X-Git-Url: https://git.p6c8.net/jirafeau_mojo42.git/blobdiff_plain/91938ace0f73ee6bdfbc44956cd2e1652c9c8297..50f88df47f6d5b3cb5dc20fb2e9d3022862adbcf:/lib/settings.php?ds=sidebyside

diff --git a/lib/settings.php b/lib/settings.php
index 3a9f450..da0d9db 100644
--- a/lib/settings.php
+++ b/lib/settings.php
@@ -17,9 +17,24 @@
  *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-/* Jirafeau constants */
+global $cfg;
+
+// Read config files
+require (JIRAFEAU_ROOT . 'lib/config.original.php');
+if (file_exists(JIRAFEAU_ROOT . 'lib/config.local.php'))
+{
+	// read local copy and merge with original values
+	$cfgOriginal = $cfg;
+	require (JIRAFEAU_ROOT . 'lib/config.local.php');
+	$cfg = array_merge($cfgOriginal, $cfg);
+	unset($cfgOriginal);
+}
+
+// Set constants
+
+/* Jirafeau package */
 define ('JIRAFEAU_PACKAGE', 'Jirafeau');
-define ('JIRAFEAU_VERSION', '1.2.0');
+define ('JIRAFEAU_VERSION', '2.0.0');
 
 /* Directories. */
 define ('VAR_FILES', $cfg['var_root'] . 'files/');
@@ -28,8 +43,12 @@ define ('VAR_ASYNC', $cfg['var_root'] . 'async/');
 define ('VAR_ALIAS', $cfg['var_root'] . 'alias/');
 
 /* Useful constants. */
-if (!defined ('NL'))
+if (!defined ('NL')) {
     define ('NL', "\n");
+}
+if (!defined ('QUOTE')) {
+    define ('QUOTE', "'");
+}
 
 define ('JIRAFEAU_INFINITY', -1);
 define ('JIRAFEAU_MINUTE', 60); // 60
@@ -39,5 +58,3 @@ 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
-
-?>