nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

patch #2715142 [export] (rfe 2416960, escape new line in CSV export)

Browse Source
This commit is contained in:
Marc Delisle
2009-03-30 23:08:54 +00:00
parent 05c0c24b32
commit a9c77afa54
58 changed files with 105 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@@ -47,6 +47,8 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
- [security] warn about existence of config directory on main page
+ patch #2706761 [lang] Polish update,
thanks to Pawel Smolinski - zipoking
+ patch #2715142 [export] (rfe 2416960, escape new line in CSV export)
thanks to Derek Schaefer - drummingds1
3.1.4.0 (not yet released)
+ patch #1808339 [doc] Apache SSLOptions and StdEnvVars FAQ,

1
lang/afrikaans-utf-8.inc.php
View File

@@ -1478,4 +1478,5 @@ $strHostTableExplanation = 'When Host table is used, this field is ignored and v
$strGetMoreThemes = 'Get more themes!'; //to translate
$strNoneDefault = 'None'; //to translate
$strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate
$strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate
?>

1
lang/albanian-utf-8.inc.php
View File

@@ -1477,4 +1477,5 @@ $strHostTableExplanation = 'When Host table is used, this field is ignored and v
$strGetMoreThemes = 'Get more themes!'; //to translate
$strNoneDefault = 'None'; //to translate
$strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate
$strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate
?>

1
lang/arabic-utf-8.inc.php
View File

@@ -1479,4 +1479,5 @@ $strHostTableExplanation = 'When Host table is used, this field is ignored and v
$strGetMoreThemes = 'Get more themes!'; //to translate
$strNoneDefault = 'None'; //to translate
$strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate
$strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate
?>

1
lang/azerbaijani-utf-8.inc.php
View File

@@ -1474,4 +1474,5 @@ $strHostTableExplanation = 'When Host table is used, this field is ignored and v
$strGetMoreThemes = 'Get more themes!'; //to translate
$strNoneDefault = 'None'; //to translate
$strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate
$strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate
?>

1
lang/bangla-utf-8.inc.php
View File

@@ -1453,4 +1453,5 @@ $strHostTableExplanation = 'When Host table is used, this field is ignored and v
$strGetMoreThemes = 'Get more themes!'; //to translate
$strNoneDefault = 'None'; //to translate
$strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate
$strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate
?>

1
lang/basque-utf-8.inc.php
View File

@@ -1471,4 +1471,5 @@ $strHostTableExplanation = 'When Host table is used, this field is ignored and v
$strGetMoreThemes = 'Get more themes!'; //to translate
$strNoneDefault = 'None'; //to translate
$strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate
$strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate
?>

1
lang/belarusian_cyrillic-utf-8.inc.php
View File

@@ -1453,4 +1453,5 @@ $strHostTableExplanation = 'When Host table is used, this field is ignored and v
$strGetMoreThemes = 'Get more themes!'; //to translate
$strNoneDefault = 'None'; //to translate
$strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate
$strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate
?>

1
lang/belarusian_latin-utf-8.inc.php
View File

@@ -1461,4 +1461,5 @@ $strHostTableExplanation = 'When Host table is used, this field is ignored and v
$strGetMoreThemes = 'Get more themes!'; //to translate
$strNoneDefault = 'None'; //to translate
$strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate
$strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate
?>

1
lang/bosnian-utf-8.inc.php
View File

@@ -1477,4 +1477,5 @@ $strHostTableExplanation = 'When Host table is used, this field is ignored and v
$strGetMoreThemes = 'Get more themes!'; //to translate
$strNoneDefault = 'None'; //to translate
$strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate
$strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate
?>

1
lang/brazilian_portuguese-utf-8.inc.php
View File

@@ -1451,4 +1451,5 @@ $strHostTableExplanation = 'When Host table is used, this field is ignored and v
$strGetMoreThemes = 'Get more themes!'; //to translate
$strNoneDefault = 'None'; //to translate
$strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate
$strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate
?>

1
lang/bulgarian-utf-8.inc.php
View File

@@ -1474,4 +1474,5 @@ $strHostTableExplanation = 'When Host table is used, this field is ignored and v
$strGetMoreThemes = 'Get more themes!'; //to translate
$strNoneDefault = 'None'; //to translate
$strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate
$strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate
?>

1
lang/catalan-utf-8.inc.php
View File

@@ -1451,4 +1451,5 @@ $strHostTableExplanation = 'When Host table is used, this field is ignored and v
$strGetMoreThemes = 'Get more themes!'; //to translate
$strNoneDefault = 'None'; //to translate
$strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate
$strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate
?>

1
lang/chinese_simplified-utf-8.inc.php
View File

