Add mailformat - which format to use for email

diff --git a/contrib/package/asterisk-xip/files/uci/voicemailconf b/contrib/package/asterisk-xip/files/uci/voicemailconf
index f022e6fc091eb611d7379de70694047ece4dc757..fbdfd7b878bba993d0554c15d47dc920fd2a6ac8 100755 (executable)
--- 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 2318201b6b3513e37c8559026adb78a14632fe87..174d8a8042e9837d2fa8f7c8f7ff104f99ec55a2 100644 (file)
--- 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