Changeset 12961

Timestamp:

11/15/11 08:07:36 (2 years ago)

Author:

mbrevda

Message:

re #5451 - abstract app_meetme to transparently support app_meetme OR app_confbridge

Files:

• modules/branches/2.10/conferences/functions.inc.php (modified) (2 diffs)
• modules/branches/2.10/conferences/install.php (modified) (1 diff)
• modules/branches/2.10/conferences/page.conferences.php (modified) (7 diffs)
• modules/branches/2.10/paging/agi-bin/page.agi (modified) (1 diff)
• modules/branches/2.10/paging/functions.inc.php (modified) (4 diffs)
• modules/branches/2.10/paging/module.xml (modified) (1 diff)
• modules/branches/2.10/paging/page.paging.php (modified) (3 diffs)

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

@@ -84 +84 @@
-*/
-function conferences_get_config($engine) {
-
-
-
-
-
+
-  
-  $ast_ge_162 = version_compare($version, '1.6.2', 'ge');
-  // Default to conference meetme
-  $confapp = 'ext_meetme';
-  if ($ast_ge_162 && $amp_conf['AMPENGINE'] == 'asterisk' && isset($astman) && $astman->connected()) {
-    //check for meetme application and fallback to confbridge if possible
-    $app = $astman->send_request('Command', array('Command' => 'module show like meetme'));
-    if (preg_match('/[1-9] modules loaded/', $app['data'])){
-      $confapp='ext_meetme';
-    } else {
-      $app = $astman->send_request('Command', array('Command' => 'module show like confbridge'));
-      if (preg_match('/[1-9] modules loaded/', $app['data'])){        
-        $confapp='ext_confbridge';
-      }
-    }
-  }
-  
-  switch($engine) {
@@ -122 +104 @@
-        $ext->add($contextname, 'STARTMEETME', '', new ext_setvar('GROUP(meetme)','${MEETME_ROOMNUM}'));
-        $ext->add($contextname, 'STARTMEETME', '', new ext_gotoif('$[${MAX_PARTICIPANTS} > 0 && ${GROUP_COUNT(${MEETME_ROOMNUM}@meetme)}>${MAX_PARTICIPANTS}]','MEETMEFULL,1'));
-
-
-
-
-
+
+
-        $ext->add($contextname, 'STARTMEETME', '', new ext_hangup(''));
-

modules/branches/2.10/conferences/install.php

@@ -115 +115 @@
-  out(_("already present"));
-}
+
+
-?>

modules/branches/2.10/conferences/page.conferences.php

@@ -80 +80 @@
-  $astver =  $engineinfo['version'];
-}
-$ast_ge_162 = version_compare($astver, '1.6.2', 'ge');
-// Default to conference meetme
-$confapp = 'ext_meetme';
-if ($ast_ge_162 && $amp_conf['AMPENGINE'] == 'asterisk' && isset($astman) && $astman->connected()) {
-      //check for meetme application and fallback to confbridge if possible
-  $app = $astman->send_request('Command', array('Command' => 'module show like meetme'));
-      if (preg_match('/[1-9] modules loaded/', $app['data'])){
-    $confapp='ext_meetme';
-  } else {
-    $app = $astman->send_request('Command', array('Command' => 'module show like confbridge'));
-    if (preg_match('/[1-9] modules loaded/', $app['data'])){        $confapp='ext_confbridge';
-    }
-  }
-}
-
-//get meetme rooms
@@ -232 +218 @@
-$engineinfo = engine_getinfo();
-$astver =  $engineinfo['version'];
-
-
-
-
-
-
-
-
+
-?>
-  <tr>
@@ -273 +252 @@
-  </tr>
-<?php
-
-
+
+
+
+
-  <tr>
-    <td><a href="#" class="info"><?php echo _("Quiet Mode:")?><span><?php echo _("Quiet mode (do not play enter/leave sounds)")?></span></a></td>
@@ -300 +281 @@
-  </tr>
-  <?php
-
-
-
-
-
+
-  ?>
-  <tr>
@@ -318 +295 @@
-    </td>
-  </tr>
-
+
+
+
-  <tr>
-    <td><a href="#" class="info"><?php echo _("Music on Hold:")?><span><?php echo _("Enable Music On Hold when the conference has a single caller")?></span></a></td>
@@ -370 +349 @@
-  </tr>
-  <?php
-
-
-
-
-
+
-  ?>
-  <tr>
@@ -388 +363 @@
-    </td>
-  </tr>
-
+
+
+
-  <?php //Begin Maximum Participants Code ?>
-  <tr>

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

@@ -29 +29 @@
-              'Async'     => 'true',
-              'Set'     => 'AMPUSER=' . $vars['AMPUSER'],
-'meetme'
+($amp_conf['ASTCONFAPP'] == 'meetme' ? 'meetme' : 'confbridge')
-              'Data'      => $vars['meetmeopts']
-              ));

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

@@ -423 +423 @@
-        
-        //if page group it in use, got to busy
-
+busy-check
-          new ext_gotoif('$[${TRYLOCK(apppaging'. $grp .')}]', '', 'busy'));
-        
@@ -432 +432 @@
-        $ext->add($apppaging, $grp, '', new ext_answer(''));
-        $ext->add($apppaging, $grp, '', new ext_set('PAGE_CONF', '${EPOCH}${RAND(100,999)}'));
+        $page_opts = $amp_conf['ASTCONFAPP'] == 'app_meetme' ? '1doqsx' : '1qs';
-        $ext->add($apppaging, $grp, '', 
-'1doqsx'
+$page_opts
-        $ext->add($apppaging, $grp, 'agi', new ext_agi('page.agi,'
-                        . 'extensions=' . implode(':',$page_memebers) . ','
@@ -446 +447 @@
-        }*/         
-        unset($page_memebers);
-,doqwxC
+', 'doqwx
-        $ext->add($apppaging, $grp, '', new ext_hangup());
-        $ext->add($apppaging, $grp, 'busy', new ext_set('PAGE${PAGEGROUP}BUSY', 'TRUE'));
@@ -555 +556 @@
-  $sql = "SELECT * FROM paging_config WHERE page_group='$grp'";
-  $results = $db->getRow($sql, DB_FETCHMODE_ASSOC);
-
-$results = null
+!$results || 
+return false
-  }
-  $sql = "SELECT * FROM admin WHERE variable='default_page_grp' AND value='$grp'";

modules/branches/2.10/paging/module.xml

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

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

@@ -114 +114 @@
-    }
-
-type=${type}&
+
-    $tlabel = sprintf(_("Delete Group %s"),$xtn);
-    $label = '<span><img width="16" height="16" border="0" title="'.$tlabel.'" alt="" src="images/core_delete.png"/>&nbsp;'.$tlabel.'</span>';
@@ -252 +252 @@
-  echo "<div class='rnav'><ul>\n";
-  echo "<li><a id='".($extdisplay==''?'current':'std')."' ";
-type=${type}&amp;
+
-  //get the list of paging groups
-  $presults = paging_list();
@@ -264 +264 @@
-      $hl = $group == $default_grp ? _(' [DEFAULT]') : '';
-      echo "<li><a class=\"".($extdisplay==$group ? 'current':'std');
-type=${type}&amp;
+
-      echo "${display}&amp;extdisplay=${group}&amp;action=modify\">";
-      echo $group." ".((trim($grouparr['description']) != '')?htmlspecialchars($grouparr['description']):_("Page Group"))."$hl</a></li>";