diff options
| author | Aleksander Machniak <alec@alec.pl> | 2013-12-25 12:11:22 +0100 |
|---|---|---|
| committer | Aleksander Machniak <alec@alec.pl> | 2013-12-25 12:11:22 +0100 |
| commit | c97625e02a95ebd995af8a06c27229581a071ddd (patch) | |
| tree | 4d20bc9facef9e8cb0a9f2d6cdf9dea8fec17e7c /program/steps/mail/import.inc | |
| parent | da5fa28d5705ab2b9991f39741f2a8f1751a25ad (diff) | |
CS fixes
Diffstat (limited to 'program/steps/mail/import.inc')
| -rw-r--r-- | program/steps/mail/import.inc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/program/steps/mail/import.inc b/program/steps/mail/import.inc index 69124f71a..4f822e0e4 100644 --- a/program/steps/mail/import.inc +++ b/program/steps/mail/import.inc @@ -32,6 +32,7 @@ if (is_array($_FILES['_file'])) { if (!$err) { // check file content type first list($mtype_primary,) = explode('/', rcube_mime::file_content_type($filepath, $_FILES['_file']['name'][$i], $_FILES['_file']['type'][$i])); + if (!in_array($mtype_primary, array('text','message'))) { $OUTPUT->show_message('importmessageerror', 'error'); continue; @@ -39,7 +40,9 @@ if (is_array($_FILES['_file'])) { // read the first few lines to detect header-like structure $fp = fopen($filepath, 'r'); - do { $line = fgets($fp); } + do { + $line = fgets($fp); + } while ($line !== false && trim($line) == ''); if (!preg_match('/^From\s+-/', $line) && !preg_match('/^[a-z-_]+:\s+.+/i', $line)) { @@ -103,4 +106,3 @@ else if ($_SERVER['REQUEST_METHOD'] == 'POST') { // send html page with JS calls as response $OUTPUT->send('iframe'); - |