Changeset 7252

Show
Ignore:
Timestamp:
11/12/08 09:25:55 (4 years ago)
Author:
p_lindheimer
Message:

Merged revisions 7248 via svnmerge from
http://svn.freepbx.org/modules/branches/2.5

........

r7248 | p_lindheimer | 2008-11-12 07:05:29 -0800 (Wed, 12 Nov 2008) | 1 line


fixes #3392 can't edit or delete conference if numbered 0

........

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/branches/2.4

    • Property svnmerge-integrated changed from /modules/branches/2.3:1-5233,5245,5333,5336 /modules/branches/2.5:1-5852,5880,5930,5995,6016-6017,6030-6031,6142,6218,6291,6361,6363,6413-6414,6422,6428-6430,6442-6443,6557,6710,6714-6715,6969-6970,6984 to /modules/branches/2.3:1-5233,5245,5333,5336 /modules/branches/2.5:1-5852,5880,5930,5995,6016-6017,6030-6031,6142,6218,6291,6361,6363,6413-6414,6422,6428-6430,6442-6443,6557,6710,6714-6715,6969-6970,6984,7248

  • modules/branches/2.4/conferences/module.xml

    r6445 r7252  
    22  <rawname>conferences</rawname> 
    33  <name>Conferences</name> 
    4   <version>2.4.0.3</version> 
     4  <version>2.4.0.4</version> 
    55  <type>setup</type> 
    66  <category>Internal Options &amp; Configuration</category> 
    77  <description>Allow creation of conference rooms (meet-me) where multiple people can talk together.</description> 
    88  <changelog> 
     9    *2.4.0.4* #3392 can't delete or edit if numbered 0 
    910    *2.4.0.3* #3087 add hook to module code 
    1011    *2.4.0.2* #2604, #2843 fix mal-formed html tags, Russian Translation 

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

    r6423 r7252  
    7676  echo '<br><h3>'._("Conference").' '.$extdisplay.' '._("deleted").'!</h3><br><br><br><br><br><br><br><br>'; 
    7777} else { 
    78   if ($extdisplay){  
     78  if ($extdisplay != ""){  
    7979    //get details for this meetme 
    8080    $thisMeetme = conferences_get($extdisplay); 
    …… 
    8585  $delURL = $_SERVER['PHP_SELF'].'?'.$_SERVER['QUERY_STRING'].'&action=delete'; 
    8686?> 
    87 <?php   if ($extdisplay){ ?> 
     87<?php   if ($extdisplay != ""){ ?> 
    8888  <h2><?php echo _("Conference:")." ". $extdisplay; ?></h2> 
    8989  <a href="<?php echo $delURL ?>"><?php echo _("Delete Conference")?> <?php echo $extdisplay; ?></a><br /> 
    …… 
    109109  <input type="hidden" name="action" value="<?php echo ($extdisplay ? 'edit' : 'add') ?>"> 
    110110  <table> 
    111   <tr><td colspan="2"><h5><?php echo ($extdisplay ? _("Edit Conference") : _("Add Conference")) ?><hr></h5></td></tr> 
    112   <tr> 
    113 <?php   if ($extdisplay){ ?> 
     111  <tr><td colspan="2"><h5><?php echo ($extdisplay != "" ? _("Edit Conference") : _("Add Conference")) ?><hr></h5></td></tr> 
     112  <tr> 
     113<?php   if ($extdisplay != ""){ ?> 
    114114    <input type="hidden" name="account" value="<?php echo $extdisplay; ?>"> 
    115115<?php   } else { ?>