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

Merge pull request #2366 from bantu/ticket/12458

Browse source 
[ticket/12458] Apply Squiz.WhiteSpace.SuperfluousWhitespace.* to legacy code

* bantu/ticket/12458:
  [ticket/12458] Apply Squiz.WhiteSpace.SuperfluousWhitespace.* to legacy code.
This commit is contained in:
Joas Schilling 2014-04-29 20:40:06 +02:00
commit 417a0d0ea6
48 changed files with 94 additions and 140 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
build/code_sniffer/ruleset-php-legacy.xml
View file

@ -41,6 +41,18 @@
</rule> </rule>
<rule ref="Squiz.Functions.FunctionDeclarationArgumentSpacing.SpacingAfterHint" /> <rule ref="Squiz.Functions.FunctionDeclarationArgumentSpacing.SpacingAfterHint" />
<!-- There MUST NOT be trailing whitespace at the end of lines. -->
<rule ref="Squiz.WhiteSpace.SuperfluousWhitespace" />
<!-- There MUST NOT be whitespace before the first content of a file -->
<rule ref="Squiz.WhiteSpace.SuperfluousWhitespace.StartFile" />
<!-- There MUST NOT be whitespace after the last content of a file -->
<rule ref="Squiz.WhiteSpace.SuperfluousWhitespace.EndFile" />
<!-- Functions MUST NOT contain multiple empty lines in a row -->
<rule ref="Squiz.WhiteSpace.SuperfluousWhitespace.EmptyLines" />
<!-- The ?> closing tag MUST be omitted from files containing only PHP. --> <!-- The ?> closing tag MUST be omitted from files containing only PHP. -->
<rule ref="Zend.Files.ClosingTag" /> <rule ref="Zend.Files.ClosingTag" />

12
build/code_sniffer/ruleset-php-strict.xml
View file

@ -22,18 +22,6 @@
<!-- PHP keywords MUST be in lower case. --> <!-- PHP keywords MUST be in lower case. -->
<rule ref="Generic.PHP.LowerCaseKeyword" /> <rule ref="Generic.PHP.LowerCaseKeyword" />
<!-- There MUST NOT be trailing whitespace at the end of lines. -->
<rule ref="Squiz.WhiteSpace.SuperfluousWhitespace" />
<!-- There MUST NOT be whitespace before the first content of a file -->
<rule ref="Squiz.WhiteSpace.SuperfluousWhitespace.StartFile" />
<!-- There MUST NOT be whitespace after the last content of a file -->
<rule ref="Squiz.WhiteSpace.SuperfluousWhitespace.EndFile" />
<!-- Functions MUST NOT contain multiple empty lines in a row -->
<rule ref="Squiz.WhiteSpace.SuperfluousWhitespace.EmptyLines" />
<!-- Classes etc. MUST be namespaced --> <!-- Classes etc. MUST be namespaced -->
<rule ref="PSR1.Classes.ClassDeclaration.MissingNamespace" /> <rule ref="PSR1.Classes.ClassDeclaration.MissingNamespace" />

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

@ -147,7 +147,6 @@ class acp_attachments
'secure_allow_empty_referer' => array('lang' => 'SECURE_EMPTY_REFERRER', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true), 'secure_allow_empty_referer' => array('lang' => 'SECURE_EMPTY_REFERRER', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true),
'check_attachment_content' => array('lang' => 'CHECK_CONTENT', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true), 'check_attachment_content' => array('lang' => 'CHECK_CONTENT', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true),
'legend2' => $l_legend_cat_images, 'legend2' => $l_legend_cat_images,
'img_display_inlined' => array('lang' => 'DISPLAY_INLINED', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true), 'img_display_inlined' => array('lang' => 'DISPLAY_INLINED', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true),
'img_create_thumbnail' => array('lang' => 'CREATE_THUMBNAIL', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true), 'img_create_thumbnail' => array('lang' => 'CREATE_THUMBNAIL', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true),

1
phpBB/includes/acp/acp_bbcodes.php
View file

