X-Git-Url: https://git.p6c8.net/jirafeau_mojo42.git/blobdiff_plain/af7e43a4a3bbcb62912eabd75537480bf696b265..4d41ec577bd1d9e0f48f09a2a4a6d6cab2db4bc5:/lib/settings.php

diff --git a/lib/settings.php b/lib/settings.php
index 3795122..33c76da 100644
--- a/lib/settings.php
+++ b/lib/settings.php
@@ -21,15 +21,20 @@ 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);
 }
 
-/* Jirafeau constants */
+// 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/');
@@ -37,9 +42,22 @@ define ('VAR_LINKS', $cfg['var_root'] . 'links/');
 define ('VAR_ASYNC', $cfg['var_root'] . 'async/');
 define ('VAR_ALIAS', $cfg['var_root'] . 'alias/');
 
+// helping variable to build absolute link to
+// 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
+	$absPrefix = './';
+}
+define ('JIRAFEAU_ABSPREFIX', $absPrefix);
+
 /* 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
@@ -49,7 +67,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
-
-
-
-?>