No more duplicate folders anymore.

2 files changed, 18 insertions, 10 deletions

diff --git a/www/constants.php b/www/constants.php
index 235f34a..9245821 100644
--- a/www/constants.php
+++ b/www/constants.php
@@ -34,13 +34,14 @@ define("MKDIR_SUCCESS", 24);
 define("MKDIR_OWNER", 25);
 define("MKDIR_LOGIN", 26);
 define("MKDIR_DATABASE", 27);
-
-define("UPLOAD_SUCCESS", 28);
-define("UPLOAD_DATABASE", 29);
-define("UPLOAD_LOGIN", 30);
-define("UPLOAD_UPLOAD", 31);
-define("UPLOAD_PARENTFOLDER", 32); // cur. tested if integer. Later should be if owner and uploader the same person
-define("UPLOAD_QUOTA", 33);
-define("UPLOAD_FILE_HANDLING", 34);
-define("UPLOAD_MOVING", 35);
-define("UPLOAD_DUPLICATE", 36);
+define("MKDIR_DUPLICATE", 28);
+
+define("UPLOAD_SUCCESS", 29);
+define("UPLOAD_DATABASE", 30);
+define("UPLOAD_LOGIN", 31);
+define("UPLOAD_UPLOAD", 32);
+define("UPLOAD_PARENTFOLDER", 33); // cur. tested if integer. Later should be if owner and uploader the same person
+define("UPLOAD_QUOTA", 34);
+define("UPLOAD_FILE_HANDLING", 35);
+define("UPLOAD_MOVING", 36);
+define("UPLOAD_DUPLICATE", 37);
diff --git a/www/functions/func_folder.php b/www/functions/func_folder.php
index 7a2233b..537e106 100644
--- a/www/functions/func_folder.php
+++ b/www/functions/func_folder.php
@@ -19,6 +19,13 @@ function create_folder($path, $new_folder_name, $share){
 
 //	echo "path: ".$path." file_id: ".$file_id." userid: ".$_SESSION['userid']." new_folder_name: ".$new_folder_name." share: ".$share."<br>"; exit;
 
+	$dupl_db = $db->query("SELECT parent FROM files WHERE name='" . SQLite3::escapeString($new_folder_name) . "';");
+	while($dupl_ar = $dupl_db->fetchArray(SQLITE3_NUM)){
+		if($dupl_ar[0] == $file_id){
+			return MKDIR_DUPLICATE;
+		}
+	}
+
 	if($db->exec("
 		BEGIN TRANSACTION;
 		INSERT INTO files (id, parent, owner, name, folder, size, share, hash) VALUES (Null, " . $file_id . ", " . $_SESSION['userid'] . ", '" . SQLite3::escapeString($new_folder_name) . "', 'DIRECTORY', 0, '" . SQLite3::escapeString($share) . "', '');