From b261320e76c178a392aead7208b06f0719a78c9b Mon Sep 17 00:00:00 2001
From: Cameron <cameron@e107coders.org>
Date: Wed, 28 Nov 2012 12:13:10 -0800
Subject: [PATCH] admin user and usersettings GUI fixes.

---
 e107_admin/users.php |  4 +--
 usersettings.php     | 72 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 74 insertions(+), 2 deletions(-)

diff --git a/e107_admin/users.php b/e107_admin/users.php
index 067f00fc0..280a6aeae 100644
--- a/e107_admin/users.php
+++ b/e107_admin/users.php
@@ -433,14 +433,14 @@ if (isset ($_POST['useraction']) && $_POST['useraction'] == "reqverify")
 
 if (isset ($_POST['useraction']) && $_POST['useraction'] == "ban")
 {
-	e107::getMessage()->addError('FIXME, I\'m not working...');
+	e107::getMessage()->addError('FIXME, I\'m not working... Use "batch" instead');
 	//$user->user_ban($_POST['userid']);
 }
 
 // ------- Unban User --------------
 if (isset ($_POST['useraction']) && $_POST['useraction'] == "unban")
 {
-	e107::getMessage()->addError('FIXME, I\'m not working...');
+	e107::getMessage()->addError('FIXME, I\'m not working...Use "batch" instead');
 	//$user->user_unban($_POST['userid']);
 }
 
diff --git a/usersettings.php b/usersettings.php
index 3960b7cdb..de9cd6f16 100644
--- a/usersettings.php
+++ b/usersettings.php
@@ -112,6 +112,72 @@ if(is_numeric(e_QUERY))
 }
 if($adminEdit) // try to stay in Admin when admin is editing.
 {
+	$mes = e107::getMessage();
+	$ADMIN_USERSETTINGS_EDIT =  $mes->render(). "
+	<table class='table adminform'>
+    	<colgroup span='2'>
+    		<col class='col-label' />
+    		<col class='col-control' />
+    	</colgroup>
+
+	{USERNAME}
+	{LOGINNAME}
+
+	<tr>
+	<td>".LAN_USER_60.req(!$pref['disable_emailcheck'])."</td>
+	<td>
+	{EMAIL}
+	</td>
+	</tr>
+
+	<tr>
+	<td>".LAN_USER_63.req($pref['signup_option_realname'])."</td>
+	<td>
+	{REALNAME}
+	</td>
+	</tr>
+
+	{CUSTOMTITLE}
+
+	{PASSWORD1}
+	{PASSWORD_LEN}
+	{PASSWORD2}
+
+
+	<tr>
+	<td>".LAN_USER_83."</td>
+	<td><span class='defaulttext'>
+	{HIDEEMAIL=radio}
+	</span>
+	</td>
+	</tr>
+	
+	<tr>
+	<td>".LAN_USER_07.req($pref['signup_option_image'])."</td>
+	<td>
+	{AVATAR_REMOTE}
+	</td>
+	</tr>
+
+	{AVATAR_UPLOAD}
+	{PHOTO_UPLOAD}
+
+	{USERCLASSES}
+	{USEREXTENDED_ALL}
+
+	
+	{SIGNATURE=cols=58&rows=4}	
+	{SIGNATURE_HELP}
+	</tr>
+	</table>
+	<div class='buttons-bar center'>
+	".e107::getForm()->admin_button('updatesettings',LAN_UPDATE,'update')."
+	</div>
+	
+	";
+	
+	
+	$USERSETTINGS_EDIT = $ADMIN_USERSETTINGS_EDIT;
 	include_lan(e_LANGUAGEDIR.e_LANGUAGE."/admin/lan_admin.php");
 	require_once (e_ADMIN."auth.php");
 }
@@ -553,6 +619,12 @@ if ($dataToSave && !$promptPassword)
 		header('Location: index.php');
 	}
 	
+	if($adminEdit && $message)
+	{
+		$mes->addSuccess($message);		
+	}
+	
+	
 	if(isset($USERSETTINGS_MESSAGE))
 	{
 		$message = str_replace("{MESSAGE}",$message,$USERSETTINGS_MESSAGE);