1
0
mirror of https://github.com/e107inc/e107.git synced 2025-08-03 21:27:25 +02:00

News & eURL - work in progress

This commit is contained in:
secretr
2008-12-02 16:50:16 +00:00
parent f5de93cf98
commit 91a116c3bd
4 changed files with 110 additions and 91 deletions

View File

@@ -1,21 +1,17 @@
<?php <?php
/* /*
+---------------------------------------------------------------+ * e107 website system
| e107 website system *
| * Copyright (C) 2001-2008 e107 Inc (e107.org)
| <20>Steve Dunstan 2001-2002 * Released under the terms and conditions of the
| http://e107.org * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
| jalist@e107.org *
| * News Administration
| Released under the terms and conditions of the *
| GNU General Public License (http://gnu.org). * $Source: /cvs_backup/e107_0.8/e107_admin/newspost.php,v $
| * $Revision: 1.17 $
| $Source: /cvs_backup/e107_0.8/e107_admin/newspost.php,v $ * $Date: 2008-12-02 16:50:16 $
| $Revision: 1.16 $ * $Author: secretr $
| $Date: 2008-11-11 13:26:49 $
| $Author: secretr $
+---------------------------------------------------------------+
*/ */
require_once("../class2.php"); require_once("../class2.php");

View File

@@ -0,0 +1,24 @@
<?php
function url_news_main($parms)
{
$base = e_HTTP.'news.php?'.$parms['action'];
switch ($parms['action'])
{
case 'all':
return $base;
case 'cat':
case 'extend':
case 'list'://TODO - find out what are list params
case 'month': //TODO - find out what are month params
case 'day': //TODO - find out what are day params
return $base.'.'.$parms['value'];
case 'item':
return $base.".{$parms['id']}.{$parms['cat']}";
default:
return false;
}
}
?>

View File

