Changeset 12982

Timestamp:

11/30/11 03:35:47 (1 year ago)

Author:

p_lindheimer

Message:

move most of static vars out of local channel, do checks for busy and self in agi, simplify page modes, other cleanup, still not done but works and checking in so changes are not lost

Files:

• modules/branches/2.10/paging/agi-bin/page.agi (modified) (3 diffs)
• modules/branches/2.10/paging/functions.inc.php (modified) (6 diffs)

modules/branches/2.10/paging/agi-bin/page.agi

@@ -9 +9 @@
-
-$get = array(
+    'ALERTINFO',
+    'CALLINFO',
+    'SIPURI',
+    'VXML_URL',
+    'DOPTIONS',
+    'DTIME',
-    'AMPUSER',
-    'PAGE_CONF',
-    'PAGE_CONF_OPTS',
-    'PAGE_MEMBERS',
+    'PAGEMODE',
-    'STREAM'
-);
@@ -20 +27 @@
-}
-
-$vars['PAGE_MEMBERS'] = unserialize(base64_decode($vars['PAGE_MEMBERS']));
-$vars['STREAM'] = $vars['STREAM'] ? $vars['STREAM'] : 'beep';
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-/* TODO: run through the list here first and check for:
- *       extension -- current device doing the page and yank them out if so
- *       if not force page -- check if target extension (or is it device) is busy if so pull out of list
- *       future - check if each specific extension needs modifications to auto-answer channel variables
- *                so the conditional assignments can be skipped
- *
- *       extension will have to be changed to the raw extension and more intelligence added to here to
- *       properly accomodated the above, and then changes to the auto-answer macro, etc.
- */
-
-
-
+
+
+
+
+
+
+
-    continue;
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  $astman->Originate(array(
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-}
-
+//TODO: is PAGE_CONF_OPTS correct for both meetme and conf_bridge?
+//
-$beep = array(
-    'Channel'   => 'Local/s@app-page-stream',
-    'CallerID'    => 'Playback Stream',
-    'Async'     => 'true',
-
-
-
-
+
-    'Application' => 'Playback',
-    'Data'      => $vars['STREAM']
-);
-
+//
-$astman->Originate($beep);
-
@@ -102 +166 @@
-  return '';
-}
+
+function __pad_string($string) {
+  return str_replace(array('\\',',','='),array('\\\\','\\,','\\='),$string);
+}
-?>

modules/branches/2.10/paging/functions.inc.php

@@ -11 +11 @@
-
-function paging_get_config($engine) {
-
+
+
+
+
+
-  switch($engine) {
-    case "asterisk":
@@ -35 +39 @@
-      $callinfo  = 'Call-Info: <uri>\;answer-after=0';
-      $sipuri    = 'intercom=true';
-$doptions = '';//
+//$doptions = 
-      $vxml_url = '';
-      $dtime = '5';
@@ -324 +328 @@
-      //auto answer stuff
-      //set autoanswer variables
-
+
+
+
+
+
+
+
+
+
-      if (isset($alertinfo) && trim($alertinfo) != "") {
-        $ext->add($apppaging, '_AUTOASWER.', '', new ext_setvar
+ $ext->add($apppaging, 'ssetup', '', new ext_set
-      }
-      
-      if (isset($callinfo) && trim($callinfo) != "") {
-        $ext->add($apppaging, '_AUTOASWER.', '', new ext_setvar
+ $ext->add($apppaging, 'ssetup', '', new ext_set
-      }
-      if (isset($sipuri) && trim($sipuri) != "") {
-        $ext->add($apppaging, '_AUTOASWER.', '', new ext_setvar
+ $ext->add($apppaging, 'ssetup', '', new ext_set
-      }
-      if (isset($vxml_url) && trim($vxml_url) != "") {
-        $ext->add($apppaging, '_AUTOASWER.', '', new ext_setvar
+ $ext->add($apppaging, 'ssetup', '', new ext_set
-      }
-      if (isset($doptions) && trim($doptions) != "") {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-      $ext->add($apppaging, "_PAGE.", 'SKIPCHECK', new ext_gosub('AUTOASWER${EXTEN:4},1'));
-      $ext->add($apppaging, "_PAGE.", '', new ext_dial('${DIAL}','${DTIME},${DOPTIONS}'));
-      $ext->add($apppaging, "_PAGE.", 'skipself', new ext_hangup());
-      $ext->add($apppaging, "_PAGE.", '', new ext_hangup(''), 'AVAIL',101);
-
-      // Try ChanSpy Version
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-      // Now get a list of all the paging groups...
-      $sql = "SELECT page_group, force_page, duplex FROM paging_config";
@@ -382 +376 @@
-      foreach ($paging_groups as $thisgroup) {
-        $grp=trim($thisgroup['page_group']);
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-        $sql = "SELECT ext FROM paging_groups WHERE page_number='$grp'";
-
-
-
+
+
-        // Create the paging context that is used in the paging application for each phone to auto-answer
-        //add ext-paging with goto's to our app-paging context and a hint for the page
-        $extpaging = 'ext-paging';
-ing
+egroups
-        $ext->addInclude('from-internal-noxfer-additional',$extpaging);
-        $ext->addHint($extpaging, $grp, 'Custom:PAGE' . $grp);
-
+ 
-        //app-page dialplan
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-        //set blf to in use
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-      }
-      //h
-
-
-
-
-
-
+
+
-      
-      //page playback
@@ -536 +519 @@
-  $results = $db->getAll($sql);
-  if(DB::IsError($results)) 
-null
+array()
-  foreach ($results as $val)
-    $tmparray[] = $val[0];
@@ -550 +533 @@
-  $sql = "SELECT * FROM paging_config WHERE page_group='$grp'";
-  $results = $db->getRow($sql, DB_FETCHMODE_ASSOC);
-!$results || 
-return false
+
+$results = null
-  }
-  $sql = "SELECT * FROM admin WHERE variable='default_page_grp' AND value='$grp'";