X-Git-Url: https://git.p6c8.net/jirafeau_project.git/blobdiff_plain/9d77c0fe903db4f4ab2e3c6b5d5fc956f58c227d..814a694cd2782c11983433ba053111c4743d07f3:/lib/settings.php

diff --git a/lib/settings.php b/lib/settings.php
index c520412..2c2235a 100644
--- a/lib/settings.php
+++ b/lib/settings.php
@@ -30,17 +30,18 @@ if (file_exists(JIRAFEAU_ROOT . 'lib/config.local.php')) {
 }
 
 // Setup debug mode
-error_reporting(0);
-if ($cfg['debug'] === true)
-{
-    error_reporting(E_ALL);
+if ($cfg['debug'] === true) {
+    @error_reporting(E_ALL);
+} else {
+    @error_reporting(0);
 }
 
+
 // Set constants
 
 /* Jirafeau package */
 define('JIRAFEAU_PACKAGE', 'Jirafeau');
-define('JIRAFEAU_VERSION', '4.1.1');
+define('JIRAFEAU_VERSION', '4.6.0-beta');
 
 /* Directories. */
 define('VAR_FILES', $cfg['var_root'] . 'files/');
@@ -51,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)) {
-    // 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);
@@ -69,9 +70,31 @@ 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_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_USER_AUTH_BY_IP_NO_PASSWORD', 1);
+define('JIRAFEAU_USER_AUTH_BY_PASSWORD', 2);
+
+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
-date_default_timezone_set ('UTC');
+date_default_timezone_set('UTC');