[FEATURE] Move config include into settings file

Move the include of the original and the local
configuration file into the settings file to reduce one
includes in each file, have all settings in one place
and remove unneccessary code from the config file
(which makes it easier to copy and change it).

diff --git a/admin.php b/admin.php
index cb6058036bee37b11b8ada637b07e71d5fd028f6..d602dcda96f989745df8f3ba820570c73648ca2e 100644 (file)
--- a/admin.php
+++ b/admin.php
@@ -19,7 +19,6 @@
 
 define ('JIRAFEAU_ROOT', dirname (__FILE__) . '/');
 
-require (JIRAFEAU_ROOT . 'lib/config.original.php');
 require (JIRAFEAU_ROOT . 'lib/settings.php');
 require (JIRAFEAU_ROOT . 'lib/functions.php');
 require (JIRAFEAU_ROOT . 'lib/lang.php');

diff --git a/f.php b/f.php
index 02186024fa0873a1554ef98458ba1dfe2b7329c4..a97718f9387a4ddd11f8d0563ee58ef4a11a57b3 100644 (file)
--- a/f.php
+++ b/f.php
@@ -19,10 +19,9 @@
  */
 define ('JIRAFEAU_ROOT', dirname (__FILE__) . '/');
 
-require (JIRAFEAU_ROOT . 'lib/lang.php');
-require (JIRAFEAU_ROOT . 'lib/config.original.php');
 require (JIRAFEAU_ROOT . 'lib/settings.php');
 require (JIRAFEAU_ROOT . 'lib/functions.php');
+require (JIRAFEAU_ROOT . 'lib/lang.php');
 
 if (!isset ($_GET['h']) || empty ($_GET['h']))
 {

diff --git a/index.php b/index.php
index 4371e9e0e5fb475002fa0fdc08a139d9b218f02e..2002ad7d05ee539184f5dd4b825b1279116eb5bb 100644 (file)
--- a/index.php
+++ b/index.php
@@ -20,7 +20,6 @@
  */
 define ('JIRAFEAU_ROOT', dirname (__FILE__) . '/');
 
-require (JIRAFEAU_ROOT . 'lib/config.original.php');
 require (JIRAFEAU_ROOT . 'lib/settings.php');
 require (JIRAFEAU_ROOT . 'lib/functions.php');
 require (JIRAFEAU_ROOT . 'lib/lang.php');

diff --git a/install.php b/install.php
index b96593e67bb4983d470fba8029470fccf0eac521..51cf7b8268a07aa85b6d1014bfb6c3846199c3f9 100644 (file)
--- a/install.php
+++ b/install.php
@@ -20,11 +20,9 @@
 define ('JIRAFEAU_ROOT', dirname (__FILE__) . '/');
 define ('NL', "\n");
 define ('QUOTE', "'");
-
 define ('JIRAFEAU_CFG', JIRAFEAU_ROOT.'lib/config.local.php');
 define ('JIRAFEAU_VAR_RAND_LENGTH', 15);
 
-require (JIRAFEAU_ROOT . 'lib/config.original.php');
 require (JIRAFEAU_ROOT . 'lib/settings.php');
 require (JIRAFEAU_ROOT . 'lib/functions.php');
 require (JIRAFEAU_ROOT . 'lib/lang.php');

diff --git a/lib/config.original.php b/lib/config.original.php
index 6a5c1babada2672941538f0177b034b8023e60fb..30ec13495d56ba5d1670c4aa2e690b61f4eb6edb 100644 (file)
--- a/lib/config.original.php
+++ b/lib/config.original.php
@@ -24,7 +24,6 @@
  * To overwrite these settings copy the file,
  * rename it to »config.local.php« and adapt the parameters.
  **/
-global $cfg;
 
 /* URL of installation, with traling slash (eg. »https://exmaple.com/jirafeau/«)
  */
@@ -133,11 +132,4 @@ $cfg['proxy_ip'] = array();
  */
 $cfg['installation_done'] = false;
 
-/* Try to include user's local configuration. */
-if ((basename (__FILE__) != 'config.local.php')
-    && file_exists (JIRAFEAU_ROOT.'lib/config.local.php'))
-{
-    require (JIRAFEAU_ROOT.'lib/config.local.php');
-}
-
-?>
+?>
\ No newline at end of file

diff --git a/lib/functions.js.php b/lib/functions.js.php
index 7a1c5af373dc17691f2981f7e9f245be4477b629..31cefe3f6359616ac9330ff13fe2885e56e1c99b 100644 (file)
--- a/lib/functions.js.php
+++ b/lib/functions.js.php
@@ -21,7 +21,7 @@
 header('Content-Type: text/javascript');
 
 define ('JIRAFEAU_ROOT', dirname (__FILE__) . '/../');
-require (JIRAFEAU_ROOT . 'lib/config.original.php');
+
 require (JIRAFEAU_ROOT . 'lib/settings.php');
 require (JIRAFEAU_ROOT . 'lib/functions.php');
 require (JIRAFEAU_ROOT . 'lib/lang.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/>.
  */
 
+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');
@@ -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
 
+
+
 ?>

diff --git a/script.php b/script.php
index 5e02456e3f5346415135d35071e4461970515d89..c3b722f82518bd1a479ee025fd5819ad7a500aa6 100644 (file)
--- a/script.php
+++ b/script.php
@@ -22,10 +22,8 @@
  * If you don't want this feature, you can simply delete this file from your
  * web directory.
  */
-
 define ('JIRAFEAU_ROOT', dirname (__FILE__) . '/');
 
-require (JIRAFEAU_ROOT . 'lib/config.original.php');
 require (JIRAFEAU_ROOT . 'lib/settings.php');
 require (JIRAFEAU_ROOT . 'lib/functions.php');
 require (JIRAFEAU_ROOT . 'lib/lang.php');

diff --git a/tos.php b/tos.php
index 111916dafa0e2c033955e514851d31e3714e1469..c5e4307f63a073623bcc0f90e3c51df650b31b0b 100644 (file)
--- a/tos.php
+++ b/tos.php
@@ -17,10 +17,10 @@
  */\r
 \r
 define ('JIRAFEAU_ROOT', dirname (__FILE__) . '/');\r
-require (JIRAFEAU_ROOT . 'lib/config.original.php');\r
 require (JIRAFEAU_ROOT . 'lib/settings.php');\r
 require (JIRAFEAU_ROOT . 'lib/functions.php');\r
 require (JIRAFEAU_ROOT . 'lib/lang.php');\r
+\r
 require (JIRAFEAU_ROOT . 'lib/template/header.php');\r
 \r
 $url = $cfg['web_root'] . 'tos.php';\r
@@ -39,5 +39,7 @@ echo $tos;
 echo '</textarea>';\r
 echo '<p>This license text is under <a href="http://creativecommons.org/licenses/by/3.0/">Creative Commons - Attribution 3.0 Unported</a>.</p><p>It has been based on this work: <a href="http://opensource.org/ToS">http://opensource.org/ToS</a></p>';\r
 echo '</div>';\r
+\r
 require (JIRAFEAU_ROOT . 'lib/template/footer.php');\r
-?>\r
+\r
+?>
\ No newline at end of file