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

Fix #51305 - User need a_clearlog to delete warnings

Browse source 
Authorised by: AcydBurn

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10145 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Joas Schilling 2009-09-15 09:45:05 +00:00
parent ffbe4e3b82
commit b4c7dbcd66
2 changed files with 8 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
phpBB/adm/style/acp_users_warnings.html
View file

@ -7,17 +7,16 @@
<th>{L_REPORT_BY}</th> <th>{L_REPORT_BY}</th>
<th>{L_TIME}</th> <th>{L_TIME}</th>
<th>{L_FEEDBACK}</th> <th>{L_FEEDBACK}</th>
<!-- IF S_CLEARLOGS --><th>{L_MARK}</th><!-- ENDIF --> <th>{L_MARK}</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<!-- BEGIN warn --> <!-- BEGIN warn -->
<!-- IF warn.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF --> <!-- IF warn.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
<td>{warn.USERNAME}</td> <td>{warn.USERNAME}</td>
<td style="text-align: center; nowrap: nowrap;">{warn.DATE}</td> <td style="text-align: center; nowrap: nowrap;">{warn.DATE}</td>
<td>{warn.ACTION}</td> <td>{warn.ACTION}</td>
<!-- IF S_CLEARLOGS --><td style="text-align: center;"><input type="checkbox" class="radio" name="mark[]" value="{warn.ID}" /></td><!-- ENDIF --> <td style="text-align: center;"><input type="checkbox" class="radio" name="mark[]" value="{warn.ID}" /></td>
</tr> </tr>
<!-- END warn --> <!-- END warn -->
</tbody> </tbody>
@ -28,12 +27,10 @@
</div> </div>
<!-- ENDIF --> <!-- ENDIF -->
<!-- IF S_CLEARLOGS --> <fieldset class="quick">
<fieldset class="quick"> <input class="button2" type="submit" name="delall" value="{L_DELETE_ALL}" />&nbsp;
<input class="button2" type="submit" name="delall" value="{L_DELETE_ALL}" />&nbsp; <input class="button2" type="submit" name="delmarked" value="{L_DELETE_MARKED}" />
<input class="button2" type="submit" name="delmarked" value="{L_DELETE_MARKED}" /> <p class="small"><a href="#" onclick="marklist('list', 'mark', true);">{L_MARK_ALL}</a> &bull; <a href="#" onclick="marklist('list', 'mark', false);">{L_UNMARK_ALL}</a></p>
<p class="small"><a href="#" onclick="marklist('list', 'mark', true);">{L_MARK_ALL}</a> &bull; <a href="#" onclick="marklist('list', 'mark', false);">{L_UNMARK_ALL}</a></p> </fieldset>
</fieldset>
<!-- ENDIF -->
{S_FORM_TOKEN} {S_FORM_TOKEN}
</form> </form>

9
phpBB/includes/acp/acp_users.php
View file

@ -1167,13 +1167,7 @@ class acp_users
$deleteall = request_var('delall', 0); $deleteall = request_var('delall', 0);
if ($deletemark && $marked) if ($deletemark && $marked)
{ {
$sql_in = array(); $where_sql = ' AND ' . $db->sql_in_set('warning_id', array_values($marked));
foreach ($marked as $mark)
{
$sql_in[] = $mark;
}
$where_sql = ' AND ' . $db->sql_in_set('warning_id', $sql_in);
unset($sql_in);
} }
if ($where_sql || $deleteall) if ($where_sql || $deleteall)
@ -1291,7 +1285,6 @@ class acp_users
$template->assign_vars(array( $template->assign_vars(array(
'S_WARNINGS' => true, 'S_WARNINGS' => true,
'S_CLEARLOGS' => $auth->acl_get('a_clearlogs'),
)); ));
break; break;