diff --git a/ChangeLog b/ChangeLog index 093981534..fb36fadfd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -16,6 +16,8 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA + rfe #2726479 [export] Export tables preselect + patch #2805828 [export] PHP array export plugin, thanks to Geoffray Warnants - amnsk ++ patch #2798592 [import] Progress bar, + thanks to Tomas Srnka - tomassrnka 3.2.1.0 (not yet released) - bug #2799009 Login with ipv6 IP address breaks redirect diff --git a/db_import.php b/db_import.php index bdcd5d698..37c3158ae 100644 --- a/db_import.php +++ b/db_import.php @@ -11,6 +11,11 @@ */ require_once './libraries/common.inc.php'; +/** + * Load mootools for upload progress bar + */ +$GLOBALS['js_include'][] = 'mootools.js'; + /** * Gets tables informations and displays top links */ diff --git a/import.php b/import.php index 2c0ca5fd7..43190ec0b 100644 --- a/import.php +++ b/import.php @@ -12,8 +12,12 @@ * Get the variables sent or posted to this script and a core script */ require_once './libraries/common.inc.php'; +//require_once './libraries/display_import_functions.lib.php'; $GLOBALS['js_include'][] = 'functions.js'; +// reset import messages for ajax request +$_SESSION['Import_message']['message'] = null; +$_SESSION['Import_message']['go_back_url'] = null; // default values $GLOBALS['reload'] = false; @@ -50,11 +54,17 @@ if (!empty($sql_query)) { // If we didn't get any parameters, either user called this directly, or // upload limit has been reached, let's assume the second possibility. +; if ($_POST == array() && $_GET == array()) { require_once './libraries/header.inc.php'; $message = PMA_Message::error('strUploadLimit'); $message->addParam('[a@./Documentation.html#faq1_16@_blank]'); $message->addParam('[/a]'); + + // so we can obtain the message + $_SESSION['Import_message']['message'] = $message->getDisplay(); + $_SESSION['Import_message']['go_back_url'] = $goto; + $message->display(); require './libraries/footer.inc.php'; } @@ -71,12 +81,15 @@ require_once './libraries/import.lib.php'; // Create error and goto url if ($import_type == 'table') { $err_url = 'tbl_import.php?' . PMA_generate_common_url($db, $table); + $_SESSION['Import_message']['go_back_url'] = $err_url; $goto = 'tbl_import.php'; } elseif ($import_type == 'database') { $err_url = 'db_import.php?' . PMA_generate_common_url($db); + $_SESSION['Import_message']['go_back_url'] = $err_url; $goto = 'db_import.php'; } elseif ($import_type == 'server') { $err_url = 'server_import.php?' . PMA_generate_common_url(); + $_SESSION['Import_message']['go_back_url'] = $err_url; $goto = 'server_import.php'; } else { if (empty($goto) || !preg_match('@^(server|db|tbl)(_[a-z]*)*\.php$@i', $goto)) { @@ -98,6 +111,7 @@ if ($import_type == 'table') { $err_url = $goto . '?' . $common . (preg_match('@^tbl_[a-z]*\.php$@', $goto) ? '&table=' . urlencode($table) : ''); + $_SESSION['Import_message']['go_back_url'] = $err_url; } @@ -230,6 +244,7 @@ if (!empty($local_import_file) && !empty($cfg['UploadDir'])) { } // Do we have file to import? + if ($import_file != 'none' && !$error) { // work around open_basedir and other limitations $open_basedir = @ini_get('open_basedir'); @@ -243,11 +258,15 @@ if ($import_file != 'none' && !$error) { $tmp_subdir = (PMA_IS_WINDOWS ? '.\\tmp\\' : './tmp/'); if (is_writable($tmp_subdir)) { + + $import_file_new = $tmp_subdir . basename($import_file); if (move_uploaded_file($import_file, $import_file_new)) { $import_file = $import_file_new; $file_to_unlink = $import_file_new; } + + $size = filesize($import_file); } } @@ -320,6 +339,9 @@ if ($import_file != 'none' && !$error) { } } +// so we can obtain the message +//$_SESSION['Import_message'] = $message->getDisplay(); + // Convert the file's charset if necessary if ($cfg['AllowAnywhereRecoding'] && isset($charset_of_file)) { if ($charset_of_file != $charset) { @@ -396,6 +418,11 @@ if ($timeout_passed) { } } +// if there is any message, copy it into $_SESSION as well, so we can obtain it by AJAX call +if (isset($message)) { + $_SESSION['Import_message']['message'] = $message->getDisplay(); +// $_SESSION['Import_message']['go_back_url'] = $goto.'?'. PMA_generate_common_url(); +} // Parse and analyze the query, for correct db and table name // in case of a query typed in the query window require_once './libraries/parse_analyze.lib.php'; diff --git a/import_status.php b/import_status.php new file mode 100644 index 000000000..5ce253674 --- /dev/null +++ b/import_status.php @@ -0,0 +1,32 @@ +'."\n"; + echo ' [ '.$GLOBALS["strBack"].' ]' ."\n"; + echo ''."\n"; + +} else { + PMA_importAjaxStatus($GLOBALS["id"]); +} +?> diff --git a/lang/afrikaans-utf-8.inc.php b/lang/afrikaans-utf-8.inc.php index 814884c66..b79fd6588 100644 --- a/lang/afrikaans-utf-8.inc.php +++ b/lang/afrikaans-utf-8.inc.php @@ -1487,4 +1487,7 @@ $strReplicationStatus_master = 'Master status'; //to translate $strReplicationStatus_slave = 'Slave status'; //to translate $strNavTableFilter = 'Filter'; //to translate $strPhpArray = 'PHP array'; //to translate +$strImportLargeFileUploading = 'The file being uploaded is probably larger than the maximum allowed size or this is a known bug in webkit based (Safari, Google Chrome, Arora etc.) browsers.'; //to translate +$strImportProceedingFile = 'The file is being processed, please be patient.'; //to translate +$strImportUploadInfoNotAvailable = 'Please be patient, the file is being uploaded. Details about the upload are not available.'; //to translate ?> diff --git a/lang/albanian-utf-8.inc.php b/lang/albanian-utf-8.inc.php index ee7afd778..f38523c31 100644 --- a/lang/albanian-utf-8.inc.php +++ b/lang/albanian-utf-8.inc.php @@ -1486,4 +1486,7 @@ $strReplicationStatus_master = 'Master status'; //to translate $strReplicationStatus_slave = 'Slave status'; //to translate $strNavTableFilter = 'Filter'; //to translate $strPhpArray = 'PHP array'; //to translate +$strImportLargeFileUploading = 'The file being uploaded is probably larger than the maximum allowed size or this is a known bug in webkit based (Safari, Google Chrome, Arora etc.) browsers.'; //to translate +$strImportProceedingFile = 'The file is being processed, please be patient.'; //to translate +$strImportUploadInfoNotAvailable = 'Please be patient, the file is being uploaded. Details about the upload are not available.'; //to translate ?> diff --git a/lang/arabic-utf-8.inc.php b/lang/arabic-utf-8.inc.php index 205e605fd..f53a2f340 100644 --- a/lang/arabic-utf-8.inc.php +++ b/lang/arabic-utf-8.inc.php @@ -1488,4 +1488,7 @@ $strReplicationStatus_master = 'Master status'; //to translate $strReplicationStatus_slave = 'Slave status'; //to translate $strNavTableFilter = 'Filter'; //to translate $strPhpArray = 'PHP array'; //to translate +$strImportLargeFileUploading = 'The file being uploaded is probably larger than the maximum allowed size or this is a known bug in webkit based (Safari, Google Chrome, Arora etc.) browsers.'; //to translate +$strImportProceedingFile = 'The file is being processed, please be patient.'; //to translate +$strImportUploadInfoNotAvailable = 'Please be patient, the file is being uploaded. Details about the upload are not available.'; //to translate ?> diff --git a/lang/azerbaijani-utf-8.inc.php b/lang/azerbaijani-utf-8.inc.php index 436c5f8a6..5cc9580e5 100644 --- a/lang/azerbaijani-utf-8.inc.php +++ b/lang/azerbaijani-utf-8.inc.php @@ -1483,4 +1483,7 @@ $strReplicationStatus_master = 'Master status'; //to translate $strReplicationStatus_slave = 'Slave status'; //to translate $strNavTableFilter = 'Filter'; //to translate $strPhpArray = 'PHP array'; //to translate +$strImportLargeFileUploading = 'The file being uploaded is probably larger than the maximum allowed size or this is a known bug in webkit based (Safari, Google Chrome, Arora etc.) browsers.'; //to translate +$strImportProceedingFile = 'The file is being processed, please be patient.'; //to translate +$strImportUploadInfoNotAvailable = 'Please be patient, the file is being uploaded. Details about the upload are not available.'; //to translate ?> diff --git a/lang/bangla-utf-8.inc.php b/lang/bangla-utf-8.inc.php index 6f299b56f..f327502f9 100644 --- a/lang/bangla-utf-8.inc.php +++ b/lang/bangla-utf-8.inc.php @@ -1462,4 +1462,7 @@ $strReplicationStatus_master = 'Master status'; //to translate $strReplicationStatus_slave = 'Slave status'; //to translate $strNavTableFilter = 'Filter'; //to translate $strPhpArray = 'PHP array'; //to translate +$strImportLargeFileUploading = 'The file being uploaded is probably larger than the maximum allowed size or this is a known bug in webkit based (Safari, Google Chrome, Arora etc.) browsers.'; //to translate +$strImportProceedingFile = 'The file is being processed, please be patient.'; //to translate +$strImportUploadInfoNotAvailable = 'Please be patient, the file is being uploaded. Details about the upload are not available.'; //to translate ?> diff --git a/lang/basque-utf-8.inc.php b/lang/basque-utf-8.inc.php index 6f9f677f1..0d352530f 100644 --- a/lang/basque-utf-8.inc.php +++ b/lang/basque-utf-8.inc.php @@ -1480,4 +1480,7 @@ $strReplicationStatus_master = 'Master status'; //to translate $strReplicationStatus_slave = 'Slave status'; //to translate $strNavTableFilter = 'Filter'; //to translate $strPhpArray = 'PHP array'; //to translate +$strImportLargeFileUploading = 'The file being uploaded is probably larger than the maximum allowed size or this is a known bug in webkit based (Safari, Google Chrome, Arora etc.) browsers.'; //to translate +$strImportProceedingFile = 'The file is being processed, please be patient.'; //to translate +$strImportUploadInfoNotAvailable = 'Please be patient, the file is being uploaded. Details about the upload are not available.'; //to translate ?> diff --git a/lang/belarusian_cyrillic-utf-8.inc.php b/lang/belarusian_cyrillic-utf-8.inc.php index 3e70d236b..1df6db92c 100644 --- a/lang/belarusian_cyrillic-utf-8.inc.php +++ b/lang/belarusian_cyrillic-utf-8.inc.php @@ -1462,4 +1462,7 @@ $strReplicationStatus_master = 'Master status'; //to translate $strReplicationStatus_slave = 'Slave status'; //to translate $strNavTableFilter = 'Filter'; //to translate $strPhpArray = 'PHP array'; //to translate +$strImportLargeFileUploading = 'The file being uploaded is probably larger than the maximum allowed size or this is a known bug in webkit based (Safari, Google Chrome, Arora etc.) browsers.'; //to translate +$strImportProceedingFile = 'The file is being processed, please be patient.'; //to translate +$strImportUploadInfoNotAvailable = 'Please be patient, the file is being uploaded. Details about the upload are not available.'; //to translate ?> diff --git a/lang/belarusian_latin-utf-8.inc.php b/lang/belarusian_latin-utf-8.inc.php index 979f5e89f..27a20fc7d 100644 --- a/lang/belarusian_latin-utf-8.inc.php +++ b/lang/belarusian_latin-utf-8.inc.php @@ -1470,4 +1470,7 @@ $strReplicationStatus_master = 'Master status'; //to translate $strReplicationStatus_slave = 'Slave status'; //to translate $strNavTableFilter = 'Filter'; //to translate $strPhpArray = 'PHP array'; //to translate +$strImportLargeFileUploading = 'The file being uploaded is probably larger than the maximum allowed size or this is a known bug in webkit based (Safari, Google Chrome, Arora etc.) browsers.'; //to translate +$strImportProceedingFile = 'The file is being processed, please be patient.'; //to translate +$strImportUploadInfoNotAvailable = 'Please be patient, the file is being uploaded. Details about the upload are not available.'; //to translate ?> diff --git a/lang/bosnian-utf-8.inc.php b/lang/bosnian-utf-8.inc.php index bc6ed253b..ae0a93efc 100644 --- a/lang/bosnian-utf-8.inc.php +++ b/lang/bosnian-utf-8.inc.php @@ -1486,4 +1486,7 @@ $strReplicationStatus_master = 'Master status'; //to translate $strReplicationStatus_slave = 'Slave status'; //to translate $strNavTableFilter = 'Filter'; //to translate $strPhpArray = 'PHP array'; //to translate +$strImportLargeFileUploading = 'The file being uploaded is probably larger than the maximum allowed size or this is a known bug in webkit based (Safari, Google Chrome, Arora etc.) browsers.'; //to translate +$strImportProceedingFile = 'The file is being processed, please be patient.'; //to translate +$strImportUploadInfoNotAvailable = 'Please be patient, the file is being uploaded. Details about the upload are not available.'; //to translate ?> diff --git a/lang/brazilian_portuguese-utf-8.inc.php b/lang/brazilian_portuguese-utf-8.inc.php index a0838805a..4a1c4fbf4 100644 --- a/lang/brazilian_portuguese-utf-8.inc.php +++ b/lang/brazilian_portuguese-utf-8.inc.php @@ -1460,4 +1460,7 @@ $strReplicationStatus_master = 'Master status'; //to translate $strReplicationStatus_slave = 'Slave status'; //to translate $strNavTableFilter = 'Filter'; //to translate $strPhpArray = 'PHP array'; //to translate +$strImportLargeFileUploading = 'The file being uploaded is probably larger than the maximum allowed size or this is a known bug in webkit based (Safari, Google Chrome, Arora etc.) browsers.'; //to translate +$strImportProceedingFile = 'The file is being processed, please be patient.'; //to translate +$strImportUploadInfoNotAvailable = 'Please be patient, the file is being uploaded. Details about the upload are not available.'; //to translate ?> diff --git a/lang/bulgarian-utf-8.inc.php b/lang/bulgarian-utf-8.inc.php index 334075aac..1055eebaf 100644 --- a/lang/bulgarian-utf-8.inc.php +++ b/lang/bulgarian-utf-8.inc.php @@ -1483,4 +1483,7 @@ $strReplicationStatus_master = 'Master status'; //to translate $strReplicationStatus_slave = 'Slave status'; //to translate $strNavTableFilter = 'Filter'; //to translate $strPhpArray = 'PHP array'; //to translate +$strImportLargeFileUploading = 'The file being uploaded is probably larger than the maximum allowed size or this is a known bug in webkit based (Safari, Google Chrome, Arora etc.) browsers.'; //to translate +$strImportProceedingFile = 'The file is being processed, please be patient.'; //to translate +$strImportUploadInfoNotAvailable = 'Please be patient, the file is being uploaded. Details about the upload are not available.'; //to translate ?> diff --git a/lang/catalan-utf-8.inc.php b/lang/catalan-utf-8.inc.php index f5fb7f1ad..59bba8e2b 100644 --- a/lang/catalan-utf-8.inc.php +++ b/lang/catalan-utf-8.inc.php @@ -1457,4 +1457,7 @@ $strZip = '"comprimit amb zip"'; $strNavTableFilter = 'Filter'; //to translate $strPhpArray = 'PHP array'; //to translate +$strImportLargeFileUploading = 'The file being uploaded is probably larger than the maximum allowed size or this is a known bug in webkit based (Safari, Google Chrome, Arora etc.) browsers.'; //to translate +$strImportProceedingFile = 'The file is being processed, please be patient.'; //to translate +$strImportUploadInfoNotAvailable = 'Please be patient, the file is being uploaded. Details about the upload are not available.'; //to translate ?> diff --git a/lang/chinese_simplified-utf-8.inc.php b/lang/chinese_simplified-utf-8.inc.php index b0323ef9f..0e426209a 100644 --- a/lang/chinese_simplified-utf-8.inc.php +++ b/lang/chinese_simplified-utf-8.inc.php @@ -1470,4 +1470,7 @@ $strZip = 'zip 压缩'; $strNavTableFilter = 'Filter'; //to translate $strPhpArray = 'PHP array'; //to translate +$strImportLargeFileUploading = 'The file being uploaded is probably larger than the maximum allowed size or this is a known bug in webkit based (Safari, Google Chrome, Arora etc.) browsers.'; //to translate +$strImportProceedingFile = 'The file is being processed, please be patient.'; //to translate +$strImportUploadInfoNotAvailable = 'Please be patient, the file is being uploaded. Details about the upload are not available.'; //to translate ?> diff --git a/lang/chinese_traditional-utf-8.inc.php b/lang/chinese_traditional-utf-8.inc.php index 3894a703c..170af2e29 100644 --- a/lang/chinese_traditional-utf-8.inc.php +++ b/lang/chinese_traditional-utf-8.inc.php @@ -1467,4 +1467,7 @@ $strReplicationStatus_master = 'Master status'; //to translate $strReplicationStatus_slave = 'Slave status'; //to translate $strNavTableFilter = 'Filter'; //to translate $strPhpArray = 'PHP array'; //to translate +$strImportLargeFileUploading = 'The file being uploaded is probably larger than the maximum allowed size or this is a known bug in webkit based (Safari, Google Chrome, Arora etc.) browsers.'; //to translate +$strImportProceedingFile = 'The file is being processed, please be patient.'; //to translate +$strImportUploadInfoNotAvailable = 'Please be patient, the file is being uploaded. Details about the upload are not available.'; //to translate ?> diff --git a/lang/croatian-utf-8.inc.php b/lang/croatian-utf-8.inc.php index 881a719fd..1df78e165 100644 --- a/lang/croatian-utf-8.inc.php +++ b/lang/croatian-utf-8.inc.php @@ -1464,4 +1464,7 @@ $strReplicationStatus_master = 'Master status'; //to translate $strReplicationStatus_slave = 'Slave status'; //to translate $strNavTableFilter = 'Filter'; //to translate $strPhpArray = 'PHP array'; //to translate +$strImportLargeFileUploading = 'The file being uploaded is probably larger than the maximum allowed size or this is a known bug in webkit based (Safari, Google Chrome, Arora etc.) browsers.'; //to translate +$strImportProceedingFile = 'The file is being processed, please be patient.'; //to translate +$strImportUploadInfoNotAvailable = 'Please be patient, the file is being uploaded. Details about the upload are not available.'; //to translate ?> diff --git a/lang/czech-utf-8.inc.php b/lang/czech-utf-8.inc.php index 247860212..ea8750be2 100644 --- a/lang/czech-utf-8.inc.php +++ b/lang/czech-utf-8.inc.php @@ -1466,4 +1466,7 @@ $strSetupZipDumpExportWarning = '[a@?page=form&formset=features#tab_Import_e $strSetupZipDumpImportWarning = '[a@?page=form&formset=features#tab_Import_export]Zip decompression[/a] requires functions (%s) which are unavailable on this system.'; //to translate $strPhpArray = 'PHP array'; //to translate +$strImportLargeFileUploading = 'The file being uploaded is probably larger than the maximum allowed size or this is a known bug in webkit based (Safari, Google Chrome, Arora etc.) browsers.'; //to translate +$strImportProceedingFile = 'The file is being processed, please be patient.'; //to translate +$strImportUploadInfoNotAvailable = 'Please be patient, the file is being uploaded. Details about the upload are not available.'; //to translate ?> diff --git a/lang/danish-utf-8.inc.php b/lang/danish-utf-8.inc.php index 0566bd6ef..f98d54373 100644 --- a/lang/danish-utf-8.inc.php +++ b/lang/danish-utf-8.inc.php @@ -1462,4 +1462,7 @@ $strReplicationStatus_master = 'Master status'; //to translate $strReplicationStatus_slave = 'Slave status'; //to translate $strNavTableFilter = 'Filter'; //to translate $strPhpArray = 'PHP array'; //to translate +$strImportLargeFileUploading = 'The file being uploaded is probably larger than the maximum allowed size or this is a known bug in webkit based (Safari, Google Chrome, Arora etc.) browsers.'; //to translate +$strImportProceedingFile = 'The file is being processed, please be patient.'; //to translate +$strImportUploadInfoNotAvailable = 'Please be patient, the file is being uploaded. Details about the upload are not available.'; //to translate ?> diff --git a/lang/dutch-utf-8.inc.php b/lang/dutch-utf-8.inc.php index 895e44034..b2c29f9ab 100644 --- a/lang/dutch-utf-8.inc.php +++ b/lang/dutch-utf-8.inc.php @@ -1467,4 +1467,7 @@ $strZip = '"Gezipt"'; $strNavTableFilter = 'Filter'; $strPhpArray = 'PHP array'; //to translate +$strImportLargeFileUploading = 'The file being uploaded is probably larger than the maximum allowed size or this is a known bug in webkit based (Safari, Google Chrome, Arora etc.) browsers.'; //to translate +$strImportProceedingFile = 'The file is being processed, please be patient.'; //to translate +$strImportUploadInfoNotAvailable = 'Please be patient, the file is being uploaded. Details about the upload are not available.'; //to translate ?> diff --git a/lang/english-utf-8.inc.php b/lang/english-utf-8.inc.php index 5a7398be5..a1de6bf5e 100644 --- a/lang/english-utf-8.inc.php +++ b/lang/english-utf-8.inc.php @@ -381,7 +381,10 @@ $strImportExportCoords = 'Import/Export coordinates for PDF schema'; $strImportFiles = 'Import files'; $strImportFormat = 'Format of imported file'; $strImport = 'Import'; +$strImportLargeFileUploading = 'The file being uploaded is probably larger than the maximum allowed size or this is a known bug in webkit based (Safari, Google Chrome, Arora etc.) browsers.'; +$strImportProceedingFile = 'The file is being processed, please be patient.'; $strImportSuccessfullyFinished = 'Import has been successfully finished, %d queries executed.'; +$strImportUploadInfoNotAvailable = 'Please be patient, the file is being uploaded. Details about the upload are not available.'; $strIndexes = 'Indexes'; $strIndexesSeemEqual = 'The indexes %1$s and %2$s seem to be equal and one of them could possibly be removed.'; $strIndexHasBeenDropped = 'Index %s has been dropped'; diff --git a/lang/estonian-utf-8.inc.php b/lang/estonian-utf-8.inc.php index f53cd8780..c7d7e9f98 100644 --- a/lang/estonian-utf-8.inc.php +++ b/lang/estonian-utf-8.inc.php @@ -1468,4 +1468,7 @@ $strReplicationStatus_master = 'Master status'; //to translate $strReplicationStatus_slave = 'Slave status'; //to translate $strNavTableFilter = 'Filter'; //to translate $strPhpArray = 'PHP array'; //to translate +$strImportLargeFileUploading = 'The file being uploaded is probably larger than the maximum allowed size or this is a known bug in webkit based (Safari, Google Chrome, Arora etc.) browsers.'; //to translate +$strImportProceedingFile = 'The file is being processed, please be patient.'; //to translate +$strImportUploadInfoNotAvailable = 'Please be patient, the file is being uploaded. Details about the upload are not available.'; //to translate ?> diff --git a/lang/finnish-utf-8.inc.php b/lang/finnish-utf-8.inc.php index 27bbb30ec..d04df6a36 100644 --- a/lang/finnish-utf-8.inc.php +++ b/lang/finnish-utf-8.inc.php @@ -1463,4 +1463,7 @@ $strZip = '"zip-pakattu"'; $strNavTableFilter = 'Filter'; //to translate $strPhpArray = 'PHP array'; //to translate +$strImportLargeFileUploading = 'The file being uploaded is probably larger than the maximum allowed size or this is a known bug in webkit based (Safari, Google Chrome, Arora etc.) browsers.'; //to translate +$strImportProceedingFile = 'The file is being processed, please be patient.'; //to translate +$strImportUploadInfoNotAvailable = 'Please be patient, the file is being uploaded. Details about the upload are not available.'; //to translate ?> diff --git a/lang/french-utf-8.inc.php b/lang/french-utf-8.inc.php index 266dff7a6..ccf4a12d3 100644 --- a/lang/french-utf-8.inc.php +++ b/lang/french-utf-8.inc.php @@ -1459,4 +1459,7 @@ $strYes = 'Oui'; $strZeroRemovesTheLimit = 'Note: Une valeur de 0 (zero) enlève la limite.'; $strZip = '"zippé"'; +$strImportLargeFileUploading = 'The file being uploaded is probably larger than the maximum allowed size or this is a known bug in webkit based (Safari, Google Chrome, Arora etc.) browsers.'; //to translate +$strImportProceedingFile = 'The file is being processed, please be patient.'; //to translate +$strImportUploadInfoNotAvailable = 'Please be patient, the file is being uploaded. Details about the upload are not available.'; //to translate ?> diff --git a/lang/galician-utf-8.inc.php b/lang/galician-utf-8.inc.php index 6e527d23f..41738e634 100644 --- a/lang/galician-utf-8.inc.php +++ b/lang/galician-utf-8.inc.php @@ -1461,4 +1461,7 @@ $strReplicationStatus_master = 'Estado do mestre'; $strReplicationStatus_slave = 'Estado do escravo'; $strNavTableFilter = 'Filter'; //to translate $strPhpArray = 'PHP array'; //to translate +$strImportLargeFileUploading = 'The file being uploaded is probably larger than the maximum allowed size or this is a known bug in webkit based (Safari, Google Chrome, Arora etc.) browsers.'; //to translate +$strImportProceedingFile = 'The file is being processed, please be patient.'; //to translate +$strImportUploadInfoNotAvailable = 'Please be patient, the file is being uploaded. Details about the upload are not available.'; //to translate ?> diff --git a/lang/georgian-utf-8.inc.php b/lang/georgian-utf-8.inc.php index 9f291ea66..3dee8c603 100644 --- a/lang/georgian-utf-8.inc.php +++ b/lang/georgian-utf-8.inc.php @@ -1467,4 +1467,7 @@ $strReplicationStatus_master = 'Master status'; //to translate $strReplicationStatus_slave = 'Slave status'; //to translate $strNavTableFilter = 'Filter'; //to translate $strPhpArray = 'PHP array'; //to translate +$strImportLargeFileUploading = 'The file being uploaded is probably larger than the maximum allowed size or this is a known bug in webkit based (Safari, Google Chrome, Arora etc.) browsers.'; //to translate +$strImportProceedingFile = 'The file is being processed, please be patient.'; //to translate +$strImportUploadInfoNotAvailable = 'Please be patient, the file is being uploaded. Details about the upload are not available.'; //to translate ?> diff --git a/lang/german-utf-8.inc.php b/lang/german-utf-8.inc.php index 4ca8edc7b..1c35900e7 100644 --- a/lang/german-utf-8.inc.php +++ b/lang/german-utf-8.inc.php @@ -1481,4 +1481,7 @@ $strReplicationStatus_master = 'Master status'; //to translate $strReplicationStatus_slave = 'Slave status'; //to translate $strNavTableFilter = 'Filter'; //to translate $strPhpArray = 'PHP array'; //to translate +$strImportLargeFileUploading = 'The file being uploaded is probably larger than the maximum allowed size or this is a known bug in webkit based (Safari, Google Chrome, Arora etc.) browsers.'; //to translate +$strImportProceedingFile = 'The file is being processed, please be patient.'; //to translate +$strImportUploadInfoNotAvailable = 'Please be patient, the file is being uploaded. Details about the upload are not available.'; //to translate ?> diff --git a/lang/greek-utf-8.inc.php b/lang/greek-utf-8.inc.php index 6d97781a9..7a4e38764 100644 --- a/lang/greek-utf-8.inc.php +++ b/lang/greek-utf-8.inc.php @@ -1485,4 +1485,7 @@ $strReplicationStatus_master = 'Master status'; //to translate $strReplicationStatus_slave = 'Slave status'; //to translate $strNavTableFilter = 'Filter'; //to translate $strPhpArray = 'PHP array'; //to translate +$strImportLargeFileUploading = 'The file being uploaded is probably larger than the maximum allowed size or this is a known bug in webkit based (Safari, Google Chrome, Arora etc.) browsers.'; //to translate +$strImportProceedingFile = 'The file is being processed, please be patient.'; //to translate +$strImportUploadInfoNotAvailable = 'Please be patient, the file is being uploaded. Details about the upload are not available.'; //to translate ?> diff --git a/lang/hebrew-utf-8.inc.php b/lang/hebrew-utf-8.inc.php index 9593860e0..37032dcab 100644 --- a/lang/hebrew-utf-8.inc.php +++ b/lang/hebrew-utf-8.inc.php @@ -1480,4 +1480,7 @@ $strReplicationStatus_master = 'Master status'; //to translate $strReplicationStatus_slave = 'Slave status'; //to translate $strNavTableFilter = 'Filter'; //to translate $strPhpArray = 'PHP array'; //to translate +$strImportLargeFileUploading = 'The file being uploaded is probably larger than the maximum allowed size or this is a known bug in webkit based (Safari, Google Chrome, Arora etc.) browsers.'; //to translate +$strImportProceedingFile = 'The file is being processed, please be patient.'; //to translate +$strImportUploadInfoNotAvailable = 'Please be patient, the file is being uploaded. Details about the upload are not available.'; //to translate ?> diff --git a/lang/hindi-utf-8.inc.php b/lang/hindi-utf-8.inc.php index 2be6221bb..2dfc557f1 100644 --- a/lang/hindi-utf-8.inc.php +++ b/lang/hindi-utf-8.inc.php @@ -1488,4 +1488,7 @@ $strReplicationStatus_master = 'Master status'; //to translate $strReplicationStatus_slave = 'Slave status'; //to translate $strNavTableFilter = 'Filter'; //to translate $strPhpArray = 'PHP array'; //to translate +$strImportLargeFileUploading = 'The file being uploaded is probably larger than the maximum allowed size or this is a known bug in webkit based (Safari, Google Chrome, Arora etc.) browsers.'; //to translate +$strImportProceedingFile = 'The file is being processed, please be patient.'; //to translate +$strImportUploadInfoNotAvailable = 'Please be patient, the file is being uploaded. Details about the upload are not available.'; //to translate ?> diff --git a/lang/hungarian-utf-8.inc.php b/lang/hungarian-utf-8.inc.php index e14dfa445..6939e8239 100644 --- a/lang/hungarian-utf-8.inc.php +++ b/lang/hungarian-utf-8.inc.php @@ -1464,4 +1464,7 @@ $strZeroRemovesTheLimit = 'Megjegyzés: Ezen beállítások 0-ra (nulla) állít $strZip = '"zip tömörítés"'; $strNavTableFilter = 'Filter'; //to translate $strPhpArray = 'PHP array'; //to translate +$strImportLargeFileUploading = 'The file being uploaded is probably larger than the maximum allowed size or this is a known bug in webkit based (Safari, Google Chrome, Arora etc.) browsers.'; //to translate +$strImportProceedingFile = 'The file is being processed, please be patient.'; //to translate +$strImportUploadInfoNotAvailable = 'Please be patient, the file is being uploaded. Details about the upload are not available.'; //to translate ?> diff --git a/lang/indonesian-utf-8.inc.php b/lang/indonesian-utf-8.inc.php index f935dd573..2e8ba817c 100644 --- a/lang/indonesian-utf-8.inc.php +++ b/lang/indonesian-utf-8.inc.php @@ -1478,4 +1478,7 @@ $strReplicationStatus_master = 'Master status'; //to translate $strReplicationStatus_slave = 'Slave status'; //to translate $strNavTableFilter = 'Filter'; //to translate $strPhpArray = 'PHP array'; //to translate +$strImportLargeFileUploading = 'The file being uploaded is probably larger than the maximum allowed size or this is a known bug in webkit based (Safari, Google Chrome, Arora etc.) browsers.'; //to translate +$strImportProceedingFile = 'The file is being processed, please be patient.'; //to translate +$strImportUploadInfoNotAvailable = 'Please be patient, the file is being uploaded. Details about the upload are not available.'; //to translate ?> diff --git a/lang/italian-utf-8.inc.php b/lang/italian-utf-8.inc.php index f1a0f1f57..b33c9bfeb 100644 --- a/lang/italian-utf-8.inc.php +++ b/lang/italian-utf-8.inc.php @@ -1467,4 +1467,7 @@ $strReplicationStatus_master = 'Master status'; //to translate $strReplicationStatus_slave = 'Slave status'; //to translate $strNavTableFilter = 'Filter'; //to translate $strPhpArray = 'PHP array'; //to translate +$strImportLargeFileUploading = 'The file being uploaded is probably larger than the maximum allowed size or this is a known bug in webkit based (Safari, Google Chrome, Arora etc.) browsers.'; //to translate +$strImportProceedingFile = 'The file is being processed, please be patient.'; //to translate +$strImportUploadInfoNotAvailable = 'Please be patient, the file is being uploaded. Details about the upload are not available.'; //to translate ?> diff --git a/lang/japanese-utf-8.inc.php b/lang/japanese-utf-8.inc.php index 076f74d59..c16779276 100644 --- a/lang/japanese-utf-8.inc.php +++ b/lang/japanese-utf-8.inc.php @@ -1468,4 +1468,7 @@ $strReplicationStatus_master = 'Master status'; //to translate $strReplicationStatus_slave = 'Slave status'; //to translate $strNavTableFilter = 'Filter'; //to translate $strPhpArray = 'PHP array'; //to translate +$strImportLargeFileUploading = 'The file being uploaded is probably larger than the maximum allowed size or this is a known bug in webkit based (Safari, Google Chrome, Arora etc.) browsers.'; //to translate +$strImportProceedingFile = 'The file is being processed, please be patient.'; //to translate +$strImportUploadInfoNotAvailable = 'Please be patient, the file is being uploaded. Details about the upload are not available.'; //to translate ?> diff --git a/lang/korean-utf-8.inc.php b/lang/korean-utf-8.inc.php index 6eaeb6abc..46559ce35 100644 --- a/lang/korean-utf-8.inc.php +++ b/lang/korean-utf-8.inc.php @@ -1483,4 +1483,7 @@ $strReplicationStatus_master = 'Master status'; //to translate $strReplicationStatus_slave = 'Slave status'; //to translate $strNavTableFilter = 'Filter'; //to translate $strPhpArray = 'PHP array'; //to translate +$strImportLargeFileUploading = 'The file being uploaded is probably larger than the maximum allowed size or this is a known bug in webkit based (Safari, Google Chrome, Arora etc.) browsers.'; //to translate +$strImportProceedingFile = 'The file is being processed, please be patient.'; //to translate +$strImportUploadInfoNotAvailable = 'Please be patient, the file is being uploaded. Details about the upload are not available.'; //to translate ?> diff --git a/lang/latvian-utf-8.inc.php b/lang/latvian-utf-8.inc.php index a35ae50c9..6310c3202 100644 --- a/lang/latvian-utf-8.inc.php +++ b/lang/latvian-utf-8.inc.php @@ -1485,4 +1485,7 @@ $strReplicationStatus_master = 'Master status'; //to translate $strReplicationStatus_slave = 'Slave status'; //to translate $strNavTableFilter = 'Filter'; //to translate $strPhpArray = 'PHP array'; //to translate +$strImportLargeFileUploading = 'The file being uploaded is probably larger than the maximum allowed size or this is a known bug in webkit based (Safari, Google Chrome, Arora etc.) browsers.'; //to translate +$strImportProceedingFile = 'The file is being processed, please be patient.'; //to translate +$strImportUploadInfoNotAvailable = 'Please be patient, the file is being uploaded. Details about the upload are not available.'; //to translate ?> diff --git a/lang/lithuanian-utf-8.inc.php b/lang/lithuanian-utf-8.inc.php index 31ac2180f..45cd12e71 100644 --- a/lang/lithuanian-utf-8.inc.php +++ b/lang/lithuanian-utf-8.inc.php @@ -1477,4 +1477,7 @@ $strReplicationStatus_master = 'Master status'; //to translate $strReplicationStatus_slave = 'Slave status'; //to translate $strNavTableFilter = 'Filter'; //to translate $strPhpArray = 'PHP array'; //to translate +$strImportLargeFileUploading = 'The file being uploaded is probably larger than the maximum allowed size or this is a known bug in webkit based (Safari, Google Chrome, Arora etc.) browsers.'; //to translate +$strImportProceedingFile = 'The file is being processed, please be patient.'; //to translate +$strImportUploadInfoNotAvailable = 'Please be patient, the file is being uploaded. Details about the upload are not available.'; //to translate ?> diff --git a/lang/macedonian_cyrillic-utf-8.inc.php b/lang/macedonian_cyrillic-utf-8.inc.php index 54548626d..d54ae37b7 100644 --- a/lang/macedonian_cyrillic-utf-8.inc.php +++ b/lang/macedonian_cyrillic-utf-8.inc.php @@ -1463,4 +1463,7 @@ $strReplicationStatus_master = 'Master status'; //to translate $strReplicationStatus_slave = 'Slave status'; //to translate $strNavTableFilter = 'Filter'; //to translate $strPhpArray = 'PHP array'; //to translate +$strImportLargeFileUploading = 'The file being uploaded is probably larger than the maximum allowed size or this is a known bug in webkit based (Safari, Google Chrome, Arora etc.) browsers.'; //to translate +$strImportProceedingFile = 'The file is being processed, please be patient.'; //to translate +$strImportUploadInfoNotAvailable = 'Please be patient, the file is being uploaded. Details about the upload are not available.'; //to translate ?> diff --git a/lang/malay-utf-8.inc.php b/lang/malay-utf-8.inc.php index 015f19b7d..51efd859a 100644 --- a/lang/malay-utf-8.inc.php +++ b/lang/malay-utf-8.inc.php @@ -1500,4 +1500,7 @@ $strReplicationStatus_master = 'Master status'; //to translate $strReplicationStatus_slave = 'Slave status'; //to translate $strNavTableFilter = 'Filter'; //to translate $strPhpArray = 'PHP array'; //to translate +$strImportLargeFileUploading = 'The file being uploaded is probably larger than the maximum allowed size or this is a known bug in webkit based (Safari, Google Chrome, Arora etc.) browsers.'; //to translate +$strImportProceedingFile = 'The file is being processed, please be patient.'; //to translate +$strImportUploadInfoNotAvailable = 'Please be patient, the file is being uploaded. Details about the upload are not available.'; //to translate ?> diff --git a/lang/mongolian-utf-8.inc.php b/lang/mongolian-utf-8.inc.php index af4f0bcc1..eb3b813eb 100644 --- a/lang/mongolian-utf-8.inc.php +++ b/lang/mongolian-utf-8.inc.php @@ -1483,4 +1483,7 @@ $strReplicationStatus_master = 'Master status'; //to translate $strReplicationStatus_slave = 'Slave status'; //to translate $strNavTableFilter = 'Filter'; //to translate $strPhpArray = 'PHP array'; //to translate +$strImportLargeFileUploading = 'The file being uploaded is probably larger than the maximum allowed size or this is a known bug in webkit based (Safari, Google Chrome, Arora etc.) browsers.'; //to translate +$strImportProceedingFile = 'The file is being processed, please be patient.'; //to translate +$strImportUploadInfoNotAvailable = 'Please be patient, the file is being uploaded. Details about the upload are not available.'; //to translate ?> diff --git a/lang/norwegian-utf-8.inc.php b/lang/norwegian-utf-8.inc.php index efb177281..3d838f850 100644 --- a/lang/norwegian-utf-8.inc.php +++ b/lang/norwegian-utf-8.inc.php @@ -1460,4 +1460,7 @@ $strZip = 'Komprimert (zip)'; $strNavTableFilter = 'Filter'; //to translate $strPhpArray = 'PHP array'; //to translate +$strImportLargeFileUploading = 'The file being uploaded is probably larger than the maximum allowed size or this is a known bug in webkit based (Safari, Google Chrome, Arora etc.) browsers.'; //to translate +$strImportProceedingFile = 'The file is being processed, please be patient.'; //to translate +$strImportUploadInfoNotAvailable = 'Please be patient, the file is being uploaded. Details about the upload are not available.'; //to translate ?> diff --git a/lang/persian-utf-8.inc.php b/lang/persian-utf-8.inc.php index b179cbc8a..578569ce1 100644 --- a/lang/persian-utf-8.inc.php +++ b/lang/persian-utf-8.inc.php @@ -1514,4 +1514,7 @@ $strReplicationStatus_master = 'Master status'; //to translate $strReplicationStatus_slave = 'Slave status'; //to translate $strNavTableFilter = 'Filter'; //to translate $strPhpArray = 'PHP array'; //to translate +$strImportLargeFileUploading = 'The file being uploaded is probably larger than the maximum allowed size or this is a known bug in webkit based (Safari, Google Chrome, Arora etc.) browsers.'; //to translate +$strImportProceedingFile = 'The file is being processed, please be patient.'; //to translate +$strImportUploadInfoNotAvailable = 'Please be patient, the file is being uploaded. Details about the upload are not available.'; //to translate ?> diff --git a/lang/polish-utf-8.inc.php b/lang/polish-utf-8.inc.php index 4250df70b..5a8b4fecb 100644 --- a/lang/polish-utf-8.inc.php +++ b/lang/polish-utf-8.inc.php @@ -1456,4 +1456,7 @@ $strReplicationStatus_master = 'Master status'; //to translate $strReplicationStatus_slave = 'Slave status'; //to translate $strNavTableFilter = 'Filter'; //to translate $strPhpArray = 'PHP array'; //to translate +$strImportLargeFileUploading = 'The file being uploaded is probably larger than the maximum allowed size or this is a known bug in webkit based (Safari, Google Chrome, Arora etc.) browsers.'; //to translate +$strImportProceedingFile = 'The file is being processed, please be patient.'; //to translate +$strImportUploadInfoNotAvailable = 'Please be patient, the file is being uploaded. Details about the upload are not available.'; //to translate ?> diff --git a/lang/portuguese-utf-8.inc.php b/lang/portuguese-utf-8.inc.php index 22d7a2f7f..e4c850ee8 100644 --- a/lang/portuguese-utf-8.inc.php +++ b/lang/portuguese-utf-8.inc.php @@ -1489,4 +1489,7 @@ $strReplicationStatus_master = 'Master status'; //to translate $strReplicationStatus_slave = 'Slave status'; //to translate $strNavTableFilter = 'Filter'; //to translate $strPhpArray = 'PHP array'; //to translate +$strImportLargeFileUploading = 'The file being uploaded is probably larger than the maximum allowed size or this is a known bug in webkit based (Safari, Google Chrome, Arora etc.) browsers.'; //to translate +$strImportProceedingFile = 'The file is being processed, please be patient.'; //to translate +$strImportUploadInfoNotAvailable = 'Please be patient, the file is being uploaded. Details about the upload are not available.'; //to translate ?> diff --git a/lang/romanian-utf-8.inc.php b/lang/romanian-utf-8.inc.php index da219bab8..c7f6259f2 100644 --- a/lang/romanian-utf-8.inc.php +++ b/lang/romanian-utf-8.inc.php @@ -1469,4 +1469,7 @@ $strReplicationStatus_master = 'Master status'; //to translate $strReplicationStatus_slave = 'Slave status'; //to translate $strNavTableFilter = 'Filter'; //to translate $strPhpArray = 'PHP array'; //to translate +$strImportLargeFileUploading = 'The file being uploaded is probably larger than the maximum allowed size or this is a known bug in webkit based (Safari, Google Chrome, Arora etc.) browsers.'; //to translate +$strImportProceedingFile = 'The file is being processed, please be patient.'; //to translate +$strImportUploadInfoNotAvailable = 'Please be patient, the file is being uploaded. Details about the upload are not available.'; //to translate ?> diff --git a/lang/russian-utf-8.inc.php b/lang/russian-utf-8.inc.php index 56cc2363e..fbb7e1103 100644 --- a/lang/russian-utf-8.inc.php +++ b/lang/russian-utf-8.inc.php @@ -1473,4 +1473,7 @@ $strReplicationStatusInfo = 'This MySQL server works as %s in replication $strReplicationStatus_master = 'Master status'; //to translate $strReplicationStatus_slave = 'Slave status'; //to translate $strPhpArray = 'PHP array'; //to translate +$strImportLargeFileUploading = 'The file being uploaded is probably larger than the maximum allowed size or this is a known bug in webkit based (Safari, Google Chrome, Arora etc.) browsers.'; //to translate +$strImportProceedingFile = 'The file is being processed, please be patient.'; //to translate +$strImportUploadInfoNotAvailable = 'Please be patient, the file is being uploaded. Details about the upload are not available.'; //to translate ?> diff --git a/lang/serbian_cyrillic-utf-8.inc.php b/lang/serbian_cyrillic-utf-8.inc.php index 0793dcede..d665bf9a1 100644 --- a/lang/serbian_cyrillic-utf-8.inc.php +++ b/lang/serbian_cyrillic-utf-8.inc.php @@ -1462,4 +1462,7 @@ $strReplicationStatus_master = 'Master status'; //to translate $strReplicationStatus_slave = 'Slave status'; //to translate $strNavTableFilter = 'Filter'; //to translate $strPhpArray = 'PHP array'; //to translate +$strImportLargeFileUploading = 'The file being uploaded is probably larger than the maximum allowed size or this is a known bug in webkit based (Safari, Google Chrome, Arora etc.) browsers.'; //to translate +$strImportProceedingFile = 'The file is being processed, please be patient.'; //to translate +$strImportUploadInfoNotAvailable = 'Please be patient, the file is being uploaded. Details about the upload are not available.'; //to translate ?> diff --git a/lang/serbian_latin-utf-8.inc.php b/lang/serbian_latin-utf-8.inc.php index 30c341f74..5ca9c4e74 100644 --- a/lang/serbian_latin-utf-8.inc.php +++ b/lang/serbian_latin-utf-8.inc.php @@ -1462,4 +1462,7 @@ $strReplicationStatus_master = 'Master status'; //to translate $strReplicationStatus_slave = 'Slave status'; //to translate $strNavTableFilter = 'Filter'; //to translate $strPhpArray = 'PHP array'; //to translate +$strImportLargeFileUploading = 'The file being uploaded is probably larger than the maximum allowed size or this is a known bug in webkit based (Safari, Google Chrome, Arora etc.) browsers.'; //to translate +$strImportProceedingFile = 'The file is being processed, please be patient.'; //to translate +$strImportUploadInfoNotAvailable = 'Please be patient, the file is being uploaded. Details about the upload are not available.'; //to translate ?> diff --git a/lang/sinhala-utf-8.inc.php b/lang/sinhala-utf-8.inc.php index 825ec8db4..e567f3219 100644 --- a/lang/sinhala-utf-8.inc.php +++ b/lang/sinhala-utf-8.inc.php @@ -1465,4 +1465,7 @@ $strReplicationStatus_master = 'Master status'; //to translate $strReplicationStatus_slave = 'Slave status'; //to translate $strNavTableFilter = 'Filter'; //to translate $strPhpArray = 'PHP array'; //to translate +$strImportLargeFileUploading = 'The file being uploaded is probably larger than the maximum allowed size or this is a known bug in webkit based (Safari, Google Chrome, Arora etc.) browsers.'; //to translate +$strImportProceedingFile = 'The file is being processed, please be patient.'; //to translate +$strImportUploadInfoNotAvailable = 'Please be patient, the file is being uploaded. Details about the upload are not available.'; //to translate ?> diff --git a/lang/slovak-utf-8.inc.php b/lang/slovak-utf-8.inc.php index 31ce2096f..f85785ebb 100644 --- a/lang/slovak-utf-8.inc.php +++ b/lang/slovak-utf-8.inc.php @@ -1463,4 +1463,7 @@ $strReplicationStatus_master = 'Master status'; //to translate $strReplicationStatus_slave = 'Slave status'; //to translate $strNavTableFilter = 'Filter'; //to translate $strPhpArray = 'PHP array'; //to translate +$strImportLargeFileUploading = 'The file being uploaded is probably larger than the maximum allowed size or this is a known bug in webkit based (Safari, Google Chrome, Arora etc.) browsers.'; //to translate +$strImportProceedingFile = 'The file is being processed, please be patient.'; //to translate +$strImportUploadInfoNotAvailable = 'Please be patient, the file is being uploaded. Details about the upload are not available.'; //to translate ?> diff --git a/lang/slovenian-utf-8.inc.php b/lang/slovenian-utf-8.inc.php index b67c86a63..dd9bdf397 100644 --- a/lang/slovenian-utf-8.inc.php +++ b/lang/slovenian-utf-8.inc.php @@ -1482,4 +1482,7 @@ $strReplicationStatus_master = 'Master status'; //to translate $strReplicationStatus_slave = 'Slave status'; //to translate $strNavTableFilter = 'Filter'; //to translate $strPhpArray = 'PHP array'; //to translate +$strImportLargeFileUploading = 'The file being uploaded is probably larger than the maximum allowed size or this is a known bug in webkit based (Safari, Google Chrome, Arora etc.) browsers.'; //to translate +$strImportProceedingFile = 'The file is being processed, please be patient.'; //to translate +$strImportUploadInfoNotAvailable = 'Please be patient, the file is being uploaded. Details about the upload are not available.'; //to translate ?> diff --git a/lang/spanish-utf-8.inc.php b/lang/spanish-utf-8.inc.php index 897ce6735..386100a3f 100644 --- a/lang/spanish-utf-8.inc.php +++ b/lang/spanish-utf-8.inc.php @@ -1460,4 +1460,7 @@ $strReplicationStatus_master = 'Master status'; //to translate $strReplicationStatus_slave = 'Slave status'; //to translate $strNavTableFilter = 'Filter'; //to translate $strPhpArray = 'PHP array'; //to translate +$strImportLargeFileUploading = 'The file being uploaded is probably larger than the maximum allowed size or this is a known bug in webkit based (Safari, Google Chrome, Arora etc.) browsers.'; //to translate +$strImportProceedingFile = 'The file is being processed, please be patient.'; //to translate +$strImportUploadInfoNotAvailable = 'Please be patient, the file is being uploaded. Details about the upload are not available.'; //to translate ?> diff --git a/lang/swedish-utf-8.inc.php b/lang/swedish-utf-8.inc.php index 891d5e5f4..d6aa33189 100644 --- a/lang/swedish-utf-8.inc.php +++ b/lang/swedish-utf-8.inc.php @@ -1460,4 +1460,7 @@ $strZip = '"zippad"'; $strNavTableFilter = 'Filter'; //to translate $strPhpArray = 'PHP array'; //to translate +$strImportLargeFileUploading = 'The file being uploaded is probably larger than the maximum allowed size or this is a known bug in webkit based (Safari, Google Chrome, Arora etc.) browsers.'; //to translate +$strImportProceedingFile = 'The file is being processed, please be patient.'; //to translate +$strImportUploadInfoNotAvailable = 'Please be patient, the file is being uploaded. Details about the upload are not available.'; //to translate ?> diff --git a/lang/tatarish-utf-8.inc.php b/lang/tatarish-utf-8.inc.php index 2c6d535ac..faa973fa5 100644 --- a/lang/tatarish-utf-8.inc.php +++ b/lang/tatarish-utf-8.inc.php @@ -1473,4 +1473,7 @@ $strReplicationStatus_master = 'Master status'; //to translate $strReplicationStatus_slave = 'Slave status'; //to translate $strNavTableFilter = 'Filter'; //to translate $strPhpArray = 'PHP array'; //to translate +$strImportLargeFileUploading = 'The file being uploaded is probably larger than the maximum allowed size or this is a known bug in webkit based (Safari, Google Chrome, Arora etc.) browsers.'; //to translate +$strImportProceedingFile = 'The file is being processed, please be patient.'; //to translate +$strImportUploadInfoNotAvailable = 'Please be patient, the file is being uploaded. Details about the upload are not available.'; //to translate ?> diff --git a/lang/thai-utf-8.inc.php b/lang/thai-utf-8.inc.php index 0c56fd8d7..b95f1978f 100644 --- a/lang/thai-utf-8.inc.php +++ b/lang/thai-utf-8.inc.php @@ -1484,4 +1484,7 @@ $strReplicationStatus_master = 'Master status'; //to translate $strReplicationStatus_slave = 'Slave status'; //to translate $strNavTableFilter = 'Filter'; //to translate $strPhpArray = 'PHP array'; //to translate +$strImportLargeFileUploading = 'The file being uploaded is probably larger than the maximum allowed size or this is a known bug in webkit based (Safari, Google Chrome, Arora etc.) browsers.'; //to translate +$strImportProceedingFile = 'The file is being processed, please be patient.'; //to translate +$strImportUploadInfoNotAvailable = 'Please be patient, the file is being uploaded. Details about the upload are not available.'; //to translate ?> diff --git a/lang/turkish-utf-8.inc.php b/lang/turkish-utf-8.inc.php index 0c7722689..3147ea1d0 100644 --- a/lang/turkish-utf-8.inc.php +++ b/lang/turkish-utf-8.inc.php @@ -1466,4 +1466,7 @@ $strReplicationStatus_master = 'Master status'; //to translate $strReplicationStatus_slave = 'Slave status'; //to translate $strNavTableFilter = 'Filter'; //to translate $strPhpArray = 'PHP array'; //to translate +$strImportLargeFileUploading = 'The file being uploaded is probably larger than the maximum allowed size or this is a known bug in webkit based (Safari, Google Chrome, Arora etc.) browsers.'; //to translate +$strImportProceedingFile = 'The file is being processed, please be patient.'; //to translate +$strImportUploadInfoNotAvailable = 'Please be patient, the file is being uploaded. Details about the upload are not available.'; //to translate ?> diff --git a/lang/ukrainian-utf-8.inc.php b/lang/ukrainian-utf-8.inc.php index 0d920b8b4..da2dd66b9 100644 --- a/lang/ukrainian-utf-8.inc.php +++ b/lang/ukrainian-utf-8.inc.php @@ -1482,4 +1482,7 @@ $strReplicationStatus_master = 'Master status'; //to translate $strReplicationStatus_slave = 'Slave status'; //to translate $strNavTableFilter = 'Filter'; //to translate $strPhpArray = 'PHP array'; //to translate +$strImportLargeFileUploading = 'The file being uploaded is probably larger than the maximum allowed size or this is a known bug in webkit based (Safari, Google Chrome, Arora etc.) browsers.'; //to translate +$strImportProceedingFile = 'The file is being processed, please be patient.'; //to translate +$strImportUploadInfoNotAvailable = 'Please be patient, the file is being uploaded. Details about the upload are not available.'; //to translate ?> diff --git a/libraries/common.inc.php b/libraries/common.inc.php index 09cd94054..e2adc6106 100644 --- a/libraries/common.inc.php +++ b/libraries/common.inc.php @@ -982,4 +982,4 @@ if (!empty($__redirect) && in_array($__redirect, $goto_whitelist)) { require $__redirect; exit(); } -?> +?> \ No newline at end of file diff --git a/libraries/common.lib.php b/libraries/common.lib.php index 824e85d4d..411fcc1b4 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -540,6 +540,8 @@ function PMA_mysqlDie($error_message = '', $the_query = '', */ require_once './libraries/header.inc.php'; + $error_msg_output = ''; + if (!$error_message) { $error_message = PMA_DBI_getError(); } @@ -562,8 +564,8 @@ function PMA_mysqlDie($error_message = '', $the_query = '', } } // --- - echo "\n" . '' . "\n"; - echo '

