Completed substitution of 'section' url var with 'subject'.

diff --git a/all_db.php b/all_db.php
index 0e3035f908e286e2ce7f8c35e5bf7e4c2261c766..cf202567aa886b3e858fb7eea5ef41902f023083 100644 (file)
--- a/all_db.php
+++ b/all_db.php
@@ -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 7f2d9a811fb815d2c513ca1025f4260a83480cbc..307243c9b9cc677eb019431ec0edbf5edcf03be1 100644 (file)
--- 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 3e47e33e1039204bdf0d1113c71fe2c64851c1fa..b1b37a808954569e70504437fe5281fd01edc8ea 100755 (executable)
--- 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 54b0496432c18022cac1c3cae9c4b32aaf077d0f..0c4eace276d2d519114f76c766b70763b1ff86ab 100644 (file)
--- 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 10f450b880c438295232a293610397b9b475f477..2e07187f6fbc1820dd0cff1245b1a967c965041c 100644 (file)
--- 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 bda8990af2c30e837e676dff8260577d0a7d24a9..a458c76b30c01252067836c94296da82270e0dc8 100644 (file)
--- 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(

diff --git a/tables.php b/tables.php
index ed81d57d4608e7e0dc03599fb33a87d122d1520c..9fb4fdb18a2a705dbabadee326a3812c44aec8f9 100644 (file)
--- a/tables.php
+++ b/tables.php
@@ -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(

diff --git a/views.php b/views.php
index d81aca8a0382c7b2f57819d09504ebc25dc679e3..f6a958b90a125eaab0eb65486a0147dbfdeb43e0 100644 (file)
--- a/views.php
+++ b/views.php
@@ -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(