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

Issue #106: News Category SEF

Browse Source
This commit is contained in:
SecretR
2013-02-19 18:36:58 +02:00
parent 439fb926a5
commit a6adeca93c
7 changed files with 210 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
e107_core/shortcodes/batch/news_shortcodes.php
View File

@@ -41,6 +41,13 @@ class news_shortcodes extends e_shortcode
return $this->e107->tp->toHTML($this->news_item['news_title'], TRUE, 'TITLE');
}
function sc_newsurltitle()
{
$title = $this->sc_newstitle();
// FIXME generic parser toAttribute method (currently toAttribute() isn't appropriate)
return '<a href="'.$this->sc_newsurl().'" title="'.preg_replace('/\'|"|<|>/s', '', $this->news_item['news_title']).'">'.$title.'</a>';
}
function sc_newsbody($parm)
{
e107::getBB()->setClass("news");

120
e107_core/shortcodes/single/news_categories.sc
View File

@@ -5,7 +5,15 @@
* News Categories shortcode
*/
//<?
global $e107, $sql,$pref,$tp,$NEWSCAT,$NEWSCAT_ITEM;
global $NEWSCAT,$NEWSCAT_ITEM;
// FIXME full rewrite!!!
$e107 = e107::getInstance();
$sql = e107::getDb();
$pref = e107::getPref();
$tp = e107::getParser();
$scbatch = e107::getScBatch('news');
$cString = 'nq_news_categories_sc';
$cached = e107::getCache()->retrieve($cString);
@@ -21,11 +29,19 @@ $ix = new news;
$nbr_cols = (isset($pref['nbr_cols'])) ? $pref['nbr_cols'] : 1;
$nbr_cols = (defined("NEWSCAT_COLS")) ? NEWSCAT_COLS : $nbr_cols;
if(!defined("NEWSCAT_AMOUNT")){
if(!defined("NEWSCAT_AMOUNT"))
{
define("NEWSCAT_AMOUNT",3);
}
if(!$NEWSCAT){
// News templates with BC
if(!$NEWSCAT)
{
$tmpl = e107::getTemplate('news', 'news', 'category');
$NEWSCAT = $tmpl['body'];
}
if(!$NEWSCAT)
{
$NEWSCAT = "
<div style='padding:5px'><div style='border-bottom:1px inset black; padding-bottom:1px;margin-bottom:5px'>
{NEWSCATICON}&nbsp;{NEWSCATEGORY}
@@ -34,8 +50,15 @@ $nbr_cols = (defined("NEWSCAT_COLS")) ? NEWSCAT_COLS : $nbr_cols;
</div>
";
}
if(!$NEWSCAT_ITEM){
// News templates with BC
if(!$NEWSCAT_ITEM)
{
$tmpl = e107::getTemplate('news', 'news', 'category');
$NEWSCAT_ITEM = $tmpl['item'];
}
if(!$NEWSCAT_ITEM)
{
$NEWSCAT_ITEM = "
<div style='width:100%;padding-bottom:2px'>
<table style='width:100%' cellpadding='0' cellspacing='0' border='0'>
@@ -52,23 +75,29 @@ $nbr_cols = (defined("NEWSCAT_COLS")) ? NEWSCAT_COLS : $nbr_cols;
}
if(!defined("NEWSCAT_CATLINK")){
if(!defined("NEWSCAT_CATLINK"))
{
define("NEWSCAT_CATLINK","");
}
if(!defined("NEWSCAT_ITEMLINK")){
if(!defined("NEWSCAT_ITEMLINK"))
{
define("NEWSCAT_ITEMLINK","");
}
if(!defined("NEWSCAT_STYLE")){
if(!defined("NEWSCAT_STYLE"))
{
define("NEWSCAT_STYLE","width:96%");
}
if(!defined("NEWSCAT_CATICON")){
if(!defined("NEWSCAT_CATICON"))
{
define("NEWSCAT_CATICON","border:0px");
}
if(!defined("NEWSCAT_THUMB")){
if(!defined("NEWSCAT_THUMB"))
{
define("NEWSCAT_THUMB","border:0px");
}
if(!defined("NEWSCAT_CELL")){
if(!defined("NEWSCAT_CELL"))
{
define("NEWSCAT_CELL","vertical-align:top");
}
@@ -79,24 +108,37 @@ $nbr_cols = (defined("NEWSCAT_COLS")) ? NEWSCAT_COLS : $nbr_cols;
$param['catlink'] = NEWSCAT_CATLINK;
$param['caticon'] = NEWSCAT_CATICON;
$sql2 = new db;
$qry = "SELECT nc.*, ncr.news_rewrite_string AS news_category_rewrite_string, ncr.news_rewrite_id AS news_category_rewrite_id FROM #news_category AS nc
LEFT JOIN #news_rewrite AS ncr ON nc.category_id=ncr.news_rewrite_source AND ncr.news_rewrite_type=2
ORDER BY nc.category_order ASC
";
// get categories
$sql2 = e107::getDb('sql2');
$_time = time();
$qry = "SELECT nc.*, COUNT(n.news_id) as ccount FROM #news_category AS nc
LEFT JOIN #news as n ON n.news_category=nc.category_id
WHERE n.news_class IN (".USERCLASS_LIST.")
AND (n.news_start=0 || news_start < {$_time})
AND (n.news_end=0 || news_end > {$_time})
GROUP BY nc.category_id
ORDER BY nc.category_order ASC";
if(!$sql2->db_Select_gen($qry))
{
return '';
}
$cats = array();
while ($row = $sql2->db_Fetch())
{
if($row['ccount'] > 0) $cats[$row['category_id']] = $row;
}
if(empty($cats)) return;
$text3 = "\n\n\n
<div style='width:100%;text-align:center;margin-left:auto;margin-right:auto'>
<table style='".NEWSCAT_STYLE."' cellpadding='0' cellspacing='0'>
\n";
$t = 0;
$wid = floor(100/$nbr_cols);
while ($row3 = $sql2->db_Fetch()) {
$wid = floor(100/$nbr_cols);
foreach($cats as $row3)
{
extract($row3);
$scbatch->setScVar('news_item', $row3);
//quick fix
if($category_icon)
{
@@ -110,30 +152,22 @@ $nbr_cols = (defined("NEWSCAT_COLS")) ? NEWSCAT_COLS : $nbr_cols;
$category_icon = e_IMAGE_ABS."icons/".$category_icon;
}
}
$search[0] = "/\{NEWSCATICON\}(.*?)/si";
$replace[0] = ($category_icon) ? "<a href='".e107::getUrl('core:news', 'main', 'action=list&id='.$category_id.'&sef='.$news_category_rewrite_string)."'><img src='".$category_icon."' alt='' style='".$param['caticon']."' /></a>" : "";
$search[1] = "/\{NEWSCATEGORY\}(.*?)/si";
$replace[1] = ($category_name) ? "<a href='".e107::getUrl('core:news', 'main', 'action=list&id='.$category_id.'&sef='.$news_category_rewrite_string)."' style='".$param['catlink']."' >".$tp->toHTML($category_name,TRUE,"defs")."</a>" : "";
$text3 .= ($t % $nbr_cols == 0) ? "<tr>" : "";
$text3 .= "\n<td style='".NEWSCAT_CELL."; width:$wid%;'>\n";
// Grab each news item.--------------
$cqry = "SELECT n.*, nr.* FROM #news AS n
LEFT JOIN #news_rewrite AS nr ON n.news_id=nr.news_rewrite_source AND nr.news_rewrite_type=1
$cqry = "SELECT n.* FROM #news AS n
WHERE news_category='".intval($category_id)."'
AND news_class IN (".USERCLASS_LIST.")
AND (news_start=0 || news_start < ".time().")
AND (news_end=0 || news_end>".time().")
AND (news_start=0 || news_start < {$_time})
AND (news_end=0 || news_end > {$_time})
ORDER BY news_datestamp DESC LIMIT 0,".NEWSCAT_AMOUNT;
$count = $sql->db_Select_gen($cqry);
//$count = $sql->db_Select("news", "*", "news_category='".intval($category_id)."' AND news_class IN (".USERCLASS_LIST.") AND (news_start=0 || news_start < ".time().") AND (news_end=0 || news_end>".time().") ORDER BY news_datestamp DESC LIMIT 0,".NEWSCAT_AMOUNT);
if($count)
{
while ($row = $sql->db_Fetch()) {
while ($row = $sql->db_Fetch())
{
$scbatch->setScVar('news_item', $row);
//$row['category_name'] = $category_name;
//$row['category_icon'] = $category_icon;
$row = array_merge($row, $row3);
@@ -142,24 +176,38 @@ $nbr_cols = (defined("NEWSCAT_COLS")) ? NEWSCAT_COLS : $nbr_cols;
}
}
// ----------------------------------
$search[0] = "/\{NEWSCATICON\}(.*?)/si";
$replace[0] = $scbatch->sc_newscaticon('url');
$search[1] = "/\{NEWSCATEGORY\}(.*?)/si";
$replace[1] = $scbatch->sc_newscategory();
$search[2] = "/\{NEWSCAT_ITEM\}(.*?)/si";
$replace[2] = $textbody;
$text3 .= ($t % $nbr_cols == 0) ? "<tr>" : "";
$text3 .= "\n<td style='".NEWSCAT_CELL."; width:$wid%;'>\n";
$text3 .= preg_replace($search, $replace,$NEWSCAT);
unset($textbody);
$text3 .= "\n</td>\n";
if (($t+1) % $nbr_cols == 0) {
if (($t+1) % $nbr_cols == 0)
{
$text3 .= "</tr>";
$t++;
} else {
}
else
{
$t++;
}
}
while ($t % $nbr_cols != 0){
while ($t % $nbr_cols != 0)
{
$text3 .= "<td style='".NEWSCAT_CELL.";width:{$wid}%'>&nbsp;</td>\n";
$text3 .= (($t+1) % $nbr_cols == 0) ? "</tr>" : "";
$t++;

6
e107_core/shortcodes/single/news_category.sc
View File

@@ -1,3 +1,5 @@
require_once(e_PLUGIN."alt_news/alt_news.php");
alt_news($parm);
//<?
// FIXME obsolete, remove, or switch to news_categories_menu (BC)
//require_once(e_PLUGIN."alt_news/alt_news.php");
//alt_news($parm);
return "";