modularization date_int

[jirafeau_project.git] / admin.php

diff --git a/admin.php b/admin.php
index ed9baad25a6ad7c44078143d573c386a0b87da2b..ea3e084b2af710dc54ed5bd99799a3c7ba8de0c4 100644 (file)
--- a/admin.php
+++ b/admin.php
@@ -2,6 +2,7 @@
 /*
  *  Jirafeau, your web file repository
  *  Copyright (C) 2015  Jerome Jutteau <jerome@jutteau.fr>
 /*
  *  Jirafeau, your web file repository
  *  Copyright (C) 2015  Jerome Jutteau <jerome@jutteau.fr>

+ *  Copyright (C) 2023  Blackeye <blackeye@blackeyeprojects.de>

  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU Affero General Public License as
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU Affero General Public License as


@@ -64,7 +65,8 @@ if (php_sapi_name() == "cli") {
     if (!jirafeau_admin_session_logged()) {
         /* Test HTTP authentication. */
         if (!empty($cfg['admin_http_auth_user']) &&
     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. */
             jirafeau_admin_session_start();
         }
         /* Test web password authentication. */


@@ -120,6 +122,10 @@ if (php_sapi_name() == "cli") {
         require(JIRAFEAU_ROOT . 'lib/template/header.php'); ?><h2><?php echo t('ADMIN_INTERFACE'); ?></h2><?php
         ?><h2>(version <?php echo JIRAFEAU_VERSION ?>)</h2><?php
 
         require(JIRAFEAU_ROOT . 'lib/template/header.php'); ?><h2><?php echo t('ADMIN_INTERFACE'); ?></h2><?php
         ?><h2>(version <?php echo JIRAFEAU_VERSION ?>)</h2><?php
 

+        if ($cfg['enable_crypt'] && !(extension_loaded('sodium'))) {
+            echo '<div class="error"><p>'.t('SODIUM_UNAVAILABLE').'</p></div>';
+        }
+

         ?><div id = "admin">
           <fieldset><legend><?php echo t('ACTIONS'); ?></legend>
           <table>
         ?><div id = "admin">
           <fieldset><legend><?php echo t('ACTIONS'); ?></legend>
           <table>