From c97625e02a95ebd995af8a06c27229581a071ddd Mon Sep 17 00:00:00 2001 From: Aleksander Machniak <alec@alec.pl> Date: Wed, 25 Dec 2013 06:11:22 -0500 Subject: [PATCH] CS fixes --- 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 69124f7..4f822e0 100644 --- a/program/steps/mail/import.inc +++ b/program/steps/mail/import.inc @@ -32,6 +32,7 @@ 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 @@ // 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 @@ // send html page with JS calls as response $OUTPUT->send('iframe'); - -- Gitblit v1.9.1