X-Git-Url: https://git.p6c8.net/jirafeau_project.git/blobdiff_plain/3e84a5debe0984bea841016ba587b109031a7816..5bd3412d378c6de75c36737b5fd93eb214945469:/admin.php diff --git a/admin.php b/admin.php index d05ce35..79918be 100644 --- a/admin.php +++ b/admin.php @@ -44,7 +44,8 @@ if (php_sapi_name() == "cli") { } else { die("No command found. Should be admin.php <clean_expired|clean_async>.\n"); } -} else { +// Second check: Challenge by IP +} elseif (true === jirafeau_challenge_admin_ip($cfg, get_ip_address($cfg))) { /* Disable admin interface if we have a empty admin password. */ if (empty($cfg['admin_password']) && empty($cfg['admin_http_auth_user'])) { require(JIRAFEAU_ROOT . 'lib/template/header.php'); @@ -57,7 +58,7 @@ if (php_sapi_name() == "cli") { /* Logout if requested. */ if (jirafeau_admin_session_logged() && isset($_POST['action']) && (strcmp($_POST['action'], 'logout') == 0)) { - jirafeau_admin_session_end(); + jirafeau_session_end(); } if (!jirafeau_admin_session_logged()) { @@ -117,9 +118,9 @@ if (php_sapi_name() == "cli") { /* Show admin interface if not downloading a file. */ if (!(isset($_POST['action']) && strcmp($_POST['action'], 'download') == 0)) { require(JIRAFEAU_ROOT . 'lib/template/header.php'); ?><h2><?php echo t('ADMIN_INTERFACE'); ?></h2><?php - ?><h2>(version <?php echo JIRAFEAU_VERSION ?>)</h2><?php + ?><h2>(version <?php echo JIRAFEAU_VERSION ?>)</h2><?php - ?><div id = "admin"> + ?><div id = "admin"> <fieldset><legend><?php echo t('ACTIONS'); ?></legend> <table> <form method="post"> @@ -301,5 +302,7 @@ if (php_sapi_name() == "cli") { } require(JIRAFEAU_ROOT.'lib/template/footer.php'); +} else { + jirafeau_fatal_error(t('ACCESS_KO'), $cfg); } ?>