5 files changed, 374 insertions, 48 deletions
diff --git a/phpBB/admin/admin_ban.php b/phpBB/admin/admin_ban.php
index 5e3d5df493..811e15b2e3 100644
--- a/phpBB/admin/admin_ban.php
+++ b/phpBB/admin/admin_ban.php
@@ -401,7 +401,7 @@ switch ( $mode )
 		$l_unban_explain = $lang['Unban_username_explain'];
 		$l_ban_cell = $lang['Username'];
 		$l_no_ban_cell = $lang['No_banned_users'];
-		$s_submit_extra = '<input type="submit" name="usersubmit" value="' . $lang['Find_username'] . '" class="liteoption" onClick="window.open(\'../search.' . $phpEx . $SID . '&amp;mode=searchuser\', \'_phpbbsearch\', \'HEIGHT=250,resizable=yes,WIDTH=400\');return false;" />';
+		$s_submit_extra = '<input type="submit" name="usersubmit" value="' . $lang['Find_username'] . '" class="liteoption" onClick="window.open(\'../search.' . $phpEx . $SID . '&amp;mode=searchuser&amp;field=ban\', \'_phpbbsearch\', \'HEIGHT=420,resizable=yes,scrollbars=yes,WIDTH=650\');return false;" />';
 
 		break;
 
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 4ac62a885e..e932100724 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -231,11 +231,11 @@ function language_select($default, $select_name = "language", $dirname="language
 	$lang = array();
 	while ( $file = readdir($dir) )
 	{
-		if ( ereg("^lang_", $file) && !is_file($dirname . "/" . $file) && !is_link($dirname . "/" . $file) )
+		if ( preg_match('#^lang_#', $file) && !is_file($dirname . '/' . $file) && !is_link($dirname . '/' . $file) )
 		{
-			$filename = trim(str_replace("lang_", "", $file));
-			$displayname = preg_replace("/^(.*?)_(.*)$/", "\\1 [ \\2 ]", $filename);
-			$displayname = preg_replace("/\[(.*?)_(.*)\]/", "[ \\1 - \\2 ]", $displayname);
+			$filename = trim(str_replace('lang_', '', $file));
+			$displayname = preg_replace('/^(.*?)_(.*)$/', '\\1 [ \\2 ]', $filename);
+			$displayname = preg_replace('/\[(.*?)_(.*)\]/', '[ \\1 - \\2 ]', $displayname);
 			$lang[$displayname] = $filename;
 		}
 	}
@@ -246,7 +246,7 @@ function language_select($default, $select_name = "language", $dirname="language
 	@reset($lang);
 
 	$lang_select = '<select name="' . $select_name . '">';
-	while ( list($displayname, $filename) = @each($lang) )
+	foreach ( $lang as $displayname => $filename )
 	{
 		$selected = ( strtolower($default) == strtolower($filename) ) ? ' selected="selected"' : '';
 		$lang_select .= '<option value="' . $filename . '"' . $selected . '>' . ucwords($displayname) . '</option>';
@@ -434,7 +434,6 @@ function create_date($format, $gmepoch, $tz)
 
 	if ( empty($translate) && $board_config['default_lang'] != 'english' )
 	{
-		@reset($lang['datetime']);
 		foreach ( $lang['datetime'] as $match => $replace )
 		{
 			$translate[$match] = $replace;
diff --git a/phpBB/language/lang_english/lang_main.php b/phpBB/language/lang_english/lang_main.php
index 0a98d6dc6a..29a0577888 100644
--- a/phpBB/language/lang_english/lang_main.php
+++ b/phpBB/language/lang_english/lang_main.php
@@ -760,6 +760,8 @@ $lang['Search_keywords'] = 'Search for Keywords';
 $lang['Search_keywords_explain'] = 'You can use <u>AND</u> to define words which must be in the results, <u>OR</u> to define words which may be in the result and <u>NOT</u> to define words which should not be in the result. Use * as a wildcard for partial matches';
 $lang['Search_author'] = 'Search for Author';
 $lang['Search_author_explain'] = 'Use * as a wildcard for partial matches';
+$lang['Find_username_explain'] = 'Use this form to search for specific usernames. You do not need to fill out all fields, to partialy match data use * as a wildcard. When entering dates use the format yyyy-mm-dd, e.g. 2002-01-01.';
+$lang['Last_active'] = 'Last active';
 
 $lang['Search_for_any'] = 'Search for any terms or use query as entered';
 $lang['Search_for_all'] = 'Search for all terms';
@@ -777,6 +779,17 @@ $lang['Sort_Post_Subject'] = 'Post Subject';
 $lang['Sort_Topic_Title'] = 'Topic Title';
 $lang['Sort_Author'] = 'Author';
 $lang['Sort_Forum'] = 'Forum';
+$lang['Sort_Post_count'] = 'Post count';
+$lang['Sort_Last_active'] = 'Last active';
+
+$lang['Less_than'] = 'Less than';
+$lang['Equal_to'] = 'Equal to';
+$lang['More_than'] = 'More than';
+
+$lang['Before'] = 'Before';
+$lang['After'] = 'After';
+
+$lang['Never'] = 'Never';
 
 $lang['Display_results'] = 'Display results as';
 $lang['All_available'] = 'All available';
diff --git a/phpBB/search.php b/phpBB/search.php
index fc99d18b31..0e571617cd 100644
--- a/phpBB/search.php
+++ b/phpBB/search.php
@@ -8,7 +8,6 @@
  *
  *   $Id$
  *
- *
  ***************************************************************************/
 
 /***************************************************************************
@@ -31,11 +30,13 @@ include($phpbb_root_path . 'includes/functions_posting.'.$phpEx);
 // Start session management
 //
 $userdata = $session->start();
-$acl = new auth('list', $userdata);
+$acl = new auth('read', $userdata);
 //
 // End session management
 //
 
+$session->configure($userdata);
+
 //
 // Define initial vars
 //
@@ -125,14 +126,7 @@ if ( $mode == 'searchuser' )
 	//
 	// This handles the simple windowed user search functions called from various other scripts
 	//
-	if ( isset($HTTP_POST_VARS['search_username']) )
-	{
-		username_search($HTTP_POST_VARS['search_username']);
-	}
-	else
-	{
-		username_search('');
-	}
+	username_search();
 
 	exit;
 }
@@ -1188,17 +1182,11 @@ $sql = "SELECT c.cat_title, c.cat_id, f.forum_name, f.forum_id
 	WHERE f.cat_id = c.cat_id 
 	ORDER BY c.cat_id, f.forum_order";
 $result = $db->sql_query($sql);
-if ( !$result )
-{
-	message_die(ERROR, 'Could not obtain forum_name/forum_id', '', __LINE__, __FILE__, $sql);
-}
-
-$is_auth_ary = auth(AUTH_READ, AUTH_LIST_ALL, $userdata);
 
 $s_forums = '';
 while( $row = $db->sql_fetchrow($result) )
 {
-	if ( $is_auth_ary[$row['forum_id']]['auth_read'] )
+	if ( $acl->get_acl($row['forum_id'], 'forum', 'read') )
 	{
 		$s_forums .= '<option value="' . $row['forum_id'] . '">' . $row['forum_name'] . '</option>';
 		if ( empty($list_cat[$row['cat_id']]) )
@@ -1262,17 +1250,6 @@ for($i = 0; $i < count($previous_days); $i++)
 	$s_time .= '<option value="' . $previous_days[$i] . '"' . $selected . '>' . $previous_days_text[$i] . '</option>';
 }
 
-//
-// Output the basic page
-//
-$page_title = $lang['Search'];
-include($phpbb_root_path . 'includes/page_header.'.$phpEx);
-
-$template->set_filenames(array(
-	'body' => 'search_body.tpl')
-);
-make_jumpbox('viewforum.'.$phpEx);
-
 $template->assign_vars(array(
 	'L_SEARCH_QUERY' => $lang['Search_query'], 
 	'L_SEARCH_OPTIONS' => $lang['Search_options'], 
@@ -1296,7 +1273,7 @@ $template->assign_vars(array(
 	'L_TOPICS' => $lang['Topics'],
 	'L_POSTS' => $lang['Posts'],
 
-	'S_SEARCH_ACTION' => append_sid("search.$phpEx?mode=results"),
+	'S_SEARCH_ACTION' => "search.$phpEx$SID&amp;mode=results",
 	'S_CHARACTER_OPTIONS' => $s_characters,
 	'S_FORUM_OPTIONS' => $s_forums, 
 	'S_CATEGORY_OPTIONS' => $s_categories, 
@@ -1305,8 +1282,262 @@ $template->assign_vars(array(
 	'S_HIDDEN_FIELDS' => $s_hidden_fields)
 );
 
-$template->pparse('body');
+//
+// Output the basic page
+//
+$page_title = $lang['Search'];
+include($phpbb_root_path . 'includes/page_header.'.$phpEx);
+
+$template->set_filenames(array(
+	'body' => 'search_body.html')
+);
+make_jumpbox('viewforum.'.$phpEx);
 
 include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
 
+//
+// Username search
+//
+function username_search()
+{
+	global $SID, $HTTP_GET_VARS, $HTTP_POST_VARS, $phpEx, $phpbb_root_path;
+	global $db, $board_config, $template, $acl, $lang, $theme;
+	global $starttime;
+
+	$field_name = ( isset($HTTP_GET_VARS['field']) ) ? $HTTP_GET_VARS['field'] : 'username';
+	$start = ( isset($HTTP_GET_VARS['start']) ) ? intval($HTTP_GET_VARS['start']) : 0;
+
+	$sort_order = ( !empty($HTTP_POST_VARS['sort_order']) ) ? $HTTP_POST_VARS['sort_order'] : 'd';
+	$sort_by = ( !empty($HTTP_POST_VARS['sort_by']) ) ? intval($HTTP_POST_VARS['sort_by']) : 4;
+	$joined_select = ( !empty($HTTP_POST_VARS['joined_select']) ) ? $HTTP_POST_VARS['joined_select'] : 'lt';
+	$active_select = ( !empty($HTTP_POST_VARS['active_select']) ) ? $HTTP_POST_VARS['active_select'] : 'lt';
+	$count_select = ( !empty($HTTP_POST_VARS['count_select']) ) ? $HTTP_POST_VARS['count_select'] : 'lt';
+
+	$username = ( !empty($HTTP_POST_VARS['username']) ) ? $HTTP_POST_VARS['username'] : '';
+	$email = ( !empty($HTTP_POST_VARS['email']) ) ? $HTTP_POST_VARS['email'] : '';
+	$icq = ( !empty($HTTP_POST_VARS['icq']) ) ? intval($HTTP_POST_VARS['icq']) : '';
+	$aim = ( !empty($HTTP_POST_VARS['aim']) ) ? $HTTP_POST_VARS['aim'] : '';
+	$yahoo = ( !empty($HTTP_POST_VARS['yahoo']) ) ? $HTTP_POST_VARS['yahoo'] : '';
+	$msn = ( !empty($HTTP_POST_VARS['msn']) ) ? $HTTP_POST_VARS['msn'] : '';
+	$joined = ( !empty($HTTP_POST_VARS['joined']) ) ? explode('-', $HTTP_POST_VARS['joined']) : '';
+	$active = ( !empty($HTTP_POST_VARS['active']) ) ? explode('-', $HTTP_POST_VARS['active']) : '';
+	$count = ( !empty($HTTP_POST_VARS['count']) ) ? intval($HTTP_POST_VARS['count']) : '';
+
+	//
+	//
+	//
+	$sort_by_types_text = array($lang['Sort_Username'], $lang['Sort_Email'], $lang['Sort_Post_count'], $lang['Sort_Joined'], $lang['Sort_Last_active']);
+	$s_sort_by = '';
+	for($i = 0; $i < count($sort_by_types_text); $i++)
+	{
+		$selected = ( $sort_by == $i ) ? ' selected="selected"' : '';
+		$s_sort_by .= '<option value="' . $i . '"' . $selected . '>' . $sort_by_types_text[$i] . '</option>';
+	}
+
+	$sort_order_text = array('a' => $lang['Ascending'], 'd' => $lang['Descending']);
+	$s_sort_order = '';
+	foreach ( $sort_order_text as $key => $value )
+	{
+		$selected = ( $sort_order == $key ) ? ' selected="selected"' : '';
+		$s_sort_order .= '<option value="' . $key . '"' . $selected . '>' . $value . '</option>';
+	}
+
+	$sort_order = ( $sort_order == 'a' ) ? 'ASC' : 'DESC';
+
+	$find_count = array('lt' => $lang['Less_than'], 'eq' => $lang['Equal_to'], 'gt' => $lang['More_than']);
+	$s_find_count = '';
+	foreach ( $find_count as $key => $value )
+	{
+		$selected = ( $count_select == $key ) ? ' selected="selected"' : '';
+		$s_find_count .= '<option value="' . $key . '"' . $selected . '>' . $value . '</option>';
+	}
+
+	$find_time = array('lt' => $lang['Before'], 'gt' => $lang['After']);
+	$s_find_join_time = '';
+	foreach ( $find_time as $key => $value )
+	{
+		$selected = ( $joined_select == $key ) ? ' selected="selected"' : '';
+		$s_find_join_time .= '<option value="' . $key . '"' . $selected . '>' . $value . '</option>';
+	}
+	$s_find_active_time = '';
+	foreach ( $find_time as $key => $value )
+	{
+		$selected = ( $active_select == $key ) ? ' selected="selected"' : '';
+		$s_find_active_time .= '<option value="' . $key . '"' . $selected . '>' . $value . '</option>';
+	}
+
+	//
+	//
+	//
+	$where_sql = '';
+	if ( isset($HTTP_POST_VARS['submit']) )
+	{
+		$key_match = array('lt' => '<', 'gt' => '>', 'eq' => '=');
+		$sort_by_types = array('username', 'user_email', 'user_posts', 'user_regdate', 'user_session_time');
+
+		$where_sql .= ( $username ) ? " AND username LIKE '" . str_replace('*', '%', $username) ."'" : '';
+		$where_sql .= ( $email ) ? " AND user_email LIKE '" . str_replace('*', '%', $email) ."' " : '';
+		$where_sql .= ( $icq ) ? " AND user_icq LIKE '" . str_replace('*', '%', $icq) ."' " : '';
+		$where_sql .= ( $aim ) ? " AND user_aim LIKE '" . str_replace('*', '%', $aim) ."' " : '';
+		$where_sql .= ( $yahoo ) ? " AND user_yim LIKE '" . str_replace('*', '%', $yahoo) ."' " : '';
+		$where_sql .= ( $msn ) ? " AND user_msnm LIKE '" . str_replace('*', '%', $msn) ."' " : '';
+		$where_sql .= ( $joined ) ? " AND user_regdate " . $key_match[$joined_select] . " " . gmmktime(0, 0, 0, $joined[1], $joined[2], $joined[0]) : '';
+		$where_sql .= ( $count ) ? " AND user_posts " . $key_match[$count_select] . " $count " : '';
+		$where_sql .= ( $active ) ? " AND user_session_time " . $key_match[$active_select] . " " . gmmktime(0, 0, 0, $active[1], $active[2], $active[0]) : '';
+
+		$order_by = $sort_by_types[$sort_by] . "  $sort_order ";
+	}
+	else
+	{
+		$order_by = "user_session_time $sort_order ";
+	}
+
+	$sql = "SELECT COUNT(user_id) AS total_users 
+		FROM " . USERS_TABLE . " 
+		WHERE user_id <> " . ANONYMOUS . " 
+		$where_sql 
+		ORDER BY $order_by 
+		LIMIT $start, " . $board_config['topics_per_page'];
+	$result = $db->sql_query($sql);
+
+	$total_users = ( $row = $db->sql_fetchrow($result) ) ? $row['total_users'] : 0;
+
+	$pagination = generate_pagination("search.$phpEx$SID&amp;mode=searchuser&amp;order=$sort_order", $total_users, $board_config['topics_per_page'], $start);
+
+	//
+	//
+	//
+	$page_title = $lang['Search'];
+	include($phpbb_root_path . 'includes/page_header.'.$phpEx);
+
+	$template->set_filenames(array(
+		'search_user_body' => 'search_username.html')
+	);
+
+	$template->assign_vars(array(
+		'USERNAME' => $username, 
+		'EMAIL' => $email, 
+		'ICQ' => $icq, 
+		'AIM' => $aim, 
+		'YAHOO' => $yahoo, 
+		'MSNM' => $msn, 
+		'JOINED' => ( is_array($joined) ) ? implode('-', $joined) : '', 
+		'ACTIVE' => ( is_array($active) ) ? implode('-', $active) : '', 
+		'COUNT' => $count, 
+
+		'PAGINATION' => $pagination,
+		'PAGE_NUMBER' => sprintf($lang['Page_of'], ( floor( $start / $board_config['topics_per_page'] ) + 1 ), ceil( $total_users / $board_config['topics_per_page'] )), 
+
+		'L_CLOSE_WINDOW' => $lang['Close_window'], 
+		'L_SEARCH_USERNAME' => $lang['Find_username'], 
+		'L_SEARCH_EXPLAIN' => $lang['Find_username_explain'], 
+		'L_EMAIL' => $lang['Email'], 
+		'L_ICQ_NUMBER' => $lang['ICQ'],
+		'L_MESSENGER' => $lang['MSNM'],
+		'L_YAHOO' => $lang['YIM'],
+		'L_AIM' => $lang['AIM'], 
+		'L_JOINED' => $lang['Joined'], 
+		'L_ACTIVE' => $lang['Last_active'], 
+		'L_POSTS' => $lang['Posts'], 
+		'L_SORT_BY' => $lang['Sort_by'],
+		'L_SORT_ASCENDING' => $lang['Sort_Ascending'],
+		'L_SORT_DESCENDING' => $lang['Sort_Descending'],
+
+		'L_UPDATE_USERNAME' => $lang['Select_username'], 
+		'L_SELECT' => $lang['Select'], 
+		'L_SEARCH' => $lang['Search'], 
+		'L_CLOSE_WINDOW' => $lang['Close_window'], 
+
+		'S_FIELD_NAME' => $field_name, 
+		'S_COUNT_OPTIONS' => $s_find_count, 
+		'S_JOINED_TIME_OPTIONS' => $s_find_join_time, 
+		'S_ACTIVE_TIME_OPTIONS' => $s_find_active_time, 
+		'S_SORT_OPTIONS' => $s_sort_by, 
+		'S_SORT_ORDER' => $s_sort_order, 
+		'S_USERNAME_OPTIONS' => $username_list, 
+		'S_SEARCH_ACTION' => "search.$phpEx$SID&amp;mode=searchuser")
+	);
+
+	$sql = "SELECT username, user_id, user_viewemail, user_posts, user_regdate, user_email, user_session_time 
+		FROM " . USERS_TABLE . " 
+		WHERE user_id <> " . ANONYMOUS . " 
+		$where_sql 
+		ORDER BY $order_by 
+		LIMIT $start, " . $board_config['topics_per_page'];
+	$result = $db->sql_query($sql);
+
+	if ( $row = $db->sql_fetchrow($result) )
+	{
+		$i = 0;
+		do
+		{
+			$username = $row['username'];
+			$user_id = $row['user_id'];
+
+			$from = ( !empty($row['user_from']) ) ? $row['user_from'] : '&nbsp;';
+			$joined = create_date($lang['DATE_FORMAT'], $row['user_regdate'], $board_config['board_timezone']);
+			$posts = ( $row['user_posts'] ) ? $row['user_posts'] : 0;
+			$active = ( !$row['user_session_time'] ) ? $lang['Never'] : create_date($lang['DATE_FORMAT'], $row['user_session_time'], $board_config['board_timezone']);
+
+			if ( $row['user_viewemail'] || $acl->get_acl_admin() )
+			{
+				$email_uri = ( $board_config['board_email_form'] ) ? "profile.$phpEx$SID&amp;mode=email&amp;u=" . $user_id : 'mailto:' . $row['user_email'];
+
+				$email_img = '<a href="' . $email_uri . '">' . create_img($theme['icon_email'], $lang['Send_email']) . '</a>';
+				$email = '<a href="' . $email_uri . '">' . $lang['Send_email'] . '</a>';
+			}
+			else
+			{
+				$email_img = '&nbsp;';
+				$email = '&nbsp;';
+			}
+
+			$temp_url = "profile.$phpEx$SID&amp;mode=viewprofile&amp;u=$user_id";
+			$profile_img = '<a href="' . $temp_url . '">' . create_img($theme['icon_profile'], $lang['Read_profile']) . '</a>';
+			$profile = '<a href="' . $temp_url . '">' . $lang['Read_profile'] . '</a>';
+
+			$template->assign_block_vars('memberrow', array(
+				'ROW_NUMBER' => $i + ( $start + 1 ), 
+				'USERNAME' => $username,
+				'FROM' => $from,
+				'JOINED' => $joined,
+				'POSTS' => $posts, 
+				'ACTIVE' => $active, 
+				'AVATAR_IMG' => $poster_avatar,
+				'PROFILE_IMG' => $profile_img, 
+				'PROFILE' => $profile, 
+				'SEARCH_IMG' => $search_img,
+				'SEARCH' => $search,
+				'PM_IMG' => $pm_img,
+				'PM' => $pm,
+				'EMAIL_IMG' => $email_img,
+				'EMAIL' => $email,
+				'WWW_IMG' => $www_img,
+				'WWW' => $www,
+				'ICQ_STATUS_IMG' => $icq_status_img,
+				'ICQ_IMG' => $icq_img, 
+				'ICQ' => $icq, 
+				'AIM_IMG' => $aim_img,
+				'AIM' => $aim,
+				'MSN_IMG' => $msn_img,
+				'MSN' => $msn,
+				'YIM_IMG' => $yim_img,
+				'YIM' => $yim,
+
+				'S_ROW_COUNT' => $i, 
+				
+				'U_VIEWPROFILE' => "profile.$phpEx$SID&amp;mode=viewprofile&amp;u=$user_id")
+			);
+
+			$i++;
+		}
+		while ( $row = $db->sql_fetchrow($result) );
+	}
+
+	$template->display('search_user_body');
+
+	include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
+	exit;
+}
+
 ?>
 \ No newline at end of file
diff --git a/phpBB/templates/subSilver/search_username.html b/phpBB/templates/subSilver/search_username.html
index a113c30f01..4d2a536fc1 100644
--- a/phpBB/templates/subSilver/search_username.html
+++ b/phpBB/templates/subSilver/search_username.html
@@ -4,30 +4,113 @@
 <!--
 function refresh_username(selected_username)
 {
-	opener.document.forms['post'].username.value = selected_username;
+	opener.document.forms[0].{S_FIELD_NAME}.value += ( opener.document.forms[0].{S_FIELD_NAME}.value.length  ) ? "\n" + selected_username : selected_username;
 	opener.focus();
-	window.close();
 }
 //-->
 </script>
 
-<form method="post" name="search" action="{S_SEARCH_ACTION}">
-<table width="100%" border="0" cellspacing="0" cellpadding="10">
+<form method="post" name="search" action="{S_SEARCH_ACTION}"><table width="100%" cellspacing="0" cellpadding="10" border="0">
 	<tr>
-		<td><table width="100%" class="forumline" cellpadding="4" cellspacing="1" border="0">
+		<td><table width="100%" class="forumline" cellspacing="1" cellpadding="4" border="0">
 			<tr> 
-				<th class="thHead" height="25">{L_SEARCH_USERNAME}</th>
+				<th class="thHead" colspan="2" height="25">{L_SEARCH_USERNAME}</th>
+			</tr>
+			<tr>
+				<td class="row2" colspan="2"><span class="gensmall">{L_SEARCH_EXPLAIN}</span></td>
+			</tr>
+			<tr> 
+				<td class="row1"><span class="gen">{L_USERNAME}: </span></td>
+				<td class="row1"><input class="post" type="text" name="username" value="{USERNAME}" /></td>
+			</tr>
+			<tr> 
+				<td class="row2"><span class="gen">{L_EMAIL}: </span></td>
+				<td class="row2"><input class="post" type="text" name="email" value="{EMAIL}" /></td>
+			</tr>
+			<tr> 
+				<td class="row1"><span class="gen">{L_ICQ_NUMBER}: </span></td>
+				<td class="row1"><input class="post" type="text" name="icq" value="{ICQ}" /></td>
+			</tr>
+			<tr> 
+				<td class="row2"><span class="gen">{L_AIM}: </span></td>
+				<td class="row2"><input class="post" type="text" name="aim" value="{AIM}" /></td>
 			</tr>
 			<tr> 
-				<td valign="top" class="row1"><span class="genmed"><br /><input type="text" name="search_username" value="{USERNAME}" class="post" />&nbsp; <input type="submit" name="search" value="{L_SEARCH}" class="liteoption" /></span><br /><span class="gensmall">{L_SEARCH_EXPLAIN}</span><br />
-				<!-- IF S_SELECT_NAME -->
-				<span class="genmed">{L_UPDATE_USERNAME}<br /><select name="username_list">{S_USERNAME_OPTIONS}</select>&nbsp; <input type="submit" class="liteoption" onClick="refresh_username(this.form.username_list.options[this.form.username_list.selectedIndex].value);return false;" name="use" value="{L_SELECT}" /></span><br />
-				<!-- ENDIF -->
-				<br /><span class="genmed"><a href="javascript:window.close();" class="genmed">{L_CLOSE_WINDOW}</a></span></td>
+				<td class="row1"><span class="gen">{L_YAHOO}: </span></td>
+				<td class="row1"><input class="post" type="text" name="yahoo" value="{YAHOO}" /></td>
+			</tr>
+			<tr> 
+				<td class="row2"><span class="gen">{L_MESSENGER}: </span></td>
+				<td class="row2"><input class="post" type="text" name="msn" value="{MSNM}" /></td>
+			</tr>
+			<tr> 
+				<td class="row1"><span class="gen">{L_JOINED}: </span></td>
+				<td class="row1"><select name="joined_select">{S_JOINED_TIME_OPTIONS}</select> <input class="post" type="text" name="joined" value="{JOINED}" /></td>
+			</tr>
+			<tr> 
+				<td class="row2"><span class="gen">{L_ACTIVE}: </span></td>
+				<td class="row2"><select name="active_select">{S_ACTIVE_TIME_OPTIONS}</select> <input class="post" type="text" name="active" value="{ACTIVE}" /></td>
+			</tr>
+			<tr> 
+				<td class="row1"><span class="gen">{L_POSTS}: </span></td>
+				<td class="row1"><select name="count_select">{S_COUNT_OPTIONS}</select> <input class="post" type="text" name="count" value="{COUNT}" /></td>
+			</tr>
+			<tr>
+				<td class="row2"><span class="gen">{L_SORT_BY}:&nbsp;</span></td>
+				<td class="row2" valign="middle" nowrap="nowrap"><span class="genmed"><select class="post" name="sort_by">{S_SORT_OPTIONS}</select> <select class="post" name="sort_order">{S_SORT_ORDER}</select></span>&nbsp;</td>
+			</tr>
+			<tr>
+				<td class="catBottom" colspan="2" align="center"><input type="submit" name="submit" value="{L_SEARCH}" class="liteoption" /></td>
+			</tr>
+		</table></td>
+	</tr>
+	<tr>
+		<td><table width="100%" cellpadding="3" cellspacing="1" border="0" class="forumline">
+			<tr> 
+				<th width="2%" height="25" class="thCornerL" nowrap="nowrap">#</th>
+				<th class="thTop" nowrap="nowrap">{L_USERNAME}</th>
+				<th class="thTop" nowrap="nowrap">{L_POSTS}</th>
+				<th class="thTop" nowrap="nowrap">{L_JOINED}</th>
+				<th class="thTop" nowrap="nowrap">{L_ACTIVE}</th>
+			</tr>
+			<!-- BEGIN memberrow -->
+			<!-- IF memberrow.S_ROW_COUNT is even -->
+			<tr class="row2">
+			<!-- ELSE -->
+			<tr class="row1">
+			<!-- ENDIF -->
+				<td align="center"><span class="gen">&nbsp;{memberrow.ROW_NUMBER}&nbsp;</span></td>
+				<td align="center"><span class="gen"><a class="gen" href="{memberrow.U_VIEWPROFILE}" onClick="refresh_username('{memberrow.USERNAME}');return false;">{memberrow.USERNAME}</a></span></td>
+				<td align="center" valign="middle"><span class="gen">{memberrow.POSTS}</span></td>
+				<td align="center" valign="middle"><span class="gensmall">{memberrow.JOINED}</span></td>
+				<td align="center" valign="middle"><span class="gensmall">{memberrow.ACTIVE}</span></td>
+			</tr>
+			<!-- BEGINELSE -->
+			<tr>
+				<td class="row1" colspan="5">{L_NO_USERS}</td>
+			</tr>
+			<!-- END memberrow -->
+			<tr> 
+				<td class="catbottom" colspan="8" height="28">&nbsp;</td>
+			</tr>
+		</table>
+		
+		<table width="100%" cellspacing="0" cellpadding="0" border="0">
+			<tr> 
+				<td><span class="nav">{PAGE_NUMBER}</span></td>
+				<td align="right"><span class="gensmall">{S_TIMEZONE}</span><br /><span class="nav">{PAGINATION}</span></td>
 			</tr>
 		</table></td>
 	</tr>
 </table>
+
+
+<!-- IF S_SELECT_NAME -->
+	<tr>
+		<td><span class="genmed">{L_UPDATE_USERNAME}<br /><select name="username_list">{S_USERNAME_OPTIONS}</select>&nbsp; <input type="submit" class="liteoption" onClick="refresh_username(this.form.username_list.options[this.form.username_list.selectedIndex].value);return false;" name="use" value="{L_SELECT}" /></span><br /><br /><span class="genmed"><a href="javascript:window.close();" class="genmed">{L_CLOSE_WINDOW}</a></span></td>
+	</tr>
+<!-- ENDIF -->
+
 </form>
 
 <!-- INCLUDE simple_footer.html -->
 \ No newline at end of file