SimpleMachines / SMF2.1

Sources/Subs-Graphics.php

Braces +240 added lines, -195 removed lines

@@ -18,8 +18,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * downloads a file from a url and stores it locally for avatar use by id_member.
@@ -44,8 +45,9 @@ 
 	$destName = 'avatar_' . $memID . '_' . time() . '.' . $ext;
 
 	// Just making sure there is a non-zero member.
-	if (empty($memID))
-		return false;
+	if (empty($memID)) {
+			return false;
+	}
 
 	require_once($sourcedir . '/ManageAttachments.php');
 	removeAttachments(array('id_member' => $memID));
@@ -76,10 +78,11 @@ 
 	$destName = $modSettings['custom_avatar_dir'] . '/' . $destName . '.tmp';
 
 	// Resize it.
-	if (!empty($modSettings['avatar_download_png']))
-		$success = resizeImageFile($url, $destName, $max_width, $max_height, 3);
-	else
-		$success = resizeImageFile($url, $destName, $max_width, $max_height);
+	if (!empty($modSettings['avatar_download_png'])) {
+			$success = resizeImageFile($url, $destName, $max_width, $max_height, 3);
+	} else {
+			$success = resizeImageFile($url, $destName, $max_width, $max_height);
+	}
 
 	// Remove the .tmp extension.
 	$destName = substr($destName, 0, -4);
@@ -108,11 +111,10 @@ 
 				)
 			);
 			return true;
+		} else {
+					return false;
 		}
