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

On permissions, return to user/group/forum selection, 2nd step, instead of 1st step - #27615 - patch by schumi

Browse source 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9444 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen 2009-04-12 13:49:54 +00:00
parent 3a7758da68
commit 4193b22bd9
2 changed files with 18 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
phpBB/adm/style/acp_permissions.html
View file

@ -3,7 +3,7 @@
<a name="maincontent"></a> <a name="maincontent"></a>
<!-- IF S_INTRO --> <!-- IF S_INTRO -->
<h1>{L_ACP_PERMISSIONS}</h1> <h1>{L_ACP_PERMISSIONS}</h1>
{L_ACP_PERMISSIONS_EXPLAIN} {L_ACP_PERMISSIONS_EXPLAIN}
@ -12,10 +12,12 @@
<!-- IF S_SELECT_VICTIM --> <!-- IF S_SELECT_VICTIM -->
<!-- IF U_BACK --><a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a><!-- ENDIF -->
<h1>{L_TITLE}</h1> <h1>{L_TITLE}</h1>
<p>{L_EXPLAIN}</p> <p>{L_EXPLAIN}</p>
<!-- IF S_FORUM_NAMES --> <!-- IF S_FORUM_NAMES -->
<p><strong>{L_FORUMS}:</strong> {FORUM_NAMES}</p> <p><strong>{L_FORUMS}:</strong> {FORUM_NAMES}</p>
<!-- ENDIF --> <!-- ENDIF -->
@ -62,7 +64,7 @@
</fieldset> </fieldset>
</form> </form>
<!-- ENDIF --> <!-- ENDIF -->
<!-- ELSEIF S_SELECT_USER and S_CAN_SELECT_USER --> <!-- ELSEIF S_SELECT_USER and S_CAN_SELECT_USER -->
@ -123,7 +125,7 @@
<!-- IF S_ALLOW_ALL_SELECT --><dd class="full" style="text-align: right;"><label><input type="checkbox" class="radio" name="all_users" value="1" /> {L_ALL_USERS}</label></dd><!-- ENDIF --> <!-- IF S_ALLOW_ALL_SELECT --><dd class="full" style="text-align: right;"><label><input type="checkbox" class="radio" name="all_users" value="1" /> {L_ALL_USERS}</label></dd><!-- ENDIF -->
</dl> </dl>
</fieldset> </fieldset>
<fieldset class="quick"> <fieldset class="quick">
{S_HIDDEN_FIELDS} {S_HIDDEN_FIELDS}
{S_FORM_TOKEN} {S_FORM_TOKEN}
@ -154,7 +156,7 @@
</div> </div>
<div style="float: {S_CONTENT_FLOW_END}; width: 48%"> <div style="float: {S_CONTENT_FLOW_END}; width: 48%">
<!-- IF S_CAN_SELECT_GROUP --> <!-- IF S_CAN_SELECT_GROUP -->
<h1>{L_USERGROUPS}</h1> <h1>{L_USERGROUPS}</h1>
@ -168,7 +170,7 @@
<!-- IF S_ALLOW_ALL_SELECT --><dd class="full" style="text-align: right;"><label><input type="checkbox" class="radio" name="all_groups" value="1" /> {L_ALL_GROUPS}</label></dd><!-- ENDIF --> <!-- IF S_ALLOW_ALL_SELECT --><dd class="full" style="text-align: right;"><label><input type="checkbox" class="radio" name="all_groups" value="1" /> {L_ALL_GROUPS}</label></dd><!-- ENDIF -->
</dl> </dl>
</fieldset> </fieldset>
<fieldset class="quick"> <fieldset class="quick">
{S_HIDDEN_FIELDS} {S_HIDDEN_FIELDS}
{S_FORM_TOKEN} {S_FORM_TOKEN}
@ -177,7 +179,7 @@
</form> </form>
<form id="add_groups" method="post" action="{U_ACTION}"> <form id="add_groups" method="post" action="{U_ACTION}">
<fieldset> <fieldset>
<legend>{L_ADD_GROUPS}</legend> <legend>{L_ADD_GROUPS}</legend>
<dl> <dl>
@ -199,7 +201,7 @@
<!-- ELSEIF S_SELECT_USERGROUP_VIEW --> <!-- ELSEIF S_SELECT_USERGROUP_VIEW -->
<div style="float: {S_CONTENT_FLOW_BEGIN}; width: 48%;"> <div style="float: {S_CONTENT_FLOW_BEGIN}; width: 48%;">
<h1>{L_USERS}</h1> <h1>{L_USERS}</h1>
<form id="users" method="post" action="{U_ACTION}"> <form id="users" method="post" action="{U_ACTION}">
@ -210,7 +212,7 @@
<dd class="full"><select style="width: 100%;" name="user_id[]" multiple="multiple" size="5">{S_DEFINED_USER_OPTIONS}</select></dd> <dd class="full"><select style="width: 100%;" name="user_id[]" multiple="multiple" size="5">{S_DEFINED_USER_OPTIONS}</select></dd>
</dl> </dl>
</fieldset> </fieldset>
<fieldset class="quick"> <fieldset class="quick">
{S_HIDDEN_FIELDS} {S_HIDDEN_FIELDS}
{S_FORM_TOKEN} {S_FORM_TOKEN}
@ -240,7 +242,7 @@
</div> </div>
<div style="float: {S_CONTENT_FLOW_END}; width: 48%"> <div style="float: {S_CONTENT_FLOW_END}; width: 48%">
<h1>{L_USERGROUPS}</h1> <h1>{L_USERGROUPS}</h1>
<form id="groups" method="post" action="{U_ACTION}"> <form id="groups" method="post" action="{U_ACTION}">
@ -251,7 +253,7 @@
<dd class="full"><select style="width: 100%;" name="group_id[]" multiple="multiple" size="5">{S_DEFINED_GROUP_OPTIONS}</select></dd> <dd class="full"><select style="width: 100%;" name="group_id[]" multiple="multiple" size="5">{S_DEFINED_GROUP_OPTIONS}</select></dd>
</dl> </dl>
</fieldset> </fieldset>
<fieldset class="quick"> <fieldset class="quick">
{S_HIDDEN_FIELDS} {S_HIDDEN_FIELDS}
{S_FORM_TOKEN} {S_FORM_TOKEN}
@ -311,11 +313,11 @@
<!-- IF S_PERMISSION_DROPDOWN --> <!-- IF S_PERMISSION_DROPDOWN -->
<form id="pselect" method="post" action="{U_ACTION}"> <form id="pselect" method="post" action="{U_ACTION}">
<fieldset class="quick" style="float: {S_CONTENT_FLOW_BEGIN};"> <fieldset class="quick" style="float: {S_CONTENT_FLOW_BEGIN};">
{S_HIDDEN_FIELDS} {S_HIDDEN_FIELDS}
{S_FORM_TOKEN} {S_FORM_TOKEN}
{L_SELECT_TYPE}: <select name="type">{S_PERMISSION_DROPDOWN}</select> {L_SELECT_TYPE}: <select name="type">{S_PERMISSION_DROPDOWN}</select>
<input class="button2" type="submit" name="submit" value="{L_GO}" /> <input class="button2" type="submit" name="submit" value="{L_GO}" />
</fieldset> </fieldset>
@ -347,7 +349,7 @@
</fieldset> </fieldset>
<br /><br /> <br /><br />
</form> </form>
<!-- ENDIF --> <!-- ENDIF -->

