define environment in config file

index.php

@@ -36,9 +36,19 @@
  * using massively asynchronous javascript and abstracting XMPP calls into an
  * events-based API.
  */
-define('ENVIRONMENT','prod');
+
+/**
+* BOOTSTRAP
+**/
 define('ROOTDIR',  dirname(__FILE__));
-if (ENVIRONMENT === 'debug') {
+require_once(ROOTDIR.'/system/Utils.php');
+require_once(ROOTDIR.'/system/Conf.php');
+try {
+    define('ENVIRONMENT',Conf::getServerConfElement('environment'));
+} catch (Exception $e) {
+//    define('ENVIRONMENT','production');//default environment is production
+}
+if (ENVIRONMENT === 'development') {
     ini_set('log_errors', 0);
     ini_set('display_errors', 1);
     ini_set('error_reporting', E_ALL ^ E_DEPRECATED ^ E_NOTICE);
@@ -60,7 +70,6 @@ WidgetWrapper::getInstance(false);
 
 // Closing stuff
 WidgetWrapper::destroyInstance();
-if (ENVIRONMENT === 'debug') {
+if (ENVIRONMENT === 'development') {
     echo Logger::displayLog();
-   
 }

infos.php

@@ -17,9 +17,31 @@
  */
 
 // We load the Movim kernel
-define('ENVIRONMENT','debug');
+/**
+* BOOTSTRAP
+**/
 define('ROOTDIR',  dirname(__FILE__));
-require_once("init.php");
+require_once(ROOTDIR.'/system/Utils.php');
+require_once(ROOTDIR.'/system/Conf.php');
+try {
+    define('ENVIRONMENT',Conf::getServerConfElement('environment'));
+} catch (Exception $e) {
+    define('ENVIRONMENT','production');//default environment is production
+}
+if (ENVIRONMENT === 'development') {
+    ini_set('log_errors', 0);
+    ini_set('display_errors', 1);
+    ini_set('error_reporting', E_ALL ^ E_DEPRECATED ^ E_NOTICE);
+} else {
+    ini_set('log_errors', 1);
+    ini_set('display_errors', 0);
+    ini_set('error_reporting', E_ALL ^ E_DEPRECATED ^ E_NOTICE);
+}
+ini_set('error_log', ROOTDIR.'/log/php.log');
+
+// Run
+require_once('init.php');
+
   
 // We get the informations
 $pop = 0;

jajax.php

@@ -15,14 +15,24 @@
  * 
  * See the file `COPYING' for licensing information.
  */
-define('ENVIRONMENT','debug');
+/**
+* BOOTSTRAP
+**/
 define('ROOTDIR',  dirname(__FILE__));
+require_once(ROOTDIR.'/system/Utils.php');
+require_once(ROOTDIR.'/system/Conf.php');
+try {
+    define('ENVIRONMENT',Conf::getServerConfElement('environment'));
+} catch (Exception $e) {
+    define('ENVIRONMENT','production');//default environment is production
+}
 ini_set('log_errors', 1);
 ini_set('display_errors', 0);
 ini_set('error_reporting', E_ALL ^ E_DEPRECATED ^ E_NOTICE);
 ini_set('error_log', ROOTDIR.'/log/php.log');
 
-require('init.php');
+// Run
+require_once('init.php');
 
 set_time_limit(200);
 

system/Conf.php

@@ -12,7 +12,7 @@ class Conf
     /* Return the general configuration */
 
     static function getServerConf() {
-        $conf_file = BASE_PATH . self::$conf_path . "/conf.xml";
+        $conf_file = ROOTDIR . self::$conf_path . "/conf.xml";
         return self::getConf('server', $conf_file);
     }
 
@@ -27,6 +27,7 @@ class Conf
         } else {
             // Return the default configuration
             return array(
+                'environment' => 'production',//allow "production" and "development" for the moment
                 'theme'     => 'movim',
                 'defLang'   => 'en',
                 'maxUsers'  => -1,
@@ -51,7 +52,6 @@ class Conf
 
     static function getServerConfElement($element) {
         $conf = self::getServerConf();
-
         if(!isset($conf[$element])) {
             throw new MovimException(t("Cannot load element value '%s'", $element));
         }

system/Logger.php

@@ -140,5 +140,14 @@ abstract class Logger
         self::$logs->addLog($msg);
 
     }
+    static function displayLog()
+    {
+        if (!isset(self::$logs)) {
+            self::$logs = new Logs();
+        }
+        self::$logs->displayLog();
 
-}
+
+    }
+
+}

upload.php

@@ -1,6 +1,22 @@
 <?php
+/**
+* BOOTSTRAP
+**/
+define('ROOTDIR',  dirname(__FILE__));
+require_once(ROOTDIR.'/system/Utils.php');
+require_once(ROOTDIR.'/system/Conf.php');
+try {
+    define('ENVIRONMENT',Conf::getServerConfElement('environment'));
+} catch (Exception $e) {
+    define('ENVIRONMENT','production');//default environment is production
+}
+ini_set('log_errors', 1);
+ini_set('display_errors', 0);
+ini_set('error_reporting', E_ALL ^ E_DEPRECATED ^ E_NOTICE);
+ini_set('error_log', ROOTDIR.'/log/php.log');
 
-require('init.php');
+// Run
+require_once('init.php');
 
 function bytesToSize1024($bytes, $precision = 2) {
     $unit = array('B','KB','MB');