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

Fixed, set the error level to other more low, and fixed unclosed tag. Ticket: #1499

This commit is contained in:
mdtrooper 2014-10-28 11:20:02 +01:00
parent 6618aa3cba
commit 88d9852b27
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pandora_console/operation/events/events_rss.php
View File

@ -76,6 +76,7 @@ function rss_error_handler ($errno, $errstr, $errfile, $errline, $error_human_de
$rss_feed .= "\n"; $rss_feed .= "\n";
$rss_feed .= '<title>Error creating feed</title>'; $rss_feed .= '<title>Error creating feed</title>';
$rss_feed .= "\n"; $rss_feed .= "\n";
if (empty($error_human_description)) { if (empty($error_human_description)) {
$rss_feed .= '<description>There was an error creating the feed: '.$errno.' - '.$errstr.' in '.$errfile.' on line '.$errline.'</description>'; $rss_feed .= '<description>There was an error creating the feed: '.$errno.' - '.$errstr.' in '.$errfile.' on line '.$errline.'</description>';
} }
@ -87,12 +88,14 @@ function rss_error_handler ($errno, $errstr, $errfile, $errline, $error_human_de
$rss_feed .= "\n"; $rss_feed .= "\n";
$rss_feed .= '</item>'; $rss_feed .= '</item>';
$rss_feed .= "\n"; $rss_feed .= "\n";
$rss_feed .= '</channel>';
$rss_feed .= "\n";
$rss_feed .= '</rss>'; $rss_feed .= '</rss>';
exit ($rss_feed); //Exit by displaying the feed exit ($rss_feed); //Exit by displaying the feed
} }
set_error_handler ('rss_error_handler', E_ALL); //Errors output as RSS set_error_handler ('rss_error_handler', E_ERROR); //Errors output as RSS
$id_group = get_parameter ("id_group", 0); // group $id_group = get_parameter ("id_group", 0); // group
$event_type = get_parameter ("event_type", ''); // 0 all $event_type = get_parameter ("event_type", ''); // 0 all
@ -122,7 +125,7 @@ $tag_without = array_diff($tag_without, array(0 => 0));
$filter_only_alert = (int)get_parameter('filter_only_alert', -1); $filter_only_alert = (int)get_parameter('filter_only_alert', -1);
///////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////
// Build the condition of the events query // Build the condition of the events query
$sql_post = ""; $sql_post = "";
$meta = false; $meta = false;
@ -132,11 +135,11 @@ $id_user = $user;
require('events.build_query.php'); require('events.build_query.php');
// Now $sql_post have all the where condition // Now $sql_post have all the where condition
///////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////
$sql = "SELECT * $sql = "SELECT *
FROM tevento FROM tevento
WHERE 1=1 ".$sql_post." WHERE 1=1 " . $sql_post . "
ORDER BY utimestamp DESC"; ORDER BY utimestamp DESC";
$result = db_get_all_rows_sql ($sql); $result = db_get_all_rows_sql ($sql);