diff --git a/phpBB/language/lang_english.php b/phpBB/language/lang_english.php
index 5f1723e1bd..94b8f573a1 100755
--- a/phpBB/language/lang_english.php
+++ b/phpBB/language/lang_english.php
@@ -158,7 +158,12 @@ $lang['Sticky'] = "Sticky:";
// Viewtopic
//
$lang['Guest'] = 'Guest';
+$lang['Post_subject'] = "Post subject";
+$lang['View_next_topic'] = "View next topic";
+$lang['View_previous_topic'] = "View previous topic";
+$lang['No_newer_topics'] = "There are no newer topics in this forum";
+$lang['No_older_topics'] = "There are no older topics in this forum";
$lang['Topic_post_not_exist'] = "The topic or post you requested does not exist";
//
diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php
index 5ccc14fa8e..ddee1421aa 100644
--- a/phpBB/viewtopic.php
+++ b/phpBB/viewtopic.php
@@ -30,128 +30,89 @@ $pagetype = "viewtopic";
//
// Start initial var setup
//
-
-if(!isset($HTTP_GET_VARS['topic'])) // For backward compatibility
+if(isset($HTTP_GET_VARS[POST_TOPIC_URL]))
{
$topic_id = $HTTP_GET_VARS[POST_TOPIC_URL];
}
-else
-{
- $topic_id = $HTTP_GET_VARS['topic'];
-}
if(isset($HTTP_GET_VARS[POST_POST_URL]))
{
$post_id = $HTTP_GET_VARS[POST_POST_URL];
}
-$start = (isset($HTTP_GET_VARS['start'])) ? $HTTP_GET_VARS['start'] : 0;
-
-$is_moderator = 0;
if(!isset($topic_id) && !isset($post_id))
{
message_die(GENERAL_MESSAGE, $lang['Topic_post_not_exist']);
}
+$start = (isset($HTTP_GET_VARS['start'])) ? $HTTP_GET_VARS['start'] : 0;
//
// End initial var setup
//
-// This is the single/double 'integrated'
-// query to obtain the next/previous
-// topic from just the current topic_id
//
-// We will make this word, if it's the last thing I
-// do ... and it quite possibly will be!
-/*
-if(isset($HTTP_GET_VARS['view']))
+// Find topic id if user requested a newer
+// or older topic
+//
+if( isset($HTTP_GET_VARS["view"]) )
{
- if($HTTP_GET_VARS['view'] == 'newer')
+ if($HTTP_GET_VARS["view"] == "next")
{
- $operator = ">";
+ $sql_condition = ">";
+ $sql_ordering = "ASC";
}
- else if($HTTP_GET_VARS['view'] == 'older')
+ else if($HTTP_GET_VARS["view"] == "previous")
{
- $operator = "<";
+ $sql_condition = "<";
+ $sql_ordering = "DESC";
}
- switch($dbms)
+ $sql = "SELECT t.topic_id
+ FROM " . TOPICS_TABLE . " t, " . TOPICS_TABLE . " t2
+ WHERE t2.topic_id = $topic_id
+ AND t.forum_id = t2.forum_id
+ AND t.topic_time $sql_condition t2.topic_time
+ ORDER BY t.topic_time $sql_ordering
+ LIMIT 1";
+
+ if(!$result = $db->sql_query($sql))
{
- case 'mysql':
- // And now the stupid MySQL case...I wish they would get around to implementing subselectes...
- $sub_query = "SELECT topic_time
- FROM ".TOPICS_TABLE."
- WHERE topic_id = $topic_id";
- if($sub_result = $db->sql_query($sub_query))
- {
- $resultset = $db->sql_fetchrowset($sub_result);
- $sql = "SELECT t.topic_id, t.topic_title, t.topic_status, t.topic_replies,
- f.forum_type, f.forum_name, f.forum_id, u.username, u.user_id
- FROM ".TOPICS_TABLE." t, ".FORUMS_TABLE." f, ".FORUM_MODS_TABLE." fm, ".USERS_TABLE." u
- WHERE t.topic_time ".$operator." ".$resultset[0]['topic_time']."
- AND f.forum_id = ".$HTTP_GET_VARS[POST_FORUM_URL]."
- AND f.forum_id = t.forum_id
- AND fm.forum_id = t.forum_id
- AND u.user_id = fm.user_id";
- $db->sql_freeresult($sub_result);
- }
- else
- {
- if(DEBUG)
- {
- $dberror = $db->sql_error();
- error_die(SQL_QUERY, "Couldn't obtain topic information.
Reason: ".$dberror['message']."
Query: $sql", __LINE__, __FILE__);
- }
- else
- {
- error_die(SQL_QUERY, "Couldn't obtain topic information.", __LINE__, __FILE__);
- }
- }
- break;
- default:
- $sql = "SELECT t.topic_id, t.topic_title, t.topic_status, t.topic_replies,
- f.forum_type, f.forum_name, f.forum_id, u.username, u.user_id
- FROM ".TOPICS_TABLE." t, ".FORUMS_TABLE." f, ".FORUM_MODS_TABLE." fm, ".USERS_TABLE." u
- WHERE t.topic_id in
- (select max(topic_id) from ".TOPICS_TABLE." WHERE topic_time ".$operator." (select topic_time as t_time from ".TOPICS_TABLE." where topic_id = $topic_id))
- AND f.forum_id = ".$HTTP_GET_VARS[POST_FORUM_URL]."
- AND f.forum_id = t.forum_id
- AND fm.forum_id = t.forum_id
- AND u.user_id = fm.user_id";
- break;
+ message_die(GENERAL_ERROR, "Couldn't obtain newer/older topic information", "", __LINE__, __FILE__, $sql);
+ }
+
+ list($topic_id) = $db->sql_fetchrow($result);
+ if(empty($topic_id))
+ {
+ if($HTTP_GET_VARS["view"] == "next")
+ {
+ message_die(GENERAL_MESSAGE, $lang['No_newer_topics']);
+ }
+ else
+ {
+ message_die(GENERAL_MESSAGE, $lang['No_older_topics']);
+ }
}
}
+
//
-// End.
+// This rather complex gaggle of code handles querying for topics but
+// also allows for direct linking to a post (and the calculation of which
+// page the post is on and the correct display of viewtopic)
//
-else
-{
-*/
+$join_sql_table = (!isset($post_id)) ? "" : "" . POSTS_TABLE . " p, " . POSTS_TABLE . " p2,";
+$join_sql = (!isset($post_id)) ? "t.topic_id = $topic_id" : "p.post_id = $post_id AND t.topic_id = p.topic_id AND p2.topic_id = p.topic_id AND p2.post_id <= $post_id";
+$count_sql = (!isset($post_id)) ? "" : ", COUNT(p2.post_id) AS prev_posts";
- //
- // This is perhaps a bodged(?) way of allowing a direct link to a post
- // it also allows calculation of which page the post should be on. This
- // query no longer grabs moderator info for this forum ... right now
- // that's fine, but if needed it can be easily replaced/added
- //
- $join_sql_table = (!isset($post_id)) ? "" : "" . POSTS_TABLE . " p, " . POSTS_TABLE . " p2,";
- $join_sql = (!isset($post_id)) ? "t.topic_id = $topic_id" : "p.post_id = $post_id AND t.topic_id = p.topic_id AND p2.topic_id = p.topic_id AND p2.post_id <= $post_id";
- $count_sql = (!isset($post_id)) ? "" : ", COUNT(p2.post_id) AS prev_posts";
+$order_sql = (!isset($post_id)) ? "" : "GROUP BY p.post_id, t.topic_id, t.topic_title, t.topic_status, t.topic_replies, t.topic_time, f.forum_name, f.forum_id, f.auth_view, f.auth_read, f.auth_post, f.auth_reply, f.auth_edit, f.auth_delete, f.auth_votecreate, f.auth_vote, f.auth_attachments ORDER BY p.post_id ASC";
- $order_sql = (!isset($post_id)) ? "" : "GROUP BY p.post_id, t.topic_id, t.topic_title, t.topic_status, t.topic_replies, t.topic_time, f.forum_name, f.forum_id, f.auth_view, f.auth_read, f.auth_post, f.auth_reply, f.auth_edit, f.auth_delete, f.auth_votecreate, f.auth_vote, f.auth_attachments ORDER BY p.post_id ASC";
-
- $sql = "SELECT t.topic_id, t.topic_title, t.topic_status, t.topic_replies, t.topic_time, f.forum_name, f.forum_id, f.auth_view, f.auth_read, f.auth_post, f.auth_reply, f.auth_edit, f.auth_delete, f.auth_votecreate, f.auth_vote, f.auth_attachments" . $count_sql . "
- FROM $join_sql_table " . TOPICS_TABLE . " t, " . FORUMS_TABLE . " f
- WHERE $join_sql
- AND f.forum_id = t.forum_id
- $order_sql";
-
-// This closes out the opening braces above
-// Needed for the view/next query
-//}
+$sql = "SELECT t.topic_id, t.topic_title, t.topic_status, t.topic_replies, t.topic_time, f.forum_name, f.forum_id, f.auth_view, f.auth_read, f.auth_post, f.auth_reply, f.auth_edit, f.auth_delete, f.auth_votecreate, f.auth_vote, f.auth_attachments" . $count_sql . "
+ FROM $join_sql_table " . TOPICS_TABLE . " t, " . FORUMS_TABLE . " f
+ WHERE $join_sql
+ AND f.forum_id = t.forum_id
+ $order_sql";
if(!$result = $db->sql_query($sql))
{
- message_die(GENERAL_MESSAGE, $lang['Topic_post_not_exist'], "", __LINE__, __FILE__, $sql);
+ message_die(GENERAL_ERROR, "Couldn't obtain topic information", "", __LINE__, __FILE__, $sql);
}
if(!$total_rows = $db->sql_numrows($result))
@@ -159,6 +120,7 @@ if(!$total_rows = $db->sql_numrows($result))
message_die(GENERAL_MESSAGE, $lang['Topic_post_not_exist'], "", __LINE__, __FILE__, $sql);
}
$forum_row = $db->sql_fetchrowset($result);
+
$forum_name = stripslashes($forum_row[0]['forum_name']);
$forum_id = $forum_row[0]['forum_id'];
$topic_id = $forum_row[0]['topic_id'];
@@ -188,12 +150,9 @@ $is_auth = auth(AUTH_ALL, $forum_id, $userdata, $forum_row[0]);
if(!$is_auth['auth_view'] || !$is_auth['auth_view'])
{
//
- // Ooopss, user is not authed
- // to read this forum ...
+ // The user is not authed to read this forum ...
//
- include('includes/page_header.'.$phpEx);
-
- $msg = "I am sorry but only " . $is_auth['auth_read_type'] . " can read this topic.";
+ $msg = $lang['Sorry_auth'] . $is_auth['auth_read_type'] . $lang['can_read'] . $lang['this_forum'];
message_die(GENERAL_MESSAGE, $msg);
}
@@ -203,13 +162,10 @@ if(!$is_auth['auth_view'] || !$is_auth['auth_view'])
/*
//
-// This code allows for individual topic
-// read tracking, on small, low volume sites
-// it'll probably work very well. However, for
-// busy sites the use of a text field in the DB
-// combined with the additional UPDATE's required
-// in viewtopic may be unacceptable. So, by default
-// this code is off, however you may want to play
+// This code allows for individual topic read tracking, on small, low volume sites
+// it'll probably work very well. However, for busy sites the use of a text field
+// in the DB combined with the additional UPDATE's required in viewtopic may be
+// unacceptable. So, by default this code is off, however you may want to play
// ...
//
// psoTFX
@@ -233,45 +189,11 @@ if($userdata['user_id'] != ANONYMOUS)
}
*/
-for($x = 0; $x < $total_rows; $x++)
-{
- $moderators[] = array(
- "user_id" => $forum_row[$x]['user_id'],
- "username" => $forum_row[$x]['username']);
-
- if($userdata['user_id'] == $forum_row[$x]['user_id'])
- {
- $is_moderator = 1;
- }
-}
-
-//
-// Get next and previous topic_id's
-//
-$sql_next_id = "SELECT topic_id
- FROM ".TOPICS_TABLE."
- WHERE topic_time > $topic_time
- AND forum_id = $forum_id
- ORDER BY topic_time ASC
- LIMIT 1";
-
-$sql_prev_id = "SELECT topic_id
- FROM ".TOPICS_TABLE."
- WHERE topic_time < $topic_time
- AND forum_id = $forum_id
- ORDER BY topic_time DESC
- LIMIT 1";
-
-$result_next = $db->sql_query($sql_next_id);
-$result_prev = $db->sql_query($sql_prev_id);
-$topic_next_row = $db->sql_fetchrow($result_next);
-$topic_prev_row = $db->sql_fetchrow($result_prev);
-
//
// Go ahead and pull all data for this topic
//
$sql = "SELECT u.username, u.user_id, u.user_posts, u.user_from, u.user_website, u.user_icq, u.user_aim, u.user_yim, u.user_regdate, u.user_msnm, u.user_viewemail, u.user_rank, u.user_sig, u.user_avatar, p.post_time, p.post_id, p.bbcode_uid, pt.post_text, pt.post_subject, p.post_username
- FROM ".POSTS_TABLE." p, ".USERS_TABLE." u, ".POSTS_TEXT_TABLE." pt
+ FROM " . POSTS_TABLE . " p, " . USERS_TABLE . " u, " . POSTS_TEXT_TABLE . " pt
WHERE p.topic_id = $topic_id
AND p.poster_id = u.user_id
AND p.post_id = pt.post_id
@@ -281,18 +203,15 @@ if(!$result = $db->sql_query($sql))
{
message_die(GENERAL_ERROR, "Couldn't obtain post/user information.", "", __LINE__, __FILE__, $sql);
}
+
if(!$total_posts = $db->sql_numrows($result))
{
- //
- // Again this should be considered temporary and
- // will appear in the templates file at some
- // point
- //
message_die(GENERAL_ERROR, "There don't appear to be any posts for this topic.", "", __LINE__, __FILE__, $sql);
}
+
$sql = "SELECT *
- FROM ".RANKS_TABLE."
- ORDER BY rank_min";
+ FROM " . RANKS_TABLE . "
+ ORDER BY rank_special, rank_min";
if(!$ranks_result = $db->sql_query($sql))
{
message_die(GENERAL_ERROR, "Couldn't obtain ranks information.", "", __LINE__, __FILE__, $sql);
@@ -301,8 +220,7 @@ $postrow = $db->sql_fetchrowset($result);
$ranksrow = $db->sql_fetchrowset($ranksresult);
//
-// Dump out the page header and
-// load viewtopic body template
+// Dump out the page header and oad viewtopic body template
//
include('includes/page_header.'.$phpEx);
@@ -310,12 +228,14 @@ $template->set_filenames(array(
"body" => "viewtopic_body.tpl",
"jumpbox" => "jumpbox.tpl")
);
+
$jumpbox = make_jumpbox();
$template->assign_vars(array(
"JUMPBOX_LIST" => $jumpbox,
"SELECT_NAME" => POST_FORUM_URL)
);
$template->assign_var_from_handle("JUMPBOX", "jumpbox");
+
$template->assign_vars(array(
"FORUM_ID" => $forum_id,
"FORUM_NAME" => $forum_name,
@@ -334,25 +254,31 @@ $template->assign_vars(array(
//
$new_topic_url = append_sid("posting.$phpEx?mode=newtopic&" . POST_FORUM_URL . "=$forum_id");
$reply_topic_url = append_sid("posting.$phpEx?mode=reply&" . POST_TOPIC_URL . "=$topic_id&" . POST_FORUM_URL . "=$forum_id");
+
$view_forum_url = append_sid("viewforum.$phpEx?" . POST_FORUM_URL . "=$forum_id");
-$view_prev_topic_url = (!empty($topic_prev_row['topic_id'])) ? append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=" . $topic_prev_row['topic_id']) : "";
-$view_next_topic_url = (!empty($topic_next_row['topic_id'])) ? append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=" . $topic_next_row['topic_id']) : "";
+
+$view_prev_topic_url = append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id&view=previous");
+$view_next_topic_url = append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id&view=next");
$template->assign_vars(array(
- "L_POSTED" => $l_posted,
- "U_POST_NEW_TOPIC" => $new_topic_url,
"FORUM_NAME" => $forum_name,
"TOPIC_TITLE" => $topic_title,
+ "L_POSTED" => $lang['Posted'],
+ "L_POST_SUBJECT" => $lang['Post_subject'],
+ "L_VIEW_NEXT_TOPIC" => $lang['View_next_topic'],
+ "L_VIEW_PREVIOUS_TOPIC" => $lang['View_previous_topic'],
+
"U_VIEW_FORUM" => $view_forum_url,
"U_VIEW_OLDER_TOPIC" => $view_prev_topic_url,
"U_VIEW_NEWER_TOPIC" => $view_next_topic_url,
+ "U_POST_NEW_TOPIC" => $new_topic_url,
"U_POST_REPLY_TOPIC" => $reply_topic_url));
//
// Update the topic view counter
//
-$sql = "UPDATE ".TOPICS_TABLE."
+$sql = "UPDATE " . TOPICS_TABLE . "
SET topic_views = topic_views + 1
WHERE topic_id = $topic_id";
if(!$update_result = $db->sql_query($sql))
@@ -364,92 +290,104 @@ if(!$update_result = $db->sql_query($sql))
// Okay, let's do the loop, yeah come on baby let's do the loop
// and it goes like this ...
//
-for($x = 0; $x < $total_posts; $x++)
+for($i = 0; $i < $total_posts; $i++)
{
- $poster = stripslashes($postrow[$x]['username']);
- $poster_id = $postrow[$x]['user_id'];
- $post_date = create_date($board_config['default_dateformat'], $postrow[$x]['post_time'], $board_config['default_timezone']);
+ $poster_id = $postrow[$i]['user_id'];
+ $poster = stripslashes($postrow[$i]['username']);
- $poster_posts = ($postrow[$x]['user_id'] != ANONYMOUS) ? $lang['Posts'] . ": " . $postrow[$x]['user_posts'] : "";
+ $post_date = create_date($board_config['default_dateformat'], $postrow[$i]['post_time'], $board_config['default_timezone']);
- $poster_from = ($postrow[$x]['user_from'] && $postrow[$x]['user_id'] != ANONYMOUS) ? $lang['From'] . ": " .$postrow[$x]['user_from'] : "";
+ $poster_posts = ($postrow[$i]['user_id'] != ANONYMOUS) ? $lang['Posts'] . ": " . $postrow[$i]['user_posts'] : "";
- $poster_joined = ($postrow[$x]['user_id'] != ANONYMOUS) ? $lang['Joined'] . ": " . create_date($board_config['default_dateformat'], $postrow[$x]['user_regdate'], $board_config['default_timezone']) : "";
+ $poster_from = ($postrow[$i]['user_from'] && $postrow[$i]['user_id'] != ANONYMOUS) ? $lang['From'] . ": " .$postrow[$i]['user_from'] : "";
- $poster_avatar = ($postrow[$x]['user_avatar'] != "" && $userdata['user_id'] != ANONYMOUS) ? "![](\"".$board_config['avatar_path']."/".$postrow[$x]['user_avatar']."\")
" : "";
+ $poster_joined = ($postrow[$i]['user_id'] != ANONYMOUS) ? $lang['Joined'] . ": " . create_date($board_config['default_dateformat'], $postrow[$i]['user_regdate'], $board_config['default_timezone']) : "";
- if(empty($postrow[$x]['user_rank']) && $postrow[$x]['user_id'] != ANONYMOUS)
+ if($postrow[$i]['user_avatar'] != "" && $userdata['user_id'] != ANONYMOUS)
{
- for($i = 0; $i < count($ranksrow); $i++)
+ $poster_avatar = (strstr("http", $postrow[$i]['user_avatar']) && $board_config['allow_avatar_remote']) ? "![](\"")
" : "";
+ }
+
+ //
+ // Generate ranks
+ //
+ if( $postrow[$i]['user_id'] == ANONYMOUS )
+ {
+ $poster_rank = "";
+ $rank_image = "";
+ }
+ else if( $postrow[$i]['user_rank'] )
+ {
+ for($j = 0; $j < count($ranksrow); $j++)
{
- if($poster_posts > $ranksrow[$i]['rank_min'] && $poster_posts < $ranksrow[$i]['rank_max'])
+ if($postrow[$i]['user_rank'] == $ranksrow[$j]['rank_special'])
{
- $poster_rank = $ranksrow[$i]['rank_title'];
- $rank_image = ($ranksrow[$i]['rank_image']) ? "![](\"".$ranksrow[$i]['rank_image']."\")
" : "";
+ $poster_rank = $ranksrow[$j]['rank_title'];
+ $rank_image = ($ranksrow[$j]['rank_image']) ? "" : "";
}
}
}
else
{
- if(!empty($postrow[$x]['user_rank']))
+ for($j = 0; $j < count($ranksrow); $j++)
{
- for($i = 0; $i < count($ranksrow); $i++)
+ if($postrow[$i]['user_posts'] > $ranksrow[$j]['rank_min'] && $postrow[$i]['user_posts'] < $ranksrow[$j]['rank_max'])
{
- if($postrow[$x]['user_rank'] == $ranksrow[$i]['rank_special'])
- {
- $poster_rank = $ranksrow[$i]['rank_title'];
- $rank_image = ($ranksrow[$i]['rank_image']) ? "" : "";
- }
+ $poster_rank = $ranksrow[$j]['rank_title'];
+ $rank_image = ($ranksrow[$j]['rank_image']) ? "" : "";
}
}
}
+ //
// Handle anon users posting with usernames
- if($poster_id == ANONYMOUS && $postrow[$x]['post_username'] != '')
+ //
+ if($poster_id == ANONYMOUS && $postrow[$i]['post_username'] != '')
{
- $poster = stripslashes($postrow[$x]['post_username']);
+ $poster = stripslashes($postrow[$i]['post_username']);
$poster_rank = $lang['Guest'];
}
$profile_img = "![\"$l_profileof](\"".$images['profile']."\")
";
+ $search_img = "";
+
$pm_img = "![\""](\"".)
";
- $email_img = ($postrow[$x]['user_viewemail'] == 1) ? "![\"$l_email](\"".$images['email']."\")
" : "";
+ $email_img = ($postrow[$i]['user_viewemail'] == 1) ? "" : "";
- $www_img = ($postrow[$x]['user_website']) ? "![\"$l_viewsite\"](\"".$images['www']."\")
" : "";
+ $www_img = ($postrow[$i]['user_website']) ? "" : "";
- if($postrow[$x]['user_icq'])
+ if($postrow[$i]['user_icq'])
{
- $icq_status_img = "![\"$l_icqstatus\"](\"http://online.mirabilis.com/scripts/online.dll?icq=".$postrow[$x]['user_icq']."&img=5\")
";
+ $icq_status_img = "![\"$l_icqstatus\"](\"http://online.mirabilis.com/scripts/online.dll?icq=".$postrow[$i]['user_icq']."&img=5\")
";
- $icq_add_img = "![\"$l_icq\"](\"".$images['icq']."\")
";
+ $icq_add_img = "";
}
else
{
$icq_status_img = "";
-
$icq_add_img = "";
}
- $aim_img = ($postrow[$x]['user_aim']) ? "![](\"".$images['aim']."\")
" : "";
+ $aim_img = ($postrow[$i]['user_aim']) ? "" : "";
- $msn_img = ($postrow[$x]['user_msnm']) ? "![](\"".$images['msn']."\")
" : "";
+ $msn_img = ($postrow[$i]['user_msnm']) ? "" : "";
- $yim_img = ($postrow[$x]['user_yim']) ? "![](\"".$images['yim']."\")
" : "";
+ $yim_img = ($postrow[$i]['user_yim']) ? "" : "";
- if($x == 0)
+ if($i == 0)
{
- $edit_post_url = append_sid("posting.$phpEx?mode=editpost&".POST_POST_URL."=".$postrow[$x]['post_id']."&".POST_TOPIC_URL."=$topic_id&".POST_FORUM_URL."=$forum_id&is_first_post=1");
+ $edit_post_url = append_sid("posting.$phpEx?mode=editpost&".POST_POST_URL."=".$postrow[$i]['post_id']."&".POST_TOPIC_URL."=$topic_id&".POST_FORUM_URL."=$forum_id&is_first_post=1");
}
else
{
- $edit_post_url = append_sid("posting.$phpEx?mode=editpost&".POST_POST_URL."=".$postrow[$x]['post_id']."&".POST_TOPIC_URL."=$topic_id&".POST_FORUM_URL."=$forum_id");
+ $edit_post_url = append_sid("posting.$phpEx?mode=editpost&".POST_POST_URL."=".$postrow[$i]['post_id']."&".POST_TOPIC_URL."=$topic_id&".POST_FORUM_URL."=$forum_id");
}
$edit_img = "![\"$l_editdelete\"](\"".$images['edit']."\")
";
- $quote_img = "![\"$l_replyquote\"](\"".$images['quote']."\")
";
+ $quote_img = "";
$pmsg_img = "![\"$l_sendpmsg\"](\"".$images['pmsg']."\")
";
@@ -457,22 +395,23 @@ for($x = 0; $x < $total_posts; $x++)
{
$ip_img = "![\"$l_viewip\"](\"".$images['ip']."\")
";
- $delpost_img = "![\"$l_delete\"](\"".$images['delpost']."\")
";
+ $delpost_img = "";
}
- $post_subject = ($postrow[$x]['post_subject'] != "") ? stripslashes($postrow[$x]['post_subject']) : "Re: ".$topic_title;
+ $post_subject = ($postrow[$i]['post_subject'] != "") ? stripslashes($postrow[$i]['post_subject']) : $topic_title;
- $bbcode_uid = $postrow[$x]['bbcode_uid'];
+ $bbcode_uid = $postrow[$i]['bbcode_uid'];
- $user_sig = stripslashes($postrow[$x]['user_sig']);
- $message = stripslashes($postrow[$x]['post_text']);
+ $user_sig = stripslashes($postrow[$i]['user_sig']);
+ $message = stripslashes($postrow[$i]['post_text']);
if(!$board_config['allow_html'])
{
$user_sig = strip_tags($user_sig);
$message = strip_tags($message);
}
+
if($board_config['allow_bbcode'])
{
// do bbcode stuff here
@@ -490,7 +429,7 @@ for($x = 0; $x < $total_posts; $x++)
// Again this will be handled by the templating
// code at some point
//
- if(!($x % 2))
+ if(!($i % 2))
{
$color = "#".$theme['td_color1'];
}
@@ -514,6 +453,7 @@ for($x = 0; $x < $total_posts; $x++)
"POST_SUBJECT" => $post_subject,
"MESSAGE" => $message,
"PROFILE_IMG" => $profile_img,
+ "SEARCH_IMG" => $search_img,
"PM_IMG" => $pm_img,
"EMAIL_IMG" => $email_img,
"WWW_IMG" => $www_img,
@@ -528,7 +468,8 @@ for($x = 0; $x < $total_posts; $x++)
"IP_IMG" => $ip_img,
"DELPOST_IMG" => $delpost_img,
- "U_POST_ID" => $postrow[$x]['post_id']));
+ "U_POST_ID" => $postrow[$i]['post_id'])
+ );
}
$s_auth_can = "You " . (($is_auth['auth_read']) ? "can" : "cannot" ) . " read posts in this forum
";