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

[ticket/10990] Use $user->lang['COMMA_SEPARATOR'] when appropriate

Browse source 
PHPBB3-10990
This commit is contained in:
Nathan 2012-07-14 18:12:57 -05:00 • committed by Nathan Guse
parent 841ea0e494
commit 67665f5957
22 changed files with 62 additions and 61 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
phpBB/includes/acp/acp_attachments.php
View file

@ -98,7 +98,7 @@ class acp_attachments
} }
$db->sql_freeresult($result); $db->sql_freeresult($result);
$l_legend_cat_images = $user->lang['SETTINGS_CAT_IMAGES'] . ' [' . $user->lang['ASSIGNED_GROUP'] . ': ' . ((!empty($s_assigned_groups[ATTACHMENT_CATEGORY_IMAGE])) ? implode(', ', $s_assigned_groups[ATTACHMENT_CATEGORY_IMAGE]) : $user->lang['NO_EXT_GROUP']) . ']'; $l_legend_cat_images = $user->lang['SETTINGS_CAT_IMAGES'] . ' [' . $user->lang['ASSIGNED_GROUP'] . ': ' . ((!empty($s_assigned_groups[ATTACHMENT_CATEGORY_IMAGE])) ? implode($user->lang['COMMA_SEPARATOR'], $s_assigned_groups[ATTACHMENT_CATEGORY_IMAGE]) : $user->lang['NO_EXT_GROUP']) . ']';
$display_vars = array( $display_vars = array(
'title' => 'ACP_ATTACHMENT_SETTINGS', 'title' => 'ACP_ATTACHMENT_SETTINGS',
@ -916,8 +916,8 @@ class acp_attachments
WHERE ' . $db->sql_in_set('attach_id', array_keys($delete_files)); WHERE ' . $db->sql_in_set('attach_id', array_keys($delete_files));
$db->sql_query($sql); $db->sql_query($sql);
add_log('admin', 'LOG_ATTACH_ORPHAN_DEL', implode(', ', $delete_files)); add_log('admin', 'LOG_ATTACH_ORPHAN_DEL', implode($user->lang['COMMA_SEPARATOR'], $delete_files));
$notify[] = sprintf($user->lang['LOG_ATTACH_ORPHAN_DEL'], implode(', ', $delete_files)); $notify[] = sprintf($user->lang['LOG_ATTACH_ORPHAN_DEL'], implode($user->lang['COMMA_SEPARATOR'], $delete_files));
} }
$upload_list = array(); $upload_list = array();
@ -1470,7 +1470,7 @@ class acp_attachments
// Grab the list of entries // Grab the list of entries
$ips = request_var('ips', ''); $ips = request_var('ips', '');
$ip_list = array_unique(explode("\n", $ips)); $ip_list = array_unique(explode("\n", $ips));
$ip_list_log = implode(', ', $ip_list); $ip_list_log = implode($user->lang['COMMA_SEPARATOR'], $ip_list);
$ip_exclude = (int) $request->variable('ipexclude', false, false, phpbb_request_interface::POST); $ip_exclude = (int) $request->variable('ipexclude', false, false, phpbb_request_interface::POST);

28
phpBB/includes/acp/acp_bots.php
View file