' . $GLOBALS['strError'] . '

' . "\n"; + $error_msg_output .= "\n" . '' . "\n"; + $error_msg_output .= '

' . $GLOBALS['strError'] . '

' . "\n"; // if the config password is wrong, or the MySQL server does not // respond, do not show the query that would reveal the // username/password @@ -572,14 +574,14 @@ function PMA_mysqlDie($error_message = '', $the_query = '', // Robbat2 - 12 January 2003, 9:46PM // Revised, Robbat2 - 13 January 2003, 2:59PM if (function_exists('PMA_SQP_isError') && PMA_SQP_isError()) { - echo PMA_SQP_getErrorString() . "\n"; - echo '
' . "\n"; + $error_msg_output .= PMA_SQP_getErrorString() . "\n"; + $error_msg_output .= '
' . "\n"; } // --- // modified to show me the help on sql errors (Michael Keck) - echo '

' . $GLOBALS['strSQLQuery'] . ':' . "\n"; + $error_msg_output .= '

' . $GLOBALS['strSQLQuery'] . ':' . "\n"; if (strstr(strtolower($formatted_sql), 'select')) { // please show me help to the error on select - echo PMA_showMySQLDocu('SQL-Syntax', 'SELECT'); + $error_msg_output .= PMA_showMySQLDocu('SQL-Syntax', 'SELECT'); } if ($is_modify_link) { $_url_params = array( @@ -597,11 +599,11 @@ function PMA_mysqlDie($error_message = '', $the_query = '', $doedit_goto = ''; } - echo $doedit_goto + $error_msg_output .= $doedit_goto . PMA_getIcon('b_edit.png', $GLOBALS['strEdit']) . ''; } // end if - echo '

