From: Jerome Jutteau <jerome@jutteau.fr>
Date: Mon, 11 Nov 2019 22:47:39 +0000 (+0100)
Subject: [TASK] Size checking adjustments
X-Git-Tag: 4.1.0~12
X-Git-Url: https://git.p6c8.net/jirafeau_mojo42.git/commitdiff_plain/c3114e0b2e59f3d5e75368d1e29f0c9bbad1eb87?ds=sidebyside

[TASK] Size checking adjustments

- identation
- print GB when >= 1024
- show limitation in MB when > 0
- hide text under file selection when there is no limit

Signed-off-by: Jerome Jutteau <jerome@jutteau.fr>
---

diff --git a/index.php b/index.php
index 8e512b6..b03af76 100644
--- a/index.php
+++ b/index.php
@@ -167,9 +167,13 @@ 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">
@@ -232,13 +236,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>';
         }
         ?>