Inspection of "Fixes and updates to install/upgrade scripts" - elkarte/Elkarte - Measure and Improve Code Quality continuously with Scrutinizer

Passed

Pull Request — patch_1-1-9 (#3692)

by Spuds

created 2023-01-27 21:33 UTC

Status

Spacing +33 added lines, -33 removed lines patch added patch discarded remove patch

@@ -109,7 +109,7 @@  discard block
 block discarded – undo
 					LEFT JOIN {db_prefix}topics AS t ON (t.id_topic = m.id_topic)
 				WHERE t.id_topic IS NULL
 				GROUP BY m.id_topic, m.id_board',
-			'fix_processing' => function ($row) {
+			'fix_processing' => function($row) {
 				global $salvageBoardID;
 
 				$db = database();
@@ -197,7 +197,7 @@  discard block
 block discarded – undo
 			// Remove all topics that have zero messages in the messages table.
 			'fix_collect' => array(
 				'index' => 'id_topic',
-				'process' => function ($topics) {
+				'process' => function($topics) {
 					$db = database();
 
 					$db->query('', '
@@ -231,7 +231,7 @@  discard block
 block discarded – undo
 					LEFT JOIN {db_prefix}topics AS t ON (t.id_poll = p.id_poll)
 				WHERE p.id_poll BETWEEN {STEP_LOW} AND {STEP_HIGH}
 					AND t.id_poll IS NULL',
-			'fix_processing' => function ($row) {
+			'fix_processing' => function($row) {
 				global $salvageBoardID, $txt;
 
 				$db = database();
@@ -346,7 +346,7 @@  discard block
 block discarded – undo
 				WHERE t.id_topic BETWEEN {STEP_LOW} AND {STEP_HIGH}
 				GROUP BY t.id_topic, t.id_first_msg, t.id_last_msg, t.approved, mf.approved
 				ORDER BY t.id_topic',
-			'fix_processing' => function ($row) {
+			'fix_processing' => function($row) {
 				$row['firstmsg_approved'] = (int) $row['firstmsg_approved'];
 				$row['myid_first_msg'] = (int) $row['myid_first_msg'];
 				$row['myid_last_msg'] = (int) $row['myid_last_msg'];
@@ -366,7 +366,7 @@  discard block
 block discarded – undo
 					'approved' => $row['firstmsg_approved'],
 				));
 			},
-			'message_function' => function ($row) {
+			'message_function' => function($row) {
 				global $txt, $context;
 
 				// A pretend error?
@@ -401,7 +401,7 @@  discard block
 block discarded – undo
 				WHERE t.id_topic BETWEEN {STEP_LOW} AND {STEP_HIGH}
 				GROUP BY t.id_topic, t.num_replies, mf.approved
 				ORDER BY t.id_topic',
-			'fix_processing' => function ($row) {
+			'fix_processing' => function($row) {
 				$row['my_num_replies'] = (int) $row['my_num_replies'];
 
 				// Not really a problem?
@@ -412,7 +412,7 @@  discard block
 block discarded – undo
 					'num_replies' => $row['my_num_replies'],
 				));
 			},
-			'message_function' => function ($row) {
+			'message_function' => function($row) {
 				global $txt, $context;
 
 				// Just joking?
@@ -442,7 +442,7 @@  discard block
 block discarded – undo
 				GROUP BY t.id_topic, t.unapproved_posts
 				HAVING unapproved_posts != COUNT(mu.id_msg)
 				ORDER BY t.id_topic',
-			'fix_processing' => function ($row) {
+			'fix_processing' => function($row) {
 				$row['my_unapproved_posts'] = (int) $row['my_unapproved_posts'];
 
 				setTopicAttribute($row['id_topic'], array(
@@ -474,7 +474,7 @@  discard block
 block discarded – undo
 				WHERE b.id_board IS NULL
 					AND t.id_topic BETWEEN {STEP_LOW} AND {STEP_HIGH}
 				GROUP BY t.id_board',
-			'fix_processing' => function ($row) {
+			'fix_processing' => function($row) {
 				global $salvageCatID, $txt;
 
 				$db = database();
@@ -522,7 +522,7 @@  discard block
 block discarded – undo
 				ORDER BY b.id_cat, b.id_board',
 			'fix_collect' => array(
 				'index' => 'id_cat',
-				'process' => function ($cats) {
+				'process' => function($cats) {
 					global $salvageCatID;
 
 					$db = database();
@@ -559,7 +559,7 @@  discard block
 block discarded – undo
 			// Last step-make sure all non-guest posters still exist.
 			'fix_collect' => array(
 				'index' => 'id_msg',
-				'process' => function ($msgs) {
+				'process' => function($msgs) {
 					$db = database();
 
 					$db->query('', '
@@ -586,7 +586,7 @@  discard block
 block discarded – undo
 				ORDER BY b.id_parent, b.id_board',
 			'fix_collect' => array(
 				'index' => 'id_parent',
-				'process' => function ($parents) {
+				'process' => function($parents) {
 					global $salvageBoardID, $salvageCatID;
 
 					$db = database();
@@ -621,7 +621,7 @@  discard block
 block discarded – undo
 					AND p.id_poll IS NULL',
 			'fix_collect' => array(
 				'index' => 'id_poll',
-				'process' => function ($polls) {
+				'process' => function($polls) {
 					$db = database();
 
 					$db->query('', '
@@ -653,7 +653,7 @@  discard block
 block discarded – undo
 				ORDER BY cal.id_topic',
 			'fix_collect' => array(
 				'index' => 'id_topic',
-				'process' => function ($events) {
+				'process' => function($events) {
 					$db = database();
 
 					$db->query('', '
@@ -683,7 +683,7 @@  discard block
 block discarded – undo
 					AND lt.id_member BETWEEN {STEP_LOW} AND {STEP_HIGH}',
 			'fix_collect' => array(
 				'index' => 'id_topic',
-				'process' => function ($topics) {
+				'process' => function($topics) {
 					$db = database();
 
 					$db->query('', '
@@ -713,7 +713,7 @@  discard block
 block discarded – undo
 				GROUP BY lt.id_member',
 			'fix_collect' => array(
 				'index' => 'id_member',
-				'process' => function ($members) {
+				'process' => function($members) {
 					$db = database();
 
 					$db->query('', '
@@ -743,7 +743,7 @@  discard block
 block discarded – undo
 				GROUP BY lb.id_board',
 			'fix_collect' => array(
 				'index' => 'id_board',
-				'process' => function ($boards) {
+				'process' => function($boards) {
 					$db = database();
 
 					$db->query('', '
@@ -773,7 +773,7 @@  discard block
 block discarded – undo
 				GROUP BY lb.id_member',
 			'fix_collect' => array(
 				'index' => 'id_member',
-				'process' => function ($members) {
+				'process' => function($members) {
 					$db = database();
 
 					$db->query('', '
@@ -803,7 +803,7 @@  discard block
 block discarded – undo
 				GROUP BY lmr.id_board',
 			'fix_collect' => array(
 				'index' => 'id_board',
-				'process' => function ($boards) {
+				'process' => function($boards) {
 					$db = database();
 
 					$db->query('', '
@@ -833,7 +833,7 @@  discard block
 block discarded – undo
 				GROUP BY lmr.id_member',
 			'fix_collect' => array(
 				'index' => 'id_member',
-				'process' => function ($members) {
+				'process' => function($members) {
 					$db = database();
 
 					$db->query('', '
@@ -863,7 +863,7 @@  discard block
 block discarded – undo
 				GROUP BY pmr.id_pm',
 			'fix_collect' => array(
 				'index' => 'id_pm',
-				'process' => function ($pms) {
+				'process' => function($pms) {
 					$db = database();
 
 					$db->query('', '
@@ -894,7 +894,7 @@  discard block
 block discarded – undo
 				GROUP BY pmr.id_member',
 			'fix_collect' => array(
 				'index' => 'id_member',
-				'process' => function ($members) {
+				'process' => function($members) {
 					$db = database();
 
 					$db->query('', '
@@ -924,7 +924,7 @@  discard block
 block discarded – undo
 					AND mem.id_member IS NULL',
 			'fix_collect' => array(
 				'index' => 'id_pm',
-				'process' => function ($guestMessages) {
+				'process' => function($guestMessages) {
 					$db = database();
 
 					$db->query('', '
@@ -954,7 +954,7 @@  discard block
 block discarded – undo
 				GROUP BY ln.id_member',
 			'fix_collect' => array(
 				'index' => 'id_member',
-				'process' => function ($members) {
+				'process' => function($members) {
 					$db = database();
 
 					$db->query('', '
@@ -982,7 +982,7 @@  discard block
 block discarded – undo
 					LEFT JOIN {db_prefix}log_search_subjects AS lss ON (lss.id_topic = t.id_topic)
 				WHERE t.id_topic BETWEEN {STEP_LOW} AND {STEP_HIGH}
 					AND lss.id_topic IS NULL',
-			'fix_full_processing' => function ($result) {
+			'fix_full_processing' => function($result) {
 
 				$db = database();
 
@@ -1012,7 +1012,7 @@  discard block
 block discarded – undo
 						array('word', 'id_topic')
 					);
 			},
-			'message_function' => function ($row) {
+			'message_function' => function($row) {
 				global $txt, $context;
 
 				if (count(text2words($row['subject'])) != 0)
@@ -1039,7 +1039,7 @@  discard block
 block discarded – undo
 					AND t.id_topic IS NULL',
 			'fix_collect' => array(
 				'index' => 'id_topic',
-				'process' => function ($deleteTopics) {
+				'process' => function($deleteTopics) {
 					$db = database();
 
 					$db->query('', '
@@ -1069,7 +1069,7 @@  discard block
 block discarded – undo
 					AND mem.id_member IS NULL',
 			'fix_collect' => array(
 				'index' => 'id_member',
-				'process' => function ($members) {
+				'process' => function($members) {
 					$db = database();
 
 					$db->query('', '
@@ -1098,7 +1098,7 @@  discard block
 block discarded – undo
 					AND p.id_poll IS NULL',
 			'fix_collect' => array(
 				'index' => 'id_poll',
-				'process' => function ($polls) {
+				'process' => function($polls) {
 					$db = database();
 
 					$db->query('', '
@@ -1127,7 +1127,7 @@  discard block
 block discarded – undo
 					AND lrc.id_report IS NULL',
 			'fix_collect' => array(
 				'index' => 'id_report',
-				'process' => function ($reports) {
+				'process' => function($reports) {
 					$db = database();
 
 					$db->query('', '
@@ -1156,7 +1156,7 @@  discard block
 block discarded – undo
 					AND lr.id_report IS NULL',
 			'fix_collect' => array(
 				'index' => 'id_report',
-				'process' => function ($reports) {
+				'process' => function($reports) {
 					$db = database();
 
 					$db->query('', '
@@ -1186,7 +1186,7 @@  discard block
 block discarded – undo
 				GROUP BY lgr.id_member',
 			'fix_collect' => array(
 				'index' => 'id_member',
-				'process' => function ($members) {
+				'process' => function($members) {
 					$db = database();
 
 					$db->query('', '
@@ -1216,7 +1216,7 @@  discard block
 block discarded – undo
 				GROUP BY lgr.id_group',
 			'fix_collect' => array(
 				'index' => 'id_group',
-				'process' => function ($groups) {
+				'process' => function($groups) {
 					$db = database();
 
 					$db->query('', '

Please login to merge, or discard this patch.

sources/subs/Package.subs.php 1 patch

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

@@ -325,7 +325,7 @@  discard block
 block discarded – undo
 						'value' => $txt['package_restore_permissions_cur_status'],
 					),
 					'data' => array(
-						'function' => function ($rowData) {
+						'function' => function($rowData) {
 							global $txt;
 
 							$formatTxt = $rowData['result'] == '' || $rowData['result'] == 'skipped' ? $txt['package_restore_permissions_pre_change'] : $txt['package_restore_permissions_post_change'];
@@ -354,7 +354,7 @@  discard block
 block discarded – undo
 						'value' => $txt['package_restore_permissions_result'],
 					),
 					'data' => array(
-						'function' => function ($rowData) {
+						'function' => function($rowData) {
 							global $txt;
 
 							return $txt['package_restore_permissions_action_' . $rowData['result']];

Please login to merge, or discard this patch.

sources/controllers/PostModeration.controller.php 1 patch

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

@@ -375,7 +375,7 @@  discard block
 block discarded – undo
 						'value' => $txt['mc_unapproved_attach_poster'],
 					),
 					'data' => array(
-						'function' => function ($data) {
+						'function' => function($data) {
 							return $data['poster']['link'];
 						},
 					),
@@ -404,7 +404,7 @@  discard block
 block discarded – undo
 						'value' => $txt['post'],
 					),
 					'data' => array(
-						'function' => function ($data) {
+						'function' => function($data) {
 							global $modSettings;
 
 							return '<a href="' . $data['message']['href'] . '">' . Util::shorten_text($data['message']['subject'], !empty($modSettings['subject_length']) ? $modSettings['subject_length'] : 24) . '</a>';

Please login to merge, or discard this patch.

sources/controllers/Groups.controller.php 1 patch

Spacing +4 added lines, -4 removed lines patch added patch discarded remove patch

@@ -122,7 +122,7 @@  discard block
 block discarded – undo
 						'value' => $txt['name'],
 					),
 					'data' => array(
-						'function' => function ($rowData) use ($base_url) {
+						'function' => function($rowData) use ($base_url) {
 							global $scripturl;
 
 							// Since the moderator group has no explicit members, no link is needed.
@@ -152,7 +152,7 @@  discard block
 block discarded – undo
 						'value' => $txt['membergroups_icons'],
 					),
 					'data' => array(
-						'function' => function ($rowData) {
+						'function' => function($rowData) {
 							global $settings;
 
 							if (!empty($rowData['icons'][0]) && !empty($rowData['icons'][1]))
@@ -171,7 +171,7 @@  discard block
 block discarded – undo
 						'value' => $txt['moderators'],
 					),
 					'data' => array(
-						'function' => function ($group) {
+						'function' => function($group) {
 							global $txt;
 
 							return empty($group['moderators']) ? '<em>' . $txt['membergroups_new_copy_none'] . '</em>' : implode(', ', $group['moderators']);
@@ -183,7 +183,7 @@  discard block
 block discarded – undo
 						'value' => $txt['membergroups_members_top'],
 					),
 					'data' => array(
-						'function' => function ($rowData) {
+						'function' => function($rowData) {
 							global $txt;
 
 							// No explicit members for the moderator group.

Please login to merge, or discard this patch.

sources/admin/ManageNews.controller.php 1 patch

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

@@ -195,7 +195,7 @@  discard block
 block discarded – undo
 						'value' => $txt['admin_edit_news'],
 					),
 					'data' => array(
-						'function' => function ($news) {
+						'function' => function($news) {
 							return '<textarea class="" id="data_' . $news['id'] . '" rows="3" name="news[]">' . $news['unparsed'] . '</textarea>
 								<br />
 								<div id="preview_' . $news['id'] . '"></div>';
@@ -208,7 +208,7 @@  discard block
 block discarded – undo
 						'value' => $txt['preview'],
 					),
 					'data' => array(
-						'function' => function ($news) {
+						'function' => function($news) {
 							return '<div id="box_preview_' . $news['id'] . '">' . $news['parsed'] . '</div>';
 						},
 						'class' => 'newspreview',
@@ -220,7 +220,7 @@  discard block
 block discarded – undo
 						'class' => 'centertext',
 					),
 					'data' => array(
-						'function' => function ($news) {
+						'function' => function($news) {
 							if (is_numeric($news['id']))
 								return '<input type="checkbox" name="remove[]" value="' . $news['id'] . '" class="input_check" />';
 							else

Please login to merge, or discard this patch.

sources/admin/ManageBans.controller.php 1 patch

Spacing +8 added lines, -8 removed lines patch added patch discarded remove patch

@@ -199,7 +199,7 @@  discard block
 block discarded – undo
 						'value' => $txt['ban_added'],
 					),
 					'data' => array(
-						'function' => function ($rowData) {
+						'function' => function($rowData) {
 							global $context;
 							return standardTime($rowData['ban_time'], empty($context['ban_time_format']) ? true : $context['ban_time_format']);
 						},
@@ -214,7 +214,7 @@  discard block
 block discarded – undo
 						'value' => $txt['ban_expires'],
 					),
 					'data' => array(
-						'function' => function ($rowData) {
+						'function' => function($rowData) {
 							global $txt;
 
 							// This ban never expires...whahaha.
@@ -361,7 +361,7 @@  discard block
 block discarded – undo
 								'style' => 'width: 60%;',
 							),
 							'data' => array(
-								'function' => function ($ban_item) {
+								'function' => function($ban_item) {
 									global $txt;
 
 									if (in_array($ban_item['type'], array('ip', 'hostname', 'email')))
@@ -389,7 +389,7 @@  discard block
 block discarded – undo
 								'style' => 'width: 15%;',
 							),
 							'data' => array(
-								'function' => function ($ban_item) {
+								'function' => function($ban_item) {
 									global $txt, $context, $scripturl;
 
 									return '<a href="' . $scripturl . '?action=admin;area=ban;sa=edittrigger;bg=' . $context['ban']['id'] . ';bi=' . $ban_item['id'] . '">' . $txt['ban_edit_trigger'] . '</a>';
@@ -603,7 +603,7 @@  discard block
 block discarded – undo
 						'value' => $txt['ban_log_date'],
 					),
 					'data' => array(
-						'function' => function ($rowData) {
+						'function' => function($rowData) {
 							return standardTime($rowData['log_time']);
 						},
 					),
@@ -1023,7 +1023,7 @@  discard block
 block discarded – undo
 		if ($context['selected_entity'] === 'ip')
 		{
 			$listOptions['columns']['banned_entity']['data'] = array(
-				'function' => function ($rowData) {
+				'function' => function($rowData) {
 					return range2ip(array(
 						$rowData['ip_low1'],
 						$rowData['ip_low2'],
@@ -1053,7 +1053,7 @@  discard block
 block discarded – undo
 		elseif ($context['selected_entity'] === 'hostname')
 		{
 			$listOptions['columns']['banned_entity']['data'] = array(
-				'function' => function ($rowData) {
+				'function' => function($rowData) {
 					return strtr(Util::htmlspecialchars($rowData['hostname']), array('%' => '*'));
 				},
 			);
@@ -1065,7 +1065,7 @@  discard block
 block discarded – undo
 		elseif ($context['selected_entity'] === 'email')
 		{
 			$listOptions['columns']['banned_entity']['data'] = array(
-				'function' => function ($rowData) {
+				'function' => function($rowData) {
 					return strtr(Util::htmlspecialchars($rowData['email_address']), array('%' => '*'));
 				},
 			);

Please login to merge, or discard this patch.

sources/admin/ManageMembergroups.controller.php 1 patch

Spacing +5 added lines, -5 removed lines patch added patch discarded remove patch

@@ -143,7 +143,7 @@  discard block
 block discarded – undo
 						'value' => $txt['membergroups_name'],
 					),
 					'data' => array(
-						'function' => function ($rowData) {
+						'function' => function($rowData) {
 							global $scripturl;
 
 							// Since the moderator group has no explicit members, no link is needed.
@@ -173,7 +173,7 @@  discard block
 block discarded – undo
 						'value' => $txt['membergroups_icons'],
 					),
 					'data' => array(
-						'function' => function ($rowData) {
+						'function' => function($rowData) {
 							global $settings;
 
 							if (!empty($rowData['icons'][0]) && !empty($rowData['icons'][1]))
@@ -192,7 +192,7 @@  discard block
 block discarded – undo
 						'value' => $txt['membergroups_members_top'],
 					),
 					'data' => array(
-						'function' => function ($rowData) {
+						'function' => function($rowData) {
 							global $txt;
 
 							// No explicit members for the moderator group.
@@ -255,7 +255,7 @@  discard block
 block discarded – undo
 						'value' => $txt['membergroups_name'],
 					),
 					'data' => array(
-						'function' => function ($rowData) {
+						'function' => function($rowData) {
 							global $scripturl;
 
 							return sprintf('<a href="%1$s?action=admin;area=membergroups;sa=members;group=%2$d">%3$s</a>', $scripturl, $rowData['id_group'], $rowData['group_name_color']);
@@ -271,7 +271,7 @@  discard block
 block discarded – undo
 						'value' => $txt['membergroups_icons'],
 					),
 					'data' => array(
-						'function' => function ($rowData) {
+						'function' => function($rowData) {
 							global $settings;
 
 							if (!empty($rowData['icons'][0]) && !empty($rowData['icons'][1]))

Please login to merge, or discard this patch.

sources/admin/ManageSearchEngines.controller.php 1 patch

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

@@ -260,7 +260,7 @@  discard block
 block discarded – undo
 						'value' => $txt['spider_name'],
 					),
 					'data' => array(
-						'function' => function ($rowData) {
+						'function' => function($rowData) {
 							global $scripturl;
 
 							return sprintf('<a href="%1$s?action=admin;area=sengines;sa=editspiders;sid=%2$d">%3$s</a>', $scripturl, $rowData['id_spider'], htmlspecialchars($rowData['spider_name'], ENT_COMPAT, 'UTF-8'));
@@ -276,7 +276,7 @@  discard block
 block discarded – undo
 						'value' => $txt['spider_last_seen'],
 					),
 					'data' => array(
-						'function' => function ($rowData) {
+						'function' => function($rowData) {
 							global $context, $txt;
 
 							return isset($context['spider_last_seen'][$rowData['id_spider']]) ? standardTime($context['spider_last_seen'][$rowData['id_spider']]) : $txt['spider_last_never'];
@@ -461,7 +461,7 @@  discard block
 block discarded – undo
 						'value' => $txt['spider_time'],
 					),
 					'data' => array(
-						'function' => function ($rowData) {
+						'function' => function($rowData) {
 							return standardTime($rowData['log_time']);
 						},
 					),

Please login to merge, or discard this patch.

sources/admin/Modlog.controller.php 1 patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -255,7 +255,7 @@
 block discarded – undo
 						'class' => 'centertext',
 					),
 					'data' => array(
-						'function' => function ($entry) {
+						'function' => function($entry) {
 							return '<input type="checkbox" name="delete[]" value="' . $entry['id'] . '"' . ($entry['editable'] ? '' : ' disabled="disabled"') . ' />';
 						},
 						'class' => 'centertext',

Please login to merge, or discard this patch.

		@@ -325,7 +325,7 @@ discard block
		block discarded – undo
325	325	'value' => $txt['package_restore_permissions_cur_status'],
326	326	),
327	327	'data' => array(
328		- 'function' => function ($rowData) {
	328	+ 'function' => function($rowData) {
329	329	global $txt;
330	330
331	331	$formatTxt = $rowData['result'] == '' \|\| $rowData['result'] == 'skipped' ? $txt['package_restore_permissions_pre_change'] : $txt['package_restore_permissions_post_change'];
		@@ -354,7 +354,7 @@ discard block
		block discarded – undo
354	354	'value' => $txt['package_restore_permissions_result'],
355	355	),
356	356	'data' => array(
357		- 'function' => function ($rowData) {
	357	+ 'function' => function($rowData) {
358	358	global $txt;
359	359
360	360	return $txt['package_restore_permissions_action_' . $rowData['result']];

		@@ -375,7 +375,7 @@ discard block
		block discarded – undo
375	375	'value' => $txt['mc_unapproved_attach_poster'],
376	376	),
377	377	'data' => array(
378		- 'function' => function ($data) {
	378	+ 'function' => function($data) {
379	379	return $data['poster']['link'];
380	380	},
381	381	),
		@@ -404,7 +404,7 @@ discard block
		block discarded – undo
404	404	'value' => $txt['post'],
405	405	),
406	406	'data' => array(
407		- 'function' => function ($data) {
	407	+ 'function' => function($data) {
408	408	global $modSettings;
409	409
410	410	return '<a href="' . $data['message']['href'] . '">' . Util::shorten_text($data['message']['subject'], !empty($modSettings['subject_length']) ? $modSettings['subject_length'] : 24) . '</a>';

		@@ -260,7 +260,7 @@ discard block
		block discarded – undo
260	260	'value' => $txt['spider_name'],
261	261	),
262	262	'data' => array(
263		- 'function' => function ($rowData) {
	263	+ 'function' => function($rowData) {
264	264	global $scripturl;
265	265
266	266	return sprintf('<a href="%1$s?action=admin;area=sengines;sa=editspiders;sid=%2$d">%3$s</a>', $scripturl, $rowData['id_spider'], htmlspecialchars($rowData['spider_name'], ENT_COMPAT, 'UTF-8'));
		@@ -276,7 +276,7 @@ discard block
		block discarded – undo
276	276	'value' => $txt['spider_last_seen'],
277	277	),
278	278	'data' => array(
279		- 'function' => function ($rowData) {
	279	+ 'function' => function($rowData) {
280	280	global $context, $txt;
281	281
282	282	return isset($context['spider_last_seen'][$rowData['id_spider']]) ? standardTime($context['spider_last_seen'][$rowData['id_spider']]) : $txt['spider_last_never'];
		@@ -461,7 +461,7 @@ discard block
		block discarded – undo
461	461	'value' => $txt['spider_time'],
462	462	),
463	463	'data' => array(
464		- 'function' => function ($rowData) {
	464	+ 'function' => function($rowData) {
465	465	return standardTime($rowData['log_time']);
466	466	},
467	467	),

		@@ -109,7 +109,7 @@ discard block
		block discarded – undo
109	109	LEFT JOIN {db_prefix}topics AS t ON (t.id_topic = m.id_topic)
110	110	WHERE t.id_topic IS NULL
111	111	GROUP BY m.id_topic, m.id_board',
112		- 'fix_processing' => function ($row) {
	112	+ 'fix_processing' => function($row) {
113	113	global $salvageBoardID;
114	114
115	115	$db = database();
		@@ -197,7 +197,7 @@ discard block
		block discarded – undo
197	197	// Remove all topics that have zero messages in the messages table.
198	198	'fix_collect' => array(
199	199	'index' => 'id_topic',
200		- 'process' => function ($topics) {
	200	+ 'process' => function($topics) {
201	201	$db = database();
202	202
203	203	$db->query('', '
		@@ -231,7 +231,7 @@ discard block
		block discarded – undo
231	231	LEFT JOIN {db_prefix}topics AS t ON (t.id_poll = p.id_poll)
232	232	WHERE p.id_poll BETWEEN {STEP_LOW} AND {STEP_HIGH}
233	233	AND t.id_poll IS NULL',
234		- 'fix_processing' => function ($row) {
	234	+ 'fix_processing' => function($row) {
235	235	global $salvageBoardID, $txt;
236	236
237	237	$db = database();
		@@ -346,7 +346,7 @@ discard block
		block discarded – undo
346	346	WHERE t.id_topic BETWEEN {STEP_LOW} AND {STEP_HIGH}
347	347	GROUP BY t.id_topic, t.id_first_msg, t.id_last_msg, t.approved, mf.approved
348	348	ORDER BY t.id_topic',
349		- 'fix_processing' => function ($row) {
	349	+ 'fix_processing' => function($row) {
350	350	$row['firstmsg_approved'] = (int) $row['firstmsg_approved'];
351	351	$row['myid_first_msg'] = (int) $row['myid_first_msg'];
352	352	$row['myid_last_msg'] = (int) $row['myid_last_msg'];
		@@ -366,7 +366,7 @@ discard block
		block discarded – undo
366	366	'approved' => $row['firstmsg_approved'],
367	367	));
368	368	},
369		- 'message_function' => function ($row) {
	369	+ 'message_function' => function($row) {
370	370	global $txt, $context;
371	371
372	372	// A pretend error?
		@@ -401,7 +401,7 @@ discard block
		block discarded – undo
401	401	WHERE t.id_topic BETWEEN {STEP_LOW} AND {STEP_HIGH}
402	402	GROUP BY t.id_topic, t.num_replies, mf.approved
403	403	ORDER BY t.id_topic',
404		- 'fix_processing' => function ($row) {
	404	+ 'fix_processing' => function($row) {
405	405	$row['my_num_replies'] = (int) $row['my_num_replies'];
406	406
407	407	// Not really a problem?
		@@ -412,7 +412,7 @@ discard block
		block discarded – undo
412	412	'num_replies' => $row['my_num_replies'],
413	413	));
414	414	},
415		- 'message_function' => function ($row) {
	415	+ 'message_function' => function($row) {
416	416	global $txt, $context;
417	417
418	418	// Just joking?
		@@ -442,7 +442,7 @@ discard block
		block discarded – undo
442	442	GROUP BY t.id_topic, t.unapproved_posts
443	443	HAVING unapproved_posts != COUNT(mu.id_msg)
444	444	ORDER BY t.id_topic',
445		- 'fix_processing' => function ($row) {
	445	+ 'fix_processing' => function($row) {
446	446	$row['my_unapproved_posts'] = (int) $row['my_unapproved_posts'];
447	447
448	448	setTopicAttribute($row['id_topic'], array(
		@@ -474,7 +474,7 @@ discard block
		block discarded – undo
474	474	WHERE b.id_board IS NULL
475	475	AND t.id_topic BETWEEN {STEP_LOW} AND {STEP_HIGH}
476	476	GROUP BY t.id_board',
477		- 'fix_processing' => function ($row) {
	477	+ 'fix_processing' => function($row) {
478	478	global $salvageCatID, $txt;
479	479
480	480	$db = database();
		@@ -522,7 +522,7 @@ discard block
		block discarded – undo
522	522	ORDER BY b.id_cat, b.id_board',
523	523	'fix_collect' => array(
524	524	'index' => 'id_cat',
525		- 'process' => function ($cats) {
	525	+ 'process' => function($cats) {
526	526	global $salvageCatID;
527	527
528	528	$db = database();
		@@ -559,7 +559,7 @@ discard block
		block discarded – undo
559	559	// Last step-make sure all non-guest posters still exist.
560	560	'fix_collect' => array(
561	561	'index' => 'id_msg',
562		- 'process' => function ($msgs) {
	562	+ 'process' => function($msgs) {
563	563	$db = database();
564	564
565	565	$db->query('', '
		@@ -586,7 +586,7 @@ discard block
		block discarded – undo
586	586	ORDER BY b.id_parent, b.id_board',
587	587	'fix_collect' => array(
588	588	'index' => 'id_parent',
589		- 'process' => function ($parents) {
	589	+ 'process' => function($parents) {
590	590	global $salvageBoardID, $salvageCatID;
591	591
592	592	$db = database();
		@@ -621,7 +621,7 @@ discard block
		block discarded – undo
621	621	AND p.id_poll IS NULL',
622	622	'fix_collect' => array(
623	623	'index' => 'id_poll',
624		- 'process' => function ($polls) {
	624	+ 'process' => function($polls) {
625	625	$db = database();
626	626
627	627	$db->query('', '
		@@ -653,7 +653,7 @@ discard block
		block discarded – undo
653	653	ORDER BY cal.id_topic',
654	654	'fix_collect' => array(
655	655	'index' => 'id_topic',
656		- 'process' => function ($events) {
	656	+ 'process' => function($events) {
657	657	$db = database();
658	658
659	659	$db->query('', '
		@@ -683,7 +683,7 @@ discard block
		block discarded – undo
683	683	AND lt.id_member BETWEEN {STEP_LOW} AND {STEP_HIGH}',
684	684	'fix_collect' => array(
685	685	'index' => 'id_topic',
686		- 'process' => function ($topics) {
	686	+ 'process' => function($topics) {
687	687	$db = database();
688	688
689	689	$db->query('', '
		@@ -713,7 +713,7 @@ discard block
		block discarded – undo
713	713	GROUP BY lt.id_member',
714	714	'fix_collect' => array(
715	715	'index' => 'id_member',
716		- 'process' => function ($members) {
	716	+ 'process' => function($members) {
717	717	$db = database();
718	718
719	719	$db->query('', '
		@@ -743,7 +743,7 @@ discard block
		block discarded – undo
743	743	GROUP BY lb.id_board',
744	744	'fix_collect' => array(
745	745	'index' => 'id_board',
746		- 'process' => function ($boards) {
	746	+ 'process' => function($boards) {
747	747	$db = database();
748	748
749	749	$db->query('', '
		@@ -773,7 +773,7 @@ discard block
		block discarded – undo
773	773	GROUP BY lb.id_member',
774	774	'fix_collect' => array(
775	775	'index' => 'id_member',
776		- 'process' => function ($members) {
	776	+ 'process' => function($members) {
777	777	$db = database();
778	778
779	779	$db->query('', '
		@@ -803,7 +803,7 @@ discard block
		block discarded – undo
803	803	GROUP BY lmr.id_board',
804	804	'fix_collect' => array(
805	805	'index' => 'id_board',
806		- 'process' => function ($boards) {
	806	+ 'process' => function($boards) {
807	807	$db = database();
808	808
809	809	$db->query('', '
		@@ -833,7 +833,7 @@ discard block
		block discarded – undo
833	833	GROUP BY lmr.id_member',
834	834	'fix_collect' => array(
835	835	'index' => 'id_member',
836		- 'process' => function ($members) {
	836	+ 'process' => function($members) {
837	837	$db = database();
838	838
839	839	$db->query('', '
		@@ -863,7 +863,7 @@ discard block
		block discarded – undo
863	863	GROUP BY pmr.id_pm',
864	864	'fix_collect' => array(
865	865	'index' => 'id_pm',
866		- 'process' => function ($pms) {
	866	+ 'process' => function($pms) {
867	867	$db = database();
868	868
869	869	$db->query('', '
		@@ -894,7 +894,7 @@ discard block
		block discarded – undo
894	894	GROUP BY pmr.id_member',
895	895	'fix_collect' => array(
896	896	'index' => 'id_member',
897		- 'process' => function ($members) {
	897	+ 'process' => function($members) {
898	898	$db = database();
899	899
900	900	$db->query('', '
		@@ -924,7 +924,7 @@ discard block
		block discarded – undo
924	924	AND mem.id_member IS NULL',
925	925	'fix_collect' => array(
926	926	'index' => 'id_pm',
927		- 'process' => function ($guestMessages) {
	927	+ 'process' => function($guestMessages) {
928	928	$db = database();
929	929
930	930	$db->query('', '
		@@ -954,7 +954,7 @@ discard block
		block discarded – undo
954	954	GROUP BY ln.id_member',
955	955	'fix_collect' => array(
956	956	'index' => 'id_member',
957		- 'process' => function ($members) {
	957	+ 'process' => function($members) {
958	958	$db = database();
959	959
960	960	$db->query('', '
		@@ -982,7 +982,7 @@ discard block
		block discarded – undo
982	982	LEFT JOIN {db_prefix}log_search_subjects AS lss ON (lss.id_topic = t.id_topic)
983	983	WHERE t.id_topic BETWEEN {STEP_LOW} AND {STEP_HIGH}
984	984	AND lss.id_topic IS NULL',
985		- 'fix_full_processing' => function ($result) {
	985	+ 'fix_full_processing' => function($result) {
986	986
987	987	$db = database();
988	988
		@@ -1012,7 +1012,7 @@ discard block
		block discarded – undo
1012	1012	array('word', 'id_topic')
1013	1013	);
1014	1014	},
1015		- 'message_function' => function ($row) {
	1015	+ 'message_function' => function($row) {
1016	1016	global $txt, $context;
1017	1017
1018	1018	if (count(text2words($row['subject'])) != 0)
		@@ -1039,7 +1039,7 @@ discard block
		block discarded – undo
1039	1039	AND t.id_topic IS NULL',
1040	1040	'fix_collect' => array(
1041	1041	'index' => 'id_topic',
1042		- 'process' => function ($deleteTopics) {
	1042	+ 'process' => function($deleteTopics) {
1043	1043	$db = database();
1044	1044
1045	1045	$db->query('', '
		@@ -1069,7 +1069,7 @@ discard block
		block discarded – undo
1069	1069	AND mem.id_member IS NULL',
1070	1070	'fix_collect' => array(
1071	1071	'index' => 'id_member',
1072		- 'process' => function ($members) {
	1072	+ 'process' => function($members) {
1073	1073	$db = database();
1074	1074
1075	1075	$db->query('', '
		@@ -1098,7 +1098,7 @@ discard block
		block discarded – undo
1098	1098	AND p.id_poll IS NULL',
1099	1099	'fix_collect' => array(
1100	1100	'index' => 'id_poll',
1101		- 'process' => function ($polls) {
	1101	+ 'process' => function($polls) {
1102	1102	$db = database();
1103	1103
1104	1104	$db->query('', '
		@@ -1127,7 +1127,7 @@ discard block
		block discarded – undo
1127	1127	AND lrc.id_report IS NULL',
1128	1128	'fix_collect' => array(
1129	1129	'index' => 'id_report',
1130		- 'process' => function ($reports) {
	1130	+ 'process' => function($reports) {
1131	1131	$db = database();
1132	1132
1133	1133	$db->query('', '
		@@ -1156,7 +1156,7 @@ discard block
		block discarded – undo
1156	1156	AND lr.id_report IS NULL',
1157	1157	'fix_collect' => array(
1158	1158	'index' => 'id_report',
1159		- 'process' => function ($reports) {
	1159	+ 'process' => function($reports) {
1160	1160	$db = database();
1161	1161
1162	1162	$db->query('', '
		@@ -1186,7 +1186,7 @@ discard block
		block discarded – undo
1186	1186	GROUP BY lgr.id_member',
1187	1187	'fix_collect' => array(
1188	1188	'index' => 'id_member',
1189		- 'process' => function ($members) {
	1189	+ 'process' => function($members) {
1190	1190	$db = database();
1191	1191
1192	1192	$db->query('', '
		@@ -1216,7 +1216,7 @@ discard block
		block discarded – undo
1216	1216	GROUP BY lgr.id_group',
1217	1217	'fix_collect' => array(
1218	1218	'index' => 'id_group',
1219		- 'process' => function ($groups) {
	1219	+ 'process' => function($groups) {
1220	1220	$db = database();
1221	1221
1222	1222	$db->query('', '

		@@ -122,7 +122,7 @@ discard block
		block discarded – undo
122	122	'value' => $txt['name'],
123	123	),
124	124	'data' => array(
125		- 'function' => function ($rowData) use ($base_url) {
	125	+ 'function' => function($rowData) use ($base_url) {
126	126	global $scripturl;
127	127
128	128	// Since the moderator group has no explicit members, no link is needed.
		@@ -152,7 +152,7 @@ discard block
		block discarded – undo
152	152	'value' => $txt['membergroups_icons'],
153	153	),
154	154	'data' => array(
155		- 'function' => function ($rowData) {
	155	+ 'function' => function($rowData) {
156	156	global $settings;
157	157
158	158	if (!empty($rowData['icons'][0]) && !empty($rowData['icons'][1]))
		@@ -171,7 +171,7 @@ discard block
		block discarded – undo
171	171	'value' => $txt['moderators'],
172	172	),
173	173	'data' => array(
174		- 'function' => function ($group) {
	174	+ 'function' => function($group) {
175	175	global $txt;
176	176
177	177	return empty($group['moderators']) ? '<em>' . $txt['membergroups_new_copy_none'] . '</em>' : implode(', ', $group['moderators']);
		@@ -183,7 +183,7 @@ discard block
		block discarded – undo
183	183	'value' => $txt['membergroups_members_top'],
184	184	),
185	185	'data' => array(
186		- 'function' => function ($rowData) {
	186	+ 'function' => function($rowData) {
187	187	global $txt;
188	188
189	189	// No explicit members for the moderator group.

		@@ -195,7 +195,7 @@ discard block
		block discarded – undo
195	195	'value' => $txt['admin_edit_news'],
196	196	),
197	197	'data' => array(
198		- 'function' => function ($news) {
	198	+ 'function' => function($news) {
199	199	return '<textarea class="" id="data_' . $news['id'] . '" rows="3" name="news[]">' . $news['unparsed'] . '</textarea>
200	200	<br />
201	201	<div id="preview_' . $news['id'] . '"></div>';
		@@ -208,7 +208,7 @@ discard block
		block discarded – undo
208	208	'value' => $txt['preview'],
209	209	),
210	210	'data' => array(
211		- 'function' => function ($news) {
	211	+ 'function' => function($news) {
212	212	return '<div id="box_preview_' . $news['id'] . '">' . $news['parsed'] . '</div>';
213	213	},
214	214	'class' => 'newspreview',
		@@ -220,7 +220,7 @@ discard block
		block discarded – undo
220	220	'class' => 'centertext',
221	221	),
222	222	'data' => array(
223		- 'function' => function ($news) {
	223	+ 'function' => function($news) {
224	224	if (is_numeric($news['id']))
225	225	return '<input type="checkbox" name="remove[]" value="' . $news['id'] . '" class="input_check" />';
226	226	else

		@@ -199,7 +199,7 @@ discard block
		block discarded – undo
199	199	'value' => $txt['ban_added'],
200	200	),
201	201	'data' => array(
202		- 'function' => function ($rowData) {
	202	+ 'function' => function($rowData) {
203	203	global $context;
204	204	return standardTime($rowData['ban_time'], empty($context['ban_time_format']) ? true : $context['ban_time_format']);
205	205	},
		@@ -214,7 +214,7 @@ discard block
		block discarded – undo
214	214	'value' => $txt['ban_expires'],
215	215	),
216	216	'data' => array(
217		- 'function' => function ($rowData) {
	217	+ 'function' => function($rowData) {
218	218	global $txt;
219	219
220	220	// This ban never expires...whahaha.
		@@ -361,7 +361,7 @@ discard block
		block discarded – undo
361	361	'style' => 'width: 60%;',
362	362	),
363	363	'data' => array(
364		- 'function' => function ($ban_item) {
	364	+ 'function' => function($ban_item) {
365	365	global $txt;
366	366
367	367	if (in_array($ban_item['type'], array('ip', 'hostname', 'email')))
		@@ -389,7 +389,7 @@ discard block
		block discarded – undo
389	389	'style' => 'width: 15%;',
390	390	),
391	391	'data' => array(
392		- 'function' => function ($ban_item) {
	392	+ 'function' => function($ban_item) {
393	393	global $txt, $context, $scripturl;
394	394
395	395	return '<a href="' . $scripturl . '?action=admin;area=ban;sa=edittrigger;bg=' . $context['ban']['id'] . ';bi=' . $ban_item['id'] . '">' . $txt['ban_edit_trigger'] . '</a>';
		@@ -603,7 +603,7 @@ discard block
		block discarded – undo
603	603	'value' => $txt['ban_log_date'],
604	604	),
605	605	'data' => array(
606		- 'function' => function ($rowData) {
	606	+ 'function' => function($rowData) {
607	607	return standardTime($rowData['log_time']);
608	608	},
609	609	),
		@@ -1023,7 +1023,7 @@ discard block
		block discarded – undo
1023	1023	if ($context['selected_entity'] === 'ip')
1024	1024	{
1025	1025	$listOptions['columns']['banned_entity']['data'] = array(
1026		- 'function' => function ($rowData) {
	1026	+ 'function' => function($rowData) {
1027	1027	return range2ip(array(
1028	1028	$rowData['ip_low1'],
1029	1029	$rowData['ip_low2'],
		@@ -1053,7 +1053,7 @@ discard block
		block discarded – undo
1053	1053	elseif ($context['selected_entity'] === 'hostname')
1054	1054	{
1055	1055	$listOptions['columns']['banned_entity']['data'] = array(
1056		- 'function' => function ($rowData) {
	1056	+ 'function' => function($rowData) {
1057	1057	return strtr(Util::htmlspecialchars($rowData['hostname']), array('%' => '*'));
1058	1058	},
1059	1059	);
		@@ -1065,7 +1065,7 @@ discard block
		block discarded – undo
1065	1065	elseif ($context['selected_entity'] === 'email')
1066	1066	{
1067	1067	$listOptions['columns']['banned_entity']['data'] = array(
1068		- 'function' => function ($rowData) {
	1068	+ 'function' => function($rowData) {
1069	1069	return strtr(Util::htmlspecialchars($rowData['email_address']), array('%' => '*'));
1070	1070	},
1071	1071	);

		@@ -143,7 +143,7 @@ discard block
		block discarded – undo
143	143	'value' => $txt['membergroups_name'],
144	144	),
145	145	'data' => array(
146		- 'function' => function ($rowData) {
	146	+ 'function' => function($rowData) {
147	147	global $scripturl;
148	148
149	149	// Since the moderator group has no explicit members, no link is needed.
		@@ -173,7 +173,7 @@ discard block
		block discarded – undo
173	173	'value' => $txt['membergroups_icons'],
174	174	),
175	175	'data' => array(
176		- 'function' => function ($rowData) {
	176	+ 'function' => function($rowData) {
177	177	global $settings;
178	178
179	179	if (!empty($rowData['icons'][0]) && !empty($rowData['icons'][1]))
		@@ -192,7 +192,7 @@ discard block
		block discarded – undo
192	192	'value' => $txt['membergroups_members_top'],
193	193	),
194	194	'data' => array(
195		- 'function' => function ($rowData) {
	195	+ 'function' => function($rowData) {
196	196	global $txt;
197	197
198	198	// No explicit members for the moderator group.
		@@ -255,7 +255,7 @@ discard block
		block discarded – undo
255	255	'value' => $txt['membergroups_name'],
256	256	),
257	257	'data' => array(
258		- 'function' => function ($rowData) {
	258	+ 'function' => function($rowData) {
259	259	global $scripturl;
260	260
261	261	return sprintf('<a href="%1$s?action=admin;area=membergroups;sa=members;group=%2$d">%3$s</a>', $scripturl, $rowData['id_group'], $rowData['group_name_color']);
		@@ -271,7 +271,7 @@ discard block
		block discarded – undo
271	271	'value' => $txt['membergroups_icons'],
272	272	),
273	273	'data' => array(
274		- 'function' => function ($rowData) {
	274	+ 'function' => function($rowData) {
275	275	global $settings;
276	276
277	277	if (!empty($rowData['icons'][0]) && !empty($rowData['icons'][1]))

		@@ -255,7 +255,7 @@
		block discarded – undo
255	255	'class' => 'centertext',
256	256	),
257	257	'data' => array(
258		- 'function' => function ($entry) {
	258	+ 'function' => function($entry) {
259	259	return '<input type="checkbox" name="delete[]" value="' . $entry['id'] . '"' . ($entry['editable'] ? '' : ' disabled="disabled"') . ' />';
260	260	},
261	261	'class' => 'centertext',

elkarte / Elkarte

Pull Request — patch_1-1-9 (#3692)

Status

Category

Spacing +33 added lines, -33 removed lines patch added patch discarded remove patch

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

Spacing +4 added lines, -4 removed lines patch added patch discarded remove patch

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

Spacing +8 added lines, -8 removed lines patch added patch discarded remove patch

Spacing +5 added lines, -5 removed lines patch added patch discarded remove patch

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch