dbxe
/
fusionpbx
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

BugFix [master] - messages class (#2618) 

htmlspecialchars isn't required for the javascript, only the \r?\n escape
This commit is contained in:
Mafoo 2017-05-31 21:09:07 +01:00 committed by FusionPBX
parent 94ea1e427a
commit 10188339e5
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
resources/classes/messages.php
View File

@ -32,14 +32,15 @@ if (!class_exists('messages')) {
$_SESSION["messages"][] = array(message => $message, mood => $mood, delay => $delay);
}
static function html($clear_messages = true) {
$html = "";
static function html($clear_messages = true, $spacer = "") {
$html = "${spacer}//render the messages\n";
$spacer .="\t";
if (strlen($_SESSION['message']) > 0) {
$message_text = addslashes($_SESSION['message']);
$message_mood = $_SESSION['message_mood'] ?: 'default';
$message_delay = $_SESSION['message_delay'];
$html .= "display_message('".str_replace(array("\r\n", "\n", "\r"),'\\n', htmlspecialchars($message_text))."', '".$message_mood."'";
$html .= "${spacer}display_message('".str_replace(array("\r\n", "\n", "\r"),'\\n', $message_text)."', '".$message_mood."'";
if ($message_delay != '') {
$html .= ", '".$message_delay."'";
}
@ -51,7 +52,7 @@ if (!class_exists('messages')) {
$message_mood = $message['mood'] ?: 'default';
$message_delay = $message['delay'];
$html .= "display_message('".str_replace(array("\r\n", "\n", "\r"),'\\n', htmlspecialchars($message_text))."', '".$message_mood."'";
$html .= "${spacer}display_message('".str_replace(array("\r\n", "\n", "\r"),'\\n', $message_text)."', '".$message_mood."'";
if ($message_delay != '') {
$html .= ", '".$message_delay."'";
}

3
themes/default/template.php
View File

@ -85,8 +85,7 @@
$(document).ready(function() {
//render the messages
<?php echo messages::html(); ?>
<?php echo messages::html(true, " ");?>
//hide message bar on hover
$("#message_text").mouseover(function() { $(this).hide(); $("#message_container").hide(); });