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

- Added new directory application/views/system/messages/

Browse Source 
- 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:
Paolo
2019-02-06 18:18:57 +01:00
parent e25034560f
commit 91fbabde6f
13 changed files with 80 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/controllers/ViewMessage.php
+6 -6
View File
@@ -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');
}
}
}
application/controllers/system/FASMessages.php
+2 -2
View File
@@ -63,7 +63,7 @@ class FASMessages extends Auth_Controller
'isAdmin' => $isAdmin
);
$this->load->view('system/messageWrite', $data);
$this->load->view('system/messages/messageWrite', $data);
}
/**
@@ -109,7 +109,7 @@ class FASMessages extends Auth_Controller
'isAdmin' => $isAdmin
);
$this->load->view('system/messageWrite', $data);
$this->load->view('system/messages/messageWrite', $data);
}
// -----------------------------------------------------------------------------------------------------------------
application/controllers/system/Messages.php
+23 -22
View File
@@ -66,7 +66,7 @@ class Messages extends Auth_Controller
'isAdmin' => $isAdmin
);
$this->load->view('system/messageWrite', $data);
$this->load->view('system/messages/messageWrite', $data);
}
/**
@@ -146,11 +146,6 @@ class Messages extends Auth_Controller
{
$parsedText = "";
$dataArray = (array)$data->retval[$i];
foreach ($dataArray as $key => $val)
{
$newKey = str_replace(" ", "_", strtolower($key));
$dataArray[$newKey] = $dataArray[$key];
}
// if oe not given, get from prestudent
if (isEmptyString($oe_kurzbz) && hasData($prestudentsData))
@@ -175,7 +170,7 @@ class Messages extends Auth_Controller
{
if (isset($msgvars) && is_array($msgvars))
{
//additional message variables
// additional message variables
foreach ($msgvars as $key => $msgvar)
{
$dataArray[$key] = $msgvar;
@@ -208,6 +203,7 @@ class Messages extends Auth_Controller
);
}
return success('success');
}
}
@@ -218,14 +214,27 @@ class Messages extends Auth_Controller
public function getVorlage()
{
$vorlage_kurzbz = $this->input->get('vorlage_kurzbz');
$result = null;
if (isset($vorlage_kurzbz))
if (!isEmptyString($vorlage_kurzbz))
{
$this->load->model('system/Vorlagestudiengang_model', 'VorlagestudiengangModel');
$this->VorlagestudiengangModel->addOrder('version','DESC');
$result = $this->VorlagestudiengangModel->loadWhere(array('vorlage_kurzbz' => $vorlage_kurzbz));
$this->outputJsonSuccess($result);
$result = $this->VorlagestudiengangModel->loadWhere(array('vorlage_kurzbz' => $vorlage_kurzbz));
}
else
{
$result = error('The given vorlage_kurzbz is not valid');
}
if (isError($result) || !hasData($result))
{
$this->outputJsonError($result->retval);
}
else
{
$this->outputJsonSuccess($result->retval);
}
}
@@ -234,7 +243,6 @@ class Messages extends Auth_Controller
*/
public function parseMessageText()
{
$prestudent_id = $this->input->get('prestudent_id');
$person_id = $this->input->get('person_id');
$text = $this->input->get('text');
$parsedText = '';
@@ -244,25 +252,18 @@ class Messages extends Auth_Controller
{
$data = $this->MessageModel->getMsgVarsDataByPersonId($person_id);
}
elseif (is_numeric($prestudent_id))
else
{
$data = $this->MessageModel->getMsgVarsDataByPrestudentId($prestudent_id);
$data = error('The given person_id is not a valid number');
}
if (is_error($data) || !hasData($data))
if (isError($data) || !hasData($data))
{
$this->outputJsonError($data->retval);
}
else
{
$dataArray = (array)$data->retval[0];
foreach ($dataArray as $key => $val)
{
$newKey = str_replace(" ", "_", strtolower($key));
$dataArray[$newKey] = $dataArray[$key];
}
$parsedText = $this->messagelib->parseMessageText($text, $dataArray);
$parsedText = $this->messagelib->parseMessageText($text, (array)$data->retval[0]);
$this->outputJsonSuccess($parsedText);
}
application/controllers/system/Phrases.php
-14
View File
@@ -16,7 +16,6 @@ class Phrases extends Auth_Controller
'view' => 'system/phrase:r',
'deltext' => 'system/phrase:rw',
'edit' => 'system/phrase:rw',
'write' => 'system/phrase:rw',
'save' => 'system/phrase:rw',
'newText' => 'system/phrase:rw',
'editText' => 'system/phrase:rw',
@@ -115,19 +114,6 @@ class Phrases extends Auth_Controller
$this->load->view('system/phrases/phrasesEdit', $data);
}
/**
*
*/
public function write()
{
$data = array(
'subject' => 'TestSubject',
'body' => 'TestDevelopmentBodyText'
);
$this->load->view('system/messageWrite', $data);
}
/**
*
*/
application/libraries/MessageLib.php
+9 -1
View File
@@ -760,7 +760,15 @@ class MessageLib
*/
public function parseMessageText($text, $data = array())
{
return $this->_ci->parser->parse_string($text, $data, true);
$tmpData = array();
// Replaces data array keys to a lowercase without spaces string
foreach ($data as $key => $val)
{
$tmpData[str_replace(' ', '_', strtolower($key))] = $data[$key];
}
return $this->_ci->parser->parse_string($text, $tmpData, true);
}
/**
application/views/system/messageForm.php → application/views/system/messages/messageForm.php
View File
application/views/system/messageHTML.php → application/views/system/messages/messageHTML.php
View File
application/views/system/messageList.php → application/views/system/messages/messageList.php
View File
application/views/system/messageSent.php → application/views/system/messages/messageSent.php
View File
application/views/system/messageWrite.php → application/views/system/messages/messageWrite.php
+2
View File
@@ -4,7 +4,9 @@ $this->load->view(
array(
'title' => 'Write a message',
'jquery' => true,
'jqueryui' => true,
'bootstrap' => true,
'ajaxlib' => true,
'fontawesome' => true,
'tinymce' => true,
'sbadmintemplate' => true,
application/views/system/messageWriteReply.php → application/views/system/messages/messageWriteReply.php
+1 -1
View File
@@ -26,7 +26,7 @@ $href = site_url().'/ViewMessage/sendReply';
</div>
</div>
<form id="sendForm" method="post" action="<?php echo $href; ?>">
<?php $this->load->view('system/messageForm.php'); ?>
<?php $this->load->view('system/messages/messageForm.php'); ?>
<?php
for ($i = 0; $i < count($receivers); $i++)
{
public/js/AjaxLib.js
+1 -4
View File
@@ -146,10 +146,7 @@ var FHC_AjaxClient = {
if (jQuery.type(response) == "object" && response.hasOwnProperty(CODE))
{
if (response.error == SUCCESS)
{
isSuccess = true;
}
code = response.error;
}
return code;
public/js/messaging/messageWrite.js
+36 -26
View File
@@ -1,4 +1,6 @@
const CONTROLLER_URL = FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + "/system/Messages";
/**
* JS used by view system/messages/messageWrite
*/
function tinymcePreviewSetContent()
{
@@ -17,22 +19,26 @@ function tinymcePreviewSetContent()
function parseMessageText(receiver_id, text)
{
$.ajax({
dataType: "json",
url: CONTROLLER_URL + "/parseMessageText",
data: {
"person_id": receiver_id,
"text": text
},
success: function(data, textStatus, jqXHR)
FHC_AjaxClient.ajaxCallGet(
"system/Messages/parseMessageText",
{
tinyMCE.get("tinymcePreview").setContent(data);
person_id: receiver_id,
text: text
},
error: function(jqXHR, textStatus, errorThrown)
{
alert(textStatus + " - " + errorThrown + " - " + jqXHR.responseText);
successCallback: function(data, textStatus, jqXHR) {
if (FHC_AjaxClient.hasData(data))
{
tinyMCE.get("tinymcePreview").setContent(FHC_AjaxClient.getData(data));
}
else if (FHC_AjaxClient.isError(data))
{
alert(data.retval);
}
}
}
});
);
}
$(document).ready(function ()
@@ -100,24 +106,28 @@ $(document).ready(function ()
{
$("#vorlageDnD").change(function ()
{
if (this.value != '')
var vorlage_kurzbz = this.value;
if (vorlage_kurzbz != '')
{
$.ajax({
dataType: "json",
url: CONTROLLER_URL + "/getVorlage",
data: {
"vorlage_kurzbz": this.value
},
success: function(data, textStatus, jqXHR)
FHC_AjaxClient.ajaxCallGet(
"system/Messages/getVorlage",
{
tinyMCE.get("bodyTextArea").setContent(data.retval[0].text);
$("#subject").val(data.retval[0].subject);
vorlage_kurzbz: vorlage_kurzbz
},
error: function(jqXHR, textStatus, errorThrown)
{
alert(textStatus + " - " + errorThrown);
successCallback: function(data, textStatus, jqXHR) {
if (FHC_AjaxClient.hasData(data))
{
var msg = FHC_AjaxClient.getData(data);
tinyMCE.get("bodyTextArea").setContent(msg[0].text);
$("#subject").val(msg[0].subject);
}
}
}
});
);
}
});
}