kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-25 15:08:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Option maxmessage should be maxsecs per-folder, too (closes issue #10729)

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@82496 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2007-09-16 15:32:00 +00:00
parent 6a98adc357
commit 6c97fd4cb4
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
apps/app_voicemail.c
View File

@@ -734,20 +734,22 @@ static void apply_option(struct ast_vm_user *vmu, const char *var, const char *v
ast_copy_string(vmu->dialout, value, sizeof(vmu->dialout)); ast_copy_string(vmu->dialout, value, sizeof(vmu->dialout));
} else if (!strcasecmp(var, "exitcontext")) { } else if (!strcasecmp(var, "exitcontext")) {
ast_copy_string(vmu->exit, value, sizeof(vmu->exit)); ast_copy_string(vmu->exit, value, sizeof(vmu->exit));
} else if (!strcasecmp(var, "maxmessage")) { } else if (!strcasecmp(var, "maxmessage") || !strcasecmp(var, "maxsecs")) {
if (vmu->maxsecs <= 0) { if (vmu->maxsecs <= 0) {
ast_log(LOG_WARNING, "Invalid max message length of %s. Using global value %i\n", value, vmmaxsecs); ast_log(LOG_WARNING, "Invalid max message length of %s. Using global value %d\n", value, vmmaxsecs);
vmu->maxsecs = vmmaxsecs; vmu->maxsecs = vmmaxsecs;
} else { } else {
vmu->maxsecs = atoi(value); vmu->maxsecs = atoi(value);
} }
if (!strcasecmp(var, "maxmessage"))
ast_log(LOG_WARNING, "Option 'maxmessage' has been deprecated in favor of 'maxsecs'. Please make that change in your voicemail config.\n");
} else if (!strcasecmp(var, "maxmsg")) { } else if (!strcasecmp(var, "maxmsg")) {
vmu->maxmsg = atoi(value); vmu->maxmsg = atoi(value);
if (vmu->maxmsg <= 0) { if (vmu->maxmsg <= 0) {
ast_log(LOG_WARNING, "Invalid number of messages per folder maxmsg=%s. Using default value %i\n", value, MAXMSG); ast_log(LOG_WARNING, "Invalid number of messages per folder maxmsg=%s. Using default value %d\n", value, MAXMSG);
vmu->maxmsg = MAXMSG; vmu->maxmsg = MAXMSG;
} else if (vmu->maxmsg > MAXMSGLIMIT) { } else if (vmu->maxmsg > MAXMSGLIMIT) {
ast_log(LOG_WARNING, "Maximum number of messages per folder is %i. Cannot accept value maxmsg=%s\n", MAXMSGLIMIT, value); ast_log(LOG_WARNING, "Maximum number of messages per folder is %d. Cannot accept value maxmsg=%s\n", MAXMSGLIMIT, value);
vmu->maxmsg = MAXMSGLIMIT; vmu->maxmsg = MAXMSGLIMIT;
} }
} else if (!strcasecmp(var, "volgain")) { } else if (!strcasecmp(var, "volgain")) {