Changeset 10152

Timestamp:

07/14/10 23:46:58 (3 years ago)

Author:

GameGamer43

Message:

closes #4213 - thanks ip-rob for adding support for app-confbridge

Files:

• modules/branches/2.9/conferences/functions.inc.php (modified) (2 diffs)
• modules/branches/2.9/conferences/page.conferences.php (modified) (6 diffs)

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

@@ -88 +88 @@
-  global $version;
-  global $amp_conf;
+  global $astman;
+  
+  if ($astver === null) {
+    $engineinfo = engine_getinfo();
+    $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';
+      }
+    }
+  }
+  
-  switch($engine) {
-    case "asterisk":
@@ -98 +120 @@
-        $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.9/conferences/page.conferences.php

@@ -52 +52 @@
-      redirect_standard('extdisplay');
-    break;
+  }
+}
+
+//Check to see if conference application is only confbridge
+global $amp_conf;
+global $astman;
+if ($astver === null) {
+  $engineinfo = engine_getinfo();
+  $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';
+    }
-  }
-}
@@ -197 +219 @@
-$engineinfo = engine_getinfo();
-$astver =  $engineinfo['version'];
-
+
+
+
+
+
+
+
+
-?>
-  <tr>
@@ -257 +286 @@
-    </td>
-  </tr>
+  <?php
+    //If the application is confbridge remove options that aren't supported
+    if ($confapp=='ext_confbridge') {
+      str_replace("i","",$options);
+    }
+    if ($confapp=='ext_meetme') {
+  ?>
-  <tr>
-    <td><a href="#" class="info"><?php echo _("User join/leave:")?><span><?php echo _("Announce user join/leave")?></span></a></td>
@@ -269 +305 @@
-    </td>
-  </tr>
+  <?php } ?>
-  <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>
@@ -319 +356 @@
-    </td>
-  </tr>
-
+
+
+
+
+
+
+
-  <tr>
-    <td><a href="#" class="info"><?php echo _("Record Conference:")?><span><?php echo _("Record the conference call")?></span></a></td>
@@ -332 +375 @@
-    </td>
-  </tr>
-
+
-  <?php //Begin Maximum Participants Code ?>
-  <tr>