abolish mailbox attribute in users and use number-alias attribute instead MODAPP-218

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@13377 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Michael Jerris
2009-05-18 17:06:13 +00:00
parent d9f50be754
commit d18fa24ae6
3 changed files with 41 additions and 49 deletions

View File

@@ -1686,14 +1686,14 @@ static switch_status_t find_user_in_tag(switch_xml_t tag, const char *ip, const
}
if (user_name) {
if (params && switch_event_get_header(params, (char *) "mailbox")) {
if ((*user = switch_xml_find_child_multi(tag, "user", "mailbox", user_name, "type", type, NULL))) {
if (!strcasecmp(key, "id")) {
if ((*user = switch_xml_find_child_multi(tag, "user", key, user_name, "number-alias", user_name, "type", type, NULL))) {
return SWITCH_STATUS_SUCCESS;
}
} else {
if ((*user = switch_xml_find_child_multi(tag, "user", key, user_name, "type", type, NULL))) {
return SWITCH_STATUS_SUCCESS;
}
}
if ((*user = switch_xml_find_child_multi(tag, "user", key, user_name, "type", type, NULL))) {
return SWITCH_STATUS_SUCCESS;
}
}