mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-03 13:17:24 +02:00
Code Issues Releases Wiki Activity

Fixes #4172 - Incorrect RSS URLs on news and incorrect SEF URL example.

Browse Source
This commit is contained in:
Cameron
2020-05-20 11:49:05 -07:00
parent 80c5bd7582
commit 74a3735488
3 changed files with 22 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
e107_core/url/news/sef_url.php
View File

@@ -140,7 +140,7 @@ class core_news_sef_url extends eUrlConfig
'name' => LAN_EURL_CORE_NEWS, // Module name 'name' => LAN_EURL_CORE_NEWS, // Module name
'label' => LAN_EURL_NEWS_REWRITEX_LABEL, // Current profile name 'label' => LAN_EURL_NEWS_REWRITEX_LABEL, // Current profile name
'description' => LAN_EURL_NEWS_REWRITEX_DESCR, // 'description' => LAN_EURL_NEWS_REWRITEX_DESCR, //
'examples' => array('{SITEURL}news/1/news-title') 'examples' => array('{SITEURL}news/view/1/news-category/news-title')
), ),
'generate' => array('table'=> 'news', 'primary'=>'news_id', 'input'=>'news_title', 'output'=>'news_sef'), 'generate' => array('table'=> 'news', 'primary'=>'news_id', 'input'=>'news_title', 'output'=>'news_sef'),
'form' => array(), // Under construction - additional configuration options 'form' => array(), // Under construction - additional configuration options

2
e107_plugins/news/e_rss.php
View File

@@ -76,7 +76,7 @@ class news_rss // plugin-folder + '_rss'
$topic = (!empty($parms['id']) && is_numeric($parms['id'])) ? " AND news_category = ".intval($parms['id']) : ''; $topic = (!empty($parms['id']) && is_numeric($parms['id'])) ? " AND news_category = ".intval($parms['id']) : '';
$limit = vartrue($parms['limit'],10); $limit = vartrue($parms['limit'],10);
$rssQuery = "SELECT n.*, u.user_id, u.user_name, u.user_email, u.user_customtitle, nc.category_name, nc.category_icon FROM #news AS n $rssQuery = "SELECT n.*, u.user_id, u.user_name, u.user_email, u.user_customtitle, nc.category_name, nc.category_sef, nc.category_icon FROM #news AS n
LEFT JOIN #user AS u ON n.news_author = u.user_id LEFT JOIN #user AS u ON n.news_author = u.user_id
LEFT JOIN #news_category AS nc ON n.news_category = nc.category_id LEFT JOIN #news_category AS nc ON n.news_category = nc.category_id
WHERE n.news_class IN (".USERCLASS_LIST.") AND NOT (n.news_class REGEXP ".$nobody_regexp.") AND n.news_start < ".time()." AND (n.news_end=0 || n.news_end>".time().") {$render} {$topic} ORDER BY n.news_datestamp DESC LIMIT 0,".$limit; WHERE n.news_class IN (".USERCLASS_LIST.") AND NOT (n.news_class REGEXP ".$nobody_regexp.") AND n.news_start < ".time()." AND (n.news_end=0 || n.news_end>".time().") {$render} {$topic} ORDER BY n.news_datestamp DESC LIMIT 0,".$limit;

37
e107_plugins/rss_menu/e_meta.php
View File

@@ -10,38 +10,41 @@
| Released under the terms and conditions of the | Released under the terms and conditions of the
| GNU General Public License (http://gnu.org). | GNU General Public License (http://gnu.org).
| |
| $Source: /cvs_backup/e107_0.8/e107_plugins/rss_menu/e_meta.php,v $
| $Revision$
| $Date$
| $Author$
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
if (!defined('e107_INIT')) { exit; } if (!defined('e107_INIT')) { exit; }
global $PLUGINS_DIRECTORY;
$tp = e107::getParser();
$sql = e107::getDb();
if(USER_AREA && $sql->select("rss", "*", "rss_class='0' AND rss_limit>0 ORDER BY rss_name")) if(USER_AREA && $sql->select("rss", "*", "rss_class='0' AND rss_limit>0 ORDER BY rss_name"))
{ {
$tp = e107::getParser();
$sql = e107::getDb();
while($row = $sql->fetch()) while($row = $sql->fetch())
{ {
if(strpos($row['rss_url'], "*") === false) // Wildcard topic_id's should not be listed if(strpos($row['rss_url'], "*") === false) // Wildcard topic_id's should not be listed
{ {
// $url = SITEURL.$PLUGINS_DIRECTORY."rss_menu/rss.php?".$tp->toHTML($row['rss_url'], TRUE, 'constants, no_hook, emotes_off').".2";
// $url .= ($row['rss_topicid']) ? ".".$row['rss_topicid'] : "";
$url2 = rtrim(SITEURL,'/') . e107::url('rss_menu','rss', $row);
$url4 = rtrim(SITEURL,'/') . e107::url('rss_menu','atom', $row);
$name = $tp->toHTML($row['rss_name'], TRUE, 'no_hook, emotes_off'); $name = $tp->toHTML($row['rss_name'], TRUE, 'no_hook, emotes_off');
$title = htmlspecialchars(SITENAME, ENT_QUOTES, 'utf-8')." ".htmlspecialchars($name, ENT_QUOTES, 'utf-8');
echo "<link rel='alternate' type='application/rss+xml' title='".htmlspecialchars(SITENAME, ENT_QUOTES, 'utf-8')." ".htmlspecialchars($name, ENT_QUOTES, 'utf-8')."' href='".$url2."' />\n"; e107::link([
echo "<link rel='alternate' type='application/atom+xml' title='".htmlspecialchars(SITENAME, ENT_QUOTES, 'utf-8')." ".htmlspecialchars($name, ENT_QUOTES, 'utf-8')."' href='".$url4."' />\n"; 'rel' => 'alternate',
'type' => 'application/rss+xml',
'title' => $title,
'href' => e107::url('rss_menu','rss', $row, array('mode'=>'full'))
]);
e107::link([
'rel' => 'alternate',
'type' => 'application/atom+xml',
'title' => $title,
'href' => e107::url('rss_menu','atom', $row, array('mode'=>'full'))
]);
} }
} }
unset($name, $title);
} }
?>