@ -123,7 +123,7 @@ class acp_bots
$cache->destroy('_bots'); $cache->destroy('_bots');
add_log('admin', 'LOG_BOT_DELETE', implode(', ', $bot_name_ary)); add_log('admin', 'LOG_BOT_DELETE', implode($user->lang['COMMA_SEPARATOR'], $bot_name_ary));
trigger_error($user->lang['BOT_DELETED'] . adm_back_link($this->u_action)); trigger_error($user->lang['BOT_DELETED'] . adm_back_link($this->u_action));
} }
else else
@ -157,7 +157,7 @@ class acp_bots
{ {
$error[] = $user->lang['ERR_BOT_NO_MATCHES']; $error[] = $user->lang['ERR_BOT_NO_MATCHES'];
} }
if ($bot_row['bot_ip'] && !preg_match('#^[\d\.,:]+$#', $bot_row['bot_ip'])) if ($bot_row['bot_ip'] && !preg_match('#^[\d\.,:]+$#', $bot_row['bot_ip']))
{ {
if (!$ip_list = gethostbynamel($bot_row['bot_ip'])) if (!$ip_list = gethostbynamel($bot_row['bot_ip']))
@ -176,7 +176,7 @@ class acp_bots
{ {
$error[] = $user->lang['ERR_BOT_AGENT_MATCHES_UA']; $error[] = $user->lang['ERR_BOT_AGENT_MATCHES_UA'];
} }
$bot_name = false; $bot_name = false;
if ($bot_id) if ($bot_id)
{ {
@ -201,7 +201,7 @@ class acp_bots
{ {
$error[] = $user->lang['BOT_NAME_TAKEN']; $error[] = $user->lang['BOT_NAME_TAKEN'];
} }
if (!sizeof($error)) if (!sizeof($error))
{ {
// New bot? Create a new user and group entry // New bot? Create a new user and group entry
@ -219,7 +219,7 @@ class acp_bots
{ {
trigger_error($user->lang['NO_BOT_GROUP'] . adm_back_link($this->u_action . "&id=$bot_id&action=$action"), E_USER_WARNING); trigger_error($user->lang['NO_BOT_GROUP'] . adm_back_link($this->u_action . "&id=$bot_id&action=$action"), E_USER_WARNING);
} }
$user_id = user_add(array( $user_id = user_add(array(
'user_type' => (int) USER_IGNORE, 'user_type' => (int) USER_IGNORE,
@ -233,7 +233,7 @@ class acp_bots
'user_style' => (int) $bot_row['bot_style'], 'user_style' => (int) $bot_row['bot_style'],
'user_allow_massemail' => 0, 'user_allow_massemail' => 0,
)); ));
$sql = 'INSERT INTO ' . BOTS_TABLE . ' ' . $db->sql_build_array('INSERT', array( $sql = 'INSERT INTO ' . BOTS_TABLE . ' ' . $db->sql_build_array('INSERT', array(
'user_id' => (int) $user_id, 'user_id' => (int) $user_id,
'bot_name' => (string) $bot_row['bot_name'], 'bot_name' => (string) $bot_row['bot_name'],
@ -242,7 +242,7 @@ class acp_bots
'bot_ip' => (string) $bot_row['bot_ip']) 'bot_ip' => (string) $bot_row['bot_ip'])
); );
$db->sql_query($sql); $db->sql_query($sql);
$log = 'ADDED'; $log = 'ADDED';
} }
else if ($bot_id) else if ($bot_id)
@ -289,12 +289,12 @@ class acp_bots
$log = 'UPDATED'; $log = 'UPDATED';
} }
$cache->destroy('_bots'); $cache->destroy('_bots');
add_log('admin', 'LOG_BOT_' . $log, $bot_row['bot_name']); add_log('admin', 'LOG_BOT_' . $log, $bot_row['bot_name']);
trigger_error($user->lang['BOT_' . $log] . adm_back_link($this->u_action)); trigger_error($user->lang['BOT_' . $log] . adm_back_link($this->u_action));
} }
} }
else if ($bot_id) else if ($bot_id)
@ -335,11 +335,11 @@ class acp_bots
'U_ACTION' => $this->u_action . "&id=$bot_id&action=$action", 'U_ACTION' => $this->u_action . "&id=$bot_id&action=$action",
'U_BACK' => $this->u_action, 'U_BACK' => $this->u_action,
'ERROR_MSG' => (sizeof($error)) ? implode('<br />', $error) : '', 'ERROR_MSG' => (sizeof($error)) ? implode('<br />', $error) : '',
'BOT_NAME' => $bot_row['bot_name'], 'BOT_NAME' => $bot_row['bot_name'],
'BOT_IP' => $bot_row['bot_ip'], 'BOT_IP' => $bot_row['bot_ip'],
'BOT_AGENT' => $bot_row['bot_agent'], 'BOT_AGENT' => $bot_row['bot_agent'],
'S_EDIT_BOT' => true, 'S_EDIT_BOT' => true,
'S_ACTIVE_OPTIONS' => $s_active_options, 'S_ACTIVE_OPTIONS' => $s_active_options,
'S_STYLE_OPTIONS' => $style_select, 'S_STYLE_OPTIONS' => $style_select,
@ -397,7 +397,7 @@ class acp_bots
} }
$db->sql_freeresult($result); $db->sql_freeresult($result);
} }
/** /**
* Validate bot name against username table * Validate bot name against username table
*/ */
@ -417,7 +417,7 @@ class acp_bots
$result = $db->sql_query($sql); $result = $db->sql_query($sql);
$row = $db->sql_fetchrow($result); $row = $db->sql_fetchrow($result);
$db->sql_freeresult($result); $db->sql_freeresult($result);
return ($row) ? false : true; return ($row) ? false : true;
} }
} }

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

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

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

