makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-29 06:38:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Problems with pagestart removed, some minor mods

Browse source 
git-svn-id: file:///svn/phpbb/trunk@842 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Paul S. Owen 2001-08-12 23:01:09 +00:00
parent 7ff7b65a79
commit 902d5c63ed
3 changed files with 47 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
phpBB/admin/admin_groupauth.php
View file

@ -698,11 +698,11 @@ else
} }
else if( $allowed ) else if( $allowed )
{ {
$optionlist_acl .= "<option value=\"1\" selected>" . $lang['Allowed_Access'] . "</option><option value=\"0\">". $lang['Disallowed_Access'] . "</option>"; $optionlist_acl .= "<option value=\"1\" selected=\"selected\">" . $lang['Allowed_Access'] . "</option><option value=\"0\">". $lang['Disallowed_Access'] . "</option>";
} }
else else
{ {
$optionlist_acl .= "<option value=\"1\">" . $lang['Allowed_Access'] . "</option><option value=\"0\" selected>". $lang['Disallowed_Access'] . "</option>"; $optionlist_acl .= "<option value=\"1\">" . $lang['Allowed_Access'] . "</option><option value=\"0\" selected=\"selected\">". $lang['Disallowed_Access'] . "</option>";
} }
$optionlist_acl .= "</select>"; $optionlist_acl .= "</select>";
@ -731,11 +731,11 @@ else
{ {
if(!$auth_field_acl[$forum_id][$field_name]) if(!$auth_field_acl[$forum_id][$field_name])
{ {
$optionlist_acl_adv[$forum_id][$j] .= "<option value=\"1\">" . $lang['ON'] . "</option><option value=\"0\" selected>" . $lang['OFF'] . "</option>"; $optionlist_acl_adv[$forum_id][$j] .= "<option value=\"1\">" . $lang['ON'] . "</option><option value=\"0\" selected=\"selected\">" . $lang['OFF'] . "</option>";
} }
else else
{ {
$optionlist_acl_adv[$forum_id][$j] .= "<option value=\"1\" selected>" . $lang['ON'] . "</option><option value=\"0\">" . $lang['OFF'] . "</option>"; $optionlist_acl_adv[$forum_id][$j] .= "<option value=\"1\" selected=\"selected\">" . $lang['ON'] . "</option><option value=\"0\">" . $lang['OFF'] . "</option>";
} }
} }
else else
@ -746,7 +746,7 @@ else
} }
else else
{ {
$optionlist_acl_adv[$forum_id][$j] .= "<option value=\"1\">" . $lang['ON'] . "</option><option value=\"0\" selected>" . $lang['OFF'] . "</option>"; $optionlist_acl_adv[$forum_id][$j] .= "<option value=\"1\">" . $lang['ON'] . "</option><option value=\"0\" selected=\"selected\">" . $lang['OFF'] . "</option>";
} }
} }
@ -760,11 +760,11 @@ else
$optionlist_mod = "<select name=\"moderator[$forumkey]\">"; $optionlist_mod = "<select name=\"moderator[$forumkey]\">";
if($group_ary['auth_mod']) if($group_ary['auth_mod'])
{ {
$optionlist_mod .= "<option value=\"1\" selected>" . $lang['Is_Moderator'] . "</option><option value=\"0\">" . $lang['Not_Moderator'] . "</option>"; $optionlist_mod .= "<option value=\"1\" selected=\"selected\">" . $lang['Is_Moderator'] . "</option><option value=\"0\">" . $lang['Not_Moderator'] . "</option>";
} }
else else
{ {
$optionlist_mod .= "<option value=\"1\">" . $lang['Is_Moderator'] . "</option><option value=\"0\" selected>" . $lang['Not_Moderator'] . "</option>"; $optionlist_mod .= "<option value=\"1\">" . $lang['Is_Moderator'] . "</option><option value=\"0\" selected=\"selected\">" . $lang['Not_Moderator'] . "</option>";
} }
$optionlist_mod .= "</select>"; $optionlist_mod .= "</select>";
@ -827,7 +827,6 @@ else
} }
$s_hidden_fields = "<input type=\"hidden\" name=\"" . POST_GROUPS_URL . "\" value=\"$group_id\">"; $s_hidden_fields = "<input type=\"hidden\" name=\"" . POST_GROUPS_URL . "\" value=\"$group_id\">";
$s_hidden_fields .= "<input type=\"hidden\" name=\"curadmin\" value=\"" . $is_admin ."\">";
$s_column_span = 2; // Two columns always present $s_column_span = 2; // Two columns always present
if(!$adv) if(!$adv)

