summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHorus32014-03-11 02:16:49 +0100
committerHorus32014-03-11 02:16:49 +0100
commit7df2c4d16ce7c8ee77e096f4185632b5c0514d76 (patch)
treec8ae8f81ae4bfa6e7ce4736f2285659cdad8f5d2
parent1ffaaf2be9fb2e287ff0ec1c058bfde0e55c99e7 (diff)
downloadfiles.iamfabulous.de-7df2c4d16ce7c8ee77e096f4185632b5c0514d76.tar.gz
changed the order of execution
-rw-r--r--www/upload.php20
1 files changed, 9 insertions, 11 deletions
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);