X-Git-Url: https://git.p6c8.net/jirafeau.git/blobdiff_plain/6165f1ef9bf8abf6d07caff88f14a36f368832c6..a8d95768360edef46370b7581741bbf0edb40b4a:/lib/settings.php?ds=sidebyside

diff --git a/lib/settings.php b/lib/settings.php
index 477e9c7..3167414 100644
--- a/lib/settings.php
+++ b/lib/settings.php
@@ -14,15 +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 <http://www.gnu.org/licenses/>.
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
+
+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', '0.9');
+define ('JIRAFEAU_VERSION', '1.2.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'))
@@ -32,7 +48,11 @@ define ('JIRAFEAU_INFINITY', -1);
 define ('JIRAFEAU_MINUTE', 60); // 60
 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_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
+
+
 
 ?>