Changeset 8582

Timestamp:

01/10/10 17:39:29 (2 years ago)

Author:

p_lindheimer

Message:

re #1718 adds GUI and needed functionality in core to force CIDs out trunks blocked for foreign CIDS, only serverside validation no js yet so not closing

Files:

• modules/branches/2.7/core/functions.inc.php (modified) (1 diff)
• modules/branches/2.7/findmefollow/functions.inc.php (modified) (6 diffs)
• modules/branches/2.7/findmefollow/page.findmefollow.php (modified) (7 diffs)

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

@@ -2064 +2064 @@
-      $ext->add($context, $exten, 'bypass', new ext_set('EMERGENCYCID', '${DB(DEVICE/${REALCALLERIDNUM}/emergency_cid)}'));
-      $ext->add($context, $exten, '', new ext_set('TRUNKOUTCID', '${OUTCID_${ARG1}}'));
- $["${EMERGENCYROUTE:1:2}" = ""] | $["${EMERGENCYCID:1:2}" = ""] 
+"${EMERGENCYROUTE:1:2}" = "" | "${EMERGENCYCID:1:2}" = ""
-      $ext->add($context, $exten, '', new ext_set('CALLERID(all)', '${EMERGENCYCID}'));  // emergency cid for device
-      $ext->add($context, $exten, 'exit', new ext_macroexit());
-
-
-
-
-
+
+
+
+
+
+
+
-      if ($ast_lt_16) { 
-        $ext->add($context, $exten, 'hidecid', new ext_execif('$["${CALLERID(name)}"="hidden"]', 'SetCallerPres', 'prohib_passed_screen'));

modules/branches/2.7/findmefollow/functions.inc.php

@@ -192 +192 @@
-          changecid:
-            default   - works as always, same as if not present
-            did       - set to the DID that the call came in on or leave alone
-            fixed     - set to the fixedcid
-            extern    - set to the fixedcid if the call is from the outside only
+            did       - set to the DID that the call came in on or leave alone, treated as foreign
+            forcedid  - set to the DID that the call came in on or leave alone, not treated as foreign
-          
-          BLKVM_BASE - has the exten num called, hoaky if that goes away but for now use it
@@ -204 +205 @@
-
-          $exten = 's-fixed';
-
+
+
+
+
+
-          $ext->add($contextname, $exten, '', new ext_return(''));
-
@@ -211 +216 @@
-          $ext->add($contextname, $exten, '', new ext_return(''));
-
-extern
-DB(AMPUSER/${BLKVM_BASE}/followme/fixedcid)})}" == "1" & "${FROM_DID}" != ""]', 'Set', '__REALCALLERIDNUM=${DB(AMPUSER/${BLKVM_BASE}/followme/fixedcid)
+forcedid
+FROM_DID})}" = "1"]', 'Set', '__TRUNKCIDOVERRIDE=${FROM_DID
-          $ext->add($contextname, $exten, '', new ext_return(''));
-
@@ -225 +230 @@
-}
-
-
+,$changecid='default',$fixedcid=''
-  global $amp_conf;
-  global $astman;
@@ -245 +250 @@
-    $ddialvalue = ($ddial == 'CHECKED')?'EXTENSION':'DIRECT';
-    $astman->database_put("AMPUSER",$grpnum."/followme/ddial",$ddialvalue);
+
+    $astman->database_put("AMPUSER",$grpnum."/followme/changecid",$changecid);
+    $fixedcid = preg_replace("/[^0-9\+]/" ,"", trim($fixedcid));
+    $astman->database_put("AMPUSER",$grpnum."/followme/fixedcid",$fixedcid);
-  } else {
-    fatal("Cannot connect to Asterisk Manager with ".$amp_conf["AMPMGRUSER"]."/".$amp_conf["AMPMGRPASS"]);
@@ -348 +357 @@
-      $astdb_grplist = $astman->database_get("AMPUSER",$grpnum."/followme/grplist");
-      $astdb_grpconf = $astman->database_get("AMPUSER",$grpnum."/followme/grpconf");
+
+      $astdb_changecid = strtolower($astman->database_get("AMPUSER",$grpnum."/followme/changecid"));
+      switch($astdb_changecid) {
+        case 'default':
+        case 'did':
+        case 'forcedid':
+        case 'fixed':
+        case 'extern':
+          break;
+        default:
+          $astdb_changecid = 'default';
+      }
+      $results['changecid'] = $astdb_changecid;
+      $fixedcid = $astman->database_get("AMPUSER",$grpnum."/followme/fixedcid");
+      $results['fixedcid'] = preg_replace("/[^0-9\+]/" ,"", trim($fixedcid));
-    } else {
-      fatal("Cannot connect to Asterisk Manager with ".$amp_conf["AMPMGRUSER"]."/".$amp_conf["AMPMGRPASS"]);

modules/branches/2.7/findmefollow/page.findmefollow.php

@@ -31 +31 @@
-isset($_REQUEST['pre_ring'])?$pre_ring = $_REQUEST['pre_ring']:$pre_ring='0';
-isset($_REQUEST['ddial'])?$ddial = $_REQUEST['ddial']:$ddial='';
+isset($_REQUEST['changecid'])?$changecid = $_REQUEST['changecid']:$changecid='default';
+isset($_REQUEST['fixedcid'])?$fixedcid = $_REQUEST['fixedcid']:$fixedcid='';
-
-
@@ -73 +75 @@
-    //add group
-    if ($action == 'addGRP') {
-
+,$changecid,$fixedcid
-
-      needreload();
@@ -89 +91 @@
-    if ($action == 'edtGRP') {
-      findmefollow_del($account); 
-
+,$changecid,$fixedcid
-
-      needreload();
@@ -129 +131 @@
-
-    $thisgrp = findmefollow_get($extdisplay, 1);
+    freepbx_debug($thisgrp);
-    $grpliststr = isset($thisgrp['grplist']) ? $thisgrp['grplist'] : '';
-    $grplist = explode("-", $grpliststr);
@@ -143 +146 @@
-    $pre_ring    = isset($thisgrp['pre_ring'])    ? $thisgrp['pre_ring']    : '';
-    $ddial       = isset($thisgrp['ddial'])       ? $thisgrp['ddial']       : '';
+    $changecid   = isset($thisgrp['changecid'])   ? $thisgrp['changecid']   : 'default';
+    $fixedcid    = isset($thisgrp['fixedcid'])    ? $thisgrp['fixedcid']    : '';
-    $goto = isset($thisgrp['postdest'])?$thisgrp['postdest']:((isset($thisgrp['voicemail']) && $thisgrp['voicemail'] != 'novm')?"ext-local,vmu$extdisplay,1":'');
-    unset($grpliststr);
@@ -345 +350 @@
-      </tr>
-
+      <tr><td colspan="2"><h5><?php echo _("Call Confirmation Configuration") ?><hr></h5></td></tr>
+
-      <tr>
-        <td><a href="#" class="info"><?php echo _("Confirm Calls")?><span><?php echo _('Enable this if you\'re calling external numbers that need confirmation - eg, a mobile phone may go to voicemail which will pick up the call. Enabling this requires the remote side push 1 on their phone before the call is put through. This feature only works with the ringall/ringall-prim  ring strategy')?></span></a>:</td>
@@ -388 +395 @@
-      </tr>
-<?php } ?>
+
+      <tr><td colspan="2"><h5><?php echo _("Change External CID Configuration") ?><hr></h5></td></tr>
+      <tr>
+        <td>
+        <a href="#" class="info"><?php echo _("Mode")?>
+        <span>
+          <b><?php echo _("Default")?></b>:  <?php echo _("Transmits the Callers CID if allowed by the trunk.")?><br>
+          <b><?php echo _("Fixed CID Value")?></b>:  <?php echo _("Always transmit the Fixed CID Value below.")?><br>
+          <b><?php echo _("Outside Calls Fixed CID Value")?></b>: <?php echo _("Transmit the Fixed CID Value below on calls that come in from outside only. Internal extension to extension calls will continue to operate in default mode.")?><br>
+          <b><?php echo _("Use Dialed Number")?></b>: <?php echo _("Transmit the number that was dialed as the CID for calls coming from outside. Internal extension to extension calls will continue to operate in default mode. There must be a DID on the inbound route for this. This will be BLOCKED on trunks that block foreign callerid")?><br>
+          <b><?php echo _("Force Dialed Number")?></b>: <?php echo _("Transmit the number that was dialed as the CID for calls coming from outside. Internal extension to extension calls will continue to operate in default mode. There must be a DID on the inbound route for this. This WILL be transmitred on trunks that block foreign callerid")?><br>
+        </span>
+        </a>
+        </td>
+        <td>
+          <select name="changecid" tabindex="<?php echo ++$tabindex;?>">
+          <?php
+            $default = (isset($changecid) ? $changecid : 'default');
+            echo '<option value="default" '.($default == 'default' ? 'SELECTED' : '').'>'._("Default");
+            echo '<option value="fixed" '.($default == 'fixed' ? 'SELECTED' : '').'>'._("Fixed CID Value");
+            echo '<option value="extern" '.($default == 'extern' ? 'SELECTED' : '').'>'._("Outside Calls Fixed CID Value");
+            echo '<option value="did" '.($default == 'did' ? 'SELECTED' : '').'>'._("Used Dialed Number");
+            echo '<option value="forcedid" '.($default == 'forcedid' ? 'SELECTED' : '').'>'._("Force Dialed Number");
+          ?>    
+          </select>
+        </td>
+      </tr>
+
+      <tr>
+        <td><a href="#" class="info"><?php echo _("Fixed CID Value")?>:<span><?php echo _('Fixed value to replace the CID with used with some of the modes above. Should be in a format of digits only with an option of E164 format using a leading "+".')?></span></a></td>
+        <td><input size="18" type="text" name="fixedcid" value="<?php  echo $fixedcid ?>" tabindex="<?php echo ++$tabindex;?>"></td>
+      </tr>
-      
-      <tr><td colspan="2"><br><h5><?php echo _("Destination if no answer")?>:<hr></h5></td></tr>