Ticket #3549: sipiaxchandid.patch

old/functions.inc.php

@@ -1009 +1009 @@
-          
-      }
-
-zapt
+chann
-      // Send it to from-trunk so it is handled as other dids would be handled.
-      //
-      foreach (core_zapchandids_list() as $row) {
-        $channel = $row['channel'];
-        $did     = $row['did'];
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-      }
-
-      /* user extensions */
@@ -1134 +1145 @@
-            case 'IAX2':
-            case 'SIP':
-              $trunkgroup = $trunkprops['globalvar'];
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-              break;
-            default:
-          }
@@ -1874 +1912 @@
-        $ext->add($context, $exten, '', new ext_set('CHAN', '${CHANNEL:4}'));
-      }       
-      $ext->add($context, $exten, '', new ext_set('CHAN', '${CUT(CHAN,-,1)}'));
-zapt
+chann
-      // If nothing there, then treat it as a DID
-zapt
+chann
-      $ext->add($context, $exten, '', new ext_goto(1, '${DID}', 'from-pstn'));
-      $ext->add($context, 'fax', '', new ext_goto(1, 'in_fax', 'ext-fax'));
-
@@ -3041 +3079 @@
-  global $db;
-
-
-!ctype_digit(trim($channel)) || 
-be numeric and not
+
+not be
-    return false;
-  }
-  if (trim($did) == '') {
@@ -3050 +3088 @@
-    return false;
-  }
-
+  //permit non numeric channel names
+  if (!is_numeric($channel)) {
+    $tableinfo = $db->tableinfo('zapchandids');
+    if ($tableinfo[0]['type'] != 'string') {
+      $sql = "ALTER TABLE zapchandids CHANGE COLUMN channel channel VARCHAR(40)"; 
+      $results = $db->query($sql);
+      if (DB::IsError($results)) {die_freepbx($results->getMessage()."<br><br>".$sql);}
+    }
+  }
+
-  $description = q($description);
-  $channel     = q($channel);
-  $did         = q($did);
@@ -3070 +3118 @@
-function core_zapchandids_edit($description, $channel, $did) {
-  global $db;
-
+  //permit non numeric channel names
+  if (!is_numeric($channel)) {
+    $tableinfo = $db->tableinfo('zapchandids');
+    if ($tableinfo[0]['type'] != 'string') {
+      $sql = "ALTER TABLE zapchandids CHANGE COLUMN channel channel VARCHAR(40)"; 
+      $results = $db->query($sql);
+      if (DB::IsError($results)) {die_freepbx($results->getMessage()."<br><br>".$sql);}
+    }
+  }
+
-  $description = q($description);
-  $channel     = q($channel);
-  $did         = q($did);

old/module.xml

@@ -54 +54 @@
-    <users needsenginedb="yes" sort="-3">Users</users>
-    <devices needsenginedb="yes" sort="-4">Devices</devices>
-    <did category="Inbound Call Control" sort="-5">Inbound Routes</did>
-Zap 
+
-    <routing>Outbound Routes</routing>
-    <trunks>Trunks</trunks>
-    <general>General Settings</general>

old/page.zapchandids.php

@@ -71 +71 @@
-  $channel     = $row['channel'];
-  $did         = $row['did'];
-
-Zap 
+
-} else {
-Zap 
+
-}
-
-Zap Channel DIDs allow you to assign a DID to specific Zap Channels. You can supply the same DID to multiple channels. This would be a common scenario if you have multiple POTS lines that are on a hunt group from your provider. You MUST assign the channel's context to from-zaptel for these settings to have effect. It will be a line that looks like:<br /><br />context = from-zaptel<br /><br />in your zapata.conf configuration effecting the specified channel(s)
+Channel DIDs allow you to assign a DID to specific Channels. You can supply the same DID to multiple channels. This would be a common scenario if you have multiple POTS lines that are on a hunt group from your provider. For DAHDI/ZAP channels, you MUST assign the channel's context to from-zaptel for these settings to have effect. It will be a line that looks like:<br /><br />context = from-zaptel<br /><br />in your zapata.conf configuration effecting the specified channel(s). For sip trunk channels you MUST set the channel's context to from-trunk-sip-TRUNKNAME
-echo "<p>".$helptext."</p>\n";
-?>
-<form name="editZapchandid" action="<?php  $_SERVER['PHP_SELF'] ?>" method="post" onsubmit="return checkZapchandid(editZapchandid);">
@@ -89 +89 @@
-  if ($extdisplay == '') {
-?>
-  <tr>
-Zap Channel number
-5
+Channel
+40
-  </tr>
-<?php
-  }
@@ -100 +100 @@
-    <td><input size="40" type="text" name="description" value="<?php  echo $description; ?>" tabindex="<?php echo ++$tabindex;?>"></td>
-  </tr>
-  <tr>
-
+. For SIP channels you may use the magic string 'siptoheader' if you want the DID to be retrieved dynamically from the To: header of the SIP message.
-    <td><input size="40" type="text" name="did" value="<?php echo $did; ?>"  tabindex="<?php echo ++$tabindex;?>"/></td>
-  </tr>
-
@@ -120 +120 @@
-var actionDelete = false;
-
-function checkZapchandid(theForm) {
-be numeric and not
+not be
-  var msgInvalidDID = "<?php echo _('Invalid DID, must be a non-blank DID'); ?>";
-  var msgConfirmDIDNonStd = "<?php echo _('DID information is normally just an incoming telephone number.\n\nYou have entered a non standard DID pattern.\n\nAre you sure this is correct?'); ?>";
-  var msgConfirmConvertDID = "<?php echo _('You appear to be using a converted DID in the form of zapchanNN that was automatically generated during an upgrade. You should consider assigning the DID that is normally associated with this channel to take full advantage of the inbound routing abilities. Changing the DID here will require you to make changes in the Inbound Routes tab. Do you want to continue?'); ?>";
@@ -134 +134 @@
-  // form validation
-
-  defaultEmptyOK = false;
-!isInteger
+isEmpty
-    return warnInvalid(theForm.channel, msgInvalidChannel);
-  }
-  if (isEmpty(theForm.did.value)) {