[TASK] rework user auth

[jirafeau_mojo42.git] / script.php

diff --git a/script.php b/script.php
index de105ba1a5ef1fac7f7aa7e52405330f7c0b81f4..99ebfebb3f4bbb2ce559265b45546bba0b57fc03 100644 (file)
--- a/script.php
+++ b/script.php
@@ -62,20 +62,22 @@ if (has_error()) {
     exit;
 }
 
     exit;
 }
 

+session_start();
+

 /* Upload file */
 if (isset($_FILES['file']) && is_writable(VAR_FILES)
     && is_writable(VAR_LINKS)) {
 /* Upload file */
 if (isset($_FILES['file']) && is_writable(VAR_FILES)
     && is_writable(VAR_LINKS)) {

-    if (isset($_POST['upload_password'])) {
-        if (!jirafeau_challenge_upload($cfg, get_ip_address($cfg), $_POST['upload_password'])) {
+    if (!jirafeau_user_session_logged()) {
+        if (isset($_POST['upload_password']) &&
+            !jirafeau_challenge_upload($cfg, get_ip_address($cfg), $_POST['upload_password'])) {

             echo 'Error 3: Invalid password';
             exit;
             echo 'Error 3: Invalid password';
             exit;

-        }
-    } else {
-        if (!jirafeau_challenge_upload($cfg, get_ip_address($cfg), null)) {
+        } elseif (!jirafeau_challenge_upload($cfg, get_ip_address($cfg), null)) {

             echo 'Error 2: No password nor allowed IP';
             exit;
         }
     }
             echo 'Error 2: No password nor allowed IP';
             exit;
         }
     }

+

     $key = '';
     if (isset($_POST['key'])) {
         $key = $_POST['key'];
     $key = '';
     if (isset($_POST['key'])) {
         $key = $_POST['key'];


@@ -135,7 +137,7 @@ if (isset($_FILES['file']) && is_writable(VAR_FILES)
     } else {
         $ip = "";
     }
     } else {
         $ip = "";
     }

-    
+

     $res = jirafeau_upload(
         $_FILES['file'],
         isset($_POST['one_time_download']),
     $res = jirafeau_upload(
         $_FILES['file'],
         isset($_POST['one_time_download']),


@@ -260,8 +262,8 @@ if [ -n "$JIRAFEAU_ONE_TIME" ]; then
     one_time='1'
 fi
 
     one_time='1'
 fi
 

-if [ -n "$UPLOAD_PASSWD" ]; then
-    upload_password="$JIRAFEAU_UPLOAD_PASSWORD"
+if [ -n "$JIRAFEAU_UPLOAD_PASSWD" ]; then
+    upload_password="$JIRAFEAU_UPLOAD_PASSWD"

 fi
 
 if [ -z "$curl" ]; then
 fi
 
 if [ -z "$curl" ]; then


@@ -405,7 +407,8 @@ fi
 }
 /* Initialize an asynchronous upload. */
 elseif (isset($_GET['init_async'])) {
 }
 /* Initialize an asynchronous upload. */
 elseif (isset($_GET['init_async'])) {

-    if (isset($_POST['upload_password'])) {
+    if (jirafeau_user_session_logged()) {}
+    elseif (isset($_POST['upload_password'])) {

         if (!jirafeau_challenge_upload($cfg, get_ip_address($cfg), $_POST['upload_password'])) {
             echo 'Error 20: Invalid password';
             exit;
         if (!jirafeau_challenge_upload($cfg, get_ip_address($cfg), $_POST['upload_password'])) {
             echo 'Error 20: Invalid password';
             exit;


@@ -479,7 +482,7 @@ elseif (isset($_GET['init_async'])) {
     } else {
         $ip = "";
     }
     } else {
         $ip = "";
     }

-    
+

     echo jirafeau_async_init(
         $_POST['filename'],
         $type,
     echo jirafeau_async_init(
         $_POST['filename'],
         $type,