phpbb-checkins

[Joas S. <nic...@ph...>]

Author: nickvergessen
Date: Tue Sep 15 10:45:05 2009
New Revision: 10145

Log:
Fix #51305 - User need a_clearlog to delete warnings

Authorised by: AcydBurn

Modified:
    branches/phpBB-3_0_0/phpBB/adm/style/acp_users_warnings.html
    branches/phpBB-3_0_0/phpBB/includes/acp/acp_users.php

Modified: branches/phpBB-3_0_0/phpBB/adm/style/acp_users_warnings.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/adm/style/acp_users_warnings.html (original)
--- branches/phpBB-3_0_0/phpBB/adm/style/acp_users_warnings.html Tue Sep 15 10:45:05 2009
***************
*** 7,23 ****
  		<th>{L_REPORT_BY}</th>
  		<th>{L_TIME}</th>
  		<th>{L_FEEDBACK}</th>
! 		<!-- IF S_CLEARLOGS --><th>{L_MARK}</th><!-- ENDIF -->
  	</tr>
  	</thead>
  	<tbody>
  	<!-- BEGIN warn -->
  		<!-- IF warn.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
- 
  			<td>{warn.USERNAME}</td>
  			<td style="text-align: center; nowrap: nowrap;">{warn.DATE}</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 -->
  		</tr>
  	<!-- END warn -->
  	</tbody>
--- 7,22 ----
  		<th>{L_REPORT_BY}</th>
  		<th>{L_TIME}</th>
  		<th>{L_FEEDBACK}</th>
! 		<th>{L_MARK}</th>
  	</tr>
  	</thead>
  	<tbody>
  	<!-- BEGIN warn -->
  		<!-- IF warn.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
  			<td>{warn.USERNAME}</td>
  			<td style="text-align: center; nowrap: nowrap;">{warn.DATE}</td>
  			<td>{warn.ACTION}</td>
! 			<td style="text-align: center;"><input type="checkbox" class="radio" name="mark[]" value="{warn.ID}" /></td>
  		</tr>
  	<!-- END warn -->
  	</tbody>
***************
*** 28,39 ****
  		</div>
  	<!-- ENDIF -->
  
! 	<!-- IF S_CLEARLOGS -->
! 		<fieldset class="quick">
! 			<input class="button2" type="submit" name="delall" value="{L_DELETE_ALL}" />&nbsp;
! 			<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>
! 		</fieldset>
! 	<!-- ENDIF -->
  	{S_FORM_TOKEN}
  	</form>
--- 27,36 ----
  		</div>
  	<!-- ENDIF -->
  
! 	<fieldset class="quick">
! 		<input class="button2" type="submit" name="delall" value="{L_DELETE_ALL}" />&nbsp;
! 		<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>
! 	</fieldset>
  	{S_FORM_TOKEN}
  	</form>

Modified: branches/phpBB-3_0_0/phpBB/includes/acp/acp_users.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/acp/acp_users.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/acp/acp_users.php Tue Sep 15 10:45:05 2009
***************
*** 1167,1179 ****
  						$deleteall = request_var('delall', 0);
  						if ($deletemark && $marked)
  						{
! 							$sql_in = array();
! 							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)
--- 1167,1173 ----
  						$deleteall = request_var('delall', 0);
  						if ($deletemark && $marked)
  						{
! 							$where_sql = ' AND ' . $db->sql_in_set('warning_id', array_values($marked));
  						}
  
  						if ($where_sql || $deleteall)
***************
*** 1291,1297 ****
  
  				$template->assign_vars(array(
  					'S_WARNINGS'	=> true,
- 					'S_CLEARLOGS'	=> $auth->acl_get('a_clearlogs'),
  				));
  
  			break;
--- 1285,1290 ----