X-Git-Url: https://git.p6c8.net/jirafeau_mojo42.git/blobdiff_plain/03d1001bce1a6d3ba0cce77199a6e1ad686e8273..4cb33eda92e6812bb61b534817389ca5cd197027:/admin.php?ds=sidebyside diff --git a/admin.php b/admin.php index a91d529..49a2f8f 100644 --- a/admin.php +++ b/admin.php @@ -1,7 +1,7 @@ <?php /* * Jirafeau, your web file repository - * Copyright (C) 2012 Jerome Jutteau <j.jutteau@gmail.com> + * Copyright (C) 2015 Jerome Jutteau <j.jutteau@gmail.com> * * 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 '<div class="error"><p>'. @@ -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'); ?> <form action = "<?php echo basename(__FILE__); ?>" method = "post"> @@ -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 '<div class="error"><p>'. + t('Sorry, you are not authenticated on admin interface.') . + '</p></div>'; + 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'); -?><h2><?php echo t('Admin interface'); ?></h2><?php - -/* Show admin interface. */ +/* Show admin interface if not downloading a file. */ +if (!(isset ($_POST['action']) && strcmp ($_POST['action'], 'download') == 0)) { - ?><div id = "install"> + require (JIRAFEAU_ROOT . 'lib/template/header.php'); + ?><h2><?php echo t('Admin interface'); ?></h2><?php + + ?><div id = "admin"> <fieldset><legend><?php echo t('Actions');?></legend> <table> <form action = "<?php echo basename(__FILE__); ?>" method = "post"> @@ -128,7 +148,7 @@ require (JIRAFEAU_ROOT . 'lib/template/header.php'); <tr> <input type = "hidden" name = "action" value = "clean_async"/> <td class = "info"> - <?php echo t('Clean old unfinished transferts'); ?> + <?php echo t('Clean old unfinished transfers'); ?> </td> <td></td> <td> @@ -192,8 +212,8 @@ require (JIRAFEAU_ROOT . 'lib/template/header.php'); </form> </table> <form action = "<?php echo basename(__FILE__); ?>" method = "post"> - <input type = "hidden" name = "action" value = "logout"/> - <input type = "submit" value = "<?php echo t('Logout'); ?>" /> + <input type = "hidden" name = "action" value = "logout" /> + <input type = "submit" value = "<?php echo t('Logout'); ?>" /> </form> </fieldset></div><?php } @@ -257,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; } }