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

[ticket/10990] Changes for develop

Browse source 
PHPBB3-10990
This commit is contained in:
Nathan Guse 2012-07-22 14:48:39 -05:00
parent eb5e33a768
commit 577dbf8951
7 changed files with 29 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1074,7 +1074,7 @@ class acp_attachments
$error[] = $user->lang['FILES_GONE']; $error[] = $user->lang['FILES_GONE'];
} }
add_log('admin', 'LOG_ATTACHMENTS_DELETED', implode(', ', $deleted_filenames)); add_log('admin', 'LOG_ATTACHMENTS_DELETED', implode(', ', $deleted_filenames));
$notify[] = sprintf($user->lang['LOG_ATTACHMENTS_DELETED'], implode(', ', $deleted_filenames)); $notify[] = sprintf($user->lang['LOG_ATTACHMENTS_DELETED'], implode($user->lang['COMMA_SEPARATOR'], $deleted_filenames));
} }
else else
{ {

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

@ -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;
} }
} }

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",

18
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
@ -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]);

2
phpBB/includes/mcp/mcp_pm_reports.php
View file

@ -291,7 +291,7 @@ class mcp_pm_reports
'REPORT_ID' => $row['report_id'], 'REPORT_ID' => $row['report_id'],
'REPORT_TIME' => $user->format_date($row['report_time']), 'REPORT_TIME' => $user->format_date($row['report_time']),
'RECIPIENTS' => implode(', ', $address_list[$row['msg_id']]), 'RECIPIENTS' => implode($user->lang['COMMA_SEPARATOR'], $address_list[$row['msg_id']]),
'ATTACH_ICON_IMG' => ($auth->acl_get('u_download') && $row['message_attachment']) ? $user->img('icon_topic_attach', $user->lang['TOTAL_ATTACHMENTS']) : '', 'ATTACH_ICON_IMG' => ($auth->acl_get('u_download') && $row['message_attachment']) ? $user->img('icon_topic_attach', $user->lang['TOTAL_ATTACHMENTS']) : '',
)); ));
} }

2
phpBB/includes/search/fulltext_native.php
View file

@ -334,7 +334,7 @@ class phpbb_search_fulltext_native extends phpbb_search_base
// throw an error if we shall not ignore unexistant words // throw an error if we shall not ignore unexistant words
else if (!$ignore_no_id && sizeof($non_common_words)) else if (!$ignore_no_id && sizeof($non_common_words))
{ {
trigger_error(sprintf($user->lang['WORDS_IN_NO_POST'], implode(', ', $non_common_words))); trigger_error(sprintf($user->lang['WORDS_IN_NO_POST'], implode($user->lang['COMMA_SEPARATOR'], $non_common_words)));
} }
unset($non_common_words); unset($non_common_words);
} }

2
phpBB/index.php
View file

@ -157,7 +157,7 @@ $template->assign_vars(array(
'NEWEST_USER' => $user->lang('NEWEST_USER', get_username_string('full', $config['newest_user_id'], $config['newest_username'], $config['newest_user_colour'])), 'NEWEST_USER' => $user->lang('NEWEST_USER', get_username_string('full', $config['newest_user_id'], $config['newest_username'], $config['newest_user_colour'])),
'LEGEND' => $legend, 'LEGEND' => $legend,
'BIRTHDAY_LIST' => (empty($birthday_list)) ? '' : implode(', ', $birthday_list), 'BIRTHDAY_LIST' => (empty($birthday_list)) ? '' : implode($user->lang['COMMA_SEPARATOR'], $birthday_list),
'FORUM_IMG' => $user->img('forum_read', 'NO_UNREAD_POSTS'), 'FORUM_IMG' => $user->img('forum_read', 'NO_UNREAD_POSTS'),
'FORUM_UNREAD_IMG' => $user->img('forum_unread', 'UNREAD_POSTS'), 'FORUM_UNREAD_IMG' => $user->img('forum_unread', 'UNREAD_POSTS'),