@ -289,8 +289,8 @@ class acp_inactive
} }
$base_url = $this->u_action . "&amp;$u_sort_param&amp;users_per_page=$per_page"; $base_url = $this->u_action . "&amp;$u_sort_param&amp;users_per_page=$per_page";
phpbb_generate_template_pagination($template, $base_url, 'pagination', 'start', $inactive_count, $per_page, $start); phpbb_generate_template_pagination($template, $base_url, 'pagination', 'start', $inactive_count, $per_page, $start);
$template->assign_vars(array( $template->assign_vars(array(
'S_INACTIVE_USERS' => true, 'S_INACTIVE_USERS' => true,
'S_INACTIVE_OPTIONS' => build_select($option_ary), 'S_INACTIVE_OPTIONS' => build_select($option_ary),
@ -299,7 +299,7 @@ class acp_inactive
'S_SORT_KEY' => $s_sort_key, 'S_SORT_KEY' => $s_sort_key,
'S_SORT_DIR' => $s_sort_dir, 'S_SORT_DIR' => $s_sort_dir,
'S_ON_PAGE' => phpbb_on_page($template, $user, $base_url, $inactive_count, $per_page, $start), 'S_ON_PAGE' => phpbb_on_page($template, $user, $base_url, $inactive_count, $per_page, $start),
'USERS_PER_PAGE' => $per_page, 'USERS_PER_PAGE' => $per_page,
'U_ACTION' => $this->u_action . "&amp;$u_sort_param&amp;users_per_page=$per_page&amp;start=$start", 'U_ACTION' => $this->u_action . "&amp;$u_sort_param&amp;users_per_page=$per_page&amp;start=$start",

2
phpBB/includes/acp/acp_permissions.php
View file

@ -497,7 +497,7 @@ class acp_permissions
$template->assign_vars(array( $template->assign_vars(array(
'S_FORUM_NAMES' => (sizeof($forum_names)) ? true : false, 'S_FORUM_NAMES' => (sizeof($forum_names)) ? true : false,
'FORUM_NAMES' => implode(', ', $forum_names)) 'FORUM_NAMES' => implode($user->lang['COMMA_SEPARATOR'], $forum_names))
); );
} }

20
phpBB/includes/acp/acp_prune.php
View file

@ -79,7 +79,7 @@ class acp_prune
$prune_posted = request_var('prune_days', 0); $prune_posted = request_var('prune_days', 0);
$prune_viewed = request_var('prune_vieweddays', 0); $prune_viewed = request_var('prune_vieweddays', 0);
$prune_all = (!$prune_posted && !$prune_viewed) ? true : false; $prune_all = (!$prune_posted && !$prune_viewed) ? true : false;
$prune_flags = 0; $prune_flags = 0;
$prune_flags += (request_var('prune_old_polls', 0)) ? 2 : 0; $prune_flags += (request_var('prune_old_polls', 0)) ? 2 : 0;
$prune_flags += (request_var('prune_announce', 0)) ? 4 : 0; $prune_flags += (request_var('prune_announce', 0)) ? 4 : 0;
@ -109,7 +109,7 @@ class acp_prune
$p_result['topics'] = 0; $p_result['topics'] = 0;
$p_result['posts'] = 0; $p_result['posts'] = 0;
$log_data = ''; $log_data = '';
do do
{ {
if (!$auth->acl_get('f_list', $row['forum_id'])) if (!$auth->acl_get('f_list', $row['forum_id']))
@ -129,7 +129,7 @@ class acp_prune
$p_result['topics'] += $return['topics']; $p_result['topics'] += $return['topics'];
$p_result['posts'] += $return['posts']; $p_result['posts'] += $return['posts'];
} }
if ($prune_viewed) if ($prune_viewed)
{ {
$return = prune($row['forum_id'], 'viewed', $prunedate_viewed, $prune_flags, false); $return = prune($row['forum_id'], 'viewed', $prunedate_viewed, $prune_flags, false);
@ -145,11 +145,11 @@ class acp_prune
'NUM_TOPICS' => $p_result['topics'], 'NUM_TOPICS' => $p_result['topics'],
'NUM_POSTS' => $p_result['posts']) 'NUM_POSTS' => $p_result['posts'])
); );
$log_data .= (($log_data != '') ? ', ' : '') . $row['forum_name']; $log_data .= (($log_data != '') ? ', ' : '') . $row['forum_name'];
} }
while ($row = $db->sql_fetchrow($result)); while ($row = $db->sql_fetchrow($result));
// Sync all pruned forums at once // Sync all pruned forums at once
sync('forum', 'forum_id', $prune_ids, true, true); sync('forum', 'forum_id', $prune_ids, true, true);
add_log('admin', 'LOG_PRUNE', $log_data); add_log('admin', 'LOG_PRUNE', $log_data);
@ -259,7 +259,7 @@ class acp_prune
{ {
user_delete('remove', $user_id); user_delete('remove', $user_id);
} }
$l_log = 'LOG_PRUNE_USER_DEL_DEL'; $l_log = 'LOG_PRUNE_USER_DEL_DEL';
} }
else else
@ -273,7 +273,7 @@ class acp_prune
} }
} }
add_log('admin', $l_log, implode(', ', $usernames)); add_log('admin', $l_log, implode($user->lang['COMMA_SEPARATOR'], $usernames));
$msg = $user->lang['USER_' . strtoupper($action) . '_SUCCESS']; $msg = $user->lang['USER_' . strtoupper($action) . '_SUCCESS'];
} }
else else
@ -345,7 +345,7 @@ class acp_prune
{ {
$s_find_join_time .= '<option value="' . $key . '">' . $value . '</option>'; $s_find_join_time .= '<option value="' . $key . '">' . $value . '</option>';
} }
$s_find_active_time = ''; $s_find_active_time = '';
foreach ($find_time as $key => $value) foreach ($find_time as $key => $value)
{ {
@ -369,7 +369,7 @@ class acp_prune
global $user, $db; global $user, $db;
$users = utf8_normalize_nfc(request_var('users', '', true)); $users = utf8_normalize_nfc(request_var('users', '', true));
if ($users) if ($users)
{ {
$users = explode("\n", $users); $users = explode("\n", $users);
@ -409,7 +409,7 @@ class acp_prune
if (sizeof($active) && (int) $active[0] == 0 && (int) $active[1] == 0 && (int) $active[2] == 0) if (sizeof($active) && (int) $active[0] == 0 && (int) $active[1] == 0 && (int) $active[2] == 0)
{ {
$where_sql .= ' AND user_lastvisit = 0'; $where_sql .= ' AND user_lastvisit = 0';
} }
else if (sizeof($active) && $active_select != 'lt') else if (sizeof($active) && $active_select != 'lt')
{ {
$where_sql .= ' AND user_lastvisit ' . $key_match[$active_select] . ' ' . gmmktime(0, 0, 0, (int) $active[1], (int) $active[2], (int) $active[0]); $where_sql .= ' AND user_lastvisit ' . $key_match[$active_select] . ' ' . gmmktime(0, 0, 0, (int) $active[1], (int) $active[2], (int) $active[0]);

8
phpBB/includes/acp/acp_reasons.php
View file

@ -113,7 +113,7 @@ class acp_reasons
$result = $db->sql_query($sql); $result = $db->sql_query($sql);
$max_order = (int) $db->sql_fetchfield('max_reason_order'); $max_order = (int) $db->sql_fetchfield('max_reason_order');
$db->sql_freeresult($result); $db->sql_freeresult($result);
$sql_ary = array( $sql_ary = array(
'reason_title' => (string) $reason_row['reason_title'], 'reason_title' => (string) $reason_row['reason_title'],
'reason_description' => (string) $reason_row['reason_description'], 'reason_description' => (string) $reason_row['reason_description'],
@ -171,14 +171,14 @@ class acp_reasons
'U_ACTION' => $this->u_action . "&amp;id=$reason_id&amp;action=$action", 'U_ACTION' => $this->u_action . "&amp;id=$reason_id&amp;action=$action",
'U_BACK' => $this->u_action, 'U_BACK' => $this->u_action,
'ERROR_MSG' => (sizeof($error)) ? implode('<br />', $error) : '', 'ERROR_MSG' => (sizeof($error)) ? implode('<br />', $error) : '',
'REASON_TITLE' => $reason_row['reason_title'], 'REASON_TITLE' => $reason_row['reason_title'],
'REASON_DESCRIPTION' => $reason_row['reason_description'], 'REASON_DESCRIPTION' => $reason_row['reason_description'],
'TRANSLATED_TITLE' => ($translated) ? $user->lang['report_reasons']['TITLE'][strtoupper($reason_row['reason_title'])] : '', 'TRANSLATED_TITLE' => ($translated) ? $user->lang['report_reasons']['TITLE'][strtoupper($reason_row['reason_title'])] : '',
'TRANSLATED_DESCRIPTION'=> ($translated) ? $user->lang['report_reasons']['DESCRIPTION'][strtoupper($reason_row['reason_title'])] : '', 'TRANSLATED_DESCRIPTION'=> ($translated) ? $user->lang['report_reasons']['DESCRIPTION'][strtoupper($reason_row['reason_title'])] : '',
'S_AVAILABLE_TITLES' => implode(', ', array_map('htmlspecialchars', array_keys($user->lang['report_reasons']['TITLE']))), 'S_AVAILABLE_TITLES' => implode($user->lang['COMMA_SEPARATOR'], array_map('htmlspecialchars', array_keys($user->lang['report_reasons']['TITLE']))),
'S_EDIT_REASON' => true, 'S_EDIT_REASON' => true,
'S_TRANSLATED' => $translated, 'S_TRANSLATED' => $translated,
'S_ERROR' => (sizeof($error)) ? true : false, 'S_ERROR' => (sizeof($error)) ? true : false,
@ -303,7 +303,7 @@ class acp_reasons
do do
{ {
++$order; ++$order;
if ($row['reason_order'] != $order) if ($row['reason_order'] != $order)
{ {
$sql = 'UPDATE ' . REPORTS_REASONS_TABLE . " $sql = 'UPDATE ' . REPORTS_REASONS_TABLE . "

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

@ -1943,7 +1943,7 @@ class acp_users
$message = (sizeof($log_attachments) == 1) ? $user->lang['ATTACHMENT_DELETED'] : $user->lang['ATTACHMENTS_DELETED']; $message = (sizeof($log_attachments) == 1) ? $user->lang['ATTACHMENT_DELETED'] : $user->lang['ATTACHMENTS_DELETED'];
add_log('admin', 'LOG_ATTACHMENTS_DELETED', implode(', ', $log_attachments)); add_log('admin', 'LOG_ATTACHMENTS_DELETED', implode($user->lang['COMMA_SEPARATOR'], $log_attachments));
trigger_error($message . adm_back_link($this->u_action . '&amp;u=' . $user_id)); trigger_error($message . adm_back_link($this->u_action . '&amp;u=' . $user_id));
} }
else else

4
phpBB/includes/acp/auth.php
View file

@ -529,8 +529,8 @@ class auth_admin extends phpbb_auth
'NAME' => $ug_name, 'NAME' => $ug_name,
'CATEGORIES' => implode('</th><th>', $categories), 'CATEGORIES' => implode('</th><th>', $categories),
'USER_GROUPS_DEFAULT' => ($user_mode == 'user' && isset($user_groups_default[$ug_id]) && sizeof($user_groups_default[$ug_id])) ? implode(', ', $user_groups_default[$ug_id]) : '', 'USER_GROUPS_DEFAULT' => ($user_mode == 'user' && isset($user_groups_default[$ug_id]) && sizeof($user_groups_default[$ug_id])) ? implode($user->lang['COMMA_SEPARATOR'], $user_groups_default[$ug_id]) : '',
'USER_GROUPS_CUSTOM' => ($user_mode == 'user' && isset($user_groups_custom[$ug_id]) && sizeof($user_groups_custom[$ug_id])) ? implode(', ', $user_groups_custom[$ug_id]) : '', 'USER_GROUPS_CUSTOM' => ($user_mode == 'user' && isset($user_groups_custom[$ug_id]) && sizeof($user_groups_custom[$ug_id])) ? implode($user->lang['COMMA_SEPARATOR'], $user_groups_custom[$ug_id]) : '',
'L_ACL_TYPE' => $l_acl_type, 'L_ACL_TYPE' => $l_acl_type,
'S_LOCAL' => ($local) ? true : false, 'S_LOCAL' => ($local) ? true : false,

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) if ($add_log)
{ {
add_log('admin', 'LOG_FORUM_COPIED_PERMISSIONS', $src_forum_name, implode(', ', $dest_forum_names)); add_log('admin', 'LOG_FORUM_COPIED_PERMISSIONS', $src_forum_name, implode($user->lang['COMMA_SEPARATOR'], $dest_forum_names));
} }
$db->sql_transaction('commit'); $db->sql_transaction('commit');

4
phpBB/includes/functions_display.php
View file

@ -411,7 +411,7 @@ function display_forums($root_data = '', $display_moderators = true, $return_mod
if ($display_moderators && !empty($forum_moderators[$forum_id])) if ($display_moderators && !empty($forum_moderators[$forum_id]))
{ {
$l_moderator = (sizeof($forum_moderators[$forum_id]) == 1) ? $user->lang['MODERATOR'] : $user->lang['MODERATORS']; $l_moderator = (sizeof($forum_moderators[$forum_id]) == 1) ? $user->lang['MODERATOR'] : $user->lang['MODERATORS'];
$moderators_list = implode(', ', $forum_moderators[$forum_id]); $moderators_list = implode($user->lang['COMMA_SEPARATOR'], $forum_moderators[$forum_id]);
} }
$l_post_click_count = ($row['forum_type'] == FORUM_LINK) ? 'CLICKS' : 'POSTS'; $l_post_click_count = ($row['forum_type'] == FORUM_LINK) ? 'CLICKS' : 'POSTS';
@ -422,7 +422,7 @@ function display_forums($root_data = '', $display_moderators = true, $return_mod
{ {
$s_subforums_list[] = '<a href="' . $subforum['link'] . '" class="subforum ' . (($subforum['unread']) ? 'unread' : 'read') . '" title="' . (($subforum['unread']) ? $user->lang['UNREAD_POSTS'] : $user->lang['NO_UNREAD_POSTS']) . '">' . $subforum['name'] . '</a>'; $s_subforums_list[] = '<a href="' . $subforum['link'] . '" class="subforum ' . (($subforum['unread']) ? 'unread' : 'read') . '" title="' . (($subforum['unread']) ? $user->lang['UNREAD_POSTS'] : $user->lang['NO_UNREAD_POSTS']) . '">' . $subforum['name'] . '</a>';
} }
$s_subforums_list = (string) implode(', ', $s_subforums_list); $s_subforums_list = (string) implode($user->lang['COMMA_SEPARATOR'], $s_subforums_list);
$catless = ($row['parent_id'] == $root_data['forum_id']) ? true : false; $catless = ($row['parent_id'] == $root_data['forum_id']) ? true : false;
if ($row['forum_type'] != FORUM_LINK) if ($row['forum_type'] != FORUM_LINK)

2
phpBB/includes/functions_privmsgs.php
View file

@ -2045,7 +2045,7 @@ function message_history($msg_id, $user_id, $message_row, $folder, $in_post_mode
'SUBJECT' => $subject, 'SUBJECT' => $subject,
'SENT_DATE' => $user->format_date($row['message_time']), 'SENT_DATE' => $user->format_date($row['message_time']),
'MESSAGE' => $message, 'MESSAGE' => $message,
'FOLDER' => implode(', ', $row['folder']), 'FOLDER' => implode($user->lang['COMMA_SEPARATOR'], $row['folder']),
'DECODED_MESSAGE' => $decoded_message, 'DECODED_MESSAGE' => $decoded_message,
'S_CURRENT_MSG' => ($row['msg_id'] == $msg_id), 'S_CURRENT_MSG' => ($row['msg_id'] == $msg_id),

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); $db->sql_query($sql);
$ban_list = (!is_array($ban)) ? array_unique(explode("\n", $ban)) : $ban; $ban_list = (!is_array($ban)) ? array_unique(explode("\n", $ban)) : $ban;
$ban_list_log = implode(', ', $ban_list); $ban_list_log = implode($user->lang['COMMA_SEPARATOR'], $ban_list);
$current_time = time(); $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'); $log = ($leader) ? 'LOG_MODS_ADDED' : (($pending) ? 'LOG_USERS_PENDING' : 'LOG_USERS_ADDED');
add_log('admin', $log, $group_name, implode(', ', $username_ary)); add_log('admin', $log, $group_name, implode($user->lang['COMMA_SEPARATOR'], $username_ary));
group_update_listings($group_id); 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) if ($group_name)
{ {
add_log('admin', $log, $group_name, implode(', ', $username_ary)); add_log('admin', $log, $group_name, implode($user->lang['COMMA_SEPARATOR'], $username_ary));
} }
group_update_listings($group_id); 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 // Clear permissions cache of relevant users
$auth->acl_clear_prefetch($user_id_ary); $auth->acl_clear_prefetch($user_id_ary);
add_log('admin', $log, $group_name, implode(', ', $username_ary)); add_log('admin', $log, $group_name, implode($user->lang['COMMA_SEPARATOR'], $username_ary));
group_update_listings($group_id); group_update_listings($group_id);

5
phpBB/includes/ucp/ucp_groups.php
View file

@ -846,7 +846,7 @@ class ucp_groups
$base_url = $this->u_action . "&amp;action=$action&amp;g=$group_id"; $base_url = $this->u_action . "&amp;action=$action&amp;g=$group_id";
phpbb_generate_template_pagination($template, $base_url, 'pagination', 'start', $total_members, $config['topics_per_page'], $start); phpbb_generate_template_pagination($template, $base_url, 'pagination', 'start', $total_members, $config['topics_per_page'], $start);
$template->assign_vars(array( $template->assign_vars(array(
'S_LIST' => true, 'S_LIST' => true,
'S_ACTION_OPTIONS' => $s_action_options, 'S_ACTION_OPTIONS' => $s_action_options,
@ -1069,7 +1069,8 @@ class ucp_groups
'mode' => $mode, 'mode' => $mode,
'action' => $action 'action' => $action
); );
confirm_box(false, $user->lang('GROUP_CONFIRM_ADD_USERS', sizeof($name_ary), implode(', ', $name_ary)), build_hidden_fields($s_hidden_fields));
confirm_box(false, $user->lang('GROUP_CONFIRM_ADD_USERS', sizeof($name_ary), implode($user->lang['COMMA_SEPARATOR'], $name_ary)), build_hidden_fields($s_hidden_fields));
} }
trigger_error($user->lang['NO_USERS_ADDED'] . '<br /><br />' . sprintf($user->lang['RETURN_PAGE'], '<a href="' . $this->u_action . '&amp;action=list&amp;g=' . $group_id . '">', '</a>')); trigger_error($user->lang['NO_USERS_ADDED'] . '<br /><br />' . sprintf($user->lang['RETURN_PAGE'], '<a href="' . $this->u_action . '&amp;action=list&amp;g=' . $group_id . '">', '</a>'));

2
phpBB/includes/ucp/ucp_pm_compose.php
View file

@ -874,7 +874,7 @@ function compose_pm($id, $mode, $action, $user_folders = array())
$forward_text[] = sprintf($user->lang['FWD_SUBJECT'], censor_text($message_subject)); $forward_text[] = sprintf($user->lang['FWD_SUBJECT'], censor_text($message_subject));
$forward_text[] = sprintf($user->lang['FWD_DATE'], $user->format_date($message_time, false, true)); $forward_text[] = sprintf($user->lang['FWD_DATE'], $user->format_date($message_time, false, true));
$forward_text[] = sprintf($user->lang['FWD_FROM'], $quote_username_text); $forward_text[] = sprintf($user->lang['FWD_FROM'], $quote_username_text);
$forward_text[] = sprintf($user->lang['FWD_TO'], implode(', ', $fwd_to_field['to'])); $forward_text[] = sprintf($user->lang['FWD_TO'], implode($user->lang['COMMA_SEPARATOR'], $fwd_to_field['to']));
$message_parser->message = implode("\n", $forward_text) . "\n\n[quote=&quot;{$quote_username}&quot;]\n" . censor_text(trim($message_parser->message)) . "\n[/quote]"; $message_parser->message = implode("\n", $forward_text) . "\n\n[quote=&quot;{$quote_username}&quot;]\n" . censor_text(trim($message_parser->message)) . "\n[/quote]";
$message_subject = ((!preg_match('/^Fwd:/', $message_subject)) ? 'Fwd: ' : '') . censor_text($message_subject); $message_subject = ((!preg_match('/^Fwd:/', $message_subject)) ? 'Fwd: ' : '') . censor_text($message_subject);

8
phpBB/includes/ucp/ucp_pm_viewfolder.php
View file

@ -176,7 +176,7 @@ function view_folder($id, $mode, $folder_id, $folder)
'U_VIEW_PM' => ($row['pm_deleted']) ? '' : $view_message_url, 'U_VIEW_PM' => ($row['pm_deleted']) ? '' : $view_message_url,
'U_REMOVE_PM' => ($row['pm_deleted']) ? $remove_message_url : '', 'U_REMOVE_PM' => ($row['pm_deleted']) ? $remove_message_url : '',
'U_MCP_REPORT' => (isset($row['report_id'])) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=pm_reports&amp;mode=pm_report_details&amp;r=' . $row['report_id']) : '', 'U_MCP_REPORT' => (isset($row['report_id'])) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=pm_reports&amp;mode=pm_report_details&amp;r=' . $row['report_id']) : '',
'RECIPIENTS' => ($folder_id == PRIVMSGS_OUTBOX || $folder_id == PRIVMSGS_SENTBOX) ? implode(', ', $address_list[$message_id]) : '') 'RECIPIENTS' => ($folder_id == PRIVMSGS_OUTBOX || $folder_id == PRIVMSGS_SENTBOX) ? implode($user->lang['COMMA_SEPARATOR'], $address_list[$message_id]) : '')
); );
} }
unset($folder_info['rowset']); unset($folder_info['rowset']);
@ -266,9 +266,9 @@ function view_folder($id, $mode, $folder_id, $folder)
} }
} }
// There is the chance that all recipients of the message got deleted. To avoid creating // There is the chance that all recipients of the message got deleted. To avoid creating
// exports without recipients, we add a bogus "undisclosed recipient". // exports without recipients, we add a bogus "undisclosed recipient".
if (!(isset($address[$message_id]['g']) && sizeof($address[$message_id]['g'])) && if (!(isset($address[$message_id]['g']) && sizeof($address[$message_id]['g'])) &&
!(isset($address[$message_id]['u']) && sizeof($address[$message_id]['u']))) !(isset($address[$message_id]['u']) && sizeof($address[$message_id]['u'])))
{ {
$address[$message_id]['u'] = array(); $address[$message_id]['u'] = array();
@ -277,7 +277,7 @@ function view_folder($id, $mode, $folder_id, $folder)
} }
decode_message($message_row['message_text'], $message_row['bbcode_uid']); decode_message($message_row['message_text'], $message_row['bbcode_uid']);
$data[] = array( $data[] = array(
'subject' => censor_text($row['message_subject']), 'subject' => censor_text($row['message_subject']),
'sender' => $row['username'], 'sender' => $row['username'],

2
phpBB/index.php
View file

@ -104,7 +104,7 @@ while ($row = $db->sql_fetchrow($result))
} }
$db->sql_freeresult($result); $db->sql_freeresult($result);
$legend = implode(', ', $legend); $legend = implode($user->lang['COMMA_SEPARATOR'], $legend);
// Generate birthday list if required ... // Generate birthday list if required ...
$birthday_list = array(); $birthday_list = array();

