Update for installations that allow large files - If file is over 1 GB, display units...

[jirafeau_project.git] / index.php

diff --git a/index.php b/index.php
index 54e532517f951ed84694c8d8038b18b3754db1ad..9b1a4c942965f18701f26e7e53b7789700eef913 100644 (file)
--- a/index.php
+++ b/index.php
@@ -35,8 +35,14 @@ if (has_error()) {
 require(JIRAFEAU_ROOT . 'lib/template/header.php');
 
 /* Check if user is allowed to upload. */
-// First check: Challenge by IP
-if (true === jirafeau_challenge_upload_ip($cfg['upload_ip'], get_ip_address($cfg))) {
+// First check: Challenge by IP NO PASSWORD
+if (true === jirafeau_challenge_upload_ip($cfg['upload_ip_nopassword'], 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))) {
     // Is an upload password required?
     if (jirafeau_has_upload_password($cfg)) {
         // Logout action
@@ -160,8 +166,10 @@ 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') . " " . $cfg['maximal_upload_size']/1024 . " GB.";} 
+                       else {echo t('2_BIG') . ', ' . t('FILE_LIM') . " " . $cfg['maximal_upload_size'] . " MB.";} ?>')"/>
     </p>
 
     <div id="options">
@@ -172,7 +180,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>
@@ -224,9 +232,13 @@ else {
         </tr>
 
         <?php
-        if ($cfg['maximal_upload_size'] > 0) {
+        if ($cfg['maximal_upload_size'] > 0 && $cfg['maximal_upload_size'] < 1024) {
             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">' . t('FILE_LIM');
+            echo " " . $cfg['maximal_upload_size']/1024 . " GB.</p>";
         }
         ?>
 
@@ -256,7 +268,8 @@ else {
     </div> </fieldset>
 
     <?php
-    if (jirafeau_has_upload_password($cfg)) {
+    if (jirafeau_has_upload_password($cfg)
+        && false === jirafeau_challenge_upload_ip($cfg['upload_ip_nopassword'], get_ip_address($cfg))) {
         ?>
     <form method="post" class="form logout">
         <input type = "hidden" name = "action" value = "logout"/>