@@ -1460,4 +1460,5 @@ $strZeroRemovesTheLimit = '注意：若将这些选项设为 0(零) 即不限制
$strZip = 'zip 压缩';
$strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate
$strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate
?>

1
lang/chinese_traditional-utf-8.inc.php
View File

@@ -1458,4 +1458,5 @@ $strHostTableExplanation = 'When Host table is used, this field is ignored and v
$strGetMoreThemes = 'Get more themes!'; //to translate
$strNoneDefault = 'None'; //to translate
$strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate
$strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate
?>

1
lang/croatian-utf-8.inc.php
View File

@@ -1455,4 +1455,5 @@ $strHostTableExplanation = 'When Host table is used, this field is ignored and v
$strGetMoreThemes = 'Get more themes!'; //to translate
$strNoneDefault = 'None'; //to translate
$strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate
$strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate
?>

1
lang/czech-utf-8.inc.php
View File

@@ -1459,4 +1459,5 @@ $strShowKeys = 'Only show keys'; //to translate
$strStatic = 'static'; //to translate
$strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate
$strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate
?>

1
lang/danish-utf-8.inc.php
View File

@@ -1453,4 +1453,5 @@ $strHostTableExplanation = 'When Host table is used, this field is ignored and v
$strGetMoreThemes = 'Get more themes!'; //to translate
$strNoneDefault = 'None'; //to translate
$strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate
$strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate
?>

1
lang/dutch-utf-8.inc.php
View File

@@ -1460,4 +1460,5 @@ $strHostTableExplanation = 'Indien er gebruik wordt gemaakt van de Host tabel is
$strGetMoreThemes = 'Bekijk meer thema\'s!';
$strNoneDefault = 'Geen';
$strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate
$strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate
?>

85
lang/english-utf-8.inc.php
View File

