Changeset 5567

Show
Ignore:
Timestamp:
01/10/08 15:48:56 (1 year ago)
Author:
p_lindheimer
Message:

add tech in auto-generated from-trunk names to make them unique between technologies

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r5566 r5567  
    939939                                                case 'SIP': 
    940940                                                        $trunkgroup = $trunkprops['globalvar']; 
    941                                                         $trunkcontext  = "from-trunk-".$trunkprops['name']; 
     941                                                        $trunkcontext  = "from-trunk-".strtolower($trunkprops['tech'])."-".$trunkprops['name']; 
    942942                                                        $ext->add($trunkcontext, '_.', '', new ext_setvar('GROUP()',$trunkgroup)); 
    943943                                                        $ext->add($trunkcontext, '_.', '', new ext_goto('1','${EXTEN}','from-trunk')); 

  • modules/branches/2.4/core/page.trunks.php

    r5566 r5567  
    360360        if ($tech == "sip" || substr($tech,0,3) == "iax") { 
    361361?> 
    362                                         <a href=# class="info"><?php echo _("Maximum Channels")?><span><?php echo sprintf(_("Controls the maximum number of outbound channels (simultaneous calls) that can be used on this trunk. To count inbound calls against this maximum, use the auto-generated context: %s as the inbound trunk's context. (see extensions_additional.conf) Leave blank to specify no maximum."),((isset($channelid) && trim($channelid)!="")?"from-trunk-$channelid":"from-trunk-[trunkname]"))?></span></a>:  
     362                                        <a href=# class="info"><?php echo _("Maximum Channels")?><span><?php echo sprintf(_("Controls the maximum number of outbound channels (simultaneous calls) that can be used on this trunk. To count inbound calls against this maximum, use the auto-generated context: %s as the inbound trunk's context. (see extensions_additional.conf) Leave blank to specify no maximum."),((isset($channelid) && trim($channelid)!="")?"from-trunk-$tech-$channelid":"from-trunk-[trunkname]"))?></span></a>:  
    363363<?php 
    364364        } else {