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

27 files changed, 95 insertions, 92 deletions

diff --git a/aggregates.php b/aggregates.php
index 1e839d6e..de61e728 100644
--- 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 110ba96b..350ac9bb 100644
--- 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 c4d8ae37..a0927d7d 100644
--- 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 526e7b7d..307601d1 100644
--- 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 854c5e56..9a3ebf56 100644
--- 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 c7e3e79f..ed1de763 100644
--- 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 cdc6a2ec..00e6e9c5 100644
--- 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 fc0522c8..67e7b660 100644
--- 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 1678b3a2..4351fc59 100644
--- 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 c16caa1b..3f540797 100644
--- 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 fefe1a60..ce9a7955 100644
--- 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 c3be64fb..99fb0f06 100644
--- 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 0bf7bfaf..72ef3716 100644
--- 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 89fac6bd..c750f95c 100644
--- 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 d705e973..80a91939 100644
--- 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 6f0f3d86..89a8100b 100644
--- 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 750d3737..ecb569cb 100755
--- 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 223a8c8d..57893e8a 100644
--- 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 0dec1074..f69c2806 100644
--- 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 f94ce63c..43cb5b9d 100644
--- a/tables.php
+++ b/tables.php
@@ -738,7 +738,7 @@
 			'table' => array(
 				'title' => $lang['strtable'],
 				'field' => field('relname'),
-				'url'		=> "redirect.php?subject=table&amp;{$misc->href}&amp;",
+				'url'	=> "redirect.php?subject=table&amp;{$misc->href}&amp;",
 				'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 90b33c46..2ac84ed2 100755
--- 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 37bcc728..e229e890 100644
--- 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 fbe81058..64c665ec 100644
--- 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 159ee1a0..e3e9d2ed 100644
--- 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 4672272c..dcd11700 100644
--- 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 d13a4f39..4000b491 100755
--- 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 be8c88d0..f81331eb 100644
--- 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',