Changeset 12942

Timestamp:

11/09/11 13:27:55 (2 years ago)

Author:

mbrevda

Message:

closes #5443 - paging improvements, revert some accidental checkins. Bugs/more features in NEW tickets please

Files:

• modules/branches/2.10/backup/page.backup.php (modified) (1 diff)
• modules/branches/2.10/package.php (modified) (11 diffs)
• modules/branches/2.10/paging/agi-bin (added)
• modules/branches/2.10/paging/agi-bin/page.agi (added)
• modules/branches/2.10/paging/functions.inc.php (modified) (6 diffs)
• modules/branches/2.10/paging/module.xml (modified) (1 diff)
• modules/branches/2.10/paging/page.paging.php (modified) (1 diff)

modules/branches/2.10/backup/page.backup.php

@@ -62 +62 @@
-    }
-
-
+$amp_conf['buffering_callback']
-    header('Content-Type: text/event-stream');
-    header('Cache-Control: no-cache');

modules/branches/2.10/package.php

@@ -90 +90 @@
-foreach ($vars['modules'] as $mod) {
-  $mod    = trim($mod, '/');
-
+
+
-  $exclude[]  = '.*';
-  $files    =
@@ -102 +103 @@
-  
-  echo 'Packaging ' . $mod . '...' . PHP_EOL;
-
-
+_dir
+_dir
-    continue;
-  }
-
+_dir
-  
-  //test xml file and get some of its values
@@ -124 +125 @@
-  
-  //include module specifc hook, if present
-
-
+_dir
+_dir
-    
-    //test include so that includes can return false and prevent further execution if it fail
-
-
+_dir
+_dir
-        . $mod . ' wont be built' . PHP_EOL;
-        continue;
@@ -157 +158 @@
-  
-  //check php files for syntax errors
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-      }
-    }
-
-
-
-
+
-  }
-  
-  //check in any out standing files
-
-
+_dir
+_dir
-  }
-  
@@ -190 +190 @@
-  //tell tar to change directoires (-C) to one level above
-  $tar_dir_path   = explode('/', trim($tar_dir, '/'));
-
+_dir
-  $tar_dir_path   = (is_array($tar_dir_path) && (count($tar_dir_path) > 1)) 
-          ? ' -C /' . implode('/', $tar_dir_path) : '';
@@ -196 +196 @@
-  
-  //update md5 sum
-
+_dir
-  if(file_exists($filename)) {
-    $md5 = md5_file($filename);
@@ -209 +209 @@
-  }
-
-
+_dir
-
-  
@@ -222 +222 @@
-  
-  //set latpublished property
-
-
+_dir
+_dir
-  
-  //check in new tarball and module.xml
-
+_dir
-          . ' -m"Module package script: ' . $rawname . ' ' . $ver . '"');
-          
-  //cleanup any remaining files
-/*
+
-    if (file_exists($f)) {
-
-
-*/
-cessful
+//
+
+
+sessfu
-  
-}
@@ -311 +311 @@
-//test xml file for validity and extract some info from it
-function check_xml($mod, $xml) {
+  global $mod_dir;
-  //check the xml script integrity
-
+_dir
-  $xml_loaded_contents = simplexml_load_string($xml_contents);
-  if($xml_loaded_contents === FALSE) { 
-
+_dir
-    return array(false, false);
-  }
@@ -321 +322 @@
-  //check that module name is set in module.xml
-  if (!preg_match('/<rawname>(.*?)<\/rawname>/', $xml, $rawname)) {
-
+_dir
-    $rawname = false;
-  } else {
@@ -329 +330 @@
-  //check that module version is set in module.xml
-  if (!preg_match('/<version>(.*?)<\/version>/', $xml, $version)) {
-
+_dir
-    $ver = false;
-  } else {

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

@@ -38 +38 @@
-      $callinfo  = 'Call-Info: <uri>\;answer-after=0';
-      $sipuri    = 'intercom=true';
-
+//
-      $vxml_url = '';
-      $dtime = '5';
@@ -73 +73 @@
-      }
-
-extpaging = 'ext
+apppaging = 'app
-      if (!empty($intercom_code)) {
-        $code = '_'.$intercom_code.'.';
@@ -130 +130 @@
-        $ext->add($context, $code, '', new ext_macro('hangupcall'));
-        if (!$ast_ge_14) {
-
-  
-  
+   
+
+
-        }
-        $ext->add($context, $code, 'pagemode', new ext_setvar('ITER', '1'));
-        $ext->add($context, $code, '', new ext_setvar('DIALSTR', ''));
-ext
+app
-        $ext->add($context, $code, '', new ext_setvar('ITER', '$[${ITER} + 1]'));
-        $ext->add($context, $code, '', new ext_gotoif('$[${ITER} <= ${LOOPCNT}]', 'begin'));
@@ -142 +142 @@
-        $ext->add($context, $code, '', new ext_setvar('_AMPUSER', '${AMPUSER}'));
-        $ext->add($context, $code, '', new ext_page('${DIALSTR},d'));
-
+   
-        $ext->add($context, $code, '', new ext_busy());
-        $ext->add($context, $code, '', new ext_macro('hangupcall'));
-
-        $ext->add($context, $code, 'nointercom', new ext_noop('Intercom disallowed by ${dialnumber}'));
-
+   
-        $ext->add($context, $code, '', new ext_playback('intercom&for&extension'));
-        $ext->add($context, $code, '', new ext_saydigits('${dialnumber}'));
@@ -324 +324 @@
-        $ext->add($macro, "s", 'macro2', new ext_macro('${ANSWERMACRO}','${ARG1}'), 'n',2);
-      }
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-      // Normal page version
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-      // Try ChanSpy Version
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-      // Force page version
-
-
-
-
-
-
+
+
+
+
+
-      // Now get a list of all the paging groups...
-      $sql = "SELECT page_group, force_page, duplex FROM paging_config";
@@ -394 +401 @@
-        $all_exts = $db->getAll($sql);
-        $dialstr='';
+        
+        // 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';
+        $ext->add($extpaging, $grp, '', new ext_goto($apppaging . ',' . $grp . ',1'));
+        $ext->addInclude('from-internal-noxfer-additional',$extpaging);
+        $ext->addHint($extpaging, $grp, 'Custom:PAGE' . $grp);
+        
+        //app-page dialplan
-        foreach($all_exts as $local_dial) {
-          if (strtoupper(substr($local_dial[0],-1)) == "X") {
-            $local_dial[0] = rtrim($local_dial[0],"xX");
-          }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-      
-    break;

modules/branches/2.10/paging/module.xml

@@ -3 +3 @@
-  <repo>standard</repo>
-  <name>Paging and Intercom</name>
-0
+1
-  <publisher>FreePBX</publisher>
-  <license>GPLv2+</license>
-  <category>Applications</category>
-  <changelog>
+    *2.10.0.1* #729
-    *2.10.0.0* new version changes
-    *2.9.0.5* #5000

modules/branches/2.10/paging/page.paging.php

@@ -171 +171 @@
-  </td></tr>
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  <td>
-  <span class="radioset">
-      <input id="force_page_no" type="radio" name="force_page" value="0" <?php echo $force_page == 0 ? "checked=\"yes\"":""?>/>
-No
+Skip
-      <input id="force_page_yes" type="radio" name="force_page" value="1" <?php echo $force_page == 1 ? "checked=\"yes\"":""?>/>
-Yes
+Force
-      <input id="force_page_whisper" type="radio" name="force_page" value="2" <?php echo $force_page == 2 ? "checked=\"yes\"":""?>/>
-      <label for="force_page_whisper"><?php echo _("Whisper") ?></label>