Fixes and updates

git-svn-id: file:///svn/phpbb/trunk@579 89ea8834-ac86-4346-8a33-228a782c2dd0

phpBB/common.php

@@ -37,11 +37,11 @@ include('config.'.$phpEx);
 include('includes/constants.'.$phpEx);
 
 $url_images = "images";
-$images['quote'] = "$url_images/quote.gif";
+$images['quote'] = "$url_images/icon_quote.gif";
+$images['edit'] = "$url_images/icon_edit.gif";
 $images['search_icon'] = "$url_images/search_icon.gif";
-$images['edit'] = "$url_images/edit.gif";
+$images['profile'] = "$url_images/icon_profile.gif";
-$images['profile'] = "$url_images/profile.gif";
+$images['privmsg'] = "$url_images/icon_pm.gif";
-$images['privmsg'] = "$url_images/icon_privmsg.gif";
 $images['email'] = "$url_images/email.gif";
 $images['delpost'] = "$url_images/edit.gif";
 $images['ip'] = "$url_images/ip_logged.gif";
@@ -50,7 +50,6 @@ $images['icq'] = "$url_images/icq_add.gif";
 $images['aim'] = "$url_images/aim.gif";
 $images['yim'] = "$url_images/yim.gif";
 $images['msnm'] = "$url_images/msnm.gif";
-$images['quote'] = "$url_images/quote.gif";
 $images['posticon'] = "$url_images/posticon.gif";
 $images['folder'] = "$url_images/folder.gif";
 $images['new_folder'] = "$url_images/red_folder.gif";

phpBB/viewtopic.php

@@ -53,7 +53,7 @@ $start = (isset($HTTP_GET_VARS['start'])) ? $HTTP_GET_VARS['start'] : 0;
 // Find topic id if user requested a newer
 // or older topic
 //
-if( isset($HTTP_GET_VARS["view"]) )
+if( isset($HTTP_GET_VARS["view"]) && empty($HTTP_GET_VARS[POST_POST_URL]) )
 {
 	if($HTTP_GET_VARS["view"] == "next")
 	{
@@ -67,13 +67,15 @@ if( isset($HTTP_GET_VARS["view"]) )
 	}
 
 	$sql = "SELECT t.topic_id 
-		FROM " . TOPICS_TABLE . " t, " . TOPICS_TABLE . " t2 
+		FROM " . TOPICS_TABLE . " t, " . TOPICS_TABLE . " t2, " . POSTS_TABLE . " p, " . POSTS_TABLE . " p2  
 		WHERE t2.topic_id = $topic_id 
+			AND p2.post_id = t2.topic_last_post_id 
 			AND t.forum_id = t2.forum_id 
-			AND t.topic_time $sql_condition t2.topic_time 
+			AND p.post_id = t.topic_last_post_id 
-		ORDER BY t.topic_time $sql_ordering 
+			AND p.post_time $sql_condition p2.post_time 
+			AND p.topic_id = t.topic_id 
+		ORDER BY p.post_time $sql_ordering 
 		LIMIT 1";
-
 	if(!$result = $db->sql_query($sql))
 	{
 		message_die(GENERAL_ERROR, "Couldn't obtain newer/older topic information", "", __LINE__, __FILE__, $sql);
@@ -273,7 +275,8 @@ $template->assign_vars(array(
 	"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));
+	"U_POST_REPLY_TOPIC" => $reply_topic_url)
+);
 
 //
 // Update the topic view counter
@@ -308,6 +311,10 @@ for($i = 0; $i < $total_posts; $i++)
 	{
 		$poster_avatar = (strstr("http", $postrow[$i]['user_avatar']) && $board_config['allow_avatar_remote']) ? "<img src=\"" . $postrow[$i]['user_avatar'] . "\">" : "<img src=\"" . $board_config['avatar_path'] . "/" . $postrow[$i]['user_avatar'] . "\">";
 	}
+	else
+	{
+		$poster_avatar = "";
+	}
 
 	//
 	// Generate ranks
@@ -321,7 +328,7 @@ for($i = 0; $i < $total_posts; $i++)
 	{
 		for($j = 0; $j < count($ranksrow); $j++)
 		{
-			if($postrow[$i]['user_rank'] == $ranksrow[$j]['rank_special'])
+			if($postrow[$i]['user_rank'] == $ranksrow[$j]['rank_id'] && $ranksrow[$j]['rank_special'])
 			{
 				$poster_rank = $ranksrow[$j]['rank_title'];
 				$rank_image = ($ranksrow[$j]['rank_image']) ? "<img src=\"" . $ranksrow[$j]['rank_image'] . "\">" : "";
@@ -332,7 +339,7 @@ for($i = 0; $i < $total_posts; $i++)
 	{
 		for($j = 0; $j < count($ranksrow); $j++)
 		{
-			if($postrow[$i]['user_posts'] > $ranksrow[$j]['rank_min'] && $postrow[$i]['user_posts'] < $ranksrow[$j]['rank_max'])
+			if($postrow[$i]['user_posts'] > $ranksrow[$j]['rank_min'] && $postrow[$i]['user_posts'] < $ranksrow[$j]['rank_max'] && !$ranksrow[$j]['rank_special'])
 			{
 				$poster_rank = $ranksrow[$j]['rank_title'];
 				$rank_image = ($ranksrow[$j]['rank_image']) ? "<img src=\"" . $ranksrow[$j]['rank_image'] . "\">" : "";
@@ -389,8 +396,6 @@ for($i = 0; $i < $total_posts; $i++)
 
 	$quote_img = "<a href=\"" . append_sid("posting.$phpEx?mode=reply&quote=true&" . POST_POST_URL . "=" . $postrow[$i]['post_id'] . "&" . POST_TOPIC_URL . "=$topic_id&" . POST_FORUM_URL . "=$forum_id") . "\"><img src=\"" . $images['quote'] . "\" alt=\"$l_replyquote\" border=\"0\"></a>";
 
-	$pmsg_img = "<a href=\"".append_sid("privmsg.$phpEx?mode=send&" . POST_USERS_URL . "=" .$poster_id) . "\"><img src=\"".$images['pmsg']."\" alt=\"$l_sendpmsg\" border=\"0\"></a>";
-
 	if($is_auth['auth_mod'])
 	{
 		$ip_img = "<a href=\"" . append_sid("topicadmin.$phpEx?mode=viewip&" . POST_USERS_URL . "=" . $poster_id) . "\"><img src=\"" . $images['ip'] . "\" alt=\"$l_viewip\" border=\"0\"></a>";
@@ -398,7 +403,6 @@ for($i = 0; $i < $total_posts; $i++)
 		$delpost_img = "<a href=\"" . append_sid("topicadmin.$phpEx?mode=delpost&" . POST_POST_URL . "=" . $postrow[$i]['post_id']) . "\"><img src=\"" . $images['delpost'] . "\" alt=\"$l_delete\" border=\"0\"></a>";
 	}
 
-
 	$post_subject = ($postrow[$i]['post_subject'] != "") ? stripslashes($postrow[$i]['post_subject']) : $topic_title;
 
 	$bbcode_uid = $postrow[$i]['bbcode_uid'];