Userpost page rewrite, new template engine and template override location

2025-08-06 06:38:00 +02:00 · 2011-04-26 13:45:10 +00:00
parent 34d10aec20
commit e6c3c163a2
2 changed files with 242 additions and 171 deletions
--- a/userposts.php
+++ b/userposts.php
@@ -1,31 +1,32 @@
 <?php
 /*
-+ ----------------------------------------------------------------------------+
-|     e107 website system
-|
-|     Copyright (C) 2008-2009 e107 Inc 
-|     http://e107.org
-|
-|
-|     Released under the terms and conditions of the
-|     GNU General Public License (http://gnu.org).
-|
-|     $Source: /cvs_backup/e107_0.8/userposts.php,v $
-|     $Revision$
-|     $Date$
-|     $Author$
-+----------------------------------------------------------------------------+
+ * e107 website system
+ *
+ * Copyright (C) 2008-2011 e107 Inc (e107.org)
+ * Released under the terms and conditions of the
+ * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
+ *
+ * User posts page
+ *
+ * $URL$
+ * $Id$
+ *
 */
 require_once('class2.php');
-include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/lan_'.e_PAGE);
+
+e107::coreLan('userposts');

 require_once(e_HANDLER.'comment_class.php');
-$cobj = new comment;
+$cobj = new comment();
+
+$e107 = e107::getInstance();
+$sql = e107::getDb();
+$pref = e107::getPref();
+$tp = e107::getParser();
+$ns = e107::getRender();
+
 require_once(HEADERF);

-
-$_POST['f_query'] = trim($_POST['f_query']);
-
 $action = 'exit';
 if (e_QUERY)
 {
@@ -38,29 +39,31 @@ if (e_QUERY)
  if (($id != USERID) && !check_class(varset($pref['memberlist_access'], 253))) $action = 'exit';
  unset($tmp);
 }
