deleted local_setting from php

[jirafeau_project.git] / lib / settings.php

diff --git a/lib/settings.php b/lib/settings.php
index ec348cdd301f4b4014e19605f1c5ed61c9f2825c..494dfd28f896314022e3a6cfb826835ae8840ea7 100644 (file)
--- a/lib/settings.php
+++ b/lib/settings.php
@@ -41,7 +41,9 @@ if ($cfg['debug'] === true) {
 
 /* Jirafeau package */
 define('JIRAFEAU_PACKAGE', 'Jirafeau');
 
 /* Jirafeau package */
 define('JIRAFEAU_PACKAGE', 'Jirafeau');

-define('JIRAFEAU_VERSION', '4.5.0');
+define('JIRAFEAU_VERSION', '4.6.x-dev');
+
+define('JIRAFEAU_WEBSITE', 'https://gitlab.com/jirafeau/Jirafeau');

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


@@ -75,20 +77,25 @@ define('JIRAFEAU_MONTH', 2592000); // JIRAFEAU_DAY * 30
 define('JIRAFEAU_QUARTER', 7776000); // JIRAFEAU_DAY * 90
 define('JIRAFEAU_YEAR', 31536000); // JIRAFEAU_DAY * 365
 
 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
 
 define('JIRAFEAU_SODIUM_CHUNKSIZE', 1024);
 
 // Define some Sodium constants from newer PHP versions if they are not available
 

-if (!defined('SSODIUM_CRYPTO_STREAM_XCHACHA20_KEYBYTES')) {
-    define('SODIUM_CRYPTO_STREAM_XCHACHA20_KEYBYTES', 32);
-}
+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_HEADERBYTES')) {
+        define('SODIUM_CRYPTO_SECRETSTREAM_XCHACHA20POLY1305_HEADERBYTES', 24);
+    }

 
 

-if (!defined('SODIUM_CRYPTO_SECRETSTREAM_XCHACHA20POLY1305_ABYTES')) {
-    define('SODIUM_CRYPTO_SECRETSTREAM_XCHACHA20POLY1305_ABYTES', 17);
+    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