From 41670e64dcce85c7269ea025f0186d312e209267 Mon Sep 17 00:00:00 2001 From: Piotr Przybylski Date: Thu, 9 Oct 2008 16:50:11 +0000 Subject: [PATCH] Setup script: - never hide error messages - fixed a few typos --- setup/lang/english-utf-8.inc.php | 10 +++++----- setup/lib/index.lib.php | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/setup/lang/english-utf-8.inc.php b/setup/lang/english-utf-8.inc.php index 91ebede0f..c66e7e2ec 100644 --- a/setup/lang/english-utf-8.inc.php +++ b/setup/lang/english-utf-8.inc.php @@ -60,7 +60,7 @@ $str['VersionCheckDataError'] = 'Reading of version failed. Maybe you\'re offlin $str['VersionCheckInvalid'] = 'Got invalid version string from server'; $str['VersionCheckUnparsable'] = 'Unparsable version string'; $str['VersionCheckNewAvailable'] = 'New version of phpMyAdmin is available, you should consider upgrade. New version is %s, released on %s.'; -$str['VersionCheckNewAvailableSvn'] = 'You are using subversion version, run [kbd]svn update[/kbd] :-).[br]The latest stable version is %s, released on %s.'; +$str['VersionCheckNewAvailableSvn'] = 'You are using subversion version, run [kbd]svn update[/kbd] :-)[br]The latest stable version is %s, released on %s.'; $str['VersionCheckNone'] = 'No newer stable version is available'; $str['ServerSecurityInfoMsg'] = 'If you feel this is necessary, use additional protection settings - [a@?page=servers&mode=edit&id=%1$d#tab_Server_config]host authentication[/a] settings and [a@?page=form&formset=features#tab_Security]trusted proxies list[/a]. However, IP-based protection may not be reliable if your IP belongs to an ISP where thousands of users, including you, are connected to.'; $str['ServerSslMsg'] = 'You should use SSL connections if your web server supports it'; @@ -74,10 +74,10 @@ $str['ForceSSLMsg'] = 'This [a@?page=form&formset=features#tab_Security]opti $str['AllowArbitraryServerMsg'] = 'This [a@?page=form&formset=features#tab_Security]option[/a] should be disabled as it allows attackers to bruteforce login to any MySQL server. If you feel this is necessary, use [a@?page=form&formset=features#tab_Security]trusted proxies list[/a]. However, IP-based protection may not be reliable if your IP belongs to an ISP where thousands of users, including you, are connected to.'; $str['LoginCookieValidityMsg'] = '[a@?page=form&formset=features#tab_Security]Login cookie validity[/a] should be should be set to 1800 seconds (30 minutes) at most. Values larger than 1800 may pose a security risk such as impersonation.'; $str['DirectoryNotice'] = 'This value should be double checked to ensure that this directory is neither world accessible nor readable or writable by other users on your server.'; -$str['GZipDumpWarning'] = '[a@?page=form&formset=features#tab_Import_export]GZip compression and decompression[/a] requires functions (%s) which are unavaible on this system.'; -$str['BZipDumpWarning'] = '[a@?page=form&formset=features#tab_Import_export]Bzip2 compression and decompression[/a] requires functions (%s) which are unavaible on this system.'; -$str['ZipDumpImportWarning'] = '[a@?page=form&formset=features#tab_Import_export]Zip decompression[/a] requires functions (%s) which are unavaible on this system.'; -$str['ZipDumpExportWarning'] = '[a@?page=form&formset=features#tab_Import_export]Zip compression[/a] requires functions (%s) which are unavaible on this system.'; +$str['GZipDumpWarning'] = '[a@?page=form&formset=features#tab_Import_export]GZip compression and decompression[/a] requires functions (%s) which are unavailable on this system.'; +$str['BZipDumpWarning'] = '[a@?page=form&formset=features#tab_Import_export]Bzip2 compression and decompression[/a] requires functions (%s) which are unavailable on this system.'; +$str['ZipDumpImportWarning'] = '[a@?page=form&formset=features#tab_Import_export]Zip decompression[/a] requires functions (%s) which are unavailable on this system.'; +$str['ZipDumpExportWarning'] = '[a@?page=form&formset=features#tab_Import_export]Zip compression[/a] requires functions (%s) which are unavailable on this system.'; // form errors $str['error_form'] = 'Submitted form contains errors'; diff --git a/setup/lib/index.lib.php b/setup/lib/index.lib.php index e262c72c2..df2e787e0 100644 --- a/setup/lib/index.lib.php +++ b/setup/lib/index.lib.php @@ -76,7 +76,7 @@ function messages_show_html() foreach ($_SESSION['messages'] as $type => $messages) { foreach ($messages as $id => $msg) { echo '
' . '

' . $msg['title'] . '

' . $msg['message'] . '
'; - if (!$msg['fresh']) { + if (!$msg['fresh'] && $type != 'error') { $old_ids[] = $id; } }