@ -210,7 +210,6 @@ class acp_bbcodes
trigger_error($user->lang['BBCODE_TAG_DEF_TOO_LONG'] . adm_back_link($this->u_action), E_USER_WARNING); trigger_error($user->lang['BBCODE_TAG_DEF_TOO_LONG'] . adm_back_link($this->u_action), E_USER_WARNING);
} }
if (strlen($bbcode_helpline) > 255) if (strlen($bbcode_helpline) > 255)
{ {
trigger_error($user->lang['BBCODE_HELPLINE_TOO_LONG'] . adm_back_link($this->u_action), E_USER_WARNING); trigger_error($user->lang['BBCODE_HELPLINE_TOO_LONG'] . adm_back_link($this->u_action), E_USER_WARNING);

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

@ -220,7 +220,6 @@ class acp_bots
trigger_error($user->lang['NO_BOT_GROUP'] . adm_back_link($this->u_action . "&amp;id=$bot_id&amp;action=$action"), E_USER_WARNING); trigger_error($user->lang['NO_BOT_GROUP'] . adm_back_link($this->u_action . "&amp;id=$bot_id&amp;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,
'group_id' => (int) $group_row['group_id'], 'group_id' => (int) $group_row['group_id'],

1
phpBB/includes/acp/acp_captcha.php
View file

@ -36,7 +36,6 @@ class acp_captcha
$selected = (isset($captchas['available'][$selected]) || isset($captchas['unavailable'][$selected])) ? $selected : $config['captcha_plugin']; $selected = (isset($captchas['available'][$selected]) || isset($captchas['unavailable'][$selected])) ? $selected : $config['captcha_plugin'];
$configure = request_var('configure', false); $configure = request_var('configure', false);
// Oh, they are just here for the view // Oh, they are just here for the view
if (isset($_GET['captcha_demo'])) if (isset($_GET['captcha_demo']))
{ {

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

@ -1180,7 +1180,6 @@ class postgres_extractor extends base_extractor
} }
$db->sql_freeresult($result); $db->sql_freeresult($result);
// Get the listing of primary keys. // Get the listing of primary keys.
$sql_pri_keys = "SELECT ic.relname as index_name, bc.relname as tab_name, ta.attname as column_name, i.indisunique as unique_key, i.indisprimary as primary_key $sql_pri_keys = "SELECT ic.relname as index_name, bc.relname as tab_name, ta.attname as column_name, i.indisunique as unique_key, i.indisprimary as primary_key
FROM pg_class bc, pg_class ic, pg_index i, pg_attribute ta, pg_attribute ia FROM pg_class bc, pg_class ic, pg_index i, pg_attribute ta, pg_attribute ia
@ -1280,7 +1279,6 @@ class postgres_extractor extends base_extractor
$ary_type[] = pg_field_type($result, $i); $ary_type[] = pg_field_type($result, $i);
$ary_name[] = pg_field_name($result, $i); $ary_name[] = pg_field_name($result, $i);
$sql = "SELECT pg_get_expr(d.adbin, d.adrelid) as rowdefault $sql = "SELECT pg_get_expr(d.adbin, d.adrelid) as rowdefault
FROM pg_attrdef d, pg_class c FROM pg_attrdef d, pg_class c
WHERE (c.relname = '{$table_name}') WHERE (c.relname = '{$table_name}')

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

@ -53,7 +53,6 @@ class acp_groups
$start = request_var('start', 0); $start = request_var('start', 0);
$update = (isset($_POST['update'])) ? true : false; $update = (isset($_POST['update'])) ? true : false;
// Clear some vars // Clear some vars
$group_row = array(); $group_row = array();
@ -331,7 +330,6 @@ class acp_groups
} }
} }
// Did we submit? // Did we submit?
if ($update) if ($update)
{ {

1
phpBB/includes/acp/acp_icons.php
View file

@ -203,7 +203,6 @@ class acp_icons
unset($_images[$row[$fields . '_url']]); unset($_images[$row[$fields . '_url']]);
} }
if ($row[$fields . '_id'] == $icon_id) if ($row[$fields . '_id'] == $icon_id)
{ {
$after = true; $after = true;

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

@ -330,7 +330,6 @@ class acp_permissions
} }
} }
// Setting permissions screen // Setting permissions screen
$s_hidden_fields = build_hidden_fields(array( $s_hidden_fields = build_hidden_fields(array(
'user_id' => $user_id, 'user_id' => $user_id,

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

@ -485,7 +485,6 @@ class acp_profile
} }
$db->sql_freeresult($result); $db->sql_freeresult($result);
$sql = 'SELECT lang_id, lang_name, lang_explain, lang_default_value $sql = 'SELECT lang_id, lang_name, lang_explain, lang_default_value
FROM ' . PROFILE_LANG_TABLE . ' FROM ' . PROFILE_LANG_TABLE . '
WHERE lang_id <> ' . $this->edit_lang_id . " WHERE lang_id <> ' . $this->edit_lang_id . "
@ -1116,7 +1115,6 @@ class acp_profile
} }
} }
$db->sql_transaction('begin'); $db->sql_transaction('begin');
if ($action == 'create') if ($action == 'create')

