From ec33842949f38286aa7d80b7e494c6699fadd8d7 Mon Sep 17 00:00:00 2001
From: nemunaire <pomercier@novaquark.com>
Date: Wed, 14 Jan 2015 10:56:08 +0100
Subject: [PATCH] DEBUG mode now relies on config.xml

---
 entrypoint.sh               | 9 +++++++++
 htdocs/index.php            | 5 -----
 onyx/config/sample.root.xml | 2 +-
 onyx/include/common.php     | 4 ++++
 4 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/entrypoint.sh b/entrypoint.sh
index 365393fb..8cb86199 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -25,6 +25,15 @@ if(!defined('ONYX')) exit;
 EOF
 sed -i 's/"profile">sample</"profile">docker</' ${BASEDIR}/onyx/config/root.xml
 
+# Development version?
+if [ -n "$DEVELOPMENT" ]
+then
+    echo -e "\033[1;31mDEVELOPMENT version ENABLED\033[0m"
+    sed -i 's/<var name="development">0</<var name="development">1</' ${BASEDIR}/onyx/config/root.xml
+else
+    echo -e "\033[32mLaunched as PRODUCTION version\033[0m"
+fi
+
 # Generate hashed path for files
 echo 'Copying files...'
 ${BASEDIR}/gen_hash_link_files.sh --copy ${BASEDIR}/files-in ${BASEDIR}/files
diff --git a/htdocs/index.php b/htdocs/index.php
index 7b582646..12b80d19 100644
--- a/htdocs/index.php
+++ b/htdocs/index.php
@@ -6,11 +6,6 @@ define("SALT_PUBLIC", $VAR["prefix_public"]);
 define("SALT_USER", $VAR["prefix_teams"]);
 define("SALT_ADMIN", $VAR["prefix_admin"]);
 
-//On active le débogage si l'on est sur le domaine de debug
-
-//if ($_SERVER["SERVER_NAME"] == "localhost" || $_SERVER["SERVER_NAME"] == "fic" || $_SERVER["SERVER_NAME"] == "fic.nemunai.re" || $_SERVER["SERVER_NAME"] == "atlantis.chen.li")
-  define("DEBUG", true);
-
 //Chargement de tout le nécessaire pour le site
 require_once("common.php");
 
diff --git a/onyx/config/sample.root.xml b/onyx/config/sample.root.xml
index b77fa14a..f1bb2528 100644
--- a/onyx/config/sample.root.xml
+++ b/onyx/config/sample.root.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configs active="1" root="/var/www/fic-server/htdocs/" cache="1">
   <config match="index.php">
-    <var name="end_challenge">1386827772</var>
+    <var name="development">0</var>
     <var name="files_dir">/var/www/fic-server/files/</var>
     <var name="misc_dir">/var/www/fic-server/</var>
     <var name="submission_dir">/var/www/fic-server/submission/</var>
diff --git a/onyx/include/common.php b/onyx/include/common.php
index 80ca4622..9cf17c05 100644
--- a/onyx/include/common.php
+++ b/onyx/include/common.php
@@ -4,6 +4,10 @@ if(!defined('ONYX')) exit;
 if (empty($sess->values["connected"]) && !defined("xCSRF"))
   define("xCSRF", true);
 
+// Enable debugging in development environment
+if (!empty($VAR["development"]))
+    define("DEBUG", true);
+
 require_once("functions.php"); //Inclusion des principales fonctions
 
 require_once("common/Exercice.class.php");