summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--blob/nginx_rewrite_rules15
-rw-r--r--www/functions.php9
-rw-r--r--www/index.php13
-rw-r--r--www/select.php22
4 files changed, 35 insertions, 24 deletions
diff --git a/blob/nginx_rewrite_rules b/blob/nginx_rewrite_rules
index 950ae78..1a1a238 100644
--- a/blob/nginx_rewrite_rules
+++ b/blob/nginx_rewrite_rules
@@ -1,26 +1,27 @@
-location /robots.txt {}
+location /robots.txt {} #stop rewriting the robots.txt
location ~* ^/?login(\?[0-9a-zA-Z]*(=[0-9a-zA-Z]*)?)? {
- rewrite ^/?login(\?[0-9a-zA-Z]*(=[0-9a-zA-Z]*)?)? /index.php?task=login&arguments=$1 last;
+ rewrite ^/?login(\?[0-9a-zA-Z]*(=[0-9a-zA-Z]*)?)? /index.php?task=login&arguments=$1 last;
}
location ~* ^/?logout([?/]?.*) {
- rewrite ^/?logout([?/]?.*) /index.php?task=logout&arguments=$1 last;
+ rewrite ^/?logout([?/]?.*) /index.php?task=logout&arguments=$1 last;
}
location ~* ^/?register(\?[0-9a-zA-Z]*(=[0-9a-zA-Z]*)?)? {
- rewrite ^/?register(\?[0-9a-zA-Z]*(=[0-9a-zA-Z]*)?)? /index.php?task=register&arguments=$1 last;
+ rewrite ^/?register(\?[0-9a-zA-Z]*(=[0-9a-zA-Z]*)?)? /index.php?task=register&arguments=$1 last;
}
location ~* ^/?invite(\?[0-9a-zA-Z]*(=[0-9a-zA-Z]*)?)? {
- rewrite ^/?invite(\?[0-9a-zA-Z]*(=[0-9a-zA-Z]*)?)? /index.php?task=invite&arguments=$1 last;
+ rewrite ^/?invite(\?[0-9a-zA-Z]*(=[0-9a-zA-Z]*)?)? /index.php?task=invite&arguments=$1 last;
}
location ~* \.php(\?[0-9a-zA-Z]*(=[0-9a-zA-Z]*)?)? {} #empty block to catch all
location / {
- rewrite ^/([0-9a-zA-Z-_]*)/(.*) /index.php?name=$1&folder=$2 last;
- rewrite ^/([0-9a-zA-Z-_]*) /index.php?name=$1&folder=$2 last;
+ rewrite ^/([0-9a-zA-Z-_]+)/(.*) /index.php?name=$1&folder=$2 last;
+ rewrite ^/([0-9a-zA-Z-_]+) /index.php?name=$1 last;
+ rewrite ^/ /index.php last;
break;
}
diff --git a/www/functions.php b/www/functions.php
index 188c3b1..562b393 100644
--- a/www/functions.php
+++ b/www/functions.php
@@ -60,14 +60,14 @@ function login(){
} else {
foreach ($_GET as $argument => $value) {
if(preg_match("/success/",$argument))
- $logout="Successfull loged out!";
+ $logout="Log out was succesfull!";
}
if($logout){
echo $logout;
}
- echo "<form method='post' action='/login.php'>
+ echo "<form method='post' action='/login'>
<p>Name: <input type='text' name='username'></p>
<p>Password: <input type='password' name='password'>
<p><input type='submit' name='submit' value='login'></p>
@@ -148,7 +148,7 @@ function invite(){
}
echo "Hallo $name
- <form method='post' action='/invite.php'>
+ <form method='post' action='/invite'>
<p> E-Mail: <input type='text' name='email'></p>
<input type='hidden' name='username' value='$_SESSION[username]'>
<input type='submit' name='submit' value='invite'>
@@ -231,7 +231,7 @@ function register(){
echo 'Name: ' . $name . ' Value: ' . $value . '<br />';
}
- echo "<form method='post' action='register.php'>
+ echo "<form method='post' action='register'>
<p>Name: <input type='text' name='name'></p>
<p>pswd: <input type='password' name='pswd'></p>
<p>2ndpsdw: <input type='password' name='2ndpswd'></p>
@@ -259,4 +259,5 @@ function select(){
echo 'Name: ' . $name . ' Value: ' . $value . '<br />';
$i++;
}
+ echo "Presented by func select()!";
}
diff --git a/www/index.php b/www/index.php
index 5e2bf87..87b64ad 100644
--- a/www/index.php
+++ b/www/index.php
@@ -38,7 +38,7 @@ if(empty($_GET)){
user();
break;
default:
- 404();
+ get_404();
break;
}
} else {
@@ -47,13 +47,17 @@ if(empty($_GET)){
if(empty($name_id_ar)){
if($_SESSION["login"]){
- $_GET["folder"] = "" . $_GET["name"] . "" . $_GET["folder"] . "";
+ echo "Eingeloggt! Zeige deine Ordner beginnend mit '$_GET[name]' ! <br><br>";
+ $_GET["folder"] = "" . $_GET["name"] . "/" . $_GET["folder"] . "";
+ $_GET["name"] = $_SESSION["username"];
select();
+ exit;
} else {
- 404();
+ get_404();
}
} else {
select();
+ exit;
}
}
}
@@ -70,4 +74,5 @@ $safe_name=SQLite3::escapeString("$_SESSION[username]");
$invite = $invite_ar[0];
echo "<br><br>";
-echo "You have currently $invite invites.";
+echo "You have currently $invite invites. <br>";
+select();
diff --git a/www/select.php b/www/select.php
index 1dda9cf..78ab1bc 100644
--- a/www/select.php
+++ b/www/select.php
@@ -3,18 +3,22 @@
//session_start();
$db = new SQLite3("../database/sqlite.db");
-$user=2;
-$parent=1;
+$owner=2;
+$parentdir=0;
+$count=0;
$result_db = $db->query("SELECT id, parent, name, share FROM files WHERE parent=$parentdir AND owner=$owner AND folder='DIRECTORY' AND share='PUBLIC';");
-while(!empty($result=$result_db->fetchArray())){
- $dimension = count($result);
- for($i=0;$i<$dimension;$i++){
- echo $result[$i][2];
- $parentdir=$result[$i][0];
- $result_db = $db->query("SELECT id, parent, name, share FROM files WHERE parent=$parentdir AND owner=$owner AND folder='DIRECTORY' AND share='PUBLIC';");
- $result=$result_db->fetchArray();
+while($result[$count]=$result_db->fetchArray(SQLITE3_NUM)){
+ while(!empty($result)){
+ $dimension = count($result);
+ for($i=0;$i<$dimension;$i++){
+ echo "result: " . $result[$i][2] . " dimension: " . $dimension . " ";
+ $parentdir=$result[$i][0];
+ $result_db = $db->query("SELECT id, parent, name, share FROM files WHERE parent='$parentdir' AND owner=$owner AND folder='DIRECTORY' AND share='PUBLIC';");
+ $result[$count]=$result_db->fetchArray();
+ }
}
+ $count++;
}
/*