From cf6d82d2326584bf9288ee04d12a1931c338db40 Mon Sep 17 00:00:00 2001
From: Alex Tselegidis <alextselegidis@gmail.com>
Date: Thu, 9 Apr 2015 21:41:36 +0200
Subject: [PATCH] Load config.php at index.php

---
 src/application/config/config.php   |  8 ++++----
 src/application/config/database.php |  2 --
 src/index.php                       | 16 +++++++++++++++-
 3 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/src/application/config/config.php b/src/application/config/config.php
index 5b2b281f..b48c2f1e 100644
--- a/src/application/config/config.php
+++ b/src/application/config/config.php
@@ -1,18 +1,18 @@
 <?php  if ( ! defined('BASEPATH')) exit('No direct script access allowed');
 
 // Include E!A configuration file. 
-require_once __DIR__ . '/../../config.php'; 
+//require_once __DIR__ . '/../../config.php'; 
 
 /*
 |--------------------------------------------------------------------------
-| Easy!Appointments Configuration
+| Easy!Appointments - Internal Configuration
 |--------------------------------------------------------------------------
 | 
 | Declare some of the global config values of Easy!Appointments.  
 | the global "config" variable.
 |
 */
-$config['easyappointmenst'] = array(
+$config['easyappointments'] = array(
 	'version' => '1.1.0', 	// This must be changed manually.
 	'title' => 'Develop' 	// Leave empty for no title or add BETA, TEST etc ...
 );
@@ -93,7 +93,7 @@ $config['url_suffix'] = '';
 */
 $config['language'] = 'english'; // default language
 $config['available_languages'] = array('english', 'german', 'greek', 'hungarian', 'portuguese',
-        'chinese', 'dutch', 'french', 'japanese', 'polish', 'spanish');
+        'chinese', 'dutch', 'french', 'japanese', 'polish', 'spanish', 'italian', 'danish');
 
 /*
 |--------------------------------------------------------------------------
diff --git a/src/application/config/database.php b/src/application/config/database.php
index a31fd903..2bbb6bf7 100644
--- a/src/application/config/database.php
+++ b/src/application/config/database.php
@@ -48,8 +48,6 @@
 $active_group = 'default';
 $active_record = TRUE;
 
-require_once __DIR__ . '/../../config.php';
-
 $db['default']['hostname'] = Config::DB_HOST;     
 $db['default']['username'] = Config::DB_USERNAME; 
 $db['default']['password'] = Config::DB_PASSWORD; 
diff --git a/src/index.php b/src/index.php
index 6132768f..287c1cd2 100644
--- a/src/index.php
+++ b/src/index.php
@@ -1,5 +1,19 @@
 <?php
 
+/*
+ *---------------------------------------------------------------
+ * EASY!APPOINTMENST CONFIGURATION
+ *---------------------------------------------------------------
+ *
+ * Include Easy!Appointments configuration file so that it is available
+ * globally in the application. You can access configuration information
+ * through the static Config class.
+ *
+ */
+
+require_once __DIR__ . '/config.php';
+
+
 /*
  *---------------------------------------------------------------
  * APPLICATION ENVIRONMENT
@@ -18,7 +32,7 @@
  * NOTE: If you change these, also change the error_reporting() code below
  *
  */
-	define('ENVIRONMENT', 'development');
+	define('ENVIRONMENT', (Config::DEBUG_MODE) ? 'development' : 'production');
 /*
  *---------------------------------------------------------------
  * ERROR REPORTING