Changeset 3357

Show
Ignore:
Timestamp:
12/18/06 23:21:33 (6 years ago)
Author:
qldrob
Message:

Merged revisions 3355-3356 via svnmerge from
https://svn.sourceforge.net/svnroot/amportal/modules/branches/2.2

........

r3355 | qldrob | 2006-12-19 14:13:34 +1000 (Tue, 19 Dec 2006) | 2 lines


Fix for #1485, voicemail had frm_users hard coded in. Now discovers the page name correctly. Thanks to naftali5 for the debugging work!

........

r3356 | qldrob | 2006-12-19 14:15:05 +1000 (Tue, 19 Dec 2006) | 1 line


Module Publish Script: voicemail 1.5.3

........

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/branches/2.3

    • Property svnmerge-integrated changed from /modules/branches/2.2:1-3329 to /modules/branches/2.2:1-3329,3355-3356

  • modules/branches/2.3/voicemail/functions.inc.php

    r3325 r3357  
    124124  $ext = isset($_REQUEST['extdisplay'])?$_REQUEST['extdisplay']:null; 
    125125  $extn = isset($_REQUEST['extension'])?$_REQUEST['extension']:null; 
     126  $display = isset($_REQUEST['display'])?$_REQUEST['display']:null; 
    126127   
    127128  if ($ext==='') { 
    …… 
    195196    $section = 'Voicemail & Directory'; 
    196197    $currentcomponent->addguielem($section, new gui_selectbox('vm', $currentcomponent->getoptlist('vmena'), $vmselect, 'Status', '', false)); 
    197     $currentcomponent->addguielem($section, new gui_textbox('vmpwd', $vmpwd, 'voicemail password', "This is the password used to access the voicemail system.<br><br>This password can only contain numbers.<br><br>A user can change the password you enter here after logging into the voicemail system ($fc_vm) with a phone.", "frm_users_isVoiceMailEnabled() && !isInteger()", $msgInvalidVmPwd, false)); 
    198     $currentcomponent->addguielem($section, new gui_textbox('email', $email, 'email address', "The email address that voicemails are sent to.", "frm_users_isVoiceMailEnabled() && !isEmail()", $msgInvalidEmail, true)); 
    199     $currentcomponent->addguielem($section, new gui_textbox('pager', $pager, 'pager email address', "Pager/mobile email address that short voicemail notifcations are sent to.", "frm_users_isVoiceMailEnabled() && !isEmail()", $msgInvalidEmail, true)); 
     198    $currentcomponent->addguielem($section, new gui_textbox('vmpwd', $vmpwd, 'voicemail password', "This is the password used to access the voicemail system.<br><br>This password can only contain numbers.<br><br>A user can change the password you enter here after logging into the voicemail system ($fc_vm) with a phone.", "frm_${display}_isVoiceMailEnabled() && !isInteger()", $msgInvalidVmPwd, false)); 
     199    $currentcomponent->addguielem($section, new gui_textbox('email', $email, 'email address', "The email address that voicemails are sent to.", "frm_${display}_isVoiceMailEnabled() && !isEmail()", $msgInvalidEmail, true)); 
     200    $currentcomponent->addguielem($section, new gui_textbox('pager', $pager, 'pager email address', "Pager/mobile email address that short voicemail notifcations are sent to.", "frm_${display}_isVoiceMailEnabled() && !isEmail()", $msgInvalidEmail, true)); 
    200201    $currentcomponent->addguielem($section, new gui_radio('attach', $currentcomponent->getoptlist('vmyn'), $vmops_attach, 'email attachment', "Option to attach voicemails to email.")); 
    201202    $currentcomponent->addguielem($section, new gui_radio('saycid', $currentcomponent->getoptlist('vmyn'), $vmops_saycid, 'Play CID', "Read back caller's telephone number prior to playing the incoming message, and just after announcing the date and time the message was left.")); 
    …… 
    203204    $currentcomponent->addguielem($section, new gui_radio('delete', $currentcomponent->getoptlist('vmyn'), $vmops_delete, 'Delete Vmail', "If set to \"yes\" the message will be deleted from the voicemailbox (after having been emailed). Provides functionality that allows a user to receive their voicemail via email alone, rather than having the voicemail able to be retrieved from the Webinterface or the Extension handset.  CAUTION: MUST HAVE attach voicemail to email SET TO YES OTHERWISE YOUR MESSAGES WILL BE LOST FOREVER.")); 
    204205    $currentcomponent->addguielem($section, new gui_textbox('options', $options, 'vm options', 'Separate options with pipe ( | )<br><br>ie: review=yes|maxmessage=60')); 
    205     $currentcomponent->addguielem($section, new gui_textbox('vmcontext', $vmcontext, 'vm context', '', 'frm_users_isVoiceMailEnabled() && isEmpty()', $msgInvalidVMContext, false)); 
     206    $currentcomponent->addguielem($section, new gui_textbox('vmcontext', $vmcontext, 'vm context', '', "frm_${display}_isVoiceMailEnabled() && isEmpty()", $msgInvalidVMContext, false)); 
    206207  } 
    207208} 

  • modules/branches/2.3/voicemail/module.xml

    r3326 r3357  
    22  <rawname>voicemail</rawname> 
    33  <name>Voicemail</name> 
    4   <version>1.5.2</version> 
     4  <version>1.5.3</version> 
    55  <changelog> 
     6      *1.5.3* Fix for vm Javascript sanity checks only working in DevAndUser mode. 
    67      *1.5.2* Fix vm not appearing in DeviceAndUser mode 
    78            *1.5.1* Fix for MWI not working 
    …… 
    1415  <type>setup</type> 
    1516  <category>Basic</category> 
    16   <location>release/2.3/voicemail-1.5.2.tgz</location> 
    17   <info>http://aussievoip.com.au/wiki/freePBX-Features</info> 
    1817  <md5sum>13e1aa56412ac54c728fa8cd43e6ec53</md5sum> 
    1918</module>