@@ -132,6 +132,26 @@ $strCardinality = 'Cardinality';
$strCaseInsensitive = 'case-insensitive';
$strCaseSensitive = 'case-sensitive';
$strCentralEuropean = 'Central European';
$strChange = 'Change';
$strChangeCopyModeCopy = '... keep the old one.';
$strChangeCopyMode = 'Create a new user with the same privileges and ...';
$strChangeCopyModeDeleteAndReload = ' ... delete the old one from the user tables and reload the privileges afterwards.';
$strChangeCopyModeJustDelete = ' ... delete the old one from the user tables.';
$strChangeCopyModeRevoke = ' ... revoke all active privileges from the old one and delete it afterwards.';
$strChangeCopyUser = 'Change Login Information / Copy User';
$strChangeDisplay = 'Choose field to display';
$strChangePassword = 'Change password';
$strCharset = 'Charset';
$strCharsetOfFile = 'Character set of the file:';
$strCharsetsAndCollations = 'Character Sets and Collations';
$strCharsets = 'Charsets';
$strCheckAll = 'Check All';
$strCheck = 'Check';
$strCheckOverhead = 'Check tables having overhead';
$strCheckPrivs = 'Check Privileges';
$strCheckPrivsLong = 'Check privileges for database "%s".';
$strCheckTable = 'Check table';
$strChoosePage = 'Please choose a page to edit';
$strColComFeat = 'Displaying Column Comments';
$strCollation = 'Collation';
$strColumnNames = 'Column names';
@@ -182,26 +202,6 @@ $strCustomColor = 'Custom color';
$strCyrillic = 'Cyrillic';
$strCzech = 'Czech';
$strCzechSlovak = 'Czech-Slovak';
$strChangeCopyModeCopy = '... keep the old one.';
$strChangeCopyMode = 'Create a new user with the same privileges and ...';
$strChangeCopyModeDeleteAndReload = ' ... delete the old one from the user tables and reload the privileges afterwards.';
$strChangeCopyModeJustDelete = ' ... delete the old one from the user tables.';
$strChangeCopyModeRevoke = ' ... revoke all active privileges from the old one and delete it afterwards.';
$strChangeCopyUser = 'Change Login Information / Copy User';
$strChangeDisplay = 'Choose field to display';
$strChange = 'Change';
$strChangePassword = 'Change password';
$strCharset = 'Charset';
$strCharsetOfFile = 'Character set of the file:';
$strCharsetsAndCollations = 'Character Sets and Collations';
$strCharsets = 'Charsets';
$strCheckAll = 'Check All';
$strCheck = 'Check';
$strCheckOverhead = 'Check tables having overhead';
$strCheckPrivs = 'Check Privileges';
$strCheckPrivsLong = 'Check privileges for database "%s".';
$strCheckTable = 'Check table';
$strChoosePage = 'Please choose a page to edit';
$strDanish = 'Danish';
$strDatabase = 'Database';
@@ -288,6 +288,7 @@ $strErrorRelationAdded = 'Error: Relation not added.';
$strErrorRelationExists = 'Error: relation already exists.';
$strErrorRenamingTable = 'Error renaming table %1$s to %2$s';
$strErrorSaveTable = 'Error saving coordinates for Designer.';
$strEscapeCRLF = 'Remove CRLF characters within fields';
$strEscapeWildcards = 'Wildcards _ and % should be escaped with a \ to use them literally';
$strEsperanto = 'Esperanto';
$strEstonian = 'Estonian';
@@ -436,6 +437,7 @@ $strKorean = 'Korean';
$strLandscape = 'Landscape';
$strLanguage = 'Language';
$strLanguageUnknown = 'Unknown language: %1$s.';
$strLatchedPages = 'Latched pages';
$strLatexCaption = 'Table caption';
$strLatexContent = 'Content of table __TABLE__';
$strLatexContinuedCaption = 'Continued table caption';
@@ -444,7 +446,6 @@ $strLatexIncludeCaption = 'Include table caption';
$strLatexLabel = 'Label key';
$strLaTeX = 'LaTeX';
$strLatexStructure = 'Structure of table __TABLE__';
$strLatchedPages = 'Latched pages';
$strLatvian = 'Latvian';
$strLDI = 'CSV using LOAD DATA';
$strLDILocal = 'Use LOCAL keyword';
@@ -502,9 +503,9 @@ $strMyISAMRepairThreadsDesc = 'If this value is greater than 1, MyISAM table ind
$strMyISAMRepairThreads = 'Repair threads';
$strMyISAMSortBufferSizeDesc = 'The buffer that is allocated when sorting MyISAM indexes during a REPAIR TABLE or when creating indexes with CREATE INDEX or ALTER TABLE.';
$strMyISAMSortBufferSize = 'Sort buffer size';
$strMySQLCharset = 'MySQL charset';
$strMysqlClientVersion = 'MySQL client version';
$strMySQLConnectionCollation = 'MySQL connection collation';
$strMySQLCharset = 'MySQL charset';
$strMysqlLibDiffersServerVersion = 'Your PHP MySQL library version %s differs from your MySQL server version %s. This may cause unpredictable behavior.';
$strMySQLSaid = 'MySQL said: ';
$strMySQLShowProcess = 'Show processes';
@@ -572,19 +573,19 @@ $strPartitionDefinition = 'PARTITION definition';
$strPartitioned = 'partitioned';
$strPartitionMaintenance = 'Partition maintenance';
$strPartition = 'Partition %s';
$strPasswordChanged = 'The password for %s was changed successfully.';
$strPasswordEmpty = 'The password is empty!';
$strPasswordHashing = 'Password Hashing';
$strPasswordChanged = 'The password for %s was changed successfully.';
$strPasswordNotSame = 'The passwords aren\'t the same!';
$strPassword = 'Password';
$strPBXTCheckpointFrequency = 'Checkpoint frequency';
$strPBXTCheckpointFrequencyDesc = 'The amount of data written to the transaction log before a checkpoint is performed. The default value is 24MB.';
$strPBXTDataFileGrowSize = 'Data file grow size';
$strPBXTDataFileGrowSizeDesc = 'The grow size of the handle data (.xtd) files.';
$strPBXTDataLogThreshold = 'Data log threshold';
$strPBXTDataLogThresholdDesc = 'The maximum size of a data log file. The default value is 64MB. PBXT can create a maximum of 32000 data logs, which are used by all tables. So the value of this variable can be increased to increase the total amount of data that can be stored in the database.';
$strPBXTGarbageThresholdDesc = 'The percentage of garbage in a data log file before it is compacted. This is a value between 1 and 99. The default is 50.';
$strPBXTGarbageThreshold = 'Garbage threshold';
$strPBXTCheckpointFrequencyDesc = 'The amount of data written to the transaction log before a checkpoint is performed. The default value is 24MB.';
$strPBXTCheckpointFrequency = 'Checkpoint frequency';
$strPBXTIndexCacheSizeDesc = 'This is the amount of memory allocated to the index cache. Default value is 32MB. The memory allocated here is used only for caching index pages.';
$strPBXTIndexCacheSize = 'Index cache size';
$strPBXTLogBufferSizeDesc = 'The size of the buffer used when writing a data log. The default is 256MB. The engine allocates one buffer per thread, but only if the thread is required to write a data log.';
@@ -643,8 +644,8 @@ $strPrivDescDelete = 'Allows deleting data.';
$strPrivDescDropDb = 'Allows dropping databases and tables.';
$strPrivDescDropTbl = 'Allows dropping tables.';
$strPrivDescEvent = 'Allows to set up events for the event scheduler';
$strPrivDescExecute = 'Allows running stored procedures; has no effect in this MySQL version.';
$strPrivDescExecute5 = 'Allows executing stored routines.';
$strPrivDescExecute = 'Allows running stored procedures; has no effect in this MySQL version.';
$strPrivDescFile = 'Allows importing data from and exporting data into files.';
$strPrivDescGrant = 'Allows adding users and privileges without reloading the privilege tables.';
$strPrivDescIndex = 'Allows creating and dropping indexes.';
@@ -792,8 +793,8 @@ $strSetupAllowArbitraryServer_desc = 'If enabled user can enter any MySQL server
$strSetupAllowArbitraryServerMsg = '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.';
$strSetupAllowArbitraryServer_name = 'Allow login to any MySQL server';
$strSetupAllowUserDropDatabase_name = 'Show "Drop database" link to normal users';
$strSetupblowfish_secret_desc = 'Secret passphrase used for encrypting cookies in [kbd]cookie[/kbd] authentication';
$strSetupBlowfishSecretCharsMsg = 'Key should contain letters, numbers [em]and[/em] special characters';
$strSetupblowfish_secret_desc = 'Secret passphrase used for encrypting cookies in [kbd]cookie[/kbd] authentication';
$strSetupBlowfishSecretLengthMsg = 'Key is too short, it should have at least 8 characters';
$strSetupBlowfishSecretMsg = 'You didn\'t have blowfish secret set and have enabled cookie authentication, so a key was automatically generated for you. It is used to encrypt cookies; you don\'t need to remember it.';
$strSetupblowfish_secret_name = 'Blowfish secret';
@@ -806,6 +807,13 @@ $strSetupBZipDump_name = 'Bzip2';
$strSetupBZipDumpWarning = '[a@?page=form&formset=features#tab_Import_export]Bzip2 compression and decompression[/a] requires functions (%s) which are unavailable on this system.';
$strSetupCannotLoadConfig = 'Cannot load or save configuration';
$strSetupCannotLoadConfigMsg = '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.';
$strSetupCharEditing_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';
$strSetupCharEditing_name = 'CHAR fields editing';
$strSetupCharTextareaCols_desc = 'Number of columns for CHAR/VARCHAR textareas';
$strSetupCharTextareaCols_name = 'CHAR textarea columns';
$strSetupCharTextareaRows_desc = 'Number of rows for CHAR/VARCHAR textareas';
$strSetupCharTextareaRows_name = 'CHAR textarea rows';
$strSetupCheckConfigurationPermissions_name = 'Check config file permissions';
$strSetupClear = 'Clear';
$strSetupCompressOnFly_desc = 'Compress gzip/bzip2 exports on the fly without the need for much memory; if you encounter problems with created gzip/bzip2 files disable this feature';
$strSetupCompressOnFly_name = 'Compress on the fly';
@@ -847,12 +855,12 @@ $strSetuperror_nan_p = 'Not a positive number';
$strSetupExecTimeLimit_desc = 'Set the number of seconds a script is allowed to run ([kbd]0[/kbd] for no limit)';
$strSetupExecTimeLimit_name = 'Maximum execution time';
$strSetupExport_asfile_name = 'Save as file';
$strSetupExport_charset_name = 'Character set of the file';
$strSetupExport_compression_name = 'Compression';
$strSetupExport_file_template_database_name = 'Database name template';
$strSetupExport_file_template_server_name = 'Server name template';
$strSetupExport_file_template_table_name = 'Table name template';
$strSetupExport_format_name = 'Format';
$strSetupExport_charset_name = 'Character set of the file';
$strSetupExport_onserver_name = 'Save on server';
$strSetupExport_onserver_overwrite_name = 'Overwrite existing file(s)';
$strSetupExport_remember_file_template_name = 'Remember file name template';
@@ -915,13 +923,6 @@ $strSetupGZipDump_desc = 'Enable [a@http://en.wikipedia.org/wiki/Gzip]gzip[/a] c
$strSetupGZipDump_name = 'GZip';
$strSetupGZipDumpWarning = '[a@?page=form&formset=features#tab_Import_export]GZip compression and decompression[/a] requires functions (%s) which are unavailable on this system.';
$strSetupHomepageLink = 'phpMyAdmin homepage';
$strSetupCharEditing_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';
$strSetupCharEditing_name = 'CHAR fields editing';
$strSetupCharTextareaCols_desc = 'Number of columns for CHAR/VARCHAR textareas';
$strSetupCharTextareaCols_name = 'CHAR textarea columns';
$strSetupCharTextareaRows_desc = 'Number of rows for CHAR/VARCHAR textareas';
$strSetupCharTextareaRows_name = 'CHAR textarea rows';
$strSetupCheckConfigurationPermissions_name = 'Check config file permissions';
$strSetupIconvExtraParams_name = 'Extra parameters for iconv';
$strSetupIgnoreErrors = 'Ignore errors';
$strSetupIgnoreMultiSubmitErrors_desc = 'If enabled, phpMyAdmin continues computing multiple-statement queries even if one of the queries failed';
@@ -969,10 +970,10 @@ $strSetupLoginCookieStore_name = 'Login cookie store';
$strSetupLoginCookieValidity_desc = 'Define how long (in seconds) a login cookie is valid';
$strSetupLoginCookieValidityMsg = '[a@?page=form&formset=features#tab_Security]Login cookie validity[/a] should be set to 1800 seconds (30 minutes) at most. Values larger than 1800 may pose a security risk such as impersonation.';
$strSetupLoginCookieValidity_name = 'Login cookie validity';
$strSetupMaxDbList_desc = 'Maximum number of databases displayed in left frame and database list';
$strSetupMaxDbList_name = 'Maximum databases';
$strSetupMaxCharactersInDisplayedSQL_desc = 'Maximum number of characters used when a SQL query is displayed';
$strSetupMaxCharactersInDisplayedSQL_name = 'Maximum displayed SQL length';
$strSetupMaxDbList_desc = 'Maximum number of databases displayed in left frame and database list';
$strSetupMaxDbList_name = 'Maximum databases';
$strSetupMaxRows_desc = 'Number of rows displayed when browsing a result set. If the result set contains more rows, "Previous" and "Next" links will be shown.';
$strSetupMaxRows_name = 'Maximum number of rows to display';
$strSetupMaxTableList_desc = 'Maximum number of tables displayed in table list';
@@ -1079,20 +1080,20 @@ $strSetupServers_table_info_desc = 'Table to describe the display fields, leave
$strSetupServers_table_info_name = 'Display fields table';
$strSetupServers_user_desc = 'Leave empty if not using config auth';
$strSetupServers_user_name = 'User for config auth';
$strSetupServers_verbose_desc = 'A user-friendly description of this server. Leave blank to display the hostname instead.';
$strSetupServers_verbose_check_desc = 'Disable if you know that your pma_* tables are up to date. This prevents compatibility checks and thereby increases performance';
$strSetupServers_verbose_check_name = 'Verbose check';
$strSetupServers_verbose_desc = 'A user-friendly description of this server. Leave blank to display the hostname instead.';
$strSetupServers_verbose_name = 'Verbose name of this server';
$strSetupSetValue = 'Set value: %s';
$strSetupShowAll_desc = 'Whether a user should be displayed a "show all (records)" button';
$strSetupShowAll_name = 'Allow to display all the rows';
$strSetupShowChgPassword_desc = 'Please note that enabling this has no effect with [kbd]config[/kbd] authentication mode because the password is hard coded in the configuration file; this does not limit the ability to execute the same command directly';
$strSetupShowChgPassword_name = 'Show password change form';
$strSetupShowCreateDb_name = 'Show create database form';
$strSetupShowForm = 'Show form';
$strSetupShowFunctionFields_desc = 'Display the function fields in edit/insert mode';
$strSetupShowFunctionFields_name = 'Show function fields';
$strSetupShowHiddenMessages = 'Show hidden messages (#MSG_COUNT)';
$strSetupShowChgPassword_desc = 'Please note that enabling this has no effect with [kbd]config[/kbd] authentication mode because the password is hard coded in the configuration file; this does not limit the ability to execute the same command directly';
$strSetupShowChgPassword_name = 'Show password change form';
$strSetupShowPhpInfo_desc = 'Shows link to [a@http://php.net/manual/function.phpinfo.php]phpinfo()[/a] output';
$strSetupShowPhpInfo_name = 'Show phpinfo() link';
$strSetupShowServerInfo_name = 'Show detailed MySQL server information';
@@ -1244,8 +1245,8 @@ $strShowStatusReset = 'Reset';
$strShowStatusRpl_statusDescr = 'The status of failsafe replication (not yet implemented).';
$strShowStatusSelect_full_joinDescr = 'The number of joins that do not use indexes. If this value is not 0, you should carefully check the indexes of your tables.';
$strShowStatusSelect_full_range_joinDescr = 'The number of joins that used a range search on a reference table.';
$strShowStatusSelect_rangeDescr = 'The number of joins that used ranges on the first table. (It\'s normally not critical even if this is big.)';
$strShowStatusSelect_range_checkDescr = 'The number of joins without keys that check for key usage after each row. (If this is not 0, you should carefully check the indexes of your tables.)';
$strShowStatusSelect_rangeDescr = 'The number of joins that used ranges on the first table. (It\'s normally not critical even if this is big.)';
$strShowStatusSelect_scanDescr = 'The number of joins that did a full scan of the first table.';
$strShowStatusSlave_open_temp_tablesDescr = 'The number of temporary tables currently open by the slave SQL thread.';
$strShowStatusSlave_retried_transactionsDescr = 'Total (since startup) number of times the replication slave SQL thread has retried transactions.';
@@ -1291,9 +1292,9 @@ $strSQPBugInvalidIdentifer = 'Invalid Identifer';
$strSQPBugUnclosedQuote = 'Unclosed quote';
$strSQPBugUnknownPunctuation = 'Unknown Punctuation String';
$strStandInStructureForView = 'Stand-in structure for view';
$strStatCheckTime = 'Last check';
$strStatCreateTime = 'Creation';
$strStatement = 'Statements';
$strStatCheckTime = 'Last check';
$strStatic = 'static';
$strStatisticsOverrun = 'On a busy server, the byte counters may overrun, so those statistics as reported by the MySQL server may be incorrect.';
$strStatUpdateTime = 'Last update';

