Inspection of "Fixes" - elkarte/Elkarte - Measure and Improve Code Quality continuously with Scrutinizer

Passed

Pull Request — development (#3780)

by Spuds

created 2024-04-01 18:06 UTC

Status

Braces +5 added lines, -2 removed lines patch added patch discarded remove patch

@@ -2,6 +2,9 @@
 block discarded – undo
 
 // Try to handle it with the upper level index.php. (it should know what to do.)
 if (file_exists(dirname(dirname(__FILE__)) . '/index.php'))
+{
 	include (dirname(dirname(__FILE__)) . '/index.php');
-else
-	exit;
\ No newline at end of file
+}
+else {
+	exit;
+}

Please login to merge, or discard this patch.

themes/default/cache/index.php 1 patch

Braces +5 added lines, -2 removed lines patch added patch discarded remove patch

@@ -2,6 +2,9 @@
 block discarded – undo
 
 // Try to handle it with the upper level index.php. (it should know what to do.)
 if (file_exists(dirname(dirname(__FILE__)) . '/index.php'))
+{
 	include (dirname(dirname(__FILE__)) . '/index.php');
-else
-	exit;
\ No newline at end of file
+}
+else {
+	exit;
+}

Please login to merge, or discard this patch.

themes/default/css/_dark/index.php 1 patch

Braces +5 added lines, -2 removed lines patch added patch discarded remove patch

@@ -2,6 +2,9 @@
 block discarded – undo
 
 // Try to handle it with the upper level index.php. (it should know what to do.)
 if (file_exists(dirname(dirname(__FILE__)) . '/index.php'))
+{
 	include (dirname(dirname(__FILE__)) . '/index.php');
-else
-	exit;
\ No newline at end of file
+}
+else {
+	exit;
+}

Please login to merge, or discard this patch.

sources/subs/MessageIcons.subs.php 1 patch

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

@@ -44,7 +44,7 @@
 block discarded – undo
 		ORDER BY m.icon_order',
 		[]
 	)->fetch_callback(
-		function ($row) use (&$icons, &$last_icon, &$trueOrder) {
+		function($row) use (&$icons, &$last_icon, &$trueOrder) {
 			global $settings, $txt;
 
 			$icons[$row['id_icon']] = [

Please login to merge, or discard this patch.

sources/subs/Attachments.subs.php 1 patch

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

@@ -614,7 +614,7 @@
 block discarded – undo
 			'type' => 0,
 		)
 	)->fetch_callback(
-		function ($row) use (&$attachmentData) {
+		function($row) use (&$attachmentData) {
 			$attachmentData = $row;
 			$attachmentData['is_image'] = substr($attachmentData['mime_type'], 0, 5) === 'image';
 			$attachmentData['size'] = byte_format($attachmentData['size']);

Please login to merge, or discard this patch.

sources/subs/ManageSearch.subs.php 1 patch

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

@@ -34,7 +34,7 @@  discard block
 block discarded – undo
 		FROM {db_prefix}messages',
 		array()
 	)->fetch_callback(
-		function ($row) use (&$fulltext_index) {
+		function($row) use (&$fulltext_index) {
 			if (($row['Column_name'] === 'body' || $row['Column_name'] === 'subject')
 				&& (isset($row['Index_type']) && $row['Index_type'] === 'FULLTEXT'
 					|| isset($row['Comment']) && $row['Comment'] === 'FULLTEXT'))
@@ -380,7 +380,7 @@  discard block
 block discarded – undo
 			'starting_id' => $start,
 		)
 	)->fetch_callback(
-		function ($row) use (&$num_messages) {
+		function($row) use (&$num_messages) {
 			$num_messages[empty($row['todo']) ? 'done' : 'todo'] = $row['num_messages'];
 		}
 	);
@@ -414,7 +414,7 @@  discard block
 block discarded – undo
 					'limit' => $messages_per_batch,
 				)
 			)->fetch_callback(
-				function ($row) use (&$forced_break, &$number_processed, &$inserts, $stop) {
+				function($row) use (&$forced_break, &$number_processed, &$inserts, $stop) {
 					// In theory it's possible for one of these to take friggin ages so add more timeout protection.
 					if ($stop < time() || $forced_break)
 					{
@@ -501,7 +501,7 @@  discard block
 block discarded – undo
 				'minimum_messages' => $max_occurrences,
 			)
 		)->fetch_callback(
-			function ($row) use (&$stop_words) {
+			function($row) use (&$stop_words) {
 				$stop_words[] = $row['id_word'];
 			}
 		);

Please login to merge, or discard this patch.

sources/subs/RepairBoards.subs.php 1 patch

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

@@ -107,7 +107,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) {
 				$db = database();
 
 				// Only if we don't have a reasonable idea of where to put it.
@@ -196,7 +196,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 $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'];
@@ -369,7 +369,7 @@  discard block
 block discarded – undo
 					'approved' => $row['firstmsg_approved'],
 				));
 			},
-			'message_function' => function ($row) {
+			'message_function' => function($row) {
 				global $txt, $context;
 
 				// A pretend error?
@@ -414,7 +414,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?
@@ -428,7 +428,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?
@@ -462,7 +462,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(
@@ -496,7 +496,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 $txt;
 
 				$db = database();
@@ -547,7 +547,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) {
 					$db = database();
 					$salvageCatID = createSalvageCategory();
 					$db->query('', '
@@ -583,7 +583,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('', '
@@ -612,7 +612,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) {
 					$db = database();
 					$salvageCatID = createSalvageCategory();
 					$salvageBoardID = createSalvageBoard();
@@ -649,7 +649,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('', '
@@ -683,7 +683,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('', '
@@ -714,7 +714,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('', '
@@ -743,7 +743,7 @@  discard block
 block discarded – undo
 					AND lt.id_member BETWEEN {STEP_LOW} AND {STEP_HIGH}',
 			'fix_collect' => array(
 				'index' => 'id_member',
-				'process' => function ($members) {
+				'process' => function($members) {
 					$db = database();
 
 					$db->query('', '
@@ -772,7 +772,7 @@  discard block
 block discarded – undo
 					AND lb.id_member BETWEEN {STEP_LOW} AND {STEP_HIGH}',
 			'fix_collect' => array(
 				'index' => 'id_board',
-				'process' => function ($boards) {
+				'process' => function($boards) {
 					$db = database();
 
 					$db->query('', '
@@ -801,7 +801,7 @@  discard block
 block discarded – undo
 					AND lb.id_member BETWEEN {STEP_LOW} AND {STEP_HIGH}',
 			'fix_collect' => array(
 				'index' => 'id_member',
-				'process' => function ($members) {
+				'process' => function($members) {
 					$db = database();
 
 					$db->query('', '
@@ -830,7 +830,7 @@  discard block
 block discarded – undo
 					AND lmr.id_member BETWEEN {STEP_LOW} AND {STEP_HIGH}',
 			'fix_collect' => array(
 				'index' => 'id_board',
-				'process' => function ($boards) {
+				'process' => function($boards) {
 					$db = database();
 
 					$db->query('', '
@@ -859,7 +859,7 @@  discard block
 block discarded – undo
 					AND lmr.id_member BETWEEN {STEP_LOW} AND {STEP_HIGH}',
 			'fix_collect' => array(
 				'index' => 'id_member',
-				'process' => function ($members) {
+				'process' => function($members) {
 					$db = database();
 
 					$db->query('', '
@@ -890,7 +890,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('', '
@@ -920,7 +920,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('', '
@@ -951,7 +951,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('', '
@@ -980,7 +980,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('', '
@@ -1009,7 +1009,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();
 
@@ -1043,7 +1043,7 @@  discard block
 block discarded – undo
 					);
 				}
 			},
-			'message_function' => function ($row) {
+			'message_function' => function($row) {
 				global $txt, $context;
 
 				if (count(text2words($row['subject'])) != 0)
@@ -1072,7 +1072,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('', '
@@ -1103,7 +1103,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('', '
@@ -1133,7 +1133,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('', '
@@ -1163,7 +1163,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('', '
@@ -1193,7 +1193,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('', '
@@ -1222,7 +1222,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('', '
@@ -1251,7 +1251,7 @@  discard block
 block discarded – undo
 					AND mg.id_group IS NULL',
 			'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/Language.subs.php 1 patch

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

@@ -88,7 +88,7 @@
 block discarded – undo
 		GROUP BY lngfile',
 		array()
 	)->fetch_callback(
-		function ($row) use (&$languages, $language) {
+		function($row) use (&$languages, $language) {
 			// Default?
 			if (empty($row['lngfile']) || !isset($languages[$row['lngfile']]))
 			{

Please login to merge, or discard this patch.

sources/subs/ManagePermissions.subs.php 1 patch

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

@@ -330,7 +330,7 @@  discard block
 block discarded – undo
 				'newbie_group' => 4,
 			)
 		)->fetch_callback(
-			function ($row) use ($db, $boardLevels, $profile, $level) {
+			function($row) use ($db, $boardLevels, $profile, $level) {
 				$group = $row['id_group'];
 
 				$boardInserts = array();
@@ -388,7 +388,7 @@  discard block
 block discarded – undo
 		ORDER BY id_profile',
 		array()
 	)->fetch_callback(
-		function ($row) use ($txt) {
+		function($row) use ($txt) {
 			global $context;
 
 			// Format the label nicely.
@@ -737,7 +737,7 @@  discard block
 block discarded – undo
 			'hidden_permissions' => !isset($hidden_permissions) ? $hidden_permissions : array(),
 		)
 	)->fetch_callback(
-		function ($row) use (&$groups) {
+		function($row) use (&$groups) {
 			if (isset($groups[(int) $row['id_group']]) && (!empty($row['add_deny']) || $row['id_group'] != -1))
 			{
 				$groups[$row['id_group']]['num_permissions'][empty($row['add_deny']) ? 'denied' : 'allowed'] = $row['num_permissions'];
@@ -775,7 +775,7 @@  discard block
 block discarded – undo
 			'current_profile' => $profile_id,
 		)
 	)->fetch_callback(
-		function ($row) use (&$groups) {
+		function($row) use (&$groups) {
 			if (isset($groups[(int) $row['id_group']]) && (!empty($row['add_deny']) || $row['id_group'] != -1))
 			{
 				$groups[$row['id_group']]['num_permissions'][empty($row['add_deny']) ? 'denied' : 'allowed'] += $row['num_permissions'];
@@ -834,7 +834,7 @@  discard block
 block discarded – undo
 			'copy_from' => $copy_from,
 		)
 	)->fetch_callback(
-		function ($row) use (&$target_perm) {
+		function($row) use (&$target_perm) {
 			$target_perm[$row['permission']] = $row['add_deny'];
 		}
 	);
@@ -907,7 +907,7 @@  discard block
 block discarded – undo
 			'current_profile' => $profile_id,
 		)
 	)->fetch_callback(
-		function ($row) use (&$target_perm) {
+		function($row) use (&$target_perm) {
 			$target_perm[$row['permission']] = $row['add_deny'];
 		}
 	);
@@ -1070,7 +1070,7 @@  discard block
 block discarded – undo
 			'current_group' => $id_group,
 		)
 	)->fetch_callback(
-		function ($row) use (&$permissions) {
+		function($row) use (&$permissions) {
 			$permissions[empty($row['add_deny']) ? 'denied' : 'allowed'][] = $row['permission'];
 		}
 	);
@@ -1109,7 +1109,7 @@  discard block
 block discarded – undo
 			'current_profile' => $permission_type === 'membergroup' ? 1 : $profile_id,
 		)
 	)->fetch_callback(
-		function ($row) use (&$permissions) {
+		function($row) use (&$permissions) {
 			$permissions[empty($row['add_deny']) ? 'denied' : 'allowed'][] = $row['permission'];
 		}
 	);
@@ -1205,7 +1205,7 @@  discard block
 block discarded – undo
 			'min_posts' => -1,
 		)
 	)->fetch_callback(
-		function ($row) {
+		function($row) {
 			return $row['id_group'];
 		}
 	);
@@ -1272,7 +1272,7 @@  discard block
 block discarded – undo
 			'copy_from' => $copy_from,
 		)
 	)->fetch_callback(
-		function ($row) use ($profile_id) {
+		function($row) use ($profile_id) {
 			return array($profile_id, $row['id_group'], $row['permission'], $row['add_deny']);
 		}
 	);
@@ -1372,7 +1372,7 @@  discard block
 block discarded – undo
 		GROUP BY id_profile',
 		array()
 	)->fetch_callback(
-		function ($row) use (&$profiles) {
+		function($row) use (&$profiles) {
 			global $txt;
 
 			if (isset($profiles[$row['id_profile']]))
@@ -1459,7 +1459,7 @@  discard block
 block discarded – undo
 			'permissions' => $permissions,
 		)
 	)->fetch_callback(
-		function ($row) use (&$groups) {
+		function($row) use (&$groups) {
 			$groups[$row['id_group']][$row['add_deny'] ? 'add' : 'deny'][] = $row['permission'];
 		}
 	);

Please login to merge, or discard this patch.

		@@ -614,7 +614,7 @@
		block discarded – undo
614	614	'type' => 0,
615	615	)
616	616	)->fetch_callback(
617		- function ($row) use (&$attachmentData) {
	617	+ function($row) use (&$attachmentData) {
618	618	$attachmentData = $row;
619	619	$attachmentData['is_image'] = substr($attachmentData['mime_type'], 0, 5) === 'image';
620	620	$attachmentData['size'] = byte_format($attachmentData['size']);

		@@ -330,7 +330,7 @@ discard block
		block discarded – undo
330	330	'newbie_group' => 4,
331	331	)
332	332	)->fetch_callback(
333		- function ($row) use ($db, $boardLevels, $profile, $level) {
	333	+ function($row) use ($db, $boardLevels, $profile, $level) {
334	334	$group = $row['id_group'];
335	335
336	336	$boardInserts = array();
		@@ -388,7 +388,7 @@ discard block
		block discarded – undo
388	388	ORDER BY id_profile',
389	389	array()
390	390	)->fetch_callback(
391		- function ($row) use ($txt) {
	391	+ function($row) use ($txt) {
392	392	global $context;
393	393
394	394	// Format the label nicely.
		@@ -737,7 +737,7 @@ discard block
		block discarded – undo
737	737	'hidden_permissions' => !isset($hidden_permissions) ? $hidden_permissions : array(),
738	738	)
739	739	)->fetch_callback(
740		- function ($row) use (&$groups) {
	740	+ function($row) use (&$groups) {
741	741	if (isset($groups[(int) $row['id_group']]) && (!empty($row['add_deny']) \|\| $row['id_group'] != -1))
742	742	{
743	743	$groups[$row['id_group']]['num_permissions'][empty($row['add_deny']) ? 'denied' : 'allowed'] = $row['num_permissions'];
		@@ -775,7 +775,7 @@ discard block
		block discarded – undo
775	775	'current_profile' => $profile_id,
776	776	)
777	777	)->fetch_callback(
778		- function ($row) use (&$groups) {
	778	+ function($row) use (&$groups) {
779	779	if (isset($groups[(int) $row['id_group']]) && (!empty($row['add_deny']) \|\| $row['id_group'] != -1))
780	780	{
781	781	$groups[$row['id_group']]['num_permissions'][empty($row['add_deny']) ? 'denied' : 'allowed'] += $row['num_permissions'];
		@@ -834,7 +834,7 @@ discard block
		block discarded – undo
834	834	'copy_from' => $copy_from,
835	835	)
836	836	)->fetch_callback(
837		- function ($row) use (&$target_perm) {
	837	+ function($row) use (&$target_perm) {
838	838	$target_perm[$row['permission']] = $row['add_deny'];
839	839	}
840	840	);
		@@ -907,7 +907,7 @@ discard block
		block discarded – undo
907	907	'current_profile' => $profile_id,
908	908	)
909	909	)->fetch_callback(
910		- function ($row) use (&$target_perm) {
	910	+ function($row) use (&$target_perm) {
911	911	$target_perm[$row['permission']] = $row['add_deny'];
912	912	}
913	913	);
		@@ -1070,7 +1070,7 @@ discard block
		block discarded – undo
1070	1070	'current_group' => $id_group,
1071	1071	)
1072	1072	)->fetch_callback(
1073		- function ($row) use (&$permissions) {
	1073	+ function($row) use (&$permissions) {
1074	1074	$permissions[empty($row['add_deny']) ? 'denied' : 'allowed'][] = $row['permission'];
1075	1075	}
1076	1076	);
		@@ -1109,7 +1109,7 @@ discard block
		block discarded – undo
1109	1109	'current_profile' => $permission_type === 'membergroup' ? 1 : $profile_id,
1110	1110	)
1111	1111	)->fetch_callback(
1112		- function ($row) use (&$permissions) {
	1112	+ function($row) use (&$permissions) {
1113	1113	$permissions[empty($row['add_deny']) ? 'denied' : 'allowed'][] = $row['permission'];
1114	1114	}
1115	1115	);
		@@ -1205,7 +1205,7 @@ discard block
		block discarded – undo
1205	1205	'min_posts' => -1,
1206	1206	)
1207	1207	)->fetch_callback(
1208		- function ($row) {
	1208	+ function($row) {
1209	1209	return $row['id_group'];
1210	1210	}
1211	1211	);
		@@ -1272,7 +1272,7 @@ discard block
		block discarded – undo
1272	1272	'copy_from' => $copy_from,
1273	1273	)
1274	1274	)->fetch_callback(
1275		- function ($row) use ($profile_id) {
	1275	+ function($row) use ($profile_id) {
1276	1276	return array($profile_id, $row['id_group'], $row['permission'], $row['add_deny']);
1277	1277	}
1278	1278	);
		@@ -1372,7 +1372,7 @@ discard block
		block discarded – undo
1372	1372	GROUP BY id_profile',
1373	1373	array()
1374	1374	)->fetch_callback(
1375		- function ($row) use (&$profiles) {
	1375	+ function($row) use (&$profiles) {
1376	1376	global $txt;
1377	1377
1378	1378	if (isset($profiles[$row['id_profile']]))
		@@ -1459,7 +1459,7 @@ discard block
		block discarded – undo
1459	1459	'permissions' => $permissions,
1460	1460	)
1461	1461	)->fetch_callback(
1462		- function ($row) use (&$groups) {
	1462	+ function($row) use (&$groups) {
1463	1463	$groups[$row['id_group']][$row['add_deny'] ? 'add' : 'deny'][] = $row['permission'];
1464	1464	}
1465	1465	);

		@@ -2,6 +2,9 @@
		block discarded – undo
2	2
3	3	// Try to handle it with the upper level index.php. (it should know what to do.)
4	4	if (file_exists(dirname(dirname(__FILE__)) . '/index.php'))
	5	+{
5	6	include (dirname(dirname(__FILE__)) . '/index.php');
6		-else
7		- exit;
8	7	\ No newline at end of file
	8	+}
	9	+else {
	10	+ exit;
	11	+}

		@@ -44,7 +44,7 @@
		block discarded – undo
44	44	ORDER BY m.icon_order',
45	45	[]
46	46	)->fetch_callback(
47		- function ($row) use (&$icons, &$last_icon, &$trueOrder) {
	47	+ function($row) use (&$icons, &$last_icon, &$trueOrder) {
48	48	global $settings, $txt;
49	49
50	50	$icons[$row['id_icon']] = [

		@@ -34,7 +34,7 @@ discard block
		block discarded – undo
34	34	FROM {db_prefix}messages',
35	35	array()
36	36	)->fetch_callback(
37		- function ($row) use (&$fulltext_index) {
	37	+ function($row) use (&$fulltext_index) {
38	38	if (($row['Column_name'] === 'body' \|\| $row['Column_name'] === 'subject')
39	39	&& (isset($row['Index_type']) && $row['Index_type'] === 'FULLTEXT'
40	40	\|\| isset($row['Comment']) && $row['Comment'] === 'FULLTEXT'))
		@@ -380,7 +380,7 @@ discard block
		block discarded – undo
380	380	'starting_id' => $start,
381	381	)
382	382	)->fetch_callback(
383		- function ($row) use (&$num_messages) {
	383	+ function($row) use (&$num_messages) {
384	384	$num_messages[empty($row['todo']) ? 'done' : 'todo'] = $row['num_messages'];
385	385	}
386	386	);
		@@ -414,7 +414,7 @@ discard block
		block discarded – undo
414	414	'limit' => $messages_per_batch,
415	415	)
416	416	)->fetch_callback(
417		- function ($row) use (&$forced_break, &$number_processed, &$inserts, $stop) {
	417	+ function($row) use (&$forced_break, &$number_processed, &$inserts, $stop) {
418	418	// In theory it's possible for one of these to take friggin ages so add more timeout protection.
419	419	if ($stop < time() \|\| $forced_break)
420	420	{
		@@ -501,7 +501,7 @@ discard block
		block discarded – undo
501	501	'minimum_messages' => $max_occurrences,
502	502	)
503	503	)->fetch_callback(
504		- function ($row) use (&$stop_words) {
	504	+ function($row) use (&$stop_words) {
505	505	$stop_words[] = $row['id_word'];
506	506	}
507	507	);

		@@ -107,7 +107,7 @@ discard block
		block discarded – undo
107	107	LEFT JOIN {db_prefix}topics AS t ON (t.id_topic = m.id_topic)
108	108	WHERE t.id_topic IS NULL
109	109	GROUP BY m.id_topic, m.id_board',
110		- 'fix_processing' => function ($row) {
	110	+ 'fix_processing' => function($row) {
111	111	$db = database();
112	112
113	113	// Only if we don't have a reasonable idea of where to put it.
		@@ -196,7 +196,7 @@ discard block
		block discarded – undo
196	196	// Remove all topics that have zero messages in the messages table.
197	197	'fix_collect' => array(
198	198	'index' => 'id_topic',
199		- 'process' => function ($topics) {
	199	+ 'process' => function($topics) {
200	200	$db = database();
201	201
202	202	$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 $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'];
		@@ -369,7 +369,7 @@ discard block
		block discarded – undo
369	369	'approved' => $row['firstmsg_approved'],
370	370	));
371	371	},
372		- 'message_function' => function ($row) {
	372	+ 'message_function' => function($row) {
373	373	global $txt, $context;
374	374
375	375	// A pretend error?
		@@ -414,7 +414,7 @@ discard block
		block discarded – undo
414	414	WHERE t.id_topic BETWEEN {STEP_LOW} AND {STEP_HIGH}
415	415	GROUP BY t.id_topic, t.num_replies, mf.approved
416	416	ORDER BY t.id_topic',
417		- 'fix_processing' => function ($row) {
	417	+ 'fix_processing' => function($row) {
418	418	$row['my_num_replies'] = (int) $row['my_num_replies'];
419	419
420	420	// Not really a problem?
		@@ -428,7 +428,7 @@ discard block
		block discarded – undo
428	428	'num_replies' => $row['my_num_replies'],
429	429	));
430	430	},
431		- 'message_function' => function ($row) {
	431	+ 'message_function' => function($row) {
432	432	global $txt, $context;
433	433
434	434	// Just joking?
		@@ -462,7 +462,7 @@ discard block
		block discarded – undo
462	462	GROUP BY t.id_topic, t.unapproved_posts
463	463	HAVING unapproved_posts != COUNT(mu.id_msg)
464	464	ORDER BY t.id_topic',
465		- 'fix_processing' => function ($row) {
	465	+ 'fix_processing' => function($row) {
466	466	$row['my_unapproved_posts'] = (int) $row['my_unapproved_posts'];
467	467
468	468	setTopicAttribute($row['id_topic'], array(
		@@ -496,7 +496,7 @@ discard block
		block discarded – undo
496	496	WHERE b.id_board IS NULL
497	497	AND t.id_topic BETWEEN {STEP_LOW} AND {STEP_HIGH}
498	498	GROUP BY t.id_board',
499		- 'fix_processing' => function ($row) {
	499	+ 'fix_processing' => function($row) {
500	500	global $txt;
501	501
502	502	$db = database();
		@@ -547,7 +547,7 @@ discard block
		block discarded – undo
547	547	ORDER BY b.id_cat, b.id_board',
548	548	'fix_collect' => array(
549	549	'index' => 'id_cat',
550		- 'process' => function ($cats) {
	550	+ 'process' => function($cats) {
551	551	$db = database();
552	552	$salvageCatID = createSalvageCategory();
553	553	$db->query('', '
		@@ -583,7 +583,7 @@ discard block
		block discarded – undo
583	583	// Last step-make sure all non-guest posters still exist.
584	584	'fix_collect' => array(
585	585	'index' => 'id_msg',
586		- 'process' => function ($msgs) {
	586	+ 'process' => function($msgs) {
587	587	$db = database();
588	588
589	589	$db->query('', '
		@@ -612,7 +612,7 @@ discard block
		block discarded – undo
612	612	ORDER BY b.id_parent, b.id_board',
613	613	'fix_collect' => array(
614	614	'index' => 'id_parent',
615		- 'process' => function ($parents) {
	615	+ 'process' => function($parents) {
616	616	$db = database();
617	617	$salvageCatID = createSalvageCategory();
618	618	$salvageBoardID = createSalvageBoard();
		@@ -649,7 +649,7 @@ discard block
		block discarded – undo
649	649	AND p.id_poll IS NULL',
650	650	'fix_collect' => array(
651	651	'index' => 'id_poll',
652		- 'process' => function ($polls) {
	652	+ 'process' => function($polls) {
653	653	$db = database();
654	654
655	655	$db->query('', '
		@@ -683,7 +683,7 @@ discard block
		block discarded – undo
683	683	ORDER BY cal.id_topic',
684	684	'fix_collect' => array(
685	685	'index' => 'id_topic',
686		- 'process' => function ($events) {
	686	+ 'process' => function($events) {
687	687	$db = database();
688	688
689	689	$db->query('', '
		@@ -714,7 +714,7 @@ discard block
		block discarded – undo
714	714	AND lt.id_member BETWEEN {STEP_LOW} AND {STEP_HIGH}',
715	715	'fix_collect' => array(
716	716	'index' => 'id_topic',
717		- 'process' => function ($topics) {
	717	+ 'process' => function($topics) {
718	718	$db = database();
719	719
720	720	$db->query('', '
		@@ -743,7 +743,7 @@ discard block
		block discarded – undo
743	743	AND lt.id_member BETWEEN {STEP_LOW} AND {STEP_HIGH}',
744	744	'fix_collect' => array(
745	745	'index' => 'id_member',
746		- 'process' => function ($members) {
	746	+ 'process' => function($members) {
747	747	$db = database();
748	748
749	749	$db->query('', '
		@@ -772,7 +772,7 @@ discard block
		block discarded – undo
772	772	AND lb.id_member BETWEEN {STEP_LOW} AND {STEP_HIGH}',
773	773	'fix_collect' => array(
774	774	'index' => 'id_board',
775		- 'process' => function ($boards) {
	775	+ 'process' => function($boards) {
776	776	$db = database();
777	777
778	778	$db->query('', '
		@@ -801,7 +801,7 @@ discard block
		block discarded – undo
801	801	AND lb.id_member BETWEEN {STEP_LOW} AND {STEP_HIGH}',
802	802	'fix_collect' => array(
803	803	'index' => 'id_member',
804		- 'process' => function ($members) {
	804	+ 'process' => function($members) {
805	805	$db = database();
806	806
807	807	$db->query('', '
		@@ -830,7 +830,7 @@ discard block
		block discarded – undo
830	830	AND lmr.id_member BETWEEN {STEP_LOW} AND {STEP_HIGH}',
831	831	'fix_collect' => array(
832	832	'index' => 'id_board',
833		- 'process' => function ($boards) {
	833	+ 'process' => function($boards) {
834	834	$db = database();
835	835
836	836	$db->query('', '
		@@ -859,7 +859,7 @@ discard block
		block discarded – undo
859	859	AND lmr.id_member BETWEEN {STEP_LOW} AND {STEP_HIGH}',
860	860	'fix_collect' => array(
861	861	'index' => 'id_member',
862		- 'process' => function ($members) {
	862	+ 'process' => function($members) {
863	863	$db = database();
864	864
865	865	$db->query('', '
		@@ -890,7 +890,7 @@ discard block
		block discarded – undo
890	890	GROUP BY pmr.id_pm',
891	891	'fix_collect' => array(
892	892	'index' => 'id_pm',
893		- 'process' => function ($pms) {
	893	+ 'process' => function($pms) {
894	894	$db = database();
895	895
896	896	$db->query('', '
		@@ -920,7 +920,7 @@ discard block
		block discarded – undo
920	920	AND mem.id_member IS NULL',
921	921	'fix_collect' => array(
922	922	'index' => 'id_member',
923		- 'process' => function ($members) {
	923	+ 'process' => function($members) {
924	924	$db = database();
925	925
926	926	$db->query('', '
		@@ -951,7 +951,7 @@ discard block
		block discarded – undo
951	951	AND mem.id_member IS NULL',
952	952	'fix_collect' => array(
953	953	'index' => 'id_pm',
954		- 'process' => function ($guestMessages) {
	954	+ 'process' => function($guestMessages) {
955	955	$db = database();
956	956
957	957	$db->query('', '
		@@ -980,7 +980,7 @@ discard block
		block discarded – undo
980	980	AND mem.id_member IS NULL',
981	981	'fix_collect' => array(
982	982	'index' => 'id_member',
983		- 'process' => function ($members) {
	983	+ 'process' => function($members) {
984	984	$db = database();
985	985
986	986	$db->query('', '
		@@ -1009,7 +1009,7 @@ discard block
		block discarded – undo
1009	1009	LEFT JOIN {db_prefix}log_search_subjects AS lss ON (lss.id_topic = t.id_topic)
1010	1010	WHERE t.id_topic BETWEEN {STEP_LOW} AND {STEP_HIGH}
1011	1011	AND lss.id_topic IS NULL',
1012		- 'fix_full_processing' => function ($result) {
	1012	+ 'fix_full_processing' => function($result) {
1013	1013
1014	1014	$db = database();
1015	1015
		@@ -1043,7 +1043,7 @@ discard block
		block discarded – undo
1043	1043	);
1044	1044	}
1045	1045	},
1046		- 'message_function' => function ($row) {
	1046	+ 'message_function' => function($row) {
1047	1047	global $txt, $context;
1048	1048
1049	1049	if (count(text2words($row['subject'])) != 0)
		@@ -1072,7 +1072,7 @@ discard block
		block discarded – undo
1072	1072	AND t.id_topic IS NULL',
1073	1073	'fix_collect' => array(
1074	1074	'index' => 'id_topic',
1075		- 'process' => function ($deleteTopics) {
	1075	+ 'process' => function($deleteTopics) {
1076	1076	$db = database();
1077	1077
1078	1078	$db->query('', '
		@@ -1103,7 +1103,7 @@ discard block
		block discarded – undo
1103	1103	AND mem.id_member IS NULL',
1104	1104	'fix_collect' => array(
1105	1105	'index' => 'id_member',
1106		- 'process' => function ($members) {
	1106	+ 'process' => function($members) {
1107	1107	$db = database();
1108	1108
1109	1109	$db->query('', '
		@@ -1133,7 +1133,7 @@ discard block
		block discarded – undo
1133	1133	AND p.id_poll IS NULL',
1134	1134	'fix_collect' => array(
1135	1135	'index' => 'id_poll',
1136		- 'process' => function ($polls) {
	1136	+ 'process' => function($polls) {
1137	1137	$db = database();
1138	1138
1139	1139	$db->query('', '
		@@ -1163,7 +1163,7 @@ discard block
		block discarded – undo
1163	1163	AND lrc.id_report IS NULL',
1164	1164	'fix_collect' => array(
1165	1165	'index' => 'id_report',
1166		- 'process' => function ($reports) {
	1166	+ 'process' => function($reports) {
1167	1167	$db = database();
1168	1168
1169	1169	$db->query('', '
		@@ -1193,7 +1193,7 @@ discard block
		block discarded – undo
1193	1193	AND lr.id_report IS NULL',
1194	1194	'fix_collect' => array(
1195	1195	'index' => 'id_report',
1196		- 'process' => function ($reports) {
	1196	+ 'process' => function($reports) {
1197	1197	$db = database();
1198	1198
1199	1199	$db->query('', '
		@@ -1222,7 +1222,7 @@ discard block
		block discarded – undo
1222	1222	AND mem.id_member IS NULL',
1223	1223	'fix_collect' => array(
1224	1224	'index' => 'id_member',
1225		- 'process' => function ($members) {
	1225	+ 'process' => function($members) {
1226	1226	$db = database();
1227	1227
1228	1228	$db->query('', '
		@@ -1251,7 +1251,7 @@ discard block
		block discarded – undo
1251	1251	AND mg.id_group IS NULL',
1252	1252	'fix_collect' => array(
1253	1253	'index' => 'id_group',
1254		- 'process' => function ($groups) {
	1254	+ 'process' => function($groups) {
1255	1255	$db = database();
1256	1256
1257	1257	$db->query('', '

		@@ -88,7 +88,7 @@
		block discarded – undo
88	88	GROUP BY lngfile',
89	89	array()
90	90	)->fetch_callback(
91		- function ($row) use (&$languages, $language) {
	91	+ function($row) use (&$languages, $language) {
92	92	// Default?
93	93	if (empty($row['lngfile']) \|\| !isset($languages[$row['lngfile']]))
94	94	{

elkarte / Elkarte

Pull Request — development (#3780)

Status

Category

Braces +5 added lines, -2 removed lines patch added patch discarded remove patch

Braces +5 added lines, -2 removed lines patch added patch discarded remove patch

Braces +5 added lines, -2 removed lines patch added patch discarded remove patch

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

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

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

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

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

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