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

- Added Redirect controller to redirect from the link present in the email to

Browse Source 
the page for viewing the message
This commit is contained in:
bison-paolo
2016-10-07 12:00:59 +02:00
parent b0459c6603
commit 1fed18dd9b
7 changed files with 95 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/config/fhcomplete.php
+5 -4
View File
@@ -1,6 +1,6 @@
<?php
if (! defined('BASEPATH'))
exit('No direct script access allowed');
if (! defined('BASEPATH')) exit('No direct script access allowed');
$config['fhc_version'] = '3.2';
@@ -235,9 +235,10 @@ $config['fhc_acl'] = array
'wawi.tbl_rechnungsbetrag' => 'basis/rechnungsbetrag',
'wawi.tbl_rechnungstyp' => 'basis/rechnungstyp',
'wawi.tbl_zahlungstyp' => 'basis/zahlungstyp',
DMS_PATH => 'fs/dms',
'public.tbl_sprache' => 'admin'
);
$config['addons_aufnahme_url'] = 'http://debian.dev/build/addons/aufnahme/cis/index.php';
application/config/message.php
+2 -2
View File
@@ -5,8 +5,8 @@ if (! defined('BASEPATH')) exit('No direct script access allowed');
$config['msg_delivery'] = true;
$config['send_immediately'] = false; // If the message should be sent immediately
$config['system_person_id'] = 1; // Dummy sender, used for sending messages from the system
$config['cis_message_view_url'] = 'readMessageByToken.php'; // Dummy sender, used for sending messages from the system
$config['message_html_view_url'] = 'index.ci.php/system/Messages/toHTML/';
$config['redirect_view_message_url'] = 'index.ci.php/Redirect/redirectByToken/'; //
$config['message_html_view_url'] = 'index.ci.php/ViewMessage/toHTML/';
define('EMAIL_KONTAKT_TYPE', 'email'); // Email kontakt type
define('SENT_INFO_NEWLINE', '\n'); // tbl_msg_recipient->sentInfo separator
application/controllers/Redirect.php
+41
View File
@@ -0,0 +1,41 @@
<?php
/**
* FH-Complete
*
* @package FHC-API
* @author FHC-Team
* @copyright Copyright (c) 2016, fhcomplete.org
* @license GPLv3
* @link http://fhcomplete.org
* @since Version 1.0
* @filesource
*/
// ------------------------------------------------------------------------
if (!defined('BASEPATH')) exit('No direct script access allowed');
class Redirect extends FHC_Controller
{
/**
* API constructor
*/
public function __construct()
{
parent::__construct();
// The second parameter is used to avoiding name collisions in the config array
$this->config->load('fhcomplete');
}
public function redirectByToken($token)
{
if (isset($token))
{
redirect($this->config->item('addons_aufnahme_url') . '?token=' . $token);
}
else
{
$this->response();
}
}
}
application/controllers/ViewMessage.php
+45
View File
@@ -0,0 +1,45 @@
<?php
/**
* FH-Complete
*
* @package FHC-API
* @author FHC-Team
* @copyright Copyright (c) 2016, fhcomplete.org
* @license GPLv3
* @link http://fhcomplete.org
* @since Version 1.0
* @filesource
*/
// ------------------------------------------------------------------------
if (!defined('BASEPATH')) exit('No direct script access allowed');
class ViewMessage extends CI_Controller
{
/**
* API constructor
*/
public function __construct()
{
parent::__construct();
$this->load->library('MessageLib');
}
public function toHTML($token)
{
$msg = $this->messagelib->getMessageByToken($token);
if ($msg->error)
{
show_error($msg->retval);
}
if (is_array($msg->retval) && count($msg->retval) > 0)
{
$data = array (
'message' => $msg->retval[0]
);
$this->load->view('system/messageHTML.php', $data);
}
}
}
application/controllers/api/v1/system/Message.php
-17
View File
@@ -105,23 +105,6 @@ class Message extends APIv1_Controller
}
}
/**
* @return void
*/
public function getRedirectByToken()
{
$token = $this->get('token');
if (isset($token))
{
redirect(CIS_ROOT);
}
else
{
$this->response();
}
}
/**
* @return void
*/
application/controllers/system/Messages.php
-18
View File
@@ -141,24 +141,6 @@ class Messages extends VileSci_Controller
redirect('/system/Messages/view/' . $msg->retval . '/' . $receiver_id);
}
public function toHTML($token)
{
$msg = $this->messagelib->getMessageByToken($token);
if ($msg->error)
{
show_error($msg->retval);
}
if (is_array($msg->retval) && count($msg->retval) > 0)
{
$data = array (
'message' => $msg->retval[0]
);
$this->load->view('system/messageHTML.php', $data);
}
}
private function getPersonId()
{
$person_id = null;
application/libraries/MessageLib.php
+2 -2
View File
@@ -512,7 +512,7 @@ class MessageLib
// If the person has an email account
if (!is_null($result->retval[$i]->receiver) && $result->retval[$i]->receiver != '')
{
$href = CIS_ROOT . $this->ci->config->item('cis_message_view_url') . '?token=' . $result->retval[$i]->token;
$href = APP_ROOT . $this->ci->config->item('redirect_view_message_url') . $result->retval[$i]->token;
// Using a template for the html email body
$body = $this->ci->parser->parse(
'templates/mailHTML',
@@ -644,7 +644,7 @@ class MessageLib
if (is_null($body))
{
// Using a template for the html email body
$href = CIS_ROOT . $this->ci->config->item('cis_message_view_url') . '?token=' . $result->retval[$i]->token;
$href = APP_ROOT . $this->ci->config->item('redirect_view_message_url') . $result->retval[$i]->token;
$bodyMsg = $this->ci->parser->parse(
'templates/mailHTML',
array(