X-Git-Url: https://git.p6c8.net/jirafeau_project.git/blobdiff_plain/625f38a7decfc1ed72e0120c6ff34fcbe2d55100..b00457671d8bf1b69e441b1ceb9f3254e6ca33bd:/admin.php?ds=sidebyside diff --git a/admin.php b/admin.php index afcccb5..2cad589 100644 --- a/admin.php +++ b/admin.php @@ -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'); ?>