Upload.php now can upload in direcotires other than root

4 files changed, 20 insertions, 6 deletions

diff --git a/php/database.php b/php/database.php
index bb8cfa4..1e76d77 100644
--- a/php/database.php
+++ b/php/database.php
@@ -337,8 +337,10 @@ require_once "node.php";
 			{
 				error_log("could not exedude dir sql statement in create_file_node");
 				return "error";
-			}
-			if(($dir=$dir_prep->fetch(PDO::FETCH_ASSOC))==false)
+            }
+
+            $dir=$dir_prep->fetch(PDO::FETCH_ASSOC);
+			if($dir == false)
 			{
 				error_log("create_file_node dir isnt a directory");
 				return "error";
diff --git a/php/node.php b/php/node.php
index bb404e0..d7c2a6c 100644
--- a/php/node.php
+++ b/php/node.php
@@ -46,6 +46,9 @@ require_once "user.php";
 		{
 			$dir_id=$database->create_dangling_directory();
 			$database->link_nodes($parent_dir_id,$dir_id,$directory_name,$note);
+
+			$database->give_view_access($dir_id, $user->user_id);
+			$database->give_edit_access($dir_id, $user->user_id);
 			return $dir_id;
 		}
 	}
diff --git a/php/readdir.php b/php/readdir.php
index 8194580..24d3c49 100644
--- a/php/readdir.php
+++ b/php/readdir.php
@@ -4,8 +4,8 @@
 	$user=$_SESSION['user_object'];
 	$path=$_POST['path'];
 
-//echo '[ { "name": "file1.txt", "mimetype": "text/plain", "is_directory": false }, { "name": "file2.pdf", "mimetype": "application/pdf", "is_directory": false }, { "name": "dir", "mimetype": "", "is_directory": true } ] ';
 	$ret=get_directory_contents($path,$user);
+
 	$json=json_encode($ret);
 	echo $json;
 ?>
diff --git a/php/upload.php b/php/upload.php
index 1672e9e..9739744 100644
--- a/php/upload.php
+++ b/php/upload.php
@@ -2,9 +2,10 @@
 require_once "database.php";
 require_once "configuration.php";
 require_once "file_type_recogniser.php";
+require_once "node.php";
 
 session_start();
-if (!isset( $_POST["filename"]) || !isset($_FILES["the_file"]))
+if (!isset( $_POST["filename"]) || !isset($_FILES["the_file"]) || !isset($_POST['parent_directory']))
 {
 	error_log("someone tried to upload something impropperly");
 	http_response_code(400);
@@ -13,16 +14,24 @@ if (!isset( $_POST["filename"]) || !isset($_FILES["the_file"]))
 
 $file=$_FILES["the_file"];
 $filename=$_POST["filename"];
+$parent_directory=$_POST["parent_directory"];
 $user=$_SESSION['user_object'];
 $homedir=$user->home_directory;
 $mimetype=file_type($file['tmp_name']);
 
+$dir = get_directory($parent_directory, $user);
+if (!$dir) 
+{
+    error_log("trying to upload to invalid directory");
+	http_response_code(409);
+    exit(0);
+}
 
-$codename=$database->create_file_node($filename,"",$homedir,$mimetype,$user);
+$codename=$database->create_file_node($filename,"",$dir,$mimetype,$user);
 if($codename=="error")
 {
 	error_log("could not create file_node in upload.php");
-	http_response_code(400);
+	http_response_code(409);
 	exit(0);
 }
 if($codename=="filename taken")