Give environnments vars to the navlink hook

Helpful to decide when to add a navlink or not depending on the context
phppgadmin · Aug 22, 2012 · 28fd7cd · 28fd7cd
1 parent 0a65e36
commit 28fd7cd
Show file tree

Hide file tree

Showing 25 changed files with 53 additions and 48 deletions.
diff --git a/aggregates.php b/aggregates.php
@@ -297,7 +297,7 @@ function doProperties($msg = '') {
 			'content' => $lang['strdrop']
 		);
 
-		$misc->printNavLinks($navlinks, 'aggregates-properties');
+		$misc->printNavLinks($navlinks, 'aggregates-properties', get_defined_vars());
 	}
 
 
@@ -390,7 +390,7 @@ function doDefault($msg = '') {
 				'content' => $lang['strcreateaggregate']
 			)
 		);
-		$misc->printNavLinks($navlinks, 'aggregates-aggregates');
+		$misc->printNavLinks($navlinks, 'aggregates-aggregates', get_defined_vars());
 	}
 
 	/**

diff --git a/all_db.php b/all_db.php
@@ -461,7 +461,7 @@ function doDefault($msg = '') {
 			'content' => $lang['strcreatedatabase']
 		    )
 		);
-		$misc->printNavLinks($navlinks, 'all_db-databases');
+		$misc->printNavLinks($navlinks, 'all_db-databases', get_defined_vars());
 	}
 
 	function doTree() {

diff --git a/classes/Misc.php b/classes/Misc.php
@@ -50,7 +50,6 @@ function getHREF($exclude_from = null) {
 		}
 
 		function getSubjectParams($subject) {
-
 			$vars = array();
 
 			switch($subject) {
@@ -172,16 +171,16 @@ function getSubjectParams($subject) {
 							'column' => $_REQUEST['column']
 						));
 					break;
-				// case 'plugin':
-				// 	$vars = array('params' => array(
-				// 		'server' => $_REQUEST['server'],
-				// 		'subject' => 'plugin',
-				// 		'plugin' => $_REQUEST['plugin'],
-				// 		'database' => $_REQUEST['database'],
-				// 		'schema' => $_REQUEST['schema'],
-				// 		'action' => $_REQUEST['action']
-				// 	));
-				// 	break;
+                               // case 'plugin':
+                               //      $vars = array('params' => array(
+                               //              'server' => $_REQUEST['server'],
+                               //              'subject' => 'plugin',
+                               //              'plugin' => $_REQUEST['plugin'],
+                               //              'database' => $_REQUEST['database'],
+                               //              'schema' => $_REQUEST['schema'],
+                               //              'action' => $_REQUEST['action']
+                               //      ));
+                               //      break;
 				default:
 					return false;
 			}
@@ -1601,15 +1600,18 @@ function getTrail($subject = null) {
 		*
 		* @param $navlinks - An array with the the attributes and values that will be shown. See printLinksList for array format.
 		* @param $place - Place where the $navlinks are displayed. Like 'display-browse', where 'display' is the file (display.php)
+		* @param $env - Associative array of defined variables in the scope of the caller.
+		*               Allows to give some environnement details to plugins.
 		* and 'browse' is the place inside that code (doBrowse).
 		*/
-		function printNavLinks($navlinks=array(), $place) {
+		function printNavLinks($navlinks, $place, $env = array()) {
 			global $plugin_manager;
 
 			// Navlinks hook's place
 			$plugin_functions_parameters = array(
 				'navlinks' => &$navlinks,
-				'place' => $place
+				'place' => $place,
+				'env' => $env
 			);
 			$plugin_manager->do_hook('navlinks', $plugin_functions_parameters);
 

diff --git a/colproperties.php b/colproperties.php
@@ -321,7 +321,7 @@ function attPre(&$rowdata) {
 				);
 			}
 
-			$misc->printNavLinks($navlinks, 'colproperties-colproperties');
+			$misc->printNavLinks($navlinks, 'colproperties-colproperties', get_defined_vars());
 		}
 	}
 

diff --git a/constraints.php b/constraints.php
@@ -543,7 +543,7 @@ function cnPre(&$rowdata) {
 				'content' => $lang['straddfk']
 			)
 		);
-		$misc->printNavLinks($navlinks, 'constraints-constraints');
+		$misc->printNavLinks($navlinks, 'constraints-constraints', get_defined_vars());
 	}
 
 	function doTree() {

diff --git a/display.php b/display.php
@@ -800,7 +800,7 @@ function doBrowse($msg = '') {
 			'content' => $lang['strrefresh']
 		);
 
-		$misc->printNavLinks($navlinks, 'display-browse');
+		$misc->printNavLinks($navlinks, 'display-browse', get_defined_vars());
 	}
 
 

