diff --git a/pandora_console/operation/events/events_rss.php b/pandora_console/operation/events/events_rss.php index fc200f9527..2ba00fef59 100644 --- a/pandora_console/operation/events/events_rss.php +++ b/pandora_console/operation/events/events_rss.php @@ -213,18 +213,20 @@ else { $lastbuild = (int) $result[0]['unix_timestamp']; } -$rss_feed = ''; // ' '; -$rss_feed .= 'Pandora RSS FeedLatest events on Pandora'; -$rss_feed .= ''.date (DATE_RFC822, $lastbuild).''; //Last build date is the last event - that way readers won't mark it as having new posts -$rss_feed .= ''.$url.''; //Link back to the main Pandora page -$rss_feed .= ''; //Alternative for Atom feeds. It's the same. +$rss_feed = '' . "\n"; // ' ' . "\n"; +$rss_feed .= ''. "\n"; +$rss_feed .= 'Pandora RSS Feed'. "\n"; +$rss_feed .= 'Latest events on Pandora' . "\n"; +$rss_feed .= ''.date (DATE_RFC822, $lastbuild).''. "\n"; //Last build date is the last event - that way readers won't mark it as having new posts +$rss_feed .= ''.$url.''. "\n"; //Link back to the main Pandora page +$rss_feed .= ''. "\n";; //Alternative for Atom feeds. It's the same. if (empty ($result)) { $result = array(); $rss_feed .= ''.io_safe_input ($url.'/index.php?sec=eventos&sec2=operation/events/events').'No results'; $rss_feed .= 'There are no results. Click on the link to see all Pending events'; - $rss_feed .= ''.io_safe_input ($url.'/index.php?sec=eventos&sec2=operation/events/events').''; + $rss_feed .= ''.io_safe_input ($url.'/index.php?sec=eventos&sec2=operation/events/events').''. "\n"; } foreach ($result as $row) { @@ -244,26 +246,26 @@ foreach ($result as $row) { //This is mandatory $rss_feed .= ''; - $rss_feed .= io_safe_input ($url . "/index.php?sec=eventos&sec2=operation/events/events&id_event=" . $row['event_id']); + $rss_feed .= io_safe_input($url . "/index.php?sec=eventos&sec2=operation/events/events&id_event=" . $row['event_id']); $rss_feed .= ''; $rss_feed .= $agent_name; $rss_feed .= ''; - $rss_feed .= io_safe_input ($row['event_descr']); + $rss_feed .= $row['event_descr']; if($row['validated'] == 1) { - $rss_feed .= io_safe_input ('

').'Validated by ' . io_safe_input ($row['validated_by']); + $rss_feed .= io_safe_input('

'.'Validated by ' . $row['validated_by']); } $rss_feed .= '
'; - $rss_feed .= io_safe_input ($url . "/index.php?sec=eventos&sec2=operation/events/events&id_event=" . $row["event_id"]); + $rss_feed .= io_safe_input($url . "/index.php?sec=eventos&sec2=operation/events/events&id_event=" . $row["event_id"]); $rss_feed .= ''; //The rest is optional $rss_feed .= '' . date(DATE_RFC822, $row['unix_timestamp']) . ''; //This is mandatory again - $rss_feed .= '
'; + $rss_feed .= '' . "\n"; } -$rss_feed .= "
"; +$rss_feed .= "
\n\n"; echo $rss_feed; ?> diff --git a/pandora_console/operation/events/export_csv.php b/pandora_console/operation/events/export_csv.php index b72edb0d9b..fc2a1375dd 100644 --- a/pandora_console/operation/events/export_csv.php +++ b/pandora_console/operation/events/export_csv.php @@ -112,11 +112,11 @@ while ($event = db_get_all_row_by_steps_sql($new, $result, $sql)) { echo $event["timestamp"]; echo ","; - echo agents_get_name($event["id_agente"]); + echo io_safe_output(agents_get_name($event["id_agente"])); echo ","; echo groups_get_name($event["id_grupo"]); echo ","; - echo $event["evento"]; + echo io_safe_output($event["evento"]); echo ","; echo $event["estado"]; echo ",";