git.p6c8.net
/
jirafeau.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Changed JIRAFEAU_VERSION so that we can identify that this is a development vesion
[jirafeau.git]
/
admin.php
diff --git
a/admin.php
b/admin.php
index ed9baad25a6ad7c44078143d573c386a0b87da2b..09bded527fa9ab6f59d204f537b39efaa150a756 100644
(file)
--- a/
admin.php
+++ b/
admin.php
@@
-64,7
+64,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
+121,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>
patrick-canterino.de