2
phpBB/install/install_convert.php
View file

@ -933,7 +933,7 @@ class install_convert extends module
} }
else if (sizeof($missing_tables)) else if (sizeof($missing_tables))
{ {
$this->p_master->error(sprintf($user->lang['TABLES_MISSING'], implode(', ', $missing_tables)) . '<br /><br />' . $user->lang['CHECK_TABLE_PREFIX'], __LINE__, __FILE__); $this->p_master->error(sprintf($user->lang['TABLES_MISSING'], implode($user->lang['COMMA_SEPARATOR'], $missing_tables)) . '<br /><br />' . $user->lang['CHECK_TABLE_PREFIX'], __LINE__, __FILE__);
} }
$url = $this->save_convert_progress('&amp;confirm=1'); $url = $this->save_convert_progress('&amp;confirm=1');

2
phpBB/language/en/common.php
View file

@ -134,7 +134,7 @@ $lang = array_merge($lang, array(
'COLLAPSE_VIEW' => 'Collapse view', 'COLLAPSE_VIEW' => 'Collapse view',
'CLOSE_WINDOW' => 'Close window', 'CLOSE_WINDOW' => 'Close window',
'COLOUR_SWATCH' => 'Colour swatch', 'COLOUR_SWATCH' => 'Colour swatch',
'COMMA_SEPARATOR' => ', ', // Used in pagination of ACP & prosilver, use localised comma if appropriate, eg: Ideographic or Arabic 'COMMA_SEPARATOR' => ', ', // Comma used to join lists into a single string, use localised comma if appropriate, eg: Ideographic or Arabic
'CONFIRM' => 'Confirm', 'CONFIRM' => 'Confirm',
'CONFIRM_CODE' => 'Confirmation code', 'CONFIRM_CODE' => 'Confirmation code',
'CONFIRM_CODE_EXPLAIN' => 'Enter the code exactly as it appears. All letters are case insensitive.', 'CONFIRM_CODE_EXPLAIN' => 'Enter the code exactly as it appears. All letters are case insensitive.',

2
phpBB/posting.php
View file

@ -1362,7 +1362,7 @@ $template->assign_vars(array(
'FORUM_NAME' => $post_data['forum_name'], 'FORUM_NAME' => $post_data['forum_name'],
'FORUM_DESC' => ($post_data['forum_desc']) ? generate_text_for_display($post_data['forum_desc'], $post_data['forum_desc_uid'], $post_data['forum_desc_bitfield'], $post_data['forum_desc_options']) : '', 'FORUM_DESC' => ($post_data['forum_desc']) ? generate_text_for_display($post_data['forum_desc'], $post_data['forum_desc_uid'], $post_data['forum_desc_bitfield'], $post_data['forum_desc_options']) : '',
'TOPIC_TITLE' => censor_text($post_data['topic_title']), 'TOPIC_TITLE' => censor_text($post_data['topic_title']),
'MODERATORS' => (sizeof($moderators)) ? implode(', ', $moderators[$forum_id]) : '', 'MODERATORS' => (sizeof($moderators)) ? implode($user->lang['COMMA_SEPARATOR'], $moderators[$forum_id]) : '',
'USERNAME' => ((!$preview && $mode != 'quote') || $preview) ? $post_data['username'] : '', 'USERNAME' => ((!$preview && $mode != 'quote') || $preview) ? $post_data['username'] : '',
'SUBJECT' => $post_data['post_subject'], 'SUBJECT' => $post_data['post_subject'],
'MESSAGE' => $post_data['post_text'], 'MESSAGE' => $post_data['post_text'],

2
phpBB/viewforum.php
View file

@ -289,7 +289,7 @@ if (!empty($_EXTRA_URL))
} }
$template->assign_vars(array( $template->assign_vars(array(
'MODERATORS' => (!empty($moderators[$forum_id])) ? implode(', ', $moderators[$forum_id]) : '', 'MODERATORS' => (!empty($moderators[$forum_id])) ? implode($user->lang['COMMA_SEPARATOR'], $moderators[$forum_id]) : '',
'POST_IMG' => ($forum_data['forum_status'] == ITEM_LOCKED) ? $user->img('button_topic_locked', $post_alt) : $user->img('button_topic_new', $post_alt), 'POST_IMG' => ($forum_data['forum_status'] == ITEM_LOCKED) ? $user->img('button_topic_locked', $post_alt) : $user->img('button_topic_new', $post_alt),
'NEWEST_POST_IMG' => $user->img('icon_topic_newest', 'VIEW_NEWEST_POST'), 'NEWEST_POST_IMG' => $user->img('icon_topic_newest', 'VIEW_NEWEST_POST'),

2
phpBB/viewtopic.php
View file

@ -602,7 +602,7 @@ $template->assign_vars(array(
'PAGE_NUMBER' => phpbb_on_page($template, $user, $base_url, $total_posts, $config['posts_per_page'], $start), 'PAGE_NUMBER' => phpbb_on_page($template, $user, $base_url, $total_posts, $config['posts_per_page'], $start),
'TOTAL_POSTS' => $user->lang('VIEW_TOPIC_POSTS', (int) $total_posts), 'TOTAL_POSTS' => $user->lang('VIEW_TOPIC_POSTS', (int) $total_posts),
'U_MCP' => ($auth->acl_get('m_', $forum_id)) ? append_sid("{$phpbb_root_path}mcp.$phpEx", "i=main&amp;mode=topic_view&amp;f=$forum_id&amp;t=$topic_id" . (($start == 0) ? '' : "&amp;start=$start") . ((strlen($u_sort_param)) ? "&amp;$u_sort_param" : ''), true, $user->session_id) : '', 'U_MCP' => ($auth->acl_get('m_', $forum_id)) ? append_sid("{$phpbb_root_path}mcp.$phpEx", "i=main&amp;mode=topic_view&amp;f=$forum_id&amp;t=$topic_id" . (($start == 0) ? '' : "&amp;start=$start") . ((strlen($u_sort_param)) ? "&amp;$u_sort_param" : ''), true, $user->session_id) : '',
'MODERATORS' => (isset($forum_moderators[$forum_id]) && sizeof($forum_moderators[$forum_id])) ? implode(', ', $forum_moderators[$forum_id]) : '', 'MODERATORS' => (isset($forum_moderators[$forum_id]) && sizeof($forum_moderators[$forum_id])) ? implode($user->lang['COMMA_SEPARATOR'], $forum_moderators[$forum_id]) : '',
'POST_IMG' => ($topic_data['forum_status'] == ITEM_LOCKED) ? $user->img('button_topic_locked', 'FORUM_LOCKED') : $user->img('button_topic_new', 'POST_NEW_TOPIC'), 'POST_IMG' => ($topic_data['forum_status'] == ITEM_LOCKED) ? $user->img('button_topic_locked', 'FORUM_LOCKED') : $user->img('button_topic_new', 'POST_NEW_TOPIC'),
'QUOTE_IMG' => $user->img('icon_post_quote', 'REPLY_WITH_QUOTE'), 'QUOTE_IMG' => $user->img('icon_post_quote', 'REPLY_WITH_QUOTE'),