Index: /modules/branches/2.11/backup/module.xml =================================================================== --- /modules/branches/2.11/backup/module.xml (revision 13608) +++ /modules/branches/2.11/backup/module.xml (revision 13776) @@ -3,5 +3,5 @@ standard Backup & Restore - 2.10.0.19 + 2.10.0.20 Schmoozecom.com GPLv2+ @@ -10,7 +10,7 @@ Backup & Restore - - - + + + @@ -18,4 +18,5 @@ + *2.10.0.20* #5566 *2.10.0.19* #5618, add ability to disable registered trunks on restore *2.10.0.18* #5615, #5619, #5620 @@ -39,5 +40,5 @@ *2.10.0.0* Backup Module Rewrite - release/2.10/backup-2.10.0.19.tgz - 4b16fbef7bf888e4fcf856fe77dd8659 + release/2.10/backup-2.10.0.20.tgz + 217cc6e9c7fdc0bb36a4ebd09730c19f Index: /modules/branches/2.11/backup/views/rnav/main.php =================================================================== --- /modules/branches/2.11/backup/views/rnav/main.php (revision 12414) +++ /modules/branches/2.11/backup/views/rnav/main.php (revision 13776) @@ -8,4 +8,9 @@ foreach ($list as $k => $v) { + // If current user does not have access to this sub-menu then don't display it + // + if (is_object($_SESSION["AMP_user"]) && !$_SESSION["AMP_user"]->checkSection($k)) { + continue; + } $li[] = ' Index: /modules/branches/2.11/voicemail/module.xml =================================================================== --- /modules/branches/2.11/voicemail/module.xml (revision 13548) +++ /modules/branches/2.11/voicemail/module.xml (revision 13776) @@ -3,5 +3,5 @@ standard Voicemail - 2.10.0.2 + 2.10.0.3 FreePBX GPLv2+ @@ -9,4 +9,5 @@ no + *2.10.0.3* #5639 *2.10.0.2* #5135, #5168 *2.10.0.1* #5478 @@ -27,5 +28,5 @@ 2.5.0alpha1 - release/2.10/voicemail-2.10.0.2.tgz - 5d659e0d1804d65bd774e95b8101531d + release/2.10/voicemail-2.10.0.3.tgz + 9c6cd4db60e79f946aaf2078ba6a1f8c Index: /modules/branches/2.11/voicemail/functions.inc.php =================================================================== --- /modules/branches/2.11/voicemail/functions.inc.php (revision 13545) +++ /modules/branches/2.11/voicemail/functions.inc.php (revision 13776) @@ -796,8 +796,4 @@ 'options' => $vmoptions ); - // Update $_REQUEST with 'devinfo_mailbox, so MWI works. - if (empty($_REQUEST['devinfo_mailbox'])) { - $_REQUEST['devinfo_mailbox']="$extension@$vmcontext"; - } } voicemail_saveVoicemail($uservm); Index: /modules/branches/2.11/disa/module.xml =================================================================== --- /modules/branches/2.11/disa/module.xml (revision 13223) +++ /modules/branches/2.11/disa/module.xml (revision 13776) @@ -3,5 +3,5 @@ extended DISA - 2.10.0.1 + 2.10.0.2 FreePBX GPLv2+ @@ -12,4 +12,5 @@ DISA Allows you 'Direct Inward System Access'. This gives you the ability to have an option on an IVR that gives you a dial tone, and you're able to dial out from the FreePBX machine as if you were connected to a standard extension. It appears as a Destination. + *2.10.0.2* #5574 *2.10.0.1* #5507, misc *2.10.0.0* new version changes @@ -23,5 +24,5 @@ 2.4.0 - release/2.10/disa-2.10.0.1.tgz - f013ec8ea3c1f9a706afc3c78efbfa99 + release/2.10/disa-2.10.0.2.tgz + d535c92490e5af99895d1577365c6862 Index: /modules/branches/2.11/disa/functions.inc.php =================================================================== --- /modules/branches/2.11/disa/functions.inc.php (revision 13091) +++ /modules/branches/2.11/disa/functions.inc.php (revision 13776) @@ -119,9 +119,11 @@ $context = 'disa-dial'; - $exten = '_[0-9a-zA-Z*#].'; - $ext->add($context, $exten, '', new ext_noop('called ${EXTEN} in ${DISACONTEXT} by ID: ${CUT(DISA,^,2)}')); - $ext->add($context, $exten, '', new ext_dial('Local/${EXTEN}@${DISACONTEXT}', '300,${HANGUP}')); // Regular Trunk Dial - $ext->add($context, $exten, '', new ext_gosub('1', 's-${DIALSTATUS}')); - $ext->add($context, $exten, '', new ext_goto('${CUT(DISA,^,1)},${CUT(DISA,^,2)},${CUT(DISA,^,3)}')); + + foreach (array('_[0-9a-zA-Z]','_[0-9a-zA-Z*#].') as $exten) { + $ext->add($context, $exten, '', new ext_noop('called ${EXTEN} in ${DISACONTEXT} by ID: ${CUT(DISA,^,2)}')); + $ext->add($context, $exten, '', new ext_dial('Local/${EXTEN}@${DISACONTEXT}', '300,${HANGUP}')); // Regular Trunk Dial + $ext->add($context, $exten, '', new ext_gosub('1', 's-${DIALSTATUS}')); + $ext->add($context, $exten, '', new ext_goto('${CUT(DISA,^,1)},${CUT(DISA,^,2)},${CUT(DISA,^,3)}')); + } $exten = 's-ANSWER'; Index: /modules/branches/2.11/core/module.xml =================================================================== --- /modules/branches/2.11/core/module.xml (revision 13627) +++ /modules/branches/2.11/core/module.xml (revision 13776) @@ -4,5 +4,5 @@ Applications Core - 2.10.0.0 + 2.10.0.1 FreePBX GPLv2+ @@ -10,4 +10,5 @@ no + *2.10.0.1* #5385, #5381 *2.10.0.0* bump to final, minor tweaks *2.10.0rc1.3* #5618, #5633 @@ -48,5 +49,5 @@ FreePBX Support - release/2.10/core-2.10.0.0.tgz - f8d702f9d147bbafbd26fe880c0f4d5c + release/2.10/core-2.10.0.1.tgz + 63898c4925fc1016b7a94746b8ab1d3a Index: /modules/branches/2.11/core/functions.inc.php =================================================================== --- /modules/branches/2.11/core/functions.inc.php (revision 13622) +++ /modules/branches/2.11/core/functions.inc.php (revision 13776) @@ -1313,5 +1313,9 @@ $ext->add($context, $exten, '', new ext_execif('$["${FROM_DID}" = ""]','Set','__FROM_DID=${EXTEN}')); } else { - $ext->add($context, $exten, '', new ext_setvar('__FROM_DID','${EXTEN}')); + if ($exten == 's'){ + $ext->add($context, $exten, '', new ext_execif('$["${FROM_DID}" = ""]','Set','__FROM_DID=${EXTEN}')); + }else{ + $ext->add($context, $exten, '', new ext_setvar('__FROM_DID','${EXTEN}')); + } } // always set CallerID name Index: /modules/branches/2.11/core/page.general.php =================================================================== --- /modules/branches/2.11/core/page.general.php (revision 12852) +++ /modules/branches/2.11/core/page.general.php (revision 13776) @@ -264,6 +264,7 @@