[FEATURE] Remove redundant constants

[jirafeau_project.git] / lib / settings.php

diff --git a/lib/settings.php b/lib/settings.php
index a54a3a7528e9a6bd118ee5155e6bdb360f36d19e..da0d9db5227a69eb3922cf9ed97130e2d4a7d01c 100644 (file)
--- a/lib/settings.php
+++ b/lib/settings.php
@@ -14,39 +14,47 @@
  *  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/');
-define('VAR_TRASH', $cfg['var_root'] . 'trash/');
-
-// i18n
-
-setlocale(LC_ALL, $cfg['lang']);
+global $cfg;
+
+// Read config files
+require (JIRAFEAU_ROOT . 'lib/config.original.php');
+if (file_exists(JIRAFEAU_ROOT . 'lib/config.local.php'))
+{
+       // read local copy and merge with original values
+       $cfgOriginal = $cfg;
+       require (JIRAFEAU_ROOT . 'lib/config.local.php');
+       $cfg = array_merge($cfgOriginal, $cfg);
+       unset($cfgOriginal);
+}

 
 

-bindtextdomain(JIRAFEAU_PACKAGE, JIRAFEAU_ROOT . 'lib/locale');
-textdomain(JIRAFEAU_PACKAGE);
+// Set constants

 
 

+/* Jirafeau package */
+define ('JIRAFEAU_PACKAGE', 'Jirafeau');
+define ('JIRAFEAU_VERSION', '2.0.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/');

 
 

-if(!defined('NL')) {
-  define('NL', "\n");
+/* Useful constants. */
+if (!defined ('NL')) {
+    define ('NL', "\n");
+}
+if (!defined ('QUOTE')) {
+    define ('QUOTE', "'");

 }
 
 }
 

-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_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_QUARTER', 7257600); // JIRAFEAU_MONTH * 3
+define ('JIRAFEAU_YEAR', 29030400); // JIRAFEAU_MONTH * 12