From 296d8a14511739a15327ffe30c0895cd3490e940 Mon Sep 17 00:00:00 2001
From: root
Date: Fri, 21 Mar 2014 19:25:02 +0100
Subject: Doesn't show private files anymore and trying to write a empty_folder
 function.

---
 www/functions/func_content.php | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

(limited to 'www/functions/func_content.php')

diff --git a/www/functions/func_content.php b/www/functions/func_content.php
index e24ea34..8431c15 100755
--- a/www/functions/func_content.php
+++ b/www/functions/func_content.php
@@ -11,6 +11,8 @@ function collect_content($db,$username, $folder_path){
 
 	if(!$file_id){
 		print_empty_folder($db, $username, $folder_path);
+		echo "Empty folder";
+		exit;
 	}
 
 	$content = get_content($db, $file_id, $owner);
@@ -20,7 +22,13 @@ function collect_content($db,$username, $folder_path){
 
 function get_content($db, $file_id, $owner){
 
-	$content_db = $db->query("SELECT * FROM files WHERE parent=" . $file_id . " AND owner=" . $owner . ";");
+	if($_SESSION["login"] && $_SESSION["userid"] == $owner){
+		$share="";
+	} else {
+		$share =" AND share='PUBLIC'";
+	}
+
+	$content_db = $db->query("SELECT * FROM files WHERE parent=" . $file_id . " AND owner=" . $owner . $share . ";");
 	
 	$count=0;
 
@@ -46,27 +54,31 @@ function get_content($db, $file_id, $owner){
 
 function get_path_to_empty_folder($db, $username, $folder_path){
 
+	$owner = user_id($db, $username);
+
 	if($_SESSION["login"] && $_SESSION["userid"] == $owner){
-		if($_SESSION["login"] && $_SESSION["userid"] == $owner){}
+		$share = "";
 	} else {
-		$share ="AND share='PUBLIC'";
+		$share =" AND share='PUBLIC'";
 	}
 
 	$folder_array_unsafe = explode("/",$folder_path);
 	$length = count($folder_array_unsafe);
 
-	$root_db = $db->query("SELECT id FROM files WHERE parent=0 AND owner=" . SQLite3::escapeString($owner) . " AND fo    lder='DIRECTORY' " . $share . ";");
+	//echo "SELECT id FROM files WHERE parent=0 AND owner=" . SQLite3::escapeString($owner) . " AND folder='DIRECTORY' " . $share . ";"; exit;
+
+	$root_db = $db->query("SELECT id FROM files WHERE parent=0 AND owner=" . SQLite3::escapeString($owner) . " AND folder='DIRECTORY' " . $share . ";");
 	$root_ar = $root_db->fetchArray(SQLITE3_NUM);
 	$root_id = $root_ar[0];
 
 	if(empty($root_id[0])){
-		return NOT_PUBLIC;
+		return FOLDER_NOT_PUBLIC;
 	}
 
 	$parentdir = $root_id;
 
 	for($i=0; $i<$length; $i++){
-		$parentdir_db = $db->query("SELECT id, parent FROM files WHERE owner=" . $owner . $share . " AND parent="     . $parentdir . " AND name='" . SQLite3::escapeString($folder_array_unsafe[$i]) . "';");
+		$parentdir_db = $db->query("SELECT id, parent FROM files WHERE owner=" . $owner . $share . " AND parent=". $parentdir . " AND name='" . SQLite3::escapeString($folder_array_unsafe[$i]) . "';");
 		$prim_id = $parentdir_db->fetchArray(SQLITE3_NUM);
 
 		if($parentdir != $prim_id[1]){
-- 
cgit v1.2.3