Merge branch 'master' into next-release

[jirafeau.git] / lib / settings.php

diff --git a/lib/settings.php b/lib/settings.php
index 7449dc694706e456115375702c7797224a788dea..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,12 +77,15 @@ 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
 
 if (extension_loaded('sodium')) {
 define('JIRAFEAU_SODIUM_CHUNKSIZE', 1024);
 
 // Define some Sodium constants from newer PHP versions if they are not available
 
 if (extension_loaded('sodium')) {

-    if (!defined('SSODIUM_CRYPTO_STREAM_XCHACHA20_KEYBYTES')) {
+    if (!defined('SODIUM_CRYPTO_STREAM_XCHACHA20_KEYBYTES')) {

         define('SODIUM_CRYPTO_STREAM_XCHACHA20_KEYBYTES', 32);
     }
 
         define('SODIUM_CRYPTO_STREAM_XCHACHA20_KEYBYTES', 32);
     }