X-Git-Url: https://git.p6c8.net/jirafeau.git/blobdiff_plain/d98c495abf51c2581b2d8b1edfc09004f5defcde..2f04c1bf329bc7c589308ffe5bc0adceb8f864cb:/lib/settings.php?ds=inline
diff --git a/lib/settings.php b/lib/settings.php
index 3812e63..d619637 100644
--- a/lib/settings.php
+++ b/lib/settings.php
@@ -14,11 +14,25 @@
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
+
+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 */
define ('JIRAFEAU_PACKAGE', 'Jirafeau');
-define ('JIRAFEAU_VERSION', '1.0');
+define ('JIRAFEAU_VERSION', '2.0.0');
/* Directories. */
define ('VAR_FILES', $cfg['var_root'] . 'files/');
@@ -36,6 +50,9 @@ define ('JIRAFEAU_HOUR', 3600); // JIRAFEAU_MINUTE * 60
define ('JIRAFEAU_DAY', 86400); // JIRAFEAU_HOUR * 24
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
+
+
?>