Ticket #3331: conferences.patch

functions.inc.php

@@ -95 +95 @@
-        
-        // Start the conference
-        $ext->add($contextname, 'STARTMEETME', '', new ext_execif('$["${MEETME_MUSIC}" != ""]','SetMusicOnHold','${MEETME_MUSIC}'));
+        $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_meetme('${MEETME_ROOMNUM}','${MEETME_OPTS}','${PIN}'));
-        $ext->add($contextname, 'STARTMEETME', '', new ext_hangup(''));
-        
@@ -115 +117 @@
-          }
-          $roomuserpin = $room['userpin'];
-          $roomadminpin = $room['adminpin'];
+          $roomusers = $room['users'];
-          if(isset($room['music']) && $room['music'] !='' && $room['music']!='inherit') {
-            $music = $room['music'];
-          } else {
@@ -133 +136 @@
-          // entry point
-          $ext->add($contextname, $roomnum, '', new ext_macro('user-callerid'));
-          $ext->add($contextname, $roomnum, '', new ext_setvar('MEETME_ROOMNUM',$roomnum));
+                  //set our maximum number of users
+                  $ext->add($contextname, $roomnum, '', new ext_setvar('MAX_PARTICIPANTS', $roomusers));
-          $ext->add($contextname, $roomnum, '', new ext_setvar('MEETME_MUSIC',$music));
-          if (strstr($room['options'],'r') !== false) {
-            $ext->add($contextname, $roomnum, '', new ext_setvar('MEETME_RECORDINGFILE','${ASTSPOOLDIR}/monitor/meetme-conf-rec-${MEETME_ROOMNUM}-${UNIQUEID}'));
-          }
-   
+
-          $ext->add($contextname, $roomnum, '', new ext_answer(''));
-          $ext->add($contextname, $roomnum, '', new ext_wait(1));
-          
@@ -177 +182 @@
-            $ext->add($contextname, $roomnum, '', new ext_playback($roomjoinmsg));
-          }
-          $ext->add($contextname, $roomnum, '', new ext_goto('STARTMEETME,1'));
+
+          //meetme full
+          $ext->add($contextname, 'MEETMEFULL', '', new ext_playback('im-sorry&conf-full&goodbye'));
+          $ext->add($contextname, 'MEETMEFULL', '', new ext_hangup(''));
+
-          
-          // add meetme config
-          $conferences_conf->addMeetme($room['exten'],$room['userpin']);
@@ -228 +238 @@
-function conferences_get($account){
-  global $db;
-  //get all the variables for the meetme
-
+,users
-  return $results;
-}
-
@@ -237 +247 @@
-  $results = sql("DELETE FROM meetme WHERE exten = '".$db->escapeSimple($account)."'","query");
-}
-
-
+,$users
-  global $active_modules;
-  global $db;
-  $account    = $db->escapeSimple($account);
@@ -247 +257 @@
-  $options    = $db->escapeSimple($options);
-  $joinmsg_id = $db->escapeSimple($joinmsg_id);
-  $music      = $db->escapeSimple($music);
-
+
+
-}
-?>

page.conferences.php

@@ -20 +20 @@
-
-$account = isset($_REQUEST['account']) ? $_REQUEST['account'] : '';
-$music = isset($_REQUEST['music']) ? $_REQUEST['music'] : '';
+$users = isset($_REQUEST['users']) ? $_REQUEST['users'] : '';
-
-//check if the extension is within range for this user
-if (isset($account) && !checkRange($account)){
@@ -34 +35 @@
-      $usage_arr = framework_check_extension_usage($account);
-      if (!empty($usage_arr)) {
-        $conflict_url = framework_display_extension_usage_alert($usage_arr);
-
+,$users
-        needreload();
-        redirect_standard();
-      }
@@ -46 +47 @@
-    break;
-    case "edit":  //just delete and re-add
-      conferences_del($account);
-
+,$users
-      needreload();
-      redirect_standard('extdisplay');
-    break;
@@ -88 +89 @@
-    $description = $thisMeetme['description'];
-    $joinmsg_id  = $thisMeetme['joinmsg_id'];
-    $music       = $thisMeetme['music'];
+    $users        = $thisMeetme['users'];
-  } else {
-    $options     = "";
-    $userpin     = "";
@@ -95 +97 @@
-    $description = "";
-    $joinmsg_id  = "";
-    $music       = "";
+    $users        = "";
-  }
-
-?>
@@ -329 +332 @@
-    </td>
-  </tr>
-
+  <?php //Begin Maximum Participants Code ?>
+  <tr>
+                <td><a href="#" class="info"><?php echo _("Maximum Participants:")?><span><?php echo _("Maximum Number of users allowed to join this conference.")?></span></a></td>
+                <td>
+                        <select name="users" tabindex="<?php echo ++$tabindex;?>">
+                        <?php
+                                $default = (($users) ? $users : 0);
+        for ($i=0; $i <= 20; $i++) {
+                                  echo '<option value="'.$i.'" '.($i == $default ? 'SELECTED' : '').'>'.$i.'</option>';
+                            }
+                        ?>
+                 </select>
+          </td>
+         </tr>
+
-  </table>
-<?php
-  // implementation of module hook

install.php

@@ -23 +23 @@
-  `adminpin` VARCHAR( 50 ) , 
-  `description` VARCHAR( 50 ) , 
-  `joinmsg_id` INTEGER, 
-
+
+
-)
-";
-$check = $db->query($sql);
@@ -108 +109 @@
-} else {
-  out(_("already migrated"));
-}
+//Migration for User Count
+outn(_("Checking if users field present.."));
+$sql = "SELECT users FROM meetme";
+$check = $db->getRow($sql, DB_FETCHMODE_ASSOC);
+if(DB::IsError($check)) {
+  outn(_("adding users field.."));
+  $sql = "ALTER TABLE meetme ADD users TINYINT DEFAULT 0";
+  $result = $db->query($sql);
+  if(DB::IsError($result)) {
+    out(_("fatal error"));
+    die_freepbx($result->getDebugInfo()); 
+  } else {
+    out(_("ok"));
+  }
+} else {
+  out(_("already present"));
+}
-?>