From: Dan Untenzu <untenzu@webit.de>
Date: Wed, 18 Jan 2017 17:11:23 +0000 (+0100)
Subject: [FEATURE] Remove redundant constants
X-Git-Tag: 3.0.0~27
X-Git-Url: https://git.p6c8.net/jirafeau.git/commitdiff_plain/c147db2590b6add287eac571b1ce751be734b2ea

[FEATURE] Remove redundant constants

Remove some redundant settings
---

diff --git a/install.php b/install.php
index df4f106..2d7afd9 100644
--- a/install.php
+++ b/install.php
@@ -18,8 +18,7 @@
  *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 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);
 
diff --git a/lib/settings.php b/lib/settings.php
index d619637..da0d9db 100644
--- a/lib/settings.php
+++ b/lib/settings.php
@@ -30,7 +30,9 @@ if (file_exists(JIRAFEAU_ROOT . 'lib/config.local.php'))
 	unset($cfgOriginal);
 }
 
-/* Jirafeau constants */
+// Set constants
+
+/* Jirafeau package */
 define ('JIRAFEAU_PACKAGE', 'Jirafeau');
 define ('JIRAFEAU_VERSION', '2.0.0');
 
@@ -41,8 +43,12 @@ 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");
+}
+if (!defined ('QUOTE')) {
+    define ('QUOTE', "'");
+}
 
 define ('JIRAFEAU_INFINITY', -1);
 define ('JIRAFEAU_MINUTE', 60); // 60
@@ -52,7 +58,3 @@ 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
-
-
-
-?>