[FEATURE] Move config include into settings file

[jirafeau_project.git] / lib / settings.php

diff --git a/lib/settings.php b/lib/settings.php
index 3a9f450172471d1b9feb3a3216791145c387bc9b..37951221130c3bcb5171011d54b3a658267e7b88 100644 (file)
--- a/lib/settings.php
+++ b/lib/settings.php
@@ -17,6 +17,16 @@
  *  along with this program.  If not, see <https://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'))
+{
+       require (JIRAFEAU_ROOT . 'lib/config.local.php');
+}
+

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


@@ -40,4 +50,6 @@ define ('JIRAFEAU_MONTH', 2419200); // JIRAFEAU_WEEK * 4
 define ('JIRAFEAU_QUARTER', 7257600); // JIRAFEAU_MONTH * 3
 define ('JIRAFEAU_YEAR', 29030400); // JIRAFEAU_MONTH * 12
 
 define ('JIRAFEAU_QUARTER', 7257600); // JIRAFEAU_MONTH * 3
 define ('JIRAFEAU_YEAR', 29030400); // JIRAFEAU_MONTH * 12
 

+
+

 ?>
 ?>