Changeset 7331

Show
Ignore:
Timestamp:
12/22/08 16:06:08 (4 years ago)
Author:
p_lindheimer
Message:

fixes #3451 use of empty() function on did/cid treats 0 as empty

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/branches/2.5/core/functions.inc.php

    r7272 r7331  
    903903          $context = ($pricid) ? "ext-did-0001":"ext-did-0002"; 
    904904 
    905           $exten = (empty($exten)?"s":$exten); 
    906           $exten = $exten.(empty($cidnum)?"":"/".$cidnum); //if a CID num is defined, add it 
     905          $exten = (($exten == "")?"s":$exten); 
     906          $exten = $exten.(($cidnum == "")?"":"/".$cidnum); //if a CID num is defined, add it 
    907907 
    908908          if ($cidroute) { 

  • modules/branches/2.5/core/page.did.php

    r7272 r7331  
    111111if (isset($inroutes)) { 
    112112  foreach ($inroutes as $inroute) { 
    113     $displaydid = ( empty($inroute['extension'])? _("any DID") : $inroute['extension'] ); 
    114     $displaycid = ( empty($inroute['cidnum'])? _("any CID") : $inroute['cidnum'] ); 
     113    $displaydid = ( (trim($inroute['extension']) == "") ? _("any DID") : $inroute['extension'] ); 
     114    $displaycid = ( (trim($inroute['cidnum']) == "") ? _("any CID") : $inroute['cidnum'] ); 
    115115    $desc = ( empty($inroute['description'])? "" : $inroute['description']."<br />" ); 
    116116    echo "\t<li><a ".($extdisplay==$inroute['extension']."/".$inroute['cidnum'] ? 'class="current"':'')." href=\"config.php?display=".urlencode($dispnum)."&amp;didfilter=$didfilter&amp;extdisplay=".urlencode($inroute['extension'])."/".urlencode($inroute['cidnum'])."\">{$desc} {$displaydid} / {$displaycid} </a></li>\n";