1 files changed, 52 insertions, 21 deletions
diff --git a/phpBB/includes/functions_admin.php b/phpBB/includes/functions_admin.php
index c85802dafb..c00a2cd3d9 100644
--- a/phpBB/includes/functions_admin.php
+++ b/phpBB/includes/functions_admin.php
@@ -160,7 +160,7 @@ function make_forum_select($select_id = false, $ignore_id = false, $ignore_acl =
 
 		if ($return_array)
 		{
-			// Include some more informations...
+			// Include some more information...
 			$selected = (is_array($select_id)) ? ((in_array($row['forum_id'], $select_id)) ? true : false) : (($row['forum_id'] == $select_id) ? true : false);
 			$forum_list[$row['forum_id']] = array_merge(array('padding' => $padding, 'selected' => $selected), $row);
 		}
@@ -471,7 +471,7 @@ function move_posts($post_ids, $topic_id, $auto_sync = true)
 		sync('forum', 'forum_id', $forum_ids, true);
 	}
 
-	// Update posted informations
+	// Update posted information
 	update_posted_info($topic_ids);
 }
 
@@ -482,6 +482,7 @@ function delete_topics($where_type, $where_ids, $auto_sync = true)
 {
 	global $db, $config;
 
+	$approved_topics = 0;
 	$forum_ids = $topic_ids = array();
 
 	if (is_array($where_ids))
@@ -502,7 +503,7 @@ function delete_topics($where_type, $where_ids, $auto_sync = true)
 		'posts'	=>	delete_posts($where_type, $where_ids, false, true)
 	);
 
-	$sql = 'SELECT topic_id, forum_id
+	$sql = 'SELECT topic_id, forum_id, topic_approved
 		FROM ' . TOPICS_TABLE . '
 		WHERE ' . $db->sql_in_set($where_type, $where_ids);
 	$result = $db->sql_query($sql);
@@ -511,6 +512,11 @@ function delete_topics($where_type, $where_ids, $auto_sync = true)
 	{
 		$forum_ids[] = $row['forum_id'];
 		$topic_ids[] = $row['topic_id'];
+
+		if ($row['topic_approved'])
+		{
+			$approved_topics++;
+		}
 	}
 	$db->sql_freeresult($result);
 
@@ -545,7 +551,10 @@ function delete_topics($where_type, $where_ids, $auto_sync = true)
 		sync('topic_reported', $where_type, $where_ids);
 	}
 
-	set_config('num_topics', $config['num_topics'] - sizeof($return['topics']), true);
+	if ($approved_topics)
+	{
+		set_config('num_topics', $config['num_topics'] - $approved_topics, true);
+	}
 
 	return $return;
 }
@@ -571,9 +580,10 @@ function delete_posts($where_type, $where_ids, $auto_sync = true, $posted_sync =
 		return false;
 	}
 
+	$approved_posts = 0;
 	$post_ids = $topic_ids = $forum_ids = $post_counts = array();
 
-	$sql = 'SELECT post_id, poster_id, post_postcount, topic_id, forum_id
+	$sql = 'SELECT post_id, poster_id, post_approved, post_postcount, topic_id, forum_id
 		FROM ' . POSTS_TABLE . '
 		WHERE ' . $db->sql_in_set($where_type, array_map('intval', $where_ids));
 	$result = $db->sql_query($sql);
@@ -589,6 +599,11 @@ function delete_posts($where_type, $where_ids, $auto_sync = true, $posted_sync =
 		{
 			$post_counts[$row['poster_id']] = (!empty($post_counts[$row['poster_id']])) ? $post_counts[$row['poster_id']] + 1 : 1;
 		}
+
+		if ($row['post_approved'])
+		{
+			$approved_posts++;
+		}
 	}
 	$db->sql_freeresult($result);
 
@@ -658,7 +673,10 @@ function delete_posts($where_type, $where_ids, $auto_sync = true, $posted_sync =
 		sync('forum', 'forum_id', $forum_ids, true);
 	}
 
-	set_config('num_posts', $config['num_posts'] - sizeof($post_ids), true);
+	if ($approved_posts)
+	{
+		set_config('num_posts', $config['num_posts'] - $approved_posts, true);
+	}
 
 	return sizeof($post_ids);
 }
