mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-04-21 16:22:22 +02:00
Code Issues Releases Wiki Activity

[ticket/10990] Do not use comma separator when storing it as a log.

Browse Source 
PHPBB3-10990
This commit is contained in:
Nathan Guse 2012-07-22 14:39:10 -05:00
parent 67665f5957
commit eb5e33a768
6 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
phpBB/includes/acp/acp_attachments.php
View File

@ -916,7 +916,7 @@ class acp_attachments
WHERE ' . $db->sql_in_set('attach_id', array_keys($delete_files));
$db->sql_query($sql);
add_log('admin', 'LOG_ATTACH_ORPHAN_DEL', implode($user->lang['COMMA_SEPARATOR'], $delete_files));
add_log('admin', 'LOG_ATTACH_ORPHAN_DEL', implode(', ', $delete_files));
$notify[] = sprintf($user->lang['LOG_ATTACH_ORPHAN_DEL'], implode($user->lang['COMMA_SEPARATOR'], $delete_files));
}
@ -1470,7 +1470,7 @@ class acp_attachments
// Grab the list of entries
$ips = request_var('ips', '');
$ip_list = array_unique(explode("\n", $ips));
$ip_list_log = implode($user->lang['COMMA_SEPARATOR'], $ip_list);
$ip_list_log = implode(', ', $ip_list);
$ip_exclude = (int) $request->variable('ipexclude', false, false, phpbb_request_interface::POST);

2
phpBB/includes/acp/acp_bots.php
View File

@ -123,7 +123,7 @@ class acp_bots
$cache->destroy('_bots');
add_log('admin', 'LOG_BOT_DELETE', implode($user->lang['COMMA_SEPARATOR'], $bot_name_ary));
add_log('admin', 'LOG_BOT_DELETE', implode(', ', $bot_name_ary));
trigger_error($user->lang['BOT_DELETED'] . adm_back_link($this->u_action));
}
else

2
phpBB/includes/acp/acp_email.php
View File

@ -216,7 +216,7 @@ class acp_email
if ($usernames)
{
$usernames = explode("\n", $usernames);
add_log('admin', 'LOG_MASS_EMAIL', implode($user->lang['COMMA_SEPARATOR'], utf8_normalize_nfc($usernames)));
add_log('admin', 'LOG_MASS_EMAIL', implode(', ', utf8_normalize_nfc($usernames)));
}
else
{

2
phpBB/includes/acp/acp_prune.php
View File

@ -273,7 +273,7 @@ class acp_prune
}
}
add_log('admin', $l_log, implode($user->lang['COMMA_SEPARATOR'], $usernames));
add_log('admin', $l_log, implode(', ', $usernames));
$msg = $user->lang['USER_' . strtoupper($action) . '_SUCCESS'];
}
else

2
phpBB/includes/functions_admin.php
View File

@ -439,7 +439,7 @@ function copy_forum_permissions($src_forum_id, $dest_forum_ids, $clear_dest_perm
if ($add_log)
{
add_log('admin', 'LOG_FORUM_COPIED_PERMISSIONS', $src_forum_name, implode($user->lang['COMMA_SEPARATOR'], $dest_forum_names));
add_log('admin', 'LOG_FORUM_COPIED_PERMISSIONS', $src_forum_name, implode(', ', $dest_forum_names));
}
$db->sql_transaction('commit');

8
phpBB/includes/functions_user.php
View File

@ -659,7 +659,7 @@ function user_ban($mode, $ban, $ban_len, $ban_len_other, $ban_exclude, $ban_reas
$db->sql_query($sql);
$ban_list = (!is_array($ban)) ? array_unique(explode("\n", $ban)) : $ban;
$ban_list_log = implode($user->lang['COMMA_SEPARATOR'], $ban_list);
$ban_list_log = implode(', ', $ban_list);
$current_time = time();
@ -2923,7 +2923,7 @@ function group_user_add($group_id, $user_id_ary = false, $username_ary = false,
$log = ($leader) ? 'LOG_MODS_ADDED' : (($pending) ? 'LOG_USERS_PENDING' : 'LOG_USERS_ADDED');
add_log('admin', $log, $group_name, implode($user->lang['COMMA_SEPARATOR'], $username_ary));
add_log('admin', $log, $group_name, implode(', ', $username_ary));
group_update_listings($group_id);
@ -3056,7 +3056,7 @@ function group_user_del($group_id, $user_id_ary = false, $username_ary = false,
if ($group_name)
{
add_log('admin', $log, $group_name, implode($user->lang['COMMA_SEPARATOR'], $username_ary));
add_log('admin', $log, $group_name, implode(', ', $username_ary));
}
group_update_listings($group_id);
@ -3296,7 +3296,7 @@ function group_user_attributes($action, $group_id, $user_id_ary = false, $userna
// Clear permissions cache of relevant users
$auth->acl_clear_prefetch($user_id_ary);
add_log('admin', $log, $group_name, implode($user->lang['COMMA_SEPARATOR'], $username_ary));
add_log('admin', $log, $group_name, implode(', ', $username_ary));
group_update_listings($group_id);