' . "\n" + $error_msg_output .= '

' . "\n" .'

' . "\n" .' ' . $formatted_sql . "\n" .'

' . "\n"; @@ -615,7 +617,7 @@ function PMA_mysqlDie($error_message = '', $the_query = '', } // modified to show me the help on error-returns (Michael Keck) // (now error-messages-server) - echo '

' . "\n" + $error_msg_output .= '

' . "\n" . ' ' . $GLOBALS['strMySQLSaid'] . '' . PMA_showMySQLDocu('Error-messages-server', 'Error-messages-server') . "\n" @@ -631,10 +633,12 @@ function PMA_mysqlDie($error_message = '', $the_query = '', // Replace linebreaks $error_message = nl2br($error_message); - echo '' . "\n" + $error_msg_output .= '' . "\n" . $error_message . "\n" . '
' . "\n"; - echo '

'; + $error_msg_output .= '
'; + + $_SESSION['Import_message']['message'] = $error_msg_output; if ($exit) { if (! empty($back_url)) { @@ -643,13 +647,19 @@ function PMA_mysqlDie($error_message = '', $the_query = '', } else { $back_url .= '?no_history=true'; } - echo '
'; - echo '[ ' . $GLOBALS['strBack'] . ' ]'; - echo '
' . "\n\n"; + + $_SESSION['Import_message']['go_back_url'] = $back_url; + + $error_msg_output .= '
'; + $error_msg_output .= '[ ' . $GLOBALS['strBack'] . ' ]'; + $error_msg_output .= '
' . "\n\n"; } + + echo $error_msg_output; /** * display footer and exit */ + require_once './libraries/footer.inc.php'; } } // end of the 'PMA_mysqlDie()' function @@ -940,6 +950,7 @@ function PMA_whichCrlf() /** * Reloads navigation if needed. * + * @param $jsonly prints out pure JavaScript * @uses $GLOBALS['reload'] * @uses $GLOBALS['db'] * @uses PMA_generate_common_url() @@ -947,7 +958,7 @@ function PMA_whichCrlf() * * @access public */ -function PMA_reloadNavigation() +function PMA_reloadNavigation($jsonly=false) { global $cfg; @@ -960,8 +971,9 @@ function PMA_reloadNavigation() unset($_SESSION['tmp_user_values']['table_limit_offset']); echo "\n"; $reload_url = './navigation.php?' . PMA_generate_common_url($GLOBALS['db'], '', '&'); - ?> - - '."\n"; + unset($GLOBALS['reload']); } } diff --git a/libraries/display_import.lib.php b/libraries/display_import.lib.php index 04dc0acc3..6d2b0c869 100644 --- a/libraries/display_import.lib.php +++ b/libraries/display_import.lib.php @@ -14,6 +14,7 @@ if (! defined('PHPMYADMIN')) { */ require_once './libraries/file_listing.php'; require_once './libraries/plugin_interface.lib.php'; +require_once './libraries/display_import_ajax.lib.php'; /* Scan for plugins */ $import_list = PMA_getPlugins('./libraries/import/', $import_type); @@ -25,7 +26,124 @@ if (empty($import_list)) { } ?> -
+ + +
+ + + '; +echo ' '."\n"; echo PMA_pluginGetJavascript($import_list); ?>
-
+
+ + +
+
display(); @@ -185,6 +309,7 @@ echo "\n";
+