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

Updated shortcode handler to support class->method use in batch shortcodes. Updated bbcode and news shortcodes to use this new method. Reduced the use of cachevar usage in the new shortcodes.

Browse Source 
I may have broken overriding of core news shortcodes, need to look into that.
This commit is contained in:
mcfly
2009-01-07 19:57:09 +00:00
parent bd228fc99f
commit b489d7cef3
3 changed files with 378 additions and 311 deletions
Download Patch File Download Diff File Expand all files Collapse all files

488
e107_files/shortcode/batch/news_shortcodes.php
View File

@@ -1,114 +1,104 @@
<?php <?php
/* /*
* Copyright e107 Inc e107.org, Licensed under GNU GPL (http://www.gnu.org/licenses/gpl.txt) * Copyright e107 Inc e107.org, Licensed under GNU GPL (http://www.gnu.org/licenses/gpl.txt)
* $Id: news_shortcodes.php,v 1.14 2008-12-03 12:38:07 secretr Exp $ * $Id: news_shortcodes.php,v 1.15 2009-01-07 19:57:09 mcfly_e107 Exp $
* *
* News shortcode batch * News shortcode batch
*/ */
if (!defined('e107_INIT')) { exit; } if (!defined('e107_INIT')) { exit; }
include_once(e_HANDLER.'shortcode_handler.php'); include_once(e_HANDLER.'shortcode_handler.php');
$news_shortcodes = $tp -> e_sc -> parse_scbatch(__FILE__);
/*
SC_BEGIN NEWSTITLE
global $tp;
$news_item = getcachedvars('current_news_item');
$param = getcachedvars('current_news_param');
return $tp -> toHTML($news_item['news_title'], TRUE, 'TITLE');
SC_END
SC_BEGIN NEWSBODY $codes = array(
global $tp; 'newstitle', 'newsbody', 'newsicon','newsauthor', 'newscomments',
$news_item = getcachedvars('current_news_item'); 'trackback', 'newsheader', 'newscategory', 'newsdate', 'newscommentlink',
$param = getcachedvars('current_news_param'); 'newscommentcount', 'emailicon', 'printicon', 'pdficon', 'newsid', 'adminoptions',
$news_body = $tp -> toHTML($news_item['news_body'], TRUE, 'BODY, fromadmin', $news_item['news_author']); 'extended', 'captionclass', 'admincaption', 'adminbody', 'newssummary',
if($news_item['news_extended'] && (isset($_POST['preview']) || strpos(e_QUERY, 'extend') !== FALSE) && $parm != "noextend") { 'newsthumbnail', 'newsimage', 'sticky_icon', 'newstitlelink', 'newscaticon', 'newsinfo'
$news_extended = $tp -> toHTML($news_item['news_extended'], TRUE, 'BODY, fromadmin', $news_item['news_author']); );
$news_body .= "<br /><br />".$news_extended; register_shortcode('news_shortcodes', $codes);
class news_shortcodes
{
var $news_item, $param, $e107;
function news_shortcodes()
{
$this->e107 = e107::getInstance();
}
function load_news_item()
{
global $newsItemBegin;
if($newsItemBegin == true)
{
$this->news_item = getcachedvars('current_news_item');
$this->param = getcachedvars('current_news_param');
$newsItemBegin = false;
}
}
function get_newstitle()
{
$this->load_news_item();
return $this->e107->tp->toHTML($this->news_item['news_title'], TRUE, 'TITLE');
}
function get_newsbody($parm)
{
$this->load_news_item();
$news_body = $this->e107->tp->toHTML($this->news_item['news_body'], true, 'BODY, fromadmin', $this->news_item['news_author']);
if($this->news_item['news_extended'] && (isset($_POST['preview']) || strpos(e_QUERY, 'extend') !== FALSE) && $parm != 'noextend')
{
$news_extended = $this->e107->tp->toHTML($this->news_item['news_extended'], true, 'BODY, fromadmin', $this->news_item['news_author']);
$news_body .= '<br /><br />'.$news_extended;
} }
return $news_body; return $news_body;
SC_END
SC_BEGIN NEWSICON
global $e107, $tp, $news_shortcodes;
$news_item = getcachedvars('current_news_item');
$param = getcachedvars('current_news_param');
$category_icon = $tp -> parseTemplate('{NEWSHEADER}', FALSE, $news_shortcodes);
if (!$category_icon) return '';
return "<a href='".$e107->url->getUrl('core:news', 'main', 'action=cat&value='.$news_item['news_category'])."'><img style='".$param['caticon']."' src='".$category_icon."' alt='' /></a>";
SC_END
SC_BEGIN NEWSHEADER
$news_item = getcachedvars('current_news_item');
$param = getcachedvars('current_news_param');
$category_icon = str_replace("../", "", trim($news_item['category_icon']));
if (!$category_icon) return '';
if ($category_icon && strstr("images", $category_icon)) {
return THEME_ABS.$category_icon;
} else {
return e_IMAGE_ABS."icons/".$category_icon;
} }
SC_END
SC_BEGIN NEWSCATEGORY function get_newsicon($parm)
global $tp, $e107;
$news_item = getcachedvars('current_news_item');
$param = getcachedvars('current_news_param');
$category_name = $tp -> toHTML($news_item['category_name'],FALSE,"defs");
return "<a class='".$GLOBALS['NEWS_CSSMODE']."_category' style='".(isset($param['catlink']) ? $param['catlink'] : "#")."' href='".$e107->url->getUrl('core:news', 'main', 'action=cat&value='.$news_item['news_category'])."'>".$category_name."</a>";
SC_END
SC_BEGIN NEWSAUTHOR
global $e107;
$news_item = getcachedvars('current_news_item');
$param = getcachedvars('current_news_param');
if($news_item['user_id'])
{ {
if($parm == 'nolink') $this->load_news_item();
$category_icon = str_replace('../', '', trim($this->news_item['category_icon']));
if ($category_icon && strstr('images', $category_icon))
{ {
return $news_item['user_name']; $category_icon = THEME_ABS.$category_icon;
} }
else else
{ {
return "<a href='".$e107->url->getUrl('core:user', 'main', 'func=profile&id='.$news_item['user_id'])."'>".$news_item['user_name']."{$parm}</a>"; $category_icon = e_IMAGE_ABS.'icons/'.$category_icon;
}
if (!$category_icon) { return ''; }
return "<a href='".$this->e107->url->getUrl('core:news', 'main', 'action=cat&value='.$this->news_item['news_category'])."'><img style='".$this->param['caticon']."' src='".$category_icon."' alt='' /></a>";
}
function get_newsauthor($parm)
{
$this->load_news_item();
if($this->news_item['user_id'])
{
if($parm == 'nolink')
{
return $this->news_item['user_name'];
}
else
{
return "<a href='".$this->e107->url->getUrl('core:user', 'main', 'func=profile&id='.$this->news_item['user_id'])."'>".$this->news_item['user_name']."{$parm}</a>";
} }
} }
return "<a href='http://e107.org'>e107</a>"; return "<a href='http://e107.org'>e107</a>";
SC_END
SC_BEGIN NEWSDATE
$news_item = getcachedvars('current_news_item');
$param = getcachedvars('current_news_param');
$con = new convert;
if($parm == "")
{
return $con -> convert_date($news_item['news_datestamp'], 'long');
} }
switch($parm)
{
case 'long':
return $con -> convert_date($news_item['news_datestamp'], 'long');
break;
case 'short':
return $con -> convert_date($news_item['news_datestamp'], 'short');
break;
case 'forum':
return $con -> convert_date($news_item['news_datestamp'], 'forum');
break;
default :
return date($parm, $news_item['news_datestamp']);
break;
}
SC_END
SC_BEGIN NEWSCOMMENTS function get_newscomments($parm)
{
$this->load_news_item();
global $pref, $sql; global $pref, $sql;
if($pref['comments_disabled'] == 1) if($pref['comments_disabled'] == 1)
{ {
return; return;
} }
$news_item = getcachedvars('current_news_item'); $news_item = $this->news_item;
$param = getcachedvars('current_news_param'); $param = $this->param;
if (varsettrue($pref['multilanguage'])) if (varsettrue($pref['multilanguage']))
{ // Can have multilanguage news table, monlingual comment table. If the comment table is multilingual, it'll only count entries in the current language { // Can have multilanguage news table, monlingual comment table. If the comment table is multilingual, it'll only count entries in the current language
@@ -134,171 +124,229 @@ else
$NEWIMAGE = $param['image_nonew_small']; $NEWIMAGE = $param['image_nonew_small'];
} }
return ($news_item['news_allow_comments'] ? $param['commentoffstring'] : ''.($pref['comments_icon'] ? $NEWIMAGE : '')." <a href='".e_HTTP."comment.php?comment.news.".$news_item['news_id']."'>".$param['commentlink'].$news_item['news_comment_total'].'</a>'); return ($news_item['news_allow_comments'] ? $param['commentoffstring'] : ''.($pref['comments_icon'] ? $NEWIMAGE : '')." <a href='".e_HTTP."comment.php?comment.news.".$news_item['news_id']."'>".$param['commentlink'].$news_item['news_comment_total'].'</a>');
SC_END }
SC_BEGIN NEWSCOMMENTLINK function get_trackback($parm)
global $pref, $sql; {
$news_item = getcachedvars('current_news_item'); global $pref;
$param = getcachedvars('current_news_param'); $this->load_news_item();
return ($news_item['news_allow_comments'] ? $param['commentoffstring'] : " <a href='".e_HTTP."comment.php?comment.news.".$news_item['news_id']."'>".$param['commentlink']."</a>"); if(!varsettrue($pref['trackbackEnabled'])) { return ''; }
SC_END return ($this->param['trackbackbeforestring'] ? $this->param['trackbackbeforestring'] : '')."<a href='".e_HTTP."comment.php?comment.news.".$this->news_item['news_id']."#track'>".$this->param['trackbackstring'].$this->news_item['tb_count'].'</a>'.($this->param['trackbackafterstring'] ? $this->param['trackbackafterstring'] : '');
}
SC_BEGIN NEWSCOMMENTCOUNT function get_newsheader($parm)
global $pref, $sql; {
$news_item = getcachedvars('current_news_item'); $this->load_news_item();
return $news_item['news_comment_total']; $category_icon = str_replace("../", "", trim($this->news_item['category_icon']));
SC_END if (!$category_icon) return '';
if ($category_icon && strstr("images", $category_icon)) {
return THEME_ABS.$category_icon;
SC_BEGIN EMAILICON
$news_item = getcachedvars('current_news_item');
$param = getcachedvars('current_news_param');
require_once(e_HANDLER.'emailprint_class.php');
return emailprint::render_emailprint('news', $news_item['news_id'], 1);
SC_END
SC_BEGIN PRINTICON
$news_item = getcachedvars('current_news_item');
$param = getcachedvars('current_news_param');
require_once(e_HANDLER.'emailprint_class.php');
return emailprint::render_emailprint('news', $news_item['news_id'], 2);
SC_END
SC_BEGIN PDFICON
global $tp, $pref;
if (!$pref['plug_installed']['pdf']) return '';
$news_item = getcachedvars('current_news_item');
return $tp -> parseTemplate("{PDF=".LAN_NEWS_24."^news.".$news_item['news_id']."}");
SC_END
SC_BEGIN NEWSID
$news_item = getcachedvars('current_news_item');
$param = getcachedvars('current_news_param');
return $news_item['news_id'];
SC_END
SC_BEGIN ADMINOPTIONS
global $imode;
$news_item = getcachedvars('current_news_item');
$param = getcachedvars('current_news_param');
if (ADMIN && getperms("H")) {
$adop_icon = (file_exists(THEME."images/newsedit.png") ? THEME_ABS."images/newsedit.png" : e_IMAGE_ABS."packs/".$imode."/generic/newsedit.png");
return " <a href='".e_ADMIN_ABS."newspost.php?create.edit.".$news_item['news_id']."'><img src='".$adop_icon."' alt='' style='border:0' /></a>\n";
} else { } else {
return e_IMAGE_ABS."icons/".$category_icon;
}
}
function get_newscategory($parm)
{
$this->load_news_item();
$category_name = $this->e107->tp->toHTML($this->news_item['category_name'], FALSE ,'defs');
return "<a class='".$GLOBALS['NEWS_CSSMODE']."_category' style='".(isset($this->param['catlink']) ? $this->param['catlink'] : "#")."' href='".$e107->url->getUrl('core:news', 'main', 'action=cat&value='.$this->news_item['news_category'])."'>".$category_name."</a>";
}
function get_newsdate($parm)
{
$this->load_news_item();
$con = new convert;
if($parm == '')
{
return $con->convert_date($this->news_item['news_datestamp'], 'long');
}
switch($parm)
{
case 'long':
return $con->convert_date($this->news_item['news_datestamp'], 'long');
break;
case 'short':
return $con->convert_date($this->news_item['news_datestamp'], 'short');
break;
case 'forum':
return $con->convert_date($this->news_item['news_datestamp'], 'forum');
break;
default :
return date($parm, $this->news_item['news_datestamp']);
break;
}
}
function get_newscommentlink($parm)
{
$this->load_news_item();
return ($this->news_item['news_allow_comments'] ? $this->param['commentoffstring'] : " <a href='".e_HTTP."comment.php?comment.news.".$this->news_item['news_id']."'>".$this->param['commentlink'].'</a>');
}
function get_newscommentcount($parm)
{
$this->load_news_item();
return $this->news_item['news_comment_total'];
}
function get_emailicon($parm)
{
$this->load_news_item();
require_once(e_HANDLER.'emailprint_class.php');
return emailprint::render_emailprint('news', $this->news_item['news_id'], 1);
}
function get_printicon()
{
$this->load_news_item();
require_once(e_HANDLER.'emailprint_class.php');
return emailprint::render_emailprint('news', $this->news_item['news_id'], 2);
}
function get_pdficon()
{
global $pref;
$this->load_news_item();
if (!$pref['plug_installed']['pdf']) { return ''; }
return $this->e107->tp->parseTemplate('{PDF='.LAN_NEWS_24.'^news.'.$this->news_item['news_id'].'}');
}
function get_newsid()
{
$this->load_news_item();
return $this->news_item['news_id'];
}
function get_adminoptions()
{
global $imode;
$this->load_news_item();
if (ADMIN && getperms('H'))
{
$adop_icon = (file_exists(THEME."images/newsedit.png") ? THEME_ABS."images/newsedit.png" : e_IMAGE_ABS."packs/".$imode."/generic/newsedit.png");
return " <a href='".e_ADMIN_ABS."newspost.php?create.edit.".$this->news_item['news_id']."'><img src='".$adop_icon."' alt='' style='border:0' /></a>\n";
}
else
{
return ''; return '';
} }
SC_END }
SC_BEGIN EXTENDED function get_extended($parm)
global $e107; {
$news_item = getcachedvars('current_news_item'); $this->load_news_item();
$param = getcachedvars('current_news_param'); if ($this->news_item['news_extended'] && (strpos(e_QUERY, 'extend') === FALSE || $parm == 'force'))
if ($news_item['news_extended'] && (strpos(e_QUERY, 'extend') === FALSE || $parm == "force")) { {
if (defined("PRE_EXTENDEDSTRING")) { if (defined('PRE_EXTENDEDSTRING'))
{
$es1 = PRE_EXTENDEDSTRING; $es1 = PRE_EXTENDEDSTRING;
} }
if (defined("POST_EXTENDEDSTRING")) { if (defined('POST_EXTENDEDSTRING'))
{
$es2 = POST_EXTENDEDSTRING; $es2 = POST_EXTENDEDSTRING;
} }
if (isset($_POST['preview'])) { if (isset($_POST['preview']))
return $es1.EXTENDEDSTRING.$es2."<br />".$news_item['news_extended']; {
} else { return $es1.EXTENDEDSTRING.$es2."<br />".$this->news_item['news_extended'];
return $es1."<a href='".$e107->url->getUrl('core:news', 'main', 'action=extend&value='.$news_item['news_id'])."'>".EXTENDEDSTRING."</a>".$es2;
} }
} else { else
return ""; {
return $es1."<a href='".$this->e107->url->getUrl('core:news', 'main', 'action=extend&value='.$this->news_item['news_id'])."'>".EXTENDEDSTRING."</a>".$es2;
}
}
return '';
} }
SC_END
SC_BEGIN CAPTIONCLASS function get_captionclass()
global $tp; {
$news_item = getcachedvars('current_news_item'); $this->load_news_item();
$param = getcachedvars('current_news_param'); $news_title = $this->e107->tp->toHTML($this->news_item['news_title'], TRUE,'no_hook,emotes_off, no_make_clickable');
$news_title = $tp -> toHTML($news_item['news_title'], TRUE,'no_hook,emotes_off, no_make_clickable'); return "<div class='category".$this->news_item['news_category']."'>".($this->news_item['news_render_type'] == 1 ? "<a href='".e_HTTP."comment.php?comment.news.".$this->news_item['news_id']."'>".$news_title."</a>" : $news_title)."</div>";
return "<div class='category".$news_item['news_category']."'>".($news_item['news_render_type'] == 1 ? "<a href='".e_HTTP."comment.php?comment.news.".$news_item['news_id']."'>".$news_title."</a>" : $news_title)."</div>"; }
SC_END
SC_BEGIN ADMINCAPTION function get_admincaption()
global $tp; {
$news_item = getcachedvars('current_news_item'); $this->load_news_item();
$param = getcachedvars('current_news_param'); $news_title = $this->e107->tp->toHTML($this->news_item['news_title'], TRUE,'no_hook,emotes_off, no_make_clickable');
$news_title = $tp -> toHTML($news_item['news_title'], TRUE,'no_hook,emotes_off, no_make_clickable'); return "<div class='".(defined(ADMINNAME) ? ADMINNAME : "null")."'>".($this->news_item['news_render_type'] == 1 ? "<a href='".e_HTTP."comment.php?comment.news.".$this->news_item['news_id']."'>".$news_title."</a>" : $news_title)."</div>";
return "<div class='".(defined(ADMINNAME) ? ADMINNAME : "null")."'>".($news_item['news_render_type'] == 1 ? "<a href='".e_HTTP."comment.php?comment.news.".$news_item['news_id']."'>".$news_title."</a>" : $news_title)."</div>"; }
SC_END
SC_BEGIN ADMINBODY function get_adminbody()
{
global $tp, $news_shortcodes; global $tp, $news_shortcodes;
$news_item = getcachedvars('current_news_item'); $news_item = getcachedvars('current_news_item');
$param = getcachedvars('current_news_param'); $param = getcachedvars('current_news_param');
$news_body = $tp->parseTemplate('{NEWSBODY}', FALSE, $news_shortcodes); $news_body = $tp->parseTemplate('{NEWSBODY}', FALSE, $news_shortcodes);
return "<div class='".(defined(ADMINNAME) ? ADMINNAME : "null")."'>".$news_body."</div>"; return "<div class='".(defined(ADMINNAME) ? ADMINNAME : 'null')."'>".$news_body.'</div>';
SC_END }
SC_BEGIN NEWSSUMMARY function get_newssummary()
$news_item = getcachedvars('current_news_item'); {
$param = getcachedvars('current_news_param'); $this->load_news_item();
return ($news_item['news_summary']) ? $news_item['news_summary']."<br />" : ""; return ($this->news_item['news_summary']) ? $this->news_item['news_summary'].'<br />' : '';
SC_END }
SC_BEGIN NEWSTHUMBNAIL function get_newsthumbnail()
global $e107; {
$news_item = getcachedvars('current_news_item'); $this->load_news_item();
$param = getcachedvars('current_news_param'); return (isset($this->news_item['news_thumbnail']) && $this->news_item['news_thumbnail']) ? "<a href='".$this->e107->url->getUrl('core:news', 'main', "action=item&value1={$this->news_item['news_id']}&value2={$this->news_item['news_category']}")."'><img class='news_image' src='".e_IMAGE_ABS."newspost_images/".$this->news_item['news_thumbnail']."' alt='' style='".$this->param['thumbnail']."' /></a>" : '';
return (isset($news_item['news_thumbnail']) && $news_item['news_thumbnail']) ? "<a href='".$e107->url->getUrl('core:news', 'main', "action=item&value1={$news_item['news_id']}&value2={$news_item['news_category']}")."'><img class='news_image' src='".e_IMAGE_ABS."newspost_images/".$news_item['news_thumbnail']."' alt='' style='".$param['thumbnail']."' /></a>" : ""; }
SC_END
SC_BEGIN NEWSIMAGE function get_newsimage()
global $e107; {
$news_item = getcachedvars('current_news_item'); $this->load_news_item();
$param = getcachedvars('current_news_param'); return (isset($this->news_item['news_thumbnail']) && $this->news_item['news_thumbnail']) ? "<a href='".$this->e107->url->getUrl('core:news', 'main', "action=item&value1={$this->news_item['news_id']}&value2={$this->news_item['news_category']}")."'><img class='news_image' src='".e_IMAGE_ABS."newspost_images/".$this->news_item['news_thumbnail']."' alt='' style='".$this->param['thumbnail']."' /></a>" : '';
return (isset($news_item['news_thumbnail']) && $news_item['news_thumbnail']) ? "<a href='".$e107->url->getUrl('core:news', 'main', "action=item&value1={$news_item['news_id']}&value2={$news_item['news_category']}")."'><img class='news_image' src='".e_IMAGE_ABS."newspost_images/".$news_item['news_thumbnail']."' alt='' style='".$param['thumbnail']."' /></a>" : ""; }
SC_END
SC_BEGIN STICKY_ICON function get_sticky_icon()
$news_item = getcachedvars('current_news_item'); {
$param = getcachedvars('current_news_param'); $this->load_news_item();
return $news_item['news_sticky'] ? $param['image_sticky'] : ""; return $this->news_item['news_sticky'] ? $this->param['image_sticky'] : '';
SC_END }
SC_BEGIN NEWSTITLELINK function get_newstitlelink()
global $e107; {
$news_item = getcachedvars('current_news_item'); $this->load_news_item();
$param = getcachedvars('current_news_param'); return "<a style='".(isset($this->param['itemlink']) ? $this->param['itemlink'] : 'null')."' href='".$this->e107->url->getUrl('core:news', 'main', "action=item&value1={$this->news_item['news_id']}&value2={$this->news_item['news_category']}")."'>".$this->news_item['news_title'].'</a>';
return "<a style='".(isset($param['itemlink']) ? $param['itemlink'] : "null")."' href='".$e107->url->getUrl('core:news', 'main', "action=item&value1={$news_item['news_id']}&value2={$news_item['news_category']}")."'>".$news_item['news_title']."</a>"; }
SC_END
SC_BEGIN NEWSCATICON function get_newscaticon()
global $e107, $news_shortcodes; {
$news_item = getcachedvars('current_news_item'); $this->load_news_item();
$param = getcachedvars('current_news_param'); $category_icon = str_replace('../', '', trim($this->news_item['category_icon']));
$category_icon = $e107->tp->parseTemplate('{NEWSHEADER}', FALSE, $news_shortcodes); if (!$category_icon) { return ''; }
if (!$category_icon) return ''; if ($category_icon && strstr('images', $category_icon))
if($param['caticon'] == ""){$param['caticon'] = "border:0px";} {
return "<a href='".$e107->url->getUrl('core:news', 'main', "action=cat&value={$news_item['news_category']}")."'><img style='".$param['caticon']."' src='".$category_icon."' alt='' /></a>"; $category_icon = THEME_ABS.$category_icon;
SC_END }
else
{
$category_icon = e_IMAGE_ABS.'icons/'.$category_icon;
}
SC_BEGIN TRACKBACK if($this->param['caticon'] == ''){$this->param['caticon'] = 'border:0px';}
global $pref; return "<a href='".$this->e107->url->getUrl('core:news', 'main', "action=cat&value={$this->news_item['news_category']}")."'><img style='".$this->param['caticon']."' src='".$category_icon."' alt='' /></a>";
if(!varsettrue($pref['trackbackEnabled'])) return ''; }
$news_item = getcachedvars('current_news_item');
$param = getcachedvars('current_news_param');
return ($param['trackbackbeforestring'] ? $param['trackbackbeforestring'] : "")."<a href='".e_HTTP."comment.php?comment.news.".$news_item['news_id']."#track'>".$param['trackbackstring'].$news_item['tb_count']."</a>".($param['trackbackafterstring'] ? $param['trackbackafterstring'] : "");
SC_END
SC_BEGIN NEWSINFO function get_newsinfo()
global $ns; {
$news_item = getcachedvars('current_news_item'); $this->load_news_item();
$param = getcachedvars('current_news_param'); $news_item = $this->news_item;
$param = $this->param;
$con = new convert; $con = new convert;
$news_item['news_start'] = (isset($news_item['news_start']) && $news_item['news_start'] ? str_replace(" - 00:00:00", "", $con -> convert_date($news_item['news_start'], "long")) : LAN_NEWS_19); $news_item['news_start'] = (isset($news_item['news_start']) && $news_item['news_start'] ? str_replace(' - 00:00:00', '', $con->convert_date($news_item['news_start'], 'long')) : LAN_NEWS_19);
$news_item['news_end'] = (isset($news_item['news_end']) && $news_item['news_end'] ? " to ".str_replace(" - 00:00:00", "", $con -> convert_date($news_item['news_end'], "long")) : ""); $news_item['news_end'] = (isset($news_item['news_end']) && $news_item['news_end'] ? ' to '.str_replace(' - 00:00:00', '', $con->convert_date($news_item['news_end'], 'long')) : '');
$info = $news_item['news_render_type'] == 1 ? LAN_NEWS_9 : ""; $info = $news_item['news_render_type'] == 1 ? LAN_NEWS_9 : '';
$info .= $news_item['news_class'] == 255 ? LAN_NEWS_10 : LAN_NEWS_11; $info .= $news_item['news_class'] == 255 ? LAN_NEWS_10 : LAN_NEWS_11;
$info .= $news_item['news_sticky'] ? "<br />".LAN_NEWS_31 : ""; $info .= $news_item['news_sticky'] ? '<br />'.LAN_NEWS_31 : '';
$info .= "<br />".($news_item['news_allow_comments'] ? LAN_NEWS_13 : LAN_NEWS_12); $info .= '<br />'.($news_item['news_allow_comments'] ? LAN_NEWS_13 : LAN_NEWS_12);
$info .= LAN_NEWS_14.$news_item['news_start'].$news_item['news_end']."<br />"; $info .= LAN_NEWS_14.$news_item['news_start'].$news_item['news_end'].'<br />';
$info .= LAN_NEWS_15.strlen($news_item['news_body']).LAN_NEWS_16.strlen($news_item['news_extended']).LAN_NEWS_17."<br /><br />"; $info .= LAN_NEWS_15.strlen($news_item['news_body']).LAN_NEWS_16.strlen($news_item['news_extended']).LAN_NEWS_17."<br /><br />";
return $ns -> tablerender(LAN_NEWS_18, $info); return $this->e107->ns->tablerender(LAN_NEWS_18, $info);
SC_END }
*/
}
?> ?>

