X-Git-Url: https://git.p6c8.net/jirafeau.git/blobdiff_plain/631048856d53591fed1253a61f63ab07c3772443..2590706e0001e6df17d4252e9dc22e3d9e3c5614:/index.php
diff --git a/index.php b/index.php
old mode 100755
new mode 100644
index d267140..5a2c926
--- a/index.php
+++ b/index.php
@@ -26,7 +26,7 @@ require (JIRAFEAU_ROOT . 'lib/functions.php');
require (JIRAFEAU_ROOT . 'lib/lang.php');
require (JIRAFEAU_ROOT . 'lib/template/header.php');
-check_errors ();
+check_errors ($cfg);
if (has_error ())
{
show_errors ();
@@ -34,20 +34,31 @@ if (has_error ())
exit;
}
+/* Check if user is allowed to upload. */
+if (!jirafeau_challenge_upload_ip ($cfg, get_ip_address($cfg)))
+{
+ echo '
' . t('Access denied') . '
';
+ require (JIRAFEAU_ROOT.'lib/template/footer.php');
+ exit;
+}
+
/* Ask password if upload password is set. */
-if (strlen ($cfg['upload_password']) > 0)
+if (jirafeau_has_upload_password ($cfg))
{
session_start();
/* Unlog if asked. */
if (isset ($_POST['action']) && (strcmp ($_POST['action'], 'logout') == 0))
- $_SESSION['upload_auth'] = false;
+ session_unset ();
/* Auth. */
if (isset ($_POST['upload_password']))
{
- if (strcmp ($cfg['upload_password'], $_POST['upload_password']) == 0)
+ if (jirafeau_challenge_upload_password ($cfg, $_POST['upload_password']))
+ {
$_SESSION['upload_auth'] = true;
+ $_SESSION['user_upload_password'] = $_POST['upload_password'];
+ }
else
{
$_SESSION['admin_auth'] = false;
@@ -91,31 +102,51 @@ if (strlen ($cfg['upload_password']) > 0)
?>
-
- :
-
-
-
-
+
+
- :
-
-
-
-
-
- :
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+