From 507ea546b8dc27841f89512b1371e520b177d1b5 Mon Sep 17 00:00:00 2001 From: Sebastian Mendel Date: Thu, 17 Nov 2005 12:07:13 +0000 Subject: [PATCH] added $GLOBALS['PMA_errors'] array --- ChangeLog | 2 + libraries/common.lib.php | 6 ++- main.php | 104 +++++++++++++++++++++------------------ 3 files changed, 62 insertions(+), 50 deletions(-) diff --git a/ChangeLog b/ChangeLog index a4f61be3b..18b640b51 100755 --- a/ChangeLog +++ b/ChangeLog @@ -21,6 +21,8 @@ $Source$ libraries/select_lang.php: keep the global space clean - unset variables after use - commented out some never used variables + * main.php, libraries/common.lib.php, libraries/dbi/*: + - added $GLOBALS['PMA_errors'] array 2005-11-16 Marc Delisle * tbl_properties_links.php: missing menu tabs diff --git a/libraries/common.lib.php b/libraries/common.lib.php index 6e14d92d1..10248c776 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -51,10 +51,14 @@ // TODO: remove direct calling from elsewhere require_once('./libraries/grab_globals.lib.php'); +/** + * @var array $GLOBALS['PMA_errors'] holds errors + */ +$GLOBALS['PMA_errors'] = array(); + /** * Minimum inclusion? (i.e. for the stylesheet builder) */ - if (!isset($is_minimum_common)) { $is_minimum_common = FALSE; } diff --git a/main.php b/main.php index 47a39478a..626394a9a 100644 --- a/main.php +++ b/main.php @@ -50,17 +50,17 @@ require_once('./header.inc.php'); * Displays the welcome message and the server informations */ if ( @file_exists($pmaThemeImage . 'logo_right.png') ) { - ?> + ?> phpMyAdmin +?>

phpMyAdmin ' . PMA_VERSION . ''); -?> +?>

0 ) { echo '

' . $full_string . '

' . "\n"; } // end if $server > 0 -?> +?>
+?> @@ -324,7 +324,7 @@ if (empty($cfg['Lang'])) { ?> ','s_lang.png','Language','') : $str_normal_list); - ?> + ?> + ?> ') : $str_normal_list) . "\n"; - ?> + ?> +?> ','b_docs.png',$strPmaDocumentation,'') : $str_normal_list); -?> +?> @@ -474,21 +474,21 @@ if (isset($available_themes_choices) && $available_themes_choices > 1) { + ?> ','php_sym.png',$strShowPHPInfo,'') : $str_normal_list); - ?> + ?> +?> ','b_home.png',$strHomepageOfficial,'') : $str_normal_list); -?> +?> @@ -512,6 +512,12 @@ echo ($str_iconic_list != '' ? sprintf($str_iconic_list,'' . $error . '' . "\n"; + } +} + /** * Removed the "empty $cfg['PmaAbsoluteUri']" warning on 2005-08-23 * See https://sourceforge.net/tracker/index.php?func=detail&aid=1257134&group_id=23067&atid=377411
0 ) { $cfg['ShowChgPassword'] = FALSE; } - ?> + ?> + ?> ','s_status.png',$strMySQLShowStatus,'') : $str_normal_list); - ?> + ?> ','s_vars.png',$strMySQLShowVars,'') : $str_normal_list); - ?> + ?> ','s_process.png',$strMySQLShowProcess,'') : $str_normal_list); - ?> + ?> = 40100) { - ?> + ?> ','s_asci.png',$strCharsetsAndCollations,'') : $str_normal_list); - ?> + ?> + ?> ','b_engine.png',$strStorageEngines,'') : $str_normal_list); - ?> + ?> @@ -214,10 +214,10 @@ if ( $server > 0 ) { + ?> ','s_reload.png',$strReloadMySQL,'') : $str_normal_list); - ?> + ?> ','s_rights.png',$strPrivileges,'') : $str_normal_list); - ?> + ?> @@ -239,10 +239,10 @@ if ( $server > 0 ) { $binlogs = PMA_DBI_try_query('SHOW MASTER LOGS', NULL, PMA_DBI_QUERY_STORE); if ($binlogs) { if (PMA_DBI_num_rows($binlogs) > 0) { - ?> + ?> ','s_tbl.png',$strBinaryLog,'') : $str_normal_list); - ?> + ?> @@ -252,10 +252,10 @@ if ( $server > 0 ) { PMA_DBI_free_result($binlogs); } unset($binlogs); - ?> + ?> ','s_db.png',$strDatabases,'') : $str_normal_list); - ?> + ?> @@ -263,7 +263,7 @@ if ( $server > 0 ) { ','b_export.png',$strExport,'') : $str_normal_list); - ?> + ?> @@ -271,7 +271,7 @@ if ( $server > 0 ) { ','b_import.png',$strImport,'') : $str_normal_list); - ?> + ?> @@ -279,11 +279,11 @@ if ( $server > 0 ) { + ?> ','s_passwd.png',$strChangePassword,'') : $str_normal_list); - ?> + ?> @@ -297,21 +297,21 @@ if ( $server > 0 ) { ? '' . ($cfg['ReplaceHelpImg'] ? 'Info' : '(*)') . '' : ''; - ?> + ?> ','s_loggoff.png',$strLogout,'') : $str_normal_list); - ?> + ?> 0) -?> +?>
MySQL
- +
- +
- +
- +
@@ -226,10 +226,10 @@ if ( $server > 0 ) { + ?>
- +
 
@@ -358,7 +358,7 @@ if (empty($cfg['Lang'])) { echo ' '; echo '' . "\n"; } - ?> + ?> @@ -370,10 +370,10 @@ if (empty($cfg['Lang'])) { if ( isset($cfg['AllowAnywhereRecoding']) && $cfg['AllowAnywhereRecoding'] && $server != 0 && $allow_recoding && PMA_MYSQL_INT_VERSION < 40100) { - ?> + ?>
@@ -390,7 +390,7 @@ if ( isset($cfg['AllowAnywhereRecoding']) && $cfg['AllowAnywhereRecoding'] echo ' ' . '' . "\n"; } - ?> + ?> @@ -436,16 +436,16 @@ if (isset($available_themes_choices) && $available_themes_choices > 1) { $theme_preview_href = ''; - ?> + ?>
:' . "\n"; - ?> + ?>
@@ -463,10 +463,10 @@ if (isset($available_themes_choices) && $available_themes_choices > 1) {