1
lang/estonian-utf-8.inc.php
View File

@@ -1459,4 +1459,5 @@ $strHostTableExplanation = 'When Host table is used, this field is ignored and v
$strGetMoreThemes = 'Get more themes!'; //to translate
$strNoneDefault = 'None'; //to translate
$strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate
$strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate
?>

1
lang/finnish-utf-8.inc.php
View File

@@ -1454,4 +1454,5 @@ $strHostTableExplanation = 'When Host table is used, this field is ignored and v
$strGetMoreThemes = 'Get more themes!'; //to translate
$strNoneDefault = 'None'; //to translate
$strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate
$strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate
?>

1
lang/french-utf-8.inc.php
View File

@@ -1450,4 +1450,5 @@ $strHostTableExplanation = 'When Host table is used, this field is ignored and v
$strGetMoreThemes = 'Get more themes!'; //to translate
$strNoneDefault = 'None'; //to translate
$strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate
$strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate
?>

1
lang/galician-utf-8.inc.php
View File

@@ -1452,4 +1452,5 @@ $strHostTableExplanation = 'When Host table is used, this field is ignored and v
$strGetMoreThemes = 'Get more themes!'; //to translate
$strNoneDefault = 'None'; //to translate
$strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate
$strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate
?>

