X-Git-Url: https://git.p6c8.net/jirafeau.git/blobdiff_plain/12b5f1c92a8860eb2f72b99d6eda34971f82463e..68892c7ee6ea5f3f30d1e5d1051cd7029b2cbd41:/admin.php diff --git a/admin.php b/admin.php old mode 100755 new mode 100644 index 80b18b1..2cad589 --- a/admin.php +++ b/admin.php @@ -1,7 +1,7 @@ + * Copyright (C) 2015 Jerome Jutteau * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -33,7 +33,7 @@ if (file_exists (JIRAFEAU_ROOT . 'install.php') } /* Disable admin interface if we have a empty admin password. */ -if (empty($cfg['admin_password'])) +if (empty($cfg['admin_password']) && empty($cfg['admin_http_auth_user'])) { require (JIRAFEAU_ROOT . 'lib/template/header.php'); echo '

'. @@ -50,8 +50,8 @@ session_start(); if (isset ($_POST['action']) && (strcmp ($_POST['action'], 'logout') == 0)) $_SESSION['admin_auth'] = false; -/* Check password. */ -if (isset ($_POST['admin_password'])) +/* Check classic admin password authentification. */ +if (isset ($_POST['admin_password']) && empty($cfg['admin_http_auth_user'])) { if (strcmp ($cfg['admin_password'], $_POST['admin_password']) == 0) $_SESSION['admin_auth'] = true; @@ -65,8 +65,9 @@ if (isset ($_POST['admin_password'])) exit; } } -/* Ask for password. */ -elseif (!isset ($_SESSION['admin_auth']) || $_SESSION['admin_auth'] != true) +/* Ask for classic admin password authentification. */ +elseif ((!isset ($_SESSION['admin_auth']) || $_SESSION['admin_auth'] != true) + && empty($cfg['admin_http_auth_user'])) { require (JIRAFEAU_ROOT . 'lib/template/header.php'); ?>

@@ -95,6 +96,25 @@ elseif (!isset ($_SESSION['admin_auth']) || $_SESSION['admin_auth'] != true) require (JIRAFEAU_ROOT.'lib/template/footer.php'); exit; } +/* Check authenticated user if HTTP authentification is enable. */ +elseif ((!isset ($_SESSION['admin_auth']) || $_SESSION['admin_auth'] != true) + && !empty($cfg['admin_http_auth_user'])) +{ + if ($cfg['admin_http_auth_user'] == $_SERVER['PHP_AUTH_USER']) + $_SESSION['admin_auth'] = true; +} + +/* Be sure that no one can access further without admin_auth. */ +if (!isset ($_SESSION['admin_auth']) || $_SESSION['admin_auth'] != true) +{ + $_SESSION['admin_auth'] = false; + require (JIRAFEAU_ROOT . 'lib/template/header.php'); + echo '

'. + t('Sorry, you are not authenticated on admin interface.') . + '

'; + require (JIRAFEAU_ROOT.'lib/template/footer.php'); + exit; +} /* Operations may take a long time. * Be sure PHP's safe mode is off. @@ -103,13 +123,13 @@ elseif (!isset ($_SESSION['admin_auth']) || $_SESSION['admin_auth'] != true) /* Remove errors. */ @error_reporting(0); -/* Admin interface. */ -require (JIRAFEAU_ROOT . 'lib/template/header.php'); -?>

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

@@ -128,23 +148,7 @@ require (JIRAFEAU_ROOT . 'lib/template/header.php'); - - - - - - - - - - - @@ -237,14 +237,6 @@ if (isset ($_POST['action'])) echo t('Number of cleaned files') . ' : ' . $total; echo '

'; } - elseif (strcmp ($_POST['action'], 'clean_block') == 0) - { - $total = jirafeau_admin_clean_block (); - echo '
' . NL; - echo '

'; - echo t('Number of cleaned files') . ' : ' . $total; - echo '

'; - } elseif (strcmp ($_POST['action'], 'list') == 0) { jirafeau_admin_list ("", "", ""); @@ -285,6 +277,7 @@ if (isset ($_POST['action'])) $l['file_name'] . '"'); if (file_exists(VAR_FILES . $p . $l['md5'])) readfile (VAR_FILES . $p . $l['md5']); + exit; } }
- - - -
- + @@ -152,10 +156,6 @@ require (JIRAFEAU_ROOT . 'lib/template/header.php');