From 7df2c4d16ce7c8ee77e096f4185632b5c0514d76 Mon Sep 17 00:00:00 2001
From: Horus3
Date: Tue, 11 Mar 2014 02:16:49 +0100
Subject: changed the order of execution

---
 www/upload.php | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

(limited to 'www')

diff --git a/www/upload.php b/www/upload.php
index e3b1100..1c64fa1 100644
--- a/www/upload.php
+++ b/www/upload.php
@@ -51,14 +51,13 @@ function upload($db){
 
 	$uploaddir = "../files/";
 
-	if($db->exec("
-		BEGIN TRANSACTION;
-		INSERT INTO files (id, parent, owner, name, folder, mime, size, share) VALUES (NULL, " . $parentdir . ", " . $owner . ", '" . $filename . "', '" . $folder . "', '" . $mime . "', '" . $size . "', '" . $share ."');
-		COMMIT;
-	")){
-		$id = $db->lastInsertRowID();
-		if(move_uploaded_file($_FILES['userfile']['tmp_name'], $uploaddir . $_FILES['userfile']['name'])){
-
+	if(move_uploaded_file($_FILES['userfile']['tmp_name'], $uploaddir . $_FILES['userfile']['name'])){
+		if($db->exec("
+			BEGIN TRANSACTION;
+			INSERT INTO files (id, parent, owner, name, folder, mime, size, share) VALUES (NULL, " . $parentdir . ", " . $owner . ", '" . $filename . "', '" . $folder . "', '" . $mime . "', '" . $size . "', '" . $share ."');
+			COMMIT;
+		")){
+			$id = $db->lastInsertRowID();
 			$gzfile = $uploaddir . $id . ".gz";
 			$fp = gzopen($gzfile, 'w9');
 			if(gzwrite($fp, file_get_contents($uploaddir . $filename))){
@@ -74,12 +73,11 @@ function upload($db){
 			}
 
 		} else {
-			error("Upload failed");
+			error("Database error.");
 		}
 	} else{
-		error("Database error.");
+		error("Upload failed");
 	}
-
 }
 
 upload($db);
-- 
cgit v1.2.3