X-Git-Url: https://git.p6c8.net/jirafeau_project.git/blobdiff_plain/93d7dffa6e851ee8e2c1c0708c78caff3fa35dd7..23a68ba6e720d9d9449ccea4dd366cb002b4aa0f:/admin.php?ds=sidebyside

diff --git a/admin.php b/admin.php
index 0f8967f..f8270a2 100644
--- a/admin.php
+++ b/admin.php
@@ -1,7 +1,9 @@
 <?php
 /*
  *  Jirafeau, your web file repository
+ *  Copyright (C) 2008  Julien "axolotl" BERNARD <axolotl@magieeternelle.org>
  *  Copyright (C) 2015  Jerome Jutteau <jerome@jutteau.fr>
+ *  Copyright (C) 2024  Jirafeau project <https://gitlab.com/jirafeau> (see AUTHORS.md)
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU Affero General Public License as
@@ -14,7 +16,7 @@
  *  GNU Affero General Public License for more details.
  *
  *  You should have received a copy of the GNU Affero General Public License
- *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 session_start();
 define('JIRAFEAU_ROOT', dirname(__FILE__) . '/');
@@ -35,17 +37,18 @@ if (php_sapi_name() == "cli") {
     if ($cfg['installation_done'] == false) {
         die("Installation not completed yet.\n");
     }
-    if ((count($argv)>1) && $argv[1]=="clean_expired") {
+    if ((count($argv) > 1) && $argv[1] == 'clean_expired') {
         $total = jirafeau_admin_clean();
         echo "$total expired files deleted.\n";
-    } elseif ((count($argv)>1) && $argv[1]=="clean_async") {
+    } elseif ((count($argv) > 1) && $argv[1] == 'clean_async') {
         $total = jirafeau_admin_clean_async();
         echo "$total old unfinished transfers deleted.\n";
     } else {
         die("No command found. Should be admin.php <clean_expired|clean_async>.\n");
     }
-// Second check: Challenge by IP
-} elseif (true === jirafeau_challenge_admin_ip($cfg, get_ip_address($cfg))) {
+}
+/* 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');
@@ -64,7 +67,8 @@ if (php_sapi_name() == "cli") {
     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. */