1
lang/georgian-utf-8.inc.php
View File

@@ -1458,4 +1458,5 @@ $strHostTableExplanation = 'When Host table is used, this field is ignored and v
$strGetMoreThemes = 'Get more themes!'; //to translate
$strNoneDefault = 'None'; //to translate
$strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate
$strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate
?>

1
lang/german-utf-8.inc.php
View File

@@ -1472,4 +1472,5 @@ $strTexyText = 'Texy! text'; //to translate
$strViewHasAtLeast = 'This view has at least this number of rows. Please refer to %sdocumentation%s.'; //to translate
$strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate
$strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate
?>

1
lang/greek-utf-8.inc.php
View File

@@ -1476,4 +1476,5 @@ $strHostTableExplanation = 'When Host table is used, this field is ignored and v
$strGetMoreThemes = 'Get more themes!'; //to translate
$strNoneDefault = 'None'; //to translate
$strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate
$strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate
?>

1
lang/hebrew-utf-8.inc.php
View File

@@ -1471,4 +1471,5 @@ $strHostTableExplanation = 'When Host table is used, this field is ignored and v
$strGetMoreThemes = 'Get more themes!'; //to translate
$strNoneDefault = 'None'; //to translate
$strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate
$strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate
?>

1
lang/hindi-utf-8.inc.php
View File