45
phpBB/admin/admin_userauth.php
View file

@ -30,10 +30,26 @@ if($setmodules == 1)
return; 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 // 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])) if(isset($HTTP_POST_VARS['submit']) && !empty($HTTP_POST_VARS[POST_USERS_URL]))
{ {
$user_id = $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 = "<br />" . $lang['Conflict_message_userauth'] . "<br/><br/>" . $warning_list . "<br />" . $lang['Click'] . " <a href=\"admin_userauth.$phpEx?" . POST_USERS_URL . "=$user_id\">" . $lang['HERE'] . "</a> ". $lang['return_user_auth_admin'] . "<br />"; $warning_list = "<br />" . $lang['Conflict_message_userauth'] . "<br/><br/>" . $warning_list . "<br />" . $lang['Click'] . " <a href=\"admin_userauth.$phpEx?" . POST_USERS_URL . "=$user_id\">" . $lang['HERE'] . "</a> ". $lang['return_user_auth_admin'] . "<br />";
include('page_header_admin.'.$phpEx);
$template->set_filenames(array( $template->set_filenames(array(
"body" => "admin/admin_message_body.tpl") "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")); header("Location: " . append_sid("admin_userauth.$phpEx?" . POST_USERS_URL . "=$user_id"));
} }
} }
} }
else if(empty($HTTP_GET_VARS[POST_USERS_URL])) else if(empty($HTTP_GET_VARS[POST_USERS_URL]))
{ {
@ -582,6 +598,8 @@ else if(empty($HTTP_GET_VARS[POST_USERS_URL]))
} }
$select_list .= "</select>"; $select_list .= "</select>";
include('page_header_admin.'.$phpEx);
$template->set_filenames(array( $template->set_filenames(array(
"body" => "admin/auth_select_body.tpl") "body" => "admin/auth_select_body.tpl")
); );
@ -612,6 +630,9 @@ else
$adv = FALSE; $adv = FALSE;
} }
$template_header = "admin/page_header.tpl";
include('page_header_admin.'.$phpEx);
$template->set_filenames(array( $template->set_filenames(array(
"body" => "admin/auth_ug_body.tpl") "body" => "admin/auth_ug_body.tpl")
); );
@ -766,11 +787,11 @@ else
} }
else if($allowed) else if($allowed)
{ {
$optionlist_acl .= "<option value=\"1\" selected=\"selected\">" . $lang['Allowed_Access'] . "</option><option value=\"0\">". $lang['Disallowed_Access'] . "</option>"; $optionlist_acl .= "<option value=\"1\" selected=\"selected\">" . $lang['Allowed_Access'] . "</option><option value=\"0\">". $lang['Disallowed_Access'] . "</option>";
} }
else else
{ {
$optionlist_acl .= "<option value=\"1\">" . $lang['Allowed_Access'] . "</option><option value=\"0\" selected=\"selected\">". $lang['Disallowed_Access'] . "</option>"; $optionlist_acl .= "<option value=\"1\">" . $lang['Allowed_Access'] . "</option><option value=\"0\" selected=\"selected\">". $lang['Disallowed_Access'] . "</option>";
} }
$optionlist_acl .= "</select>"; $optionlist_acl .= "</select>";
@ -803,7 +824,7 @@ else
} }
else else
{ {
$optionlist_acl_adv[$forum_id][$j] .= "<option value=\"1\" selected=\"selected\">" . $lang['ON'] . "</option><option value=\"0\">" . $lang['OFF'] . "</option>"; $optionlist_acl_adv[$forum_id][$j] .= "<option value=\"1\" selected=\"selected\">" . $lang['ON'] . "</option><option value=\"0\">" . $lang['OFF'] . "</option>";
} }
} }
else else
@ -814,7 +835,7 @@ else
} }
else else
{ {
$optionlist_acl_adv[$forum_id][$j] .= "<option value=\"1\">" . $lang['ON'] . "</option><option value=\"0\" selected=\"selected\">" . $lang['OFF'] . "</option>"; $optionlist_acl_adv[$forum_id][$j] .= "<option value=\"1\">" . $lang['ON'] . "</option><option value=\"0\" selected=\"selected\">" . $lang['OFF'] . "</option>";
} }
} }
@ -828,11 +849,11 @@ else
$optionlist_mod = "<select name=\"moderator[$forumkey]\">"; $optionlist_mod = "<select name=\"moderator[$forumkey]\">";
if($user_ary['auth_mod']) if($user_ary['auth_mod'])
{ {
$optionlist_mod .= "<option value=\"1\" selected=\"selected\">" . $lang['Is_Moderator'] . "</option><option value=\"0\">" . $lang['Not_Moderator'] . "</option>"; $optionlist_mod .= "<option value=\"1\" selected=\"selected\">" . $lang['Is_Moderator'] . "</option><option value=\"0\">" . $lang['Not_Moderator'] . "</option>";
} }
else else
{ {
$optionlist_mod .= "<option value=\"1\">" . $lang['Is_Moderator'] . "</option><option value=\"0\" selected=\"selected\">" . $lang['Not_Moderator'] . "</option>"; $optionlist_mod .= "<option value=\"1\">" . $lang['Is_Moderator'] . "</option><option value=\"0\" selected=\"selected\">" . $lang['Not_Moderator'] . "</option>";
} }
$optionlist_mod .= "</select>"; $optionlist_mod .= "</select>";
@ -867,10 +888,10 @@ else
$i++; $i++;
} }
reset($auth_user); @reset($auth_user);
$t_username .= $userinf[0]['username']; $t_username .= $userinf[0]['username'];
$s_user_type = ($is_admin) ? '<select name="userlevel"><option value="admin" selected=\"selected\">' . $lang['Administrator'] . '</option><option value="user">' . $lang['User'] . '</option></select>' : '<select name="userlevel"><option value="admin">' . $lang['Administrator'] . '</option><option value="user" selected=\"selected\">' . $lang['User'] . '</option></select>'; $s_user_type = ($is_admin) ? '<select name="userlevel"><option value="admin" selected=\"selected\">' . $lang['Administrator'] . '</option><option value="user">' . $lang['User'] . '</option></select>' : '<select name="userlevel"><option value="admin">' . $lang['Administrator'] . '</option><option value="user" selected=\"selected\">' . $lang['User'] . '</option></select>';
for($i = 0; $i < count($userinf); $i++) for($i = 0; $i < count($userinf); $i++)
{ {

12
phpBB/templates/PSO/admin/auth_ug_body.tpl
View file

@ -5,6 +5,8 @@
<h2>{L_USER_OR_GROUPNAME}: {USERNAME}</h2> <h2>{L_USER_OR_GROUPNAME}: {USERNAME}</h2>
<form method="post" action="{S_AUTH_ACTION}">
<p>{USER_GROUP_MEMBERSHIPS}</p> <p>{USER_GROUP_MEMBERSHIPS}</p>
<h2>{L_PERMISSIONS}</h2> <h2>{L_PERMISSIONS}</h2>
@ -12,7 +14,7 @@
<p>{L_AUTH_EXPLAIN}</p> <p>{L_AUTH_EXPLAIN}</p>
<table cellspacing="1" cellpadding="4" border="0" align="center"> <table cellspacing="1" cellpadding="4" border="0" align="center">
<tr><form method="post" action="{S_AUTH_ACTION}"> <tr>
<th width="30%">{L_FORUM}</th> <th width="30%">{L_FORUM}</th>
<!-- BEGIN acltype --> <!-- BEGIN acltype -->
<th>{acltype.L_UG_ACL_TYPE}</th> <th>{acltype.L_UG_ACL_TYPE}</th>
@ -34,10 +36,8 @@
<td align="center"><span class="gensmall">{U_SWITCH_MODE}</span></td> <td align="center"><span class="gensmall">{U_SWITCH_MODE}</span></td>
</tr> </tr>
<tr> <tr>
<td align="center">{S_HIDDEN_FIELDS}<input type="submit" name="submit" value="{L_SUBMIT_CHANGES}">&nbsp;&nbsp;<input type="reset" value="{L_RESET_CHANGES}"></td> <td align="center">{S_HIDDEN_FIELDS}<input type="submit" name="submit" value="{L_SUBMIT_CHANGES}" />&nbsp;&nbsp;<input type="reset" value="{L_RESET_CHANGES}" /></td>
</tr> </tr>
</table></td> </table></td>
</form></tr> </tr>
</table> </table></form>
<br clear="all" />