-		else
-			return false;
-	}
-	else
+	} else
 	{
 		$smcFunc['db_query']('', '
 			DELETE FROM {db_prefix}attachments
@@ -144,17 +146,18 @@ 
 	$destName = $source . '_thumb.tmp';
 
 	// Do the actual resize.
-	if (!empty($modSettings['attachment_thumb_png']))
-		$success = resizeImageFile($source, $destName, $max_width, $max_height, 3);
-	else
-		$success = resizeImageFile($source, $destName, $max_width, $max_height);
+	if (!empty($modSettings['attachment_thumb_png'])) {
+			$success = resizeImageFile($source, $destName, $max_width, $max_height, 3);
+	} else {
+			$success = resizeImageFile($source, $destName, $max_width, $max_height);
+	}
 
 	// Okay, we're done with the temporary stuff.
 	$destName = substr($destName, 0, -4);
 
-	if ($success && @rename($destName . '.tmp', $destName))
-		return true;
-	else
+	if ($success && @rename($destName . '.tmp', $destName)) {
+			return true;
+	} else
 	{
 		@unlink($destName . '.tmp');
 		@touch($destName);
@@ -176,18 +179,21 @@ 
 {
 	if (!resizeImageFile($fileName, $fileName . '.tmp', null, null, $preferred_format))
 	{
-		if (file_exists($fileName . '.tmp'))
-			unlink($fileName . '.tmp');
+		if (file_exists($fileName . '.tmp')) {
+					unlink($fileName . '.tmp');
+		}
 
 		return false;
 	}
 
-	if (!unlink($fileName))
-		return false;
+	if (!unlink($fileName)) {
+			return false;
+	}
 
-	if (!rename($fileName . '.tmp', $fileName))
-		return false;
-}
+	if (!rename($fileName . '.tmp', $fileName)) {
+			return false;
+	}
+	}
 
 /**
  * Searches through the file to see if there's potentially harmful non-binary content.
@@ -200,8 +206,9 @@ 
 function checkImageContents($fileName, $extensiveCheck = false)
 {
 	$fp = fopen($fileName, 'rb');
-	if (!$fp)
-		fatal_lang_error('attach_timeout');
+	if (!$fp) {
+			fatal_lang_error('attach_timeout');
+	}
 
 	$prev_chunk = '';
 	while (!feof($fp))
@@ -218,8 +225,7 @@ 
 				fclose($fp);
 				return false;
 			}
-		}
-		else
+		} else
 		{
 			// Check for potential infection - focus on clues for inline php & flash.
 			// Will result in significantly fewer false positives than the paranoid check.
@@ -247,8 +253,9 @@ 
 	global $gd2;
 
 	// Check to see if GD is installed and what version.
-	if (($extensionFunctions = get_extension_funcs('gd')) === false)
-		return false;
+	if (($extensionFunctions = get_extension_funcs('gd')) === false) {
+			return false;
+	}
 
 	// Also determine if GD2 is installed and store it in a global.
 	$gd2 = in_array('imagecreatetruecolor', $extensionFunctions) && function_exists('imagecreatetruecolor');
@@ -320,8 +327,9 @@ 
 	global $sourcedir;
 
 	// Nothing to do without GD or IM/MW
-	if (!checkGD() && !checkImagick() && !checkMagickWand())
-		return false;
+	if (!checkGD() && !checkImagick() && !checkMagickWand()) {
+			return false;
+	}
 
 	static $default_formats = array(
 		'1' => 'gif',
@@ -343,38 +351,39 @@ 
 		fclose($fp_destination);
 
 		$sizes = @getimagesize($destination);
-	}
-	elseif ($fp_destination)
+	} elseif ($fp_destination)
 	{
 		$sizes = @getimagesize($source);
 
 		$fp_source = fopen($source, 'rb');
 		if ($fp_source !== false)
 		{
-			while (!feof($fp_source))
-				fwrite($fp_destination, fread($fp_source, 8192));
+			while (!feof($fp_source)) {
+							fwrite($fp_destination, fread($fp_source, 8192));
+			}
 			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);
+	}
 
 	// See if we have -or- can get the needed memory for this operation
 	// ImageMagick isn't subject to PHP's memory limits :)
-	if (!(checkIMagick() || checkMagickWand()) && checkGD() && !imageMemoryCheck($sizes))
-		return false;
+	if (!(checkIMagick() || checkMagickWand()) && checkGD() && !imageMemoryCheck($sizes)) {
+			return false;
+	}
 
 	// A known and supported format?
 	// @todo test PSD and gif.
 	if ((checkImagick() || checkMagickWand()) && isset($default_formats[$sizes[2]]))
 	{
 		return resizeImage(null, $destination, null, null, $max_width, $max_height, true, $preferred_format);
-	}
-	elseif (checkGD() && isset($default_formats[$sizes[2]]) && function_exists('imagecreatefrom' . $default_formats[$sizes[2]]))
+	} elseif (checkGD() && isset($default_formats[$sizes[2]]) && function_exists('imagecreatefrom' . $default_formats[$sizes[2]]))
 	{
 		$imagecreatefrom = 'imagecreatefrom' . $default_formats[$sizes[2]];
 		if ($src_img = @$imagecreatefrom($destination))
@@ -427,14 +436,14 @@ 
 			$dest_width = empty($max_width) ? $src_width : $max_width;
 			$dest_height = empty($max_height) ? $src_height : $max_height;
 
-			if ($default_formats[$preferred_format] == 'jpeg')
-				$imagick->setCompressionQuality(!empty($modSettings['avatar_jpeg_quality']) ? $modSettings['avatar_jpeg_quality'] : 82);
+			if ($default_formats[$preferred_format] == 'jpeg') {
+							$imagick->setCompressionQuality(!empty($modSettings['avatar_jpeg_quality']) ? $modSettings['avatar_jpeg_quality'] : 82);
+			}
 
 			$imagick->setImageFormat($default_formats[$preferred_format]);
 			$imagick->resizeImage($dest_width, $dest_height, Imagick::FILTER_LANCZOS, 1, true);
 			$success = $imagick->writeImage($destName);
-		}
-		else
+		} else
 		{
 			$magick_wand = newMagickWand();
 			MagickReadImage($magick_wand, $destName);
@@ -443,8 +452,9 @@ 
 			$dest_width = empty($max_width) ? $src_width : $max_width;
 			$dest_height = empty($max_height) ? $src_height : $max_height;
 
-			if ($default_formats[$preferred_format] == 'jpeg')
-				MagickSetCompressionQuality($magick_wand, !empty($modSettings['avatar_jpeg_quality']) ? $modSettings['avatar_jpeg_quality'] : 82);
+			if ($default_formats[$preferred_format] == 'jpeg') {
+							MagickSetCompressionQuality($magick_wand, !empty($modSettings['avatar_jpeg_quality']) ? $modSettings['avatar_jpeg_quality'] : 82);
+			}
 
 			MagickSetImageFormat($magick_wand, $default_formats[$preferred_format]);
 			MagickResizeImage($magick_wand, $dest_width, $dest_height, MW_LanczosFilter, 1, true);
@@ -452,8 +462,7 @@ 
 		}
 
 		return !empty($success);
-	}
-	elseif (checkGD())
+	} elseif (checkGD())
 	{
 		$success = false;
 
@@ -464,8 +473,7 @@ 
 			{
 				$dst_width = $max_width;
 				$dst_height = round($src_height * $max_width / $src_width);
-			}
-			elseif (!empty($max_height))
+			} elseif (!empty($max_height))
 			{
 				$dst_width = round($src_width * $max_height / $src_height);
 				$dst_height = $max_height;
@@ -483,44 +491,48 @@ 
 					if ((!empty($preferred_format)) && ($preferred_format == 3))
 					{
 						imagealphablending($dst_img, false);
-						if (function_exists('imagesavealpha'))
-							imagesavealpha($dst_img, true);
+						if (function_exists('imagesavealpha')) {
+													imagesavealpha($dst_img, true);
+						}
 					}
+				} else {
+									$dst_img = imagecreate($dst_width, $dst_height);
 				}
-				else
-					$dst_img = imagecreate($dst_width, $dst_height);
 
 				// Resize it!
-				if ($gd2)
-					imagecopyresampled($dst_img, $src_img, 0, 0, 0, 0, $dst_width, $dst_height, $src_width, $src_height);
-				else
-					imagecopyresamplebicubic($dst_img, $src_img, 0, 0, 0, 0, $dst_width, $dst_height, $src_width, $src_height);
+				if ($gd2) {
+									imagecopyresampled($dst_img, $src_img, 0, 0, 0, 0, $dst_width, $dst_height, $src_width, $src_height);
+				} else {
+									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);
-		elseif (!empty($preferred_format) && ($preferred_format == 1) && function_exists('imagegif'))
-			$success = imagegif($dst_img, $destName);
-		elseif (function_exists('imagejpeg'))
-			$success = imagejpeg($dst_img, $destName, !empty($modSettings['avatar_jpeg_quality']) ? $modSettings['avatar_jpeg_quality'] : 82);
+		if (!empty($preferred_format) && ($preferred_format == 3) && function_exists('imagepng')) {
+					$success = imagepng($dst_img, $destName);
+		} elseif (!empty($preferred_format) && ($preferred_format == 1) && function_exists('imagegif')) {
+					$success = imagegif($dst_img, $destName);
+		} elseif (function_exists('imagejpeg')) {
+					$success = imagejpeg($dst_img, $destName, !empty($modSettings['avatar_jpeg_quality']) ? $modSettings['avatar_jpeg_quality'] : 82);
+		}
 
 		// Free the memory.
 		imagedestroy($src_img);
-		if ($dst_img != $src_img)
-			imagedestroy($dst_img);
+		if ($dst_img != $src_img) {
+					imagedestroy($dst_img);
+		}
 
 		return $success;
-	}
-	else
-		// Without GD, no image resizing at all.
+	} else {
+			// Without GD, no image resizing at all.
 		return false;
-}
+	}
+	}
 
 /**
  * Copy image.
@@ -574,8 +586,9 @@ 
 			$color = imagecolorresolve($dst_img, $red, $green, $blue);
 			if ($color == -1)
 			{
-				if ($palsize++ < 256)
-					imagecolorallocate($dst_img, $red, $green, $blue);
+				if ($palsize++ < 256) {
+									imagecolorallocate($dst_img, $red, $green, $blue);
+				}
 				$color = imagecolorclosest($dst_img, $red, $green, $blue);
 			}
 
@@ -605,13 +618,15 @@ 
 		$header = unpack('vtype/Vsize/Vreserved/Voffset', fread($fp, 14));
 		$info = unpack('Vsize/Vwidth/Vheight/vplanes/vbits/Vcompression/Vimagesize/Vxres/Vyres/Vncolor/Vcolorimportant', fread($fp, 40));
 
-		if ($header['type'] != 0x4D42)
-			return false;
+		if ($header['type'] != 0x4D42) {
+					return false;
+		}
 
-		if ($gd2)
-			$dst_img = imagecreatetruecolor($info['width'], $info['height']);
-		else
-			$dst_img = imagecreate($info['width'], $info['height']);
+		if ($gd2) {
+					$dst_img = imagecreatetruecolor($info['width'], $info['height']);
+		} else {
+					$dst_img = imagecreate($info['width'], $info['height']);
+		}
 
 		$palette_size = $header['offset'] - 54;
 		$info['ncolor'] = $palette_size / 4;
@@ -637,8 +652,9 @@ 
 			fseek($fp, $header['offset'] + ($scan_line_size + $scan_line_align) * $l);
 			$scan_line = fread($fp, $scan_line_size);
 
-			if (strlen($scan_line) < $scan_line_size)
-				continue;
+			if (strlen($scan_line) < $scan_line_size) {
+							continue;
+			}
 
 			if ($info['bits'] == 32)
 			{
@@ -656,14 +672,14 @@ 
 						$color = imagecolorallocate($dst_img, $r, $g, $b);
 
 						// Gah!  Out of colors?  Stupid GD 1... try anyhow.
-						if ($color == -1)
-							$color = imagecolorclosest($dst_img, $r, $g, $b);
+						if ($color == -1) {
+													$color = imagecolorclosest($dst_img, $r, $g, $b);
+						}
 					}
 
 					imagesetpixel($dst_img, $x, $y, $color);
 				}
-			}
-			elseif ($info['bits'] == 24)
+			} elseif ($info['bits'] == 24)
 			{
 				$x = 0;
 				for ($j = 0; $j < $scan_line_size; $x++)
@@ -678,14 +694,14 @@ 
 						$color = imagecolorallocate($dst_img, $r, $g, $b);
 
 						// Gah!  Out of colors?  Stupid GD 1... try anyhow.
-						if ($color == -1)
-							$color = imagecolorclosest($dst_img, $r, $g, $b);
+						if ($color == -1) {
+													$color = imagecolorclosest($dst_img, $r, $g, $b);
+						}
 					}
 
 					imagesetpixel($dst_img, $x, $y, $color);
 				}
-			}
-			elseif ($info['bits'] == 16)
+			} elseif ($info['bits'] == 16)
 			{
 				$x = 0;
 				for ($j = 0; $j < $scan_line_size; $x++)
@@ -706,20 +722,20 @@ 
 						$color = imagecolorallocate($dst_img, $r, $g, $b);
 
 						// Gah!  Out of colors?  Stupid GD 1... try anyhow.
-						if ($color == -1)
-							$color = imagecolorclosest($dst_img, $r, $g, $b);
+						if ($color == -1) {
+													$color = imagecolorclosest($dst_img, $r, $g, $b);
+						}
 					}
 
 					imagesetpixel($dst_img, $x, $y, $color);
 				}
-			}
-			elseif ($info['bits'] == 8)
+			} elseif ($info['bits'] == 8)
 			{
 				$x = 0;
-				for ($j = 0; $j < $scan_line_size; $x++)
-					imagesetpixel($dst_img, $x, $y, $palette[ord($scan_line{$j++})]);
-			}
-			elseif ($info['bits'] == 4)
+				for ($j = 0; $j < $scan_line_size; $x++) {
+									imagesetpixel($dst_img, $x, $y, $palette[ord($scan_line{$j++})]);
+				}
+			} elseif ($info['bits'] == 4)
 			{
 				$x = 0;
 				for ($j = 0; $j < $scan_line_size; $x++)
@@ -727,11 +743,11 @@ 
 					$byte = ord($scan_line{$j++});
 
 					imagesetpixel($dst_img, $x, $y, $palette[(int) ($byte / 16)]);
-					if (++$x < $info['width'])
-						imagesetpixel($dst_img, $x, $y, $palette[$byte & 15]);
+					if (++$x < $info['width']) {
+											imagesetpixel($dst_img, $x, $y, $palette[$byte & 15]);
+					}
 				}
-			}
-			elseif ($info['bits'] == 1)
+			} elseif ($info['bits'] == 1)
 			{
 				$x = 0;
 				for ($j = 0; $j < $scan_line_size; $x++)
@@ -740,7 +756,9 @@ 
 
 					imagesetpixel($dst_img, $x, $y, $palette[(($byte) & 128) != 0]);
 					for ($shift = 1; $shift < 8; $shift++) {
-						if (++$x < $info['width']) imagesetpixel($dst_img, $x, $y, $palette[(($byte << $shift) & 128) != 0]);
+						if (++$x < $info['width']) {
+							imagesetpixel($dst_img, $x, $y, $palette[(($byte << $shift) & 128) != 0]);
+						}
 					}
 				}
 			}
@@ -764,15 +782,18 @@ 
  */
 function gif_outputAsPng($gif, $lpszFileName, $background_color = -1)
 {
-	if (!isset($gif) || @get_class($gif) != 'cgif' || !$gif->loaded || $lpszFileName == '')
-		return false;
+	if (!isset($gif) || @get_class($gif) != 'cgif' || !$gif->loaded || $lpszFileName == '') {
+			return false;
+	}
 
 	$fd = $gif->get_png_data($background_color);
-	if (strlen($fd) <= 0)
-		return false;
+	if (strlen($fd) <= 0) {
+			return false;
+	}
 
-	if (!($fh = @fopen($lpszFileName, 'wb')))
-		return false;
+	if (!($fh = @fopen($lpszFileName, 'wb'))) {
+			return false;
+	}
 
 	@fwrite($fh, $fd, strlen($fd));
 	@fflush($fh);
@@ -799,8 +820,9 @@ 
 	// What type are we going to be doing?
 	$imageType = $modSettings['visual_verification_type'];
 	// Special case to allow the admin center to show samples.
-	if ($user_info['is_admin'] && isset($_GET['type']))
-		$imageType = (int) $_GET['type'];
+	if ($user_info['is_admin'] && isset($_GET['type'])) {
+			$imageType = (int) $_GET['type'];
+	}
 
 	// Some quick references for what we do.
 	// Do we show no, low or high noise?
@@ -834,25 +856,28 @@ 
 	$character_spacing = 1;
 
 	// 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);
+	if ($simpleBGColor) {
+			$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);
-	else
+	if ($simpleFGColor) {
+			$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'];
+		if (isset($settings['verification_foreground'])) {
+					$foreground_color = $settings['verification_foreground'];
+		}
 	}
 
-	if (!is_dir($settings['default_theme_dir'] . '/fonts'))
-		return false;
+	if (!is_dir($settings['default_theme_dir'] . '/fonts')) {
+			return false;
+	}
 
 	// Get a list of the available fonts.
 	$font_dir = dir($settings['default_theme_dir'] . '/fonts');
@@ -863,25 +888,28 @@ 
 	{
 		if (preg_match('~^(.+)\.gdf$~', $entry, $matches) === 1)
 		{
-			if ($endian ^ (strpos($entry, '_end.gdf') === false))
-				$font_list[] = $entry;
+			if ($endian ^ (strpos($entry, '_end.gdf') === false)) {
+							$font_list[] = $entry;
+			}
+		} elseif (preg_match('~^(.+)\.ttf$~', $entry, $matches) === 1) {
+					$ttfont_list[] = $entry;
 		}
-		elseif (preg_match('~^(.+)\.ttf$~', $entry, $matches) === 1)
-			$ttfont_list[] = $entry;
 	}
 
-	if (empty($font_list))
-		return false;
+	if (empty($font_list)) {
+			return false;
+	}
 
 	// For non-hard things don't even change fonts.
 	if (!$varyFonts)
 	{
 		$font_list = array($font_list[0]);
 		// Try use Screenge if we can - it looks good!
-		if (in_array('AnonymousPro.ttf', $ttfont_list))
-			$ttfont_list = array('AnonymousPro.ttf');
-		else
-			$ttfont_list = empty($ttfont_list) ? array() : array($ttfont_list[0]);
+		if (in_array('AnonymousPro.ttf', $ttfont_list)) {
+					$ttfont_list = array('AnonymousPro.ttf');
+		} else {
+					$ttfont_list = empty($ttfont_list) ? array() : array($ttfont_list[0]);
+		}
 
 	}
 
@@ -899,14 +927,16 @@ 
 	}
 
 	// Load all fonts and determine the maximum font height.
-	foreach ($loaded_fonts as $font_index => $dummy)
-		$loaded_fonts[$font_index] = imageloadfont($settings['default_theme_dir'] . '/fonts/' . $font_list[$font_index]);
+	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.
-	if ($imageType == 4 || $imageType == 5)
-		$extra = 80;
-	else
-		$extra = 45;
+	if ($imageType == 4 || $imageType == 5) {
+			$extra = 80;
+	} else {
+			$extra = 45;
+	}
 
 	$total_width = $character_spacing * strlen($code) + $extra;
 	$max_height = 0;
@@ -927,13 +957,15 @@ 
 	imagefilledrectangle($code_image, 0, 0, $total_width - 1, $max_height - 1, $bg_color);
 
 	// 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));
+	for ($i = 0; $i < 3; $i++) {
+			$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 dots.
-	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);
+	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);
+	}
 	$randomness_color = imagecolorallocate($code_image, $dotbgcolor[0], $dotbgcolor[1], $dotbgcolor[2]);
 
 	// Some squares/rectanges for new extreme level
