DEBUG mode now relies on config.xml

This commit is contained in:
nemunaire 2015-01-14 10:56:08 +01:00 committed by Nemunaire
parent 64219a693d
commit ec33842949
4 changed files with 14 additions and 6 deletions

View File

@ -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

View File

@ -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");

View File

@ -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>

View File

@ -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");