From 7e04bdff6d8c7a11afde4b333b9791f59f43bc6d Mon Sep 17 00:00:00 2001
From: Olivier PEREZ <olivier@olivierperez.fr>
Date: Sat, 17 Jan 2015 16:47:10 +0100
Subject: [PATCH] Split constants.php in 2 files: constants.php + config.php

---
 .gitignore                                    |  2 +-
 ...tants.php.template => config.template.php} | 20 ---------
 app/inc/constants.php                         | 42 +++++++++++++++++++
 app/inc/init.php                              |  1 +
 4 files changed, 44 insertions(+), 21 deletions(-)
 rename app/inc/{constants.php.template => config.template.php} (80%)
 create mode 100644 app/inc/constants.php

diff --git a/.gitignore b/.gitignore
index 556e7bc..580102f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,7 +4,7 @@ admin/logs_studs.txt
 composer.phar
 framanav
 nav
-app/inc/constants.php
+app/inc/config.php
 vendor
 cache/
 tpl_c/
diff --git a/app/inc/constants.php.template b/app/inc/config.template.php
similarity index 80%
rename from app/inc/constants.php.template
rename to app/inc/config.template.php
index 7d733cd..c840737 100644
--- a/app/inc/constants.php.template
+++ b/app/inc/config.template.php
@@ -17,9 +17,6 @@
  * Auteurs de Framadate/OpenSondage : Framasoft (https://github.com/framasoft)
  */
 
-// FRAMADATE version
-const VERSION = '0.9.1';
-
 // Application name
 const NOMAPPLICATION = '<Application name>';
 
@@ -55,12 +52,6 @@ $ALLOWED_LANGUAGES = [
     'de_DE' => 'Deutsch',
 ];
 
-// Regex
-const POLL_REGEX = '/^[a-z0-9]+$/';
-const CHOICE_REGEX = '/^[012]$/';
-const NAME_REGEX = '/^[áàâäãåçéèêëíìîïñóòôöõúùûüýÿæœa-z0-9_ -]+$/i';
-const BOOLEAN_REGEX = '/^(on|off|true|false|1|0)$/';
-
 // Path to logo
 const LOGOBANDEAU = '<relative path to the logo file>';
 
@@ -79,17 +70,6 @@ const USE_REMOTE_USER =  true;
 // Path to the log file
 const LOG_FILE = 'admin/stdout.log';
 
-const COMMENT_EMPTY         = 0x0000000001;
-const COMMENT_USER_EMPTY    = 0x0000000010;
-const COMMENT_INSERT_FAILED = 0x0000000100;
-const NAME_EMPTY            = 0x0000001000;
-const NAME_TAKEN            = 0x0000010000;
-const NO_POLL               = 0x0000100000;
-const NO_POLL_ID            = 0x0001000000;
-const INVALID_EMAIL         = 0x0010000000;
-const TITLE_EMPTY           = 0x0100000000;
-const INVALID_DATE          = 0x1000000000;
-
 // Config
 $config = [
     /* general config */
diff --git a/app/inc/constants.php b/app/inc/constants.php
new file mode 100644
index 0000000..f395541
--- /dev/null
+++ b/app/inc/constants.php
@@ -0,0 +1,42 @@
+<?php
+/**
+ * This software is governed by the CeCILL-B license. If a copy of this license
+ * is not distributed with this file, you can obtain one at
+ * http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.txt
+ *
+ * Authors of STUdS (initial project): Guilhem BORGHESI (borghesi@unistra.fr) and Raphaël DROZ
+ * Authors of Framadate/OpenSondate: Framasoft (https://github.com/framasoft)
+ *
+ * =============================
+ *
+ * Ce logiciel est régi par la licence CeCILL-B. Si une copie de cette licence
+ * ne se trouve pas avec ce fichier vous pouvez l'obtenir sur
+ * http://www.cecill.info/licences/Licence_CeCILL-B_V1-fr.txt
+ *
+ * Auteurs de STUdS (projet initial) : Guilhem BORGHESI (borghesi@unistra.fr) et Raphaël DROZ
+ * Auteurs de Framadate/OpenSondage : Framasoft (https://github.com/framasoft)
+ */
+
+// FRAMADATE version
+const VERSION = '0.9.1';
+
+// Regex
+const POLL_REGEX = '/^[a-z0-9]+$/';
+const CHOICE_REGEX = '/^[012]$/';
+const NAME_REGEX = '/^[áàâäãåçéèêëíìîïñóòôöõúùûüýÿæœa-z0-9_ -]+$/i';
+const BOOLEAN_REGEX = '/^(on|off|true|false|1|0)$/';
+
+// CSRF (300s = 5min)
+const TOKEN_TIME = 300;
+
+// Errors
+const COMMENT_EMPTY         = 0x0000000001;
+const COMMENT_USER_EMPTY    = 0x0000000010;
+const COMMENT_INSERT_FAILED = 0x0000000100;
+const NAME_EMPTY            = 0x0000001000;
+const NAME_TAKEN            = 0x0000010000;
+const NO_POLL               = 0x0000100000;
+const NO_POLL_ID            = 0x0001000000;
+const INVALID_EMAIL         = 0x0010000000;
+const TITLE_EMPTY           = 0x0100000000;
+const INVALID_DATE          = 0x1000000000;
diff --git a/app/inc/init.php b/app/inc/init.php
index 42c46c1..7f3f4d0 100644
--- a/app/inc/init.php
+++ b/app/inc/init.php
@@ -32,6 +32,7 @@ if (ini_get('date.timezone') == '') {
 define('ROOT_DIR', __DIR__ . '/../../');
 
 require_once __DIR__ . '/constants.php';
+require_once __DIR__ . '/config.php';
 require_once __DIR__ . '/i18n.php';
 
 // Smarty