diff --git a/phpBB/admin/admin_groupauth.php b/phpBB/admin/admin_groupauth.php
index d17d5b375c..32e235e1a6 100644
--- a/phpBB/admin/admin_groupauth.php
+++ b/phpBB/admin/admin_groupauth.php
@@ -698,11 +698,11 @@ else
}
else if( $allowed )
{
- $optionlist_acl .= "";
+ $optionlist_acl .= "";
}
else
{
- $optionlist_acl .= "";
+ $optionlist_acl .= "";
}
$optionlist_acl .= "";
@@ -731,11 +731,11 @@ else
{
if(!$auth_field_acl[$forum_id][$field_name])
{
- $optionlist_acl_adv[$forum_id][$j] .= "";
+ $optionlist_acl_adv[$forum_id][$j] .= "";
}
else
{
- $optionlist_acl_adv[$forum_id][$j] .= "";
+ $optionlist_acl_adv[$forum_id][$j] .= "";
}
}
else
@@ -746,7 +746,7 @@ else
}
else
{
- $optionlist_acl_adv[$forum_id][$j] .= "";
+ $optionlist_acl_adv[$forum_id][$j] .= "";
}
}
@@ -760,11 +760,11 @@ else
$optionlist_mod = "";
@@ -827,7 +827,6 @@ else
}
$s_hidden_fields = "";
- $s_hidden_fields .= "";
$s_column_span = 2; // Two columns always present
if(!$adv)
diff --git a/phpBB/admin/admin_userauth.php b/phpBB/admin/admin_userauth.php
index b83790033f..f382a3e765 100644
--- a/phpBB/admin/admin_userauth.php
+++ b/phpBB/admin/admin_userauth.php
@@ -30,10 +30,26 @@ if($setmodules == 1)
return;
}
+$phpbb_root_path = "./../";
+include($phpbb_root_path . 'extension.inc');
+include($phpbb_root_path . 'common.'.$phpEx);
+
//
-// Include required files, get $phpEx and check permissions
+// Start session management
//
-require('pagestart.inc');
+$userdata = session_pagestart($user_ip, PAGE_INDEX, $session_length);
+init_userprefs($userdata);
+//
+// End session management
+//
+if( !$userdata['session_logged_in'] )
+{
+ header("Location: ../login.$phpEx?forward_page=admin/");
+}
+else if( $userdata['user_level'] != ADMIN )
+{
+ message_die(GENERAL_MESSAGE, $lang['Not_admin']);
+}
//
// Start program - define vars
@@ -106,7 +122,6 @@ function a_auth_check_user($type, $key, $u_auth, $is_admin)
//
//
//
-
if(isset($HTTP_POST_VARS['submit']) && !empty($HTTP_POST_VARS[POST_USERS_URL]))
{
$user_id = $HTTP_POST_VARS[POST_USERS_URL];
@@ -545,6 +560,8 @@ if(isset($HTTP_POST_VARS['submit']) && !empty($HTTP_POST_VARS[POST_USERS_URL]))
{
$warning_list = "
" . $lang['Conflict_message_userauth'] . "
" . $warning_list . "
" . $lang['Click'] . " " . $lang['HERE'] . " ". $lang['return_user_auth_admin'] . "
";
+ include('page_header_admin.'.$phpEx);
+
$template->set_filenames(array(
"body" => "admin/admin_message_body.tpl")
);
@@ -559,7 +576,6 @@ if(isset($HTTP_POST_VARS['submit']) && !empty($HTTP_POST_VARS[POST_USERS_URL]))
header("Location: " . append_sid("admin_userauth.$phpEx?" . POST_USERS_URL . "=$user_id"));
}
}
-
}
else if(empty($HTTP_GET_VARS[POST_USERS_URL]))
{
@@ -582,6 +598,8 @@ else if(empty($HTTP_GET_VARS[POST_USERS_URL]))
}
$select_list .= "";
+ include('page_header_admin.'.$phpEx);
+
$template->set_filenames(array(
"body" => "admin/auth_select_body.tpl")
);
@@ -612,6 +630,9 @@ else
$adv = FALSE;
}
+ $template_header = "admin/page_header.tpl";
+ include('page_header_admin.'.$phpEx);
+
$template->set_filenames(array(
"body" => "admin/auth_ug_body.tpl")
);
@@ -766,11 +787,11 @@ else
}
else if($allowed)
{
- $optionlist_acl .= "";
+ $optionlist_acl .= "";
}
else
{
- $optionlist_acl .= "";
+ $optionlist_acl .= "";
}
$optionlist_acl .= "";
@@ -803,7 +824,7 @@ else
}
else
{
- $optionlist_acl_adv[$forum_id][$j] .= "";
+ $optionlist_acl_adv[$forum_id][$j] .= "";
}
}
else
@@ -814,7 +835,7 @@ else
}
else
{
- $optionlist_acl_adv[$forum_id][$j] .= "";
+ $optionlist_acl_adv[$forum_id][$j] .= "";
}
}
@@ -828,11 +849,11 @@ else
$optionlist_mod = "";
@@ -867,10 +888,10 @@ else
$i++;
}
- reset($auth_user);
+ @reset($auth_user);
$t_username .= $userinf[0]['username'];
- $s_user_type = ($is_admin) ? '' : '';
+ $s_user_type = ($is_admin) ? '' : '';
for($i = 0; $i < count($userinf); $i++)
{
@@ -956,4 +977,4 @@ $template->pparse("body");
include('page_footer_admin.'.$phpEx);
-?>
+?>
\ No newline at end of file
diff --git a/phpBB/templates/PSO/admin/auth_ug_body.tpl b/phpBB/templates/PSO/admin/auth_ug_body.tpl
index 6593b44093..5e1741f398 100644
--- a/phpBB/templates/PSO/admin/auth_ug_body.tpl
+++ b/phpBB/templates/PSO/admin/auth_ug_body.tpl
@@ -5,6 +5,8 @@
{L_USER_OR_GROUPNAME}: {USERNAME}
+
-
-
-
+
+