Changeset 5576

Show
Ignore:
Timestamp:
01/12/08 14:12:26 (5 years ago)
Author:
p_lindheimer
Message:

Merged revisions 5572 via svnmerge from
http://svn.freepbx.org/modules/branches/2.4

........

r5572 | pnlarsson | 2008-01-12 08:48:07 -0800 (Sat, 12 Jan 2008) | 1 line


Fixes #2607, Custom trunks stripped of starting A or M or P

........

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/branches/2.3

    • Property svnmerge-integrated changed from /modules/branches/2.2:1-3588,3615-3635,3637-3638,3640,3674,3680,3686,3692,3702,3706,3710,3716,3758,3760,3762-3765,3767-3785,3787-3789,3801,3810,3828,3831,3839,3860,3866,3875,3877,3887,3899,3911,3913,3943,3982-3983,3990,3998,4007,4022-4023,4089,4092,4098,4265,4285 /modules/branches/2.4:1-5079,5090,5093,5097-5118,5120-5170,5172,5174,5176-5182,5184-5199,5202-5203,5205-5211,5239,5271-5272,5312,5383,5516,5544 to /modules/branches/2.2:1-3588,3615-3635,3637-3638,3640,3674,3680,3686,3692,3702,3706,3710,3716,3758,3760,3762-3765,3767-3785,3787-3789,3801,3810,3828,3831,3839,3860,3866,3875,3877,3887,3899,3911,3913,3943,3982-3983,3990,3998,4007,4022-4023,4089,4092,4098,4265,4285 /modules/branches/2.4:1-5079,5090,5093,5097-5118,5120-5170,5172,5174,5176-5182,5184-5199,5202-5203,5205-5211,5239,5271-5272,5312,5383,5516,5544,5572

  • modules/branches/2.3/core/module.xml

    r5528 r5576  
    44  <category>Basic</category> 
    55  <name>Core</name> 
    6   <version>2.3.1.3</version> 
     6  <version>2.3.1.4</version> 
    77  <candisable>no</candisable> 
    88  <canuninstall>no</canuninstall> 
    99  <changelog> 
     10    *2.3.1.4* #2607 fix display problems with custom trunks starting with A, M or P 
    1011    *2.3.1.3* added info to update checking tooltip providing info of what is transmitted 
    1112    *2.3.1.2* #2526 dialout-trunk-predial-hook not always called, block queue login using queue number and fix to use AMPUSER 

  • modules/branches/2.3/core/page.routing.php

    r4987 r5576  
    512512        foreach ($trunks as $name=>$display_description) { 
    513513          if ($trunkstate[$name] == 'off') { 
    514             echo "<option id=\"trunk".$key."\" name=\"trunk".$key."\" value=\"".$name."\" style=\"background: #FFF;\" ".($name == $trunk ? "selected" : "").">".$display_description."</option>"; 
     514            echo "<option id=\"trunk".$key."\" name=\"trunk".$key."\" value=\"".$name."\" style=\"background: #FFF;\" ".($name == $trunk ? "selected" : "").">".str_replace('AMP:', '', $display_description)."</option>"; 
    515515          } else { 
    516             echo "<option id=\"trunk".$key."\" name=\"trunk".$key."\" value=\"".$name."\" style=\"background: #DDD;\" ".($name == $trunk ? "selected" : "").">".$display_description."</option>"; 
     516            echo "<option id=\"trunk".$key."\" name=\"trunk".$key."\" value=\"".$name."\" style=\"background: #DDD;\" ".($name == $trunk ? "selected" : "").">".str_replace('AMP:', '', $display_description)."</option>"; 
    517517          } 
    518518        } 
    …… 
    556556        foreach ($trunks as $name=>$display_description) { 
    557557          if ($trunkstate[$name] == 'off') { 
    558           echo "<option value=\"".$name."\">".ltrim($display_description,"AMP:")."</option>"; 
     558          echo "<option value=\"".$name."\">".str_replace('AMP:', '', $display_description)."</option>"; 
    559559          } else { 
    560560          echo "<option value=\"".$name."\" style=\"background: #DDD;\" >*".ltrim($display_description,"AMP:")."*</option>"; 

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

    r5091 r5576  
    199199foreach ($tresults as $tresult) { 
    200200  $background = ($tresult[2] == 'on')?'#DDD':'#FFF'; 
    201   echo "\t<li><a ".($extdisplay==$tresult[0] ? 'class="current"':'')." href=\"config.php?display=".urlencode($display)."&amp;extdisplay=".urlencode($tresult[0])."\" title=\"".urlencode($tresult[1])."\" style=\"background: $background;\" >"._("Trunk")." ".substr(ltrim($tresult[1],"AMP:"),0,15)."</a></li>\n"; 
     201  echo "\t<li><a ".($extdisplay==$tresult[0] ? 'class="current"':'')." href=\"config.php?display=".urlencode($display)."&amp;extdisplay=".urlencode($tresult[0])."\" title=\"".urlencode($tresult[1])."\" style=\"background: $background;\" >"._("Trunk")." ".substr(str_replace('AMP:', '', $tresult[1]),0,15)."</a></li>\n"; 
    202202} 
    203203