Changeset 7882

Show
Ignore:
Timestamp:
06/29/09 22:04:45 (3 years ago)
Author:
p_lindheimer
Message:

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

........

r7878 | p_lindheimer | 2009-06-29 19:36:32 -0700 (Mon, 29 Jun 2009) | 1 line


fixes #3741 added new function core_routing_trunk_del(trunknum) which deletes the specified trunk from all routes

........

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-5545,5548-5549,5555,5564,5570,5572-5574,5576-5578,5596,5606-5610,5612,5615-5618,5623-5624,5628,5630-5642,5644-5646,5648-5651,5653-5654,5656-5657,5660,5687-5699,5701-5702,5704-5715,5723-5727,5729-5730,5733-5741,5752-5753,5756,5830-5831,5842-5843,5881,6280,7876 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-5545,5548-5549,5555,5564,5570,5572-5574,5576-5578,5596,5606-5610,5612,5615-5618,5623-5624,5628,5630-5642,5644-5646,5648-5651,5653-5654,5656-5657,5660,5687-5699,5701-5702,5704-5715,5723-5727,5729-5730,5733-5741,5752-5753,5756,5830-5831,5842-5843,5881,6280,7876,7881

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

    r5227 r7882  
    24902490} 
    24912491 
     2492/* Delete all occurences of the specified trunk from all routes that may use it 
     2493 */ 
     2494function core_routing_trunk_del($trunknum) { 
     2495  global $db; 
     2496 
     2497  $sql = "DELETE FROM `extensions` WHERE `application` = 'Macro' AND `context` LIKE 'outrt-%' AND `args` LIKE 'dialout-%,$trunknum,%'"; 
     2498  $result = $db->query($sql); 
     2499} 
     2500 
    24922501function core_routing_rename($oldname, $newname) { 
    24932502  global $db; 

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

    r5616 r7882  
    9696   
    9797    core_trunks_del($trunknum); 
     98    core_routing_trunk_del($trunknum); 
    9899     
    99100    /* //DIALRULES