1
0
mirror of https://github.com/e107inc/e107.git synced 2025-08-02 20:57:26 +02:00

admin user and usersettings GUI fixes.

This commit is contained in:
Cameron
2012-11-28 12:13:10 -08:00
parent cbc6a07747
commit b261320e76
2 changed files with 74 additions and 2 deletions

View File

@@ -433,14 +433,14 @@ if (isset ($_POST['useraction']) && $_POST['useraction'] == "reqverify")
} }
if (isset ($_POST['useraction']) && $_POST['useraction'] == "ban") if (isset ($_POST['useraction']) && $_POST['useraction'] == "ban")
{ {
e107::getMessage()->addError('FIXME, I\'m not working... Use "batch" instead'); e107::getMessage()->addError('FIXME, I\'m not working... Use "batch" instead');
//$user->user_ban($_POST['userid']); //$user->user_ban($_POST['userid']);
} }
// ------- Unban User -------------- // ------- Unban User --------------
if (isset ($_POST['useraction']) && $_POST['useraction'] == "unban") if (isset ($_POST['useraction']) && $_POST['useraction'] == "unban")
{ {
e107::getMessage()->addError('FIXME, I\'m not working...Use "batch" instead'); e107::getMessage()->addError('FIXME, I\'m not working...Use "batch" instead');
//$user->user_unban($_POST['userid']); //$user->user_unban($_POST['userid']);
} }

View File

@@ -112,6 +112,72 @@ if(is_numeric(e_QUERY))
} }
if($adminEdit) // try to stay in Admin when admin is editing. 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"); include_lan(e_LANGUAGEDIR.e_LANGUAGE."/admin/lan_admin.php");
require_once (e_ADMIN."auth.php"); require_once (e_ADMIN."auth.php");
} }
@@ -553,6 +619,12 @@ if ($dataToSave && !$promptPassword)
header('Location: index.php'); header('Location: index.php');
} }
if($adminEdit && $message)
{
$mes->addSuccess($message);
}
if(isset($USERSETTINGS_MESSAGE)) if(isset($USERSETTINGS_MESSAGE))
{ {
$message = str_replace("{MESSAGE}",$message,$USERSETTINGS_MESSAGE); $message = str_replace("{MESSAGE}",$message,$USERSETTINGS_MESSAGE);