kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-29 18:19:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

More RSW merges. Everything from apps/ except for the big offenders

Browse Source 
app_voicemail and app_queue.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@137055 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Sean Bright
2008-08-10 14:45:25 +00:00
parent 357bf3e90b
commit 3ffb39833b
18 changed files with 211 additions and 213 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
apps/app_directory.c
View File

@@ -484,23 +484,23 @@ static int search_directory(const char *context, struct ast_config *vmcfg, struc
if (ucfg) {
for (cat = ast_category_browse(ucfg, NULL); cat ; cat = ast_category_browse(ucfg, cat)) {
const char *pos;
const char *position;
if (!strcasecmp(cat, "general"))
continue;
if (!ast_true(ast_config_option(ucfg, cat, "hasdirectory")))
continue;
/* Find all candidate extensions */
pos = ast_variable_retrieve(ucfg, cat, "fullname");
if (!pos)
position = ast_variable_retrieve(ucfg, cat, "fullname");
if (!position)
continue;
res = 0;
if (ast_test_flag(&flags, OPT_LISTBYLASTNAME)) {
res = check_match(&item, pos, cat, ext, 0 /* use_first_name */);
res = check_match(&item, position, cat, ext, 0 /* use_first_name */);
}
if (!res && ast_test_flag(&flags, OPT_LISTBYFIRSTNAME)) {
res = check_match(&item, pos, cat, ext, 1 /* use_first_name */);
res = check_match(&item, position, cat, ext, 1 /* use_first_name */);
}
if (!res)