diff --git a/fulltext.php b/fulltext.php
@@ -89,7 +89,7 @@ function doDefault($msg = '') {
 			)
 		);
 
-		$misc->printNavLinks($navlinks, 'fulltext-fulltext');
+		$misc->printNavLinks($navlinks, 'fulltext-fulltext', get_defined_vars());
 	}
 
 	function doDropConfig($confirm) {
@@ -454,7 +454,7 @@ function doViewDicts($msg = '') {
 			)
 		);
 
-		$misc->printNavLinks($navlinks, 'fulltext-viewdicts');
+		$misc->printNavLinks($navlinks, 'fulltext-viewdicts', get_defined_vars());
 	}
 
 
@@ -549,7 +549,7 @@ function doViewConfig($ftscfg, $msg = '') {
 			)
 		);
 
-		$misc->printNavLinks($navlinks, 'fulltext-viewconfig');
+		$misc->printNavLinks($navlinks, 'fulltext-viewconfig', get_defined_vars());
 	}
 
 	/**

diff --git a/functions.php b/functions.php
@@ -373,7 +373,7 @@ function doProperties($msg = '') {
 			)
 		);
 
-		$misc->printNavLinks($navlinks, 'functions-properties');
+		$misc->printNavLinks($navlinks, 'functions-properties', get_defined_vars());
 	}
 
 	/**
@@ -937,7 +937,7 @@ function doDefault($msg = '') {
 			)
 		);
 
-		$misc->printNavLinks($navlinks, 'functions-functions');
+		$misc->printNavLinks($navlinks, 'functions-functions', get_defined_vars());
 	}
 
 	/**

diff --git a/groups.php b/groups.php
@@ -129,7 +129,7 @@ function doProperties($msg = '') {
 					)
 				),
 				'content' => $lang['strshowallgroups']
-			)), 'groups-properties');
+			)), 'groups-properties', get_defined_vars());
 	}
 
 	/**
@@ -279,7 +279,7 @@ function doDefault($msg = '') {
 					)
 				),
 				'content' => $lang['strcreategroup']
-			)), 'groups-groups');
+			)), 'groups-groups', get_defined_vars());
 
 	}
 

diff --git a/history.php b/history.php
@@ -130,7 +130,7 @@ function doDefault() {
 			);
 		}
 
-		$misc->printNavLinks($navlinks, 'history-history');
+		$misc->printNavLinks($navlinks, 'history-history', get_defined_vars());
 	}
 
 	function doDelHistory($qid, $confirm) {

diff --git a/indexes.php b/indexes.php
@@ -351,7 +351,7 @@ function indPre(&$rowdata, $actions) {
 				),
 				'content' => $lang['strcreateindex']
 			)
-		), 'indexes-indexes');
+		), 'indexes-indexes', get_defined_vars());
 	}
 
 	function doTree() {

diff --git a/privileges.php b/privileges.php
@@ -326,7 +326,7 @@ function doDefault($msg = '') {
 			);
 		}
 
-		$misc->printNavLinks($navlinks, 'privileges-privileges');
+		$misc->printNavLinks($navlinks, 'privileges-privileges', get_defined_vars());
 	}
 
 	$misc->printHeader($lang['strprivileges']);

diff --git a/roles.php b/roles.php
@@ -465,7 +465,7 @@ function doProperties($msg = '') {
 			)
 		);
 
-		$misc->printNavLinks($navlinks, 'roles-properties');
+		$misc->printNavLinks($navlinks, 'roles-properties', get_defined_vars());
 	}
 
 	/**
@@ -525,7 +525,7 @@ function doAccount($msg = '') {
 					)
 				),
 				'content' => $lang['strchangepassword']
-			)), 'roles-account');
+			)), 'roles-account', get_defined_vars());
 	}
 
 	/**
@@ -693,7 +693,7 @@ function renderRoleExpires($val) {
 				'content' => $lang['strcreaterole']
 			)
 		);
-		$misc->printNavLinks($navlinks, 'roles-roles');
+		$misc->printNavLinks($navlinks, 'roles-roles', get_defined_vars());
 	}
 
 	$misc->printHeader($lang['strroles']);

diff --git a/rules.php b/rules.php
@@ -182,7 +182,7 @@ function doDefault($msg = '') {
 					)
 				),
 				'content' => $lang['strcreaterule']
-			)), 'rules-rules');
+			)), 'rules-rules', get_defined_vars());
 	}
 
 	function doTree() {

diff --git a/schemas.php b/schemas.php
@@ -106,7 +106,7 @@ function doDefault($msg = '') {
 					)
 				),
 				'content' => $lang['strcreateschema']
-			)), 'schemas-schemas');
+			)), 'schemas-schemas', get_defined_vars());
 	}
 
 	/**

diff --git a/sequences.php b/sequences.php
@@ -106,7 +106,7 @@ function doDefault($msg = '')	{
 					)
 				),
 				'content' => $lang['strcreatesequence']
-			)), 'sequences-sequences');
+			)), 'sequences-sequences', get_defined_vars());
 	}
 
 	/**
@@ -281,7 +281,7 @@ function doProperties($msg = '') {
 			if (! $data->hasAlterSequenceStart())
 				unset($navlinks['restart']);
 
-			$misc->printNavLinks($navlinks, 'sequences-properties');
+			$misc->printNavLinks($navlinks, 'sequences-properties', get_defined_vars());
 		}
 		else echo "<p>{$lang['strnodata']}</p>\n";
 	}

diff --git a/sql.php b/sql.php
@@ -258,7 +258,7 @@ function sqlCallback($query, $rs, $lineno) {
 		);
 	}
 
-	$misc->printNavLinks($navlinks, 'sql-form');
+	$misc->printNavLinks($navlinks, 'sql-form', get_defined_vars());
 
 	$misc->printFooter();
 ?>
diff --git a/tables.php b/tables.php
@@ -924,7 +924,7 @@ function doDefault($msg = '') {
 			);
 		}
 
-		$misc->printNavLinks($navlinks, 'tables-tables');
+		$misc->printNavLinks($navlinks, 'tables-tables', get_defined_vars());
 	}
 
 	require('./admin.php');

diff --git a/tablespaces.php b/tablespaces.php
@@ -288,7 +288,7 @@ function doDefault($msg = '') {
 					)
 				),
 				'content' => $lang['strcreatetablespace']
-			)), 'tablespaces-tablespaces');
+			)), 'tablespaces-tablespaces', get_defined_vars());
 	}
 
 	$misc->printHeader($lang['strtablespaces']);

diff --git a/tblproperties.php b/tblproperties.php
@@ -732,7 +732,10 @@ function cstrRender($s, $p) {
 				'content' => $lang['stralter']
 			)
 		);
-		$misc->printNavLinks($navlinks, 'tblproperties-tblproperties');
+		$misc->printNavLinks($navlinks,
+			'tblproperties-tblproperties'
+			, get_defined_vars()
+		);
 
 	}
 

diff --git a/triggers.php b/triggers.php
@@ -377,7 +377,7 @@ function tgPre(&$rowdata,$actions) {
 					)
 				),
 				'content' => $lang['strcreatetrigger']
-			)), 'triggers-triggers');
+			)), 'triggers-triggers', get_defined_vars());
 	}
 
 	function doTree() {

diff --git a/types.php b/types.php
@@ -97,7 +97,7 @@ function attPre(&$rowdata) {
 						)
 					),
 					'content' => $lang['strshowalltypes']
-				)), 'types-properties');
+				)), 'types-properties', get_defined_vars());
 		} else
 			doDefault($lang['strinvalidparam']);
 	}
@@ -643,7 +643,7 @@ function doDefault($msg = '') {
 			unset($navlinks['enum']);
 		}
 
-		$misc->printNavLinks($navlinks, 'types-types');
+		$misc->printNavLinks($navlinks, 'types-types', get_defined_vars());
 	}
 
 	/**

diff --git a/users.php b/users.php
@@ -58,7 +58,7 @@ function doAccount($msg = '') {
 					)
 				),
 				'content' => $lang['strchangepassword']
-			)), 'users-account');
+			)), 'users-account', get_defined_vars());
 	}
 
 	/**
@@ -366,7 +366,7 @@ function renderUseExpires($val) {
 					)
 				),
 				'content' => $lang['strcreateuser']
-			)), 'users-users');
+			)), 'users-users', get_defined_vars());
 
 	}
 

diff --git a/viewproperties.php b/viewproperties.php
@@ -164,7 +164,7 @@ function doDefinition($msg = '') {
 					)
 				),
 				'content' => $lang['stralter']
-			)), 'viewproperties-definition');
+			)), 'viewproperties-definition', get_defined_vars());
 	}
 
 	/**
@@ -516,7 +516,7 @@ function attPre(&$rowdata) {
 			)
 		);
 
-		$misc->printNavLinks($navlinks, 'viewproperties-viewproperties');
+		$misc->printNavLinks($navlinks, 'viewproperties-viewproperties', get_defined_vars());
 	}
 
 	$misc->printHeader($lang['strviews'] . ' - ' . $_REQUEST['view']);

diff --git a/views.php b/views.php
@@ -677,7 +677,7 @@ function doDefault($msg = '') {
 				'content' => $lang['strcreateviewwiz']
 			)
 		);
-		$misc->printNavLinks($navlinks, 'views-views');
+		$misc->printNavLinks($navlinks, 'views-views', get_defined_vars());
 
 	}