mirror/php-adminer
1
0
Fork 0
mirror of https://github.com/vrana/adminer.git synced 2025-08-22 06:02:57 +02:00
Code Issues Releases Wiki Activity

Verify UTF-8 encoding of CSV import

Browse Source
This commit is contained in:
Jakub Vrana
2013-06-03 14:57:26 -07:00
parent c05e332ca3
commit 8e0ead4678
5 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
adminer/select.inc.php
View File

@@ -158,8 +158,11 @@ if ($_POST && !$error) {
queries_redirect(remove_from_uri(), lang('%d item(s) have been affected.', $affected), $result);
}
} elseif (is_string($file = get_file("csv_file", true))) {
//! character set
} elseif (!is_string($file = get_file("csv_file", true))) {
$error = upload_error($file);
} elseif (!preg_match('~~u', $file)) {
$error = lang('File must be in UTF-8 encoding.');
} else {
cookie("adminer_import", "output=" . urlencode($adminer_import["output"]) . "&format=" . urlencode($_POST["separator"]));
$result = true;
$cols = array_keys($fields);
@@ -190,8 +193,6 @@ if ($_POST && !$error) {
queries_redirect(remove_from_uri("page"), lang('%d row(s) have been imported.', $affected), $result);
queries("ROLLBACK"); // after queries_redirect() to not overwrite error
} else {
$error = upload_error($file);
}
}
}