Changeset 8785

Timestamp:

02/07/10 18:54:30 (2 years ago)

Author:

p_lindheimer

Message:

adds place to define penalties for dynamic agents and optionally restrict queue members to these agents, this code was mostly written by mbrevda (Moshe), I'm just checking it in for him. WARNING: NOT YET TESTED (comming soon). re #2085

Files:

• modules/branches/2.7/queues/functions.inc.php (modified) (8 diffs)
• modules/branches/2.7/queues/module.xml (modified) (2 diffs)
• modules/branches/2.7/queues/page.queues.php (modified) (5 diffs)

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

@@ -486 +486 @@
-      $ext->add($context, $exten, '', new ext_gotoif('$["${ARG3}" = "EXTEN" & ${DB_EXISTS(AMPUSER/${CALLBACKNUM}/cidname)} = 0]', 'invalid'));
-
+      // If this is a restricted dynamic agent queue then check to make sure they are allowed
+      //
+      $ext->add($context, $exten, '', new ext_gotoif('$["${DB(QPENALTY/${ARG1}/dynmemberonly)}" = "yes" & ${DB_EXISTS(QPENALTY/${ARG1}/agents/${CALLBACKNUM})} != 1]', 'invalid'));
+
-      $ext->add($context, $exten, '', new ext_execif('$["${QREGEX}" != ""]', 'GotoIf', '$["${REGEX("${QREGEX}" ${CALLBACKNUM})}" = "0"]?invalid'));
-      $ext->add($context, $exten, '', new ext_execif('$["${ARG2}" != ""]', 'Authenticate', '${ARG2}'));
@@ -491 +495 @@
-
-      if ($amp_conf['USEQUEUESTATE']) {
-0
-
+${DB(QPENALTY/${ARG1}/agents/${CALLBACKNUM})}
+,${DB(QPENALTY/${ARG1}/agents/${CALLBACKNUM})}
-      } else {
-
+,${DB(QPENALTY/${ARG1}/agents/${CALLBACKNUM})}
-      }
-      $ext->add($context, $exten, '', new ext_userevent('Agentlogin', 'Agent: ${CALLBACKNUM}'));
@@ -557 +561 @@
-}
-
-
- global $db
+, $dynmembers = '', $dynmemberonly = ''
+  global $db,$astman,$amp_conf
-
-  if (trim($account) == '') {
@@ -636 +640 @@
-          VALUES ('$extension', '$descr', '$grppre', '$alertinfo', '$joinannounce_id', '$ringing', '$agentannounce_id', '$maxwait', '$password', '$ivr_id', '$dest', '$cwignore', '$qregex', '$queuewait', '$use_queue_context')  ";
-  $results = sql($sql);
+
+  // store dynamic member data in astDB
+  if ($astman) {
+    foreach($dynmembers as $member){
+      $mem=explode(',',$member);
+      $astman->database_put('QPENALTY/'.$account.'/agents',$mem[0],$mem[1]);
+    }
+    $astman->database_put('QPENALTY/'.$account,'dynmemberonly',$dynmemberonly);
+  } else {
+    fatal("Cannot connect to Asterisk Manager with ".$amp_conf["AMPMGRUSER"]."/".$amp_conf["AMPMGRPASS"]);
+  }
+
-  return true;
-}
-
-function queues_del($account) {
-
+,$astman,$amp_conf
-  
-  $sql = "DELETE FROM queues_details WHERE id = '$account'";
@@ -652 +668 @@
-        die_freepbx($result->getMessage().$sql);
-    }
-
+
+
+
+
+
+
+
-}
-
@@ -773 +795 @@
-
-function queues_get($account, $queues_conf_only=false) {
-
+,$astman,$amp_conf
-  
-    if ($account == "")
@@ -855 +877 @@
-    }
-  }
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  return $results;
-}
@@ -929 +970 @@
-  $ext->add($id, $c, '', new ext_setvar('CALLBACKNUM','${AMPUSER}'));
-
+  $ext->add($id, $c, '', new ext_gotoif('$["${DB(QPENALTY/${QUEUENO}/dynmemberonly)}" = "yes" & ${DB_EXISTS(QPENALTY/${QUEUENO}/agents/${CALLBACKNUM})} != 1]', 'invalid'));
-  // I think that when using this it will always be a user, but just in case...
-  //
-  if ($amp_conf['USEQUEUESTATE']) {
-0
-
+${DB(QPENALTY/${QUEUENO}/agents/${CALLBACKNUM})}
+,${DB(QPENALTY/${QUEUENO}/agents/${CALLBACKNUM})}
-  } else {
-
+,${DB(QPENALTY/${QUEUENO}/agents/${CALLBACKNUM})}
-  }
-
-  $ext->add($id, $c, '', new ext_userevent('AgentLogin','Agent: ${CALLBACKNUM}'));
+  $ext->add($id, $c, '', new ext_macroexit());
+  $ext->add($id, $c, 'invalid', new ext_playback('pbx-invalid'));
-  $ext->add($id, $c, '', new ext_macroexit());
-}