4
phpBB/includes/acp/acp_permissions.php
View file

@ -762,7 +762,7 @@ class acp_permissions
$this->log_action($mode, 'add', $permission_type, $ug_type, $ug_ids, $forum_ids); $this->log_action($mode, 'add', $permission_type, $ug_type, $ug_ids, $forum_ids);
trigger_error($user->lang['AUTH_UPDATED'] . adm_back_link($this->u_action)); trigger_error($user->lang['AUTH_UPDATED'] . adm_back_link($this->u_action . '&amp;forum_id[]=' . implode('&amp;forum_id[]=', $forum_ids)));
} }
/** /**
@ -829,7 +829,7 @@ class acp_permissions
$this->log_action($mode, 'del', $permission_type, $ug_type, (($ug_type == 'user') ? $user_id : $group_id), (sizeof($forum_id) ? $forum_id : array(0 => 0))); $this->log_action($mode, 'del', $permission_type, $ug_type, (($ug_type == 'user') ? $user_id : $group_id), (sizeof($forum_id) ? $forum_id : array(0 => 0)));
trigger_error($user->lang['AUTH_UPDATED'] . adm_back_link($this->u_action)); trigger_error($user->lang['AUTH_UPDATED'] . adm_back_link($this->u_action . '&amp;forum_id[]=' . implode('&amp;forum_id[]=', $forum_id)));
} }
/** /**