9
e107_handlers/news_class.php
View File

@@ -9,9 +9,9 @@
* News handler * News handler
* *
* $Source: /cvs_backup/e107_0.8/e107_handlers/news_class.php,v $ * $Source: /cvs_backup/e107_0.8/e107_handlers/news_class.php,v $
* $Revision: 1.8 $ * $Revision: 1.9 $
* $Date: 2008-12-29 20:50:41 $ * $Date: 2009-01-07 19:57:09 $
* $Author: lisa_ $ * $Author: mcfly_e107 $
*/ */
if (!defined('e107_INIT')) { exit; } if (!defined('e107_INIT')) { exit; }
@@ -122,7 +122,7 @@ class news {
function render_newsitem($news, $mode = 'default', $n_restrict = '', $NEWS_TEMPLATE = '', $param='') function render_newsitem($news, $mode = 'default', $n_restrict = '', $NEWS_TEMPLATE = '', $param='')
{ {
global $e107, $tp, $sql, $override, $pref, $ns, $NEWSSTYLE, $NEWSLISTSTYLE, $news_shortcodes, $loop_uid, $imode; global $e107, $tp, $sql, $override, $pref, $ns, $NEWSSTYLE, $NEWSLISTSTYLE, $news_shortcodes, $loop_uid, $imode, $newsItemBegin;
if ($override_newsitem = $override -> override_check('render_newsitem')) { if ($override_newsitem = $override -> override_check('render_newsitem')) {
$result = call_user_func($override_newsitem, $news, $mode, $n_restrict, $NEWS_TEMPLATE, $param); $result = call_user_func($override_newsitem, $news, $mode, $n_restrict, $NEWS_TEMPLATE, $param);
if ($result == 'return') if ($result == 'return')
@@ -212,6 +212,7 @@ class news {
$loop_uid = $news['news_author']; $loop_uid = $news['news_author'];
require_once(e_FILE.'shortcode/batch/news_shortcodes.php'); require_once(e_FILE.'shortcode/batch/news_shortcodes.php');
$newsItemBegin = true;
$text = $e107->tp -> parseTemplate($NEWS_PARSE, TRUE, $news_shortcodes); $text = $e107->tp -> parseTemplate($NEWS_PARSE, TRUE, $news_shortcodes);
if ($mode == 'return') if ($mode == 'return')

34
e107_handlers/shortcode_handler.php
View File

@@ -12,20 +12,28 @@
| GNU General Public License (http://gnu.org). | GNU General Public License (http://gnu.org).
| |
| $Source: /cvs_backup/e107_0.8/e107_handlers/shortcode_handler.php,v $ | $Source: /cvs_backup/e107_0.8/e107_handlers/shortcode_handler.php,v $
| $Revision: 1.14 $ | $Revision: 1.15 $
| $Date: 2008-10-30 20:21:55 $ | $Date: 2009-01-07 19:57:09 $
| $Author: e107steved $ | $Author: mcfly_e107 $
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
if (!defined('e107_INIT')) { exit; } if (!defined('e107_INIT')) { exit; }
function register_shortcode($code, $filename, $function, $force=false) function register_shortcode($class, $codes, $path='', $force=false)
{ {
global $e_shortcodes; global $e_shortcodes;
if(!is_array($codes))
{
$codes = array($codes);
}
foreach($codes as $code)
{
$code = strtoupper($code);
if(!array_key_exists($code, $e_shortcodes) || $force == true) if(!array_key_exists($code, $e_shortcodes) || $force == true)
{ {
$e_shortcodes[$code] = array('file' => $filename, 'function' => $function); $e_shortcodes[$code] = array('path' => $path, 'class' => $class, 'function' => $function);
}
} }
} }
@@ -35,6 +43,7 @@ class e_shortcode
var $parseSCFiles; // True if individual shortcode files are to be used var $parseSCFiles; // True if individual shortcode files are to be used
var $addedCodes; // Apparently not used var $addedCodes; // Apparently not used
var $registered_codes; // Shortcodes added by plugins var $registered_codes; // Shortcodes added by plugins
var $scClasses; //Batch shortcode classes
function e_shortcode() function e_shortcode()
{ {
@@ -132,10 +141,19 @@ class e_shortcode
/* Check for shortcode registered with $e_shortcodes */ /* Check for shortcode registered with $e_shortcodes */
if (is_array($e_shortcodes) && (array_key_exists($code, $e_shortcodes))) if (is_array($e_shortcodes) && (array_key_exists($code, $e_shortcodes)))
{ {
include_once($e_shortcodes[$code]['file']); $_class = $e_shortcodes[$code]['class'];
if(function_exists($e_shortcodes[$code]['function'])) $_method = 'get_'.strtolower($code);
if(!isset($this->scClasses[$_class]))
{ {
$ret = call_user_func($e_shortcodes[$code]['function'], $parm); if(!class_exists($_class) && $e_shortcodes[$code]['path'])
{
include_once($e_shortcodes[$code]['path'].$_class.'.php');
}
$this->scClasses[$_class] = new $_class;
}
if(is_callable(array($_class, $_method)))
{
$ret = $this->scClasses[$_class]->$_method($parm);
} }
} }
else else