-
+if(isset($_POST['fsearch']))
+{
+	$action = 'forums';
+}

 if ($action == 'exit')
 {
-	header("location:".e_BASE."index.php");
+	header("Location: ".SITEURL);
 	exit;
 }

 if ($action == "comments")
 {
-	if(is_numeric($id))
-	{
-		$sql->db_Select("user", "user_name", "user_id=".$id);
-		$row = $sql->db_Fetch();
-		$user_name = $row['user_name'];
-		$user_id = $id.".".$user_name."";
-	}
-	else
-	{
-		$user_name = UP_LAN_16.$id;
-	}
+		//$sql->db_Select("user", "user_name", "user_id=".$id);
+		//$row = $sql->db_Fetch();
+		if($id == e107::getUser()->getId())
+		{
+			$user_name = USERNAME;
+		}
+		else
+		{
+			$user_name = e107::getSystemUser($id, false)->getName(LAN_ANONYMOUS);
+		}

-	if (!$USERPOSTS_COMMENTS_TABLE)
+	/*if (!isset($USERPOSTS_TEMPLATE))
 	{
 		if (file_exists(THEME."userposts_template.php"))
 		{
@@ -68,23 +71,28 @@ if ($action == "comments")
 		}
 		else
 		{
-			require_once(e_BASE.$THEMES_DIRECTORY."templates/userposts_template.php");
+			require_once(e_THEME."templates/userposts_template.php");
 		}
-	}

+	}*/
+	// new template engine - override in THEME/templates/userposts_template.php
+	$USERPOSTS_TEMPLATE = e107::getCoreTemplate('userposts');

-	$sql2 = new db;
-	if(is_numeric($id))
+	$sql2 = e107::getDb('sql2');
+	if($user_name)
 	{
 		$ccaption = UP_LAN_1.$user_name;
-		$sql->db_Select("user", "user_comments", "user_id=".$id);
+		/*$sql->db_Select("user", "user_comments", "user_id=".$id);
 		$row = $sql->db_Fetch();
-		$ctotal = $row['user_comments'];
-		$data = $cobj->getCommentData($amount='10', $from, "comment_author = '".$user_id."'");
+		$ctotal = $row['user_comments'];*/
+		$ctotal = e107::getSystemUser($id, false)->getValue('comments', 0); // user_* getter shorthand
+		$data = $cobj->getCommentData(10, $from, 'comment_author_id ='.$id);
 	}
-	else
+	else // posts by IP currently disabled (see Query filtering - top of the page)
 	{
-		$dip = $id;
+		header("Location:".SITEURL."index.php");
+		exit;
+		/*$dip = $id;
 		if (strlen($dip) == 8)
 		{  // Legacy decode (IPV4 address as it used to be stored - hex string)
 		  $hexip = explode('.', chunk_split($dip, 2, '.'));
@@ -93,40 +101,52 @@ if ($action == "comments")
 		}
 		$ccaption = UP_LAN_1.$dip;
 		$data = $cobj->getCommentData($amount='10', $from, "comment_ip = '".$id."'");
+		$data = $cobj->getCommentData(10, $from, 'comment_ip ='.$tp->toDB($user_ip));*/
 	}

-	if(empty($data) || !is_array($data)){
+	$ctext = '';
+	if(empty($data) || !is_array($data))
+	{
 		$ctext = "<span class='mediumtext'>".UP_LAN_7."</span>";
 	}

-	global $row;
-	foreach($data as $row){
-		$userposts_comments_table_string .= parse_userposts_comments_table($row, $USERPOSTS_COMMENTS_TABLE);
+	else
+	{
+		$userposts_comments_table_string = '';
+		foreach($data as $row)
+		{
+			$userposts_comments_table_string .= parse_userposts_comments_table($row, $USERPOSTS_TEMPLATE['comments_table']);
+		}
+
+		$parms = $ctotal.",10,".$from.",".e_REQUEST_SELF."?[FROM].comments.".$id;
+		$nextprev = $ctotal ? $tp->parseTemplate("{NEXTPREV={$parms}}") : '';
+		if($nextprev) $nextprev = str_replace('{USERPOSTS_NEXTPREV}', $nextprev, $USERPOSTS_TEMPLATE['np_table']);
+		$vars = new e_vars(array(
+			'NEXTPREV' => $nextprev
+		));
+
+		// preg_replace("/\{(.*?)\}/e", '$\1', $USERPOSTS_TEMPLATE['comments_table_start']);
+		$userposts_comments_table_start = $tp->simpleParse($USERPOSTS_TEMPLATE['comments_table_start'], $vars);
+		// preg_replace("/\{(.*?)\}/e", '$\1', $USERPOSTS_TEMPLATE['comments_table_end'])
+		$userposts_comments_table_end = $tp->simpleParse($USERPOSTS_TEMPLATE['comments_table_end'], $vars);
+
+		$ctext .= $userposts_comments_table_start.$userposts_comments_table_string.$userposts_comments_table_end;
+
 	}
-
-	$userposts_comments_table_start = preg_replace("/\{(.*?)\}/e", '$\1', $USERPOSTS_COMMENTS_TABLE_START);
-	$userposts_comments_table_end = preg_replace("/\{(.*?)\}/e", '$\1', $USERPOSTS_COMMENTS_TABLE_END);
-
-	$ctext .= $userposts_comments_table_start."".$userposts_comments_table_string."".$userposts_comments_table_end;
-
 	$ns->tablerender($ccaption, $ctext);
-
-	$parms = $ctotal.",10,".$from.",".e_SELF."?[FROM].comments.".$id;
-	$USERPOSTS_NEXTPREV = $tp->parseTemplate("{NEXTPREV={$parms}}");
-	echo preg_replace("/\{(.*?)\}/e", '$\1', $USERPOSTS_NP_TABLE);
 }



-if ($action == 'forums' || isset($_POST['fsearch']))
+elseif ($action == 'forums')
 {
 	require_once (e_PLUGIN.'forum/forum_class.php');
-	$forum = new e107forum;
+	$forum = new e107forum();

-	$forumList = implode(',', $forum->permList['view']);
+	$forumList = implode(',', $forum->getForumPermList('view'));


-	if(is_numeric($id))
+	/*if(is_numeric($id))
 	{
 		$uinfo = get_user_data($id);
 		$fcaption = UP_LAN_0.' '.$uinfo['user_name'];
@@ -134,8 +154,24 @@ if ($action == 'forums' || isset($_POST['fsearch']))
 	else
 	{
 		$user_name = 0;
+	}*/
+	if($id == e107::getUser()->getId())
+	{
+		$user_name = USERNAME;
+	}
+	else
+	{
+		$user_name = e107::getSystemUser($id, false)->getName(LAN_ANONYMOUS);
 	}

+	if(!$user_name)
+	{
+		header("Location:".SITEURL);
+		exit;
+	}
+
+	$fcaption = UP_LAN_0.' '.$user_name;
+/*
 	if (!$USERPOSTS_FORUM_TABLE)
 	{
 		if (file_exists(THEME.'userposts_template.php'))
@@ -146,15 +182,19 @@ if ($action == 'forums' || isset($_POST['fsearch']))
 		{
 			require_once(e_BASE.$THEMES_DIRECTORY.'templates/userposts_template.php');
 		}
-	}
+	}*/
+	// new template engine - override in THEME/templates/userposts_template.php
+	$USERPOSTS_TEMPLATE = e107::getCoreTemplate('userposts');

 	$s_info = '';
-	if (isset($_POST['f_query']) && $_POST['f_query'] != '')
+	$_POST['f_query'] = trim(varset($_POST['f_query']));
+	if ($_POST['f_query'] !== '')
 	{
-		$f_query = $tp -> toDB($_POST['f_query']);
+		$f_query = $tp->toDB($_POST['f_query']);
 		$s_info = "AND (t.thread_name REGEXP('".$f_query."') OR p.post_entry REGEXP('".$f_query."'))";
-		$fcaption = UP_LAN_12.' '.$row['user_name'];
+		$fcaption = UP_LAN_12.' '.$user_name;
 	}
+
 	$qry = "
 	SELECT SQL_CALC_FOUND_ROWS p.*, t.*, f.* FROM `#forum_post` AS p
 	LEFT JOIN `#forum_thread` AS t ON t.thread_id = p.post_thread
@@ -171,70 +211,96 @@ if ($action == 'forums' || isset($_POST['fsearch']))
 	}
 	else
 	{
-		if (!is_object($gen))
+		$gen = e107::getDateConvert();
+		$vars = new e_vars();
+
+		$userposts_forum_table_string = '';
+		while(true)
 		{
-			$gen = new convert;
-		}
-		while($row = $e107->sql->db_Fetch(MYSQL_ASSOC))
-		{
-//			var_dump($row);
+			$row = $sql->db_Fetch(MYSQL_ASSOC);
+			if(empty($row)) break;
+
 			$datestamp = $gen->convert_date($row['post_datestamp'], 'short');
-			if ($row['thread_datestamp'] = $row['post_datestamp'])
+			if ($row['thread_datestamp'] == $row['post_datestamp'])
 			{
-				$USERPOSTS_FORUM_TOPIC_PRE = UP_LAN_2.': ';
+				$vars->USERPOSTS_FORUM_TOPIC_PRE = UP_LAN_2.': ';
 			}
 			else
 			{
-				$USERPOSTS_FORUM_TOPIC_PRE = UP_LAN_12.': ';
+				$vars->USERPOSTS_FORUM_TOPIC_PRE = UP_LAN_15.': ';
 			}
-			$USERPOSTS_FORUM_ICON = "<img src='".e_PLUGIN."forum/images/".IMODE."/new_small.png' alt='' />";
-			$USERPOSTS_FORUM_TOPIC_HREF_PRE = "<a href='".$e107->url->getUrl('forum', 'thread', "func=post&id={$row['post_id']}")."'>";
-			$USERPOSTS_FORUM_TOPIC = $tp->toHTML($row['thread_name'], true, 'USER_BODY', $id);
-			$USERPOSTS_FORUM_NAME_HREF_PRE = "<a href='".$e107->url->getUrl('forum', 'forum', "func=view&id={$row['post_forum']}")."'>";
-			$USERPOSTS_FORUM_NAME = $tp->toHTML($row['forum_name'], true, 'USER_BODY', $id);
-			$USERPOSTS_FORUM_THREAD = $tp->toHTML($row['post_entry'], true, 'USER_BODY', $id);
-			$USERPOSTS_FORUM_DATESTAMP = UP_LAN_11." ".$datestamp;
+			$vars->USERPOSTS_FORUM_ICON = "<img src='".e_PLUGIN."forum/images/".IMODE."/new_small.png' alt='' />";
+			$vars->USERPOSTS_FORUM_TOPIC_HREF_PRE = "<a href='".$e107->url->getUrl('forum', 'thread', "func=post&id={$row['post_id']}")."'>";
+			$vars->USERPOSTS_FORUM_TOPIC = $tp->toHTML($row['thread_name'], true, 'USER_BODY', $id);
+			$vars->USERPOSTS_FORUM_NAME_HREF_PRE = "<a href='".$e107->url->getUrl('forum', 'forum', "func=view&id={$row['post_forum']}")."'>";
+			$vars->USERPOSTS_FORUM_NAME = $tp->toHTML($row['forum_name'], true, 'USER_BODY', $id);
+			$vars->USERPOSTS_FORUM_THREAD = $tp->toHTML($row['post_entry'], true, 'USER_BODY', $id);
+			$vars->USERPOSTS_FORUM_DATESTAMP = UP_LAN_11." ".$datestamp;

-			$userposts_forum_table_string .= preg_replace("/\{(.*?)\}/e", '$\1', $USERPOSTS_FORUM_TABLE);
+			//$userposts_forum_table_string .= preg_replace("/\{(.*?)\}/e", '$\1', $USERPOSTS_FORUM_TABLE);
+			$userposts_forum_table_string .= $tp->simpleParse($USERPOSTS_TEMPLATE['forum_table'], $vars);
 		}
-		$userposts_forum_table_start = preg_replace("/\{(.*?)\}/e", '$\1', $USERPOSTS_FORUM_TABLE_START);
-		$USERPOSTS_FORUM_SEARCH = "<input class='tbox' type='text' name='f_query' size='20' value='' maxlength='50' /> <input class='button' type='submit' name='fsearch' value='".UP_LAN_12."' />";
-		$userposts_forum_table_end = preg_replace("/\{(.*?)\}/e", '$\1', $USERPOSTS_FORUM_TABLE_END);
-		$ftext .= $userposts_forum_table_start."".$userposts_forum_table_string."".$userposts_forum_table_end;
+
+		$vars->emptyVars();
+
+		$ftotal = $sql->total_results;
+		$parms = $ftotal.",10,".$from.",".e_REQUEST_SELF."?[FROM].forums.".$id;
+		$vars->NEXTPREV = $ftotal ? $tp->parseTemplate("{NEXTPREV={$parms}}") : '';
+		if($vars->NEXTPREV) $vars->NEXTPREV =  str_replace('{USERPOSTS_NEXTPREV}', $vars->NEXTPREV, $USERPOSTS_TEMPLATE['np_table']);
+		$vars->USERPOSTS_FORUM_SEARCH_VALUE = htmlspecialchars($_POST['f_query'], ENT_QUOTES, CHARSET);
+		$vars->USERPOSTS_FORUM_SEARCH_FIELD = "<input class='tbox input' type='text' name='f_query' size='20' value='{$vars->USERPOSTS_FORUM_SEARCH_VALUE}' maxlength='50' />";
+		$vars->USERPOSTS_FORUM_SEARCH_BUTTON = "<input class='button' type='submit' name='fsearch' value='".UP_LAN_12."' />";
+		$vars->USERPOSTS_FORUM_SEARCH = "<input class='tbox' type='text' name='f_query' size='20' value='{$vars->USERPOSTS_FORUM_SEARCH_VALUE}' maxlength='50' /> <input class='button' type='submit' name='fsearch' value='".UP_LAN_12."' />";
+
+		// $userposts_forum_table_start = preg_replace("/\{(.*?)\}/e", '$\1', $USERPOSTS_FORUM_TABLE_START);
+		$userposts_forum_table_start = $tp->simpleParse($USERPOSTS_TEMPLATE['forum_table_start'], $vars);
+		//$userposts_forum_table_end = preg_replace("/\{(.*?)\}/e", '$\1', $USERPOSTS_FORUM_TABLE_END);
+		$userposts_forum_table_end = $tp->simpleParse($USERPOSTS_TEMPLATE['forum_table_end'], $vars);
+
+		$ftext = $userposts_forum_table_start.$userposts_forum_table_string.$userposts_forum_table_end;
 	}
+
 	$ns->tablerender($fcaption, $ftext);
-	$ftotal = $e107->sql->total_results;
+	/*$ftotal = $e107->sql->total_results;
 	$parms = $ftotal.",10,".$from.",".e_SELF."?[FROM].forums.".$id;
 	$USERPOSTS_NEXTPREV = $tp->parseTemplate("{NEXTPREV={$parms}}");
-	echo preg_replace("/\{(.*?)\}/e", '$\1', $USERPOSTS_NP_TABLE);
+	echo preg_replace("/\{(.*?)\}/e", '$\1', $USERPOSTS_NP_TABLE);*/
+}
+else
+{
+	header("Location: ".SITEURL);
+	exit;
 }

 require_once(FOOTERF);


-function parse_userposts_comments_table($row, $USERPOSTS_COMMENTS_TABLE)
+function parse_userposts_comments_table($row, $template)
 {
 //	global $USERPOSTS_COMMENTS_TABLE, $pref, $gen, $tp, $id, $sql2, $comment_files;

-	$gen = new convert;
+	$gen = e107::getDateConvert();
 	$datestamp = $gen->convert_date($row['comment_datestamp'], "short");
 	$bullet = '';
 	if(defined('BULLET'))
 	{
-		$bullet = '<img src="'.THEME.'images/'.BULLET.'" alt="" class="icon" />';
+		$bullet = '<img src="'.THEME_ABS.'images/'.BULLET.'" alt="" class="icon" />';
 	}
 	elseif(file_exists(THEME.'images/bullet2.gif'))
 	{
-		$bullet = '<img src="'.THEME.'images/bullet2.gif" alt="" class="icon" />';
+		$bullet = '<img src="'.THEME_ABS.'images/bullet2.gif" alt="" class="icon" />';
 	}
-	$USERPOSTS_COMMENTS_ICON		= $bullet;
-	$USERPOSTS_COMMENTS_DATESTAMP	= UP_LAN_11." ".$datestamp;
-	$USERPOSTS_COMMENTS_HEADING		= $row['comment_title'];
-	$USERPOSTS_COMMENTS_COMMENT		= $row['comment_comment'];
-	$USERPOSTS_COMMENTS_HREF_PRE	= "<a href='".$row['comment_url']."'>";
-	$USERPOSTS_COMMENTS_TYPE		= $row['comment_type'];
+	$vars = new e_vars();

-	return(preg_replace("/\{(.*?)\}/e", '$\1', $USERPOSTS_COMMENTS_TABLE));
+	$vars->USERPOSTS_COMMENTS_ICON		= $bullet;
+	$vars->USERPOSTS_COMMENTS_DATESTAMP	= UP_LAN_11." ".$datestamp;
+	$vars->USERPOSTS_COMMENTS_HEADING	= $row['comment_title'];
+	$vars->USERPOSTS_COMMENTS_COMMENT	= $row['comment_comment'];
+	$vars->USERPOSTS_COMMENTS_HREF_PRE	= "<a href='".$row['comment_url']."'>";
+	$vars->USERPOSTS_COMMENTS_TYPE		= $row['comment_type'];
+
+	//return(preg_replace("/\{(.*?)\}/e", '$\1', $USERPOSTS_COMMENTS_TABLE));
+	return e107::getParser()->simpleParse($template, $vars);
 }

 ?>