@@ -959,10 +991,11 @@ 
 			$can_do_ttf = function_exists('imagettftext');
 
 			// How much rotation will we give?
-			if ($rotationType == 'none')
-				$angle = 0;
-			else
-				$angle = mt_rand(-100, 100) / ($rotationType == 'high' ? 6 : 10);
+			if ($rotationType == 'none') {
+							$angle = 0;
+			} else {
+							$angle = mt_rand(-100, 100) / ($rotationType == 'high' ? 6 : 10);
+			}
 
 			// What color shall we do it?
 			if ($fontColorType == 'cyclic')
@@ -976,51 +1009,56 @@ 
 					array(0, 0, 0),
 					array(143, 39, 31),
 				);
-				if (!isset($last_index))
-					$last_index = -1;
+				if (!isset($last_index)) {
+									$last_index = -1;
+				}
 				$new_index = $last_index;
-				while ($last_index == $new_index)
-					$new_index = mt_rand(0, count($colors) - 1);
+				while ($last_index == $new_index) {
+									$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]);
 			}
-			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]);
 
 			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;
+				if ($fontSizeRandom) {
+									$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;
 				$font_y = $max_height - ($fontVerPos == 'vrandom' ? mt_rand(2, 8) : ($fontVerPos == 'random' ? mt_rand(3, 5) : 5));
 
 				// What font face?
-				if (!empty($ttfont_list))
-					$fontface = $settings['default_theme_dir'] . '/fonts/' . $ttfont_list[mt_rand(0, count($ttfont_list) - 1)];
+				if (!empty($ttfont_list)) {
+									$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;
 				$char_color = function_exists('imagecolorallocatealpha') && $fontTrans ? imagecolorallocatealpha($code_image, $char_fg_color[0], $char_fg_color[1], $char_fg_color[2], 50) : imagecolorallocate($code_image, $char_fg_color[0], $char_fg_color[1], $char_fg_color[2]);
 
 				$fontcord = @imagettftext($code_image, $font_size, $angle, $font_x, $font_y, $char_color, $fontface, $character['id']);
-				if (empty($fontcord))
-					$can_do_ttf = false;
-				elseif ($is_reverse)
+				if (empty($fontcord)) {
+									$can_do_ttf = false;
+				} elseif ($is_reverse)
 				{
 					imagefilledpolygon($code_image, $fontcord, 4, $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);
+				if ($can_do_ttf) {
+									$cur_x = max($fontcord[2], $fontcord[4]) + ($angle == 0 ? 0 : 3);
+				}
 			}
 
 			if (!$can_do_ttf)
@@ -1039,8 +1077,9 @@ 
 				}
 
 				// Sorry, no rotation available.
-				else
-					imagechar($code_image, $loaded_fonts[$character['font']], $cur_x, floor(($max_height - $character['height']) / 2), $character['id'], imagecolorallocate($code_image, $char_fg_color[0], $char_fg_color[1], $char_fg_color[2]));
+				else {
+									imagechar($code_image, $loaded_fonts[$character['font']], $cur_x, floor(($max_height - $character['height']) / 2), $character['id'], imagecolorallocate($code_image, $char_fg_color[0], $char_fg_color[1], $char_fg_color[2]));
+				}
 				$cur_x += $character['width'] + $character_spacing;
 			}
 		}