@@ -1479,4 +1479,5 @@ $strHostTableExplanation = 'When Host table is used, this field is ignored and v
$strGetMoreThemes = 'Get more themes!'; //to translate
$strNoneDefault = 'None'; //to translate
$strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate
$strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate
?>

1
lang/hungarian-utf-8.inc.php
View File

@@ -1456,4 +1456,5 @@ $strHostTableExplanation = 'When Host table is used, this field is ignored and v
$strGetMoreThemes = 'Get more themes!'; //to translate
$strNoneDefault = 'None'; //to translate
$strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate
$strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate
?>

1
lang/indonesian-utf-8.inc.php
View File

@@ -1469,4 +1469,5 @@ $strHostTableExplanation = 'When Host table is used, this field is ignored and v
$strGetMoreThemes = 'Get more themes!'; //to translate
$strNoneDefault = 'None'; //to translate
$strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate
$strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate
?>

1
lang/italian-utf-8.inc.php
View File

@@ -1458,4 +1458,5 @@ $strHostTableExplanation = 'When Host table is used, this field is ignored and v
$strGetMoreThemes = 'Get more themes!'; //to translate
$strNoneDefault = 'None'; //to translate
$strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate
$strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate
?>

1
lang/japanese-utf-8.inc.php
View File

