Changeset 10132

Show
Ignore:
Timestamp:
07/13/10 19:41:43 (3 years ago)
Author:
GameGamer43
Message:

closes #4417 - applies patch to mute everyone in the conference on join.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r9099 r10132  
    172172            // admin mode -- only valid if there is an admin pin 
    173173            if ($roomadminpin != '') { 
    174               $ext->add($contextname, $roomnum, 'ADMIN', new ext_setvar('MEETME_OPTS','aA'.$roomoptions)); 
     174              $ext->add($contextname, $roomnum, 'ADMIN', new ext_setvar('MEETME_OPTS','aA'.trim($roomoptions,'m')); 
    175175              if ($roomjoinmsg != '') {  // play joining message if one defined 
    176176                $ext->add($contextname, $roomnum, '', new ext_playback($roomjoinmsg)); 

  • modules/branches/2.9/conferences/page.conferences.php

    r9786 r10132  
    336336  <tr> 
    337337    <td><a href="#" class="info"><?php echo _("Maximum Participants:")?><span><?php echo _("Maximum Number of users allowed to join this conference.")?></span></a></td> 
    338     <td> 
    339       <select name="users" tabindex="<?php echo ++$tabindex;?>"> 
    340         <?php 
    341         $default = (($users) ? $users : 0); 
    342         echo '<option value="'.$i.'" '.($i == $default ? 'SELECTED' : '').'>'._("No Limit").'</option>'; 
    343         for ($i=2; $i <= 20; $i++) { 
    344           echo '<option value="'.$i.'" '.($i == $default ? 'SELECTED' : '').'>'.$i.'</option>'; 
    345         } 
    346         ?> 
    347       </select> 
    348     </td> 
    349   </tr> 
    350  
     338    <td> 
     339      <select name="users" tabindex="<?php echo ++$tabindex;?>"> 
     340      <?php 
     341      $default = (($users) ? $users : 0); 
     342      echo '<option value="'.$i.'" '.($i == $default ? 'SELECTED' : '').'>'._("No Limit").'</option>'; 
     343      for ($i=2; $i <= 20; $i++) { 
     344        echo '<option value="'.$i.'" '.($i == $default ? 'SELECTED' : '').'>'.$i.'</option>'; 
     345      } 
     346      ?> 
     347      </select> 
     348    </td> 
     349  </tr> 
     350  <tr> 
     351    <td><a href="#" class="info"><?php echo _("Mute on Join:")?><span><?php echo _("Mute everyone when they initially join the conference. Please note that if you do not have 'Leader Wait' set to yes you must have 'Allow Menu' set to Yes to unmute yourself")?></span></a></td> 
     352    <td> 
     353        <select name="opt#m" tabindex="<?php echo ++$tabindex;?>"> 
     354        <?php 
     355            $optselect = strpos($options, "m"); 
     356            echo '<option value=""' . ($optselect === false ? ' SELECTED' : '') . '>'._("No") . '</option>'; 
     357            echo '<option value="m"'. ($optselect !== false ? ' SELECTED' : '') . '>'._("Yes"). '</option>'; 
     358        ?> 
     359        </select> 
     360    </td> 
     361    </tr> 
    351362  </table> 
    352363<?php 
    …… 
    372383  var msgInvalidConfName = "<?php echo _('Please enter a valid Conference Name'); ?>"; 
    373384  var msgNeedAdminPIN = "<?php echo _('You must set an admin PIN for the Conference Leader when selecting the leader wait option'); ?>"; 
     385  var msgInvalidMuteOnJoin = "<?php echo _('You must set Allow Menu to Yes when not using a Leader or Admin in your conference, otherwise you will be unable to unmute yourself'); ?>"; 
    374386   
    375387  defaultEmptyOK = false; 
    …… 
    398410  if (theForm.options.value.indexOf("w") > -1 && theForm.adminpin.value == "") 
    399411    return warnInvalid(theForm.adminpin, msgNeedAdminPIN); 
    400      
     412   
     413  // should not have a conference with no 'leader', mute on join, and no allow menu, so let's complain 
     414  if ($('[name=opt#m]').val() != '' && !$('[name=opt#w]').val() && !$('[name=opt#s]').val()) 
     415    return warnInvalid(theForm.options, msgInvalidMuteOnJoin);   
     416 
    401417  return true; 
    402418}