elkarte / Elkarte

sources/subs/Graphics.subs.php

Spacing +1 added lines, -1 removed lines

@@ -377,7 +377,7 @@
 
 			// The behavior of bestfit changed in Imagick 3.0.0 and it will now scale up, we prevent that
 			$dest_width = empty($max_width) ? $src_width : ($force_resize ? $max_width : min($max_width, $src_width));
-			$dest_height = empty($max_height) ? $src_height : ($force_resize ? $max_height :  min($max_height, $src_height));
+			$dest_height = empty($max_height) ? $src_height : ($force_resize ? $max_height : min($max_height, $src_height));
 
 			// Set jpeg image quality to 80
 			if ($default_formats[$preferred_format] === 'jpeg')

Braces +218 added lines, -87 removed lines

@@ -43,7 +43,9 @@ 
 	$destName = substr($destName, 0, -4);
 
 	if ($success && @rename($destName . '.tmp', $destName))
-		return true;
+	{
+			return true;
+	}
 	else
 	{
 		@unlink($destName . '.tmp');
@@ -79,13 +81,17 @@ 
 	if (!resizeImageFile($fileName, $fileName . '.tmp', null, null, $preferred_format, true))
 	{
 		if (file_exists($fileName . '.tmp'))
-			unlink($fileName . '.tmp');
+		{
+					unlink($fileName . '.tmp');
+		}
 
 		return false;
 	}
 
 	if (!unlink($fileName))
-		return false;
+	{
+			return false;
+	}
 
 	return rename($fileName . '.tmp', $fileName);
 }
@@ -162,7 +168,9 @@ 
 
 	// Check to see if GD is installed and what version.
 	if (($extensionFunctions = get_extension_funcs('gd')) === false)
-		return false;
+	{
+			return false;
+	}
 
 	// Also determine if GD2 is installed and store it in a global.
 	$gd2 = in_array('imagecreatetruecolor', $extensionFunctions) && function_exists('imagecreatetruecolor');
@@ -267,7 +275,9 @@ 
 
 	// Nothing to do without GD or IM
 	if (!checkGD() && !checkImagick())
-		return false;
+	{
+			return false;
+	}
 
 	if (!file_exists($source) && substr($source, 0, 7) !== 'http://' && substr($source, 0, 8) !== 'https://')
 	{
@@ -310,25 +320,33 @@ 
 			}
 			fclose($fp_source);
 		}
-		else
-			$sizes = array(-1, -1, -1);
+		else {
+					$sizes = array(-1, -1, -1);
+		}
 
 		fclose($fp_destination);
 	}
 	// We can't get to the file.
-	else
-		$sizes = array(-1, -1, -1);
+	else {
+			$sizes = array(-1, -1, -1);
+	}
 
 	if ($sizes[0] === -1)
-		return false;
+	{
+			return false;
+	}
 
 	// See if we have -or- can get the needed memory for this operation
 	if (checkGD() && !imageMemoryCheck($sizes))
-		return false;
+	{
+			return false;
+	}
 
 	// Not allowed to save webp or can't support webp input
 	if ((empty($modSettings['attachment_webp_enable']) && $preferred_format == 18) || ($sizes[2] == 18 && !hasWebpSupport()))
-		return false;
+	{
+			return false;
+	}
 
 	// A known and supported format?
 	if (checkImagick() && isset($default_formats[$sizes[2]]))
@@ -404,7 +422,9 @@ 
 
 		// Just to be sure, if the admin does not want webp
 		if (empty($modSettings['attachment_webp_enable']))
-			unset($default_formats[18]);
+		{
+					unset($default_formats[18]);
+		}
 
 		$preferred_format = empty($preferred_format) || !isset($default_formats[$preferred_format]) ? 2 : $preferred_format;
 
@@ -506,33 +526,46 @@ 
 					imagecopyresamplebicubic($dst_img, $src_img, 0, 0, 0, 0, $dst_width, $dst_height, $src_width, $src_height);
 				}
 			}
