mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-07-31 20:00:37 +02:00
Code Issues Releases Wiki Activity

NewsTags shortcode, some admin-ui fixes and newspost thumbnail BC fixes.

Browse Source
This commit is contained in:
CaMer0n
2012-07-15 03:01:30 +00:00
parent 5f61a512ae
commit 187bb8f53b
8 changed files with 71 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
news.php
View File

@@ -46,7 +46,7 @@ if (!defined('ITEMVIEW'))
define('ITEMVIEW', varset($pref['newsposts'],15));
}
if (e_QUERY)
if (e_QUERY) //TODO add support for $_GET['cat'] and $_GET['mode'] and phase-out the x.x.x format.
{
$tmp = explode(".",e_QUERY);
@@ -123,7 +123,8 @@ $nobody_regexp = "'(^|,)(".str_replace(",", "|", e_UC_NOBODY).")(,|$)'";
// DISPLAY NEWS IN 'CATEGORY' FORMAT HERE
//------------------------------------------------------
// Just title and a few other details
if ($action == 'cat' || $action == 'all')
if ($action == 'cat' || $action == 'all' || vartrue($_GET['tag']))
{ // --> Cache
if($newsCachedPage = checkCache($cacheString))
{
@@ -175,6 +176,22 @@ if ($action == 'cat' || $action == 'all')
ORDER BY n.news_datestamp DESC
LIMIT ".intval($newsfrom).",".NEWSLIST_LIMIT;
}
elseif(vartrue($_GET['tag']))
{
$tagsearch = preg_replace('#[^a-zA-Z0-9\-]#','', $_GET['tag']);
$query = "
SELECT n.*, u.user_id, u.user_name, u.user_customtitle, nc.category_name, nc.category_icon, nc.category_meta_keywords,
nc.category_meta_description{$rewrite_cols_cat}{$rewrite_cols}
FROM #news AS n
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
WHERE n.news_meta_keywords LIKE '%".$tagsearch."%'
AND n.news_start < ".time()." AND (n.news_end=0 || n.news_end>".time().")
AND n.news_class REGEXP '".e_CLASS_REGEXP."' AND NOT (n.news_class REGEXP ".$nobody_regexp.")
ORDER BY n.news_datestamp DESC
LIMIT ".intval($newsfrom).",".NEWSLIST_LIMIT;
$category_name = 'Tag: "'.$tagsearch.'"';
}
$newsList = array();
if($sql->db_Select_gen($query))