Cleaned up navigation (bread crumbs, tabs & titles).
authorjollytoad <jollytoad>
Wed, 1 Sep 2004 16:35:57 +0000 (16:35 +0000)
committerjollytoad <jollytoad>
Wed, 1 Sep 2004 16:35:57 +0000 (16:35 +0000)
Standardised some request vars in groups.php & tablespaces.php to support nav system.
Removed obsolete funcs printNav/printTableNav.
Added more flexible context help - for review.

29 files changed:
aggregates.php
all_db.php
casts.php
classes/Misc.php
constraints.php
conversions.php
database.php
dataimport.php
domains.php
functions.php
groups.php
indexes.php
info.php
languages.php
opclasses.php
operators.php
privileges.php
rules.php
sequences.php
sql.php
tables.php
tablespaces.php
tblproperties.php
themes/default/global.css
triggers.php
types.php
users.php
viewproperties.php
views.php

index b67316062f05b57b35611700af8358a0159c4d0c..b41acc8afd555444f2123cde38552fb30ab5c593 100644 (file)
@@ -3,7 +3,7 @@
        /**
         * Manage aggregates in a database
         *
-        * $Id: aggregates.php,v 1.7 2004/07/13 16:13:15 jollytoad Exp $
+        * $Id: aggregates.php,v 1.8 2004/09/01 16:35:57 jollytoad Exp $
         */
 
        // Include application functions
@@ -19,7 +19,8 @@
                global $data, $conf, $misc;
                global $lang;
 
-               $misc->printTitle(array($misc->printVal($_REQUEST['database']), $lang['straggregates']), 'aggregates');
+               $misc->printTrail('schema');
+               $misc->printTabs('schema', 'aggregates');
                $misc->printMsg($msg);
                
                $aggregates = &$data->getAggregates();
@@ -47,7 +48,6 @@
 
        $misc->printHeader($lang['straggregates']);
        $misc->printBody();
