[TASK] Small README.md update

[jirafeau_mojo42.git] / script.php

diff --git a/script.php b/script.php
index 2eb6b4a46b7b70a2cd3ed32ebb47c0ff27a9f074..50726f2690e63af47d1da25e03345f6fe3e79256 100644 (file)
--- a/script.php
+++ b/script.php
@@ -50,7 +50,7 @@ if ($_SERVER['REQUEST_METHOD'] == "GET" && count($_GET) == 0) {
     <h2>Scripting interface</h2>
     <p>This interface permits to script your uploads and downloads.</p>
     <p>See <a href="https://gitlab.com/mojo42/Jirafeau/blob/master/script.php">source code</a> of this interface to get available calls :)</p>
-    <p>You may download a preconfigured <a href="<?php echo JIRAFEAU_ABSPREFIX . 'script.php?lang=bash'; ?>">Bash Script</a> to easily send to and get files from the API via command line.</p>
+    <p>You may download a preconfigured <a href="script.php?lang=bash">Bash Script</a> to easily send to and get files from the API via command line.</p>
     </div>
     <br />
     <?php
@@ -70,18 +70,18 @@ if (has_error()) {
 /* Upload file */
 if (isset($_FILES['file']) && is_writable(VAR_FILES)
     && is_writable(VAR_LINKS)) {
-    if (!jirafeau_challenge_upload_ip($cfg, get_ip_address($cfg))) {
-        echo 'Error 2';
-        exit;
-    }
-
-    if (jirafeau_has_upload_password($cfg) &&
-         (!isset($_POST['upload_password']) ||
-          !jirafeau_challenge_upload_password($cfg, $_POST['upload_password']))) {
-        echo 'Error 3';
-        exit;
+    if (isset ($_POST['upload_password'])) {
+        if (!jirafeau_challenge_upload($cfg, get_ip_address($cfg), $_POST['upload_password'])) {
+            echo 'Error 3: Invalid password';
+            exit;
+        }
+    } else {
+        if (!jirafeau_challenge_upload($cfg, get_ip_address($cfg), null)) {
+            echo 'Error 2: No password nor allowed IP';
+            exit;
+        }
     }
-
+    
     $key = '';
     if (isset($_POST['key'])) {
         $key = $_POST['key'];
@@ -363,85 +363,18 @@ fi
         exit;
     }
 }
-/* Create alias. */
-elseif (isset($_GET['alias_create'])) {
-    $ip = get_ip_address($cfg);
-    if (!jirafeau_challenge_upload_ip($cfg, $ip)) {
-        echo 'Error 13';
-        exit;
-    }
-
-    if (jirafeau_has_upload_password($cfg) &&
-         (!isset($_POST['upload_password']) ||
-          !jirafeau_challenge_upload_password($cfg, $_POST['upload_password']))) {
-        echo 'Error 14';
-        exit;
-    }
-
-    if (!isset($_POST['alias']) ||
-        !isset($_POST['destination']) ||
-        !isset($_POST['password'])) {
-        echo 'Error 15';
-        exit;
-    }
-
-    echo jirafeau_alias_create($_POST['alias'],
-                                $_POST['destination'],
-                                $_POST['password'],
-                                $ip);
-}
-/* Get alias. */
-elseif (isset($_GET['alias_get'])) {
-    if (!isset($_POST['alias'])) {
-        echo 'Error 16';
-        exit;
-    }
-
-    echo jirafeau_alias_get($_POST['alias']);
-}
-/* Update alias. */
-elseif (isset($_GET['alias_update'])) {
-    if (!isset($_POST['alias']) ||
-        !isset($_POST['destination']) ||
-        !isset($_POST['password'])) {
-        echo 'Error 17';
-        exit;
-    }
-
-    $new_password = '';
-    if (isset($_POST['new_password'])) {
-        $new_password = $_POST['new_password'];
-    }
-
-    echo jirafeau_alias_update($_POST['alias'],
-                                $_POST['destination'],
-                                $_POST['password'],
-                                $new_password,
-                                get_ip_address($cfg));
-}
-/* Delete alias. */
-elseif (isset($_GET['alias_delete'])) {
-    if (!isset($_POST['alias']) ||
-        !isset($_POST['password'])) {
-        echo 'Error 18';
-        exit;
-    }
-
-    echo jirafeau_alias_delete($_POST['alias'],
-                                $_POST['password']);
-}
 /* Initialize an asynchronous upload. */
 elseif (isset($_GET['init_async'])) {
-    if (!jirafeau_challenge_upload_ip($cfg, get_ip_address($cfg))) {
-        echo 'Error 19';
-        exit;
-    }
-
-    if (jirafeau_has_upload_password($cfg) &&
-         (!isset($_POST['upload_password']) ||
-          !jirafeau_challenge_upload_password($cfg, $_POST['upload_password']))) {
-        echo 'Error 20';
-        exit;
+    if (isset($_POST['upload_password'])){
+        if (!jirafeau_challenge_upload($cfg, get_ip_address($cfg), $_POST['upload_password'])) {
+            echo 'Error 20: Invalid password';
+            exit;
+        }
+    } else {
+        if (!jirafeau_challenge_upload($cfg, get_ip_address($cfg), null)) {
+            echo 'Error 19: No password nor allowed IP';
+            exit;
+        }
     }
 
     if (!isset($_POST['filename'])) {