Changeset 9137

Timestamp:

03/11/10 20:10:38 (2 years ago)

Author:

p_lindheimer

Message:

Merged revisions 9075-9111,9113-9122,9124-9136 via svnmerge from
http://svn.freepbx.org/modules/branches/2.7

........

r9079 | p_lindheimer | 2010-03-04 14:17:04 -0800 (Thu, 04 Mar 2010) | 1 line

fixes #4102, fixes #4104, fixes #4105 global variables not exposed and label typo

........

r9080 | p_lindheimer | 2010-03-04 14:17:36 -0800 (Thu, 04 Mar 2010) | 1 line

Module Publish Script: callforward 2.7.0.2

........

r9083 | p_lindheimer | 2010-03-05 15:29:27 -0800 (Fri, 05 Mar 2010) | 1 line

Auto Check-in of any outstanding patches

........

r9084 | p_lindheimer | 2010-03-05 15:29:47 -0800 (Fri, 05 Mar 2010) | 1 line

Module Publish Script: music 2.7.0.3

........

r9085 | p_lindheimer | 2010-03-05 16:37:14 -0800 (Fri, 05 Mar 2010) | 1 line

fixes #4102 check if set before checking value

........

r9092 | p_lindheimer | 2010-03-07 16:17:42 -0800 (Sun, 07 Mar 2010) | 1 line

fixes #4101 - hang up instead of goto h,1 no feedback on ticket so I hope it fixes it, fixes #4112 - forget all the commas in the goto target label, replace them with ^{and then use CUT for each part in the goto, works on 1.4 needs confirming on 1.6, fixes #4113 adds option to force detection part of dialplan, ext-fax will still not be generated since that requires native detection and instead external sources will have to supply an equivalent.}

........

r9093 | p_lindheimer | 2010-03-07 16:18:23 -0800 (Sun, 07 Mar 2010) | 1 line

Module Publish Script: fax 2.7.0.16

........

r9096 | p_lindheimer | 2010-03-08 08:16:47 -0800 (Mon, 08 Mar 2010) | 1 line

fixes #4100 use CUT() exclusively in parsing recordings, also unrelated puts Macro(user-callerid) back into pri 1 of all outbound routes which won't be executed but for custom code and maybe custom contexts out there using these routes it retains previous behavior while not affecting anything in the main dialplan

........

r9097 | p_lindheimer | 2010-03-08 08:30:21 -0800 (Mon, 08 Mar 2010) | 1 line

fixes #4099 don't put double quotes around Set() assignments. Please test patch and respond if possible before we publish

........

r9098 | p_lindheimer | 2010-03-08 09:10:21 -0800 (Mon, 08 Mar 2010) | 1 line

fixes 105 again where DEVSTATE was not made global and worked by accident from previous declarations

........

r9105 | mickecarlsson | 2010-03-09 22:57:50 -0800 (Tue, 09 Mar 2010) | 1 line

Fixed small typo in queues, updated all langauges

........

r9111 | p_lindheimer | 2010-03-10 09:53:22 -0800 (Wed, 10 Mar 2010) | 1 line

don't put faxdetect into sip configuration if no detection is enabled, part of solution but not final fix re #4117

........

r9113 | p_lindheimer | 2010-03-10 09:57:20 -0800 (Wed, 10 Mar 2010) | 1 line

Module Publish Script: queues 2.7.0.1

........

r9118 | mickecarlsson | 2010-03-10 10:47:17 -0800 (Wed, 10 Mar 2010) | 1 line

Re #4120, fixed typo

........

r9119 | p_lindheimer | 2010-03-10 10:49:32 -0800 (Wed, 10 Mar 2010) | 1 line

Module Publish Script: queues 2.7.0.2

........

r9120 | p_lindheimer | 2010-03-10 11:12:48 -0800 (Wed, 10 Mar 2010) | 1 line

fixes #4117 add faxdetect=no to all extensions

........

Files:

• modules/branches/2.8 (modified) (1 prop)
• modules/branches/2.8/callforward/functions.inc.php (modified) (7 diffs)
• modules/branches/2.8/callforward/module.xml (modified) (2 diffs)
• modules/branches/2.8/core/agi-bin/dialparties.agi (modified) (1 diff)
• modules/branches/2.8/core/functions.inc.php (modified) (6 diffs)
• modules/branches/2.8/core/module.xml (modified) (1 diff)
• modules/branches/2.8/fax/functions.inc.php (modified) (8 diffs)
• modules/branches/2.8/fax/install.php (modified) (1 diff)
• modules/branches/2.8/fax/module.xml (modified) (2 diffs)
• modules/branches/2.8/fax/page.fax.php (modified) (2 diffs)
• modules/branches/2.8/music/functions.inc.php (modified) (1 diff)
• modules/branches/2.8/music/module.xml (modified) (2 diffs)
• modules/branches/2.8/music/page.music.php (modified) (1 diff)
• modules/branches/2.8/queues/module.xml (modified) (3 diffs)
• modules/branches/2.8/queues/page.queues.php (modified) (1 diff)

modules/branches/2.8/callforward/functions.inc.php

@@ -22 +22 @@
-  global $ext;  
-  global $amp_conf;  
+  global $version;
+  global $DEVSTATE;
-  switch($engine) {
-    case "asterisk":
@@ -29 +31 @@
-        $ext->addGlobal('CFDEVSTATE','TRUE');
-      }
+      $DEVSTATE = version_compare($version, "1.6", "ge") ? "DEVICE_STATE" : "DEVSTATE";
+
-      if (is_array($featurelist = featurecodes_getModuleFeatures($modulename))) {
-        foreach($featurelist as $item) {
@@ -75 +79 @@
-  global $ext;
-  global $amp_conf;
-
-
-
+
-
-  $id = "app-cf-toggle"; // The context to be included
@@ -141 +143 @@
-function callforward_cfon($c) {
-  global $ext;
+  global $amp_conf;
+  global $DEVSTATE;
-
-  $id = "app-cf-on"; // The context to be included
@@ -164 +168 @@
-  }
-  if ($amp_conf['FCBEEPONLY']) {
-2
+1
-  } else {
-    $ext->add($id, $c, 'hook_1', new ext_playback('call-fwd-unconditional&for&extension'));
@@ -209 +213 @@
-function callforward_cfoff_any($c) {
-  global $ext;
+  global $amp_conf;
+  global $DEVSTATE;
-
-  $id = "app-cf-off-any"; // The context to be included
@@ -245 +251 @@
-function callforward_cfoff($c) {
-  global $ext;
+  global $amp_conf;
+  global $DEVSTATE;
-
-  $id = "app-cf-off"; // The context to be included

modules/branches/2.8/callforward/module.xml

@@ -2 +2 @@
-  <rawname>callforward</rawname>
-  <name>Call Forward</name>
-1
+3
-  <publisher>FreePBX</publisher>
-  <license>GPLv2+</license>
-  <changelog>
+    *2.7.0.3* #4105 again
+    *2.7.0.2* #4103, #4104, #4105
-    *2.7.0.1* localizations
-    *2.7.0.0* #4047 CF toggle + devstate and hint additions
@@ -22 +24 @@
-  <type>setup</type>
-  <category>Internal Options &amp; Configuration</category>
-1
-6b7f6233fb6601df656a09718420e1a7
+2
+0aa4cdc91da096bb87241d2d853d7ce6
-</module>

modules/branches/2.8/core/agi-bin/dialparties.agi

@@ -570 +570 @@
-  foreach ($extarray as $k ) {
-    // we loop through the original array to get the extensions in order of importance
-
+isset($ext_hunt[$k]) && 
-      //If the original array is included in the extension hash then set variables
-      $myhuntmember="HuntMember"."$loops";

modules/branches/2.8/core/functions.inc.php

@@ -184 +184 @@
-      $ver12 = true;
-    }
+    if (version_compare($ast_version, "1.6", "ge")) { 
+      $faxdetect = "faxdetect=no\n";
+      $ver16 = true;
+    } else {
+      $faxdetect = "";
+      $ver16 = false;
+    }
-
-    $sql = "SELECT keyword,data from $table_name where id=-1 and keyword <> 'account' and flags <> 1";
@@ -310 +317 @@
-            $output .= $call_limit;
-          }
+          if ($faxdetect) {
+            $output .= $faxdetect;
+          }
-      }
-      $output .= $additional."\n";
@@ -372 +382 @@
-            break;
-          case 'requirecalltoken':
-                                   
-                                         
-                                   
+
+
+
-          default:
-            $additional .= $result['keyword']."=$option\n";
@@ -447 +457 @@
-              break;
-            case 'requirecalltoken':
-                                         
-                                               
-                                         
+
+
+
-            case 'record_in':
-            case 'record_out':
@@ -480 +490 @@
-          break;
-        default:
-          if ($call_limit) {
-            $output .= $call_limit;
-          }
-      }
-      $output .= $additional."\n";
@@ -1499 +1506 @@
-        $ext->add($context, $exten, 'Group', new ext_set('LOOPCNT','${FIELDQTY(ARG1,-)}'));
-        $ext->add($context, $exten, '', new ext_set('ITER','1'));
-
-
-
+
+
-        $ext->add($context, $exten, '', new ext_noop('Recording enable for ${TEXTEN}'));
-        $ext->add($context, $exten, '', new ext_set('CALLFILENAME','g${TEXTEN}-${STRFTIME(${EPOCH},,%Y%m%d-%H%M%S)}-${UNIQUEID}'));

modules/branches/2.8/core/module.xml

@@ -10 +10 @@
-  <canuninstall>no</canuninstall>
-  <changelog>
-
+00, #4102, #41
-    *2.7.0.2* really fix #4092
-    *2.7.0.1* #4093, #4094, #4095, #4092

modules/branches/2.8/fax/functions.inc.php

@@ -200 +200 @@
-
-function fax_get_config($engine){
-
+
+
+
+
-
-  $fax=fax_detect($version);
-  if($fax['module']){ //dont continue unless we have a fax module in asterisk
-    global $ext;
-    global $amp_conf;
-    global $core_conf;
-
-    $ast_ge_16= version_compare($version, '1.6', 'ge');
-    if ($ast_ge_16 && isset($core_conf) && is_a($core_conf, "core_conf")) {
-      $core_conf->addSipGeneral('faxdetect','yes');
-    }
-
-    $context='ext-fax';
@@ -220 +215 @@
-        $exten=$row['user'];
-        $ext->add($context, $exten, '', new ext_noop('Receiving Fax for: '.$row['name'].' ('.$row['user'].'), From: ${CALLERID(all)}'));
-'"'.$row['faxemail'].'"'
+$row['faxemail']
-        $ext->add($context, $exten, '', new ext_goto('receivefax','s'));
-      }
@@ -256 +251 @@
-      $ext->add($context, $exten, '', new ext_execif('$["${FAXOPT(error)}"=""]','Set','FAXSTATUS=FAILED LICENSE EXCEEDED'));
-      $ext->add($context, $exten, '', new ext_execif('$["${FAXOPT(error)}"!="" && "${FAXOPT(error)}"!="NO_ERROR"]','Set','FAXSTATUS="FAILED FAXOPT: error: ${FAXOPT(error)} status: ${FAXOPT(status)} statusstr: ${FAXOPT(statusstr)}"'));
-goto('1','h'
+hangup(
-
-    break;
@@ -266 +261 @@
-    $exten = 'h';
-    $ext->add($context, $exten, '', new ext_gotoif('$["${FAXSTATUS:0:6}" = "FAILED"]', 'failed'));
-"${FAX_RX_EMAIL}" = ""
+${LEN(${FAX_RX_EMAIL})} = 0
-    $ext->add($context, $exten, '', new ext_system('${ASTVARLIBDIR}/bin/fax-process.pl --to ${FAX_RX_EMAIL} --from "'.$sender_address['0'].'" --dest "${FROM_DID}" --subject "New fax from ${URIENCODE(${CALLERID(name)})} ${URIENCODE(<${CALLERID(number)}>)}" --attachment fax_${URIENCODE(${CALLERID(number)})}.pdf --type application/pdf --file ${ASTSPOOLDIR}/fax/${UNIQUEID}.tif'));
-
@@ -273 +268 @@
-    $ext->add($context, $exten, '', new ext_macro('hangupcall'));
-
-    $ext->add('ext-did-0001', 'fax', '', new ext_goto('${FAX_DEST}'));
-    $ext->add('ext-did-0002', 'fax', '', new ext_goto('${FAX_DEST}'));
-
-    // Add fax extension to ivr and announcement as inbound controle may be passed quickly to them and still detection is desired
-    if (function_exists('ivr_list')) {
-      $ivrlist = ivr_list();
-      if(is_array($ivrlist)) foreach($ivrlist as $item) {
-        $ext->add("ivr-".$item['ivr_id'], 'fax', '', new ext_goto('${FAX_DEST}'));
-      }
-    }
-    if (function_exists('announcement_list')) foreach (announcement_list() as $row) {
-      $ext->add('app-announcement-'.$row['announcement_id'], 'fax', '', new ext_goto('${FAX_DEST}'));
-    }
-
-    //write out res_fax.conf and res_fax_digium.conf
@@ -301 +283 @@
-      $ext->add('app-fax', $fc_simu_fax, '', new ext_goto('1', 's', 'ext-fax'));
-      $ext->add('app-fax', 'h', '', new ext_macro('hangupcall'));
+    }
+    // This is not really needed but is put here in case some ever accidently switches the order below when
+    // checking for this setting since $fax['module'] will be set there and the 2nd part never checked
+    $fax_settings['force_detection'] = 'yes';
+  } else {
+    $fax_settings=fax_get_settings();
+  }
+  if ($fax['module'] | $fax_settings['force_detection'] == 'yes') { //dont continue unless we have a fax module in asterisk
+    $ast_ge_16= version_compare($version, '1.6', 'ge');
+    if ($ast_ge_16 && isset($core_conf) && is_a($core_conf, "core_conf")) {
+      $core_conf->addSipGeneral('faxdetect','yes');
+    }
+
+    $ext->add('ext-did-0001', 'fax', '', new ext_goto('${CUT(FAX_DEST,^,1)},${CUT(FAX_DEST,^,2)},${CUT(FAX_DEST,^,3)}'));
+    $ext->add('ext-did-0002', 'fax', '', new ext_goto('${CUT(FAX_DEST,^,1)},${CUT(FAX_DEST,^,2)},${CUT(FAX_DEST,^,3)}'));
+
+    // Add fax extension to ivr and announcement as inbound controle may be passed quickly to them and still detection is desired
+    if (function_exists('ivr_list')) {
+      $ivrlist = ivr_list();
+      if(is_array($ivrlist)) foreach($ivrlist as $item) {
+        $ext->add("ivr-".$item['ivr_id'], 'fax', '', new ext_goto('${CUT(FAX_DEST,^,1)},${CUT(FAX_DEST,^,2)},${CUT(FAX_DEST,^,3)}'));
+      }
+    }
+    if (function_exists('announcement_list')) foreach (announcement_list() as $row) {
+      $ext->add('app-announcement-'.$row['announcement_id'], 'fax', '', new ext_goto('${CUT(FAX_DEST,^,1)},${CUT(FAX_DEST,^,2)},${CUT(FAX_DEST,^,3)}'));
-    }
-  }
@@ -465 +472 @@
-  global $version;
-  $fax=fax_detect($version);
-
+
+
+
+
+
+
-    global $ext;
-    global $engine;
@@ -486 +498 @@
-      }
-      if ($route['legacy_email'] === null) {
-'"'.$route['destination'].'"'
+str_replace(',','^',$route['destination'])
-      } else {
-"ext-fax,s,1"
+ext-fax^s^1
-        if ($route['legacy_email']) {
-          $fax_rx_email = $route['legacy_email'];

modules/branches/2.8/fax/install.php

@@ -92 +92 @@
-if(!$set['ecm']){$sql[]='REPLACE INTO fax_details (`key`, `value`) VALUES ("ecm","yes")';}
-if(!$set['legacy_mode']){$sql[]='REPLACE INTO fax_details (`key`, `value`) VALUES ("legacy_mode","no")';}
-
+
+
-foreach ($sql as $statement){
-  $check = $db->query($statement);

modules/branches/2.8/fax/module.xml

@@ -2 +2 @@
-  <rawname>fax</rawname>
-  <name>Fax Configuration</name>
-5
+7
-  <publisher>Schmoozecom.com</publisher>
-  <license>GPLv2+</license>
@@ -12 +12 @@
-  <description>Adds configurations, options and GUI for inbound faxing</description>
-  <changelog>
+    *2.7.0.17* #4099
+    *2.7.0.16* #4101, #4112, #4113
-    *2.7.0.15* #4096 (workaround for Asterisk bug in 1.6.2)
-    *2.7.0.14* #4090

modules/branches/2.8/fax/page.fax.php

@@ -23 +23 @@
-  }
-  $fax['legacy_mode'] = isset($_REQUEST['legacy_mode']) ? $_REQUEST['legacy_mode'] : 'no';
+  $fax['force_detection'] = isset($_REQUEST['force_detection']) ? $_REQUEST['force_detection'] : 'no';
-  fax_save_settings($fax);
-}else{
-  $fax=fax_get_settings();
-  $fax['legacy_mode'] = isset($fax['legacy_mode']) ? $fax['legacy_mode'] : 'no';
+  $fax['force_detection'] = isset($fax['force_detection']) ? $fax['force_detection'] : 'no';
-  $action='';//no action to do
-}
+$fax_detect=fax_detect();
-?>
-
@@ -123 +126 @@
-        <input type="radio" name="legacy_mode" value="no" <?php echo (($fax['legacy_mode'] == 'no')?'checked':''); ?> tabindex="<?php echo ++$tabindex;?>"><?php echo _("No")?></td>      
-      </tr>       
+
+<?php if(!$fax_detect['module']){ ?>
+      <tr>
+        <td><a href="#" class="info"><?php echo _("Always Generate Detection Code")?>:<span><?php echo _("When no fax modules are detected the module will not generate any detection dialplan by default. If the system is being used with phyical FAX devices, hylafax + iaxmodem, or other outside fax setups you can force the dialplan to be generated here.")?></span></a></td>
+        <td><input type="radio" name="force_detection" value="yes" <?php echo (($fax['force_detection'] == 'yes')?'checked':''); ?> tabindex="<?php echo ++$tabindex;?>"><?php echo _("Yes")?>
+        <input type="radio" name="force_detection" value="no" <?php echo (($fax['force_detection'] == 'no')?'checked':''); ?> tabindex="<?php echo ++$tabindex;?>"><?php echo _("No")?></td>      
+      </tr>       
+<?php } ?>
-  </tbody>
-  </table>
-  <br />
-
-  
-  <input type="hidden" value="fax" name="display"/>
-  <input type="hidden" name="action" value="edit">

modules/branches/2.8/music/functions.inc.php

@@ -8 +8 @@
-      $amp_conf['MOHDIR'] = '/mohmp3';
-    }
-
+'/'.
-  }
-  $i = 1;

modules/branches/2.8/music/module.xml

@@ -2 +2 @@
-  <rawname>music</rawname>
-  <name>Music on Hold</name>
-2
+3
-  <publisher>FreePBX</publisher>
-  <license>GPLv2+</license>
@@ -11 +11 @@
-  <description>Uploading and management of sound files (wav, mp3) to be used for on-hold music.</description>
-  <changelog>
+    *2.7.0.3* #4111
-    *2.7.0.2* #4087
-    *2.7.0.1* text tweaks

modules/branches/2.8/music/page.music.php

@@ -21 +21 @@
-
-// Determine default path to music directory, old default was mohmp3, now settable
-
+'/'.
-
-

modules/branches/2.8/queues/module.xml

@@ -2 +2 @@
-  <rawname>queues</rawname>
-  <name>Queues</name>
-0
+2
-  <publisher>FreePBX</publisher>
-  <license>GPLv2+</license>
@@ -11 +11 @@
-  </description>
-  <changelog>
+    *2.7.0.2* #4120 again fixed typo in variable name
+    *2.7.0.1* #4120, spelling typo
-    *2.7.0.0* #4084, spelling, tooltips changes, localizations
-    *2.7.0beta1.5* #4084, #4068 (support for experimental dial-one)
@@ -59 +61 @@
-    <queues needsenginedb="yes">Queues</queues>
-  </menuitems>
-0
-845b60da3aa54490e5d9968f75dedde7
+2
+4c20585b3eed5ef40e0d7bae2cca31b3
-</module>

modules/branches/2.8/queues/page.queues.php

@@ -207 +207 @@
-          break;
-      }
-_
+
-    }
-  }