@@ -924,7 +942,7 @@ function delete_topic_shadows($max_age, $forum_id = '', $auto_sync = true)
 }
 
 /**
-* Update/Sync posted informations for topics
+* Update/Sync posted information for topics
 */
 function update_posted_info(&$topic_ids)
 {
@@ -1928,8 +1946,6 @@ function split_sql_file($sql, $delimiter)
 /**
 * Cache moderators, called whenever permissions are changed via admin_permissions. Changes of username
 * and group names must be carried through for the moderators table
-*
-* @todo let the admin define if he wants to display moderators (forum-based) - display_on_index already present and checked for...
 */
 function cache_moderators()
 {
@@ -2128,7 +2144,7 @@ function view_log($mode, &$log, &$log_count, $limit = 0, $offset = 0, $forum_id
 
 		case 'user':
 			$log_type = LOG_USERS;
-			$sql_forum = 'AND l.reportee_id = ' . intval($user_id);
+			$sql_forum = 'AND l.reportee_id = ' . (int) $user_id;
 		break;
 		
 		case 'users':
@@ -2145,7 +2161,7 @@ function view_log($mode, &$log, &$log_count, $limit = 0, $offset = 0, $forum_id
 			return;
 	}
 
-	$sql = "SELECT l.*, u.username
+	$sql = "SELECT l.*, u.username, u.user_colour
 		FROM " . LOG_TABLE . " l, " . USERS_TABLE . " u
 		WHERE l.log_type = $log_type
 			AND u.user_id = l.user_id
@@ -2170,10 +2186,15 @@ function view_log($mode, &$log, &$log_count, $limit = 0, $offset = 0, $forum_id
 
 		$log[$i] = array(
 			'id'				=> $row['log_id'],
-			'reportee_id'		=> $row['reportee_id'],
-			'reportee_username'	=> '',
+
+			'reportee_id'			=> $row['reportee_id'],
+			'reportee_username'		=> '',
+			'reportee_username_full'=> '',
+
 			'user_id'			=> $row['user_id'],
-			'username'			=> '<a href="' . $profile_url . '&amp;u=' . $row['user_id'] . '">' . $row['username'] . '</a>',
+			'username'			=> $row['username'],
+			'username_full'		=> get_username_string('full', $row['user_id'], $row['username'], $row['user_colour'], false, $profile_url),
+
 			'ip'				=> $row['log_ip'],
 			'time'				=> $row['log_time'],
 			'forum_id'			=> $row['forum_id'],
@@ -2256,21 +2277,31 @@ function view_log($mode, &$log, &$log_count, $limit = 0, $offset = 0, $forum_id
 		}
 	}
 
-	if ($reportee_id_list)
+	if (sizeof($reportee_id_list))
 	{
 		$reportee_id_list = array_unique($reportee_id_list);
 		$reportee_names_list = array();
 
-		if (!function_exists('user_get_id_name'))
+		$sql = 'SELECT user_id, username, user_colour
+			FROM ' . USERS_TABLE . '
+			WHERE ' . $db->sql_in_set('user_id', $reportee_id_list);
+		$result = $db->sql_query($sql);
+
+		while ($row = $db->sql_fetchrow($result))
 		{
-			include_once($phpbb_root_path . 'includes/functions_user.' . $phpEx);
+			$reportee_names_list[$row['user_id']] = $row;
 		}
-
-		user_get_id_name($reportee_id_list, $reportee_names_list);
+		$db->sql_freeresult($result);
 
 		foreach ($log as $key => $row)
 		{
-			$log[$key]['reportee_username'] = (isset($reportee_names_list[$row['reportee_id']])) ? '<a href="' . $profile_url . '&amp;u=' . $row['reportee_id'] . '">' . $reportee_names_list[$row['reportee_id']] . '</a>' : false;
+			if (!isset($reportee_names_list[$row['reportee_id']]))
+			{
+				continue;
+			}
+
+			$log[$key]['reportee_username'] = $reportee_names_list[$row['reportee_id']]['username'];
+			$log[$key]['reportee_username_full'] = get_username_string('full', $row['reportee_id'], $reportee_names_list[$row['reportee_id']]['username'], $reportee_names_list[$row['reportee_id']]['user_colour'], false, $profile_url);
 		}
 	}
 
@@ -2369,7 +2400,7 @@ function view_warned_users(&$users, &$user_count, $limit = 0, $offset = 0, $limi
 {
 	global $db;
 
-	$sql = 'SELECT user_id, username, user_warnings, user_last_warning
+	$sql = 'SELECT user_id, username, user_colour, user_warnings, user_last_warning
 		FROM ' . USERS_TABLE . '
 		WHERE user_warnings > 0
 		' . (($limit_days) ? "AND user_last_warning >= $limit_days" : '') . "