Changeset 5949

Timestamp:

07/07/08 16:35:33 (4 years ago)

Author:

p_lindheimer

Message:

#2976 Add Optional Regex to filter user agent numbers that they can input

Files:

• modules/branches/2.5/queues/functions.inc.php (modified) (5 diffs)
• modules/branches/2.5/queues/install.php (modified) (1 diff)
• modules/branches/2.5/queues/module.xml (modified) (2 diffs)
• modules/branches/2.5/queues/page.queues.php (modified) (5 diffs)

modules/branches/2.5/queues/functions.inc.php

@@ -159 +159 @@
-          $grppre = (isset($q['prefix'])?$q['prefix']:'');
-          $alertinfo = (isset($q['alertinfo'])?$q['alertinfo']:'');
+
+          // Not sure why someone would ever have a ; in the regex, but since Asterisk has problems with them
+          // it would need to be escaped
+          //
+          $qregex = (isset($q['qregex'])?$q['qregex']:'');
+          str_replace(';','\;',$qregex);
-          
-          $ext->add('ext-queues', $exten, '', new ext_macro('user-callerid'));
@@ -227 +233 @@
-          
-          //dynamic agent login/logout
+          if (trim($qregex) != '') {
+            $ext->add('ext-queues', $exten."*", '', new ext_setvar('QREGEX', $qregex));
+          }
-          $ext->add('ext-queues', $exten."*", '', new ext_macro('agent-add',$exten.",".$q['password']));
-          $ext->add('ext-queues', $exten."**", '', new ext_macro('agent-del',$exten.",".$exten));
@@ -261 +270 @@
-}
-
-
+,$qregex=''
-  global $db;
-
@@ -324 +333 @@
-  $dest          = isset($goto) ? $goto:'';
-  $cwignore      = isset($cwignore) ? $cwignore:'0';
+  $qregex        = isset($qregex) ? addslashes($qregex):'';
-
-  // Assumes it has just been deleted
-
-
+, qregex
+, '$qregex'
-  $results = sql($sql);
-  return true;
@@ -524 +534 @@
-    $results['rtone']         = $config['ringing'];
-    $results['cwignore']      = $config['cwignore'];
+    $results['qregex']        = $config['qregex'];
-  }
-

modules/branches/2.5/queues/install.php

@@ -301 +301 @@
-  }
-
+
+
+
+  // Version 2.5 upgrade
+  outn(_("checking for qregex field.."));
+  $sql = "SELECT `qregex` FROM queues_config";
+  $check = $db->getRow($sql, DB_FETCHMODE_ASSOC);
+  if(DB::IsError($check)) {
+    // add new field
+    $sql = "ALTER TABLE queues_config ADD `qregex` VARCHAR( 255 ) NULL ;";
+    $result = $db->query($sql);
+    if(DB::IsError($result)) {
+      die_freepbx($result->getDebugInfo());
+    }
+    out(_("OK"));
+  } else {
+    out(_("already exists"));
+  }
+
-?>

modules/branches/2.5/queues/module.xml

@@ -2 +2 @@
-  <rawname>queues</rawname>
-  <name>Queues</name>
-4.0.8
+5.0.0
-  <type>setup</type>
-  <category>Inbound Call Control</category>
@@ -9 +9 @@
-  </description>
-  <changelog>
+    *2.5.0.0* #2976 Add Optional Regex to filter user agent numbers that they can input
-    *2.4.0.8* #2757 allow spaces and other alphanumeric characters in description
-    *2.4.0.7* #2604, #2707, #2843 fix mal-formed html tags, typo, Russian Translation, add oldstyle module hook

modules/branches/2.5/queues/page.queues.php

@@ -28 +28 @@
-$cwignore = isset($_REQUEST['cwignore'])?$_REQUEST['cwignore']:'0';
-$rtone = isset($_REQUEST['rtone'])?$_REQUEST['rtone']:'0';
+$qregex = isset($_REQUEST['qregex'])?$_REQUEST['qregex']:'';
-
-if (isset($_REQUEST['goto0']) && isset($_REQUEST[$_REQUEST['goto0']."0"])) {
@@ -97 +98 @@
-          $conflict_url = framework_display_extension_usage_alert($usage_arr);
-        } else {
-
+,$qregex
-          needreload();
-          redirect_standard();
@@ -109 +110 @@
-      case "edit":  //just delete and re-add
-        queues_del($account);
-
+,$qregex
-        needreload();
-        redirect_standard('extdisplay');
@@ -524 +525 @@
-      </select>
-    </td>
+  </tr>
+
+  <tr>
+    <td><a href="#" class="info"><?php echo _("Agent Regex Filter")?><span><?php echo _("Provides an optional regex expression that will be applied against the agent callback number. If the callback number does not pass the regex filter then it will be treated as invalid. This can be used to restrict agents to extensions within a range, not allow callbacks to include keys like *, or any other use that may be appropriate. An examle input might be:<br />^([2-4][0-9]{3})$<br />This would restrict agents to extensions 2000-4999. Or <br />^([0-9]+)$ would allow any number of any length, but restrict the * key.<br />WARNING: make sure you undertand what you are doing or otherwise leave this blank!")?></span></a></td>
+    <td><input type="text" name="qregex" value="<?php echo (isset($qregex) ? $qregex : ''); ?>"></td>
-  </tr>
-
@@ -705 +711 @@
-
-function checkQ(theForm) {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-