X-Git-Url: https://git.p6c8.net/jirafeau.git/blobdiff_plain/6c160f220551712c82c642f45d2e70ba070c04ae..86058c063871b6c9a070be3da87f4f047a655e80:/index.php?ds=inline

diff --git a/index.php b/index.php
index 5c3ffce..832749b 100644
--- a/index.php
+++ b/index.php
@@ -36,10 +36,13 @@ require(JIRAFEAU_ROOT . 'lib/template/header.php');
 
 /* Check if user is allowed to upload. */
 // First check: Challenge by IP NO PASSWORD
-if (true === jirafeau_challenge_upload_ip($cfg['upload_ip_nopassword'], get_ip_address($cfg))) {
+if (true === jirafeau_challenge_upload_ip_without_password($cfg, get_ip_address($cfg))) {
+    $_SESSION['upload_auth'] = true;
+    $_POST['upload_password'] = '';
+    $_SESSION['user_upload_password'] = $_POST['upload_password'];
 }
 // Second check: Challenge by IP
-elseif (true === jirafeau_challenge_upload_ip($cfg['upload_ip'], get_ip_address($cfg))) {
+elseif (true === jirafeau_challenge_upload_ip($cfg, get_ip_address($cfg))) {
     // Is an upload password required?
     if (jirafeau_has_upload_password($cfg)) {
         // Logout action
@@ -104,7 +107,7 @@ else {
         <a id="upload_link_email" href=""><img id="upload_image_email"/></a>
     </p><p>
         <code id=upload_link_text></code>
-        <button id="upload_link_button">⎘</button>
+        <button id="upload_link_button">&#128203;</button>
     </p>
     </div>
 
@@ -115,7 +118,7 @@ else {
         <a id="preview_link" href=""><?php echo t('VIEW_LINK') ?></a>
     </p><p>
         <code id=preview_link_text></code>
-        <button id="preview_link_button">⎘</button>
+        <button id="preview_link_button">&#128203;</button>
     </p>
     </div>
     <?php
@@ -126,7 +129,7 @@ else {
         <a id="direct_link" href=""><?php echo t('DIRECT_DL') ?></a>
     </p><p>
         <code id=direct_link_text></code>
-        <button id="direct_link_button">⎘</button>
+        <button id="direct_link_button">&#128203;</button>
     </p>
     </div>
 
@@ -135,7 +138,7 @@ else {
         <a id="delete_link" href=""><?php echo t('DELETE_LINK') ?></a>
     </p><p>
         <code id=delete_link_text></code>
-        <button id="delete_link_button">⎘</button>
+        <button id="delete_link_button">&#128203;</button>
     </p>
     </div>
 
@@ -163,8 +166,14 @@ else {
     <?php echo t('SEL_FILE'); ?>
     </legend>
     <p>
-    <input type="file" id="file_select" size="30"
-    onchange="control_selected_file_size(<?php echo $cfg['maximal_upload_size'] ?>, '<?php echo t('2_BIG') . ', ' . t('FILE_LIM') . " " . $cfg['maximal_upload_size'] . " MB"; ?>')"/>
+        <input type="file" id="file_select" size="30"
+    onchange="control_selected_file_size(<?php echo $cfg['maximal_upload_size'] ?>, '<?php
+        if ($cfg['maximal_upload_size'] >= 1024) {
+          echo t('2_BIG') . ', ' . t('FILE_LIM') . " " . number_format($cfg['maximal_upload_size']/1024, 2) . " GB.";
+        } else if ($cfg['maximal_upload_size'] > 0) { 
+          echo t('2_BIG') . ', ' . t('FILE_LIM') . " " . $cfg['maximal_upload_size'] . " MB.";
+        }
+    ?>')"/>
     </p>
 
     <div id="options">
@@ -175,7 +184,7 @@ else {
         </tr>
         <tr>
         <td><label for="input_key"><?php echo t('PSW') . ':'; ?></label></td>
-        <td><input type="text" name="key" id="input_key" /></td>
+        <td><input type="password" name="key" id="input_key" /></td>
         </tr>
         <tr>
         <td><label for="select_time"><?php echo t('TIME_LIM') . ':'; ?></label></td>
@@ -227,9 +236,14 @@ else {
         </tr>
 
         <?php
-        if ($cfg['maximal_upload_size'] > 0) {
+        if ($cfg['maximal_upload_size'] >= 1024) {
+            echo '<p class="config">' . t('FILE_LIM');
+            echo " " . number_format($cfg['maximal_upload_size'] / 1024, 2) . " GB.</p>";
+        } else if ($cfg['maximal_upload_size'] > 0) {
             echo '<p class="config">' . t('FILE_LIM');
-            echo " " . $cfg['maximal_upload_size'] . " MB</p>";
+            echo " " . $cfg['maximal_upload_size'] . " MB.</p>";
+        } else {
+           echo '<p class="config"></p>';
         }
         ?>
 
@@ -259,7 +273,8 @@ else {
     </div> </fieldset>
 
     <?php
-    if (jirafeau_has_upload_password($cfg)) {
+    if (jirafeau_has_upload_password($cfg)
+        && false === jirafeau_challenge_upload_ip_without_password($cfg, get_ip_address($cfg))) {
         ?>
     <form method="post" class="form logout">
         <input type = "hidden" name = "action" value = "logout"/>