Inspection of "Fixes undefined errors on profile" - SimpleMachines/SMF2.1 - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Pull Request — release-2.1 (#4670)

by Fran

created 2018-03-26 16:47 UTC

Status

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

@@ -39,7 +39,7 @@
 block discarded – undo
 	$error_call++;
 
 	// are we in a loop?
-	if($error_call > 2)
+	if ($error_call > 2)
 	{
 		if (!isset($db_show_debug) || $db_show_debug === false)
 			$backtrace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);

Please login to merge, or discard this patch.

Themes/default/Post.template.php 1 patch

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

@@ -417,8 +417,8 @@  discard block
 block discarded – undo
 									</div><!-- .attached_BBC -->
 									<div class="progressBar" role="progressBar" aria-valuemin="0" aria-valuemax="100" aria-valuenow="0"><span></span></div>
 									<div class="attach-ui">
-										<a data-dz-remove class="button cancel">', $txt['modify_cancel'] ,'</a>
-										<a class="button upload">', $txt['upload'] ,'</a>
+										<a data-dz-remove class="button cancel">', $txt['modify_cancel'], '</a>
+										<a class="button upload">', $txt['upload'], '</a>
 									</div>
 								</div><!-- .attach-info -->
 							</div><!-- #au-template -->
@@ -433,10 +433,10 @@  discard block
 block discarded – undo
 							</dt>
 							<dd class="smalltext fallback">
 								<div id="attachUpload" class="descbox">
-									<h5>', $txt['attach_drop_zone'] ,'</h5>
-									<a class="button" id="attach-cancelAll">', $txt['attached_cancelAll'] ,'</a>
-									<a class="button" id="attach-uploadAll">', $txt['attached_uploadAll'] ,'</a>
-									<a class="button fileinput-button">', $txt['attach_add'] ,'</a>
+									<h5>', $txt['attach_drop_zone'], '</h5>
+									<a class="button" id="attach-cancelAll">', $txt['attached_cancelAll'], '</a>
+									<a class="button" id="attach-uploadAll">', $txt['attached_uploadAll'], '</a>
+									<a class="button fileinput-button">', $txt['attach_add'], '</a>
 									<div id="total-progress" class="progressBar" role="progressBar" aria-valuemin="0" aria-valuemax="100" aria-valuenow="0"><span></span></div>
 									<div class="fallback">
 										<input type="file" multiple="multiple" name="attachment[]" id="attachment1" class="fallback"> (<a href="javascript:void(0);" onclick="cleanFileInput(\'attachment1\');">', $txt['clean_attach'], '</a>)
@@ -541,7 +541,7 @@  discard block
 block discarded – undo
 	// Option to delete an event if user is editing one.
 	if ($context['make_event'] && !$context['event']['new'])
 		echo '
-						<input type="submit" name="deleteevent" value="', $txt['event_delete'], '" data-confirm="', $txt['event_delete_confirm'] ,'" class="button you_sure">';
+						<input type="submit" name="deleteevent" value="', $txt['event_delete'], '" data-confirm="', $txt['event_delete_confirm'], '" class="button you_sure">';
 
 	echo '
 					</span>
@@ -795,7 +795,7 @@  discard block
 block discarded – undo
 			});';
 
 	echo '
-			var oEditorID = "', $context['post_box_name'] ,'";
+			var oEditorID = "', $context['post_box_name'], '";
 			var oEditorObject = oEditorHandle_', $context['post_box_name'], ';
 		</script>';
 
@@ -827,7 +827,7 @@  discard block
 block discarded – undo
 			if ($context['can_quote'])
 				echo '
 					<ul class="quickbuttons" id="msg_', $post['id'], '_quote">
-						<li style="display:none;" id="quoteSelected_', $post['id'], '" data-msgid="', $post['id'], '"><a href="javascript:void(0)"><span class="generic_icons quote_selected"></span>', $txt['quote_selected_action'] ,'</a></li>
+						<li style="display:none;" id="quoteSelected_', $post['id'], '" data-msgid="', $post['id'], '"><a href="javascript:void(0)"><span class="generic_icons quote_selected"></span>', $txt['quote_selected_action'], '</a></li>
 						<li id="post_modify"><a href="#postmodify" onclick="return insertQuoteFast(', $post['id'], ');"><span class="generic_icons quote"></span>', $txt['quote'], '</a></li>
 					</ul>';
 
@@ -911,7 +911,7 @@  discard block
 block discarded – undo
 	<head>
 		<meta charset="', $context['character_set'], '">
 		<title>', $txt['spell_check'], '</title>
-		<link rel="stylesheet" href="', $settings['theme_url'], '/css/index', $context['theme_variant'], '.css', $modSettings['browser_cache'] ,'">
+		<link rel="stylesheet" href="', $settings['theme_url'], '/css/index', $context['theme_variant'], '.css', $modSettings['browser_cache'], '">
 		<style>
 			body, td {
 				font-size: small;
@@ -941,8 +941,8 @@  discard block
 block discarded – undo
 			var spell_formname = window.opener.spell_formname;
 			var spell_fieldname = window.opener.spell_fieldname;
 		</script>
-		<script src="', $settings['default_theme_url'], '/scripts/spellcheck.js', $modSettings['browser_cache'] ,'"></script>
-		<script src="', $settings['default_theme_url'], '/scripts/script.js', $modSettings['browser_cache'] ,'"></script>
+		<script src="', $settings['default_theme_url'], '/scripts/spellcheck.js', $modSettings['browser_cache'], '"></script>
+		<script src="', $settings['default_theme_url'], '/scripts/script.js', $modSettings['browser_cache'], '"></script>
 		<script>
 			', $context['spell_js'], '
 		</script>
@@ -986,7 +986,7 @@  discard block
 block discarded – undo
 	<head>
 		<meta charset="', $context['character_set'], '">
 		<title>', $txt['retrieving_quote'], '</title>
-		<script src="', $settings['default_theme_url'], '/scripts/script.js', $modSettings['browser_cache'] ,'"></script>
+		<script src="', $settings['default_theme_url'], '/scripts/script.js', $modSettings['browser_cache'], '"></script>
 	</head>
 	<body>
 		', $txt['retrieving_quote'], '

Please login to merge, or discard this patch.

Sources/ManageSmileys.php 1 patch

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

@@ -393,7 +393,7 @@  discard block
 block discarded – undo
 					'class' => 'centercol',
 				),
 				'data' => array(
-					'function' => function ($rowData)
+					'function' => function($rowData)
 					{
 						return $rowData['selected'] ? '<span class="generic_icons valid"></span>' : '';
 					},
@@ -453,7 +453,7 @@  discard block
 block discarded – undo
 					'class' => 'centercol',
 				),
 				'data' => array(
-					'function' => function ($rowData)
+					'function' => function($rowData)
 					{
 						return $rowData['selected'] ? '' : sprintf('<input type="checkbox" name="smiley_set[%1$d]">', $rowData['id']);
 					},
@@ -997,7 +997,7 @@  discard block
 block discarded – undo
 						'value' => $txt['smileys_location'],
 					),
 					'data' => array(
-						'function' => function ($rowData) use ($txt)
+						'function' => function($rowData) use ($txt)
 						{
 							if (empty($rowData['hidden']))
 								return $txt['smileys_location_form'];
@@ -1008,7 +1008,7 @@  discard block
 block discarded – undo
 						},
 					),
 					'sort' => array(
-						'default' => $smcFunc['db_custom_order']('hidden', array_keys($smiley_locations)) ,
+						'default' => $smcFunc['db_custom_order']('hidden', array_keys($smiley_locations)),
 						'reverse' => $smcFunc['db_custom_order']('hidden', array_keys($smiley_locations), true),
 					),
 				),
