X-Git-Url: https://git.p6c8.net/jirafeau_mojo42.git/blobdiff_plain/f58031f40640cc7c243a32d2c3515210ef4ed282..7f61e026f87a7f731fc915581b720a17756aa054:/lib/settings.php diff --git a/lib/settings.php b/lib/settings.php index 46f7c51..d619637 100644 --- a/lib/settings.php +++ b/lib/settings.php @@ -14,16 +14,31 @@ * 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/'); define ('VAR_LINKS', $cfg['var_root'] . 'links/'); define ('VAR_ASYNC', $cfg['var_root'] . 'async/'); +define ('VAR_ALIAS', $cfg['var_root'] . 'alias/'); /* Useful constants. */ if (!defined ('NL')) @@ -35,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_MONTH', 29030400); // JIRAFEAU_MONTH * 12 +define ('JIRAFEAU_QUARTER', 7257600); // JIRAFEAU_MONTH * 3 +define ('JIRAFEAU_YEAR', 29030400); // JIRAFEAU_MONTH * 12 + + ?>