@@ -1053,17 +1092,22 @@ 
 	}
 
 	// Make the background color transparent on the hard image.
-	if (!$simpleBGColor)
-		imagecolortransparent($code_image, $bg_color);
-	if ($hasBorder)
-		imagerectangle($code_image, 0, 0, $total_width - 1, $max_height - 1, $fg_color);
+	if (!$simpleBGColor) {
+			imagecolortransparent($code_image, $bg_color);
+	}
+	if ($hasBorder) {
+			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 ($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);
+			}
 
 		// Put in some lines too?
 		if ($noiseType != 'extreme')
@@ -1076,8 +1120,7 @@ 
 					$x1 = mt_rand(0, $total_width);
 					$x2 = mt_rand(0, $total_width);
 					$y1 = 0; $y2 = $max_height;
-				}
-				else
+				} else
 				{
 					$y1 = mt_rand(0, $max_height);
 					$y2 = mt_rand(0, $max_height);
@@ -1086,8 +1129,7 @@ 
 				imagesetthickness($code_image, mt_rand(1, 2));
 				imageline($code_image, $x1, $y1, $x2, $y2, mt_rand(0, 1) ? $fg_color : $randomness_color);
 			}
-		}
-		else
+		} else
 		{
 			// Put in some ellipse
 			$num_ellipse = $noiseType == 'extreme' ? mt_rand(6, 12) : mt_rand(2, 6);
@@ -1107,8 +1149,7 @@ 
 	{
 		header('Content-type: image/gif');
 		imagegif($code_image);
-	}
-	else
+	} else
 	{
 		header('Content-type: image/png');
 		imagepng($code_image);
@@ -1131,25 +1172,29 @@ 
 {
 	global $settings;
 
-	if (!is_dir($settings['default_theme_dir'] . '/fonts'))
-		return false;
+	if (!is_dir($settings['default_theme_dir'] . '/fonts')) {
+			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'))
+	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'))
 			$font_list[] = $entry;
+	}
 
-	if (empty($font_list))
-		return false;
+	if (empty($font_list)) {
+			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 . '.png'))
-		return false;
+	if (!file_exists($settings['default_theme_dir'] . '/fonts/' . $random_font . '/' . $letter . '.png')) {
+			return false;
+	}
 
 	// Include it!
 	header('Content-type: image/png');