-			else
-				$dst_img = $src_img;
+			else {
+							$dst_img = $src_img;
+			}
+		}
+		else {
+					$dst_img = $src_img;
 		}
-		else
-			$dst_img = $src_img;
 
 		// Save the image as ...
 		if (!empty($preferred_format) && ($preferred_format == 3) && function_exists('imagepng'))
-			$success = imagepng($dst_img, $destName, 9, PNG_ALL_FILTERS);
+		{
+					$success = imagepng($dst_img, $destName, 9, PNG_ALL_FILTERS);
+		}
 		elseif (!empty($preferred_format) && ($preferred_format == 1) && function_exists('imagegif'))
-			$success = imagegif($dst_img, $destName);
+		{
+					$success = imagegif($dst_img, $destName);
+		}
 		elseif (!empty($preferred_format) && $preferred_format == 18 && function_exists('imagewebp'))
-			$success = imagewebp($dst_img, $destName, 80);
+		{
+					$success = imagewebp($dst_img, $destName, 80);
+		}
 		elseif (function_exists('imagejpeg'))
-			$success = imagejpeg($dst_img, $destName, 80);
+		{
+					$success = imagejpeg($dst_img, $destName, 80);
+		}
 
 		// Free the memory.
 		imagedestroy($src_img);
 		if ($dst_img != $src_img)
-			imagedestroy($dst_img);
+		{
+					imagedestroy($dst_img);
+		}
 
 		return $success;
 	}
 	// Without Imagick or GD, no image resizing at all.
