Changeset 4658

Show
Ignore:
Timestamp:
08/02/07 15:00:01 (1 year ago)
Author:
p_lindheimer
Message:

#2151 fix trunk ordering when more than 9 trunks used, and some unitialized vars

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • freepbx/branches/2.2/amp_conf/htdocs/admin/modules/core/functions.inc.php

    r4387 r4658  
    22292229function core_routing_getroutetrunks($route) { 
    22302230        global $db; 
    2231         $sql = "SELECT DISTINCT args FROM extensions WHERE context = 'outrt-".$route."' AND (args LIKE 'dialout-trunk,%' OR args LIKE 'dialout-enum,%') ORDER BY priority "; 
     2231        $sql = "SELECT DISTINCT args FROM extensions WHERE context = 'outrt-".$route."' AND (args LIKE 'dialout-trunk,%' OR args LIKE 'dialout-enum,%') ORDER BY CAST(priority as UNSIGNED) "; 
    22322232        $results = $db->getAll($sql); 
    22332233        if(DB::IsError($results)) { 
    …… 
    22562256function core_routing_getroutepassword($route) { 
    22572257        global $db; 
    2258         $sql = "SELECT DISTINCT args FROM extensions WHERE context = 'outrt-".$route."' AND (args LIKE 'dialout-trunk,%' OR args LIKE 'dialout-enum,%') ORDER BY priority "; 
     2258        $sql = "SELECT DISTINCT args FROM extensions WHERE context = 'outrt-".$route."' AND (args LIKE 'dialout-trunk,%' OR args LIKE 'dialout-enum,%') ORDER BY CAST(priority as UNSIGNED) "; 
    22592259        $results = $db->getOne($sql); 
    22602260        if(DB::IsError($results)) { 

  • freepbx/branches/2.2/amp_conf/htdocs/admin/modules/core/page.trunks.php

    r4520 r4658  
    5555        // check for duplicates, and re-sequence 
    5656        $dialrules = array_values(array_unique($dialrules)); 
     57} else { 
     58        $dialrules = ''; 
    5759} 
    5860