upload.php: Unnest upload_file() if-else expressions

As phpmd (PHP Mess Detector) linter says: "An if expression with an else
branch is never necessary." Well, at least almost never necessary.

Improves readability and resolves phpmd cleancode lint errors.

1 files changed, 30 insertions, 30 deletions

diff --git a/static/upload.php b/static/upload.php
index c7d5ea7..a218c71 100644
--- a/static/upload.php
+++ b/static/upload.php
@@ -129,38 +129,38 @@ function upload_file($file)
     $newname = generate_name($file);
 
     // Attempt to move it to the static directory
-    if (move_uploaded_file($file->tempfile, POMF_FILES_ROOT.$newname)) {
-        // Need to change permissions for the new file to make it world readable
-        if (chmod(POMF_FILES_ROOT.$newname, 0644)) {
-            // Add it to the database
-            // 'expire' support is deprecated since version 2.1.0. It may be
-            // removed in a future release.
-            $q = $db->prepare('INSERT INTO files (hash, originalname, filename, size, date, '.
-                              'expire, delid) VALUES (:hash, :orig, :name, :size, :date, '.
-                              ':exp, :del)');
-
-            // Common parameters binding
-            $q->bindValue(':hash', $file->get_sha1(),       PDO::PARAM_STR);
-            $q->bindValue(':orig', strip_tags($file->name), PDO::PARAM_STR);
-            $q->bindValue(':name', $newname,                PDO::PARAM_STR);
-            $q->bindValue(':size', $file->size,             PDO::PARAM_INT);
-            $q->bindValue(':date', date('Y-m-d'),           PDO::PARAM_STR);
-            $q->bindValue(':exp',  null,                    PDO::PARAM_STR); // Deprecated since version 2.1.0
-            $q->bindValue(':del',  sha1($file->tempfile),   PDO::PARAM_STR);
-            $q->execute();
-
-            return array(
-                'hash' => $file->get_sha1(),
-                'name' => $file->name,
-                'url' => POMF_URL.$newname,
-                'size' => $file->size,
-            );
-        } else {
-            throw new Exception('Failed to change file permissions', 500);
-        }
-    } else {
+    if (!move_uploaded_file($file->tempfile, POMF_FILES_ROOT.$newname)) {
         throw new Exception('Failed to move file to destination', 500);
     }
+
+    // Need to change permissions for the new file to make it world readable
+    if (!chmod(POMF_FILES_ROOT.$newname, 0644)) {
+        throw new Exception('Failed to change file permissions', 500);
+    }
+
+    // Add it to the database
+    // 'expire' support is deprecated since version 2.1.0. It may be
+    // removed in a future release.
+    $q = $db->prepare('INSERT INTO files (hash, originalname, filename, size, date, '.
+                      'expire, delid) VALUES (:hash, :orig, :name, :size, :date, '.
+                      ':exp, :del)');
+
+    // Common parameters binding
+    $q->bindValue(':hash', $file->get_sha1(),       PDO::PARAM_STR);
+    $q->bindValue(':orig', strip_tags($file->name), PDO::PARAM_STR);
+    $q->bindValue(':name', $newname,                PDO::PARAM_STR);
+    $q->bindValue(':size', $file->size,             PDO::PARAM_INT);
+    $q->bindValue(':date', date('Y-m-d'),           PDO::PARAM_STR);
+    $q->bindValue(':exp',  null,                    PDO::PARAM_STR); // Deprecated since version 2.1.0
+    $q->bindValue(':del',  sha1($file->tempfile),   PDO::PARAM_STR);
+    $q->execute();
+
+    return array(
+        'hash' => $file->get_sha1(),
+        'name' => $file->name,
+        'url' => POMF_URL.$newname,
+        'size' => $file->size,
+    );
 }
 
 /**