Coding style (user profile pages)

qa-include/pages/user-activity.php

@@ -20,13 +20,13 @@
 	More about this license: http://www.question2answer.org/license.php
 */
 
-	if (!defined('QA_VERSION')) { // don't allow this page to be requested directly from browser
-		header('Location: ../');
-		exit;
-	}
+if (!defined('QA_VERSION')) { // don't allow this page to be requested directly from browser
+	header('Location: ../');
+	exit;
+}
 
-	require_once QA_INCLUDE_DIR.'db/selects.php';
-	require_once QA_INCLUDE_DIR.'app/format.php';
+require_once QA_INCLUDE_DIR . 'db/selects.php';
+require_once QA_INCLUDE_DIR . 'app/format.php';
 
 
 //	$handle, $userhtml are already set by qa-page-user.php - also $userid if using external user integration
@@ -34,70 +34,65 @@
 
 //	Find the recent activity for this user
 
-	$loginuserid = qa_get_logged_in_userid();
-	$identifier = QA_FINAL_EXTERNAL_USERS ? $userid : $handle;
+$loginuserid = qa_get_logged_in_userid();
+$identifier = QA_FINAL_EXTERNAL_USERS ? $userid : $handle;
 
-	list($useraccount, $questions, $answerqs, $commentqs, $editqs) = qa_db_select_with_pending(
-		QA_FINAL_EXTERNAL_USERS ? null : qa_db_user_account_selectspec($handle, false),
-		qa_db_user_recent_qs_selectspec($loginuserid, $identifier, qa_opt_if_loaded('page_size_activity')),
-		qa_db_user_recent_a_qs_selectspec($loginuserid, $identifier),
-		qa_db_user_recent_c_qs_selectspec($loginuserid, $identifier),
-		qa_db_user_recent_edit_qs_selectspec($loginuserid, $identifier)
-	);
+list($useraccount, $questions, $answerqs, $commentqs, $editqs) = qa_db_select_with_pending(
+	QA_FINAL_EXTERNAL_USERS ? null : qa_db_user_account_selectspec($handle, false),
+	qa_db_user_recent_qs_selectspec($loginuserid, $identifier, qa_opt_if_loaded('page_size_activity')),
+	qa_db_user_recent_a_qs_selectspec($loginuserid, $identifier),
+	qa_db_user_recent_c_qs_selectspec($loginuserid, $identifier),
+	qa_db_user_recent_edit_qs_selectspec($loginuserid, $identifier)
+);
 
-	if (!QA_FINAL_EXTERNAL_USERS && !is_array($useraccount)) // check the user exists
-		return include QA_INCLUDE_DIR.'qa-page-not-found.php';
+if (!QA_FINAL_EXTERNAL_USERS && !is_array($useraccount)) // check the user exists
+	return include QA_INCLUDE_DIR . 'qa-page-not-found.php';
 
 
 //	Get information on user references
 
-	$questions = qa_any_sort_and_dedupe(array_merge($questions, $answerqs, $commentqs, $editqs));
-	$questions = array_slice($questions, 0, qa_opt('page_size_activity'));
-	$usershtml = qa_userids_handles_html(qa_any_get_userids_handles($questions), false);
+$questions = qa_any_sort_and_dedupe(array_merge($questions, $answerqs, $commentqs, $editqs));
+$questions = array_slice($questions, 0, qa_opt('page_size_activity'));
+$usershtml = qa_userids_handles_html(qa_any_get_userids_handles($questions), false);
 
 
 //	Prepare content for theme
 
-	$qa_content = qa_content_prepare(true);
+$qa_content = qa_content_prepare(true);
 
-	if (count($questions))
-		$qa_content['title'] = qa_lang_html_sub('profile/recent_activity_by_x', $userhtml);
-	else
-		$qa_content['title'] = qa_lang_html_sub('profile/no_posts_by_x', $userhtml);
+if (count($questions))
+	$qa_content['title'] = qa_lang_html_sub('profile/recent_activity_by_x', $userhtml);
+else
+	$qa_content['title'] = qa_lang_html_sub('profile/no_posts_by_x', $userhtml);
 
 
 //	Recent activity by this user
 
-	$qa_content['q_list']['form'] = array(
-		'tags' => 'method="post" action="'.qa_self_html().'"',
+$qa_content['q_list']['form'] = array(
+	'tags' => 'method="post" action="' . qa_self_html() . '"',
 
-		'hidden' => array(
-			'code' => qa_get_form_security_code('vote'),
-		),
-	);
+	'hidden' => array(
+		'code' => qa_get_form_security_code('vote'),
+	),
+);
 
-	$qa_content['q_list']['qs'] = array();
+$qa_content['q_list']['qs'] = array();
 
-	$htmldefaults = qa_post_html_defaults('Q');
-	$htmldefaults['whoview'] = false;
-	$htmldefaults['voteview'] = false;
-	$htmldefaults['avatarsize'] = 0;
+$htmldefaults = qa_post_html_defaults('Q');
+$htmldefaults['whoview'] = false;
+$htmldefaults['voteview'] = false;
+$htmldefaults['avatarsize'] = 0;
 
-	foreach ($questions as $question) {
-		$qa_content['q_list']['qs'][] = qa_any_to_q_html_fields($question, $loginuserid, qa_cookie_get(),
-			$usershtml, null, array('voteview' => false) + qa_post_html_options($question, $htmldefaults));
-	}
+foreach ($questions as $question) {
+	$qa_content['q_list']['qs'][] = qa_any_to_q_html_fields($question, $loginuserid, qa_cookie_get(),
+		$usershtml, null, array('voteview' => false) + qa_post_html_options($question, $htmldefaults));
+}
 
 
 //	Sub menu for navigation in user pages
 
-	$ismyuser = isset($loginuserid) && $loginuserid == (QA_FINAL_EXTERNAL_USERS ? $userid : $useraccount['userid']);
-	$qa_content['navigation']['sub'] = qa_user_sub_navigation($handle, 'activity', $ismyuser);
+$ismyuser = isset($loginuserid) && $loginuserid == (QA_FINAL_EXTERNAL_USERS ? $userid : $useraccount['userid']);
+$qa_content['navigation']['sub'] = qa_user_sub_navigation($handle, 'activity', $ismyuser);
 
 
-	return $qa_content;
-
-
-/*
-	Omit PHP closing tag to help avoid accidental output
-*/
\ No newline at end of file
+return $qa_content;

qa-include/pages/user-answers.php

@@ -20,91 +20,86 @@
 	More about this license: http://www.question2answer.org/license.php
 */
 
-	if (!defined('QA_VERSION')) { // don't allow this page to be requested directly from browser
-		header('Location: ../');
-		exit;
-	}
+if (!defined('QA_VERSION')) { // don't allow this page to be requested directly from browser
+	header('Location: ../');
+	exit;
+}
 
-	require_once QA_INCLUDE_DIR.'db/selects.php';
-	require_once QA_INCLUDE_DIR.'app/format.php';
+require_once QA_INCLUDE_DIR . 'db/selects.php';
+require_once QA_INCLUDE_DIR . 'app/format.php';
 
 
 //	$handle, $userhtml are already set by qa-page-user.php - also $userid if using external user integration
 
-	$start = qa_get_start();
+$start = qa_get_start();
 
 
 //	Find the questions for this user
 
-	$loginuserid = qa_get_logged_in_userid();
-	$identifier = QA_FINAL_EXTERNAL_USERS ? $userid : $handle;
+$loginuserid = qa_get_logged_in_userid();
+$identifier = QA_FINAL_EXTERNAL_USERS ? $userid : $handle;
 
-	list($useraccount, $userpoints, $questions) = qa_db_select_with_pending(
-		QA_FINAL_EXTERNAL_USERS ? null : qa_db_user_account_selectspec($handle, false),
-		qa_db_user_points_selectspec($identifier),
-		qa_db_user_recent_a_qs_selectspec($loginuserid, $identifier, qa_opt_if_loaded('page_size_activity'), $start)
-	);
+list($useraccount, $userpoints, $questions) = qa_db_select_with_pending(
+	QA_FINAL_EXTERNAL_USERS ? null : qa_db_user_account_selectspec($handle, false),
+	qa_db_user_points_selectspec($identifier),
+	qa_db_user_recent_a_qs_selectspec($loginuserid, $identifier, qa_opt_if_loaded('page_size_activity'), $start)
+);
 
-	if (!QA_FINAL_EXTERNAL_USERS && !is_array($useraccount)) // check the user exists
-		return include QA_INCLUDE_DIR.'qa-page-not-found.php';
+if (!QA_FINAL_EXTERNAL_USERS && !is_array($useraccount)) // check the user exists
+	return include QA_INCLUDE_DIR . 'qa-page-not-found.php';
 
 
 //	Get information on user questions
 
-	$pagesize = qa_opt('page_size_activity');
-	$count = (int)@$userpoints['aposts'];
-	$questions = array_slice($questions, 0, $pagesize);
-	$usershtml = qa_userids_handles_html($questions, false);
+$pagesize = qa_opt('page_size_activity');
+$count = (int)@$userpoints['aposts'];
+$questions = array_slice($questions, 0, $pagesize);
+$usershtml = qa_userids_handles_html($questions, false);
 
 
 //	Prepare content for theme
 
-	$qa_content = qa_content_prepare(true);
+$qa_content = qa_content_prepare(true);
 
-	if (count($questions))
-		$qa_content['title'] = qa_lang_html_sub('profile/answers_by_x', $userhtml);
-	else
-		$qa_content['title'] = qa_lang_html_sub('profile/no_answers_by_x', $userhtml);
+if (count($questions))
+	$qa_content['title'] = qa_lang_html_sub('profile/answers_by_x', $userhtml);
+else
+	$qa_content['title'] = qa_lang_html_sub('profile/no_answers_by_x', $userhtml);
 
 
 //	Recent questions by this user
 
-	$qa_content['q_list']['form'] = array(
-		'tags' => 'method="post" action="'.qa_self_html().'"',
+$qa_content['q_list']['form'] = array(
+	'tags' => 'method="post" action="' . qa_self_html() . '"',
 
-		'hidden' => array(
-			'code' => qa_get_form_security_code('vote'),
-		),
-	);
+	'hidden' => array(
+		'code' => qa_get_form_security_code('vote'),
+	),
+);
 
-	$qa_content['q_list']['qs'] = array();
+$qa_content['q_list']['qs'] = array();
 
-	$htmldefaults = qa_post_html_defaults('Q');
-	$htmldefaults['whoview'] = false;
-	$htmldefaults['avatarsize'] = 0;
-	$htmldefaults['ovoteview'] = true;
-	$htmldefaults['answersview'] = false;
+$htmldefaults = qa_post_html_defaults('Q');
+$htmldefaults['whoview'] = false;
+$htmldefaults['avatarsize'] = 0;
+$htmldefaults['ovoteview'] = true;
+$htmldefaults['answersview'] = false;
 
-	foreach ($questions as $question) {
-		$options = qa_post_html_options($question, $htmldefaults);
-		$options['voteview'] = qa_get_vote_view('A', false, false);
+foreach ($questions as $question) {
+	$options = qa_post_html_options($question, $htmldefaults);
+	$options['voteview'] = qa_get_vote_view('A', false, false);
 
-		$qa_content['q_list']['qs'][] = qa_other_to_q_html_fields($question, $loginuserid, qa_cookie_get(),
-			$usershtml, null, $options);
-	}
+	$qa_content['q_list']['qs'][] = qa_other_to_q_html_fields($question, $loginuserid, qa_cookie_get(),
+		$usershtml, null, $options);
+}
 
-	$qa_content['page_links'] = qa_html_page_links(qa_request(), $start, $pagesize, $count, qa_opt('pages_prev_next'));
+$qa_content['page_links'] = qa_html_page_links(qa_request(), $start, $pagesize, $count, qa_opt('pages_prev_next'));
 
 
 //	Sub menu for navigation in user pages
 
-	$ismyuser = isset($loginuserid) && $loginuserid == (QA_FINAL_EXTERNAL_USERS ? $userid : $useraccount['userid']);
-	$qa_content['navigation']['sub'] = qa_user_sub_navigation($handle, 'answers', $ismyuser);
+$ismyuser = isset($loginuserid) && $loginuserid == (QA_FINAL_EXTERNAL_USERS ? $userid : $useraccount['userid']);
+$qa_content['navigation']['sub'] = qa_user_sub_navigation($handle, 'answers', $ismyuser);
 
 
-	return $qa_content;
-
-
-/*
-	Omit PHP closing tag to help avoid accidental output
-*/
\ No newline at end of file
+return $qa_content;

qa-include/pages/user-profile.php

@@ -20,15 +20,15 @@
 	More about this license: http://www.question2answer.org/license.php
 */
 
-	if (!defined('QA_VERSION')) { // don't allow this page to be requested directly from browser
-		header('Location: ../');
-		exit;
-	}
+if (!defined('QA_VERSION')) { // don't allow this page to be requested directly from browser
+	header('Location: ../');
+	exit;
+}
 
-	require_once QA_INCLUDE_DIR.'db/selects.php';
-	require_once QA_INCLUDE_DIR.'app/format.php';
-	require_once QA_INCLUDE_DIR.'app/limits.php';
-	require_once QA_INCLUDE_DIR.'app/updates.php';
+require_once QA_INCLUDE_DIR . 'db/selects.php';
+require_once QA_INCLUDE_DIR . 'app/format.php';
+require_once QA_INCLUDE_DIR . 'app/limits.php';
+require_once QA_INCLUDE_DIR . 'app/updates.php';
 
 
 //	$handle, $userhtml are already set by qa-page-user.php - also $userid if using external user integration
@@ -36,947 +36,927 @@
 
 //	Redirect to 'My Account' page if button clicked
 
-	if (qa_clicked('doaccount'))
-		qa_redirect('account');
+if (qa_clicked('doaccount'))
+	qa_redirect('account');
 
 
 //	Find the user profile and questions and answers for this handle
 