-	else
-		return false;
-}
+	else {
+			return false;
+	}
+	}
 
 /*
  * Determines if an image has any alpha pixels
@@ -543,13 +576,17 @@ 
 function hasTransparency($fileName, $png = true)
 {
 	if (empty($fileName) || !file_exists($fileName))
-		return false;
+	{
+			return false;
+	}
 
 	$header = file_get_contents($fileName, false, null, 0, 26);
 
 	// Does it even claim to have been saved with transparency
 	if ($png && !ord($header[25]) & 4)
-		return false;
+	{
+			return false;
+	}
 
 	// Webp has its own
 	if (!$png)
@@ -599,11 +636,16 @@ 
 		list ($width, $height, $type) = elk_getimagesize($fileName);
 
 		if ($type === 18 && hasWebpSupport())
-			$image = imagecreatefromwebp($fileName);
+		{
+					$image = imagecreatefromwebp($fileName);
+		}
 		elseif ($type === 3)
-			$image = imagecreatefrompng($fileName);
-		else
-			return false;
+		{
+					$image = imagecreatefrompng($fileName);
+		}
+		else {
+					return false;
+		}
 
 		for ($i = 0; $i < $width; $i++)
 		{
@@ -1009,7 +1051,9 @@ 
 			if ($color == -1)
 			{
 				if ($palsize++ < 256)
-					imagecolorallocate($dst_img, $red, $green, $blue);
+				{
+									imagecolorallocate($dst_img, $red, $green, $blue);
+				}
 				$color = imagecolorclosest($dst_img, $red, $green, $blue);
 			}
 
@@ -1050,13 +1094,18 @@ 
 
 		// Not a standard bitmap, bail out
 		if ($header['type'] != 0x4D42)
-			return false;
+		{
+					return false;
+		}
 
 		// Create our image canvas with the given WxH
 		if ($gd2)
-			$dst_img = imagecreatetruecolor($info['width'], $info['height']);
-		else
-			$dst_img = imagecreate($info['width'], $info['height']);
+		{
+					$dst_img = imagecreatetruecolor($info['width'], $info['height']);
+		}
+		else {
+					$dst_img = imagecreate($info['width'], $info['height']);
+		}
 
 		// Color bitCounts 1,4,8 have palette information we use
 		$palette = array();
@@ -1088,7 +1137,9 @@ 
 			$scan_line = fread($fp, $scan_line_size);
 
 			if (strlen($scan_line) < $scan_line_size)
-				continue;
+			{
+							continue;
+			}
 
 			// 32 bits per pixel
 			if ($info['bits'] == 32)
@@ -1108,7 +1159,9 @@ 
 
 						// Gah!  Out of colors?  Stupid GD 1... try anyhow.
 						if ($color == -1)
-							$color = imagecolorclosest($dst_img, $r, $g, $b);
+						{
+													$color = imagecolorclosest($dst_img, $r, $g, $b);
+						}
 					}
 
 					imagesetpixel($dst_img, $x, $y, $color);
@@ -1131,7 +1184,9 @@ 
 
 						// Gah!  Out of colors?  Stupid GD 1... try anyhow.
 						if ($color == -1)
-							$color = imagecolorclosest($dst_img, $r, $g, $b);
+						{
+													$color = imagecolorclosest($dst_img, $r, $g, $b);
+						}
 					}
 
 					imagesetpixel($dst_img, $x, $y, $color);
@@ -1160,7 +1215,9 @@ 
 
 						// Gah!  Out of colors?  Stupid GD 1... try anyhow.
 						if ($color == -1)
-							$color = imagecolorclosest($dst_img, $r, $g, $b);
+						{
+													$color = imagecolorclosest($dst_img, $r, $g, $b);
+						}
 					}
 
 					imagesetpixel($dst_img, $x, $y, $color);
@@ -1171,7 +1228,9 @@ 
 			{
 				$x = 0;
 				for ($j = 0; $j < $scan_line_size; $x++)
-					imagesetpixel($dst_img, $x, $y, $palette[ord($scan_line[$j++])]);
+				{
+									imagesetpixel($dst_img, $x, $y, $palette[ord($scan_line[$j++])]);
+				}
 			}
 			// 4 bits per pixel
 			elseif ($info['bits'] == 4)
@@ -1183,7 +1242,9 @@ 
 
 					imagesetpixel($dst_img, $x, $y, $palette[(int) ($byte / 16)]);
 					if (++$x < $info['width'])
-						imagesetpixel($dst_img, $x, $y, $palette[$byte & 15]);
+					{
+											imagesetpixel($dst_img, $x, $y, $palette[$byte & 15]);
+					}
 				}
 			}
 			// 1 bit
@@ -1198,7 +1259,9 @@ 
 					for ($shift = 1; $shift < 8; $shift++)
 					{
 						if (++$x < $info['width'])
-							imagesetpixel($dst_img, $x, $y, $palette[(($byte << $shift) & 128) != 0]);
+						{
+													imagesetpixel($dst_img, $x, $y, $palette[(($byte << $shift) & 128) != 0]);
+						}
 					}
 				}
 			}
@@ -1231,7 +1294,9 @@ 
 	global $gd2, $settings, $user_info, $modSettings;
 
 	if (!checkGD())
-		return false;
+	{
+			return false;
+	}
 
 	// What type are we going to be doing?
 	// Note: The higher the value of visual_verification_type the harder the verification is
@@ -1240,7 +1305,9 @@ 
 
 	// Special case to allow the admin center to show samples.
 	if ($user_info['is_admin'] && isset($_GET['type']))
-		$imageType = (int) $_GET['type'];
+	{
+			$imageType = (int) $_GET['type'];
+	}
 
 	// Some quick references for what we do.
 	// Do we show no, low or high noise?
@@ -1275,24 +1342,33 @@ 
 
 	// What color is the background - generally white unless we're on "hard".
 	if ($simpleBGColor)
-		$background_color = array(255, 255, 255);
-	else
-		$background_color = isset($settings['verification_background']) ? $settings['verification_background'] : array(236, 237, 243);
+	{
+			$background_color = array(255, 255, 255);
+	}
+	else {
+			$background_color = isset($settings['verification_background']) ? $settings['verification_background'] : array(236, 237, 243);
+	}
 
 	// The color of the characters shown (red, green, blue).
 	if ($simpleFGColor)
-		$foreground_color = array(0, 0, 0);
+	{
+			$foreground_color = array(0, 0, 0);
+	}
 	else
 	{
 		$foreground_color = array(64, 101, 136);
 
 		// Has the theme author requested a custom color?
 		if (isset($settings['verification_foreground']))
-			$foreground_color = $settings['verification_foreground'];
+		{
+					$foreground_color = $settings['verification_foreground'];
+		}
 	}
 
 	if (!is_dir($settings['default_theme_dir'] . '/fonts'))
-		return false;
+	{
+			return false;
+	}
 
 	// Can we use true type fonts?
 	$can_do_ttf = function_exists('imagettftext');
@@ -1304,13 +1380,19 @@ 
 	while ($entry = $font_dir->read())
 	{
 		if (preg_match('~^(.+)\.gdf$~', $entry, $matches) === 1)
-			$font_list[] = $entry;
+		{
+					$font_list[] = $entry;
+		}
 		elseif (preg_match('~^(.+)\.ttf$~', $entry, $matches) === 1)
-			$ttfont_list[] = $entry;
+		{
+					$ttfont_list[] = $entry;
+		}
 	}
 
 	if (empty($font_list) && ($can_do_ttf && empty($ttfont_list)))
-		return false;
+	{
+			return false;
+	}
 
 	// For non-hard things don't even change fonts.
 	if (!$varyFonts)
@@ -1319,9 +1401,12 @@ 
 
 		// Try use OpenSans if we can - it looks good!
 		if (in_array('OpenSans.ttf', $ttfont_list))
-			$ttfont_list = array('OpenSans.ttf');
-		else
-			$ttfont_list = empty($ttfont_list) ? array() : array($ttfont_list[0]);
+		{
+					$ttfont_list = array('OpenSans.ttf');
+		}
+		else {
+					$ttfont_list = empty($ttfont_list) ? array() : array($ttfont_list[0]);
+		}
 	}
 
 	// Create a list of characters to be shown.
@@ -1340,8 +1425,10 @@ 
 
 	// Load all fonts and determine the maximum font height.
 	if (!$can_do_ttf)
-		foreach ($loaded_fonts as $font_index => $dummy)
+	{
+			foreach ($loaded_fonts as $font_index => $dummy)
 			$loaded_fonts[$font_index] = imageloadfont($settings['default_theme_dir'] . '/fonts/' . $font_list[$font_index]);
+	}
 
 	// Determine the dimensions of each character.
 	$extra = ($imageType == 4 || $imageType == 5) ? 80 : 45;
@@ -1353,9 +1440,12 @@ 
 		{
 			// GD2 handles font size differently.
 			if ($fontSizeRandom)
-				$font_size = $gd2 ? mt_rand(17, 19) : mt_rand(25, 27);
-			else
-				$font_size = $gd2 ? 17 : 27;
+			{
+							$font_size = $gd2 ? mt_rand(17, 19) : mt_rand(25, 27);
+			}
+			else {
+							$font_size = $gd2 ? 17 : 27;
+			}
 
 			$img_box = imagettfbbox($font_size, 0, $settings['default_theme_dir'] . '/fonts/' . $ttfont_list[$character['font']], $character['id']);
 
@@ -1381,13 +1471,17 @@ 
 
 	// Randomize the foreground color a little.
 	for ($i = 0; $i < 3; $i++)
-		$foreground_color[$i] = mt_rand(max($foreground_color[$i] - 3, 0), min($foreground_color[$i] + 3, 255));
+	{
+			$foreground_color[$i] = mt_rand(max($foreground_color[$i] - 3, 0), min($foreground_color[$i] + 3, 255));
+	}
 	$fg_color = imagecolorallocate($code_image, $foreground_color[0], $foreground_color[1], $foreground_color[2]);
 
 	// Color for the noise dots.
 	$dotbgcolor = array();
 	for ($i = 0; $i < 3; $i++)
-		$dotbgcolor[$i] = $background_color[$i] < $foreground_color[$i] ? mt_rand(0, max($foreground_color[$i] - 20, 0)) : mt_rand(min($foreground_color[$i] + 20, 255), 255);
+	{
+			$dotbgcolor[$i] = $background_color[$i] < $foreground_color[$i] ? mt_rand(0, max($foreground_color[$i] - 20, 0)) : mt_rand(min($foreground_color[$i] + 20, 255), 255);
+	}
 	$randomness_color = imagecolorallocate($code_image, $dotbgcolor[0], $dotbgcolor[1], $dotbgcolor[2]);
 
 	// Some squares/rectangles for new extreme level
@@ -1414,9 +1508,12 @@ 
 		{
 			// How much rotation will we give?
 			if ($rotationType == 'none')
-				$angle = 0;
-			else
-				$angle = mt_rand(-100, 100) / ($rotationType == 'high' ? 6 : 10);
+			{
+							$angle = 0;
+			}
+			else {
+							$angle = mt_rand(-100, 100) / ($rotationType == 'high' ? 6 : 10);
+			}
 
 			// What color shall we do it?
 			if ($fontColorType == 'cyclic')
@@ -1434,22 +1531,30 @@ 
 				// Pick a color, but not the same one twice in a row
 				$new_index = $last_index;
 				while ($last_index == $new_index)
-					$new_index = mt_rand(0, count($colors) - 1);
+				{
+									$new_index = mt_rand(0, count($colors) - 1);
+				}
 				$char_fg_color = $colors[$new_index];
 				$last_index = $new_index;
 			}
 			elseif ($fontColorType == 'random')
-				$char_fg_color = array(mt_rand(max($foreground_color[0] - 2, 0), $foreground_color[0]), mt_rand(max($foreground_color[1] - 2, 0), $foreground_color[1]), mt_rand(max($foreground_color[2] - 2, 0), $foreground_color[2]));
-			else
-				$char_fg_color = array($foreground_color[0], $foreground_color[1], $foreground_color[2]);
+			{
+							$char_fg_color = array(mt_rand(max($foreground_color[0] - 2, 0), $foreground_color[0]), mt_rand(max($foreground_color[1] - 2, 0), $foreground_color[1]), mt_rand(max($foreground_color[2] - 2, 0), $foreground_color[2]));
+			}
+			else {
+							$char_fg_color = array($foreground_color[0], $foreground_color[1], $foreground_color[2]);
+			}
 
 			if (!empty($can_do_ttf))
 			{
 				// GD2 handles font size differently.
 				if ($fontSizeRandom)
-					$font_size = $gd2 ? mt_rand(17, 19) : mt_rand(18, 25);
-				else
-					$font_size = $gd2 ? 18 : 24;
+				{
+									$font_size = $gd2 ? mt_rand(17, 19) : mt_rand(18, 25);
+				}
+				else {
+									$font_size = $gd2 ? 18 : 24;
+				}
 
 				// Work out the sizes - also fix the character width cause TTF not quite so wide!
 				$font_x = $fontHorSpace === 'minus' && $cur_x > 0 ? $cur_x - 3 : $cur_x + 5;
@@ -1457,7 +1562,9 @@ 
 
 				// What font face?
 				if (!empty($ttfont_list))
-					$fontface = $settings['default_theme_dir'] . '/fonts/' . $ttfont_list[mt_rand(0, count($ttfont_list) - 1)];
+				{
+									$fontface = $settings['default_theme_dir'] . '/fonts/' . $ttfont_list[mt_rand(0, count($ttfont_list) - 1)];
+				}
 
 				// What color are we to do it in?
 				$is_reverse = $showReverseChars ? mt_rand(0, 1) : false;
@@ -1465,20 +1572,27 @@ 
 
 				$fontcord = @imagettftext($code_image, $font_size, $angle, $font_x, $font_y, $char_color, $fontface, $character['id']);
 				if (empty($fontcord))
-					$can_do_ttf = false;
+				{
+									$can_do_ttf = false;
+				}
 				elseif ($is_reverse !== false)
 				{
 					if (version_compare(PHP_VERSION, '8.1.0') === -1)
-						imagefilledpolygon($code_image, $fontcord, 4, $fg_color);
-					else
-						imagefilledpolygon($code_image, $fontcord, $fg_color);
+					{
+											imagefilledpolygon($code_image, $fontcord, 4, $fg_color);
+					}
+					else {
+											imagefilledpolygon($code_image, $fontcord, $fg_color);
+					}
 
 					// Put the character back!
 					imagettftext($code_image, $font_size, $angle, $font_x, $font_y, $randomness_color, $fontface, $character['id']);
 				}
 
 				if ($can_do_ttf)
-					$cur_x = max($fontcord[2], $fontcord[4]) + ($angle == 0 ? 0 : 3);
+				{
+									$cur_x = max($fontcord[2], $fontcord[4]) + ($angle == 0 ? 0 : 3);
+				}
 			}
 
 			if (!$can_do_ttf)
@@ -1505,17 +1619,26 @@ 
 
 	// Make the background color transparent on the hard image.
 	if (!$simpleBGColor)
-		imagecolortransparent($code_image, $bg_color);
+	{
+			imagecolortransparent($code_image, $bg_color);
+	}
 
 	if ($hasBorder)
-		imagerectangle($code_image, 0, 0, $total_width - 1, $max_height - 1, $fg_color);
+	{
+			imagerectangle($code_image, 0, 0, $total_width - 1, $max_height - 1, $fg_color);
+	}
 
 	// Add some noise to the background?
 	if ($noiseType != 'none')
 	{
 		for ($i = mt_rand(0, 2); $i < $max_height; $i += mt_rand(1, 2))
-			for ($j = mt_rand(0, 10); $j < $total_width; $j += mt_rand(1, 10))
-				imagesetpixel($code_image, $j, $i, mt_rand(0, 1) ? $fg_color : $randomness_color);
+		{
+					for ($j = mt_rand(0, 10);
+		}
+		$j < $total_width; $j += mt_rand(1, 10))
+			{
+							imagesetpixel($code_image, $j, $i, mt_rand(0, 1) ? $fg_color : $randomness_color);
+			}
 
 		// Put in some lines too?
 		if ($noiseType != 'extreme')
@@ -1594,24 +1717,32 @@ 
 	global $settings;
 
 	if (!is_dir($settings['default_theme_dir'] . '/fonts'))
-		return false;
+	{
+			return false;
+	}
 
 	// Get a list of the available font directories.
 	$font_dir = dir($settings['default_theme_dir'] . '/fonts');
 	$font_list = array();
 	while ($entry = $font_dir->read())
-		if ($entry[0] !== '.' && is_dir($settings['default_theme_dir'] . '/fonts/' . $entry) && file_exists($settings['default_theme_dir'] . '/fonts/' . $entry . '.gdf'))
+	{
+			if ($entry[0] !== '.' && is_dir($settings['default_theme_dir'] . '/fonts/' . $entry) && file_exists($settings['default_theme_dir'] . '/fonts/' . $entry . '.gdf'))
 			$font_list[] = $entry;
+	}
 
 	if (empty($font_list))
-		return false;
+	{
+			return false;
+	}
 
 	// Pick a random font.
 	$random_font = $font_list[array_rand($font_list)];
 
 	// Check if the given letter exists.
 	if (!file_exists($settings['default_theme_dir'] . '/fonts/' . $random_font . '/' . $letter . '.gif'))
-		return false;
+	{
+			return false;
+	}
 
 	// Include it!
 	header('Content-type: image/gif');