X-Git-Url: https://git.p6c8.net/jirafeau_project.git/blobdiff_plain/0b85af176ceecbd94fad0b48977abf6eeff9c0c0..9040c556f63db0e26f9874b3afceec3ecf7f47d1:/index.php

diff --git a/index.php b/index.php
index 8e512b6..63906c1 100644
--- a/index.php
+++ b/index.php
@@ -2,7 +2,7 @@
 /*
  *  Jirafeau, your web file repository
  *  Copyright (C) 2013
- *  Jerome Jutteau <j.jutteau@gmail.com>
+ *  Jerome Jutteau <jerome@jutteau.fr>
  *  Jimmy Beauvois <jimmy.beauvois@gmail.com>
  *
  *  This program is free software: you can redistribute it and/or modify
@@ -36,13 +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
@@ -167,17 +167,23 @@ else {
     </legend>
     <p>
         <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.";} ?>')"/>
+    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">
         <table id="option_table">
-        <tr>
-        <td><?php echo t('ONE_TIME_DL'); ?>:</td>
-        <td><input type="checkbox" id="one_time_download" /></td>
-        </tr>
+        <?php
+        if ($cfg['one_time_download']) {
+            echo '<tr><td>' . t('ONE_TIME_DL') . ':</td>';
+            echo '<td><input type="checkbox" id="one_time_download" /></td></tr>';
+        }
+        ?>
         <tr>
         <td><label for="input_key"><?php echo t('PSW') . ':'; ?></label></td>
         <td><input type="password" name="key" id="input_key" /></td>
@@ -232,13 +238,14 @@ else {
         </tr>
 
         <?php
-        if ($cfg['maximal_upload_size'] > 0 && $cfg['maximal_upload_size'] < 1024) {
+        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>";
-        }
-		else {
-		    echo '<p class="config">' . t('FILE_LIM');
-            echo " " . $cfg['maximal_upload_size']/1024 . " GB.</p>";
+        } else {
+           echo '<p class="config"></p>';
         }
         ?>
 
@@ -269,7 +276,7 @@ else {
 
     <?php
     if (jirafeau_has_upload_password($cfg)
-        && false === jirafeau_challenge_upload_ip($cfg['upload_ip_nopassword'], get_ip_address($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"/>