Merge branch 'master' of https://github.com/alexvitkov/india

5 files changed, 16 insertions, 4 deletions

diff --git a/php/.database.php.swp b/php/.database.php.swp
deleted file mode 100644
index eecacf9..0000000
--- a/php/.database.php.swp
+++ /dev/null
diff --git a/php/.node.php.swp b/php/.node.php.swp
deleted file mode 100644
index 2046c2b..0000000
--- a/php/.node.php.swp
+++ /dev/null
diff --git a/php/.upload.php.swp b/php/.upload.php.swp
deleted file mode 100644
index e1fc62b..0000000
--- a/php/.upload.php.swp
+++ /dev/null
diff --git a/php/node.php b/php/node.php
index b6c3428..3c18519 100644
--- a/php/node.php
+++ b/php/node.php
@@ -1,9 +1,21 @@
 <?php 
 require_once "database.php";
 
-	class Current_Directory
+	class Node
 	{
 		public $node_id;
+		public $is_directory;
+		public $relative_path;
+		public $type;
+		public $name;
+		public $note;
+		function __construct($node_id)
+		{
+			$this->node_id=$node_id;
+		}
+	}
+	class Current_Directory
+	{
 		/*an array of the dir_ids taken to reach here*/
 		public $path;
 
diff --git a/php/upload.php b/php/upload.php
index bd72b6b..42a8bf6 100644
--- a/php/upload.php
+++ b/php/upload.php
@@ -1,8 +1,8 @@
 <?php 
-require_once "database.php"
-require_once "configuration.php"
+require_once "database.php";
+require_once "configuration.php";
 
-if (!isset( $_POST["filename") || !isset($_POST["the_file"])
+if (!isset( $_POST["filename"]) || !isset($_POST["the_file"]))
 {
 	http_response_code(400);
 	error_log("someone tried to upload something impropperly");