X-Git-Url: https://git.p6c8.net/jirafeau_project.git/blobdiff_plain/28606cf6b85459d37b0b4e45a6114eced94fcf4c..6a04487fc7086450c76a7f846019113063550a65:/lib/settings.php?ds=sidebyside

diff --git a/lib/settings.php b/lib/settings.php
index bd71f59..33c76da 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.1');
+define ('JIRAFEAU_VERSION', '2.0.0');
 
 /* Directories. */
 define ('VAR_FILES', $cfg['var_root'] . 'files/');
@@ -27,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
@@ -39,5 +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
-
-?>