@@ -1017,7 +1017,7 @@  discard block
 block discarded – undo
 						'value' => $txt['smileys_description'],
 					),
 					'data' => array(
-						'function' => function ($rowData) use ($context, $txt, $modSettings, $smcFunc)
+						'function' => function($rowData) use ($context, $txt, $modSettings, $smcFunc)
 						{
 							if (empty($modSettings['smileys_dir']) || !is_dir($modSettings['smileys_dir']))
 								return $smcFunc['htmlspecialchars']($rowData['description']);
@@ -1554,7 +1554,7 @@  discard block
 block discarded – undo
 				'action' => $smcFunc['htmlspecialchars'](strtr($action['destination'], array($boarddir => '.')))
 			);
 
-			$file =  $packagesdir . '/temp/' . $base_path . $action['filename'];
+			$file = $packagesdir . '/temp/' . $base_path . $action['filename'];
 			if (isset($action['filename']) && (!file_exists($file) || !is_writable(dirname($action['destination']))))
 			{
 				$context['has_failure'] = true;
@@ -1599,7 +1599,7 @@  discard block
 block discarded – undo
 		{
 			updateSettings(array(
 				'smiley_sets_known' => $modSettings['smiley_sets_known'] . ',' . basename($action['action']),
-				'smiley_sets_names' => $modSettings['smiley_sets_names'] . "\n" . $smileyInfo['name'] . (count($context['actions']) > 1 ? ' ' .  (!empty($action['description']) ? $smcFunc['htmlspecialchars']($action['description']) : basename($action['action'])) : ''),
+				'smiley_sets_names' => $modSettings['smiley_sets_names'] . "\n" . $smileyInfo['name'] . (count($context['actions']) > 1 ? ' ' . (!empty($action['description']) ? $smcFunc['htmlspecialchars']($action['description']) : basename($action['action'])) : ''),
 			));
 		}
 
@@ -1611,7 +1611,7 @@  discard block
 block discarded – undo
 			'{db_prefix}log_packages',
 			array(
 				'filename' => 'string', 'name' => 'string', 'package_id' => 'string', 'version' => 'string',
-				'id_member_installed' => 'int', 'member_installed' => 'string','time_installed' => 'int',
+				'id_member_installed' => 'int', 'member_installed' => 'string', 'time_installed' => 'int',
 				'install_state' => 'int', 'failed_steps' => 'string', 'themes_installed' => 'string',
 				'member_removed' => 'int', 'db_changes' => 'string', 'credits' => 'string',
 			),
@@ -1860,7 +1860,7 @@  discard block
 block discarded – undo
 		'columns' => array(
 			'icon' => array(
 				'data' => array(
-					'function' => function ($rowData) use ($settings, $smcFunc)
+					'function' => function($rowData) use ($settings, $smcFunc)
 					{
 						$images_url = $settings[file_exists(sprintf('%1$s/images/post/%2$s.png', $settings['theme_dir'], $rowData['filename'])) ? 'actual_images_url' : 'default_images_url'];
 						return sprintf('<img src="%1$s/post/%2$s.png" alt="%3$s">', $images_url, $rowData['filename'], $smcFunc['htmlspecialchars']($rowData['title']));
@@ -1894,7 +1894,7 @@  discard block
 block discarded – undo
 					'value' => $txt['icons_board'],
 				),
 				'data' => array(
-					'function' => function ($rowData) use ($txt)
+					'function' => function($rowData) use ($txt)
 					{
 						return empty($rowData['board_name']) ? $txt['icons_edit_icons_all_boards'] : $rowData['board_name'];
 					},

Please login to merge, or discard this patch.

Sources/CacheAPI-sqlite.php 1 patch

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

@@ -108,14 +108,14 @@  discard block
 block discarded – undo
 	 */
 	public function cleanCache($type = '')
 	{
-		if($type == 'expired')
-			$query = 'DELETE FROM cache WHERE ttl >= ' . time().';';
+		if ($type == 'expired')
+			$query = 'DELETE FROM cache WHERE ttl >= ' . time() . ';';
 		else
 			$query = 'DELETE FROM cache;';
 
 		$result = $this->cacheDB->exec($query);
 		
-		$query	= 'VACUUM;';
+		$query = 'VACUUM;';
 		$this->cacheDB->exec($query);
 
 		return $result;
@@ -156,7 +156,7 @@  discard block
 block discarded – undo
 
 		// If its invalid, use SMF's.
 		if (is_null($dir) || !is_writable($dir))
-			if(is_null($cachedir_sqlite) || !is_writable($cachedir_sqlite))
+			if (is_null($cachedir_sqlite) || !is_writable($cachedir_sqlite))
 				$this->cachedir = $cachedir;
 			else
 				$this->cachedir = $cachedir_sqlite;

Please login to merge, or discard this patch.

Sources/CacheAPI-postgres.php 1 patch

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

@@ -165,7 +165,7 @@  discard block
 block discarded – undo
 	{
 		global $db_connection, $db_prefix;
 		
-		pg_query($db_connection, 'CREATE LOCAL TEMP TABLE IF NOT EXISTS ' . $db_prefix . 'cache_tmp AS SELECT * FROM ' . $db_prefix . 'cache WHERE ttl >= ' . time() );
+		pg_query($db_connection, 'CREATE LOCAL TEMP TABLE IF NOT EXISTS ' . $db_prefix . 'cache_tmp AS SELECT * FROM ' . $db_prefix . 'cache WHERE ttl >= ' . time());
 	}
 	
 	/**
@@ -189,7 +189,7 @@  discard block
 block discarded – undo
 	{
 		global $db_connection, $db_prefix;
 		
-		pg_query($db_connection, 'INSERT INTO ' . $db_prefix . 'cache SELECT * FROM '. $db_prefix . 'cache_tmp ON CONFLICT DO NOTHING');
+		pg_query($db_connection, 'INSERT INTO ' . $db_prefix . 'cache SELECT * FROM ' . $db_prefix . 'cache_tmp ON CONFLICT DO NOTHING');
 	}
 }
 

Please login to merge, or discard this patch.

Sources/MessageIndex.php 1 patch

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

@@ -349,7 +349,7 @@
 block discarded – undo
 			SELECT
 				t.id_topic, t.num_replies, t.locked, t.num_views, t.is_sticky, t.id_poll, t.id_previous_board,
 				' . ($user_info['is_guest'] ? '0' : 'COALESCE(lt.id_msg, COALESCE(lmr.id_msg, -1)) + 1') . ' AS new_from,
-				' . ( $enableParticipation ? ' COALESCE(( SELECT 1 FROM {db_prefix}messages AS parti WHERE t.id_topic = parti.id_topic and parti.id_member = {int:current_member} LIMIT 1) , 0) as is_posted_in,
+				' . ($enableParticipation ? ' COALESCE(( SELECT 1 FROM {db_prefix}messages AS parti WHERE t.id_topic = parti.id_topic and parti.id_member = {int:current_member} LIMIT 1) , 0) as is_posted_in,
 				'	: '') . '
 				t.id_last_msg, t.approved, t.unapproved_posts, ml.poster_time AS last_poster_time, t.id_redirect_topic,
 				ml.id_msg_modified, ml.subject AS last_subject, ml.icon AS last_icon,

Please login to merge, or discard this patch.

other/upgrade.php 1 patch

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

		@@ -1661,7 +1661,7 @@ discard block
		block discarded – undo
1661	1661
1662	1662	// Our custom error handler - does nothing but does stop public errors from XML!
1663	1663	set_error_handler(
1664		- function ($errno, $errstr, $errfile, $errline) use ($support_js)
	1664	+ function($errno, $errstr, $errfile, $errline) use ($support_js)
1665	1665	{
1666	1666	if ($support_js)
1667	1667	return true;
		@@ -2651,94 +2651,94 @@ discard block
		block discarded – undo
2651	2651	// Translation table for the character sets not native for MySQL.
2652	2652	$translation_tables = array(
2653	2653	'windows-1255' => array(
2654		- '0x81' => '\'\'', '0x8A' => '\'\'', '0x8C' => '\'\'',
2655		- '0x8D' => '\'\'', '0x8E' => '\'\'', '0x8F' => '\'\'',
2656		- '0x90' => '\'\'', '0x9A' => '\'\'', '0x9C' => '\'\'',
2657		- '0x9D' => '\'\'', '0x9E' => '\'\'', '0x9F' => '\'\'',
2658		- '0xCA' => '\'\'', '0xD9' => '\'\'', '0xDA' => '\'\'',
2659		- '0xDB' => '\'\'', '0xDC' => '\'\'', '0xDD' => '\'\'',
2660		- '0xDE' => '\'\'', '0xDF' => '\'\'', '0xFB' => '0xD792',
2661		- '0xFC' => '0xE282AC', '0xFF' => '0xD6B2', '0xC2' => '0xFF',
2662		- '0x80' => '0xFC', '0xE2' => '0xFB', '0xA0' => '0xC2A0',
2663		- '0xA1' => '0xC2A1', '0xA2' => '0xC2A2', '0xA3' => '0xC2A3',
2664		- '0xA5' => '0xC2A5', '0xA6' => '0xC2A6', '0xA7' => '0xC2A7',
2665		- '0xA8' => '0xC2A8', '0xA9' => '0xC2A9', '0xAB' => '0xC2AB',
2666		- '0xAC' => '0xC2AC', '0xAD' => '0xC2AD', '0xAE' => '0xC2AE',
2667		- '0xAF' => '0xC2AF', '0xB0' => '0xC2B0', '0xB1' => '0xC2B1',
2668		- '0xB2' => '0xC2B2', '0xB3' => '0xC2B3', '0xB4' => '0xC2B4',
2669		- '0xB5' => '0xC2B5', '0xB6' => '0xC2B6', '0xB7' => '0xC2B7',
2670		- '0xB8' => '0xC2B8', '0xB9' => '0xC2B9', '0xBB' => '0xC2BB',
2671		- '0xBC' => '0xC2BC', '0xBD' => '0xC2BD', '0xBE' => '0xC2BE',
2672		- '0xBF' => '0xC2BF', '0xD7' => '0xD7B3', '0xD1' => '0xD781',
2673		- '0xD4' => '0xD7B0', '0xD5' => '0xD7B1', '0xD6' => '0xD7B2',
2674		- '0xE0' => '0xD790', '0xEA' => '0xD79A', '0xEC' => '0xD79C',
2675		- '0xED' => '0xD79D', '0xEE' => '0xD79E', '0xEF' => '0xD79F',
2676		- '0xF0' => '0xD7A0', '0xF1' => '0xD7A1', '0xF2' => '0xD7A2',
2677		- '0xF3' => '0xD7A3', '0xF5' => '0xD7A5', '0xF6' => '0xD7A6',
2678		- '0xF7' => '0xD7A7', '0xF8' => '0xD7A8', '0xF9' => '0xD7A9',
2679		- '0x82' => '0xE2809A', '0x84' => '0xE2809E', '0x85' => '0xE280A6',
2680		- '0x86' => '0xE280A0', '0x87' => '0xE280A1', '0x89' => '0xE280B0',
2681		- '0x8B' => '0xE280B9', '0x93' => '0xE2809C', '0x94' => '0xE2809D',
2682		- '0x95' => '0xE280A2', '0x97' => '0xE28094', '0x99' => '0xE284A2',
2683		- '0xC0' => '0xD6B0', '0xC1' => '0xD6B1', '0xC3' => '0xD6B3',
2684		- '0xC4' => '0xD6B4', '0xC5' => '0xD6B5', '0xC6' => '0xD6B6',
2685		- '0xC7' => '0xD6B7', '0xC8' => '0xD6B8', '0xC9' => '0xD6B9',
2686		- '0xCB' => '0xD6BB', '0xCC' => '0xD6BC', '0xCD' => '0xD6BD',
2687		- '0xCE' => '0xD6BE', '0xCF' => '0xD6BF', '0xD0' => '0xD780',
2688		- '0xD2' => '0xD782', '0xE3' => '0xD793', '0xE4' => '0xD794',
2689		- '0xE5' => '0xD795', '0xE7' => '0xD797', '0xE9' => '0xD799',
2690		- '0xFD' => '0xE2808E', '0xFE' => '0xE2808F', '0x92' => '0xE28099',
2691		- '0x83' => '0xC692', '0xD3' => '0xD783', '0x88' => '0xCB86',
2692		- '0x98' => '0xCB9C', '0x91' => '0xE28098', '0x96' => '0xE28093',
2693		- '0xBA' => '0xC3B7', '0x9B' => '0xE280BA', '0xAA' => '0xC397',
2694		- '0xA4' => '0xE282AA', '0xE1' => '0xD791', '0xE6' => '0xD796',
2695		- '0xE8' => '0xD798', '0xEB' => '0xD79B', '0xF4' => '0xD7A4',
	2654	+ '0x81' => '\'\'', '0x8A' => '\'\'', '0x8C' => '\'\'',
	2655	+ '0x8D' => '\'\'', '0x8E' => '\'\'', '0x8F' => '\'\'',
	2656	+ '0x90' => '\'\'', '0x9A' => '\'\'', '0x9C' => '\'\'',
	2657	+ '0x9D' => '\'\'', '0x9E' => '\'\'', '0x9F' => '\'\'',
	2658	+ '0xCA' => '\'\'', '0xD9' => '\'\'', '0xDA' => '\'\'',
	2659	+ '0xDB' => '\'\'', '0xDC' => '\'\'', '0xDD' => '\'\'',
	2660	+ '0xDE' => '\'\'', '0xDF' => '\'\'', '0xFB' => '0xD792',
	2661	+ '0xFC' => '0xE282AC', '0xFF' => '0xD6B2', '0xC2' => '0xFF',
	2662	+ '0x80' => '0xFC', '0xE2' => '0xFB', '0xA0' => '0xC2A0',
	2663	+ '0xA1' => '0xC2A1', '0xA2' => '0xC2A2', '0xA3' => '0xC2A3',
	2664	+ '0xA5' => '0xC2A5', '0xA6' => '0xC2A6', '0xA7' => '0xC2A7',
	2665	+ '0xA8' => '0xC2A8', '0xA9' => '0xC2A9', '0xAB' => '0xC2AB',
	2666	+ '0xAC' => '0xC2AC', '0xAD' => '0xC2AD', '0xAE' => '0xC2AE',
	2667	+ '0xAF' => '0xC2AF', '0xB0' => '0xC2B0', '0xB1' => '0xC2B1',
	2668	+ '0xB2' => '0xC2B2', '0xB3' => '0xC2B3', '0xB4' => '0xC2B4',
	2669	+ '0xB5' => '0xC2B5', '0xB6' => '0xC2B6', '0xB7' => '0xC2B7',
	2670	+ '0xB8' => '0xC2B8', '0xB9' => '0xC2B9', '0xBB' => '0xC2BB',
	2671	+ '0xBC' => '0xC2BC', '0xBD' => '0xC2BD', '0xBE' => '0xC2BE',
	2672	+ '0xBF' => '0xC2BF', '0xD7' => '0xD7B3', '0xD1' => '0xD781',
	2673	+ '0xD4' => '0xD7B0', '0xD5' => '0xD7B1', '0xD6' => '0xD7B2',
	2674	+ '0xE0' => '0xD790', '0xEA' => '0xD79A', '0xEC' => '0xD79C',
	2675	+ '0xED' => '0xD79D', '0xEE' => '0xD79E', '0xEF' => '0xD79F',
	2676	+ '0xF0' => '0xD7A0', '0xF1' => '0xD7A1', '0xF2' => '0xD7A2',
	2677	+ '0xF3' => '0xD7A3', '0xF5' => '0xD7A5', '0xF6' => '0xD7A6',
	2678	+ '0xF7' => '0xD7A7', '0xF8' => '0xD7A8', '0xF9' => '0xD7A9',
	2679	+ '0x82' => '0xE2809A', '0x84' => '0xE2809E', '0x85' => '0xE280A6',
	2680	+ '0x86' => '0xE280A0', '0x87' => '0xE280A1', '0x89' => '0xE280B0',
	2681	+ '0x8B' => '0xE280B9', '0x93' => '0xE2809C', '0x94' => '0xE2809D',
	2682	+ '0x95' => '0xE280A2', '0x97' => '0xE28094', '0x99' => '0xE284A2',
	2683	+ '0xC0' => '0xD6B0', '0xC1' => '0xD6B1', '0xC3' => '0xD6B3',
	2684	+ '0xC4' => '0xD6B4', '0xC5' => '0xD6B5', '0xC6' => '0xD6B6',
	2685	+ '0xC7' => '0xD6B7', '0xC8' => '0xD6B8', '0xC9' => '0xD6B9',
	2686	+ '0xCB' => '0xD6BB', '0xCC' => '0xD6BC', '0xCD' => '0xD6BD',
	2687	+ '0xCE' => '0xD6BE', '0xCF' => '0xD6BF', '0xD0' => '0xD780',
	2688	+ '0xD2' => '0xD782', '0xE3' => '0xD793', '0xE4' => '0xD794',
	2689	+ '0xE5' => '0xD795', '0xE7' => '0xD797', '0xE9' => '0xD799',
	2690	+ '0xFD' => '0xE2808E', '0xFE' => '0xE2808F', '0x92' => '0xE28099',
	2691	+ '0x83' => '0xC692', '0xD3' => '0xD783', '0x88' => '0xCB86',
	2692	+ '0x98' => '0xCB9C', '0x91' => '0xE28098', '0x96' => '0xE28093',
	2693	+ '0xBA' => '0xC3B7', '0x9B' => '0xE280BA', '0xAA' => '0xC397',
	2694	+ '0xA4' => '0xE282AA', '0xE1' => '0xD791', '0xE6' => '0xD796',
	2695	+ '0xE8' => '0xD798', '0xEB' => '0xD79B', '0xF4' => '0xD7A4',
2696	2696	'0xFA' => '0xD7AA',
2697	2697	),
2698	2698	'windows-1253' => array(
2699		- '0x81' => '\'\'', '0x88' => '\'\'', '0x8A' => '\'\'',
2700		- '0x8C' => '\'\'', '0x8D' => '\'\'', '0x8E' => '\'\'',
2701		- '0x8F' => '\'\'', '0x90' => '\'\'', '0x98' => '\'\'',
2702		- '0x9A' => '\'\'', '0x9C' => '\'\'', '0x9D' => '\'\'',
2703		- '0x9E' => '\'\'', '0x9F' => '\'\'', '0xAA' => '\'\'',
2704		- '0xD2' => '0xE282AC', '0xFF' => '0xCE92', '0xCE' => '0xCE9E',
2705		- '0xB8' => '0xCE88', '0xBA' => '0xCE8A', '0xBC' => '0xCE8C',
2706		- '0xBE' => '0xCE8E', '0xBF' => '0xCE8F', '0xC0' => '0xCE90',
2707		- '0xC8' => '0xCE98', '0xCA' => '0xCE9A', '0xCC' => '0xCE9C',
2708		- '0xCD' => '0xCE9D', '0xCF' => '0xCE9F', '0xDA' => '0xCEAA',
2709		- '0xE8' => '0xCEB8', '0xEA' => '0xCEBA', '0xEC' => '0xCEBC',
2710		- '0xEE' => '0xCEBE', '0xEF' => '0xCEBF', '0xC2' => '0xFF',
2711		- '0xBD' => '0xC2BD', '0xED' => '0xCEBD', '0xB2' => '0xC2B2',
2712		- '0xA0' => '0xC2A0', '0xA3' => '0xC2A3', '0xA4' => '0xC2A4',
2713		- '0xA5' => '0xC2A5', '0xA6' => '0xC2A6', '0xA7' => '0xC2A7',
2714		- '0xA8' => '0xC2A8', '0xA9' => '0xC2A9', '0xAB' => '0xC2AB',
2715		- '0xAC' => '0xC2AC', '0xAD' => '0xC2AD', '0xAE' => '0xC2AE',
2716		- '0xB0' => '0xC2B0', '0xB1' => '0xC2B1', '0xB3' => '0xC2B3',
2717		- '0xB5' => '0xC2B5', '0xB6' => '0xC2B6', '0xB7' => '0xC2B7',
2718		- '0xBB' => '0xC2BB', '0xE2' => '0xCEB2', '0x80' => '0xD2',
2719		- '0x82' => '0xE2809A', '0x84' => '0xE2809E', '0x85' => '0xE280A6',
2720		- '0x86' => '0xE280A0', '0xA1' => '0xCE85', '0xA2' => '0xCE86',
2721		- '0x87' => '0xE280A1', '0x89' => '0xE280B0', '0xB9' => '0xCE89',
2722		- '0x8B' => '0xE280B9', '0x91' => '0xE28098', '0x99' => '0xE284A2',
2723		- '0x92' => '0xE28099', '0x93' => '0xE2809C', '0x94' => '0xE2809D',
2724		- '0x95' => '0xE280A2', '0x96' => '0xE28093', '0x97' => '0xE28094',
2725		- '0x9B' => '0xE280BA', '0xAF' => '0xE28095', '0xB4' => '0xCE84',
2726		- '0xC1' => '0xCE91', '0xC3' => '0xCE93', '0xC4' => '0xCE94',
2727		- '0xC5' => '0xCE95', '0xC6' => '0xCE96', '0x83' => '0xC692',
2728		- '0xC7' => '0xCE97', '0xC9' => '0xCE99', '0xCB' => '0xCE9B',
2729		- '0xD0' => '0xCEA0', '0xD1' => '0xCEA1', '0xD3' => '0xCEA3',
2730		- '0xD4' => '0xCEA4', '0xD5' => '0xCEA5', '0xD6' => '0xCEA6',
2731		- '0xD7' => '0xCEA7', '0xD8' => '0xCEA8', '0xD9' => '0xCEA9',
2732		- '0xDB' => '0xCEAB', '0xDC' => '0xCEAC', '0xDD' => '0xCEAD',
2733		- '0xDE' => '0xCEAE', '0xDF' => '0xCEAF', '0xE0' => '0xCEB0',
2734		- '0xE1' => '0xCEB1', '0xE3' => '0xCEB3', '0xE4' => '0xCEB4',
2735		- '0xE5' => '0xCEB5', '0xE6' => '0xCEB6', '0xE7' => '0xCEB7',
2736		- '0xE9' => '0xCEB9', '0xEB' => '0xCEBB', '0xF0' => '0xCF80',
2737		- '0xF1' => '0xCF81', '0xF2' => '0xCF82', '0xF3' => '0xCF83',
2738		- '0xF4' => '0xCF84', '0xF5' => '0xCF85', '0xF6' => '0xCF86',
2739		- '0xF7' => '0xCF87', '0xF8' => '0xCF88', '0xF9' => '0xCF89',
2740		- '0xFA' => '0xCF8A', '0xFB' => '0xCF8B', '0xFC' => '0xCF8C',
2741		- '0xFD' => '0xCF8D', '0xFE' => '0xCF8E',
	2699	+ '0x81' => '\'\'', '0x88' => '\'\'', '0x8A' => '\'\'',
	2700	+ '0x8C' => '\'\'', '0x8D' => '\'\'', '0x8E' => '\'\'',
	2701	+ '0x8F' => '\'\'', '0x90' => '\'\'', '0x98' => '\'\'',
	2702	+ '0x9A' => '\'\'', '0x9C' => '\'\'', '0x9D' => '\'\'',
	2703	+ '0x9E' => '\'\'', '0x9F' => '\'\'', '0xAA' => '\'\'',
	2704	+ '0xD2' => '0xE282AC', '0xFF' => '0xCE92', '0xCE' => '0xCE9E',
	2705	+ '0xB8' => '0xCE88', '0xBA' => '0xCE8A', '0xBC' => '0xCE8C',
	2706	+ '0xBE' => '0xCE8E', '0xBF' => '0xCE8F', '0xC0' => '0xCE90',
	2707	+ '0xC8' => '0xCE98', '0xCA' => '0xCE9A', '0xCC' => '0xCE9C',
	2708	+ '0xCD' => '0xCE9D', '0xCF' => '0xCE9F', '0xDA' => '0xCEAA',
	2709	+ '0xE8' => '0xCEB8', '0xEA' => '0xCEBA', '0xEC' => '0xCEBC',
	2710	+ '0xEE' => '0xCEBE', '0xEF' => '0xCEBF', '0xC2' => '0xFF',
	2711	+ '0xBD' => '0xC2BD', '0xED' => '0xCEBD', '0xB2' => '0xC2B2',
	2712	+ '0xA0' => '0xC2A0', '0xA3' => '0xC2A3', '0xA4' => '0xC2A4',
	2713	+ '0xA5' => '0xC2A5', '0xA6' => '0xC2A6', '0xA7' => '0xC2A7',
	2714	+ '0xA8' => '0xC2A8', '0xA9' => '0xC2A9', '0xAB' => '0xC2AB',
	2715	+ '0xAC' => '0xC2AC', '0xAD' => '0xC2AD', '0xAE' => '0xC2AE',
	2716	+ '0xB0' => '0xC2B0', '0xB1' => '0xC2B1', '0xB3' => '0xC2B3',
	2717	+ '0xB5' => '0xC2B5', '0xB6' => '0xC2B6', '0xB7' => '0xC2B7',
	2718	+ '0xBB' => '0xC2BB', '0xE2' => '0xCEB2', '0x80' => '0xD2',
	2719	+ '0x82' => '0xE2809A', '0x84' => '0xE2809E', '0x85' => '0xE280A6',
	2720	+ '0x86' => '0xE280A0', '0xA1' => '0xCE85', '0xA2' => '0xCE86',
	2721	+ '0x87' => '0xE280A1', '0x89' => '0xE280B0', '0xB9' => '0xCE89',
	2722	+ '0x8B' => '0xE280B9', '0x91' => '0xE28098', '0x99' => '0xE284A2',
	2723	+ '0x92' => '0xE28099', '0x93' => '0xE2809C', '0x94' => '0xE2809D',
	2724	+ '0x95' => '0xE280A2', '0x96' => '0xE28093', '0x97' => '0xE28094',
	2725	+ '0x9B' => '0xE280BA', '0xAF' => '0xE28095', '0xB4' => '0xCE84',
	2726	+ '0xC1' => '0xCE91', '0xC3' => '0xCE93', '0xC4' => '0xCE94',
	2727	+ '0xC5' => '0xCE95', '0xC6' => '0xCE96', '0x83' => '0xC692',
	2728	+ '0xC7' => '0xCE97', '0xC9' => '0xCE99', '0xCB' => '0xCE9B',
	2729	+ '0xD0' => '0xCEA0', '0xD1' => '0xCEA1', '0xD3' => '0xCEA3',
	2730	+ '0xD4' => '0xCEA4', '0xD5' => '0xCEA5', '0xD6' => '0xCEA6',
	2731	+ '0xD7' => '0xCEA7', '0xD8' => '0xCEA8', '0xD9' => '0xCEA9',
	2732	+ '0xDB' => '0xCEAB', '0xDC' => '0xCEAC', '0xDD' => '0xCEAD',
	2733	+ '0xDE' => '0xCEAE', '0xDF' => '0xCEAF', '0xE0' => '0xCEB0',
	2734	+ '0xE1' => '0xCEB1', '0xE3' => '0xCEB3', '0xE4' => '0xCEB4',
	2735	+ '0xE5' => '0xCEB5', '0xE6' => '0xCEB6', '0xE7' => '0xCEB7',
	2736	+ '0xE9' => '0xCEB9', '0xEB' => '0xCEBB', '0xF0' => '0xCF80',
	2737	+ '0xF1' => '0xCF81', '0xF2' => '0xCF82', '0xF3' => '0xCF83',
	2738	+ '0xF4' => '0xCF84', '0xF5' => '0xCF85', '0xF6' => '0xCF86',
	2739	+ '0xF7' => '0xCF87', '0xF8' => '0xCF88', '0xF9' => '0xCF89',
	2740	+ '0xFA' => '0xCF8A', '0xFB' => '0xCF8B', '0xFC' => '0xCF8C',
	2741	+ '0xFD' => '0xCF8D', '0xFE' => '0xCF8E',
2742	2742	),
2743	2743	);
2744	2744
		@@ -3638,7 +3638,7 @@ discard block
		block discarded – undo
3638	3638
3639	3639	if ($active < 600)
3640	3640	echo '
3641		- ', $txt['upgrade_run_script'], ' ', $upcontext['user']['name'],' ', $txt['upgrade_run_script2'], '';
	3641	+ ', $txt['upgrade_run_script'], ' ', $upcontext['user']['name'], ' ', $txt['upgrade_run_script2'], '';
3642	3642
3643	3643	if ($active > $upcontext['inactive_timeout'])
3644	3644	echo '
		@@ -3840,7 +3840,7 @@ discard block
		block discarded – undo
3840	3840	<form action="', $upcontext['form_url'], '" name="upform" id="upform" method="post">
3841	3841	<input type="hidden" name="backup_done" id="backup_done" value="0">
3842	3842	<strong>Completed <span id="tab_done">', $upcontext['cur_table_num'], '</span> out of ', $upcontext['table_count'], ' tables.</strong>
3843		- <div id="debug_section" style="height: ', ($is_debug ? '115' : '12') , 'px; overflow: auto;">
	3843	+ <div id="debug_section" style="height: ', ($is_debug ? '115' : '12'), 'px; overflow: auto;">
3844	3844	<span id="debuginfo"></span>
3845	3845	</div>';
3846	3846
		@@ -4341,7 +4341,7 @@ discard block
		block discarded – undo
4341	4341	<form action="', $upcontext['form_url'], '" name="upform" id="upform" method="post">
4342	4342	<input type="hidden" name="utf8_done" id="utf8_done" value="0">
4343	4343	<strong>', $txt['upgrade_completed'], ' <span id="tab_done">', $upcontext['cur_table_num'], '</span> ', $txt['upgrade_outof'], ' ', $upcontext['table_count'], ' ', $txt['upgrade_tables'], '</strong>
4344		- <div id="debug_section" style="height: ', ($is_debug ? '97' : '12') , 'px; overflow: auto;">
	4344	+ <div id="debug_section" style="height: ', ($is_debug ? '97' : '12'), 'px; overflow: auto;">
4345	4345	<span id="debuginfo"></span>
4346	4346	</div>';
4347	4347
		@@ -4442,7 +4442,7 @@ discard block
		block discarded – undo
4442	4442	<form action="', $upcontext['form_url'], '" name="upform" id="upform" method="post">
4443	4443	<input type="hidden" name="json_done" id="json_done" value="0">
4444	4444	<strong>', $txt['upgrade_completed'], ' <span id="tab_done">', $upcontext['cur_table_num'], '</span> ', $txt['upgrade_outof'], ' ', $upcontext['table_count'], ' ', $txt['upgrade_tables'], '</strong>
4445		- <div id="debug_section" style="height: ', ($is_debug ? '115' : '12') , 'px; overflow: auto;">
	4445	+ <div id="debug_section" style="height: ', ($is_debug ? '115' : '12'), 'px; overflow: auto;">
4446	4446	<span id="debuginfo"></span>
4447	4447	</div>';
4448	4448

Please login to merge, or discard this patch.

Sources/Subs-Db-postgresql.php 1 patch

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

@@ -199,22 +199,22 @@  discard block
 block discarded – undo
 
 		case 'date':
 			if (preg_match('~^(\d{4})-([0-1]?\d)-([0-3]?\d)$~', $replacement, $date_matches) === 1)
-				return sprintf('\'%04d-%02d-%02d\'', $date_matches[1], $date_matches[2], $date_matches[3]).'::date';
+				return sprintf('\'%04d-%02d-%02d\'', $date_matches[1], $date_matches[2], $date_matches[3]) . '::date';
 			else
 				smf_db_error_backtrace('Wrong value type sent to the database. Date expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
 		break;
 
 		case 'time':
 			if (preg_match('~^([0-1]?\d|2[0-3]):([0-5]\d):([0-5]\d)$~', $replacement, $time_matches) === 1)
-				return sprintf('\'%02d:%02d:%02d\'', $time_matches[1], $time_matches[2], $time_matches[3]).'::time';
+				return sprintf('\'%02d:%02d:%02d\'', $time_matches[1], $time_matches[2], $time_matches[3]) . '::time';
 			else
 				smf_db_error_backtrace('Wrong value type sent to the database. Time expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
 		break;
 
 		case 'datetime':
 			if (preg_match('~^(\d{4})-([0-1]?\d)-([0-3]?\d) ([0-1]?\d|2[0-3]):([0-5]\d):([0-5]\d)$~', $replacement, $datetime_matches) === 1)
-				return 'to_timestamp('.
-					sprintf('\'%04d-%02d-%02d %02d:%02d:%02d\'', $datetime_matches[1], $datetime_matches[2], $datetime_matches[3], $datetime_matches[4], $datetime_matches[5] ,$datetime_matches[6]).
+				return 'to_timestamp(' .
+					sprintf('\'%04d-%02d-%02d %02d:%02d:%02d\'', $datetime_matches[1], $datetime_matches[2], $datetime_matches[3], $datetime_matches[4], $datetime_matches[5], $datetime_matches[6]) .
 					',\'YYYY-MM-DD HH24:MI:SS\')';
 			else
 				smf_db_error_backtrace('Wrong value type sent to the database. Datetime expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
@@ -424,7 +424,7 @@  discard block
 block discarded – undo
 		$old_pos = 0;
 		$pos = -1;
 		// Remove the string escape for better runtime
-		$db_string_1 = str_replace('\'\'','',$db_string);
+		$db_string_1 = str_replace('\'\'', '', $db_string);
 		while (true)
 		{
 			$pos = strpos($db_string_1, '\'', $pos + 1);
@@ -802,7 +802,7 @@  discard block
 block discarded – undo
 	if (!empty($keys) && (count($keys) > 0) && $returnmode > 0)
 	{
 		// we only take the first key
-		$returning = ' RETURNING '.$keys[0];
+		$returning = ' RETURNING ' . $keys[0];
 		$with_returning = true;
 	}
 
@@ -833,7 +833,7 @@  discard block
 block discarded – undo
 			INSERT INTO ' . $table . '("' . implode('", "', $indexed_columns) . '")
 			VALUES
 				' . implode(',
-				', $insertRows).$replace.$returning,
+				', $insertRows) . $replace . $returning,
 			array(
 				'security_override' => true,
 				'db_error_skip' => $method == 'ignore' || $table === $db_prefix . 'log_errors',
@@ -846,7 +846,7 @@  discard block
 block discarded – undo
 			if ($returnmode === 2)
 				$return_var = array();
 
-			while(($row = $smcFunc['db_fetch_row']($request)) && $with_returning)
+			while (($row = $smcFunc['db_fetch_row']($request)) && $with_returning)
 			{
 				if (is_numeric($row[0])) // try to emulate mysql limitation
 				{
@@ -1009,7 +1009,7 @@  discard block
 block discarded – undo
  */
 function smf_db_custom_order($field, $array_values, $desc = false)
 {
-	$return = 'CASE '. $field . ' ';
+	$return = 'CASE ' . $field . ' ';
 	$count = count($array_values);
 	$then = ($desc ? ' THEN -' : ' THEN ');
 

Please login to merge, or discard this patch.

other/install.php 1 patch

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

@@ -1697,8 +1697,7 @@  discard block
 block discarded – undo
 	updateStats('topic');
 
 	// This function is needed to do the updateStats('subject') call.
-	$smcFunc['strtolower'] = $db_character_set != 'utf8' && $txt['lang_character_set'] != 'UTF-8' ? 'strtolower' :
-		function($string){
+	$smcFunc['strtolower'] = $db_character_set != 'utf8' && $txt['lang_character_set'] != 'UTF-8' ? 'strtolower' : function($string) {
 			global $sourcedir;
 			if (function_exists('mb_strtolower'))
 				return mb_strtolower($string, 'UTF-8');
@@ -1767,7 +1766,7 @@  discard block
 block discarded – undo
 		if (trim($settingsArray[$i]) == 'if (file_exists(dirname(__FILE__) . \'/install.php\'))' && trim($settingsArray[$i + 1]) == '{' && trim($settingsArray[$i + 9]) == '}')
 		{
 			// Set the ten lines to nothing.
-			for ($j=0; $j < 10; $j++)
+			for ($j = 0; $j < 10; $j++)
 				$settingsArray[$i++] = '';
 
 			continue;

Please login to merge, or discard this patch.

		@@ -393,7 +393,7 @@ discard block
		block discarded – undo
393	393	'class' => 'centercol',
394	394	),
395	395	'data' => array(
396		- 'function' => function ($rowData)
	396	+ 'function' => function($rowData)
397	397	{
398	398	return $rowData['selected'] ? '<span class="generic_icons valid"></span>' : '';
399	399	},
		@@ -453,7 +453,7 @@ discard block
		block discarded – undo
453	453	'class' => 'centercol',
454	454	),
455	455	'data' => array(
456		- 'function' => function ($rowData)
	456	+ 'function' => function($rowData)
457	457	{
458	458	return $rowData['selected'] ? '' : sprintf('<input type="checkbox" name="smiley_set[%1$d]">', $rowData['id']);
459	459	},
		@@ -997,7 +997,7 @@ discard block
		block discarded – undo
997	997	'value' => $txt['smileys_location'],
998	998	),
999	999	'data' => array(
1000		- 'function' => function ($rowData) use ($txt)
	1000	+ 'function' => function($rowData) use ($txt)
1001	1001	{
1002	1002	if (empty($rowData['hidden']))
1003	1003	return $txt['smileys_location_form'];
		@@ -1008,7 +1008,7 @@ discard block
		block discarded – undo
1008	1008	},
1009	1009	),
1010	1010	'sort' => array(
1011		- 'default' => $smcFunc['db_custom_order']('hidden', array_keys($smiley_locations)) ,
	1011	+ 'default' => $smcFunc['db_custom_order']('hidden', array_keys($smiley_locations)),
1012	1012	'reverse' => $smcFunc['db_custom_order']('hidden', array_keys($smiley_locations), true),
1013	1013	),
1014	1014	),
		@@ -1017,7 +1017,7 @@ discard block
		block discarded – undo
1017	1017	'value' => $txt['smileys_description'],
1018	1018	),
1019	1019	'data' => array(
1020		- 'function' => function ($rowData) use ($context, $txt, $modSettings, $smcFunc)
	1020	+ 'function' => function($rowData) use ($context, $txt, $modSettings, $smcFunc)
1021	1021	{
1022	1022	if (empty($modSettings['smileys_dir']) \|\| !is_dir($modSettings['smileys_dir']))
1023	1023	return $smcFunc['htmlspecialchars']($rowData['description']);
		@@ -1554,7 +1554,7 @@ discard block
		block discarded – undo
1554	1554	'action' => $smcFunc['htmlspecialchars'](strtr($action['destination'], array($boarddir => '.')))
1555	1555	);
1556	1556
1557		- $file = $packagesdir . '/temp/' . $base_path . $action['filename'];
	1557	+ $file = $packagesdir . '/temp/' . $base_path . $action['filename'];
1558	1558	if (isset($action['filename']) && (!file_exists($file) \|\| !is_writable(dirname($action['destination']))))
1559	1559	{
1560	1560	$context['has_failure'] = true;
		@@ -1599,7 +1599,7 @@ discard block
		block discarded – undo
1599	1599	{
1600	1600	updateSettings(array(
1601	1601	'smiley_sets_known' => $modSettings['smiley_sets_known'] . ',' . basename($action['action']),
1602		- 'smiley_sets_names' => $modSettings['smiley_sets_names'] . "\n" . $smileyInfo['name'] . (count($context['actions']) > 1 ? ' ' . (!empty($action['description']) ? $smcFunc['htmlspecialchars']($action['description']) : basename($action['action'])) : ''),
	1602	+ 'smiley_sets_names' => $modSettings['smiley_sets_names'] . "\n" . $smileyInfo['name'] . (count($context['actions']) > 1 ? ' ' . (!empty($action['description']) ? $smcFunc['htmlspecialchars']($action['description']) : basename($action['action'])) : ''),
1603	1603	));
1604	1604	}
1605	1605
		@@ -1611,7 +1611,7 @@ discard block
		block discarded – undo
1611	1611	'{db_prefix}log_packages',
1612	1612	array(
1613	1613	'filename' => 'string', 'name' => 'string', 'package_id' => 'string', 'version' => 'string',
1614		- 'id_member_installed' => 'int', 'member_installed' => 'string','time_installed' => 'int',
	1614	+ 'id_member_installed' => 'int', 'member_installed' => 'string', 'time_installed' => 'int',
1615	1615	'install_state' => 'int', 'failed_steps' => 'string', 'themes_installed' => 'string',
1616	1616	'member_removed' => 'int', 'db_changes' => 'string', 'credits' => 'string',
1617	1617	),
		@@ -1860,7 +1860,7 @@ discard block
		block discarded – undo
1860	1860	'columns' => array(
1861	1861	'icon' => array(
1862	1862	'data' => array(
1863		- 'function' => function ($rowData) use ($settings, $smcFunc)
	1863	+ 'function' => function($rowData) use ($settings, $smcFunc)
1864	1864	{
1865	1865	$images_url = $settings[file_exists(sprintf('%1$s/images/post/%2$s.png', $settings['theme_dir'], $rowData['filename'])) ? 'actual_images_url' : 'default_images_url'];
1866	1866	return sprintf('<img src="%1$s/post/%2$s.png" alt="%3$s">', $images_url, $rowData['filename'], $smcFunc['htmlspecialchars']($rowData['title']));
		@@ -1894,7 +1894,7 @@ discard block
		block discarded – undo
1894	1894	'value' => $txt['icons_board'],
1895	1895	),
1896	1896	'data' => array(
1897		- 'function' => function ($rowData) use ($txt)
	1897	+ 'function' => function($rowData) use ($txt)
1898	1898	{
1899	1899	return empty($rowData['board_name']) ? $txt['icons_edit_icons_all_boards'] : $rowData['board_name'];
1900	1900	},

		@@ -165,7 +165,7 @@ discard block
		block discarded – undo
165	165	{
166	166	global $db_connection, $db_prefix;
167	167
168		- pg_query($db_connection, 'CREATE LOCAL TEMP TABLE IF NOT EXISTS ' . $db_prefix . 'cache_tmp AS SELECT * FROM ' . $db_prefix . 'cache WHERE ttl >= ' . time() );
	168	+ pg_query($db_connection, 'CREATE LOCAL TEMP TABLE IF NOT EXISTS ' . $db_prefix . 'cache_tmp AS SELECT * FROM ' . $db_prefix . 'cache WHERE ttl >= ' . time());
169	169	}
170	170
171	171	/**
		@@ -189,7 +189,7 @@ discard block
		block discarded – undo
189	189	{
190	190	global $db_connection, $db_prefix;
191	191
192		- pg_query($db_connection, 'INSERT INTO ' . $db_prefix . 'cache SELECT * FROM '. $db_prefix . 'cache_tmp ON CONFLICT DO NOTHING');
	192	+ pg_query($db_connection, 'INSERT INTO ' . $db_prefix . 'cache SELECT * FROM ' . $db_prefix . 'cache_tmp ON CONFLICT DO NOTHING');
193	193	}
194	194	}
195	195

		@@ -199,22 +199,22 @@ discard block
		block discarded – undo
199	199
200	200	case 'date':
201	201	if (preg_match('~^(\d{4})-([0-1]?\d)-([0-3]?\d)$~', $replacement, $date_matches) === 1)
202		- return sprintf('\'%04d-%02d-%02d\'', $date_matches[1], $date_matches[2], $date_matches[3]).'::date';
	202	+ return sprintf('\'%04d-%02d-%02d\'', $date_matches[1], $date_matches[2], $date_matches[3]) . '::date';
203	203	else
204	204	smf_db_error_backtrace('Wrong value type sent to the database. Date expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
205	205	break;
206	206
207	207	case 'time':
208	208	if (preg_match('~^([0-1]?\d\|2[0-3]):([0-5]\d):([0-5]\d)$~', $replacement, $time_matches) === 1)
209		- return sprintf('\'%02d:%02d:%02d\'', $time_matches[1], $time_matches[2], $time_matches[3]).'::time';
	209	+ return sprintf('\'%02d:%02d:%02d\'', $time_matches[1], $time_matches[2], $time_matches[3]) . '::time';
210	210	else
211	211	smf_db_error_backtrace('Wrong value type sent to the database. Time expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
212	212	break;
213	213
214	214	case 'datetime':
215	215	if (preg_match('~^(\d{4})-([0-1]?\d)-([0-3]?\d) ([0-1]?\d\|2[0-3]):([0-5]\d):([0-5]\d)$~', $replacement, $datetime_matches) === 1)
216		- return 'to_timestamp('.
217		- sprintf('\'%04d-%02d-%02d %02d:%02d:%02d\'', $datetime_matches[1], $datetime_matches[2], $datetime_matches[3], $datetime_matches[4], $datetime_matches[5] ,$datetime_matches[6]).
	216	+ return 'to_timestamp(' .
	217	+ sprintf('\'%04d-%02d-%02d %02d:%02d:%02d\'', $datetime_matches[1], $datetime_matches[2], $datetime_matches[3], $datetime_matches[4], $datetime_matches[5], $datetime_matches[6]) .
218	218	',\'YYYY-MM-DD HH24:MI:SS\')';
219	219	else
220	220	smf_db_error_backtrace('Wrong value type sent to the database. Datetime expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
		@@ -424,7 +424,7 @@ discard block
		block discarded – undo
424	424	$old_pos = 0;
425	425	$pos = -1;
426	426	// Remove the string escape for better runtime
427		- $db_string_1 = str_replace('\'\'','',$db_string);
	427	+ $db_string_1 = str_replace('\'\'', '', $db_string);
428	428	while (true)
429	429	{
430	430	$pos = strpos($db_string_1, '\'', $pos + 1);
		@@ -802,7 +802,7 @@ discard block
		block discarded – undo
802	802	if (!empty($keys) && (count($keys) > 0) && $returnmode > 0)
803	803	{
804	804	// we only take the first key
805		- $returning = ' RETURNING '.$keys[0];
	805	+ $returning = ' RETURNING ' . $keys[0];
806	806	$with_returning = true;
807	807	}
808	808
		@@ -833,7 +833,7 @@ discard block
		block discarded – undo
833	833	INSERT INTO ' . $table . '("' . implode('", "', $indexed_columns) . '")
834	834	VALUES
835	835	' . implode(',
836		- ', $insertRows).$replace.$returning,
	836	+ ', $insertRows) . $replace . $returning,
837	837	array(
838	838	'security_override' => true,
839	839	'db_error_skip' => $method == 'ignore' \|\| $table === $db_prefix . 'log_errors',
		@@ -846,7 +846,7 @@ discard block
		block discarded – undo
846	846	if ($returnmode === 2)
847	847	$return_var = array();
848	848
849		- while(($row = $smcFunc['db_fetch_row']($request)) && $with_returning)
	849	+ while (($row = $smcFunc['db_fetch_row']($request)) && $with_returning)
850	850	{
851	851	if (is_numeric($row[0])) // try to emulate mysql limitation
852	852	{
		@@ -1009,7 +1009,7 @@ discard block
		block discarded – undo
1009	1009	*/
1010	1010	function smf_db_custom_order($field, $array_values, $desc = false)
1011	1011	{
1012		- $return = 'CASE '. $field . ' ';
	1012	+ $return = 'CASE ' . $field . ' ';
1013	1013	$count = count($array_values);
1014	1014	$then = ($desc ? ' THEN -' : ' THEN ');
1015	1015

		@@ -1697,8 +1697,7 @@ discard block
		block discarded – undo
1697	1697	updateStats('topic');
1698	1698
1699	1699	// This function is needed to do the updateStats('subject') call.
1700		- $smcFunc['strtolower'] = $db_character_set != 'utf8' && $txt['lang_character_set'] != 'UTF-8' ? 'strtolower' :
1701		- function($string){
	1700	+ $smcFunc['strtolower'] = $db_character_set != 'utf8' && $txt['lang_character_set'] != 'UTF-8' ? 'strtolower' : function($string) {
1702	1701	global $sourcedir;
1703	1702	if (function_exists('mb_strtolower'))
1704	1703	return mb_strtolower($string, 'UTF-8');
		@@ -1767,7 +1766,7 @@ discard block
		block discarded – undo
1767	1766	if (trim($settingsArray[$i]) == 'if (file_exists(dirname(__FILE__) . \'/install.php\'))' && trim($settingsArray[$i + 1]) == '{' && trim($settingsArray[$i + 9]) == '}')
1768	1767	{
1769	1768	// Set the ten lines to nothing.
1770		- for ($j=0; $j < 10; $j++)
	1769	+ for ($j = 0; $j < 10; $j++)
1771	1770	$settingsArray[$i++] = '';
1772	1771
1773	1772	continue;

		@@ -39,7 +39,7 @@
		block discarded – undo
39	39	$error_call++;
40	40
41	41	// are we in a loop?
42		- if($error_call > 2)
	42	+ if ($error_call > 2)
43	43	{
44	44	if (!isset($db_show_debug) \|\| $db_show_debug === false)
45	45	$backtrace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);

		@@ -417,8 +417,8 @@ discard block
		block discarded – undo
417	417	</div><!-- .attached_BBC -->
418	418	<div class="progressBar" role="progressBar" aria-valuemin="0" aria-valuemax="100" aria-valuenow="0"><span></span></div>
419	419	<div class="attach-ui">
420		- <a data-dz-remove class="button cancel">', $txt['modify_cancel'] ,'</a>
421		- <a class="button upload">', $txt['upload'] ,'</a>
	420	+ <a data-dz-remove class="button cancel">', $txt['modify_cancel'], '</a>
	421	+ <a class="button upload">', $txt['upload'], '</a>
422	422	</div>
423	423	</div><!-- .attach-info -->
424	424	</div><!-- #au-template -->
		@@ -433,10 +433,10 @@ discard block
		block discarded – undo
433	433	</dt>
434	434	<dd class="smalltext fallback">
435	435	<div id="attachUpload" class="descbox">
436		- <h5>', $txt['attach_drop_zone'] ,'</h5>
437		- <a class="button" id="attach-cancelAll">', $txt['attached_cancelAll'] ,'</a>
438		- <a class="button" id="attach-uploadAll">', $txt['attached_uploadAll'] ,'</a>
439		- <a class="button fileinput-button">', $txt['attach_add'] ,'</a>
	436	+ <h5>', $txt['attach_drop_zone'], '</h5>
	437	+ <a class="button" id="attach-cancelAll">', $txt['attached_cancelAll'], '</a>
	438	+ <a class="button" id="attach-uploadAll">', $txt['attached_uploadAll'], '</a>
	439	+ <a class="button fileinput-button">', $txt['attach_add'], '</a>
440	440	<div id="total-progress" class="progressBar" role="progressBar" aria-valuemin="0" aria-valuemax="100" aria-valuenow="0"><span></span></div>
441	441	<div class="fallback">
442	442	<input type="file" multiple="multiple" name="attachment[]" id="attachment1" class="fallback"> (<a href="javascript:void(0);" onclick="cleanFileInput(\'attachment1\');">', $txt['clean_attach'], '</a>)
		@@ -541,7 +541,7 @@ discard block
		block discarded – undo
541	541	// Option to delete an event if user is editing one.
542	542	if ($context['make_event'] && !$context['event']['new'])
543	543	echo '
544		- <input type="submit" name="deleteevent" value="', $txt['event_delete'], '" data-confirm="', $txt['event_delete_confirm'] ,'" class="button you_sure">';
	544	+ <input type="submit" name="deleteevent" value="', $txt['event_delete'], '" data-confirm="', $txt['event_delete_confirm'], '" class="button you_sure">';
545	545
546	546	echo '
547	547	</span>
		@@ -795,7 +795,7 @@ discard block
		block discarded – undo
795	795	});';
796	796
797	797	echo '
798		- var oEditorID = "', $context['post_box_name'] ,'";
	798	+ var oEditorID = "', $context['post_box_name'], '";
799	799	var oEditorObject = oEditorHandle_', $context['post_box_name'], ';
800	800	</script>';
801	801
		@@ -827,7 +827,7 @@ discard block
		block discarded – undo
827	827	if ($context['can_quote'])
828	828	echo '
829	829	<ul class="quickbuttons" id="msg_', $post['id'], '_quote">
830		- <li style="display:none;" id="quoteSelected_', $post['id'], '" data-msgid="', $post['id'], '"><a href="javascript:void(0)"><span class="generic_icons quote_selected"></span>', $txt['quote_selected_action'] ,'</a></li>
	830	+ <li style="display:none;" id="quoteSelected_', $post['id'], '" data-msgid="', $post['id'], '"><a href="javascript:void(0)"><span class="generic_icons quote_selected"></span>', $txt['quote_selected_action'], '</a></li>
831	831	<li id="post_modify"><a href="#postmodify" onclick="return insertQuoteFast(', $post['id'], ');"><span class="generic_icons quote"></span>', $txt['quote'], '</a></li>
832	832	</ul>';
833	833
		@@ -911,7 +911,7 @@ discard block
		block discarded – undo
911	911	<head>
912	912	<meta charset="', $context['character_set'], '">
913	913	<title>', $txt['spell_check'], '</title>
914		- <link rel="stylesheet" href="', $settings['theme_url'], '/css/index', $context['theme_variant'], '.css', $modSettings['browser_cache'] ,'">
	914	+ <link rel="stylesheet" href="', $settings['theme_url'], '/css/index', $context['theme_variant'], '.css', $modSettings['browser_cache'], '">
915	915	<style>
916	916	body, td {
917	917	font-size: small;
		@@ -941,8 +941,8 @@ discard block
		block discarded – undo
941	941	var spell_formname = window.opener.spell_formname;
942	942	var spell_fieldname = window.opener.spell_fieldname;
943	943	</script>
944		- <script src="', $settings['default_theme_url'], '/scripts/spellcheck.js', $modSettings['browser_cache'] ,'"></script>
945		- <script src="', $settings['default_theme_url'], '/scripts/script.js', $modSettings['browser_cache'] ,'"></script>
	944	+ <script src="', $settings['default_theme_url'], '/scripts/spellcheck.js', $modSettings['browser_cache'], '"></script>
	945	+ <script src="', $settings['default_theme_url'], '/scripts/script.js', $modSettings['browser_cache'], '"></script>
946	946	<script>
947	947	', $context['spell_js'], '
948	948	</script>
		@@ -986,7 +986,7 @@ discard block
		block discarded – undo
986	986	<head>
987	987	<meta charset="', $context['character_set'], '">
988	988	<title>', $txt['retrieving_quote'], '</title>
989		- <script src="', $settings['default_theme_url'], '/scripts/script.js', $modSettings['browser_cache'] ,'"></script>
	989	+ <script src="', $settings['default_theme_url'], '/scripts/script.js', $modSettings['browser_cache'], '"></script>
990	990	</head>
991	991	<body>
992	992	', $txt['retrieving_quote'], '

		@@ -108,14 +108,14 @@ discard block
		block discarded – undo
108	108	*/
109	109	public function cleanCache($type = '')
110	110	{
111		- if($type == 'expired')
112		- $query = 'DELETE FROM cache WHERE ttl >= ' . time().';';
	111	+ if ($type == 'expired')
	112	+ $query = 'DELETE FROM cache WHERE ttl >= ' . time() . ';';
113	113	else
114	114	$query = 'DELETE FROM cache;';
115	115
116	116	$result = $this->cacheDB->exec($query);
117	117
118		- $query = 'VACUUM;';
	118	+ $query = 'VACUUM;';
119	119	$this->cacheDB->exec($query);
120	120
121	121	return $result;
		@@ -156,7 +156,7 @@ discard block
		block discarded – undo
156	156
157	157	// If its invalid, use SMF's.
158	158	if (is_null($dir) \|\| !is_writable($dir))
159		- if(is_null($cachedir_sqlite) \|\| !is_writable($cachedir_sqlite))
	159	+ if (is_null($cachedir_sqlite) \|\| !is_writable($cachedir_sqlite))
160	160	$this->cachedir = $cachedir;
161	161	else
162	162	$this->cachedir = $cachedir_sqlite;

		@@ -349,7 +349,7 @@
		block discarded – undo
349	349	SELECT
350	350	t.id_topic, t.num_replies, t.locked, t.num_views, t.is_sticky, t.id_poll, t.id_previous_board,
351	351	' . ($user_info['is_guest'] ? '0' : 'COALESCE(lt.id_msg, COALESCE(lmr.id_msg, -1)) + 1') . ' AS new_from,
352		- ' . ( $enableParticipation ? ' COALESCE(( SELECT 1 FROM {db_prefix}messages AS parti WHERE t.id_topic = parti.id_topic and parti.id_member = {int:current_member} LIMIT 1) , 0) as is_posted_in,
	352	+ ' . ($enableParticipation ? ' COALESCE(( SELECT 1 FROM {db_prefix}messages AS parti WHERE t.id_topic = parti.id_topic and parti.id_member = {int:current_member} LIMIT 1) , 0) as is_posted_in,
353	353	' : '') . '
354	354	t.id_last_msg, t.approved, t.unapproved_posts, ml.poster_time AS last_poster_time, t.id_redirect_topic,
355	355	ml.id_msg_modified, ml.subject AS last_subject, ml.icon AS last_icon,

SimpleMachines / SMF2.1

Pull Request — release-2.1 (#4670)

Status

Category

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

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

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

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

Spacing +2 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 +90 added lines, -90 removed lines patch added patch discarded remove patch

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

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