summaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
authorroot2014-04-28 10:12:33 +0200
committerroot2014-04-28 10:12:33 +0200
commitd0857bc2803f3c223d7331c8770aedcbc4b310a2 (patch)
treeb32c74abc12e30ce0176ec9ee5c19d8e1e0089b5 /www
parent11ed3a4c720d9379beaf7f5770f297677da5d9a7 (diff)
downloadfiles.iamfabulous.de-d0857bc2803f3c223d7331c8770aedcbc4b310a2.tar.gz
Unimportant changes #1
Diffstat (limited to 'www')
-rw-r--r--www/check.hash.php35
-rw-r--r--www/class.files.php21
-rwxr-xr-xwww/functions/func_register.php2
3 files changed, 50 insertions, 8 deletions
diff --git a/www/check.hash.php b/www/check.hash.php
new file mode 100644
index 0000000..2149355
--- /dev/null
+++ b/www/check.hash.php
@@ -0,0 +1,35 @@
+<?php
+
+$db = new SQLite3("../database/sqlite.db");
+
+//$hash_db = $db->query("SELECT count(hash) FROM (SELECT DISTINCT hash FROM files WHERE folder='FILE')");
+$hash_db = $db->query("SELECT hash FROM (SELECT DISTINCT hash FROM files WHERE folder='FILE')");
+$file_name = array_diff(scandir("../files/"), array(".", "..", "README"));
+$ar_key = array_keys($file_name);
+$file = array();
+
+$cnt=0;
+
+while($hash_ar = $hash_db->fetchArray(SQLITE3_NUM)){
+ $res[$count] = $hash_ar[0].".gz";
+ $count++;
+}
+
+echo "Checking for leftover hashs in dir... <br>";
+for($i=0;$i<count($ar_key); $i++){
+ if(!in_array($file_name[$ar_key[$i]], $res)){
+ $file[$cnt] = $file_name[$ar_key[$i]];
+ $cnt++;
+ }
+}
+
+var_dump($file);
+
+echo "<br><br> Checking for leftover hashs in database... <br>";
+
+foreach($file_name as $file){
+ if(!in_array($res, $file)){
+ echo "<br>";
+ echo $file;
+ }
+}
diff --git a/www/class.files.php b/www/class.files.php
index 8f4090a..e512c7a 100644
--- a/www/class.files.php
+++ b/www/class.files.php
@@ -41,14 +41,21 @@ class file {
$OwnerId = user_id($GLOBALS["db"], $_GET["name"]);
$this->OwnerId = $OwnerId;
- $FileId = select_file_id($db, $OwnerId, $_GET["folder"]);
- $ParentId_db = $db->query("SELECT parent FROM files WHERE id=".$FileId.";");
- $ParentId = $ParentId_db->fetchArray(SQLITE3_NUM);
- $this->ParentId = $ParentId[0];
+ if(!$var){
+ return;
+ } else {
+ $FileId = select_file_id($db, $OwnerId, $_GET["folder"]);
+ if(!$FileId){
+ return;
+ }
+ $ParentId_db = $db->query("SELECT parent FROM files WHERE id=".$FileId.";");
+ $ParentId = $ParentId_db->fetchArray(SQLITE3_NUM);
+ $this->ParentId = $ParentId[0];
- $ParentName_db = $db->query("SELECT name FROM files WHERE id=".$ParentId[0]);
- $ParentName = $ParentName_db->fetchArray(SQLITE3_NUM);
- $this->ParentName = $ParentName[0];
+ $ParentName_db = $db->query("SELECT name FROM files WHERE id=".$ParentId[0]);
+ $ParentName = $ParentName_db->fetchArray(SQLITE3_NUM);
+ $this->ParentName = $ParentName[0];
+ }
}
function NotFound(){
diff --git a/www/functions/func_register.php b/www/functions/func_register.php
index b848866..1ad4cd5 100755
--- a/www/functions/func_register.php
+++ b/www/functions/func_register.php
@@ -61,7 +61,7 @@ function register($db){
BEGIN TRANSACTION;
UPDATE user SET name='" . $safe_name . "', password='" . $hash_password . "', invites=5, status=1, register=(SELECT strftime('%s', 'now')), color_folder='DEFAULT', color_file='DEFAULT' WHERE id=" . $id . ";
INSERT INTO files (id, parent, owner, name, folder, mime, size, share, size, hash) VALUES (NULL, 0, $id, '/', 'DIRECTORY', NULL, NULL, 'PUBLIC', 0, '');
- INSERT INTO log (id, user, login) VALUES (NULL, (SELECT id FROM user WHERE name='" . $safe_name. "'), (SELECT strftime('%s', 'now'));
+ INSERT INTO log (id, user, login) VALUES (NULL, (SELECT id FROM user WHERE name='" . $safe_name. "'), (SELECT strftime('%s', 'now')));
COMMIT;")
){