@@ -1,20 +1,17 @@
<?php <?php
/* /*
+ ----------------------------------------------------------------------------+ * e107 website system
| e107 website system *
| * Copyright (C) 2001-2008 e107 Inc (e107.org)
| <20>Steve Dunstan 2001-2002 * Released under the terms and conditions of the
| http://e107.org * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
| jalist@e107.org *
| * News Shortcode Batch
| Released under the terms and conditions of the *
| GNU General Public License (http://gnu.org). * $Source: /cvs_backup/e107_0.8/e107_files/shortcode/batch/news_shortcodes.php,v $
| * $Revision: 1.12 $
| $Source: /cvs_backup/e107_0.8/e107_files/shortcode/batch/news_shortcodes.php,v $ * $Date: 2008-12-02 16:50:15 $
| $Revision: 1.11 $ * $Author: secretr $
| $Date: 2008-12-01 21:04:12 $
| $Author: e107steved $
+----------------------------------------------------------------------------+
*/ */
if (!defined('e107_INIT')) { exit; } if (!defined('e107_INIT')) { exit; }
include_once(e_HANDLER.'shortcode_handler.php'); include_once(e_HANDLER.'shortcode_handler.php');
@@ -40,12 +37,13 @@ return $news_body;
SC_END SC_END
SC_BEGIN NEWSICON SC_BEGIN NEWSICON
global $tp, $news_shortcodes; global $e107, $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');
$category_icon = $tp -> parseTemplate('{NEWSHEADER}', FALSE, $news_shortcodes); $category_icon = $tp -> parseTemplate('{NEWSHEADER}', FALSE, $news_shortcodes);
if (!$category_icon) return ''; if (!$category_icon) return '';
return "<a href='".e_HTTP."news.php?cat.".$news_item['news_category']."'><img style='".$param['caticon']."' src='".$category_icon."' alt='' /></a>";
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_END
SC_BEGIN NEWSHEADER SC_BEGIN NEWSHEADER
@@ -61,14 +59,15 @@ if ($category_icon && strstr("images", $category_icon)) {
SC_END SC_END
SC_BEGIN NEWSCATEGORY SC_BEGIN NEWSCATEGORY
global $tp; global $tp, $e107;
$news_item = getcachedvars('current_news_item'); $news_item = getcachedvars('current_news_item');
$param = getcachedvars('current_news_param'); $param = getcachedvars('current_news_param');
$category_name = $tp -> toHTML($news_item['category_name'],FALSE,"defs"); $category_name = $tp -> toHTML($news_item['category_name'],FALSE,"defs");
return "<a class='".$GLOBALS['NEWS_CSSMODE']."_category' style='".(isset($param['catlink']) ? $param['catlink'] : "#")."' href='".e_HTTP."news.php?cat.".$news_item['news_category']."'>".$category_name."</a>"; 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_END
SC_BEGIN NEWSAUTHOR SC_BEGIN NEWSAUTHOR
global $e107;
$news_item = getcachedvars('current_news_item'); $news_item = getcachedvars('current_news_item');
$param = getcachedvars('current_news_param'); $param = getcachedvars('current_news_param');
if($news_item['user_id']) if($news_item['user_id'])
@@ -79,7 +78,7 @@ if($news_item['user_id'])
} }
else else
{ {
return "<a href='".e_HTTP."user.php?id.".$news_item['user_id']."'>".$news_item['user_name']."{$parm}</a>"; return "<a href='".$e107->url->getUrl('core:user', 'main', 'func=profile&id='.$news_item['user_id'])."'>".$news_item['user_name']."{$parm}</a>";
} }
} }
return "<a href='http://e107.org'>e107</a>"; return "<a href='http://e107.org'>e107</a>";
@@ -199,6 +198,7 @@ if (ADMIN && getperms("H")) {
SC_END SC_END
SC_BEGIN EXTENDED SC_BEGIN EXTENDED
global $e107;
$news_item = getcachedvars('current_news_item'); $news_item = getcachedvars('current_news_item');
$param = getcachedvars('current_news_param'); $param = getcachedvars('current_news_param');
if ($news_item['news_extended'] && (strpos(e_QUERY, 'extend') === FALSE || $parm == "force")) { if ($news_item['news_extended'] && (strpos(e_QUERY, 'extend') === FALSE || $parm == "force")) {
@@ -211,7 +211,7 @@ if ($news_item['news_extended'] && (strpos(e_QUERY, 'extend') === FALSE || $parm
if (isset($_POST['preview'])) { if (isset($_POST['preview'])) {
return $es1.EXTENDEDSTRING.$es2."<br />".$news_item['news_extended']; return $es1.EXTENDEDSTRING.$es2."<br />".$news_item['news_extended'];
} else { } else {
return $es1."<a href='".e_HTTP."news.php?extend.".$news_item['news_id']."'>".EXTENDEDSTRING."</a>".$es2; return $es1."<a href='".$e107->url->getUrl('core:news', 'main', 'action=extend&value='.$news_item['news_id'])."'>".EXTENDEDSTRING."</a>".$es2;
} }
} else { } else {
return ""; return "";
@@ -249,15 +249,17 @@ return ($news_item['news_summary']) ? $news_item['news_summary']."<br />" : "";
SC_END SC_END
SC_BEGIN NEWSTHUMBNAIL SC_BEGIN NEWSTHUMBNAIL
global $e107;
$news_item = getcachedvars('current_news_item'); $news_item = getcachedvars('current_news_item');
$param = getcachedvars('current_news_param'); $param = getcachedvars('current_news_param'); echo
return (isset($news_item['news_thumbnail']) && $news_item['news_thumbnail']) ? "<a href='".e_HTTP."news.php?item.".$news_item['news_id'].".".$news_item['news_category']."'><img class='news_image' src='".e_IMAGE_ABS."newspost_images/".$news_item['news_thumbnail']."' alt='' style='".$param['thumbnail']."' /></a>" : ""; return (isset($news_item['news_thumbnail']) && $news_item['news_thumbnail']) ? "<a href='".$e107->url->getUrl('core:news', 'main', "action=item&id={$news_item['news_id']}&cat={$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_END
SC_BEGIN NEWSIMAGE SC_BEGIN NEWSIMAGE
global $e107;
$news_item = getcachedvars('current_news_item'); $news_item = getcachedvars('current_news_item');
$param = getcachedvars('current_news_param'); $param = getcachedvars('current_news_param');
return (isset($news_item['news_thumbnail']) && $news_item['news_thumbnail']) ? "<a href='".e_HTTP."news.php?item.".$news_item['news_id'].".".$news_item['news_category']."'><img class='news_image' src='".e_IMAGE_ABS."newspost_images/".$news_item['news_thumbnail']."' alt='' style='".$param['thumbnail']."' /></a>" : ""; return (isset($news_item['news_thumbnail']) && $news_item['news_thumbnail']) ? "<a href='".$e107->url->getUrl('core:news', 'main', "action=item&id={$news_item['news_id']}&cat={$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_END
SC_BEGIN STICKY_ICON SC_BEGIN STICKY_ICON
@@ -267,19 +269,20 @@ return $news_item['news_sticky'] ? $param['image_sticky'] : "";
SC_END SC_END
SC_BEGIN NEWSTITLELINK SC_BEGIN NEWSTITLELINK
global $e107;
$news_item = getcachedvars('current_news_item'); $news_item = getcachedvars('current_news_item');
$param = getcachedvars('current_news_param'); $param = getcachedvars('current_news_param');
return "<a style='".(isset($param['itemlink']) ? $param['itemlink'] : "null")."' href='".e_HTTP."news.php?item.".$news_item['news_id'].".".$news_item['news_category']."'>".$news_item['news_title']."</a>"; return "<a style='".(isset($param['itemlink']) ? $param['itemlink'] : "null")."' href='".$e107->url->getUrl('core:news', 'main', "action=item&id={$news_item['news_id']}&cat={$news_item['news_category']}")."'>".$news_item['news_title']."</a>";
SC_END SC_END
SC_BEGIN NEWSCATICON SC_BEGIN NEWSCATICON
global $tp, $news_shortcodes; global $e107, $news_shortcodes;
$news_item = getcachedvars('current_news_item'); $news_item = getcachedvars('current_news_item');
$param = getcachedvars('current_news_param'); $param = getcachedvars('current_news_param');
$category_icon = $tp -> parseTemplate('{NEWSHEADER}', FALSE, $news_shortcodes); $category_icon = $e107->tp->parseTemplate('{NEWSHEADER}', FALSE, $news_shortcodes);
if (!$category_icon) return ''; if (!$category_icon) return '';
if($param['caticon'] == ""){$param['caticon'] = "border:0px";} if($param['caticon'] == ""){$param['caticon'] = "border:0px";}
return "<a href='".e_HTTP."news.php?cat.".$news_item['news_category']."'><img style='".$param['caticon']."' src='".$category_icon."' alt='' /></a>"; 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_END
SC_BEGIN TRACKBACK SC_BEGIN TRACKBACK

View File

@@ -1,21 +1,17 @@
<?php <?php
/* /*
+---------------------------------------------------------------+ * e107 website system
| e107 website system *
| /classes/news_class.php * Copyright (C) 2001-2008 e107 Inc (e107.org)
| * Released under the terms and conditions of the
| <20>Steve Dunstan 2001-2002 * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
| http://jalist.com *
| stevedunstan@jalist.com * News handler
| *
| Released under the terms and conditions of the * $Source: /cvs_backup/e107_0.8/e107_handlers/news_class.php,v $
| GNU General Public License (http://gnu.org). * $Revision: 1.6 $
| * $Date: 2008-12-02 16:50:15 $
| $Source: /cvs_backup/e107_0.8/e107_handlers/news_class.php,v $ * $Author: secretr $
| $Revision: 1.5 $
| $Date: 2008-05-18 16:34:16 $
| $Author: e107coders $
+---------------------------------------------------------------+
*/ */
if (!defined('e107_INIT')) { exit; } if (!defined('e107_INIT')) { exit; }
@@ -108,14 +104,14 @@ 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 $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;
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') {
return; return;
} }
} }
if (!is_object($tp)) $tp = new e_parse; if (!is_object($e107->tp)) $e107->tp = new e_parse;
if ($n_restrict == 'userclass') { if ($n_restrict == 'userclass') {
$news['news_id'] = 0; $news['news_id'] = 0;
@@ -196,7 +192,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');
$text = $tp -> parseTemplate($NEWS_PARSE, TRUE, $news_shortcodes); $text = $e107->tp -> parseTemplate($NEWS_PARSE, TRUE, $news_shortcodes);
if ($mode == 'return') { if ($mode == 'return') {
return $text; return $text;
@@ -207,12 +203,12 @@ class news {
} }
function make_xml_compatible($original) { function make_xml_compatible($original) {
global $tp, $ml; global $e107;
if (!is_object($tp)) $tp = new e_parse; if (!is_object($e107->tp)) $e107->tp = new e_parse;
$original = $tp->toHTML($original, TRUE); $original = $e107->tp->toHTML($original, TRUE);
$original = str_replace('&pound', '&amp;#163;', $original); $original = str_replace('&pound', '&amp;#163;', $original);
$original = str_replace('&copy;', '(c)', $original); $original = str_replace('&copy;', '(c)', $original);
return htmlspecialchars($original); return htmlspecialchars($original, ENT_COMPAT, CHARSET);
} }
} }