Changeset 7877

Show
Ignore:
Timestamp:
06/28/09 09:58:58 (1 year ago)
Author:
p_lindheimer
Message:

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

................

r7874 | p_lindheimer | 2009-06-28 09:04:24 -0700 (Sun, 28 Jun 2009) | 1 line


fixes #3739 add new inbound route direct from URL resulting in proper page loaded

................

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 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

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

    r4905 r7877  
    7676        if ($action == 'delIncoming') { 
    7777                echo '<br><h3>Route '.$extdisplay.' '._("deleted").'!</h3><br><br><br><br><br><br><br><br>'; 
    78        } else { 
    79                 $delURL = $_SERVER['PHP_SELF'].'?'.$_SERVER['QUERY_STRING'].'&action=delIncoming'; 
    80 ?> 
    81 <?php if ($extdisplay) {         
    82         //create variables for the selected route's settings 
    83         $extarray=explode('/',$extdisplay,3); 
    84        $ininfo=core_did_get($extarray[0],$extarray[1],$extarray[2]); 
    85        if (is_array($ininfo)) extract($ininfo); 
     78  } else { 
     79    if ($extdisplay) { 
     80      //create variables for the selected route's settings 
     81      $extarray=explode('/',$extdisplay,3); 
     82            $ininfo=core_did_get($extarray[0],$extarray[1],$extarray[2]); 
     83      if (is_array($ininfo) && !empty($ininfo)) { 
     84        extract($ininfo); 
     85        $delete_url = true; 
    8686?> 
    8787                <h2><?php echo _("Route")?>: <?php echo !empty($description)?$description:$extdisplay; ?></h2> 
     88<?php 
     89      } else { 
     90        $extension = $extarray[0]; 
     91        $cidnum    = $extarray[1]; 
     92        $channel   = $extarray[1]; 
     93        $delete_url = false; 
     94        $extdisplay = ''; 
     95?> 
     96                <h2><?php echo _("Add Incoming Route")?></h2> 
     97<?php 
     98      } 
     99      if ($delete_url) { 
     100        $delURL = $_SERVER['PHP_SELF'].'?'.$_SERVER['QUERY_STRING'].'&action=delIncoming'; 
     101?> 
    88102                <p><a href="<?php echo $delURL ?>"><?php echo _("Delete Route")?> <?php echo !empty($description)?$description:$extdisplay ?></a></p> 
    89 <?php } else { ?> 
     103<?php  
     104      } 
     105    } else { ?> 
    90106                <h2><?php echo _("Add Incoming Route")?></h2> 
    91 <?php } ?> 
     107<?php  
     108}  
     109?> 
    92110                <form name="editGRP" action="<?php $_SERVER['PHP_SELF'] ?>" method="post" onsubmit="return editGRP_onsubmit();"> 
    93111                <input type="hidden" name="display" value="<?php echo $dispnum?>">