X-Git-Url: https://git.p6c8.net/jirafeau.git/blobdiff_plain/652b90a6551e4c70d38189dcf16284a04399918d..9093d4ec5187ecd2638bae1f2f9decce6b501642:/script.php

diff --git a/script.php b/script.php
index 3b6b234..1c154b1 100644
--- a/script.php
+++ b/script.php
@@ -140,7 +140,7 @@ if ($_SERVER['REQUEST_METHOD'] == "GET" && count ($_GET) == 0)
     echo t('Example') . ": <a href=\"" . $web_root . "script.php?h=30ngy0hsDcpfrF8zR7x9iU&amp;d=0d210a952\">" . $web_root . "script.php?h=30ngy0hsDcpfrF8zR7x9iU&amp;d=0d210a952</a> ";
     echo '</p>';
     
-    echo '<h3>' . t('Get a generated scripts') . ':</h3>';
+    echo '<h3>' . t('Get a generated script') . ':</h3>';
     echo '<p>';
     echo t('Send a GET query to') . ': <i>' . $web_root . 'script.php</i><br />';
     echo '<br />';
@@ -157,9 +157,9 @@ if ($_SERVER['REQUEST_METHOD'] == "GET" && count ($_GET) == 0)
         echo "$name: <a href=\"" . $web_root . "script.php?lang=$lang\">" . $web_root . "script.php?lang=$lang</a> ";
     echo '</p>';
     
-    echo '<h3>' . t('Initalize an asynchronous transfert') . ':</h3>';
+    echo '<h3>' . t('Initalize an asynchronous transfer') . ':</h3>';
     echo '<p>';
-    echo t('The goal is to permit to transfert big file, chunk by chunk.') . ' ';
+    echo t('The goal is to permit to transfer big file, chunk by chunk.') . ' ';
     echo t('Chunks of data must be sent in order.');
     echo '</p>';
     echo '<p>';
@@ -174,9 +174,9 @@ if ($_SERVER['REQUEST_METHOD'] == "GET" && count ($_GET) == 0)
     echo "<b>upload_password=</b>your_upload_password<i> (" . t('Optional') . ")</i> <br />";
     echo '</p>';
     echo '<p>' . t('This will return brut text content.') . ' ' .
-         t('First line is the asynchronous transfert reference and the second line the code to use in the next operation.') . '<br /></p>';
+         t('First line is the asynchronous transfer reference and the second line the code to use in the next operation.') . '<br /></p>';
 
-    echo '<h3>' . t('Push data during asynchronous transfert') . ':</h3>';
+    echo '<h3>' . t('Push data during asynchronous transfer') . ':</h3>';
     echo '<p>';
     echo t('Send a GET query to') . ': <i>' . $web_root . 'script.php?push_async</i><br />';
     echo '<br />';
@@ -188,7 +188,7 @@ if ($_SERVER['REQUEST_METHOD'] == "GET" && count ($_GET) == 0)
     echo '<p>' . t('This will return brut text content.') . ' ' .
          t('Returns the next code to use.') . '<br /></p>';
 
-    echo '<h3>' . t('Finalize asynchronous transfert') . ':</h3>';
+    echo '<h3>' . t('Finalize asynchronous transfer') . ':</h3>';
     echo '<p>';
     echo t('Send a GET query to') . ': <i>' . $web_root . 'script.php?end_async</i><br />';
     echo '<br />';
@@ -218,6 +218,12 @@ if (has_error ())
 if (isset ($_FILES['file']) && is_writable (VAR_FILES)
     && is_writable (VAR_LINKS))
 {
+    if (!jirafeau_challenge_upload_ip ($cfg, get_ip_address($cfg)))
+    {
+        echo "Error";
+        exit;
+    }
+
     if (jirafeau_has_upload_password ($cfg) &&
          (!isset ($_POST['upload_password']) ||
           !jirafeau_challenge_upload_password ($cfg, $_POST['upload_password'])))
@@ -272,7 +278,7 @@ if (isset ($_FILES['file']) && is_writable (VAR_FILES)
 
     $res = jirafeau_upload ($_FILES['file'],
                             isset ($_POST['one_time_download']),
-                            $key, $time, $_SERVER['REMOTE_ADDR'],
+                            $key, $time, get_ip_address($cfg),
                             $cfg['enable_crypt'], $cfg['link_name_length']);
     
     if (empty($res) || $res['error']['has_error'])
@@ -505,6 +511,12 @@ fi
 /* Initialize an asynchronous upload. */
 elseif (isset ($_GET['init_async']))
 {
+    if (!jirafeau_challenge_upload_ip ($cfg, get_ip_address($cfg)))
+    {
+        echo "Error";
+        exit;
+    }
+
     if (jirafeau_has_upload_password ($cfg) &&
          (!isset ($_POST['upload_password']) ||
           !jirafeau_challenge_upload_password ($cfg, $_POST['upload_password'])))
@@ -563,7 +575,7 @@ elseif (isset ($_GET['init_async']))
                               isset ($_POST['one_time_download']),
                               $key,
                               $time,
-                              $_SERVER['REMOTE_ADDR']);
+                              get_ip_address($cfg));
 }
 /* Continue an asynchronous upload. */
 elseif (isset ($_GET['push_async']))