X-Git-Url: https://git.p6c8.net/jirafeau_project.git/blobdiff_plain/3e84a5debe0984bea841016ba587b109031a7816..8d680388c6ee5495386a31ea22d794df26d5c910:/admin.php?ds=sidebyside diff --git a/admin.php b/admin.php index d05ce35..09bded5 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 .\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,13 +58,14 @@ 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()) { /* Test HTTP authentication. */ if (!empty($cfg['admin_http_auth_user']) && - $cfg['admin_http_auth_user'] == $_SERVER['PHP_AUTH_USER']) { + ((is_array($cfg['admin_http_auth_user']) && in_array($_SERVER['PHP_AUTH_USER'], $cfg['admin_http_auth_user'])) || + (($cfg['admin_http_auth_user'] == $_SERVER['PHP_AUTH_USER'])))) { jirafeau_admin_session_start(); } /* Test web password authentication. */ @@ -117,9 +119,13 @@ 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'); ?>

(version )

(version )

'.t('SODIUM_UNAVAILABLE').'

'; + } - ?>
+ ?>
@@ -301,5 +307,8 @@ if (php_sapi_name() == "cli") { } require(JIRAFEAU_ROOT.'lib/template/footer.php'); +} else { + require(JIRAFEAU_ROOT . 'lib/template/header.php'); + jirafeau_fatal_error(t('ACCESS_KO'), $cfg); } ?>