1
phpBB/includes/acp/acp_ranks.php
View file

@ -214,7 +214,6 @@ class acp_ranks
'MIN_POSTS' => (isset($ranks['rank_min']) && !$ranks['rank_special']) ? $ranks['rank_min'] : 0) 'MIN_POSTS' => (isset($ranks['rank_min']) && !$ranks['rank_special']) ? $ranks['rank_min'] : 0)
); );
return; return;
break; break;

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

@ -735,7 +735,6 @@ class acp_users
sync('forum', 'forum_id', $forum_id_ary, false, true); sync('forum', 'forum_id', $forum_id_ary, false, true);
} }
add_log('admin', 'LOG_USER_MOVE_POSTS', $user_row['username'], $forum_info['forum_name']); add_log('admin', 'LOG_USER_MOVE_POSTS', $user_row['username'], $forum_info['forum_name']);
add_log('user', $user_id, 'LOG_USER_MOVE_POSTS_USER', $forum_info['forum_name']); add_log('user', $user_id, 'LOG_USER_MOVE_POSTS_USER', $forum_info['forum_name']);
@ -1329,7 +1328,6 @@ class acp_users
} }
} }
$template->assign_block_vars('warn', array( $template->assign_block_vars('warn', array(
'ID' => $row['warning_id'], 'ID' => $row['warning_id'],
'USERNAME' => ($row['log_operation']) ? get_username_string('full', $row['mod_user_id'], $row['mod_username'], $row['mod_user_colour']) : '-', 'USERNAME' => ($row['log_operation']) ? get_username_string('full', $row['mod_user_id'], $row['mod_username'], $row['mod_user_colour']) : '-',
@ -1379,7 +1377,6 @@ class acp_users
$data['bday_year'] = request_var('bday_year', $data['bday_year']); $data['bday_year'] = request_var('bday_year', $data['bday_year']);
$data['user_birthday'] = sprintf('%2d-%2d-%4d', $data['bday_day'], $data['bday_month'], $data['bday_year']); $data['user_birthday'] = sprintf('%2d-%2d-%4d', $data['bday_day'], $data['bday_month'], $data['bday_year']);
if ($submit) if ($submit)
{ {
$error = validate_data($data, array( $error = validate_data($data, array(
@ -2243,7 +2240,6 @@ class acp_users
$error = array(); $error = array();
} }
$sql = 'SELECT ug.*, g.* $sql = 'SELECT ug.*, g.*
FROM ' . GROUPS_TABLE . ' g, ' . USER_GROUP_TABLE . " ug FROM ' . GROUPS_TABLE . ' g, ' . USER_GROUP_TABLE . " ug
WHERE ug.user_id = $user_id WHERE ug.user_id = $user_id

1
phpBB/includes/acp/acp_words.php
View file

@ -162,7 +162,6 @@ class acp_words
break; break;
} }
$template->assign_vars(array( $template->assign_vars(array(
'U_ACTION' => $this->u_action, 'U_ACTION' => $this->u_action,
'S_HIDDEN_FIELDS' => $s_hidden_fields) 'S_HIDDEN_FIELDS' => $s_hidden_fields)

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

@ -139,7 +139,6 @@ class auth_admin extends \phpbb\auth\auth
$auth2 = &$auth; $auth2 = &$auth;
} }
$hold_ary[$userdata['user_id']] = array(); $hold_ary[$userdata['user_id']] = array();
foreach ($forum_ids as $f_id) foreach ($forum_ids as $f_id)
{ {

1
phpBB/includes/captcha/captcha_gd.php
View file

@ -2352,7 +2352,6 @@ class colour_manager
$colour3[0] += 180; $colour3[0] += 180;
$colour4[0] += 210; $colour4[0] += 210;
$results[] = $this->allocate($colour2, $mode); $results[] = $this->allocate($colour2, $mode);
$results[] = $this->allocate($colour3, $mode); $results[] = $this->allocate($colour3, $mode);
$results[] = $this->allocate($colour4, $mode); $results[] = $this->allocate($colour4, $mode);

1
phpBB/includes/functions.php
View file

@ -2694,7 +2694,6 @@ function confirm_box($check, $title = '', $hidden = '', $html_body = 'confirm_bo
WHERE user_id = " . $user->data['user_id']; WHERE user_id = " . $user->data['user_id'];
$db->sql_query($sql); $db->sql_query($sql);
if ($request->is_ajax()) if ($request->is_ajax())
{ {
$u_action .= '&confirm_uid=' . $user->data['user_id'] . '&sess=' . $user->session_id . '&sid=' . $user->session_id; $u_action .= '&confirm_uid=' . $user->data['user_id'] . '&sess=' . $user->session_id . '&sid=' . $user->session_id;

1
phpBB/includes/functions_display.php
View file

@ -900,7 +900,6 @@ function topic_status(&$topic_row, $replies, $unread_topic, &$folder_img, &$fold
$folder_new .= '_locked'; $folder_new .= '_locked';
} }
$folder_img = ($unread_topic) ? $folder_new : $folder; $folder_img = ($unread_topic) ? $folder_new : $folder;
$folder_alt = ($unread_topic) ? 'UNREAD_POSTS' : (($topic_row['topic_status'] == ITEM_LOCKED) ? 'TOPIC_LOCKED' : 'NO_UNREAD_POSTS'); $folder_alt = ($unread_topic) ? 'UNREAD_POSTS' : (($topic_row['topic_status'] == ITEM_LOCKED) ? 'TOPIC_LOCKED' : 'NO_UNREAD_POSTS');

1
phpBB/includes/functions_posting.php
View file

@ -173,7 +173,6 @@ function update_post_information($type, $ids, $return_update_sql = false)
$ids = array($ids); $ids = array($ids);
} }
$update_sql = $empty_forums = $not_empty_forums = array(); $update_sql = $empty_forums = $not_empty_forums = array();
if ($type != 'topic') if ($type != 'topic')

1
phpBB/includes/functions_privmsgs.php
View file

@ -314,7 +314,6 @@ function check_rule(&$rules, &$rule_row, &$message_row, $user_id)
break; break;
} }
if (!$result) if (!$result)
{ {
return false; return false;

1
phpBB/includes/functions_user.php
View file

@ -2086,7 +2086,6 @@ function get_avatar_filename($avatar_entry)
{ {
global $config; global $config;
if ($avatar_entry[0] === 'g') if ($avatar_entry[0] === 'g')
{ {
$avatar_group = true; $avatar_group = true;

3
phpBB/includes/mcp/mcp_queue.php
View file

@ -298,7 +298,6 @@ class mcp_queue
'MINI_POST_IMG' => ($post_unread) ? $user->img('icon_post_target_unread', 'UNREAD_POST') : $user->img('icon_post_target', 'POST'), 'MINI_POST_IMG' => ($post_unread) ? $user->img('icon_post_target_unread', 'UNREAD_POST') : $user->img('icon_post_target', 'POST'),
'RETURN_QUEUE' => sprintf($user->lang['RETURN_QUEUE'], '<a href="' . append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=queue' . (($topic_id) ? '&amp;mode=unapproved_topics' : '&amp;mode=unapproved_posts')) . '&amp;start=' . $start . '">', '</a>'), 'RETURN_QUEUE' => sprintf($user->lang['RETURN_QUEUE'], '<a href="' . append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=queue' . (($topic_id) ? '&amp;mode=unapproved_topics' : '&amp;mode=unapproved_posts')) . '&amp;start=' . $start . '">', '</a>'),
'RETURN_POST' => sprintf($user->lang['RETURN_POST'], '<a href="' . $post_url . '">', '</a>'), 'RETURN_POST' => sprintf($user->lang['RETURN_POST'], '<a href="' . $post_url . '">', '</a>'),
'RETURN_TOPIC_SIMPLE' => sprintf($user->lang['RETURN_TOPIC_SIMPLE'], '<a href="' . $topic_url . '">', '</a>'), 'RETURN_TOPIC_SIMPLE' => sprintf($user->lang['RETURN_TOPIC_SIMPLE'], '<a href="' . $topic_url . '">', '</a>'),
@ -1126,7 +1125,6 @@ class mcp_queue
$post_data['disapprove_reason'] .= ($reason) ? "\n\n" . $reason : ''; $post_data['disapprove_reason'] .= ($reason) ? "\n\n" . $reason : '';
} }
if ($disapprove_all_posts_in_topic && $topic_information[$topic_id]['topic_posts_unapproved'] == 1) if ($disapprove_all_posts_in_topic && $topic_information[$topic_id]['topic_posts_unapproved'] == 1)
{ {
// If there is only 1 post when disapproving the topic, // If there is only 1 post when disapproving the topic,
@ -1144,7 +1142,6 @@ class mcp_queue
unset($lang_reasons, $post_info, $disapprove_reason, $disapprove_reason_lang); unset($lang_reasons, $post_info, $disapprove_reason, $disapprove_reason_lang);
if ($num_disapproved_topics) if ($num_disapproved_topics)
{ {
$success_msg = ($num_disapproved_topics == 1) ? 'TOPIC' : 'TOPICS'; $success_msg = ($num_disapproved_topics == 1) ? 'TOPIC' : 'TOPICS';

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

@ -144,7 +144,6 @@ class mcp_reports
$post_unread = (isset($topic_tracking_info[$post_info['topic_id']]) && $post_info['post_time'] > $topic_tracking_info[$post_info['topic_id']]) ? true : false; $post_unread = (isset($topic_tracking_info[$post_info['topic_id']]) && $post_info['post_time'] > $topic_tracking_info[$post_info['topic_id']]) ? true : false;
$report['report_text'] = make_clickable(bbcode_nl2br($report['report_text'])); $report['report_text'] = make_clickable(bbcode_nl2br($report['report_text']));
if ($post_info['post_attachment'] && $auth->acl_get('u_download') && $auth->acl_get('f_download', $post_info['forum_id'])) if ($post_info['post_attachment'] && $auth->acl_get('u_download') && $auth->acl_get('f_download', $post_info['forum_id']))
@ -578,7 +577,6 @@ function close_report($report_id_list, $mode, $action, $pm = false)
} }
$db->sql_query($sql); $db->sql_query($sql);
if (sizeof($close_report_posts)) if (sizeof($close_report_posts))
{ {
if ($pm) if ($pm)

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

@ -619,7 +619,6 @@ class ucp_main
break; break;
} }
$template->assign_vars(array( $template->assign_vars(array(
'L_TITLE' => $user->lang['UCP_MAIN_' . strtoupper($mode)], 'L_TITLE' => $user->lang['UCP_MAIN_' . strtoupper($mode)],
@ -691,7 +690,6 @@ class ucp_main
AND t.topic_id = tw.topic_id AND t.topic_id = tw.topic_id
AND ' . $db->sql_in_set('t.forum_id', $forbidden_forum_ary, true, true), AND ' . $db->sql_in_set('t.forum_id', $forbidden_forum_ary, true, true),
'ORDER_BY' => 't.topic_last_post_time DESC' 'ORDER_BY' => 't.topic_last_post_time DESC'
); );

1
phpBB/includes/ucp/ucp_pm.php
View file

@ -172,7 +172,6 @@ class ucp_pm
trigger_error('NO_AUTH_READ_HOLD_MESSAGE'); trigger_error('NO_AUTH_READ_HOLD_MESSAGE');
} }
// First Handle Mark actions and moving messages // First Handle Mark actions and moving messages
$submit_mark = (isset($_POST['submit_mark'])) ? true : false; $submit_mark = (isset($_POST['submit_mark'])) ? true : false;
$move_pm = (isset($_POST['move_pm'])) ? true : false; $move_pm = (isset($_POST['move_pm'])) ? true : false;

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

@ -586,7 +586,6 @@ function compose_pm($id, $mode, $action, $user_folders = array())
); );
$s_hidden_fields .= build_address_field($address_list); $s_hidden_fields .= build_address_field($address_list);
confirm_box(false, 'SAVE_DRAFT', $s_hidden_fields); confirm_box(false, 'SAVE_DRAFT', $s_hidden_fields);
} }
} }
@ -748,7 +747,6 @@ function compose_pm($id, $mode, $action, $user_folders = array())
$return_box_url = ($action === 'post' || $action === 'edit') ? $outbox_folder_url : $inbox_folder_url; $return_box_url = ($action === 'post' || $action === 'edit') ? $outbox_folder_url : $inbox_folder_url;
$return_box_lang = ($action === 'post' || $action === 'edit') ? 'PM_OUTBOX' : 'PM_INBOX'; $return_box_lang = ($action === 'post' || $action === 'edit') ? 'PM_OUTBOX' : 'PM_INBOX';
$save_message = ($action === 'edit') ? $user->lang['MESSAGE_EDITED'] : $user->lang['MESSAGE_STORED']; $save_message = ($action === 'edit') ? $user->lang['MESSAGE_EDITED'] : $user->lang['MESSAGE_STORED'];
$message = $save_message . '<br /><br />' . $user->lang('VIEW_PRIVATE_MESSAGE', '<a href="' . $return_message_url . '">', '</a>'); $message = $save_message . '<br /><br />' . $user->lang('VIEW_PRIVATE_MESSAGE', '<a href="' . $return_message_url . '">', '</a>');
@ -1006,7 +1004,6 @@ function compose_pm($id, $mode, $action, $user_folders = array())
// Build hidden address list // Build hidden address list
$s_hidden_address_field = build_address_field($address_list); $s_hidden_address_field = build_address_field($address_list);
$bbcode_checked = (isset($enable_bbcode)) ? !$enable_bbcode : (($config['allow_bbcode'] && $auth->acl_get('u_pm_bbcode')) ? !$user->optionget('bbcode') : 1); $bbcode_checked = (isset($enable_bbcode)) ? !$enable_bbcode : (($config['allow_bbcode'] && $auth->acl_get('u_pm_bbcode')) ? !$user->optionget('bbcode') : 1);
$smilies_checked = (isset($enable_smilies)) ? !$enable_smilies : (($config['allow_smilies'] && $auth->acl_get('u_pm_smilies')) ? !$user->optionget('smilies') : 1); $smilies_checked = (isset($enable_smilies)) ? !$enable_smilies : (($config['allow_smilies'] && $auth->acl_get('u_pm_smilies')) ? !$user->optionget('smilies') : 1);
$urls_checked = (isset($enable_urls)) ? !$enable_urls : 0; $urls_checked = (isset($enable_urls)) ? !$enable_urls : 0;

6
phpBB/includes/utf/utf_normalizer.php
View file

@ -479,7 +479,6 @@ class utf_normalizer
continue; continue;
} }
// STEP 1: Decompose current char // STEP 1: Decompose current char
// We have found a character that is either: // We have found a character that is either:
@ -527,7 +526,6 @@ class utf_normalizer
$utf_seq = array($utf_char); $utf_seq = array($utf_char);
} }
// STEP 2: Capture the starter // STEP 2: Capture the starter
// Check out the combining class of the first character of the UTF sequence // Check out the combining class of the first character of the UTF sequence
@ -683,7 +681,6 @@ class utf_normalizer
} }
} }
// STEP 3: Capture following combining modifiers // STEP 3: Capture following combining modifiers
while ($pos < $len) while ($pos < $len)
@ -752,7 +749,6 @@ class utf_normalizer
} }
} }
// STEP 4: Sort and combine // STEP 4: Sort and combine
// Here we sort... // Here we sort...
@ -991,7 +987,6 @@ class utf_normalizer
$tmp_pos = $last_cc = $sort = $dump = 0; $tmp_pos = $last_cc = $sort = $dump = 0;
$utf_sort = array(); $utf_sort = array();
// Main loop // Main loop
do do
{ {
@ -1047,7 +1042,6 @@ class utf_normalizer
continue; continue;
} }
// STEP 1: Decide what to do with current char // STEP 1: Decide what to do with current char
// Now, in that order: // Now, in that order:

