From e7d4391f145db500120aee51de7107e7a167f275 Mon Sep 17 00:00:00 2001 From: kostadinp Date: Fri, 16 Jan 2015 18:16:47 +0200 Subject: [PATCH] FIX array $eplug_rss_data and clean whitespaces --- e107_plugins/download/e_rss.php | 119 ++++++++++++++++---------------- 1 file changed, 58 insertions(+), 61 deletions(-) diff --git a/e107_plugins/download/e_rss.php b/e107_plugins/download/e_rss.php index d4072b6e0..adb38a538 100644 --- a/e107_plugins/download/e_rss.php +++ b/e107_plugins/download/e_rss.php @@ -19,77 +19,74 @@ if (!defined('e107_INIT')) { exit; } //FIXME TODO - Use v2 method. See chatbox_menu/e_rss.php //##### create feed for admin, return array $eplug_rss_feed -------------------------------- - // Download - $feed['name'] = ADLAN_24; - $feed['url'] = 'download'; - $feed['topic_id'] = ''; - $feed['path'] = 'download'; - $feed['text'] = RSS_PLUGIN_LAN_8; - $feed['class'] = '0'; - $feed['limit'] = '9'; - $eplug_rss_feed[] = $feed; + // Download + $feed['name'] = ADLAN_24; + $feed['url'] = 'download'; + $feed['topic_id'] = ''; + $feed['path'] = 'download'; + $feed['text'] = RSS_PLUGIN_LAN_8; + $feed['class'] = '0'; + $feed['limit'] = '9'; + $eplug_rss_feed[] = $feed; // ------------------------------------------------------------------------------------ + // Download categories for admin import. + $sqli = e107::getDb('download'); - // Download categories for admin import. - $sqli = e107::getDb('download'); - - if($sqli -> db_Select("download_category", "*","download_category_id!='' ORDER BY download_category_order ")) + if($sqli -> db_Select("download_category", "*","download_category_id!='' ORDER BY download_category_order ")) + { + while($rowi = $sqli -> db_Fetch()) { - while($rowi = $sqli -> db_Fetch()) - { - $feed['name'] = ADLAN_24.' > '.$rowi['download_category_name']; - $feed['url'] = 'download'; - $feed['topic_id'] = $rowi['download_category_id']; - $feed['path'] = 'download'; - $feed['text'] = RSS_PLUGIN_LAN_11.' '.$rowi['download_category_name']; - $feed['class'] = '0'; - $feed['limit'] = '9'; - $eplug_rss_feed[] = $feed; - } + $feed['name'] = ADLAN_24.' > '.$rowi['download_category_name']; + $feed['url'] = 'download'; + $feed['topic_id'] = $rowi['download_category_id']; + $feed['path'] = 'download'; + $feed['text'] = RSS_PLUGIN_LAN_11.' '.$rowi['download_category_name']; + $feed['class'] = '0'; + $feed['limit'] = '9'; + $eplug_rss_feed[] = $feed; } + } //##### create rss data, return as array $eplug_rss_data ----------------------------------- + if($topic_id && is_numeric($topic_id)) + { + $topic = "d.download_category='" . intval($topic_id) . "' AND "; + } + else + { + $topic = ""; + } + $path=''; + $class_list = "0,251,252,253"; + $query = "SELECT d.*, dc.* FROM #download AS d LEFT JOIN #download_category AS dc ON d.download_category = dc.download_category_id WHERE {$topic} d.download_active > 0 AND d.download_class IN (".$class_list.") ORDER BY d.download_datestamp DESC LIMIT 0,".$this -> limit; + $sql -> db_Select_gen($query); - if($topic_id && is_numeric($topic_id)) - { - $topic = "d.download_category='".intval($topic_id)."' AND "; - } - else - { - $topic = ""; - } - $path=''; - $class_list = "0,251,252,253"; - $query = "SELECT d.*, dc.* FROM #download AS d LEFT JOIN #download_category AS dc ON d.download_category = dc.download_category_id WHERE {$topic} d.download_active > 0 AND d.download_class IN (".$class_list.") ORDER BY d.download_datestamp DESC LIMIT 0,".$this -> limit; - $sql -> db_Select_gen($query); - - // $sql->db_Select("download", "*", "{$topic} download_active > 0 AND download_class IN (".$class_list.") ORDER BY download_datestamp DESC LIMIT 0,".$this -> limit); - $tmp = $sql->db_getList(); - $rss = array(); - $loop=0; - foreach($tmp as $value) - { - if($value['download_author']) - { - $nick = preg_replace("/[0-9]+\./", "", $value['download_author']); - $rss[$loop]['author'] = $nick; - } - $rss[$loop]['author_email'] = $value['download_author_email']; - $rss[$loop]['title'] = $value['download_name']; - $rss[$loop]['link'] = $e107->base_path."download.php?view.".$value['download_id']; - $rss['description'] = ($rss_type == 3 ? $value['download_description'] : $value['download_description']); - $rss['category_name'] = $value['download_category_name']; - $rss['category_link'] = $e107->base_path."download.php?list.".$value['download_category_id']; - $rss['enc_url'] = $e107->base_path."request.php?".$value['download_id']; - $rss['enc_leng'] = $value['download_filesize']; - $rss['enc_type'] = $this->getmime($value['download_url']); - $rss['pubdate'] = $value['download_datestamp']; - $loop++; - } - + // $sql->db_Select("download", "*", "{$topic} download_active > 0 AND download_class IN (".$class_list.") ORDER BY download_datestamp DESC LIMIT 0,".$this -> limit); + $tmp = $sql->db_getList(); + $rss = array(); + $loop=0; + foreach($tmp as $value) + { + if($value['download_author']) + { + $nick = preg_replace("/[0-9]+\./", "", $value['download_author']); + $rss[$loop]['author'] = $nick; + } + $rss[$loop]['author_email'] = $value['download_author_email']; + $rss[$loop]['title'] = $value['download_name']; + $rss[$loop]['link'] = $e107->base_path."download/download.php?view.".$value['download_id']; + $rss[$loop]['description'] = ($rss_type == 3 ? $value['download_description'] : $value['download_description']); + $rss[$loop]['category_name'] = $value['download_category_name']; + $rss[$loop]['category_link'] = $e107->base_path."download/download.php?list.".$value['download_category_id']; + $rss[$loop]['enc_url'] = $e107->base_path."download/request.php?".$value['download_id']; + $rss[$loop]['enc_leng'] = $value['download_filesize']; + $rss[$loop]['enc_type'] = $this->getmime($value['download_url']); + $rss[$loop]['datestamp'] = $value['download_datestamp']; + $loop++; + } //##### ------------------------------------------------------------------------------------