@@ -237,7 +237,7 @@ display_fieldset_bottom_simple();
display_form_bottom();
?>
\ No newline at end of file
diff --git a/setup/frames/menu.inc.php b/setup/frames/menu.inc.php
index 7f4748350..c32e05373 100644
--- a/setup/frames/menu.inc.php
+++ b/setup/frames/menu.inc.php
@@ -1,7 +1,7 @@
* @license http://www.gnu.org/licenses/gpl.html GNU GPL 2.0
@@ -19,6 +19,6 @@ $separator = PMA_get_arg_separator('html');
-
-
+
+
diff --git a/setup/frames/servers.inc.php b/setup/frames/servers.inc.php
index 3cc4d45c8..8a0a6b562 100644
--- a/setup/frames/servers.inc.php
+++ b/setup/frames/servers.inc.php
@@ -1,7 +1,7 @@
* @license http://www.gnu.org/licenses/gpl.html GNU GPL 2.0
@@ -23,7 +23,7 @@ $cf = ConfigFile::getInstance();
$server_exists = !empty($id) && $cf->get("Servers/$id") !== null;
if ($mode == 'edit' && $server_exists) {
- $page_title = $GLOBALS['str']['page_servers_edit']
+ $page_title = $GLOBALS['str']['ServersEdit']
. ' ' . $id . ' (' . $cf->getServerDSN($id) . ')';
} elseif ($mode == 'remove' && $server_exists) {
$cf->removeServer($id);
@@ -32,7 +32,7 @@ if ($mode == 'edit' && $server_exists) {
} elseif ($mode == 'revert' && $server_exists) {
// handled by process_formset()
} else {
- $page_title = $GLOBALS['str']['page_servers_add'];
+ $page_title = $GLOBALS['str']['ServersAdd'];
$id = 0;
}
?>
diff --git a/setup/lang/english-utf-8.inc.php b/setup/lang/english-utf-8.inc.php
index 5f305383e..91ebede0f 100644
--- a/setup/lang/english-utf-8.inc.php
+++ b/setup/lang/english-utf-8.inc.php
@@ -10,13 +10,14 @@
*/
// page titles
-$str['page_servers_add'] = 'Add a new server';
-$str['page_servers_edit'] = 'Edit server';
+$str['ServersAdd'] = 'Add a new server';
+$str['ServersEdit'] = 'Edit server';
$str['Formset_features'] = 'Features';
$str['Formset_left_frame'] = 'Customize navigation frame';
$str['Formset_main_frame'] = 'Customize main frame';
$str['Formset_import'] = 'Customize import defaults';
$str['Formset_export'] = 'Customize export options';
+$str['Formset_customization'] = 'Customization';
// forms
$str['true'] = 'yes';
@@ -25,54 +26,58 @@ $str['Display'] = 'Display';
$str['Download'] = 'Download';
$str['Clear'] = 'Clear';
$str['Load'] = 'Load';
-$str['Restore_default'] = 'Restore default value';
-$str['Set_value'] = 'Set value: %s';
+$str['RestoreDefaultValue'] = 'Restore default value';
+$str['SetValue'] = 'Set value: %s';
$str['Warning'] = 'Warning';
-$str['Ignore_errors'] = 'Ignore errors';
-$str['Revert_erroneous_fields'] = 'Try to revert erroneous fields to their default values';
-$str['Show_form'] = 'Show form';
+$str['IgnoreErrors'] = 'Ignore errors';
+$str['RevertErroneousFields'] = 'Try to revert erroneous fields to their default values';
+$str['ShowForm'] = 'Show form';
// main page
$str['Overview'] = 'Overview';
-$str['Show_hidden_messages'] = 'Show hidden messages (#MSG_COUNT)';
-$str['No_servers'] = 'There are no configured servers';
-$str['New_server'] = 'New server';
-$str['Default_language'] = 'Default language';
-$str['Default_server'] = 'Default server';
-$str['let_the_user_choose'] = 'let the user choose';
+$str['ShowHiddenMessages'] = 'Show hidden messages (#MSG_COUNT)';
+$str['NoServers'] = 'There are no configured servers';
+$str['NewServer'] = 'New server';
+$str['DefaultLanguage'] = 'Default language';
+$str['DefaultServer'] = 'Default server';
+$str['LetUserChoose'] = 'let the user choose';
$str['-none-'] = '- none -';
-$str['End_of_lne'] = 'End of line';
-$str['Configuration_file'] = 'Configuration file';
-$str['Homepage_link'] = 'phpMyAdmin homepage';
-$str['Donate_link'] = 'Donate';
-$str['Version_check_link'] = 'Check for latest version';
+$str['EndOfLine'] = 'End of line';
+$str['ConfigurationFile'] = 'Configuration file';
+$str['HomepageLink'] = 'phpMyAdmin homepage';
+$str['DonateLink'] = 'Donate';
+$str['VersionCheckLink'] = 'Check for latest version';
// main page messages
-$str['Cannot_load_config'] = 'Cannot load or save configuration';
-$str['Cannot_load_config_desc'] = 'Please create web server writable folder [em]config[/em] in phpMyAdmin top level directory as described in [a@../Documentation.html#setup_script]documentation[/a]. Otherwise you will be only able to download or display it.';
-$str['Insecure_connection'] = 'Insecure connection';
-$str['Insecure_connection_desc1'] = 'You are not using a secure connection, all data (including sensitive, like passwords) is transferred unencrypted!';
-$str['Insecure_connection_desc2'] = 'If your server is also configured to accept HTTPS requests follow [a@%s]this link[/a] to use a secure connection.';
-$str['Version_check'] = 'Version check';
-$str['Version_check_wrapper_error'] = 'Neither URL wrapper nor CURL is available. Version check is not possible.';
-$str['Version_check_data_error'] = 'Reading of version failed. Maybe you\'re offline or the upgrade server does not respond.';
-$str['Version_check_invalid'] = 'Got invalid version string from server';
-$str['Version_check_unparsable'] = 'Unparsable version string';
-$str['Version_check_new_available'] = 'New version of phpMyAdmin is available, you should consider upgrade. New version is %s, released on %s.';
-$str['Version_check_new_available_svn'] = 'You are using subversion version, run [kbd]svn update[/kbd] :-).[br]The latest stable version is %s, released on %s.';
-$str['Version_check_none'] = 'No newer stable version is available';
-$str['Server_security_info_msg'] = '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['Server_ssl_msg'] = 'You should use SSL connections if your web server supports it';
-$str['Server_extension_msg'] = 'You should use mysqli for performance reasons';
-$str['Server_auth_config_msg'] = 'You set [kbd]config[/kbd] authentication type and included username and password for auto-login, which is not a desirable option for live hosts. Anyone who knows phpMyAdmin URL can directly access your phpMyAdmin panel. Set [a@?page=servers&mode=edit&id=%1$d#tab_Server]authentication type[/a] to [kbd]cookie[/kbd] or [kbd]http[/kbd].';
-$str['Server_no_password_root_msg'] = 'You allow for connecting to the server as root without a passowrd.';
-$str['blowfish_secret_msg'] = 'You didn\'t have blowfish secret set and enabled cookie authentication so the key was generated for you. It is used to encrypt cookies.';
-$str['blowfish_secret_length_msg'] = 'Key is too short, it should have at least 8 characters';
-$str['blowfish_secret_chars_msg'] = 'Key should contain alphanumerics, letters [em]and[/em] special characters';
-$str['ForceSSL_msg'] = 'This [a@?page=form&formset=features#tab_Security]option[/a] should be enabled if your web server supports it';
-$str['AllowArbitraryServer_msg'] = '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['LoginCookieValidity_msg'] = '[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['Directory_notice'] = '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['CannotLoadConfig'] = 'Cannot load or save configuration';
+$str['CannotLoadConfigMsg'] = 'Please create web server writable folder [em]config[/em] in phpMyAdmin top level directory as described in [a@../Documentation.html#setup_script]documentation[/a]. Otherwise you will be only able to download or display it.';
+$str['InsecureConnection'] = 'Insecure connection';
+$str['InsecureConnectionMsg1'] = 'You are not using a secure connection, all data (including sensitive, like passwords) is transferred unencrypted!';
+$str['InsecureConnectionMsg2'] = 'If your server is also configured to accept HTTPS requests follow [a@%s]this link[/a] to use a secure connection.';
+$str['VersionCheck'] = 'Version check';
+$str['VersionCheckWrapperError'] = 'Neither URL wrapper nor CURL is available. Version check is not possible.';
+$str['VersionCheckDataError'] = 'Reading of version failed. Maybe you\'re offline or the upgrade server does not respond.';
+$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['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';
+$str['ServerExtensionMsg'] = 'You should use mysqli for performance reasons';
+$str['ServerAuthConfigMsg'] = 'You set [kbd]config[/kbd] authentication type and included username and password for auto-login, which is not a desirable option for live hosts. Anyone who knows phpMyAdmin URL can directly access your phpMyAdmin panel. Set [a@?page=servers&mode=edit&id=%1$d#tab_Server]authentication type[/a] to [kbd]cookie[/kbd] or [kbd]http[/kbd].';
+$str['ServerNoPasswordRootMsg'] = 'You allow for connecting to the server as root without a passowrd.';
+$str['BlowfishSecretMsg'] = 'You didn\'t have blowfish secret set and enabled cookie authentication so the key was generated for you. It is used to encrypt cookies.';
+$str['BlowfishSecretLengthMsg'] = 'Key is too short, it should have at least 8 characters';
+$str['BlowfishSecretCharsMsg'] = 'Key should contain alphanumerics, letters [em]and[/em] special characters';
+$str['ForceSSLMsg'] = 'This [a@?page=form&formset=features#tab_Security]option[/a] should be enabled if your web server supports it';
+$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.';
// form errors
$str['error_form'] = 'Submitted form contains errors';
@@ -121,21 +126,16 @@ $str['Form_Browse'] = 'Browse mode';
$str['Form_Browse_desc'] = 'Customize browse mode';
$str['Form_Edit'] = 'Edit mode';
$str['Form_Edit_desc'] = 'Customize edit mode';
-$str['Form_Tabs'] = 'Tabs display';
+$str['Form_Tabs'] = 'Tabs';
$str['Form_Tabs_desc'] = 'Choose how you want tabs to work';
$str['Form_Sql_box'] = 'SQL Query box';
$str['Form_Sql_box_desc'] = 'Customize links shown in SQL Query boxes';
-$str['Form_Import'] = $GLOBALS['strImport'];
-$str['Form_Import_desc'] = 'Customize default common import options';
-$str['Form_Import_sql'] = $GLOBALS['strSQL'];
-$str['Form_Import_sql_desc'] = 'Customize default SQL import options';
-$str['Form_Import_csv'] = $GLOBALS['strCSV'];
-$str['Form_Import_csv_desc'] = 'Customize default CSV import options';
-$str['Form_Import_ldi'] = $GLOBALS['strLDI'];
-$str['Form_Import_ldi_desc'] = 'Customize default CSV using LOAD DATA import options';
-$str['Form_Export'] = $GLOBALS['strExport'];
-$str['Form_Export_defaults'] = 'Defaults';
+$str['Form_Import_defaults'] = 'Import defaults';
+$str['Form_Import_defaults_desc'] = 'Customize default common import options';
+$str['Form_Export_defaults'] = 'Export defaults';
$str['Form_Export_defaults_desc'] = 'Customize default export options';
+$str['Form_Query_window'] = 'Query window';
+$str['Form_Query_window_desc'] = 'Customize query window options';
// Form: Server
$str['Servers/verbose_name'] = 'Verbose name of this server';
@@ -358,9 +358,9 @@ $str['ShowFunctionFields_desc'] = 'Display the function fields in edit/insert mo
$str['CharEditing_name'] = 'CHAR fields editing';
$str['CharEditing_desc'] = 'Defines which type of editing controls should be used for CHAR and VARCHAR fields; [kbd]input[/kbd] - allows limiting of input length, [kbd]textarea[/kbd] - allows newlines in fields';
$str['CharTextareaCols_name'] = 'CHAR textarea columns';
-$str['CharTextareaCols_desc'] = 'Number of columns for textareas, this value will be emphasized (*2) for SQL query textareas and (*1.25) for SQL textareas inside the query window';
+$str['CharTextareaCols_desc'] = 'Number of columns for CHAR/VARCHAR textareas';
$str['CharTextareaRows_name'] = 'CHAR textarea rows';
-$str['CharTextareaRows_desc'] = 'Number of rows for textareas, this value will be emphasized (*2) for SQL query textareas and (*1.25) for SQL textareas inside the query window';
+$str['CharTextareaRows_desc'] = 'Number of rows for CHAR/VARCHAR textareas';
$str['InsertRows_name'] = 'Number of inserted rows';
$str['InsertRows_desc'] = 'How many rows can be inserted at one time';
$str['ForeignKeyDropdownOrder_name'] = 'Foreign key dropdown order';
@@ -379,49 +379,31 @@ $str['DefaultTabDatabase_name'] = 'Default database tab';
$str['DefaultTabDatabase_desc'] = 'Tab that is displayed when entering a database';
$str['DefaultTabTable_name'] = 'Default table tab';
$str['DefaultTabTable_desc'] = 'Tab that is displayed when entering a table';
+$str['QueryWindowDefTab_name'] = 'Default query window tab';
+$str['QueryWindowDefTab_desc'] = 'Tab displayed when opening a new query window';
// Form: Sql_Box
-$str['SQLQuery/Edit_name'] = $GLOBALS['strEdit'];
-$str['SQLQuery/Explain_name'] = $GLOBALS['strExplain'];
-$str['SQLQuery/ShowAsPHP_name'] = $GLOBALS['strPhp'];
-$str['SQLQuery/Validate_name'] = $GLOBALS['strValidateSQL'];
-$str['SQLQuery/Refresh_name'] = $GLOBALS['strRefresh'];
+$str['SQLQuery/Edit_name'] = 'Edit';
+$str['SQLQuery/Explain_name'] = 'Explain SQL';
+$str['SQLQuery/ShowAsPHP_name'] = 'Create PHP Code';
+$str['SQLQuery/Validate_name'] = 'Validate SQL';
+$str['SQLQuery/Refresh_name'] = 'Refresh';
-// Form: Import
-$str['Import/format_name'] = $GLOBALS['strImportFormat'];
+// Form: Import_defaults
+$str['Import/format_name'] = 'Format of imported file';
$str['Import/format_desc'] = 'Default format, mind that this list depends on location (database, table) and only SQL is always avaiable';
$str['Import/allow_interrupt_name'] = 'Partial import: allow interrupt';
-$str['Import/allow_interrupt_desc'] = $GLOBALS['strAllowInterrupt'];
+$str['Import/allow_interrupt_desc'] = 'Allow interrupt of import in case script detects it is close to time limit. This might be good way to import large files, however it can break transactions.';
$str['Import/skip_queries_name'] = 'Partial import: skip queries';
-$str['Import/skip_queries_desc'] = $GLOBALS['strSkipQueries'];
-
-// Form: Import_sql
-$str['Import/sql_compatibility_name'] = $GLOBALS['strSQLCompatibility'];
-$str['Import/sql_compatibility_desc'] = 'You can find more information on SQL compatibility modes in [a@http://dev.mysql.com/doc/refman/5.0/en/server-sql-mode.html]MySQL Reference Manual[/a]';
-// Form: Import_csv
-$str['Import/csv_replace_name'] = $GLOBALS['strReplaceTable'];
-$str['Import/csv_terminated_name'] = $GLOBALS['strFieldsTerminatedBy'];
-$str['Import/csv_enclosed_name'] = $GLOBALS['strFieldsEnclosedBy'];
-$str['Import/csv_escaped_name'] = $GLOBALS['strFieldsEscapedBy'];
-$str['Import/csv_new_line_name'] = $GLOBALS['strLinesTerminatedBy'];
-$str['Import/csv_columns_name'] = $GLOBALS['strColumnNames'];
-
-// Form: Import_ldi
-$str['Import/ldi_replace_name'] = $GLOBALS['strReplaceTable'];
-$str['Import/ldi_terminated_name'] = $GLOBALS['strFieldsTerminatedBy'];
-$str['Import/ldi_enclosed_name'] = $GLOBALS['strFieldsEnclosedBy'];
-$str['Import/ldi_escaped_name'] = $GLOBALS['strFieldsEscapedBy'];
-$str['Import/ldi_new_line_name'] = $GLOBALS['strLinesTerminatedBy'];
-$str['Import/ldi_columns_name'] = $GLOBALS['strColumnNames'];
-$str['Import/ldi_local_option_name'] = $GLOBALS['strLDILocal'];
+$str['Import/skip_queries_desc'] = 'Number of records (queries) to skip from start';
// Form: Export_defaults
$str['Export/format_name'] = 'Format';
-$str['Export/compression_name'] = $GLOBALS['strCompression'];
-$str['Export/asfile_name'] = $GLOBALS['strSend'];
-$str['Export/charset_name'] = $GLOBALS['strCharsetOfFile'];
+$str['Export/compression_name'] = 'Compression';
+$str['Export/asfile_name'] = 'Save as file';
+$str['Export/charset_name'] = 'Character set of the file';
$str['Export/onserver_name'] = 'Save on server';
-$str['Export/onserver_overwrite_name'] = $GLOBALS['strOverwriteExisting'];
+$str['Export/onserver_overwrite_name'] = 'Overwrite existing file(s)';
$str['Export/remember_file_template_name'] = 'Remember file name template';
$str['Export/file_template_table_name'] = 'Table name template';
$str['Export/file_template_database_name'] = 'Database name template';
diff --git a/setup/lib/FormDisplay.class.php b/setup/lib/FormDisplay.class.php
index 241cf3e9a..9d666d539 100644
--- a/setup/lib/FormDisplay.class.php
+++ b/setup/lib/FormDisplay.class.php
@@ -293,6 +293,9 @@ class FormDisplay
$value = (array) $value;
$value_default = (array) $value_default;
break;
+ case 'NULL':
+ trigger_error("Field $system_path has no type", E_USER_WARNING);
+ return;
}
// TrustedProxies requires changes before displaying
diff --git a/setup/lib/FormDisplay.tpl.php b/setup/lib/FormDisplay.tpl.php
index f49431714..a94042095 100644
--- a/setup/lib/FormDisplay.tpl.php
+++ b/setup/lib/FormDisplay.tpl.php
@@ -180,12 +180,12 @@ function display_input($path, $name, $description = '', $type, $value, $value_is
}
if (isset($opts['setvalue']) && $opts['setvalue']) {
?>
- " title="" style="display:none">
+ " title="" style="display:none">
-
+
-
+
displayErrors() ?>
-
+
-
+
array(
'Edit',
'Explain',
'ShowAsPHP',
'Validate',
'Refresh'));
-$forms['Import'] = array('Import' => array(
+$forms['Import_defaults'] = array('Import' => array(
'format',
'allow_interrupt',
'skip_queries'));
-$forms['Import_sql'] = array('Import' => array(
- 'sql_compatibility'));
-$forms['Import_csv'] = array('Import' => array(
- 'csv_replace',
- 'csv_terminated',
- 'csv_enclosed',
- 'csv_escaped',
- 'csv_new_line',
- 'csv_columns'));
-$forms['Import_ldi'] = array('Import' => array(
- 'ldi_replace',
- 'ldi_terminated',
- 'ldi_enclosed',
- 'ldi_escaped',
- 'ldi_new_line',
- 'ldi_columns',
- 'ldi_local_option'));
$forms['Export_defaults'] = array('Export' => array(
'format',
'compression',
@@ -189,4 +173,4 @@ $forms['Export_defaults'] = array('Export' => array(
'file_template_table',
'file_template_database',
'file_template_server'));
-?>
+?>
\ No newline at end of file
diff --git a/setup/lib/index.lib.php b/setup/lib/index.lib.php
index b2cc10fc0..e262c72c2 100644
--- a/setup/lib/index.lib.php
+++ b/setup/lib/index.lib.php
@@ -42,7 +42,11 @@ function messages_set($type, $id, $title, $message)
{
$fresh = !isset($_SESSION['messages'][$type][$id]);
$title = PMA_lang($title);
- $_SESSION['messages'][$type][$id] = array('fresh' => $fresh, 'active' => true, 'title' => $title, 'message' => $message);
+ $_SESSION['messages'][$type][$id] = array(
+ 'fresh' => $fresh,
+ 'active' => true,
+ 'title' => $title,
+ 'message' => $message);
}
/**
@@ -111,15 +115,15 @@ function PMA_version_check()
$data = curl_exec($ch);
curl_close($ch);
} else {
- messages_set('error', $message_id, 'Version_check',
- PMA_lang('Version_check_wrapper_error'));
+ messages_set('error', $message_id, 'VersionCheck',
+ PMA_lang('VersionCheckWrapperError'));
return;
}
}
if (empty($data)) {
- messages_set('error', $message_id, 'Version_check',
- PMA_lang('Version_check_data_error'));
+ messages_set('error', $message_id, 'VersionCheck',
+ PMA_lang('VersionCheckDataError'));
return;
}
@@ -135,30 +139,30 @@ function PMA_version_check()
$version_upstream = version_to_int($version);
if ($version_upstream === false) {
- messages_set('error', $message_id, 'Version_check',
- PMA_lang('Version_check_invalid'));
+ messages_set('error', $message_id, 'VersionCheck',
+ PMA_lang('VersionCheckInvalid'));
return;
}
$version_local = version_to_int($_SESSION['PMA_Config']->get('PMA_VERSION'));
if ($version_local === false) {
- messages_set('error', $message_id, 'Version_check',
- PMA_lang('Version_check_unparsable'));
+ messages_set('error', $message_id, 'VersionCheck',
+ PMA_lang('VersionCheckUnparsable'));
return;
}
if ($version_upstream > $version_local) {
$version = htmlspecialchars($version);
$date = htmlspecialchars($date);
- messages_set('notice', $message_id, 'Version_check',
- PMA_lang('Version_check_new_available', $version, $date));
+ messages_set('notice', $message_id, 'VersionCheck',
+ PMA_lang('VersionCheckNewAvailable', $version, $date));
} else {
if ($version_local % 100 == 0) {
- messages_set('notice', $message_id, 'Version_check',
- PMA_lang('Version_check_new_available_svn', $version, $date));
+ messages_set('notice', $message_id, 'VersionCheck',
+ PMA_lang('VersionCheckNewAvailableSvn', $version, $date));
} else {
- messages_set('notice', $message_id, 'Version_check',
- PMA_lang('Version_check_none'));
+ messages_set('notice', $message_id, 'VersionCheck',
+ PMA_lang('VersionCheckNone'));
}
}
}
@@ -193,7 +197,8 @@ function version_to_int($version)
$added = 0;
break;
default:
- messages_set('notice', 'version_match', 'Version_check', 'Unknown version part: ' . htmlspecialchars($matches[6]));
+ messages_set('notice', 'version_match', 'VersionCheck',
+ 'Unknown version part: ' . htmlspecialchars($matches[6]));
$added = 0;
break;
}
@@ -258,7 +263,8 @@ function perform_config_checks()
//
if (!$cf->getValue("Servers/$i/ssl")) {
$title = PMA_lang_name('Servers/1/ssl') . " ($server_name)";
- messages_set('notice', "Servers/$i/ssl", $title, PMA_lang('Server_ssl_msg'));
+ messages_set('notice', "Servers/$i/ssl", $title,
+ PMA_lang('ServerSslMsg'));
}
//
@@ -267,7 +273,8 @@ function perform_config_checks()
//
if ($cf->getValue("Servers/$i/extension") == 'mysql') {
$title = PMA_lang_name('Servers/1/extension') . " ($server_name)";
- messages_set('notice', "Servers/$i/extension", $title, PMA_lang('Server_extension_msg'));
+ messages_set('notice', "Servers/$i/extension", $title,
+ PMA_lang('ServerExtensionMsg'));
}
//
@@ -279,8 +286,8 @@ function perform_config_checks()
&& $cf->getValue("Servers/$i/password") != '') {
$title = PMA_lang_name('Servers/1/auth_type') . " ($server_name)";
messages_set('warning', "Servers/$i/auth_type", $title,
- PMA_lang('Server_auth_config_msg', $i) . ' ' .
- PMA_lang('Server_security_info_msg', $i));
+ PMA_lang('ServerAuthConfigMsg', $i) . ' ' .
+ PMA_lang('ServerSecurityInfoMsg', $i));
}
//
@@ -290,10 +297,10 @@ function perform_config_checks()
//
if ($cf->getValue("Servers/$i/AllowRoot")
&& $cf->getValue("Servers/$i/AllowNoPasswordRoot")) {
- $title = PMA_lang_name('Servers/1/AllowNoPasswordRoot') . " ($server_name)";
- messages_set('warning', "Servers/$i/AllowNoPasswordRoot", $title,
- PMA_lang('Server_no_password_root_msg') . ' ' .
- PMA_lang('Server_security_info_msg', $i));
+ $title = PMA_lang_name('Servers/1/AllowNoPasswordRoot') . " ($server_name)";
+ messages_set('warning', "Servers/$i/AllowNoPasswordRoot", $title,
+ PMA_lang('ServerNoPasswordRootMsg') . ' ' .
+ PMA_lang('ServerSecurityInfoMsg', $i));
}
}
@@ -305,20 +312,20 @@ function perform_config_checks()
if ($blowfish_secret_set) {
// 'cookie' auth used, blowfish_secret was generated
messages_set('notice', 'blowfish_secret_created', 'blowfish_secret_name',
- PMA_lang('blowfish_secret_msg'));
+ PMA_lang('BlowfishSecretMsg'));
} else {
$blowfish_warnings = array();
// check length
if (strlen($blowfish_secret) < 8) {
// too short key
- $blowfish_warnings[] = PMA_lang('blowfish_secret_length_msg');
+ $blowfish_warnings[] = PMA_lang('BlowfishSecretLengthMsg');
}
// check used characters
$has_digits = (bool) preg_match('/\d/', $blowfish_secret);
$has_chars = (bool) preg_match('/\S/', $blowfish_secret);
$has_nonword = (bool) preg_match('/\W/', $blowfish_secret);
if (!$has_digits || !$has_chars || !$has_nonword) {
- $blowfish_warnings[] = PMA_lang('blowfish_secret_chars_msg');
+ $blowfish_warnings[] = PMA_lang('BlowfishSecretCharsMsg');
}
if (!empty($blowfish_warnings)) {
messages_set('warning', 'blowfish_warnings' . count($blowfish_warnings),
@@ -332,7 +339,8 @@ function perform_config_checks()
// should be enabled if possible
//
if (!$cf->getValue('ForceSSL')) {
- messages_set('notice', 'ForceSSL', 'ForceSSL_name', PMA_lang('ForceSSL_msg'));
+ messages_set('notice', 'ForceSSL', 'ForceSSL_name',
+ PMA_lang('ForceSSLMsg'));
}
//
@@ -341,7 +349,7 @@ function perform_config_checks()
//
if ($cf->getValue('AllowArbitraryServer')) {
messages_set('warning', 'AllowArbitraryServer', 'AllowArbitraryServer_name',
- PMA_lang('AllowArbitraryServer_msg'));
+ PMA_lang('AllowArbitraryServerMsg'));
}
//
@@ -350,7 +358,7 @@ function perform_config_checks()
//
if ($cf->getValue('LoginCookieValidity') > 1800) {
messages_set('warning', 'LoginCookieValidity', 'LoginCookieValidity_name',
- PMA_lang('LoginCookieValidity_msg'));
+ PMA_lang('LoginCookieValidityMsg'));
}
//
@@ -359,7 +367,7 @@ function perform_config_checks()
//
if ($cf->getValue('SaveDir') != '') {
messages_set('notice', 'SaveDir', 'SaveDir_name',
- PMA_lang('Directory_notice'));
+ PMA_lang('DirectoryNotice'));
}
//
@@ -368,27 +376,51 @@ function perform_config_checks()
//
if ($cf->getValue('TempDir') != '') {
messages_set('notice', 'TempDir', 'TempDir_name',
- PMA_lang('Directory_notice'));
+ PMA_lang('DirectoryNotice'));
+ }
+
+ //
+ // $cfg['GZipDump']
+ // requires zlib functions
+ //
+ if ($cf->getValue('GZipDump')
+ && (@!function_exists('gzopen') || @!function_exists('gzencode'))) {
+ messages_set('warning', 'GZipDump', 'GZipDump_name',
+ PMA_lang('GZipDumpWarning', 'gzencode'));
+ }
+
+ //
+ // $cfg['BZipDump']
+ // requires bzip2 functions
+ //
+ if ($cf->getValue('BZipDump')
+ && (!@function_exists('bzopen') || !@function_exists('bzcompress'))) {
+ $functions = @function_exists('bzopen')
+ ? '' :
+ 'bzopen';
+ $functions .= @function_exists('bzcompress')
+ ? ''
+ : ($functions ? ', ' : '') . 'bzcompress';
+ messages_set('warning', 'BZipDump', 'BZipDump_name',
+ PMA_lang('BZipDumpWarning', $functions));
+ }
+
+ //
+ // $cfg['ZipDump']
+ // requires zip_open in import
+ //
+ if ($cf->getValue('ZipDump') && !@function_exists('zip_open')) {
+ messages_set('warning', 'ZipDump_import', 'ZipDump_name',
+ PMA_lang('ZipDumpImportWarning', 'zip_open'));
+ }
+
+ //
+ // $cfg['ZipDump']
+ // requires gzcompress in export
+ //
+ if ($cf->getValue('ZipDump') && !@function_exists('gzcompress')) {
+ messages_set('warning', 'ZipDump_export', 'ZipDump_name',
+ PMA_lang('ZipDumpExportWarning', 'gzcompress'));
}
}
-
-/*
- * add checks for compression options:
- *
- * import:
-if ($cfg['GZipDump'] && @function_exists('gzopen')) {
- $compressions .= ', gzip';
-}
-if ($cfg['BZipDump'] && @function_exists('bzopen')) {
- $compressions .= ', bzip2';
-}
-if ($cfg['ZipDump'] && @function_exists('zip_open')) {
- $compressions .= ', zip';
-}
-
-export:
-$is_zip = ($cfg['ZipDump'] && @function_exists('gzcompress'));
-$is_gzip = ($cfg['GZipDump'] && @function_exists('gzencode'));
-$is_bzip = ($cfg['BZipDump'] && @function_exists('bzcompress'));
- */
?>
\ No newline at end of file
diff --git a/setup/styles.css b/setup/styles.css
index 271a0ded5..0b8914328 100644
--- a/setup/styles.css
+++ b/setup/styles.css
@@ -125,7 +125,7 @@ div.warning h4 {
div.error {
border-color: #D00;
background-color: #FFC;
- background-image: url(../themes/original/img/s_errro.png);
+ background-image: url(../themes/original/img/s_error.png);
}
div.error h4 {
+ " title="" style="display:none">