manage visitor IP behind reverse proxies, refs #36

[jirafeau.git] / index.php

diff --git a/index.php b/index.php
index 1a5c6aac7eeda0dae9c8369491a3cf37a03afbdf..5a2c9263637a21c06a045a94915eb75e8a597815 100644 (file)
--- a/index.php
+++ b/index.php
@@ -34,6 +34,14 @@ if (has_error ())
     exit;
 }
 
     exit;
 }
 

+/* Check if user is allowed to upload. */
+if (!jirafeau_challenge_upload_ip ($cfg, get_ip_address($cfg)))
+{
+    echo '<div class="error"><p>' . t('Access denied') . '</p></div>';
+    require (JIRAFEAU_ROOT.'lib/template/footer.php');
+    exit;
+}
+

 /* Ask password if upload password is set. */
 if (jirafeau_has_upload_password ($cfg))
 {
 /* Ask password if upload password is set. */
 if (jirafeau_has_upload_password ($cfg))
 {


@@ -95,44 +103,36 @@ if (jirafeau_has_upload_password ($cfg))
 ?>
 <div id="upload_finished">
     <p><?php echo t('File uploaded !') ?></p>
 ?>
 <div id="upload_finished">
     <p><?php echo t('File uploaded !') ?></p>

-    <br />

 
 

-    <?php if ($cfg['download_page'] == true) { ?>

     <div id="upload_finished_download_page">
     <div id="upload_finished_download_page">

-    <?php echo t('Download page') ?>
+    <p>
+          <?php echo t('Download page') ?> 
+          <a id="upload_link_email" href=""><img id="upload_image_email"/></a>
+    </p>

     <p><a id="upload_link" href=""></a></p>
     <p><a id="upload_link" href=""></a></p>

-    <br />
-    </div>
-    <?php } ?>
-
-    <div id="upload_password_page">
-    <p><?php echo t('Download page') ?>:</p>
-    <p><a id="password_link" href=""></a></p>
-    <br />

     </div>
 
     <?php if ($cfg['preview'] == true) { ?>
     <div id="upload_finished_preview">
     <p><?php echo t('View link') ?>:</p>
     <p><a id="preview_link" href=""></a></p>
     </div>
 
     <?php if ($cfg['preview'] == true) { ?>
     <div id="upload_finished_preview">
     <p><?php echo t('View link') ?>:</p>
     <p><a id="preview_link" href=""></a></p>

-    <br />

     </div>
     <?php } ?>
 
     <div id="upload_direct_download">
     <p><?php echo t('Direct download link') ?>:</p>
     <p><a id="direct_link" href=""></a></p>
     </div>
     <?php } ?>
 
     <div id="upload_direct_download">
     <p><?php echo t('Direct download link') ?>:</p>
     <p><a id="direct_link" href=""></a></p>

-    <br />

     </div>
 
     </div>
 

+    <div>

     <p><?php echo t('Delete link') ?>:</p>
     <p><a id="delete_link" href=""></a></p>
     <p><?php echo t('Delete link') ?>:</p>
     <p><a id="delete_link" href=""></a></p>

-    <br />
-    
-    <p id="validity">
-    <?php echo t('This file is valid until the following date'); ?>:
-    <br /><strong><div id="date"></div></strong>
-    </p>
+    </div>
+
+    <div id="validity">
+    <p><?php echo t('This file is valid until the following date'); ?>:</p>
+    <p id="date"></p>
+    </div>

 </div>
 
 <div id="uploading">
 </div>
 
 <div id="uploading">