blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-07-23 18:02:18 +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/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;