aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--admin/user_modify.php32
-rw-r--r--template/default/admin/user_modify.vtp4
2 files changed, 23 insertions, 13 deletions
diff --git a/admin/user_modify.php b/admin/user_modify.php
index 69104704e..92ea7188f 100644
--- a/admin/user_modify.php
+++ b/admin/user_modify.php
@@ -137,22 +137,28 @@ if ( $display_form )
$page['mail_address'] = $_POST['mail_address'];
}
$vtp->setVar( $sub, 'form.user:mail_address', $page['mail_address'] );
- if ( isset( $_POST['status'] ) )
+ // change status only if the user is not the webmaster
+ if ( $page['username'] != $conf['webmaster'] )
{
- $page['status'] = $_POST['status'];
- }
- $option = get_enums( PREFIX_TABLE.'users', 'status' );
- for ( $i = 0; $i < sizeof( $option ); $i++ )
- {
- $vtp->addSession( $sub, 'status_option' );
- $vtp->setVar( $sub, 'status_option.value', $option[$i] );
- $vtp->setVar( $sub, 'status_option.option',
- $lang['adduser_status_'.$option[$i]] );
- if( $option[$i] == $page['status'] )
+ $vtp->addSession( $sub, 'status' );
+ if ( isset( $_POST['status'] ) )
+ {
+ $page['status'] = $_POST['status'];
+ }
+ $option = get_enums( PREFIX_TABLE.'users', 'status' );
+ for ( $i = 0; $i < sizeof( $option ); $i++ )
{
- $vtp->setVar( $sub, 'status_option.selected', ' selected="selected"' );
+ $vtp->addSession( $sub, 'status_option' );
+ $vtp->setVar( $sub, 'status_option.value', $option[$i] );
+ $vtp->setVar( $sub, 'status_option.option',
+ $lang['adduser_status_'.$option[$i]] );
+ if( $option[$i] == $page['status'] )
+ {
+ $vtp->setVar( $sub, 'status_option.selected', ' selected="selected"' );
+ }
+ $vtp->closeSession( $sub, 'status_option' );
}
- $vtp->closeSession( $sub, 'status_option' );
+ $vtp->closeSession( $sub, 'status' );
}
// groups linked with this user
$query = 'SELECT id,name';
diff --git a/template/default/admin/user_modify.vtp b/template/default/admin/user_modify.vtp
index 49d2f1358..475a0eff3 100644
--- a/template/default/admin/user_modify.vtp
+++ b/template/default/admin/user_modify.vtp
@@ -40,6 +40,8 @@
<td>{#mail_address}</td>
<td><input type="text" name="mail_address" value="{#user:mail_address}" /></td>
</tr>
+
+ <!--VTP_status-->
<tr>
<td>{#adduser_status}</td>
<td>
@@ -50,6 +52,8 @@
</select>
</td>
</tr>
+ <!--/VTP_status-->
+
<!--VTP_groups-->
<tr>
<td valign="top">{#menu_groups}</td>