@@ -1459,4 +1459,5 @@ $strHostTableExplanation = 'When Host table is used, this field is ignored and v
$strGetMoreThemes = 'Get more themes!'; //to translate
$strNoneDefault = 'None'; //to translate
$strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate
$strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate
?>

1
lang/korean-utf-8.inc.php
View File

@@ -1474,4 +1474,5 @@ $strHostTableExplanation = 'When Host table is used, this field is ignored and v
$strGetMoreThemes = 'Get more themes!'; //to translate
$strNoneDefault = 'None'; //to translate
$strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate
$strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate
?>

1
lang/latvian-utf-8.inc.php
View File

@@ -1476,4 +1476,5 @@ $strHostTableExplanation = 'When Host table is used, this field is ignored and v
$strGetMoreThemes = 'Get more themes!'; //to translate
$strNoneDefault = 'None'; //to translate
$strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate
$strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate
?>

1
lang/lithuanian-utf-8.inc.php
View File

@@ -1468,4 +1468,5 @@ $strHostTableExplanation = 'When Host table is used, this field is ignored and v
$strGetMoreThemes = 'Get more themes!'; //to translate
$strNoneDefault = 'None'; //to translate
$strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate
$strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate
?>

1
lang/macedonian_cyrillic-utf-8.inc.php
View File

@@ -1454,4 +1454,5 @@ $strHostTableExplanation = 'When Host table is used, this field is ignored and v
$strGetMoreThemes = 'Get more themes!'; //to translate
$strNoneDefault = 'None'; //to translate
$strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate
$strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate
?>

1
lang/malay-utf-8.inc.php
View File

@@ -1491,4 +1491,5 @@ $strHostTableExplanation = 'When Host table is used, this field is ignored and v
$strGetMoreThemes = 'Get more themes!'; //to translate
$strNoneDefault = 'None'; //to translate
$strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate
$strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate
?>

1
lang/mongolian-utf-8.inc.php
View File

@@ -1474,4 +1474,5 @@ $strHostTableExplanation = 'When Host table is used, this field is ignored and v
$strGetMoreThemes = 'Get more themes!'; //to translate
$strNoneDefault = 'None'; //to translate
$strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate
$strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate
?>

1
lang/norwegian-utf-8.inc.php
View File

@@ -1451,4 +1451,5 @@ $strHostTableExplanation = 'When Host table is used, this field is ignored and v
$strGetMoreThemes = 'Get more themes!'; //to translate
$strNoneDefault = 'None'; //to translate
$strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate
$strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate
?>

1
lang/persian-utf-8.inc.php
View File

@@ -1505,4 +1505,5 @@ $strHostTableExplanation = 'When Host table is used, this field is ignored and v
$strGetMoreThemes = 'Get more themes!'; //to translate
$strNoneDefault = 'None'; //to translate
$strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate
$strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate
?>

1
lang/polish-utf-8.inc.php
View File

@@ -1447,4 +1447,5 @@ $strHostTableExplanation = 'When Host table is used, this field is ignored and v
$strGetMoreThemes = 'Pobierz więcej motywów!';
$strNoneDefault = 'None'; //to translate
$strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate
$strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate
?>

1
lang/portuguese-utf-8.inc.php
View File

@@ -1480,4 +1480,5 @@ $strHostTableExplanation = 'When Host table is used, this field is ignored and v
$strGetMoreThemes = 'Get more themes!'; //to translate
$strNoneDefault = 'None'; //to translate
$strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate
$strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate
?>

1
lang/romanian-utf-8.inc.php
View File

@@ -1460,4 +1460,5 @@ $strHostTableExplanation = 'When Host table is used, this field is ignored and v
$strGetMoreThemes = 'Get more themes!'; //to translate
$strNoneDefault = 'None'; //to translate
$strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate
$strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate
?>

1
lang/russian-utf-8.inc.php
View File

@@ -1464,4 +1464,5 @@ $strHostTableExplanation = 'When Host table is used, this field is ignored and v
$strGetMoreThemes = 'Get more themes!'; //to translate
$strNoneDefault = 'None'; //to translate
$strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate
$strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate
?>

1
lang/serbian_cyrillic-utf-8.inc.php
View File

@@ -1453,4 +1453,5 @@ $strHostTableExplanation = 'When Host table is used, this field is ignored and v
$strGetMoreThemes = 'Get more themes!'; //to translate
$strNoneDefault = 'None'; //to translate
$strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate
$strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate
?>

1
lang/serbian_latin-utf-8.inc.php
View File