modules/branches/2.7/queues/module.xml

@@ -11 +11 @@
-  </description>
-  <changelog>
+    *2.7.0beta1.1* #2085
-    *2.7.0beta1.0* #3594
-    *2.6.0.3* #3945,#3984
@@ -51 +52 @@
-  </depends>
-  <menuitems>
-
+ needsenginedb="yes"
-  </menuitems>
-  <location>release/2.7/queues-2.7.0beta1.0.tgz</location>

modules/branches/2.7/queues/page.queues.php

@@ -32 +32 @@
-$weight = isset($_REQUEST['weight'])?$_REQUEST['weight']:'0';
-$autofill = isset($_REQUEST['autofill'])?$_REQUEST['autofill']:'no';
-
+
-$use_queue_context = isset($_REQUEST['use_queue_context'])?$_REQUEST['use_queue_context']:'0';
-$exten_context = "from-queue";
@@ -88 +88 @@
-  // $members = array_values(array_unique($members));
-}
+
+if (isset($_REQUEST["dynmembers"])) {
+  $dynmembers=explode("\n",$_REQUEST["dynmembers"]);
+  if (!$dynmembers) {
+    $dynmembers = null;
+  }
+}
+
-
-// do if we are submitting a form
@@ -104 +112 @@
-          $conflict_url = framework_display_extension_usage_alert($usage_arr);
-        } else {
-
+,$dynmembers,$dynmemberonly
-          needreload();
-          redirect_standard();
@@ -116 +124 @@
-      case "edit":  //just delete and re-add
-        queues_del($account);
-
+,$dynmembers,$dynmemberonly
-        needreload();
-        redirect_standard('extdisplay');
@@ -257 +265 @@
-  ?>
-      </select>
+    </td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="#" class="info"><?php echo _('Dynamic Member Penalty') ?>:<span><br><?php echo _("Dynamic Members are extensions that can log in and out of the queue. When a member logges in to a queue, their penalty in the queue will be as specified here. Extensions included here will NOT be automaticlay logged in to the queue.") ?><br><br></span></a></td>
+    <td valign="top">
+      <textarea id="dynmembers" cols="15" rows="<?php  $rows = count($dynmembers)+1; echo (($rows < 5) ? 5 : (($rows > 20) ? 20 : $rows) ); ?>" name="dynmembers" tabindex="<?php echo ++$tabindex;?>"><?php echo $dynmembers; ?></textarea>
+    </td>
+  </tr>
+
+  <tr>
+    <td>
+    <a href=# class="info"><?php echo _("Extension Quick Pick")?>
+      <span>
+        <?php echo _("Choose an extension to append to the end of the dynamic memebers list above.")?>
+      </span>
+    </a>
+    </td>
+    <td>
+      <select onChange="insertExten('dyn');" id="dyninsexten" tabindex="<?php echo ++$tabindex;?>">
+        <option value=""><?php echo _("(pick extension)")?></option>
+  <?php
+        $results = core_users_list();
+        foreach ($results as $result) {
+          echo "<option value='".$result[0]."'>".$result[0]." (".$result[1].")</option>\n";
+        }
+  ?>
+      </select>
+    </td>
+  </tr>
+
+  <tr>
+    <td><a href="#" class="info"><?php echo _("Allow only these?")?><span><?php echo _('Restrict dynamic queue memeber logins to only thoes listed in previous option. When set to yes, members not listed will be DENIED ACCESS to the queue.')?></span></a></td>
+    <td><input type="radio" name="dynmemberonly" value="yes" <?php echo ($dynmemberonly=='yes'?'checked':'');?>><?php echo _('Yes')?><input type="radio" name="dynmemberonly" value="yes" <?php echo ($dynmemberonly!='yes'?'checked':'');?> ><?php echo _('No')?>
-    </td>
-  </tr>