Changeset 1883

Timestamp:

05/06/06 20:55:05 (7 years ago)

Author:

mheydon1973

Message:

* Ticket #743 (Bugs) -- Error in macro-vm

Option for Default/Unavailable/Busy/None now on General Settings

* Ticket #732 (Feature Requests) -- Give GUI/dialplan to voicemail gain adjustment

Optional Gain setting on General Settings

* General Settings Cleanup

Re-arranged all Voicemail options under their own heading

Files:

• freepbx/trunk/amp_conf/astetc/extensions.conf (modified) (2 diffs)
• freepbx/trunk/amp_conf/htdocs/admin/modules/core/page.general.php (modified) (5 diffs)
• freepbx/trunk/install_amp (modified) (1 diff)
• freepbx/trunk/upgrades/2.1beta3 (added)
• freepbx/trunk/upgrades/2.1beta3/tables.php (added)

freepbx/trunk/amp_conf/astetc/extensions.conf

@@ -118 +118 @@
-[macro-vm]
-exten => s,1,Macro(user-callerid)
-
+
+
-
-exten => s-BUSY,1,NoOp(BUSY voicemail)
-exten => s-BUSY,n,Macro(get-vmcontext,${ARG1})
-
-Hangup(
+${VMGAIN}
+Goto(exit-${VMSTATUS},1
-
-exten => s-DIRECTDIAL,1,NoOp(DIRECTDIAL voicemail)
-exten => s-DIRECTDIAL,n,Macro(get-vmcontext,${ARG1})
-)  ; Just play 'To leave a message..'
-Hangup(
+|${VM_DDTYPE}${VMGAIN})
+Goto(exit-${VMSTATUS},1
-
-exten => _s-.,1,Macro(get-vmcontext,${ARG1})
-
-Hangup(
+${VMGAIN}
+Goto(exit-${VMSTATUS},1
-
-exten => o,1,Background(one-moment-please)      ; 0 during vm message will hangup
@@ -140 +141 @@
-exten => a,n,VoiceMailMain(${ARG1}@${VMCONTEXT})
-exten => a,n,Hangup
+
+exten => exit-FAILED,1,Playback(im-sorry&an-error-has-occured)
+exten => exit-FAILED,n,Hangup()
+
+exten => exit-SUCCESS,1,Playback(goodbye)
+exten => exit-SUCCESS,n,Hangup()
+
+exten => exit-USEREXIT,1,Playback(goodbye)
+exten => exit-USEREXIT,n,Hangup()
+
+exten => t,1,Hangup()
-
-; get the voicemail context for the user in ARG1

freepbx/trunk/amp_conf/htdocs/admin/modules/core/page.general.php

@@ -17 +17 @@
-//if submitting form, update database
-if ($action == 'editglobals') {
-
+
+
-            array($_REQUEST['FAX_RX'],'FAX_RX'),
-            array($_REQUEST['FAX_RX_EMAIL'],'FAX_RX_EMAIL'),
@@ -23 +24 @@
-            array($_REQUEST['DIRECTORY'],'DIRECTORY'),
-            array($_REQUEST['VM_PREFIX'],'VM_PREFIX'),
+            array($_REQUEST['VM_DDTYPE'],'VM_DDTYPE'),
+            array($_REQUEST['VM_GAIN'],'VM_GAIN'),
-            array($_REQUEST['DIAL_OPTIONS'],'DIAL_OPTIONS'),
-                                                
+           
-            array($_REQUEST['TONEZONE'], 'TONEZONE'),
-            array($_REQUEST['ALLOW_SIP_ANON'], 'ALLOW_SIP_ANON'),
@@ -62 +65 @@
-<h5><?php echo _("Dialing Options")?></h5>
-<p>
-  <?php echo _("Number of seconds to ring phones before sending callers to voicemail:")?>
-  <input type="text" size="2" name="RINGTIMER" value="<?php  echo htmlspecialchars($RINGTIMER)?>"/>
-  <br><br>
-  <?php echo _("Extension prefix for dialing direct to voicemail:")?>
-  <input type="text" size="2" name="VM_PREFIX" value="<?php  echo htmlspecialchars($VM_PREFIX)?>"/>
-  <br><br>
-  <a href=# class="info"><?php echo _("Asterisk Dial command options:")?><span><br>
-<?php echo _("t: Allow the called user to transfer the call by hitting #")?><br>
@@ -85 +82 @@
-  </span></a>
-  <input type="text" size="2" name="TRUNK_OPTIONS" value="<?php  echo htmlspecialchars($TRUNK_OPTIONS)?>"/>
+</p>
+
+<h5><?php echo _("Voicemail")?></h5>
+<p>
+  <?php echo _("Number of seconds to ring phones before sending callers to voicemail:")?>
+  <input type="text" size="2" name="RINGTIMER" value="<?php  echo htmlspecialchars($RINGTIMER)?>"/>
+  <br><br>
+  <?php echo _("Extension prefix for dialing direct to voicemail:")?>
+  <input type="text" size="2" name="VM_PREFIX" value="<?php  echo htmlspecialchars($VM_PREFIX)?>"/>
+  <br><br>
+  <?php echo _("Direct Dial to Voicemail message type:")?>
+  <select name="VM_DDTYPE">
+  <option value=""><?php echo _("Default"); ?></option>
+  <option value="u"<?php if ($VM_DDTYPE == "u") echo " SELECTED"; ?>><?php echo _("Unavailable"); ?></option>
+  <option value="su"<?php if ($VM_DDTYPE == "su") echo " SELECTED"; ?>><?php echo _("Unavailable")."--"._("no instructions"); ?></option>
+  <option value="b"<?php if ($VM_DDTYPE == "b") echo " SELECTED"; ?>><?php echo _("Busy"); ?></option>
+  <option value="sb"<?php if ($VM_DDTYPE == "sb") echo " SELECTED"; ?>><?php echo _("Busy")."--"._("no instructions"); ?></option>
+  <option value="s"<?php if ($VM_DDTYPE == "s") echo " SELECTED"; ?>><?php echo ("No Message"); ?></option>
+  </select>
+  <br><br>
+  <a href=# class="info"><?php echo _("Use gain when recording the voicemail message (optional):")?><span>
+  <?php echo _("Use the specified amount of gain when recording the voicemail message."); ?><br><br>
+  <?php echo _("The units are whole-number decibels (dB)."); ?></span></a>
+  <input type="text" size="2" name="VM_GAIN" value="<?php  echo htmlspecialchars($VM_GAIN)?>"/>
-</p>
-
@@ -127 +148 @@
-  <input type="text" size="20" name="FAX_RX_FROM" value="<?php  echo htmlspecialchars($FAX_RX_FROM)?>"/>
-</p>
-Tone 
+
-<p>
-  <?php echo _("Country")?> <a class="info" href="#"><?php echo _("Indications")?><span><?php echo _("Select which country you are in")?></span></a>&nbsp;

freepbx/trunk/install_amp

@@ -27 +27 @@
-    '2.0.1',
-    '2.1beta1',
-
+
+
-  );
-