summaryrefslogtreecommitdiffhomepage
path: root/contrib
diff options
context:
space:
mode:
authorMichael Geddes <openwrt@frog.wheelycreek.net>2009-03-31 05:13:38 +0000
committerMichael Geddes <openwrt@frog.wheelycreek.net>2009-03-31 05:13:38 +0000
commitbaab33794bb53375a7eddac72dace20b34db7862 (patch)
tree04807190ea2d7118f26f081e8638c12c065e489b /contrib
parent1a8cae287428a011377e68cd4ac01e6a9cf1a82a (diff)
Add mailformat - which format to use for email
Diffstat (limited to 'contrib')
-rwxr-xr-xcontrib/package/asterisk-xip/files/uci/voicemailconf10
-rw-r--r--contrib/package/asterisk-xip/files/uci/voicemailconf.txt1
2 files changed, 10 insertions, 1 deletions
diff --git a/contrib/package/asterisk-xip/files/uci/voicemailconf b/contrib/package/asterisk-xip/files/uci/voicemailconf
index f022e6fc0..fbdfd7b87 100755
--- a/contrib/package/asterisk-xip/files/uci/voicemailconf
+++ b/contrib/package/asterisk-xip/files/uci/voicemailconf
@@ -28,7 +28,7 @@ init_voicemailconf() {
return 0
}
-voicegeneral_list="format serveremail attach skipms maxsilence silencethreshold maxlogins emaildateformat sendvoicemail maxmsg maxmessage minmessage maxgreet"
+voicegeneral_list="format emailformat serveremail attach skipms maxsilence silencethreshold maxlogins emaildateformat sendvoicemail maxmsg maxmessage minmessage maxgreet"
voicegeneral_ext_list=""
valid_voicemail(){
@@ -96,6 +96,14 @@ create_voicemailconf() {
else
[ -z "${voice_format}" ] && voice_format="wav49|gsm|wav"
+ # Make emailformat first in the list
+ if [ ! -z "${voice_emailformat}" ] ; then
+ local newfmt=${voice_emailformat}
+ for i in ${voice_format//|/ } ; do
+ [ "$i" == "${voice_emailformat}" ] || newfmt="${newfmt}|${i}"
+ done
+ voice_format="${newfmt}"
+ fi
echo "${asteriskuci_gen}[general]" > $file
for i in ${voicegeneral_list} ; do
eval value=\${voice_$i}
diff --git a/contrib/package/asterisk-xip/files/uci/voicemailconf.txt b/contrib/package/asterisk-xip/files/uci/voicemailconf.txt
index 2318201b6..174d8a804 100644
--- a/contrib/package/asterisk-xip/files/uci/voicemailconf.txt
+++ b/contrib/package/asterisk-xip/files/uci/voicemailconf.txt
@@ -1,6 +1,7 @@
voicegeneral - General options for voicemail
format - Formats to store mail in (Default wav49|gsm|wav) - once set do NOT change this.
+ emailformat - Which format to use for email
maxlogins - Number of failed login attempts allowed
maxmsg - Maximum numer of messages per folder
sendvoicemail - Allow Sending of voicemail from VoiceMailMain