[FEATURE] Remove redundant constants

Remove some redundant settings

diff --git a/install.php b/install.php
index df4f106490992fa72623da13a484f7399e40b9c0..2d7afd986d008fdf268b17b5c8b35ef7244026c5 100644 (file)
--- 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__) . '/');
  *  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);
 
 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 d61963733efdc4ab7009a02c255649660c56b079..da0d9db5227a69eb3922cf9ed97130e2d4a7d01c 100644 (file)
--- a/lib/settings.php
+++ b/lib/settings.php
@@ -30,7 +30,9 @@ if (file_exists(JIRAFEAU_ROOT . 'lib/config.local.php'))
        unset($cfgOriginal);
 }
 
        unset($cfgOriginal);
 }
 

-/* Jirafeau constants */
+// Set constants
+
+/* Jirafeau package */

 define ('JIRAFEAU_PACKAGE', 'Jirafeau');
 define ('JIRAFEAU_VERSION', '2.0.0');
 
 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. */
 define ('VAR_ALIAS', $cfg['var_root'] . 'alias/');
 
 /* Useful constants. */

-if (!defined ('NL'))
+if (!defined ('NL')) {

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

+}
+if (!defined ('QUOTE')) {
+    define ('QUOTE', "'");
+}

 
 define ('JIRAFEAU_INFINITY', -1);
 define ('JIRAFEAU_MINUTE', 60); // 60
 
 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
 define ('JIRAFEAU_MONTH', 2419200); // JIRAFEAU_WEEK * 4
 define ('JIRAFEAU_QUARTER', 7257600); // JIRAFEAU_MONTH * 3
 define ('JIRAFEAU_YEAR', 29030400); // JIRAFEAU_MONTH * 12

-
-
-
-?>