Allow multiple usernames when using HTTP authentication for the admin interface

[jirafeau.git] / lib / settings.php

diff --git a/lib/settings.php b/lib/settings.php
index 1109d9ab64d4ebecab8aa65a13dc34a25e3ef516..e3399fd937c1c4cc25e1da8c69dc4fd1fc6ccc64 100644 (file)
--- a/lib/settings.php
+++ b/lib/settings.php
@@ -29,11 +29,19 @@ if (file_exists(JIRAFEAU_ROOT . 'lib/config.local.php')) {
     unset($cfgOriginal);
 }
 
     unset($cfgOriginal);
 }
 

+// Setup debug mode
+if ($cfg['debug'] === true) {
+    @error_reporting(E_ALL);
+} else {
+    @error_reporting(0);
+}
+
+

 // Set constants
 
 /* Jirafeau package */
 define('JIRAFEAU_PACKAGE', 'Jirafeau');
 // Set constants
 
 /* Jirafeau package */
 define('JIRAFEAU_PACKAGE', 'Jirafeau');

-define('JIRAFEAU_VERSION', '3.2.1');
+define('JIRAFEAU_VERSION', '4.5.0');

 
 /* Directories. */
 define('VAR_FILES', $cfg['var_root'] . 'files/');
 
 /* Directories. */
 define('VAR_FILES', $cfg['var_root'] . 'files/');


@@ -44,7 +52,7 @@ define('VAR_ASYNC', $cfg['var_root'] . 'async/');
 // root of the domain without handling the URL scheme
 $absPrefix = parse_url($cfg['web_root'], PHP_URL_PATH);
 if (true === empty($absPrefix)) {
 // root of the domain without handling the URL scheme
 $absPrefix = parse_url($cfg['web_root'], PHP_URL_PATH);
 if (true === empty($absPrefix)) {

-    // fallback if installation isnt done yet: relative links to same level on the current page
+    // fallback if installation isn't done yet: relative links to same level on the current page

     $absPrefix = './';
 }
 define('JIRAFEAU_ABSPREFIX', $absPrefix);
     $absPrefix = './';
 }
 define('JIRAFEAU_ABSPREFIX', $absPrefix);


@@ -62,9 +70,28 @@ define('JIRAFEAU_MINUTE', 60); // 60
 define('JIRAFEAU_HOUR', 3600); // JIRAFEAU_MINUTE * 60
 define('JIRAFEAU_DAY', 86400); // JIRAFEAU_HOUR * 24
 define('JIRAFEAU_WEEK', 604800); // JIRAFEAU_DAY * 7
 define('JIRAFEAU_HOUR', 3600); // JIRAFEAU_MINUTE * 60
 define('JIRAFEAU_DAY', 86400); // JIRAFEAU_HOUR * 24
 define('JIRAFEAU_WEEK', 604800); // JIRAFEAU_DAY * 7

-define('JIRAFEAU_MONTH', 2419200); // JIRAFEAU_WEEK * 4
-define('JIRAFEAU_QUARTER', 7257600); // JIRAFEAU_MONTH * 3
-define('JIRAFEAU_YEAR', 29030400); // JIRAFEAU_MONTH * 12
+define('JIRAFEAU_FORTNIGHT', 1209600); // JIRAFEAU_WEEK * 2
+define('JIRAFEAU_MONTH', 2592000); // JIRAFEAU_DAY * 30
+define('JIRAFEAU_QUARTER', 7776000); // JIRAFEAU_DAY * 90
+define('JIRAFEAU_YEAR', 31536000); // JIRAFEAU_DAY * 365
+
+define('JIRAFEAU_SODIUM_CHUNKSIZE', 1024);
+
+// Define some Sodium constants from newer PHP versions if they are not available
+
+if (extension_loaded('sodium')) {
+    if (!defined('SODIUM_CRYPTO_STREAM_XCHACHA20_KEYBYTES')) {
+        define('SODIUM_CRYPTO_STREAM_XCHACHA20_KEYBYTES', 32);
+    }
+
+    if (!defined('SODIUM_CRYPTO_SECRETSTREAM_XCHACHA20POLY1305_HEADERBYTES')) {
+        define('SODIUM_CRYPTO_SECRETSTREAM_XCHACHA20POLY1305_HEADERBYTES', 24);
+    }
+
+    if (!defined('SODIUM_CRYPTO_SECRETSTREAM_XCHACHA20POLY1305_ABYTES')) {
+        define('SODIUM_CRYPTO_SECRETSTREAM_XCHACHA20POLY1305_ABYTES', 17);
+    }
+}

 
 // set UTC as default timezone for all date/time functions
 
 // set UTC as default timezone for all date/time functions

-date_default_timezone_set ('UTC');
+date_default_timezone_set('UTC');