1 files changed, 12 insertions, 27 deletions
diff --git a/www/functions/func_upload.php b/www/functions/func_upload.php
index eb3061b..c8ef93a 100755
--- a/www/functions/func_upload.php
+++ b/www/functions/func_upload.php
@@ -1,20 +1,5 @@
 <?php
 
-/* This was tested with this interface, where PWD the primary key from the working directory is:
-
-UPDATE 26.3. : Should now accept the path as an argument.
-
-<!DOCTYPE html>
-<form method='post' action='/upload.php' enctype="multipart/form-data">
-<p>File :<input name="userfile" type="file" size="500000000" maxlength="100000000000000"></p>
-
-<p>PWD: <input type='text' name='path'></p>
-<p>Share: <input type='text' name='share'>
-<p><input type='submit' name='submit' value='upload'></p>
-</form>
-
-*/
-
 function database_upload($db, $parentdir, $owner, $filename, $folder, $mime, $size, $share, $filehash){
 	if($db->exec("
 		BEGIN TRANSACTION;
@@ -27,7 +12,9 @@ function database_upload($db, $parentdir, $owner, $filename, $folder, $mime, $si
 	}
 }
 
-function upload($db){
+function upload($path){
+
+	$db = $GLOBALS["db"];
 
 	set_time_limit(0);
 
@@ -39,11 +26,7 @@ function upload($db){
 		return UPLOAD_UPLOAD;
 	}
 
-	$parentdir = select_file_id($db, $_SESSION["userid"], $_POST["path"]);
-	//$parentdir = SQLite3::escapeString("$_POST[pwd]");
-	if(!preg_match("/[0-9]+/", $parentdir)){
-		return UPLOAD_PARENTFOLDER;
-	}
+	$parentdir = select_file_id($db, $_SESSION["userid"], $path);
 
 	$folder_owner_db = $db->query("SELECT owner FROM files WHERE id=".$parentdir.";");
 	$folder_owner_ar = $folder_owner_db->fetchArray(SQLITE3_NUM);
@@ -52,10 +35,7 @@ function upload($db){
 		return UPLOAD_FOLDER_NOT_OWNER;
 	}
 
-	$ownername = SQLite3::escapeString($_SESSION['username']);
-	$owner_db = $db->query("SELECT id FROM user WHERE name='" . $ownername . "';");
-	$owner_ar = $owner_db->fetchArray(SQLITE3_NUM);
-	$owner = $owner_ar[0];
+	$owner = $_SESSION["userid"];
 
 	$overall_size_db = $db->query("SELECT size FROM files WHERE owner=" . $owner . " AND size > 0;");
 	$overall_size = 0;
@@ -64,7 +44,7 @@ function upload($db){
 		$overall_size = $overall_size + $row[$count];
 		$count++;
 	}
-
+	
 	if($overall_size > 2147483648){		// == 2GB
 		return UPLOAD_QUOTA;
 	}
@@ -73,7 +53,12 @@ function upload($db){
 	$folder = "FILE";
 	$mime = $_FILES['userfile']['type'];
 	$size = $_FILES['userfile']['size'];
-	$share = SQLite3::escapeString($_POST['share']);
+
+	if(isset($_POST["share"])){
+		$share = "PUBLIC";
+	} else {
+		$share = "PRIVATE";
+	}
 
 	$uploaddir = "../files/";