-	$loginuserid = qa_get_logged_in_userid();
-	$identifier = QA_FINAL_EXTERNAL_USERS ? $userid : $handle;
-
-	list($useraccount, $userprofile, $userfields, $usermessages, $userpoints, $userlevels, $navcategories, $userrank) =
-		qa_db_select_with_pending(
-			QA_FINAL_EXTERNAL_USERS ? null : qa_db_user_account_selectspec($handle, false),
-			QA_FINAL_EXTERNAL_USERS ? null : qa_db_user_profile_selectspec($handle, false),
-			QA_FINAL_EXTERNAL_USERS ? null : qa_db_userfields_selectspec(),
-			QA_FINAL_EXTERNAL_USERS ? null : qa_db_recent_messages_selectspec(null, null, $handle, false, qa_opt_if_loaded('page_size_wall')),
-			qa_db_user_points_selectspec($identifier),
-			qa_db_user_levels_selectspec($identifier, QA_FINAL_EXTERNAL_USERS, true),
-			qa_db_category_nav_selectspec(null, true),
-			qa_db_user_rank_selectspec($identifier)
-		);
-
-	if (!QA_FINAL_EXTERNAL_USERS) {
-		foreach ($userfields as $index => $userfield) {
-			if ( isset($userfield['permit']) && qa_permit_value_error($userfield['permit'], $loginuserid, qa_get_logged_in_level(), qa_get_logged_in_flags()) )
-				unset($userfields[$index]); // don't pay attention to user fields we're not allowed to view
-		}
+$loginuserid = qa_get_logged_in_userid();
+$identifier = QA_FINAL_EXTERNAL_USERS ? $userid : $handle;
+
+list($useraccount, $userprofile, $userfields, $usermessages, $userpoints, $userlevels, $navcategories, $userrank) = qa_db_select_with_pending(
+	QA_FINAL_EXTERNAL_USERS ? null : qa_db_user_account_selectspec($handle, false),
+	QA_FINAL_EXTERNAL_USERS ? null : qa_db_user_profile_selectspec($handle, false),
+	QA_FINAL_EXTERNAL_USERS ? null : qa_db_userfields_selectspec(),
+	QA_FINAL_EXTERNAL_USERS ? null : qa_db_recent_messages_selectspec(null, null, $handle, false, qa_opt_if_loaded('page_size_wall')),
+	qa_db_user_points_selectspec($identifier),
+	qa_db_user_levels_selectspec($identifier, QA_FINAL_EXTERNAL_USERS, true),
+	qa_db_category_nav_selectspec(null, true),
+	qa_db_user_rank_selectspec($identifier)
+);
+
+if (!QA_FINAL_EXTERNAL_USERS) {
+	foreach ($userfields as $index => $userfield) {
+		if (isset($userfield['permit']) && qa_permit_value_error($userfield['permit'], $loginuserid, qa_get_logged_in_level(), qa_get_logged_in_flags()))
+			unset($userfields[$index]); // don't pay attention to user fields we're not allowed to view
 	}
+}
 
 
 //	Check the user exists and work out what can and can't be set (if not using single sign-on)
 
-	$errors = array();
+$errors = array();
 
-	$loginlevel = qa_get_logged_in_level();
+$loginlevel = qa_get_logged_in_level();
 
-	if (!QA_FINAL_EXTERNAL_USERS) { // if we're using integrated user management, we can know and show more
-		require_once QA_INCLUDE_DIR.'app/messages.php';
+if (!QA_FINAL_EXTERNAL_USERS) { // if we're using integrated user management, we can know and show more
+	require_once QA_INCLUDE_DIR . 'app/messages.php';
 
-		if ((!is_array($userpoints)) && !is_array($useraccount))
-			return include QA_INCLUDE_DIR.'qa-page-not-found.php';
+	if ((!is_array($userpoints)) && !is_array($useraccount))
+		return include QA_INCLUDE_DIR . 'qa-page-not-found.php';
 
-		$userid = $useraccount['userid'];
-		$fieldseditable = false;
-		$maxlevelassign = null;
+	$userid = $useraccount['userid'];
+	$fieldseditable = false;
+	$maxlevelassign = null;
 
-		$maxuserlevel = $useraccount['level'];
-		foreach ($userlevels as $userlevel)
-			$maxuserlevel = max($maxuserlevel, $userlevel['level']);
+	$maxuserlevel = $useraccount['level'];
+	foreach ($userlevels as $userlevel)
+		$maxuserlevel = max($maxuserlevel, $userlevel['level']);
 
-		if (
-			isset($loginuserid) &&
-			($loginuserid != $userid) &&
-			(($loginlevel >= QA_USER_LEVEL_SUPER) || ($loginlevel > $maxuserlevel)) &&
-			(!qa_user_permit_error())
-		) { // can't change self - or someone on your level (or higher, obviously) unless you're a super admin
-
-			if ($loginlevel >= QA_USER_LEVEL_SUPER)
-				$maxlevelassign = QA_USER_LEVEL_SUPER;
+	if (isset($loginuserid) && $loginuserid != $userid &&
+		($loginlevel >= QA_USER_LEVEL_SUPER || $loginlevel > $maxuserlevel) &&
+		!qa_user_permit_error()
+	) { // can't change self - or someone on your level (or higher, obviously) unless you're a super admin
 
-			elseif ($loginlevel >= QA_USER_LEVEL_ADMIN)
-				$maxlevelassign = QA_USER_LEVEL_MODERATOR;
+		if ($loginlevel >= QA_USER_LEVEL_SUPER)
+			$maxlevelassign = QA_USER_LEVEL_SUPER;
+		elseif ($loginlevel >= QA_USER_LEVEL_ADMIN)
+			$maxlevelassign = QA_USER_LEVEL_MODERATOR;
+		elseif ($loginlevel >= QA_USER_LEVEL_MODERATOR)
+			$maxlevelassign = QA_USER_LEVEL_EXPERT;
 
-			elseif ($loginlevel >= QA_USER_LEVEL_MODERATOR)
-				$maxlevelassign = QA_USER_LEVEL_EXPERT;
+		if ($loginlevel >= QA_USER_LEVEL_ADMIN)
+			$fieldseditable = true;
 
-			if ($loginlevel >= QA_USER_LEVEL_ADMIN)
-				$fieldseditable = true;
-
-			if (isset($maxlevelassign) && ($useraccount['flags'] & QA_USER_FLAGS_USER_BLOCKED))
-				$maxlevelassign = min($maxlevelassign, QA_USER_LEVEL_EDITOR); // if blocked, can't promote too high
-		}
+		if (isset($maxlevelassign) && ($useraccount['flags'] & QA_USER_FLAGS_USER_BLOCKED))
+			$maxlevelassign = min($maxlevelassign, QA_USER_LEVEL_EDITOR); // if blocked, can't promote too high
+	}
 
-		$approvebutton = isset($maxlevelassign)
-			&& $useraccount['level'] < QA_USER_LEVEL_APPROVED
-			&& $maxlevelassign >= QA_USER_LEVEL_APPROVED
-			&& !($useraccount['flags'] & QA_USER_FLAGS_USER_BLOCKED)
-			&& qa_opt('moderate_users');
-		$usereditbutton = $fieldseditable || isset($maxlevelassign);
-		$userediting = $usereditbutton && (qa_get_state() == 'edit');
+	$approvebutton = isset($maxlevelassign)
+		&& $useraccount['level'] < QA_USER_LEVEL_APPROVED
+		&& $maxlevelassign >= QA_USER_LEVEL_APPROVED
+		&& !($useraccount['flags'] & QA_USER_FLAGS_USER_BLOCKED)
+		&& qa_opt('moderate_users');
+	$usereditbutton = $fieldseditable || isset($maxlevelassign);
+	$userediting = $usereditbutton && (qa_get_state() == 'edit');
 
-		$wallposterrorhtml = qa_wall_error_html($loginuserid, $useraccount['userid'], $useraccount['flags']);
+	$wallposterrorhtml = qa_wall_error_html($loginuserid, $useraccount['userid'], $useraccount['flags']);
 
 	//	This code is similar but not identical to that in to qq-page-user-wall.php
 
-		$usermessages = array_slice($usermessages, 0, qa_opt('page_size_wall'));
-		$usermessages = qa_wall_posts_add_rules($usermessages, 0);
+	$usermessages = array_slice($usermessages, 0, qa_opt('page_size_wall'));
+	$usermessages = qa_wall_posts_add_rules($usermessages, 0);
 
-		foreach ($usermessages as $message) {
-			if ($message['deleteable'] && qa_clicked('m'.$message['messageid'].'_dodelete')) {
-				if (!qa_check_form_security_code('wall-'.$useraccount['handle'], qa_post_text('code')))
-					$errors['page'] = qa_lang_html('misc/form_security_again');
-				else {
-					qa_wall_delete_post($loginuserid, qa_get_logged_in_handle(), qa_cookie_get(), $message);
-					qa_redirect(qa_request(), null, null, null, 'wall');
-				}
+	foreach ($usermessages as $message) {
+		if ($message['deleteable'] && qa_clicked('m' . $message['messageid'] . '_dodelete')) {
+			if (!qa_check_form_security_code('wall-' . $useraccount['handle'], qa_post_text('code')))
+				$errors['page'] = qa_lang_html('misc/form_security_again');
+			else {
+				qa_wall_delete_post($loginuserid, qa_get_logged_in_handle(), qa_cookie_get(), $message);
+				qa_redirect(qa_request(), null, null, null, 'wall');
 			}
 		}
 	}
+}
 
 
 //	Process edit or save button for user, and other actions
 
-	if (!QA_FINAL_EXTERNAL_USERS) {
-		$reloaduser = false;
+if (!QA_FINAL_EXTERNAL_USERS) {
+	$reloaduser = false;
 
-		if ($usereditbutton) {
-			if (qa_clicked('docancel'))
-				qa_redirect(qa_request());
+	if ($usereditbutton) {
+		if (qa_clicked('docancel')) {
+			qa_redirect(qa_request());
+		} elseif (qa_clicked('doedit')) {
+			qa_redirect(qa_request(), array('state' => 'edit'));
+		} elseif (qa_clicked('dosave')) {
+			require_once QA_INCLUDE_DIR . 'app/users-edit.php';
+			require_once QA_INCLUDE_DIR . 'db/users.php';
 
-			elseif (qa_clicked('doedit'))
-				qa_redirect(qa_request(), array('state' => 'edit'));
+			$inemail = qa_post_text('email');
 
-			elseif (qa_clicked('dosave')) {
-				require_once QA_INCLUDE_DIR.'app/users-edit.php';
-				require_once QA_INCLUDE_DIR.'db/users.php';
+			$inprofile = array();
+			foreach ($userfields as $userfield)
+				$inprofile[$userfield['fieldid']] = qa_post_text('field_' . $userfield['fieldid']);
 
-				$inemail = qa_post_text('email');
+			if (!qa_check_form_security_code('user-edit-' . $handle, qa_post_text('code'))) {
+				$errors['page'] = qa_lang_html('misc/form_security_again');
+				$userediting = true;
+			} else {
+				if (qa_post_text('removeavatar')) {
+					qa_db_user_set_flag($userid, QA_USER_FLAGS_SHOW_AVATAR, false);
+					qa_db_user_set_flag($userid, QA_USER_FLAGS_SHOW_GRAVATAR, false);
+
+					if (isset($useraccount['avatarblobid'])) {
+						require_once QA_INCLUDE_DIR . 'app/blobs.php';
+
+						qa_db_user_set($userid, 'avatarblobid', null);
+						qa_db_user_set($userid, 'avatarwidth', null);
+						qa_db_user_set($userid, 'avatarheight', null);
+						qa_delete_blob($useraccount['avatarblobid']);
+					}
+				}
 
-				$inprofile = array();
-				foreach ($userfields as $userfield)
-					$inprofile[$userfield['fieldid']] = qa_post_text('field_'.$userfield['fieldid']);
+				if ($fieldseditable) {
+					$filterhandle = $handle; // we're not filtering the handle...
+					$errors = qa_handle_email_filter($filterhandle, $inemail, $useraccount);
+					unset($errors['handle']); // ...and we don't care about any errors in it
 
-				if (!qa_check_form_security_code('user-edit-'.$handle, qa_post_text('code'))) {
-					$errors['page'] = qa_lang_html('misc/form_security_again');
-					$userediting = true;
-				}
-				else {
-					if (qa_post_text('removeavatar')) {
-						qa_db_user_set_flag($userid, QA_USER_FLAGS_SHOW_AVATAR, false);
-						qa_db_user_set_flag($userid, QA_USER_FLAGS_SHOW_GRAVATAR, false);
-
-						if (isset($useraccount['avatarblobid'])) {
-							require_once QA_INCLUDE_DIR.'app/blobs.php';
-
-							qa_db_user_set($userid, 'avatarblobid', null);
-							qa_db_user_set($userid, 'avatarwidth', null);
-							qa_db_user_set($userid, 'avatarheight', null);
-							qa_delete_blob($useraccount['avatarblobid']);
+					if (!isset($errors['email'])) {
+						if ($inemail != $useraccount['email']) {
+							qa_db_user_set($userid, 'email', $inemail);
+							qa_db_user_set_flag($userid, QA_USER_FLAGS_EMAIL_CONFIRMED, false);
 						}
 					}
 
-					if ($fieldseditable) {
-						$filterhandle = $handle; // we're not filtering the handle...
-						$errors = qa_handle_email_filter($filterhandle, $inemail, $useraccount);
-						unset($errors['handle']); // ...and we don't care about any errors in it
-
-						if (!isset($errors['email']))
-							if ($inemail != $useraccount['email']) {
-								qa_db_user_set($userid, 'email', $inemail);
-								qa_db_user_set_flag($userid, QA_USER_FLAGS_EMAIL_CONFIRMED, false);
-							}
-
-						if (count($inprofile)) {
-							$filtermodules = qa_load_modules_with('filter', 'filter_profile');
-							foreach ($filtermodules as $filtermodule)
-								$filtermodule->filter_profile($inprofile, $errors, $useraccount, $userprofile);
-						}
+					if (count($inprofile)) {
+						$filtermodules = qa_load_modules_with('filter', 'filter_profile');
+						foreach ($filtermodules as $filtermodule)
+							$filtermodule->filter_profile($inprofile, $errors, $useraccount, $userprofile);
+					}
 
-						foreach ($userfields as $userfield)
-							if (!isset($errors[$userfield['fieldid']]))
-								qa_db_user_profile_set($userid, $userfield['title'], $inprofile[$userfield['fieldid']]);
+					foreach ($userfields as $userfield) {
+						if (!isset($errors[$userfield['fieldid']]))
+							qa_db_user_profile_set($userid, $userfield['title'], $inprofile[$userfield['fieldid']]);
+					}
 
-						if (count($errors))
-							$userediting = true;
+					if (count($errors))
+						$userediting = true;
 
-						qa_report_event('u_edit', $loginuserid, qa_get_logged_in_handle(), qa_cookie_get(), array(
-							'userid' => $userid,
-							'handle' => $useraccount['handle'],
-						));
-					}
+					qa_report_event('u_edit', $loginuserid, qa_get_logged_in_handle(), qa_cookie_get(), array(
+						'userid' => $userid,
+						'handle' => $useraccount['handle'],
+					));
+				}
 
-					if (isset($maxlevelassign)) {
-						$inlevel = min($maxlevelassign, (int)qa_post_text('level')); // constrain based on maximum permitted to prevent simple browser-based attack
-						if ($inlevel != $useraccount['level'])
-							qa_set_user_level($userid, $useraccount['handle'], $inlevel, $useraccount['level']);
+				if (isset($maxlevelassign)) {
+					$inlevel = min($maxlevelassign, (int)qa_post_text('level')); // constrain based on maximum permitted to prevent simple browser-based attack
+					if ($inlevel != $useraccount['level'])
+						qa_set_user_level($userid, $useraccount['handle'], $inlevel, $useraccount['level']);
 
-						if (qa_using_categories()) {
-							$inuserlevels = array();
+					if (qa_using_categories()) {
+						$inuserlevels = array();
 
-							for ($index = 1; $index <= 999; $index++) {
-								$inlevel = qa_post_text('uc_'.$index.'_level');
-								if (!isset($inlevel))
-									break;
+						for ($index = 1; $index <= 999; $index++) {
+							$inlevel = qa_post_text('uc_' . $index . '_level');
+							if (!isset($inlevel))
+								break;
 
-								$categoryid = qa_get_category_field_value('uc_'.$index.'_cat');
+							$categoryid = qa_get_category_field_value('uc_' . $index . '_cat');
 
-								if (strlen($categoryid) && strlen($inlevel))
-									$inuserlevels[] = array(
-										'entitytype' => QA_ENTITY_CATEGORY,
-										'entityid' => $categoryid,
-										'level' => min($maxlevelassign, (int)$inlevel),
-									);
+							if (strlen($categoryid) && strlen($inlevel)) {
+								$inuserlevels[] = array(
+									'entitytype' => QA_ENTITY_CATEGORY,
+									'entityid' => $categoryid,
+									'level' => min($maxlevelassign, (int)$inlevel),
+								);
 							}
-
-							qa_db_user_levels_set($userid, $inuserlevels);
 						}
+
+						qa_db_user_levels_set($userid, $inuserlevels);
 					}
+				}
 
-					if (empty($errors))
-						qa_redirect(qa_request());
+				if (empty($errors))
+					qa_redirect(qa_request());
 
-					list($useraccount, $userprofile, $userlevels) = qa_db_select_with_pending(
-						qa_db_user_account_selectspec($userid, true),
-						qa_db_user_profile_selectspec($userid, true),
-						qa_db_user_levels_selectspec($userid, true, true)
-					);
-				}
+				list($useraccount, $userprofile, $userlevels) = qa_db_select_with_pending(
+					qa_db_user_account_selectspec($userid, true),
+					qa_db_user_profile_selectspec($userid, true),
+					qa_db_user_levels_selectspec($userid, true, true)
+				);
 			}
 		}
+	}
 
-		if (qa_clicked('doapprove') || qa_clicked('doblock') || qa_clicked('dounblock') || qa_clicked('dohideall') || qa_clicked('dodelete')) {
-			if (!qa_check_form_security_code('user-'.$handle, qa_post_text('code')))
-				$errors['page'] = qa_lang_html('misc/form_security_again');
+	if (qa_clicked('doapprove') || qa_clicked('doblock') || qa_clicked('dounblock') || qa_clicked('dohideall') || qa_clicked('dodelete')) {
+		if (!qa_check_form_security_code('user-' . $handle, qa_post_text('code')))
+			$errors['page'] = qa_lang_html('misc/form_security_again');
 
-			else {
-				if ($approvebutton && qa_clicked('doapprove')) {
-					require_once QA_INCLUDE_DIR.'app/users-edit.php';
-					qa_set_user_level($userid, $useraccount['handle'], QA_USER_LEVEL_APPROVED, $useraccount['level']);
-					qa_redirect(qa_request());
-				}
+		else {
+			if ($approvebutton && qa_clicked('doapprove')) {
+				require_once QA_INCLUDE_DIR . 'app/users-edit.php';
+				qa_set_user_level($userid, $useraccount['handle'], QA_USER_LEVEL_APPROVED, $useraccount['level']);
+				qa_redirect(qa_request());
+			}
 
-				if (isset($maxlevelassign) && ($maxuserlevel < QA_USER_LEVEL_MODERATOR)) {
-					if (qa_clicked('doblock')) {
-						require_once QA_INCLUDE_DIR.'app/users-edit.php';
+			if (isset($maxlevelassign) && ($maxuserlevel < QA_USER_LEVEL_MODERATOR)) {
+				if (qa_clicked('doblock')) {
+					require_once QA_INCLUDE_DIR . 'app/users-edit.php';
 
-						qa_set_user_blocked($userid, $useraccount['handle'], true);
-						qa_redirect(qa_request());
-					}
+					qa_set_user_blocked($userid, $useraccount['handle'], true);
+					qa_redirect(qa_request());
+				}
 
-					if (qa_clicked('dounblock')) {
-						require_once QA_INCLUDE_DIR.'app/users-edit.php';
+				if (qa_clicked('dounblock')) {
+					require_once QA_INCLUDE_DIR . 'app/users-edit.php';
 
-						qa_set_user_blocked($userid, $useraccount['handle'], false);
-						qa_redirect(qa_request());
-					}
+					qa_set_user_blocked($userid, $useraccount['handle'], false);
+					qa_redirect(qa_request());
+				}
 
-					if (qa_clicked('dohideall') && !qa_user_permit_error('permit_hide_show')) {
-						require_once QA_INCLUDE_DIR.'db/admin.php';
-						require_once QA_INCLUDE_DIR.'app/posts.php';
+				if (qa_clicked('dohideall') && !qa_user_permit_error('permit_hide_show')) {
+					require_once QA_INCLUDE_DIR . 'db/admin.php';
+					require_once QA_INCLUDE_DIR . 'app/posts.php';
 
-						$postids = qa_db_get_user_visible_postids($userid);
+					$postids = qa_db_get_user_visible_postids($userid);
 
-						foreach ($postids as $postid)
-							qa_post_set_hidden($postid, true, $loginuserid);
+					foreach ($postids as $postid)
+						qa_post_set_hidden($postid, true, $loginuserid);
 
-						qa_redirect(qa_request());
-					}
+					qa_redirect(qa_request());
+				}
 
-					if (qa_clicked('dodelete') && ($loginlevel >= QA_USER_LEVEL_ADMIN)) {
-						require_once QA_INCLUDE_DIR.'app/users-edit.php';
+				if (qa_clicked('dodelete') && ($loginlevel >= QA_USER_LEVEL_ADMIN)) {
+					require_once QA_INCLUDE_DIR . 'app/users-edit.php';
 
-						qa_delete_user($userid);
+					qa_delete_user($userid);
 
-						qa_report_event('u_delete', $loginuserid, qa_get_logged_in_handle(), qa_cookie_get(), array(
-							'userid' => $userid,
-							'handle' => $useraccount['handle'],
-						));
+					qa_report_event('u_delete', $loginuserid, qa_get_logged_in_handle(), qa_cookie_get(), array(
+						'userid' => $userid,
+						'handle' => $useraccount['handle'],
+					));
 
-						qa_redirect('users');
-					}
+					qa_redirect('users');
 				}
 			}
 		}
+	}
 
 
-		if (qa_clicked('dowallpost')) {
-			$inmessage = qa_post_text('message');
-
-			if (!strlen($inmessage))
-				$errors['message'] = qa_lang('profile/post_wall_empty');
-
-			elseif (!qa_check_form_security_code('wall-'.$useraccount['handle'], qa_post_text('code')))
-				$errors['message'] = qa_lang_html('misc/form_security_again');
+	if (qa_clicked('dowallpost')) {
+		$inmessage = qa_post_text('message');
 
-			elseif (!$wallposterrorhtml) {
-				qa_wall_add_post($loginuserid, qa_get_logged_in_handle(), qa_cookie_get(), $userid, $useraccount['handle'], $inmessage, '');
-				qa_redirect(qa_request(), null, null, null, 'wall');
-			}
+		if (!strlen($inmessage)) {
+			$errors['message'] = qa_lang('profile/post_wall_empty');
+		} elseif (!qa_check_form_security_code('wall-' . $useraccount['handle'], qa_post_text('code'))) {
+			$errors['message'] = qa_lang_html('misc/form_security_again');
+		} elseif (!$wallposterrorhtml) {
+			qa_wall_add_post($loginuserid, qa_get_logged_in_handle(), qa_cookie_get(), $userid, $useraccount['handle'], $inmessage, '');
+			qa_redirect(qa_request(), null, null, null, 'wall');
 		}
 	}
+}
 
 
 //	Process bonus setting button
 
-	if ( ($loginlevel >= QA_USER_LEVEL_ADMIN) && qa_clicked('dosetbonus') ) {
-		require_once QA_INCLUDE_DIR.'db/points.php';
-
-		$inbonus = (int)qa_post_text('bonus');
+if ($loginlevel >= QA_USER_LEVEL_ADMIN && qa_clicked('dosetbonus')) {
+	require_once QA_INCLUDE_DIR . 'db/points.php';
 
-		if (!qa_check_form_security_code('user-activity-'.$handle, qa_post_text('code')))
-			$errors['page'] = qa_lang_html('misc/form_security_again');
+	$inbonus = (int)qa_post_text('bonus');
 
-		else {
-			qa_db_points_set_bonus($userid, $inbonus);
-			qa_db_points_update_ifuser($userid, null);
-			qa_redirect(qa_request(), null, null, null, 'activity');
-		}
+	if (!qa_check_form_security_code('user-activity-' . $handle, qa_post_text('code'))) {
+		$errors['page'] = qa_lang_html('misc/form_security_again');
+	} else {
+		qa_db_points_set_bonus($userid, $inbonus);
+		qa_db_points_update_ifuser($userid, null);
+		qa_redirect(qa_request(), null, null, null, 'activity');
 	}
+}
 
 
 //	Prepare content for theme
 
-	$qa_content = qa_content_prepare();
+$qa_content = qa_content_prepare();
 
-	$qa_content['title'] = qa_lang_html_sub('profile/user_x', $userhtml);
-	$qa_content['error'] = @$errors['page'];
+$qa_content['title'] = qa_lang_html_sub('profile/user_x', $userhtml);
+$qa_content['error'] = @$errors['page'];
 
-	if (isset($loginuserid) && $loginuserid != $useraccount['userid'] && !QA_FINAL_EXTERNAL_USERS) {
-		$favoritemap = qa_get_favorite_non_qs_map();
-		$favorite = @$favoritemap['user'][$useraccount['userid']];
+if (isset($loginuserid) && $loginuserid != $useraccount['userid'] && !QA_FINAL_EXTERNAL_USERS) {
+	$favoritemap = qa_get_favorite_non_qs_map();
+	$favorite = @$favoritemap['user'][$useraccount['userid']];
 
-		$qa_content['favorite'] = qa_favorite_form(QA_ENTITY_USER, $useraccount['userid'], $favorite,
-			qa_lang_sub($favorite ? 'main/remove_x_favorites' : 'users/add_user_x_favorites', $handle));
-	}
+	$qa_content['favorite'] = qa_favorite_form(QA_ENTITY_USER, $useraccount['userid'], $favorite,
+		qa_lang_sub($favorite ? 'main/remove_x_favorites' : 'users/add_user_x_favorites', $handle));
+}
 
-	$qa_content['script_rel'][] = 'qa-content/qa-user.js?'.QA_VERSION;
+$qa_content['script_rel'][] = 'qa-content/qa-user.js?' . QA_VERSION;
 
 
 //	General information about the user, only available if we're using internal user management
 
-	if (!QA_FINAL_EXTERNAL_USERS) {
-		$membertime = qa_time_to_string(qa_opt('db_time') - $useraccount['created']);
-		$joindate = qa_when_to_html($useraccount['created'], 0);
-
-		$qa_content['form_profile'] = array(
-			'tags' => 'method="post" action="'.qa_self_html().'"',
-
-			'style' => 'wide',
-
-			'fields' => array(
-				'avatar' => array(
-					'type' => 'image',
-					'style' => 'tall',
-					'label' => '',
-					'html' => qa_get_user_avatar_html($useraccount['flags'], $useraccount['email'], $useraccount['handle'],
-						$useraccount['avatarblobid'], $useraccount['avatarwidth'], $useraccount['avatarheight'], qa_opt('avatar_profile_size')),
-					'id' => 'avatar',
-				),
-
-				'removeavatar' => null,
-
-				'duration' => array(
-					'type' => 'static',
-					'label' => qa_lang_html('users/member_for'),
-					'value' => qa_html( $membertime . ' (' . qa_lang_sub('main/since_x', $joindate['data']) . ')' ),
-					'id' => 'duration',
-				),
-
-				'level' => array(
-					'type' => 'static',
-					'label' => qa_lang_html('users/member_type'),
-					'tags' => 'name="level"',
-					'value' => qa_html(qa_user_level_string($useraccount['level'])),
-					'note' => (($useraccount['flags'] & QA_USER_FLAGS_USER_BLOCKED) && isset($maxlevelassign)) ? qa_lang_html('users/user_blocked') : '',
-					'id' => 'level',
-				),
+if (!QA_FINAL_EXTERNAL_USERS) {
+	$membertime = qa_time_to_string(qa_opt('db_time') - $useraccount['created']);
+	$joindate = qa_when_to_html($useraccount['created'], 0);
+
+	$qa_content['form_profile'] = array(
+		'tags' => 'method="post" action="' . qa_self_html() . '"',
+
+		'style' => 'wide',
+
+		'fields' => array(
+			'avatar' => array(
+				'type' => 'image',
+				'style' => 'tall',
+				'label' => '',
+				'html' => qa_get_user_avatar_html($useraccount['flags'], $useraccount['email'], $useraccount['handle'],
+					$useraccount['avatarblobid'], $useraccount['avatarwidth'], $useraccount['avatarheight'], qa_opt('avatar_profile_size')),
+				'id' => 'avatar',
 			),
-		);
 
-		if (empty($qa_content['form_profile']['fields']['avatar']['html']))
-			unset($qa_content['form_profile']['fields']['avatar']);
+			'removeavatar' => null,
+
+			'duration' => array(
+				'type' => 'static',
+				'label' => qa_lang_html('users/member_for'),
+				'value' => qa_html($membertime . ' (' . qa_lang_sub('main/since_x', $joindate['data']) . ')'),
+				'id' => 'duration',
+			),
+
+			'level' => array(
+				'type' => 'static',
+				'label' => qa_lang_html('users/member_type'),
+				'tags' => 'name="level"',
+				'value' => qa_html(qa_user_level_string($useraccount['level'])),
+				'note' => (($useraccount['flags'] & QA_USER_FLAGS_USER_BLOCKED) && isset($maxlevelassign)) ? qa_lang_html('users/user_blocked') : '',
+				'id' => 'level',
+			),
+		),
+	);
+
+	if (empty($qa_content['form_profile']['fields']['avatar']['html']))
+		unset($qa_content['form_profile']['fields']['avatar']);
 
 
 	//	Private message link
 
-		if ( qa_opt('allow_private_messages') && isset($loginuserid) && ($loginuserid != $userid) && !($useraccount['flags'] & QA_USER_FLAGS_NO_MESSAGES) && !$userediting ) {
-			$qa_content['form_profile']['fields']['level']['value'] .= strtr(qa_lang_html('profile/send_private_message'), array(
-				'^1' => '<a href="'.qa_path_html('message/'.$handle).'">',
-				'^2' => '</a>',
-			));
-		}
+	if (qa_opt('allow_private_messages') && isset($loginuserid) && $loginuserid != $userid && !($useraccount['flags'] & QA_USER_FLAGS_NO_MESSAGES) && !$userediting) {
+		$qa_content['form_profile']['fields']['level']['value'] .= strtr(qa_lang_html('profile/send_private_message'), array(
+			'^1' => '<a href="' . qa_path_html('message/' . $handle) . '">',
+			'^2' => '</a>',
+		));
+	}
 
 
 	//	Levels editing or viewing (add category-specific levels)
 
-		if ($userediting) {
+	if ($userediting) {
 
-			if (isset($maxlevelassign)) {
-				$qa_content['form_profile']['fields']['level']['type'] = 'select';
+		if (isset($maxlevelassign)) {
+			$qa_content['form_profile']['fields']['level']['type'] = 'select';
 
-				$showlevels = array(QA_USER_LEVEL_BASIC);
-				if (qa_opt('moderate_users'))
-					$showlevels[] = QA_USER_LEVEL_APPROVED;
+			$showlevels = array(QA_USER_LEVEL_BASIC);
+			if (qa_opt('moderate_users'))
+				$showlevels[] = QA_USER_LEVEL_APPROVED;
 
-				array_push($showlevels, QA_USER_LEVEL_EXPERT, QA_USER_LEVEL_EDITOR, QA_USER_LEVEL_MODERATOR, QA_USER_LEVEL_ADMIN, QA_USER_LEVEL_SUPER);
+			array_push($showlevels, QA_USER_LEVEL_EXPERT, QA_USER_LEVEL_EDITOR, QA_USER_LEVEL_MODERATOR, QA_USER_LEVEL_ADMIN, QA_USER_LEVEL_SUPER);
 
-				$leveloptions = array();
-				$catleveloptions = array('' => qa_lang_html('users/category_level_none'));
+			$leveloptions = array();
+			$catleveloptions = array('' => qa_lang_html('users/category_level_none'));
 
-				foreach ($showlevels as $showlevel) {
-					if ($showlevel <= $maxlevelassign) {
-						$leveloptions[$showlevel] = qa_html(qa_user_level_string($showlevel));
-						if ($showlevel > QA_USER_LEVEL_BASIC)
-							$catleveloptions[$showlevel] = $leveloptions[$showlevel];
-					}
+			foreach ($showlevels as $showlevel) {
+				if ($showlevel <= $maxlevelassign) {
+					$leveloptions[$showlevel] = qa_html(qa_user_level_string($showlevel));
+					if ($showlevel > QA_USER_LEVEL_BASIC)
+						$catleveloptions[$showlevel] = $leveloptions[$showlevel];
 				}
+			}
 
-				$qa_content['form_profile']['fields']['level']['options'] = $leveloptions;
+			$qa_content['form_profile']['fields']['level']['options'] = $leveloptions;
 
 
 			//	Category-specific levels
 
-				if (qa_using_categories()) {
-					$catleveladd = strlen(qa_get('catleveladd')) > 0;
+			if (qa_using_categories()) {
+				$catleveladd = strlen(qa_get('catleveladd')) > 0;
 
-					if ((!$catleveladd) && !count($userlevels)) {
-						$qa_content['form_profile']['fields']['level']['suffix'] = strtr(qa_lang_html('users/category_level_add'), array(
-							'^1' => '<a href="'.qa_path_html(qa_request(), array('state' => 'edit', 'catleveladd' => 1)).'">',
-							'^2' => '</a>',
-						));
-					}
-					else
-						$qa_content['form_profile']['fields']['level']['suffix'] = qa_lang_html('users/level_in_general');
-
-					if ($catleveladd || count($userlevels))
-						$userlevels[] = array('entitytype' => QA_ENTITY_CATEGORY);
-
-					$index = 0;
-					foreach ($userlevels as $userlevel) {
-						if ($userlevel['entitytype'] == QA_ENTITY_CATEGORY) {
-							$index++;
-							$id = 'ls_'.+$index;
-
-							$qa_content['form_profile']['fields']['uc_'.$index.'_level'] = array(
-								'label' => qa_lang_html('users/category_level_label'),
-								'type' => 'select',
-								'tags' => 'name="uc_'.$index.'_level" id="'.qa_html($id).'" onchange="this.qa_prev=this.options[this.selectedIndex].value;"',
-								'options' => $catleveloptions,
-								'value' => isset($userlevel['level']) ? qa_html(qa_user_level_string($userlevel['level'])) : '',
-								'suffix' => qa_lang_html('users/category_level_in'),
-							);
-
-							$qa_content['form_profile']['fields']['uc_'.$index.'_cat'] = array();
-
-							if (isset($userlevel['entityid']))
-								$fieldnavcategories = qa_db_select_with_pending(qa_db_category_nav_selectspec($userlevel['entityid'], true));
-							else
-								$fieldnavcategories = $navcategories;
-
-							qa_set_up_category_field($qa_content, $qa_content['form_profile']['fields']['uc_'.$index.'_cat'],
-								'uc_'.$index.'_cat', $fieldnavcategories, @$userlevel['entityid'], true, true);
-
-							unset($qa_content['form_profile']['fields']['uc_'.$index.'_cat']['note']);
-						}
-					}
+				if ((!$catleveladd) && !count($userlevels)) {
+					$qa_content['form_profile']['fields']['level']['suffix'] = strtr(qa_lang_html('users/category_level_add'), array(
+						'^1' => '<a href="' . qa_path_html(qa_request(), array('state' => 'edit', 'catleveladd' => 1)) . '">',
+						'^2' => '</a>',
+					));
+				} else {
+					$qa_content['form_profile']['fields']['level']['suffix'] = qa_lang_html('users/level_in_general');
+				}
 
-					$qa_content['script_lines'][] = array(
-						"function qa_update_category_levels()",
-						"{",
-						"\tglob=document.getElementById('level_select');",
-						"\tif (!glob)",
-						"\t\treturn;",
-						"\tvar opts=glob.options;",
-						"\tvar lev=parseInt(opts[glob.selectedIndex].value);",
-						"\tfor (var i=1; i<9999; i++) {",
-						"\t\tvar sel=document.getElementById('ls_'+i);",
-						"\t\tif (!sel)",
-						"\t\t\tbreak;",
-						"\t\tsel.qa_prev=sel.qa_prev || sel.options[sel.selectedIndex].value;",
-						"\t\tsel.options.length=1;", // just leaves "no upgrade" element
-						"\t\tfor (var j=0; j<opts.length; j++)",
-						"\t\t\tif (parseInt(opts[j].value)>lev)",
-						"\t\t\t\tsel.options[sel.options.length]=new Option(opts[j].text, opts[j].value, false, (opts[j].value==sel.qa_prev));",
-						"\t}",
-						"}",
-					);
+				if ($catleveladd || count($userlevels))
+					$userlevels[] = array('entitytype' => QA_ENTITY_CATEGORY);
+
+				$index = 0;
+				foreach ($userlevels as $userlevel) {
+					if ($userlevel['entitytype'] == QA_ENTITY_CATEGORY) {
+						$index++;
+						$id = 'ls_' . +$index;
+
+						$qa_content['form_profile']['fields']['uc_' . $index . '_level'] = array(
+							'label' => qa_lang_html('users/category_level_label'),
+							'type' => 'select',
+							'tags' => 'name="uc_' . $index . '_level" id="' . qa_html($id) . '" onchange="this.qa_prev=this.options[this.selectedIndex].value;"',
+							'options' => $catleveloptions,
+							'value' => isset($userlevel['level']) ? qa_html(qa_user_level_string($userlevel['level'])) : '',
+							'suffix' => qa_lang_html('users/category_level_in'),
+						);
 
-					$qa_content['script_onloads'][] = array(
-						"qa_update_category_levels();",
-					);
+						$qa_content['form_profile']['fields']['uc_' . $index . '_cat'] = array();
+
+						if (isset($userlevel['entityid']))
+							$fieldnavcategories = qa_db_select_with_pending(qa_db_category_nav_selectspec($userlevel['entityid'], true));
+						else
+							$fieldnavcategories = $navcategories;
 
-					$qa_content['form_profile']['fields']['level']['tags'] .= ' id="level_select" onchange="qa_update_category_levels();"';
+						qa_set_up_category_field($qa_content, $qa_content['form_profile']['fields']['uc_' . $index . '_cat'],
+							'uc_' . $index . '_cat', $fieldnavcategories, @$userlevel['entityid'], true, true);
 
+						unset($qa_content['form_profile']['fields']['uc_' . $index . '_cat']['note']);
+					}
 				}
-			}
 
+				$qa_content['script_lines'][] = array(
+					"function qa_update_category_levels()",
+					"{",
+					"\tglob=document.getElementById('level_select');",
+					"\tif (!glob)",
+					"\t\treturn;",
+					"\tvar opts=glob.options;",
+					"\tvar lev=parseInt(opts[glob.selectedIndex].value);",
+					"\tfor (var i=1; i<9999; i++) {",
+					"\t\tvar sel=document.getElementById('ls_'+i);",
+					"\t\tif (!sel)",
+					"\t\t\tbreak;",
+					"\t\tsel.qa_prev=sel.qa_prev || sel.options[sel.selectedIndex].value;",
+					"\t\tsel.options.length=1;", // just leaves "no upgrade" element
+					"\t\tfor (var j=0; j<opts.length; j++)",
+					"\t\t\tif (parseInt(opts[j].value)>lev)",
+					"\t\t\t\tsel.options[sel.options.length]=new Option(opts[j].text, opts[j].value, false, (opts[j].value==sel.qa_prev));",
+					"\t}",
+					"}",
+				);
+
+				$qa_content['script_onloads'][] = array(
+					"qa_update_category_levels();",
+				);
+
+				$qa_content['form_profile']['fields']['level']['tags'] .= ' id="level_select" onchange="qa_update_category_levels();"';
+			}
 		}
-		else {
-			foreach ($userlevels as $userlevel) {
-				if ( $userlevel['entitytype'] == QA_ENTITY_CATEGORY && $userlevel['level'] > $useraccount['level'] ) {
-					$qa_content['form_profile']['fields']['level']['value'] .= '<br/>'.
-						strtr(qa_lang_html('users/level_for_category'), array(
-							'^1' => qa_html(qa_user_level_string($userlevel['level'])),
-							'^2' => '<a href="'.qa_path_html(implode('/', array_reverse(explode('/', $userlevel['backpath'])))).'">'.qa_html($userlevel['title']).'</a>',
-						));
-				}
+
+	} else {
+		foreach ($userlevels as $userlevel) {
+			if ($userlevel['entitytype'] == QA_ENTITY_CATEGORY && $userlevel['level'] > $useraccount['level']) {
+				$qa_content['form_profile']['fields']['level']['value'] .= '<br/>' .
+					strtr(qa_lang_html('users/level_for_category'), array(
+						'^1' => qa_html(qa_user_level_string($userlevel['level'])),
+						'^2' => '<a href="' . qa_path_html(implode('/', array_reverse(explode('/', $userlevel['backpath'])))) . '">' . qa_html($userlevel['title']) . '</a>',
+					));
 			}
 		}
+	}
 
 
 	//	Show any extra privileges due to user's level or their points
 
-		$showpermits = array();
-		$permitoptions = qa_get_permit_options();
-
-		foreach ($permitoptions as $permitoption) {
-			if ( // if not available to approved and email confirmed users with no points, but yes available to the user, it's something special
-				qa_permit_error($permitoption, $userid, QA_USER_LEVEL_APPROVED, QA_USER_FLAGS_EMAIL_CONFIRMED, 0) &&
-				!qa_permit_error($permitoption, $userid, $useraccount['level'], $useraccount['flags'], $userpoints['points'])
-			) {
-				if ($permitoption == 'permit_retag_cat')
-					$showpermits[] = qa_lang(qa_using_categories() ? 'profile/permit_recat' : 'profile/permit_retag');
-				else
-					$showpermits[] = qa_lang('profile/'.$permitoption); // then show it as an extra priviliege
-			}
-		}
+	$showpermits = array();
+	$permitoptions = qa_get_permit_options();
 
-		if (count($showpermits)) {
-			$qa_content['form_profile']['fields']['permits'] = array(
-				'type' => 'static',
-				'label' => qa_lang_html('profile/extra_privileges'),
-				'value' => qa_html(implode("\n", $showpermits), true),
-				'rows' => count($showpermits),
-				'id' => 'permits',
-			);
+	foreach ($permitoptions as $permitoption) {
+		// if not available to approved and email confirmed users with no points, but yes available to the user, it's something special
+		if (
+			qa_permit_error($permitoption, $userid, QA_USER_LEVEL_APPROVED, QA_USER_FLAGS_EMAIL_CONFIRMED, 0) &&
+			!qa_permit_error($permitoption, $userid, $useraccount['level'], $useraccount['flags'], $userpoints['points'])
+		) {
+			if ($permitoption == 'permit_retag_cat')
+				$showpermits[] = qa_lang(qa_using_categories() ? 'profile/permit_recat' : 'profile/permit_retag');
+			else
+				$showpermits[] = qa_lang('profile/' . $permitoption); // then show it as an extra priviliege
 		}
+	}
+
+	if (count($showpermits)) {
+		$qa_content['form_profile']['fields']['permits'] = array(
+			'type' => 'static',
+			'label' => qa_lang_html('profile/extra_privileges'),
+			'value' => qa_html(implode("\n", $showpermits), true),
+			'rows' => count($showpermits),
+			'id' => 'permits',
+		);
+	}
 
 
 	//	Show email address only if we're an administrator
 
-		if (($loginlevel >= QA_USER_LEVEL_ADMIN) && !qa_user_permit_error()) {
-			$doconfirms = qa_opt('confirm_user_emails') && $useraccount['level'] < QA_USER_LEVEL_EXPERT;
-			$isconfirmed = ($useraccount['flags'] & QA_USER_FLAGS_EMAIL_CONFIRMED) > 0;
-			$htmlemail = qa_html(isset($inemail) ? $inemail : $useraccount['email']);
-
-			$qa_content['form_profile']['fields']['email'] = array(
-				'type' => $userediting ? 'text' : 'static',
-				'label' => qa_lang_html('users/email_label'),
-				'tags' => 'name="email"',
-				'value' => $userediting ? $htmlemail : ('<a href="mailto:'.$htmlemail.'">'.$htmlemail.'</a>'),
-				'error' => qa_html(@$errors['email']),
-				'note' => ($doconfirms ? (qa_lang_html($isconfirmed ? 'users/email_confirmed' : 'users/email_not_confirmed').' ') : '').
-					($userediting ? '' : qa_lang_html('users/only_shown_admins')),
-				'id' => 'email',
-			);
-		}
+	if ($loginlevel >= QA_USER_LEVEL_ADMIN && !qa_user_permit_error()) {
+		$doconfirms = qa_opt('confirm_user_emails') && $useraccount['level'] < QA_USER_LEVEL_EXPERT;
+		$isconfirmed = ($useraccount['flags'] & QA_USER_FLAGS_EMAIL_CONFIRMED) > 0;
+		$htmlemail = qa_html(isset($inemail) ? $inemail : $useraccount['email']);
+
+		$qa_content['form_profile']['fields']['email'] = array(
+			'type' => $userediting ? 'text' : 'static',
+			'label' => qa_lang_html('users/email_label'),
+			'tags' => 'name="email"',
+			'value' => $userediting ? $htmlemail : ('<a href="mailto:' . $htmlemail . '">' . $htmlemail . '</a>'),
+			'error' => qa_html(@$errors['email']),
+			'note' => ($doconfirms ? (qa_lang_html($isconfirmed ? 'users/email_confirmed' : 'users/email_not_confirmed') . ' ') : '') .
+				($userediting ? '' : qa_lang_html('users/only_shown_admins')),
+			'id' => 'email',
+		);
+	}
 
 
 	//	Show IP addresses and times for last login or write - only if we're a moderator or higher
 
-		if (($loginlevel >= QA_USER_LEVEL_MODERATOR) && !qa_user_permit_error()) {
-			$qa_content['form_profile']['fields']['lastlogin'] = array(
+	if ($loginlevel >= QA_USER_LEVEL_MODERATOR && !qa_user_permit_error()) {
+		$qa_content['form_profile']['fields']['lastlogin'] = array(
+			'type' => 'static',
+			'label' => qa_lang_html('users/last_login_label'),
+			'value' =>
+				strtr(qa_lang_html('users/x_ago_from_y'), array(
+					'^1' => qa_time_to_string(qa_opt('db_time') - $useraccount['loggedin']),
+					'^2' => qa_ip_anchor_html(@inet_ntop($useraccount['loginip'])),
+				)),
+			'note' => $userediting ? null : qa_lang_html('users/only_shown_moderators'),
+			'id' => 'lastlogin',
+		);
+
+		if (isset($useraccount['written'])) {
+			$qa_content['form_profile']['fields']['lastwrite'] = array(
 				'type' => 'static',
-				'label' => qa_lang_html('users/last_login_label'),
+				'label' => qa_lang_html('users/last_write_label'),
 				'value' =>
 					strtr(qa_lang_html('users/x_ago_from_y'), array(
-						'^1' => qa_time_to_string(qa_opt('db_time')-$useraccount['loggedin']),
-						'^2' => qa_ip_anchor_html(@inet_ntop($useraccount['loginip'])),
+						'^1' => qa_time_to_string(qa_opt('db_time') - $useraccount['written']),
+						'^2' => qa_ip_anchor_html(@inet_ntop($useraccount['writeip'])),
 					)),
 				'note' => $userediting ? null : qa_lang_html('users/only_shown_moderators'),
-				'id' => 'lastlogin',
+				'id' => 'lastwrite',
 			);
-
-			if (isset($useraccount['written'])) {
-				$qa_content['form_profile']['fields']['lastwrite'] = array(
-					'type' => 'static',
-					'label' => qa_lang_html('users/last_write_label'),
-					'value' =>
-						strtr(qa_lang_html('users/x_ago_from_y'), array(
-							'^1' => qa_time_to_string(qa_opt('db_time')-$useraccount['written']),
-							'^2' => qa_ip_anchor_html(@inet_ntop($useraccount['writeip'])),
-						)),
-					'note' => $userediting ? null : qa_lang_html('users/only_shown_moderators'),
-					'id' => 'lastwrite',
-				);
-			}
-			else
-				unset($qa_content['form_profile']['fields']['lastwrite']);
+		} else {
+			unset($qa_content['form_profile']['fields']['lastwrite']);
 		}
+	}
 
 
 	//	Show other profile fields
 
-		$fieldsediting = $fieldseditable && $userediting;
+	$fieldsediting = $fieldseditable && $userediting;
 
-		foreach ($userfields as $userfield) {
-			if (($userfield['flags'] & QA_FIELD_FLAGS_LINK_URL) && !$fieldsediting)
-				$valuehtml = qa_url_to_html_link(@$userprofile[$userfield['title']], qa_opt('links_in_new_window'));
+	foreach ($userfields as $userfield) {
+		if (($userfield['flags'] & QA_FIELD_FLAGS_LINK_URL) && !$fieldsediting) {
+			$valuehtml = qa_url_to_html_link(@$userprofile[$userfield['title']], qa_opt('links_in_new_window'));
+		} else {
+			$value = @$inprofile[$userfield['fieldid']];
+			if (!isset($value))
+				$value = @$userprofile[$userfield['title']];
 
-			else {
-				$value = @$inprofile[$userfield['fieldid']];
-				if (!isset($value))
-					$value = @$userprofile[$userfield['title']];
+			$valuehtml = qa_html($value, (($userfield['flags'] & QA_FIELD_FLAGS_MULTI_LINE) && !$fieldsediting));
+		}
 
-				$valuehtml = qa_html($value, (($userfield['flags'] & QA_FIELD_FLAGS_MULTI_LINE) && !$fieldsediting));
-			}
+		$label = trim(qa_user_userfield_label($userfield), ':');
+		if (strlen($label))
+			$label .= ':';
+
+		$notehtml = null;
+		if (isset($userfield['permit']) && !$userediting) {
+			if ($userfield['permit'] <= QA_PERMIT_ADMINS)
+				$notehtml = qa_lang_html('users/only_shown_admins');
+			elseif ($userfield['permit'] <= QA_PERMIT_MODERATORS)
+				$notehtml = qa_lang_html('users/only_shown_moderators');
+			elseif ($userfield['permit'] <= QA_PERMIT_EDITORS)
+				$notehtml = qa_lang_html('users/only_shown_editors');
+			elseif ($userfield['permit'] <= QA_PERMIT_EXPERTS)
+				$notehtml = qa_lang_html('users/only_shown_experts');
+		}
+
+		$qa_content['form_profile']['fields'][$userfield['title']] = array(
+			'type' => $fieldsediting ? 'text' : 'static',
+			'label' => qa_html($label),
+			'tags' => 'name="field_' . $userfield['fieldid'] . '"',
+			'value' => $valuehtml,
+			'error' => qa_html(@$errors[$userfield['fieldid']]),
+			'note' => $notehtml,
+			'rows' => ($userfield['flags'] & QA_FIELD_FLAGS_MULTI_LINE) ? 8 : null,
+			'id' => 'userfield-' . $userfield['fieldid'],
+		);
+	}
 
-			$label = trim(qa_user_userfield_label($userfield), ':');
-			if (strlen($label))
-				$label .= ':';
-
-			$notehtml = null;
-			if (isset($userfield['permit']) && !$userediting) {
-				if ($userfield['permit'] <= QA_PERMIT_ADMINS)
-					$notehtml = qa_lang_html('users/only_shown_admins');
-				elseif ($userfield['permit'] <= QA_PERMIT_MODERATORS)
-					$notehtml = qa_lang_html('users/only_shown_moderators');
-				elseif ($userfield['permit'] <= QA_PERMIT_EDITORS)
-					$notehtml = qa_lang_html('users/only_shown_editors');
-				elseif ($userfield['permit'] <= QA_PERMIT_EXPERTS)
-					$notehtml = qa_lang_html('users/only_shown_experts');
-			}
 
-			$qa_content['form_profile']['fields'][$userfield['title']] = array(
-				'type' => $fieldsediting ? 'text' : 'static',
-				'label' => qa_html($label),
-				'tags' => 'name="field_'.$userfield['fieldid'].'"',
-				'value' => $valuehtml,
-				'error' => qa_html(@$errors[$userfield['fieldid']]),
-				'note' => $notehtml,
-				'rows' => ($userfield['flags'] & QA_FIELD_FLAGS_MULTI_LINE) ? 8 : null,
-				'id' => 'userfield-'.$userfield['fieldid'],
+	//	Edit form or button, if appropriate
+
+	if ($userediting) {
+		if (
+			(qa_opt('avatar_allow_gravatar') && ($useraccount['flags'] & QA_USER_FLAGS_SHOW_GRAVATAR)) ||
+			(qa_opt('avatar_allow_upload') && ($useraccount['flags'] & QA_USER_FLAGS_SHOW_AVATAR) && isset($useraccount['avatarblobid']))
+		) {
+			$qa_content['form_profile']['fields']['removeavatar'] = array(
+				'type' => 'checkbox',
+				'label' => qa_lang_html('users/remove_avatar'),
+				'tags' => 'name="removeavatar"',
 			);
 		}
 
+		$qa_content['form_profile']['buttons'] = array(
+			'save' => array(
+				'tags' => 'onclick="qa_show_waiting_after(this, false);"',
+				'label' => qa_lang_html('users/save_user'),
+			),
 
-	//	Edit form or button, if appropriate
-
-		if ($userediting) {
-			if (
-				(qa_opt('avatar_allow_gravatar') && ($useraccount['flags'] & QA_USER_FLAGS_SHOW_GRAVATAR)) ||
-				(qa_opt('avatar_allow_upload') && ($useraccount['flags'] & QA_USER_FLAGS_SHOW_AVATAR) && isset($useraccount['avatarblobid']))
-			) {
-				$qa_content['form_profile']['fields']['removeavatar'] = array(
-					'type' => 'checkbox',
-					'label' => qa_lang_html('users/remove_avatar'),
-					'tags' => 'name="removeavatar"',
-				);
-			}
+			'cancel' => array(
+				'tags' => 'name="docancel"',
+				'label' => qa_lang_html('main/cancel_button'),
+			),
+		);
 
-			$qa_content['form_profile']['buttons'] = array(
-				'save' => array(
-					'tags' => 'onclick="qa_show_waiting_after(this, false);"',
-					'label' => qa_lang_html('users/save_user'),
-				),
+		$qa_content['form_profile']['hidden'] = array(
+			'dosave' => '1',
+			'code' => qa_get_form_security_code('user-edit-' . $handle),
+		);
 
-				'cancel' => array(
-					'tags' => 'name="docancel"',
-					'label' => qa_lang_html('main/cancel_button'),
-				),
-			);
+	} elseif ($usereditbutton) {
+		$qa_content['form_profile']['buttons'] = array();
 
-			$qa_content['form_profile']['hidden'] = array(
-				'dosave' => '1',
-				'code' => qa_get_form_security_code('user-edit-'.$handle),
+		if ($approvebutton) {
+			$qa_content['form_profile']['buttons']['approve'] = array(
+				'tags' => 'name="doapprove"',
+				'label' => qa_lang_html('users/approve_user_button'),
 			);
-
 		}
-		elseif ($usereditbutton) {
-			$qa_content['form_profile']['buttons'] = array();
 
-			if ($approvebutton) {
-				$qa_content['form_profile']['buttons']['approve'] = array(
-					'tags' => 'name="doapprove"',
-					'label' => qa_lang_html('users/approve_user_button'),
-				);
-			}
+		$qa_content['form_profile']['buttons']['edit'] = array(
+			'tags' => 'name="doedit"',
+			'label' => qa_lang_html('users/edit_user_button'),
+		);
 
-			$qa_content['form_profile']['buttons']['edit'] = array(
-				'tags' => 'name="doedit"',
-				'label' => qa_lang_html('users/edit_user_button'),
-			);
+		if (isset($maxlevelassign) && $useraccount['level'] < QA_USER_LEVEL_MODERATOR) {
+			if ($useraccount['flags'] & QA_USER_FLAGS_USER_BLOCKED) {
+				$qa_content['form_profile']['buttons']['unblock'] = array(
+					'tags' => 'name="dounblock"',
+					'label' => qa_lang_html('users/unblock_user_button'),
+				);
 
-			if (isset($maxlevelassign) && $useraccount['level'] < QA_USER_LEVEL_MODERATOR) {
-				if ($useraccount['flags'] & QA_USER_FLAGS_USER_BLOCKED) {
-					$qa_content['form_profile']['buttons']['unblock'] = array(
-						'tags' => 'name="dounblock"',
-						'label' => qa_lang_html('users/unblock_user_button'),
+				if (!qa_user_permit_error('permit_hide_show')) {
+					$qa_content['form_profile']['buttons']['hideall'] = array(
+						'tags' => 'name="dohideall" onclick="qa_show_waiting_after(this, false);"',
+						'label' => qa_lang_html('users/hide_all_user_button'),
 					);
-
-					if (!qa_user_permit_error('permit_hide_show')) {
-						$qa_content['form_profile']['buttons']['hideall'] = array(
-							'tags' => 'name="dohideall" onclick="qa_show_waiting_after(this, false);"',
-							'label' => qa_lang_html('users/hide_all_user_button'),
-						);
-					}
-
-					if ($loginlevel >= QA_USER_LEVEL_ADMIN) {
-						$qa_content['form_profile']['buttons']['delete'] = array(
-							'tags' => 'name="dodelete" onclick="qa_show_waiting_after(this, false);"',
-							'label' => qa_lang_html('users/delete_user_button'),
-						);
-					}
-
 				}
-				else {
-					$qa_content['form_profile']['buttons']['block'] = array(
-						'tags' => 'name="doblock"',
-						'label' => qa_lang_html('users/block_user_button'),
+
+				if ($loginlevel >= QA_USER_LEVEL_ADMIN) {
+					$qa_content['form_profile']['buttons']['delete'] = array(
+						'tags' => 'name="dodelete" onclick="qa_show_waiting_after(this, false);"',
+						'label' => qa_lang_html('users/delete_user_button'),
 					);
 				}
 
-				$qa_content['form_profile']['hidden'] = array(
-					'code' => qa_get_form_security_code('user-'.$handle),
+			} else {
+				$qa_content['form_profile']['buttons']['block'] = array(
+					'tags' => 'name="doblock"',
+					'label' => qa_lang_html('users/block_user_button'),
 				);
 			}
 
-		}
-		elseif (isset($loginuserid) && ($loginuserid == $userid)) {
-			$qa_content['form_profile']['buttons'] = array(
-				'account' => array(
-					'tags' => 'name="doaccount"',
-					'label' => qa_lang_html('users/edit_profile'),
-				),
+			$qa_content['form_profile']['hidden'] = array(
+				'code' => qa_get_form_security_code('user-' . $handle),
 			);
 		}
 
+	} elseif (isset($loginuserid) && ($loginuserid == $userid)) {
+		$qa_content['form_profile']['buttons'] = array(
+			'account' => array(
+				'tags' => 'name="doaccount"',
+				'label' => qa_lang_html('users/edit_profile'),
+			),
+		);
+	}
 
-		if (!is_array($qa_content['form_profile']['fields']['removeavatar']))
-			unset($qa_content['form_profile']['fields']['removeavatar']);
 
-		$qa_content['raw']['account'] = $useraccount; // for plugin layers to access
-		$qa_content['raw']['profile'] = $userprofile;
-	}
+	if (!is_array($qa_content['form_profile']['fields']['removeavatar']))
+		unset($qa_content['form_profile']['fields']['removeavatar']);
 
+	$qa_content['raw']['account'] = $useraccount; // for plugin layers to access
+	$qa_content['raw']['profile'] = $userprofile;
+}
 
-//	Information about user activity, available also with single sign-on integration
 
-	$qa_content['form_activity'] = array(
-		'title' => '<a name="activity">'.qa_lang_html_sub('profile/activity_by_x', $userhtml).'</a>',
+//	Information about user activity, available also with single sign-on integration
 
-		'style' => 'wide',
+$qa_content['form_activity'] = array(
+	'title' => '<a name="activity">' . qa_lang_html_sub('profile/activity_by_x', $userhtml) . '</a>',
 
-		'fields' => array(
-			'bonus' => array(
-				'label' => qa_lang_html('profile/bonus_points'),
-				'tags' => 'name="bonus"',
-				'value' => qa_html(isset($inbonus) ? $inbonus : $userpoints['bonus']),
-				'type' => 'number',
-				'note' => qa_lang_html('users/only_shown_admins'),
-				'id' => 'bonus',
-			),
+	'style' => 'wide',
 
-			'points' => array(
-				'type' => 'static',
-				'label' => qa_lang_html('profile/score'),
-				'value' => (@$userpoints['points'] == 1)
-					? qa_lang_html_sub('main/1_point', '<span class="qa-uf-user-points">1</span>', '1')
-					: qa_lang_html_sub('main/x_points', '<span class="qa-uf-user-points">'.qa_html(qa_format_number(@$userpoints['points'])).'</span>'),
-				'id' => 'points',
-			),
+	'fields' => array(
+		'bonus' => array(
+			'label' => qa_lang_html('profile/bonus_points'),
+			'tags' => 'name="bonus"',
+			'value' => qa_html(isset($inbonus) ? $inbonus : $userpoints['bonus']),
+			'type' => 'number',
+			'note' => qa_lang_html('users/only_shown_admins'),
+			'id' => 'bonus',
+		),
 
-			'title' => array(
-				'type' => 'static',
-				'label' => qa_lang_html('profile/title'),
-				'value' => qa_get_points_title_html(@$userpoints['points'], qa_get_points_to_titles()),
-				'id' => 'title',
-			),
+		'points' => array(
+			'type' => 'static',
+			'label' => qa_lang_html('profile/score'),
+			'value' => (@$userpoints['points'] == 1)
+				? qa_lang_html_sub('main/1_point', '<span class="qa-uf-user-points">1</span>', '1')
+				: qa_lang_html_sub('main/x_points', '<span class="qa-uf-user-points">' . qa_html(qa_format_number(@$userpoints['points'])) . '</span>'),
+			'id' => 'points',
+		),
 
-			'questions' => array(
-				'type' => 'static',
-				'label' => qa_lang_html('profile/questions'),
-				'value' => '<span class="qa-uf-user-q-posts">'.qa_html(qa_format_number(@$userpoints['qposts'])).'</span>',
-				'id' => 'questions',
-			),
+		'title' => array(
+			'type' => 'static',
+			'label' => qa_lang_html('profile/title'),
+			'value' => qa_get_points_title_html(@$userpoints['points'], qa_get_points_to_titles()),
+			'id' => 'title',
+		),
 
-			'answers' => array(
-				'type' => 'static',
-				'label' => qa_lang_html('profile/answers'),
-				'value' => '<span class="qa-uf-user-a-posts">'.qa_html(qa_format_number(@$userpoints['aposts'])).'</span>',
-				'id' => 'answers',
-			),
+		'questions' => array(
+			'type' => 'static',
+			'label' => qa_lang_html('profile/questions'),
+			'value' => '<span class="qa-uf-user-q-posts">' . qa_html(qa_format_number(@$userpoints['qposts'])) . '</span>',
+			'id' => 'questions',
 		),
-	);
 
-	if ($loginlevel >= QA_USER_LEVEL_ADMIN) {
-		$qa_content['form_activity']['tags'] = 'method="post" action="'.qa_self_html().'"';
+		'answers' => array(
+			'type' => 'static',
+			'label' => qa_lang_html('profile/answers'),
+			'value' => '<span class="qa-uf-user-a-posts">' . qa_html(qa_format_number(@$userpoints['aposts'])) . '</span>',
+			'id' => 'answers',
+		),
+	),
+);
 
-		$qa_content['form_activity']['buttons'] = array(
-			'setbonus' => array(
-				'tags' => 'name="dosetbonus"',
-				'label' => qa_lang_html('profile/set_bonus_button'),
-			),
-		);
+if ($loginlevel >= QA_USER_LEVEL_ADMIN) {
+	$qa_content['form_activity']['tags'] = 'method="post" action="' . qa_self_html() . '"';
 
-		$qa_content['form_activity']['hidden'] = array(
-			'code' => qa_get_form_security_code('user-activity-'.$handle),
-		);
+	$qa_content['form_activity']['buttons'] = array(
+		'setbonus' => array(
+			'tags' => 'name="dosetbonus"',
+			'label' => qa_lang_html('profile/set_bonus_button'),
+		),
+	);
 
-	}
-	else
-		unset($qa_content['form_activity']['fields']['bonus']);
+	$qa_content['form_activity']['hidden'] = array(
+		'code' => qa_get_form_security_code('user-activity-' . $handle),
+	);
 
-	if (!isset($qa_content['form_activity']['fields']['title']['value']))
-		unset($qa_content['form_activity']['fields']['title']);
+} else {
+	unset($qa_content['form_activity']['fields']['bonus']);
+}
 
-	if (qa_opt('comment_on_qs') || qa_opt('comment_on_as')) { // only show comment count if comments are enabled
-		$qa_content['form_activity']['fields']['comments'] = array(
-			'type' => 'static',
-			'label' => qa_lang_html('profile/comments'),
-			'value' => '<span class="qa-uf-user-c-posts">'.qa_html(qa_format_number(@$userpoints['cposts'])).'</span>',
-			'id' => 'comments',
-		);
-	}
+if (!isset($qa_content['form_activity']['fields']['title']['value']))
+	unset($qa_content['form_activity']['fields']['title']);
 
-	if (qa_opt('voting_on_qs') || qa_opt('voting_on_as')) { // only show vote record if voting is enabled
-		$votedonvalue = '';
+if (qa_opt('comment_on_qs') || qa_opt('comment_on_as')) { // only show comment count if comments are enabled
+	$qa_content['form_activity']['fields']['comments'] = array(
+		'type' => 'static',
+		'label' => qa_lang_html('profile/comments'),
+		'value' => '<span class="qa-uf-user-c-posts">' . qa_html(qa_format_number(@$userpoints['cposts'])) . '</span>',
+		'id' => 'comments',
+	);
+}
 
-		if (qa_opt('voting_on_qs')) {
-			$qvotes = @$userpoints['qupvotes']+@$userpoints['qdownvotes'];
+if (qa_opt('voting_on_qs') || qa_opt('voting_on_as')) { // only show vote record if voting is enabled
+	$votedonvalue = '';
 
-			$innervalue = '<span class="qa-uf-user-q-votes">'.qa_format_number($qvotes).'</span>';
-			$votedonvalue .= ($qvotes == 1) ? qa_lang_html_sub('main/1_question', $innervalue, '1')
-				: qa_lang_html_sub('main/x_questions', $innervalue);
+	if (qa_opt('voting_on_qs')) {
+		$qvotes = @$userpoints['qupvotes'] + @$userpoints['qdownvotes'];
 
-			if (qa_opt('voting_on_as'))
-				$votedonvalue .= ', ';
-		}
+		$innervalue = '<span class="qa-uf-user-q-votes">' . qa_format_number($qvotes) . '</span>';
+		$votedonvalue .= ($qvotes == 1) ? qa_lang_html_sub('main/1_question', $innervalue, '1')
+			: qa_lang_html_sub('main/x_questions', $innervalue);
 
-		if (qa_opt('voting_on_as')) {
-			$avotes = @$userpoints['aupvotes']+@$userpoints['adownvotes'];
+		if (qa_opt('voting_on_as'))
+			$votedonvalue .= ', ';
+	}
 
-			$innervalue = '<span class="qa-uf-user-a-votes">'.qa_format_number($avotes).'</span>';
-			$votedonvalue .= ($avotes == 1) ? qa_lang_html_sub('main/1_answer', $innervalue, '1')
-				: qa_lang_html_sub('main/x_answers', $innervalue);
-		}
+	if (qa_opt('voting_on_as')) {
+		$avotes = @$userpoints['aupvotes'] + @$userpoints['adownvotes'];
 
-		$qa_content['form_activity']['fields']['votedon'] = array(
-			'type' => 'static',
-			'label' => qa_lang_html('profile/voted_on'),
-			'value' => $votedonvalue,
-			'id' => 'votedon',
-		);
+		$innervalue = '<span class="qa-uf-user-a-votes">' . qa_format_number($avotes) . '</span>';
+		$votedonvalue .= ($avotes == 1) ? qa_lang_html_sub('main/1_answer', $innervalue, '1')
+			: qa_lang_html_sub('main/x_answers', $innervalue);
+	}
 
-		$upvotes = @$userpoints['qupvotes']+@$userpoints['aupvotes'];
-		$innervalue = '<span class="qa-uf-user-upvotes">'.qa_format_number($upvotes).'</span>';
-		$votegavevalue = (($upvotes == 1) ? qa_lang_html_sub('profile/1_up_vote', $innervalue, '1') : qa_lang_html_sub('profile/x_up_votes', $innervalue)).', ';
+	$qa_content['form_activity']['fields']['votedon'] = array(
+		'type' => 'static',
+		'label' => qa_lang_html('profile/voted_on'),
+		'value' => $votedonvalue,
+		'id' => 'votedon',
+	);
 
-		$downvotes = @$userpoints['qdownvotes']+@$userpoints['adownvotes'];
-		$innervalue = '<span class="qa-uf-user-downvotes">'.qa_format_number($downvotes).'</span>';
-		$votegavevalue .= ($downvotes == 1) ? qa_lang_html_sub('profile/1_down_vote', $innervalue, '1') : qa_lang_html_sub('profile/x_down_votes', $innervalue);
+	$upvotes = @$userpoints['qupvotes'] + @$userpoints['aupvotes'];
+	$innervalue = '<span class="qa-uf-user-upvotes">' . qa_format_number($upvotes) . '</span>';
+	$votegavevalue = (($upvotes == 1) ? qa_lang_html_sub('profile/1_up_vote', $innervalue, '1') : qa_lang_html_sub('profile/x_up_votes', $innervalue)) . ', ';
 
-		$qa_content['form_activity']['fields']['votegave'] = array(
-			'type' => 'static',
-			'label' => qa_lang_html('profile/gave_out'),
-			'value' => $votegavevalue,
-			'id' => 'votegave',
-		);
+	$downvotes = @$userpoints['qdownvotes'] + @$userpoints['adownvotes'];
+	$innervalue = '<span class="qa-uf-user-downvotes">' . qa_format_number($downvotes) . '</span>';
+	$votegavevalue .= ($downvotes == 1) ? qa_lang_html_sub('profile/1_down_vote', $innervalue, '1') : qa_lang_html_sub('profile/x_down_votes', $innervalue);
 
-		$innervalue = '<span class="qa-uf-user-upvoteds">'.qa_format_number(@$userpoints['upvoteds']).'</span>';
-		$votegotvalue = ((@$userpoints['upvoteds'] == 1) ? qa_lang_html_sub('profile/1_up_vote', $innervalue, '1')
-			: qa_lang_html_sub('profile/x_up_votes', $innervalue)).', ';
+	$qa_content['form_activity']['fields']['votegave'] = array(
+		'type' => 'static',
+		'label' => qa_lang_html('profile/gave_out'),
+		'value' => $votegavevalue,
+		'id' => 'votegave',
+	);
 
-		$innervalue = '<span class="qa-uf-user-downvoteds">'.qa_format_number(@$userpoints['downvoteds']).'</span>';
-		$votegotvalue .= (@$userpoints['downvoteds'] == 1) ? qa_lang_html_sub('profile/1_down_vote', $innervalue, '1')
-			: qa_lang_html_sub('profile/x_down_votes', $innervalue);
+	$innervalue = '<span class="qa-uf-user-upvoteds">' . qa_format_number(@$userpoints['upvoteds']) . '</span>';
+	$votegotvalue = ((@$userpoints['upvoteds'] == 1) ? qa_lang_html_sub('profile/1_up_vote', $innervalue, '1')
+			: qa_lang_html_sub('profile/x_up_votes', $innervalue)) . ', ';
 
-		$qa_content['form_activity']['fields']['votegot'] = array(
-			'type' => 'static',
-			'label' => qa_lang_html('profile/received'),
-			'value' => $votegotvalue,
-			'id' => 'votegot',
-		);
-	}
+	$innervalue = '<span class="qa-uf-user-downvoteds">' . qa_format_number(@$userpoints['downvoteds']) . '</span>';
+	$votegotvalue .= (@$userpoints['downvoteds'] == 1) ? qa_lang_html_sub('profile/1_down_vote', $innervalue, '1')
+		: qa_lang_html_sub('profile/x_down_votes', $innervalue);
 
-	if (@$userpoints['points']) {
-		$qa_content['form_activity']['fields']['points']['value'] .=
-			qa_lang_html_sub('profile/ranked_x', '<span class="qa-uf-user-rank">'.qa_format_number($userrank).'</span>');
-	}
+	$qa_content['form_activity']['fields']['votegot'] = array(
+		'type' => 'static',
+		'label' => qa_lang_html('profile/received'),
+		'value' => $votegotvalue,
+		'id' => 'votegot',
+	);
+}
 
-	if (@$userpoints['aselects']) {
-		$qa_content['form_activity']['fields']['questions']['value'] .= ($userpoints['aselects'] == 1)
-			? qa_lang_html_sub('profile/1_with_best_chosen', '<span class="qa-uf-user-q-selects">1</span>', '1')
-			: qa_lang_html_sub('profile/x_with_best_chosen', '<span class="qa-uf-user-q-selects">'.qa_format_number($userpoints['aselects']).'</span>');
-	}
+if (@$userpoints['points']) {
+	$qa_content['form_activity']['fields']['points']['value'] .=
+		qa_lang_html_sub('profile/ranked_x', '<span class="qa-uf-user-rank">' . qa_format_number($userrank) . '</span>');
+}
 
-	if (@$userpoints['aselecteds']) {
-		$qa_content['form_activity']['fields']['answers']['value'] .= ($userpoints['aselecteds'] == 1)
-			? qa_lang_html_sub('profile/1_chosen_as_best', '<span class="qa-uf-user-a-selecteds">1</span>', '1')
-			: qa_lang_html_sub('profile/x_chosen_as_best', '<span class="qa-uf-user-a-selecteds">'.qa_format_number($userpoints['aselecteds']).'</span>');
-	}
+if (@$userpoints['aselects']) {
+	$qa_content['form_activity']['fields']['questions']['value'] .= ($userpoints['aselects'] == 1)
+		? qa_lang_html_sub('profile/1_with_best_chosen', '<span class="qa-uf-user-q-selects">1</span>', '1')
+		: qa_lang_html_sub('profile/x_with_best_chosen', '<span class="qa-uf-user-q-selects">' . qa_format_number($userpoints['aselects']) . '</span>');
+}
 
+if (@$userpoints['aselecteds']) {
+	$qa_content['form_activity']['fields']['answers']['value'] .= ($userpoints['aselecteds'] == 1)
+		? qa_lang_html_sub('profile/1_chosen_as_best', '<span class="qa-uf-user-a-selecteds">1</span>', '1')
+		: qa_lang_html_sub('profile/x_chosen_as_best', '<span class="qa-uf-user-a-selecteds">' . qa_format_number($userpoints['aselecteds']) . '</span>');
+}
 
 
 //	For plugin layers to access
 
-	$qa_content['raw']['userid'] = $userid;
-	$qa_content['raw']['points'] = $userpoints;
-	$qa_content['raw']['rank'] = $userrank;
+$qa_content['raw']['userid'] = $userid;
+$qa_content['raw']['points'] = $userpoints;
+$qa_content['raw']['rank'] = $userrank;
 
 
 //	Wall posts
 
-	if (!QA_FINAL_EXTERNAL_USERS && qa_opt('allow_user_walls')) {
-		$qa_content['message_list'] = array(
-			'title' => '<a name="wall">'.qa_lang_html_sub('profile/wall_for_x', $userhtml).'</a>',
+if (!QA_FINAL_EXTERNAL_USERS && qa_opt('allow_user_walls')) {
+	$qa_content['message_list'] = array(
+		'title' => '<a name="wall">' . qa_lang_html_sub('profile/wall_for_x', $userhtml) . '</a>',
 
-			'tags' => 'id="wallmessages"',
+		'tags' => 'id="wallmessages"',
 
-			'form' => array(
-				'tags' => 'name="wallpost" method="post" action="'.qa_self_html().'#wall"',
-				'style' => 'tall',
-				'hidden' => array(
-					'qa_click' => '', // for simulating clicks in Javascript
-					'handle' => qa_html($useraccount['handle']),
-					'start' => 0,
-					'code' => qa_get_form_security_code('wall-'.$useraccount['handle']),
-				),
+		'form' => array(
+			'tags' => 'name="wallpost" method="post" action="' . qa_self_html() . '#wall"',
+			'style' => 'tall',
+			'hidden' => array(
+				'qa_click' => '', // for simulating clicks in Javascript
+				'handle' => qa_html($useraccount['handle']),
+				'start' => 0,
+				'code' => qa_get_form_security_code('wall-' . $useraccount['handle']),
 			),
+		),
 
-			'messages' => array(),
-		);
-
-		if ($wallposterrorhtml)
-			$qa_content['message_list']['error'] = $wallposterrorhtml; // an error that means we are not allowed to post
-
-		else {
-			$qa_content['message_list']['form']['fields'] = array(
-				'message' => array(
-					'tags' => 'name="message" id="message"',
-					'value' => qa_html(@$inmessage, false),
-					'rows' => 2,
-					'error' => qa_html(@$errors['message']),
-				),
-			);
-
-			$qa_content['message_list']['form']['buttons'] = array(
-				'post' => array(
-					'tags' => 'name="dowallpost" onclick="return qa_submit_wall_post(this, true);"',
-					'label' => qa_lang_html('profile/post_wall_button'),
-				),
-			);
-		}
+		'messages' => array(),
+	);
 
-		foreach ($usermessages as $message)
-			$qa_content['message_list']['messages'][] = qa_wall_post_view($message);
+	if ($wallposterrorhtml) {
+		$qa_content['message_list']['error'] = $wallposterrorhtml; // an error that means we are not allowed to post
+	} else {
+		$qa_content['message_list']['form']['fields'] = array(
+			'message' => array(
+				'tags' => 'name="message" id="message"',
+				'value' => qa_html(@$inmessage, false),
+				'rows' => 2,
+				'error' => qa_html(@$errors['message']),
+			),
+		);
 
-		if ($useraccount['wallposts'] > count($usermessages))
-			$qa_content['message_list']['messages'][] = qa_wall_view_more_link($handle, count($usermessages));
+		$qa_content['message_list']['form']['buttons'] = array(
+			'post' => array(
+				'tags' => 'name="dowallpost" onclick="return qa_submit_wall_post(this, true);"',
+				'label' => qa_lang_html('profile/post_wall_button'),
+			),
+		);
 	}
 
+	foreach ($usermessages as $message)
+		$qa_content['message_list']['messages'][] = qa_wall_post_view($message);
 
-//	Sub menu for navigation in user pages
+	if ($useraccount['wallposts'] > count($usermessages))
+		$qa_content['message_list']['messages'][] = qa_wall_view_more_link($handle, count($usermessages));
+}
 
-	$ismyuser = isset($loginuserid) && $loginuserid == (QA_FINAL_EXTERNAL_USERS ? $userid : $useraccount['userid']);
-	$qa_content['navigation']['sub'] = qa_user_sub_navigation($handle, 'profile', $ismyuser);
 
+//	Sub menu for navigation in user pages
 
-	return $qa_content;
+$ismyuser = isset($loginuserid) && $loginuserid == (QA_FINAL_EXTERNAL_USERS ? $userid : $useraccount['userid']);
+$qa_content['navigation']['sub'] = qa_user_sub_navigation($handle, 'profile', $ismyuser);
 
 
-/*
-	Omit PHP closing tag to help avoid accidental output
-*/
+return $qa_content;

qa-include/pages/user-questions.php

@@ -20,86 +20,81 @@
 	More about this license: http://www.question2answer.org/license.php
 */
 
-	if (!defined('QA_VERSION')) { // don't allow this page to be requested directly from browser
-		header('Location: ../');
-		exit;
-	}
+if (!defined('QA_VERSION')) { // don't allow this page to be requested directly from browser
+	header('Location: ../');
+	exit;
+}
 
-	require_once QA_INCLUDE_DIR.'db/selects.php';
-	require_once QA_INCLUDE_DIR.'app/format.php';
+require_once QA_INCLUDE_DIR . 'db/selects.php';
+require_once QA_INCLUDE_DIR . 'app/format.php';
 
 
 //	$handle, $userhtml are already set by qa-page-user.php - also $userid if using external user integration
 
-	$start = qa_get_start();
+$start = qa_get_start();
 
 
 //	Find the questions for this user
 
-	$loginuserid = qa_get_logged_in_userid();
-	$identifier = QA_FINAL_EXTERNAL_USERS ? $userid : $handle;
+$loginuserid = qa_get_logged_in_userid();
+$identifier = QA_FINAL_EXTERNAL_USERS ? $userid : $handle;
 
-	list($useraccount, $userpoints, $questions) = qa_db_select_with_pending(
-		QA_FINAL_EXTERNAL_USERS ? null : qa_db_user_account_selectspec($handle, false),
-		qa_db_user_points_selectspec($identifier),
-		qa_db_user_recent_qs_selectspec($loginuserid, $identifier, qa_opt_if_loaded('page_size_qs'), $start)
-	);
+list($useraccount, $userpoints, $questions) = qa_db_select_with_pending(
+	QA_FINAL_EXTERNAL_USERS ? null : qa_db_user_account_selectspec($handle, false),
+	qa_db_user_points_selectspec($identifier),
+	qa_db_user_recent_qs_selectspec($loginuserid, $identifier, qa_opt_if_loaded('page_size_qs'), $start)
+);
 
-	if ((!QA_FINAL_EXTERNAL_USERS) && !is_array($useraccount)) // check the user exists
-		return include QA_INCLUDE_DIR.'qa-page-not-found.php';
+if (!QA_FINAL_EXTERNAL_USERS && !is_array($useraccount)) // check the user exists
+	return include QA_INCLUDE_DIR . 'qa-page-not-found.php';
 
 
 //	Get information on user questions
 
-	$pagesize = qa_opt('page_size_qs');
-	$count = (int)@$userpoints['qposts'];
-	$questions = array_slice($questions, 0, $pagesize);
-	$usershtml = qa_userids_handles_html($questions, false);
+$pagesize = qa_opt('page_size_qs');
+$count = (int)@$userpoints['qposts'];
+$questions = array_slice($questions, 0, $pagesize);
+$usershtml = qa_userids_handles_html($questions, false);
 
 
 //	Prepare content for theme
 
-	$qa_content = qa_content_prepare(true);
+$qa_content = qa_content_prepare(true);
 
-	if (count($questions))
-		$qa_content['title'] = qa_lang_html_sub('profile/questions_by_x', $userhtml);
-	else
-		$qa_content['title'] = qa_lang_html_sub('profile/no_questions_by_x', $userhtml);
+if (count($questions))
+	$qa_content['title'] = qa_lang_html_sub('profile/questions_by_x', $userhtml);
+else
+	$qa_content['title'] = qa_lang_html_sub('profile/no_questions_by_x', $userhtml);
 
 
 //	Recent questions by this user
 
-	$qa_content['q_list']['form'] = array(
-		'tags' => 'method="post" action="'.qa_self_html().'"',
+$qa_content['q_list']['form'] = array(
+	'tags' => 'method="post" action="' . qa_self_html() . '"',
 
-		'hidden' => array(
-			'code' => qa_get_form_security_code('vote'),
-		),
-	);
+	'hidden' => array(
+		'code' => qa_get_form_security_code('vote'),
+	),
+);
 
-	$qa_content['q_list']['qs'] = array();
+$qa_content['q_list']['qs'] = array();
 
-	$htmldefaults = qa_post_html_defaults('Q');
-	$htmldefaults['whoview'] = false;
-	$htmldefaults['avatarsize'] = 0;
+$htmldefaults = qa_post_html_defaults('Q');
+$htmldefaults['whoview'] = false;
+$htmldefaults['avatarsize'] = 0;
 
-	foreach ($questions as $question) {
-		$qa_content['q_list']['qs'][] = qa_post_html_fields($question, $loginuserid, qa_cookie_get(),
-			$usershtml, null, qa_post_html_options($question, $htmldefaults));
-	}
+foreach ($questions as $question) {
+	$qa_content['q_list']['qs'][] = qa_post_html_fields($question, $loginuserid, qa_cookie_get(),
+		$usershtml, null, qa_post_html_options($question, $htmldefaults));
+}
 
-	$qa_content['page_links'] = qa_html_page_links(qa_request(), $start, $pagesize, $count, qa_opt('pages_prev_next'));
+$qa_content['page_links'] = qa_html_page_links(qa_request(), $start, $pagesize, $count, qa_opt('pages_prev_next'));
 
 
 //	Sub menu for navigation in user pages
 
-	$ismyuser = isset($loginuserid) && $loginuserid == (QA_FINAL_EXTERNAL_USERS ? $userid : $useraccount['userid']);
-	$qa_content['navigation']['sub'] = qa_user_sub_navigation($handle, 'questions', $ismyuser);
+$ismyuser = isset($loginuserid) && $loginuserid == (QA_FINAL_EXTERNAL_USERS ? $userid : $useraccount['userid']);
+$qa_content['navigation']['sub'] = qa_user_sub_navigation($handle, 'questions', $ismyuser);
 
 
-	return $qa_content;
-
-
-/*
-	Omit PHP closing tag to help avoid accidental output
-*/
\ No newline at end of file
+return $qa_content;

qa-include/pages/user-wall.php

@@ -20,145 +20,137 @@
 	More about this license: http://www.question2answer.org/license.php
 */
 
-	if (!defined('QA_VERSION')) { // don't allow this page to be requested directly from browser
-		header('Location: ../');
-		exit;
-	}
+if (!defined('QA_VERSION')) { // don't allow this page to be requested directly from browser
+	header('Location: ../');
+	exit;
+}
 
-	require_once QA_INCLUDE_DIR.'db/selects.php';
-	require_once QA_INCLUDE_DIR.'app/messages.php';
+require_once QA_INCLUDE_DIR . 'db/selects.php';
+require_once QA_INCLUDE_DIR . 'app/messages.php';
 
 
 //	Check we're not using single-sign on integration, which doesn't allow walls
 
-	if (QA_FINAL_EXTERNAL_USERS)
-		qa_fatal_error('User accounts are handled by external code');
+if (QA_FINAL_EXTERNAL_USERS)
+	qa_fatal_error('User accounts are handled by external code');
 
 
 //	$handle, $userhtml are already set by qa-page-user.php
 
-	$start = qa_get_start();
+$start = qa_get_start();
 
 
 //	Find the questions for this user
 
-	list($useraccount, $usermessages) = qa_db_select_with_pending(
-		qa_db_user_account_selectspec($handle, false),
-		qa_db_recent_messages_selectspec(null, null, $handle, false, qa_opt_if_loaded('page_size_wall'), $start)
-	);
+list($useraccount, $usermessages) = qa_db_select_with_pending(
+	qa_db_user_account_selectspec($handle, false),
+	qa_db_recent_messages_selectspec(null, null, $handle, false, qa_opt_if_loaded('page_size_wall'), $start)
+);
 
-	if (!is_array($useraccount)) // check the user exists
-		return include QA_INCLUDE_DIR.'qa-page-not-found.php';
+if (!is_array($useraccount)) // check the user exists
+	return include QA_INCLUDE_DIR . 'qa-page-not-found.php';
 
 
 //	Perform pagination
 
-	$pagesize = qa_opt('page_size_wall');
-	$count = $useraccount['wallposts'];
-	$loginuserid = qa_get_logged_in_userid();
+$pagesize = qa_opt('page_size_wall');
+$count = $useraccount['wallposts'];
+$loginuserid = qa_get_logged_in_userid();
 
-	$usermessages = array_slice($usermessages, 0, $pagesize);
-	$usermessages = qa_wall_posts_add_rules($usermessages, $start);
+$usermessages = array_slice($usermessages, 0, $pagesize);
+$usermessages = qa_wall_posts_add_rules($usermessages, $start);
 
 
 //	Process deleting or adding a wall post (similar but not identical code to qq-page-user-profile.php)
 
-	$errors = array();
-
-	$wallposterrorhtml = qa_wall_error_html($loginuserid, $useraccount['userid'], $useraccount['flags']);
+$errors = array();
 
-	foreach ($usermessages as $message) {
-		if ($message['deleteable'] && qa_clicked('m'.$message['messageid'].'_dodelete')) {
-			if (!qa_check_form_security_code('wall-'.$useraccount['handle'], qa_post_text('code')))
-				$errors['page'] = qa_lang_html('misc/form_security_again');
+$wallposterrorhtml = qa_wall_error_html($loginuserid, $useraccount['userid'], $useraccount['flags']);
 
-			else {
-				qa_wall_delete_post($loginuserid, qa_get_logged_in_handle(), qa_cookie_get(), $message);
-				qa_redirect(qa_request(), $_GET);
-			}
+foreach ($usermessages as $message) {
+	if ($message['deleteable'] && qa_clicked('m' . $message['messageid'] . '_dodelete')) {
+		if (!qa_check_form_security_code('wall-' . $useraccount['handle'], qa_post_text('code'))) {
+			$errors['page'] = qa_lang_html('misc/form_security_again');
+		} else {
+			qa_wall_delete_post($loginuserid, qa_get_logged_in_handle(), qa_cookie_get(), $message);
+			qa_redirect(qa_request(), $_GET);
 		}
 	}
-
-	if (qa_clicked('dowallpost')) {
-		$inmessage = qa_post_text('message');
-
-		if (!strlen($inmessage))
-			$errors['message'] = qa_lang('profile/post_wall_empty');
-
-		elseif (!qa_check_form_security_code('wall-'.$useraccount['handle'], qa_post_text('code')))
-			$errors['message'] = qa_lang_html('misc/form_security_again');
-
-		elseif (!$wallposterrorhtml) {
-			qa_wall_add_post($loginuserid, qa_get_logged_in_handle(), qa_cookie_get(), $useraccount['userid'], $useraccount['handle'], $inmessage, '');
-			qa_redirect(qa_request());
-		}
+}
+
+if (qa_clicked('dowallpost')) {
+	$inmessage = qa_post_text('message');
+
+	if (!strlen($inmessage)) {
+		$errors['message'] = qa_lang('profile/post_wall_empty');
+	} elseif (!qa_check_form_security_code('wall-' . $useraccount['handle'], qa_post_text('code'))) {
+		$errors['message'] = qa_lang_html('misc/form_security_again');
+	} elseif (!$wallposterrorhtml) {
+		qa_wall_add_post($loginuserid, qa_get_logged_in_handle(), qa_cookie_get(), $useraccount['userid'], $useraccount['handle'], $inmessage, '');
+		qa_redirect(qa_request());
 	}
+}
 
 
 //	Prepare content for theme
 
-	$qa_content = qa_content_prepare();
+$qa_content = qa_content_prepare();
 
-	$qa_content['title'] = qa_lang_html_sub('profile/wall_for_x', $userhtml);
-	$qa_content['error'] = @$errors['page'];
+$qa_content['title'] = qa_lang_html_sub('profile/wall_for_x', $userhtml);
+$qa_content['error'] = @$errors['page'];
 
-	$qa_content['script_rel'][] = 'qa-content/qa-user.js?'.QA_VERSION;
+$qa_content['script_rel'][] = 'qa-content/qa-user.js?' . QA_VERSION;
 
-	$qa_content['message_list'] = array(
-		'tags' => 'id="wallmessages"',
+$qa_content['message_list'] = array(
+	'tags' => 'id="wallmessages"',
 
-		'form' => array(
-			'tags' => 'name="wallpost" method="post" action="'.qa_self_html().'"',
-			'style' => 'tall',
-			'hidden' => array(
-				'qa_click' => '', // for simulating clicks in Javascript
-				'handle' => qa_html($useraccount['handle']),
-				'start' => qa_html($start),
-				'code' => qa_get_form_security_code('wall-'.$useraccount['handle']),
-			),
+	'form' => array(
+		'tags' => 'name="wallpost" method="post" action="' . qa_self_html() . '"',
+		'style' => 'tall',
+		'hidden' => array(
+			'qa_click' => '', // for simulating clicks in Javascript
+			'handle' => qa_html($useraccount['handle']),
+			'start' => qa_html($start),
+			'code' => qa_get_form_security_code('wall-' . $useraccount['handle']),
 		),
+	),
+
+	'messages' => array(),
+);
+
+if ($start == 0) { // only allow posting on first page
+	if ($wallposterrorhtml) {
+		$qa_content['message_list']['error'] = $wallposterrorhtml; // an error that means we are not allowed to post
+	} else {
+		$qa_content['message_list']['form']['fields'] = array(
+			'message' => array(
+				'tags' => 'name="message" id="message"',
+				'value' => qa_html(@$inmessage, false),
+				'rows' => 2,
+				'error' => qa_html(@$errors['message']),
+			),
+		);
 
-		'messages' => array(),
-	);
-
-	if ($start == 0) { // only allow posting on first page
-		if ($wallposterrorhtml)
-			$qa_content['message_list']['error'] = $wallposterrorhtml; // an error that means we are not allowed to post
-
-		else {
-			$qa_content['message_list']['form']['fields'] = array(
-				'message' => array(
-					'tags' => 'name="message" id="message"',
-					'value' => qa_html(@$inmessage, false),
-					'rows' => 2,
-					'error' => qa_html(@$errors['message']),
-				),
-			);
-
-			$qa_content['message_list']['form']['buttons'] = array(
-				'post' => array(
-					'tags' => 'name="dowallpost" onclick="return qa_submit_wall_post(this, false);"',
-					'label' => qa_lang_html('profile/post_wall_button'),
-				),
-			);
-		}
+		$qa_content['message_list']['form']['buttons'] = array(
+			'post' => array(
+				'tags' => 'name="dowallpost" onclick="return qa_submit_wall_post(this, false);"',
+				'label' => qa_lang_html('profile/post_wall_button'),
+			),
+		);
 	}
+}
 
-	foreach ($usermessages as $message)
-		$qa_content['message_list']['messages'][] = qa_wall_post_view($message);
+foreach ($usermessages as $message) {
+	$qa_content['message_list']['messages'][] = qa_wall_post_view($message);
+}
 
-	$qa_content['page_links'] = qa_html_page_links(qa_request(), $start, $pagesize, $count, qa_opt('pages_prev_next'));
+$qa_content['page_links'] = qa_html_page_links(qa_request(), $start, $pagesize, $count, qa_opt('pages_prev_next'));
 
 
 //	Sub menu for navigation in user pages
 
-	$ismyuser = isset($loginuserid) && $loginuserid == (QA_FINAL_EXTERNAL_USERS ? $userid : $useraccount['userid']);
-	$qa_content['navigation']['sub'] = qa_user_sub_navigation($handle, 'wall', $ismyuser);
+$ismyuser = isset($loginuserid) && $loginuserid == (QA_FINAL_EXTERNAL_USERS ? $userid : $useraccount['userid']);
+$qa_content['navigation']['sub'] = qa_user_sub_navigation($handle, 'wall', $ismyuser);
 
 
-	return $qa_content;
-
-
-/*
-	Omit PHP closing tag to help avoid accidental output
-*/
\ No newline at end of file
+return $qa_content;

qa-include/pages/user.php

@@ -20,71 +20,66 @@
 	More about this license: http://www.question2answer.org/license.php
 */
 
-	if (!defined('QA_VERSION')) { // don't allow this page to be requested directly from browser
-		header('Location: ../');
-		exit;
-	}
+if (!defined('QA_VERSION')) { // don't allow this page to be requested directly from browser
+	header('Location: ../');
+	exit;
+}
 
 
 //	Determine the identify of the user
 
-	$handle = qa_request_part(1);
+$handle = qa_request_part(1);
 
-	if (!strlen($handle)) {
-		$handle = qa_get_logged_in_handle();
-		qa_redirect(!empty($handle) ? 'user/'.$handle : 'users');
-	}
+if (!strlen($handle)) {
+	$handle = qa_get_logged_in_handle();
+	qa_redirect(!empty($handle) ? 'user/' . $handle : 'users');
+}
 
 
 //	Get the HTML to display for the handle, and if we're using external users, determine the userid
 
-	if (QA_FINAL_EXTERNAL_USERS) {
-		$userid = qa_handle_to_userid($handle);
-		if (!isset($userid))
-			return include QA_INCLUDE_DIR.'qa-page-not-found.php';
+if (QA_FINAL_EXTERNAL_USERS) {
+	$userid = qa_handle_to_userid($handle);
+	if (!isset($userid))
+		return include QA_INCLUDE_DIR . 'qa-page-not-found.php';
 
-		$usershtml = qa_get_users_html(array($userid), false, qa_path_to_root(), true);
-		$userhtml = @$usershtml[$userid];
+	$usershtml = qa_get_users_html(array($userid), false, qa_path_to_root(), true);
+	$userhtml = @$usershtml[$userid];
 
-	}
-	else
-		$userhtml = qa_html($handle);
+} else
+	$userhtml = qa_html($handle);
 
 
 //	Display the appropriate page based on the request
 
-	switch (qa_request_part(2)) {
-		case 'wall':
-			qa_set_template('user-wall');
-			$qa_content = include QA_INCLUDE_DIR.'pages/user-wall.php';
-			break;
-
-		case 'activity':
-			qa_set_template('user-activity');
-			$qa_content = include QA_INCLUDE_DIR.'pages/user-activity.php';
-			break;
-
-		case 'questions':
-			qa_set_template('user-questions');
-			$qa_content = include QA_INCLUDE_DIR.'pages/user-questions.php';
-			break;
-
-		case 'answers':
-			qa_set_template('user-answers');
-			$qa_content = include QA_INCLUDE_DIR.'pages/user-answers.php';
-			break;
-
-		case null:
-			$qa_content = include QA_INCLUDE_DIR.'pages/user-profile.php';
-			break;
-
-		default:
-			$qa_content = include QA_INCLUDE_DIR.'qa-page-not-found.php';
-			break;
-	}
-
-	return $qa_content;
-
-/*
-	Omit PHP closing tag to help avoid accidental output
-*/
\ No newline at end of file
+switch (qa_request_part(2)) {
+	case 'wall':
+		qa_set_template('user-wall');
+		$qa_content = include QA_INCLUDE_DIR . 'pages/user-wall.php';
+		break;
+
+	case 'activity':
+		qa_set_template('user-activity');
+		$qa_content = include QA_INCLUDE_DIR . 'pages/user-activity.php';
+		break;
+
+	case 'questions':
+		qa_set_template('user-questions');
+		$qa_content = include QA_INCLUDE_DIR . 'pages/user-questions.php';
+		break;
+
+	case 'answers':
+		qa_set_template('user-answers');
+		$qa_content = include QA_INCLUDE_DIR . 'pages/user-answers.php';
+		break;
+
+	case null:
+		$qa_content = include QA_INCLUDE_DIR . 'pages/user-profile.php';
+		break;
+
+	default:
+		$qa_content = include QA_INCLUDE_DIR . 'qa-page-not-found.php';
+		break;
+}
+
+return $qa_content;

qa-include/pages/users-blocked.php

@@ -20,76 +20,71 @@
 	More about this license: http://www.question2answer.org/license.php
 */
 
-	if (!defined('QA_VERSION')) { // don't allow this page to be requested directly from browser
-		header('Location: ../');
-		exit;
-	}
+if (!defined('QA_VERSION')) { // don't allow this page to be requested directly from browser
+	header('Location: ../');
+	exit;
+}
 
-	require_once QA_INCLUDE_DIR.'db/selects.php';
-	require_once QA_INCLUDE_DIR.'app/users.php';
-	require_once QA_INCLUDE_DIR.'app/format.php';
+require_once QA_INCLUDE_DIR . 'db/selects.php';
+require_once QA_INCLUDE_DIR . 'app/users.php';
+require_once QA_INCLUDE_DIR . 'app/format.php';
 
 
 //	Check we're not using single-sign on integration
 
-	if (QA_FINAL_EXTERNAL_USERS)
-		qa_fatal_error('User accounts are handled by external code');
+if (QA_FINAL_EXTERNAL_USERS)
+	qa_fatal_error('User accounts are handled by external code');
 
 
 //	Get list of blocked users
 
-	$start = qa_get_start();
-	$pagesize = qa_opt('page_size_users');
+$start = qa_get_start();
+$pagesize = qa_opt('page_size_users');
 
-	$userSpecCount = qa_db_selectspec_count( qa_db_users_with_flag_selectspec(QA_USER_FLAGS_USER_BLOCKED) );
-	$userSpec = qa_db_users_with_flag_selectspec(QA_USER_FLAGS_USER_BLOCKED, $start, $pagesize);
+$userSpecCount = qa_db_selectspec_count(qa_db_users_with_flag_selectspec(QA_USER_FLAGS_USER_BLOCKED));
+$userSpec = qa_db_users_with_flag_selectspec(QA_USER_FLAGS_USER_BLOCKED, $start, $pagesize);
 
-	list($numUsers, $users) = qa_db_select_with_pending($userSpecCount, $userSpec);
-	$count = $numUsers['count'];
+list($numUsers, $users) = qa_db_select_with_pending($userSpecCount, $userSpec);
+$count = $numUsers['count'];
 
 
 //	Check we have permission to view this page (moderator or above)
 
-	if (qa_get_logged_in_level() < QA_USER_LEVEL_MODERATOR) {
-		$qa_content = qa_content_prepare();
-		$qa_content['error'] = qa_lang_html('users/no_permission');
-		return $qa_content;
-	}
+if (qa_get_logged_in_level() < QA_USER_LEVEL_MODERATOR) {
+	$qa_content = qa_content_prepare();
+	$qa_content['error'] = qa_lang_html('users/no_permission');
+	return $qa_content;
+}
 
 
 //	Get userids and handles of retrieved users
 
-	$usershtml = qa_userids_handles_html($users);
+$usershtml = qa_userids_handles_html($users);
 
 
 //	Prepare content for theme
 
-	$qa_content = qa_content_prepare();
+$qa_content = qa_content_prepare();
 
-	$qa_content['title'] = $count > 0 ? qa_lang_html('users/blocked_users') : qa_lang_html('users/no_blocked_users');
-
-	$qa_content['ranking'] = array(
-		'items' => array(),
-		'rows' => ceil(count($users)/qa_opt('columns_users')),
-		'type' => 'users'
-	);
+$qa_content['title'] = $count > 0 ? qa_lang_html('users/blocked_users') : qa_lang_html('users/no_blocked_users');
 
-	foreach ($users as $user) {
-		$qa_content['ranking']['items'][] = array(
-			'label' => $usershtml[$user['userid']],
-			'score' => qa_html(qa_user_level_string($user['level'])),
-			'raw' => $user,
-		);
-	}
+$qa_content['ranking'] = array(
+	'items' => array(),
+	'rows' => ceil(count($users) / qa_opt('columns_users')),
+	'type' => 'users'
+);
 
-	$qa_content['page_links'] = qa_html_page_links(qa_request(), $start, $pagesize, $count, qa_opt('pages_prev_next'));
-
-	$qa_content['navigation']['sub'] = qa_users_sub_navigation();
+foreach ($users as $user) {
+	$qa_content['ranking']['items'][] = array(
+		'label' => $usershtml[$user['userid']],
+		'score' => qa_html(qa_user_level_string($user['level'])),
+		'raw' => $user,
+	);
+}
 
+$qa_content['page_links'] = qa_html_page_links(qa_request(), $start, $pagesize, $count, qa_opt('pages_prev_next'));
 
-	return $qa_content;
+$qa_content['navigation']['sub'] = qa_users_sub_navigation();
 
 
-/*
-	Omit PHP closing tag to help avoid accidental output
-*/
\ No newline at end of file
+return $qa_content;

qa-include/pages/users-special.php

@@ -20,67 +20,62 @@
 	More about this license: http://www.question2answer.org/license.php
 */
 
-	if (!defined('QA_VERSION')) { // don't allow this page to be requested directly from browser
-		header('Location: ../');
-		exit;
-	}
+if (!defined('QA_VERSION')) { // don't allow this page to be requested directly from browser
+	header('Location: ../');
+	exit;
+}
 
-	require_once QA_INCLUDE_DIR.'db/selects.php';
-	require_once QA_INCLUDE_DIR.'app/users.php';
-	require_once QA_INCLUDE_DIR.'app/format.php';
+require_once QA_INCLUDE_DIR . 'db/selects.php';
+require_once QA_INCLUDE_DIR . 'app/users.php';
+require_once QA_INCLUDE_DIR . 'app/format.php';
 
 
 //	Check we're not using single-sign on integration
 
-	if (QA_FINAL_EXTERNAL_USERS)
-		qa_fatal_error('User accounts are handled by external code');
+if (QA_FINAL_EXTERNAL_USERS)
+	qa_fatal_error('User accounts are handled by external code');
 
 
 //	Get list of special users
 
-	$users = qa_db_select_with_pending(qa_db_users_from_level_selectspec(QA_USER_LEVEL_EXPERT));
+$users = qa_db_select_with_pending(qa_db_users_from_level_selectspec(QA_USER_LEVEL_EXPERT));
 
 
 //	Check we have permission to view this page (moderator or above)
 
-	if (qa_get_logged_in_level() < QA_USER_LEVEL_MODERATOR) {
-		$qa_content = qa_content_prepare();
-		$qa_content['error'] = qa_lang_html('users/no_permission');
-		return $qa_content;
-	}
+if (qa_get_logged_in_level() < QA_USER_LEVEL_MODERATOR) {
+	$qa_content = qa_content_prepare();
+	$qa_content['error'] = qa_lang_html('users/no_permission');
+	return $qa_content;
+}
 
 
 //	Get userids and handles of retrieved users
 
-	$usershtml = qa_userids_handles_html($users);
+$usershtml = qa_userids_handles_html($users);
 
 
 //	Prepare content for theme
 
-	$qa_content = qa_content_prepare();
+$qa_content = qa_content_prepare();
 
-	$qa_content['title'] = qa_lang_html('users/special_users');
-
-	$qa_content['ranking'] = array(
-		'items' => array(),
-		'rows' => ceil(qa_opt('page_size_users')/qa_opt('columns_users')),
-		'type' => 'users'
-	);
+$qa_content['title'] = qa_lang_html('users/special_users');
 
-	foreach ($users as $user) {
-		$qa_content['ranking']['items'][] = array(
-			'label' => $usershtml[$user['userid']],
-			'score' => qa_html(qa_user_level_string($user['level'])),
-			'raw' => $user,
-		);
-	}
-
-	$qa_content['navigation']['sub'] = qa_users_sub_navigation();
+$qa_content['ranking'] = array(
+	'items' => array(),
+	'rows' => ceil(qa_opt('page_size_users') / qa_opt('columns_users')),
+	'type' => 'users'
+);
 
+foreach ($users as $user) {
+	$qa_content['ranking']['items'][] = array(
+		'label' => $usershtml[$user['userid']],
+		'score' => qa_html(qa_user_level_string($user['level'])),
+		'raw' => $user,
+	);
+}
 
-	return $qa_content;
+$qa_content['navigation']['sub'] = qa_users_sub_navigation();
 
 
-/*
-	Omit PHP closing tag to help avoid accidental output
-*/
\ No newline at end of file
+return $qa_content;

qa-include/pages/users.php

@@ -20,72 +20,67 @@
 	More about this license: http://www.question2answer.org/license.php
 */
 
-	if (!defined('QA_VERSION')) { // don't allow this page to be requested directly from browser
-		header('Location: ../');
-		exit;
-	}
+if (!defined('QA_VERSION')) { // don't allow this page to be requested directly from browser
+	header('Location: ../');
+	exit;
+}
 
-	require_once QA_INCLUDE_DIR.'db/users.php';
-	require_once QA_INCLUDE_DIR.'db/selects.php';
-	require_once QA_INCLUDE_DIR.'app/format.php';
+require_once QA_INCLUDE_DIR . 'db/users.php';
+require_once QA_INCLUDE_DIR . 'db/selects.php';
+require_once QA_INCLUDE_DIR . 'app/format.php';
 
 
 //	Get list of all users
 
-	$start = qa_get_start();
-	$users = qa_db_select_with_pending(qa_db_top_users_selectspec($start, qa_opt_if_loaded('page_size_users')));
+$start = qa_get_start();
+$users = qa_db_select_with_pending(qa_db_top_users_selectspec($start, qa_opt_if_loaded('page_size_users')));
 
-	$usercount = qa_opt('cache_userpointscount');
-	$pagesize = qa_opt('page_size_users');
-	$users = array_slice($users, 0, $pagesize);
-	$usershtml = qa_userids_handles_html($users);
+$usercount = qa_opt('cache_userpointscount');
+$pagesize = qa_opt('page_size_users');
+$users = array_slice($users, 0, $pagesize);
+$usershtml = qa_userids_handles_html($users);
 
 
 //	Prepare content for theme
 
-	$qa_content = qa_content_prepare();
-
-	$qa_content['title'] = qa_lang_html('main/highest_users');
-
-	$qa_content['ranking'] = array(
-		'items' => array(),
-		'rows' => ceil($pagesize/qa_opt('columns_users')),
-		'type' => 'users'
-	);
-
-	if (count($users)) {
-		foreach ($users as $userid => $user) {
-			if (QA_FINAL_EXTERNAL_USERS)
-				$avatarhtml = qa_get_external_avatar_html($user['userid'], qa_opt('avatar_users_size'), true);
-			else {
-				$avatarhtml = qa_get_user_avatar_html($user['flags'], $user['email'], $user['handle'],
-					$user['avatarblobid'], $user['avatarwidth'], $user['avatarheight'], qa_opt('avatar_users_size'), true);
-			}
-
-			// avatar and handle now listed separately for use in themes
-			$qa_content['ranking']['items'][] = array(
-				'avatar' => $avatarhtml,
-				'label' => $usershtml[$user['userid']],
-				'score' => qa_html(qa_format_number($user['points'], 0, true)),
-				'raw' => $user,
-			);
-		}
-	}
-	else
-		$qa_content['title'] = qa_lang_html('main/no_active_users');
+$qa_content = qa_content_prepare();
+
+$qa_content['title'] = qa_lang_html('main/highest_users');
 
+$qa_content['ranking'] = array(
+	'items' => array(),
+	'rows' => ceil($pagesize / qa_opt('columns_users')),
+	'type' => 'users'
+);
 
-	// set the canonical url based on possible pagination
-	$qa_content['canonical'] = qa_path_html(qa_request(), ($start > 0 ? array('start' => $start) : null), qa_opt('site_url'));
+if (count($users)) {
+	foreach ($users as $userid => $user) {
+		if (QA_FINAL_EXTERNAL_USERS)
+			$avatarhtml = qa_get_external_avatar_html($user['userid'], qa_opt('avatar_users_size'), true);
+		else {
+			$avatarhtml = qa_get_user_avatar_html($user['flags'], $user['email'], $user['handle'],
+				$user['avatarblobid'], $user['avatarwidth'], $user['avatarheight'], qa_opt('avatar_users_size'), true);
+		}
+
+		// avatar and handle now listed separately for use in themes
+		$qa_content['ranking']['items'][] = array(
+			'avatar' => $avatarhtml,
+			'label' => $usershtml[$user['userid']],
+			'score' => qa_html(qa_format_number($user['points'], 0, true)),
+			'raw' => $user,
+		);
+	}
+} else {
+	$qa_content['title'] = qa_lang_html('main/no_active_users');
+}
 
-	$qa_content['page_links'] = qa_html_page_links(qa_request(), $start, $pagesize, $usercount, qa_opt('pages_prev_next'));
 
-	$qa_content['navigation']['sub'] = qa_users_sub_navigation();
+// set the canonical url based on possible pagination
+$qa_content['canonical'] = qa_path_html(qa_request(), ($start > 0 ? array('start' => $start) : null), qa_opt('site_url'));
 
+$qa_content['page_links'] = qa_html_page_links(qa_request(), $start, $pagesize, $usercount, qa_opt('pages_prev_next'));
 
-	return $qa_content;
+$qa_content['navigation']['sub'] = qa_users_sub_navigation();
 
 
-/*
-	Omit PHP closing tag to help avoid accidental output
-*/
\ No newline at end of file
+return $qa_content;