X-Git-Url: https://git.p6c8.net/jirafeau.git/blobdiff_plain/777eeaa386e65193660e936fd5d7b12d05561c21..154774198c957b8d907f17c0afa1435232a312b9:/index.php diff --git a/index.php b/index.php index 8cb0b86..11205a4 100644 --- a/index.php +++ b/index.php @@ -16,81 +16,81 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ -define ('JIRAFEAU_ROOT', dirname (__FILE__) . '/'); - -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/template/header.php'); - -check_errors ($cfg); -if (has_error ()) -{ - show_errors (); - require (JIRAFEAU_ROOT . 'lib/template/footer.php'); +define('JIRAFEAU_ROOT', dirname(__FILE__) . '/'); + +require(JIRAFEAU_ROOT . 'lib/settings.php'); +require(JIRAFEAU_ROOT . 'lib/functions.php'); +require(JIRAFEAU_ROOT . 'lib/lang.php'); + +check_errors($cfg); +if (has_error()) { + show_errors(); + require(JIRAFEAU_ROOT . 'lib/template/footer.php'); exit; } -/* Ask password if upload password is set. */ -if (jirafeau_has_upload_password ($cfg)) -{ - session_start(); - - /* Unlog if asked. */ - if (isset ($_POST['action']) && (strcmp ($_POST['action'], 'logout') == 0)) - session_unset (); - - /* Auth. */ - if (isset ($_POST['upload_password'])) - { - if (jirafeau_challenge_upload_password ($cfg, $_POST['upload_password'])) - { - $_SESSION['upload_auth'] = true; - $_SESSION['user_upload_password'] = $_POST['upload_password']; +require(JIRAFEAU_ROOT . 'lib/template/header.php'); + +/* Check if user is allowed to upload. */ +// First check: Challenge by IP +if (true === jirafeau_challenge_upload_ip($cfg['upload_ip'], get_ip_address($cfg))) { + // Is an upload password required? + if (jirafeau_has_upload_password($cfg)) { + session_start(); + + // Logout action + if (isset($_POST['action']) && (strcmp($_POST['action'], 'logout') == 0)) { + session_unset(); } - else - { - $_SESSION['admin_auth'] = false; - echo '

' . t('Wrong password.') . '

'; - require (JIRAFEAU_ROOT.'lib/template/footer.php'); - exit; + + // Challenge by password + // …save successful logins in session + if (isset($_POST['upload_password'])) { + 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; + jirafeau_fatal_error(t('Wrong password.'), $cfg); + } } - } - /* Show auth page. */ - if (!isset ($_SESSION['upload_auth']) || $_SESSION['upload_auth'] != true) - { - ?> -
-
- - - - - - - - - -
- -
-
-
- + +
@@ -98,30 +98,38 @@ if (jirafeau_has_upload_password ($cfg))

- - + + +

-

- +
-

:

-

+

+ + +

- +
-

:

-

+

+ + +

-
-

:

-

+
+

+ + +

-
+

:

@@ -129,7 +137,7 @@ if (jirafeau_has_upload_password ($cfg))

- +

@@ -142,11 +150,11 @@ if (jirafeau_has_upload_password ($cfg))
- +

')"/> + onchange="control_selected_file_size(, '')"/>

@@ -162,79 +170,99 @@ if (jirafeau_has_upload_password ($cfg)) 0) - { - echo '

' . t ('File size is limited to'); - echo " " . $cfg['maximal_upload_size'] . " MB

"; + if ($cfg['maximal_upload_size'] > 0) { + echo '

' . t('File size is limited to'); + echo " " . $cfg['maximal_upload_size'] . " MB

"; } ?>

+ if (jirafeau_has_upload_password($cfg) && $_SESSION['upload_auth']) { + ?> + + } else { + ?>

-
+ if (jirafeau_has_upload_password($cfg)) { + ?> +
- - +