From faa522d827574973c49498a7bad234cf5cf2c069 Mon Sep 17 00:00:00 2001 From: Nikkolai Fernandez Date: Sun, 4 Nov 2018 12:00:38 +0800 Subject: [PATCH] Refactor "if" condition for "$_FILES" array remove unnecessary nested if condition to one liner using AND Boolean operator. --- upload.php | 38 ++++++++++++++++++-------------------- 1 file changed, 18 insertions(+), 20 deletions(-) diff --git a/upload.php b/upload.php index 791e8b7..0767fd0 100644 --- a/upload.php +++ b/upload.php @@ -26,27 +26,25 @@ if (login()) { mkdir($dir, 0755, true); } - if (isset($_FILES)) { - if (isset($_FILES['file'])) { - $tmp_name = $_FILES['file']['tmp_name']; - $name = basename($_FILES['file']['name']); - $error = $_FILES['file']['error']; - $path = $dir . $timestamp . '-' . $name; - - $check = getimagesize($tmp_name); - - if($check !== false) { - if ($error === UPLOAD_ERR_OK) { - $extension = pathinfo($name, PATHINFO_EXTENSION); - if (!in_array(strtolower($extension), $whitelist)) { - $error = 'Invalid file type uploaded.'; - } else { - move_uploaded_file($tmp_name, $dir . $timestamp . '-' . $name); - } + if (isset($_FILES) && isset($_FILES['file'])) { + $tmp_name = $_FILES['file']['tmp_name']; + $name = basename($_FILES['file']['name']); + $error = $_FILES['file']['error']; + $path = $dir . $timestamp . '-' . $name; + + $check = getimagesize($tmp_name); + + if($check !== false) { + if ($error === UPLOAD_ERR_OK) { + $extension = pathinfo($name, PATHINFO_EXTENSION); + if (!in_array(strtolower($extension), $whitelist)) { + $error = 'Invalid file type uploaded.'; + } else { + move_uploaded_file($tmp_name, $dir . $timestamp . '-' . $name); } - } else { - $error = "File is not an image."; } + } else { + $error = "File is not an image."; } } @@ -61,4 +59,4 @@ if (login()) { } else { $login = site_url() . 'login'; header("location: $login"); -} \ No newline at end of file +}