mirror of
https://github.com/FH-Complete/FHC-Core.git
synced 2026-06-24 07:29:28 +00:00
- Added new directory application/views/system/messages/
- Moved application/views/system/message* to application/views/system/messages/ - Adapted code to use those views with the new path - Fixed function getCode in public/js/AjaxLib.js - In public/js/messaging/messageWrite.js is now used AjaxLib.js - Changed method parseMessageText in MessageLib.php to replace the keys of the data parameter - Removed function write from application/controllers/system/Phrases.php - Adapted code in application/controllers/system/Messages.php to use the changed method parseMessageText in MessageLib.php and path of the moved views
This commit is contained in:
@@ -81,7 +81,7 @@ class ViewMessage extends FHC_Controller
|
||||
'href' => $href
|
||||
);
|
||||
|
||||
$this->load->view('system/messageHTML.php', $data);
|
||||
$this->load->view('system/messages/messageHTML.php', $data);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -94,7 +94,7 @@ class ViewMessage extends FHC_Controller
|
||||
|
||||
if (isEmptyString($token))
|
||||
{
|
||||
show_error('no token supplied');
|
||||
show_error('No token supplied');
|
||||
}
|
||||
|
||||
$msg = null;
|
||||
@@ -104,7 +104,7 @@ class ViewMessage extends FHC_Controller
|
||||
|
||||
if (!hasData($msg))
|
||||
{
|
||||
show_error('no message found');
|
||||
show_error('No message found');
|
||||
}
|
||||
|
||||
$msg = $msg->retval[0];
|
||||
@@ -114,7 +114,7 @@ class ViewMessage extends FHC_Controller
|
||||
|
||||
if (!hasData($receiverData))
|
||||
{
|
||||
show_error('no sender found');
|
||||
show_error('No sender found');
|
||||
}
|
||||
|
||||
$data = array (
|
||||
@@ -123,7 +123,7 @@ class ViewMessage extends FHC_Controller
|
||||
'token' => $token
|
||||
);
|
||||
|
||||
$this->load->view('system/messageWriteReply', $data);
|
||||
$this->load->view('system/messages/messageWriteReply', $data);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -210,7 +210,7 @@ class ViewMessage extends FHC_Controller
|
||||
|
||||
if (!$error)
|
||||
{
|
||||
$this->load->view('system/messageSent');
|
||||
$this->load->view('system/messages/messageSent');
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user