Changeset 7876

Show
Ignore:
Timestamp:
06/28/09 12:43:44 (4 years ago)
Author:
p_lindheimer
Message:

Merged revisions 7875 via svnmerge from
http://svn.freepbx.org/modules/branches/2.5

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

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

    • Property svnmerge-integrated changed from /modules/branches/2.3:1-5233,5245,5333,5336 /modules/branches/2.5:1-5852,5880,5930,5995,6016-6017,6030-6031,6142,6218,6291,6361,6363,6413-6414,6422,6428-6430,6442-6443,6557,6710,6714-6715,6969-6970,6984,7248,7281,7858-7859 to /modules/branches/2.3:1-5233,5245,5333,5336 /modules/branches/2.5:1-5852,5880,5930,5995,6016-6017,6030-6031,6142,6218,6291,6361,6363,6413-6414,6422,6428-6430,6442-6443,6557,6710,6714-6715,6969-6970,6984,7248,7281,7858-7859,7875

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

    r5762 r7876  
    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,2); 
    84  $ininfo=core_did_get($extarray[0],$extarray[1]); 
    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,2); 
     82      $ininfo=core_did_get($extarray[0],$extarray[1]); 
     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        $delete_url = false; 
     93        $extdisplay = ''; 
     94?> 
     95    <h2><?php echo _("Add Incoming Route")?></h2> 
     96<?php 
     97      } 
     98      if ($delete_url) { 
     99        $delURL = $_SERVER['PHP_SELF'].'?'.$_SERVER['QUERY_STRING'].'&action=delIncoming'; 
     100?> 
    88101    <a href="<?php echo $delURL ?>"><?php echo _("Delete Route")?> <?php echo !empty($description)?$description:$extdisplay ?></a> 
    89 <?php } else { ?> 
     102<?php  
     103      } 
     104    } else { ?> 
    90105    <h2><?php echo _("Add Incoming Route")?></h2> 
    91 <?php } ?> 
     106<?php  
     107}  
     108?> 
    92109    <form name="editGRP" action="<?php $_SERVER['PHP_SELF'] ?>" method="post" onsubmit="return editGRP_onsubmit();"> 
    93110    <input type="hidden" name="display" value="<?php echo $dispnum?>">