2
phpBB/install/convertors/functions_phpbb20.php
View file

@ -71,7 +71,6 @@ function phpbb_insert_forums()
$prune_enabled = (int) $src_db->sql_fetchfield('config_value'); $prune_enabled = (int) $src_db->sql_fetchfield('config_value');
$src_db->sql_freeresult($result); $src_db->sql_freeresult($result);
// Insert categories // Insert categories
$sql = 'SELECT cat_id, cat_title $sql = 'SELECT cat_id, cat_title
FROM ' . $convert->src_table_prefix . 'categories FROM ' . $convert->src_table_prefix . 'categories
@ -571,7 +570,6 @@ function phpbb_convert_authentication($mode)
// What we will do is handling all 2.0.x admins as founder to replicate what is common in 2.0.x. // What we will do is handling all 2.0.x admins as founder to replicate what is common in 2.0.x.
// After conversion the main admin need to make sure he is removing permissions and the founder status if wanted. // After conversion the main admin need to make sure he is removing permissions and the founder status if wanted.
// Grab user ids of users with user_level of ADMIN // Grab user ids of users with user_level of ADMIN
$sql = "SELECT user_id $sql = "SELECT user_id
FROM {$convert->src_table_prefix}users FROM {$convert->src_table_prefix}users

2
phpBB/install/install_install.php
View file