-       $misc->printNav('schema', 'aggregates');
 
        switch ($action) {
                default:
index 2986b74546dcfefd373856803b0bcce5407abcb7..1ed8720d9103d28c08cf327b6b6d04fefe8f7bb1 100644 (file)
@@ -3,7 +3,7 @@
        /**
         * Manage databases within a server
         *
-        * $Id: all_db.php,v 1.33 2004/08/26 08:29:56 jollytoad Exp $
+        * $Id: all_db.php,v 1.34 2004/09/01 16:35:57 jollytoad Exp $
         */
 
        // Include application functions
@@ -21,8 +21,9 @@
                global $PHP_SELF, $lang, $_reload_drop_database;
 
                if ($confirm) {
-                       $misc->printNav('server','databases');
-                       $misc->printTitle(array($lang['strdatabases'], $misc->printVal($_REQUEST['database']), $lang['strdrop']), 'drop_database');
+                       $misc->printTrail('database');
+                       $misc->printTitle($lang['strdrop'], 'drop_database');
+                       
                        echo "<p>", sprintf($lang['strconfdropdatabase'], $misc->printVal($_REQUEST['database'])), "</p>\n";    
                        echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
                        echo "<input type=\"hidden\" name=\"action\" value=\"drop\" />\n";
                global $data, $misc;
                global $PHP_SELF, $lang;
                
+               $misc->printTrail('server');
+               $misc->printTitle($lang['strcreatedatabase'], 'create_database');
+               $misc->printMsg($msg);
+               
                if (!isset($_POST['formName'])) $_POST['formName'] = '';
                // Default encoding is that in language file
                if (!isset($_POST['formEncoding'])) {
                // Fetch all tablespaces from the database
                if ($data->hasTablespaces()) $tablespaces = &$data->getTablespaces();
 
-               $misc->printNav('server','databases');
-               $misc->printTitle(array($lang['strdatabases'], $lang['strcreatedatabase']), 'create_database');
-               $misc->printMsg($msg);
-               
-               
                echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
                echo "<table>\n";
                echo "\t<tr>\n\t\t<th class=\"data left required\">{$lang['strname']}</th>\n";
                global $data, $misc;
                global $PHP_SELF, $lang;
 
-               $misc->printNav('server','export');
-               $misc->printTitle(array($lang['strdatabases'], $lang['strexport']));
+               $misc->printTrail('server');
+               $misc->printTabs('server','export');
                $misc->printMsg($msg);
 
                echo "<form action=\"dbexport.php\" method=\"post\">\n";
                global $data, $conf, $misc;
                global $PHP_SELF, $lang;
 
-               $misc->printNav('server','databases');
-               $misc->printTitle(array($lang['strdatabases']), 'managing_databases');
+               $misc->printTrail('server');
+               $misc->printTabs('server','databases');
                $misc->printMsg($msg);
                
                $databases = &$data->getDatabases();
        }
 
        $misc->printHeader($lang['strdatabases']);
-       $misc->printBody();     
+       $misc->printBody();
 
        switch ($action) {
                case 'export':
index 31792dee30ba0dda3820a9629dd38617fed89f5d..974035885b54aa6de4bb5dae7dffc63cbe09c76e 100644 (file)
--- a/casts.php
+++ b/casts.php
@@ -3,7 +3,7 @@
        /**
         * Manage casts in a database
         *
-        * $Id: casts.php,v 1.8 2004/07/13 16:13:15 jollytoad Exp $
+        * $Id: casts.php,v 1.9 2004/09/01 16:35:57 jollytoad Exp $
         */
 
        // Include application functions
@@ -29,7 +29,8 @@
                        }
                }
                
-               $misc->printTitle(array($misc->printVal($_REQUEST['database']), $lang['strcasts']));
+               $misc->printTrail('database');
+               $misc->printTabs('database','casts');
                $misc->printMsg($msg);
                
                $casts = &$data->getcasts();
@@ -63,7 +64,6 @@
 
        $misc->printHeader($lang['strcasts']);
        $misc->printBody();
-       $misc->printNav('database','casts');
 
        switch ($action) {
                default:
index 19e83f6e4d95b94e9f25ba0f23fc8eebd56bd4b5..4b4a0a6c9e394e18dae40b0883c0bfdb6d71529b 100644 (file)
@@ -2,7 +2,7 @@
        /**
         * Class to hold various commonly used functions
         *
-        * $Id: Misc.php,v 1.88 2004/08/31 08:39:03 jollytoad Exp $
+        * $Id: Misc.php,v 1.89 2004/09/01 16:35:57 jollytoad Exp $
         */
         
        class Misc {
                
                /**
                 * Print out the page heading and help link
-                * @param $arr Array of heading items, already escaped
+                * @param $title Title, already escaped
                 * @param $help (optional) The identifier for the help link
                 */
-               function printTitle($arr, $help = null) {
+               function printTitle($title, $help = null) {
                        global $data, $lang;
-
-                       // Don't continue unless we are actually displaying something                   
-                       if (!is_array($arr) || sizeof($arr) == 0) return;
                        
-                       if ($help !== null && isset($data->help_page[$help])) {
-                               echo "<br /><table border=\"0\" cellspacing=\"0\" cellpadding=\"0\" width=\"100%\">\n";
-                               echo "<tr><td><h2>";
-                               // Join array with separator character
-                               echo implode($lang['strseparator'], $arr);
-                               echo "</h2></td><td width=\"1\"><a class=\"navlink help\" href=\"";
-                               // Output URL to help
-                               echo htmlspecialchars($data->help_base . $data->help_page[$help]);
-                               echo "\" target=\"ppa_help\">{$lang['strhelp']}</a></td></tr>\n";
-                               echo "</table>\n";
-                               echo "<br />\n";
-                       }
-                       else {
-                               echo "<h2>";
-                               // Join array with separator character
-                               echo implode($lang['strseparator'], $arr);
-                               echo "</h2>\n";
-                       }
+                       echo "<h2>{$title}";
+                       $this->printHelp($help);
+                       echo "</h2>\n";
                }
                
                /**
                 * @param $activetab The name of the tab to be highlighted.
                 */
                function printTabs($tabs, $activetab) {
-                       global $misc, $conf;
+                       global $misc, $conf, $data, $lang;
+                       
+                       if (is_string($tabs)) {
+                               switch ($tabs) {
+                                       case 'database':
+                                       case 'schema':
+                                               if ($data->hasSchemas() === false) {
+                                                       $this->printTabs($this->getNavTabs('database'),$activetab);
+                                                       $this->printTabs($this->getNavTabs('schema'),$activetab);
+                                                       $_SESSION['webdbLastTab']['database'] = $activetab;
+                                                       return;
+                                               }
+                                       default:
+                                               $_SESSION['webdbLastTab'][$tabs] = $activetab;
+                                               $tabs = $this->getNavTabs($tabs);
+                               }
+                       }
                        
                        echo "<table class=\"tabs\"><tr>\n";
                        
                        foreach ($tabs as $tab_id => $tab) {
                                $active = ($tab_id == $activetab) ? ' active' : '';
                                
-                               if (!isset($tab['hide']) || $tab['hide'] !== true)
-                                       echo "<td width=\"{$width}\" class=\"tab{$active}\"><a href=\"" . $this->printVal($tab['url'], 'nbsp') . "\">{$tab['title']}</a></td>\n";
+                               if (!isset($tab['hide']) || $tab['hide'] !== true) {
+                                       echo "<td width=\"{$width}\" class=\"tab{$active}\"><a href=\"" . $this->printVal($tab['url'], 'nbsp') . "\">{$tab['title']}</a>";
+                                       
+                                       if (isset($tab['help'])) $this->printHelp($tab['help']);
+                                       
+                                       echo "</td>\n";
+                               }
                        }
                        
                        echo "</tr></table>\n";
                                                'databases' => array (
                                                        'title' => $lang['strdatabases'],
                                                        'url'   => "all_db.php",
+                                                       'help'  => 'managing_databases',
                                                ),
                                                'users' => array (
                                                        'title' => $lang['strusers'],
                                                        'url'   => "users.php",
                                                        'hide'  => $hide_users,
+                                                       'help'  => 'users',
                                                ),
                                                'groups' => array (
                                                        'title' => $lang['strgroups'],
                                                        'url'   => "groups.php",
                                                        'hide'  => $hide_users,
+                                                       'help'  => 'groups',
                                                ),
                                                'tablespaces' => array (
                                                        'title' => $lang['strtablespaces'],
                                                        'title' => $lang['strschemas'],
                                                        'url'   => "database.php?{$vars}",
                                                        'hide'  => (!$data->hasSchemas()),
+                                                       'help'  => 'schemas',
                                                ),
                                                'sql' => array (
                                                        'title' => $lang['strsql'],
                                                        'url'   => "database.php?{$vars}&action=sql",
+                                                       'help'  => 'sql',
                                                ),
                                                'find' => array (
                                                        'title' => $lang['strfind'],
                                                        'title' => $lang['strvariables'],
                                                        'url'   => "database.php?{$vars}&action=variables",
                                                        'hide'  => (!$data->hasVariables()),
+                                                       'help'  => 'runtime_config',
                                                ),
                                                'processes' => array (
                                                        'title' => $lang['strprocesses'],
                                                        'url'   => "database.php?{$vars}&action=processes",
                                                        'hide'  => (!$data->hasProcesses()),
+                                                       'help'  => 'processes',
                                                ),
                                                'admin' => array (
                                                        'title' => $lang['stradmin'],
                                                'tables' => array (
                                                        'title' => $lang['strtables'],
                                                        'url'   => "tables.php?{$vars}",
+                                                       'help'  => 'tables',
                                                ),
                                                'views' => array (
                                                        'title' => $lang['strviews'],
                                                        'url'   => "views.php?{$vars}",
+                                                       'help'  => 'views',
                                                ),
                                                'sequences' => array (
                                                        'title' => $lang['strsequences'],
                                                        'url'   => "sequences.php?{$vars}",
+                                                       'help'  => 'sequences',
                                                ),
                                                'functions' => array (
                                                        'title' => $lang['strfunctions'],
                                                        'title' => $lang['strdomains'],
                                                        'url'   => "domains.php?{$vars}",
                                                        'hide'  => (!$data->hasDomains()),
+                                                       'help'  => 'domains',
                                                ),
                                                'aggregates' => array (
                                                        'title' => $lang['straggregates'],
                                                        'url'   => "aggregates.php?{$vars}",
                                                        'hide'  => $hide_advanced,
+                                                       'help'  => 'aggregates',
                                                ),
                                                'types' => array (
                                                        'title' => $lang['strtypes'],
                                                        'title' => $lang['stroperators'],
                                                        'url'   => "operators.php?{$vars}",
                                                        'hide'  => $hide_advanced,
+                                                       'help'  => 'operators',
                                                ),
                                                'opclasses' => array (
                                                        'title' => $lang['stropclasses'],
                                                        'url'   => "opclasses.php?{$vars}",
                                                        'hide'  => $hide_advanced,
+                                                       'help'  => 'opclasses',
                                                ),
                                                'conversions' => array (
                                                        'title' => $lang['strconversions'],
                                                        'url'   => "conversions.php?{$vars}",
                                                        'hide'  => ($hide_advanced || !$data->hasConversions()),
+                                                       'help'  => 'conversions',
                                                ),
                                                'privileges' => array (
                                                        'title' => $lang['strprivileges'],
                                                'constraints' => array (
                                                        'title' => $lang['strconstraints'],
                                                        'url'   => "constraints.php?{$vars}",
+                                                       'help'  => 'constraints',
                                                ),
                                                'triggers' => array (
                                                        'title' => $lang['strtriggers'],
                        }
                }
 
-               /**
-                * Display a navigation tab bar.
-                * @param $section The name of the tab bar.
-                * @param $activetab The tab to highlight and set as default for the bar.
-                */
-               function printNav($section, $activetab) {
-                       global $data;
-                       
-                       echo "<div class=\"nav\">\n";
-                       
-                       $this->printTrail($this->getTrail($section));
-                       
-                       switch ($section) {
-                               case 'database':
-                               case 'schema':
-                                       if ($data->hasSchemas() === false) {
-                                               $this->printTabs($this->getNavTabs('database'),$activetab);
-                                               $this->printTabs($this->getNavTabs('schema'),$activetab);
-                                               $_SESSION['webdbLastTab']['database'] = $activetab;
-                                               break;
-                                       }
-                               default:
-                                       $tabs = $this->getNavTabs($section);
-                                       if (!empty($tabs)) {
-                                               $this->printTabs($tabs, $activetab);
-                                               $_SESSION['webdbLastTab'][$section] = $activetab;
-                                       }
-                       }
-                       
-                       echo "</div>\n";
-               }
-
-               function printTitleNav($section, $title, $help = null) {
-                       global $data, $lang;
-                       
-                       echo "<div class=\"nav\">\n";
-                       
-                       $this->printTrail($this->getTrail($section));
-                       
-                       echo "<div class=\"trail\"><span class=\"title\">{$title}</span>";
-                       
-                       if (!is_null($help) && isset($data->help_page[$help])) {
-                               echo "<a class=\"help\" href=\"";
-                               echo htmlspecialchars($data->help_base . $data->help_page[$help]);
-                               echo "\" title=\"{$lang['strhelp']}\">?</a>";
-                       }
-                       
-                       echo "</div>\n</div>\n";
-               }
-               
                /**
                 * Get the URL for the last active tab of a particular tab bar.
                 */
                function printTrail($trail = array()) {
                        global $lang;
                        
+                       if (is_string($trail)) {
+                               $trail = $this->getTrail($trail);
+                       }
+                       
                        echo "<div class=\"trail\">";
                        
                        foreach ($trail as $crumb) {
                                if (isset($crumb['title']))
                                        echo " title=\"{$crumb['title']}\"";
                                
-                               echo ">" . htmlspecialchars($crumb['text']) . "</a></span>{$lang['strseparator']}";
+                               echo ">" . htmlspecialchars($crumb['text']) . "</a>";
+                               
+                               if (isset($crumb['help']))
+                                       $this->printHelp($crumb['help']);
+                               
+                               echo "</span>{$lang['strseparator']}";
                        }
                        
                        echo "</div>\n";
                                        'title' => $lang['strschema'],
                                        'text'  => $_REQUEST['schema'],
                                        'url'   => "redirect.php?section=schema&{$vars}",
+                                       'help'  => 'schemas',
                                );
                        }
                        if ($subject == 'schema') $done = true;
                        
-                       if (!$done) {
+                       if (isset($_REQUEST['table']) && !$done) {
+                               $vars .= "section=table&table=".urlencode($_REQUEST['table']);
+                               $trail['table'] = array(
+                                       'title' => $lang['strtable'],
+                                       'text'  => $_REQUEST['table'],
+                                       'url'   => "redirect.php?{$vars}",
+                                       'help'  => 'tables',
+                               );
+                       } elseif (isset($_REQUEST['view']) && !$done) {
+                               $vars .= "section=view&view=".urlencode($_REQUEST['view']);
+                               $trail['view'] = array(
+                                       'title' => $lang['strview'],
+                                       'text'  => $_REQUEST['view'],
+                                       'url'   => "redirect.php?{$vars}",
+                                       'help'  => 'views',
+                               );
+                       }
+                       if ($subject == 'table' || $subject == 'view') $done = true;
+                       
+                       if (!$done && !is_null($subject)) {
                                switch ($subject) {
                                        case 'function':
                                                $vars .= "{$subject}_oid=".urlencode($_REQUEST[$subject.'_oid']).'&';
-                                       case 'table':
-                                       case 'view':
                                                $vars .= "section={$subject}&{$subject}=".urlencode($_REQUEST[$subject]);
                                                $trail[$subject] = array(
                                                        'title' => $lang['str'.$subject],
                                                        'text'  => $_REQUEST[$subject],
                                                        'url'   => "redirect.php?{$vars}",
+                                                       'help'  => $subject.'s',
                                                );
                                                break;
                                        default:
-                                               if (isset($_REQUEST['subject']) && isset($_REQUEST[$_REQUEST['subject']])) {
-                                                       $trail[$_REQUEST['subject']] = array(
-                                                               'text'  => $_REQUEST[$_REQUEST['subject']],
+                                               if (isset($_REQUEST[$subject])) {
+                                                       $trail[$_REQUEST[$subject]] = array(
+                                                               'title' => $lang['str'.$subject],
+                                                               'text'  => $_REQUEST[$subject],
                                                        );
                                                }
                                }
                }               
 
                /**
-                * Displays link to the context help.if $conf['docsdir'] is set
-                * @param $url - last part of a document's url (relative to $conf['docsdir'])
+                * Displays link to the context help.
+                * @param $help - help section name
                 */
-               function printHelp($url) {
-                       global $lang, $conf;
-
-                       if (isset($conf['docdir'])) {
-                               echo "<p><a href=\"" . $conf['docdir'] . $url . "\" target=\"_blank\">";
-                               echo $lang['strhelp'];
-                               echo "</a></p>\n";
+               function printHelp($help) {
+                       global $lang, $data;
+                       
+                       if (!is_null($help) && isset($data->help_page[$help])) {
+                               echo "<a class=\"help\" href=\"";
+                               echo htmlspecialchars($data->help_base . $data->help_page[$help]);
+                               echo "\" title=\"{$lang['strhelp']}\" target=\"phppgadminhelp\">?</a>";
                        }
                }
        
                 *                              column_id => array(
                 *                                      'title' => Column heading,
                 *                                      'field' => Field name for $tabledata->f[...],
+                *                                      'help'  => Help page for this column,
                 *                              ), ...
                 *                      );
                 * @param $actions   Actions that can be performed on each object:
                                
                                echo "<table>\n";
                                echo "<tr>\n";
+                               // Display column headings
                                foreach ($columns as $column_id => $column) {
                                        switch ($column_id) {
                                                case 'actions':
                                                        echo "<th class=\"data\" colspan=\"", count($actions), "\">{$column['title']}</th>\n";
                                                        break;
                                                default:
-                                                       echo "<th class=\"data\">{$column['title']}</th>\n";
+                                                       echo "<th class=\"data\">{$column['title']}";
+                                                       if (isset($column['help']))
+                                                               $this->printHelp($column['help']);
+                                                       echo "</th>\n";
                                                        break;
                                        }
                                }
                                echo "</tr>\n";
                                
+                               // Display table rows
                                $i = 0;
                                while (!$tabledata->EOF) {
                                        $id = ($i % 2) + 1;
index 2afd003ca8c0a66e73a24c4fc3f974d4ab37adc2..8dcdaf7e2425fb39beffc153228f5037bc84f20f 100644 (file)
@@ -3,7 +3,7 @@
        /**
         * List constraints on a table
         *
-        * $Id: constraints.php,v 1.38 2004/09/01 11:21:51 chriskl Exp $
+        * $Id: constraints.php,v 1.39 2004/09/01 16:35:57 jollytoad Exp $
         */
 
        // Include application functions
@@ -41,8 +41,8 @@
                                        if (!isset($_POST['initially'])) $_POST['initially'] = null;
                                        $_REQUEST['target'] = unserialize($_REQUEST['target']);
                                        
-                                       echo "<h2>", $misc->printVal($_REQUEST['database']), ": {$lang['strtables']}: ",
-                                               $misc->printVal($_REQUEST['table']), ": {$lang['straddfk']}</h2>\n";
+                                       $misc->printTrail('table');
+                                       $misc->printTitle($lang['straddfk']);
                                        $misc->printMsg($msg);
 
                                        // Unserialize target and fetch appropriate table. This is a bit messy
                                }
                                break;
                        default:
-                               echo "<h2>", $misc->printVal($_REQUEST['database']), ": {$lang['strtables']}: ",
-                                       $misc->printVal($_REQUEST['table']), ": {$lang['straddfk']}</h2>\n";
+                               $misc->printTrail('table');
+                               $misc->printTitle($lang['straddfk']);
                                $misc->printMsg($msg);
 
                                $attrs = &$data->getTableAttributes($_REQUEST['table']);
                        // Fetch all tablespaces from the database
                        if ($data->hasTablespaces()) $tablespaces = &$data->getTablespaces();
 
-                       echo "<h2>", $misc->printVal($_REQUEST['database']), ": {$lang['strtables']}: ",
-                               $misc->printVal($_REQUEST['table']), ": {$desc}</h2>\n";
+                       $misc->printTrail('table');
+                       $misc->printTitle($desc);
                        $misc->printMsg($msg);
                        
                        $selColumns = new XHTML_select('TableColumnList', true, 10);
                if (!isset($_POST['definition'])) $_POST['definition'] = '';
 
                if ($confirm) {
-                       echo "<h2>", $misc->printVal($_REQUEST['database']), ": {$lang['strtables']}: ",
-                               $misc->printVal($_REQUEST['table']), ": {$lang['straddcheck']}</h2>\n";
+                       $misc->printTrail('table');
+                       $misc->printTitle($lang['straddcheck']);
                        $misc->printMsg($msg);
 
                        echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
                global $PHP_SELF, $lang;
 
                if ($confirm) {
-                       echo "<h2>", $misc->printVal($_REQUEST['database']), ": {$lang['strtables']}: ",
-                               $misc->printVal($_REQUEST['table']), ": " , $misc->printVal($_REQUEST['constraint']), ": {$lang['strdrop']}</h2>\n";
+                       $misc->printTrail('constraint');
+                       $misc->printTitle($lang['strdrop'],'constraint');
 
                        echo "<p>", sprintf($lang['strconfdropconstraint'], $misc->printVal($_REQUEST['constraint']),
                                $misc->printVal($_REQUEST['table'])), "</p>\n";
                        }
                }
                
-               $misc->printTitle(array($misc->printVal($_REQUEST['database']), $misc->printVal($_REQUEST['table']), $lang['strconstraints']),'constraints');
+               $misc->printTrail('table');
+               $misc->printTabs('table','constraints');
                $misc->printMsg($msg);
 
                $constraints = &$data->getConstraints($_REQUEST['table']);
        else
                $misc->printBody();
 
-       $misc->printNav('table','constraints');
-
        switch ($action) {
                case 'add_foreign_key':
                        addForeignKey(1);
index 87b1a2db7fea5b63f61d210a1d0696f823dbbb9e..7437e0dc4b2a12d7867d18733521e176cc5ef6c6 100644 (file)
@@ -3,7 +3,7 @@
        /**
         * Manage conversions in a database
         *
-        * $Id: conversions.php,v 1.8 2004/07/13 16:13:15 jollytoad Exp $
+        * $Id: conversions.php,v 1.9 2004/09/01 16:35:58 jollytoad Exp $
         */
 
        // Include application functions
@@ -20,7 +20,8 @@
                global $data, $conf, $misc, $database;
                global $PHP_SELF, $lang;
 
-               $misc->printTitle(array($misc->printVal($_REQUEST['database']), $lang['strconversions']), 'conversions');
+               $misc->printTrail('schema');
+               $misc->printTabs('schema', 'conversions');
                $misc->printMsg($msg);
                
                $conversions = &$data->getconversions();
@@ -56,7 +57,6 @@
 
        $misc->printHeader($lang['strconversions']);
        $misc->printBody();
-       $misc->printNav('schema','conversions');
 
        switch ($action) {
                default:
index c2421de74b95edf77a73e3bd06735f8e76771d19..d00ca4bb2cf16eb8d35dbdd08bf9aebf81138b12 100755 (executable)
@@ -3,7 +3,7 @@
        /**
         * Manage schemas within a database
         *
-        * $Id: database.php,v 1.61 2004/08/26 08:29:56 jollytoad Exp $
+        * $Id: database.php,v 1.62 2004/09/01 16:35:58 jollytoad Exp $
         */
 
        // Include application functions
@@ -40,8 +40,8 @@
                if (!isset($_GET['term'])) $_GET['term'] = '';
                if (!isset($_GET['filter'])) $_GET['filter'] = '';
 
-               $misc->printNav('database','find');
-               $misc->printTitle(array($misc->printVal($_REQUEST['database']),$lang['strfind']));
+               $misc->printTrail('database');
+               $misc->printTabs('database','find');
                $misc->printMsg($msg);
                
                echo "<form action=\"$PHP_SELF\" method=\"get\">\n";
                global $data, $misc;
                global $PHP_SELF, $lang;
 
-               $misc->printNav('database','export');
-               $misc->printTitle(array($misc->printVal($_REQUEST['database']),$lang['strexport']));
+               $misc->printTrail('database');
+               $misc->printTabs('database','export');
                $misc->printMsg($msg);
 
                echo "<form action=\"dbexport.php\" method=\"post\">\n";
                // Fetch the variables from the database
                $variables = &$data->getVariables();
                
-               $misc->printNav('database','variables');
-               $misc->printTitle(array($misc->printVal($_REQUEST['database']),$lang['strvariables']),'runtime_config');
+               $misc->printTrail('database');
+               $misc->printTabs('database','variables');
 
                $columns = array(
                        'variable' => array(
                // Fetch the processes from the database
                $processes = &$data->getProcesses($_REQUEST['database']);
                
-               $misc->printNav('database','processes');
-               $misc->printTitle(array($misc->printVal($_REQUEST['database']), $lang['strprocesses']), 'processes');
+               $misc->printTrail('database');
+               $misc->printTabs('database','processes');
                $misc->printMsg($msg);
                
                $columns = array(
                                else doAdmin('', $lang['strreindexbad']);
                                break;
                        default:
-                               $misc->printNav('database','admin');
-                               $misc->printTitle(array($misc->printVal($_REQUEST['database']),$lang['stradmin']));
+                               $misc->printTrail('database');
+                               $misc->printTabs('database','admin');
                                $misc->printMsg($msg);
                                
                                // Vacuum
 
                if (!isset($_REQUEST['query'])) $_REQUEST['query'] = '';
 
-               $misc->printNav('database','sql');
-               $misc->printTitle(array($misc->printVal($_REQUEST['database']),$lang['strsql']),'sql');
+               $misc->printTrail('database');
+               $misc->printTabs('database','sql');
 
                echo "<p>{$lang['strentersql']}</p>\n";
                echo "<form action=\"sql.php\" method=\"post\" enctype=\"multipart/form-data\">\n";
                global $lang, $_reload_browser;
 
                if ($confirm) {
-                       $misc->printNav('database','schemas');
-                       $misc->printTitle(array($misc->printVal($_REQUEST['database']),$misc->printVal($_REQUEST['schema']),$lang['strdrop']),'drop_schema');
+                       $misc->printTrail('schema');
+                       $misc->printTitle($lang['strdrop'],'drop_schema');
 
                        echo "<p>", sprintf($lang['strconfdropschema'], $misc->printVal($_REQUEST['schema'])), "</p>\n";
 
                // Fetch all tablespaces from the database
                if ($data->hasTablespaces()) $tablespaces = &$data->getTablespaces();
 
-               $misc->printNav('database','schemas');
-               $misc->printTitle(array($misc->printVal($_REQUEST['database']),$lang['strcreateschema']),'create_schema');
+               $misc->printTrail('database');
+               $misc->printTitle($lang['strcreateschema'],'create_schema');
                $misc->printMsg($msg);
                
                echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
                global $data, $misc, $conf;
                global $PHP_SELF, $lang;
                
-               $misc->printNav('database','schemas');
-               $misc->printTitle(array($misc->printVal($_REQUEST['database']),$lang['strschemas']),'schemas');
+               $misc->printTrail('database');
+               $misc->printTabs('database','schemas');
                $misc->printMsg($msg);
                
                // Check that the DB actually supports schemas
        function doAlterSchema($msg = '') {
                global $data, $misc,$PHP_SELF, $lang;
                
-               $misc->printNav('database','schemas');
-               $misc->printTitle(array($misc->printVal($_REQUEST['database']),$misc->printVal($_REQUEST['schema']),$lang['stralter']),'alter_schema');
+               $misc->printTrail('schema');
+               $misc->printTitle($lang['stralter'],'alter_schema');
                $misc->printMsg($msg);
 
                $schema = &$data->getSchemaByName($_REQUEST['schema']);
index 9d63084c33e5d6f9e0bfc93a39612be4371bb873..f6b92d899061eaf3d592b79997f2b9ac38f566d6 100644 (file)
@@ -3,7 +3,7 @@
        /**
         * Does an import to a particular table from a text file
         *
-        * $Id: dataimport.php,v 1.5 2004/08/19 01:21:49 chriskl Exp $
+        * $Id: dataimport.php,v 1.6 2004/09/01 16:35:58 jollytoad Exp $
         */
 
        // Include application functions
        }
 
 
-       $misc->printHeader($lang['strimport']);         
-       $misc->printNav('table','import');
-       echo "<h2>", $misc->printVal($_REQUEST['database']), ": ", $misc->printVal($_REQUEST['table']), ": {$lang['strimport']}</h2>\n";
+       $misc->printHeader($lang['strimport']);
+       $misc->printTrail('table');
+       $misc->printTabs('table','import');
 
        // Check that file is specified and is an uploaded file
        if (isset($_FILES['source']) && is_uploaded_file($_FILES['source']['tmp_name']) && is_readable($_FILES['source']['tmp_name'])) {
index 8f91391bbd0860a82a8f635eac7af70dac9fe448..a8b9130060c3b19d83eb5aeebbb1944969fccd53 100644 (file)
@@ -3,7 +3,7 @@
        /**
         * Manage domains in a database
         *
-        * $Id: domains.php,v 1.17 2004/07/23 12:05:19 jollytoad Exp $
+        * $Id: domains.php,v 1.18 2004/09/01 16:35:58 jollytoad Exp $
         */
 
        // Include application functions
@@ -34,7 +34,8 @@
                global $data, $misc;
                global $PHP_SELF, $lang;
        
-               echo "<h2>", $misc->printVal($_REQUEST['database']), ": {$lang['strdomains']}: ", $misc->printVal($_REQUEST['domain']), ": {$lang['stralter']}</h2>\n";
+               $misc->printTrail('domain');
+               $misc->printTitle($lang['stralter']);
                $misc->printMsg($msg);
                
                // Fetch domain info
@@ -94,8 +95,8 @@
                if (!isset($_POST['definition'])) $_POST['definition'] = '';
 
                if ($confirm) {
-                       echo "<h2>", $misc->printVal($_REQUEST['database']), ": {$lang['strdomains']}: ",
-                               $misc->printVal($_REQUEST['domain']), ": {$lang['straddcheck']}</h2>\n";
+                       $misc->printTrail('domain');
+                       $misc->printTitle($lang['straddcheck']);
                        $misc->printMsg($msg);
 
                        echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
                global $data, $misc;
                global $PHP_SELF, $lang;
 
-               if ($confirm) { 
-                       echo "<h2>", $misc->printVal($_REQUEST['database']), ": {$lang['strdomains']}: ", 
-                               $misc->printVal($_REQUEST['domain']), ": ", $misc->printVal($_REQUEST['constraint']), ": {$lang['strdrop']}</h2>\n";
+               if ($confirm) {
+                       $misc->printTrail('domain');
+                       $misc->printTitle($lang['strdrop']);
                        $misc->printMsg($msg);
                        
                        echo "<p>", sprintf($lang['strconfdropconstraint'], $misc->printVal($_REQUEST['constraint']), 
                global $data, $misc;
                global $PHP_SELF, $lang;
        
-               echo "<h2>", $misc->printVal($_REQUEST['database']), ": {$lang['strdomains']}: ", $misc->printVal($_REQUEST['domain']), ": {$lang['strproperties']}</h2>\n";
+               $misc->printTrail('domain');
+               $misc->printTitle($lang['strproperties']);
                $misc->printMsg($msg);
                
                $domaindata = &$data->getDomain($_REQUEST['domain']);
                global $data, $misc;
                global $PHP_SELF, $lang;
 
-               if ($confirm) { 
-                       echo "<h2>", $misc->printVal($_REQUEST['database']), ": {$lang['strdomains']}: ", $misc->printVal($_REQUEST['domain']), ": {$lang['strdrop']}</h2>\n";
+               if ($confirm) {
+                       $misc->printTrail('domain');
+                       $misc->printTitle($lang['strdrop']);
                        
                        echo "<p>", sprintf($lang['strconfdropdomain'], $misc->printVal($_REQUEST['domain'])), "</p>\n";        
                        echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
 
                $types = &$data->getTypes(true);
                
-               echo "<h2>", $misc->printVal($_REQUEST['database']), ": {$lang['strdomains']}: {$lang['strcreatedomain']}</h2>\n";
+               $misc->printTrail('schema');
+               $misc->printTitle($lang['strcreatedomain']);
                $misc->printMsg($msg);
 
                echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
                global $data, $conf, $misc;
                global $PHP_SELF, $lang;
                
-               $misc->printTitle(array($misc->printVal($_REQUEST['database']), $lang['strdomains']), 'domains');
+               $misc->printTrail('schema');
+               $misc->printTabs('schema','domains');
                $misc->printMsg($msg);
                
                $domains = &$data->getDomains();
 
        $misc->printHeader($lang['strdomains']);
        $misc->printBody();
-       $misc->printNav('schema','domains');
 
        switch ($action) {
                case 'add_check':
index b4092fe2a26c0827c4686dd434e5ba9ee14e778a..d0a1c3b8e3d6119c850acaeb549c5d477de337de 100644 (file)
@@ -3,7 +3,7 @@
        /**
         * Manage functions in a database
         *
-        * $Id: functions.php,v 1.43 2004/08/26 08:29:56 jollytoad Exp $
+        * $Id: functions.php,v 1.44 2004/09/01 16:35:58 jollytoad Exp $
         */
 
        // Include application functions
@@ -47,8 +47,8 @@
                global $data, $misc;
                global $PHP_SELF, $lang;
                
-               $misc->printNav('function','definition');
-               echo "<h2>", $misc->printVal($_REQUEST['database']), ": {$lang['strfunctions']}: ", $misc->printVal($_REQUEST['function']), ": {$lang['stralter']}</h2>\n";
+               $misc->printTrail('function');
+               $misc->printTitle($lang['stralter']);
                $misc->printMsg($msg);
 
                $fndata = &$data->getFunction($_REQUEST['function_oid']);
                global $data, $misc;
                global $PHP_SELF, $lang;
                
-               $misc->printNav('function','definition');
-               echo "<h2>", $misc->printVal($_REQUEST['database']), ": {$lang['strfunctions']}: ", $misc->printVal($_REQUEST['function']), ": {$lang['strproperties']}</h2>\n";
+               $misc->printTrail('function');
+               $misc->printTitle($lang['strproperties'],'functions');
                $misc->printMsg($msg);
                
                $funcdata = &$data->getFunction($_REQUEST['function_oid']);
                global $PHP_SELF, $lang;
 
                if ($confirm) {
-                       $misc->printNav('schema','functions');
-
-                       echo "<h2>", $misc->printVal($_REQUEST['database']), ": {$lang['strfunctions']}: ", $misc->printVal($_REQUEST['function']), ": {$lang['strdrop']}</h2>\n";
+                       $misc->printTrail('schema');
+                       $misc->printTitle($lang['strdrop'],'drop_function');
                        
                        echo "<p>", sprintf($lang['strconfdropfunction'], $misc->printVal($_REQUEST['function'])), "</p>\n";    
                        
                global $data, $misc;
                global $PHP_SELF, $lang;
                
-               $misc->printNav('schema','functions');
+               $misc->printTrail('schema');
                
                if (!isset($_POST['formFunction'])) $_POST['formFunction'] = '';
                if (!isset($_POST['formArguments'])) $_POST['formArguments'] = '';
                $langs = &$data->getLanguages(true);
                $fnlang = strtolower($_POST['formLanguage']);
 
-               echo "<h2>", $misc->printVal($_REQUEST['database']), ": {$lang['strfunctions']}: ";
-               if ($fnlang == 'c') echo $lang['strcreatecfunction'];
-               else if ($fnlang == 'internal') echo $lang['strcreateinternalfunction'];
-               else echo $lang['strcreateplfunction'];
-               echo "</h2>\n";
+               switch ($fnlang) {
+                       case 'c':
+                               $desc = $lang['strcreatecfunction'];
+                               break;
+                       case 'internal':
+                               $desc = $lang['strcreateinternalfunction'];
+                               break;
+                       default:
+                               $desc = $lang['strcreateplfunction'];
+               }
+               $misc->printTitle($desc, 'functions');
                $misc->printMsg($msg);
 
                echo "<form action=\"$PHP_SELF\" method=post>\n";
                        $rowdata->f['+proreturns'] = ($data->phpBool($rowdata->f['proretset']) ? 'setof ' : '') . $rowdata->f['proresult'];
                }
                
-               $misc->printNav('schema','functions');
-               $misc->printTitle(array($misc->printVal($_REQUEST['database']), $lang['strfunctions']), 'functions');
+               $misc->printTrail('schema');
+               $misc->printTabs('schema','functions');
                $misc->printMsg($msg);
                
                $funcs = &$data->getFunctions();
index 7047f345607e504bff5d4a3d175a72b343b45ec6..30a12ebec602d9a7be4b0b7a0af56fd0c6f4a233 100644 (file)
@@ -3,7 +3,7 @@
        /**
         * Manage groups in a database cluster
         *
-        * $Id: groups.php,v 1.17 2004/07/13 15:24:41 jollytoad Exp $
+        * $Id: groups.php,v 1.18 2004/09/01 16:35:58 jollytoad Exp $
         */
 
        // Include application functions
@@ -20,7 +20,7 @@
                global $data, $misc;
                global $PHP_SELF, $lang;
 
-               $status = $data->addGroupMember($_REQUEST['groname'], $_REQUEST['user']);
+               $status = $data->addGroupMember($_REQUEST['group'], $_REQUEST['user']);
                if ($status == 0)
                        doProperties($lang['strmemberadded']);
                else
                global $PHP_SELF, $lang;
 
                if ($confirm) { 
-                       echo "<h2>{$lang['strgroups']}: ", $misc->printVal($_REQUEST['groname']), ": {$lang['strdropmember']}</h2>\n";
+                       $misc->printTrail('group');
+                       $misc->printTitle($lang['strdropmember']);
                        
-                       echo "<p>", sprintf($lang['strconfdropmember'], $misc->printVal($_REQUEST['user']), $misc->printVal($_REQUEST['groname'])), "</p>\n";
+                       echo "<p>", sprintf($lang['strconfdropmember'], $misc->printVal($_REQUEST['user']), $misc->printVal($_REQUEST['group'])), "</p>\n";
                        
                        echo "<form action=\"{$PHP_SELF}\" method=\"post\">\n";
                        echo "<input type=\"hidden\" name=\"action\" value=\"drop_member\" />\n";
-                       echo "<input type=\"hidden\" name=\"groname\" value=\"", htmlspecialchars($_REQUEST['groname']), "\" />\n";
+                       echo "<input type=\"hidden\" name=\"group\" value=\"", htmlspecialchars($_REQUEST['group']), "\" />\n";
                        echo "<input type=\"hidden\" name=\"user\" value=\"", htmlspecialchars($_REQUEST['user']), "\" />\n";
                        echo "<input type=\"submit\" name=\"drop\" value=\"{$lang['strdrop']}\" />\n";
                        echo "<input type=\"submit\" name=\"cancel\" value=\"{$lang['strcancel']}\" />\n";
                        echo "</form>\n";
                }
                else {
-                       $status = $data->dropGroupMember($_REQUEST['groname'], $_REQUEST['user']);
+                       $status = $data->dropGroupMember($_REQUEST['group'], $_REQUEST['user']);
                        if ($status == 0)
                                doProperties($lang['strmemberdropped']);
                        else
        
                if (!isset($_POST['user'])) $_POST['user'] = '';
        
-               echo "<h2>{$lang['strgroup']}: ", $misc->printVal($_REQUEST['groname']), ": {$lang['strproperties']}</h2>\n";
+               $misc->printTrail('group');
+               $misc->printTitle($lang['strproperties'],'groups');
                $misc->printMsg($msg);
                
-               $groupdata = &$data->getGroup($_REQUEST['groname']);
+               $groupdata = &$data->getGroup($_REQUEST['group']);
                $users = &$data->getUsers();
                
                if ($groupdata->recordCount() > 0) {
@@ -78,8 +80,8 @@
                while (!$groupdata->EOF) {
                                        $id = (($i % 2) == 0 ? '1' : '2');
                echo "<tr><td class=\"data{$id}\">", $misc->printVal($groupdata->f['usename']), "</td>\n";
-                                       echo "<td class=\"opbutton{$id}\"><a href=\"$PHP_SELF?action=confirm_drop_member&{$misc->href}&groname=",
-                                               urlencode($_REQUEST['groname']), "&user=", urlencode($groupdata->f['usename']), "\">{$lang['strdrop']}</a></td>\n";
+                                       echo "<td class=\"opbutton{$id}\"><a href=\"$PHP_SELF?action=confirm_drop_member&{$misc->href}&group=",
+                                               urlencode($_REQUEST['group']), "&user=", urlencode($groupdata->f['usename']), "\">{$lang['strdrop']}</a></td>\n";
                echo "</tr>\n";
                $groupdata->moveNext();
                }
                echo "</select>\n";
                echo "<input type=\"submit\" value=\"{$lang['straddmember']}\" />\n";
                echo $misc->form;
-               echo "<input type=\"hidden\" name=\"groname\" value=\"", htmlspecialchars($_REQUEST['groname']), "\" />\n";
+               echo "<input type=\"hidden\" name=\"group\" value=\"", htmlspecialchars($_REQUEST['group']), "\" />\n";
                echo "<input type=\"hidden\" name=\"action\" value=\"add_member\" />\n";
                echo "</form>\n";
                
                global $data, $misc;
                global $PHP_SELF, $lang;
 
-               if ($confirm) { 
-                       echo "<h2>{$lang['strgroups']}: ", $misc->printVal($_REQUEST['groname']), ": {$lang['strdrop']}</h2>\n";
+               if ($confirm) {
+                       $misc->printTrail('group');
+                       $misc->printTitle($lang['strdrop']);
                        
-                       echo "<p>", sprintf($lang['strconfdropgroup'], $misc->printVal($_REQUEST['groname'])), "</p>\n";
+                       echo "<p>", sprintf($lang['strconfdropgroup'], $misc->printVal($_REQUEST['group'])), "</p>\n";
                        
                        echo "<form action=\"{$PHP_SELF}\" method=\"post\">\n";
                        echo "<input type=\"hidden\" name=\"action\" value=\"drop\" />\n";
-                       echo "<input type=\"hidden\" name=\"groname\" value=\"", htmlspecialchars($_REQUEST['groname']), "\" />\n";
+                       echo "<input type=\"hidden\" name=\"group\" value=\"", htmlspecialchars($_REQUEST['group']), "\" />\n";
                        echo "<input type=\"submit\" name=\"drop\" value=\"{$lang['strdrop']}\" />\n";
                        echo "<input type=\"submit\" name=\"cancel\" value=\"{$lang['strcancel']}\" />\n";
                        echo "</form>\n";
                }
                else {
-                       $status = $data->dropGroup($_REQUEST['groname']);
+                       $status = $data->dropGroup($_REQUEST['group']);
                        if ($status == 0)
                                doDefault($lang['strgroupdropped']);
                        else
                // Fetch a list of all users in the cluster
                $users = &$data->getUsers();
                
-               echo "<h2>{$lang['strgroups']}: {$lang['strcreategroup']}</h2>\n";
+               $misc->printTrail('server');
+               $misc->printTitle($lang['strcreategroup'],'groups');
                $misc->printMsg($msg);
 
                echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
                global $data, $misc;
                global $PHP_SELF, $lang;
                
-               $misc->printTitle(array($lang['strgroups']), 'groups');
+               $misc->printTrail('server');
+               $misc->printTabs('server','groups');
                $misc->printMsg($msg);
                
                $groups = &$data->getGroups();
                        'properties' => array(
                                'title' => $lang['strproperties'],
                                'url'   => "{$PHP_SELF}?action=properties&amp;{$misc->href}&amp;",
-                               'vars'  => array('groname' => 'groname'),
+                               'vars'  => array('group' => 'groname'),
                        ),
                        'drop' => array(
                                'title' => $lang['strdrop'],
                                'url'   => "{$PHP_SELF}?action=confirm_drop&amp;{$misc->href}&amp;",
-                               'vars'  => array('groname' => 'groname'),
+                               'vars'  => array('group' => 'groname'),
                        ),
                );
                
 
        $misc->printHeader($lang['strgroups']);
        $misc->printBody();
-       $misc->printNav('server','groups');
 
        switch ($action) {
                case 'add_member':
index 68310240443829be823a94c9f72e0ef6153a3665..fee22a282d616631096a3c704b23f4fb26649640 100644 (file)
@@ -3,7 +3,7 @@
        /**
         * List indexes on a table
         *
-        * $Id: indexes.php,v 1.32 2004/07/15 09:30:27 jollytoad Exp $
+        * $Id: indexes.php,v 1.33 2004/09/01 16:35:58 jollytoad Exp $
         */
 
        // Include application functions
@@ -24,8 +24,8 @@
                        // Default analyze to on
                        $_REQUEST['analyze'] = true;
                        
-                       echo "<h2>", $misc->printVal($_REQUEST['database']), ": {$lang['strtables']}: ",
-                               $misc->printVal($_REQUEST['table']), ": " , $misc->printVal($_REQUEST['index']), ": {$lang['strcluster']}</h2>\n";
+                       $misc->printTrail('index');
+                       $misc->printTitle($lang['strcluster']);
 
                        echo "<p>", sprintf($lang['strconfcluster'], $misc->printVal($_REQUEST['index'])), "</p>\n";
 
@@ -83,7 +83,8 @@
                // Fetch all tablespaces from the database
                if ($data->hasTablespaces()) $tablespaces = &$data->getTablespaces();
                
-               echo "<h2>", $misc->printVal($_REQUEST['database']), ": {$lang['strindexes']}: {$lang['strcreateindex']} </h2>\n";
+               $misc->printTrail('table');
+               $misc->printTitle($lang['strcreateindex']);
                $misc->printMsg($msg);
 
                $selColumns = new XHTML_select("TableColumnList",true,10);
                global $PHP_SELF, $lang;
 
                if ($confirm) {
-                       echo "<h2>", $misc->printVal($_REQUEST['database']), ": {$lang['strtables']}: ",
-                               $misc->printVal($_REQUEST['table']), ": " , $misc->printVal($_REQUEST['index']), ": {$lang['strdrop']}</h2>\n";
+                       $misc->printTrail('index');
+                       $misc->printTitle($lang['strdrop']);
 
                        echo "<p>", sprintf($lang['strconfdropindex'], $misc->printVal($_REQUEST['index'])), "</p>\n";
 
                        return $actions;
                }
                
-               $misc->printTitle(array($misc->printVal($_REQUEST['database']), $misc->printVal($_REQUEST['table']), $lang['strindexes']));
+               $misc->printTrail('table');
+               $misc->printTabs('table','indexes');
                $misc->printMsg($msg);
 
                $indexes = &$data->getIndexes($_REQUEST['table']);
        else
                $misc->printBody();
 
-       $misc->printNav('table','indexes');
-
        switch ($action) {
                case 'cluster_index':
                        if (isset($_POST['cluster'])) doClusterIndex(false);
index 79177f47e749d5f16e868e8260ec6781c6f31f1b..81a38f48b729c2425c648b6f980978eda8994a71 100644 (file)
--- a/info.php
+++ b/info.php
@@ -3,7 +3,7 @@
        /**
         * List extra information on a table
         *
-        * $Id: info.php,v 1.8 2004/07/13 16:13:15 jollytoad Exp $
+        * $Id: info.php,v 1.9 2004/09/01 16:35:58 jollytoad Exp $
         */
 
        // Include application functions
@@ -19,8 +19,8 @@
                global $data, $misc;
                global $lang;
 
-               $misc->printNav('table','info');
-               echo "<h2>", $misc->printVal($_REQUEST['database']), ": ", $misc->printVal($_REQUEST['table']), ": {$lang['strinfo']}</h2>\n";
+               $misc->printTrail('table');
+               $misc->printTabs('table','info');
                $misc->printMsg($msg);
 
                // common params for printVal
index b77d454c8a57073797922e064f91d1059cb37328..5b48cc9620334ee9bfdca33a0659f2bb73ec88d9 100644 (file)
@@ -3,7 +3,7 @@
        /**
         * Manage languages in a database
         *
-        * $Id: languages.php,v 1.6 2004/07/13 16:13:15 jollytoad Exp $
+        * $Id: languages.php,v 1.7 2004/09/01 16:35:59 jollytoad Exp $
         */
 
        // Include application functions
@@ -20,7 +20,8 @@
                global $data, $misc, $database;
                global $PHP_SELF, $lang;
                
-               $misc->printTitle(array($misc->printVal($_REQUEST['database']), $lang['strlanguages']));
+               $misc->printTrail('database');
+               $misc->printTabs('database','languages');
                $misc->printMsg($msg);
                
                $languages = &$data->getlanguages();
@@ -48,7 +49,6 @@
 
        $misc->printHeader($lang['strlanguages']);
        $misc->printBody();
-       $misc->printNav('database','languages');
 
        switch ($action) {
                default:
index 77b0f61c9d99bfac1d86ded44f6740cd33d6a989..9924358264b1ac7f3fa109cc96dca3b92737df2a 100644 (file)
@@ -3,7 +3,7 @@
        /**
         * Manage opclasss in a database
         *
-        * $Id: opclasses.php,v 1.5 2004/07/13 16:13:15 jollytoad Exp $
+        * $Id: opclasses.php,v 1.6 2004/09/01 16:35:59 jollytoad Exp $
         */
 
        // Include application functions
@@ -19,7 +19,8 @@
                global $data, $conf, $misc;
                global $lang;
                
-               $misc->printTitle(array($misc->printVal($_REQUEST['database']), $lang['stropclasses']), 'opclasses');
+               $misc->printTrail('schema');
+               $misc->printTabs('schema','opclasses');
                $misc->printMsg($msg);
                
                $opclasses = &$data->getOpClasses();
@@ -55,7 +56,6 @@
 
        $misc->printHeader($lang['stropclasses']);
        $misc->printBody();
-       $misc->printNav('schema','opclasses');
 
        switch ($action) {
                default:
index 8a9f734b0dde285c515d6da8ae3c12ca726eb138..03af73677a7a59b1883531914bf224cfa51ed2ef 100644 (file)
@@ -3,7 +3,7 @@
        /**
         * Manage operators in a database
         *
-        * $Id: operators.php,v 1.15 2004/07/13 15:24:41 jollytoad Exp $
+        * $Id: operators.php,v 1.16 2004/09/01 16:35:59 jollytoad Exp $
         */
 
        // Include application functions
@@ -20,7 +20,8 @@
                global $data, $misc;
                global $PHP_SELF, $lang;
 
-               $misc->printTitle(array($misc->printVal($_REQUEST['database']), $lang['stroperators'], $misc->printVal($_REQUEST['operator']), $lang['strproperties']), 'operators');
+               $misc->printTrail('operator');
+               $misc->printTitle($lang['strproperties'],'operators');
                $misc->printMsg($msg);
                
                $oprdata = &$data->getOperator($_REQUEST['operator_oid']);
@@ -69,8 +70,9 @@
                global $data, $misc;
                global $PHP_SELF, $lang;
 
-               if ($confirm) { 
-                       $misc->printTitle(array($misc->printVal($_REQUEST['database']), $lang['stroperators'], $misc->printVal($_REQUEST['operator']), $lang['strdrop']), 'drop_operator');
+               if ($confirm) {
+                       $misc->printTrail('operator');
+                       $misc->printTitle($lang['strdrop'], 'drop_operator');
                        
                        echo "<p>", sprintf($lang['strconfdropoperator'], $misc->printVal($_REQUEST['operator'])), "</p>\n";    
                        
        function doDefault($msg = '') {
                global $data, $conf, $misc;
                global $PHP_SELF, $lang;
-
-               $misc->printTitle(array($misc->printVal($_REQUEST['database']), $lang['stroperators']), 'operators');
+               
+               $misc->printTrail('schema');
+               $misc->printTabs('schema','operators');
                $misc->printMsg($msg);
                
                $operators = &$data->getOperators();
 
        $misc->printHeader($lang['stroperators']);
        $misc->printBody();
-       $misc->printNav('schema','operators');
 
        switch ($action) {
                case 'save_create':
index f050c08fa0ad866e759f18085fb68461751305ac..6d91f054b7317aa3c08ccb2fae739ed1e8c39155 100644 (file)
@@ -3,7 +3,7 @@
        /**
         * Manage privileges in a database
         *
-        * $Id: privileges.php,v 1.29 2004/08/26 08:29:56 jollytoad Exp $
+        * $Id: privileges.php,v 1.30 2004/09/01 16:35:59 jollytoad Exp $
         */
 
        // Include application functions
         */
        function doAlter($confirm, $mode, $msg = '') {
                global $data, $misc;
-               global $PHP_SELF, $lang;
+               global $PHP_SELF, $lang;
 
+               $misc->printTrail($_REQUEST['subject']);
+               
                if (!isset($_REQUEST['username'])) $_REQUEST['username'] = array();
                if (!isset($_REQUEST['groupname'])) $_REQUEST['groupname'] = array();
                if (!isset($_REQUEST['privilege'])) $_REQUEST['privilege'] = array();
                        // Get groups from the database
                        $groups = &$data->getGroups();
 
-                       if ($mode == 'grant')
-                               echo "<h2>{$lang['strprivileges']}: ", $misc->printVal($name), ": {$lang['strgrant']}</h2>\n";
-                       elseif ($mode == 'revoke')
-                               echo "<h2>{$lang['strprivileges']}: ", $misc->printVal($name), ": {$lang['strrevoke']}</h2>\n";
+                       if ($mode == 'grant') $desc = $lang['strgrant'];
+                       else if ($mode == 'revoke') $desc = $lang['strrevoke'];
+                       
+                       $misc->printTitle($desc);
                        $misc->printMsg($msg);
+                       
                        echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
                        echo "<table>\n";
                        echo "<tr><th class=\"data left\">{$lang['strusers']}</th>\n";
                global $data, $misc, $database;
                global $PHP_SELF, $lang;
 
-               $misc->printTitle(array($lang['strprivileges']));
+               $misc->printTrail($_REQUEST['subject']);
+               
+               # @@@FIXME: This switch is just a temporary solution,
+               # need a better way, maybe every type of object should
+               # have a tab bar???
+               switch ($_REQUEST['subject']) {
+                       case 'server':
+                       case 'database':
+                       case 'schema':
+                       case 'table':
+                       case 'view':
+                               $misc->printTabs($_REQUEST['subject'], 'privileges');
+                               break;
+                       default:
+                               $misc->printTitle($lang['strprivileges']);
+               }
                $misc->printMsg($msg);
 
                // Determine whether object should be ref'd by name or oid.
 
        $misc->printHeader($lang['strprivileges']);
        $misc->printBody();
-       $misc->printNav($_REQUEST['subject'], 'privileges');
 
        switch ($action) {
                case 'save':
index b677a48185c9c17f45f9b521f6a334b7170853fd..04130a52621302262abfc6f6755ab93647849250 100644 (file)
--- a/rules.php
+++ b/rules.php
@@ -3,7 +3,7 @@
        /**
         * List rules on a table OR view
         *
-        * $Id: rules.php,v 1.21 2004/08/26 08:29:56 jollytoad Exp $
+        * $Id: rules.php,v 1.22 2004/09/01 16:35:59 jollytoad Exp $
         */
 
        // Include application functions
@@ -26,8 +26,8 @@
                if (!isset($_POST['raction'])) $_POST['raction'] = '';
 
                if ($confirm) {
-                       echo "<h2>", $misc->printVal($_REQUEST['database']),
-                               $misc->printVal($_REQUEST[$_REQUEST['subject']]), ": {$lang['strcreaterule']}</h2>\n";
+                       $misc->printTrail($_REQUEST['subject']);
+                       $misc->printTitle($lang['strcreaterule']);
                        $misc->printMsg($msg);
 
                        echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
                global $PHP_SELF, $lang;
 
                if ($confirm) {
-                       echo "<h2>", $misc->printVal($_REQUEST['database']),
-                               $misc->printVal($_REQUEST[$_REQUEST['subject']]), ": " , $misc->printVal($_REQUEST['rule']), ": {$lang['strdrop']}</h2>\n";
+                       $misc->printTrail($_REQUEST['subject']);
+                       $misc->printTitle($lang['strdrop']);
 
                        echo "<p>", sprintf($lang['strconfdroprule'], $misc->printVal($_REQUEST['rule']),
                                $misc->printVal($_REQUEST[$_REQUEST['subject']])), "</p>\n";
 
                        echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
                        echo "<input type=\"hidden\" name=\"action\" value=\"drop\" />\n";
-                       echo "<input type=\"hidden\" name=\"reltype\" value=\"", htmlspecialchars($_REQUEST['subject']), "\" />\n";
+                       echo "<input type=\"hidden\" name=\"subject\" value=\"", htmlspecialchars($_REQUEST['subject']), "\" />\n";
                        echo "<input type=\"hidden\" name=\"relation\" value=\"", htmlspecialchars($_REQUEST[$_REQUEST['subject']]), "\" />\n";
                        echo "<input type=\"hidden\" name=\"rule\" value=\"", htmlspecialchars($_REQUEST['rule']), "\" />\n";
                        echo $misc->form;
                global $PHP_SELF;
                global $lang;
 
-               $misc->printTitle(array($misc->printVal($_REQUEST['database']), $misc->printVal($_REQUEST[$_REQUEST['subject']]), $lang['strrules']));
+               $misc->printTrail($_REQUEST['subject']);
+               $misc->printTabs($_REQUEST['subject'], 'rules');
                $misc->printMsg($msg);
 
                $rules = &$data->getRules($_REQUEST[$_REQUEST['subject']]);
        // Different header if we're view rules or table rules
        $misc->printHeader($_REQUEST[$_REQUEST['subject']] . ' - ' . $lang['strrules']);
        $misc->printBody();
-       $misc->printNav($_REQUEST['subject'],'rules');
 
        switch ($action) {
                case 'create_rule':
index 5d1aadfa52f3d0a26a7a15506507b910d5d58462..70b147f858998f726659853b7abf8feda2c4ad1a 100644 (file)
@@ -3,7 +3,7 @@
        /**
         * Manage sequences in a database
         *
-        * $Id: sequences.php,v 1.25 2004/08/26 08:29:57 jollytoad Exp $
+        * $Id: sequences.php,v 1.26 2004/09/01 16:35:59 jollytoad Exp $
         */
        
        // Include application functions
@@ -20,7 +20,8 @@
                global $data, $conf, $misc; 
                global $PHP_SELF, $lang;
                
-               $misc->printTitle(array($misc->printVal($_REQUEST['database']), $lang['strsequences']), 'sequences');
+               $misc->printTrail('schema');
+               $misc->printTabs('schema', 'sequences');
                $misc->printMsg($msg);
                
                // Get all sequences
@@ -74,7 +75,8 @@
                global $data, $misc, $PHP_SELF;
                global $lang;
                
-               echo "<h2>", $misc->printVal($_REQUEST['database']), ": {$lang['strsequences']} : ", $misc->printVal($_REQUEST['sequence']), ": {$lang['strproperties']}</h2>\n";
+               $misc->printTrail('sequence');
+               $misc->printTitle($lang['strproperties']);
                $misc->printMsg($msg);
                
                // Fetch the sequence information
                global $data, $misc;
                global $PHP_SELF, $lang;
                
-               if ($confirm) { 
-                       echo "<h2>", $misc->printVal($_REQUEST['database']), ": {$lang['strsequences']} : ", $misc->printVal($_REQUEST['sequence']), ": {$lang['strdrop']}</h2>\n";
+               if ($confirm) {
+                       $misc->printTrail('sequence');
+                       $misc->printTitle($lang['strdrop']);
                        $misc->printMsg($msg);
                        
                        echo "<p>", sprintf($lang['strconfdropsequence'], $misc->printVal($_REQUEST['sequence'])), "</p>\n";
                if (!isset($_POST['formStartValue'])) $_POST['formStartValue'] = '';
                if (!isset($_POST['formCacheValue'])) $_POST['formCacheValue'] = '';
                
-               echo "<h2>", $misc->printVal($_REQUEST['database']), ": {$lang['strsequences']} : {$lang['strcreatesequence']} </h2>\n";
+               $misc->printTrail('schema');
+               $misc->printTitle($lang['strcreatesequence']);
                $misc->printMsg($msg);
                
                echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
        // Print header
        $misc->printHeader($lang['strsequences']);
        $misc->printBody();
-       $misc->printNav('schema','sequences');
 
        switch($action) {
                case 'create':
diff --git a/sql.php b/sql.php
index fd5a7cc03df47800bb4b264e5941e952d9ec4a89..6df46bbda414ffee4a64532e2bce094e8b65021a 100644 (file)
--- a/sql.php
+++ b/sql.php
@@ -6,7 +6,7 @@
         * how many SQL statements have been strung together with semi-colons
         * @param $query The SQL query string to execute
         *
-        * $Id: sql.php,v 1.24 2004/07/13 16:13:15 jollytoad Exp $
+        * $Id: sql.php,v 1.25 2004/09/01 16:35:59 jollytoad Exp $
         */
 
        // Include application functions
@@ -33,8 +33,9 @@
 
        $misc->printHeader($lang['strqueryresults']);
        $misc->printBody();
-       $misc->printNav('database','sql');
-       echo "<h2>", $misc->printVal($_REQUEST['database']), ": {$lang['strsql']}: {$lang['strqueryresults']}</h2>\n";
+       $misc->printTrail('database');
+       $misc->printTabs('database','sql');
+       $misc->printTitle($lang['strqueryresults']);
 
        // Set the schema search path
        if ($data->hasSchemas() && isset($_REQUEST['search_path'])) {
index ccae6f8094a5fe17b3cdbd8d54ebda6244f89296..a4672143943ad00ede5c4822695cbb37d0370158 100644 (file)
@@ -3,7 +3,7 @@
        /**
         * List tables in a database
         *
-        * $Id: tables.php,v 1.64 2004/08/31 08:49:38 jollytoad Exp $
+        * $Id: tables.php,v 1.65 2004/09/01 16:35:59 jollytoad Exp $
         */
 
        // Include application functions
@@ -30,7 +30,8 @@
                                // Fetch all tablespaces from the database
                                if ($data->hasTablespaces()) $tablespaces = &$data->getTablespaces();
                                
-                               $misc->printTitleNav('schema', $lang['strcreatetable'], 'create_table');
+                               $misc->printTrail('schema');
+                               $misc->printTitle($lang['strcreatetable'], 'create_table');
                                $misc->printMsg($msg);
                                
                                echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
@@ -94,7 +95,8 @@
 
                                $types = &$data->getTypes(true, false, true);
        
-                               $misc->printTitle(array($misc->printVal($_REQUEST['database']), $lang['strtables'], $lang['strcreatetable']), 'create_table');
+                               $misc->printTrail('schema');
+                               $misc->printTitle($lang['strcreatetable'], 'create_table');
                                $misc->printMsg($msg);
 
                                echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
                global $PHP_SELF;
 
                if ($confirm) {
-                       $misc->printTitleNav('table', $lang['strselect'], 'select');
+                       $misc->printTrail('table');
+                       $misc->printTitle($lang['strselect'], 'select');
                        $misc->printMsg($msg);
 
                        $attrs = &$data->getTableAttributes($_REQUEST['table']);
                global $PHP_SELF;
 
                if ($confirm) {
-                       $misc->printTitleNav('table', $lang['strinsertrow'], 'insert');
+                       $misc->printTrail('table');
+                       $misc->printTitle($lang['strinsertrow'], 'insert');
                        $misc->printMsg($msg);
 
                        $attrs = &$data->getTableAttributes($_REQUEST['table']);
                global $PHP_SELF;
 
                if ($confirm) {
-                       $misc->printTitleNav('table', $lang['strempty']);
+                       $misc->printTrail('table');
+                       $misc->printTitle($lang['strempty']);
 
                        echo "<p>", sprintf($lang['strconfemptytable'], $misc->printVal($_REQUEST['table'])), "</p>\n";
 
                global $PHP_SELF;
 
                if ($confirm) {
-                       $misc->printTitleNav('table', $lang['strdrop'], 'drop_table');
+                       $misc->printTrail('table');
+                       $misc->printTitle($lang['strdrop'], 'drop_table');
 
                        echo "<p>", sprintf($lang['strconfdroptable'], $misc->printVal($_REQUEST['table'])), "</p>\n";
 
                global $PHP_SELF;
 
                if ($confirm) {
-                       $misc->printTitleNav('table', $lang['strvacuum'], 'vacuum');
+                       $misc->printTrail('table');
+                       $misc->printTitle($lang['strvacuum'], 'vacuum');
 
                        echo "<p>", sprintf($lang['strconfvacuumtable'], $misc->printVal($_REQUEST['table'])), "</p>\n";
 
                global $data, $conf, $misc, $data;
                global $PHP_SELF, $lang;
                
-               $misc->printNav('schema','tables');
-               $misc->printTitle(array($misc->printVal($_REQUEST['database']), $lang['strtables']), 'tables');
+               $misc->printTrail('schema');
+               $misc->printTabs('schema','tables');
                $misc->printMsg($msg);
                
                $tables = &$data->getTables();
                                'url'   => "{$PHP_SELF}?action=confirm_vacuum&amp;{$misc->href}&amp;",
                                'vars'  => array('table' => 'relname'),
                        ),
-       );
+               );
                
                if (!$data->hasTablespaces()) unset($columns['tablespace']);
 
index 5ad9864a1654518e5825b15102925bc3b5ffdc2a..ca4c1334e85547d959899ad2e04541629070242a 100755 (executable)
@@ -3,7 +3,7 @@
        /**
         * Manage tablespaces in a database cluster
         *
-        * $Id: tablespaces.php,v 1.4 2004/07/21 07:44:44 jollytoad Exp $
+        * $Id: tablespaces.php,v 1.5 2004/09/01 16:35:59 jollytoad Exp $
         */
 
        // Include application functions
                global $data, $misc;
                global $PHP_SELF, $lang;
                
-               echo "<h2>{$lang['strtablespaces']}: ", $misc->printVal($_REQUEST['spcname']), ": {$lang['stralter']}</h2>\n";
+               $misc->printTrail('tablespace');
+               $misc->printTitle($lang['stralter']);
                $misc->printMsg($msg);
 
                // Fetch tablespace info                
-               $tablespace = &$data->getTablespace($_REQUEST['spcname']);
+               $tablespace = &$data->getTablespace($_REQUEST['tablespace']);
                // Fetch all users              
                $users = &$data->getUsers();
                
@@ -50,7 +51,7 @@
                        echo "</select></td></tr>\n";                           
                        echo "</table>\n";
                        echo "<p><input type=\"hidden\" name=\"action\" value=\"save_edit\" />\n";
-                       echo "<input type=\"hidden\" name=\"spcname\" value=\"", htmlspecialchars($_REQUEST['spcname']), "\" />\n";
+                       echo "<input type=\"hidden\" name=\"tablespace\" value=\"", htmlspecialchars($_REQUEST['tablespace']), "\" />\n";
                        echo $misc->form;
                        echo "<input type=\"submit\" name=\"alter\" value=\"{$lang['stralter']}\" />\n";
                        echo "<input type=\"submit\" name=\"cancel\" value=\"{$lang['strcancel']}\" /></p>\n";
                if (trim($_POST['name']) == '')
                        doAlter($lang['strtablespaceneedsname']);
                else {
-                       $status = $data->alterTablespace($_POST['spcname'], $_POST['name'], $_POST['owner']);
+                       $status = $data->alterTablespace($_POST['tablespace'], $_POST['name'], $_POST['owner']);
                        if ($status == 0) {
                                // If tablespace has been renamed, need to change to the new name
-                               if ($_POST['spcname'] != $_POST['name']) {
+                               if ($_POST['tablespace'] != $_POST['name']) {
                                        // Jump them to the new table name
-                                       $_REQUEST['spcname'] = $_POST['name'];
+                                       $_REQUEST['tablespace'] = $_POST['name'];
                                }
                                doDefault($lang['strtablespacealtered']);
                        }
                global $data, $misc;
                global $PHP_SELF, $lang;
 
-               if ($confirm) { 
-                       echo "<h2>{$lang['strtablespaces']}: ", $misc->printVal($_REQUEST['spcname']), ": {$lang['strdrop']}</h2>\n";
+               if ($confirm) {
+                       $misc->printTrail('tablespace');
+                       $misc->printTitle($lang['strdrop']);
                        
-                       echo "<p>", sprintf($lang['strconfdroptablespace'], $misc->printVal($_REQUEST['spcname'])), "</p>\n";   
+                       echo "<p>", sprintf($lang['strconfdroptablespace'], $misc->printVal($_REQUEST['tablespace'])), "</p>\n";        
                        
                        echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
                        echo "<input type=\"hidden\" name=\"action\" value=\"drop\" />\n";
-                       echo "<input type=\"hidden\" name=\"spcname\" value=\"", htmlspecialchars($_REQUEST['spcname']), "\" />\n";
+                       echo "<input type=\"hidden\" name=\"tablespace\" value=\"", htmlspecialchars($_REQUEST['tablespace']), "\" />\n";
                        echo "<input type=\"submit\" name=\"drop\" value=\"{$lang['strdrop']}\" />\n";
                        echo "<input type=\"submit\" name=\"cancel\" value=\"{$lang['strcancel']}\" />\n";
                        echo "</form>\n";
                }
                else {
-                       $status = $data->droptablespace($_REQUEST['spcname']);
+                       $status = $data->droptablespace($_REQUEST['tablespace']);
                        if ($status == 0)
                                doDefault($lang['strtablespacedropped']);
                        else
                // Fetch all users
                $users = &$data->getUsers();
                
-               echo "<h2>{$lang['strtablespaces']}: {$lang['strcreatetablespace']}</h2>\n";
+               $misc->printTrail('server');
+               $misc->printTitle($lang['strcreatetablespace']);
                $misc->printMsg($msg);
 
                echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
                global $data, $misc;
                global $PHP_SELF, $lang;
                
-               echo "<h2>{$lang['strtablespaces']}</h2>\n";
+               $misc->printTrail('server');
+               $misc->printTabs('server','tablespaces');
                $misc->printMsg($msg);
                
                $tablespaces = &$data->getTablespaces();
                        'alter' => array(
                                'title' => $lang['stralter'],
                                'url'   => "{$PHP_SELF}?action=edit&amp;",
-                               'vars'  => array('spcname' => 'spcname')
+                               'vars'  => array('tablespace' => 'spcname')
                        ),
                        'drop' => array(
                                'title' => $lang['strdrop'],
                                'url'   => "{$PHP_SELF}?action=confirm_drop&amp;",
-                               'vars'  => array('spcname' => 'spcname')
+                               'vars'  => array('tablespace' => 'spcname')
                        ),
                        'privileges' => array(
                                'title' => $lang['strprivileges'],
-                               'url'   => "privileges.php?type=tablespace&amp;",
-                               'vars'  => array('object' => 'spcname')
+                               'url'   => "privileges.php?subject=tablespace&amp;",
+                               'vars'  => array('tablespace' => 'spcname')
                        )
                );
                                
 
        $misc->printHeader($lang['strtablespaces']);
        $misc->printBody();
-       $misc->printNav('server','tablespaces');
 
        switch ($action) {
                case 'save_create':
index cb49b276fb7c8f12b1d9d061136e68fe8e456df2..87a718aee555877e5e36a81cb44faca16b49b86d 100644 (file)
@@ -3,7 +3,7 @@
        /**
         * List tables in a database
         *
-        * $Id: tblproperties.php,v 1.58 2004/08/30 11:50:31 soranzo Exp $
+        * $Id: tblproperties.php,v 1.59 2004/09/01 16:35:59 jollytoad Exp $
         */
 
        // Include application functions
@@ -21,9 +21,9 @@
                // For databases that don't allow owner change
                if (!isset($_POST['owner'])) $_POST['owner'] = '';
                // Default tablespace to null if it isn't set
-               if (!isset($_POST['spcname'])) $_POST['spcname'] = null;
+               if (!isset($_POST['tablespace'])) $_POST['tablespace'] = null;
                
-               $status = $data->alterTable($_POST['table'], $_POST['name'], $_POST['owner'], $_POST['comment'], $_POST['spcname']);
+               $status = $data->alterTable($_POST['table'], $_POST['name'], $_POST['owner'], $_POST['comment'], $_POST['tablespace']);
                if ($status == 0) {
                        // If table has been renamed, need to change to the new name and
                        // reload the browser frame.
@@ -46,8 +46,8 @@
                global $data, $misc;
                global $PHP_SELF, $lang;
                
-               $misc->printNav('table','columns');
-               $misc->printTitle(array($misc->printVal($_REQUEST['database']), $misc->printVal($_REQUEST['table']), $lang['stralter']), 'alter_table');
+               $misc->printTrail('table');
+               $misc->printTitle($lang['stralter'], 'alter_table');
                $misc->printMsg($msg);
 
                // Fetch table info             
@@ -62,7 +62,7 @@
                        if (!isset($_POST['name'])) $_POST['name'] = $table->f['relname'];
                        if (!isset($_POST['owner'])) $_POST['owner'] = $table->f['relowner'];
                        if (!isset($_POST['comment'])) $_POST['comment'] = $table->f['relcomment'];
-                       if ($data->hasTablespaces() && !isset($_POST['spcname'])) $_POST['spcname'] = $table->f['tablespace'];
+                       if ($data->hasTablespaces() && !isset($_POST['tablespace'])) $_POST['tablespace'] = $table->f['tablespace'];
                        
                        echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
                        echo "<table>\n";
                        // Tablespace (if there are any)
                        if ($data->hasTablespaces() && $tablespaces->recordCount() > 0) {
                                echo "\t<tr>\n\t\t<th class=\"data left\">{$lang['strtablespace']}</th>\n";
-                               echo "\t\t<td class=\"data1\">\n\t\t\t<select name=\"spcname\">\n";
+                               echo "\t\t<td class=\"data1\">\n\t\t\t<select name=\"tablespace\">\n";
                                // Always offer the default (empty) option
                                echo "\t\t\t\t<option value=\"\"",
-                                       ($_POST['spcname'] == '') ? ' selected="selected"' : '', "></option>\n";
+                                       ($_POST['tablespace'] == '') ? ' selected="selected"' : '', "></option>\n";
                                // Display all other tablespaces
                                while (!$tablespaces->EOF) {
                                        $spcname = htmlspecialchars($tablespaces->f['spcname']);
                                        echo "\t\t\t\t<option value=\"{$spcname}\"",
-                                               ($spcname == $_POST['spcname']) ? ' selected="selected"' : '', ">{$spcname}</option>\n";
+                                               ($spcname == $_POST['tablespace']) ? ' selected="selected"' : '', ">{$spcname}</option>\n";
                                        $tablespaces->moveNext();
                                }
                                echo "\t\t\t</select>\n\t\t</td>\n\t</tr>\n";
                // Determine whether or not the table has an object ID
                $hasID = $data->hasObjectID($_REQUEST['table']);
                
-               $misc->printNav('table','export');
-               $misc->printTitle(array($misc->printVal($_REQUEST['database']), $misc->printVal($_REQUEST['table']), $lang['strexport']));
+               $misc->printTrail('table');
+               $misc->printTabs('table','export');
                $misc->printMsg($msg);
 
                echo "<form action=\"dataexport.php\" method=\"post\">\n";
                global $data, $misc;
                global $PHP_SELF, $lang;
 
-               $misc->printNav('table','import');
-               $misc->printTitle(array($misc->printVal($_REQUEST['database']), $misc->printVal($_REQUEST['table']), $lang['strimport']));
+               $misc->printTrail('table');
+               $misc->printTabs('table','import');
                $misc->printMsg($msg);
 
                // Check that file uploads are enabled
                                // Fetch all available types
                                $types = &$data->getTypes(true, false, true);
 
-                               $misc->printNav('table','columns');
-                               $misc->printTitle(array($misc->printVal($_REQUEST['database']), $misc->printVal($_REQUEST['table']), $lang['straddcolumn']), 'add_column');
+                               $misc->printTrail('table');
+                               $misc->printTitle($lang['straddcolumn'], 'add_column');
                                $misc->printMsg($msg);
 
                                echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
                        case 1:
                                global $lang;
 
-                               $misc->printNav('table','columns');
-                               $misc->printTitle(array($misc->printVal($_REQUEST['database']), $misc->printVal($_REQUEST['table']), 
-                                       $lang['straltercolumn'], $misc->printVal($_REQUEST['column'])), 'alter_column');
+                               $misc->printTrail('column');
+                               $misc->printTitle($lang['straltercolumn'], 'alter_column'); 
                                $misc->printMsg($msg);
 
                                echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
                global $PHP_SELF, $lang;
 
                if ($confirm) {
-                       $misc->printNav('table','columns');
-                       $misc->printTitle(array($misc->printVal($_REQUEST['database']), $misc->printVal($_REQUEST['table']), 
-                               $misc->printVal($_REQUEST['column']), $lang['strdrop']), 'drop_column');
+                       $misc->printTrail('column');
+                       $misc->printTitle($lang['strdrop'], 'drop_column');
+
             echo "<p>", sprintf($lang['strconfdropcolumn'], $misc->printVal($_REQUEST['column']),
                     $misc->printVal($_REQUEST['table'])), "</p>\n";
                                                                
                        $rowdata->f['+type'] = $data->formatType($rowdata->f['type'], $rowdata->f['atttypmod']);
                }
                
-               $misc->printNav('table','columns');
-               $misc->printTitle(array($misc->printVal($_REQUEST['database']), $misc->printVal($_REQUEST['table'])));
+               $misc->printTrail('table');
+               $misc->printTabs('table','columns');
                $misc->printMsg($msg);
 
                // Get table
index 4ddc4b881e9ed6e0acc19505a463d7cdf2c992af..fee8133435539e26efaaf20d30fb2143868fe4e3 100644 (file)
@@ -1,7 +1,7 @@
 /**
  * Default style sheet
  *
- * $Id: global.css,v 1.28 2004/08/31 08:46:59 jollytoad Exp $
+ * $Id: global.css,v 1.29 2004/09/01 16:35:57 jollytoad Exp $
  */
 
 /** ELEMENTS */
@@ -60,6 +60,10 @@ h2
        font-size: medium; /*1.3em;*/
        font-family: arial, tahoma, verdana, helvetica, sans-serif, serif;
        font-weight: bold;
+       border: 2px solid #E6E6CC;
+       background-color: #F3F3E9;
+       padding: 2px 1em;
+       margin: 0 0 1ex 0;
 }
 
 h3
@@ -190,7 +194,7 @@ td.opbutton2
        padding: 2px 1em;
 }
 
-.trail, .tabs
+.trail
 {
        margin-bottom: 2px;
 }
@@ -199,6 +203,7 @@ td.opbutton2
 {
        width: 100%;
        border-collapse: collapse;
+       margin: 0 0 1ex 0;
 }
 
 .tab
@@ -211,11 +216,6 @@ td.opbutton2
        background-color: #E6E6CC;
 }
 
-.title
-{
-       font-weight: bold;
-}
-
 a,a:active 
 {
        color: #989973;
@@ -245,8 +245,6 @@ a:hover
        text-decoration: none;
 }
 
-a.help { margin-right: 10px }
-
 a.navlink:link, a.toplink:link
 {
        color: #336699;
index 217b0aba036f1fa7faed70e40a201d6edff1c4c2..228e3f7f11145ce383544bbdf68349ba8c286aad 100644 (file)
@@ -3,7 +3,7 @@
        /**
         * List triggers on a table
         *
-        * $Id: triggers.php,v 1.21 2004/07/13 15:24:41 jollytoad Exp $
+        * $Id: triggers.php,v 1.22 2004/09/01 16:35:59 jollytoad Exp $
         */
 
        // Include application functions
@@ -33,7 +33,8 @@
                global $data, $misc;
                global $PHP_SELF, $lang;
                
-               echo "<h2>", $misc->printVal($_REQUEST['database']), ": {$lang['strtriggers']}: ", $misc->printVal($_REQUEST['trigger']), ": {$lang['stralter']}</h2>\n";
+               $misc->printTrail('trigger');
+               $misc->printTitle($lang['stralter']);
                $misc->printMsg($msg);
                
                $triggerdata = &$data->getTrigger($_REQUEST['table'], $_REQUEST['trigger']);
@@ -68,8 +69,8 @@
                global $PHP_SELF, $lang;
 
                if ($confirm) {
-                       echo "<h2>", $misc->printVal($_REQUEST['database']), ": {$lang['strtables']}: ",
-                               $misc->printVal($_REQUEST['table']), ": " , $misc->printVal($_REQUEST['trigger']), ": {$lang['strdrop']}</h2>\n";
+                       $misc->printTrail('trigger');
+                       $misc->printTitle($lang['strdrop']);
 
                        echo "<p>", sprintf($lang['strconfdroptrigger'], $misc->printVal($_REQUEST['trigger']),
                                $misc->printVal($_REQUEST['table'])), "</p>\n";
                global $data, $misc;
                global $PHP_SELF, $lang;
                
-               echo "<h2>{$lang['strcreatetrigger']}</h2>";
+               $misc->printTrail('table');
+               $misc->printTitle($lang['strcreatetrigger']);
                $misc->printMsg($msg);
                
                // Get all the functions that can be used in triggers
                                                                        : $data->getTriggerDef($rowdata->f);
                }
                
-               $misc->printTitle(array($misc->printVal($_REQUEST['database'])), $misc->printVal($_REQUEST['table']), $lang['strtriggers']);
+               $misc->printTrail('table');
+               $misc->printTabs('table','triggers');
                $misc->printMsg($msg);
 
                $triggers = &$data->getTriggers($_REQUEST['table']);
 
        $misc->printHeader($lang['strtables'] . ' - ' . $_REQUEST['table'] . ' - ' . $lang['strtriggers']);
        $misc->printBody();
-       $misc->printNav('table','triggers');
 
        switch ($action) {
                case 'alter':
index 77bfd8defa98a0466b1a10b185da4eaa336ad8e6..28af90b1e16a75c5d571239d1f7d2718faa349c7 100644 (file)
--- a/types.php
+++ b/types.php
@@ -3,7 +3,7 @@
        /**
         * Manage types in a database
         *
-        * $Id: types.php,v 1.23 2004/08/22 00:06:33 soranzo Exp $
+        * $Id: types.php,v 1.24 2004/09/01 16:35:59 jollytoad Exp $
         */
 
        // Include application functions
                // Get type (using base name)
                $typedata = &$data->getType($_REQUEST['type']);
 
-               $misc->printTitle(array($misc->printVal($_REQUEST['database']), $lang['strtypes'], 
-                               $misc->printVal($typedata->f['typname']), $lang['strproperties']), 'types');
+               $misc->printTrail('type');
+               $misc->printTitle($lang['strproperties'], 'types');
                $misc->printMsg($msg);
                
-               
                if ($typedata->recordCount() > 0) {
                        switch ($typedata->f['typtype']) {
                        case 'c':
@@ -89,8 +88,9 @@
                global $data, $misc;
                global $PHP_SELF, $lang;
 
-               if ($confirm) { 
-                       $misc->printTitle(array($misc->printVal($_REQUEST['database']), $lang['strtypes'], $misc->printVal($_REQUEST['type']), $lang['strdrop']), 'drop_type');
+               if ($confirm) {
+                       $misc->printTrail('type');
+                       $misc->printTitle($lang['strdrop'], 'drop_type');
 
                        echo "<p>", sprintf($lang['strconfdroptype'], $misc->printVal($_REQUEST['type'])), "</p>\n";
 
 
                switch ($_REQUEST['stage']) {
                        case 1:
-                               $misc->printTitle(array($misc->printVal($_REQUEST['database']), $lang['strtypes'], $lang['strcreatecomptype']), 'create_type');
+                               $misc->printTrail('type');
+                               $misc->printTitle($lang['strcreatecomptype'], 'create_type');
                                $misc->printMsg($msg);
                                
                                echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
                                }
 
                                $types = &$data->getTypes(true, false, true);
-       
-                               $misc->printTitle(array($misc->printVal($_REQUEST['database']), $lang['strtypes'], $lang['strcreatecomptype']), 'create_type');
+
+                               $misc->printTrail('type');
+                               $misc->printTitle($lang['strcreatecomptype'], 'create_type');
                                $misc->printMsg($msg);
 
                                echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
                $funcs = &$data->getFunctions(true);
                $types = &$data->getTypes(true);
 
-               $misc->printTitle(array($misc->printVal($_REQUEST['database']), $lang['strtypes'], $lang['strcreatetype']), 'create_type');
+               $misc->printTrail('schema');
+               $misc->printTitle($lang['strcreatetype'], 'create_type');
                $misc->printMsg($msg);
 
                echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
                global $data, $conf, $misc;
                global $PHP_SELF, $lang;
 
-               $misc->printTitle(array($misc->printVal($_REQUEST['database']), $lang['strtypes']), 'types');
+               $misc->printTrail('schema');
+               $misc->printTabs('schema','types');
                $misc->printMsg($msg);
                
                $types = &$data->getTypes();
 
        $misc->printHeader($lang['strtypes']);
        $misc->printBody();
-       $misc->printNav('schema','types');
 
        switch ($action) {
                case 'create_comp':
index 2dec8e64933db05e2e446b71e9de38af31e17908..f9baa9bb73076dee376fd9e25a2178c87ceed255 100644 (file)
--- a/users.php
+++ b/users.php
@@ -3,7 +3,7 @@
        /**
         * Manage users in a database cluster
         *
-        * $Id: users.php,v 1.26 2004/07/13 16:13:15 jollytoad Exp $
+        * $Id: users.php,v 1.27 2004/09/01 16:35:59 jollytoad Exp $
         */
 
        // Include application functions
@@ -23,7 +23,8 @@
                global $data, $misc;
                global $PHP_SELF, $lang;
        
-               echo "<h2>{$lang['strusers']}: ", $misc->printVal($_SESSION['webdbUsername']), ": {$lang['straccount']}</h2>\n";
+               $misc->printTrail('user');
+               $misc->printTitle($lang['straccount']);
                $misc->printMsg($msg);
                
                $userdata = &$data->getUser($_SESSION['webdbUsername']);
                global $data, $misc;
                global $PHP_SELF, $lang, $conf;
 
-               if ($confirm) { 
-                       echo "<h2>{$lang['strusers']}: ", $misc->printVal($_SESSION['webdbUsername']), ": {$lang['strchangepassword']}</h2>\n";
+               if ($confirm) {
+                       $misc->printTrail('user');
+                       $misc->printTitle($lang['strchangepassword']);
                        $misc->printMsg($msg);
-                                               
+                       
                        if (!isset($_POST['password'])) $_POST['password'] = '';
                        if (!isset($_POST['confirm'])) $_POST['confirm'] = '';
                        
-                       
                        echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
                        echo "<table>\n";
                        echo "\t<tr>\n\t\t<th class=\"data left required\">{$lang['strpassword']}</th>\n";
                global $data, $misc;
                global $PHP_SELF, $lang;
        
-               echo "<h2>{$lang['strusers']}: ", $misc->printVal($_REQUEST['username']), ": {$lang['stralter']}</h2>\n";
+               $misc->printTrail('user');
+               $misc->printTitle($lang['stralter']);
                $misc->printMsg($msg);
                
                $userdata = &$data->getUser($_REQUEST['username']);
                global $data, $misc;
                global $PHP_SELF, $lang;
 
-               if ($confirm) { 
-                       echo "<h2>{$lang['strusers']}: ", $misc->printVal($_REQUEST['username']), ": {$lang['strdrop']}</h2>\n";
+               if ($confirm) {
+                       $misc->printTrail('user');
+                       $misc->printTitle($lang['strdrop']);
                        
                        echo "<p>", sprintf($lang['strconfdropuser'], $misc->printVal($_REQUEST['username'])), "</p>\n";        
                        
                if (!isset($_POST['formConfirm'])) $_POST['formConfirm'] = '';
                if (!isset($_POST['formExpires'])) $_POST['formExpires'] = '';
                
-               echo "<h2>{$lang['strusers']}: {$lang['strcreateuser']}</h2>\n";
+               $misc->printTrail('server');
+               $misc->printTitle($lang['strcreateuser']);
                $misc->printMsg($msg);
 
                echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
                        return $val == 'infinity' ? '' : htmlspecialchars($val);
                }
                
-               $misc->printTitle(array($lang['strusers']), 'users');
+               $misc->printTrail('server');
+               $misc->printTabs('server','users');
                $misc->printMsg($msg);
                
                $users = &$data->getUsers();
 
        $misc->printHeader($lang['strusers']);
        $misc->printBody();
-       $misc->printNav('server','users');
 
        switch ($action) {
                case 'changepassword':
index 63bdc39dcbc927de712e85369c1c044a87288f0a..687b0fb11981c707872a86fb357a5e3ea41314f6 100755 (executable)
@@ -3,7 +3,7 @@
        /**
         * List views in a database
         *
-        * $Id: viewproperties.php,v 1.10 2004/08/30 11:50:31 soranzo Exp $
+        * $Id: viewproperties.php,v 1.11 2004/09/01 16:35:59 jollytoad Exp $
         */
 
        // Include application functions
@@ -32,7 +32,8 @@
                global $data, $misc;
                global $PHP_SELF, $lang;
                
-               $misc->printTitle(array($misc->printVal($_REQUEST['database']), $lang['strviews'], $misc->printVal($_REQUEST['view']), $lang['stredit']));
+               $misc->printTrail('view');
+               $misc->printTitle($lang['stredit']);
                $misc->printMsg($msg);
                
                $viewdata = &$data->getView($_REQUEST['view']);
@@ -74,8 +75,8 @@
                global $data, $misc;
                global $PHP_SELF, $lang;
 
-               $misc->printNav('view','export');
-               $misc->printTitle(array($misc->printVal($_REQUEST['database']), $misc->printVal($_REQUEST['view']), $lang['strexport']));
+               $misc->printTrail('view');
+               $misc->printTabs('view','export');
                $misc->printMsg($msg);
 
                echo "<form action=\"dataexport.php\" method=\"post\">\n";
                // Get view
                $vdata = &$data->getView($_REQUEST['view']);
 
-               $misc->printNav('view','definition');
-               $misc->printTitle(array($misc->printVal($_REQUEST['database']), $lang['strviews'], $misc->printVal($_REQUEST['view']), $lang['strdefinition']));
+               $misc->printTrail('view');
+               $misc->printTabs('view','definition');
                $misc->printMsg($msg);
                
                if ($vdata->recordCount() > 0) {
                        case 1:
                                global $lang;
 
-                               $misc->printNav('view','columns');
-                               $misc->printTitle(array($misc->printVal($_REQUEST['database']), $lang['strviews'], $lang['straltercolumn'],     $misc->printVal($_REQUEST['column'])));
+                               $misc->printTrail('column');
+                               $misc->printTitle($lang['straltercolumn']); 
                                $misc->printMsg($msg);
 
                                echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
                        $rowdata->f['+type'] = $data->formatType($rowdata->f['type'], $rowdata->f['atttypmod']);
                }
                
-               $misc->printNav('view','columns');
-               $misc->printTitle(array($misc->printVal($_REQUEST['database']), $lang['strviews'], $misc->printVal($_REQUEST['view'])));
+               $misc->printTrail('view');
+               $misc->printTabs('view','columns');
                $misc->printMsg($msg);
 
                // Get view
index 6161a6cf703e68f959a938804c828eeeb3633ac6..d90c1726ad15f059cb595c15b2ed40c2f63e2f54 100644 (file)
--- a/views.php
+++ b/views.php
@@ -3,7 +3,7 @@
        /**
         * Manage views in a database
         *
-        * $Id: views.php,v 1.48 2004/08/30 11:50:31 soranzo Exp $
+        * $Id: views.php,v 1.49 2004/09/01 16:35:59 jollytoad Exp $
         */
 
        // Include application functions
@@ -23,7 +23,8 @@
                global $PHP_SELF;
 
                if ($confirm) {
-                       $misc->printTitle(array($misc->printVal($_REQUEST['database']), $lang['strviews'], $misc->printVal($_REQUEST['view']), $lang['strselect']), 'select');
+                       $misc->printTrail('view');
+                       $misc->printTitle($lang['strselect'], 'select');
                        $misc->printMsg($msg);
 
                        $attrs = &$data->getTableAttributes($_REQUEST['view']);
                global $PHP_SELF, $lang, $_reload_browser;
 
                if ($confirm) { 
-                       $misc->printTitle(array($misc->printVal($_REQUEST['database']),$lang['strviews'], $misc->printVal($_REQUEST['view']), $lang['strdrop']),'drop_view');
+                       $misc->printTrail('view');
+                       $misc->printTitle($lang['strdrop'],'drop_view');
+                       
+                       echo "<p>", sprintf($lang['strconfdropview'], $misc->printVal($_REQUEST['view'])), "</p>\n";
                        
-                       echo "<p>", sprintf($lang['strconfdropview'], $misc->printVal($_REQUEST['view'])), "</p>\n";    
                        echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
                        echo "<input type=\"hidden\" name=\"action\" value=\"drop\" />\n";
                        echo "<input type=\"hidden\" name=\"view\" value=\"", htmlspecialchars($_REQUEST['view']), "\" />\n";
                        if (!isset($_REQUEST['formView'])) $_REQUEST['formView'] = '';
                        if (!isset($_REQUEST['formComment'])) $_REQUEST['formComment'] = '';
                        
-                       $misc->printTitle(array($misc->printVal($_REQUEST['database']), $lang['strviews'], $lang['strcreateviewwiz']), 'create_view');          
+                       $misc->printTrail('schema');
+                       $misc->printTitle($lang['strcreateviewwiz'], 'create_view');
                        $misc->printMsg($msg);
                        
                        $tblCount = sizeof($_POST['formTables']);
        function doWizardCreate($msg = '') {
                global $data, $misc;
                global $PHP_SELF, $lang;
-               $tables = &$data->getTables(true);                              
-               $misc->printTitle(array($misc->printVal($_REQUEST['database']), $lang['strviews'], $lang['strcreateviewwiz']), 'create_view');          
+               
+               $tables = &$data->getTables(true);
+               
+               $misc->printTrail('schema');
+               $misc->printTitle($lang['strcreateviewwiz'], 'create_view');
                $misc->printMsg($msg);
+               
                echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
                echo "<table>\n";
                echo "<tr><th class=\"data\">{$lang['strtables']}</th></tr>";           
                if (!isset($_REQUEST['formDefinition'])) $_REQUEST['formDefinition'] = 'SELECT ';
                if (!isset($_REQUEST['formComment'])) $_REQUEST['formComment'] = '';
                
-               $misc->printTitle(array($misc->printVal($_REQUEST['database']), $lang['strviews'], $lang['strcreateview']), 'create_view');
-               
+               $misc->printTrail('schema');
+               $misc->printTitle($lang['strcreateview'], 'create_view');
                $misc->printMsg($msg);
                
                echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
                        $rowdata->f['+vwcount'] = "SELECT COUNT(*) AS total FROM \"{$rowdata->f['relname']}\"";
                }
                
-               $misc->printTitle(array($misc->printVal($_REQUEST['database']), $lang['strviews']), 'views');
+               $misc->printTrail('schema');
+               $misc->printTabs('schema','views');
                $misc->printMsg($msg);
                
                $views = &$data->getViews();
 
        $misc->printHeader($lang['strviews']);
        $misc->printBody();
-       $misc->printNav('schema','views');
 
        switch ($action) {
                case 'selectrows':