makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-09 04:48:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'github-exreaction/ticket/7598' into develop

Browse source 
* github-exreaction/ticket/7598:
  [ticket/7598] Use $user->lang['COMMA_SEPARATOR']
  [ticket/7598] Inactive users action notification (ACP)
This commit is contained in:
Nils Adermann 2012-07-17 20:32:07 +02:00
commit fb34a7aa64
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
phpBB/includes/acp/acp_inactive.php
View file

@ -136,6 +136,8 @@ class acp_inactive
add_log('admin', 'LOG_USER_ACTIVE', $row['username']); add_log('admin', 'LOG_USER_ACTIVE', $row['username']);
add_log('user', $row['user_id'], 'LOG_USER_ACTIVE_USER'); add_log('user', $row['user_id'], 'LOG_USER_ACTIVE_USER');
} }
trigger_error(sprintf($user->lang['LOG_INACTIVE_ACTIVATE'], implode($user->lang['COMMA_SEPARATOR'], $user_affected) . ' ' . adm_back_link($this->u_action)));
} }
// For activate we really need to redirect, else a refresh can result in users being deactivated again // For activate we really need to redirect, else a refresh can result in users being deactivated again
@ -159,6 +161,8 @@ class acp_inactive
} }
add_log('admin', 'LOG_INACTIVE_' . strtoupper($action), implode(', ', $user_affected)); add_log('admin', 'LOG_INACTIVE_' . strtoupper($action), implode(', ', $user_affected));
trigger_error(sprintf($user->lang['LOG_INACTIVE_DELETE'], implode($user->lang['COMMA_SEPARATOR'], $user_affected) . ' ' . adm_back_link($this->u_action)));
} }
else else
{ {
@ -230,7 +234,8 @@ class acp_inactive
$db->sql_query($sql); $db->sql_query($sql);
add_log('admin', 'LOG_INACTIVE_REMIND', implode(', ', $usernames)); add_log('admin', 'LOG_INACTIVE_REMIND', implode(', ', $usernames));
unset($usernames);
trigger_error(sprintf($user->lang['LOG_INACTIVE_REMIND'], implode($user->lang['COMMA_SEPARATOR'], $usernames) . ' ' . adm_back_link($this->u_action)));
} }
$db->sql_freeresult($result); $db->sql_freeresult($result);