Changeset 6550
- Timestamp:
- 09/03/08 15:31:27 (3 months ago)
- Files:
-
- modules/branches/2.5/core/functions.inc.php (modified) (1 diff)
- modules/branches/2.5/findmefollow/page.findmefollow.php (modified) (7 diffs)
- modules/branches/2.5/voicemail/functions.inc.php (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
modules/branches/2.5/core/functions.inc.php
r6540 r6550 4136 4136 4137 4137 // Ensure variables possibly extracted later exist 4138 $name = $outboundcid = $record_in = $record_out = $sipname = $cid_masquerade = null;4138 $name = $outboundcid = $record_in = $record_out = $sipname = $cid_masquerade = $newdid_name = $newdid = $newdidcid = null; 4139 4139 4140 4140 // Init vars from $_REQUEST[] modules/branches/2.5/findmefollow/page.findmefollow.php
r6302 r6550 118 118 <?php 119 119 120 if ( !$extdisplay) {120 if ($extdisplay == "") { 121 121 echo '<br><h2>'._("Follow Me").'</h2><br><h3>'._('Choose a user/extension:').'</h3><br><br><br><br><br><br><br>'; 122 122 } … … 124 124 echo '<br><h3>'._("Follow Me").' '.$account.' '._("deleted").'!</h3><br><br><br><br><br><br><br><br>'; 125 125 } else { 126 if ($extdisplay ) {126 if ($extdisplay != "") { 127 127 // We need to populate grplist with the existing extension list. 128 $thisgrp = findmefollow_get(ltrim($extdisplay,'GRP-'), 1); 128 $extdisplay = ltrim($extdisplay,'GRP-'); 129 130 $thisgrp = findmefollow_get($extdisplay, 1); 129 131 $grpliststr = isset($thisgrp['grplist']) ? $thisgrp['grplist'] : ''; 130 132 $grplist = explode("-", $grpliststr); … … 133 135 $grppre = isset($thisgrp['grppre']) ? $thisgrp['grppre'] : ''; 134 136 $grptime = isset($thisgrp['grptime']) ? $thisgrp['grptime'] : ''; 135 $goto = isset($thisgrp['postdest']) ? $thisgrp['postdest'] : '';137 $goto = isset($thisgrp['postdest']) ? $thisgrp['postdest'] : "ext-local,vmu$extdisplay,1"; 136 138 $annmsg_id = isset($thisgrp['annmsg_id']) ? $thisgrp['annmsg_id'] : ''; 137 139 $dring = isset($thisgrp['dring']) ? $thisgrp['dring'] : ''; … … 148 150 <form name=delete action=\"{$_SERVER['PHP_SELF']}\" method=POST> 149 151 <input type=\"hidden\" name=\"display\" value=\"{$dispnum}\"> 150 <input type=\"hidden\" name=\"account\" value=\" ".ltrim($extdisplay,'GRP-')."\">152 <input type=\"hidden\" name=\"account\" value=\"{$extdisplay}\"> 151 153 <input type=\"hidden\" name=\"action\" value=\"delGRP\"> 152 154 <input type=submit value=\""._("Delete Entries")."\"> 153 155 </form>"; 154 156 155 echo "<h2>"._("Follow Me").": ". ltrim($extdisplay,'GRP-')."</h2>";157 echo "<h2>"._("Follow Me").": ".$extdisplay."</h2>"; 156 158 157 159 … … 159 161 // 160 162 if (isset($amp_conf["AMPEXTENSIONS"]) && ($amp_conf["AMPEXTENSIONS"] == "deviceanduser")) { 161 $editURL = $_SERVER['PHP_SELF'].'?display=users&extdisplay='. ltrim($extdisplay,'GRP-');163 $editURL = $_SERVER['PHP_SELF'].'?display=users&extdisplay='.$extdisplay; 162 164 $EXTorUSER = _("User"); 163 165 } 164 166 else { 165 $editURL = $_SERVER['PHP_SELF'].'?display=extensions&extdisplay='. ltrim($extdisplay,'GRP-');167 $editURL = $_SERVER['PHP_SELF'].'?display=extensions&extdisplay='.$extdisplay; 166 168 $EXTorUSER = _("Extension"); 167 169 } 168 170 169 $label = '<span><img width="16" height="16" border="0" title="'.sprintf(_("Edit %s"),$EXTorUSER).'" alt="" src="images/user_edit.png"/> '.sprintf(_("Edit %s %s"),$EXTorUSER, ltrim($extdisplay,'GRP-')).'</span>';171 $label = '<span><img width="16" height="16" border="0" title="'.sprintf(_("Edit %s"),$EXTorUSER).'" alt="" src="images/user_edit.png"/> '.sprintf(_("Edit %s %s"),$EXTorUSER, $extdisplay).'</span>'; 170 172 echo "<p><a href=".$editURL.">".$label."</a></p>"; 171 173 echo "<p>".$delButton."</p>"; … … 174 176 <form name="editGRP" action="<?php $_SERVER['PHP_SELF'] ?>" method="post" onsubmit="return checkGRP(editGRP);"> 175 177 <input type="hidden" name="display" value="<?php echo $dispnum?>"> 176 <input type="hidden" name="action" value="<?php echo ( $extdisplay? 'edtGRP' : 'addGRP'); ?>">178 <input type="hidden" name="action" value="<?php echo (($extdisplay != "") ? 'edtGRP' : 'addGRP'); ?>"> 177 179 <table> 178 <tr><td colspan="2"><h5><?php echo ( $extdisplay? _("Edit Follow Me") : _("Add Follow Me")) ?><hr></h5></td></tr>180 <tr><td colspan="2"><h5><?php echo (($extdisplay != "") ? _("Edit Follow Me") : _("Add Follow Me")) ?><hr></h5></td></tr> 179 181 <tr> 180 182 <?php 181 if ($extdisplay ) {182 183 ?> 184 <input size="5" type="hidden" name="account" value="<?php echo ltrim($extdisplay,'GRP-'); ?>">183 if ($extdisplay != "") { 184 185 ?> 186 <input size="5" type="hidden" name="account" value="<?php echo $extdisplay; ?>"> 185 187 <?php } else { ?> 186 188 <td><a href="#" class="info"><?php echo _("group number")?>:<span><?php echo _("The number users will dial to ring extensions in this ring group")?></span></a></td> … … 255 257 $rows = count($grplist)+1; 256 258 if ($rows <= 2 && trim($grplist[0]) == "") { 257 $grplist[0] = ltrim($extdisplay,'GRP-');259 $grplist[0] = $extdisplay; 258 260 } 259 261 ($rows < 5) ? 5 : (($rows > 20) ? 20 : $rows); modules/branches/2.5/voicemail/functions.inc.php
r6449 r6550 520 520 521 521 $follow_me_disabled = !$vmxobj->hasFollowMe(); 522 if (!$follow_me_disable ) {522 if (!$follow_me_disabled) { 523 523 $vmx_option_1_system_default_text_box_options = $dval; 524 524 if ($vmxobj->isFollowMe()) { … … 531 531 $vmx_option_1_system_default = ''; 532 532 } 533 } else { 534 $vmx_option_1_number_text_box_options = $dval; 533 535 } 534 536 … … 547 549 $tabindex = guielement::gettabindex(); 548 550 $tabindex_text = "tabindex='$tabindex'"; 549 $set_vmx_text .=551 $set_vmx_text = 550 552 " 551 553 <tr>
