mirror of
https://github.com/e107inc/e107.git
synced 2025-08-03 13:17:24 +02:00
rss_menu code clean-up
This commit is contained in:
@@ -65,7 +65,6 @@ if(!empty($_GET['type']))
|
|||||||
$content_type = $tp->toDB($_GET['cat']);
|
$content_type = $tp->toDB($_GET['cat']);
|
||||||
$rss_type = intval(varset($_GET['type'],0));
|
$rss_type = intval(varset($_GET['type'],0));
|
||||||
$topic_id = $tp->toDB($_GET['topic'],'');
|
$topic_id = $tp->toDB($_GET['topic'],'');
|
||||||
|
|
||||||
}
|
}
|
||||||
elseif(e_QUERY)
|
elseif(e_QUERY)
|
||||||
{
|
{
|
||||||
@@ -84,8 +83,8 @@ else
|
|||||||
|
|
||||||
// List available rss feeds
|
// List available rss feeds
|
||||||
if (empty($rss_type))
|
if (empty($rss_type))
|
||||||
{ // Display list of all feeds
|
{
|
||||||
|
// Display list of all feeds
|
||||||
require_once(HEADERF);
|
require_once(HEADERF);
|
||||||
|
|
||||||
// require_once(e_PLUGIN.'rss_menu/rss_template.php'); Already loaded
|
// require_once(e_PLUGIN.'rss_menu/rss_template.php'); Already loaded
|
||||||
@@ -137,9 +136,11 @@ if(!$sql->select('rss', '*', "rss_class!=2 AND rss_url='".$content_type."' ".$ch
|
|||||||
if(!$sql->select('rss', '*', "rss_class != 2 AND rss_url='".$content_type."' ".$check_topic." AND rss_limit > 0 "))
|
if(!$sql->select('rss', '*', "rss_class != 2 AND rss_url='".$content_type."' ".$check_topic." AND rss_limit > 0 "))
|
||||||
{
|
{
|
||||||
require_once(HEADERF);
|
require_once(HEADERF);
|
||||||
|
|
||||||
$repl = array("<br /><br /><a href='".e_REQUEST_SELF."'>", "</a>");
|
$repl = array("<br /><br /><a href='".e_REQUEST_SELF."'>", "</a>");
|
||||||
$message = str_replace(array("[","]"), $repl, RSS_LAN_ERROR_1);
|
$message = str_replace(array("[","]"), $repl, RSS_LAN_ERROR_1);
|
||||||
$ns->tablerender('', $message);
|
$ns->tablerender('', $message);
|
||||||
|
|
||||||
require_once(FOOTERF);
|
require_once(FOOTERF);
|
||||||
exit;
|
exit;
|
||||||
}
|
}
|
||||||
@@ -338,11 +339,14 @@ class rssCreate
|
|||||||
$this -> rssItems[$k]['link'] = SITEURLBASE.e_PLUGIN_ABS.$row['link'];
|
$this -> rssItems[$k]['link'] = SITEURLBASE.e_PLUGIN_ABS.$row['link'];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
$this -> rssItems[$k]['description'] = $row['description'];
|
$this -> rssItems[$k]['description'] = $row['description'];
|
||||||
|
|
||||||
if($row['enc_url'])
|
if($row['enc_url'])
|
||||||
{
|
{
|
||||||
$this -> rssItems[$k]['enc_url'] = SITEURLBASE.e_PLUGIN_ABS.$row['enc_url'].$row['item_id'];
|
$this -> rssItems[$k]['enc_url'] = SITEURLBASE.e_PLUGIN_ABS.$row['enc_url'].$row['item_id'];
|
||||||
}
|
}
|
||||||
|
|
||||||
if($row['enc_leng'])
|
if($row['enc_leng'])
|
||||||
{
|
{
|
||||||
$this -> rssItems[$k]['enc_leng'] = $row['enc_leng'];
|
$this -> rssItems[$k]['enc_leng'] = $row['enc_leng'];
|
||||||
@@ -358,6 +362,7 @@ class rssCreate
|
|||||||
}
|
}
|
||||||
|
|
||||||
$this -> rssItems[$k]['category_name'] = $row['category_name'];
|
$this -> rssItems[$k]['category_name'] = $row['category_name'];
|
||||||
|
|
||||||
if($row['category_link'])
|
if($row['category_link'])
|
||||||
{
|
{
|
||||||
if(stripos($row['category_link'], 'http') !== FALSE)
|
if(stripos($row['category_link'], 'http') !== FALSE)
|
||||||
@@ -369,6 +374,7 @@ class rssCreate
|
|||||||
$this -> rssItems[$k]['category_link'] = SITEURLBASE.e_PLUGIN_ABS.$row['category_link'];
|
$this -> rssItems[$k]['category_link'] = SITEURLBASE.e_PLUGIN_ABS.$row['category_link'];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if(!empty($row['datestamp']))
|
if(!empty($row['datestamp']))
|
||||||
{
|
{
|
||||||
$this -> rssItems[$k]['pubdate'] = $row['datestamp'];
|
$this -> rssItems[$k]['pubdate'] = $row['datestamp'];
|
||||||
|
Reference in New Issue
Block a user