Merge branch 'img' into 'master'

[jirafeau.git] / index.php

diff --git a/index.php b/index.php
index 4802e33a9dc99efed5de21a3ec92b6ed090f824d..b83dd35ef030059242016419085727c1c8a4610b 100644 (file)
--- a/index.php
+++ b/index.php
@@ -24,7 +24,6 @@ require (JIRAFEAU_ROOT . 'lib/config.original.php');
 require (JIRAFEAU_ROOT . 'lib/settings.php');
 require (JIRAFEAU_ROOT . 'lib/functions.php');
 require (JIRAFEAU_ROOT . 'lib/lang.php');
 require (JIRAFEAU_ROOT . 'lib/settings.php');
 require (JIRAFEAU_ROOT . 'lib/functions.php');
 require (JIRAFEAU_ROOT . 'lib/lang.php');

-require (JIRAFEAU_ROOT . 'lib/template/header.php');

 
 check_errors ($cfg);
 if (has_error ())
 
 check_errors ($cfg);
 if (has_error ())


@@ -34,8 +33,10 @@ if (has_error ())
     exit;
 }
 
     exit;
 }
 

+require (JIRAFEAU_ROOT . 'lib/template/header.php');
+

 /* Check if user is allowed to upload. */
 /* Check if user is allowed to upload. */

-if (!jirafeau_challenge_upload_ip ($cfg, $_SERVER['REMOTE_ADDR']))
+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');
 {
     echo '<div class="error"><p>' . t('Access denied') . '</p></div>';
     require (JIRAFEAU_ROOT.'lib/template/footer.php');