X-Git-Url: https://git.p6c8.net/jirafeau.git/blobdiff_plain/f58031f40640cc7c243a32d2c3515210ef4ed282..b5ecfc0a1a1cab78e1e1899c0c783585ff1ced95:/index.php?ds=sidebyside

diff --git a/index.php b/index.php
index 8c2898a..dade552 100644
--- a/index.php
+++ b/index.php
@@ -97,13 +97,11 @@ if (jirafeau_has_upload_password ($cfg))
     <p><?php echo t('File uploaded !') ?></p>
     <br />
 
-    <?php if ($cfg['download_page'] == true) { ?>
     <div id="upload_finished_download_page">
     <?php echo t('Download page') ?>
     <p><a id="upload_link" href=""></a></p>
     <br />
     </div>
-    <?php } ?>
 
     <div id="upload_password_page">
     <p><?php echo t('Download page') ?>:</p>
@@ -137,10 +135,16 @@ if (jirafeau_has_upload_password ($cfg))
 
 <div id="uploading">
     <p>
-    <?php echo t ('Uploading ...'); ?><div id="uploaded_percentage"></div>
+    <?php echo t ('Uploading ...'); ?>
+    <div id="uploaded_percentage"></div>
+    <div id="uploaded_speed"></div>
+    <div id="uploaded_time"></div>
     </p>
 </div>
 
+<div id="error_pop" class="error">
+</div>
+
 <div id="upload">
 <fieldset>
     <legend>
@@ -148,12 +152,9 @@ if (jirafeau_has_upload_password ($cfg))
     </legend>
     <p>
     <input type="file" id="file_select" size="30"
-    onchange="
-        document.getElementById('options').style.display = '';
-        document.getElementById('send').style.display = '';
-    "/>
+    onchange="control_selected_file_size(<?php echo $cfg['maximal_upload_size'] ?>, '<?php echo t ('File is too big') . ', ' . t ('File size is limited to') . " " . $cfg['maximal_upload_size'] . " MB"; ?>')"/>
     </p>
-    
+
     <div id="options">
         <table id="option_table">
         <tr>
@@ -167,29 +168,38 @@ if (jirafeau_has_upload_password ($cfg))
         <tr>
         <td><label for="select_time"><?php echo t('Time limit') . ':'; ?></label></td>
         <td><select name="time" id="select_time">
-        <?php if ($cfg['availabilities']['minute']) { ?>
-        <option value = "minute"><?php echo t('One minute'); ?></option>
+        <?php if ($cfg['availabilities']['none']) { ?>
+        <option value="none"><?php echo t('None'); ?></option>
         <?php } ?>
-        <?php if ($cfg['availabilities']['hour']) { ?>
-        <option value = "hour"><?php echo t('One hour'); ?></option>
+        <?php if ($cfg['availabilities']['year']) { ?>
+        <option value = "year"><?php echo t('One year');?></option>
         <?php } ?>
-        <?php if ($cfg['availabilities']['day']) { ?>
-        <option value = "day"><?php echo t('One day'); ?></option>
+        <?php if ($cfg['availabilities']['month']) { ?>
+        <option value = "month"><?php echo t('One month');?></option>
         <?php } ?>
         <?php if ($cfg['availabilities']['week']) { ?>
         <option value = "week"><?php echo t('One week'); ?></option>
         <?php } ?>
-        <?php if ($cfg['availabilities']['month']) { ?>
-        <option value = "month"><?php echo t('One month');?></option>
+        <?php if ($cfg['availabilities']['day']) { ?>
+        <option value = "day"><?php echo t('One day'); ?></option>
         <?php } ?>
-        <?php if ($cfg['availabilities']['year']) { ?>
-        <option value = "year"><?php echo t('One year');?></option>
+        <?php if ($cfg['availabilities']['hour']) { ?>
+        <option value = "hour"><?php echo t('One hour'); ?></option>
         <?php } ?>
-        <?php if ($cfg['availabilities']['none']) { ?>
-        <option value="none"><?php echo t('None'); ?></option>
+        <?php if ($cfg['availabilities']['minute']) { ?>
+        <option value = "minute"><?php echo t('One minute'); ?></option>
         <?php } ?>
         </select></td>
         </tr>
+
+        <?php
+        if ($cfg['maximal_upload_size'] > 0)
+        {
+        echo '<p class="config">' . t ('File size is limited to');
+        echo " " . $cfg['maximal_upload_size'] . " MB</p>";
+        }
+        ?>
+
 		<p id="max_file_size" class="config"></p>
     <p>
     <?php
@@ -231,6 +241,7 @@ if (jirafeau_has_upload_password ($cfg))
 </div>
 
 <script lang="Javascript">
+    document.getElementById('error_pop').style.display = 'none';
     document.getElementById('uploading').style.display = 'none';
     document.getElementById('upload_finished').style.display = 'none';
     document.getElementById('options').style.display = 'none';