From 5635f1792c1fa72c11e26ea48789836d15daedd8 Mon Sep 17 00:00:00 2001
From: Paolo <bison@technikum-wien.at>
Date: Tue, 17 Jul 2018 17:13:12 +0200
Subject: [PATCH] - Removed config file application/config/fhcomplete.php -
 Moved config messages entries from fhcomplete.php to
 application/config/message.php - Renamed the config entry addons_aufnahme_url
 to message_redirect_url - Adapted application/controllers/Redirect.php to use
 this new entry

---
 application/config/autoload.php      | 2 +-
 application/config/fhcomplete.php    | 9 ---------
 application/config/message.php       | 4 ++++
 application/controllers/Redirect.php | 4 ++--
 4 files changed, 7 insertions(+), 12 deletions(-)
 delete mode 100644 application/config/fhcomplete.php

diff --git a/application/config/autoload.php b/application/config/autoload.php
index baf545db6..4916ef0ce 100644
--- a/application/config/autoload.php
+++ b/application/config/autoload.php
@@ -98,7 +98,7 @@ $autoload['helper'] = array('url', 'language');
 | config files.  Otherwise, leave it blank.
 |
 */
-$autoload['config'] = array('fhcomplete');
+$autoload['config'] = array();
 
 /*
 | -------------------------------------------------------------------
diff --git a/application/config/fhcomplete.php b/application/config/fhcomplete.php
deleted file mode 100644
index 427270550..000000000
--- a/application/config/fhcomplete.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-$config['fhc_version'] = '3.3';
-
-$config['addons_aufnahme_url'] = array();
-$config['addons_aufnahme_url']['fallback'] = 'https://localhost/fhcomplete/index.ci.php/ViewMessage/writeReply/';
-$config['addons_aufnahme_url']['OE_ROOT'] = 'https://SERVER-NAME/addons/aufnahme/OE_ROOT/cis/index.php';
diff --git a/application/config/message.php b/application/config/message.php
index 8689f94bd..495c8c38a 100644
--- a/application/config/message.php
+++ b/application/config/message.php
@@ -14,6 +14,10 @@ $config['message_html_view_url'] = '/ViewMessage/toHTML/';
 $config['message_server'] = site_url();
 $config['assistent_function'] = 'ass';
 
+$config['message_redirect_url'] = array();
+$config['message_redirect_url']['fallback'] = site_url('ViewMessage/writeReply');
+// $config['message_redirect_url']['OE_ROOT'] = 'https://SERVER-NAME/addons/aufnahme/OE_ROOT/cis/index.php';
+
 define('EMAIL_KONTAKT_TYPE', 'email'); // Email kontakt type
 define('SENT_INFO_NEWLINE', '\n'); // tbl_msg_recipient->sentInfo separator
 
diff --git a/application/controllers/Redirect.php b/application/controllers/Redirect.php
index 38b7c6dbe..8a24c590d 100644
--- a/application/controllers/Redirect.php
+++ b/application/controllers/Redirect.php
@@ -58,7 +58,7 @@ class Redirect extends FHC_Controller
 				show_error('No organisation unit present in the message');
 			}
 
-			$addonAufnahmeUrls = $this->config->item('addons_aufnahme_url');
+			$addonAufnahmeUrls = $this->config->item('message_redirect_url');
 			if(!isset($addonAufnahmeUrls[$organisationRoot]))
 				$organisationRoot = 'fallback';
 
@@ -73,7 +73,7 @@ class Redirect extends FHC_Controller
 		}
 		else
 		{
-			$addonAufnahmeUrls = $this->config->item('addons_aufnahme_url');
+			$addonAufnahmeUrls = $this->config->item('message_redirect_url');
 			if (isset($token)
 				&& hasData($msg)
 				&& is_array($addonAufnahmeUrls)