Merge remote-tracking branch 'origin/master'

[jirafeau_project.git] / lib / settings.php

diff --git a/lib/settings.php b/lib/settings.php
index 46f7c51cd1504b96e77a12fd705cc7534e7850c0..3812e635f06fd069bb86eb5a4c7ed8f6baa5e439 100644 (file)
--- a/lib/settings.php
+++ b/lib/settings.php
@@ -24,6 +24,7 @@ define ('JIRAFEAU_VERSION', '1.0');
 define ('VAR_FILES', $cfg['var_root'] . 'files/');
 define ('VAR_LINKS', $cfg['var_root'] . 'links/');
 define ('VAR_ASYNC', $cfg['var_root'] . 'async/');
 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'))
 
 /* Useful constants. */
 if (!defined ('NL'))


@@ -35,6 +36,6 @@ 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_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_YEAR', 29030400); // JIRAFEAU_MONTH * 12

 
 ?>
 
 ?>