Changeset 10133 for modules

Show
Ignore:
Timestamp:
07/13/10 20:31:34 (3 years ago)
Author:
GameGamer43
Message:

re #4417 - don't use trim as it's possible our option can be in the middle, also fixes jQuery so we don't get the pop-up just because we aren't using leader wait

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r10132 r10133  
    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'.trim($roomoptions,'m')); 
     174              $ext->add($contextname, $roomnum, 'ADMIN', new ext_setvar('MEETME_OPTS','aA'.str_replace('m','',$roomoptions))); 
    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

    r10132 r10133  
    412412   
    413413  // 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()) 
     414  if ($('[name=opt#m]').val() != '' && $('[name=adminpin]').val() == '' && !$('[name=opt#s]').val()) 
    415415    return warnInvalid(theForm.options, msgInvalidMuteOnJoin);   
    416416