@ -217,7 +217,6 @@ class install_install extends module
'S_LEGEND' => false, 'S_LEGEND' => false,
)); ));
// Check for getimagesize // Check for getimagesize
if (@function_exists('getimagesize')) if (@function_exists('getimagesize'))
{ {
@ -535,7 +534,6 @@ class install_install extends module
$url = (!in_array(false, $passed)) ? $this->p_master->module_url . "?mode=$mode&amp;sub=database&amp;language=$language" : $this->p_master->module_url . "?mode=$mode&amp;sub=requirements&amp;language=$language "; $url = (!in_array(false, $passed)) ? $this->p_master->module_url . "?mode=$mode&amp;sub=database&amp;language=$language" : $this->p_master->module_url . "?mode=$mode&amp;sub=requirements&amp;language=$language ";
$submit = (!in_array(false, $passed)) ? $lang['INSTALL_START'] : $lang['INSTALL_TEST']; $submit = (!in_array(false, $passed)) ? $lang['INSTALL_START'] : $lang['INSTALL_TEST'];
$template->assign_vars(array( $template->assign_vars(array(
'L_SUBMIT' => $submit, 'L_SUBMIT' => $submit,
'S_HIDDEN' => $s_hidden_fields, 'S_HIDDEN' => $s_hidden_fields,