Merge bug 1483 -- advanced voicemail options
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@2792 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
parent
fcb0714e11
commit
b56ba71434
File diff suppressed because it is too large
Load Diff
|
@ -86,12 +86,26 @@ central24=America/Chicago|'vm-received' q 'digits/at' H 'digits/hundred' M 'hour
|
|||
; if the e-mail is specified, a message will be sent when a message is
|
||||
; received, to the given mailbox. If pager is specified, a message will be sent there as well.
|
||||
;
|
||||
; Advanced options example is extension 4069
|
||||
; NOTE: All options can be expressed globally in the general section, and overriden in the per-mailbox settings.
|
||||
;
|
||||
; tz=central (timezone from zonemessages above)
|
||||
; attach=yes (attach the voicemail to the notification email *NOT* the pager email)
|
||||
; saycid=yes (say the caller id information before the message. If not described, or set to no, it will be in the envelope)
|
||||
; dialout=fromvm (context to dial out from [option 4 from the advanced menu]; if not listed, dialing out will not be permitted)
|
||||
; callback=fromvm (context to call back from; if not listed, calling the sender back will not be permitted)
|
||||
; review=yes (allow sender to review/rerecord their message before saving it)
|
||||
; operator=yes (allow sender to hit 0 after leaving a voicemail to reach an operator)
|
||||
;
|
||||
|
||||
|
||||
[default]
|
||||
1234 => 4242,Example Mailbox,root@localhost
|
||||
;4200 => 9855,Mark Spencer,markster@linux-support.net,mypager@digium.com,attach=no|serveremail=myaddy@digium.com|tz=central
|
||||
;4300 => 3456,Ben Rigas,ben@american-computer.net
|
||||
;4310 => 5432,Sales,sales@marko.net
|
||||
;4069 => 6522,Matt Brooks,matt@marko.net
|
||||
;4069 => 6522,Matt Brooks,matt@marko.net,,|tz=central|attach=yes|saycid=yes|dialout=fromvm|callback=fromvm|review=yes|operator=
|
||||
yes
|
||||
;4110 => 3443,Rob Flynn,rflynn@blueridge.net
|
||||
|
||||
;
|
||||
|
|
15
say.c
15
say.c
|
@ -34,6 +34,7 @@ int ast_say_digit_str(struct ast_channel *chan, char *fn2, char *ints, char *lan
|
|||
int num = 0;
|
||||
int res = 0;
|
||||
while(fn2[num] && !res) {
|
||||
fn[0] = '\0';
|
||||
switch (fn2[num]) {
|
||||
case ('*'):
|
||||
snprintf(fn, sizeof(fn), "digits/star");
|
||||
|
@ -42,12 +43,16 @@ int ast_say_digit_str(struct ast_channel *chan, char *fn2, char *ints, char *lan
|
|||
snprintf(fn, sizeof(fn), "digits/pound");
|
||||
break;
|
||||
default:
|
||||
snprintf(fn, sizeof(fn), "digits/%c", fn2[num]);
|
||||
if((fn2[num] >= '0') && (fn2[num] <= '9')){ /* Must be in {0-9} */
|
||||
snprintf(fn, sizeof(fn), "digits/%c", fn2[num]);
|
||||
}
|
||||
}
|
||||
res = ast_streamfile(chan, fn, lang);
|
||||
if (!res)
|
||||
res = ast_waitstream(chan, ints);
|
||||
ast_stopstream(chan);
|
||||
if(strlen(fn)){ /* if length == 0, then skip this digit as it is invalid */
|
||||
res = ast_streamfile(chan, fn, lang);
|
||||
if (!res)
|
||||
res = ast_waitstream(chan, ints);
|
||||
ast_stopstream(chan);
|
||||
}
|
||||
num++;
|
||||
}
|
||||
return res;
|
||||
|
|
50
sounds.txt
50
sounds.txt
|
@ -426,3 +426,53 @@
|
|||
message without prepending
|
||||
|
||||
%vm-mailboxfull.gsm%sorry but the users mail box can't accept more messages
|
||||
|
||||
%vm-tocancelmsg.gsm%press star to cancel this message
|
||||
|
||||
%vm-from.gsm%from
|
||||
|
||||
%vm-from-extension.gsm%from extension
|
||||
|
||||
%vm-from-phonenumber.gsm%from phone number
|
||||
|
||||
%vm-unknown-caller.gsm%from an unknown caller
|
||||
|
||||
%vm-advopts.gsm%press 3 for advanced options
|
||||
|
||||
%vm-toreply.gsm%press 1 to send a reply
|
||||
|
||||
%vm-tocallback.gsm%press 2 to call the person who sent this message
|
||||
|
||||
%vm-tohearenv.gsm%press 3 to hear the message envelope
|
||||
|
||||
%vm-tomakecall.gsm%press 4 to place an outgoing call
|
||||
|
||||
%vm-starmain.gsm%press star to return to the main menu
|
||||
|
||||
%vm-dialout.gsm%please wait while i connect your call
|
||||
|
||||
%vm-enter-num-to-call.gsm%please enter the number you wish to call
|
||||
|
||||
%vm-then-pound.gsm%then press pound
|
||||
|
||||
%vm-star-cancel.gsm%press star to cancel
|
||||
|
||||
%vm-num-i-have.gsm%the number i have is
|
||||
|
||||
%vm-tocallnum.gsm%press 1 to call this number
|
||||
|
||||
%vm-calldiffnum.gsm%press 2 to enter a different number
|
||||
|
||||
%vm-nonumber.gsm%i'm afraid i don't know who sent this message
|
||||
|
||||
%vm-toenternumber.gsm%press 1 to enter a number
|
||||
|
||||
%vm-nobox.gsm%you cannot reply to this message because the sender does not have a mailbox
|
||||
|
||||
%vm-review.gsm%press 1 to accept this recording press 2 to listen to it press 3 to rerecord your message
|
||||
|
||||
%vm-torerecord.gsm%press 3 to rerecord your message
|
||||
|
||||
%vm-reachoper.gsm%press 0 to reach an operator
|
||||
|
||||
%vm-tooshort.gsm%your message is too short
|
||||
|
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Reference in New Issue