Name all navigation links so we can easily make reference to each of them from the...

diff --git a/aggregates.php b/aggregates.php
index 1e839d6e2540acba41b6172ee37c2fd778328935..de61e72829f31a7f5579c4143cfc2bfbc51c38d6 100644 (file)
--- a/aggregates.php
+++ b/aggregates.php
@@ -246,7 +246,7 @@
                else echo "<p>{$lang['strnodata']}</p>\n";
 
                $navlinks = array (
-                       array (
+                       'showall' => array (
                                'attr'=> array (
                                        'href' => array (
                                                'url' => 'aggregates.php',
@@ -262,7 +262,7 @@
                );
 
                if ($data->hasAlterAggregate()) {
-                       $navlinks[] = array (
+                       $navlinks['alter'] = array (
                                'attr'=> array (
                                        'href' => array (
                                                'url' => 'aggregates.php',
@@ -280,7 +280,7 @@
                        );
                }
 
-               $navlinks[] = array (
+               $navlinks['drop'] = array (
                        'attr'=> array (
                                'href' => array (
                                        'url' => 'aggregates.php',
@@ -375,7 +375,7 @@
                $misc->printTable($aggregates, $columns, $actions, 'aggregates-aggregates', $lang['strnoaggregates']);
 
                $navlinks = array (
-                       array (
+                       'create' => array (
                                'attr'=> array (
                                        'href' => array (
                                                'url' => 'aggregates.php',

diff --git a/all_db.php b/all_db.php
index 110ba96bed75b68ae5e6cbfbfa5fd7c144c620dc..350ac9bbd36c54dce66dab261bd58698e9f9432d 100644 (file)
--- a/all_db.php
+++ b/all_db.php
@@ -448,7 +448,7 @@
                $misc->printTable($databases, $columns, $actions, 'all_db-databases', $lang['strnodatabases']);
 
                $navlinks = array (
-                   array (
+                   'create' => array (
                        'attr'=> array (
                            'href' => array (
                                'url' => 'all_db.php',

diff --git a/colproperties.php b/colproperties.php
index c4d8ae3785a2f4587902749910d40dfc35ab9723..a0927d7d447945d6a9408edfe88c85fa467b7fd7 100644 (file)
--- a/colproperties.php
+++ b/colproperties.php
@@ -245,7 +245,7 @@
                                 * send an ugly SQL in the URL */
 
                                $navlinks = array (
-                                       array (
+                                       'browse' => array (
                                                'attr'=> array (
                                                        'href' => array (
                                                                'url' => 'display.php',
@@ -263,7 +263,7 @@
                                                ),
                                                'content' => $lang['strbrowse'],
                                        ),
-                                       array (
+                                       'alter' => array (
                                                'attr'=> array (
                                                        'href' => array (
                                                                'url' => 'colproperties.php',
@@ -279,7 +279,7 @@
                                                ),
                                                'content' => $lang['stralter'],
                                        ),
-                                       array (
+                                       'drop' => array (
                                                'attr'=> array (
                                                        'href' => array (
                                                                'url' => 'tblproperties.php',
@@ -300,7 +300,7 @@
                        else {
                                /* Browse link */
                                $navlinks = array (
-                                       array (
+                                       'browse' => array (
                                                'attr'=> array (
                                                        'href' => array (
                                                                'url' => 'display.php',

diff --git a/constraints.php b/constraints.php
index 526e7b7d19aeea9d0af001c8d70c206b6db471df..307601d183968ddcec2dec81c1349b7b4ea694dc 100644 (file)
--- a/constraints.php
+++ b/constraints.php
@@ -482,7 +482,7 @@
                $misc->printTable($constraints, $columns, $actions, 'constraints-constraints', $lang['strnoconstraints'], 'cnPre');
 
                $navlinks = array (
-                       array (
+                       'addcheck' => array (
                                'attr'=> array (
                                        'href' => array (
                                                'url' => 'constraints.php',
@@ -497,7 +497,7 @@
                                ),
                                'content' => $lang['straddcheck'],
                        ),
-                       array (
+                       'adduniq' => array (
                                'attr'=> array (
                                        'href' => array (
                                                'url' => 'constraints.php',
@@ -512,7 +512,7 @@
                                ),
                                'content' => $lang['stradduniq'],
                        ),
-                       array (
+                       'addpk' => array (
                                'attr'=> array (
                                        'href' => array (
                                                'url' => 'constraints.php',
@@ -527,7 +527,7 @@
                                ),
                                'content' => $lang['straddpk'],
                        ),
-                       array (
+                       'addfk' => array (
                                'attr'=> array (
                                        'href' => array (
                                                'url' => 'constraints.php',

diff --git a/display.php b/display.php
index 854c5e5688dc73836815616d51a521c6fe9d4ff3..9a3ebf56aa0449e0f3545fb7826137f7a3ae1267 100644 (file)
--- a/display.php
+++ b/display.php
@@ -682,7 +682,7 @@
                if (isset($_REQUEST['return'])) {
                        $urlvars = $misc->getSubjectParams($_REQUEST['return']);
 
-                       $navlinks[] = array (
+                       $navlinks['back'] = array (
                                'attr'=> array (
                                        'href' => array (
                                                'url' => $urlvars['url'],
@@ -695,7 +695,7 @@
 
                // Edit SQL link
                if (isset($_REQUEST['query']))
-                       $navlinks[] = array (
+                       $navlinks['edit'] = array (
                                'attr'=> array (
                                        'href' => array (
                                                'url' => 'database.php',
@@ -711,7 +711,7 @@
 
                // Expand/Collapse
                if ($_REQUEST['strings'] == 'expanded')
-                       $navlinks[] = array (
+                       $navlinks['collapse'] = array (
                                'attr'=> array (
                                        'href' => array (
                                                'url' => 'display.php',
@@ -726,7 +726,7 @@
                                'content' => $lang['strcollapse']
                        );
                else
-                       $navlinks[] = array (
+                       $navlinks['collapse'] = array (
                                'attr'=> array (
                                        'href' => array (
                                                'url' => 'display.php',
@@ -743,7 +743,7 @@
 
                // Create report
                if (isset($_REQUEST['query']) && ($subject !== 'report') && $conf['show_reports'] && isset($rs) && is_object($rs) && $rs->recordCount() > 0) {
-                       $navlinks[] = array (
+                       $navlinks['createreport'] = array (
                                'attr'=> array (
                                        'href' => array (
                                                'url' => 'reports.php',
@@ -765,7 +765,7 @@
                        // Report views don't set a schema, so we need to disable create view in that case
                        if (isset($_REQUEST['schema'])) {
 
-                               $navlinks[] = array (
+                               $navlinks['createview'] = array (
                                        'attr'=> array (
                                                'href' => array (
                                                        'url' => 'views.php',
@@ -783,7 +783,7 @@
                        if (isset($_REQUEST['search_path']))
                                $urlvars['search_path'] = $_REQUEST['search_path'];
 
-                       $navlinks[] = array (
+                       $navlinks['download'] = array (
                                'attr'=> array (
                                        'href' => array (
                                                'url' => 'dataexport.php',
@@ -796,7 +796,7 @@
 
                // Insert
                if (isset($object) && (isset($subject) && $subject == 'table'))
-                       $navlinks[] = array (
+                       $navlinks['insert'] = array (
                                'attr'=> array (
                                        'href' => array (
                                                'url' => 'tables.php',
@@ -810,7 +810,7 @@
                        );
 
                // Refresh
-               $navlinks[] = array (
+               $navlinks['refresh'] = array (
                        'attr'=> array (
                                'href' => array (
                                        'url' => 'display.php',

diff --git a/domains.php b/domains.php
index c7e3e79f11b36b583d705a3669bc418925f63c8f..ed1de7632a23e0e17fa548bbddb62956f728ee64 100644 (file)
--- a/domains.php
+++ b/domains.php
@@ -243,7 +243,7 @@
                else echo "<p>{$lang['strnodata']}</p>\n";
                
                $navlinks = array (
-                       array (
+                       'drop' => array (
                                'attr'=> array (
                                        'href' => array (
                                                'url' => 'domains.php',
@@ -260,7 +260,7 @@
                        )
                );
                if ($data->hasAlterDomains()) {
-                       $navlinks[] = array (
+                       $navlinks['addcheck'] = array (
                                'attr'=> array (
                                        'href' => array (
                                                'url' => 'domains.php',
@@ -275,7 +275,7 @@
                                ),
                                'content' => $lang['straddcheck']
                        );
-                       $navlinks[] = array (
+                       $navlinks['alter'] = array (
                                'attr'=> array (
                                        'href' => array (
                                                'url' => 'domains.php',
@@ -490,7 +490,7 @@
                $misc->printTable($domains, $columns, $actions, 'domains-domains', $lang['strnodomains']);
 
                $navlinks = array (
-                       array (
+                       'create' => rray (
                                'attr'=> array (
                                        'href' => array (
                                                'url' => 'domains.php',

diff --git a/fulltext.php b/fulltext.php
index cdc6a2ecbd824f3d78213f76ec3a538be139dc56..00e6e9c530b6e1f53489bddea1dbeea0e8c54e69 100644 (file)
--- a/fulltext.php
+++ b/fulltext.php
@@ -73,7 +73,7 @@
                $misc->printTable($cfgs, $columns, $actions, 'fulltext-fulltext', $lang['strftsnoconfigs']);
 
                $navlinks = array(
-                       array (
+                       'createconf' => array (
                                'attr'=> array (
                                        'href' => array (
                                                'url' => 'fulltext.php',
@@ -438,7 +438,7 @@
                $misc->printTable($dicts, $columns, $actions, 'fulltext-viewdicts', $lang['strftsnodicts']);
 
                $navlinks = array(
-                       array (
+                       'createdict' => array (
                                'attr'=> array (
                                        'href' => array (
                                                'url' => 'fulltext.php',
@@ -532,7 +532,7 @@
                $misc->printTable($map, $columns, $actions, 'fulltext-viewconfig', $lang['strftsemptymap']);
 
                $navlinks = array(
-                       array (
+                       'addmapping' => array (
                                'attr'=> array (
                                        'href' => array (
                                                'url' => 'fulltext.php',

diff --git a/functions.php b/functions.php
index fc0522c84d0ae74c276595df17b6bb4af5fe63ac..67e7b6600df3af90eeb5782ce4fe64e52f7e05b5 100644 (file)
--- a/functions.php
+++ b/functions.php
@@ -326,7 +326,7 @@
                else echo "<p>{$lang['strnodata']}</p>\n";
 
                $navlinks = array(
-                       array (
+                       'showall' => array (
                                'attr'=> array (
                                        'href' => array (
                                                'url' => 'functions.php',
@@ -339,7 +339,7 @@
                                ),
                                'content' => $lang['strshowallfunctions']
                        ),
-                       array (
+                       'alter' => array (
                                'attr'=> array (
                                        'href' => array (
                                                'url' => 'functions.php',
@@ -355,7 +355,7 @@
                                ),
                                'content' => $lang['stralter']
                        ),
-                       array (
+                       'drop' => array (
                                'attr'=> array (
                                        'href' => array (
                                                'url' => 'functions.php',
@@ -891,7 +891,7 @@
                $misc->printTable($funcs, $columns, $actions, 'functions-functions', $lang['strnofunctions']);
 
                $navlinks = array(
-                       array (
+                       'createpl' => array (
                                'attr'=> array (
                                        'href' => array (
                                                'url' => 'functions.php',
@@ -905,7 +905,7 @@
                                ),
                                'content' => $lang['strcreateplfunction']
                        ),
-                       array (
+                       'createinternal' => array (
                                'attr'=> array (
                                        'href' => array (
                                                'url' => 'functions.php',
@@ -920,7 +920,7 @@
                                ),
                                'content' => $lang['strcreateinternalfunction']
                        ),
-                       array (
+                       'createc' => array (
                                'attr'=> array (
                                        'href' => array (
                                                'url' => 'functions.php',

diff --git a/groups.php b/groups.php
index 1678b3a255d388838c9e89b5968ccb9cdddfe12e..4351fc59e45ec74a3995e714cd1c1e99ba3d1647 100644 (file)
--- a/groups.php
+++ b/groups.php
@@ -100,7 +100,7 @@
                                )
                        );
 
-                       $misc->printTable($groupdata, $columns, $actions, 'groups-properties', $lang['strnousers']);
+                       $misc->printTable($groupdata, $columns, $actions, 'groups-members', $lang['strnousers']);
                }
 
                // Display form for adding a user to the group                  
@@ -119,7 +119,7 @@
                echo "<input type=\"hidden\" name=\"action\" value=\"add_member\" />\n";
                echo "</form>\n";
                
-               $misc->printNavLinks(array (array (
+               $misc->printNavLinks(array ('showall' => array (
                                'attr'=> array (
                                        'href' => array (
                                                'url' => 'groups.php',
@@ -268,7 +268,7 @@
                
                $misc->printTable($groups, $columns, $actions, 'groups-properties', $lang['strnogroups']);
                
-               $misc->printNavLinks(array (array (
+               $misc->printNavLinks(array ('create' => array (
                                'attr'=> array (
                                        'href' => array (
                                                'url' => 'groups.php',

diff --git a/history.php b/history.php
index c16caa1b6e6957c7ec36970a85bcdc3c3d7bc8db..3f5407973ef6fa6c113106b1aa6c4d12a9354fed 100644 (file)
--- a/history.php
+++ b/history.php
@@ -85,7 +85,7 @@
                else echo "<p>{$lang['strnohistory']}</p>\n";
 
                $navlinks = array (
-                       array (
+                       'refresh' => array (
                                'attr'=> array (
                                        'href' => array (
                                                'url' => 'history.php',
@@ -102,7 +102,7 @@
 
                if (isset($_SESSION['history'][$_REQUEST['server']][$_REQUEST['database']]) 
                                && count($_SESSION['history'][$_REQUEST['server']][$_REQUEST['database']])) {
-                       $navlinks[] = array (
+                       $navlinks['download'] = array (
                                'attr'=> array (
                                        'href' => array (
                                                'url' => 'history.php',
@@ -115,7 +115,7 @@
                                ),
                                'content' => $lang['strdownload']
                        );
-                       $navlinks[] = array (
+                       $navlinks['clear'] = array (
                                'attr'=> array (
                                        'href' => array (
                                                'url' => 'history.php',

diff --git a/indexes.php b/indexes.php
index fefe1a60a68e3c4c20c8b4ded1a68327d32a9b80..ce9a79555d2af52359b3195f2b026fec678a5c0f 100644 (file)
--- a/indexes.php
+++ b/indexes.php
@@ -336,7 +336,7 @@
                $misc->printTable($indexes, $columns, $actions, 'indexes-indexes', $lang['strnoindexes'], 'indPre');
                
                $misc->printNavLinks(array (
-                       array (
+                       'create' => array (
                                'attr'=> array (
                                        'href' => array (
                                                'url' => 'indexes.php',

diff --git a/operators.php b/operators.php
index c3be64fb6911d34aa6925de8922d2994222025db..99fb0f06d1ceccd6618bb2fe19450bf2d0aa2c99 100644 (file)
--- a/operators.php
+++ b/operators.php
@@ -65,7 +65,7 @@
                        echo "</table>\n";
 
                        $misc->printNavLinks(array (
-                               array (
+                               'showall' => array (
                                        'attr'=> array (
                                                'href' => array (
                                                        'url' => 'operators.php',

diff --git a/privileges.php b/privileges.php
index 0bf7bfafc9bc3ff77bb793478b19490208b47afd..72ef37160cb9818d61a9feefd44b350ebbe448e2 100644 (file)
--- a/privileges.php
+++ b/privileges.php
@@ -232,14 +232,17 @@
                        case 'sequence':
                        case 'function':
                        case 'tablespace':
+                               $alllabel = "showall{$_REQUEST['subject']}s";
                                $allurl = "{$_REQUEST['subject']}s.php";
                                $alltxt = $lang["strshowall{$_REQUEST['subject']}s"];
                                break;
                        case 'schema':
+                               $alllabel = "showallschemas";
                                $allurl = "schemas.php";
                                $alltxt = $lang["strshowallschemas"];
                                break;
                        case 'database':
+                               $alllabel = "showalldatabases";
                                $allurl = 'all_db.php';
                                $alltxt = $lang['strshowalldatabases'];
                                break;
@@ -287,7 +290,7 @@
                }
 
                $navlinks = array (
-                       array (
+                       'grant' => array (
                                'attr'=> array (
                                        'href' => array (
                                                'url' => 'privileges.php',
@@ -296,7 +299,7 @@
                                ),
                                'content' => $lang['strgrant']
                        ),
-                       array (
+                       'revoke' => array (
                                'attr'=> array (
                                        'href' => array (
                                                'url' => 'privileges.php',
@@ -308,7 +311,7 @@
                );
 
                if (isset($allurl)) {
-                       $navlinks[] = array (
+                       $navlinks[$alllabel] = array (
                                'attr'=> array (
                                        'href' => array (
                                                'url' => $allurl,

diff --git a/reports.php b/reports.php
index 89fac6bde47678e039d5225221facc2910a12500..c750f95cc1a9cab50ede8f46b55ce7241c9558d1 100644 (file)
--- a/reports.php
+++ b/reports.php
@@ -128,7 +128,7 @@
                if (isset($_REQUEST['database'])) $urlvars['database'] = $_REQUEST['database'];
 
                $navlinks = array (
-                       array (
+                       'showall' => array (
                                'attr'=> array (
                                        'href' => array (
                                                'url' => 'reports.php',
@@ -137,7 +137,7 @@
                                ),
                                'content' => $lang['strshowallreports']
                        ),
-                       array (
+                       'alter' => array (
                                'attr'=> array (
                                        'href' => array (
                                                'url' => 'reports.php',
@@ -149,7 +149,7 @@
                                ),
                                'content' => $lang['stredit']
                        ),
-                       array (
+                       'exec' => array (
                                'attr'=> array (
                                        'href' => array (
                                                'url' => 'sql.php',
@@ -373,7 +373,7 @@
                if (isset($_REQUEST['schema'])) $urlvars['schema'] = $_REQUEST['schema'];
 
                $misc->printNavLinks(array (
-                       array (
+                       'create' => array (
                                'attr'=> array (
                                        'href' => array (
                                                'url' => 'reports.php',

diff --git a/roles.php b/roles.php
index d705e9732bbdd965de6ec9eaceef0951d87b2a00..80a91939a516a713d34d7c18a57c21e527654a2a 100644 (file)
--- a/roles.php
+++ b/roles.php
@@ -426,7 +426,7 @@
                else echo "<p>{$lang['strnodata']}</p>\n";
 
                $navlinks = array (
-                       array (
+                       'showall' => array (
                                'attr'=> array (
                                        'href' => array (
                                                'url' => 'roles.php',
@@ -437,7 +437,7 @@
                                ),
                                'content' => $lang['strshowallroles']
                        ),
-                       array (
+                       'alter' => array (
                                'attr'=> array (
                                        'href' => array (
                                        'url' => 'roles.php',
@@ -450,7 +450,7 @@
                                ),
                                'content' => $lang['stralter']
                        ),
-                       array (
+                       'drop' => array (
                                'attr'=> array (
                                        'href' => array (
                                        'url' => 'roles.php',
@@ -514,7 +514,7 @@
                }
                else echo "<p>{$lang['strnodata']}</p>\n";
                
-               $misc->printNavLinks(array (array (
+               $misc->printNavLinks(array ('changepassword' =>  array (
                                'attr'=> array (
                                        'href' => array (
                                        'url' => 'roles.php',
@@ -680,7 +680,7 @@
                $misc->printTable($roles, $columns, $actions, 'roles-roles', $lang['strnoroles']);
 
                $navlinks = array (
-                       array (
+                       'create' => array (
                                'attr'=> array (
                                        'href' => array (
                                                'url' => 'roles.php',

diff --git a/rules.php b/rules.php
index 6f0f3d863e100385519281a70299285e6fb01995..89a8100ba788c5b6bc07bfc967d1d9c76113fa40 100644 (file)
--- a/rules.php
+++ b/rules.php
@@ -167,7 +167,7 @@
 
                $misc->printTable($rules, $columns, $actions, 'rules-rules', $lang['strnorules']);
 
-               $misc->printNavLinks(array (array (
+               $misc->printNavLinks(array ('create' => array (
                                'attr'=> array (
                                        'href' => array (
                                                'url' => 'rules.php',

diff --git a/schemas.php b/schemas.php
index 750d3737bec5025fc0ca00e17f82e560c5e8cb9e..ecb569cbc961f8ad6e906a964d99e2f5eac075bc 100755 (executable)
--- a/schemas.php
+++ b/schemas.php
@@ -94,7 +94,7 @@
 
                $misc->printTable($schemas, $columns, $actions, 'schemas-schemas', $lang['strnoschemas']);
 
-               $misc->printNavLinks(array (array (
+               $misc->printNavLinks(array ('create' => array (
                                'attr'=> array (
                                        'href' => array (
                                                'url' => 'schemas.php',

diff --git a/sequences.php b/sequences.php
index 223a8c8de64a43d001710eef0802abdafdd6df08..57893e8a28c28274fce1aeea9a2c06937448c664 100644 (file)
--- a/sequences.php
+++ b/sequences.php
@@ -93,7 +93,7 @@
 
                $misc->printTable($sequences, $columns, $actions, 'sequences-sequences', $lang['strnosequences']);
 
-               $misc->printNavLinks(array (array (
+               $misc->printNavLinks(array ('create' => array (
                                'attr'=> array (
                                        'href' => array (
                                                'url' => 'sequences.php',
@@ -188,7 +188,7 @@
                        echo "</table>";
 
                        $navlinks = array (
-                               array (
+                               'alter' => array (
                                        'attr'=> array (
                                                'href' => array (
                                                        'url' => 'sequences.php',
@@ -203,7 +203,7 @@
                                        ),
                                        'content' => $lang['stralter']
                                ),
-                               array (
+                               'setval' => array (
                                        'attr'=> array (
                                                'href' => array (
                                                        'url' => 'sequences.php',
@@ -218,7 +218,7 @@
                                        ),
                                        'content' => $lang['strsetval']
                                ),
-                               array (
+                               'nextval' => array (
                                        'attr'=> array (
                                                'href' => array (
                                                        'url' => 'sequences.php',
@@ -248,7 +248,7 @@
                                        ),
                                        'content' => $lang['strrestart']
                                ),
-                               array (
+                               'reset' => array (
                                        'attr'=> array (
                                                'href' => array (
                                                        'url' => 'sequences.php',
@@ -263,7 +263,7 @@
                                        ),
                                        'content' => $lang['strreset']
                                ),
-                               array (
+                               'showall' => array (
                                        'attr'=> array (
                                                'href' => array (
                                                        'url' => 'sequences.php',

diff --git a/sql.php b/sql.php
index 0dec1074750f136e11bad2d5850713b9cd9deac7..f69c28063c3ca553f0da190accc9ff9a3568bccb 100644 (file)
--- a/sql.php
+++ b/sql.php
@@ -208,7 +208,7 @@
        // Return
        if (isset($_REQUEST['return'])) {
                $urlvars = $misc->getSubjectParams($_REQUEST['return']);
-               $navlinks[] = array (
+               $navlinks['back'] = array (
                        'attr'=> array (
                                'href' => array (
                                        'url' => $urlvars['url'],
@@ -220,7 +220,7 @@
        }
 
        // Edit         
-       $navlinks[] = array (
+       $navlinks['alter'] = array (
                'attr'=> array (
                        'href' => array (
                                'url' => 'database.php',
@@ -234,7 +234,7 @@
 
        // Create report
        if (($subject !== 'report') && $conf['show_reports'] && isset($rs) && is_object($rs) && $rs->recordCount() > 0) {
-               $navlinks[] = array (
+               $navlinks['createreport'] = array (
                        'attr'=> array (
                                'href' => array (
                                        'url' => 'reports.php',
@@ -252,7 +252,7 @@
        if (isset($_SESSION['sqlquery']) && isset($rs) && is_object($rs) && $rs->recordCount() > 0) {
                // Report views don't set a schema, so we need to disable create view in that case
                if (isset($_REQUEST['schema'])) {
-                       $navlinks[] = array (
+                       $navlinks['createview'] = array (
                                'attr'=> array (
                                        'href' => array (
                                                'url' => 'views.php',

diff --git a/tables.php b/tables.php
index f94ce63cd0b1066182dd51eb749445af9230b5a8..43cb5b9d2d268210e6c6f11a16d513806627defe 100644 (file)
--- a/tables.php
+++ b/tables.php
@@ -738,7 +738,7 @@
                        'table' => array(
                                'title' => $lang['strtable'],
                                'field' => field('relname'),
-                               'url'           => "redirect.php?subject=table&{$misc->href}&",
+                               'url'   => "redirect.php?subject=table&{$misc->href}&",
                                'vars'  => array('table' => 'relname'),
                        ),
                        'owner' => array(
@@ -891,7 +891,7 @@
                $misc->printTable($tables, $columns, $actions, 'tables-tables', $lang['strnotables']);
 
                $navlinks = array (
-                       array (
+                       'create' => array (
                                'attr'=> array (
                                        'href' => array (
                                                'url' => 'tables.php',
@@ -908,7 +908,7 @@
                );
 
                if (($tables->recordCount() > 0) && $data->hasCreateTableLike()) {
-                       $navlinks[] = array (
+                       $navlinks['createlike'] = array (
                                'attr'=> array (
                                        'href' => array (
                                                'url' => 'tables.php',

diff --git a/tablespaces.php b/tablespaces.php
index 90b33c46e062f23df61a3506f02bd05ee0400bcc..2ac84ed26130996f4aeab6ded19dbbccc5988f15 100755 (executable)
--- a/tablespaces.php
+++ b/tablespaces.php
@@ -277,7 +277,7 @@
                                
                $misc->printTable($tablespaces, $columns, $actions, 'tablespaces-tablespaces', $lang['strnotablespaces']);
                
-               $misc->printNavLinks(array (array (
+               $misc->printNavLinks(array ('create' => array (
                                'attr'=> array (
                                        'href' => array (
                                                'url' => 'tablespaces.php',

diff --git a/tblproperties.php b/tblproperties.php
index 37bcc7288409312ceebd3066694c71c74637a2c8..e229e8903028e87ce744f4c3ecbcb825bd6bba83 100644 (file)
--- a/tblproperties.php
+++ b/tblproperties.php
@@ -625,7 +625,7 @@
                $misc->printTable($attrs, $columns, $actions, 'tblproperties-tblproperties', null, 'attPre');
 
                $navlinks = array (
-                       array (
+                       'browse' => array (
                                'attr'=> array (
                                        'href' => array (
                                                'url' => 'display.php',
@@ -641,7 +641,7 @@
                                ),
                                'content' => $lang['strbrowse']
                        ),
-                       array (
+                       'select' => array (
                                'attr'=> array (
                                        'href' => array (
                                                'url' => 'tables.php',
@@ -656,7 +656,7 @@
                                ),
                                'content' => $lang['strselect']
                        ),
-                       array (
+                       'insert' => array (
                                'attr'=> array (
                                        'href' => array (
                                        'url' => 'tables.php',
@@ -671,7 +671,7 @@
                                ),
                                'content' => $lang['strinsert']
                        ),
-                       array (
+                       'empty' => array (
                                'attr'=> array (
                                        'href' => array (
                                        'url' => 'tables.php',
@@ -686,7 +686,7 @@
                                ),
                                'content' => $lang['strempty']
                        ),
-                       array (
+                       'drop' => array (
                                'attr'=> array (
                                        'href' => array (
                                                'url' => 'tables.php',
@@ -701,7 +701,7 @@
                                ),
                                'content' => $lang['strdrop']
                        ),
-                       array (
+                       'addcolumn' => array (
                                'attr'=> array (
                                        'href' => array (
                                                'url' => 'tblproperties.php',
@@ -716,7 +716,7 @@
                                ),
                                'content' => $lang['straddcolumn']
                        ),
-                       array (
+                       'alter' => array (
                                'attr'=> array (
                                        'href' => array (
                                                'url' => 'tblproperties.php',

diff --git a/triggers.php b/triggers.php
index fbe81058b6023eef72239d426f7555f55762407e..64c665ec5eaedfe25d517f204e7bbfd60c4d8639 100644 (file)
--- a/triggers.php
+++ b/triggers.php
@@ -363,7 +363,7 @@
 
                $misc->printTable($triggers, $columns, $actions, 'triggers-triggers', $lang['strnotriggers'], 'tgPre');
                
-               $misc->printNavLinks(array (array (
+               $misc->printNavLinks(array ('create' => array (
                                'attr'=> array (
                                        'href' => array (
                                        'url' => 'triggers.php',

diff --git a/types.php b/types.php
index 159ee1a06d275f5b8b3dbe94762b84c29d160ea6..e3e9d2ed908448faf3b93d141d88bdae780f2b14 100644 (file)
--- a/types.php
+++ b/types.php
@@ -85,7 +85,7 @@
                                echo "</table>\n";
                        }
 
-                       $misc->printNavLinks(array (array (
+                       $misc->printNavLinks(array ('showall' => array (
                                        'attr'=> array (
                                                'href' => array (
                                                'url' => 'types.php',
@@ -595,7 +595,7 @@
                $misc->printTable($types, $columns, $actions, 'types-types', $lang['strnotypes']);
 
                $navlinks = array (
-                       array (
+                       'create' => array (
                                'attr'=> array (
                                        'href' => array (
                                                'url' => 'types.php',
@@ -609,7 +609,7 @@
                                ),
                                'content' => $lang['strcreatetype']
                        ),
-                       array (
+                       'createcomp' => array (
                                'attr'=> array (
                                        'href' => array (
                                                'url' => 'types.php',
@@ -623,7 +623,7 @@
                                ),
                                'content' => $lang['strcreatecomptype']
                        ),
-                       'enum' => array (
+                       'createenum' => array (
                                'attr'=> array (
                                        'href' => array(
                                                'url' => 'types.php',

diff --git a/users.php b/users.php
index 4672272c6e25681536f0d5015d1854783742aedd..dcd117008705123c331895ba174dc74162cddd5c 100644 (file)
--- a/users.php
+++ b/users.php
@@ -47,7 +47,7 @@
                }
                else echo "<p>{$lang['strnodata']}</p>\n";
                
-               $misc->printNavLinks(array (array (
+               $misc->printNavLinks(array ('changepassword' => array (
                                'attr'=> array (
                                        'href' => array (
                                                'url' => 'users.php',
@@ -355,7 +355,7 @@
                
                $misc->printTable($users, $columns, $actions, 'users-users', $lang['strnousers']);
 
-               $misc->printNavLinks(array (array (
+               $misc->printNavLinks(array ('create' => array (
                                'attr'=> array (
                                        'href' => array (
                                                'url' => 'users.php',

diff --git a/viewproperties.php b/viewproperties.php
index d13a4f3941002b6c365dab309e41fbb6bb05e5d6..4000b491eecab05fe04d7ca29ef51d106a2ae1ec 100755 (executable)
--- a/viewproperties.php
+++ b/viewproperties.php
@@ -150,7 +150,7 @@
                }
                else echo "<p>{$lang['strnodata']}</p>\n";
                
-               $misc->printNavLinks(array (array (
+               $misc->printNavLinks(array ( 'alter' => array (
                                'attr'=> array (
                                        'href' => array (
                                                'url' => 'viewproperties.php',
@@ -453,7 +453,7 @@
                echo "<br />\n";
 
                $navlinks = array (
-                       array (
+                       'browse' => array (
                                'attr'=> array (
                                        'href' => array (
                                        'url' => 'display.php',
@@ -469,7 +469,7 @@
                                ),
                                'content' => $lang['strbrowse']
                        ),
-                       array (
+                       'select' => array (
                                'attr'=> array (
                                        'href' => array (
                                        'url' => 'views.php',
@@ -484,7 +484,7 @@
                                ),
                                'content' => $lang['strselect']
                        ),
-                       array (
+                       'drop' => array (
                                'attr'=> array (
                                        'href' => array (
                                        'url' => 'views.php',
@@ -499,7 +499,7 @@
                                ),
                                'content' => $lang['strdrop']
                        ),
-                       array (
+                       'alter' => array (
                                'attr'=> array (
                                        'href' => array (
                                        'url' => 'viewproperties.php',

diff --git a/views.php b/views.php
index be8c88d06ddd7ab101090c48df52f6578be7f139..f81331eba9410869e07fbb1049b75bd5dc970673 100644 (file)
--- a/views.php
+++ b/views.php
@@ -648,7 +648,7 @@
                $misc->printTable($views, $columns, $actions, 'views-views',  $lang['strnoviews']);
                
                $navlinks = array (
-                       array (
+                       'create' => array (
                                'attr'=> array (
                                        'href' => array (
                                        'url' => 'views.php',
@@ -662,7 +662,7 @@
                                ),
                                'content' => $lang['strcreateview']
                        ),
-                       array (
+                       'createwiz' => array (
                                'attr'=> array (
                                        'href' => array (
                                        'url' => 'views.php',