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

Merge branch 'master' of https://github.com/FH-Complete/FHC-Core

Browse Source
This commit is contained in:
kindlm
2017-05-09 17:38:19 +02:00
parent a7bf08af11 7312a4afe1
commit d22cc76ad5
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/config/message.php
+1
View File
@@ -9,6 +9,7 @@ $config['msg_delivery'] = true; // Default true
$config['system_person_id'] = 1; // Dummy sender, used for sending messages from the system
$config['redirect_view_message_url'] = 'index.ci.php/Redirect/redirectByToken/'; //
$config['message_html_view_url'] = 'index.ci.php/ViewMessage/toHTML/';
$config['message_server'] = 'http://www.fhcomplete.org/';
$config['assistent_function'] = 'ass';
define('EMAIL_KONTAKT_TYPE', 'email'); // Email kontakt type
application/libraries/MessageLib.php
+2 -2
View File
@@ -453,7 +453,7 @@ class MessageLib
// If the person has an email account
if (!is_null($result->retval[$i]->receiver) && $result->retval[$i]->receiver != '')
{
$href = APP_ROOT . $this->ci->config->item('message_html_view_url') . $result->retval[0]->token;
$href = $this->ci->config->item('message_server') . $this->ci->config->item('message_html_view_url') . $result->retval[0]->token;
// Using a template for the html email body
$body = $this->ci->parser->parse(
'templates/mailHTML',
@@ -588,7 +588,7 @@ class MessageLib
if ($multiPartMime === true)
{
// Using a template for the html email body
$href = APP_ROOT . $this->ci->config->item('message_html_view_url') . $result->retval[0]->token;
$href = $this->ci->config->item('message_server') . $this->ci->config->item('message_html_view_url') . $result->retval[0]->token;
$bodyMsg = $this->ci->parser->parse(
'templates/mailHTML',
array(