aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/acp/acp_users.php
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2006-06-16 16:54:51 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2006-06-16 16:54:51 +0000
commitb0c3e3958220c04cbb4f25f0c24b53b65a34e360 (patch)
tree6c23cb4352a297b4dade2b3a1aa6706b89a53c82 /phpBB/includes/acp/acp_users.php
parenta3c9182e0f9efeb193f5ef682d1945382f234eb3 (diff)
downloadforums-b0c3e3958220c04cbb4f25f0c24b53b65a34e360.tar
forums-b0c3e3958220c04cbb4f25f0c24b53b65a34e360.tar.gz
forums-b0c3e3958220c04cbb4f25f0c24b53b65a34e360.tar.bz2
forums-b0c3e3958220c04cbb4f25f0c24b53b65a34e360.tar.xz
forums-b0c3e3958220c04cbb4f25f0c24b53b65a34e360.zip
- removed db cache (might re-appear, but for now we do not see the need for it)
- all changes to styles/subsilver/template are purely cosmetic (no functional changes) - cosmetics - bugfixes - add index to modules table - use modules ordering code for forums too git-svn-id: file:///svn/phpbb/trunk@6073 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/acp/acp_users.php')
-rw-r--r--phpBB/includes/acp/acp_users.php16
1 files changed, 11 insertions, 5 deletions
diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php
index 0448b7e568..a30078d7bf 100644
--- a/phpBB/includes/acp/acp_users.php
+++ b/phpBB/includes/acp/acp_users.php
@@ -31,7 +31,7 @@ class acp_users
$username = request_var('username', '', true);
$user_id = request_var('u', 0);
$action = request_var('action', '');
-
+
$submit = (isset($_POST['update'])) ? true : false;
// Whois (special case)
@@ -57,7 +57,7 @@ class acp_users
return;
}
-
+
// Show user selection mask
if (!$username && !$user_id)
{
@@ -130,6 +130,12 @@ class acp_users
'S_FORM_OPTIONS' => $s_form_options)
);
+ // Prevent normal users/admins change/view founders if they are not a founder by themselves
+ if ($user->data['user_type'] != USER_FOUNDER && $user_row['user_type'] == USER_FOUNDER)
+ {
+ trigger_error($user->lang['NOT_MANAGE_FOUNDER'] . adm_back_link($this->u_action));
+ }
+
switch ($mode)
{
case 'overview':
@@ -1502,9 +1508,9 @@ class acp_users
'SIGNATURE' => $signature,
'SIGNATURE_PREVIEW' => $signature_preview,
- 'S_BBCODE_CHECKED' => (!$enable_bbcode) ? 'checked="checked"' : '',
- 'S_SMILIES_CHECKED' => (!$enable_smilies) ? 'checked="checked"' : '',
- 'S_MAGIC_URL_CHECKED' => (!$enable_urls) ? 'checked="checked"' : '',
+ 'S_BBCODE_CHECKED' => (!$enable_bbcode) ? 'checked="checked"' : '',
+ 'S_SMILIES_CHECKED' => (!$enable_smilies) ? 'checked="checked"' : '',
+ 'S_MAGIC_URL_CHECKED' => (!$enable_urls) ? 'checked="checked"' : '',
'BBCODE_STATUS' => ($config['allow_sig_bbcode']) ? sprintf($user->lang['BBCODE_IS_ON'], '<a href="' . append_sid("{$phpbb_root_path}faq.$phpEx", 'mode=bbcode') . '" onclick="target=\'_phpbbcode\';">', '</a>') : sprintf($user->lang['BBCODE_IS_OFF'], '<a href="' . append_sid("{$phpbb_root_path}faq.$phpEx", 'mode=bbcode') . '" onclick="target=\'_phpbbcode\';">', '</a>'),
'SMILIES_STATUS' => ($config['allow_sig_smilies']) ? $user->lang['SMILIES_ARE_ON'] : $user->lang['SMILIES_ARE_OFF'],