[FEATURE] Move config include into settings file

[jirafeau.git] / lib / settings.php

diff --git a/lib/settings.php b/lib/settings.php
index afd16c8c810237ed759b935dd6dae24128920754..37951221130c3bcb5171011d54b3a658267e7b88 100644 (file)
--- a/lib/settings.php
+++ b/lib/settings.php
@@ -14,37 +14,42 @@
  *  GNU Affero General Public License for more details.
  *
  *  You should have received a copy of the GNU Affero General Public License
  *  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/>.

  */
  */

-// Jirafeau constants
-define ('JIRAFEAU_PACKAGE', 'Jirafeau');
-define ('JIRAFEAU_VERSION', '0.4');
-
-// directories

 
 

-define ('VAR_FILES', $cfg['var_root'] . 'files/');
-define ('VAR_LINKS', $cfg['var_root'] . 'links/');
+global $cfg;

 
 

-// i18n
+// Read config files
+require (JIRAFEAU_ROOT . 'lib/config.original.php');

 
 

-setlocale (LC_ALL, $cfg['lang']);
-
-bindtextdomain (JIRAFEAU_PACKAGE, JIRAFEAU_ROOT.'lib/locale');
-textdomain (JIRAFEAU_PACKAGE);
+if (file_exists(JIRAFEAU_ROOT . 'lib/config.local.php'))
+{
+       require (JIRAFEAU_ROOT . 'lib/config.local.php');
+}

 
 

+/* Jirafeau constants */
+define ('JIRAFEAU_PACKAGE', 'Jirafeau');
+define ('JIRAFEAU_VERSION', '1.2.0');

 
 

-// useful constants
+/* 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'))
 if (!defined ('NL'))

-{

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

-}

 
 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_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
+
+

 
 ?>
 
 ?>