diff options
author | jollytoad | 2005-03-22 09:29:34 +0000 |
---|---|---|
committer | jollytoad | 2005-03-22 09:29:34 +0000 |
commit | 4cb0e363d9434ff1555b78f413297e943a5f229d (patch) | |
tree | 710e387e1e00ac9c836b7d6ea349d7b6879b92e4 | |
parent | 599358ee1582ce9ce1872b9dc9f3b4a80910e8e8 (diff) |
Completed substitution of 'section' url var with 'subject'.
-rw-r--r-- | all_db.php | 4 | ||||
-rw-r--r-- | classes/Misc.php | 16 | ||||
-rwxr-xr-x | database.php | 4 | ||||
-rw-r--r-- | functions.php | 4 | ||||
-rw-r--r-- | redirect.php | 3 | ||||
-rw-r--r-- | servers.php | 4 | ||||
-rw-r--r-- | tables.php | 4 | ||||
-rw-r--r-- | views.php | 4 |
8 files changed, 21 insertions, 22 deletions
@@ -3,7 +3,7 @@ /** * Manage databases within a server * - * $Id: all_db.php,v 1.35.4.3 2005/03/14 09:57:59 jollytoad Exp $ + * $Id: all_db.php,v 1.35.4.4 2005/03/22 09:29:43 jollytoad Exp $ */ // Include application functions @@ -224,7 +224,7 @@ $actions = array( 'properties' => array( 'title' => $lang['strproperties'], - 'url' => "redirect.php?section=database&{$misc->href}&", + 'url' => "redirect.php?subject=database&{$misc->href}&", 'vars' => array('database' => 'datname'), ), 'drop' => array( diff --git a/classes/Misc.php b/classes/Misc.php index 7f2d9a81..307243c9 100644 --- a/classes/Misc.php +++ b/classes/Misc.php @@ -2,7 +2,7 @@ /** * Class to hold various commonly used functions * - * $Id: Misc.php,v 1.98.2.11 2005/03/14 09:57:58 jollytoad Exp $ + * $Id: Misc.php,v 1.98.2.12 2005/03/22 09:29:34 jollytoad Exp $ */ class Misc { @@ -939,7 +939,7 @@ $trail['root'] = array( 'text' => $appName, - 'url' => 'redirect.php?section=root', + 'url' => 'redirect.php?subject=root', ); if ($subject == 'root') $done = true; @@ -950,7 +950,7 @@ $trail['server'] = array( 'title' => $lang['strserver'], 'text' => $server_info['desc'], - 'url' => "redirect.php?section=server&{$vars}", + 'url' => "redirect.php?subject=server&{$vars}", 'help' => 'pg.server' ); } @@ -961,7 +961,7 @@ $trail['database'] = array( 'title' => $lang['strdatabase'], 'text' => $_REQUEST['database'], - 'url' => "redirect.php?section=database&{$vars}", + 'url' => "redirect.php?subject=database&{$vars}", 'help' => 'pg.database' ); } @@ -972,14 +972,14 @@ $trail['schema'] = array( 'title' => $lang['strschema'], 'text' => $_REQUEST['schema'], - 'url' => "redirect.php?section=schema&{$vars}", + 'url' => "redirect.php?subject=schema&{$vars}", 'help' => 'pg.schema' ); } if ($subject == 'schema') $done = true; if (isset($_REQUEST['table']) && !$done) { - $vars .= "section=table&table=".urlencode($_REQUEST['table']); + $vars .= "subject=table&table=".urlencode($_REQUEST['table']); $trail['table'] = array( 'title' => $lang['strtable'], 'text' => $_REQUEST['table'], @@ -987,7 +987,7 @@ 'help' => 'pg.table' ); } elseif (isset($_REQUEST['view']) && !$done) { - $vars .= "section=view&view=".urlencode($_REQUEST['view']); + $vars .= "subject=view&view=".urlencode($_REQUEST['view']); $trail['view'] = array( 'title' => $lang['strview'], 'text' => $_REQUEST['view'], @@ -1001,7 +1001,7 @@ switch ($subject) { case 'function': $vars .= "{$subject}_oid=".urlencode($_REQUEST[$subject.'_oid']).'&'; - $vars .= "section={$subject}&{$subject}=".urlencode($_REQUEST[$subject]); + $vars .= "subject={$subject}&{$subject}=".urlencode($_REQUEST[$subject]); $trail[$subject] = array( 'title' => $lang['str'.$subject], 'text' => $_REQUEST[$subject], diff --git a/database.php b/database.php index 3e47e33e..b1b37a80 100755 --- a/database.php +++ b/database.php @@ -3,7 +3,7 @@ /** * Manage schemas within a database * - * $Id: database.php,v 1.65.2.4 2005/03/14 09:58:00 jollytoad Exp $ + * $Id: database.php,v 1.65.2.5 2005/03/22 09:29:43 jollytoad Exp $ */ // Include application functions @@ -684,7 +684,7 @@ $actions = array( 'properties' => array( 'title' => $lang['strproperties'], - 'url' => "redirect.php?section=schema&{$href}&", + 'url' => "redirect.php?subject=schema&{$href}&", 'vars' => array('schema' => 'nspname'), ), 'drop' => array( diff --git a/functions.php b/functions.php index 54b04964..0c4eace2 100644 --- a/functions.php +++ b/functions.php @@ -3,7 +3,7 @@ /** * Manage functions in a database * - * $Id: functions.php,v 1.47.4.3 2005/03/14 09:58:00 jollytoad Exp $ + * $Id: functions.php,v 1.47.4.4 2005/03/22 09:29:44 jollytoad Exp $ */ // Include application functions @@ -503,7 +503,7 @@ $actions = array( 'properties' => array( 'title' => $lang['strproperties'], - 'url' => "redirect.php?section=function&action=properties&{$misc->href}&", + 'url' => "redirect.php?subject=function&action=properties&{$misc->href}&", 'vars' => array('function' => 'proproto', 'function_oid' => 'prooid'), ), 'alter' => array( diff --git a/redirect.php b/redirect.php index 10f450b8..2e07187f 100644 --- a/redirect.php +++ b/redirect.php @@ -1,6 +1,5 @@ <?php - # TEMP: until all URL's converted 'section' to 'subject' - $subject = isset($_REQUEST['subject']) ? $_REQUEST['subject'] : $_REQUEST['section']; + $subject = isset($_REQUEST['subject']) ? $_REQUEST['subject'] : 'root'; if ($subject == 'root') $_no_db_connection = true; diff --git a/servers.php b/servers.php index bda8990a..a458c76b 100644 --- a/servers.php +++ b/servers.php @@ -3,7 +3,7 @@ /** * Manage servers * - * $Id: servers.php,v 1.1.2.3 2005/03/14 09:58:01 jollytoad Exp $ + * $Id: servers.php,v 1.1.2.4 2005/03/22 09:29:44 jollytoad Exp $ */ // Include application functions @@ -63,7 +63,7 @@ $actions = array( 'properties' => array( 'title' => $lang['strproperties'], - 'url' => "redirect.php?section=server&", + 'url' => "redirect.php?subject=server&", 'vars' => array('server' => 'id'), ), 'logout' => array( @@ -3,7 +3,7 @@ /** * List tables in a database * - * $Id: tables.php,v 1.69.2.2 2005/03/14 09:58:01 jollytoad Exp $ + * $Id: tables.php,v 1.69.2.3 2005/03/22 09:29:44 jollytoad Exp $ */ // Include application functions @@ -562,7 +562,7 @@ $actions = array( 'properties' => array( 'title' => $lang['strproperties'], - 'url' => "redirect.php?section=table&{$misc->href}&", + 'url' => "redirect.php?subject=table&{$misc->href}&", 'vars' => array('table' => 'relname'), ), 'browse' => array( @@ -3,7 +3,7 @@ /** * Manage views in a database * - * $Id: views.php,v 1.52.2.2 2005/03/14 09:58:01 jollytoad Exp $ + * $Id: views.php,v 1.52.2.3 2005/03/22 09:29:44 jollytoad Exp $ */ // Include application functions @@ -548,7 +548,7 @@ $actions = array( 'properties' => array( 'title' => $lang['strproperties'], - 'url' => "redirect.php?section=view&{$misc->href}&", + 'url' => "redirect.php?subject=view&{$misc->href}&", 'vars' => array('view' => 'relname'), ), 'browse' => array( |