diff --git a/phpBB/includes/functions_admin.php b/phpBB/includes/functions_admin.php
index 52447ba6de..77254c0569 100644
--- a/phpBB/includes/functions_admin.php
+++ b/phpBB/includes/functions_admin.php
@@ -2140,12 +2140,9 @@ function view_log($mode, &$log, &$log_count, $limit = 0, $offset = 0, $forum_id
if (isset($user->lang[$row['log_operation']]))
{
- foreach ($log_data_ary as $log_data)
- {
- $log_data = str_replace("\n", '
', censor_text($log_data));
-
- $log[$i]['action'] = preg_replace('#%s#', $log_data, $log[$i]['action'], 1);
- }
+ $params = array_merge(array($log[$i]['action']), $log_data_ary);
+ $log[$i]['action'] = call_user_func_array('sprintf', $params);
+ $log[$i]['action'] = str_replace("\n", '
', censor_text($log[$i]['action']));
}
else
{
diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php
index ca8e7ff652..2b74ccbe4f 100644
--- a/phpBB/language/en/acp/common.php
+++ b/phpBB/language/en/acp/common.php
@@ -333,7 +333,7 @@ $lang = array_merge($lang, array(
'WELCOME_PHPBB' => 'Welcome to phpBB',
));
-// Log
+// Log Entries
$lang = array_merge($lang, array(
'LOG_ACL_ADD_USER_GLOBAL_U_' => 'Added or edited users user permissions
» %s',
'LOG_ACL_ADD_GROUP_GLOBAL_U_' => 'Added or edited groups user permissions
» %s',
@@ -345,18 +345,18 @@ $lang = array_merge($lang, array(
'LOG_ACL_ADD_ADMIN_GLOBAL_A_' => 'Added or edited Administrators
» %s',
'LOG_ACL_ADD_MOD_GLOBAL_M_' => 'Added or edited Global Moderators
» %s',
- 'LOG_ACL_ADD_USER_LOCAL_F_' => 'Added or edited users forum access from %s
» %s',
- 'LOG_ACL_ADD_USER_LOCAL_M_' => 'Added or edited users forum moderator access from %s
» %s',
- 'LOG_ACL_ADD_GROUP_LOCAL_F_' => 'Added or edited groups forum access from %s
» %s',
- 'LOG_ACL_ADD_GROUP_LOCAL_M_' => 'Added or edited groups forum moderator access from %s
» %s',
+ 'LOG_ACL_ADD_USER_LOCAL_F_' => 'Added or edited users forum access from %1$s
» %2$s',
+ 'LOG_ACL_ADD_USER_LOCAL_M_' => 'Added or edited users forum moderator access from %1$s
» %2$s',
+ 'LOG_ACL_ADD_GROUP_LOCAL_F_' => 'Added or edited groups forum access from %1$s
» %2$s',
+ 'LOG_ACL_ADD_GROUP_LOCAL_M_' => 'Added or edited groups forum moderator access from %1$s
» %2$s',
- 'LOG_ACL_ADD_MOD_LOCAL_M_' => 'Added or edited Moderators from %s
» %s',
- 'LOG_ACL_ADD_FORUM_LOCAL_F_' => 'Added or edited Forum Permissions from %s
» %s',
+ 'LOG_ACL_ADD_MOD_LOCAL_M_' => 'Added or edited Moderators from %1$s
» %2$s',
+ 'LOG_ACL_ADD_FORUM_LOCAL_F_' => 'Added or edited Forum Permissions from %1$s
» %2$s',
'LOG_ACL_DEL_ADMIN_GLOBAL_A_' => 'Removed Administrators
» %s',
'LOG_ACL_DEL_MOD_GLOBAL_M_' => 'Removed Global Moderators
» %s',
- 'LOG_ACL_DEL_MOD_LOCAL_M_' => 'Removed Moderators from %s
» %s',
- 'LOG_ACL_DEL_FORUM_LOCAL_F_' => 'Removed User/Group Forum Permissions from %s
» %s',
+ 'LOG_ACL_DEL_MOD_LOCAL_M_' => 'Removed Moderators from %1$s
» %2$s',
+ 'LOG_ACL_DEL_FORUM_LOCAL_F_' => 'Removed User/Group Forum Permissions from %1$s
» %2$s',
'LOG_ACL_TRANSFER_PERMISSIONS' => 'Permissions transfered from
» %s',
'LOG_ACL_RESTORE_PERMISSIONS' => 'Own permissions restored after using permissions from
» %s',
@@ -373,12 +373,12 @@ $lang = array_merge($lang, array(
'LOG_ATTACH_FILEUPLOAD' => 'Orphan File uploaded to Post
» ID %1$d - %2$s',
'LOG_ATTACH_ORPHAN_DEL' => 'Orphan Files deleted
» %s',
- 'LOG_BAN_EXCLUDE_USER' => 'Excluded user from ban for reason "%s"
» %s ',
- 'LOG_BAN_EXCLUDE_IP' => 'Excluded ip from ban for reason "%s"
» %s ',
- 'LOG_BAN_EXCLUDE_EMAIL' => 'Excluded email from ban for reason "%s"
» %s ',
- 'LOG_BAN_USER' => 'Banned User for reason "%s"
» %s ',
- 'LOG_BAN_IP' => 'Banned ip for reason "%s"
» %s',
- 'LOG_BAN_EMAIL' => 'Banned email for reason "%s"
» %s',
+ 'LOG_BAN_EXCLUDE_USER' => 'Excluded user from ban for reason "%1$s"
» %2$s ',
+ 'LOG_BAN_EXCLUDE_IP' => 'Excluded ip from ban for reason "%1$s"
» %2$s ',
+ 'LOG_BAN_EXCLUDE_EMAIL' => 'Excluded email from ban for reason "%1$s"
» %2$s ',
+ 'LOG_BAN_USER' => 'Banned User for reason "%1$s"
» %2$s ',
+ 'LOG_BAN_IP' => 'Banned ip for reason "%1$s"
» %2$s',
+ 'LOG_BAN_EMAIL' => 'Banned email for reason "%1$s"
» %2$s',
'LOG_UNBAN_USER' => 'Unbanned user
» %s',
'LOG_UNBAN_IP' => 'Unbanned ip
» %s',
'LOG_UNBAN_EMAIL' => 'Unbanned email
» %s',
@@ -445,28 +445,28 @@ $lang = array_merge($lang, array(
'LOG_FORUM_ADD' => 'Created new forum
» %s',
'LOG_FORUM_DEL_FORUM' => 'Deleted forum
» %s',
'LOG_FORUM_DEL_FORUMS' => 'Deleted forum and its subforums
» %s',
- 'LOG_FORUM_DEL_MOVE_FORUMS' => 'Deleted forum and moved subforums to %s
» %s',
- 'LOG_FORUM_DEL_MOVE_POSTS' => 'Deleted forum and moved posts to %s
» %s',
- 'LOG_FORUM_DEL_MOVE_POSTS_FORUMS' => 'Deleted forum and its subforums, moved messages to %s
» %s',
- 'LOG_FORUM_DEL_MOVE_POSTS_MOVE_FORUMS' => 'Deleted forum, moved posts to %s and subforums to %s
» %s',
+ 'LOG_FORUM_DEL_MOVE_FORUMS' => 'Deleted forum and moved subforums to %1$s
» %2$s',
+ 'LOG_FORUM_DEL_MOVE_POSTS' => 'Deleted forum and moved posts to %1$s
» %2$s',
+ 'LOG_FORUM_DEL_MOVE_POSTS_FORUMS' => 'Deleted forum and its subforums, moved messages to %1$s
» %2$s',
+ 'LOG_FORUM_DEL_MOVE_POSTS_MOVE_FORUMS' => 'Deleted forum, moved posts to %1$s and subforums to %2$s
» %3$s',
'LOG_FORUM_DEL_POSTS' => 'Deleted forum and its messages
» %s',
'LOG_FORUM_DEL_POSTS_FORUMS' => 'Deleted forum, its messages and subforums
» %s',
- 'LOG_FORUM_DEL_POSTS_MOVE_FORUMS' => 'Deleted forum and its messages, moved subforums to %s
» %s',
+ 'LOG_FORUM_DEL_POSTS_MOVE_FORUMS' => 'Deleted forum and its messages, moved subforums to %1$s
» %2$s',
'LOG_FORUM_EDIT' => 'Edited forum details
» %s',
- 'LOG_FORUM_MOVE_DOWN' => 'Moved forum %s below %s',
- 'LOG_FORUM_MOVE_UP' => 'Moved forum %s above %s',
+ 'LOG_FORUM_MOVE_DOWN' => 'Moved forum %1$s below %2$s',
+ 'LOG_FORUM_MOVE_UP' => 'Moved forum %1$s above %2$s',
'LOG_FORUM_SYNC' => 'Re-synchronised forum
» %s',
'LOG_GROUP_CREATED' => 'New usergroup created
» %s',
'LOG_GROUP_DEFAULTS' => 'Group made default for members
» %s',
'LOG_GROUP_DELETE' => 'Usergroup deleted
» %s',
- 'LOG_GROUP_DEMOTED' => 'Leaders demoted in usergroup %s
» %s',
- 'LOG_GROUP_PROMOTED' => 'Members promoted to leader in usergroup %s
» %s',
- 'LOG_GROUP_REMOVE' => 'Members removed from usergroup %s
» %s',
+ 'LOG_GROUP_DEMOTED' => 'Leaders demoted in usergroup %1$s
» %2$s',
+ 'LOG_GROUP_PROMOTED' => 'Members promoted to leader in usergroup %1$s
» %2$s',
+ 'LOG_GROUP_REMOVE' => 'Members removed from usergroup %1$s
» %2$s',
'LOG_GROUP_UPDATED' => 'Usergroup details updated
» %s',
- 'LOG_MODS_ADDED' => 'Added new leaders to usergroup %s
» %s',
- 'LOG_USERS_APPROVED' => 'Users approved in usergroup %s
» %s',
- 'LOG_USERS_ADDED' => 'Added new members to usergroup %s
» %s',
+ 'LOG_MODS_ADDED' => 'Added new leaders to usergroup %1$s
» %2$s',
+ 'LOG_USERS_APPROVED' => 'Users approved in usergroup %1$s
» %2$s',
+ 'LOG_USERS_ADDED' => 'Added new members to usergroup %1$s
» %2$s',
'LOG_IMAGESET_ADD_DB' => 'Added new imageset to database
» %s',
'LOG_IMAGESET_ADD_FS' => 'Add new imageset on filesystem
» %s',
@@ -478,10 +478,10 @@ $lang = array_merge($lang, array(
'LOG_INDEX_ACTIVATE' => 'Activated inactive users
» %s',
'LOG_INDEX_DELETE' => 'Deleted inactive users
» %s',
'LOG_INDEX_REMIND' => 'Sent reminder emails to inactive users
» %s',
- 'LOG_INSTALL_CONVERTED' => 'Converted from %s to phpBB %s',
+ 'LOG_INSTALL_CONVERTED' => 'Converted from %1$s to phpBB %2$s',
'LOG_INSTALL_INSTALLED' => 'Installed phpBB %s',
- 'LOG_IP_BROWSER_CHECK' => 'Session IP/Browser check failed
»User IP "%s" checked against session IP "%s" and user browser string "%s" checked against session browser string "%s".',
+ 'LOG_IP_BROWSER_CHECK' => 'Session IP/Browser check failed
»User IP "%1$s" checked against session IP "%2$s" and user browser string "%3$s" checked against session browser string "%4$s".',
'LOG_JAB_CHANGED' => 'Jabber account changed',
'LOG_JAB_PASSCHG' => 'Jabber password changed',
@@ -495,7 +495,7 @@ $lang = array_merge($lang, array(
'LOG_MASS_EMAIL' => 'Sent mass email
» %s',
- 'LOG_MCP_CHANGE_POSTER' => 'Changed poster in topic "%s"
» from %s to %s',
+ 'LOG_MCP_CHANGE_POSTER' => 'Changed poster in topic "%1$s"
» from %2$s to %3$s',
'LOG_MODULE_DISABLE' => 'Module disabled',
'LOG_MODULE_ENABLE' => 'Module enabled',
@@ -547,9 +547,9 @@ $lang = array_merge($lang, array(
'LOG_TEMPLATE_ADD_DB' => 'Added new template set to database
» %s',
'LOG_TEMPLATE_ADD_FS' => 'Add new template set on filesystem
» %s',
- 'LOG_TEMPLATE_CACHE_CLEARED' => 'Deleted cached versions of template files in template set %s
» %s',
+ 'LOG_TEMPLATE_CACHE_CLEARED' => 'Deleted cached versions of template files in template set %1$s
» %2$s',
'LOG_TEMPLATE_DELETE' => 'Deleted template set
» %s',
- 'LOG_TEMPLATE_EDIT' => 'Edited template set %s
» %s',
+ 'LOG_TEMPLATE_EDIT' => 'Edited template set %1$s
» %2$s',
'LOG_TEMPLATE_EDIT_DETAILS' => 'Edited template details
» %s',
'LOG_TEMPLATE_EXPORT' => 'Exported template set
» %s',
'LOG_TEMPLATE_REFRESHED' => 'Refreshed template set
» %s',
@@ -558,25 +558,25 @@ $lang = array_merge($lang, array(
'LOG_THEME_ADD_FS' => 'Add new theme on filesystem
» %s',
'LOG_THEME_DELETE' => 'Theme deleted
» %s',
'LOG_THEME_EDIT_DETAILS' => 'Edited theme details
» %s',
- 'LOG_THEME_EDIT' => 'Edited theme %s
» Modified class %s',
- 'LOG_THEME_EDIT_ADD' => 'Edited theme %s
» Added class %s',
+ 'LOG_THEME_EDIT' => 'Edited theme %1$s
» Modified class %2$s',
+ 'LOG_THEME_EDIT_ADD' => 'Edited theme %1$s
» Added class %2$s',
'LOG_THEME_EXPORT' => 'Exported theme
» %s',
'LOG_USER_ACTIVE' => 'User activated
» %s',
- 'LOG_USER_BAN_USER' => 'Banned User via user management for reason "%s"
» %s',
- 'LOG_USER_BAN_IP' => 'Banned ip via user management for reason "%s"
» %s',
- 'LOG_USER_BAN_EMAIL' => 'Banned email via user management for reason "%s"
» %s',
+ 'LOG_USER_BAN_USER' => 'Banned User via user management for reason "%1$s"
» %2$s',
+ 'LOG_USER_BAN_IP' => 'Banned ip via user management for reason "%1$s"
» %2$s',
+ 'LOG_USER_BAN_EMAIL' => 'Banned email via user management for reason "%1$s"
» %2$s',
'LOG_USER_DELETED' => 'Deleted user
» %s',
'LOG_USER_DEL_ATTACH' => 'Removed all attachments made by the user
» %s',
'LOG_USER_DEL_AVATAR' => 'Removed user avatar
» %s',
'LOG_USER_DEL_POSTS' => 'Removed all posts made by the user
» %s',
'LOG_USER_DEL_SIG' => 'Removed user signature
» %s',
'LOG_USER_INACTIVE' => 'User deactivated
» %s',
- 'LOG_USER_MOVE_POSTS' => 'Moved user posts
» posts by "%s" to forum "%s"',
+ 'LOG_USER_MOVE_POSTS' => 'Moved user posts
» posts by "%1$s" to forum "%2$s"',
'LOG_USER_NEW_PASSWORD' => 'Changed user password
» %s',
'LOG_USER_REACTIVATE' => 'Forced user account re-activation
» %s',
- 'LOG_USER_UPDATE_EMAIL' => 'User "%s" changed email
» from "%s" to "%s"',
- 'LOG_USER_UPDATE_NAME' => 'Changed username
» from "%s" to "%s"',
+ 'LOG_USER_UPDATE_EMAIL' => 'User "%1$s" changed email
» from "%2$s" to "%3$s"',
+ 'LOG_USER_UPDATE_NAME' => 'Changed username
» from "%1$s" to "%2$s"',
'LOG_USER_USER_UPDATE' => 'Updated user details
» %s',
'LOG_USER_ACTIVE_USER' => 'User account activated',