blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-07-18 07:22:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Removed config file application/config/fhcomplete.php

Browse Source 
- 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
This commit is contained in:
Paolo
2018-07-17 17:13:12 +02:00
parent 3e79011ada
commit 5635f1792c
4 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/config/autoload.php
+1 -1
View File
@@ -98,7 +98,7 @@ $autoload['helper'] = array('url', 'language');
| config files. Otherwise, leave it blank.
|
*/
$autoload['config'] = array('fhcomplete');
$autoload['config'] = array();
/*
| -------------------------------------------------------------------
application/config/fhcomplete.php
-9
View File
@@ -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';
application/config/message.php
+4
View File
@@ -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
application/controllers/Redirect.php
+2 -2
View File
@@ -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)