From 8740c2128aafc31d456f0a2c20344e9f51b93b9b Mon Sep 17 00:00:00 2001 From: Pierre Date: Sun, 29 Apr 2018 21:04:30 +0200 Subject: [PATCH] Moved API connexion configuration --- system/config/build.config.php | 7 +++++++ system/config/dev.config.php | 7 +++++++ system/config/global.config.php | 7 ------- system/system.php | 6 +++--- 4 files changed, 17 insertions(+), 10 deletions(-) diff --git a/system/config/build.config.php b/system/config/build.config.php index 16b0aa45..41ddf1cd 100644 --- a/system/config/build.config.php +++ b/system/config/build.config.php @@ -7,6 +7,13 @@ class Build { + /** + * API access and credentials + */ + const API_URL = "http://devweb.local/comunic/api/"; + const API_SERVICE_NAME = "ComunicWeb"; + const API_SERVICE_TOKEN = "12XU67pJUlnNQ"; + /** * Site URL */ diff --git a/system/config/dev.config.php b/system/config/dev.config.php index 7c24b4dd..599481e6 100644 --- a/system/config/dev.config.php +++ b/system/config/dev.config.php @@ -7,6 +7,13 @@ class Dev { + /** + * API access and credentials + */ + const API_URL = "http://devweb.local/comunic/api/"; + const API_SERVICE_NAME = "ComunicWeb"; + const API_SERVICE_TOKEN = "12XU67pJUlnNQ"; + /** * Site URL */ diff --git a/system/config/global.config.php b/system/config/global.config.php index 2a1d0731..c3ba1237 100644 --- a/system/config/global.config.php +++ b/system/config/global.config.php @@ -12,11 +12,4 @@ class Config { */ const VERSION = "0.1.1"; - /** - * API access and credentials - */ - const API_URL = "http://devweb.local/comunic/api/"; - const API_SERVICE_NAME = "ComunicWeb"; - const API_SERVICE_TOKEN = "12XU67pJUlnNQ"; - } \ No newline at end of file diff --git a/system/system.php b/system/system.php index eb7056ff..8c4e7452 100644 --- a/system/system.php +++ b/system/system.php @@ -84,9 +84,9 @@ function get_javascript_config($config) : string { siteURL: '".$config::SITE_URL."', //API configuration - apiURL: '".Config::API_URL."', - apiServiceName: '".Config::API_SERVICE_NAME."', - apiServiceToken: '".Config::API_SERVICE_TOKEN."', + apiURL: '".$config::API_URL."', + apiServiceName: '".$config::API_SERVICE_NAME."', + apiServiceToken: '".$config::API_SERVICE_TOKEN."', //Default language defaultLanguage: '".$config::DEFAULT_LANGUAGE."',