Changeset 4178 for modules/branches/2.3/core
- Timestamp:
- 06/23/07 17:30:40 (6 years ago)
- Files:
-
- modules/branches/2.3/core/functions.inc.php (modified) (2 diffs)
- modules/branches/2.3/core/page.did.php (modified) (5 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
modules/branches/2.3/core/functions.inc.php
r4175 r4178 495 495 /* begin page.did.php functions */ 496 496 497 function core_did_list(){ 498 $sql = "SELECT * FROM incoming ORDER BY extension,cidnum"; 497 function core_did_list($order='extension'){ 498 switch ($order) { 499 case 'description': 500 $sql = "SELECT * FROM incoming ORDER BY description,extension,cidnum"; 501 break; 502 case 'extension': 503 default: 504 $sql = "SELECT * FROM incoming ORDER BY extension,cidnum"; 505 } 499 506 return sql($sql,"getAll",DB_FETCHMODE_ASSOC); 500 507 } … … 565 572 if (empty($existing) && empty($existing_directdid)) { 566 573 $destination=${$goto0.'0'}; 567 $sql="INSERT INTO incoming (cidnum,extension,destination,faxexten,faxemail,answer,wait,privacyman,alertinfo, channel, ringing, mohclass ) values ('$cidnum','$extension','$destination','$faxexten','$faxemail','$answer','$wait','$privacyman','$alertinfo', '$channel', '$ringing', '$mohclass')";574 $sql="INSERT INTO incoming (cidnum,extension,destination,faxexten,faxemail,answer,wait,privacyman,alertinfo, channel, ringing, mohclass, description) values ('$cidnum','$extension','$destination','$faxexten','$faxemail','$answer','$wait','$privacyman','$alertinfo', '$channel', '$ringing', '$mohclass', '$description')"; 568 575 sql($sql); 569 576 return true; modules/branches/2.3/core/page.did.php
r4169 r4178 18 18 $goto = isset($_REQUEST['goto0'])?$_REQUEST['goto0']:''; 19 19 $ringing = isset($_REQUEST['ringing'])?$_REQUEST['ringing']:''; 20 $description = isset($_REQUEST['description'])?$_REQUEST['description']:''; 20 21 21 22 //update db if submiting form … … 53 54 <?php 54 55 //get unique incoming routes 55 $inroutes = core_did_list( );56 $inroutes = core_did_list('description'); 56 57 if (isset($inroutes)) { 57 58 foreach ($inroutes as $inroute) { … … 59 60 $displaycid = ( empty($inroute['cidnum'])? _("any CID") : $inroute['cidnum'] ); 60 61 $zapchan = ( strlen($inroute['channel'])? "Zaptel Channel {$inroute['channel']}" : "" ); 62 $desc = ( empty($inroute['description'])? "" : $inroute['description']."<br />" ); 61 63 if ($zapchan != "") 62 echo "\t<li><a ".($extdisplay==$inroute['extension']."/".$inroute['cidnum']."/".$inroute['channel'] ? 'class="current"':'')." href=\"config.php?display=".urlencode($dispnum)."&extdisplay=".urlencode($inroute['extension'])."/".urlencode($inroute['cidnum'])."/".urlencode($inroute['channel'])."\">{$ zapchan} </a></li>\n";64 echo "\t<li><a ".($extdisplay==$inroute['extension']."/".$inroute['cidnum']."/".$inroute['channel'] ? 'class="current"':'')." href=\"config.php?display=".urlencode($dispnum)."&extdisplay=".urlencode($inroute['extension'])."/".urlencode($inroute['cidnum'])."/".urlencode($inroute['channel'])."\">{$desc} {$zapchan} </a></li>\n"; 63 65 else 64 echo "\t<li><a ".($extdisplay==$inroute['extension']."/".$inroute['cidnum']."/".$inroute['channel'] ? 'class="current"':'')." href=\"config.php?display=".urlencode($dispnum)."&extdisplay=".urlencode($inroute['extension'])."/".urlencode($inroute['cidnum'])."/".urlencode($inroute['channel'])."\">{$d isplaydid} / {$displaycid} {$zapchan} </a></li>\n";66 echo "\t<li><a ".($extdisplay==$inroute['extension']."/".$inroute['cidnum']."/".$inroute['channel'] ? 'class="current"':'')." href=\"config.php?display=".urlencode($dispnum)."&extdisplay=".urlencode($inroute['extension'])."/".urlencode($inroute['cidnum'])."/".urlencode($inroute['channel'])."\">{$desc} {$displaydid} / {$displaycid} </a></li>\n"; 65 67 } 66 68 } … … 83 85 if (is_array($ininfo)) extract($ininfo); 84 86 ?> 85 <h2><?php echo _("Route")?>: <?php echo $extdisplay; ?></h2>86 <p><a href="<?php echo $delURL ?>"><?php echo _("Delete Route")?> <?php echo $extdisplay ?></a></p>87 <h2><?php echo _("Route")?>: <?php echo !empty($description)?$description:$extdisplay; ?></h2> 88 <p><a href="<?php echo $delURL ?>"><?php echo _("Delete Route")?> <?php echo !empty($description)?$description:$extdisplay ?></a></p> 87 89 <?php } else { ?> 88 90 <h2><?php echo _("Add Incoming Route")?></h2> … … 94 96 <table> 95 97 <tr><td colspan="2"><h5><?php echo ($extdisplay ? _('Edit Incoming Route') : _('Add Incoming Route')) ?><hr></h5></td></tr> 98 <tr> 99 <td><a href="#" class="info"><?php echo _("Description")?><span><?php echo _('Provide a meaningful description of what this incoming route is')?></span></a>:</td> 100 <td><input type="text" name="description" value="<?php echo htmlspecialchars(isset($description)?$description:''); ?>"></td> 101 </tr> 96 102 <tr> 97 103 <td><a href="#" class="info"><?php echo _("DID Number")?><span><?php echo _('Define the expected DID Number if your trunk passes DID on incoming calls. <br><br>Leave this blank to match calls with any or no DID info.<br><br>You can also use a pattern match (eg _2[345]X) to match a range of numbers')?></span></a>:</td>
