Changeset 9650 for modules

Timestamp:

05/18/10 19:37:15 (3 years ago)

Author:

p_lindheimer

Message:

closes #4280 checks for version ge 1.4.25 to use queue state information if USEQUEUESTATE is not set

Files:

• modules/branches/2.8/queues/functions.inc.php (modified) (11 diffs)

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

@@ -44 +44 @@
-    $ver12 = version_compare($ast_version, '1.4', 'lt');
-    $ver16 = version_compare($ast_version, '1.6', 'ge');
+    $ast_ge_14_25 = version_compare($ast_version,'1.4.25','ge');
-    
-    // legacy but in case someone was using this we will leave it
@@ -59 +60 @@
-    }
-
-mp_conf['USEQUEUEDEVICE']
+st_ge_14_25
-      $devices = array();
-      $device_results = core_devices_list('all','full',true);
@@ -71 +72 @@
-      }
-    }
-mp_conf['USEQUEUEDEVICE']
+st_ge_14_25
-      $users = array();
-      $user_results = core_users_list();
@@ -152 +153 @@
-          }
-        }
-mp_conf['USEQUEUEDEVICE']
+st_ge_14_25
-        foreach ($members as $member) {
-          preg_match("/^Local\/([\d]+)\@*/",$member,$matches);
@@ -200 +201 @@
-    return $output;
-  }
-
-
-
-}
-
@@ -298 +296 @@
-      $ast_ge_14 = version_compare($version,'1.4','ge');
-      $ast_ge_16 = version_compare($version,'1.6','ge');
+      $ast_ge_14_25 = version_compare($version,'1.4.25','ge');
-
-      $has_extension_state = $ast_ge_16;
@@ -522 +521 @@
-          $ext->add($from_queue_exten_only, $item[0], '', new ext_setvar('RingGroupMethod', 'none'));
-          $ext->add($from_queue_exten_only, $item[0], '', new ext_macro('record-enable',$item[0].",IN"));
-amp_conf['USEDIALONE'] && $
+
-            $ext->add($from_queue_exten_only, $item[0], '', new ext_macro('dial-one',',${DIAL_OPTIONS},'.$item[0]));
-          } else {
@@ -546 +545 @@
-      $ext->add($context, $exten, 'a5', new ext_set('CALLBACKNUM', '${IF($[${LEN(${AMPUSER})}=0]?${CALLERID(number)}:${AMPUSER})}'));
-
-mp_conf['USEQUEUEDEVICE']
+st_ge_14_25
-        $ext->add($context, $exten, '', new ext_set('THISDEVICE', '${DB(DEVICE/${REALCALLERIDNUM}/dial)}'));
-      }
@@ -567 +566 @@
-        $ext->add($context, $exten, '', new ext_execif('$[${DB_EXISTS(AMPUSER/${CALLBACKNUM}/cidname)} = 1]', 'AddQueueMember', '${ARG1},Local/${CALLBACKNUM}@from-queue/n,${DB(QPENALTY/${ARG1}/agents/${CALLBACKNUM})},,${DB(AMPUSER/${CALLBACKNUM}/cidname)},HINT:${CALLBACKNUM}@ext-local'));
-        $ext->add($context, $exten, '', new ext_execif('$[${DB_EXISTS(AMPUSER/${CALLBACKNUM}/cidname)} = 0]', 'AddQueueMember', '${ARG1},Local/${CALLBACKNUM}@from-queue/n,${DB(QPENALTY/${ARG1}/agents/${CALLBACKNUM})}'));
-mp_conf['USEQUEUEDEVICE']
+st_ge_14_25
-        $ext->add($context, $exten, '', new ext_set('THISDEVICE', '${IF($[${LEN(${THISDEVICE})}=0]?${DB(DEVICE/${CUT(DB(AMPUSER/${CALLBACKNUM}/device),&,1)}/dial)}:${THISDEVICE})}'));
-        $ext->add($context, $exten, '', new ext_execif('$[${LEN(${THISDEVICE})}!=0]', 'AddQueueMember', '${ARG1},Local/${CALLBACKNUM}@from-queue/n,${DB(QPENALTY/${ARG1}/agents/${CALLBACKNUM})},,${DB(AMPUSER/${CALLBACKNUM}/cidname)},${THISDEVICE}'));
@@ -1043 +1042 @@
-  global $ext;
-  global $amp_conf;
-
+
+
+
-  $id = "macro-toggle-add-agent"; // The context to be included
-
@@ -1055 +1056 @@
-  if ($amp_conf['USEQUEUESTATE']) {
-    $ext->add($id, $c, '', new ext_addqueuemember('${QUEUENO}','Local/${CALLBACKNUM}@from-queue/n,${DB(QPENALTY/${QUEUENO}/agents/${CALLBACKNUM})},,${DB(AMPUSER/${CALLBACKNUM}/cidname)},HINT:${CALLBACKNUM}@ext-local'));
-mp_conf['USEQUEUEDEVICE']
+st_ge_14_25
-    $ext->add($id, $c, '', new ext_addqueuemember('${QUEUENO}','Local/${CALLBACKNUM}@from-queue/n,${DB(QPENALTY/${QUEUENO}/agents/${CALLBACKNUM})},,${DB(AMPUSER/${CALLBACKNUM}/cidname)},${DB(DEVICE/${REALCALLERIDNUM}/dial)}'));
-  } else {