tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cherry-pick-22138f62' into 'develop' 

DEVELOP::: Fixed problems with htmld tags in list events and other view that include list of events. Gitlab: #529

See merge request !257
This commit is contained in:
vgilc 2017-03-15 15:58:45 +01:00
parent a094f67dd9 22f7bae5ae
commit 41c774ac99
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pandora_console/include/ajax/events.php
View File

@ -53,7 +53,7 @@ if ($get_event_name) {
return; return;
} }
ui_print_truncate_text(io_safe_output($name), 75, false, false, false, '...'); ui_print_truncate_text(strip_tags(io_safe_output($name)), 75, false, false, false, '...');
return; return;
} }

4
pandora_console/include/functions_events.php
View File

@ -970,7 +970,7 @@ function events_print_event_table ($filter = "", $limit = 10, $width = 440, $ret
$data[2] = events_print_type_img ($event["event_type"], true); $data[2] = events_print_type_img ($event["event_type"], true);
/* Event text */ /* Event text */
$data[3] = ui_print_string_substr (io_safe_output($event["evento"]), 75, true, '7.5'); $data[3] = ui_print_string_substr (strip_tags(io_safe_output($event["evento"])), 75, true, '7.5');
if($agent_id == 0) { if($agent_id == 0) {
if ($event["id_agente"] > 0) { if ($event["id_agente"] > 0) {
@ -2336,7 +2336,7 @@ function events_page_general ($event) {
$data = array(); $data = array();
$data[0] = __('Event name'); $data[0] = __('Event name');
$data[1] = io_safe_output(io_safe_output($event["evento"])); $data[1] = strip_tags(io_safe_output($event["evento"]));
$table_general->data[] = $data; $table_general->data[] = $data;
$data = array(); $data = array();

6
pandora_console/operation/events/events.build_table.php
View File

@ -415,11 +415,11 @@ else {
if (in_array('evento', $show_fields)) { if (in_array('evento', $show_fields)) {
// Event description // Event description
$data[$i] = '<span title="'.$event["evento"].'" class="f9">'; $data[$i] = '<span title="' . strip_tags(io_safe_output($event["evento"])) . '" class="f9">';
if($allow_action) { if($allow_action) {
$data[$i] .= '<a href="javascript:" onclick="show_event_dialog(' . $event["id_evento"] . ', '.$group_rep.');">'; $data[$i] .= '<a href="javascript:" onclick="show_event_dialog(' . $event["id_evento"] . ', '.$group_rep.');">';
} }
$data[$i] .= '<span class="'.$myclass.'" style="font-size: 7.5pt;">' . ui_print_truncate_text (io_safe_output($event["evento"]), 160) . '</span>'; $data[$i] .= '<span class="' . $myclass . '" style="font-size: 7.5pt;">' . ui_print_truncate_text (strip_tags(io_safe_output($event["evento"])), 160) . '</span>';
if($allow_action) { if($allow_action) {
$data[$i] .= '</a>'; $data[$i] .= '</a>';
} }
@ -695,7 +695,7 @@ else {
} }
$data[$i] .= '<a href="javascript:" onclick="show_event_dialog(' . $event["id_evento"] . ', '.$group_rep.');">'; $data[$i] .= '<a href="javascript:" onclick="show_event_dialog(' . $event["id_evento"] . ', '.$group_rep.');">';
$data[$i] .= html_print_input_hidden('event_title_'.$event["id_evento"], "#".$event["id_evento"]." - ".$event["evento"], true); $data[$i] .= html_print_input_hidden('event_title_'.$event["id_evento"], "#".$event["id_evento"]." - " . strip_tags(io_safe_output($event["evento"])), true);
$data[$i] .= html_print_image ("images/eye.png", true, $data[$i] .= html_print_image ("images/eye.png", true,
array ("title" => __('Show more'))); array ("title" => __('Show more')));
$data[$i] .= '</a>'; $data[$i] .= '</a>';