[FEATURE] Remove redundant constants

[jirafeau_mojo42.git] / lib / settings.php

diff --git a/lib/settings.php b/lib/settings.php
index 37951221130c3bcb5171011d54b3a658267e7b88..da0d9db5227a69eb3922cf9ed97130e2d4a7d01c 100644 (file)
--- a/lib/settings.php
+++ b/lib/settings.php
@@ -21,15 +21,20 @@ global $cfg;
 
 // Read config files
 require (JIRAFEAU_ROOT . 'lib/config.original.php');
 
 // Read config files
 require (JIRAFEAU_ROOT . 'lib/config.original.php');

-

 if (file_exists(JIRAFEAU_ROOT . 'lib/config.local.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');
        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_PACKAGE', 'Jirafeau');

-define ('JIRAFEAU_VERSION', '1.2.0');
+define ('JIRAFEAU_VERSION', '2.0.0');

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


@@ -38,8 +43,12 @@ define ('VAR_ASYNC', $cfg['var_root'] . 'async/');
 define ('VAR_ALIAS', $cfg['var_root'] . 'alias/');
 
 /* Useful constants. */
 define ('VAR_ALIAS', $cfg['var_root'] . 'alias/');
 
 /* Useful constants. */

-if (!defined ('NL'))
+if (!defined ('NL')) {

     define ('NL', "\n");
     define ('NL', "\n");

+}
+if (!defined ('QUOTE')) {
+    define ('QUOTE', "'");
+}

 
 define ('JIRAFEAU_INFINITY', -1);
 define ('JIRAFEAU_MINUTE', 60); // 60
 
 define ('JIRAFEAU_INFINITY', -1);
 define ('JIRAFEAU_MINUTE', 60); // 60


@@ -49,7 +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
 define ('JIRAFEAU_MONTH', 2419200); // JIRAFEAU_WEEK * 4
 define ('JIRAFEAU_QUARTER', 7257600); // JIRAFEAU_MONTH * 3
 define ('JIRAFEAU_YEAR', 29030400); // JIRAFEAU_MONTH * 12

-
-
-
-?>