Changeset 8839

Timestamp:

02/16/10 23:36:28 (2 years ago)

Author:

p_lindheimer

Message:

closes #4050 add external CID manipulation re #1718 in followme, initial check-in not yet tested

Files:

• modules/branches/2.7/ringgroups/functions.inc.php (modified) (6 diffs)
• modules/branches/2.7/ringgroups/module.xml (modified) (2 diffs)
• modules/branches/2.7/ringgroups/page.ringgroups.php (modified) (7 diffs)

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

@@ -118 +118 @@
-          $ext->add($contextname, $grpnum, 'skipov', new ext_setvar('RRNODEST', '${NODEST}'));
-          $ext->add($contextname, $grpnum, 'skipvmblk', new ext_setvar('__NODEST', '${EXTEN}'));
+
+          $ext->add($contextname, $grpnum, '', new ext_gosubif('$[${DB_EXISTS(RINGGROUP/'.$grpnum.'/changecid)} = 1 & "${DB(RINGGROUP/'.$grpnum.'/changecid)}" != "default" & "${DB(RINGGROUP/'.$grpnum.'/changecid)}" != ""]', 'sub-rgsetcid,s,1'));
-          
-          // deal with group CID prefix
@@ -196 +198 @@
-          $ext->add($contextname, $grpnum, 'nodest', new ext_noop('SKIPPING DEST, CALL CAME FROM Q/RG: ${RRNODEST}'));
-        }
+        /*
+          ASTDB Settings:
+          RINGGROUP/nnn/changecid default | did | fixed | extern
+          RINGGROUP/nnn/fixedcid XXXXXXXX
+
+          changecid:
+            default   - works as always, same as if not present
+            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
+        */
+        if (count($ringlist)) {
+          $contextname = 'sub-rgsetcid';
+          $exten = 's';
+          $ext->add($contextname, $exten, '', new ext_goto('1','s-${DB(RINGGROUP/${BLKVM_BASE}/changecid)}'));
+
+          $exten = 's-fixed';
+          $ext->add($contextname, $exten, '', new ext_execif('$["${REGEX("^[\+]?[0-9]+$" ${DB(RINGGROUP/${BLKVM_BASE}/fixedcid)})}" = "1"]', 'Set', '__TRUNKCIDOVERRIDE=${DB(RINGGROUP/${BLKVM_BASE}/fixedcid)}'));
+          $ext->add($contextname, $exten, '', new ext_return(''));
+
+          $exten = 's-extern';
+          $ext->add($contextname, $exten, '', new ext_execif('$["${REGEX("^[\+]?[0-9]+$" ${DB(RINGGROUP/${BLKVM_BASE}/fixedcid)})}" == "1" & "${FROM_DID}" != ""]', 'Set', '__TRUNKCIDOVERRIDE=${DB(RINGGROUP/${BLKVM_BASE}/fixedcid)}'));
+          $ext->add($contextname, $exten, '', new ext_return(''));
+
+          $exten = 's-did';
+          $ext->add($contextname, $exten, '', new ext_execif('$["${REGEX("^[\+]?[0-9]+$" ${FROM_DID})}" = "1"]', 'Set', '__REALCALLERIDNUM=${FROM_DID}'));
+          $ext->add($contextname, $exten, '', new ext_return(''));
+
+          $exten = 's-forcedid';
+          $ext->add($contextname, $exten, '', new ext_execif('$["${REGEX("^[\+]?[0-9]+$" ${FROM_DID})}" = "1"]', 'Set', '__TRUNKCIDOVERRIDE=${FROM_DID}'));
+          $ext->add($contextname, $exten, '', new ext_return(''));
+
+          $exten = '_s-.';
+          $ext->add($contextname, $exten, '', new ext_noop('Unknown value for RINGGROUP/${BLKVM_BASE}/changecid of ${DB(RINGGROUP/${BLKVM_BASE}/changecid)} set to "default"'));
+          $ext->add($contextname, $exten, '', new ext_setvar('DB(RINGGROUP/${BLKVM_BASE}/changecid)', 'default'));
+          $ext->add($contextname, $exten, '', new ext_return(''));
+        }
-      }
-    break;
@@ -201 +243 @@
-}
-
-
+,$changecid='default',$fixedcid=''
-  global $db;
-
@@ -217 +259 @@
-  $sql = "INSERT INTO ringgroups (grpnum, strategy, grptime, grppre, grplist, annmsg_id, postdest, description, alertinfo, needsconf, remotealert_id, toolate_id, ringing, cwignore, cfignore) VALUES ('".$db->escapeSimple($grpnum)."', '".$db->escapeSimple($strategy)."', ".$db->escapeSimple($grptime).", '".$db->escapeSimple($grppre)."', '".$db->escapeSimple($grplist)."', '".$annmsg_id."', '".$db->escapeSimple($postdest)."', '".$db->escapeSimple($desc)."', '".$db->escapeSimple($alertinfo)."', '$needsconf', '$remotealert_id', '$toolate_id', '$ringing', '$cwignore', '$cfignore')";
-  $results = sql($sql);
+
+  // from followme, put these in astdb, should migrate more settings to astdb from sql so that user portal control can be
+  // added. So consider this a start.
+  if ($astman) {
+    $astman->database_put("RINGGROUP",$grpnum."/changecid",$changecid);
+    $fixedcid = preg_replace("/[^0-9\+]/" ,"", trim($fixedcid));
+    $astman->database_put("RINGGROUP",$grpnum."/fixedcid",$fixedcid);
+  } else {
+    fatal("Cannot connect to Asterisk Manager with ".$amp_conf["AMPMGRUSER"]."/".$amp_conf["AMPMGRPASS"]);
+  }
-  return true;
-}
@@ -224 +276 @@
-
-  $results = sql("DELETE FROM ringgroups WHERE grpnum = '".$db->escapeSimple($grpnum)."'","query");
+  if ($astman) {
+    $astman->database_deltree("RINGGROUP/".$grpnum);
+  } else {
+    fatal("Cannot connect to Asterisk Manager with ".$amp_conf["AMPMGRUSER"]."/".$amp_conf["AMPMGRPASS"]);
+  }
-}
-
@@ -296 +353 @@
-
-  $results = sql("SELECT grpnum, strategy, grptime, grppre, grplist, annmsg_id, postdest, description, alertinfo, needsconf, remotealert_id, toolate_id, ringing, cwignore, cfignore FROM ringgroups WHERE grpnum = '".$db->escapeSimple($grpnum)."'","getRow",DB_FETCHMODE_ASSOC);
+  if ($astman) {
+    $astdb_changecid = strtolower($astman->database_get("RINGGROUP",$grpnum."/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("RINGGROUP",$grpnum."/fixedcid");
+    $results['fixedcid'] = preg_replace("/[^0-9\+]/" ,"", trim($fixedcid));
+  } else {
+    fatal("Cannot connect to Asterisk Manager with ".$amp_conf["AMPMGRUSER"]."/".$amp_conf["AMPMGRPASS"]);
+  }
-  return $results;
-}

modules/branches/2.7/ringgroups/module.xml

@@ -2 +2 @@
-  <rawname>ringgroups</rawname>
-  <name>Ring Groups</name>
-6.0.1
+7.0.0
-  <publisher>FreePBX</publisher>
-  <license>GPLv2+</license>
@@ -11 +11 @@
-  </description>
-  <changelog>
+    *2.7.0.0* #4050
-    *2.6.0.1* #3610
-    *2.6.0.0* #3697

modules/branches/2.7/ringgroups/page.ringgroups.php

@@ -31 +31 @@
-isset($_REQUEST['ringing'])?$ringing = $_REQUEST['ringing']:$ringing='';
-
+isset($_REQUEST['changecid'])?$changecid = $_REQUEST['changecid']:$changecid='default';
+isset($_REQUEST['fixedcid'])?$fixedcid = $_REQUEST['fixedcid']:$fixedcid='';
+
-if (isset($_REQUEST['goto0']) && isset($_REQUEST[$_REQUEST['goto0']."0"])) {
-        $goto = $_REQUEST[$_REQUEST['goto0']."0"];
@@ -77 +80 @@
-        $conflict_url = framework_display_extension_usage_alert($usage_arr);
-
-
+,$changecid,$fixedcid
-        needreload();
-        redirect_standard();
@@ -93 +96 @@
-    if ($action == 'edtGRP') {
-      ringgroups_del($account); 
-
+,$changecid,$fixedcid
-      needreload();
-      redirect_standard('extdisplay');
@@ -139 +142 @@
-    $toolate_id = $thisgrp['toolate_id'];
-    $ringing = $thisgrp['ringing'];
+    $changecid   = isset($thisgrp['changecid'])   ? $thisgrp['changecid']   : 'default';
+    $fixedcid    = isset($thisgrp['fixedcid'])    ? $thisgrp['fixedcid']    : '';
-    unset($grpliststr);
-    unset($thisgrp);
@@ -390 +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 transmitted on trunks that block foreign callerid")?><br>
+        </span>
+        </a>
+        </td>
+        <td>
+          <select name="changecid" id="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' : '').'>'._("Use Dialed Number");
+            echo '<option value="forcedid" '.($default == 'forcedid' ? 'SELECTED' : '').'>'._("Force Dialed Number");
+            $fixedcid_disabled = ($default != 'fixed' && $default != 'extern') ? 'disabled = "disabled"':'';
+          ?>    
+          </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="30" type="text" name="fixedcid" id="fixedcid" value="<?php  echo $fixedcid ?>" tabindex="<?php echo ++$tabindex;?>" <?php echo $fixedcid_disabled ?>></td>
+      </tr>
+      
-<?php
-      // implementation of module hook
@@ -416 +454 @@
-<script language="javascript">
-<!--
+
+$(document).ready(function(){
+  $("#changecid").change(function(){
+    state = (this.value == "fixed" || this.value == "extern") ? "" : "disabled";
+    $("#fixedcid").attr("disabled",state);
+  });
+});
-
-function insertExten() {
@@ -455 +500 @@
-    return warnInvalid(theForm.grplist, msgInvalidExtList);
-
+  if (!theForm.fixedcid.disabled) {
+    fixedcid = $.trim(theForm.fixedcid.value);
+    if (!fixedcid.match('^[+]{0,1}[0-9]+$')) {
+      return warnInvalid(theForm.fixedcid, msgInvalidCID);
+    }
+  }
+
-  defaultEmptyOK = false;
-  if (!isInteger(theForm.grptime.value)) {