@@ -1453,4 +1453,5 @@ $strHostTableExplanation = 'When Host table is used, this field is ignored and v
$strGetMoreThemes = 'Get more themes!'; //to translate
$strNoneDefault = 'None'; //to translate
$strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate
$strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate
?>

1
lang/sinhala-utf-8.inc.php
View File

@@ -1456,4 +1456,5 @@ $strHostTableExplanation = 'When Host table is used, this field is ignored and v
$strGetMoreThemes = 'Get more themes!'; //to translate
$strNoneDefault = 'None'; //to translate
$strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate
$strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate
?>

1
lang/slovak-utf-8.inc.php
View File

@@ -1454,4 +1454,5 @@ $strHostTableExplanation = 'When Host table is used, this field is ignored and v
$strGetMoreThemes = 'Get more themes!'; //to translate
$strNoneDefault = 'None'; //to translate
$strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate
$strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate
?>

1
lang/slovenian-utf-8.inc.php
View File

@@ -1473,4 +1473,5 @@ $strHostTableExplanation = 'When Host table is used, this field is ignored and v
$strGetMoreThemes = 'Get more themes!'; //to translate
$strNoneDefault = 'None'; //to translate
$strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate
$strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate
?>

1
lang/spanish-utf-8.inc.php
View File

@@ -1449,4 +1449,5 @@ $strHostTableExplanation = 'When Host table is used, this field is ignored and v
$strGetMoreThemes = 'Get more themes!'; //to translate
$strNoneDefault = 'None'; //to translate
$strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate
$strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate
?>

1
lang/swedish-utf-8.inc.php
View File

@@ -1451,4 +1451,5 @@ $strHostTableExplanation = 'When Host table is used, this field is ignored and v
$strGetMoreThemes = 'Get more themes!'; //to translate
$strNoneDefault = 'None'; //to translate
$strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate
$strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate
?>

1
lang/tatarish-utf-8.inc.php
View File

@@ -1464,4 +1464,5 @@ $strHostTableExplanation = 'When Host table is used, this field is ignored and v
$strGetMoreThemes = 'Get more themes!'; //to translate
$strNoneDefault = 'None'; //to translate
$strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate
$strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate
?>

1
lang/thai-utf-8.inc.php
View File

@@ -1475,4 +1475,5 @@ $strHostTableExplanation = 'When Host table is used, this field is ignored and v
$strGetMoreThemes = 'Get more themes!'; //to translate
$strNoneDefault = 'None'; //to translate
$strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate
$strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate
?>

1
lang/turkish-utf-8.inc.php
View File

@@ -1457,4 +1457,5 @@ $strHostTableExplanation = 'When Host table is used, this field is ignored and v
$strGetMoreThemes = 'Get more themes!'; //to translate
$strNoneDefault = 'None'; //to translate
$strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate
$strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate
?>

1
lang/ukrainian-utf-8.inc.php
View File

@@ -1473,4 +1473,5 @@ $strHostTableExplanation = 'When Host table is used, this field is ignored and v
$strGetMoreThemes = 'Get more themes!'; //to translate
$strNoneDefault = 'None'; //to translate
$strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate
$strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate
?>

5
libraries/export/csv.php
View File

@@ -23,6 +23,7 @@ if (isset($plugin_list)) {
array('type' => 'text', 'name' => 'escaped', 'text' => 'strFieldsEscapedBy'),
array('type' => 'text', 'name' => 'terminated', 'text' => 'strLinesTerminatedBy'),
array('type' => 'text', 'name' => 'null', 'text' => 'strReplaceNULLBy'),
array('type' => 'bool', 'name' => 'escapeCRLF', 'text' => 'strEscapeCRLF'),
array('type' => 'bool', 'name' => 'columns', 'text' => 'strPutColNames'),
array('type' => 'hidden', 'name' => 'data'),
),
@@ -181,6 +182,10 @@ function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) {
if ($what == 'excel') {
$row[$j] = preg_replace("/\015(\012)?/", "\012", $row[$j]);
}
// escape CRLF characters within field
if ($GLOBALS[$what . '_escapeCRLF']) {
$row[$j] = str_replace("\n", "", str_replace("\r", "", $row[$j]));
}
if ($csv_enclosed == '') {
$schema_insert .= $row[$j];
} else {

1
libraries/export/excel.php
View File

@@ -20,6 +20,7 @@ if (isset($plugin_list)) {
'mime_type' => 'text/comma-separated-values',
'options' => array(
array('type' => 'text', 'name' => 'null', 'text' => 'strReplaceNULLBy'),
array('type' => 'bool', 'name' => 'escapeCRLF', 'text' => 'strEscapeCRLF'),
array('type' => 'bool', 'name' => 'columns', 'text' => 'strPutColNames'),
array(
'type' => 'select',