mambax7 / XoopsCore25

htdocs/modules/system/class/thumbs/phpthumb.filters.php

Indentation +1506 added lines, -1506 removed lines

@@ -11,68 +11,68 @@ 
 
 class phpthumb_filters {
 
-	/**
-	* @var phpthumb
-	*/
-
-	public $phpThumbObject = null;
-
-
-	public function DebugMessage($message, $file='', $line='') {
-		if (is_object($this->phpThumbObject)) {
-			return $this->phpThumbObject->DebugMessage($message, $file, $line);
-		}
-		return false;
-	}
-
-
-	public function ApplyMask(&$gdimg_mask, &$gdimg_image) {
-		if (phpthumb_functions::gd_version() < 2) {
-			$this->DebugMessage('Skipping ApplyMask() because gd_version is "'.phpthumb_functions::gd_version().'"', __FILE__, __LINE__);
-			return false;
-		}
-		if (phpthumb_functions::version_compare_replacement(PHP_VERSION, '4.3.2', '>=')) {
-
-			$this->DebugMessage('Using alpha ApplyMask() technique', __FILE__, __LINE__);
-			if ($gdimg_mask_resized = phpthumb_functions::ImageCreateFunction(imagesx($gdimg_image), imagesy($gdimg_image))) {
-
-				imagecopyresampled($gdimg_mask_resized, $gdimg_mask, 0, 0, 0, 0, imagesx($gdimg_image), imagesy($gdimg_image), imagesx($gdimg_mask), imagesy($gdimg_mask));
-				if ($gdimg_mask_blendtemp = phpthumb_functions::ImageCreateFunction(imagesx($gdimg_image), imagesy($gdimg_image))) {
-
-					$color_background = imagecolorallocate($gdimg_mask_blendtemp, 0, 0, 0);
-					imagefilledrectangle($gdimg_mask_blendtemp, 0, 0, imagesx($gdimg_mask_blendtemp), imagesy($gdimg_mask_blendtemp), $color_background);
-					imagealphablending($gdimg_mask_blendtemp, false);
-					imagesavealpha($gdimg_mask_blendtemp, true);
-					for ($x = 0, $xMax = imagesx($gdimg_image); $x < $xMax; $x++) {
-						for ($y = 0, $yMax = imagesy($gdimg_image); $y < $yMax; $y++) {
-							//$RealPixel = phpthumb_functions::GetPixelColor($gdimg_mask_blendtemp, $x, $y);
-							$RealPixel = phpthumb_functions::GetPixelColor($gdimg_image, $x, $y);
-							$MaskPixel = phpthumb_functions::GrayscalePixel(phpthumb_functions::GetPixelColor($gdimg_mask_resized, $x, $y));
-							$MaskAlpha = 127 - (floor($MaskPixel['red'] / 2) * (1 - ($RealPixel['alpha'] / 127)));
-							$newcolor = phpthumb_functions::ImageColorAllocateAlphaSafe($gdimg_mask_blendtemp, $RealPixel['red'], $RealPixel['green'], $RealPixel['blue'], $MaskAlpha);
-							imagesetpixel($gdimg_mask_blendtemp, $x, $y, $newcolor);
-						}
-					}
-					imagealphablending($gdimg_image, false);
-					imagesavealpha($gdimg_image, true);
-					imagecopy($gdimg_image, $gdimg_mask_blendtemp, 0, 0, 0, 0, imagesx($gdimg_mask_blendtemp), imagesy($gdimg_mask_blendtemp));
-					imagedestroy($gdimg_mask_blendtemp);
-
-				} else {
-					$this->DebugMessage('ImageCreateFunction() failed', __FILE__, __LINE__);
-				}
-				imagedestroy($gdimg_mask_resized);
-
-			} else {
-				$this->DebugMessage('ImageCreateFunction() failed', __FILE__, __LINE__);
-			}
-
-		} else {
-			// alpha merging requires PHP v4.3.2+
-			$this->DebugMessage('Skipping ApplyMask() technique because PHP is v"'. PHP_VERSION .'"', __FILE__, __LINE__);
-		}
-		return true;
-	}
+    /**
+     * @var phpthumb
+     */
+
+    public $phpThumbObject = null;
+
+
+    public function DebugMessage($message, $file='', $line='') {
+        if (is_object($this->phpThumbObject)) {
+            return $this->phpThumbObject->DebugMessage($message, $file, $line);
+        }
+        return false;
+    }
+
+
+    public function ApplyMask(&$gdimg_mask, &$gdimg_image) {
+        if (phpthumb_functions::gd_version() < 2) {
+            $this->DebugMessage('Skipping ApplyMask() because gd_version is "'.phpthumb_functions::gd_version().'"', __FILE__, __LINE__);
+            return false;
+        }
+        if (phpthumb_functions::version_compare_replacement(PHP_VERSION, '4.3.2', '>=')) {
+
+            $this->DebugMessage('Using alpha ApplyMask() technique', __FILE__, __LINE__);
+            if ($gdimg_mask_resized = phpthumb_functions::ImageCreateFunction(imagesx($gdimg_image), imagesy($gdimg_image))) {
+
+                imagecopyresampled($gdimg_mask_resized, $gdimg_mask, 0, 0, 0, 0, imagesx($gdimg_image), imagesy($gdimg_image), imagesx($gdimg_mask), imagesy($gdimg_mask));
+                if ($gdimg_mask_blendtemp = phpthumb_functions::ImageCreateFunction(imagesx($gdimg_image), imagesy($gdimg_image))) {
+
+                    $color_background = imagecolorallocate($gdimg_mask_blendtemp, 0, 0, 0);
+                    imagefilledrectangle($gdimg_mask_blendtemp, 0, 0, imagesx($gdimg_mask_blendtemp), imagesy($gdimg_mask_blendtemp), $color_background);
+                    imagealphablending($gdimg_mask_blendtemp, false);
+                    imagesavealpha($gdimg_mask_blendtemp, true);
+                    for ($x = 0, $xMax = imagesx($gdimg_image); $x < $xMax; $x++) {
+                        for ($y = 0, $yMax = imagesy($gdimg_image); $y < $yMax; $y++) {
+                            //$RealPixel = phpthumb_functions::GetPixelColor($gdimg_mask_blendtemp, $x, $y);
+                            $RealPixel = phpthumb_functions::GetPixelColor($gdimg_image, $x, $y);
+                            $MaskPixel = phpthumb_functions::GrayscalePixel(phpthumb_functions::GetPixelColor($gdimg_mask_resized, $x, $y));
+                            $MaskAlpha = 127 - (floor($MaskPixel['red'] / 2) * (1 - ($RealPixel['alpha'] / 127)));
+                            $newcolor = phpthumb_functions::ImageColorAllocateAlphaSafe($gdimg_mask_blendtemp, $RealPixel['red'], $RealPixel['green'], $RealPixel['blue'], $MaskAlpha);
+                            imagesetpixel($gdimg_mask_blendtemp, $x, $y, $newcolor);
+                        }
+                    }
+                    imagealphablending($gdimg_image, false);
+                    imagesavealpha($gdimg_image, true);
+                    imagecopy($gdimg_image, $gdimg_mask_blendtemp, 0, 0, 0, 0, imagesx($gdimg_mask_blendtemp), imagesy($gdimg_mask_blendtemp));
+                    imagedestroy($gdimg_mask_blendtemp);
+
+                } else {
+                    $this->DebugMessage('ImageCreateFunction() failed', __FILE__, __LINE__);
+                }
+                imagedestroy($gdimg_mask_resized);
+
+            } else {
+                $this->DebugMessage('ImageCreateFunction() failed', __FILE__, __LINE__);
+            }
+
+        } else {
+            // alpha merging requires PHP v4.3.2+
+            $this->DebugMessage('Skipping ApplyMask() technique because PHP is v"'. PHP_VERSION .'"', __FILE__, __LINE__);
+        }
+        return true;
+    }
 
 
     public function Bevel(&$gdimg, $width, $hexcolor1, $hexcolor2) {
@@ -95,1449 +95,1449 @@ 
     }
 
 
-	public function Blur(&$gdimg, $radius=0.5) {
-		// Taken from Torstein Hønsi's phpUnsharpMask (see phpthumb.unsharp.php)
-
-		$radius = round(max(0, min($radius, 50)) * 2);
-		if (!$radius) {
-			return false;
-		}
-
-		$w = imagesx($gdimg);
-		$h = imagesy($gdimg);
-		if ($imgBlur = imagecreatetruecolor($w, $h)) {
-			// Gaussian blur matrix:
-			//	1	2	1
-			//	2	4	2
-			//	1	2	1
-
-			// Move copies of the image around one pixel at the time and merge them with weight
-			// according to the matrix. The same matrix is simply repeated for higher radii.
-			for ($i = 0; $i < $radius; $i++)	{
-				imagecopy     ($imgBlur, $gdimg, 0, 0, 1, 1, $w - 1, $h - 1);            // up left
-				imagecopymerge($imgBlur, $gdimg, 1, 1, 0, 0, $w,     $h,     50.00000);  // down right
-				imagecopymerge($imgBlur, $gdimg, 0, 1, 1, 0, $w - 1, $h,     33.33333);  // down left
-				imagecopymerge($imgBlur, $gdimg, 1, 0, 0, 1, $w,     $h - 1, 25.00000);  // up right
-				imagecopymerge($imgBlur, $gdimg, 0, 0, 1, 0, $w - 1, $h,     33.33333);  // left
-				imagecopymerge($imgBlur, $gdimg, 1, 0, 0, 0, $w,     $h,     25.00000);  // right
-				imagecopymerge($imgBlur, $gdimg, 0, 0, 0, 1, $w,     $h - 1, 20.00000);  // up
-				imagecopymerge($imgBlur, $gdimg, 0, 1, 0, 0, $w,     $h,     16.666667); // down
-				imagecopymerge($imgBlur, $gdimg, 0, 0, 0, 0, $w,     $h,     50.000000); // center
-				imagecopy     ($gdimg, $imgBlur, 0, 0, 0, 0, $w,     $h);
-			}
-			return true;
-		}
-		return false;
-	}
-
-
-	public function BlurGaussian(&$gdimg) {
-		if (phpthumb_functions::version_compare_replacement(PHP_VERSION, '5.0.0', '>=') && phpthumb_functions::gd_is_bundled()) {
-			if (imagefilter($gdimg, IMG_FILTER_GAUSSIAN_BLUR)) {
-				return true;
-			}
-			$this->DebugMessage('FAILED: imagefilter($gdimg, IMG_FILTER_GAUSSIAN_BLUR)', __FILE__, __LINE__);
-			// fall through and try it the hard way
-		}
-		$this->DebugMessage('FAILED: phpthumb_filters::BlurGaussian($gdimg) [using phpthumb_filters::Blur() instead]', __FILE__, __LINE__);
-		return self::Blur($gdimg, 0.5);
-	}
-
-
-	public function BlurSelective(&$gdimg) {
-		if (phpthumb_functions::version_compare_replacement(PHP_VERSION, '5.0.0', '>=') && phpthumb_functions::gd_is_bundled()) {
-			if (imagefilter($gdimg, IMG_FILTER_SELECTIVE_BLUR)) {
-				return true;
-			}
-			$this->DebugMessage('FAILED: imagefilter($gdimg, IMG_FILTER_SELECTIVE_BLUR)', __FILE__, __LINE__);
-			// fall through and try it the hard way
-		}
-		// currently not implemented "the hard way"
-		$this->DebugMessage('FAILED: phpthumb_filters::BlurSelective($gdimg) [function not implemented]', __FILE__, __LINE__);
-		return false;
-	}
-
-
-	public function Brightness(&$gdimg, $amount=0) {
-		if ($amount == 0) {
-			return true;
-		}
-		$amount = max(-255, min(255, $amount));
-
-		if (phpthumb_functions::version_compare_replacement(PHP_VERSION, '5.0.0', '>=') && phpthumb_functions::gd_is_bundled()) {
-			if (imagefilter($gdimg, IMG_FILTER_BRIGHTNESS, $amount)) {
-				return true;
-			}
-			$this->DebugMessage('FAILED: imagefilter($gdimg, IMG_FILTER_BRIGHTNESS, '.$amount.')', __FILE__, __LINE__);
-			// fall through and try it the hard way
-		}
-
-		$scaling = (255 - abs($amount)) / 255;
-		$baseamount = (($amount > 0) ? $amount : 0);
-		for ($x = 0, $xMax = imagesx($gdimg); $x < $xMax; $x++) {
-			for ($y = 0, $yMax = imagesy($gdimg); $y < $yMax; $y++) {
-				$OriginalPixel = phpthumb_functions::GetPixelColor($gdimg, $x, $y);
-				$NewPixel = array();
-				foreach ($OriginalPixel as $key => $value) {
-					$NewPixel[$key] = round($baseamount + ($OriginalPixel[$key] * $scaling));
-				}
-				$newColor = imagecolorallocate($gdimg, $NewPixel['red'], $NewPixel['green'], $NewPixel['blue']);
-				imagesetpixel($gdimg, $x, $y, $newColor);
-			}
-		}
-		return true;
-	}
-
-
-	public function Contrast(&$gdimg, $amount=0) {
-		if ($amount == 0) {
-			return true;
-		}
-		$amount = max(-255, min(255, $amount));
-
-		if (phpthumb_functions::version_compare_replacement(PHP_VERSION, '5.0.0', '>=') && phpthumb_functions::gd_is_bundled()) {
-			// imagefilter(IMG_FILTER_CONTRAST) has range +100 to -100 (positive numbers make it darker!)
-			$amount = ($amount / 255) * -100;
-			if (imagefilter($gdimg, IMG_FILTER_CONTRAST, $amount)) {
-				return true;
-			}
-			$this->DebugMessage('FAILED: imagefilter($gdimg, IMG_FILTER_CONTRAST, '.$amount.')', __FILE__, __LINE__);
-			// fall through and try it the hard way
-		}
-
-		if ($amount > 0) {
-			$scaling = 1 + ($amount / 255);
-		} else {
-			$scaling = (255 - abs($amount)) / 255;
-		}
-		for ($x = 0, $xMax = imagesx($gdimg); $x < $xMax; $x++) {
-			for ($y = 0, $yMax = imagesy($gdimg); $y < $yMax; $y++) {
-				$OriginalPixel = phpthumb_functions::GetPixelColor($gdimg, $x, $y);
-				$NewPixel = array();
-				foreach ($OriginalPixel as $key => $value) {
-					$NewPixel[$key] = min(255, max(0, round($OriginalPixel[$key] * $scaling)));
-				}
-				$newColor = imagecolorallocate($gdimg, $NewPixel['red'], $NewPixel['green'], $NewPixel['blue']);
-				imagesetpixel($gdimg, $x, $y, $newColor);
-			}
-		}
-		return true;
-	}
-
-
-	public function Colorize(&$gdimg, $amount, $targetColor) {
-		$amount      = (is_numeric($amount)                          ? $amount      : 25);
-		$amountPct   = $amount / 100;
-		$targetColor = (phpthumb_functions::IsHexColor($targetColor) ? $targetColor : 'gray');
-
-		if ($amount == 0) {
-			return true;
-		}
-
-		if (phpthumb_functions::version_compare_replacement(PHP_VERSION, '5.0.0', '>=') && phpthumb_functions::gd_is_bundled()) {
-			if ($targetColor == 'gray') {
-				$targetColor = '808080';
-			}
-			$r = round($amountPct * hexdec(substr($targetColor, 0, 2)));
-			$g = round($amountPct * hexdec(substr($targetColor, 2, 2)));
-			$b = round($amountPct * hexdec(substr($targetColor, 4, 2)));
-			if (imagefilter($gdimg, IMG_FILTER_COLORIZE, $r, $g, $b)) {
-				return true;
-			}
-			$this->DebugMessage('FAILED: imagefilter($gdimg, IMG_FILTER_COLORIZE)', __FILE__, __LINE__);
-			// fall through and try it the hard way
-		}
-
-		// overridden below for grayscale
-		$TargetPixel = array();
-		if ($targetColor != 'gray') {
-			$TargetPixel['red']   = hexdec(substr($targetColor, 0, 2));
-			$TargetPixel['green'] = hexdec(substr($targetColor, 2, 2));
-			$TargetPixel['blue']  = hexdec(substr($targetColor, 4, 2));
-		}
-
-		for ($x = 0, $xMax = imagesx($gdimg); $x < $xMax; $x++) {
-			for ($y = 0, $yMax = imagesy($gdimg); $y < $yMax; $y++) {
-				$OriginalPixel = phpthumb_functions::GetPixelColor($gdimg, $x, $y);
-				if ($targetColor == 'gray') {
-					$TargetPixel = phpthumb_functions::GrayscalePixel($OriginalPixel);
-				}
-				$NewPixel = array();
-				foreach ($TargetPixel as $key => $value) {
-					$NewPixel[$key] = round(max(0, min(255, ($OriginalPixel[$key] * ((100 - $amount) / 100)) + ($TargetPixel[$key] * $amountPct))));
-				}
-				//$newColor = phpthumb_functions::ImageColorAllocateAlphaSafe($gdimg, $NewPixel['red'], $NewPixel['green'], $NewPixel['blue'], $OriginalPixel['alpha']);
-				$newColor = imagecolorallocate($gdimg, $NewPixel['red'], $NewPixel['green'], $NewPixel['blue']);
-				imagesetpixel($gdimg, $x, $y, $newColor);
-			}
-		}
-		return true;
-	}
-
-
-	public function Crop(&$gdimg, $left=0, $right=0, $top=0, $bottom=0) {
-		if (!$left && !$right && !$top && !$bottom) {
-			return true;
-		}
-		$oldW = imagesx($gdimg);
-		$oldH = imagesy($gdimg);
-		if (($left   > 0) && ($left   < 1)) { $left   = round($left   * $oldW); }
-		if (($right  > 0) && ($right  < 1)) { $right  = round($right  * $oldW); }
-		if (($top    > 0) && ($top    < 1)) { $top    = round($top    * $oldH); }
-		if (($bottom > 0) && ($bottom < 1)) { $bottom = round($bottom * $oldH); }
-		$right  = min($oldW - $left - 1, $right);
-		$bottom = min($oldH - $top  - 1, $bottom);
-		$newW = $oldW - $left - $right;
-		$newH = $oldH - $top  - $bottom;
-
-		if ($imgCropped = imagecreatetruecolor($newW, $newH)) {
-			imagecopy($imgCropped, $gdimg, 0, 0, $left, $top, $newW, $newH);
-			if ($gdimg = imagecreatetruecolor($newW, $newH)) {
-				imagecopy($gdimg, $imgCropped, 0, 0, 0, 0, $newW, $newH);
-				imagedestroy($imgCropped);
-				return true;
-			}
-			imagedestroy($imgCropped);
-		}
-		return false;
-	}
-
-
-	public function Desaturate(&$gdimg, $amount, $color='') {
-		if ($amount == 0) {
-			return true;
-		}
-		return self::Colorize($gdimg, $amount, (phpthumb_functions::IsHexColor($color) ? $color : 'gray'));
-	}
-
-
-	public function DropShadow(&$gdimg, $distance, $width, $hexcolor, $angle, $alpha) {
-		if (phpthumb_functions::gd_version() < 2) {
-			return false;
-		}
-		$distance =                 ($distance ? $distance : 10);
-		$width    =                 ($width    ? $width    : 10);
-		$hexcolor =                 ($hexcolor ? $hexcolor : '000000');
-		$angle    =                 ($angle    ? $angle    : 225) % 360;
-		$alpha    = max(0, min(100, ($alpha    ? $alpha    : 100)));
-
-		if ($alpha <= 0) {
-			// invisible shadow, nothing to do
-			return true;
-		}
-		if ($distance <= 0) {
-			// shadow completely obscured by source image, nothing to do
-			return true;
-		}
-
-		//$width_shadow  = cos(deg2rad($angle)) * ($distance + $width);
-		//$height_shadow = sin(deg2rad($angle)) * ($distance + $width);
-		//$scaling = min(imagesx($gdimg) / (imagesx($gdimg) + abs($width_shadow)), imagesy($gdimg) / (imagesy($gdimg) + abs($height_shadow)));
-
-		$Offset = array();
-		for ($i = 0; $i < $width; $i++) {
-			$WidthAlpha[$i] = (abs(($width / 2) - $i) / $width);
-			$Offset['x'] = cos(deg2rad($angle)) * ($distance + $i);
-			$Offset['y'] = sin(deg2rad($angle)) * ($distance + $i);
-		}
-
-		$tempImageWidth  = imagesx($gdimg)  + abs($Offset['x']);
-		$tempImageHeight = imagesy($gdimg) + abs($Offset['y']);
-
-		if ($gdimg_dropshadow_temp = phpthumb_functions::ImageCreateFunction($tempImageWidth, $tempImageHeight)) {
-
-			imagealphablending($gdimg_dropshadow_temp, false);
-			imagesavealpha($gdimg_dropshadow_temp, true);
-			$transparent1 = phpthumb_functions::ImageColorAllocateAlphaSafe($gdimg_dropshadow_temp, 0, 0, 0, 127);
-			imagefill($gdimg_dropshadow_temp, 0, 0, $transparent1);
-
-			$PixelMap = array();
-			for ($x = 0, $xMax = imagesx($gdimg); $x < $xMax; $x++) {
-				for ($y = 0, $yMax = imagesy($gdimg); $y < $yMax; $y++) {
-					$PixelMap[$x][$y] = phpthumb_functions::GetPixelColor($gdimg, $x, $y);
-				}
-			}
-			for ($x = 0; $x < $tempImageWidth; $x++) {
-				for ($y = 0; $y < $tempImageHeight; $y++) {
-					//for ($i = 0; $i < $width; $i++) {
-					for ($i = 0; $i < 1; $i++) {
-						if (!isset($PixelMap[$x][$y]['alpha']) || ($PixelMap[$x][$y]['alpha'] > 0)) {
-							if (isset($PixelMap[$x + $Offset['x']][$y + $Offset['y']]['alpha']) && ($PixelMap[$x + $Offset['x']][$y + $Offset['y']]['alpha'] < 127)) {
-								$thisColor = phpthumb_functions::ImageHexColorAllocate($gdimg, $hexcolor, false, $PixelMap[$x + $Offset['x']][$y + $Offset['y']]['alpha']);
-								imagesetpixel($gdimg_dropshadow_temp, $x, $y, $thisColor);
-							}
-						}
-					}
-				}
-			}
-
-			imagealphablending($gdimg_dropshadow_temp, true);
-			for ($x = 0, $xMax = imagesx($gdimg); $x < $xMax; $x++) {
-				for ($y = 0, $yMax = imagesy($gdimg); $y < $yMax; $y++) {
-					if ($PixelMap[$x][$y]['alpha'] < 127) {
-						$thisColor = phpthumb_functions::ImageColorAllocateAlphaSafe($gdimg_dropshadow_temp, $PixelMap[$x][$y]['red'], $PixelMap[$x][$y]['green'], $PixelMap[$x][$y]['blue'], $PixelMap[$x][$y]['alpha']);
-						imagesetpixel($gdimg_dropshadow_temp, $x, $y, $thisColor);
-					}
-				}
-			}
-
-			imagesavealpha($gdimg, true);
-			imagealphablending($gdimg, false);
-			//$this->is_alpha = true;
-			$transparent2 = phpthumb_functions::ImageColorAllocateAlphaSafe($gdimg, 0, 0, 0, 127);
-			imagefilledrectangle($gdimg, 0, 0, imagesx($gdimg), imagesy($gdimg), $transparent2);
-			imagecopyresampled($gdimg, $gdimg_dropshadow_temp, 0, 0, 0, 0, imagesx($gdimg), imagesy($gdimg), imagesx($gdimg_dropshadow_temp), imagesy($gdimg_dropshadow_temp));
-
-			imagedestroy($gdimg_dropshadow_temp);
-		}
-		return true;
-	}
-
-
-	public function EdgeDetect(&$gdimg) {
-		if (phpthumb_functions::version_compare_replacement(PHP_VERSION, '5.0.0', '>=') && phpthumb_functions::gd_is_bundled()) {
-			if (imagefilter($gdimg, IMG_FILTER_EDGEDETECT)) {
-				return true;
-			}
-			$this->DebugMessage('FAILED: imagefilter($gdimg, IMG_FILTER_EDGEDETECT)', __FILE__, __LINE__);
-			// fall through and try it the hard way
-		}
-		// currently not implemented "the hard way"
-		$this->DebugMessage('FAILED: phpthumb_filters::EdgeDetect($gdimg) [function not implemented]', __FILE__, __LINE__);
-		return false;
-	}
-
-
-	public function Ellipse($gdimg) {
-		if (phpthumb_functions::gd_version() < 2) {
-			return false;
-		}
-		// generate mask at twice desired resolution and downsample afterwards for easy antialiasing
-		if ($gdimg_ellipsemask_double = phpthumb_functions::ImageCreateFunction(imagesx($gdimg) * 2, imagesy($gdimg) * 2)) {
-			if ($gdimg_ellipsemask = phpthumb_functions::ImageCreateFunction(imagesx($gdimg), imagesy($gdimg))) {
-
-				$color_transparent = imagecolorallocate($gdimg_ellipsemask_double, 255, 255, 255);
-				imagefilledellipse($gdimg_ellipsemask_double, imagesx($gdimg), imagesy($gdimg), (imagesx($gdimg) - 1) * 2, (imagesy($gdimg) - 1) * 2, $color_transparent);
-				imagecopyresampled($gdimg_ellipsemask, $gdimg_ellipsemask_double, 0, 0, 0, 0, imagesx($gdimg), imagesy($gdimg), imagesx($gdimg) * 2, imagesy($gdimg) * 2);
-
-				self::ApplyMask($gdimg_ellipsemask, $gdimg);
-				imagedestroy($gdimg_ellipsemask);
-				return true;
-
-			} else {
-				$this->DebugMessage('$gdimg_ellipsemask = phpthumb_functions::ImageCreateFunction() failed', __FILE__, __LINE__);
-			}
-			imagedestroy($gdimg_ellipsemask_double);
-		} else {
-			$this->DebugMessage('$gdimg_ellipsemask_double = phpthumb_functions::ImageCreateFunction() failed', __FILE__, __LINE__);
-		}
-		return false;
-	}
-
-
-	public function Emboss(&$gdimg) {
-		if (phpthumb_functions::version_compare_replacement(PHP_VERSION, '5.0.0', '>=') && phpthumb_functions::gd_is_bundled()) {
-			if (imagefilter($gdimg, IMG_FILTER_EMBOSS)) {
-				return true;
-			}
-			$this->DebugMessage('FAILED: imagefilter($gdimg, IMG_FILTER_EMBOSS)', __FILE__, __LINE__);
-			// fall through and try it the hard way
-		}
-		// currently not implemented "the hard way"
-		$this->DebugMessage('FAILED: phpthumb_filters::Emboss($gdimg) [function not implemented]', __FILE__, __LINE__);
-		return false;
-	}
-
-
-	public function Flip(&$gdimg, $x=false, $y=false) {
-		if (!$x && !$y) {
-			return false;
-		}
-		if ($tempImage = phpthumb_functions::ImageCreateFunction(imagesx($gdimg), imagesy($gdimg))) {
-			if ($x) {
-				imagecopy($tempImage, $gdimg, 0, 0, 0, 0, imagesx($gdimg), imagesy($gdimg));
-				for ($x = 0, $xMax = imagesx($gdimg); $x < $xMax; $x++) {
-					imagecopy($gdimg, $tempImage, imagesx($gdimg) - 1 - $x, 0, $x, 0, 1, imagesy($gdimg));
-				}
-			}
-			if ($y) {
-				imagecopy($tempImage, $gdimg, 0, 0, 0, 0, imagesx($gdimg), imagesy($gdimg));
-				for ($y = 0, $yMax = imagesy($gdimg); $y < $yMax; $y++) {
-					imagecopy($gdimg, $tempImage, 0, imagesy($gdimg) - 1 - $y, 0, $y, imagesx($gdimg), 1);
-				}
-			}
-			imagedestroy($tempImage);
-		}
-		return true;
-	}
-
-
-	public function Frame(&$gdimg, $frame_width, $edge_width, $hexcolor_frame, $hexcolor1, $hexcolor2) {
-		$frame_width    = ($frame_width    ? $frame_width    : 5);
-		$edge_width     = ($edge_width     ? $edge_width     : 1);
-		$hexcolor_frame = ($hexcolor_frame ? $hexcolor_frame : 'CCCCCC');
-		$hexcolor1      = ($hexcolor1      ? $hexcolor1      : 'FFFFFF');
-		$hexcolor2      = ($hexcolor2      ? $hexcolor2      : '000000');
-
-		$color_frame = phpthumb_functions::ImageHexColorAllocate($gdimg, $hexcolor_frame);
-		$color1      = phpthumb_functions::ImageHexColorAllocate($gdimg, $hexcolor1);
-		$color2      = phpthumb_functions::ImageHexColorAllocate($gdimg, $hexcolor2);
-		for ($i = 0; $i < $edge_width; $i++) {
-			// outer bevel
-			imageline($gdimg,                   $i,                   $i,                   $i, imagesy($gdimg) - $i, $color1); // left
-			imageline($gdimg,                   $i,                   $i, imagesx($gdimg) - $i,                   $i, $color1); // top
-			imageline($gdimg, imagesx($gdimg) - $i, imagesy($gdimg) - $i, imagesx($gdimg) - $i,                   $i, $color2); // right
-			imageline($gdimg, imagesx($gdimg) - $i, imagesy($gdimg) - $i,                   $i, imagesy($gdimg) - $i, $color2); // bottom
-		}
-		for ($i = 0; $i < $frame_width; $i++) {
-			// actual frame
-			imagerectangle($gdimg, $edge_width + $i, $edge_width + $i, imagesx($gdimg) - $edge_width - $i, imagesy($gdimg) - $edge_width - $i, $color_frame);
-		}
-		for ($i = 0; $i < $edge_width; $i++) {
-			// inner bevel
-			imageline($gdimg,                   $frame_width + $edge_width + $i,                   $frame_width + $edge_width + $i,                   $frame_width + $edge_width + $i, imagesy($gdimg) - $frame_width - $edge_width - $i, $color2); // left
-			imageline($gdimg,                   $frame_width + $edge_width + $i,                   $frame_width + $edge_width + $i, imagesx($gdimg) - $frame_width - $edge_width - $i,                   $frame_width + $edge_width + $i, $color2); // top
-			imageline($gdimg, imagesx($gdimg) - $frame_width - $edge_width - $i, imagesy($gdimg) - $frame_width - $edge_width - $i, imagesx($gdimg) - $frame_width - $edge_width - $i,                   $frame_width + $edge_width + $i, $color1); // right
-			imageline($gdimg, imagesx($gdimg) - $frame_width - $edge_width - $i, imagesy($gdimg) - $frame_width - $edge_width - $i,                   $frame_width + $edge_width + $i, imagesy($gdimg) - $frame_width - $edge_width - $i, $color1); // bottom
-		}
-		return true;
-	}
-
-
-	public function Gamma(&$gdimg, $amount) {
-		if (number_format($amount, 4) == '1.0000') {
-			return true;
-		}
-		return imagegammacorrect($gdimg, 1.0, $amount);
-	}
-
-
-	public function Grayscale(&$gdimg) {
-		if (phpthumb_functions::version_compare_replacement(PHP_VERSION, '5.0.0', '>=') && phpthumb_functions::gd_is_bundled()) {
-			if (imagefilter($gdimg, IMG_FILTER_GRAYSCALE)) {
-				return true;
-			}
-			$this->DebugMessage('FAILED: imagefilter($gdimg, IMG_FILTER_GRAYSCALE)', __FILE__, __LINE__);
-			// fall through and try it the hard way
-		}
-		return self::Colorize($gdimg, 100, 'gray');
-	}
-
-
-	public function HistogramAnalysis(&$gdimg, $calculateGray=false) {
-		$ImageSX = imagesx($gdimg);
-		$ImageSY = imagesy($gdimg);
-		$Analysis = array();
-		for ($x = 0; $x < $ImageSX; $x++) {
-			for ($y = 0; $y < $ImageSY; $y++) {
-				$OriginalPixel = phpthumb_functions::GetPixelColor($gdimg, $x, $y);
-				@$Analysis['red'][$OriginalPixel['red']]++;
-				@$Analysis['green'][$OriginalPixel['green']]++;
-				@$Analysis['blue'][$OriginalPixel['blue']]++;
-				@$Analysis['alpha'][$OriginalPixel['alpha']]++;
-				if ($calculateGray) {
-					$GrayPixel = phpthumb_functions::GrayscalePixel($OriginalPixel);
-					@$Analysis['gray'][$GrayPixel['red']]++;
-				}
-			}
-		}
-		$keys = array('red', 'green', 'blue', 'alpha');
-		if ($calculateGray) {
-			$keys[] = 'gray';
-		}
-		foreach ($keys as $dummy => $key) {
-			ksort($Analysis[$key]);
-		}
-		return $Analysis;
-	}
-
-
-	public function HistogramStretch(&$gdimg, $band='*', $method=0, $threshold=0.1) {
-		// equivalent of "Auto Contrast" in Adobe Photoshop
-		// method 0 stretches according to RGB colors. Gives a more conservative stretch.
-		// method 1 band stretches according to grayscale which is color-biased (59% green, 30% red, 11% blue). May give a punchier / more aggressive stretch, possibly appearing over-saturated
-		$Analysis = self::HistogramAnalysis($gdimg, true);
-		$keys = array('r'=>'red', 'g'=>'green', 'b'=>'blue', 'a'=>'alpha', '*'=>(($method == 0) ? 'all' : 'gray'));
-		$band = $band[ 0 ];
-		if (!isset($keys[$band])) {
-			return false;
-		}
-		$key = $keys[$band];
-
-		// If the absolute brightest and darkest pixels are used then one random
-		// pixel in the image could throw off the whole system. Instead, count up/down
-		// from the limit and allow <threshold> (default = 0.1%) of brightest/darkest
-		// pixels to be clipped to min/max
-		$threshold = (float) $threshold / 100;
-		$clip_threshold = imagesx($gdimg) * imagesx($gdimg) * $threshold;
-
-		$countsum  = 0;
-		$range_min = 0;
-		for ($i = 0; $i <= 255; $i++) {
-			if ($method == 0) {
-				$countsum = max(@$Analysis['red'][$i], @$Analysis['green'][$i], @$Analysis['blue'][$i]);
-			} else {
-				$countsum += @$Analysis[$key][$i];
-			}
-			if ($countsum >= $clip_threshold) {
-				$range_min = $i - 1;
-				break;
-			}
-		}
-		$range_min = max($range_min, 0);
-
-		$countsum  =   0;
-		$range_max = 255;
-		for ($i = 255; $i >= 0; $i--) {
-			if ($method == 0) {
-				$countsum = max(@$Analysis['red'][$i], @$Analysis['green'][$i], @$Analysis['blue'][$i]);
-			} else {
-				$countsum += @$Analysis[$key][$i];
-			}
-			if ($countsum >= $clip_threshold) {
-				$range_max = $i + 1;
-				break;
-			}
-		}
-		$range_max = min($range_max, 255);
-
-		$range_scale = (($range_max == $range_min) ? 1 : (255 / ($range_max - $range_min)));
-		if (($range_min == 0) && ($range_max == 255)) {
-			// no adjustment necessary - don't waste CPU time!
-			return true;
-		}
-
-		$ImageSX = imagesx($gdimg);
-		$ImageSY = imagesy($gdimg);
-		for ($x = 0; $x < $ImageSX; $x++) {
-			for ($y = 0; $y < $ImageSY; $y++) {
-				$OriginalPixel = phpthumb_functions::GetPixelColor($gdimg, $x, $y);
-				if ($band == '*') {
-					$new['red']   = min(255, max(0, ($OriginalPixel['red']   - $range_min) * $range_scale));
-					$new['green'] = min(255, max(0, ($OriginalPixel['green'] - $range_min) * $range_scale));
-					$new['blue']  = min(255, max(0, ($OriginalPixel['blue']  - $range_min) * $range_scale));
-					$new['alpha'] = min(255, max(0, ($OriginalPixel['alpha'] - $range_min) * $range_scale));
-				} else {
-					$new = $OriginalPixel;
-					$new[$key] = min(255, max(0, ($OriginalPixel[$key] - $range_min) * $range_scale));
-				}
-				$newColor = phpthumb_functions::ImageColorAllocateAlphaSafe($gdimg, $new['red'], $new['green'], $new['blue'], $new['alpha']);
-				imagesetpixel($gdimg, $x, $y, $newColor);
-			}
-		}
-
-		return true;
-	}
-
-
-	public function HistogramOverlay(&$gdimg, $bands='*', $colors='', $width=0.25, $height=0.25, $alignment='BR', $opacity=50, $margin_x=5, $margin_y=null) {
-		$margin_y = (null === $margin_y ? $margin_x : $margin_y);
-
-		$Analysis = self::HistogramAnalysis($gdimg, true);
-		$histW = round(($width > 1) ? min($width, imagesx($gdimg)) : imagesx($gdimg) * $width);
-		$histH = round(($width > 1) ? min($width, imagesx($gdimg)) : imagesx($gdimg) * $width);
-		if ($gdHist = imagecreatetruecolor($histW, $histH)) {
-			$color_back = phpthumb_functions::ImageColorAllocateAlphaSafe($gdHist, 0, 0, 0, 127);
-			imagefilledrectangle($gdHist, 0, 0, $histW, $histH, $color_back);
-			imagealphablending($gdHist, false);
-			imagesavealpha($gdHist, true);
-
-			$HistogramTempWidth  = 256;
-			$HistogramTempHeight = 100;
-			if ($gdHistTemp = imagecreatetruecolor($HistogramTempWidth, $HistogramTempHeight)) {
-				$color_back_temp = phpthumb_functions::ImageColorAllocateAlphaSafe($gdHistTemp, 255, 0, 255, 127);
-				imagealphablending($gdHistTemp, false);
-				imagesavealpha($gdHistTemp, true);
-				imagefilledrectangle($gdHistTemp, 0, 0, imagesx($gdHistTemp), imagesy($gdHistTemp), $color_back_temp);
-
-				$DefaultColors = array('r'=>'FF0000', 'g'=>'00FF00', 'b'=>'0000FF', 'a'=>'999999', '*'=>'FFFFFF');
-				$Colors = explode(';', $colors);
-				$BandsToGraph = array_unique(preg_split('##', $bands));
-				$keys = array('r'=>'red', 'g'=>'green', 'b'=>'blue', 'a'=>'alpha', '*'=>'gray');
-				foreach ($BandsToGraph as $key => $band) {
-					if (!isset($keys[$band])) {
-						continue;
-					}
-					$PeakValue = max($Analysis[$keys[$band]]);
-					$thisColor = phpthumb_functions::ImageHexColorAllocate($gdHistTemp, phpthumb_functions::IsHexColor(@$Colors[$key]) ? $Colors[$key] : $DefaultColors[$band]);
-					for ($x = 0; $x < $HistogramTempWidth; $x++) {
-						imageline($gdHistTemp, $x, $HistogramTempHeight - 1, $x, $HistogramTempHeight - 1 - round(@$Analysis[$keys[$band]][$x] / $PeakValue * $HistogramTempHeight), $thisColor);
-					}
-					imageline($gdHistTemp, 0, $HistogramTempHeight - 1, $HistogramTempWidth - 1, $HistogramTempHeight - 1, $thisColor);
-					imageline($gdHistTemp, 0, $HistogramTempHeight - 2, $HistogramTempWidth - 1, $HistogramTempHeight - 2, $thisColor);
-				}
-				imagecopyresampled($gdHist, $gdHistTemp, 0, 0, 0, 0, imagesx($gdHist), imagesy($gdHist), imagesx($gdHistTemp), imagesy($gdHistTemp));
-				imagedestroy($gdHistTemp);
-			} else {
-				return false;
-			}
-
-			self::WatermarkOverlay($gdimg, $gdHist, $alignment, $opacity, $margin_x, $margin_y);
-			imagedestroy($gdHist);
-			return true;
-		}
-		return false;
-	}
-
-
-	public function ImageBorder(&$gdimg, $border_width, $radius_x, $radius_y, $hexcolor_border) {
-		$border_width = ($border_width ? $border_width : 1);
-		$radius_x     = ($radius_x     ? $radius_x     : 0);
-		$radius_y     = ($radius_y     ? $radius_y     : 0);
-
-		$output_width  = imagesx($gdimg);
-		$output_height = imagesy($gdimg);
-
-		list($new_width, $new_height) = phpthumb_functions::ProportionalResize($output_width, $output_height, $output_width - max($border_width * 2, $radius_x), $output_height - max($border_width * 2, $radius_y));
-		$offset_x = ($radius_x ? $output_width  - $new_width  - $radius_x : 0);
-
-		if ($gd_border_canvas = phpthumb_functions::ImageCreateFunction($output_width, $output_height)) {
-
-			imagesavealpha($gd_border_canvas, true);
-			imagealphablending($gd_border_canvas, false);
-			$color_background = phpthumb_functions::ImageColorAllocateAlphaSafe($gd_border_canvas, 255, 255, 255, 127);
-			imagefilledrectangle($gd_border_canvas, 0, 0, $output_width, $output_height, $color_background);
-
-			$color_border = phpthumb_functions::ImageHexColorAllocate($gd_border_canvas, (phpthumb_functions::IsHexColor($hexcolor_border) ? $hexcolor_border : '000000'));
-
-			for ($i = 0; $i < $border_width; $i++) {
-				imageline($gd_border_canvas,             floor($offset_x / 2) + $radius_x,                      $i, $output_width - $radius_x - ceil($offset_x / 2),                         $i, $color_border); // top
-				imageline($gd_border_canvas,             floor($offset_x / 2) + $radius_x, $output_height - 1 - $i, $output_width - $radius_x - ceil($offset_x / 2),    $output_height - 1 - $i, $color_border); // bottom
-				imageline($gd_border_canvas,                    floor($offset_x / 2) + $i,               $radius_y,                      floor($offset_x / 2) +  $i, $output_height - $radius_y, $color_border); // left
-				imageline($gd_border_canvas, $output_width - 1 - $i - ceil($offset_x / 2),               $radius_y,    $output_width - 1 - $i - ceil($offset_x / 2), $output_height - $radius_y, $color_border); // right
-			}
-
-			if ($radius_x && $radius_y) {
-
-				// PHP bug: imagearc() with thicknesses > 1 give bad/undesirable/unpredicatable results
-				// Solution: Draw multiple 1px arcs side-by-side.
-
-				// Problem: parallel arcs give strange/ugly antialiasing problems
-				// Solution: draw non-parallel arcs, from one side of the line thickness at the start angle
-				//   to the opposite edge of the line thickness at the terminating angle
-				for ($thickness_offset = 0; $thickness_offset < $border_width; $thickness_offset++) {
-					imagearc($gd_border_canvas, floor($offset_x / 2) + 1 +                 $radius_x,              $thickness_offset - 1 + $radius_y, $radius_x * 2, $radius_y * 2, 180, 270, $color_border); // top-left
-					imagearc($gd_border_canvas,                     $output_width - $radius_x - 1 - ceil($offset_x / 2),              $thickness_offset - 1 + $radius_y, $radius_x * 2, $radius_y * 2, 270, 360, $color_border); // top-right
-					imagearc($gd_border_canvas,                     $output_width - $radius_x - 1 - ceil($offset_x / 2), $output_height - $thickness_offset - $radius_y, $radius_x * 2, $radius_y * 2,   0,  90, $color_border); // bottom-right
-					imagearc($gd_border_canvas, floor($offset_x / 2) + 1 +                 $radius_x, $output_height - $thickness_offset - $radius_y, $radius_x * 2, $radius_y * 2,  90, 180, $color_border); // bottom-left
-				}
-				if ($border_width > 1) {
-					for ($thickness_offset = 0; $thickness_offset < $border_width; $thickness_offset++) {
-						imagearc($gd_border_canvas, floor($offset_x / 2) + $thickness_offset + $radius_x,                                      $radius_y, $radius_x * 2, $radius_y * 2, 180, 270, $color_border); // top-left
-						imagearc($gd_border_canvas, $output_width - $thickness_offset - $radius_x - 1 - ceil($offset_x / 2),                                      $radius_y, $radius_x * 2, $radius_y * 2, 270, 360, $color_border); // top-right
-						imagearc($gd_border_canvas, $output_width - $thickness_offset - $radius_x - 1 - ceil($offset_x / 2),                     $output_height - $radius_y, $radius_x * 2, $radius_y * 2,   0,  90, $color_border); // bottom-right
-						imagearc($gd_border_canvas, floor($offset_x / 2) + $thickness_offset + $radius_x,                     $output_height - $radius_y, $radius_x * 2, $radius_y * 2,  90, 180, $color_border); // bottom-left
-					}
-				}
-
-			}
-			$this->phpThumbObject->ImageResizeFunction($gd_border_canvas, $gdimg, floor(($output_width - $new_width) / 2), round(($output_height - $new_height) / 2), 0, 0, $new_width, $new_height, $output_width, $output_height);
-
-			imagedestroy($gdimg);
-			$gdimg = phpthumb_functions::ImageCreateFunction($output_width, $output_height);
-			imagesavealpha($gdimg, true);
-			imagealphablending($gdimg, false);
-			$gdimg_color_background = phpthumb_functions::ImageColorAllocateAlphaSafe($gdimg, 255, 255, 255, 127);
-			imagefilledrectangle($gdimg, 0, 0, $output_width, $output_height, $gdimg_color_background);
-
-			imagecopy($gdimg, $gd_border_canvas, 0, 0, 0, 0, $output_width, $output_height);
-			imagedestroy($gd_border_canvas);
-			return true;
-
-
-		} else {
-			$this->DebugMessage('FAILED: $gd_border_canvas = phpthumb_functions::ImageCreateFunction('.$output_width.', '.$output_height.')', __FILE__, __LINE__);
-		}
-		return false;
-	}
-
-
-	public static function ImprovedImageRotate(&$gdimg_source, $rotate_angle=0, $config_background_hexcolor='FFFFFF', $bg=null, &$phpThumbObject) {
-		while ($rotate_angle < 0) {
-			$rotate_angle += 360;
-		}
-		$rotate_angle %= 360;
-		if ($rotate_angle != 0) {
-
-			$background_color = phpthumb_functions::ImageHexColorAllocate($gdimg_source, $config_background_hexcolor);
-
-			if ((phpthumb_functions::gd_version() >= 2) && !$bg && ($rotate_angle % 90)) {
-
-				//$this->DebugMessage('Using alpha rotate', __FILE__, __LINE__);
-				if ($gdimg_rotate_mask = phpthumb_functions::ImageCreateFunction(imagesx($gdimg_source), imagesy($gdimg_source))) {
-
-					$color_mask = array();
-					for ($i = 0; $i <= 255; $i++) {
-						$color_mask[$i] = imagecolorallocate($gdimg_rotate_mask, $i, $i, $i);
-					}
-					imagefilledrectangle($gdimg_rotate_mask, 0, 0, imagesx($gdimg_rotate_mask), imagesy($gdimg_rotate_mask), $color_mask[255]);
-					$imageX = imagesx($gdimg_source);
-					$imageY = imagesy($gdimg_source);
-					for ($x = 0; $x < $imageX; $x++) {
-						for ($y = 0; $y < $imageY; $y++) {
-							$pixelcolor = phpthumb_functions::GetPixelColor($gdimg_source, $x, $y);
-							imagesetpixel($gdimg_rotate_mask, $x, $y, $color_mask[255 - round($pixelcolor['alpha'] * 255 / 127)]);
-						}
-					}
-					$gdimg_rotate_mask = imagerotate($gdimg_rotate_mask, $rotate_angle, $color_mask[0]);
-					$gdimg_source      = imagerotate($gdimg_source,      $rotate_angle, $background_color);
-
-					imagealphablending($gdimg_source, false);
-					imagesavealpha($gdimg_source, true);
-					//$this->is_alpha = true;
-					$phpThumbFilters = new self();
-					//$phpThumbFilters->phpThumbObject = $this;
-					$phpThumbFilters->phpThumbObject = $phpThumbObject;
-					$phpThumbFilters->ApplyMask($gdimg_rotate_mask, $gdimg_source);
-
-					imagedestroy($gdimg_rotate_mask);
-
-				} else {
-					//$this->DebugMessage('ImageCreateFunction() failed', __FILE__, __LINE__);
-				}
-
-			} else {
-
-				if (phpthumb_functions::gd_version() < 2) {
-					//$this->DebugMessage('Using non-alpha rotate because gd_version is "'.phpthumb_functions::gd_version().'"', __FILE__, __LINE__);
-				} elseif ($bg) {
-					//$this->DebugMessage('Using non-alpha rotate because $this->bg is "'.$bg.'"', __FILE__, __LINE__);
-				} elseif ($rotate_angle % 90) {
-					//$this->DebugMessage('Using non-alpha rotate because ($rotate_angle % 90) = "'.($rotate_angle % 90).'"', __FILE__, __LINE__);
-				} else {
-					//$this->DebugMessage('Using non-alpha rotate because $this->thumbnailFormat is "'.$this->thumbnailFormat.'"', __FILE__, __LINE__);
-				}
-
-				if (imagecolortransparent($gdimg_source) >= 0) {
-					// imagerotate() forgets all about an image's transparency and sets the transparent color to black
-					// To compensate, flood-fill the transparent color of the source image with the specified background color first
-					// then rotate and the colors should match
-
-					if (!function_exists('imageistruecolor') || !imageistruecolor($gdimg_source)) {
-						// convert paletted image to true-color before rotating to prevent nasty aliasing artifacts
-
-						//$this->source_width  = imagesx($gdimg_source);
-						//$this->source_height = imagesy($gdimg_source);
-						$gdimg_newsrc = phpthumb_functions::ImageCreateFunction(imagesx($gdimg_source), imagesy($gdimg_source));
-						$background_color = phpthumb_functions::ImageHexColorAllocate($gdimg_newsrc, $config_background_hexcolor);
-						imagefilledrectangle($gdimg_newsrc, 0, 0, imagesx($gdimg_source), imagesy($gdimg_source), phpthumb_functions::ImageHexColorAllocate($gdimg_newsrc, $config_background_hexcolor));
-						imagecopy($gdimg_newsrc, $gdimg_source, 0, 0, 0, 0, imagesx($gdimg_source), imagesy($gdimg_source));
-						imagedestroy($gdimg_source);
-						unset($gdimg_source);
-						$gdimg_source = $gdimg_newsrc;
-						unset($gdimg_newsrc);
-
-					} else {
-
-						imagecolorset(
-							$gdimg_source,
-							imagecolortransparent($gdimg_source),
-							hexdec(substr($config_background_hexcolor, 0, 2)),
-							hexdec(substr($config_background_hexcolor, 2, 2)),
-							hexdec(substr($config_background_hexcolor, 4, 2)));
-
-						imagecolortransparent($gdimg_source, -1);
-
-					}
-				}
-
-				$gdimg_source = imagerotate($gdimg_source, $rotate_angle, $background_color);
-
-			}
-		}
-		return true;
-	}
-
-
-	public function MeanRemoval(&$gdimg) {
-		if (phpthumb_functions::version_compare_replacement(PHP_VERSION, '5.0.0', '>=') && phpthumb_functions::gd_is_bundled()) {
-			if (imagefilter($gdimg, IMG_FILTER_MEAN_REMOVAL)) {
-				return true;
-			}
-			$this->DebugMessage('FAILED: imagefilter($gdimg, IMG_FILTER_MEAN_REMOVAL)', __FILE__, __LINE__);
-			// fall through and try it the hard way
-		}
-		// currently not implemented "the hard way"
-		$this->DebugMessage('FAILED: phpthumb_filters::MeanRemoval($gdimg) [function not implemented]', __FILE__, __LINE__);
-		return false;
-	}
-
-
-	public function Negative(&$gdimg) {
-		if (phpthumb_functions::version_compare_replacement(PHP_VERSION, '5.0.0', '>=') && phpthumb_functions::gd_is_bundled()) {
-			if (imagefilter($gdimg, IMG_FILTER_NEGATE)) {
-				return true;
-			}
-			$this->DebugMessage('FAILED: imagefilter($gdimg, IMG_FILTER_NEGATE)', __FILE__, __LINE__);
-			// fall through and try it the hard way
-		}
-		$ImageSX = imagesx($gdimg);
-		$ImageSY = imagesy($gdimg);
-		for ($x = 0; $x < $ImageSX; $x++) {
-			for ($y = 0; $y < $ImageSY; $y++) {
-				$currentPixel = phpthumb_functions::GetPixelColor($gdimg, $x, $y);
-				$newColor = phpthumb_functions::ImageColorAllocateAlphaSafe($gdimg, (~$currentPixel['red'] & 0xFF), (~$currentPixel['green'] & 0xFF), (~$currentPixel['blue'] & 0xFF), $currentPixel['alpha']);
-				imagesetpixel($gdimg, $x, $y, $newColor);
-			}
-		}
-		return true;
-	}
-
-
-	public function RoundedImageCorners(&$gdimg, $radius_x, $radius_y) {
-		// generate mask at twice desired resolution and downsample afterwards for easy antialiasing
-		// mask is generated as a white double-size ellipse on a triple-size black background and copy-paste-resampled
-		// onto a correct-size mask image as 4 corners due to errors when the entire mask is resampled at once (gray edges)
-		if ($gdimg_cornermask_triple = phpthumb_functions::ImageCreateFunction($radius_x * 6, $radius_y * 6)) {
-			if ($gdimg_cornermask = phpthumb_functions::ImageCreateFunction(imagesx($gdimg), imagesy($gdimg))) {
-
-				$color_transparent = imagecolorallocate($gdimg_cornermask_triple, 255, 255, 255);
-				imagefilledellipse($gdimg_cornermask_triple, $radius_x * 3, $radius_y * 3, $radius_x * 4, $radius_y * 4, $color_transparent);
-
-				imagefilledrectangle($gdimg_cornermask, 0, 0, imagesx($gdimg), imagesy($gdimg), $color_transparent);
-
-				imagecopyresampled($gdimg_cornermask, $gdimg_cornermask_triple,                           0,                           0,     $radius_x,     $radius_y, $radius_x, $radius_y, $radius_x * 2, $radius_y * 2);
-				imagecopyresampled($gdimg_cornermask, $gdimg_cornermask_triple,                           0, imagesy($gdimg) - $radius_y,     $radius_x, $radius_y * 3, $radius_x, $radius_y, $radius_x * 2, $radius_y * 2);
-				imagecopyresampled($gdimg_cornermask, $gdimg_cornermask_triple, imagesx($gdimg) - $radius_x, imagesy($gdimg) - $radius_y, $radius_x * 3, $radius_y * 3, $radius_x, $radius_y, $radius_x * 2, $radius_y * 2);
-				imagecopyresampled($gdimg_cornermask, $gdimg_cornermask_triple, imagesx($gdimg) - $radius_x,                           0, $radius_x * 3,     $radius_y, $radius_x, $radius_y, $radius_x * 2, $radius_y * 2);
-
-				self::ApplyMask($gdimg_cornermask, $gdimg);
-				imagedestroy($gdimg_cornermask);
-				$this->DebugMessage('RoundedImageCorners('.$radius_x.', '.$radius_y.') succeeded', __FILE__, __LINE__);
-				return true;
-
-			} else {
-				$this->DebugMessage('FAILED: $gdimg_cornermask = phpthumb_functions::ImageCreateFunction('.imagesx($gdimg).', '.imagesy($gdimg).')', __FILE__, __LINE__);
-			}
-			imagedestroy($gdimg_cornermask_triple);
-
-		} else {
-			$this->DebugMessage('FAILED: $gdimg_cornermask_triple = phpthumb_functions::ImageCreateFunction('.($radius_x * 6).', '.($radius_y * 6).')', __FILE__, __LINE__);
-		}
-		return false;
-	}
-
-
-	public function Saturation(&$gdimg, $amount, $color='') {
-		if ($amount == 0) {
-			return true;
-		} elseif ($amount > 0) {
-			$amount = 0 - $amount;
-		} else {
-			$amount = abs($amount);
-		}
-		return self::Desaturate($gdimg, $amount, $color);
-	}
-
-
-	public function Sepia(&$gdimg, $amount, $targetColor) {
-		$amount      = (is_numeric($amount) ? max(0, min(100, $amount)) : 50);
-		$amountPct   = $amount / 100;
-		$targetColor = (phpthumb_functions::IsHexColor($targetColor) ? $targetColor : 'A28065');
-
-		if ($amount == 0) {
-			return true;
-		}
-
-		if (phpthumb_functions::version_compare_replacement(PHP_VERSION, '5.0.0', '>=') && phpthumb_functions::gd_is_bundled()) {
-			if (imagefilter($gdimg, IMG_FILTER_GRAYSCALE)) {
-
-				$r = round($amountPct * hexdec(substr($targetColor, 0, 2)));
-				$g = round($amountPct * hexdec(substr($targetColor, 2, 2)));
-				$b = round($amountPct * hexdec(substr($targetColor, 4, 2)));
-				if (imagefilter($gdimg, IMG_FILTER_COLORIZE, $r, $g, $b)) {
-					return true;
-				}
-				$this->DebugMessage('FAILED: imagefilter($gdimg, IMG_FILTER_COLORIZE)', __FILE__, __LINE__);
-				// fall through and try it the hard way
-
-			} else {
-
-				$this->DebugMessage('FAILED: imagefilter($gdimg, IMG_FILTER_GRAYSCALE)', __FILE__, __LINE__);
-				// fall through and try it the hard way
-
-			}
-		}
-
-		$TargetPixel['red']   = hexdec(substr($targetColor, 0, 2));
-		$TargetPixel['green'] = hexdec(substr($targetColor, 2, 2));
-		$TargetPixel['blue']  = hexdec(substr($targetColor, 4, 2));
-
-		$ImageSX = imagesx($gdimg);
-		$ImageSY = imagesy($gdimg);
-		for ($x = 0; $x < $ImageSX; $x++) {
-			for ($y = 0; $y < $ImageSY; $y++) {
-				$OriginalPixel = phpthumb_functions::GetPixelColor($gdimg, $x, $y);
-				$GrayPixel = phpthumb_functions::GrayscalePixel($OriginalPixel);
-
-				// http://www.gimpguru.org/Tutorials/SepiaToning/
-				// "In the traditional sepia toning process, the tinting occurs most in
-				// the mid-tones: the lighter and darker areas appear to be closer to B&W."
-				$SepiaAmount = ((128 - abs($GrayPixel['red'] - 128)) / 128) * $amountPct;
-
-				$NewPixel = array();
-				foreach ($TargetPixel as $key => $value) {
-					$NewPixel[$key] = round(max(0, min(255, $GrayPixel[$key] * (1 - $SepiaAmount) + ($TargetPixel[$key] * $SepiaAmount))));
-				}
-				$newColor = phpthumb_functions::ImageColorAllocateAlphaSafe($gdimg, $NewPixel['red'], $NewPixel['green'], $NewPixel['blue'], $OriginalPixel['alpha']);
-				imagesetpixel($gdimg, $x, $y, $newColor);
-			}
-		}
-		return true;
-	}
-
-
-	public function Smooth(&$gdimg, $amount=6) {
-		$amount = min(25, max(0, $amount));
-		if ($amount == 0) {
-			return true;
-		}
-		if (phpthumb_functions::version_compare_replacement(PHP_VERSION, '5.0.0', '>=') && phpthumb_functions::gd_is_bundled()) {
-			if (imagefilter($gdimg, IMG_FILTER_SMOOTH, $amount)) {
-				return true;
-			}
-			$this->DebugMessage('FAILED: imagefilter($gdimg, IMG_FILTER_SMOOTH, '.$amount.')', __FILE__, __LINE__);
-			// fall through and try it the hard way
-		}
-		// currently not implemented "the hard way"
-		$this->DebugMessage('FAILED: phpthumb_filters::Smooth($gdimg, '.$amount.') [function not implemented]', __FILE__, __LINE__);
-		return false;
-	}
-
-
-	public function SourceTransparentColorMask(&$gdimg, $hexcolor, $min_limit=5, $max_limit=10) {
-		$width  = imagesx($gdimg);
-		$height = imagesy($gdimg);
-		if ($gdimg_mask = imagecreatetruecolor($width, $height)) {
-			$R = hexdec(substr($hexcolor, 0, 2));
-			$G = hexdec(substr($hexcolor, 2, 2));
-			$B = hexdec(substr($hexcolor, 4, 2));
-			$targetPixel = array('red'=>$R, 'green'=>$G, 'blue'=>$B);
-			$cutoffRange = $max_limit - $min_limit;
-			for ($x = 0; $x < $width; $x++) {
-				for ($y = 0; $y < $height; $y++) {
-					$currentPixel = phpthumb_functions::GetPixelColor($gdimg, $x, $y);
-					$colorDiff = phpthumb_functions::PixelColorDifferencePercent($currentPixel, $targetPixel);
-					$grayLevel = min($cutoffRange, max(0, -$min_limit + $colorDiff)) * (255 / max(1, $cutoffRange));
-					$newColor = imagecolorallocate($gdimg_mask, $grayLevel, $grayLevel, $grayLevel);
-					imagesetpixel($gdimg_mask, $x, $y, $newColor);
-				}
-			}
-			return $gdimg_mask;
-		}
-		return false;
-	}
-
-
-	public function Threshold(&$gdimg, $cutoff) {
-		$width  = imagesx($gdimg);
-		$height = imagesy($gdimg);
-		$cutoff = min(255, max(0, ($cutoff ? $cutoff : 128)));
-		for ($x = 0; $x < $width; $x++) {
-			for ($y = 0; $y < $height; $y++) {
-				$currentPixel = phpthumb_functions::GetPixelColor($gdimg, $x, $y);
-				$grayPixel = phpthumb_functions::GrayscalePixel($currentPixel);
-				if ($grayPixel['red'] < $cutoff) {
-					$newColor = phpthumb_functions::ImageColorAllocateAlphaSafe($gdimg, 0x00, 0x00, 0x00, $currentPixel['alpha']);
-				} else {
-					$newColor = phpthumb_functions::ImageColorAllocateAlphaSafe($gdimg, 0xFF, 0xFF, 0xFF, $currentPixel['alpha']);
-				}
-				imagesetpixel($gdimg, $x, $y, $newColor);
-			}
-		}
-		return true;
-	}
-
-
-	public function ImageTrueColorToPalette2(&$image, $dither, $ncolors) {
-		// http://www.php.net/manual/en/function.imagetruecolortopalette.php
-		// zmorris at zsculpt dot com (17-Aug-2004 06:58)
-		$width  = imagesx($image);
-		$height = imagesy($image);
-		$image_copy = imagecreatetruecolor($width, $height);
-		//imagecopymerge($image_copy, $image, 0, 0, 0, 0, $width, $height, 100);
-		imagecopy($image_copy, $image, 0, 0, 0, 0, $width, $height);
-		imagetruecolortopalette($image, $dither, $ncolors);
-		imagecolormatch($image_copy, $image);
-		imagedestroy($image_copy);
-		return true;
-	}
-
-	public function ReduceColorDepth(&$gdimg, $colors=256, $dither=true) {
-		$colors = max(min($colors, 256), 2);
-		// imagetruecolortopalette usually makes ugly colors, the replacement is a bit better
-		//imagetruecolortopalette($gdimg, $dither, $colors);
-		self::ImageTrueColorToPalette2($gdimg, $dither, $colors);
-		return true;
-	}
-
-
-	public function WhiteBalance(&$gdimg, $targetColor='') {
-		if (phpthumb_functions::IsHexColor($targetColor)) {
-			$targetPixel = array(
-				'red'   => hexdec(substr($targetColor, 0, 2)),
-				'green' => hexdec(substr($targetColor, 2, 2)),
-				'blue'  => hexdec(substr($targetColor, 4, 2))
-			);
-		} else {
-			$Analysis = self::HistogramAnalysis($gdimg, false);
-			$targetPixel = array(
-				'red'   => max(array_keys($Analysis['red'])),
-				'green' => max(array_keys($Analysis['green'])),
-				'blue'  => max(array_keys($Analysis['blue']))
-			);
-		}
-		$grayValue = phpthumb_functions::GrayscaleValue($targetPixel['red'], $targetPixel['green'], $targetPixel['blue']);
-		$scaleR = $grayValue / $targetPixel['red'];
-		$scaleG = $grayValue / $targetPixel['green'];
-		$scaleB = $grayValue / $targetPixel['blue'];
-
-		for ($x = 0, $xMax = imagesx($gdimg); $x < $xMax; $x++) {
-			for ($y = 0, $yMax = imagesy($gdimg); $y < $yMax; $y++) {
-				$currentPixel = phpthumb_functions::GetPixelColor($gdimg, $x, $y);
-				$newColor = phpthumb_functions::ImageColorAllocateAlphaSafe(
-					$gdimg,
-					max(0, min(255, round($currentPixel['red']   * $scaleR))),
-					max(0, min(255, round($currentPixel['green'] * $scaleG))),
-					max(0, min(255, round($currentPixel['blue']  * $scaleB))),
-					$currentPixel['alpha']
-				);
-				imagesetpixel($gdimg, $x, $y, $newColor);
-			}
-		}
-		return true;
-	}
-
-
-	public function WatermarkText(&$gdimg, $text, $size, $alignment, $hex_color='000000', $ttffont='', $opacity=100, $margin=5, $angle=0, $bg_color=false, $bg_opacity=0, $fillextend='', $lineheight=1.0) {
-		// text watermark requested
-		if (!$text) {
-			return false;
-		}
-		imagealphablending($gdimg, true);
-
-		if (preg_match('#^([0-9\\.\\-]*)x([0-9\\.\\-]*)(@[LCR])?$#i', $alignment, $matches)) {
-			$originOffsetX = (int) $matches[ 1];
-			$originOffsetY = (int) $matches[ 2];
-			$alignment = (@$matches[4] ? $matches[4] : 'L');
-			$margin = 0;
-		} else {
-			$originOffsetX = 0;
-			$originOffsetY = 0;
-		}
-		$lineheight = min(100.0, max(0.01, (float) $lineheight));
-
-		$metaTextArray = array(
-			'^Fb' =>       $this->phpThumbObject->getimagesizeinfo['filesize'],
-			'^Fk' => round($this->phpThumbObject->getimagesizeinfo['filesize'] / 1024),
-			'^Fm' => round($this->phpThumbObject->getimagesizeinfo['filesize'] / 1048576),
-			'^X'  => $this->phpThumbObject->getimagesizeinfo[0],
-			'^Y'  => $this->phpThumbObject->getimagesizeinfo[1],
-			'^x'  => imagesx($gdimg),
-			'^y'  => imagesy($gdimg),
-			'^^'  => '^',
-		);
-		$text = strtr($text, $metaTextArray);
-
-		$text = str_replace(array(
-			"\r\n",
-			"\r"
-		), "\n", $text);
-		$textlines = explode("\n", $text);
-		$this->DebugMessage('Processing '.count($textlines).' lines of text', __FILE__, __LINE__);
-
-		if (@is_readable($ttffont) && is_file($ttffont)) {
-
-			$opacity = 100 - (int) max(min($opacity, 100), 0);
-			$letter_color_text = phpthumb_functions::ImageHexColorAllocate($gdimg, $hex_color, false, $opacity * 1.27);
-
-			$this->DebugMessage('Using TTF font "'.$ttffont.'"', __FILE__, __LINE__);
-
-			$TTFbox = imagettfbbox($size, $angle, $ttffont, $text);
-
-			$min_x = min($TTFbox[0], $TTFbox[2], $TTFbox[4], $TTFbox[6]);
-			$max_x = max($TTFbox[0], $TTFbox[2], $TTFbox[4], $TTFbox[6]);
-			//$text_width = round($max_x - $min_x + ($size * 0.5));
-			$text_width = round($max_x - $min_x);
-
-			$min_y = min($TTFbox[1], $TTFbox[3], $TTFbox[5], $TTFbox[7]);
-			$max_y = max($TTFbox[1], $TTFbox[3], $TTFbox[5], $TTFbox[7]);
-			//$text_height = round($max_y - $min_y + ($size * 0.5));
-			$text_height = round($max_y - $min_y);
-
-			$TTFboxChar = imagettfbbox($size, $angle, $ttffont, 'jH');
-			$char_min_y = min($TTFboxChar[1], $TTFboxChar[3], $TTFboxChar[5], $TTFboxChar[7]);
-			$char_max_y = max($TTFboxChar[1], $TTFboxChar[3], $TTFboxChar[5], $TTFboxChar[7]);
-			$char_height = round($char_max_y - $char_min_y);
-
-			if ($alignment == '*') {
-
-				$text_origin_y = $char_height + $margin;
-				while (($text_origin_y - $text_height) < imagesy($gdimg)) {
-					$text_origin_x = $margin;
-					while ($text_origin_x < imagesx($gdimg)) {
-						imagettftext($gdimg, $size, $angle, $text_origin_x, $text_origin_y, $letter_color_text, $ttffont, $text);
-						$text_origin_x += ($text_width + $margin);
-					}
-					$text_origin_y += ($text_height + $margin) * $lineheight;
-				}
-
-			} else {
-
-				// this block for background color only
-
-				$text_origin_x = 0;
-				$text_origin_y = 0;
-				switch ($alignment) {
-					case '*':
-						// handled separately
-						break;
-
-					case 'T':
-						$text_origin_x = ($originOffsetX ? $originOffsetX - round($text_width / 2) : round((imagesx($gdimg) - $text_width) / 2));
-						$text_origin_y = $char_height + $margin + $originOffsetY;
-						break;
-
-					case 'B':
-						$text_origin_x = ($originOffsetX ? $originOffsetX - round($text_width / 2) : round((imagesx($gdimg) - $text_width) / 2));
-						$text_origin_y = imagesy($gdimg) + $TTFbox[1] - $margin + $originOffsetY;
-						break;
-
-					case 'L':
-						$text_origin_x = $margin + $originOffsetX;
-						$text_origin_y = ($originOffsetY ? $originOffsetY : round((imagesy($gdimg) - $text_height) / 2) + $char_height);
-						break;
-
-					case 'R':
-						$text_origin_x = ($originOffsetX ? $originOffsetX - $text_width : imagesx($gdimg) - $text_width  + $TTFbox[0] - $min_x + round($size * 0.25) - $margin);
-						$text_origin_y = ($originOffsetY ? $originOffsetY : round((imagesy($gdimg) - $text_height) / 2) + $char_height);
-						break;
-
-					case 'C':
-						$text_origin_x = ($originOffsetX ? $originOffsetX - round($text_width / 2) : round((imagesx($gdimg) - $text_width) / 2));
-						$text_origin_y = ($originOffsetY ? $originOffsetY : round((imagesy($gdimg) - $text_height) / 2) + $char_height);
-						break;
-
-					case 'TL':
-						$text_origin_x = $margin + $originOffsetX;
-						$text_origin_y = $char_height + $margin + $originOffsetY;
-						break;
-
-					case 'TR':
-						$text_origin_x = ($originOffsetX ? $originOffsetX - $text_width : imagesx($gdimg) - $text_width  + $TTFbox[0] - $min_x + round($size * 0.25) - $margin);
-						$text_origin_y = $char_height + $margin + $originOffsetY;
-						break;
-
-					case 'BL':
-						$text_origin_x = $margin + $originOffsetX;
-						$text_origin_y = imagesy($gdimg) + $TTFbox[1] - $margin + $originOffsetY;
-						break;
-
-					case 'BR':
-					default:
-						$text_origin_x = ($originOffsetX ? $originOffsetX - $text_width : imagesx($gdimg) - $text_width  + $TTFbox[0] - $min_x + round($size * 0.25) - $margin);
-						$text_origin_y = imagesy($gdimg) + $TTFbox[1] - $margin + $originOffsetY;
-						break;
-				}
-
-				if (phpthumb_functions::IsHexColor($bg_color)) {
-					$text_background_alpha = round(127 * ((100 - min(max(0, $bg_opacity), 100)) / 100));
-					$text_color_background = phpthumb_functions::ImageHexColorAllocate($gdimg, $bg_color, false, $text_background_alpha);
-				} else {
-					$text_color_background = phpthumb_functions::ImageHexColorAllocate($gdimg, 'FFFFFF', false, 127);
-				}
-				$x1 = $text_origin_x + $min_x;
-				$y1 = $text_origin_y + $TTFbox[1];
-				$x2 = $text_origin_x + $min_x + $text_width;
-				$y2 = $text_origin_y + $TTFbox[1] - $text_height;
-				$x_TL = false !== stripos($fillextend, "x") ?               0 : min($x1, $x2);
-				$y_TL = false !== stripos($fillextend, "y") ?               0 : min($y1, $y2);
-				$x_BR = false !== stripos($fillextend, "x") ? imagesx($gdimg) : max($x1, $x2);
-				$y_BR = false !== stripos($fillextend, "y") ? imagesy($gdimg) : max($y1, $y2);
-				$this->DebugMessage('WatermarkText() calling imagefilledrectangle($gdimg, '.$x_TL.', '.$y_TL.', '.$x_BR.', '.$y_BR.', $text_color_background)', __FILE__, __LINE__);
-				imagefilledrectangle($gdimg, $x_TL, $y_TL, $x_BR, $y_BR, $text_color_background);
-
-				// end block for background color only
-
-
-				$y_offset = 0;
-				foreach ($textlines as $dummy => $line) {
-
-					$TTFboxLine = imagettfbbox($size, $angle, $ttffont, $line);
-					$min_x_line = min($TTFboxLine[0], $TTFboxLine[2], $TTFboxLine[4], $TTFboxLine[6]);
-					$max_x_line = max($TTFboxLine[0], $TTFboxLine[2], $TTFboxLine[4], $TTFboxLine[6]);
-					$text_width_line = round($max_x_line - $min_x_line);
-
-					switch ($alignment) {
-						// $text_origin_y set above, just re-set $text_origin_x here as needed
-
-						case 'L':
-						case 'TL':
-						case 'BL':
-							// no change necessary
-							break;
-
-						case 'C':
-						case 'T':
-						case 'B':
-							$text_origin_x = ($originOffsetX ? $originOffsetX - round($text_width_line / 2) : round((imagesx($gdimg) - $text_width_line) / 2));
-							break;
-
-						case 'R':
-						case 'TR':
-						case 'BR':
-							$text_origin_x = ($originOffsetX ? $originOffsetX - $text_width_line : imagesx($gdimg) - $text_width_line  + $TTFbox[0] - $min_x + round($size * 0.25) - $margin);
-							break;
-					}
-
-					//imagettftext($gdimg, $size, $angle, $text_origin_x, $text_origin_y, $letter_color_text, $ttffont, $text);
-					$this->DebugMessage('WatermarkText() calling imagettftext($gdimg, '.$size.', '.$angle.', '.$text_origin_x.', '.($text_origin_y + $y_offset).', $letter_color_text, '.$ttffont.', '.$line.')', __FILE__, __LINE__);
-					imagettftext($gdimg, $size, $angle, $text_origin_x, $text_origin_y + $y_offset, $letter_color_text, $ttffont, $line);
-
-					$y_offset += $char_height * $lineheight;
-				}
-
-			}
-			return true;
-
-		} else {
-
-			$size = min(5, max(1, $size));
-			$this->DebugMessage('Using built-in font (size='.$size.') for text watermark'.($ttffont ? ' because $ttffont !is_readable('.$ttffont.')' : ''), __FILE__, __LINE__);
-
-			$text_width  = 0;
-			$text_height = 0;
-			foreach ($textlines as $dummy => $line) {
-				$text_width   = max($text_width, imagefontwidth($size) * strlen($line));
-				$text_height += imagefontheight($size);
-			}
-			if ($img_watermark = phpthumb_functions::ImageCreateFunction($text_width, $text_height)) {
-				imagealphablending($img_watermark, false);
-				if (phpthumb_functions::IsHexColor($bg_color)) {
-					$text_background_alpha = round(127 * ((100 - min(max(0, $bg_opacity), 100)) / 100));
-					$text_color_background = phpthumb_functions::ImageHexColorAllocate($img_watermark, $bg_color, false, $text_background_alpha);
-				} else {
-					$text_color_background = phpthumb_functions::ImageHexColorAllocate($img_watermark, 'FFFFFF', false, 127);
-				}
-				$this->DebugMessage('WatermarkText() calling imagefilledrectangle($img_watermark, 0, 0, '.imagesx($img_watermark).', '.imagesy($img_watermark).', $text_color_background)', __FILE__, __LINE__);
-				imagefilledrectangle($img_watermark, 0, 0, imagesx($img_watermark), imagesy($img_watermark), $text_color_background);
-
-				$img_watermark_mask    = false;
-				$mask_color_background = false;
-				$mask_color_watermark  = false;
-				if ($angle && function_exists('imagerotate')) {
-					// using $img_watermark_mask is pointless if imagerotate function isn't available
-					if ($img_watermark_mask = phpthumb_functions::ImageCreateFunction($text_width, $text_height)) {
-						$mask_color_background = imagecolorallocate($img_watermark_mask, 0, 0, 0);
-						imagealphablending($img_watermark_mask, false);
-						imagefilledrectangle($img_watermark_mask, 0, 0, imagesx($img_watermark_mask), imagesy($img_watermark_mask), $mask_color_background);
-						$mask_color_watermark = imagecolorallocate($img_watermark_mask, 255, 255, 255);
-					}
-				}
-
-				$text_color_watermark = phpthumb_functions::ImageHexColorAllocate($img_watermark, $hex_color);
-				$x_offset = 0;
-				foreach ($textlines as $key => $line) {
-					switch ($alignment) {
-						case 'C':
-							$x_offset = round(($text_width - (imagefontwidth($size) * strlen($line))) / 2);
-							$originOffsetX = (imagesx($gdimg) - imagesx($img_watermark)) / 2;
-							$originOffsetY = (imagesy($gdimg) - imagesy($img_watermark)) / 2;
-							break;
-
-						case 'T':
-							$x_offset = round(($text_width - (imagefontwidth($size) * strlen($line))) / 2);
-							$originOffsetX = (imagesx($gdimg) - imagesx($img_watermark)) / 2;
-							$originOffsetY = $margin;
-							break;
-
-						case 'B':
-							$x_offset = round(($text_width - (imagefontwidth($size) * strlen($line))) / 2);
-							$originOffsetX = (imagesx($gdimg) - imagesx($img_watermark)) / 2;
-							$originOffsetY = imagesy($gdimg) - imagesy($img_watermark) - $margin;
-							break;
-
-						case 'L':
-							$x_offset = 0;
-							$originOffsetX = $margin;
-							$originOffsetY = (imagesy($gdimg) - imagesy($img_watermark)) / 2;
-							break;
-
-						case 'TL':
-							$x_offset = 0;
-							$originOffsetX = $margin;
-							$originOffsetY = $margin;
-							break;
-
-						case 'BL':
-							$x_offset = 0;
-							$originOffsetX = $margin;
-							$originOffsetY = imagesy($gdimg) - imagesy($img_watermark) - $margin;
-							break;
-
-						case 'R':
-							$x_offset = $text_width - (imagefontwidth($size) * strlen($line));
-							$originOffsetX = imagesx($gdimg) - imagesx($img_watermark) - $margin;
-							$originOffsetY = (imagesy($gdimg) - imagesy($img_watermark)) / 2;
-							break;
-
-						case 'TR':
-							$x_offset = $text_width - (imagefontwidth($size) * strlen($line));
-							$originOffsetX = imagesx($gdimg) - imagesx($img_watermark) - $margin;
-							$originOffsetY = $margin;
-							break;
-
-						case 'BR':
-						default:
-							if (!empty($originOffsetX) || !empty($originOffsetY)) {
-								// absolute pixel positioning
-							} else {
-								$x_offset = $text_width - (imagefontwidth($size) * strlen($line));
-								$originOffsetX = imagesx($gdimg) - imagesx($img_watermark) - $margin;
-								$originOffsetY = imagesy($gdimg) - imagesy($img_watermark) - $margin;
-							}
-							break;
-					}
-					$this->DebugMessage('WatermarkText() calling imagestring($img_watermark, '.$size.', '.$x_offset.', '.($key * imagefontheight($size)).', '.$line.', $text_color_watermark)', __FILE__, __LINE__);
-					imagestring($img_watermark, $size, $x_offset, $key * imagefontheight($size), $line, $text_color_watermark);
-					if ($angle && $img_watermark_mask) {
-						$this->DebugMessage('WatermarkText() calling imagestring($img_watermark_mask, '.$size.', '.$x_offset.', '.($key * imagefontheight($size) * $lineheight).', '.$text.', $mask_color_watermark)', __FILE__, __LINE__);
-						imagestring($img_watermark_mask, $size, $x_offset, $key * imagefontheight($size) * $lineheight, $text, $mask_color_watermark);
-					}
-				}
-				if ($angle && $img_watermark_mask) {
-					$img_watermark      = imagerotate($img_watermark,      $angle, $text_color_background);
-					$img_watermark_mask = imagerotate($img_watermark_mask, $angle, $mask_color_background);
-					self::ApplyMask($img_watermark_mask, $img_watermark);
-				}
-				//phpthumb_filters::WatermarkOverlay($gdimg, $img_watermark, $alignment, $opacity, $margin);
-				$this->DebugMessage('WatermarkText() calling phpthumb_filters::WatermarkOverlay($gdimg, $img_watermark, '.($originOffsetX.'x'.$originOffsetY).', '.$opacity.', 0)', __FILE__, __LINE__);
-				self::WatermarkOverlay($gdimg, $img_watermark, $originOffsetX.'x'.$originOffsetY, $opacity, 0);
-				imagedestroy($img_watermark);
-				return true;
-			}
-
-		}
-		return false;
-	}
-
-
-	public function WatermarkOverlay(&$gdimg_dest, &$img_watermark, $alignment='*', $opacity=50, $margin_x=5, $margin_y=null) {
-
-		if (is_resource($gdimg_dest) && is_resource($img_watermark)) {
-			$img_source_width          = imagesx($gdimg_dest);
-			$img_source_height         = imagesy($gdimg_dest);
-			$watermark_source_width    = imagesx($img_watermark);
-			$watermark_source_height   = imagesy($img_watermark);
-			$watermark_opacity_percent = max(0, min(100, $opacity));
-			$margin_y = (null === $margin_y ? $margin_x : $margin_y);
-			$watermark_margin_x = ((($margin_x > 0) && ($margin_x < 1)) ? round((1 - $margin_x) * $img_source_width)  : $margin_x);
-			$watermark_margin_y = ((($margin_y > 0) && ($margin_y < 1)) ? round((1 - $margin_y) * $img_source_height) : $margin_y);
-			$watermark_destination_x = 0;
-			$watermark_destination_y = 0;
-			if (preg_match('#^([0-9\\.\\-]*)x([0-9\\.\\-]*)$#i', $alignment, $matches)) {
-				$watermark_destination_x = (int) $matches[ 1];
-				$watermark_destination_y = (int) $matches[ 2];
-			} else {
-				switch ($alignment) {
-					case '*':
-						if ($gdimg_tiledwatermark = phpthumb_functions::ImageCreateFunction($img_source_width, $img_source_height)) {
-
-							imagealphablending($gdimg_tiledwatermark, false);
-							imagesavealpha($gdimg_tiledwatermark, true);
-							$text_color_transparent = phpthumb_functions::ImageColorAllocateAlphaSafe($gdimg_tiledwatermark, 255, 0, 255, 127);
-							imagefill($gdimg_tiledwatermark, 0, 0, $text_color_transparent);
-
-							// set the tiled image transparent color to whatever the untiled image transparency index is
-	//						imagecolortransparent($gdimg_tiledwatermark, imagecolortransparent($img_watermark));
-
-							// a "cleaner" way of doing it, but can't handle the margin feature :(
-	//						imagesettile($gdimg_tiledwatermark, $img_watermark);
-	//						imagefill($gdimg_tiledwatermark, 0, 0, IMG_COLOR_TILED);
-	//						break;
-
-	//						imagefill($gdimg_tiledwatermark, 0, 0, imagecolortransparent($gdimg_tiledwatermark));
-							// tile the image as many times as can fit
-							for ($x = $watermark_margin_x; $x < ($img_source_width + $watermark_source_width); $x += ($watermark_source_width + $watermark_margin_x)) {
-								for ($y = $watermark_margin_y; $y < ($img_source_height + $watermark_source_height); $y += ($watermark_source_height + $watermark_margin_y)) {
-									imagecopy(
-										$gdimg_tiledwatermark,
-										$img_watermark,
-										$x,
-										$y,
-										0,
-										0,
-										min($watermark_source_width,  $img_source_width  - $x - $watermark_margin_x),
-										min($watermark_source_height, $img_source_height - $y - $watermark_margin_y)
-									);
-								}
-							}
-
-							$watermark_source_width  = imagesx($gdimg_tiledwatermark);
-							$watermark_source_height = imagesy($gdimg_tiledwatermark);
-							$watermark_destination_x = 0;
-							$watermark_destination_y = 0;
-
-							imagedestroy($img_watermark);
-							$img_watermark = $gdimg_tiledwatermark;
-						}
-						break;
-
-					case 'T':
-						$watermark_destination_x = round((($img_source_width  / 2) - ($watermark_source_width / 2)) + $watermark_margin_x);
-						$watermark_destination_y = $watermark_margin_y;
-						break;
-
-					case 'B':
-						$watermark_destination_x = round((($img_source_width  / 2) - ($watermark_source_width / 2)) + $watermark_margin_x);
-						$watermark_destination_y = $img_source_height - $watermark_source_height - $watermark_margin_y;
-						break;
-
-					case 'L':
-						$watermark_destination_x = $watermark_margin_x;
-						$watermark_destination_y = round((($img_source_height / 2) - ($watermark_source_height / 2)) + $watermark_margin_y);
-						break;
-
-					case 'R':
-						$watermark_destination_x = $img_source_width - $watermark_source_width - $watermark_margin_x;
-						$watermark_destination_y = round((($img_source_height / 2) - ($watermark_source_height / 2)) + $watermark_margin_y);
-						break;
-
-					case 'C':
-						$watermark_destination_x = round(($img_source_width  / 2) - ($watermark_source_width  / 2));
-						$watermark_destination_y = round(($img_source_height / 2) - ($watermark_source_height / 2));
-						break;
-
-					case 'TL':
-						$watermark_destination_x = $watermark_margin_x;
-						$watermark_destination_y = $watermark_margin_y;
-						break;
-
-					case 'TR':
-						$watermark_destination_x = $img_source_width - $watermark_source_width - $watermark_margin_x;
-						$watermark_destination_y = $watermark_margin_y;
-						break;
-
-					case 'BL':
-						$watermark_destination_x = $watermark_margin_x;
-						$watermark_destination_y = $img_source_height - $watermark_source_height - $watermark_margin_y;
-						break;
-
-					case 'BR':
-					default:
-						$watermark_destination_x = $img_source_width  - $watermark_source_width  - $watermark_margin_x;
-						$watermark_destination_y = $img_source_height - $watermark_source_height - $watermark_margin_y;
-						break;
-				}
-			}
-			imagealphablending($gdimg_dest, false);
-			imagesavealpha($gdimg_dest, true);
-			imagesavealpha($img_watermark, true);
-			phpthumb_functions::ImageCopyRespectAlpha($gdimg_dest, $img_watermark, $watermark_destination_x, $watermark_destination_y, 0, 0, $watermark_source_width, $watermark_source_height, $watermark_opacity_percent);
-
-			return true;
-		}
-		return false;
-	}
+    public function Blur(&$gdimg, $radius=0.5) {
+        // Taken from Torstein Hønsi's phpUnsharpMask (see phpthumb.unsharp.php)
+
+        $radius = round(max(0, min($radius, 50)) * 2);
+        if (!$radius) {
+            return false;
+        }
+
+        $w = imagesx($gdimg);
+        $h = imagesy($gdimg);
+        if ($imgBlur = imagecreatetruecolor($w, $h)) {
+            // Gaussian blur matrix:
+            //	1	2	1
+            //	2	4	2
+            //	1	2	1
+
+            // Move copies of the image around one pixel at the time and merge them with weight
+            // according to the matrix. The same matrix is simply repeated for higher radii.
+            for ($i = 0; $i < $radius; $i++)	{
+                imagecopy     ($imgBlur, $gdimg, 0, 0, 1, 1, $w - 1, $h - 1);            // up left
+                imagecopymerge($imgBlur, $gdimg, 1, 1, 0, 0, $w,     $h,     50.00000);  // down right
+                imagecopymerge($imgBlur, $gdimg, 0, 1, 1, 0, $w - 1, $h,     33.33333);  // down left
+                imagecopymerge($imgBlur, $gdimg, 1, 0, 0, 1, $w,     $h - 1, 25.00000);  // up right
+                imagecopymerge($imgBlur, $gdimg, 0, 0, 1, 0, $w - 1, $h,     33.33333);  // left
+                imagecopymerge($imgBlur, $gdimg, 1, 0, 0, 0, $w,     $h,     25.00000);  // right
+                imagecopymerge($imgBlur, $gdimg, 0, 0, 0, 1, $w,     $h - 1, 20.00000);  // up
+                imagecopymerge($imgBlur, $gdimg, 0, 1, 0, 0, $w,     $h,     16.666667); // down
+                imagecopymerge($imgBlur, $gdimg, 0, 0, 0, 0, $w,     $h,     50.000000); // center
+                imagecopy     ($gdimg, $imgBlur, 0, 0, 0, 0, $w,     $h);
+            }
+            return true;
+        }
+        return false;
+    }
+
+
+    public function BlurGaussian(&$gdimg) {
+        if (phpthumb_functions::version_compare_replacement(PHP_VERSION, '5.0.0', '>=') && phpthumb_functions::gd_is_bundled()) {
+            if (imagefilter($gdimg, IMG_FILTER_GAUSSIAN_BLUR)) {
+                return true;
+            }
+            $this->DebugMessage('FAILED: imagefilter($gdimg, IMG_FILTER_GAUSSIAN_BLUR)', __FILE__, __LINE__);
+            // fall through and try it the hard way
+        }
+        $this->DebugMessage('FAILED: phpthumb_filters::BlurGaussian($gdimg) [using phpthumb_filters::Blur() instead]', __FILE__, __LINE__);
+        return self::Blur($gdimg, 0.5);
+    }
+
+
+    public function BlurSelective(&$gdimg) {
+        if (phpthumb_functions::version_compare_replacement(PHP_VERSION, '5.0.0', '>=') && phpthumb_functions::gd_is_bundled()) {
+            if (imagefilter($gdimg, IMG_FILTER_SELECTIVE_BLUR)) {
+                return true;
+            }
+            $this->DebugMessage('FAILED: imagefilter($gdimg, IMG_FILTER_SELECTIVE_BLUR)', __FILE__, __LINE__);
+            // fall through and try it the hard way
+        }
+        // currently not implemented "the hard way"
+        $this->DebugMessage('FAILED: phpthumb_filters::BlurSelective($gdimg) [function not implemented]', __FILE__, __LINE__);
+        return false;
+    }
+
+
+    public function Brightness(&$gdimg, $amount=0) {
+        if ($amount == 0) {
+            return true;
+        }
+        $amount = max(-255, min(255, $amount));
+
+        if (phpthumb_functions::version_compare_replacement(PHP_VERSION, '5.0.0', '>=') && phpthumb_functions::gd_is_bundled()) {
+            if (imagefilter($gdimg, IMG_FILTER_BRIGHTNESS, $amount)) {
+                return true;
+            }
+            $this->DebugMessage('FAILED: imagefilter($gdimg, IMG_FILTER_BRIGHTNESS, '.$amount.')', __FILE__, __LINE__);
+            // fall through and try it the hard way
+        }
+
+        $scaling = (255 - abs($amount)) / 255;
+        $baseamount = (($amount > 0) ? $amount : 0);
+        for ($x = 0, $xMax = imagesx($gdimg); $x < $xMax; $x++) {
+            for ($y = 0, $yMax = imagesy($gdimg); $y < $yMax; $y++) {
+                $OriginalPixel = phpthumb_functions::GetPixelColor($gdimg, $x, $y);
+                $NewPixel = array();
+                foreach ($OriginalPixel as $key => $value) {
+                    $NewPixel[$key] = round($baseamount + ($OriginalPixel[$key] * $scaling));
+                }
+                $newColor = imagecolorallocate($gdimg, $NewPixel['red'], $NewPixel['green'], $NewPixel['blue']);
+                imagesetpixel($gdimg, $x, $y, $newColor);
+            }
+        }
+        return true;
+    }
+
+
+    public function Contrast(&$gdimg, $amount=0) {
+        if ($amount == 0) {
+            return true;
+        }
+        $amount = max(-255, min(255, $amount));
+
+        if (phpthumb_functions::version_compare_replacement(PHP_VERSION, '5.0.0', '>=') && phpthumb_functions::gd_is_bundled()) {
+            // imagefilter(IMG_FILTER_CONTRAST) has range +100 to -100 (positive numbers make it darker!)
+            $amount = ($amount / 255) * -100;
+            if (imagefilter($gdimg, IMG_FILTER_CONTRAST, $amount)) {
+                return true;
+            }
+            $this->DebugMessage('FAILED: imagefilter($gdimg, IMG_FILTER_CONTRAST, '.$amount.')', __FILE__, __LINE__);
+            // fall through and try it the hard way
+        }
+
+        if ($amount > 0) {
+            $scaling = 1 + ($amount / 255);
+        } else {
+            $scaling = (255 - abs($amount)) / 255;
+        }
+        for ($x = 0, $xMax = imagesx($gdimg); $x < $xMax; $x++) {
+            for ($y = 0, $yMax = imagesy($gdimg); $y < $yMax; $y++) {
+                $OriginalPixel = phpthumb_functions::GetPixelColor($gdimg, $x, $y);
+                $NewPixel = array();
+                foreach ($OriginalPixel as $key => $value) {
+                    $NewPixel[$key] = min(255, max(0, round($OriginalPixel[$key] * $scaling)));
+                }
+                $newColor = imagecolorallocate($gdimg, $NewPixel['red'], $NewPixel['green'], $NewPixel['blue']);
+                imagesetpixel($gdimg, $x, $y, $newColor);
+            }
+        }
+        return true;
+    }
+
+
+    public function Colorize(&$gdimg, $amount, $targetColor) {
+        $amount      = (is_numeric($amount)                          ? $amount      : 25);
+        $amountPct   = $amount / 100;
+        $targetColor = (phpthumb_functions::IsHexColor($targetColor) ? $targetColor : 'gray');
+
+        if ($amount == 0) {
+            return true;
+        }
+
+        if (phpthumb_functions::version_compare_replacement(PHP_VERSION, '5.0.0', '>=') && phpthumb_functions::gd_is_bundled()) {
+            if ($targetColor == 'gray') {
+                $targetColor = '808080';
+            }
+            $r = round($amountPct * hexdec(substr($targetColor, 0, 2)));
+            $g = round($amountPct * hexdec(substr($targetColor, 2, 2)));
+            $b = round($amountPct * hexdec(substr($targetColor, 4, 2)));
+            if (imagefilter($gdimg, IMG_FILTER_COLORIZE, $r, $g, $b)) {
+                return true;
+            }
+            $this->DebugMessage('FAILED: imagefilter($gdimg, IMG_FILTER_COLORIZE)', __FILE__, __LINE__);
+            // fall through and try it the hard way
+        }
+
+        // overridden below for grayscale
+        $TargetPixel = array();
+        if ($targetColor != 'gray') {
+            $TargetPixel['red']   = hexdec(substr($targetColor, 0, 2));
+            $TargetPixel['green'] = hexdec(substr($targetColor, 2, 2));
+            $TargetPixel['blue']  = hexdec(substr($targetColor, 4, 2));
+        }
+
+        for ($x = 0, $xMax = imagesx($gdimg); $x < $xMax; $x++) {
+            for ($y = 0, $yMax = imagesy($gdimg); $y < $yMax; $y++) {
+                $OriginalPixel = phpthumb_functions::GetPixelColor($gdimg, $x, $y);
+                if ($targetColor == 'gray') {
+                    $TargetPixel = phpthumb_functions::GrayscalePixel($OriginalPixel);
+                }
+                $NewPixel = array();
+                foreach ($TargetPixel as $key => $value) {
+                    $NewPixel[$key] = round(max(0, min(255, ($OriginalPixel[$key] * ((100 - $amount) / 100)) + ($TargetPixel[$key] * $amountPct))));
+                }
+                //$newColor = phpthumb_functions::ImageColorAllocateAlphaSafe($gdimg, $NewPixel['red'], $NewPixel['green'], $NewPixel['blue'], $OriginalPixel['alpha']);
+                $newColor = imagecolorallocate($gdimg, $NewPixel['red'], $NewPixel['green'], $NewPixel['blue']);
+                imagesetpixel($gdimg, $x, $y, $newColor);
+            }
+        }
+        return true;
+    }
+
+
+    public function Crop(&$gdimg, $left=0, $right=0, $top=0, $bottom=0) {
+        if (!$left && !$right && !$top && !$bottom) {
+            return true;
+        }
+        $oldW = imagesx($gdimg);
+        $oldH = imagesy($gdimg);
+        if (($left   > 0) && ($left   < 1)) { $left   = round($left   * $oldW); }
+        if (($right  > 0) && ($right  < 1)) { $right  = round($right  * $oldW); }
+        if (($top    > 0) && ($top    < 1)) { $top    = round($top    * $oldH); }
+        if (($bottom > 0) && ($bottom < 1)) { $bottom = round($bottom * $oldH); }
+        $right  = min($oldW - $left - 1, $right);
+        $bottom = min($oldH - $top  - 1, $bottom);
+        $newW = $oldW - $left - $right;
+        $newH = $oldH - $top  - $bottom;
+
+        if ($imgCropped = imagecreatetruecolor($newW, $newH)) {
+            imagecopy($imgCropped, $gdimg, 0, 0, $left, $top, $newW, $newH);
+            if ($gdimg = imagecreatetruecolor($newW, $newH)) {
+                imagecopy($gdimg, $imgCropped, 0, 0, 0, 0, $newW, $newH);
+                imagedestroy($imgCropped);
+                return true;
+            }
+            imagedestroy($imgCropped);
+        }
+        return false;
+    }
+
+
+    public function Desaturate(&$gdimg, $amount, $color='') {
+        if ($amount == 0) {
+            return true;
+        }
+        return self::Colorize($gdimg, $amount, (phpthumb_functions::IsHexColor($color) ? $color : 'gray'));
+    }
+
+
+    public function DropShadow(&$gdimg, $distance, $width, $hexcolor, $angle, $alpha) {
+        if (phpthumb_functions::gd_version() < 2) {
+            return false;
+        }
+        $distance =                 ($distance ? $distance : 10);
+        $width    =                 ($width    ? $width    : 10);
+        $hexcolor =                 ($hexcolor ? $hexcolor : '000000');
+        $angle    =                 ($angle    ? $angle    : 225) % 360;
+        $alpha    = max(0, min(100, ($alpha    ? $alpha    : 100)));
+
+        if ($alpha <= 0) {
+            // invisible shadow, nothing to do
+            return true;
+        }
+        if ($distance <= 0) {
+            // shadow completely obscured by source image, nothing to do
+            return true;
+        }
+
+        //$width_shadow  = cos(deg2rad($angle)) * ($distance + $width);
+        //$height_shadow = sin(deg2rad($angle)) * ($distance + $width);
+        //$scaling = min(imagesx($gdimg) / (imagesx($gdimg) + abs($width_shadow)), imagesy($gdimg) / (imagesy($gdimg) + abs($height_shadow)));
+
+        $Offset = array();
+        for ($i = 0; $i < $width; $i++) {
+            $WidthAlpha[$i] = (abs(($width / 2) - $i) / $width);
+            $Offset['x'] = cos(deg2rad($angle)) * ($distance + $i);
+            $Offset['y'] = sin(deg2rad($angle)) * ($distance + $i);
+        }
+
+        $tempImageWidth  = imagesx($gdimg)  + abs($Offset['x']);
+        $tempImageHeight = imagesy($gdimg) + abs($Offset['y']);
+
+        if ($gdimg_dropshadow_temp = phpthumb_functions::ImageCreateFunction($tempImageWidth, $tempImageHeight)) {
+
+            imagealphablending($gdimg_dropshadow_temp, false);
+            imagesavealpha($gdimg_dropshadow_temp, true);
+            $transparent1 = phpthumb_functions::ImageColorAllocateAlphaSafe($gdimg_dropshadow_temp, 0, 0, 0, 127);
+            imagefill($gdimg_dropshadow_temp, 0, 0, $transparent1);
+
+            $PixelMap = array();
+            for ($x = 0, $xMax = imagesx($gdimg); $x < $xMax; $x++) {
+                for ($y = 0, $yMax = imagesy($gdimg); $y < $yMax; $y++) {
+                    $PixelMap[$x][$y] = phpthumb_functions::GetPixelColor($gdimg, $x, $y);
+                }
+            }
+            for ($x = 0; $x < $tempImageWidth; $x++) {
+                for ($y = 0; $y < $tempImageHeight; $y++) {
+                    //for ($i = 0; $i < $width; $i++) {
+                    for ($i = 0; $i < 1; $i++) {
+                        if (!isset($PixelMap[$x][$y]['alpha']) || ($PixelMap[$x][$y]['alpha'] > 0)) {
+                            if (isset($PixelMap[$x + $Offset['x']][$y + $Offset['y']]['alpha']) && ($PixelMap[$x + $Offset['x']][$y + $Offset['y']]['alpha'] < 127)) {
+                                $thisColor = phpthumb_functions::ImageHexColorAllocate($gdimg, $hexcolor, false, $PixelMap[$x + $Offset['x']][$y + $Offset['y']]['alpha']);
+                                imagesetpixel($gdimg_dropshadow_temp, $x, $y, $thisColor);
+                            }
+                        }
+                    }
+                }
+            }
+
+            imagealphablending($gdimg_dropshadow_temp, true);
+            for ($x = 0, $xMax = imagesx($gdimg); $x < $xMax; $x++) {
+                for ($y = 0, $yMax = imagesy($gdimg); $y < $yMax; $y++) {
+                    if ($PixelMap[$x][$y]['alpha'] < 127) {
+                        $thisColor = phpthumb_functions::ImageColorAllocateAlphaSafe($gdimg_dropshadow_temp, $PixelMap[$x][$y]['red'], $PixelMap[$x][$y]['green'], $PixelMap[$x][$y]['blue'], $PixelMap[$x][$y]['alpha']);
+                        imagesetpixel($gdimg_dropshadow_temp, $x, $y, $thisColor);
+                    }
+                }
+            }
+
+            imagesavealpha($gdimg, true);
+            imagealphablending($gdimg, false);
+            //$this->is_alpha = true;
+            $transparent2 = phpthumb_functions::ImageColorAllocateAlphaSafe($gdimg, 0, 0, 0, 127);
+            imagefilledrectangle($gdimg, 0, 0, imagesx($gdimg), imagesy($gdimg), $transparent2);
+            imagecopyresampled($gdimg, $gdimg_dropshadow_temp, 0, 0, 0, 0, imagesx($gdimg), imagesy($gdimg), imagesx($gdimg_dropshadow_temp), imagesy($gdimg_dropshadow_temp));
+
+            imagedestroy($gdimg_dropshadow_temp);
+        }
+        return true;
+    }
+
+
+    public function EdgeDetect(&$gdimg) {
+        if (phpthumb_functions::version_compare_replacement(PHP_VERSION, '5.0.0', '>=') && phpthumb_functions::gd_is_bundled()) {
+            if (imagefilter($gdimg, IMG_FILTER_EDGEDETECT)) {
+                return true;
+            }
+            $this->DebugMessage('FAILED: imagefilter($gdimg, IMG_FILTER_EDGEDETECT)', __FILE__, __LINE__);
+            // fall through and try it the hard way
+        }
+        // currently not implemented "the hard way"
+        $this->DebugMessage('FAILED: phpthumb_filters::EdgeDetect($gdimg) [function not implemented]', __FILE__, __LINE__);
+        return false;
+    }
+
+
+    public function Ellipse($gdimg) {
+        if (phpthumb_functions::gd_version() < 2) {
+            return false;
+        }
+        // generate mask at twice desired resolution and downsample afterwards for easy antialiasing
+        if ($gdimg_ellipsemask_double = phpthumb_functions::ImageCreateFunction(imagesx($gdimg) * 2, imagesy($gdimg) * 2)) {
+            if ($gdimg_ellipsemask = phpthumb_functions::ImageCreateFunction(imagesx($gdimg), imagesy($gdimg))) {
+
+                $color_transparent = imagecolorallocate($gdimg_ellipsemask_double, 255, 255, 255);
+                imagefilledellipse($gdimg_ellipsemask_double, imagesx($gdimg), imagesy($gdimg), (imagesx($gdimg) - 1) * 2, (imagesy($gdimg) - 1) * 2, $color_transparent);
+                imagecopyresampled($gdimg_ellipsemask, $gdimg_ellipsemask_double, 0, 0, 0, 0, imagesx($gdimg), imagesy($gdimg), imagesx($gdimg) * 2, imagesy($gdimg) * 2);
+
+                self::ApplyMask($gdimg_ellipsemask, $gdimg);
+                imagedestroy($gdimg_ellipsemask);
+                return true;
+
+            } else {
+                $this->DebugMessage('$gdimg_ellipsemask = phpthumb_functions::ImageCreateFunction() failed', __FILE__, __LINE__);
+            }
+            imagedestroy($gdimg_ellipsemask_double);
+        } else {
+            $this->DebugMessage('$gdimg_ellipsemask_double = phpthumb_functions::ImageCreateFunction() failed', __FILE__, __LINE__);
+        }
+        return false;
+    }
+
+
+    public function Emboss(&$gdimg) {
+        if (phpthumb_functions::version_compare_replacement(PHP_VERSION, '5.0.0', '>=') && phpthumb_functions::gd_is_bundled()) {
+            if (imagefilter($gdimg, IMG_FILTER_EMBOSS)) {
+                return true;
+            }
+            $this->DebugMessage('FAILED: imagefilter($gdimg, IMG_FILTER_EMBOSS)', __FILE__, __LINE__);
+            // fall through and try it the hard way
+        }
+        // currently not implemented "the hard way"
+        $this->DebugMessage('FAILED: phpthumb_filters::Emboss($gdimg) [function not implemented]', __FILE__, __LINE__);
+        return false;
+    }
+
+
+    public function Flip(&$gdimg, $x=false, $y=false) {
+        if (!$x && !$y) {
+            return false;
+        }
+        if ($tempImage = phpthumb_functions::ImageCreateFunction(imagesx($gdimg), imagesy($gdimg))) {
+            if ($x) {
+                imagecopy($tempImage, $gdimg, 0, 0, 0, 0, imagesx($gdimg), imagesy($gdimg));
+                for ($x = 0, $xMax = imagesx($gdimg); $x < $xMax; $x++) {
+                    imagecopy($gdimg, $tempImage, imagesx($gdimg) - 1 - $x, 0, $x, 0, 1, imagesy($gdimg));
+                }
+            }
+            if ($y) {
+                imagecopy($tempImage, $gdimg, 0, 0, 0, 0, imagesx($gdimg), imagesy($gdimg));
+                for ($y = 0, $yMax = imagesy($gdimg); $y < $yMax; $y++) {
+                    imagecopy($gdimg, $tempImage, 0, imagesy($gdimg) - 1 - $y, 0, $y, imagesx($gdimg), 1);
+                }
+            }
+            imagedestroy($tempImage);
+        }
+        return true;
+    }
+
+
+    public function Frame(&$gdimg, $frame_width, $edge_width, $hexcolor_frame, $hexcolor1, $hexcolor2) {
+        $frame_width    = ($frame_width    ? $frame_width    : 5);
+        $edge_width     = ($edge_width     ? $edge_width     : 1);
+        $hexcolor_frame = ($hexcolor_frame ? $hexcolor_frame : 'CCCCCC');
+        $hexcolor1      = ($hexcolor1      ? $hexcolor1      : 'FFFFFF');
+        $hexcolor2      = ($hexcolor2      ? $hexcolor2      : '000000');
+
+        $color_frame = phpthumb_functions::ImageHexColorAllocate($gdimg, $hexcolor_frame);
+        $color1      = phpthumb_functions::ImageHexColorAllocate($gdimg, $hexcolor1);
+        $color2      = phpthumb_functions::ImageHexColorAllocate($gdimg, $hexcolor2);
+        for ($i = 0; $i < $edge_width; $i++) {
+            // outer bevel
+            imageline($gdimg,                   $i,                   $i,                   $i, imagesy($gdimg) - $i, $color1); // left
+            imageline($gdimg,                   $i,                   $i, imagesx($gdimg) - $i,                   $i, $color1); // top
+            imageline($gdimg, imagesx($gdimg) - $i, imagesy($gdimg) - $i, imagesx($gdimg) - $i,                   $i, $color2); // right
+            imageline($gdimg, imagesx($gdimg) - $i, imagesy($gdimg) - $i,                   $i, imagesy($gdimg) - $i, $color2); // bottom
+        }
+        for ($i = 0; $i < $frame_width; $i++) {
+            // actual frame
+            imagerectangle($gdimg, $edge_width + $i, $edge_width + $i, imagesx($gdimg) - $edge_width - $i, imagesy($gdimg) - $edge_width - $i, $color_frame);
+        }
+        for ($i = 0; $i < $edge_width; $i++) {
+            // inner bevel
+            imageline($gdimg,                   $frame_width + $edge_width + $i,                   $frame_width + $edge_width + $i,                   $frame_width + $edge_width + $i, imagesy($gdimg) - $frame_width - $edge_width - $i, $color2); // left
+            imageline($gdimg,                   $frame_width + $edge_width + $i,                   $frame_width + $edge_width + $i, imagesx($gdimg) - $frame_width - $edge_width - $i,                   $frame_width + $edge_width + $i, $color2); // top
+            imageline($gdimg, imagesx($gdimg) - $frame_width - $edge_width - $i, imagesy($gdimg) - $frame_width - $edge_width - $i, imagesx($gdimg) - $frame_width - $edge_width - $i,                   $frame_width + $edge_width + $i, $color1); // right
+            imageline($gdimg, imagesx($gdimg) - $frame_width - $edge_width - $i, imagesy($gdimg) - $frame_width - $edge_width - $i,                   $frame_width + $edge_width + $i, imagesy($gdimg) - $frame_width - $edge_width - $i, $color1); // bottom
+        }
+        return true;
+    }
+
+
+    public function Gamma(&$gdimg, $amount) {
+        if (number_format($amount, 4) == '1.0000') {
+            return true;
+        }
+        return imagegammacorrect($gdimg, 1.0, $amount);
+    }
+
+
+    public function Grayscale(&$gdimg) {
+        if (phpthumb_functions::version_compare_replacement(PHP_VERSION, '5.0.0', '>=') && phpthumb_functions::gd_is_bundled()) {
+            if (imagefilter($gdimg, IMG_FILTER_GRAYSCALE)) {
+                return true;
+            }
+            $this->DebugMessage('FAILED: imagefilter($gdimg, IMG_FILTER_GRAYSCALE)', __FILE__, __LINE__);
+            // fall through and try it the hard way
+        }
+        return self::Colorize($gdimg, 100, 'gray');
+    }
+
+
+    public function HistogramAnalysis(&$gdimg, $calculateGray=false) {
+        $ImageSX = imagesx($gdimg);
+        $ImageSY = imagesy($gdimg);
+        $Analysis = array();
+        for ($x = 0; $x < $ImageSX; $x++) {
+            for ($y = 0; $y < $ImageSY; $y++) {
+                $OriginalPixel = phpthumb_functions::GetPixelColor($gdimg, $x, $y);
+                @$Analysis['red'][$OriginalPixel['red']]++;
+                @$Analysis['green'][$OriginalPixel['green']]++;
+                @$Analysis['blue'][$OriginalPixel['blue']]++;
+                @$Analysis['alpha'][$OriginalPixel['alpha']]++;
+                if ($calculateGray) {
+                    $GrayPixel = phpthumb_functions::GrayscalePixel($OriginalPixel);
+                    @$Analysis['gray'][$GrayPixel['red']]++;
+                }
+            }
+        }
+        $keys = array('red', 'green', 'blue', 'alpha');
+        if ($calculateGray) {
+            $keys[] = 'gray';
+        }
+        foreach ($keys as $dummy => $key) {
+            ksort($Analysis[$key]);
+        }
+        return $Analysis;
+    }
+
+
+    public function HistogramStretch(&$gdimg, $band='*', $method=0, $threshold=0.1) {
+        // equivalent of "Auto Contrast" in Adobe Photoshop
+        // method 0 stretches according to RGB colors. Gives a more conservative stretch.
+        // method 1 band stretches according to grayscale which is color-biased (59% green, 30% red, 11% blue). May give a punchier / more aggressive stretch, possibly appearing over-saturated
+        $Analysis = self::HistogramAnalysis($gdimg, true);
+        $keys = array('r'=>'red', 'g'=>'green', 'b'=>'blue', 'a'=>'alpha', '*'=>(($method == 0) ? 'all' : 'gray'));
+        $band = $band[ 0 ];
+        if (!isset($keys[$band])) {
+            return false;
+        }
+        $key = $keys[$band];
+
+        // If the absolute brightest and darkest pixels are used then one random
+        // pixel in the image could throw off the whole system. Instead, count up/down
+        // from the limit and allow <threshold> (default = 0.1%) of brightest/darkest
+        // pixels to be clipped to min/max
+        $threshold = (float) $threshold / 100;
+        $clip_threshold = imagesx($gdimg) * imagesx($gdimg) * $threshold;
+
+        $countsum  = 0;
+        $range_min = 0;
+        for ($i = 0; $i <= 255; $i++) {
+            if ($method == 0) {
+                $countsum = max(@$Analysis['red'][$i], @$Analysis['green'][$i], @$Analysis['blue'][$i]);
+            } else {
+                $countsum += @$Analysis[$key][$i];
+            }
+            if ($countsum >= $clip_threshold) {
+                $range_min = $i - 1;
+                break;
+            }
+        }
+        $range_min = max($range_min, 0);
+
+        $countsum  =   0;
+        $range_max = 255;
+        for ($i = 255; $i >= 0; $i--) {
+            if ($method == 0) {
+                $countsum = max(@$Analysis['red'][$i], @$Analysis['green'][$i], @$Analysis['blue'][$i]);
+            } else {
+                $countsum += @$Analysis[$key][$i];
+            }
+            if ($countsum >= $clip_threshold) {
+                $range_max = $i + 1;
+                break;
+            }
+        }
+        $range_max = min($range_max, 255);
+
+        $range_scale = (($range_max == $range_min) ? 1 : (255 / ($range_max - $range_min)));
+        if (($range_min == 0) && ($range_max == 255)) {
+            // no adjustment necessary - don't waste CPU time!
+            return true;
+        }
+
+        $ImageSX = imagesx($gdimg);
+        $ImageSY = imagesy($gdimg);
+        for ($x = 0; $x < $ImageSX; $x++) {
+            for ($y = 0; $y < $ImageSY; $y++) {
+                $OriginalPixel = phpthumb_functions::GetPixelColor($gdimg, $x, $y);
+                if ($band == '*') {
+                    $new['red']   = min(255, max(0, ($OriginalPixel['red']   - $range_min) * $range_scale));
+                    $new['green'] = min(255, max(0, ($OriginalPixel['green'] - $range_min) * $range_scale));
+                    $new['blue']  = min(255, max(0, ($OriginalPixel['blue']  - $range_min) * $range_scale));
+                    $new['alpha'] = min(255, max(0, ($OriginalPixel['alpha'] - $range_min) * $range_scale));
+                } else {
+                    $new = $OriginalPixel;
+                    $new[$key] = min(255, max(0, ($OriginalPixel[$key] - $range_min) * $range_scale));
+                }
+                $newColor = phpthumb_functions::ImageColorAllocateAlphaSafe($gdimg, $new['red'], $new['green'], $new['blue'], $new['alpha']);
+                imagesetpixel($gdimg, $x, $y, $newColor);
+            }
+        }
+
+        return true;
+    }
+
+
+    public function HistogramOverlay(&$gdimg, $bands='*', $colors='', $width=0.25, $height=0.25, $alignment='BR', $opacity=50, $margin_x=5, $margin_y=null) {
+        $margin_y = (null === $margin_y ? $margin_x : $margin_y);
+
+        $Analysis = self::HistogramAnalysis($gdimg, true);
+        $histW = round(($width > 1) ? min($width, imagesx($gdimg)) : imagesx($gdimg) * $width);
+        $histH = round(($width > 1) ? min($width, imagesx($gdimg)) : imagesx($gdimg) * $width);
+        if ($gdHist = imagecreatetruecolor($histW, $histH)) {
+            $color_back = phpthumb_functions::ImageColorAllocateAlphaSafe($gdHist, 0, 0, 0, 127);
+            imagefilledrectangle($gdHist, 0, 0, $histW, $histH, $color_back);
+            imagealphablending($gdHist, false);
+            imagesavealpha($gdHist, true);
+
+            $HistogramTempWidth  = 256;
+            $HistogramTempHeight = 100;
+            if ($gdHistTemp = imagecreatetruecolor($HistogramTempWidth, $HistogramTempHeight)) {
+                $color_back_temp = phpthumb_functions::ImageColorAllocateAlphaSafe($gdHistTemp, 255, 0, 255, 127);
+                imagealphablending($gdHistTemp, false);
+                imagesavealpha($gdHistTemp, true);
+                imagefilledrectangle($gdHistTemp, 0, 0, imagesx($gdHistTemp), imagesy($gdHistTemp), $color_back_temp);
+
+                $DefaultColors = array('r'=>'FF0000', 'g'=>'00FF00', 'b'=>'0000FF', 'a'=>'999999', '*'=>'FFFFFF');
+                $Colors = explode(';', $colors);
+                $BandsToGraph = array_unique(preg_split('##', $bands));
+                $keys = array('r'=>'red', 'g'=>'green', 'b'=>'blue', 'a'=>'alpha', '*'=>'gray');
+                foreach ($BandsToGraph as $key => $band) {
+                    if (!isset($keys[$band])) {
+                        continue;
+                    }
+                    $PeakValue = max($Analysis[$keys[$band]]);
+                    $thisColor = phpthumb_functions::ImageHexColorAllocate($gdHistTemp, phpthumb_functions::IsHexColor(@$Colors[$key]) ? $Colors[$key] : $DefaultColors[$band]);
+                    for ($x = 0; $x < $HistogramTempWidth; $x++) {
+                        imageline($gdHistTemp, $x, $HistogramTempHeight - 1, $x, $HistogramTempHeight - 1 - round(@$Analysis[$keys[$band]][$x] / $PeakValue * $HistogramTempHeight), $thisColor);
+                    }
+                    imageline($gdHistTemp, 0, $HistogramTempHeight - 1, $HistogramTempWidth - 1, $HistogramTempHeight - 1, $thisColor);
+                    imageline($gdHistTemp, 0, $HistogramTempHeight - 2, $HistogramTempWidth - 1, $HistogramTempHeight - 2, $thisColor);
+                }
+                imagecopyresampled($gdHist, $gdHistTemp, 0, 0, 0, 0, imagesx($gdHist), imagesy($gdHist), imagesx($gdHistTemp), imagesy($gdHistTemp));
+                imagedestroy($gdHistTemp);
+            } else {
+                return false;
+            }
+
+            self::WatermarkOverlay($gdimg, $gdHist, $alignment, $opacity, $margin_x, $margin_y);
+            imagedestroy($gdHist);
+            return true;
+        }
+        return false;
+    }
+
+
+    public function ImageBorder(&$gdimg, $border_width, $radius_x, $radius_y, $hexcolor_border) {
+        $border_width = ($border_width ? $border_width : 1);
+        $radius_x     = ($radius_x     ? $radius_x     : 0);
+        $radius_y     = ($radius_y     ? $radius_y     : 0);
+
+        $output_width  = imagesx($gdimg);
+        $output_height = imagesy($gdimg);
+
+        list($new_width, $new_height) = phpthumb_functions::ProportionalResize($output_width, $output_height, $output_width - max($border_width * 2, $radius_x), $output_height - max($border_width * 2, $radius_y));
+        $offset_x = ($radius_x ? $output_width  - $new_width  - $radius_x : 0);
+
+        if ($gd_border_canvas = phpthumb_functions::ImageCreateFunction($output_width, $output_height)) {
+
+            imagesavealpha($gd_border_canvas, true);
+            imagealphablending($gd_border_canvas, false);
+            $color_background = phpthumb_functions::ImageColorAllocateAlphaSafe($gd_border_canvas, 255, 255, 255, 127);
+            imagefilledrectangle($gd_border_canvas, 0, 0, $output_width, $output_height, $color_background);
+
+            $color_border = phpthumb_functions::ImageHexColorAllocate($gd_border_canvas, (phpthumb_functions::IsHexColor($hexcolor_border) ? $hexcolor_border : '000000'));
+
+            for ($i = 0; $i < $border_width; $i++) {
+                imageline($gd_border_canvas,             floor($offset_x / 2) + $radius_x,                      $i, $output_width - $radius_x - ceil($offset_x / 2),                         $i, $color_border); // top
+                imageline($gd_border_canvas,             floor($offset_x / 2) + $radius_x, $output_height - 1 - $i, $output_width - $radius_x - ceil($offset_x / 2),    $output_height - 1 - $i, $color_border); // bottom
+                imageline($gd_border_canvas,                    floor($offset_x / 2) + $i,               $radius_y,                      floor($offset_x / 2) +  $i, $output_height - $radius_y, $color_border); // left
+                imageline($gd_border_canvas, $output_width - 1 - $i - ceil($offset_x / 2),               $radius_y,    $output_width - 1 - $i - ceil($offset_x / 2), $output_height - $radius_y, $color_border); // right
+            }
+
+            if ($radius_x && $radius_y) {
+
+                // PHP bug: imagearc() with thicknesses > 1 give bad/undesirable/unpredicatable results
+                // Solution: Draw multiple 1px arcs side-by-side.
+
+                // Problem: parallel arcs give strange/ugly antialiasing problems
+                // Solution: draw non-parallel arcs, from one side of the line thickness at the start angle
+                //   to the opposite edge of the line thickness at the terminating angle
+                for ($thickness_offset = 0; $thickness_offset < $border_width; $thickness_offset++) {
+                    imagearc($gd_border_canvas, floor($offset_x / 2) + 1 +                 $radius_x,              $thickness_offset - 1 + $radius_y, $radius_x * 2, $radius_y * 2, 180, 270, $color_border); // top-left
+                    imagearc($gd_border_canvas,                     $output_width - $radius_x - 1 - ceil($offset_x / 2),              $thickness_offset - 1 + $radius_y, $radius_x * 2, $radius_y * 2, 270, 360, $color_border); // top-right
+                    imagearc($gd_border_canvas,                     $output_width - $radius_x - 1 - ceil($offset_x / 2), $output_height - $thickness_offset - $radius_y, $radius_x * 2, $radius_y * 2,   0,  90, $color_border); // bottom-right
+                    imagearc($gd_border_canvas, floor($offset_x / 2) + 1 +                 $radius_x, $output_height - $thickness_offset - $radius_y, $radius_x * 2, $radius_y * 2,  90, 180, $color_border); // bottom-left
+                }
+                if ($border_width > 1) {
+                    for ($thickness_offset = 0; $thickness_offset < $border_width; $thickness_offset++) {
+                        imagearc($gd_border_canvas, floor($offset_x / 2) + $thickness_offset + $radius_x,                                      $radius_y, $radius_x * 2, $radius_y * 2, 180, 270, $color_border); // top-left
+                        imagearc($gd_border_canvas, $output_width - $thickness_offset - $radius_x - 1 - ceil($offset_x / 2),                                      $radius_y, $radius_x * 2, $radius_y * 2, 270, 360, $color_border); // top-right
+                        imagearc($gd_border_canvas, $output_width - $thickness_offset - $radius_x - 1 - ceil($offset_x / 2),                     $output_height - $radius_y, $radius_x * 2, $radius_y * 2,   0,  90, $color_border); // bottom-right
+                        imagearc($gd_border_canvas, floor($offset_x / 2) + $thickness_offset + $radius_x,                     $output_height - $radius_y, $radius_x * 2, $radius_y * 2,  90, 180, $color_border); // bottom-left
+                    }
+                }
+
+            }
+            $this->phpThumbObject->ImageResizeFunction($gd_border_canvas, $gdimg, floor(($output_width - $new_width) / 2), round(($output_height - $new_height) / 2), 0, 0, $new_width, $new_height, $output_width, $output_height);
+
+            imagedestroy($gdimg);
+            $gdimg = phpthumb_functions::ImageCreateFunction($output_width, $output_height);
+            imagesavealpha($gdimg, true);
+            imagealphablending($gdimg, false);
+            $gdimg_color_background = phpthumb_functions::ImageColorAllocateAlphaSafe($gdimg, 255, 255, 255, 127);
+            imagefilledrectangle($gdimg, 0, 0, $output_width, $output_height, $gdimg_color_background);
+
+            imagecopy($gdimg, $gd_border_canvas, 0, 0, 0, 0, $output_width, $output_height);
+            imagedestroy($gd_border_canvas);
+            return true;
+
+
+        } else {
+            $this->DebugMessage('FAILED: $gd_border_canvas = phpthumb_functions::ImageCreateFunction('.$output_width.', '.$output_height.')', __FILE__, __LINE__);
+        }
+        return false;
+    }
+
+
+    public static function ImprovedImageRotate(&$gdimg_source, $rotate_angle=0, $config_background_hexcolor='FFFFFF', $bg=null, &$phpThumbObject) {
+        while ($rotate_angle < 0) {
+            $rotate_angle += 360;
+        }
+        $rotate_angle %= 360;
+        if ($rotate_angle != 0) {
+
+            $background_color = phpthumb_functions::ImageHexColorAllocate($gdimg_source, $config_background_hexcolor);
+
+            if ((phpthumb_functions::gd_version() >= 2) && !$bg && ($rotate_angle % 90)) {
+
+                //$this->DebugMessage('Using alpha rotate', __FILE__, __LINE__);
+                if ($gdimg_rotate_mask = phpthumb_functions::ImageCreateFunction(imagesx($gdimg_source), imagesy($gdimg_source))) {
+
+                    $color_mask = array();
+                    for ($i = 0; $i <= 255; $i++) {
+                        $color_mask[$i] = imagecolorallocate($gdimg_rotate_mask, $i, $i, $i);
+                    }
+                    imagefilledrectangle($gdimg_rotate_mask, 0, 0, imagesx($gdimg_rotate_mask), imagesy($gdimg_rotate_mask), $color_mask[255]);
+                    $imageX = imagesx($gdimg_source);
+                    $imageY = imagesy($gdimg_source);
+                    for ($x = 0; $x < $imageX; $x++) {
+                        for ($y = 0; $y < $imageY; $y++) {
+                            $pixelcolor = phpthumb_functions::GetPixelColor($gdimg_source, $x, $y);
+                            imagesetpixel($gdimg_rotate_mask, $x, $y, $color_mask[255 - round($pixelcolor['alpha'] * 255 / 127)]);
+                        }
+                    }
+                    $gdimg_rotate_mask = imagerotate($gdimg_rotate_mask, $rotate_angle, $color_mask[0]);
+                    $gdimg_source      = imagerotate($gdimg_source,      $rotate_angle, $background_color);
+
+                    imagealphablending($gdimg_source, false);
+                    imagesavealpha($gdimg_source, true);
+                    //$this->is_alpha = true;
+                    $phpThumbFilters = new self();
+                    //$phpThumbFilters->phpThumbObject = $this;
+                    $phpThumbFilters->phpThumbObject = $phpThumbObject;
+                    $phpThumbFilters->ApplyMask($gdimg_rotate_mask, $gdimg_source);
+
+                    imagedestroy($gdimg_rotate_mask);
+
+                } else {
+                    //$this->DebugMessage('ImageCreateFunction() failed', __FILE__, __LINE__);
+                }
+
+            } else {
+
+                if (phpthumb_functions::gd_version() < 2) {
+                    //$this->DebugMessage('Using non-alpha rotate because gd_version is "'.phpthumb_functions::gd_version().'"', __FILE__, __LINE__);
+                } elseif ($bg) {
+                    //$this->DebugMessage('Using non-alpha rotate because $this->bg is "'.$bg.'"', __FILE__, __LINE__);
+                } elseif ($rotate_angle % 90) {
+                    //$this->DebugMessage('Using non-alpha rotate because ($rotate_angle % 90) = "'.($rotate_angle % 90).'"', __FILE__, __LINE__);
+                } else {
+                    //$this->DebugMessage('Using non-alpha rotate because $this->thumbnailFormat is "'.$this->thumbnailFormat.'"', __FILE__, __LINE__);
+                }
+
+                if (imagecolortransparent($gdimg_source) >= 0) {
+                    // imagerotate() forgets all about an image's transparency and sets the transparent color to black
+                    // To compensate, flood-fill the transparent color of the source image with the specified background color first
+                    // then rotate and the colors should match
+
+                    if (!function_exists('imageistruecolor') || !imageistruecolor($gdimg_source)) {
+                        // convert paletted image to true-color before rotating to prevent nasty aliasing artifacts
+
+                        //$this->source_width  = imagesx($gdimg_source);
+                        //$this->source_height = imagesy($gdimg_source);
+                        $gdimg_newsrc = phpthumb_functions::ImageCreateFunction(imagesx($gdimg_source), imagesy($gdimg_source));
+                        $background_color = phpthumb_functions::ImageHexColorAllocate($gdimg_newsrc, $config_background_hexcolor);
+                        imagefilledrectangle($gdimg_newsrc, 0, 0, imagesx($gdimg_source), imagesy($gdimg_source), phpthumb_functions::ImageHexColorAllocate($gdimg_newsrc, $config_background_hexcolor));
+                        imagecopy($gdimg_newsrc, $gdimg_source, 0, 0, 0, 0, imagesx($gdimg_source), imagesy($gdimg_source));
+                        imagedestroy($gdimg_source);
+                        unset($gdimg_source);
+                        $gdimg_source = $gdimg_newsrc;
+                        unset($gdimg_newsrc);
+
+                    } else {
+
+                        imagecolorset(
+                            $gdimg_source,
+                            imagecolortransparent($gdimg_source),
+                            hexdec(substr($config_background_hexcolor, 0, 2)),
+                            hexdec(substr($config_background_hexcolor, 2, 2)),
+                            hexdec(substr($config_background_hexcolor, 4, 2)));
+
+                        imagecolortransparent($gdimg_source, -1);
+
+                    }
+                }
+
+                $gdimg_source = imagerotate($gdimg_source, $rotate_angle, $background_color);
+
+            }
+        }
+        return true;
+    }
+
+
+    public function MeanRemoval(&$gdimg) {
+        if (phpthumb_functions::version_compare_replacement(PHP_VERSION, '5.0.0', '>=') && phpthumb_functions::gd_is_bundled()) {
+            if (imagefilter($gdimg, IMG_FILTER_MEAN_REMOVAL)) {
+                return true;
+            }
+            $this->DebugMessage('FAILED: imagefilter($gdimg, IMG_FILTER_MEAN_REMOVAL)', __FILE__, __LINE__);
+            // fall through and try it the hard way
+        }
+        // currently not implemented "the hard way"
+        $this->DebugMessage('FAILED: phpthumb_filters::MeanRemoval($gdimg) [function not implemented]', __FILE__, __LINE__);
+        return false;
+    }
+
+
+    public function Negative(&$gdimg) {
+        if (phpthumb_functions::version_compare_replacement(PHP_VERSION, '5.0.0', '>=') && phpthumb_functions::gd_is_bundled()) {
+            if (imagefilter($gdimg, IMG_FILTER_NEGATE)) {
+                return true;
+            }
+            $this->DebugMessage('FAILED: imagefilter($gdimg, IMG_FILTER_NEGATE)', __FILE__, __LINE__);
+            // fall through and try it the hard way
+        }
+        $ImageSX = imagesx($gdimg);
+        $ImageSY = imagesy($gdimg);
+        for ($x = 0; $x < $ImageSX; $x++) {
+            for ($y = 0; $y < $ImageSY; $y++) {
+                $currentPixel = phpthumb_functions::GetPixelColor($gdimg, $x, $y);
+                $newColor = phpthumb_functions::ImageColorAllocateAlphaSafe($gdimg, (~$currentPixel['red'] & 0xFF), (~$currentPixel['green'] & 0xFF), (~$currentPixel['blue'] & 0xFF), $currentPixel['alpha']);
+                imagesetpixel($gdimg, $x, $y, $newColor);
+            }
+        }
+        return true;
+    }
+
+
+    public function RoundedImageCorners(&$gdimg, $radius_x, $radius_y) {
+        // generate mask at twice desired resolution and downsample afterwards for easy antialiasing
+        // mask is generated as a white double-size ellipse on a triple-size black background and copy-paste-resampled
+        // onto a correct-size mask image as 4 corners due to errors when the entire mask is resampled at once (gray edges)
+        if ($gdimg_cornermask_triple = phpthumb_functions::ImageCreateFunction($radius_x * 6, $radius_y * 6)) {
+            if ($gdimg_cornermask = phpthumb_functions::ImageCreateFunction(imagesx($gdimg), imagesy($gdimg))) {
+
+                $color_transparent = imagecolorallocate($gdimg_cornermask_triple, 255, 255, 255);
+                imagefilledellipse($gdimg_cornermask_triple, $radius_x * 3, $radius_y * 3, $radius_x * 4, $radius_y * 4, $color_transparent);
+
+                imagefilledrectangle($gdimg_cornermask, 0, 0, imagesx($gdimg), imagesy($gdimg), $color_transparent);
+
+                imagecopyresampled($gdimg_cornermask, $gdimg_cornermask_triple,                           0,                           0,     $radius_x,     $radius_y, $radius_x, $radius_y, $radius_x * 2, $radius_y * 2);
+                imagecopyresampled($gdimg_cornermask, $gdimg_cornermask_triple,                           0, imagesy($gdimg) - $radius_y,     $radius_x, $radius_y * 3, $radius_x, $radius_y, $radius_x * 2, $radius_y * 2);
+                imagecopyresampled($gdimg_cornermask, $gdimg_cornermask_triple, imagesx($gdimg) - $radius_x, imagesy($gdimg) - $radius_y, $radius_x * 3, $radius_y * 3, $radius_x, $radius_y, $radius_x * 2, $radius_y * 2);
+                imagecopyresampled($gdimg_cornermask, $gdimg_cornermask_triple, imagesx($gdimg) - $radius_x,                           0, $radius_x * 3,     $radius_y, $radius_x, $radius_y, $radius_x * 2, $radius_y * 2);
+
+                self::ApplyMask($gdimg_cornermask, $gdimg);
+                imagedestroy($gdimg_cornermask);
+                $this->DebugMessage('RoundedImageCorners('.$radius_x.', '.$radius_y.') succeeded', __FILE__, __LINE__);
+                return true;
+
+            } else {
+                $this->DebugMessage('FAILED: $gdimg_cornermask = phpthumb_functions::ImageCreateFunction('.imagesx($gdimg).', '.imagesy($gdimg).')', __FILE__, __LINE__);
+            }
+            imagedestroy($gdimg_cornermask_triple);
+
+        } else {
+            $this->DebugMessage('FAILED: $gdimg_cornermask_triple = phpthumb_functions::ImageCreateFunction('.($radius_x * 6).', '.($radius_y * 6).')', __FILE__, __LINE__);
+        }
+        return false;
+    }
+
+
+    public function Saturation(&$gdimg, $amount, $color='') {
+        if ($amount == 0) {
+            return true;
+        } elseif ($amount > 0) {
+            $amount = 0 - $amount;
+        } else {
+            $amount = abs($amount);
+        }
+        return self::Desaturate($gdimg, $amount, $color);
+    }
+
+
+    public function Sepia(&$gdimg, $amount, $targetColor) {
+        $amount      = (is_numeric($amount) ? max(0, min(100, $amount)) : 50);
+        $amountPct   = $amount / 100;
+        $targetColor = (phpthumb_functions::IsHexColor($targetColor) ? $targetColor : 'A28065');
+
+        if ($amount == 0) {
+            return true;
+        }
+
+        if (phpthumb_functions::version_compare_replacement(PHP_VERSION, '5.0.0', '>=') && phpthumb_functions::gd_is_bundled()) {
+            if (imagefilter($gdimg, IMG_FILTER_GRAYSCALE)) {
+
+                $r = round($amountPct * hexdec(substr($targetColor, 0, 2)));
+                $g = round($amountPct * hexdec(substr($targetColor, 2, 2)));
+                $b = round($amountPct * hexdec(substr($targetColor, 4, 2)));
+                if (imagefilter($gdimg, IMG_FILTER_COLORIZE, $r, $g, $b)) {
+                    return true;
+                }
+                $this->DebugMessage('FAILED: imagefilter($gdimg, IMG_FILTER_COLORIZE)', __FILE__, __LINE__);
+                // fall through and try it the hard way
+
+            } else {
+
+                $this->DebugMessage('FAILED: imagefilter($gdimg, IMG_FILTER_GRAYSCALE)', __FILE__, __LINE__);
+                // fall through and try it the hard way
+
+            }
+        }
+
+        $TargetPixel['red']   = hexdec(substr($targetColor, 0, 2));
+        $TargetPixel['green'] = hexdec(substr($targetColor, 2, 2));
+        $TargetPixel['blue']  = hexdec(substr($targetColor, 4, 2));
+
+        $ImageSX = imagesx($gdimg);
+        $ImageSY = imagesy($gdimg);
+        for ($x = 0; $x < $ImageSX; $x++) {
+            for ($y = 0; $y < $ImageSY; $y++) {
+                $OriginalPixel = phpthumb_functions::GetPixelColor($gdimg, $x, $y);
+                $GrayPixel = phpthumb_functions::GrayscalePixel($OriginalPixel);
+
+                // http://www.gimpguru.org/Tutorials/SepiaToning/
+                // "In the traditional sepia toning process, the tinting occurs most in
+                // the mid-tones: the lighter and darker areas appear to be closer to B&W."
+                $SepiaAmount = ((128 - abs($GrayPixel['red'] - 128)) / 128) * $amountPct;
+
+                $NewPixel = array();
+                foreach ($TargetPixel as $key => $value) {
+                    $NewPixel[$key] = round(max(0, min(255, $GrayPixel[$key] * (1 - $SepiaAmount) + ($TargetPixel[$key] * $SepiaAmount))));
+                }
+                $newColor = phpthumb_functions::ImageColorAllocateAlphaSafe($gdimg, $NewPixel['red'], $NewPixel['green'], $NewPixel['blue'], $OriginalPixel['alpha']);
+                imagesetpixel($gdimg, $x, $y, $newColor);
+            }
+        }
+        return true;
+    }
+
+
+    public function Smooth(&$gdimg, $amount=6) {
+        $amount = min(25, max(0, $amount));
+        if ($amount == 0) {
+            return true;
+        }
+        if (phpthumb_functions::version_compare_replacement(PHP_VERSION, '5.0.0', '>=') && phpthumb_functions::gd_is_bundled()) {
+            if (imagefilter($gdimg, IMG_FILTER_SMOOTH, $amount)) {
+                return true;
+            }
+            $this->DebugMessage('FAILED: imagefilter($gdimg, IMG_FILTER_SMOOTH, '.$amount.')', __FILE__, __LINE__);
+            // fall through and try it the hard way
+        }
+        // currently not implemented "the hard way"
+        $this->DebugMessage('FAILED: phpthumb_filters::Smooth($gdimg, '.$amount.') [function not implemented]', __FILE__, __LINE__);
+        return false;
+    }
+
+
+    public function SourceTransparentColorMask(&$gdimg, $hexcolor, $min_limit=5, $max_limit=10) {
+        $width  = imagesx($gdimg);
+        $height = imagesy($gdimg);
+        if ($gdimg_mask = imagecreatetruecolor($width, $height)) {
+            $R = hexdec(substr($hexcolor, 0, 2));
+            $G = hexdec(substr($hexcolor, 2, 2));
+            $B = hexdec(substr($hexcolor, 4, 2));
+            $targetPixel = array('red'=>$R, 'green'=>$G, 'blue'=>$B);
+            $cutoffRange = $max_limit - $min_limit;
+            for ($x = 0; $x < $width; $x++) {
+                for ($y = 0; $y < $height; $y++) {
+                    $currentPixel = phpthumb_functions::GetPixelColor($gdimg, $x, $y);
+                    $colorDiff = phpthumb_functions::PixelColorDifferencePercent($currentPixel, $targetPixel);
+                    $grayLevel = min($cutoffRange, max(0, -$min_limit + $colorDiff)) * (255 / max(1, $cutoffRange));
+                    $newColor = imagecolorallocate($gdimg_mask, $grayLevel, $grayLevel, $grayLevel);
+                    imagesetpixel($gdimg_mask, $x, $y, $newColor);
+                }
+            }
+            return $gdimg_mask;
+        }
+        return false;
+    }
+
+
+    public function Threshold(&$gdimg, $cutoff) {
+        $width  = imagesx($gdimg);
+        $height = imagesy($gdimg);
+        $cutoff = min(255, max(0, ($cutoff ? $cutoff : 128)));
+        for ($x = 0; $x < $width; $x++) {
+            for ($y = 0; $y < $height; $y++) {
+                $currentPixel = phpthumb_functions::GetPixelColor($gdimg, $x, $y);
+                $grayPixel = phpthumb_functions::GrayscalePixel($currentPixel);
+                if ($grayPixel['red'] < $cutoff) {
+                    $newColor = phpthumb_functions::ImageColorAllocateAlphaSafe($gdimg, 0x00, 0x00, 0x00, $currentPixel['alpha']);
+                } else {
+                    $newColor = phpthumb_functions::ImageColorAllocateAlphaSafe($gdimg, 0xFF, 0xFF, 0xFF, $currentPixel['alpha']);
+                }
+                imagesetpixel($gdimg, $x, $y, $newColor);
+            }
+        }
+        return true;
+    }
+
+
+    public function ImageTrueColorToPalette2(&$image, $dither, $ncolors) {
+        // http://www.php.net/manual/en/function.imagetruecolortopalette.php
+        // zmorris at zsculpt dot com (17-Aug-2004 06:58)
+        $width  = imagesx($image);
+        $height = imagesy($image);
+        $image_copy = imagecreatetruecolor($width, $height);
+        //imagecopymerge($image_copy, $image, 0, 0, 0, 0, $width, $height, 100);
+        imagecopy($image_copy, $image, 0, 0, 0, 0, $width, $height);
+        imagetruecolortopalette($image, $dither, $ncolors);
+        imagecolormatch($image_copy, $image);
+        imagedestroy($image_copy);
+        return true;
+    }
+
+    public function ReduceColorDepth(&$gdimg, $colors=256, $dither=true) {
+        $colors = max(min($colors, 256), 2);
+        // imagetruecolortopalette usually makes ugly colors, the replacement is a bit better
+        //imagetruecolortopalette($gdimg, $dither, $colors);
+        self::ImageTrueColorToPalette2($gdimg, $dither, $colors);
+        return true;
+    }
+
+
+    public function WhiteBalance(&$gdimg, $targetColor='') {
+        if (phpthumb_functions::IsHexColor($targetColor)) {
+            $targetPixel = array(
+                'red'   => hexdec(substr($targetColor, 0, 2)),
+                'green' => hexdec(substr($targetColor, 2, 2)),
+                'blue'  => hexdec(substr($targetColor, 4, 2))
+            );
+        } else {
+            $Analysis = self::HistogramAnalysis($gdimg, false);
+            $targetPixel = array(
+                'red'   => max(array_keys($Analysis['red'])),
+                'green' => max(array_keys($Analysis['green'])),
+                'blue'  => max(array_keys($Analysis['blue']))
+            );
+        }
+        $grayValue = phpthumb_functions::GrayscaleValue($targetPixel['red'], $targetPixel['green'], $targetPixel['blue']);
+        $scaleR = $grayValue / $targetPixel['red'];
+        $scaleG = $grayValue / $targetPixel['green'];
+        $scaleB = $grayValue / $targetPixel['blue'];
+
+        for ($x = 0, $xMax = imagesx($gdimg); $x < $xMax; $x++) {
+            for ($y = 0, $yMax = imagesy($gdimg); $y < $yMax; $y++) {
+                $currentPixel = phpthumb_functions::GetPixelColor($gdimg, $x, $y);
+                $newColor = phpthumb_functions::ImageColorAllocateAlphaSafe(
+                    $gdimg,
+                    max(0, min(255, round($currentPixel['red']   * $scaleR))),
+                    max(0, min(255, round($currentPixel['green'] * $scaleG))),
+                    max(0, min(255, round($currentPixel['blue']  * $scaleB))),
+                    $currentPixel['alpha']
+                );
+                imagesetpixel($gdimg, $x, $y, $newColor);
+            }
+        }
+        return true;
+    }
+
+
+    public function WatermarkText(&$gdimg, $text, $size, $alignment, $hex_color='000000', $ttffont='', $opacity=100, $margin=5, $angle=0, $bg_color=false, $bg_opacity=0, $fillextend='', $lineheight=1.0) {
+        // text watermark requested
+        if (!$text) {
+            return false;
+        }
+        imagealphablending($gdimg, true);
+
+        if (preg_match('#^([0-9\\.\\-]*)x([0-9\\.\\-]*)(@[LCR])?$#i', $alignment, $matches)) {
+            $originOffsetX = (int) $matches[ 1];
+            $originOffsetY = (int) $matches[ 2];
+            $alignment = (@$matches[4] ? $matches[4] : 'L');
+            $margin = 0;
+        } else {
+            $originOffsetX = 0;
+            $originOffsetY = 0;
+        }
+        $lineheight = min(100.0, max(0.01, (float) $lineheight));
+
+        $metaTextArray = array(
+            '^Fb' =>       $this->phpThumbObject->getimagesizeinfo['filesize'],
+            '^Fk' => round($this->phpThumbObject->getimagesizeinfo['filesize'] / 1024),
+            '^Fm' => round($this->phpThumbObject->getimagesizeinfo['filesize'] / 1048576),
+            '^X'  => $this->phpThumbObject->getimagesizeinfo[0],
+            '^Y'  => $this->phpThumbObject->getimagesizeinfo[1],
+            '^x'  => imagesx($gdimg),
+            '^y'  => imagesy($gdimg),
+            '^^'  => '^',
+        );
+        $text = strtr($text, $metaTextArray);
+
+        $text = str_replace(array(
+            "\r\n",
+            "\r"
+        ), "\n", $text);
+        $textlines = explode("\n", $text);
+        $this->DebugMessage('Processing '.count($textlines).' lines of text', __FILE__, __LINE__);
+
+        if (@is_readable($ttffont) && is_file($ttffont)) {
+
+            $opacity = 100 - (int) max(min($opacity, 100), 0);
+            $letter_color_text = phpthumb_functions::ImageHexColorAllocate($gdimg, $hex_color, false, $opacity * 1.27);
+
+            $this->DebugMessage('Using TTF font "'.$ttffont.'"', __FILE__, __LINE__);
+
+            $TTFbox = imagettfbbox($size, $angle, $ttffont, $text);
+
+            $min_x = min($TTFbox[0], $TTFbox[2], $TTFbox[4], $TTFbox[6]);
+            $max_x = max($TTFbox[0], $TTFbox[2], $TTFbox[4], $TTFbox[6]);
+            //$text_width = round($max_x - $min_x + ($size * 0.5));
+            $text_width = round($max_x - $min_x);
+
+            $min_y = min($TTFbox[1], $TTFbox[3], $TTFbox[5], $TTFbox[7]);
+            $max_y = max($TTFbox[1], $TTFbox[3], $TTFbox[5], $TTFbox[7]);
+            //$text_height = round($max_y - $min_y + ($size * 0.5));
+            $text_height = round($max_y - $min_y);
+
+            $TTFboxChar = imagettfbbox($size, $angle, $ttffont, 'jH');
+            $char_min_y = min($TTFboxChar[1], $TTFboxChar[3], $TTFboxChar[5], $TTFboxChar[7]);
+            $char_max_y = max($TTFboxChar[1], $TTFboxChar[3], $TTFboxChar[5], $TTFboxChar[7]);
+            $char_height = round($char_max_y - $char_min_y);
+
+            if ($alignment == '*') {
+
+                $text_origin_y = $char_height + $margin;
+                while (($text_origin_y - $text_height) < imagesy($gdimg)) {
+                    $text_origin_x = $margin;
+                    while ($text_origin_x < imagesx($gdimg)) {
+                        imagettftext($gdimg, $size, $angle, $text_origin_x, $text_origin_y, $letter_color_text, $ttffont, $text);
+                        $text_origin_x += ($text_width + $margin);
+                    }
+                    $text_origin_y += ($text_height + $margin) * $lineheight;
+                }
+
+            } else {
+
+                // this block for background color only
+
+                $text_origin_x = 0;
+                $text_origin_y = 0;
+                switch ($alignment) {
+                    case '*':
+                        // handled separately
+                        break;
+
+                    case 'T':
+                        $text_origin_x = ($originOffsetX ? $originOffsetX - round($text_width / 2) : round((imagesx($gdimg) - $text_width) / 2));
+                        $text_origin_y = $char_height + $margin + $originOffsetY;
+                        break;
+
+                    case 'B':
+                        $text_origin_x = ($originOffsetX ? $originOffsetX - round($text_width / 2) : round((imagesx($gdimg) - $text_width) / 2));
+                        $text_origin_y = imagesy($gdimg) + $TTFbox[1] - $margin + $originOffsetY;
+                        break;
+
+                    case 'L':
+                        $text_origin_x = $margin + $originOffsetX;
+                        $text_origin_y = ($originOffsetY ? $originOffsetY : round((imagesy($gdimg) - $text_height) / 2) + $char_height);
+                        break;
+
+                    case 'R':
+                        $text_origin_x = ($originOffsetX ? $originOffsetX - $text_width : imagesx($gdimg) - $text_width  + $TTFbox[0] - $min_x + round($size * 0.25) - $margin);
+                        $text_origin_y = ($originOffsetY ? $originOffsetY : round((imagesy($gdimg) - $text_height) / 2) + $char_height);
+                        break;
+
+                    case 'C':
+                        $text_origin_x = ($originOffsetX ? $originOffsetX - round($text_width / 2) : round((imagesx($gdimg) - $text_width) / 2));
+                        $text_origin_y = ($originOffsetY ? $originOffsetY : round((imagesy($gdimg) - $text_height) / 2) + $char_height);
+                        break;
+
+                    case 'TL':
+                        $text_origin_x = $margin + $originOffsetX;
+                        $text_origin_y = $char_height + $margin + $originOffsetY;
+                        break;
+
+                    case 'TR':
+                        $text_origin_x = ($originOffsetX ? $originOffsetX - $text_width : imagesx($gdimg) - $text_width  + $TTFbox[0] - $min_x + round($size * 0.25) - $margin);
+                        $text_origin_y = $char_height + $margin + $originOffsetY;
+                        break;
+
+                    case 'BL':
+                        $text_origin_x = $margin + $originOffsetX;
+                        $text_origin_y = imagesy($gdimg) + $TTFbox[1] - $margin + $originOffsetY;
+                        break;
+
+                    case 'BR':
+                    default:
+                        $text_origin_x = ($originOffsetX ? $originOffsetX - $text_width : imagesx($gdimg) - $text_width  + $TTFbox[0] - $min_x + round($size * 0.25) - $margin);
+                        $text_origin_y = imagesy($gdimg) + $TTFbox[1] - $margin + $originOffsetY;
+                        break;
+                }
+
+                if (phpthumb_functions::IsHexColor($bg_color)) {
+                    $text_background_alpha = round(127 * ((100 - min(max(0, $bg_opacity), 100)) / 100));
+                    $text_color_background = phpthumb_functions::ImageHexColorAllocate($gdimg, $bg_color, false, $text_background_alpha);
+                } else {
+                    $text_color_background = phpthumb_functions::ImageHexColorAllocate($gdimg, 'FFFFFF', false, 127);
+                }
+                $x1 = $text_origin_x + $min_x;
+                $y1 = $text_origin_y + $TTFbox[1];
+                $x2 = $text_origin_x + $min_x + $text_width;
+                $y2 = $text_origin_y + $TTFbox[1] - $text_height;
+                $x_TL = false !== stripos($fillextend, "x") ?               0 : min($x1, $x2);
+                $y_TL = false !== stripos($fillextend, "y") ?               0 : min($y1, $y2);
+                $x_BR = false !== stripos($fillextend, "x") ? imagesx($gdimg) : max($x1, $x2);
+                $y_BR = false !== stripos($fillextend, "y") ? imagesy($gdimg) : max($y1, $y2);
+                $this->DebugMessage('WatermarkText() calling imagefilledrectangle($gdimg, '.$x_TL.', '.$y_TL.', '.$x_BR.', '.$y_BR.', $text_color_background)', __FILE__, __LINE__);
+                imagefilledrectangle($gdimg, $x_TL, $y_TL, $x_BR, $y_BR, $text_color_background);
+
+                // end block for background color only
+
+
+                $y_offset = 0;
+                foreach ($textlines as $dummy => $line) {
+
+                    $TTFboxLine = imagettfbbox($size, $angle, $ttffont, $line);
+                    $min_x_line = min($TTFboxLine[0], $TTFboxLine[2], $TTFboxLine[4], $TTFboxLine[6]);
+                    $max_x_line = max($TTFboxLine[0], $TTFboxLine[2], $TTFboxLine[4], $TTFboxLine[6]);
+                    $text_width_line = round($max_x_line - $min_x_line);
+
+                    switch ($alignment) {
+                        // $text_origin_y set above, just re-set $text_origin_x here as needed
+
+                        case 'L':
+                        case 'TL':
+                        case 'BL':
+                            // no change necessary
+                            break;
+
+                        case 'C':
+                        case 'T':
+                        case 'B':
+                            $text_origin_x = ($originOffsetX ? $originOffsetX - round($text_width_line / 2) : round((imagesx($gdimg) - $text_width_line) / 2));
+                            break;
+
+                        case 'R':
+                        case 'TR':
+                        case 'BR':
+                            $text_origin_x = ($originOffsetX ? $originOffsetX - $text_width_line : imagesx($gdimg) - $text_width_line  + $TTFbox[0] - $min_x + round($size * 0.25) - $margin);
+                            break;
+                    }
+
+                    //imagettftext($gdimg, $size, $angle, $text_origin_x, $text_origin_y, $letter_color_text, $ttffont, $text);
+                    $this->DebugMessage('WatermarkText() calling imagettftext($gdimg, '.$size.', '.$angle.', '.$text_origin_x.', '.($text_origin_y + $y_offset).', $letter_color_text, '.$ttffont.', '.$line.')', __FILE__, __LINE__);
+                    imagettftext($gdimg, $size, $angle, $text_origin_x, $text_origin_y + $y_offset, $letter_color_text, $ttffont, $line);
+
+                    $y_offset += $char_height * $lineheight;
+                }
+
+            }
+            return true;
+
+        } else {
+
+            $size = min(5, max(1, $size));
+            $this->DebugMessage('Using built-in font (size='.$size.') for text watermark'.($ttffont ? ' because $ttffont !is_readable('.$ttffont.')' : ''), __FILE__, __LINE__);
+
+            $text_width  = 0;
+            $text_height = 0;
+            foreach ($textlines as $dummy => $line) {
+                $text_width   = max($text_width, imagefontwidth($size) * strlen($line));
+                $text_height += imagefontheight($size);
+            }
+            if ($img_watermark = phpthumb_functions::ImageCreateFunction($text_width, $text_height)) {
+                imagealphablending($img_watermark, false);
+                if (phpthumb_functions::IsHexColor($bg_color)) {
+                    $text_background_alpha = round(127 * ((100 - min(max(0, $bg_opacity), 100)) / 100));
+                    $text_color_background = phpthumb_functions::ImageHexColorAllocate($img_watermark, $bg_color, false, $text_background_alpha);
+                } else {
+                    $text_color_background = phpthumb_functions::ImageHexColorAllocate($img_watermark, 'FFFFFF', false, 127);
+                }
+                $this->DebugMessage('WatermarkText() calling imagefilledrectangle($img_watermark, 0, 0, '.imagesx($img_watermark).', '.imagesy($img_watermark).', $text_color_background)', __FILE__, __LINE__);
+                imagefilledrectangle($img_watermark, 0, 0, imagesx($img_watermark), imagesy($img_watermark), $text_color_background);
+
+                $img_watermark_mask    = false;
+                $mask_color_background = false;
+                $mask_color_watermark  = false;
+                if ($angle && function_exists('imagerotate')) {
+                    // using $img_watermark_mask is pointless if imagerotate function isn't available
+                    if ($img_watermark_mask = phpthumb_functions::ImageCreateFunction($text_width, $text_height)) {
+                        $mask_color_background = imagecolorallocate($img_watermark_mask, 0, 0, 0);
+                        imagealphablending($img_watermark_mask, false);
+                        imagefilledrectangle($img_watermark_mask, 0, 0, imagesx($img_watermark_mask), imagesy($img_watermark_mask), $mask_color_background);
+                        $mask_color_watermark = imagecolorallocate($img_watermark_mask, 255, 255, 255);
+                    }
+                }
+
+                $text_color_watermark = phpthumb_functions::ImageHexColorAllocate($img_watermark, $hex_color);
+                $x_offset = 0;
+                foreach ($textlines as $key => $line) {
+                    switch ($alignment) {
+                        case 'C':
+                            $x_offset = round(($text_width - (imagefontwidth($size) * strlen($line))) / 2);
+                            $originOffsetX = (imagesx($gdimg) - imagesx($img_watermark)) / 2;
+                            $originOffsetY = (imagesy($gdimg) - imagesy($img_watermark)) / 2;
+                            break;
+
+                        case 'T':
+                            $x_offset = round(($text_width - (imagefontwidth($size) * strlen($line))) / 2);
+                            $originOffsetX = (imagesx($gdimg) - imagesx($img_watermark)) / 2;
+                            $originOffsetY = $margin;
+                            break;
+
+                        case 'B':
+                            $x_offset = round(($text_width - (imagefontwidth($size) * strlen($line))) / 2);
+                            $originOffsetX = (imagesx($gdimg) - imagesx($img_watermark)) / 2;
+                            $originOffsetY = imagesy($gdimg) - imagesy($img_watermark) - $margin;
+                            break;
+
+                        case 'L':
+                            $x_offset = 0;
+                            $originOffsetX = $margin;
+                            $originOffsetY = (imagesy($gdimg) - imagesy($img_watermark)) / 2;
+                            break;
+
+                        case 'TL':
+                            $x_offset = 0;
+                            $originOffsetX = $margin;
+                            $originOffsetY = $margin;
+                            break;
+
+                        case 'BL':
+                            $x_offset = 0;
+                            $originOffsetX = $margin;
+                            $originOffsetY = imagesy($gdimg) - imagesy($img_watermark) - $margin;
+                            break;
+
+                        case 'R':
+                            $x_offset = $text_width - (imagefontwidth($size) * strlen($line));
+                            $originOffsetX = imagesx($gdimg) - imagesx($img_watermark) - $margin;
+                            $originOffsetY = (imagesy($gdimg) - imagesy($img_watermark)) / 2;
+                            break;
+
+                        case 'TR':
+                            $x_offset = $text_width - (imagefontwidth($size) * strlen($line));
+                            $originOffsetX = imagesx($gdimg) - imagesx($img_watermark) - $margin;
+                            $originOffsetY = $margin;
+                            break;
+
+                        case 'BR':
+                        default:
+                            if (!empty($originOffsetX) || !empty($originOffsetY)) {
+                                // absolute pixel positioning
+                            } else {
+                                $x_offset = $text_width - (imagefontwidth($size) * strlen($line));
+                                $originOffsetX = imagesx($gdimg) - imagesx($img_watermark) - $margin;
+                                $originOffsetY = imagesy($gdimg) - imagesy($img_watermark) - $margin;
+                            }
+                            break;
+                    }
+                    $this->DebugMessage('WatermarkText() calling imagestring($img_watermark, '.$size.', '.$x_offset.', '.($key * imagefontheight($size)).', '.$line.', $text_color_watermark)', __FILE__, __LINE__);
+                    imagestring($img_watermark, $size, $x_offset, $key * imagefontheight($size), $line, $text_color_watermark);
+                    if ($angle && $img_watermark_mask) {
+                        $this->DebugMessage('WatermarkText() calling imagestring($img_watermark_mask, '.$size.', '.$x_offset.', '.($key * imagefontheight($size) * $lineheight).', '.$text.', $mask_color_watermark)', __FILE__, __LINE__);
+                        imagestring($img_watermark_mask, $size, $x_offset, $key * imagefontheight($size) * $lineheight, $text, $mask_color_watermark);
+                    }
+                }
+                if ($angle && $img_watermark_mask) {
+                    $img_watermark      = imagerotate($img_watermark,      $angle, $text_color_background);
+                    $img_watermark_mask = imagerotate($img_watermark_mask, $angle, $mask_color_background);
+                    self::ApplyMask($img_watermark_mask, $img_watermark);
+                }
+                //phpthumb_filters::WatermarkOverlay($gdimg, $img_watermark, $alignment, $opacity, $margin);
+                $this->DebugMessage('WatermarkText() calling phpthumb_filters::WatermarkOverlay($gdimg, $img_watermark, '.($originOffsetX.'x'.$originOffsetY).', '.$opacity.', 0)', __FILE__, __LINE__);
+                self::WatermarkOverlay($gdimg, $img_watermark, $originOffsetX.'x'.$originOffsetY, $opacity, 0);
+                imagedestroy($img_watermark);
+                return true;
+            }
+
+        }
+        return false;
+    }
+
+
+    public function WatermarkOverlay(&$gdimg_dest, &$img_watermark, $alignment='*', $opacity=50, $margin_x=5, $margin_y=null) {
+
+        if (is_resource($gdimg_dest) && is_resource($img_watermark)) {
+            $img_source_width          = imagesx($gdimg_dest);
+            $img_source_height         = imagesy($gdimg_dest);
+            $watermark_source_width    = imagesx($img_watermark);
+            $watermark_source_height   = imagesy($img_watermark);
+            $watermark_opacity_percent = max(0, min(100, $opacity));
+            $margin_y = (null === $margin_y ? $margin_x : $margin_y);
+            $watermark_margin_x = ((($margin_x > 0) && ($margin_x < 1)) ? round((1 - $margin_x) * $img_source_width)  : $margin_x);
+            $watermark_margin_y = ((($margin_y > 0) && ($margin_y < 1)) ? round((1 - $margin_y) * $img_source_height) : $margin_y);
+            $watermark_destination_x = 0;
+            $watermark_destination_y = 0;
+            if (preg_match('#^([0-9\\.\\-]*)x([0-9\\.\\-]*)$#i', $alignment, $matches)) {
+                $watermark_destination_x = (int) $matches[ 1];
+                $watermark_destination_y = (int) $matches[ 2];
+            } else {
+                switch ($alignment) {
+                    case '*':
+                        if ($gdimg_tiledwatermark = phpthumb_functions::ImageCreateFunction($img_source_width, $img_source_height)) {
+
+                            imagealphablending($gdimg_tiledwatermark, false);
+                            imagesavealpha($gdimg_tiledwatermark, true);
+                            $text_color_transparent = phpthumb_functions::ImageColorAllocateAlphaSafe($gdimg_tiledwatermark, 255, 0, 255, 127);
+                            imagefill($gdimg_tiledwatermark, 0, 0, $text_color_transparent);
+
+                            // set the tiled image transparent color to whatever the untiled image transparency index is
+    //						imagecolortransparent($gdimg_tiledwatermark, imagecolortransparent($img_watermark));
+
+                            // a "cleaner" way of doing it, but can't handle the margin feature :(
+    //						imagesettile($gdimg_tiledwatermark, $img_watermark);
+    //						imagefill($gdimg_tiledwatermark, 0, 0, IMG_COLOR_TILED);
+    //						break;
+
+    //						imagefill($gdimg_tiledwatermark, 0, 0, imagecolortransparent($gdimg_tiledwatermark));
+                            // tile the image as many times as can fit
+                            for ($x = $watermark_margin_x; $x < ($img_source_width + $watermark_source_width); $x += ($watermark_source_width + $watermark_margin_x)) {
+                                for ($y = $watermark_margin_y; $y < ($img_source_height + $watermark_source_height); $y += ($watermark_source_height + $watermark_margin_y)) {
+                                    imagecopy(
+                                        $gdimg_tiledwatermark,
+                                        $img_watermark,
+                                        $x,
+                                        $y,
+                                        0,
+                                        0,
+                                        min($watermark_source_width,  $img_source_width  - $x - $watermark_margin_x),
+                                        min($watermark_source_height, $img_source_height - $y - $watermark_margin_y)
+                                    );
+                                }
+                            }
+
+                            $watermark_source_width  = imagesx($gdimg_tiledwatermark);
+                            $watermark_source_height = imagesy($gdimg_tiledwatermark);
+                            $watermark_destination_x = 0;
+                            $watermark_destination_y = 0;
+
+                            imagedestroy($img_watermark);
+                            $img_watermark = $gdimg_tiledwatermark;
+                        }
+                        break;
+
+                    case 'T':
+                        $watermark_destination_x = round((($img_source_width  / 2) - ($watermark_source_width / 2)) + $watermark_margin_x);
+                        $watermark_destination_y = $watermark_margin_y;
+                        break;
+
+                    case 'B':
+                        $watermark_destination_x = round((($img_source_width  / 2) - ($watermark_source_width / 2)) + $watermark_margin_x);
+                        $watermark_destination_y = $img_source_height - $watermark_source_height - $watermark_margin_y;
+                        break;
+
+                    case 'L':
+                        $watermark_destination_x = $watermark_margin_x;
+                        $watermark_destination_y = round((($img_source_height / 2) - ($watermark_source_height / 2)) + $watermark_margin_y);
+                        break;
+
+                    case 'R':
+                        $watermark_destination_x = $img_source_width - $watermark_source_width - $watermark_margin_x;
+                        $watermark_destination_y = round((($img_source_height / 2) - ($watermark_source_height / 2)) + $watermark_margin_y);
+                        break;
+
+                    case 'C':
+                        $watermark_destination_x = round(($img_source_width  / 2) - ($watermark_source_width  / 2));
+                        $watermark_destination_y = round(($img_source_height / 2) - ($watermark_source_height / 2));
+                        break;
+
+                    case 'TL':
+                        $watermark_destination_x = $watermark_margin_x;
+                        $watermark_destination_y = $watermark_margin_y;
+                        break;
+
+                    case 'TR':
+                        $watermark_destination_x = $img_source_width - $watermark_source_width - $watermark_margin_x;
+                        $watermark_destination_y = $watermark_margin_y;
+                        break;
+
+                    case 'BL':
+                        $watermark_destination_x = $watermark_margin_x;
+                        $watermark_destination_y = $img_source_height - $watermark_source_height - $watermark_margin_y;
+                        break;
+
+                    case 'BR':
+                    default:
+                        $watermark_destination_x = $img_source_width  - $watermark_source_width  - $watermark_margin_x;
+                        $watermark_destination_y = $img_source_height - $watermark_source_height - $watermark_margin_y;
+                        break;
+                }
+            }
+            imagealphablending($gdimg_dest, false);
+            imagesavealpha($gdimg_dest, true);
+            imagesavealpha($img_watermark, true);
+            phpthumb_functions::ImageCopyRespectAlpha($gdimg_dest, $img_watermark, $watermark_destination_x, $watermark_destination_y, 0, 0, $watermark_source_width, $watermark_source_height, $watermark_opacity_percent);
+
+            return true;
+        }
+        return false;
+    }
 
 }

Spacing +104 added lines, -104 removed lines

@@ -18,7 +18,7 @@ 
 	public $phpThumbObject = null;
 
 
-	public function DebugMessage($message, $file='', $line='') {
+	public function DebugMessage($message, $file = '', $line = '') {
 		if (is_object($this->phpThumbObject)) {
 			return $this->phpThumbObject->DebugMessage($message, $file, $line);
 		}
@@ -69,14 +69,14 @@ 
 
 		} else {
 			// alpha merging requires PHP v4.3.2+
-			$this->DebugMessage('Skipping ApplyMask() technique because PHP is v"'. PHP_VERSION .'"', __FILE__, __LINE__);
+			$this->DebugMessage('Skipping ApplyMask() technique because PHP is v"'.PHP_VERSION.'"', __FILE__, __LINE__);
 		}
 		return true;
 	}
 
 
     public function Bevel(&$gdimg, $width, $hexcolor1, $hexcolor2) {
-        $width     = ($width     ? $width     : 5);
+        $width     = ($width ? $width : 5);
         $hexcolor1 = ($hexcolor1 ? $hexcolor1 : 'FFFFFF');
         $hexcolor2 = ($hexcolor2 ? $hexcolor2 : '000000');
 
@@ -86,16 +86,16 @@ 
             $color1 = phpthumb_functions::ImageHexColorAllocate($gdimg, $hexcolor1, false, $alpha);
             $color2 = phpthumb_functions::ImageHexColorAllocate($gdimg, $hexcolor2, false, $alpha);
 
-            imageline($gdimg,                   $i,                   $i + 1,                   $i, imagesy($gdimg) - $i - 1, $color1); // left
-            imageline($gdimg,                   $i,                   $i    , imagesx($gdimg) - $i,                   $i    , $color1); // top
-            imageline($gdimg, imagesx($gdimg) - $i, imagesy($gdimg) - $i - 1, imagesx($gdimg) - $i,                   $i + 1, $color2); // right
-            imageline($gdimg, imagesx($gdimg) - $i, imagesy($gdimg) - $i    ,                   $i, imagesy($gdimg) - $i    , $color2); // bottom
+            imageline($gdimg, $i, $i + 1, $i, imagesy($gdimg) - $i - 1, $color1); // left
+            imageline($gdimg, $i, $i, imagesx($gdimg) - $i, $i, $color1); // top
+            imageline($gdimg, imagesx($gdimg) - $i, imagesy($gdimg) - $i - 1, imagesx($gdimg) - $i, $i + 1, $color2); // right
+            imageline($gdimg, imagesx($gdimg) - $i, imagesy($gdimg) - $i, $i, imagesy($gdimg) - $i, $color2); // bottom
         }
         return true;
     }
 
 
-	public function Blur(&$gdimg, $radius=0.5) {
+	public function Blur(&$gdimg, $radius = 0.5) {
 		// Taken from Torstein Hønsi's phpUnsharpMask (see phpthumb.unsharp.php)
 
 		$radius = round(max(0, min($radius, 50)) * 2);
@@ -113,17 +113,17 @@ 
 
 			// Move copies of the image around one pixel at the time and merge them with weight
 			// according to the matrix. The same matrix is simply repeated for higher radii.
-			for ($i = 0; $i < $radius; $i++)	{
-				imagecopy     ($imgBlur, $gdimg, 0, 0, 1, 1, $w - 1, $h - 1);            // up left
-				imagecopymerge($imgBlur, $gdimg, 1, 1, 0, 0, $w,     $h,     50.00000);  // down right
-				imagecopymerge($imgBlur, $gdimg, 0, 1, 1, 0, $w - 1, $h,     33.33333);  // down left
-				imagecopymerge($imgBlur, $gdimg, 1, 0, 0, 1, $w,     $h - 1, 25.00000);  // up right
-				imagecopymerge($imgBlur, $gdimg, 0, 0, 1, 0, $w - 1, $h,     33.33333);  // left
-				imagecopymerge($imgBlur, $gdimg, 1, 0, 0, 0, $w,     $h,     25.00000);  // right
-				imagecopymerge($imgBlur, $gdimg, 0, 0, 0, 1, $w,     $h - 1, 20.00000);  // up
-				imagecopymerge($imgBlur, $gdimg, 0, 1, 0, 0, $w,     $h,     16.666667); // down
-				imagecopymerge($imgBlur, $gdimg, 0, 0, 0, 0, $w,     $h,     50.000000); // center
-				imagecopy     ($gdimg, $imgBlur, 0, 0, 0, 0, $w,     $h);
+			for ($i = 0; $i < $radius; $i++) {
+				imagecopy($imgBlur, $gdimg, 0, 0, 1, 1, $w - 1, $h - 1); // up left
+				imagecopymerge($imgBlur, $gdimg, 1, 1, 0, 0, $w, $h, 50.00000); // down right
+				imagecopymerge($imgBlur, $gdimg, 0, 1, 1, 0, $w - 1, $h, 33.33333); // down left
+				imagecopymerge($imgBlur, $gdimg, 1, 0, 0, 1, $w, $h - 1, 25.00000); // up right
+				imagecopymerge($imgBlur, $gdimg, 0, 0, 1, 0, $w - 1, $h, 33.33333); // left
+				imagecopymerge($imgBlur, $gdimg, 1, 0, 0, 0, $w, $h, 25.00000); // right
+				imagecopymerge($imgBlur, $gdimg, 0, 0, 0, 1, $w, $h - 1, 20.00000); // up
+				imagecopymerge($imgBlur, $gdimg, 0, 1, 0, 0, $w, $h, 16.666667); // down
+				imagecopymerge($imgBlur, $gdimg, 0, 0, 0, 0, $w, $h, 50.000000); // center
+				imagecopy($gdimg, $imgBlur, 0, 0, 0, 0, $w, $h);
 			}
 			return true;
 		}
@@ -158,7 +158,7 @@ 
 	}
 
 
-	public function Brightness(&$gdimg, $amount=0) {
+	public function Brightness(&$gdimg, $amount = 0) {
 		if ($amount == 0) {
 			return true;
 		}
@@ -189,7 +189,7 @@ 
 	}
 
 
-	public function Contrast(&$gdimg, $amount=0) {
+	public function Contrast(&$gdimg, $amount = 0) {
 		if ($amount == 0) {
 			return true;
 		}
@@ -226,7 +226,7 @@ 
 
 
 	public function Colorize(&$gdimg, $amount, $targetColor) {
-		$amount      = (is_numeric($amount)                          ? $amount      : 25);
+		$amount      = (is_numeric($amount) ? $amount : 25);
 		$amountPct   = $amount / 100;
 		$targetColor = (phpthumb_functions::IsHexColor($targetColor) ? $targetColor : 'gray');
 
@@ -275,20 +275,20 @@ 
 	}
 
 
-	public function Crop(&$gdimg, $left=0, $right=0, $top=0, $bottom=0) {
+	public function Crop(&$gdimg, $left = 0, $right = 0, $top = 0, $bottom = 0) {
 		if (!$left && !$right && !$top && !$bottom) {
 			return true;
 		}
 		$oldW = imagesx($gdimg);
 		$oldH = imagesy($gdimg);
-		if (($left   > 0) && ($left   < 1)) { $left   = round($left   * $oldW); }
-		if (($right  > 0) && ($right  < 1)) { $right  = round($right  * $oldW); }
-		if (($top    > 0) && ($top    < 1)) { $top    = round($top    * $oldH); }
+		if (($left > 0) && ($left < 1)) { $left   = round($left * $oldW); }
+		if (($right > 0) && ($right < 1)) { $right  = round($right * $oldW); }
+		if (($top > 0) && ($top < 1)) { $top    = round($top * $oldH); }
 		if (($bottom > 0) && ($bottom < 1)) { $bottom = round($bottom * $oldH); }
 		$right  = min($oldW - $left - 1, $right);
-		$bottom = min($oldH - $top  - 1, $bottom);
+		$bottom = min($oldH - $top - 1, $bottom);
 		$newW = $oldW - $left - $right;
-		$newH = $oldH - $top  - $bottom;
+		$newH = $oldH - $top - $bottom;
 
 		if ($imgCropped = imagecreatetruecolor($newW, $newH)) {
 			imagecopy($imgCropped, $gdimg, 0, 0, $left, $top, $newW, $newH);
@@ -303,7 +303,7 @@ 
 	}
 
 
-	public function Desaturate(&$gdimg, $amount, $color='') {
+	public function Desaturate(&$gdimg, $amount, $color = '') {
 		if ($amount == 0) {
 			return true;
 		}
@@ -315,11 +315,11 @@ 
 		if (phpthumb_functions::gd_version() < 2) {
 			return false;
 		}
-		$distance =                 ($distance ? $distance : 10);
-		$width    =                 ($width    ? $width    : 10);
-		$hexcolor =                 ($hexcolor ? $hexcolor : '000000');
-		$angle    =                 ($angle    ? $angle    : 225) % 360;
-		$alpha    = max(0, min(100, ($alpha    ? $alpha    : 100)));
+		$distance = ($distance ? $distance : 10);
+		$width    = ($width ? $width : 10);
+		$hexcolor = ($hexcolor ? $hexcolor : '000000');
+		$angle    = ($angle ? $angle : 225) % 360;
+		$alpha    = max(0, min(100, ($alpha ? $alpha : 100)));
 
 		if ($alpha <= 0) {
 			// invisible shadow, nothing to do
@@ -341,7 +341,7 @@ 
 			$Offset['y'] = sin(deg2rad($angle)) * ($distance + $i);
 		}
 
-		$tempImageWidth  = imagesx($gdimg)  + abs($Offset['x']);
+		$tempImageWidth  = imagesx($gdimg) + abs($Offset['x']);
 		$tempImageHeight = imagesy($gdimg) + abs($Offset['y']);
 
 		if ($gdimg_dropshadow_temp = phpthumb_functions::ImageCreateFunction($tempImageWidth, $tempImageHeight)) {
@@ -449,7 +449,7 @@ 
 	}
 
 
-	public function Flip(&$gdimg, $x=false, $y=false) {
+	public function Flip(&$gdimg, $x = false, $y = false) {
 		if (!$x && !$y) {
 			return false;
 		}
@@ -473,21 +473,21 @@ 
 
 
 	public function Frame(&$gdimg, $frame_width, $edge_width, $hexcolor_frame, $hexcolor1, $hexcolor2) {
-		$frame_width    = ($frame_width    ? $frame_width    : 5);
-		$edge_width     = ($edge_width     ? $edge_width     : 1);
+		$frame_width    = ($frame_width ? $frame_width : 5);
+		$edge_width     = ($edge_width ? $edge_width : 1);
 		$hexcolor_frame = ($hexcolor_frame ? $hexcolor_frame : 'CCCCCC');
-		$hexcolor1      = ($hexcolor1      ? $hexcolor1      : 'FFFFFF');
-		$hexcolor2      = ($hexcolor2      ? $hexcolor2      : '000000');
+		$hexcolor1      = ($hexcolor1 ? $hexcolor1 : 'FFFFFF');
+		$hexcolor2      = ($hexcolor2 ? $hexcolor2 : '000000');
 
 		$color_frame = phpthumb_functions::ImageHexColorAllocate($gdimg, $hexcolor_frame);
 		$color1      = phpthumb_functions::ImageHexColorAllocate($gdimg, $hexcolor1);
 		$color2      = phpthumb_functions::ImageHexColorAllocate($gdimg, $hexcolor2);
 		for ($i = 0; $i < $edge_width; $i++) {
 			// outer bevel
-			imageline($gdimg,                   $i,                   $i,                   $i, imagesy($gdimg) - $i, $color1); // left
-			imageline($gdimg,                   $i,                   $i, imagesx($gdimg) - $i,                   $i, $color1); // top
-			imageline($gdimg, imagesx($gdimg) - $i, imagesy($gdimg) - $i, imagesx($gdimg) - $i,                   $i, $color2); // right
-			imageline($gdimg, imagesx($gdimg) - $i, imagesy($gdimg) - $i,                   $i, imagesy($gdimg) - $i, $color2); // bottom
+			imageline($gdimg, $i, $i, $i, imagesy($gdimg) - $i, $color1); // left
+			imageline($gdimg, $i, $i, imagesx($gdimg) - $i, $i, $color1); // top
+			imageline($gdimg, imagesx($gdimg) - $i, imagesy($gdimg) - $i, imagesx($gdimg) - $i, $i, $color2); // right
+			imageline($gdimg, imagesx($gdimg) - $i, imagesy($gdimg) - $i, $i, imagesy($gdimg) - $i, $color2); // bottom
 		}
 		for ($i = 0; $i < $frame_width; $i++) {
 			// actual frame
@@ -495,10 +495,10 @@ 
 		}
 		for ($i = 0; $i < $edge_width; $i++) {
 			// inner bevel
-			imageline($gdimg,                   $frame_width + $edge_width + $i,                   $frame_width + $edge_width + $i,                   $frame_width + $edge_width + $i, imagesy($gdimg) - $frame_width - $edge_width - $i, $color2); // left
-			imageline($gdimg,                   $frame_width + $edge_width + $i,                   $frame_width + $edge_width + $i, imagesx($gdimg) - $frame_width - $edge_width - $i,                   $frame_width + $edge_width + $i, $color2); // top
-			imageline($gdimg, imagesx($gdimg) - $frame_width - $edge_width - $i, imagesy($gdimg) - $frame_width - $edge_width - $i, imagesx($gdimg) - $frame_width - $edge_width - $i,                   $frame_width + $edge_width + $i, $color1); // right
-			imageline($gdimg, imagesx($gdimg) - $frame_width - $edge_width - $i, imagesy($gdimg) - $frame_width - $edge_width - $i,                   $frame_width + $edge_width + $i, imagesy($gdimg) - $frame_width - $edge_width - $i, $color1); // bottom
+			imageline($gdimg, $frame_width + $edge_width + $i, $frame_width + $edge_width + $i, $frame_width + $edge_width + $i, imagesy($gdimg) - $frame_width - $edge_width - $i, $color2); // left
+			imageline($gdimg, $frame_width + $edge_width + $i, $frame_width + $edge_width + $i, imagesx($gdimg) - $frame_width - $edge_width - $i, $frame_width + $edge_width + $i, $color2); // top
+			imageline($gdimg, imagesx($gdimg) - $frame_width - $edge_width - $i, imagesy($gdimg) - $frame_width - $edge_width - $i, imagesx($gdimg) - $frame_width - $edge_width - $i, $frame_width + $edge_width + $i, $color1); // right
+			imageline($gdimg, imagesx($gdimg) - $frame_width - $edge_width - $i, imagesy($gdimg) - $frame_width - $edge_width - $i, $frame_width + $edge_width + $i, imagesy($gdimg) - $frame_width - $edge_width - $i, $color1); // bottom
 		}
 		return true;
 	}
@@ -524,7 +524,7 @@ 
 	}
 
 
-	public function HistogramAnalysis(&$gdimg, $calculateGray=false) {
+	public function HistogramAnalysis(&$gdimg, $calculateGray = false) {
 		$ImageSX = imagesx($gdimg);
 		$ImageSY = imagesy($gdimg);
 		$Analysis = array();
@@ -552,13 +552,13 @@ 
 	}
 
 
-	public function HistogramStretch(&$gdimg, $band='*', $method=0, $threshold=0.1) {
+	public function HistogramStretch(&$gdimg, $band = '*', $method = 0, $threshold = 0.1) {
 		// equivalent of "Auto Contrast" in Adobe Photoshop
 		// method 0 stretches according to RGB colors. Gives a more conservative stretch.
 		// method 1 band stretches according to grayscale which is color-biased (59% green, 30% red, 11% blue). May give a punchier / more aggressive stretch, possibly appearing over-saturated
 		$Analysis = self::HistogramAnalysis($gdimg, true);
 		$keys = array('r'=>'red', 'g'=>'green', 'b'=>'blue', 'a'=>'alpha', '*'=>(($method == 0) ? 'all' : 'gray'));
-		$band = $band[ 0 ];
+		$band = $band[0];
 		if (!isset($keys[$band])) {
 			return false;
 		}
@@ -568,7 +568,7 @@ 
 		// pixel in the image could throw off the whole system. Instead, count up/down
 		// from the limit and allow <threshold> (default = 0.1%) of brightest/darkest
 		// pixels to be clipped to min/max
-		$threshold = (float) $threshold / 100;
+		$threshold = (float)$threshold / 100;
 		$clip_threshold = imagesx($gdimg) * imagesx($gdimg) * $threshold;
 
 		$countsum  = 0;
@@ -586,7 +586,7 @@ 
 		}
 		$range_min = max($range_min, 0);
 
-		$countsum  =   0;
+		$countsum  = 0;
 		$range_max = 255;
 		for ($i = 255; $i >= 0; $i--) {
 			if ($method == 0) {
@@ -613,9 +613,9 @@ 
 			for ($y = 0; $y < $ImageSY; $y++) {
 				$OriginalPixel = phpthumb_functions::GetPixelColor($gdimg, $x, $y);
 				if ($band == '*') {
-					$new['red']   = min(255, max(0, ($OriginalPixel['red']   - $range_min) * $range_scale));
+					$new['red']   = min(255, max(0, ($OriginalPixel['red'] - $range_min) * $range_scale));
 					$new['green'] = min(255, max(0, ($OriginalPixel['green'] - $range_min) * $range_scale));
-					$new['blue']  = min(255, max(0, ($OriginalPixel['blue']  - $range_min) * $range_scale));
+					$new['blue']  = min(255, max(0, ($OriginalPixel['blue'] - $range_min) * $range_scale));
 					$new['alpha'] = min(255, max(0, ($OriginalPixel['alpha'] - $range_min) * $range_scale));
 				} else {
 					$new = $OriginalPixel;
@@ -630,7 +630,7 @@ 
 	}
 
 
-	public function HistogramOverlay(&$gdimg, $bands='*', $colors='', $width=0.25, $height=0.25, $alignment='BR', $opacity=50, $margin_x=5, $margin_y=null) {
+	public function HistogramOverlay(&$gdimg, $bands = '*', $colors = '', $width = 0.25, $height = 0.25, $alignment = 'BR', $opacity = 50, $margin_x = 5, $margin_y = null) {
 		$margin_y = (null === $margin_y ? $margin_x : $margin_y);
 
 		$Analysis = self::HistogramAnalysis($gdimg, true);
@@ -682,14 +682,14 @@ 
 
 	public function ImageBorder(&$gdimg, $border_width, $radius_x, $radius_y, $hexcolor_border) {
 		$border_width = ($border_width ? $border_width : 1);
-		$radius_x     = ($radius_x     ? $radius_x     : 0);
-		$radius_y     = ($radius_y     ? $radius_y     : 0);
+		$radius_x     = ($radius_x ? $radius_x : 0);
+		$radius_y     = ($radius_y ? $radius_y : 0);
 
 		$output_width  = imagesx($gdimg);
 		$output_height = imagesy($gdimg);
 
 		list($new_width, $new_height) = phpthumb_functions::ProportionalResize($output_width, $output_height, $output_width - max($border_width * 2, $radius_x), $output_height - max($border_width * 2, $radius_y));
-		$offset_x = ($radius_x ? $output_width  - $new_width  - $radius_x : 0);
+		$offset_x = ($radius_x ? $output_width - $new_width - $radius_x : 0);
 
 		if ($gd_border_canvas = phpthumb_functions::ImageCreateFunction($output_width, $output_height)) {
 
@@ -701,10 +701,10 @@ 
 			$color_border = phpthumb_functions::ImageHexColorAllocate($gd_border_canvas, (phpthumb_functions::IsHexColor($hexcolor_border) ? $hexcolor_border : '000000'));
 
 			for ($i = 0; $i < $border_width; $i++) {
-				imageline($gd_border_canvas,             floor($offset_x / 2) + $radius_x,                      $i, $output_width - $radius_x - ceil($offset_x / 2),                         $i, $color_border); // top
-				imageline($gd_border_canvas,             floor($offset_x / 2) + $radius_x, $output_height - 1 - $i, $output_width - $radius_x - ceil($offset_x / 2),    $output_height - 1 - $i, $color_border); // bottom
-				imageline($gd_border_canvas,                    floor($offset_x / 2) + $i,               $radius_y,                      floor($offset_x / 2) +  $i, $output_height - $radius_y, $color_border); // left
-				imageline($gd_border_canvas, $output_width - 1 - $i - ceil($offset_x / 2),               $radius_y,    $output_width - 1 - $i - ceil($offset_x / 2), $output_height - $radius_y, $color_border); // right
+				imageline($gd_border_canvas, floor($offset_x / 2) + $radius_x, $i, $output_width - $radius_x - ceil($offset_x / 2), $i, $color_border); // top
+				imageline($gd_border_canvas, floor($offset_x / 2) + $radius_x, $output_height - 1 - $i, $output_width - $radius_x - ceil($offset_x / 2), $output_height - 1 - $i, $color_border); // bottom
+				imageline($gd_border_canvas, floor($offset_x / 2) + $i, $radius_y, floor($offset_x / 2) + $i, $output_height - $radius_y, $color_border); // left
+				imageline($gd_border_canvas, $output_width - 1 - $i - ceil($offset_x / 2), $radius_y, $output_width - 1 - $i - ceil($offset_x / 2), $output_height - $radius_y, $color_border); // right
 			}
 
 			if ($radius_x && $radius_y) {
@@ -716,17 +716,17 @@ 
 				// Solution: draw non-parallel arcs, from one side of the line thickness at the start angle
 				//   to the opposite edge of the line thickness at the terminating angle
 				for ($thickness_offset = 0; $thickness_offset < $border_width; $thickness_offset++) {
-					imagearc($gd_border_canvas, floor($offset_x / 2) + 1 +                 $radius_x,              $thickness_offset - 1 + $radius_y, $radius_x * 2, $radius_y * 2, 180, 270, $color_border); // top-left
-					imagearc($gd_border_canvas,                     $output_width - $radius_x - 1 - ceil($offset_x / 2),              $thickness_offset - 1 + $radius_y, $radius_x * 2, $radius_y * 2, 270, 360, $color_border); // top-right
-					imagearc($gd_border_canvas,                     $output_width - $radius_x - 1 - ceil($offset_x / 2), $output_height - $thickness_offset - $radius_y, $radius_x * 2, $radius_y * 2,   0,  90, $color_border); // bottom-right
-					imagearc($gd_border_canvas, floor($offset_x / 2) + 1 +                 $radius_x, $output_height - $thickness_offset - $radius_y, $radius_x * 2, $radius_y * 2,  90, 180, $color_border); // bottom-left
+					imagearc($gd_border_canvas, floor($offset_x / 2) + 1 + $radius_x, $thickness_offset - 1 + $radius_y, $radius_x * 2, $radius_y * 2, 180, 270, $color_border); // top-left
+					imagearc($gd_border_canvas, $output_width - $radius_x - 1 - ceil($offset_x / 2), $thickness_offset - 1 + $radius_y, $radius_x * 2, $radius_y * 2, 270, 360, $color_border); // top-right
+					imagearc($gd_border_canvas, $output_width - $radius_x - 1 - ceil($offset_x / 2), $output_height - $thickness_offset - $radius_y, $radius_x * 2, $radius_y * 2, 0, 90, $color_border); // bottom-right
+					imagearc($gd_border_canvas, floor($offset_x / 2) + 1 + $radius_x, $output_height - $thickness_offset - $radius_y, $radius_x * 2, $radius_y * 2, 90, 180, $color_border); // bottom-left
 				}
 				if ($border_width > 1) {
 					for ($thickness_offset = 0; $thickness_offset < $border_width; $thickness_offset++) {
-						imagearc($gd_border_canvas, floor($offset_x / 2) + $thickness_offset + $radius_x,                                      $radius_y, $radius_x * 2, $radius_y * 2, 180, 270, $color_border); // top-left
-						imagearc($gd_border_canvas, $output_width - $thickness_offset - $radius_x - 1 - ceil($offset_x / 2),                                      $radius_y, $radius_x * 2, $radius_y * 2, 270, 360, $color_border); // top-right
-						imagearc($gd_border_canvas, $output_width - $thickness_offset - $radius_x - 1 - ceil($offset_x / 2),                     $output_height - $radius_y, $radius_x * 2, $radius_y * 2,   0,  90, $color_border); // bottom-right
-						imagearc($gd_border_canvas, floor($offset_x / 2) + $thickness_offset + $radius_x,                     $output_height - $radius_y, $radius_x * 2, $radius_y * 2,  90, 180, $color_border); // bottom-left
+						imagearc($gd_border_canvas, floor($offset_x / 2) + $thickness_offset + $radius_x, $radius_y, $radius_x * 2, $radius_y * 2, 180, 270, $color_border); // top-left
+						imagearc($gd_border_canvas, $output_width - $thickness_offset - $radius_x - 1 - ceil($offset_x / 2), $radius_y, $radius_x * 2, $radius_y * 2, 270, 360, $color_border); // top-right
+						imagearc($gd_border_canvas, $output_width - $thickness_offset - $radius_x - 1 - ceil($offset_x / 2), $output_height - $radius_y, $radius_x * 2, $radius_y * 2, 0, 90, $color_border); // bottom-right
+						imagearc($gd_border_canvas, floor($offset_x / 2) + $thickness_offset + $radius_x, $output_height - $radius_y, $radius_x * 2, $radius_y * 2, 90, 180, $color_border); // bottom-left
 					}
 				}
 
@@ -752,7 +752,7 @@ 
 	}
 
 
-	public static function ImprovedImageRotate(&$gdimg_source, $rotate_angle=0, $config_background_hexcolor='FFFFFF', $bg=null, &$phpThumbObject) {
+	public static function ImprovedImageRotate(&$gdimg_source, $rotate_angle = 0, $config_background_hexcolor = 'FFFFFF', $bg = null, &$phpThumbObject) {
 		while ($rotate_angle < 0) {
 			$rotate_angle += 360;
 		}
@@ -780,7 +780,7 @@ 
 						}
 					}
 					$gdimg_rotate_mask = imagerotate($gdimg_rotate_mask, $rotate_angle, $color_mask[0]);
-					$gdimg_source      = imagerotate($gdimg_source,      $rotate_angle, $background_color);
+					$gdimg_source      = imagerotate($gdimg_source, $rotate_angle, $background_color);
 
 					imagealphablending($gdimg_source, false);
 					imagesavealpha($gdimg_source, true);
@@ -896,10 +896,10 @@ 
 
 				imagefilledrectangle($gdimg_cornermask, 0, 0, imagesx($gdimg), imagesy($gdimg), $color_transparent);
 
-				imagecopyresampled($gdimg_cornermask, $gdimg_cornermask_triple,                           0,                           0,     $radius_x,     $radius_y, $radius_x, $radius_y, $radius_x * 2, $radius_y * 2);
-				imagecopyresampled($gdimg_cornermask, $gdimg_cornermask_triple,                           0, imagesy($gdimg) - $radius_y,     $radius_x, $radius_y * 3, $radius_x, $radius_y, $radius_x * 2, $radius_y * 2);
+				imagecopyresampled($gdimg_cornermask, $gdimg_cornermask_triple, 0, 0, $radius_x, $radius_y, $radius_x, $radius_y, $radius_x * 2, $radius_y * 2);
+				imagecopyresampled($gdimg_cornermask, $gdimg_cornermask_triple, 0, imagesy($gdimg) - $radius_y, $radius_x, $radius_y * 3, $radius_x, $radius_y, $radius_x * 2, $radius_y * 2);
 				imagecopyresampled($gdimg_cornermask, $gdimg_cornermask_triple, imagesx($gdimg) - $radius_x, imagesy($gdimg) - $radius_y, $radius_x * 3, $radius_y * 3, $radius_x, $radius_y, $radius_x * 2, $radius_y * 2);
-				imagecopyresampled($gdimg_cornermask, $gdimg_cornermask_triple, imagesx($gdimg) - $radius_x,                           0, $radius_x * 3,     $radius_y, $radius_x, $radius_y, $radius_x * 2, $radius_y * 2);
+				imagecopyresampled($gdimg_cornermask, $gdimg_cornermask_triple, imagesx($gdimg) - $radius_x, 0, $radius_x * 3, $radius_y, $radius_x, $radius_y, $radius_x * 2, $radius_y * 2);
 
 				self::ApplyMask($gdimg_cornermask, $gdimg);
 				imagedestroy($gdimg_cornermask);
@@ -918,7 +918,7 @@ 
 	}
 
 
-	public function Saturation(&$gdimg, $amount, $color='') {
+	public function Saturation(&$gdimg, $amount, $color = '') {
 		if ($amount == 0) {
 			return true;
 		} elseif ($amount > 0) {
@@ -987,7 +987,7 @@ 
 	}
 
 
-	public function Smooth(&$gdimg, $amount=6) {
+	public function Smooth(&$gdimg, $amount = 6) {
 		$amount = min(25, max(0, $amount));
 		if ($amount == 0) {
 			return true;
@@ -1005,7 +1005,7 @@ 
 	}
 
 
-	public function SourceTransparentColorMask(&$gdimg, $hexcolor, $min_limit=5, $max_limit=10) {
+	public function SourceTransparentColorMask(&$gdimg, $hexcolor, $min_limit = 5, $max_limit = 10) {
 		$width  = imagesx($gdimg);
 		$height = imagesy($gdimg);
 		if ($gdimg_mask = imagecreatetruecolor($width, $height)) {
@@ -1063,7 +1063,7 @@ 
 		return true;
 	}
 
-	public function ReduceColorDepth(&$gdimg, $colors=256, $dither=true) {
+	public function ReduceColorDepth(&$gdimg, $colors = 256, $dither = true) {
 		$colors = max(min($colors, 256), 2);
 		// imagetruecolortopalette usually makes ugly colors, the replacement is a bit better
 		//imagetruecolortopalette($gdimg, $dither, $colors);
@@ -1072,7 +1072,7 @@ 
 	}
 
 
-	public function WhiteBalance(&$gdimg, $targetColor='') {
+	public function WhiteBalance(&$gdimg, $targetColor = '') {
 		if (phpthumb_functions::IsHexColor($targetColor)) {
 			$targetPixel = array(
 				'red'   => hexdec(substr($targetColor, 0, 2)),
@@ -1097,9 +1097,9 @@ 
 				$currentPixel = phpthumb_functions::GetPixelColor($gdimg, $x, $y);
 				$newColor = phpthumb_functions::ImageColorAllocateAlphaSafe(
 					$gdimg,
-					max(0, min(255, round($currentPixel['red']   * $scaleR))),
+					max(0, min(255, round($currentPixel['red'] * $scaleR))),
 					max(0, min(255, round($currentPixel['green'] * $scaleG))),
-					max(0, min(255, round($currentPixel['blue']  * $scaleB))),
+					max(0, min(255, round($currentPixel['blue'] * $scaleB))),
 					$currentPixel['alpha']
 				);
 				imagesetpixel($gdimg, $x, $y, $newColor);
@@ -1109,7 +1109,7 @@ 
 	}
 
 
-	public function WatermarkText(&$gdimg, $text, $size, $alignment, $hex_color='000000', $ttffont='', $opacity=100, $margin=5, $angle=0, $bg_color=false, $bg_opacity=0, $fillextend='', $lineheight=1.0) {
+	public function WatermarkText(&$gdimg, $text, $size, $alignment, $hex_color = '000000', $ttffont = '', $opacity = 100, $margin = 5, $angle = 0, $bg_color = false, $bg_opacity = 0, $fillextend = '', $lineheight = 1.0) {
 		// text watermark requested
 		if (!$text) {
 			return false;
@@ -1117,15 +1117,15 @@ 
 		imagealphablending($gdimg, true);
 
 		if (preg_match('#^([0-9\\.\\-]*)x([0-9\\.\\-]*)(@[LCR])?$#i', $alignment, $matches)) {
-			$originOffsetX = (int) $matches[ 1];
-			$originOffsetY = (int) $matches[ 2];
+			$originOffsetX = (int)$matches[1];
+			$originOffsetY = (int)$matches[2];
 			$alignment = (@$matches[4] ? $matches[4] : 'L');
 			$margin = 0;
 		} else {
 			$originOffsetX = 0;
 			$originOffsetY = 0;
 		}
-		$lineheight = min(100.0, max(0.01, (float) $lineheight));
+		$lineheight = min(100.0, max(0.01, (float)$lineheight));
 
 		$metaTextArray = array(
 			'^Fb' =>       $this->phpThumbObject->getimagesizeinfo['filesize'],
@@ -1148,7 +1148,7 @@ 
 
 		if (@is_readable($ttffont) && is_file($ttffont)) {
 
-			$opacity = 100 - (int) max(min($opacity, 100), 0);
+			$opacity = 100 - (int)max(min($opacity, 100), 0);
 			$letter_color_text = phpthumb_functions::ImageHexColorAllocate($gdimg, $hex_color, false, $opacity * 1.27);
 
 			$this->DebugMessage('Using TTF font "'.$ttffont.'"', __FILE__, __LINE__);
@@ -1209,7 +1209,7 @@ 
 						break;
 
 					case 'R':
-						$text_origin_x = ($originOffsetX ? $originOffsetX - $text_width : imagesx($gdimg) - $text_width  + $TTFbox[0] - $min_x + round($size * 0.25) - $margin);
+						$text_origin_x = ($originOffsetX ? $originOffsetX - $text_width : imagesx($gdimg) - $text_width + $TTFbox[0] - $min_x + round($size * 0.25) - $margin);
 						$text_origin_y = ($originOffsetY ? $originOffsetY : round((imagesy($gdimg) - $text_height) / 2) + $char_height);
 						break;
 
@@ -1224,7 +1224,7 @@ 
 						break;
 
 					case 'TR':
-						$text_origin_x = ($originOffsetX ? $originOffsetX - $text_width : imagesx($gdimg) - $text_width  + $TTFbox[0] - $min_x + round($size * 0.25) - $margin);
+						$text_origin_x = ($originOffsetX ? $originOffsetX - $text_width : imagesx($gdimg) - $text_width + $TTFbox[0] - $min_x + round($size * 0.25) - $margin);
 						$text_origin_y = $char_height + $margin + $originOffsetY;
 						break;
 
@@ -1235,7 +1235,7 @@ 
 
 					case 'BR':
 					default:
-						$text_origin_x = ($originOffsetX ? $originOffsetX - $text_width : imagesx($gdimg) - $text_width  + $TTFbox[0] - $min_x + round($size * 0.25) - $margin);
+						$text_origin_x = ($originOffsetX ? $originOffsetX - $text_width : imagesx($gdimg) - $text_width + $TTFbox[0] - $min_x + round($size * 0.25) - $margin);
 						$text_origin_y = imagesy($gdimg) + $TTFbox[1] - $margin + $originOffsetY;
 						break;
 				}
@@ -1250,8 +1250,8 @@ 
 				$y1 = $text_origin_y + $TTFbox[1];
 				$x2 = $text_origin_x + $min_x + $text_width;
 				$y2 = $text_origin_y + $TTFbox[1] - $text_height;
-				$x_TL = false !== stripos($fillextend, "x") ?               0 : min($x1, $x2);
-				$y_TL = false !== stripos($fillextend, "y") ?               0 : min($y1, $y2);
+				$x_TL = false !== stripos($fillextend, "x") ? 0 : min($x1, $x2);
+				$y_TL = false !== stripos($fillextend, "y") ? 0 : min($y1, $y2);
 				$x_BR = false !== stripos($fillextend, "x") ? imagesx($gdimg) : max($x1, $x2);
 				$y_BR = false !== stripos($fillextend, "y") ? imagesy($gdimg) : max($y1, $y2);
 				$this->DebugMessage('WatermarkText() calling imagefilledrectangle($gdimg, '.$x_TL.', '.$y_TL.', '.$x_BR.', '.$y_BR.', $text_color_background)', __FILE__, __LINE__);
@@ -1286,7 +1286,7 @@ 
 						case 'R':
 						case 'TR':
 						case 'BR':
-							$text_origin_x = ($originOffsetX ? $originOffsetX - $text_width_line : imagesx($gdimg) - $text_width_line  + $TTFbox[0] - $min_x + round($size * 0.25) - $margin);
+							$text_origin_x = ($originOffsetX ? $originOffsetX - $text_width_line : imagesx($gdimg) - $text_width_line + $TTFbox[0] - $min_x + round($size * 0.25) - $margin);
 							break;
 					}
 
@@ -1406,7 +1406,7 @@ 
 					}
 				}
 				if ($angle && $img_watermark_mask) {
-					$img_watermark      = imagerotate($img_watermark,      $angle, $text_color_background);
+					$img_watermark      = imagerotate($img_watermark, $angle, $text_color_background);
 					$img_watermark_mask = imagerotate($img_watermark_mask, $angle, $mask_color_background);
 					self::ApplyMask($img_watermark_mask, $img_watermark);
 				}
@@ -1422,7 +1422,7 @@ 
 	}
 
 
-	public function WatermarkOverlay(&$gdimg_dest, &$img_watermark, $alignment='*', $opacity=50, $margin_x=5, $margin_y=null) {
+	public function WatermarkOverlay(&$gdimg_dest, &$img_watermark, $alignment = '*', $opacity = 50, $margin_x = 5, $margin_y = null) {
 
 		if (is_resource($gdimg_dest) && is_resource($img_watermark)) {
 			$img_source_width          = imagesx($gdimg_dest);
@@ -1431,13 +1431,13 @@ 
 			$watermark_source_height   = imagesy($img_watermark);
 			$watermark_opacity_percent = max(0, min(100, $opacity));
 			$margin_y = (null === $margin_y ? $margin_x : $margin_y);
-			$watermark_margin_x = ((($margin_x > 0) && ($margin_x < 1)) ? round((1 - $margin_x) * $img_source_width)  : $margin_x);
+			$watermark_margin_x = ((($margin_x > 0) && ($margin_x < 1)) ? round((1 - $margin_x) * $img_source_width) : $margin_x);
 			$watermark_margin_y = ((($margin_y > 0) && ($margin_y < 1)) ? round((1 - $margin_y) * $img_source_height) : $margin_y);
 			$watermark_destination_x = 0;
 			$watermark_destination_y = 0;
 			if (preg_match('#^([0-9\\.\\-]*)x([0-9\\.\\-]*)$#i', $alignment, $matches)) {
-				$watermark_destination_x = (int) $matches[ 1];
-				$watermark_destination_y = (int) $matches[ 2];
+				$watermark_destination_x = (int)$matches[1];
+				$watermark_destination_y = (int)$matches[2];
 			} else {
 				switch ($alignment) {
 					case '*':
@@ -1467,7 +1467,7 @@ 
 										$y,
 										0,
 										0,
-										min($watermark_source_width,  $img_source_width  - $x - $watermark_margin_x),
+										min($watermark_source_width, $img_source_width - $x - $watermark_margin_x),
 										min($watermark_source_height, $img_source_height - $y - $watermark_margin_y)
 									);
 								}
@@ -1484,12 +1484,12 @@ 
 						break;
 
 					case 'T':
-						$watermark_destination_x = round((($img_source_width  / 2) - ($watermark_source_width / 2)) + $watermark_margin_x);
+						$watermark_destination_x = round((($img_source_width / 2) - ($watermark_source_width / 2)) + $watermark_margin_x);
 						$watermark_destination_y = $watermark_margin_y;
 						break;
 
 					case 'B':
-						$watermark_destination_x = round((($img_source_width  / 2) - ($watermark_source_width / 2)) + $watermark_margin_x);
+						$watermark_destination_x = round((($img_source_width / 2) - ($watermark_source_width / 2)) + $watermark_margin_x);
 						$watermark_destination_y = $img_source_height - $watermark_source_height - $watermark_margin_y;
 						break;
 
@@ -1504,7 +1504,7 @@ 
 						break;
 
 					case 'C':
-						$watermark_destination_x = round(($img_source_width  / 2) - ($watermark_source_width  / 2));
+						$watermark_destination_x = round(($img_source_width / 2) - ($watermark_source_width / 2));
 						$watermark_destination_y = round(($img_source_height / 2) - ($watermark_source_height / 2));
 						break;
 
@@ -1525,7 +1525,7 @@ 
 
 					case 'BR':
 					default:
-						$watermark_destination_x = $img_source_width  - $watermark_source_width  - $watermark_margin_x;
+						$watermark_destination_x = $img_source_width - $watermark_source_width - $watermark_margin_x;
 						$watermark_destination_y = $img_source_height - $watermark_source_height - $watermark_margin_y;
 						break;
 				}

htdocs/modules/system/class/thumbs/phpthumb.functions.php

Indentation +1027 added lines, -1027 removed lines

@@ -11,911 +11,911 @@ 
 
 class phpthumb_functions {
 
-	public static function user_function_exists($functionname) {
-		if (function_exists('get_defined_functions')) {
-			static $get_defined_functions = array();
-			if (empty($get_defined_functions)) {
-				$get_defined_functions = get_defined_functions();
-			}
-			return in_array(strtolower($functionname), $get_defined_functions['user']);
-		}
-		return function_exists($functionname);
-	}
-
-
-	public static function builtin_function_exists($functionname) {
-		if (function_exists('get_defined_functions')) {
-			static $get_defined_functions = array();
-			if (empty($get_defined_functions)) {
-				$get_defined_functions = get_defined_functions();
-			}
-			return in_array(strtolower($functionname), $get_defined_functions['internal']);
-		}
-		return function_exists($functionname);
-	}
-
-
-	public static function version_compare_replacement_sub($version1, $version2, $operator='') {
-		// If you specify the third optional operator argument, you can test for a particular relationship.
-		// The possible operators are: <, lt, <=, le, >, gt, >=, ge, ==, =, eq, !=, <>, ne respectively.
-		// Using this argument, the function will return 1 if the relationship is the one specified by the operator, 0 otherwise.
-
-		// If a part contains special version strings these are handled in the following order:
-		// (any string not found in this list) < (dev) < (alpha = a) < (beta = b) < (RC = rc) < (#) < (pl = p)
-		static $versiontype_lookup = array();
-		if (empty($versiontype_lookup)) {
-			$versiontype_lookup['dev']   = 10001;
-			$versiontype_lookup['a']     = 10002;
-			$versiontype_lookup['alpha'] = 10002;
-			$versiontype_lookup['b']     = 10003;
-			$versiontype_lookup['beta']  = 10003;
-			$versiontype_lookup['RC']    = 10004;
-			$versiontype_lookup['rc']    = 10004;
-			$versiontype_lookup['#']     = 10005;
-			$versiontype_lookup['pl']    = 10006;
-			$versiontype_lookup['p']     = 10006;
-		}
-		$version1 = (isset($versiontype_lookup[$version1]) ? $versiontype_lookup[$version1] : $version1);
-		$version2 = (isset($versiontype_lookup[$version2]) ? $versiontype_lookup[$version2] : $version2);
-
-		switch ($operator) {
-			case '<':
-			case 'lt':
-				return (int) ($version1 < $version2);
-				break;
-			case '<=':
-			case 'le':
-				return (int) ($version1 <= $version2);
-				break;
-			case '>':
-			case 'gt':
-				return (int) ($version1 > $version2);
-				break;
-			case '>=':
-			case 'ge':
-				return (int) ($version1 >= $version2);
-				break;
-			case '==':
-			case '=':
-			case 'eq':
-				return (int) ($version1 == $version2);
-				break;
-			case '!=':
-			case '<>':
-			case 'ne':
-				return (int) ($version1 != $version2);
-				break;
-		}
-		if ($version1 == $version2) {
-			return 0;
-		} elseif ($version1 < $version2) {
-			return -1;
-		}
-		return 1;
-	}
-
-
-	public static function version_compare_replacement($version1, $version2, $operator='') {
-		if (function_exists('version_compare')) {
-			// built into PHP v4.1.0+
-			return version_compare($version1, $version2, $operator);
-		}
-
-		// The function first replaces _, - and + with a dot . in the version strings
-		$version1 = strtr($version1, '_-+', '...');
-		$version2 = strtr($version2, '_-+', '...');
-
-		// and also inserts dots . before and after any non number so that for example '4.3.2RC1' becomes '4.3.2.RC.1'.
-		// Then it splits the results like if you were using explode('.',$ver). Then it compares the parts starting from left to right.
-		$version1 = preg_replace('#([0-9]+)([A-Z]+)([0-9]+)#i', "$1.$2.$3", $version1);
-		$version2 = preg_replace('#([0-9]+)([A-Z]+)([0-9]+)#i', "$1.$2.$3", $version2);
-
-		$parts1 = explode('.', $version1);
-		$parts2 = explode('.', $version1);
-		$parts_count = max(count($parts1), count($parts2));
-		for ($i = 0; $i < $parts_count; $i++) {
-			$comparison = self::version_compare_replacement_sub($version1, $version2, $operator);
-			if ($comparison != 0) {
-				return $comparison;
-			}
-		}
-		return 0;
-	}
-
-	public static function escapeshellarg_replacement($arg) {
-		if (function_exists('escapeshellarg') && !self::FunctionIsDisabled('escapeshellarg')) {
-			return escapeshellarg($arg);
-		}
-		return '\''.str_replace('\'', '\\\'', $arg).'\'';
-	}
-
-	public static function phpinfo_array() {
-		static $phpinfo_array = array();
-		if (empty($phpinfo_array)) {
-			ob_start();
-			phpinfo();
-			$phpinfo = ob_get_contents();
-			ob_end_clean();
-			$phpinfo_array = explode("\n", $phpinfo);
-		}
-		return $phpinfo_array;
-	}
-
-
-	public static function exif_info() {
-		static $exif_info = array();
-		if (empty($exif_info)) {
-			// based on code by johnschaefer at gmx dot de
-			// from PHP help on gd_info()
-			$exif_info = array(
-				'EXIF Support'           => '',
-				'EXIF Version'           => '',
-				'Supported EXIF Version' => '',
-				'Supported filetypes'    => ''
-			);
-			$phpinfo_array = self::phpinfo_array();
-			foreach ($phpinfo_array as $line) {
-				$line = trim(strip_tags($line));
-				foreach ($exif_info as $key => $value) {
-					if (strpos($line, $key) === 0) {
-						$newvalue = trim(str_replace($key, '', $line));
-						$exif_info[$key] = $newvalue;
-					}
-				}
-			}
-		}
-		return $exif_info;
-	}
-
-
-	public static function ImageTypeToMIMEtype($imagetype) {
-		if (function_exists('image_type_to_mime_type') && ($imagetype >= 1) && ($imagetype <= 16)) {
-			// PHP v4.3.0+
-			return image_type_to_mime_type($imagetype);
-		}
-		static $image_type_to_mime_type = array(
-			1  => 'image/gif',                     // IMAGETYPE_GIF
-			2  => 'image/jpeg',                    // IMAGETYPE_JPEG
-			3  => 'image/png',                     // IMAGETYPE_PNG
-			4  => 'application/x-shockwave-flash', // IMAGETYPE_SWF
-			5  => 'image/psd',                     // IMAGETYPE_PSD
-			6  => 'image/bmp',                     // IMAGETYPE_BMP
-			7  => 'image/tiff',                    // IMAGETYPE_TIFF_II (intel byte order)
-			8  => 'image/tiff',                    // IMAGETYPE_TIFF_MM (motorola byte order)
-			9  => 'application/octet-stream',      // IMAGETYPE_JPC
-			10 => 'image/jp2',                     // IMAGETYPE_JP2
-			11 => 'application/octet-stream',      // IMAGETYPE_JPX
-			12 => 'application/octet-stream',      // IMAGETYPE_JB2
-			13 => 'application/x-shockwave-flash', // IMAGETYPE_SWC
-			14 => 'image/iff',                     // IMAGETYPE_IFF
-			15 => 'image/vnd.wap.wbmp',            // IMAGETYPE_WBMP
-			16 => 'image/xbm',                     // IMAGETYPE_XBM
-
-			'gif'  => 'image/gif',                 // IMAGETYPE_GIF
-			'jpg'  => 'image/jpeg',                // IMAGETYPE_JPEG
-			'jpeg' => 'image/jpeg',                // IMAGETYPE_JPEG
-			'png'  => 'image/png',                 // IMAGETYPE_PNG
-			'bmp'  => 'image/bmp',                 // IMAGETYPE_BMP
-			'ico'  => 'image/x-icon',
-		);
-
-		return (isset($image_type_to_mime_type[$imagetype]) ? $image_type_to_mime_type[$imagetype] : false);
-	}
-
-
-	public static function TranslateWHbyAngle($width, $height, $angle) {
-		if (($angle % 180) == 0) {
-			return array($width, $height);
-		}
-		$newwidth  = (abs(sin(deg2rad($angle))) * $height) + (abs(cos(deg2rad($angle))) * $width);
-		$newheight = (abs(sin(deg2rad($angle))) * $width)  + (abs(cos(deg2rad($angle))) * $height);
-		return array($newwidth, $newheight);
-	}
-
-	public static function HexCharDisplay($string) {
-		$len = strlen($string);
-		$output = '';
-		for ($i = 0; $i < $len; $i++) {
-			$output .= ' 0x'.str_pad(dechex(ord($string{$i})), 2, '0', STR_PAD_LEFT);
-		}
-		return $output;
-	}
-
-
-	public static function IsHexColor($HexColorString) {
-		return preg_match('#^[0-9A-F]{6}$#i', $HexColorString);
-	}
-
-
-	public static function ImageColorAllocateAlphaSafe(&$gdimg_hexcolorallocate, $R, $G, $B, $alpha=false) {
-		if (self::version_compare_replacement(PHP_VERSION, '4.3.2', '>=') && ($alpha !== false)) {
-			return imagecolorallocatealpha($gdimg_hexcolorallocate, $R, $G, $B, (int) $alpha);
-		} else {
-			return imagecolorallocate($gdimg_hexcolorallocate, $R, $G, $B);
-		}
-	}
-
-	public static function ImageHexColorAllocate(&$gdimg_hexcolorallocate, $HexColorString, $dieOnInvalid=false, $alpha=false) {
-		if (!is_resource($gdimg_hexcolorallocate)) {
-			die('$gdimg_hexcolorallocate is not a GD resource in ImageHexColorAllocate()');
-		}
-		if (self::IsHexColor($HexColorString)) {
-			$R = hexdec(substr($HexColorString, 0, 2));
-			$G = hexdec(substr($HexColorString, 2, 2));
-			$B = hexdec(substr($HexColorString, 4, 2));
-			return self::ImageColorAllocateAlphaSafe($gdimg_hexcolorallocate, $R, $G, $B, $alpha);
-		}
-		if ($dieOnInvalid) {
-			die('Invalid hex color string: "'.$HexColorString.'"');
-		}
-		return imagecolorallocate($gdimg_hexcolorallocate, 0x00, 0x00, 0x00);
-	}
-
-
-	public static function HexColorXOR($hexcolor) {
-		return strtoupper(str_pad(dechex(~hexdec($hexcolor) & 0xFFFFFF), 6, '0', STR_PAD_LEFT));
-	}
-
-
-	public static function GetPixelColor(&$img, $x, $y) {
-		if (!is_resource($img)) {
-			return false;
-		}
-		return @imagecolorsforindex($img, @imagecolorat($img, $x, $y));
-	}
-
-
-	public static function PixelColorDifferencePercent($currentPixel, $targetPixel) {
-		$diff = 0;
-		foreach ($targetPixel as $channel => $currentvalue) {
-			$diff = max($diff, (max($currentPixel[$channel], $targetPixel[$channel]) - min($currentPixel[$channel], $targetPixel[$channel])) / 255);
-		}
-		return $diff * 100;
-	}
-
-	public static function GrayscaleValue($r, $g, $b) {
-		return round(($r * 0.30) + ($g * 0.59) + ($b * 0.11));
-	}
-
-
-	public static function GrayscalePixel($OriginalPixel) {
-		$gray = self::GrayscaleValue($OriginalPixel[ 'red'], $OriginalPixel[ 'green'], $OriginalPixel[ 'blue']);
-		return array('red'=>$gray, 'green'=>$gray, 'blue'=>$gray);
-	}
-
-
-	public static function GrayscalePixelRGB($rgb) {
-		$r = ($rgb >> 16) & 0xFF;
-		$g = ($rgb >>  8) & 0xFF;
-		$b =  $rgb        & 0xFF;
-		return ($r * 0.299) + ($g * 0.587) + ($b * 0.114);
-	}
-
-
-	public static function ScaleToFitInBox($width, $height, $maxwidth=null, $maxheight=null, $allow_enlarge=true, $allow_reduce=true) {
-		$maxwidth  = (null === $maxwidth  ? $width  : $maxwidth);
-		$maxheight = (null === $maxheight ? $height : $maxheight);
-		$scale_x = 1;
-		$scale_y = 1;
-		if (($width > $maxwidth) || ($width < $maxwidth)) {
-			$scale_x = ($maxwidth / $width);
-		}
-		if (($height > $maxheight) || ($height < $maxheight)) {
-			$scale_y = ($maxheight / $height);
-		}
-		$scale = min($scale_x, $scale_y);
-		if (!$allow_enlarge) {
-			$scale = min($scale, 1);
-		}
-		if (!$allow_reduce) {
-			$scale = max($scale, 1);
-		}
-		return $scale;
-	}
-
-	public static function ImageCopyResampleBicubic($dst_img, $src_img, $dst_x, $dst_y, $src_x, $src_y, $dst_w, $dst_h, $src_w, $src_h) {
-		// ron at korving dot demon dot nl
-		// http://www.php.net/imagecopyresampled
-
-		$scaleX = ($src_w - 1) / $dst_w;
-		$scaleY = ($src_h - 1) / $dst_h;
-
-		$scaleX2 = $scaleX / 2.0;
-		$scaleY2 = $scaleY / 2.0;
-
-		$isTrueColor = imageistruecolor($src_img);
-
-		for ($y = $src_y; $y < $src_y + $dst_h; $y++) {
-			$sY   = $y * $scaleY;
-			$siY  = (int) $sY;
-			$siY2 = (int) $sY + $scaleY2;
-
-			for ($x = $src_x; $x < $src_x + $dst_w; $x++) {
-				$sX   = $x * $scaleX;
-				$siX  = (int) $sX;
-				$siX2 = (int) $sX + $scaleX2;
-
-				if ($isTrueColor) {
-
-					$c1 = imagecolorat($src_img, $siX, $siY2);
-					$c2 = imagecolorat($src_img, $siX, $siY);
-					$c3 = imagecolorat($src_img, $siX2, $siY2);
-					$c4 = imagecolorat($src_img, $siX2, $siY);
-
-					$r = (( $c1             +  $c2             +  $c3             +  $c4            ) >> 2) & 0xFF0000;
-					$g = ((($c1 & 0x00FF00) + ($c2 & 0x00FF00) + ($c3 & 0x00FF00) + ($c4 & 0x00FF00)) >> 2) & 0x00FF00;
-					$b = ((($c1 & 0x0000FF) + ($c2 & 0x0000FF) + ($c3 & 0x0000FF) + ($c4 & 0x0000FF)) >> 2);
-
-				} else {
-
-					$c1 = imagecolorsforindex($src_img, imagecolorat($src_img, $siX, $siY2));
-					$c2 = imagecolorsforindex($src_img, imagecolorat($src_img, $siX, $siY));
-					$c3 = imagecolorsforindex($src_img, imagecolorat($src_img, $siX2, $siY2));
-					$c4 = imagecolorsforindex($src_img, imagecolorat($src_img, $siX2, $siY));
-
-					$r = ($c1['red']   + $c2['red']   + $c3['red']   + $c4['red'] )  << 14;
-					$g = ($c1['green'] + $c2['green'] + $c3['green'] + $c4['green']) <<  6;
-					$b = ($c1['blue']  + $c2['blue']  + $c3['blue']  + $c4['blue'] ) >>  2;
-
-				}
-				imagesetpixel($dst_img, $dst_x + $x - $src_x, $dst_y + $y - $src_y, $r+$g+$b);
-			}
-		}
-		return true;
-	}
-
-
-	public static function ImageCreateFunction($x_size, $y_size) {
-		$ImageCreateFunction = 'imagecreate';
-		if (self::gd_version() >= 2.0) {
-			$ImageCreateFunction = 'imagecreatetruecolor';
-		}
-		if (!function_exists($ImageCreateFunction)) {
-			return phpthumb::ErrorImage($ImageCreateFunction.'() does not exist - no GD support?');
-		}
-		if (($x_size <= 0) || ($y_size <= 0)) {
-			return phpthumb::ErrorImage('Invalid image dimensions: '.$ImageCreateFunction.'('.$x_size.', '.$y_size.')');
-		}
-		return $ImageCreateFunction(round($x_size), round($y_size));
-	}
-
-
-	public static function ImageCopyRespectAlpha(&$dst_im, &$src_im, $dst_x, $dst_y, $src_x, $src_y, $src_w, $src_h, $opacity_pct=100) {
-		$opacipct = $opacity_pct / 100;
-		for ($x = $src_x; $x < $src_w; $x++) {
-			for ($y = $src_y; $y < $src_h; $y++) {
-				$RealPixel    = self::GetPixelColor($dst_im, $dst_x + $x, $dst_y + $y);
-				$OverlayPixel = self::GetPixelColor($src_im, $x, $y);
-				$alphapct = $OverlayPixel['alpha'] / 127;
-				$overlaypct = (1 - $alphapct) * $opacipct;
-
-				$newcolor = self::ImageColorAllocateAlphaSafe(
-					$dst_im,
-					round($RealPixel['red']   * (1 - $overlaypct)) + ($OverlayPixel['red']   * $overlaypct),
-					round($RealPixel['green'] * (1 - $overlaypct)) + ($OverlayPixel['green'] * $overlaypct),
-					round($RealPixel['blue']  * (1 - $overlaypct)) + ($OverlayPixel['blue']  * $overlaypct),
-					//$RealPixel['alpha']);
-					0);
-
-				imagesetpixel($dst_im, $dst_x + $x, $dst_y + $y, $newcolor);
-			}
-		}
-		return true;
-	}
-
-
-	public static function ProportionalResize($old_width, $old_height, $new_width=false, $new_height=false) {
-		$old_aspect_ratio = $old_width / $old_height;
-		if (($new_width === false) && ($new_height === false)) {
-			return false;
-		} elseif ($new_width === false) {
-			$new_width = $new_height * $old_aspect_ratio;
-		} elseif ($new_height === false) {
-			$new_height = $new_width / $old_aspect_ratio;
-		}
-		$new_aspect_ratio = $new_width / $new_height;
-		if ($new_aspect_ratio == $old_aspect_ratio) {
-			// great, done
-		} elseif ($new_aspect_ratio < $old_aspect_ratio) {
-			// limited by width
-			$new_height = $new_width / $old_aspect_ratio;
-		} elseif ($new_aspect_ratio > $old_aspect_ratio) {
-			// limited by height
-			$new_width = $new_height * $old_aspect_ratio;
-		}
-		return array(
-			(int) round($new_width),
-			(int) round($new_height)
-		);
-	}
-
-
-	public static function FunctionIsDisabled($function) {
-		static $DisabledFunctions = null;
-		if (null === $DisabledFunctions) {
-			$disable_functions_local  = explode(',',     strtolower(@ini_get('disable_functions')));
-			$disable_functions_global = explode(',', strtolower(@get_cfg_var('disable_functions')));
-			foreach ($disable_functions_local as $key => $value) {
-				$DisabledFunctions[trim($value)] = 'local';
-			}
-			foreach ($disable_functions_global as $key => $value) {
-				$DisabledFunctions[trim($value)] = 'global';
-			}
-			if (@ini_get('safe_mode')) {
-				$DisabledFunctions['shell_exec']     = 'local';
-				$DisabledFunctions['set_time_limit'] = 'local';
-			}
-		}
-		return isset($DisabledFunctions[strtolower($function)]);
-	}
-
-
-	public static function SafeExec($command) {
-		static $AllowedExecFunctions = array();
-		if (empty($AllowedExecFunctions)) {
-			$AllowedExecFunctions = array('shell_exec'=>true, 'passthru'=>true, 'system'=>true, 'exec'=>true);
-			foreach ($AllowedExecFunctions as $key => $value) {
-				$AllowedExecFunctions[$key] = !self::FunctionIsDisabled($key);
-			}
-		}
-		$command .= ' 2>&1'; // force redirect stderr to stdout
-		foreach ($AllowedExecFunctions as $execfunction => $is_allowed) {
-			if (!$is_allowed) {
-				continue;
-			}
-			$returnvalue = false;
-			switch ($execfunction) {
-				case 'passthru':
-				case 'system':
-					ob_start();
-					$execfunction($command);
-					$returnvalue = ob_get_contents();
-					ob_end_clean();
-					break;
-
-				case 'exec':
-					$output = array();
-					$lastline = $execfunction($command, $output);
-					$returnvalue = implode("\n", $output);
-					break;
-
-				case 'shell_exec':
-					ob_start();
-					$returnvalue = $execfunction($command);
-					ob_end_clean();
-					break;
-			}
-			return $returnvalue;
-		}
-		return false;
-	}
-
-
-	public static function ApacheLookupURIarray($filename) {
-		// apache_lookup_uri() only works when PHP is installed as an Apache module.
-		if (PHP_SAPI == 'apache') {
-			//$property_exists_exists = function_exists('property_exists');
-			$keys = array('status', 'the_request', 'status_line', 'method', 'content_type', 'handler', 'uri', 'filename', 'path_info', 'args', 'boundary', 'no_cache', 'no_local_copy', 'allowed', 'send_bodyct', 'bytes_sent', 'byterange', 'clength', 'unparsed_uri', 'mtime', 'request_time');
-			if ($apacheLookupURIobject = @apache_lookup_uri($filename)) {
-				$apacheLookupURIarray = array();
-				foreach ($keys as $key) {
-					$apacheLookupURIarray[$key] = @$apacheLookupURIobject->$key;
-				}
-				return $apacheLookupURIarray;
-			}
-		}
-		return false;
-	}
-
-
-	public static function gd_is_bundled() {
-		static $isbundled = null;
-		if (null === $isbundled) {
-			$gd_info = gd_info();
-			$isbundled = (strpos($gd_info['GD Version'], 'bundled') !== false);
-		}
-		return $isbundled;
-	}
-
-
-	public static function gd_version($fullstring=false) {
-		static $cache_gd_version = array();
-		if (empty($cache_gd_version)) {
-			$gd_info = gd_info();
-			if (preg_match('#bundled \((.+)\)$#i', $gd_info['GD Version'], $matches)) {
-				$cache_gd_version[1] = $gd_info['GD Version'];  // e.g. "bundled (2.0.15 compatible)"
-				$cache_gd_version[0] = (float) $matches[1];     // e.g. "2.0" (not "bundled (2.0.15 compatible)")
-			} else {
-				$cache_gd_version[1] = $gd_info['GD Version'];                       // e.g. "1.6.2 or higher"
-				$cache_gd_version[0] = (float) substr($gd_info['GD Version'], 0, 3); // e.g. "1.6" (not "1.6.2 or higher")
-			}
-		}
-		return $cache_gd_version[ (int) $fullstring ];
-	}
-
-
-	public static function filesize_remote($remotefile, $timeout=10) {
-		$size = false;
-		$url = self::ParseURLbetter($remotefile);
-		if ($fp = @fsockopen($url['host'], ($url['port'] ? $url['port'] : 80), $errno, $errstr, $timeout)) {
-			fwrite($fp, 'HEAD '.@$url['path'].@$url['query'].' HTTP/1.0'."\r\n".'Host: '.@$url['host']."\r\n\r\n");
-			if (self::version_compare_replacement(PHP_VERSION, '4.3.0', '>=')) {
-				stream_set_timeout($fp, $timeout);
-			}
-			while (!feof($fp)) {
-				$headerline = fgets($fp, 4096);
-				if (preg_match('#^Content-Length: (.*)#i', $headerline, $matches)) {
-					$size = (int) $matches[ 1];
-					break;
-				}
-			}
-			fclose ($fp);
-		}
-		return $size;
-	}
-
-
-	public static function filedate_remote($remotefile, $timeout=10) {
-		$date = false;
-		$url = self::ParseURLbetter($remotefile);
-		if ($fp = @fsockopen($url['host'], ($url['port'] ? $url['port'] : 80), $errno, $errstr, $timeout)) {
-			fwrite($fp, 'HEAD '.@$url['path'].@$url['query'].' HTTP/1.0'."\r\n".'Host: '.@$url['host']."\r\n\r\n");
-			if (self::version_compare_replacement(PHP_VERSION, '4.3.0', '>=')) {
-				stream_set_timeout($fp, $timeout);
-			}
-			while (!feof($fp)) {
-				$headerline = fgets($fp, 4096);
-				if (preg_match('#^Last-Modified: (.*)#i', $headerline, $matches)) {
-					$date = strtotime($matches[1]) - date('Z');
-					break;
-				}
-			}
-			fclose ($fp);
-		}
-		return $date;
-	}
-
-
-	public static function md5_file_safe($filename) {
-		// md5_file() doesn't exist in PHP < 4.2.0
-		if (function_exists('md5_file')) {
-			return md5_file($filename);
-		}
-		if ($fp = @fopen($filename, 'rb')) {
-			$rawData = '';
-			do {
-				$buffer = fread($fp, 8192);
-				$rawData .= $buffer;
-			} while (strlen($buffer) > 0);
-			fclose($fp);
-			return md5($rawData);
-		}
-		return false;
-	}
-
-
-	public static function nonempty_min() {
-		$arg_list = func_get_args();
-		$acceptable = array();
-		foreach ($arg_list as $arg) {
-			if ($arg) {
-				$acceptable[] = $arg;
-			}
-		}
-		return min($acceptable);
-	}
-
-
-	public static function LittleEndian2String($number, $minbytes=1) {
-		$intstring = '';
-		while ($number > 0) {
-			$intstring .= chr($number & 255);
-			$number    >>= 8;
-		}
-		return str_pad($intstring, $minbytes, "\x00", STR_PAD_RIGHT);
-	}
-
-	public static function OneOfThese() {
-		// return the first useful (non-empty/non-zero/non-false) value from those passed
-		$arg_list = func_get_args();
-		foreach ($arg_list as $key => $value) {
-			if ($value) {
-				return $value;
-			}
-		}
-		return false;
-	}
-
-	public static function CaseInsensitiveInArray($needle, $haystack) {
-		$needle = strtolower($needle);
-		foreach ($haystack as $key => $value) {
-			if (is_array($value)) {
-				// skip?
-			} elseif ($needle == strtolower($value)) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	public static function URLreadFsock($host, $file, &$errstr, $successonly=true, $port=80, $timeout=10) {
-		if (!function_exists('fsockopen') || self::FunctionIsDisabled('fsockopen')) {
-			$errstr = 'fsockopen() unavailable';
-			return false;
-		}
-		//if ($fp = @fsockopen($host, $port, $errno, $errstr, $timeout)) {
-		if ($fp = @fsockopen((($port == 443) ? 'ssl://' : '').$host, $port, $errno, $errstr, $timeout)) { // https://github.com/JamesHeinrich/phpThumb/issues/39
-			$out  = 'GET '.$file.' HTTP/1.0'."\r\n";
-			$out .= 'Host: '.$host."\r\n";
-			$out .= 'Connection: Close'."\r\n\r\n";
-			fwrite($fp, $out);
-
-			$isHeader = true;
-			$Data_header = '';
-			$Data_body   = '';
-			$header_newlocation = '';
-			while (!feof($fp)) {
-				$line = fgets($fp, 1024);
-				if ($isHeader) {
-					$Data_header .= $line;
-				} else {
-					$Data_body .= $line;
-				}
-				if (preg_match('#^HTTP/[\\.0-9]+ ([0-9]+) (.+)$#i', rtrim($line), $matches)) {
-					list( , $errno, $errstr) = $matches;
-					$errno = (int) $errno;
-				} elseif (preg_match('#^Location: (.*)$#i', rtrim($line), $matches)) {
-					$header_newlocation = $matches[1];
-				}
-				if ($isHeader && ($line == "\r\n")) {
-					$isHeader = false;
-					if ($successonly) {
-						switch ($errno) {
-							case 200:
-								// great, continue
-								break;
-
-							default:
-								$errstr = $errno.' '.$errstr.($header_newlocation ? '; Location: '.$header_newlocation : '');
-								fclose($fp);
-								return false;
-								break;
-						}
-					}
-				}
-			}
-			fclose($fp);
-			return $Data_body;
-		}
-		return null;
-	}
-
-	public static function CleanUpURLencoding($url, $queryseperator='&') {
-		if (!preg_match('#^http#i', $url)) {
-			return $url;
-		}
-		$parse_url = self::ParseURLbetter($url);
-		$pathelements = explode('/', $parse_url['path']);
-		$CleanPathElements = array();
-		$TranslationMatrix = array(' '=>'%20');
-		foreach ($pathelements as $key => $pathelement) {
-			$CleanPathElements[] = strtr($pathelement, $TranslationMatrix);
-		}
-		foreach ($CleanPathElements as $key => $value) {
-			if ($value === '') {
-				unset($CleanPathElements[$key]);
-			}
-		}
-
-		$queries = explode($queryseperator, (isset($parse_url['query']) ? $parse_url['query'] : ''));
-		$CleanQueries = array();
-		foreach ($queries as $key => $query) {
-			@list($param, $value) = explode('=', $query);
-			$CleanQueries[] = strtr($param, $TranslationMatrix).($value ? '='.strtr($value, $TranslationMatrix) : '');
-		}
-		foreach ($CleanQueries as $key => $value) {
-			if ($value === '') {
-				unset($CleanQueries[$key]);
-			}
-		}
-
-		$cleaned_url  = $parse_url['scheme'].'://';
-		$cleaned_url .= (@$parse_url['username'] ? $parse_url['host'].(@$parse_url['password'] ? ':'.$parse_url['password'] : '').'@' : '');
-		$cleaned_url .= $parse_url['host'];
-		$cleaned_url .= ((!empty($parse_url['port']) && ($parse_url['port'] != 80)) ? ':'.$parse_url['port'] : '');
-		$cleaned_url .= '/'.implode('/', $CleanPathElements);
-		$cleaned_url .= (@$CleanQueries ? '?'.implode($queryseperator, $CleanQueries) : '');
-		return $cleaned_url;
-	}
-
-	public static function ParseURLbetter($url) {
-		$parsedURL = @parse_url($url);
-		if (!@$parsedURL['port']) {
-			switch (strtolower(@$parsedURL['scheme'])) {
-				case 'ftp':
-					$parsedURL['port'] = 21;
-					break;
-				case 'https':
-					$parsedURL['port'] = 443;
-					break;
-				case 'http':
-					$parsedURL['port'] = 80;
-					break;
-			}
-		}
-		return $parsedURL;
-	}
-
-	public static function SafeURLread($url, &$error, $timeout=10, $followredirects=true) {
-		$error   = '';
-		$errstr  = '';
-		$rawData = '';
-
-		$parsed_url = self::ParseURLbetter($url);
-		$alreadyLookedAtURLs[trim($url)] = true;
-
-		while (true) {
-			$tryagain = false;
-			$rawData = self::URLreadFsock(@$parsed_url[ 'host'], @$parsed_url[ 'path'].'?'.@$parsed_url[ 'query'], $errstr, true, (@$parsed_url[ 'port'] ? @$parsed_url[ 'port'] : 80), $timeout);
-			if ($followredirects && preg_match('#302 [a-z ]+; Location\\: (http.*)#i', $errstr, $matches)) {
-				$matches[1] = trim(@$matches[1]);
-				if (!@$alreadyLookedAtURLs[$matches[1]]) {
-					// loop through and examine new URL
-					$error .= 'URL "'.$url.'" redirected to "'.$matches[1].'"';
-
-					$tryagain = true;
-					$alreadyLookedAtURLs[$matches[1]] = true;
-					$parsed_url = self::ParseURLbetter($matches[ 1]);
-				}
-			}
-			if (!$tryagain) {
-				break;
-			}
-		}
-
-		if ($rawData === false) {
-			$error .= 'Error opening "'.$url.'":'."\n\n".$errstr;
-			return false;
-		} elseif ($rawData === null) {
-			// fall through
-			$error .= 'Error opening "'.$url.'":'."\n\n".$errstr;
-		} else {
-			return $rawData;
-		}
-
-		if (function_exists('curl_version') && !self::FunctionIsDisabled('curl_exec')) {
-			$ch = curl_init();
-			curl_setopt($ch, CURLOPT_URL, $url);
-			curl_setopt($ch, CURLOPT_HEADER, false);
-			curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-			curl_setopt($ch, CURLOPT_BINARYTRANSFER, true);
-			curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, false);
-			curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
-			curl_setopt($ch, CURLOPT_FOLLOWLOCATION, (bool) $followredirects);
-			curl_setopt($ch, CURLOPT_TIMEOUT, $timeout);
-			$rawData = curl_exec($ch);
-			curl_close($ch);
-			if (strlen($rawData) > 0) {
-				$error .= 'CURL succeeded ('.strlen($rawData).' bytes); ';
-				return $rawData;
-			}
-			$error .= 'CURL available but returned no data; ';
-		} else {
-			$error .= 'CURL unavailable; ';
-		}
-
-		$BrokenURLfopenPHPversions = array('4.4.2');
-		if (in_array(PHP_VERSION, $BrokenURLfopenPHPversions)) {
-			$error .= 'fopen(URL) broken in PHP v'. PHP_VERSION .'; ';
-		} elseif (@ini_get('allow_url_fopen')) {
-			$rawData = '';
-			$error_fopen = '';
-			ob_start();
-			if ($fp = fopen($url, 'rb')) {
-				do {
-					$buffer = fread($fp, 8192);
-					$rawData .= $buffer;
-				} while (strlen($buffer) > 0);
-				fclose($fp);
-			} else {
-				$error_fopen .= trim(strip_tags(ob_get_contents()));
-			}
-			ob_end_clean();
-			$error .= $error_fopen;
-			if (!$error_fopen) {
-				$error .= '; "allow_url_fopen" succeeded ('.strlen($rawData).' bytes); ';
-				return $rawData;
-			}
-			$error .= '; "allow_url_fopen" enabled but returned no data ('.$error_fopen.'); ';
-		} else {
-			$error .= '"allow_url_fopen" disabled; ';
-		}
-
-		return false;
-	}
-
-	public static function EnsureDirectoryExists($dirname, $mask = 0755) {
-		$directory_elements = explode(DIRECTORY_SEPARATOR, $dirname);
-		$startoffset = (!$directory_elements[0] ? 2 : 1);  // unix with leading "/" then start with 2nd element; Windows with leading "c:\" then start with 1st element
-		$open_basedirs = preg_split('#[;:]#', ini_get('open_basedir'));
-		foreach ($open_basedirs as $key => $open_basedir) {
-			if (preg_match('#^'.preg_quote($open_basedir).'#', $dirname) && (strlen($dirname) > strlen($open_basedir))) {
-				$startoffset = substr_count($open_basedir, DIRECTORY_SEPARATOR) + 1;
-				break;
-			}
-		}
-		$i = $startoffset;
-		$endoffset = count($directory_elements);
-		for ($i = $startoffset; $i <= $endoffset; $i++) {
-			$test_directory = implode(DIRECTORY_SEPARATOR, array_slice($directory_elements, 0, $i));
-			if (!$test_directory) {
-				continue;
-			}
-			if (!@is_dir($test_directory)) {
-				if (@file_exists($test_directory)) {
-					// directory name already exists as a file
-					return false;
-				}
-				@mkdir($test_directory, $mask);
-				@chmod($test_directory, $mask);
-				if (!@is_dir($test_directory) || !@is_writable($test_directory)) {
-					return false;
-				}
-			}
-		}
-		return true;
-	}
-
-
-	public static function GetAllFilesInSubfolders($dirname) {
-		$AllFiles = array();
-		$dirname = rtrim(realpath($dirname), '/\\');
-		if ($dirhandle = @opendir($dirname)) {
-			while (($file = readdir($dirhandle)) !== false) {
-				$fullfilename = $dirname.DIRECTORY_SEPARATOR.$file;
-				if (is_file($fullfilename)) {
-					$AllFiles[] = $fullfilename;
-				} elseif (is_dir($fullfilename)) {
-					switch ($file) {
-						case '.':
-						case '..':
-							break;
-
-						default:
-							$AllFiles[] = $fullfilename;
-							$subfiles = self::GetAllFilesInSubfolders($fullfilename);
-							foreach ($subfiles as $filename) {
-								$AllFiles[] = $filename;
-							}
-							break;
-					}
-				} else {
-					// ignore?
-				}
-			}
-			closedir($dirhandle);
-		}
-		sort($AllFiles);
-		return array_unique($AllFiles);
-	}
-
-
-	public static function SanitizeFilename($filename) {
-		$filename = preg_replace('/[^'.preg_quote(' !#$%^()+,-.;<>=@[]_{}').'a-zA-Z0-9]/', '_', $filename);
-		if (self::version_compare_replacement(PHP_VERSION, '4.1.0', '>=')) {
-			$filename = trim($filename, '.');
-		}
-		return $filename;
-	}
-
-	public static function PasswordStrength($password) {
-		$strength = 0;
-		$strength += strlen(preg_replace('#[^a-z]#',       '', $password)) * 0.5; // lowercase characters are weak
-		$strength += strlen(preg_replace('#[^A-Z]#',       '', $password)) * 0.8; // uppercase characters are somewhat better
-		$strength += strlen(preg_replace('#[^0-9]#',       '', $password)) * 1.0; // numbers are somewhat better
-		$strength += strlen(preg_replace('#[a-zA-Z0-9]#',  '', $password)) * 2.0; // other non-alphanumeric characters are best
-		return $strength;
-	}
+    public static function user_function_exists($functionname) {
+        if (function_exists('get_defined_functions')) {
+            static $get_defined_functions = array();
+            if (empty($get_defined_functions)) {
+                $get_defined_functions = get_defined_functions();
+            }
+            return in_array(strtolower($functionname), $get_defined_functions['user']);
+        }
+        return function_exists($functionname);
+    }
+
+
+    public static function builtin_function_exists($functionname) {
+        if (function_exists('get_defined_functions')) {
+            static $get_defined_functions = array();
+            if (empty($get_defined_functions)) {
+                $get_defined_functions = get_defined_functions();
+            }
+            return in_array(strtolower($functionname), $get_defined_functions['internal']);
+        }
+        return function_exists($functionname);
+    }
+
+
+    public static function version_compare_replacement_sub($version1, $version2, $operator='') {
+        // If you specify the third optional operator argument, you can test for a particular relationship.
+        // The possible operators are: <, lt, <=, le, >, gt, >=, ge, ==, =, eq, !=, <>, ne respectively.
+        // Using this argument, the function will return 1 if the relationship is the one specified by the operator, 0 otherwise.
+
+        // If a part contains special version strings these are handled in the following order:
+        // (any string not found in this list) < (dev) < (alpha = a) < (beta = b) < (RC = rc) < (#) < (pl = p)
+        static $versiontype_lookup = array();
+        if (empty($versiontype_lookup)) {
+            $versiontype_lookup['dev']   = 10001;
+            $versiontype_lookup['a']     = 10002;
+            $versiontype_lookup['alpha'] = 10002;
+            $versiontype_lookup['b']     = 10003;
+            $versiontype_lookup['beta']  = 10003;
+            $versiontype_lookup['RC']    = 10004;
+            $versiontype_lookup['rc']    = 10004;
+            $versiontype_lookup['#']     = 10005;
+            $versiontype_lookup['pl']    = 10006;
+            $versiontype_lookup['p']     = 10006;
+        }
+        $version1 = (isset($versiontype_lookup[$version1]) ? $versiontype_lookup[$version1] : $version1);
+        $version2 = (isset($versiontype_lookup[$version2]) ? $versiontype_lookup[$version2] : $version2);
+
+        switch ($operator) {
+            case '<':
+            case 'lt':
+                return (int) ($version1 < $version2);
+                break;
+            case '<=':
+            case 'le':
+                return (int) ($version1 <= $version2);
+                break;
+            case '>':
+            case 'gt':
+                return (int) ($version1 > $version2);
+                break;
+            case '>=':
+            case 'ge':
+                return (int) ($version1 >= $version2);
+                break;
+            case '==':
+            case '=':
+            case 'eq':
+                return (int) ($version1 == $version2);
+                break;
+            case '!=':
+            case '<>':
+            case 'ne':
+                return (int) ($version1 != $version2);
+                break;
+        }
+        if ($version1 == $version2) {
+            return 0;
+        } elseif ($version1 < $version2) {
+            return -1;
+        }
+        return 1;
+    }
+
+
+    public static function version_compare_replacement($version1, $version2, $operator='') {
+        if (function_exists('version_compare')) {
+            // built into PHP v4.1.0+
+            return version_compare($version1, $version2, $operator);
+        }
+
+        // The function first replaces _, - and + with a dot . in the version strings
+        $version1 = strtr($version1, '_-+', '...');
+        $version2 = strtr($version2, '_-+', '...');
+
+        // and also inserts dots . before and after any non number so that for example '4.3.2RC1' becomes '4.3.2.RC.1'.
+        // Then it splits the results like if you were using explode('.',$ver). Then it compares the parts starting from left to right.
+        $version1 = preg_replace('#([0-9]+)([A-Z]+)([0-9]+)#i', "$1.$2.$3", $version1);
+        $version2 = preg_replace('#([0-9]+)([A-Z]+)([0-9]+)#i', "$1.$2.$3", $version2);
+
+        $parts1 = explode('.', $version1);
+        $parts2 = explode('.', $version1);
+        $parts_count = max(count($parts1), count($parts2));
+        for ($i = 0; $i < $parts_count; $i++) {
+            $comparison = self::version_compare_replacement_sub($version1, $version2, $operator);
+            if ($comparison != 0) {
+                return $comparison;
+            }
+        }
+        return 0;
+    }
+
+    public static function escapeshellarg_replacement($arg) {
+        if (function_exists('escapeshellarg') && !self::FunctionIsDisabled('escapeshellarg')) {
+            return escapeshellarg($arg);
+        }
+        return '\''.str_replace('\'', '\\\'', $arg).'\'';
+    }
+
+    public static function phpinfo_array() {
+        static $phpinfo_array = array();
+        if (empty($phpinfo_array)) {
+            ob_start();
+            phpinfo();
+            $phpinfo = ob_get_contents();
+            ob_end_clean();
+            $phpinfo_array = explode("\n", $phpinfo);
+        }
+        return $phpinfo_array;
+    }
+
+
+    public static function exif_info() {
+        static $exif_info = array();
+        if (empty($exif_info)) {
+            // based on code by johnschaefer at gmx dot de
+            // from PHP help on gd_info()
+            $exif_info = array(
+                'EXIF Support'           => '',
+                'EXIF Version'           => '',
+                'Supported EXIF Version' => '',
+                'Supported filetypes'    => ''
+            );
+            $phpinfo_array = self::phpinfo_array();
+            foreach ($phpinfo_array as $line) {
+                $line = trim(strip_tags($line));
+                foreach ($exif_info as $key => $value) {
+                    if (strpos($line, $key) === 0) {
+                        $newvalue = trim(str_replace($key, '', $line));
+                        $exif_info[$key] = $newvalue;
+                    }
+                }
+            }
+        }
+        return $exif_info;
+    }
+
+
+    public static function ImageTypeToMIMEtype($imagetype) {
+        if (function_exists('image_type_to_mime_type') && ($imagetype >= 1) && ($imagetype <= 16)) {
+            // PHP v4.3.0+
+            return image_type_to_mime_type($imagetype);
+        }
+        static $image_type_to_mime_type = array(
+            1  => 'image/gif',                     // IMAGETYPE_GIF
+            2  => 'image/jpeg',                    // IMAGETYPE_JPEG
+            3  => 'image/png',                     // IMAGETYPE_PNG
+            4  => 'application/x-shockwave-flash', // IMAGETYPE_SWF
+            5  => 'image/psd',                     // IMAGETYPE_PSD
+            6  => 'image/bmp',                     // IMAGETYPE_BMP
+            7  => 'image/tiff',                    // IMAGETYPE_TIFF_II (intel byte order)
+            8  => 'image/tiff',                    // IMAGETYPE_TIFF_MM (motorola byte order)
+            9  => 'application/octet-stream',      // IMAGETYPE_JPC
+            10 => 'image/jp2',                     // IMAGETYPE_JP2
+            11 => 'application/octet-stream',      // IMAGETYPE_JPX
+            12 => 'application/octet-stream',      // IMAGETYPE_JB2
+            13 => 'application/x-shockwave-flash', // IMAGETYPE_SWC
+            14 => 'image/iff',                     // IMAGETYPE_IFF
+            15 => 'image/vnd.wap.wbmp',            // IMAGETYPE_WBMP
+            16 => 'image/xbm',                     // IMAGETYPE_XBM
+
+            'gif'  => 'image/gif',                 // IMAGETYPE_GIF
+            'jpg'  => 'image/jpeg',                // IMAGETYPE_JPEG
+            'jpeg' => 'image/jpeg',                // IMAGETYPE_JPEG
+            'png'  => 'image/png',                 // IMAGETYPE_PNG
+            'bmp'  => 'image/bmp',                 // IMAGETYPE_BMP
+            'ico'  => 'image/x-icon',
+        );
+
+        return (isset($image_type_to_mime_type[$imagetype]) ? $image_type_to_mime_type[$imagetype] : false);
+    }
+
+
+    public static function TranslateWHbyAngle($width, $height, $angle) {
+        if (($angle % 180) == 0) {
+            return array($width, $height);
+        }
+        $newwidth  = (abs(sin(deg2rad($angle))) * $height) + (abs(cos(deg2rad($angle))) * $width);
+        $newheight = (abs(sin(deg2rad($angle))) * $width)  + (abs(cos(deg2rad($angle))) * $height);
+        return array($newwidth, $newheight);
+    }
+
+    public static function HexCharDisplay($string) {
+        $len = strlen($string);
+        $output = '';
+        for ($i = 0; $i < $len; $i++) {
+            $output .= ' 0x'.str_pad(dechex(ord($string{$i})), 2, '0', STR_PAD_LEFT);
+        }
+        return $output;
+    }
+
+
+    public static function IsHexColor($HexColorString) {
+        return preg_match('#^[0-9A-F]{6}$#i', $HexColorString);
+    }
+
+
+    public static function ImageColorAllocateAlphaSafe(&$gdimg_hexcolorallocate, $R, $G, $B, $alpha=false) {
+        if (self::version_compare_replacement(PHP_VERSION, '4.3.2', '>=') && ($alpha !== false)) {
+            return imagecolorallocatealpha($gdimg_hexcolorallocate, $R, $G, $B, (int) $alpha);
+        } else {
+            return imagecolorallocate($gdimg_hexcolorallocate, $R, $G, $B);
+        }
+    }
+
+    public static function ImageHexColorAllocate(&$gdimg_hexcolorallocate, $HexColorString, $dieOnInvalid=false, $alpha=false) {
+        if (!is_resource($gdimg_hexcolorallocate)) {
+            die('$gdimg_hexcolorallocate is not a GD resource in ImageHexColorAllocate()');
+        }
+        if (self::IsHexColor($HexColorString)) {
+            $R = hexdec(substr($HexColorString, 0, 2));
+            $G = hexdec(substr($HexColorString, 2, 2));
+            $B = hexdec(substr($HexColorString, 4, 2));
+            return self::ImageColorAllocateAlphaSafe($gdimg_hexcolorallocate, $R, $G, $B, $alpha);
+        }
+        if ($dieOnInvalid) {
+            die('Invalid hex color string: "'.$HexColorString.'"');
+        }
+        return imagecolorallocate($gdimg_hexcolorallocate, 0x00, 0x00, 0x00);
+    }
+
+
+    public static function HexColorXOR($hexcolor) {
+        return strtoupper(str_pad(dechex(~hexdec($hexcolor) & 0xFFFFFF), 6, '0', STR_PAD_LEFT));
+    }
+
+
+    public static function GetPixelColor(&$img, $x, $y) {
+        if (!is_resource($img)) {
+            return false;
+        }
+        return @imagecolorsforindex($img, @imagecolorat($img, $x, $y));
+    }
+
+
+    public static function PixelColorDifferencePercent($currentPixel, $targetPixel) {
+        $diff = 0;
+        foreach ($targetPixel as $channel => $currentvalue) {
+            $diff = max($diff, (max($currentPixel[$channel], $targetPixel[$channel]) - min($currentPixel[$channel], $targetPixel[$channel])) / 255);
+        }
+        return $diff * 100;
+    }
+
+    public static function GrayscaleValue($r, $g, $b) {
+        return round(($r * 0.30) + ($g * 0.59) + ($b * 0.11));
+    }
+
+
+    public static function GrayscalePixel($OriginalPixel) {
+        $gray = self::GrayscaleValue($OriginalPixel[ 'red'], $OriginalPixel[ 'green'], $OriginalPixel[ 'blue']);
+        return array('red'=>$gray, 'green'=>$gray, 'blue'=>$gray);
+    }
+
+
+    public static function GrayscalePixelRGB($rgb) {
+        $r = ($rgb >> 16) & 0xFF;
+        $g = ($rgb >>  8) & 0xFF;
+        $b =  $rgb        & 0xFF;
+        return ($r * 0.299) + ($g * 0.587) + ($b * 0.114);
+    }
+
+
+    public static function ScaleToFitInBox($width, $height, $maxwidth=null, $maxheight=null, $allow_enlarge=true, $allow_reduce=true) {
+        $maxwidth  = (null === $maxwidth  ? $width  : $maxwidth);
+        $maxheight = (null === $maxheight ? $height : $maxheight);
+        $scale_x = 1;
+        $scale_y = 1;
+        if (($width > $maxwidth) || ($width < $maxwidth)) {
+            $scale_x = ($maxwidth / $width);
+        }
+        if (($height > $maxheight) || ($height < $maxheight)) {
+            $scale_y = ($maxheight / $height);
+        }
+        $scale = min($scale_x, $scale_y);
+        if (!$allow_enlarge) {
+            $scale = min($scale, 1);
+        }
+        if (!$allow_reduce) {
+            $scale = max($scale, 1);
+        }
+        return $scale;
+    }
+
+    public static function ImageCopyResampleBicubic($dst_img, $src_img, $dst_x, $dst_y, $src_x, $src_y, $dst_w, $dst_h, $src_w, $src_h) {
+        // ron at korving dot demon dot nl
+        // http://www.php.net/imagecopyresampled
+
+        $scaleX = ($src_w - 1) / $dst_w;
+        $scaleY = ($src_h - 1) / $dst_h;
+
+        $scaleX2 = $scaleX / 2.0;
+        $scaleY2 = $scaleY / 2.0;
+
+        $isTrueColor = imageistruecolor($src_img);
+
+        for ($y = $src_y; $y < $src_y + $dst_h; $y++) {
+            $sY   = $y * $scaleY;
+            $siY  = (int) $sY;
+            $siY2 = (int) $sY + $scaleY2;
+
+            for ($x = $src_x; $x < $src_x + $dst_w; $x++) {
+                $sX   = $x * $scaleX;
+                $siX  = (int) $sX;
+                $siX2 = (int) $sX + $scaleX2;
+
+                if ($isTrueColor) {
+
+                    $c1 = imagecolorat($src_img, $siX, $siY2);
+                    $c2 = imagecolorat($src_img, $siX, $siY);
+                    $c3 = imagecolorat($src_img, $siX2, $siY2);
+                    $c4 = imagecolorat($src_img, $siX2, $siY);
+
+                    $r = (( $c1             +  $c2             +  $c3             +  $c4            ) >> 2) & 0xFF0000;
+                    $g = ((($c1 & 0x00FF00) + ($c2 & 0x00FF00) + ($c3 & 0x00FF00) + ($c4 & 0x00FF00)) >> 2) & 0x00FF00;
+                    $b = ((($c1 & 0x0000FF) + ($c2 & 0x0000FF) + ($c3 & 0x0000FF) + ($c4 & 0x0000FF)) >> 2);
+
+                } else {
+
+                    $c1 = imagecolorsforindex($src_img, imagecolorat($src_img, $siX, $siY2));
+                    $c2 = imagecolorsforindex($src_img, imagecolorat($src_img, $siX, $siY));
+                    $c3 = imagecolorsforindex($src_img, imagecolorat($src_img, $siX2, $siY2));
+                    $c4 = imagecolorsforindex($src_img, imagecolorat($src_img, $siX2, $siY));
+
+                    $r = ($c1['red']   + $c2['red']   + $c3['red']   + $c4['red'] )  << 14;
+                    $g = ($c1['green'] + $c2['green'] + $c3['green'] + $c4['green']) <<  6;
+                    $b = ($c1['blue']  + $c2['blue']  + $c3['blue']  + $c4['blue'] ) >>  2;
+
+                }
+                imagesetpixel($dst_img, $dst_x + $x - $src_x, $dst_y + $y - $src_y, $r+$g+$b);
+            }
+        }
+        return true;
+    }
+
+
+    public static function ImageCreateFunction($x_size, $y_size) {
+        $ImageCreateFunction = 'imagecreate';
+        if (self::gd_version() >= 2.0) {
+            $ImageCreateFunction = 'imagecreatetruecolor';
+        }
+        if (!function_exists($ImageCreateFunction)) {
+            return phpthumb::ErrorImage($ImageCreateFunction.'() does not exist - no GD support?');
+        }
+        if (($x_size <= 0) || ($y_size <= 0)) {
+            return phpthumb::ErrorImage('Invalid image dimensions: '.$ImageCreateFunction.'('.$x_size.', '.$y_size.')');
+        }
+        return $ImageCreateFunction(round($x_size), round($y_size));
+    }
+
+
+    public static function ImageCopyRespectAlpha(&$dst_im, &$src_im, $dst_x, $dst_y, $src_x, $src_y, $src_w, $src_h, $opacity_pct=100) {
+        $opacipct = $opacity_pct / 100;
+        for ($x = $src_x; $x < $src_w; $x++) {
+            for ($y = $src_y; $y < $src_h; $y++) {
+                $RealPixel    = self::GetPixelColor($dst_im, $dst_x + $x, $dst_y + $y);
+                $OverlayPixel = self::GetPixelColor($src_im, $x, $y);
+                $alphapct = $OverlayPixel['alpha'] / 127;
+                $overlaypct = (1 - $alphapct) * $opacipct;
+
+                $newcolor = self::ImageColorAllocateAlphaSafe(
+                    $dst_im,
+                    round($RealPixel['red']   * (1 - $overlaypct)) + ($OverlayPixel['red']   * $overlaypct),
+                    round($RealPixel['green'] * (1 - $overlaypct)) + ($OverlayPixel['green'] * $overlaypct),
+                    round($RealPixel['blue']  * (1 - $overlaypct)) + ($OverlayPixel['blue']  * $overlaypct),
+                    //$RealPixel['alpha']);
+                    0);
+
+                imagesetpixel($dst_im, $dst_x + $x, $dst_y + $y, $newcolor);
+            }
+        }
+        return true;
+    }
+
+
+    public static function ProportionalResize($old_width, $old_height, $new_width=false, $new_height=false) {
+        $old_aspect_ratio = $old_width / $old_height;
+        if (($new_width === false) && ($new_height === false)) {
+            return false;
+        } elseif ($new_width === false) {
+            $new_width = $new_height * $old_aspect_ratio;
+        } elseif ($new_height === false) {
+            $new_height = $new_width / $old_aspect_ratio;
+        }
+        $new_aspect_ratio = $new_width / $new_height;
+        if ($new_aspect_ratio == $old_aspect_ratio) {
+            // great, done
+        } elseif ($new_aspect_ratio < $old_aspect_ratio) {
+            // limited by width
+            $new_height = $new_width / $old_aspect_ratio;
+        } elseif ($new_aspect_ratio > $old_aspect_ratio) {
+            // limited by height
+            $new_width = $new_height * $old_aspect_ratio;
+        }
+        return array(
+            (int) round($new_width),
+            (int) round($new_height)
+        );
+    }
+
+
+    public static function FunctionIsDisabled($function) {
+        static $DisabledFunctions = null;
+        if (null === $DisabledFunctions) {
+            $disable_functions_local  = explode(',',     strtolower(@ini_get('disable_functions')));
+            $disable_functions_global = explode(',', strtolower(@get_cfg_var('disable_functions')));
+            foreach ($disable_functions_local as $key => $value) {
+                $DisabledFunctions[trim($value)] = 'local';
+            }
+            foreach ($disable_functions_global as $key => $value) {
+                $DisabledFunctions[trim($value)] = 'global';
+            }
+            if (@ini_get('safe_mode')) {
+                $DisabledFunctions['shell_exec']     = 'local';
+                $DisabledFunctions['set_time_limit'] = 'local';
+            }
+        }
+        return isset($DisabledFunctions[strtolower($function)]);
+    }
+
+
+    public static function SafeExec($command) {
+        static $AllowedExecFunctions = array();
+        if (empty($AllowedExecFunctions)) {
+            $AllowedExecFunctions = array('shell_exec'=>true, 'passthru'=>true, 'system'=>true, 'exec'=>true);
+            foreach ($AllowedExecFunctions as $key => $value) {
+                $AllowedExecFunctions[$key] = !self::FunctionIsDisabled($key);
+            }
+        }
+        $command .= ' 2>&1'; // force redirect stderr to stdout
+        foreach ($AllowedExecFunctions as $execfunction => $is_allowed) {
+            if (!$is_allowed) {
+                continue;
+            }
+            $returnvalue = false;
+            switch ($execfunction) {
+                case 'passthru':
+                case 'system':
+                    ob_start();
+                    $execfunction($command);
+                    $returnvalue = ob_get_contents();
+                    ob_end_clean();
+                    break;
+
+                case 'exec':
+                    $output = array();
+                    $lastline = $execfunction($command, $output);
+                    $returnvalue = implode("\n", $output);
+                    break;
+
+                case 'shell_exec':
+                    ob_start();
+                    $returnvalue = $execfunction($command);
+                    ob_end_clean();
+                    break;
+            }
+            return $returnvalue;
+        }
+        return false;
+    }
+
+
+    public static function ApacheLookupURIarray($filename) {
+        // apache_lookup_uri() only works when PHP is installed as an Apache module.
+        if (PHP_SAPI == 'apache') {
+            //$property_exists_exists = function_exists('property_exists');
+            $keys = array('status', 'the_request', 'status_line', 'method', 'content_type', 'handler', 'uri', 'filename', 'path_info', 'args', 'boundary', 'no_cache', 'no_local_copy', 'allowed', 'send_bodyct', 'bytes_sent', 'byterange', 'clength', 'unparsed_uri', 'mtime', 'request_time');
+            if ($apacheLookupURIobject = @apache_lookup_uri($filename)) {
+                $apacheLookupURIarray = array();
+                foreach ($keys as $key) {
+                    $apacheLookupURIarray[$key] = @$apacheLookupURIobject->$key;
+                }
+                return $apacheLookupURIarray;
+            }
+        }
+        return false;
+    }
+
+
+    public static function gd_is_bundled() {
+        static $isbundled = null;
+        if (null === $isbundled) {
+            $gd_info = gd_info();
+            $isbundled = (strpos($gd_info['GD Version'], 'bundled') !== false);
+        }
+        return $isbundled;
+    }
+
+
+    public static function gd_version($fullstring=false) {
+        static $cache_gd_version = array();
+        if (empty($cache_gd_version)) {
+            $gd_info = gd_info();
+            if (preg_match('#bundled \((.+)\)$#i', $gd_info['GD Version'], $matches)) {
+                $cache_gd_version[1] = $gd_info['GD Version'];  // e.g. "bundled (2.0.15 compatible)"
+                $cache_gd_version[0] = (float) $matches[1];     // e.g. "2.0" (not "bundled (2.0.15 compatible)")
+            } else {
+                $cache_gd_version[1] = $gd_info['GD Version'];                       // e.g. "1.6.2 or higher"
+                $cache_gd_version[0] = (float) substr($gd_info['GD Version'], 0, 3); // e.g. "1.6" (not "1.6.2 or higher")
+            }
+        }
+        return $cache_gd_version[ (int) $fullstring ];
+    }
+
+
+    public static function filesize_remote($remotefile, $timeout=10) {
+        $size = false;
+        $url = self::ParseURLbetter($remotefile);
+        if ($fp = @fsockopen($url['host'], ($url['port'] ? $url['port'] : 80), $errno, $errstr, $timeout)) {
+            fwrite($fp, 'HEAD '.@$url['path'].@$url['query'].' HTTP/1.0'."\r\n".'Host: '.@$url['host']."\r\n\r\n");
+            if (self::version_compare_replacement(PHP_VERSION, '4.3.0', '>=')) {
+                stream_set_timeout($fp, $timeout);
+            }
+            while (!feof($fp)) {
+                $headerline = fgets($fp, 4096);
+                if (preg_match('#^Content-Length: (.*)#i', $headerline, $matches)) {
+                    $size = (int) $matches[ 1];
+                    break;
+                }
+            }
+            fclose ($fp);
+        }
+        return $size;
+    }
+
+
+    public static function filedate_remote($remotefile, $timeout=10) {
+        $date = false;
+        $url = self::ParseURLbetter($remotefile);
+        if ($fp = @fsockopen($url['host'], ($url['port'] ? $url['port'] : 80), $errno, $errstr, $timeout)) {
+            fwrite($fp, 'HEAD '.@$url['path'].@$url['query'].' HTTP/1.0'."\r\n".'Host: '.@$url['host']."\r\n\r\n");
+            if (self::version_compare_replacement(PHP_VERSION, '4.3.0', '>=')) {
+                stream_set_timeout($fp, $timeout);
+            }
+            while (!feof($fp)) {
+                $headerline = fgets($fp, 4096);
+                if (preg_match('#^Last-Modified: (.*)#i', $headerline, $matches)) {
+                    $date = strtotime($matches[1]) - date('Z');
+                    break;
+                }
+            }
+            fclose ($fp);
+        }
+        return $date;
+    }
+
+
+    public static function md5_file_safe($filename) {
+        // md5_file() doesn't exist in PHP < 4.2.0
+        if (function_exists('md5_file')) {
+            return md5_file($filename);
+        }
+        if ($fp = @fopen($filename, 'rb')) {
+            $rawData = '';
+            do {
+                $buffer = fread($fp, 8192);
+                $rawData .= $buffer;
+            } while (strlen($buffer) > 0);
+            fclose($fp);
+            return md5($rawData);
+        }
+        return false;
+    }
+
+
+    public static function nonempty_min() {
+        $arg_list = func_get_args();
+        $acceptable = array();
+        foreach ($arg_list as $arg) {
+            if ($arg) {
+                $acceptable[] = $arg;
+            }
+        }
+        return min($acceptable);
+    }
+
+
+    public static function LittleEndian2String($number, $minbytes=1) {
+        $intstring = '';
+        while ($number > 0) {
+            $intstring .= chr($number & 255);
+            $number    >>= 8;
+        }
+        return str_pad($intstring, $minbytes, "\x00", STR_PAD_RIGHT);
+    }
+
+    public static function OneOfThese() {
+        // return the first useful (non-empty/non-zero/non-false) value from those passed
+        $arg_list = func_get_args();
+        foreach ($arg_list as $key => $value) {
+            if ($value) {
+                return $value;
+            }
+        }
+        return false;
+    }
+
+    public static function CaseInsensitiveInArray($needle, $haystack) {
+        $needle = strtolower($needle);
+        foreach ($haystack as $key => $value) {
+            if (is_array($value)) {
+                // skip?
+            } elseif ($needle == strtolower($value)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public static function URLreadFsock($host, $file, &$errstr, $successonly=true, $port=80, $timeout=10) {
+        if (!function_exists('fsockopen') || self::FunctionIsDisabled('fsockopen')) {
+            $errstr = 'fsockopen() unavailable';
+            return false;
+        }
+        //if ($fp = @fsockopen($host, $port, $errno, $errstr, $timeout)) {
+        if ($fp = @fsockopen((($port == 443) ? 'ssl://' : '').$host, $port, $errno, $errstr, $timeout)) { // https://github.com/JamesHeinrich/phpThumb/issues/39
+            $out  = 'GET '.$file.' HTTP/1.0'."\r\n";
+            $out .= 'Host: '.$host."\r\n";
+            $out .= 'Connection: Close'."\r\n\r\n";
+            fwrite($fp, $out);
+
+            $isHeader = true;
+            $Data_header = '';
+            $Data_body   = '';
+            $header_newlocation = '';
+            while (!feof($fp)) {
+                $line = fgets($fp, 1024);
+                if ($isHeader) {
+                    $Data_header .= $line;
+                } else {
+                    $Data_body .= $line;
+                }
+                if (preg_match('#^HTTP/[\\.0-9]+ ([0-9]+) (.+)$#i', rtrim($line), $matches)) {
+                    list( , $errno, $errstr) = $matches;
+                    $errno = (int) $errno;
+                } elseif (preg_match('#^Location: (.*)$#i', rtrim($line), $matches)) {
+                    $header_newlocation = $matches[1];
+                }
+                if ($isHeader && ($line == "\r\n")) {
+                    $isHeader = false;
+                    if ($successonly) {
+                        switch ($errno) {
+                            case 200:
+                                // great, continue
+                                break;
+
+                            default:
+                                $errstr = $errno.' '.$errstr.($header_newlocation ? '; Location: '.$header_newlocation : '');
+                                fclose($fp);
+                                return false;
+                                break;
+                        }
+                    }
+                }
+            }
+            fclose($fp);
+            return $Data_body;
+        }
+        return null;
+    }
+
+    public static function CleanUpURLencoding($url, $queryseperator='&') {
+        if (!preg_match('#^http#i', $url)) {
+            return $url;
+        }
+        $parse_url = self::ParseURLbetter($url);
+        $pathelements = explode('/', $parse_url['path']);
+        $CleanPathElements = array();
+        $TranslationMatrix = array(' '=>'%20');
+        foreach ($pathelements as $key => $pathelement) {
+            $CleanPathElements[] = strtr($pathelement, $TranslationMatrix);
+        }
+        foreach ($CleanPathElements as $key => $value) {
+            if ($value === '') {
+                unset($CleanPathElements[$key]);
+            }
+        }
+
+        $queries = explode($queryseperator, (isset($parse_url['query']) ? $parse_url['query'] : ''));
+        $CleanQueries = array();
+        foreach ($queries as $key => $query) {
+            @list($param, $value) = explode('=', $query);
+            $CleanQueries[] = strtr($param, $TranslationMatrix).($value ? '='.strtr($value, $TranslationMatrix) : '');
+        }
+        foreach ($CleanQueries as $key => $value) {
+            if ($value === '') {
+                unset($CleanQueries[$key]);
+            }
+        }
+
+        $cleaned_url  = $parse_url['scheme'].'://';
+        $cleaned_url .= (@$parse_url['username'] ? $parse_url['host'].(@$parse_url['password'] ? ':'.$parse_url['password'] : '').'@' : '');
+        $cleaned_url .= $parse_url['host'];
+        $cleaned_url .= ((!empty($parse_url['port']) && ($parse_url['port'] != 80)) ? ':'.$parse_url['port'] : '');
+        $cleaned_url .= '/'.implode('/', $CleanPathElements);
+        $cleaned_url .= (@$CleanQueries ? '?'.implode($queryseperator, $CleanQueries) : '');
+        return $cleaned_url;
+    }
+
+    public static function ParseURLbetter($url) {
+        $parsedURL = @parse_url($url);
+        if (!@$parsedURL['port']) {
+            switch (strtolower(@$parsedURL['scheme'])) {
+                case 'ftp':
+                    $parsedURL['port'] = 21;
+                    break;
+                case 'https':
+                    $parsedURL['port'] = 443;
+                    break;
+                case 'http':
+                    $parsedURL['port'] = 80;
+                    break;
+            }
+        }
+        return $parsedURL;
+    }
+
+    public static function SafeURLread($url, &$error, $timeout=10, $followredirects=true) {
+        $error   = '';
+        $errstr  = '';
+        $rawData = '';
+
+        $parsed_url = self::ParseURLbetter($url);
+        $alreadyLookedAtURLs[trim($url)] = true;
+
+        while (true) {
+            $tryagain = false;
+            $rawData = self::URLreadFsock(@$parsed_url[ 'host'], @$parsed_url[ 'path'].'?'.@$parsed_url[ 'query'], $errstr, true, (@$parsed_url[ 'port'] ? @$parsed_url[ 'port'] : 80), $timeout);
+            if ($followredirects && preg_match('#302 [a-z ]+; Location\\: (http.*)#i', $errstr, $matches)) {
+                $matches[1] = trim(@$matches[1]);
+                if (!@$alreadyLookedAtURLs[$matches[1]]) {
+                    // loop through and examine new URL
+                    $error .= 'URL "'.$url.'" redirected to "'.$matches[1].'"';
+
+                    $tryagain = true;
+                    $alreadyLookedAtURLs[$matches[1]] = true;
+                    $parsed_url = self::ParseURLbetter($matches[ 1]);
+                }
+            }
+            if (!$tryagain) {
+                break;
+            }
+        }
+
+        if ($rawData === false) {
+            $error .= 'Error opening "'.$url.'":'."\n\n".$errstr;
+            return false;
+        } elseif ($rawData === null) {
+            // fall through
+            $error .= 'Error opening "'.$url.'":'."\n\n".$errstr;
+        } else {
+            return $rawData;
+        }
+
+        if (function_exists('curl_version') && !self::FunctionIsDisabled('curl_exec')) {
+            $ch = curl_init();
+            curl_setopt($ch, CURLOPT_URL, $url);
+            curl_setopt($ch, CURLOPT_HEADER, false);
+            curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+            curl_setopt($ch, CURLOPT_BINARYTRANSFER, true);
+            curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, false);
+            curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
+            curl_setopt($ch, CURLOPT_FOLLOWLOCATION, (bool) $followredirects);
+            curl_setopt($ch, CURLOPT_TIMEOUT, $timeout);
+            $rawData = curl_exec($ch);
+            curl_close($ch);
+            if (strlen($rawData) > 0) {
+                $error .= 'CURL succeeded ('.strlen($rawData).' bytes); ';
+                return $rawData;
+            }
+            $error .= 'CURL available but returned no data; ';
+        } else {
+            $error .= 'CURL unavailable; ';
+        }
+
+        $BrokenURLfopenPHPversions = array('4.4.2');
+        if (in_array(PHP_VERSION, $BrokenURLfopenPHPversions)) {
+            $error .= 'fopen(URL) broken in PHP v'. PHP_VERSION .'; ';
+        } elseif (@ini_get('allow_url_fopen')) {
+            $rawData = '';
+            $error_fopen = '';
+            ob_start();
+            if ($fp = fopen($url, 'rb')) {
+                do {
+                    $buffer = fread($fp, 8192);
+                    $rawData .= $buffer;
+                } while (strlen($buffer) > 0);
+                fclose($fp);
+            } else {
+                $error_fopen .= trim(strip_tags(ob_get_contents()));
+            }
+            ob_end_clean();
+            $error .= $error_fopen;
+            if (!$error_fopen) {
+                $error .= '; "allow_url_fopen" succeeded ('.strlen($rawData).' bytes); ';
+                return $rawData;
+            }
+            $error .= '; "allow_url_fopen" enabled but returned no data ('.$error_fopen.'); ';
+        } else {
+            $error .= '"allow_url_fopen" disabled; ';
+        }
+
+        return false;
+    }
+
+    public static function EnsureDirectoryExists($dirname, $mask = 0755) {
+        $directory_elements = explode(DIRECTORY_SEPARATOR, $dirname);
+        $startoffset = (!$directory_elements[0] ? 2 : 1);  // unix with leading "/" then start with 2nd element; Windows with leading "c:\" then start with 1st element
+        $open_basedirs = preg_split('#[;:]#', ini_get('open_basedir'));
+        foreach ($open_basedirs as $key => $open_basedir) {
+            if (preg_match('#^'.preg_quote($open_basedir).'#', $dirname) && (strlen($dirname) > strlen($open_basedir))) {
+                $startoffset = substr_count($open_basedir, DIRECTORY_SEPARATOR) + 1;
+                break;
+            }
+        }
+        $i = $startoffset;
+        $endoffset = count($directory_elements);
+        for ($i = $startoffset; $i <= $endoffset; $i++) {
+            $test_directory = implode(DIRECTORY_SEPARATOR, array_slice($directory_elements, 0, $i));
+            if (!$test_directory) {
+                continue;
+            }
+            if (!@is_dir($test_directory)) {
+                if (@file_exists($test_directory)) {
+                    // directory name already exists as a file
+                    return false;
+                }
+                @mkdir($test_directory, $mask);
+                @chmod($test_directory, $mask);
+                if (!@is_dir($test_directory) || !@is_writable($test_directory)) {
+                    return false;
+                }
+            }
+        }
+        return true;
+    }
+
+
+    public static function GetAllFilesInSubfolders($dirname) {
+        $AllFiles = array();
+        $dirname = rtrim(realpath($dirname), '/\\');
+        if ($dirhandle = @opendir($dirname)) {
+            while (($file = readdir($dirhandle)) !== false) {
+                $fullfilename = $dirname.DIRECTORY_SEPARATOR.$file;
+                if (is_file($fullfilename)) {
+                    $AllFiles[] = $fullfilename;
+                } elseif (is_dir($fullfilename)) {
+                    switch ($file) {
+                        case '.':
+                        case '..':
+                            break;
+
+                        default:
+                            $AllFiles[] = $fullfilename;
+                            $subfiles = self::GetAllFilesInSubfolders($fullfilename);
+                            foreach ($subfiles as $filename) {
+                                $AllFiles[] = $filename;
+                            }
+                            break;
+                    }
+                } else {
+                    // ignore?
+                }
+            }
+            closedir($dirhandle);
+        }
+        sort($AllFiles);
+        return array_unique($AllFiles);
+    }
+
+
+    public static function SanitizeFilename($filename) {
+        $filename = preg_replace('/[^'.preg_quote(' !#$%^()+,-.;<>=@[]_{}').'a-zA-Z0-9]/', '_', $filename);
+        if (self::version_compare_replacement(PHP_VERSION, '4.1.0', '>=')) {
+            $filename = trim($filename, '.');
+        }
+        return $filename;
+    }
+
+    public static function PasswordStrength($password) {
+        $strength = 0;
+        $strength += strlen(preg_replace('#[^a-z]#',       '', $password)) * 0.5; // lowercase characters are weak
+        $strength += strlen(preg_replace('#[^A-Z]#',       '', $password)) * 0.8; // uppercase characters are somewhat better
+        $strength += strlen(preg_replace('#[^0-9]#',       '', $password)) * 1.0; // numbers are somewhat better
+        $strength += strlen(preg_replace('#[a-zA-Z0-9]#',  '', $password)) * 2.0; // other non-alphanumeric characters are best
+        return $strength;
+    }
 
 }
 
@@ -924,147 +924,147 @@ 
 
 
 if (!function_exists('gd_info')) {
-	// built into PHP v4.3.0+ (with bundled GD2 library)
-	function gd_info() {
-		static $gd_info = array();
-		if (empty($gd_info)) {
-			// based on code by johnschaefer at gmx dot de
-			// from PHP help on gd_info()
-			$gd_info = array(
-				'GD Version'         => '',
-				'FreeType Support'   => false,
-				'FreeType Linkage'   => '',
-				'T1Lib Support'      => false,
-				'GIF Read Support'   => false,
-				'GIF Create Support' => false,
-				'JPG Support'        => false,
-				'PNG Support'        => false,
-				'WBMP Support'       => false,
-				'XBM Support'        => false
-			);
-			$phpinfo_array = phpthumb_functions::phpinfo_array();
-			foreach ($phpinfo_array as $line) {
-				$line = trim(strip_tags($line));
-				foreach ($gd_info as $key => $value) {
-					//if (strpos($line, $key) !== false) {
-					if (strpos($line, $key) === 0) {
-						$newvalue = trim(str_replace($key, '', $line));
-						$gd_info[$key] = $newvalue;
-					}
-				}
-			}
-			if (empty($gd_info['GD Version'])) {
-				// probable cause: "phpinfo() disabled for security reasons"
-				if (function_exists('imagetypes')) {
-					$imagetypes = imagetypes();
-					if ($imagetypes & IMG_PNG) {
-						$gd_info['PNG Support'] = true;
-					}
-					if ($imagetypes & IMG_GIF) {
-						$gd_info['GIF Create Support'] = true;
-					}
-					if ($imagetypes & IMG_JPG) {
-						$gd_info['JPG Support'] = true;
-					}
-					if ($imagetypes & IMG_WBMP) {
-						$gd_info['WBMP Support'] = true;
-					}
-				}
-				// to determine capability of GIF creation, try to use imagecreatefromgif on a 1px GIF
-				if (function_exists('imagecreatefromgif')) {
-					if ($tempfilename = phpthumb::phpThumb_tempnam()) {
-						if ($fp_tempfile = @fopen($tempfilename, 'wb')) {
-							fwrite($fp_tempfile, base64_decode('R0lGODlhAQABAIAAAH//AP///ywAAAAAAQABAAACAUQAOw==')); // very simple 1px GIF file base64-encoded as string
-							fclose($fp_tempfile);
-							@chmod($tempfilename, $this->getParameter('config_file_create_mask'));
-
-							// if we can convert the GIF file to a GD image then GIF create support must be enabled, otherwise it's not
-							$gd_info['GIF Read Support'] = (bool) @imagecreatefromgif($tempfilename);
-						}
-						unlink($tempfilename);
-					}
-				}
-				if (function_exists('imagecreatetruecolor') && @imagecreatetruecolor(1, 1)) {
-					$gd_info['GD Version'] = '2.0.1 or higher (assumed)';
-				} elseif (function_exists('imagecreate') && @imagecreate(1, 1)) {
-					$gd_info['GD Version'] = '1.6.0 or higher (assumed)';
-				}
-			}
-		}
-		return $gd_info;
-	}
+    // built into PHP v4.3.0+ (with bundled GD2 library)
+    function gd_info() {
+        static $gd_info = array();
+        if (empty($gd_info)) {
+            // based on code by johnschaefer at gmx dot de
+            // from PHP help on gd_info()
+            $gd_info = array(
+                'GD Version'         => '',
+                'FreeType Support'   => false,
+                'FreeType Linkage'   => '',
+                'T1Lib Support'      => false,
+                'GIF Read Support'   => false,
+                'GIF Create Support' => false,
+                'JPG Support'        => false,
+                'PNG Support'        => false,
+                'WBMP Support'       => false,
+                'XBM Support'        => false
+            );
+            $phpinfo_array = phpthumb_functions::phpinfo_array();
+            foreach ($phpinfo_array as $line) {
+                $line = trim(strip_tags($line));
+                foreach ($gd_info as $key => $value) {
+                    //if (strpos($line, $key) !== false) {
+                    if (strpos($line, $key) === 0) {
+                        $newvalue = trim(str_replace($key, '', $line));
+                        $gd_info[$key] = $newvalue;
+                    }
+                }
+            }
+            if (empty($gd_info['GD Version'])) {
+                // probable cause: "phpinfo() disabled for security reasons"
+                if (function_exists('imagetypes')) {
+                    $imagetypes = imagetypes();
+                    if ($imagetypes & IMG_PNG) {
+                        $gd_info['PNG Support'] = true;
+                    }
+                    if ($imagetypes & IMG_GIF) {
+                        $gd_info['GIF Create Support'] = true;
+                    }
+                    if ($imagetypes & IMG_JPG) {
+                        $gd_info['JPG Support'] = true;
+                    }
+                    if ($imagetypes & IMG_WBMP) {
+                        $gd_info['WBMP Support'] = true;
+                    }
+                }
+                // to determine capability of GIF creation, try to use imagecreatefromgif on a 1px GIF
+                if (function_exists('imagecreatefromgif')) {
+                    if ($tempfilename = phpthumb::phpThumb_tempnam()) {
+                        if ($fp_tempfile = @fopen($tempfilename, 'wb')) {
+                            fwrite($fp_tempfile, base64_decode('R0lGODlhAQABAIAAAH//AP///ywAAAAAAQABAAACAUQAOw==')); // very simple 1px GIF file base64-encoded as string
+                            fclose($fp_tempfile);
+                            @chmod($tempfilename, $this->getParameter('config_file_create_mask'));
+
+                            // if we can convert the GIF file to a GD image then GIF create support must be enabled, otherwise it's not
+                            $gd_info['GIF Read Support'] = (bool) @imagecreatefromgif($tempfilename);
+                        }
+                        unlink($tempfilename);
+                    }
+                }
+                if (function_exists('imagecreatetruecolor') && @imagecreatetruecolor(1, 1)) {
+                    $gd_info['GD Version'] = '2.0.1 or higher (assumed)';
+                } elseif (function_exists('imagecreate') && @imagecreate(1, 1)) {
+                    $gd_info['GD Version'] = '1.6.0 or higher (assumed)';
+                }
+            }
+        }
+        return $gd_info;
+    }
 }
 
 
 if (!function_exists('is_executable')) {
-	// in PHP v3+, but v5.0+ for Windows
-	function is_executable($filename) {
-		// poor substitute, but better than nothing
-		return file_exists($filename);
-	}
+    // in PHP v3+, but v5.0+ for Windows
+    function is_executable($filename) {
+        // poor substitute, but better than nothing
+        return file_exists($filename);
+    }
 }
 
 
 if (!function_exists('preg_quote')) {
-	// included in PHP v3.0.9+, but may be unavailable if not compiled in
-	function preg_quote($string, $delimiter='\\') {
-		static $preg_quote_array = array();
-		if (empty($preg_quote_array)) {
-			$escapeables = '.\\+*?[^]$(){}=!<>|:';
-			for ($i = 0, $iMax = strlen($escapeables); $i < $iMax; $i++) {
-				$strtr_preg_quote[$escapeables{$i}] = $delimiter.$escapeables{$i};
-			}
-		}
-		return strtr($string, $strtr_preg_quote);
-	}
+    // included in PHP v3.0.9+, but may be unavailable if not compiled in
+    function preg_quote($string, $delimiter='\\') {
+        static $preg_quote_array = array();
+        if (empty($preg_quote_array)) {
+            $escapeables = '.\\+*?[^]$(){}=!<>|:';
+            for ($i = 0, $iMax = strlen($escapeables); $i < $iMax; $i++) {
+                $strtr_preg_quote[$escapeables{$i}] = $delimiter.$escapeables{$i};
+            }
+        }
+        return strtr($string, $strtr_preg_quote);
+    }
 }
 
 if (!function_exists('file_get_contents')) {
-	// included in PHP v4.3.0+
-	function file_get_contents($filename) {
-		if (preg_match('#^(f|ht)tp\://#i', $filename)) {
-			return SafeURLread($filename, $error);
-		}
-		if ($fp = @fopen($filename, 'rb')) {
-			$rawData = '';
-			do {
-				$buffer = fread($fp, 8192);
-				$rawData .= $buffer;
-			} while (strlen($buffer) > 0);
-			fclose($fp);
-			return $rawData;
-		}
-		return false;
-	}
+    // included in PHP v4.3.0+
+    function file_get_contents($filename) {
+        if (preg_match('#^(f|ht)tp\://#i', $filename)) {
+            return SafeURLread($filename, $error);
+        }
+        if ($fp = @fopen($filename, 'rb')) {
+            $rawData = '';
+            do {
+                $buffer = fread($fp, 8192);
+                $rawData .= $buffer;
+            } while (strlen($buffer) > 0);
+            fclose($fp);
+            return $rawData;
+        }
+        return false;
+    }
 }
 
 
 if (!function_exists('file_put_contents')) {
-	// included in PHP v5.0.0+
-	function file_put_contents($filename, $filedata) {
-		if ($fp = @fopen($filename, 'wb')) {
-			fwrite($fp, $filedata);
-			fclose($fp);
-			return true;
-		}
-		return false;
-	}
+    // included in PHP v5.0.0+
+    function file_put_contents($filename, $filedata) {
+        if ($fp = @fopen($filename, 'wb')) {
+            fwrite($fp, $filedata);
+            fclose($fp);
+            return true;
+        }
+        return false;
+    }
 }
 
 if (!function_exists('imagealphablending')) {
-	// built-in function requires PHP v4.0.6+ *and* GD v2.0.1+
-	function imagealphablending(&$img, $blendmode=true) {
-		// do nothing, this function is declared here just to
-		// prevent runtime errors if GD2 is not available
-		return true;
-	}
+    // built-in function requires PHP v4.0.6+ *and* GD v2.0.1+
+    function imagealphablending(&$img, $blendmode=true) {
+        // do nothing, this function is declared here just to
+        // prevent runtime errors if GD2 is not available
+        return true;
+    }
 }
 
 if (!function_exists('imagesavealpha')) {
-	// built-in function requires PHP v4.3.2+ *and* GD v2.0.1+
-	function imagesavealpha(&$img, $blendmode=true) {
-		// do nothing, this function is declared here just to
-		// prevent runtime errors if GD2 is not available
-		return true;
-	}
+    // built-in function requires PHP v4.3.2+ *and* GD v2.0.1+
+    function imagesavealpha(&$img, $blendmode=true) {
+        // do nothing, this function is declared here just to
+        // prevent runtime errors if GD2 is not available
+        return true;
+    }
 }

Spacing +84 added lines, -84 removed lines

@@ -35,7 +35,7 @@ 
 	}
 
 
-	public static function version_compare_replacement_sub($version1, $version2, $operator='') {
+	public static function version_compare_replacement_sub($version1, $version2, $operator = '') {
 		// If you specify the third optional operator argument, you can test for a particular relationship.
 		// The possible operators are: <, lt, <=, le, >, gt, >=, ge, ==, =, eq, !=, <>, ne respectively.
 		// Using this argument, the function will return 1 if the relationship is the one specified by the operator, 0 otherwise.
@@ -61,29 +61,29 @@ 
 		switch ($operator) {
 			case '<':
 			case 'lt':
-				return (int) ($version1 < $version2);
+				return (int)($version1 < $version2);
 				break;
 			case '<=':
 			case 'le':
-				return (int) ($version1 <= $version2);
+				return (int)($version1 <= $version2);
 				break;
 			case '>':
 			case 'gt':
-				return (int) ($version1 > $version2);
+				return (int)($version1 > $version2);
 				break;
 			case '>=':
 			case 'ge':
-				return (int) ($version1 >= $version2);
+				return (int)($version1 >= $version2);
 				break;
 			case '==':
 			case '=':
 			case 'eq':
-				return (int) ($version1 == $version2);
+				return (int)($version1 == $version2);
 				break;
 			case '!=':
 			case '<>':
 			case 'ne':
-				return (int) ($version1 != $version2);
+				return (int)($version1 != $version2);
 				break;
 		}
 		if ($version1 == $version2) {
@@ -95,7 +95,7 @@ 
 	}
 
 
-	public static function version_compare_replacement($version1, $version2, $operator='') {
+	public static function version_compare_replacement($version1, $version2, $operator = '') {
 		if (function_exists('version_compare')) {
 			// built into PHP v4.1.0+
 			return version_compare($version1, $version2, $operator);
@@ -174,28 +174,28 @@ 
 			return image_type_to_mime_type($imagetype);
 		}
 		static $image_type_to_mime_type = array(
-			1  => 'image/gif',                     // IMAGETYPE_GIF
-			2  => 'image/jpeg',                    // IMAGETYPE_JPEG
-			3  => 'image/png',                     // IMAGETYPE_PNG
+			1  => 'image/gif', // IMAGETYPE_GIF
+			2  => 'image/jpeg', // IMAGETYPE_JPEG
+			3  => 'image/png', // IMAGETYPE_PNG
 			4  => 'application/x-shockwave-flash', // IMAGETYPE_SWF
-			5  => 'image/psd',                     // IMAGETYPE_PSD
-			6  => 'image/bmp',                     // IMAGETYPE_BMP
-			7  => 'image/tiff',                    // IMAGETYPE_TIFF_II (intel byte order)
-			8  => 'image/tiff',                    // IMAGETYPE_TIFF_MM (motorola byte order)
-			9  => 'application/octet-stream',      // IMAGETYPE_JPC
-			10 => 'image/jp2',                     // IMAGETYPE_JP2
-			11 => 'application/octet-stream',      // IMAGETYPE_JPX
-			12 => 'application/octet-stream',      // IMAGETYPE_JB2
+			5  => 'image/psd', // IMAGETYPE_PSD
+			6  => 'image/bmp', // IMAGETYPE_BMP
+			7  => 'image/tiff', // IMAGETYPE_TIFF_II (intel byte order)
+			8  => 'image/tiff', // IMAGETYPE_TIFF_MM (motorola byte order)
+			9  => 'application/octet-stream', // IMAGETYPE_JPC
+			10 => 'image/jp2', // IMAGETYPE_JP2
+			11 => 'application/octet-stream', // IMAGETYPE_JPX
+			12 => 'application/octet-stream', // IMAGETYPE_JB2
 			13 => 'application/x-shockwave-flash', // IMAGETYPE_SWC
-			14 => 'image/iff',                     // IMAGETYPE_IFF
-			15 => 'image/vnd.wap.wbmp',            // IMAGETYPE_WBMP
-			16 => 'image/xbm',                     // IMAGETYPE_XBM
-
-			'gif'  => 'image/gif',                 // IMAGETYPE_GIF
-			'jpg'  => 'image/jpeg',                // IMAGETYPE_JPEG
-			'jpeg' => 'image/jpeg',                // IMAGETYPE_JPEG
-			'png'  => 'image/png',                 // IMAGETYPE_PNG
-			'bmp'  => 'image/bmp',                 // IMAGETYPE_BMP
+			14 => 'image/iff', // IMAGETYPE_IFF
+			15 => 'image/vnd.wap.wbmp', // IMAGETYPE_WBMP
+			16 => 'image/xbm', // IMAGETYPE_XBM
+
+			'gif'  => 'image/gif', // IMAGETYPE_GIF
+			'jpg'  => 'image/jpeg', // IMAGETYPE_JPEG
+			'jpeg' => 'image/jpeg', // IMAGETYPE_JPEG
+			'png'  => 'image/png', // IMAGETYPE_PNG
+			'bmp'  => 'image/bmp', // IMAGETYPE_BMP
 			'ico'  => 'image/x-icon',
 		);
 
@@ -208,7 +208,7 @@ 
 			return array($width, $height);
 		}
 		$newwidth  = (abs(sin(deg2rad($angle))) * $height) + (abs(cos(deg2rad($angle))) * $width);
-		$newheight = (abs(sin(deg2rad($angle))) * $width)  + (abs(cos(deg2rad($angle))) * $height);
+		$newheight = (abs(sin(deg2rad($angle))) * $width) + (abs(cos(deg2rad($angle))) * $height);
 		return array($newwidth, $newheight);
 	}
 
@@ -227,15 +227,15 @@ 
 	}
 
 
-	public static function ImageColorAllocateAlphaSafe(&$gdimg_hexcolorallocate, $R, $G, $B, $alpha=false) {
+	public static function ImageColorAllocateAlphaSafe(&$gdimg_hexcolorallocate, $R, $G, $B, $alpha = false) {
 		if (self::version_compare_replacement(PHP_VERSION, '4.3.2', '>=') && ($alpha !== false)) {
-			return imagecolorallocatealpha($gdimg_hexcolorallocate, $R, $G, $B, (int) $alpha);
+			return imagecolorallocatealpha($gdimg_hexcolorallocate, $R, $G, $B, (int)$alpha);
 		} else {
 			return imagecolorallocate($gdimg_hexcolorallocate, $R, $G, $B);
 		}
 	}
 
-	public static function ImageHexColorAllocate(&$gdimg_hexcolorallocate, $HexColorString, $dieOnInvalid=false, $alpha=false) {
+	public static function ImageHexColorAllocate(&$gdimg_hexcolorallocate, $HexColorString, $dieOnInvalid = false, $alpha = false) {
 		if (!is_resource($gdimg_hexcolorallocate)) {
 			die('$gdimg_hexcolorallocate is not a GD resource in ImageHexColorAllocate()');
 		}
@@ -279,21 +279,21 @@ 
 
 
 	public static function GrayscalePixel($OriginalPixel) {
-		$gray = self::GrayscaleValue($OriginalPixel[ 'red'], $OriginalPixel[ 'green'], $OriginalPixel[ 'blue']);
+		$gray = self::GrayscaleValue($OriginalPixel['red'], $OriginalPixel['green'], $OriginalPixel['blue']);
 		return array('red'=>$gray, 'green'=>$gray, 'blue'=>$gray);
 	}
 
 
 	public static function GrayscalePixelRGB($rgb) {
 		$r = ($rgb >> 16) & 0xFF;
-		$g = ($rgb >>  8) & 0xFF;
-		$b =  $rgb        & 0xFF;
+		$g = ($rgb >> 8) & 0xFF;
+		$b = $rgb & 0xFF;
 		return ($r * 0.299) + ($g * 0.587) + ($b * 0.114);
 	}
 
 
-	public static function ScaleToFitInBox($width, $height, $maxwidth=null, $maxheight=null, $allow_enlarge=true, $allow_reduce=true) {
-		$maxwidth  = (null === $maxwidth  ? $width  : $maxwidth);
+	public static function ScaleToFitInBox($width, $height, $maxwidth = null, $maxheight = null, $allow_enlarge = true, $allow_reduce = true) {
+		$maxwidth  = (null === $maxwidth ? $width : $maxwidth);
 		$maxheight = (null === $maxheight ? $height : $maxheight);
 		$scale_x = 1;
 		$scale_y = 1;
@@ -327,13 +327,13 @@ 
 
 		for ($y = $src_y; $y < $src_y + $dst_h; $y++) {
 			$sY   = $y * $scaleY;
-			$siY  = (int) $sY;
-			$siY2 = (int) $sY + $scaleY2;
+			$siY  = (int)$sY;
+			$siY2 = (int)$sY + $scaleY2;
 
 			for ($x = $src_x; $x < $src_x + $dst_w; $x++) {
 				$sX   = $x * $scaleX;
-				$siX  = (int) $sX;
-				$siX2 = (int) $sX + $scaleX2;
+				$siX  = (int)$sX;
+				$siX2 = (int)$sX + $scaleX2;
 
 				if ($isTrueColor) {
 
@@ -342,7 +342,7 @@ 
 					$c3 = imagecolorat($src_img, $siX2, $siY2);
 					$c4 = imagecolorat($src_img, $siX2, $siY);
 
-					$r = (( $c1             +  $c2             +  $c3             +  $c4            ) >> 2) & 0xFF0000;
+					$r = (($c1 + $c2 + $c3 + $c4) >> 2) & 0xFF0000;
 					$g = ((($c1 & 0x00FF00) + ($c2 & 0x00FF00) + ($c3 & 0x00FF00) + ($c4 & 0x00FF00)) >> 2) & 0x00FF00;
 					$b = ((($c1 & 0x0000FF) + ($c2 & 0x0000FF) + ($c3 & 0x0000FF) + ($c4 & 0x0000FF)) >> 2);
 
@@ -353,12 +353,12 @@ 
 					$c3 = imagecolorsforindex($src_img, imagecolorat($src_img, $siX2, $siY2));
 					$c4 = imagecolorsforindex($src_img, imagecolorat($src_img, $siX2, $siY));
 
-					$r = ($c1['red']   + $c2['red']   + $c3['red']   + $c4['red'] )  << 14;
-					$g = ($c1['green'] + $c2['green'] + $c3['green'] + $c4['green']) <<  6;
-					$b = ($c1['blue']  + $c2['blue']  + $c3['blue']  + $c4['blue'] ) >>  2;
+					$r = ($c1['red'] + $c2['red'] + $c3['red'] + $c4['red']) << 14;
+					$g = ($c1['green'] + $c2['green'] + $c3['green'] + $c4['green']) << 6;
+					$b = ($c1['blue'] + $c2['blue'] + $c3['blue'] + $c4['blue']) >> 2;
 
 				}
-				imagesetpixel($dst_img, $dst_x + $x - $src_x, $dst_y + $y - $src_y, $r+$g+$b);
+				imagesetpixel($dst_img, $dst_x + $x - $src_x, $dst_y + $y - $src_y, $r + $g + $b);
 			}
 		}
 		return true;
@@ -380,7 +380,7 @@ 
 	}
 
 
-	public static function ImageCopyRespectAlpha(&$dst_im, &$src_im, $dst_x, $dst_y, $src_x, $src_y, $src_w, $src_h, $opacity_pct=100) {
+	public static function ImageCopyRespectAlpha(&$dst_im, &$src_im, $dst_x, $dst_y, $src_x, $src_y, $src_w, $src_h, $opacity_pct = 100) {
 		$opacipct = $opacity_pct / 100;
 		for ($x = $src_x; $x < $src_w; $x++) {
 			for ($y = $src_y; $y < $src_h; $y++) {
@@ -391,9 +391,9 @@ 
 
 				$newcolor = self::ImageColorAllocateAlphaSafe(
 					$dst_im,
-					round($RealPixel['red']   * (1 - $overlaypct)) + ($OverlayPixel['red']   * $overlaypct),
+					round($RealPixel['red'] * (1 - $overlaypct)) + ($OverlayPixel['red'] * $overlaypct),
 					round($RealPixel['green'] * (1 - $overlaypct)) + ($OverlayPixel['green'] * $overlaypct),
-					round($RealPixel['blue']  * (1 - $overlaypct)) + ($OverlayPixel['blue']  * $overlaypct),
+					round($RealPixel['blue'] * (1 - $overlaypct)) + ($OverlayPixel['blue'] * $overlaypct),
 					//$RealPixel['alpha']);
 					0);
 
@@ -404,7 +404,7 @@ 
 	}
 
 
-	public static function ProportionalResize($old_width, $old_height, $new_width=false, $new_height=false) {
+	public static function ProportionalResize($old_width, $old_height, $new_width = false, $new_height = false) {
 		$old_aspect_ratio = $old_width / $old_height;
 		if (($new_width === false) && ($new_height === false)) {
 			return false;
@@ -424,8 +424,8 @@ 
 			$new_width = $new_height * $old_aspect_ratio;
 		}
 		return array(
-			(int) round($new_width),
-			(int) round($new_height)
+			(int)round($new_width),
+			(int)round($new_height)
 		);
 	}
 
@@ -433,7 +433,7 @@ 
 	public static function FunctionIsDisabled($function) {
 		static $DisabledFunctions = null;
 		if (null === $DisabledFunctions) {
-			$disable_functions_local  = explode(',',     strtolower(@ini_get('disable_functions')));
+			$disable_functions_local  = explode(',', strtolower(@ini_get('disable_functions')));
 			$disable_functions_global = explode(',', strtolower(@get_cfg_var('disable_functions')));
 			foreach ($disable_functions_local as $key => $value) {
 				$DisabledFunctions[trim($value)] = 'local';
@@ -518,23 +518,23 @@ 
 	}
 
 
-	public static function gd_version($fullstring=false) {
+	public static function gd_version($fullstring = false) {
 		static $cache_gd_version = array();
 		if (empty($cache_gd_version)) {
 			$gd_info = gd_info();
 			if (preg_match('#bundled \((.+)\)$#i', $gd_info['GD Version'], $matches)) {
-				$cache_gd_version[1] = $gd_info['GD Version'];  // e.g. "bundled (2.0.15 compatible)"
-				$cache_gd_version[0] = (float) $matches[1];     // e.g. "2.0" (not "bundled (2.0.15 compatible)")
+				$cache_gd_version[1] = $gd_info['GD Version']; // e.g. "bundled (2.0.15 compatible)"
+				$cache_gd_version[0] = (float)$matches[1]; // e.g. "2.0" (not "bundled (2.0.15 compatible)")
 			} else {
-				$cache_gd_version[1] = $gd_info['GD Version'];                       // e.g. "1.6.2 or higher"
-				$cache_gd_version[0] = (float) substr($gd_info['GD Version'], 0, 3); // e.g. "1.6" (not "1.6.2 or higher")
+				$cache_gd_version[1] = $gd_info['GD Version']; // e.g. "1.6.2 or higher"
+				$cache_gd_version[0] = (float)substr($gd_info['GD Version'], 0, 3); // e.g. "1.6" (not "1.6.2 or higher")
 			}
 		}
-		return $cache_gd_version[ (int) $fullstring ];
+		return $cache_gd_version[(int)$fullstring];
 	}
 
 
-	public static function filesize_remote($remotefile, $timeout=10) {
+	public static function filesize_remote($remotefile, $timeout = 10) {
 		$size = false;
 		$url = self::ParseURLbetter($remotefile);
 		if ($fp = @fsockopen($url['host'], ($url['port'] ? $url['port'] : 80), $errno, $errstr, $timeout)) {
@@ -545,17 +545,17 @@ 
 			while (!feof($fp)) {
 				$headerline = fgets($fp, 4096);
 				if (preg_match('#^Content-Length: (.*)#i', $headerline, $matches)) {
-					$size = (int) $matches[ 1];
+					$size = (int)$matches[1];
 					break;
 				}
 			}
-			fclose ($fp);
+			fclose($fp);
 		}
 		return $size;
 	}
 
 
-	public static function filedate_remote($remotefile, $timeout=10) {
+	public static function filedate_remote($remotefile, $timeout = 10) {
 		$date = false;
 		$url = self::ParseURLbetter($remotefile);
 		if ($fp = @fsockopen($url['host'], ($url['port'] ? $url['port'] : 80), $errno, $errstr, $timeout)) {
@@ -570,7 +570,7 @@ 
 					break;
 				}
 			}
-			fclose ($fp);
+			fclose($fp);
 		}
 		return $date;
 	}
@@ -606,11 +606,11 @@ 
 	}
 
 
-	public static function LittleEndian2String($number, $minbytes=1) {
+	public static function LittleEndian2String($number, $minbytes = 1) {
 		$intstring = '';
 		while ($number > 0) {
 			$intstring .= chr($number & 255);
-			$number    >>= 8;
+			$number >>= 8;
 		}
 		return str_pad($intstring, $minbytes, "\x00", STR_PAD_RIGHT);
 	}
@@ -638,7 +638,7 @@ 
 		return false;
 	}
 
-	public static function URLreadFsock($host, $file, &$errstr, $successonly=true, $port=80, $timeout=10) {
+	public static function URLreadFsock($host, $file, &$errstr, $successonly = true, $port = 80, $timeout = 10) {
 		if (!function_exists('fsockopen') || self::FunctionIsDisabled('fsockopen')) {
 			$errstr = 'fsockopen() unavailable';
 			return false;
@@ -662,8 +662,8 @@ 
 					$Data_body .= $line;
 				}
 				if (preg_match('#^HTTP/[\\.0-9]+ ([0-9]+) (.+)$#i', rtrim($line), $matches)) {
-					list( , $errno, $errstr) = $matches;
-					$errno = (int) $errno;
+					list(, $errno, $errstr) = $matches;
+					$errno = (int)$errno;
 				} elseif (preg_match('#^Location: (.*)$#i', rtrim($line), $matches)) {
 					$header_newlocation = $matches[1];
 				}
@@ -690,7 +690,7 @@ 
 		return null;
 	}
 
-	public static function CleanUpURLencoding($url, $queryseperator='&') {
+	public static function CleanUpURLencoding($url, $queryseperator = '&') {
 		if (!preg_match('#^http#i', $url)) {
 			return $url;
 		}
@@ -746,7 +746,7 @@ 
 		return $parsedURL;
 	}
 
-	public static function SafeURLread($url, &$error, $timeout=10, $followredirects=true) {
+	public static function SafeURLread($url, &$error, $timeout = 10, $followredirects = true) {
 		$error   = '';
 		$errstr  = '';
 		$rawData = '';
@@ -756,7 +756,7 @@ 
 
 		while (true) {
 			$tryagain = false;
-			$rawData = self::URLreadFsock(@$parsed_url[ 'host'], @$parsed_url[ 'path'].'?'.@$parsed_url[ 'query'], $errstr, true, (@$parsed_url[ 'port'] ? @$parsed_url[ 'port'] : 80), $timeout);
+			$rawData = self::URLreadFsock(@$parsed_url['host'], @$parsed_url['path'].'?'.@$parsed_url['query'], $errstr, true, (@$parsed_url['port'] ? @$parsed_url['port'] : 80), $timeout);
 			if ($followredirects && preg_match('#302 [a-z ]+; Location\\: (http.*)#i', $errstr, $matches)) {
 				$matches[1] = trim(@$matches[1]);
 				if (!@$alreadyLookedAtURLs[$matches[1]]) {
@@ -765,7 +765,7 @@ 
 
 					$tryagain = true;
 					$alreadyLookedAtURLs[$matches[1]] = true;
-					$parsed_url = self::ParseURLbetter($matches[ 1]);
+					$parsed_url = self::ParseURLbetter($matches[1]);
 				}
 			}
 			if (!$tryagain) {
@@ -791,7 +791,7 @@ 
 			curl_setopt($ch, CURLOPT_BINARYTRANSFER, true);
 			curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, false);
 			curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
-			curl_setopt($ch, CURLOPT_FOLLOWLOCATION, (bool) $followredirects);
+			curl_setopt($ch, CURLOPT_FOLLOWLOCATION, (bool)$followredirects);
 			curl_setopt($ch, CURLOPT_TIMEOUT, $timeout);
 			$rawData = curl_exec($ch);
 			curl_close($ch);
@@ -806,7 +806,7 @@ 
 
 		$BrokenURLfopenPHPversions = array('4.4.2');
 		if (in_array(PHP_VERSION, $BrokenURLfopenPHPversions)) {
-			$error .= 'fopen(URL) broken in PHP v'. PHP_VERSION .'; ';
+			$error .= 'fopen(URL) broken in PHP v'.PHP_VERSION.'; ';
 		} elseif (@ini_get('allow_url_fopen')) {
 			$rawData = '';
 			$error_fopen = '';
@@ -836,7 +836,7 @@ 
 
 	public static function EnsureDirectoryExists($dirname, $mask = 0755) {
 		$directory_elements = explode(DIRECTORY_SEPARATOR, $dirname);
-		$startoffset = (!$directory_elements[0] ? 2 : 1);  // unix with leading "/" then start with 2nd element; Windows with leading "c:\" then start with 1st element
+		$startoffset = (!$directory_elements[0] ? 2 : 1); // unix with leading "/" then start with 2nd element; Windows with leading "c:\" then start with 1st element
 		$open_basedirs = preg_split('#[;:]#', ini_get('open_basedir'));
 		foreach ($open_basedirs as $key => $open_basedir) {
 			if (preg_match('#^'.preg_quote($open_basedir).'#', $dirname) && (strlen($dirname) > strlen($open_basedir))) {
@@ -910,10 +910,10 @@ 
 
 	public static function PasswordStrength($password) {
 		$strength = 0;
-		$strength += strlen(preg_replace('#[^a-z]#',       '', $password)) * 0.5; // lowercase characters are weak
-		$strength += strlen(preg_replace('#[^A-Z]#',       '', $password)) * 0.8; // uppercase characters are somewhat better
-		$strength += strlen(preg_replace('#[^0-9]#',       '', $password)) * 1.0; // numbers are somewhat better
-		$strength += strlen(preg_replace('#[a-zA-Z0-9]#',  '', $password)) * 2.0; // other non-alphanumeric characters are best
+		$strength += strlen(preg_replace('#[^a-z]#', '', $password)) * 0.5; // lowercase characters are weak
+		$strength += strlen(preg_replace('#[^A-Z]#', '', $password)) * 0.8; // uppercase characters are somewhat better
+		$strength += strlen(preg_replace('#[^0-9]#', '', $password)) * 1.0; // numbers are somewhat better
+		$strength += strlen(preg_replace('#[a-zA-Z0-9]#', '', $password)) * 2.0; // other non-alphanumeric characters are best
 		return $strength;
 	}
 
@@ -979,7 +979,7 @@ 
 							@chmod($tempfilename, $this->getParameter('config_file_create_mask'));
 
 							// if we can convert the GIF file to a GD image then GIF create support must be enabled, otherwise it's not
-							$gd_info['GIF Read Support'] = (bool) @imagecreatefromgif($tempfilename);
+							$gd_info['GIF Read Support'] = (bool)@imagecreatefromgif($tempfilename);
 						}
 						unlink($tempfilename);
 					}
@@ -1007,7 +1007,7 @@ 
 
 if (!function_exists('preg_quote')) {
 	// included in PHP v3.0.9+, but may be unavailable if not compiled in
-	function preg_quote($string, $delimiter='\\') {
+	function preg_quote($string, $delimiter = '\\') {
 		static $preg_quote_array = array();
 		if (empty($preg_quote_array)) {
 			$escapeables = '.\\+*?[^]$(){}=!<>|:';
@@ -1053,7 +1053,7 @@ 
 
 if (!function_exists('imagealphablending')) {
 	// built-in function requires PHP v4.0.6+ *and* GD v2.0.1+
-	function imagealphablending(&$img, $blendmode=true) {
+	function imagealphablending(&$img, $blendmode = true) {
 		// do nothing, this function is declared here just to
 		// prevent runtime errors if GD2 is not available
 		return true;
@@ -1062,7 +1062,7 @@ 
 
 if (!function_exists('imagesavealpha')) {
 	// built-in function requires PHP v4.3.2+ *and* GD v2.0.1+
-	function imagesavealpha(&$img, $blendmode=true) {
+	function imagesavealpha(&$img, $blendmode = true) {
 		// do nothing, this function is declared here just to
 		// prevent runtime errors if GD2 is not available
 		return true;

htdocs/modules/system/class/thumbs/phpthumb.bmp.php

Indentation +846 added lines, -846 removed lines

@@ -20,851 +20,851 @@
 
 class phpthumb_bmp {
 
-	public function phpthumb_bmp2gd(&$BMPdata, $truecolor=true) {
-		$ThisFileInfo = array();
-		if ($this->getid3_bmp($BMPdata, $ThisFileInfo, true, true)) {
-			$gd = $this->PlotPixelsGD($ThisFileInfo['bmp'], $truecolor);
-			return $gd;
-		}
-		return false;
-	}
-
-	public function phpthumb_bmpfile2gd($filename, $truecolor=true) {
-		if ($fp = @fopen($filename, 'rb')) {
-			$BMPdata = fread($fp, filesize($filename));
-			fclose($fp);
-			return $this->phpthumb_bmp2gd($BMPdata, $truecolor);
-		}
-		return false;
-	}
-
-	public function GD2BMPstring(&$gd_image) {
-		$imageX = imagesx($gd_image);
-		$imageY = imagesy($gd_image);
-
-		$BMP = '';
-		for ($y = ($imageY - 1); $y >= 0; $y--) {
-			$thisline = '';
-			for ($x = 0; $x < $imageX; $x++) {
-				$argb = phpthumb_functions::GetPixelColor($gd_image, $x, $y);
-				$thisline .= chr($argb['blue']).chr($argb['green']).chr($argb['red']);
-			}
-			while (strlen($thisline) % 4) {
-				$thisline .= "\x00";
-			}
-			$BMP .= $thisline;
-		}
-
-		$bmpSize = strlen($BMP) + 14 + 40;
-		// BITMAPFILEHEADER [14 bytes] - http://msdn.microsoft.com/library/en-us/gdi/bitmaps_62uq.asp
-		$BITMAPFILEHEADER  = 'BM';                                                           // WORD    bfType;
-		$BITMAPFILEHEADER .= phpthumb_functions::LittleEndian2String($bmpSize, 4); // DWORD   bfSize;
-		$BITMAPFILEHEADER .= phpthumb_functions::LittleEndian2String(       0, 2); // WORD    bfReserved1;
-		$BITMAPFILEHEADER .= phpthumb_functions::LittleEndian2String(       0, 2); // WORD    bfReserved2;
-		$BITMAPFILEHEADER .= phpthumb_functions::LittleEndian2String(      54, 4); // DWORD   bfOffBits;
-
-		// BITMAPINFOHEADER - [40 bytes] http://msdn.microsoft.com/library/en-us/gdi/bitmaps_1rw2.asp
-		$BITMAPINFOHEADER  = phpthumb_functions::LittleEndian2String(      40, 4); // DWORD  biSize;
-		$BITMAPINFOHEADER .= phpthumb_functions::LittleEndian2String( $imageX, 4); // LONG   biWidth;
-		$BITMAPINFOHEADER .= phpthumb_functions::LittleEndian2String( $imageY, 4); // LONG   biHeight;
-		$BITMAPINFOHEADER .= phpthumb_functions::LittleEndian2String(       1, 2); // WORD   biPlanes;
-		$BITMAPINFOHEADER .= phpthumb_functions::LittleEndian2String(      24, 2); // WORD   biBitCount;
-		$BITMAPINFOHEADER .= phpthumb_functions::LittleEndian2String(       0, 4); // DWORD  biCompression;
-		$BITMAPINFOHEADER .= phpthumb_functions::LittleEndian2String(       0, 4); // DWORD  biSizeImage;
-		$BITMAPINFOHEADER .= phpthumb_functions::LittleEndian2String(    2835, 4); // LONG   biXPelsPerMeter;
-		$BITMAPINFOHEADER .= phpthumb_functions::LittleEndian2String(    2835, 4); // LONG   biYPelsPerMeter;
-		$BITMAPINFOHEADER .= phpthumb_functions::LittleEndian2String(       0, 4); // DWORD  biClrUsed;
-		$BITMAPINFOHEADER .= phpthumb_functions::LittleEndian2String(       0, 4); // DWORD  biClrImportant;
-
-		return $BITMAPFILEHEADER.$BITMAPINFOHEADER.$BMP;
-	}
-
-	public function getid3_bmp(&$BMPdata, &$ThisFileInfo, $ExtractPalette=false, $ExtractData=false) {
-
-		// shortcuts
-		$ThisFileInfo['bmp']['header']['raw'] = array();
-		$thisfile_bmp                         = &$ThisFileInfo['bmp'];
-		$thisfile_bmp_header                  = &$thisfile_bmp['header'];
-		$thisfile_bmp_header_raw              = &$thisfile_bmp_header['raw'];
-
-		// BITMAPFILEHEADER [14 bytes] - http://msdn.microsoft.com/library/en-us/gdi/bitmaps_62uq.asp
-		// all versions
-		// WORD    bfType;
-		// DWORD   bfSize;
-		// WORD    bfReserved1;
-		// WORD    bfReserved2;
-		// DWORD   bfOffBits;
-
-		$offset = 0;
-		$overalloffset = 0;
-		$BMPheader = substr($BMPdata, $overalloffset, 14 + 40);
-		$overalloffset += (14 + 40);
-
-		$thisfile_bmp_header_raw['identifier']  = substr($BMPheader, $offset, 2);
-		$offset += 2;
-
-		if ($thisfile_bmp_header_raw['identifier'] != 'BM') {
-			$ThisFileInfo['error'][] = 'Expecting "BM" at offset '. (int) (@$ThisFileInfo[ 'avdataoffset']) .', found "'. $thisfile_bmp_header_raw[ 'identifier'].'"';
-			unset($ThisFileInfo['fileformat']);
-			unset($ThisFileInfo['bmp']);
-			return false;
-		}
-
-		$thisfile_bmp_header_raw['filesize']    = $this->LittleEndian2Int(substr($BMPheader, $offset, 4));
-		$offset += 4;
-		$thisfile_bmp_header_raw['reserved1']   = $this->LittleEndian2Int(substr($BMPheader, $offset, 2));
-		$offset += 2;
-		$thisfile_bmp_header_raw['reserved2']   = $this->LittleEndian2Int(substr($BMPheader, $offset, 2));
-		$offset += 2;
-		$thisfile_bmp_header_raw['data_offset'] = $this->LittleEndian2Int(substr($BMPheader, $offset, 4));
-		$offset += 4;
-		$thisfile_bmp_header_raw['header_size'] = $this->LittleEndian2Int(substr($BMPheader, $offset, 4));
-		$offset += 4;
-
-
-		// check if the hardcoded-to-1 "planes" is at offset 22 or 26
-		$planes22 = $this->LittleEndian2Int(substr($BMPheader, 22, 2));
-		$planes26 = $this->LittleEndian2Int(substr($BMPheader, 26, 2));
-		if (($planes22 == 1) && ($planes26 != 1)) {
-			$thisfile_bmp['type_os']      = 'OS/2';
-			$thisfile_bmp['type_version'] = 1;
-		} elseif (($planes26 == 1) && ($planes22 != 1)) {
-			$thisfile_bmp['type_os']      = 'Windows';
-			$thisfile_bmp['type_version'] = 1;
-		} elseif ($thisfile_bmp_header_raw['header_size'] == 12) {
-			$thisfile_bmp['type_os']      = 'OS/2';
-			$thisfile_bmp['type_version'] = 1;
-		} elseif ($thisfile_bmp_header_raw['header_size'] == 40) {
-			$thisfile_bmp['type_os']      = 'Windows';
-			$thisfile_bmp['type_version'] = 1;
-		} elseif ($thisfile_bmp_header_raw['header_size'] == 84) {
-			$thisfile_bmp['type_os']      = 'Windows';
-			$thisfile_bmp['type_version'] = 4;
-		} elseif ($thisfile_bmp_header_raw['header_size'] == 100) {
-			$thisfile_bmp['type_os']      = 'Windows';
-			$thisfile_bmp['type_version'] = 5;
-		} else {
-			$ThisFileInfo['error'][] = 'Unknown BMP subtype (or not a BMP file)';
-			unset($ThisFileInfo['fileformat']);
-			unset($ThisFileInfo['bmp']);
-			return false;
-		}
-
-		$ThisFileInfo['fileformat']                  = 'bmp';
-		$ThisFileInfo['video']['dataformat']         = 'bmp';
-		$ThisFileInfo['video']['lossless']           = true;
-		$ThisFileInfo['video']['pixel_aspect_ratio'] = (float) 1;
-
-		if ($thisfile_bmp['type_os'] == 'OS/2') {
-
-			// OS/2-format BMP
-			// http://netghost.narod.ru/gff/graphics/summary/os2bmp.htm
-
-			// DWORD  Size;             /* Size of this structure in bytes */
-			// DWORD  Width;            /* Bitmap width in pixels */
-			// DWORD  Height;           /* Bitmap height in pixel */
-			// WORD   NumPlanes;        /* Number of bit planes (color depth) */
-			// WORD   BitsPerPixel;     /* Number of bits per pixel per plane */
-
-			$thisfile_bmp_header_raw['width']          = $this->LittleEndian2Int(substr($BMPheader, $offset, 2));
-			$offset += 2;
-			$thisfile_bmp_header_raw['height']         = $this->LittleEndian2Int(substr($BMPheader, $offset, 2));
-			$offset += 2;
-			$thisfile_bmp_header_raw['planes']         = $this->LittleEndian2Int(substr($BMPheader, $offset, 2));
-			$offset += 2;
-			$thisfile_bmp_header_raw['bits_per_pixel'] = $this->LittleEndian2Int(substr($BMPheader, $offset, 2));
-			$offset += 2;
-
-			$ThisFileInfo['video']['resolution_x']    = $thisfile_bmp_header_raw['width'];
-			$ThisFileInfo['video']['resolution_y']    = $thisfile_bmp_header_raw['height'];
-			$ThisFileInfo['video']['codec']           = 'BI_RGB '.$thisfile_bmp_header_raw['bits_per_pixel'].'-bit';
-			$ThisFileInfo['video']['bits_per_sample'] = $thisfile_bmp_header_raw['bits_per_pixel'];
-
-			if ($thisfile_bmp['type_version'] >= 2) {
-				// DWORD  Compression;      /* Bitmap compression scheme */
-				// DWORD  ImageDataSize;    /* Size of bitmap data in bytes */
-				// DWORD  XResolution;      /* X resolution of display device */
-				// DWORD  YResolution;      /* Y resolution of display device */
-				// DWORD  ColorsUsed;       /* Number of color table indices used */
-				// DWORD  ColorsImportant;  /* Number of important color indices */
-				// WORD   Units;            /* Type of units used to measure resolution */
-				// WORD   Reserved;         /* Pad structure to 4-byte boundary */
-				// WORD   Recording;        /* Recording algorithm */
-				// WORD   Rendering;        /* Halftoning algorithm used */
-				// DWORD  Size1;            /* Reserved for halftoning algorithm use */
-				// DWORD  Size2;            /* Reserved for halftoning algorithm use */
-				// DWORD  ColorEncoding;    /* Color model used in bitmap */
-				// DWORD  Identifier;       /* Reserved for application use */
-
-				$thisfile_bmp_header_raw['compression']      = $this->LittleEndian2Int(substr($BMPheader, $offset, 4));
-				$offset += 4;
-				$thisfile_bmp_header_raw['bmp_data_size']    = $this->LittleEndian2Int(substr($BMPheader, $offset, 4));
-				$offset += 4;
-				$thisfile_bmp_header_raw['resolution_h']     = $this->LittleEndian2Int(substr($BMPheader, $offset, 4));
-				$offset += 4;
-				$thisfile_bmp_header_raw['resolution_v']     = $this->LittleEndian2Int(substr($BMPheader, $offset, 4));
-				$offset += 4;
-				$thisfile_bmp_header_raw['colors_used']      = $this->LittleEndian2Int(substr($BMPheader, $offset, 4));
-				$offset += 4;
-				$thisfile_bmp_header_raw['colors_important'] = $this->LittleEndian2Int(substr($BMPheader, $offset, 4));
-				$offset += 4;
-				$thisfile_bmp_header_raw['resolution_units'] = $this->LittleEndian2Int(substr($BMPheader, $offset, 2));
-				$offset += 2;
-				$thisfile_bmp_header_raw['reserved1']        = $this->LittleEndian2Int(substr($BMPheader, $offset, 2));
-				$offset += 2;
-				$thisfile_bmp_header_raw['recording']        = $this->LittleEndian2Int(substr($BMPheader, $offset, 2));
-				$offset += 2;
-				$thisfile_bmp_header_raw['rendering']        = $this->LittleEndian2Int(substr($BMPheader, $offset, 2));
-				$offset += 2;
-				$thisfile_bmp_header_raw['size1']            = $this->LittleEndian2Int(substr($BMPheader, $offset, 4));
-				$offset += 4;
-				$thisfile_bmp_header_raw['size2']            = $this->LittleEndian2Int(substr($BMPheader, $offset, 4));
-				$offset += 4;
-				$thisfile_bmp_header_raw['color_encoding']   = $this->LittleEndian2Int(substr($BMPheader, $offset, 4));
-				$offset += 4;
-				$thisfile_bmp_header_raw['identifier']       = $this->LittleEndian2Int(substr($BMPheader, $offset, 4));
-				$offset += 4;
-
-				$thisfile_bmp_header['compression']          = $this->BMPcompressionOS2Lookup($thisfile_bmp_header_raw['compression']);
-
-				$ThisFileInfo['video']['codec'] = $thisfile_bmp_header['compression'].' '.$thisfile_bmp_header_raw['bits_per_pixel'].'-bit';
-			}
-
-		} elseif ($thisfile_bmp['type_os'] == 'Windows') {
-
-			// Windows-format BMP
-
-			// BITMAPINFOHEADER - [40 bytes] http://msdn.microsoft.com/library/en-us/gdi/bitmaps_1rw2.asp
-			// all versions
-			// DWORD  biSize;
-			// LONG   biWidth;
-			// LONG   biHeight;
-			// WORD   biPlanes;
-			// WORD   biBitCount;
-			// DWORD  biCompression;
-			// DWORD  biSizeImage;
-			// LONG   biXPelsPerMeter;
-			// LONG   biYPelsPerMeter;
-			// DWORD  biClrUsed;
-			// DWORD  biClrImportant;
-
-			$thisfile_bmp_header_raw['width']            = $this->LittleEndian2Int(substr($BMPheader, $offset, 4));
-			$offset += 4;
-			$thisfile_bmp_header_raw['height']           = $this->LittleEndian2Int(substr($BMPheader, $offset, 4));
-			$offset += 4;
-			$thisfile_bmp_header_raw['planes']           = $this->LittleEndian2Int(substr($BMPheader, $offset, 2));
-			$offset += 2;
-			$thisfile_bmp_header_raw['bits_per_pixel']   = $this->LittleEndian2Int(substr($BMPheader, $offset, 2));
-			$offset += 2;
-			$thisfile_bmp_header_raw['compression']      = $this->LittleEndian2Int(substr($BMPheader, $offset, 4));
-			$offset += 4;
-			$thisfile_bmp_header_raw['bmp_data_size']    = $this->LittleEndian2Int(substr($BMPheader, $offset, 4));
-			$offset += 4;
-			$thisfile_bmp_header_raw['resolution_h']     = $this->LittleEndian2Int(substr($BMPheader, $offset, 4));
-			$offset += 4;
-			$thisfile_bmp_header_raw['resolution_v']     = $this->LittleEndian2Int(substr($BMPheader, $offset, 4));
-			$offset += 4;
-			$thisfile_bmp_header_raw['colors_used']      = $this->LittleEndian2Int(substr($BMPheader, $offset, 4));
-			$offset += 4;
-			$thisfile_bmp_header_raw['colors_important'] = $this->LittleEndian2Int(substr($BMPheader, $offset, 4));
-			$offset += 4;
-
-			$thisfile_bmp_header['compression'] = $this->BMPcompressionWindowsLookup($thisfile_bmp_header_raw['compression']);
-			$ThisFileInfo['video']['resolution_x']    = $thisfile_bmp_header_raw['width'];
-			$ThisFileInfo['video']['resolution_y']    = $thisfile_bmp_header_raw['height'];
-			$ThisFileInfo['video']['codec']           = $thisfile_bmp_header['compression'].' '.$thisfile_bmp_header_raw['bits_per_pixel'].'-bit';
-			$ThisFileInfo['video']['bits_per_sample'] = $thisfile_bmp_header_raw['bits_per_pixel'];
-
-			if (($thisfile_bmp['type_version'] >= 4) || ($thisfile_bmp_header_raw['compression'] == 3)) {
-				// should only be v4+, but BMPs with type_version==1 and BI_BITFIELDS compression have been seen
-				$BMPheader .= substr($BMPdata, $overalloffset, 44);
-				$overalloffset += 44;
-
-				// BITMAPV4HEADER - [44 bytes] - http://msdn.microsoft.com/library/en-us/gdi/bitmaps_2k1e.asp
-				// Win95+, WinNT4.0+
-				// DWORD        bV4RedMask;
-				// DWORD        bV4GreenMask;
-				// DWORD        bV4BlueMask;
-				// DWORD        bV4AlphaMask;
-				// DWORD        bV4CSType;
-				// CIEXYZTRIPLE bV4Endpoints;
-				// DWORD        bV4GammaRed;
-				// DWORD        bV4GammaGreen;
-				// DWORD        bV4GammaBlue;
-				$thisfile_bmp_header_raw['red_mask']     = $this->LittleEndian2Int(substr($BMPheader, $offset, 4));
-				$offset += 4;
-				$thisfile_bmp_header_raw['green_mask']   = $this->LittleEndian2Int(substr($BMPheader, $offset, 4));
-				$offset += 4;
-				$thisfile_bmp_header_raw['blue_mask']    = $this->LittleEndian2Int(substr($BMPheader, $offset, 4));
-				$offset += 4;
-				$thisfile_bmp_header_raw['alpha_mask']   = $this->LittleEndian2Int(substr($BMPheader, $offset, 4));
-				$offset += 4;
-				$thisfile_bmp_header_raw['cs_type']      = $this->LittleEndian2Int(substr($BMPheader, $offset, 4));
-				$offset += 4;
-				$thisfile_bmp_header_raw['ciexyz_red']   =                         substr($BMPheader, $offset, 4);
-				$offset += 4;
-				$thisfile_bmp_header_raw['ciexyz_green'] =                         substr($BMPheader, $offset, 4);
-				$offset += 4;
-				$thisfile_bmp_header_raw['ciexyz_blue']  =                         substr($BMPheader, $offset, 4);
-				$offset += 4;
-				$thisfile_bmp_header_raw['gamma_red']    = $this->LittleEndian2Int(substr($BMPheader, $offset, 4));
-				$offset += 4;
-				$thisfile_bmp_header_raw['gamma_green']  = $this->LittleEndian2Int(substr($BMPheader, $offset, 4));
-				$offset += 4;
-				$thisfile_bmp_header_raw['gamma_blue']   = $this->LittleEndian2Int(substr($BMPheader, $offset, 4));
-				$offset += 4;
-
-				$thisfile_bmp_header['ciexyz_red']   = $this->FixedPoint2_30(strrev($thisfile_bmp_header_raw['ciexyz_red']));
-				$thisfile_bmp_header['ciexyz_green'] = $this->FixedPoint2_30(strrev($thisfile_bmp_header_raw['ciexyz_green']));
-				$thisfile_bmp_header['ciexyz_blue']  = $this->FixedPoint2_30(strrev($thisfile_bmp_header_raw['ciexyz_blue']));
-			}
-
-			if ($thisfile_bmp['type_version'] >= 5) {
-				$BMPheader .= substr($BMPdata, $overalloffset, 16);
-				$overalloffset += 16;
-
-				// BITMAPV5HEADER - [16 bytes] - http://msdn.microsoft.com/library/en-us/gdi/bitmaps_7c36.asp
-				// Win98+, Win2000+
-				// DWORD        bV5Intent;
-				// DWORD        bV5ProfileData;
-				// DWORD        bV5ProfileSize;
-				// DWORD        bV5Reserved;
-				$thisfile_bmp_header_raw['intent']              = $this->LittleEndian2Int(substr($BMPheader, $offset, 4));
-				$offset += 4;
-				$thisfile_bmp_header_raw['profile_data_offset'] = $this->LittleEndian2Int(substr($BMPheader, $offset, 4));
-				$offset += 4;
-				$thisfile_bmp_header_raw['profile_data_size']   = $this->LittleEndian2Int(substr($BMPheader, $offset, 4));
-				$offset += 4;
-				$thisfile_bmp_header_raw['reserved3']           = $this->LittleEndian2Int(substr($BMPheader, $offset, 4));
-				$offset += 4;
-			}
-
-		} else {
-
-			$ThisFileInfo['error'][] = 'Unknown BMP format in header.';
-			return false;
-
-		}
-
-		if ($ExtractPalette || $ExtractData) {
-			$PaletteEntries = 0;
-			if ($thisfile_bmp_header_raw['bits_per_pixel'] < 16) {
-				$PaletteEntries = pow(2, $thisfile_bmp_header_raw['bits_per_pixel']);
-			} elseif (isset($thisfile_bmp_header_raw['colors_used']) && ($thisfile_bmp_header_raw['colors_used'] > 0) && ($thisfile_bmp_header_raw['colors_used'] <= 256)) {
-				$PaletteEntries = $thisfile_bmp_header_raw['colors_used'];
-			}
-			if ($PaletteEntries > 0) {
-				$BMPpalette = substr($BMPdata, $overalloffset, 4 * $PaletteEntries);
-				$overalloffset += 4 * $PaletteEntries;
-
-				$paletteoffset = 0;
-				for ($i = 0; $i < $PaletteEntries; $i++) {
-					// RGBQUAD          - http://msdn.microsoft.com/library/en-us/gdi/bitmaps_5f8y.asp
-					// BYTE    rgbBlue;
-					// BYTE    rgbGreen;
-					// BYTE    rgbRed;
-					// BYTE    rgbReserved;
-					$blue  = $this->LittleEndian2Int($BMPpalette[ $paletteoffset++ ]);
-					$green = $this->LittleEndian2Int($BMPpalette[ $paletteoffset++ ]);
-					$red   = $this->LittleEndian2Int($BMPpalette[ $paletteoffset++ ]);
-					if (($thisfile_bmp['type_os'] == 'OS/2') && ($thisfile_bmp['type_version'] == 1)) {
-						// no padding byte
-					} else {
-						$paletteoffset++; // padding byte
-					}
-					$thisfile_bmp['palette'][$i] = (($red << 16) | ($green << 8) | ($blue));
-				}
-			}
-		}
-
-		if ($ExtractData) {
-			$RowByteLength = ceil(($thisfile_bmp_header_raw['width'] * ($thisfile_bmp_header_raw['bits_per_pixel'] / 8)) / 4) * 4; // round up to nearest DWORD boundary
-
-			$BMPpixelData = substr($BMPdata, $thisfile_bmp_header_raw['data_offset'], $thisfile_bmp_header_raw['height'] * $RowByteLength);
-			$overalloffset = $thisfile_bmp_header_raw['data_offset'] + ($thisfile_bmp_header_raw['height'] * $RowByteLength);
-
-			$pixeldataoffset = 0;
-			switch (@$thisfile_bmp_header_raw['compression']) {
-
-				case 0: // BI_RGB
-					switch ($thisfile_bmp_header_raw['bits_per_pixel']) {
-						case 1:
-							for ($row = ($thisfile_bmp_header_raw['height'] - 1); $row >= 0; $row--) {
-								for ($col = 0; $col < $thisfile_bmp_header_raw['width']; $col = $col) {
-									$paletteindexbyte = ord($BMPpixelData{$pixeldataoffset++});
-									for ($i = 7; $i >= 0; $i--) {
-										$paletteindex = ($paletteindexbyte & (0x01 << $i)) >> $i;
-										$thisfile_bmp['data'][$row][$col] = $thisfile_bmp['palette'][$paletteindex];
-										$col++;
-									}
-								}
-								while (($pixeldataoffset % 4) != 0) {
-									// lines are padded to nearest DWORD
-									$pixeldataoffset++;
-								}
-							}
-							break;
-
-						case 4:
-							for ($row = ($thisfile_bmp_header_raw['height'] - 1); $row >= 0; $row--) {
-								for ($col = 0; $col < $thisfile_bmp_header_raw['width']; $col = $col) {
-									$paletteindexbyte = ord($BMPpixelData{$pixeldataoffset++});
-									for ($i = 1; $i >= 0; $i--) {
-										$paletteindex = ($paletteindexbyte & (0x0F << (4 * $i))) >> (4 * $i);
-										$thisfile_bmp['data'][$row][$col] = $thisfile_bmp['palette'][$paletteindex];
-										$col++;
-									}
-								}
-								while (($pixeldataoffset % 4) != 0) {
-									// lines are padded to nearest DWORD
-									$pixeldataoffset++;
-								}
-							}
-							break;
-
-						case 8:
-							for ($row = ($thisfile_bmp_header_raw['height'] - 1); $row >= 0; $row--) {
-								for ($col = 0; $col < $thisfile_bmp_header_raw['width']; $col++) {
-									$paletteindex = ord($BMPpixelData{$pixeldataoffset++});
-									$thisfile_bmp['data'][$row][$col] = $thisfile_bmp['palette'][$paletteindex];
-								}
-								while (($pixeldataoffset % 4) != 0) {
-									// lines are padded to nearest DWORD
-									$pixeldataoffset++;
-								}
-							}
-							break;
-
-						case 24:
-							for ($row = ($thisfile_bmp_header_raw['height'] - 1); $row >= 0; $row--) {
-								for ($col = 0; $col < $thisfile_bmp_header_raw['width']; $col++) {
-									$thisfile_bmp['data'][$row][$col] = (ord($BMPpixelData{$pixeldataoffset+2}) << 16) | (ord($BMPpixelData{$pixeldataoffset+1}) << 8) | ord($BMPpixelData{$pixeldataoffset});
-									$pixeldataoffset += 3;
-								}
-								while (($pixeldataoffset % 4) != 0) {
-									// lines are padded to nearest DWORD
-									$pixeldataoffset++;
-								}
-							}
-							break;
-
-						case 32:
-							for ($row = ($thisfile_bmp_header_raw['height'] - 1); $row >= 0; $row--) {
-								for ($col = 0; $col < $thisfile_bmp_header_raw['width']; $col++) {
-									$thisfile_bmp['data'][$row][$col] = (ord($BMPpixelData{$pixeldataoffset+3}) << 24) | (ord($BMPpixelData{$pixeldataoffset+2}) << 16) | (ord($BMPpixelData{$pixeldataoffset+1}) << 8) | ord($BMPpixelData{$pixeldataoffset});
-									$pixeldataoffset += 4;
-								}
-								while (($pixeldataoffset % 4) != 0) {
-									// lines are padded to nearest DWORD
-									$pixeldataoffset++;
-								}
-							}
-							break;
-
-						case 16:
-							// ?
-							break;
-
-						default:
-							$ThisFileInfo['error'][] = 'Unknown bits-per-pixel value ('.$thisfile_bmp_header_raw['bits_per_pixel'].') - cannot read pixel data';
-							break;
-					}
-					break;
-
-
-				case 1: // BI_RLE8 - http://msdn.microsoft.com/library/en-us/gdi/bitmaps_6x0u.asp
-					switch ($thisfile_bmp_header_raw['bits_per_pixel']) {
-						case 8:
-							$pixelcounter = 0;
-							while ($pixeldataoffset < strlen($BMPpixelData)) {
-								$firstbyte  = $this->LittleEndian2Int($BMPpixelData[ $pixeldataoffset++ ]);
-								$secondbyte = $this->LittleEndian2Int($BMPpixelData[ $pixeldataoffset++ ]);
-								if ($firstbyte == 0) {
-
-									// escaped/absolute mode - the first byte of the pair can be set to zero to
-									// indicate an escape character that denotes the end of a line, the end of
-									// a bitmap, or a delta, depending on the value of the second byte.
-									switch ($secondbyte) {
-										case 0:
-											// end of line
-											// no need for special processing, just ignore
-											break;
-
-										case 1:
-											// end of bitmap
-											$pixeldataoffset = strlen($BMPpixelData); // force to exit loop just in case
-											break;
-
-										case 2:
-											// delta - The 2 bytes following the escape contain unsigned values
-											// indicating the horizontal and vertical offsets of the next pixel
-											// from the current position.
-											$colincrement = $this->LittleEndian2Int($BMPpixelData[ $pixeldataoffset++ ]);
-											$rowincrement = $this->LittleEndian2Int($BMPpixelData[ $pixeldataoffset++ ]);
-											$col = ($pixelcounter % $thisfile_bmp_header_raw['width']) + $colincrement;
-											$row = ($thisfile_bmp_header_raw['height'] - 1 - (($pixelcounter - $col) / $thisfile_bmp_header_raw['width'])) - $rowincrement;
-											$pixelcounter = ($row * $thisfile_bmp_header_raw['width']) + $col;
-											break;
-
-										default:
-											// In absolute mode, the first byte is zero and the second byte is a
-											// value in the range 03H through FFH. The second byte represents the
-											// number of bytes that follow, each of which contains the color index
-											// of a single pixel. Each run must be aligned on a word boundary.
-											for ($i = 0; $i < $secondbyte; $i++) {
-												$paletteindex = $this->LittleEndian2Int($BMPpixelData[ $pixeldataoffset++ ]);
-												$col = $pixelcounter % $thisfile_bmp_header_raw['width'];
-												$row = $thisfile_bmp_header_raw['height'] - 1 - (($pixelcounter - $col) / $thisfile_bmp_header_raw['width']);
-												$thisfile_bmp['data'][$row][$col] = $thisfile_bmp['palette'][$paletteindex];
-												$pixelcounter++;
-											}
-											while (($pixeldataoffset % 2) != 0) {
-												// Each run must be aligned on a word boundary.
-												$pixeldataoffset++;
-											}
-											break;
-									}
-
-								} else {
-
-									// encoded mode - the first byte specifies the number of consecutive pixels
-									// to be drawn using the color index contained in the second byte.
-									for ($i = 0; $i < $firstbyte; $i++) {
-										$col = $pixelcounter % $thisfile_bmp_header_raw['width'];
-										$row = $thisfile_bmp_header_raw['height'] - 1 - (($pixelcounter - $col) / $thisfile_bmp_header_raw['width']);
-										$thisfile_bmp['data'][$row][$col] = $thisfile_bmp['palette'][$secondbyte];
-										$pixelcounter++;
-									}
-
-								}
-							}
-							break;
-
-						default:
-							$ThisFileInfo['error'][] = 'Unknown bits-per-pixel value ('.$thisfile_bmp_header_raw['bits_per_pixel'].') - cannot read pixel data';
-							break;
-					}
-					break;
-
-
-
-				case 2: // BI_RLE4 - http://msdn.microsoft.com/library/en-us/gdi/bitmaps_6x0u.asp
-					switch ($thisfile_bmp_header_raw['bits_per_pixel']) {
-						case 4:
-							$pixelcounter = 0;
-							while ($pixeldataoffset < strlen($BMPpixelData)) {
-								$firstbyte  = $this->LittleEndian2Int($BMPpixelData[ $pixeldataoffset++ ]);
-								$secondbyte = $this->LittleEndian2Int($BMPpixelData[ $pixeldataoffset++ ]);
-								if ($firstbyte == 0) {
-
-									// escaped/absolute mode - the first byte of the pair can be set to zero to
-									// indicate an escape character that denotes the end of a line, the end of
-									// a bitmap, or a delta, depending on the value of the second byte.
-									switch ($secondbyte) {
-										case 0:
-											// end of line
-											// no need for special processing, just ignore
-											break;
-
-										case 1:
-											// end of bitmap
-											$pixeldataoffset = strlen($BMPpixelData); // force to exit loop just in case
-											break;
-
-										case 2:
-											// delta - The 2 bytes following the escape contain unsigned values
-											// indicating the horizontal and vertical offsets of the next pixel
-											// from the current position.
-											$colincrement = $this->LittleEndian2Int($BMPpixelData[ $pixeldataoffset++ ]);
-											$rowincrement = $this->LittleEndian2Int($BMPpixelData[ $pixeldataoffset++ ]);
-											$col = ($pixelcounter % $thisfile_bmp_header_raw['width']) + $colincrement;
-											$row = ($thisfile_bmp_header_raw['height'] - 1 - (($pixelcounter - $col) / $thisfile_bmp_header_raw['width'])) - $rowincrement;
-											$pixelcounter = ($row * $thisfile_bmp_header_raw['width']) + $col;
-											break;
-
-										default:
-											// In absolute mode, the first byte is zero. The second byte contains the number
-											// of color indexes that follow. Subsequent bytes contain color indexes in their
-											// high- and low-order 4 bits, one color index for each pixel. In absolute mode,
-											// each run must be aligned on a word boundary.
-											$paletteindexes = array();
-											for ($i = 0, $iMax = ceil($secondbyte / 2); $i < $iMax; $i++) {
-												$paletteindexbyte = $this->LittleEndian2Int($BMPpixelData[ $pixeldataoffset++ ]);
-												$paletteindexes[] = ($paletteindexbyte & 0xF0) >> 4;
-												$paletteindexes[] = ($paletteindexbyte & 0x0F);
-											}
-											while (($pixeldataoffset % 2) != 0) {
-												// Each run must be aligned on a word boundary.
-												$pixeldataoffset++;
-											}
-
-											foreach ($paletteindexes as $dummy => $paletteindex) {
-												$col = $pixelcounter % $thisfile_bmp_header_raw['width'];
-												$row = $thisfile_bmp_header_raw['height'] - 1 - (($pixelcounter - $col) / $thisfile_bmp_header_raw['width']);
-												$thisfile_bmp['data'][$row][$col] = $thisfile_bmp['palette'][$paletteindex];
-												$pixelcounter++;
-											}
-											break;
-									}
-
-								} else {
-
-									// encoded mode - the first byte of the pair contains the number of pixels to be
-									// drawn using the color indexes in the second byte. The second byte contains two
-									// color indexes, one in its high-order 4 bits and one in its low-order 4 bits.
-									// The first of the pixels is drawn using the color specified by the high-order
-									// 4 bits, the second is drawn using the color in the low-order 4 bits, the third
-									// is drawn using the color in the high-order 4 bits, and so on, until all the
-									// pixels specified by the first byte have been drawn.
-									$paletteindexes[0] = ($secondbyte & 0xF0) >> 4;
-									$paletteindexes[1] = ($secondbyte & 0x0F);
-									for ($i = 0; $i < $firstbyte; $i++) {
-										$col = $pixelcounter % $thisfile_bmp_header_raw['width'];
-										$row = $thisfile_bmp_header_raw['height'] - 1 - (($pixelcounter - $col) / $thisfile_bmp_header_raw['width']);
-										$thisfile_bmp['data'][$row][$col] = $thisfile_bmp['palette'][$paletteindexes[($i % 2)]];
-										$pixelcounter++;
-									}
-
-								}
-							}
-							break;
-
-						default:
-							$ThisFileInfo['error'][] = 'Unknown bits-per-pixel value ('.$thisfile_bmp_header_raw['bits_per_pixel'].') - cannot read pixel data';
-							break;
-					}
-					break;
-
-
-				case 3: // BI_BITFIELDS
-					switch ($thisfile_bmp_header_raw['bits_per_pixel']) {
-						case 16:
-						case 32:
-							$redshift   = 0;
-							$greenshift = 0;
-							$blueshift  = 0;
-							if (!$thisfile_bmp_header_raw['red_mask'] || !$thisfile_bmp_header_raw['green_mask'] || !$thisfile_bmp_header_raw['blue_mask']) {
-								$ThisFileInfo['error'][] = 'missing $thisfile_bmp_header_raw[(red|green|blue)_mask]';
-								return false;
-							}
-							while ((($thisfile_bmp_header_raw['red_mask'] >> $redshift) & 0x01) == 0) {
-								$redshift++;
-							}
-							while ((($thisfile_bmp_header_raw['green_mask'] >> $greenshift) & 0x01) == 0) {
-								$greenshift++;
-							}
-							while ((($thisfile_bmp_header_raw['blue_mask'] >> $blueshift) & 0x01) == 0) {
-								$blueshift++;
-							}
-							for ($row = ($thisfile_bmp_header_raw['height'] - 1); $row >= 0; $row--) {
-								for ($col = 0; $col < $thisfile_bmp_header_raw['width']; $col++) {
-									$pixelvalue = $this->LittleEndian2Int(substr($BMPpixelData, $pixeldataoffset, $thisfile_bmp_header_raw['bits_per_pixel'] / 8));
-									$pixeldataoffset += $thisfile_bmp_header_raw['bits_per_pixel'] / 8;
-
-									$red   = (int) round(((($pixelvalue & $thisfile_bmp_header_raw[ 'red_mask'])   >> $redshift)   / ($thisfile_bmp_header_raw[ 'red_mask']   >> $redshift))   * 255);
-									$green = (int) round(((($pixelvalue & $thisfile_bmp_header_raw[ 'green_mask']) >> $greenshift) / ($thisfile_bmp_header_raw[ 'green_mask'] >> $greenshift)) * 255);
-									$blue  = (int) round(((($pixelvalue & $thisfile_bmp_header_raw[ 'blue_mask'])  >> $blueshift)  / ($thisfile_bmp_header_raw[ 'blue_mask']  >> $blueshift))  * 255);
-									$thisfile_bmp['data'][$row][$col] = (($red << 16) | ($green << 8) | ($blue));
-								}
-								while (($pixeldataoffset % 4) != 0) {
-									// lines are padded to nearest DWORD
-									$pixeldataoffset++;
-								}
-							}
-							break;
-
-						default:
-							$ThisFileInfo['error'][] = 'Unknown bits-per-pixel value ('.$thisfile_bmp_header_raw['bits_per_pixel'].') - cannot read pixel data';
-							break;
-					}
-					break;
-
-
-				default: // unhandled compression type
-					$ThisFileInfo['error'][] = 'Unknown/unhandled compression type value ('.$thisfile_bmp_header_raw['compression'].') - cannot decompress pixel data';
-					break;
-			}
-		}
-
-		return true;
-	}
-
-	public function IntColor2RGB($color) {
-		$red   = ($color & 0x00FF0000) >> 16;
-		$green = ($color & 0x0000FF00) >> 8;
-		$blue  = ($color & 0x000000FF);
-		return array($red, $green, $blue);
-	}
-
-	public function PlotPixelsGD(&$BMPdata, $truecolor=true) {
-		$imagewidth  = $BMPdata['header']['raw']['width'];
-		$imageheight = $BMPdata['header']['raw']['height'];
-
-		if ($truecolor) {
-
-			$gd = @imagecreatetruecolor($imagewidth, $imageheight);
-
-		} else {
-
-			$gd = @imagecreate($imagewidth, $imageheight);
-			if (!empty($BMPdata['palette'])) {
-				// create GD palette from BMP palette
-				foreach ($BMPdata['palette'] as $dummy => $color) {
-					list($r, $g, $b) = $this->IntColor2RGB($color);
-					imagecolorallocate($gd, $r, $g, $b);
-				}
-			} else {
-				// create 216-color websafe palette
-				for ($r = 0x00; $r <= 0xFF; $r += 0x33) {
-					for ($g = 0x00; $g <= 0xFF; $g += 0x33) {
-						for ($b = 0x00; $b <= 0xFF; $b += 0x33) {
-							imagecolorallocate($gd, $r, $g, $b);
-						}
-					}
-				}
-			}
-
-		}
-		if (!is_resource($gd)) {
-			return false;
-		}
-
-		foreach ($BMPdata['data'] as $row => $colarray) {
-			if (!phpthumb_functions::FunctionIsDisabled('set_time_limit')) {
-				set_time_limit(30);
-			}
-			foreach ($colarray as $col => $color) {
-				list($red, $green, $blue) = $this->IntColor2RGB($color);
-				if ($truecolor) {
-					$pixelcolor = imagecolorallocate($gd, $red, $green, $blue);
-				} else {
-					$pixelcolor = imagecolorclosest($gd, $red, $green, $blue);
-				}
-				imagesetpixel($gd, $col, $row, $pixelcolor);
-			}
-		}
-		return $gd;
-	}
-
-	public function PlotBMP(&$BMPinfo) {
-		$starttime = time();
-		if (!isset($BMPinfo['bmp']['data']) || !is_array($BMPinfo['bmp']['data'])) {
-			echo 'ERROR: no pixel data<BR>';
-			return false;
-		}
-		if (!phpthumb_functions::FunctionIsDisabled('set_time_limit')) {
-			set_time_limit((int) round($BMPinfo[ 'resolution_x'] * $BMPinfo[ 'resolution_y'] / 10000));
-		}
-		$im = $this->PlotPixelsGD($BMPinfo['bmp']);
-		if (headers_sent()) {
-			echo 'plotted '.($BMPinfo['resolution_x'] * $BMPinfo['resolution_y']).' pixels in '.(time() - $starttime).' seconds<BR>';
-			imagedestroy($im);
-			exit;
-		}
-		header('Content-Type: image/png');
-		imagepng($im);
-		imagedestroy($im);
-		return true;
-	}
-
-	public function BMPcompressionWindowsLookup($compressionid) {
-		static $BMPcompressionWindowsLookup = array(
-			0 => 'BI_RGB',
-			1 => 'BI_RLE8',
-			2 => 'BI_RLE4',
-			3 => 'BI_BITFIELDS',
-			4 => 'BI_JPEG',
-			5 => 'BI_PNG'
-		);
-		return (isset($BMPcompressionWindowsLookup[$compressionid]) ? $BMPcompressionWindowsLookup[$compressionid] : 'invalid');
-	}
-
-	public function BMPcompressionOS2Lookup($compressionid) {
-		static $BMPcompressionOS2Lookup = array(
-			0 => 'BI_RGB',
-			1 => 'BI_RLE8',
-			2 => 'BI_RLE4',
-			3 => 'Huffman 1D',
-			4 => 'BI_RLE24',
-		);
-		return (isset($BMPcompressionOS2Lookup[$compressionid]) ? $BMPcompressionOS2Lookup[$compressionid] : 'invalid');
-	}
-
-
-	// from getid3.lib.php
-
-	public function trunc($floatnumber) {
-		// truncates a floating-point number at the decimal point
-		// returns int (if possible, otherwise float)
-		if ($floatnumber >= 1) {
-			$truncatednumber = floor($floatnumber);
-		} elseif ($floatnumber <= -1) {
-			$truncatednumber = ceil($floatnumber);
-		} else {
-			$truncatednumber = 0;
-		}
-		if ($truncatednumber <= 1073741824) { // 2^30
-			$truncatednumber = (int) $truncatednumber;
-		}
-		return $truncatednumber;
-	}
-
-	public function LittleEndian2Int($byteword) {
-		$intvalue = 0;
-		$byteword = strrev($byteword);
-		$bytewordlen = strlen($byteword);
-		for ($i = 0; $i < $bytewordlen; $i++) {
-			$intvalue += ord($byteword{$i}) * pow(256, ($bytewordlen - 1 - $i));
-		}
-		return $intvalue;
-	}
-
-	public function BigEndian2Int($byteword) {
-		return $this->LittleEndian2Int(strrev($byteword));
-	}
-
-	public function BigEndian2Bin($byteword) {
-		$binvalue = '';
-		$bytewordlen = strlen($byteword);
-		for ($i = 0; $i < $bytewordlen; $i++) {
-			$binvalue .= str_pad(decbin(ord($byteword{$i})), 8, '0', STR_PAD_LEFT);
-		}
-		return $binvalue;
-	}
-
-	public function FixedPoint2_30($rawdata) {
-		$binarystring = $this->BigEndian2Bin($rawdata);
-		return $this->Bin2Dec(substr($binarystring, 0, 2)) + (float) ($this->Bin2Dec(substr($binarystring, 2, 30)) / 1073741824);
-	}
-
-	public function Bin2Dec($binstring, $signed=false) {
-		$signmult = 1;
-		if ($signed) {
-			if ($binstring{0} == '1') {
-				$signmult = -1;
-			}
-			$binstring = substr($binstring, 1);
-		}
-		$decvalue = 0;
-		for ($i = 0, $iMax = strlen($binstring); $i < $iMax; $i++) {
-			$decvalue += ((int) $binstring[ strlen($binstring) - $i - 1 ]) * pow(2, $i);
-		}
-		return $this->CastAsInt($decvalue * $signmult);
-	}
-
-	public function CastAsInt($floatnum) {
-		// convert to float if not already
-		$floatnum = (float) $floatnum;
-
-		// convert a float to type int, only if possible
-		if ($this->trunc($floatnum) == $floatnum) {
-			// it's not floating point
-			if ($floatnum <= 1073741824) { // 2^30
-				// it's within int range
-				$floatnum = (int) $floatnum;
-			}
-		}
-		return $floatnum;
-	}
+    public function phpthumb_bmp2gd(&$BMPdata, $truecolor=true) {
+        $ThisFileInfo = array();
+        if ($this->getid3_bmp($BMPdata, $ThisFileInfo, true, true)) {
+            $gd = $this->PlotPixelsGD($ThisFileInfo['bmp'], $truecolor);
+            return $gd;
+        }
+        return false;
+    }
+
+    public function phpthumb_bmpfile2gd($filename, $truecolor=true) {
+        if ($fp = @fopen($filename, 'rb')) {
+            $BMPdata = fread($fp, filesize($filename));
+            fclose($fp);
+            return $this->phpthumb_bmp2gd($BMPdata, $truecolor);
+        }
+        return false;
+    }
+
+    public function GD2BMPstring(&$gd_image) {
+        $imageX = imagesx($gd_image);
+        $imageY = imagesy($gd_image);
+
+        $BMP = '';
+        for ($y = ($imageY - 1); $y >= 0; $y--) {
+            $thisline = '';
+            for ($x = 0; $x < $imageX; $x++) {
+                $argb = phpthumb_functions::GetPixelColor($gd_image, $x, $y);
+                $thisline .= chr($argb['blue']).chr($argb['green']).chr($argb['red']);
+            }
+            while (strlen($thisline) % 4) {
+                $thisline .= "\x00";
+            }
+            $BMP .= $thisline;
+        }
+
+        $bmpSize = strlen($BMP) + 14 + 40;
+        // BITMAPFILEHEADER [14 bytes] - http://msdn.microsoft.com/library/en-us/gdi/bitmaps_62uq.asp
+        $BITMAPFILEHEADER  = 'BM';                                                           // WORD    bfType;
+        $BITMAPFILEHEADER .= phpthumb_functions::LittleEndian2String($bmpSize, 4); // DWORD   bfSize;
+        $BITMAPFILEHEADER .= phpthumb_functions::LittleEndian2String(       0, 2); // WORD    bfReserved1;
+        $BITMAPFILEHEADER .= phpthumb_functions::LittleEndian2String(       0, 2); // WORD    bfReserved2;
+        $BITMAPFILEHEADER .= phpthumb_functions::LittleEndian2String(      54, 4); // DWORD   bfOffBits;
+
+        // BITMAPINFOHEADER - [40 bytes] http://msdn.microsoft.com/library/en-us/gdi/bitmaps_1rw2.asp
+        $BITMAPINFOHEADER  = phpthumb_functions::LittleEndian2String(      40, 4); // DWORD  biSize;
+        $BITMAPINFOHEADER .= phpthumb_functions::LittleEndian2String( $imageX, 4); // LONG   biWidth;
+        $BITMAPINFOHEADER .= phpthumb_functions::LittleEndian2String( $imageY, 4); // LONG   biHeight;
+        $BITMAPINFOHEADER .= phpthumb_functions::LittleEndian2String(       1, 2); // WORD   biPlanes;
+        $BITMAPINFOHEADER .= phpthumb_functions::LittleEndian2String(      24, 2); // WORD   biBitCount;
+        $BITMAPINFOHEADER .= phpthumb_functions::LittleEndian2String(       0, 4); // DWORD  biCompression;
+        $BITMAPINFOHEADER .= phpthumb_functions::LittleEndian2String(       0, 4); // DWORD  biSizeImage;
+        $BITMAPINFOHEADER .= phpthumb_functions::LittleEndian2String(    2835, 4); // LONG   biXPelsPerMeter;
+        $BITMAPINFOHEADER .= phpthumb_functions::LittleEndian2String(    2835, 4); // LONG   biYPelsPerMeter;
+        $BITMAPINFOHEADER .= phpthumb_functions::LittleEndian2String(       0, 4); // DWORD  biClrUsed;
+        $BITMAPINFOHEADER .= phpthumb_functions::LittleEndian2String(       0, 4); // DWORD  biClrImportant;
+
+        return $BITMAPFILEHEADER.$BITMAPINFOHEADER.$BMP;
+    }
+
+    public function getid3_bmp(&$BMPdata, &$ThisFileInfo, $ExtractPalette=false, $ExtractData=false) {
+
+        // shortcuts
+        $ThisFileInfo['bmp']['header']['raw'] = array();
+        $thisfile_bmp                         = &$ThisFileInfo['bmp'];
+        $thisfile_bmp_header                  = &$thisfile_bmp['header'];
+        $thisfile_bmp_header_raw              = &$thisfile_bmp_header['raw'];
+
+        // BITMAPFILEHEADER [14 bytes] - http://msdn.microsoft.com/library/en-us/gdi/bitmaps_62uq.asp
+        // all versions
+        // WORD    bfType;
+        // DWORD   bfSize;
+        // WORD    bfReserved1;
+        // WORD    bfReserved2;
+        // DWORD   bfOffBits;
+
+        $offset = 0;
+        $overalloffset = 0;
+        $BMPheader = substr($BMPdata, $overalloffset, 14 + 40);
+        $overalloffset += (14 + 40);
+
+        $thisfile_bmp_header_raw['identifier']  = substr($BMPheader, $offset, 2);
+        $offset += 2;
+
+        if ($thisfile_bmp_header_raw['identifier'] != 'BM') {
+            $ThisFileInfo['error'][] = 'Expecting "BM" at offset '. (int) (@$ThisFileInfo[ 'avdataoffset']) .', found "'. $thisfile_bmp_header_raw[ 'identifier'].'"';
+            unset($ThisFileInfo['fileformat']);
+            unset($ThisFileInfo['bmp']);
+            return false;
+        }
+
+        $thisfile_bmp_header_raw['filesize']    = $this->LittleEndian2Int(substr($BMPheader, $offset, 4));
+        $offset += 4;
+        $thisfile_bmp_header_raw['reserved1']   = $this->LittleEndian2Int(substr($BMPheader, $offset, 2));
+        $offset += 2;
+        $thisfile_bmp_header_raw['reserved2']   = $this->LittleEndian2Int(substr($BMPheader, $offset, 2));
+        $offset += 2;
+        $thisfile_bmp_header_raw['data_offset'] = $this->LittleEndian2Int(substr($BMPheader, $offset, 4));
+        $offset += 4;
+        $thisfile_bmp_header_raw['header_size'] = $this->LittleEndian2Int(substr($BMPheader, $offset, 4));
+        $offset += 4;
+
+
+        // check if the hardcoded-to-1 "planes" is at offset 22 or 26
+        $planes22 = $this->LittleEndian2Int(substr($BMPheader, 22, 2));
+        $planes26 = $this->LittleEndian2Int(substr($BMPheader, 26, 2));
+        if (($planes22 == 1) && ($planes26 != 1)) {
+            $thisfile_bmp['type_os']      = 'OS/2';
+            $thisfile_bmp['type_version'] = 1;
+        } elseif (($planes26 == 1) && ($planes22 != 1)) {
+            $thisfile_bmp['type_os']      = 'Windows';
+            $thisfile_bmp['type_version'] = 1;
+        } elseif ($thisfile_bmp_header_raw['header_size'] == 12) {
+            $thisfile_bmp['type_os']      = 'OS/2';
+            $thisfile_bmp['type_version'] = 1;
+        } elseif ($thisfile_bmp_header_raw['header_size'] == 40) {
+            $thisfile_bmp['type_os']      = 'Windows';
+            $thisfile_bmp['type_version'] = 1;
+        } elseif ($thisfile_bmp_header_raw['header_size'] == 84) {
+            $thisfile_bmp['type_os']      = 'Windows';
+            $thisfile_bmp['type_version'] = 4;
+        } elseif ($thisfile_bmp_header_raw['header_size'] == 100) {
+            $thisfile_bmp['type_os']      = 'Windows';
+            $thisfile_bmp['type_version'] = 5;
+        } else {
+            $ThisFileInfo['error'][] = 'Unknown BMP subtype (or not a BMP file)';
+            unset($ThisFileInfo['fileformat']);
+            unset($ThisFileInfo['bmp']);
+            return false;
+        }
+
+        $ThisFileInfo['fileformat']                  = 'bmp';
+        $ThisFileInfo['video']['dataformat']         = 'bmp';
+        $ThisFileInfo['video']['lossless']           = true;
+        $ThisFileInfo['video']['pixel_aspect_ratio'] = (float) 1;
+
+        if ($thisfile_bmp['type_os'] == 'OS/2') {
+
+            // OS/2-format BMP
+            // http://netghost.narod.ru/gff/graphics/summary/os2bmp.htm
+
+            // DWORD  Size;             /* Size of this structure in bytes */
+            // DWORD  Width;            /* Bitmap width in pixels */
+            // DWORD  Height;           /* Bitmap height in pixel */
+            // WORD   NumPlanes;        /* Number of bit planes (color depth) */
+            // WORD   BitsPerPixel;     /* Number of bits per pixel per plane */
+
+            $thisfile_bmp_header_raw['width']          = $this->LittleEndian2Int(substr($BMPheader, $offset, 2));
+            $offset += 2;
+            $thisfile_bmp_header_raw['height']         = $this->LittleEndian2Int(substr($BMPheader, $offset, 2));
+            $offset += 2;
+            $thisfile_bmp_header_raw['planes']         = $this->LittleEndian2Int(substr($BMPheader, $offset, 2));
+            $offset += 2;
+            $thisfile_bmp_header_raw['bits_per_pixel'] = $this->LittleEndian2Int(substr($BMPheader, $offset, 2));
+            $offset += 2;
+
+            $ThisFileInfo['video']['resolution_x']    = $thisfile_bmp_header_raw['width'];
+            $ThisFileInfo['video']['resolution_y']    = $thisfile_bmp_header_raw['height'];
+            $ThisFileInfo['video']['codec']           = 'BI_RGB '.$thisfile_bmp_header_raw['bits_per_pixel'].'-bit';
+            $ThisFileInfo['video']['bits_per_sample'] = $thisfile_bmp_header_raw['bits_per_pixel'];
+
+            if ($thisfile_bmp['type_version'] >= 2) {
+                // DWORD  Compression;      /* Bitmap compression scheme */
+                // DWORD  ImageDataSize;    /* Size of bitmap data in bytes */
+                // DWORD  XResolution;      /* X resolution of display device */
+                // DWORD  YResolution;      /* Y resolution of display device */
+                // DWORD  ColorsUsed;       /* Number of color table indices used */
+                // DWORD  ColorsImportant;  /* Number of important color indices */
+                // WORD   Units;            /* Type of units used to measure resolution */
+                // WORD   Reserved;         /* Pad structure to 4-byte boundary */
+                // WORD   Recording;        /* Recording algorithm */
+                // WORD   Rendering;        /* Halftoning algorithm used */
+                // DWORD  Size1;            /* Reserved for halftoning algorithm use */
+                // DWORD  Size2;            /* Reserved for halftoning algorithm use */
+                // DWORD  ColorEncoding;    /* Color model used in bitmap */
+                // DWORD  Identifier;       /* Reserved for application use */
+
+                $thisfile_bmp_header_raw['compression']      = $this->LittleEndian2Int(substr($BMPheader, $offset, 4));
+                $offset += 4;
+                $thisfile_bmp_header_raw['bmp_data_size']    = $this->LittleEndian2Int(substr($BMPheader, $offset, 4));
+                $offset += 4;
+                $thisfile_bmp_header_raw['resolution_h']     = $this->LittleEndian2Int(substr($BMPheader, $offset, 4));
+                $offset += 4;
+                $thisfile_bmp_header_raw['resolution_v']     = $this->LittleEndian2Int(substr($BMPheader, $offset, 4));
+                $offset += 4;
+                $thisfile_bmp_header_raw['colors_used']      = $this->LittleEndian2Int(substr($BMPheader, $offset, 4));
+                $offset += 4;
+                $thisfile_bmp_header_raw['colors_important'] = $this->LittleEndian2Int(substr($BMPheader, $offset, 4));
+                $offset += 4;
+                $thisfile_bmp_header_raw['resolution_units'] = $this->LittleEndian2Int(substr($BMPheader, $offset, 2));
+                $offset += 2;
+                $thisfile_bmp_header_raw['reserved1']        = $this->LittleEndian2Int(substr($BMPheader, $offset, 2));
+                $offset += 2;
+                $thisfile_bmp_header_raw['recording']        = $this->LittleEndian2Int(substr($BMPheader, $offset, 2));
+                $offset += 2;
+                $thisfile_bmp_header_raw['rendering']        = $this->LittleEndian2Int(substr($BMPheader, $offset, 2));
+                $offset += 2;
+                $thisfile_bmp_header_raw['size1']            = $this->LittleEndian2Int(substr($BMPheader, $offset, 4));
+                $offset += 4;
+                $thisfile_bmp_header_raw['size2']            = $this->LittleEndian2Int(substr($BMPheader, $offset, 4));
+                $offset += 4;
+                $thisfile_bmp_header_raw['color_encoding']   = $this->LittleEndian2Int(substr($BMPheader, $offset, 4));
+                $offset += 4;
+                $thisfile_bmp_header_raw['identifier']       = $this->LittleEndian2Int(substr($BMPheader, $offset, 4));
+                $offset += 4;
+
+                $thisfile_bmp_header['compression']          = $this->BMPcompressionOS2Lookup($thisfile_bmp_header_raw['compression']);
+
+                $ThisFileInfo['video']['codec'] = $thisfile_bmp_header['compression'].' '.$thisfile_bmp_header_raw['bits_per_pixel'].'-bit';
+            }
+
+        } elseif ($thisfile_bmp['type_os'] == 'Windows') {
+
+            // Windows-format BMP
+
+            // BITMAPINFOHEADER - [40 bytes] http://msdn.microsoft.com/library/en-us/gdi/bitmaps_1rw2.asp
+            // all versions
+            // DWORD  biSize;
+            // LONG   biWidth;
+            // LONG   biHeight;
+            // WORD   biPlanes;
+            // WORD   biBitCount;
+            // DWORD  biCompression;
+            // DWORD  biSizeImage;
+            // LONG   biXPelsPerMeter;
+            // LONG   biYPelsPerMeter;
+            // DWORD  biClrUsed;
+            // DWORD  biClrImportant;
+
+            $thisfile_bmp_header_raw['width']            = $this->LittleEndian2Int(substr($BMPheader, $offset, 4));
+            $offset += 4;
+            $thisfile_bmp_header_raw['height']           = $this->LittleEndian2Int(substr($BMPheader, $offset, 4));
+            $offset += 4;
+            $thisfile_bmp_header_raw['planes']           = $this->LittleEndian2Int(substr($BMPheader, $offset, 2));
+            $offset += 2;
+            $thisfile_bmp_header_raw['bits_per_pixel']   = $this->LittleEndian2Int(substr($BMPheader, $offset, 2));
+            $offset += 2;
+            $thisfile_bmp_header_raw['compression']      = $this->LittleEndian2Int(substr($BMPheader, $offset, 4));
+            $offset += 4;
+            $thisfile_bmp_header_raw['bmp_data_size']    = $this->LittleEndian2Int(substr($BMPheader, $offset, 4));
+            $offset += 4;
+            $thisfile_bmp_header_raw['resolution_h']     = $this->LittleEndian2Int(substr($BMPheader, $offset, 4));
+            $offset += 4;
+            $thisfile_bmp_header_raw['resolution_v']     = $this->LittleEndian2Int(substr($BMPheader, $offset, 4));
+            $offset += 4;
+            $thisfile_bmp_header_raw['colors_used']      = $this->LittleEndian2Int(substr($BMPheader, $offset, 4));
+            $offset += 4;
+            $thisfile_bmp_header_raw['colors_important'] = $this->LittleEndian2Int(substr($BMPheader, $offset, 4));
+            $offset += 4;
+
+            $thisfile_bmp_header['compression'] = $this->BMPcompressionWindowsLookup($thisfile_bmp_header_raw['compression']);
+            $ThisFileInfo['video']['resolution_x']    = $thisfile_bmp_header_raw['width'];
+            $ThisFileInfo['video']['resolution_y']    = $thisfile_bmp_header_raw['height'];
+            $ThisFileInfo['video']['codec']           = $thisfile_bmp_header['compression'].' '.$thisfile_bmp_header_raw['bits_per_pixel'].'-bit';
+            $ThisFileInfo['video']['bits_per_sample'] = $thisfile_bmp_header_raw['bits_per_pixel'];
+
+            if (($thisfile_bmp['type_version'] >= 4) || ($thisfile_bmp_header_raw['compression'] == 3)) {
+                // should only be v4+, but BMPs with type_version==1 and BI_BITFIELDS compression have been seen
+                $BMPheader .= substr($BMPdata, $overalloffset, 44);
+                $overalloffset += 44;
+
+                // BITMAPV4HEADER - [44 bytes] - http://msdn.microsoft.com/library/en-us/gdi/bitmaps_2k1e.asp
+                // Win95+, WinNT4.0+
+                // DWORD        bV4RedMask;
+                // DWORD        bV4GreenMask;
+                // DWORD        bV4BlueMask;
+                // DWORD        bV4AlphaMask;
+                // DWORD        bV4CSType;
+                // CIEXYZTRIPLE bV4Endpoints;
+                // DWORD        bV4GammaRed;
+                // DWORD        bV4GammaGreen;
+                // DWORD        bV4GammaBlue;
+                $thisfile_bmp_header_raw['red_mask']     = $this->LittleEndian2Int(substr($BMPheader, $offset, 4));
+                $offset += 4;
+                $thisfile_bmp_header_raw['green_mask']   = $this->LittleEndian2Int(substr($BMPheader, $offset, 4));
+                $offset += 4;
+                $thisfile_bmp_header_raw['blue_mask']    = $this->LittleEndian2Int(substr($BMPheader, $offset, 4));
+                $offset += 4;
+                $thisfile_bmp_header_raw['alpha_mask']   = $this->LittleEndian2Int(substr($BMPheader, $offset, 4));
+                $offset += 4;
+                $thisfile_bmp_header_raw['cs_type']      = $this->LittleEndian2Int(substr($BMPheader, $offset, 4));
+                $offset += 4;
+                $thisfile_bmp_header_raw['ciexyz_red']   =                         substr($BMPheader, $offset, 4);
+                $offset += 4;
+                $thisfile_bmp_header_raw['ciexyz_green'] =                         substr($BMPheader, $offset, 4);
+                $offset += 4;
+                $thisfile_bmp_header_raw['ciexyz_blue']  =                         substr($BMPheader, $offset, 4);
+                $offset += 4;
+                $thisfile_bmp_header_raw['gamma_red']    = $this->LittleEndian2Int(substr($BMPheader, $offset, 4));
+                $offset += 4;
+                $thisfile_bmp_header_raw['gamma_green']  = $this->LittleEndian2Int(substr($BMPheader, $offset, 4));
+                $offset += 4;
+                $thisfile_bmp_header_raw['gamma_blue']   = $this->LittleEndian2Int(substr($BMPheader, $offset, 4));
+                $offset += 4;
+
+                $thisfile_bmp_header['ciexyz_red']   = $this->FixedPoint2_30(strrev($thisfile_bmp_header_raw['ciexyz_red']));
+                $thisfile_bmp_header['ciexyz_green'] = $this->FixedPoint2_30(strrev($thisfile_bmp_header_raw['ciexyz_green']));
+                $thisfile_bmp_header['ciexyz_blue']  = $this->FixedPoint2_30(strrev($thisfile_bmp_header_raw['ciexyz_blue']));
+            }
+
+            if ($thisfile_bmp['type_version'] >= 5) {
+                $BMPheader .= substr($BMPdata, $overalloffset, 16);
+                $overalloffset += 16;
+
+                // BITMAPV5HEADER - [16 bytes] - http://msdn.microsoft.com/library/en-us/gdi/bitmaps_7c36.asp
+                // Win98+, Win2000+
+                // DWORD        bV5Intent;
+                // DWORD        bV5ProfileData;
+                // DWORD        bV5ProfileSize;
+                // DWORD        bV5Reserved;
+                $thisfile_bmp_header_raw['intent']              = $this->LittleEndian2Int(substr($BMPheader, $offset, 4));
+                $offset += 4;
+                $thisfile_bmp_header_raw['profile_data_offset'] = $this->LittleEndian2Int(substr($BMPheader, $offset, 4));
+                $offset += 4;
+                $thisfile_bmp_header_raw['profile_data_size']   = $this->LittleEndian2Int(substr($BMPheader, $offset, 4));
+                $offset += 4;
+                $thisfile_bmp_header_raw['reserved3']           = $this->LittleEndian2Int(substr($BMPheader, $offset, 4));
+                $offset += 4;
+            }
+
+        } else {
+
+            $ThisFileInfo['error'][] = 'Unknown BMP format in header.';
+            return false;
+
+        }
+
+        if ($ExtractPalette || $ExtractData) {
+            $PaletteEntries = 0;
+            if ($thisfile_bmp_header_raw['bits_per_pixel'] < 16) {
+                $PaletteEntries = pow(2, $thisfile_bmp_header_raw['bits_per_pixel']);
+            } elseif (isset($thisfile_bmp_header_raw['colors_used']) && ($thisfile_bmp_header_raw['colors_used'] > 0) && ($thisfile_bmp_header_raw['colors_used'] <= 256)) {
+                $PaletteEntries = $thisfile_bmp_header_raw['colors_used'];
+            }
+            if ($PaletteEntries > 0) {
+                $BMPpalette = substr($BMPdata, $overalloffset, 4 * $PaletteEntries);
+                $overalloffset += 4 * $PaletteEntries;
+
+                $paletteoffset = 0;
+                for ($i = 0; $i < $PaletteEntries; $i++) {
+                    // RGBQUAD          - http://msdn.microsoft.com/library/en-us/gdi/bitmaps_5f8y.asp
+                    // BYTE    rgbBlue;
+                    // BYTE    rgbGreen;
+                    // BYTE    rgbRed;
+                    // BYTE    rgbReserved;
+                    $blue  = $this->LittleEndian2Int($BMPpalette[ $paletteoffset++ ]);
+                    $green = $this->LittleEndian2Int($BMPpalette[ $paletteoffset++ ]);
+                    $red   = $this->LittleEndian2Int($BMPpalette[ $paletteoffset++ ]);
+                    if (($thisfile_bmp['type_os'] == 'OS/2') && ($thisfile_bmp['type_version'] == 1)) {
+                        // no padding byte
+                    } else {
+                        $paletteoffset++; // padding byte
+                    }
+                    $thisfile_bmp['palette'][$i] = (($red << 16) | ($green << 8) | ($blue));
+                }
+            }
+        }
+
+        if ($ExtractData) {
+            $RowByteLength = ceil(($thisfile_bmp_header_raw['width'] * ($thisfile_bmp_header_raw['bits_per_pixel'] / 8)) / 4) * 4; // round up to nearest DWORD boundary
+
+            $BMPpixelData = substr($BMPdata, $thisfile_bmp_header_raw['data_offset'], $thisfile_bmp_header_raw['height'] * $RowByteLength);
+            $overalloffset = $thisfile_bmp_header_raw['data_offset'] + ($thisfile_bmp_header_raw['height'] * $RowByteLength);
+
+            $pixeldataoffset = 0;
+            switch (@$thisfile_bmp_header_raw['compression']) {
+
+                case 0: // BI_RGB
+                    switch ($thisfile_bmp_header_raw['bits_per_pixel']) {
+                        case 1:
+                            for ($row = ($thisfile_bmp_header_raw['height'] - 1); $row >= 0; $row--) {
+                                for ($col = 0; $col < $thisfile_bmp_header_raw['width']; $col = $col) {
+                                    $paletteindexbyte = ord($BMPpixelData{$pixeldataoffset++});
+                                    for ($i = 7; $i >= 0; $i--) {
+                                        $paletteindex = ($paletteindexbyte & (0x01 << $i)) >> $i;
+                                        $thisfile_bmp['data'][$row][$col] = $thisfile_bmp['palette'][$paletteindex];
+                                        $col++;
+                                    }
+                                }
+                                while (($pixeldataoffset % 4) != 0) {
+                                    // lines are padded to nearest DWORD
+                                    $pixeldataoffset++;
+                                }
+                            }
+                            break;
+
+                        case 4:
+                            for ($row = ($thisfile_bmp_header_raw['height'] - 1); $row >= 0; $row--) {
+                                for ($col = 0; $col < $thisfile_bmp_header_raw['width']; $col = $col) {
+                                    $paletteindexbyte = ord($BMPpixelData{$pixeldataoffset++});
+                                    for ($i = 1; $i >= 0; $i--) {
+                                        $paletteindex = ($paletteindexbyte & (0x0F << (4 * $i))) >> (4 * $i);
+                                        $thisfile_bmp['data'][$row][$col] = $thisfile_bmp['palette'][$paletteindex];
+                                        $col++;
+                                    }
+                                }
+                                while (($pixeldataoffset % 4) != 0) {
+                                    // lines are padded to nearest DWORD
+                                    $pixeldataoffset++;
+                                }
+                            }
+                            break;
+
+                        case 8:
+                            for ($row = ($thisfile_bmp_header_raw['height'] - 1); $row >= 0; $row--) {
+                                for ($col = 0; $col < $thisfile_bmp_header_raw['width']; $col++) {
+                                    $paletteindex = ord($BMPpixelData{$pixeldataoffset++});
+                                    $thisfile_bmp['data'][$row][$col] = $thisfile_bmp['palette'][$paletteindex];
+                                }
+                                while (($pixeldataoffset % 4) != 0) {
+                                    // lines are padded to nearest DWORD
+                                    $pixeldataoffset++;
+                                }
+                            }
+                            break;
+
+                        case 24:
+                            for ($row = ($thisfile_bmp_header_raw['height'] - 1); $row >= 0; $row--) {
+                                for ($col = 0; $col < $thisfile_bmp_header_raw['width']; $col++) {
+                                    $thisfile_bmp['data'][$row][$col] = (ord($BMPpixelData{$pixeldataoffset+2}) << 16) | (ord($BMPpixelData{$pixeldataoffset+1}) << 8) | ord($BMPpixelData{$pixeldataoffset});
+                                    $pixeldataoffset += 3;
+                                }
+                                while (($pixeldataoffset % 4) != 0) {
+                                    // lines are padded to nearest DWORD
+                                    $pixeldataoffset++;
+                                }
+                            }
+                            break;
+
+                        case 32:
+                            for ($row = ($thisfile_bmp_header_raw['height'] - 1); $row >= 0; $row--) {
+                                for ($col = 0; $col < $thisfile_bmp_header_raw['width']; $col++) {
+                                    $thisfile_bmp['data'][$row][$col] = (ord($BMPpixelData{$pixeldataoffset+3}) << 24) | (ord($BMPpixelData{$pixeldataoffset+2}) << 16) | (ord($BMPpixelData{$pixeldataoffset+1}) << 8) | ord($BMPpixelData{$pixeldataoffset});
+                                    $pixeldataoffset += 4;
+                                }
+                                while (($pixeldataoffset % 4) != 0) {
+                                    // lines are padded to nearest DWORD
+                                    $pixeldataoffset++;
+                                }
+                            }
+                            break;
+
+                        case 16:
+                            // ?
+                            break;
+
+                        default:
+                            $ThisFileInfo['error'][] = 'Unknown bits-per-pixel value ('.$thisfile_bmp_header_raw['bits_per_pixel'].') - cannot read pixel data';
+                            break;
+                    }
+                    break;
+
+
+                case 1: // BI_RLE8 - http://msdn.microsoft.com/library/en-us/gdi/bitmaps_6x0u.asp
+                    switch ($thisfile_bmp_header_raw['bits_per_pixel']) {
+                        case 8:
+                            $pixelcounter = 0;
+                            while ($pixeldataoffset < strlen($BMPpixelData)) {
+                                $firstbyte  = $this->LittleEndian2Int($BMPpixelData[ $pixeldataoffset++ ]);
+                                $secondbyte = $this->LittleEndian2Int($BMPpixelData[ $pixeldataoffset++ ]);
+                                if ($firstbyte == 0) {
+
+                                    // escaped/absolute mode - the first byte of the pair can be set to zero to
+                                    // indicate an escape character that denotes the end of a line, the end of
+                                    // a bitmap, or a delta, depending on the value of the second byte.
+                                    switch ($secondbyte) {
+                                        case 0:
+                                            // end of line
+                                            // no need for special processing, just ignore
+                                            break;
+
+                                        case 1:
+                                            // end of bitmap
+                                            $pixeldataoffset = strlen($BMPpixelData); // force to exit loop just in case
+                                            break;
+
+                                        case 2:
+                                            // delta - The 2 bytes following the escape contain unsigned values
+                                            // indicating the horizontal and vertical offsets of the next pixel
+                                            // from the current position.
+                                            $colincrement = $this->LittleEndian2Int($BMPpixelData[ $pixeldataoffset++ ]);
+                                            $rowincrement = $this->LittleEndian2Int($BMPpixelData[ $pixeldataoffset++ ]);
+                                            $col = ($pixelcounter % $thisfile_bmp_header_raw['width']) + $colincrement;
+                                            $row = ($thisfile_bmp_header_raw['height'] - 1 - (($pixelcounter - $col) / $thisfile_bmp_header_raw['width'])) - $rowincrement;
+                                            $pixelcounter = ($row * $thisfile_bmp_header_raw['width']) + $col;
+                                            break;
+
+                                        default:
+                                            // In absolute mode, the first byte is zero and the second byte is a
+                                            // value in the range 03H through FFH. The second byte represents the
+                                            // number of bytes that follow, each of which contains the color index
+                                            // of a single pixel. Each run must be aligned on a word boundary.
+                                            for ($i = 0; $i < $secondbyte; $i++) {
+                                                $paletteindex = $this->LittleEndian2Int($BMPpixelData[ $pixeldataoffset++ ]);
+                                                $col = $pixelcounter % $thisfile_bmp_header_raw['width'];
+                                                $row = $thisfile_bmp_header_raw['height'] - 1 - (($pixelcounter - $col) / $thisfile_bmp_header_raw['width']);
+                                                $thisfile_bmp['data'][$row][$col] = $thisfile_bmp['palette'][$paletteindex];
+                                                $pixelcounter++;
+                                            }
+                                            while (($pixeldataoffset % 2) != 0) {
+                                                // Each run must be aligned on a word boundary.
+                                                $pixeldataoffset++;
+                                            }
+                                            break;
+                                    }
+
+                                } else {
+
+                                    // encoded mode - the first byte specifies the number of consecutive pixels
+                                    // to be drawn using the color index contained in the second byte.
+                                    for ($i = 0; $i < $firstbyte; $i++) {
+                                        $col = $pixelcounter % $thisfile_bmp_header_raw['width'];
+                                        $row = $thisfile_bmp_header_raw['height'] - 1 - (($pixelcounter - $col) / $thisfile_bmp_header_raw['width']);
+                                        $thisfile_bmp['data'][$row][$col] = $thisfile_bmp['palette'][$secondbyte];
+                                        $pixelcounter++;
+                                    }
+
+                                }
+                            }
+                            break;
+
+                        default:
+                            $ThisFileInfo['error'][] = 'Unknown bits-per-pixel value ('.$thisfile_bmp_header_raw['bits_per_pixel'].') - cannot read pixel data';
+                            break;
+                    }
+                    break;
+
+
+
+                case 2: // BI_RLE4 - http://msdn.microsoft.com/library/en-us/gdi/bitmaps_6x0u.asp
+                    switch ($thisfile_bmp_header_raw['bits_per_pixel']) {
+                        case 4:
+                            $pixelcounter = 0;
+                            while ($pixeldataoffset < strlen($BMPpixelData)) {
+                                $firstbyte  = $this->LittleEndian2Int($BMPpixelData[ $pixeldataoffset++ ]);
+                                $secondbyte = $this->LittleEndian2Int($BMPpixelData[ $pixeldataoffset++ ]);
+                                if ($firstbyte == 0) {
+
+                                    // escaped/absolute mode - the first byte of the pair can be set to zero to
+                                    // indicate an escape character that denotes the end of a line, the end of
+                                    // a bitmap, or a delta, depending on the value of the second byte.
+                                    switch ($secondbyte) {
+                                        case 0:
+                                            // end of line
+                                            // no need for special processing, just ignore
+                                            break;
+
+                                        case 1:
+                                            // end of bitmap
+                                            $pixeldataoffset = strlen($BMPpixelData); // force to exit loop just in case
+                                            break;
+
+                                        case 2:
+                                            // delta - The 2 bytes following the escape contain unsigned values
+                                            // indicating the horizontal and vertical offsets of the next pixel
+                                            // from the current position.
+                                            $colincrement = $this->LittleEndian2Int($BMPpixelData[ $pixeldataoffset++ ]);
+                                            $rowincrement = $this->LittleEndian2Int($BMPpixelData[ $pixeldataoffset++ ]);
+                                            $col = ($pixelcounter % $thisfile_bmp_header_raw['width']) + $colincrement;
+                                            $row = ($thisfile_bmp_header_raw['height'] - 1 - (($pixelcounter - $col) / $thisfile_bmp_header_raw['width'])) - $rowincrement;
+                                            $pixelcounter = ($row * $thisfile_bmp_header_raw['width']) + $col;
+                                            break;
+
+                                        default:
+                                            // In absolute mode, the first byte is zero. The second byte contains the number
+                                            // of color indexes that follow. Subsequent bytes contain color indexes in their
+                                            // high- and low-order 4 bits, one color index for each pixel. In absolute mode,
+                                            // each run must be aligned on a word boundary.
+                                            $paletteindexes = array();
+                                            for ($i = 0, $iMax = ceil($secondbyte / 2); $i < $iMax; $i++) {
+                                                $paletteindexbyte = $this->LittleEndian2Int($BMPpixelData[ $pixeldataoffset++ ]);
+                                                $paletteindexes[] = ($paletteindexbyte & 0xF0) >> 4;
+                                                $paletteindexes[] = ($paletteindexbyte & 0x0F);
+                                            }
+                                            while (($pixeldataoffset % 2) != 0) {
+                                                // Each run must be aligned on a word boundary.
+                                                $pixeldataoffset++;
+                                            }
+
+                                            foreach ($paletteindexes as $dummy => $paletteindex) {
+                                                $col = $pixelcounter % $thisfile_bmp_header_raw['width'];
+                                                $row = $thisfile_bmp_header_raw['height'] - 1 - (($pixelcounter - $col) / $thisfile_bmp_header_raw['width']);
+                                                $thisfile_bmp['data'][$row][$col] = $thisfile_bmp['palette'][$paletteindex];
+                                                $pixelcounter++;
+                                            }
+                                            break;
+                                    }
+
+                                } else {
+
+                                    // encoded mode - the first byte of the pair contains the number of pixels to be
+                                    // drawn using the color indexes in the second byte. The second byte contains two
+                                    // color indexes, one in its high-order 4 bits and one in its low-order 4 bits.
+                                    // The first of the pixels is drawn using the color specified by the high-order
+                                    // 4 bits, the second is drawn using the color in the low-order 4 bits, the third
+                                    // is drawn using the color in the high-order 4 bits, and so on, until all the
+                                    // pixels specified by the first byte have been drawn.
+                                    $paletteindexes[0] = ($secondbyte & 0xF0) >> 4;
+                                    $paletteindexes[1] = ($secondbyte & 0x0F);
+                                    for ($i = 0; $i < $firstbyte; $i++) {
+                                        $col = $pixelcounter % $thisfile_bmp_header_raw['width'];
+                                        $row = $thisfile_bmp_header_raw['height'] - 1 - (($pixelcounter - $col) / $thisfile_bmp_header_raw['width']);
+                                        $thisfile_bmp['data'][$row][$col] = $thisfile_bmp['palette'][$paletteindexes[($i % 2)]];
+                                        $pixelcounter++;
+                                    }
+
+                                }
+                            }
+                            break;
+
+                        default:
+                            $ThisFileInfo['error'][] = 'Unknown bits-per-pixel value ('.$thisfile_bmp_header_raw['bits_per_pixel'].') - cannot read pixel data';
+                            break;
+                    }
+                    break;
+
+
+                case 3: // BI_BITFIELDS
+                    switch ($thisfile_bmp_header_raw['bits_per_pixel']) {
+                        case 16:
+                        case 32:
+                            $redshift   = 0;
+                            $greenshift = 0;
+                            $blueshift  = 0;
+                            if (!$thisfile_bmp_header_raw['red_mask'] || !$thisfile_bmp_header_raw['green_mask'] || !$thisfile_bmp_header_raw['blue_mask']) {
+                                $ThisFileInfo['error'][] = 'missing $thisfile_bmp_header_raw[(red|green|blue)_mask]';
+                                return false;
+                            }
+                            while ((($thisfile_bmp_header_raw['red_mask'] >> $redshift) & 0x01) == 0) {
+                                $redshift++;
+                            }
+                            while ((($thisfile_bmp_header_raw['green_mask'] >> $greenshift) & 0x01) == 0) {
+                                $greenshift++;
+                            }
+                            while ((($thisfile_bmp_header_raw['blue_mask'] >> $blueshift) & 0x01) == 0) {
+                                $blueshift++;
+                            }
+                            for ($row = ($thisfile_bmp_header_raw['height'] - 1); $row >= 0; $row--) {
+                                for ($col = 0; $col < $thisfile_bmp_header_raw['width']; $col++) {
+                                    $pixelvalue = $this->LittleEndian2Int(substr($BMPpixelData, $pixeldataoffset, $thisfile_bmp_header_raw['bits_per_pixel'] / 8));
+                                    $pixeldataoffset += $thisfile_bmp_header_raw['bits_per_pixel'] / 8;
+
+                                    $red   = (int) round(((($pixelvalue & $thisfile_bmp_header_raw[ 'red_mask'])   >> $redshift)   / ($thisfile_bmp_header_raw[ 'red_mask']   >> $redshift))   * 255);
+                                    $green = (int) round(((($pixelvalue & $thisfile_bmp_header_raw[ 'green_mask']) >> $greenshift) / ($thisfile_bmp_header_raw[ 'green_mask'] >> $greenshift)) * 255);
+                                    $blue  = (int) round(((($pixelvalue & $thisfile_bmp_header_raw[ 'blue_mask'])  >> $blueshift)  / ($thisfile_bmp_header_raw[ 'blue_mask']  >> $blueshift))  * 255);
+                                    $thisfile_bmp['data'][$row][$col] = (($red << 16) | ($green << 8) | ($blue));
+                                }
+                                while (($pixeldataoffset % 4) != 0) {
+                                    // lines are padded to nearest DWORD
+                                    $pixeldataoffset++;
+                                }
+                            }
+                            break;
+
+                        default:
+                            $ThisFileInfo['error'][] = 'Unknown bits-per-pixel value ('.$thisfile_bmp_header_raw['bits_per_pixel'].') - cannot read pixel data';
+                            break;
+                    }
+                    break;
+
+
+                default: // unhandled compression type
+                    $ThisFileInfo['error'][] = 'Unknown/unhandled compression type value ('.$thisfile_bmp_header_raw['compression'].') - cannot decompress pixel data';
+                    break;
+            }
+        }
+
+        return true;
+    }
+
+    public function IntColor2RGB($color) {
+        $red   = ($color & 0x00FF0000) >> 16;
+        $green = ($color & 0x0000FF00) >> 8;
+        $blue  = ($color & 0x000000FF);
+        return array($red, $green, $blue);
+    }
+
+    public function PlotPixelsGD(&$BMPdata, $truecolor=true) {
+        $imagewidth  = $BMPdata['header']['raw']['width'];
+        $imageheight = $BMPdata['header']['raw']['height'];
+
+        if ($truecolor) {
+
+            $gd = @imagecreatetruecolor($imagewidth, $imageheight);
+
+        } else {
+
+            $gd = @imagecreate($imagewidth, $imageheight);
+            if (!empty($BMPdata['palette'])) {
+                // create GD palette from BMP palette
+                foreach ($BMPdata['palette'] as $dummy => $color) {
+                    list($r, $g, $b) = $this->IntColor2RGB($color);
+                    imagecolorallocate($gd, $r, $g, $b);
+                }
+            } else {
+                // create 216-color websafe palette
+                for ($r = 0x00; $r <= 0xFF; $r += 0x33) {
+                    for ($g = 0x00; $g <= 0xFF; $g += 0x33) {
+                        for ($b = 0x00; $b <= 0xFF; $b += 0x33) {
+                            imagecolorallocate($gd, $r, $g, $b);
+                        }
+                    }
+                }
+            }
+
+        }
+        if (!is_resource($gd)) {
+            return false;
+        }
+
+        foreach ($BMPdata['data'] as $row => $colarray) {
+            if (!phpthumb_functions::FunctionIsDisabled('set_time_limit')) {
+                set_time_limit(30);
+            }
+            foreach ($colarray as $col => $color) {
+                list($red, $green, $blue) = $this->IntColor2RGB($color);
+                if ($truecolor) {
+                    $pixelcolor = imagecolorallocate($gd, $red, $green, $blue);
+                } else {
+                    $pixelcolor = imagecolorclosest($gd, $red, $green, $blue);
+                }
+                imagesetpixel($gd, $col, $row, $pixelcolor);
+            }
+        }
+        return $gd;
+    }
+
+    public function PlotBMP(&$BMPinfo) {
+        $starttime = time();
+        if (!isset($BMPinfo['bmp']['data']) || !is_array($BMPinfo['bmp']['data'])) {
+            echo 'ERROR: no pixel data<BR>';
+            return false;
+        }
+        if (!phpthumb_functions::FunctionIsDisabled('set_time_limit')) {
+            set_time_limit((int) round($BMPinfo[ 'resolution_x'] * $BMPinfo[ 'resolution_y'] / 10000));
+        }
+        $im = $this->PlotPixelsGD($BMPinfo['bmp']);
+        if (headers_sent()) {
+            echo 'plotted '.($BMPinfo['resolution_x'] * $BMPinfo['resolution_y']).' pixels in '.(time() - $starttime).' seconds<BR>';
+            imagedestroy($im);
+            exit;
+        }
+        header('Content-Type: image/png');
+        imagepng($im);
+        imagedestroy($im);
+        return true;
+    }
+
+    public function BMPcompressionWindowsLookup($compressionid) {
+        static $BMPcompressionWindowsLookup = array(
+            0 => 'BI_RGB',
+            1 => 'BI_RLE8',
+            2 => 'BI_RLE4',
+            3 => 'BI_BITFIELDS',
+            4 => 'BI_JPEG',
+            5 => 'BI_PNG'
+        );
+        return (isset($BMPcompressionWindowsLookup[$compressionid]) ? $BMPcompressionWindowsLookup[$compressionid] : 'invalid');
+    }
+
+    public function BMPcompressionOS2Lookup($compressionid) {
+        static $BMPcompressionOS2Lookup = array(
+            0 => 'BI_RGB',
+            1 => 'BI_RLE8',
+            2 => 'BI_RLE4',
+            3 => 'Huffman 1D',
+            4 => 'BI_RLE24',
+        );
+        return (isset($BMPcompressionOS2Lookup[$compressionid]) ? $BMPcompressionOS2Lookup[$compressionid] : 'invalid');
+    }
+
+
+    // from getid3.lib.php
+
+    public function trunc($floatnumber) {
+        // truncates a floating-point number at the decimal point
+        // returns int (if possible, otherwise float)
+        if ($floatnumber >= 1) {
+            $truncatednumber = floor($floatnumber);
+        } elseif ($floatnumber <= -1) {
+            $truncatednumber = ceil($floatnumber);
+        } else {
+            $truncatednumber = 0;
+        }
+        if ($truncatednumber <= 1073741824) { // 2^30
+            $truncatednumber = (int) $truncatednumber;
+        }
+        return $truncatednumber;
+    }
+
+    public function LittleEndian2Int($byteword) {
+        $intvalue = 0;
+        $byteword = strrev($byteword);
+        $bytewordlen = strlen($byteword);
+        for ($i = 0; $i < $bytewordlen; $i++) {
+            $intvalue += ord($byteword{$i}) * pow(256, ($bytewordlen - 1 - $i));
+        }
+        return $intvalue;
+    }
+
+    public function BigEndian2Int($byteword) {
+        return $this->LittleEndian2Int(strrev($byteword));
+    }
+
+    public function BigEndian2Bin($byteword) {
+        $binvalue = '';
+        $bytewordlen = strlen($byteword);
+        for ($i = 0; $i < $bytewordlen; $i++) {
+            $binvalue .= str_pad(decbin(ord($byteword{$i})), 8, '0', STR_PAD_LEFT);
+        }
+        return $binvalue;
+    }
+
+    public function FixedPoint2_30($rawdata) {
+        $binarystring = $this->BigEndian2Bin($rawdata);
+        return $this->Bin2Dec(substr($binarystring, 0, 2)) + (float) ($this->Bin2Dec(substr($binarystring, 2, 30)) / 1073741824);
+    }
+
+    public function Bin2Dec($binstring, $signed=false) {
+        $signmult = 1;
+        if ($signed) {
+            if ($binstring{0} == '1') {
+                $signmult = -1;
+            }
+            $binstring = substr($binstring, 1);
+        }
+        $decvalue = 0;
+        for ($i = 0, $iMax = strlen($binstring); $i < $iMax; $i++) {
+            $decvalue += ((int) $binstring[ strlen($binstring) - $i - 1 ]) * pow(2, $i);
+        }
+        return $this->CastAsInt($decvalue * $signmult);
+    }
+
+    public function CastAsInt($floatnum) {
+        // convert to float if not already
+        $floatnum = (float) $floatnum;
+
+        // convert a float to type int, only if possible
+        if ($this->trunc($floatnum) == $floatnum) {
+            // it's not floating point
+            if ($floatnum <= 1073741824) { // 2^30
+                // it's within int range
+                $floatnum = (int) $floatnum;
+            }
+        }
+        return $floatnum;
+    }
 
 }

Spacing +50 added lines, -50 removed lines

@@ -20,7 +20,7 @@ 
 
 class phpthumb_bmp {
 
-	public function phpthumb_bmp2gd(&$BMPdata, $truecolor=true) {
+	public function phpthumb_bmp2gd(&$BMPdata, $truecolor = true) {
 		$ThisFileInfo = array();
 		if ($this->getid3_bmp($BMPdata, $ThisFileInfo, true, true)) {
 			$gd = $this->PlotPixelsGD($ThisFileInfo['bmp'], $truecolor);
@@ -29,7 +29,7 @@ 
 		return false;
 	}
 
-	public function phpthumb_bmpfile2gd($filename, $truecolor=true) {
+	public function phpthumb_bmpfile2gd($filename, $truecolor = true) {
 		if ($fp = @fopen($filename, 'rb')) {
 			$BMPdata = fread($fp, filesize($filename));
 			fclose($fp);
@@ -57,29 +57,29 @@ 
 
 		$bmpSize = strlen($BMP) + 14 + 40;
 		// BITMAPFILEHEADER [14 bytes] - http://msdn.microsoft.com/library/en-us/gdi/bitmaps_62uq.asp
-		$BITMAPFILEHEADER  = 'BM';                                                           // WORD    bfType;
+		$BITMAPFILEHEADER  = 'BM'; // WORD    bfType;
 		$BITMAPFILEHEADER .= phpthumb_functions::LittleEndian2String($bmpSize, 4); // DWORD   bfSize;
-		$BITMAPFILEHEADER .= phpthumb_functions::LittleEndian2String(       0, 2); // WORD    bfReserved1;
-		$BITMAPFILEHEADER .= phpthumb_functions::LittleEndian2String(       0, 2); // WORD    bfReserved2;
-		$BITMAPFILEHEADER .= phpthumb_functions::LittleEndian2String(      54, 4); // DWORD   bfOffBits;
+		$BITMAPFILEHEADER .= phpthumb_functions::LittleEndian2String(0, 2); // WORD    bfReserved1;
+		$BITMAPFILEHEADER .= phpthumb_functions::LittleEndian2String(0, 2); // WORD    bfReserved2;
+		$BITMAPFILEHEADER .= phpthumb_functions::LittleEndian2String(54, 4); // DWORD   bfOffBits;
 
 		// BITMAPINFOHEADER - [40 bytes] http://msdn.microsoft.com/library/en-us/gdi/bitmaps_1rw2.asp
-		$BITMAPINFOHEADER  = phpthumb_functions::LittleEndian2String(      40, 4); // DWORD  biSize;
-		$BITMAPINFOHEADER .= phpthumb_functions::LittleEndian2String( $imageX, 4); // LONG   biWidth;
-		$BITMAPINFOHEADER .= phpthumb_functions::LittleEndian2String( $imageY, 4); // LONG   biHeight;
-		$BITMAPINFOHEADER .= phpthumb_functions::LittleEndian2String(       1, 2); // WORD   biPlanes;
-		$BITMAPINFOHEADER .= phpthumb_functions::LittleEndian2String(      24, 2); // WORD   biBitCount;
-		$BITMAPINFOHEADER .= phpthumb_functions::LittleEndian2String(       0, 4); // DWORD  biCompression;
-		$BITMAPINFOHEADER .= phpthumb_functions::LittleEndian2String(       0, 4); // DWORD  biSizeImage;
-		$BITMAPINFOHEADER .= phpthumb_functions::LittleEndian2String(    2835, 4); // LONG   biXPelsPerMeter;
-		$BITMAPINFOHEADER .= phpthumb_functions::LittleEndian2String(    2835, 4); // LONG   biYPelsPerMeter;
-		$BITMAPINFOHEADER .= phpthumb_functions::LittleEndian2String(       0, 4); // DWORD  biClrUsed;
-		$BITMAPINFOHEADER .= phpthumb_functions::LittleEndian2String(       0, 4); // DWORD  biClrImportant;
+		$BITMAPINFOHEADER  = phpthumb_functions::LittleEndian2String(40, 4); // DWORD  biSize;
+		$BITMAPINFOHEADER .= phpthumb_functions::LittleEndian2String($imageX, 4); // LONG   biWidth;
+		$BITMAPINFOHEADER .= phpthumb_functions::LittleEndian2String($imageY, 4); // LONG   biHeight;
+		$BITMAPINFOHEADER .= phpthumb_functions::LittleEndian2String(1, 2); // WORD   biPlanes;
+		$BITMAPINFOHEADER .= phpthumb_functions::LittleEndian2String(24, 2); // WORD   biBitCount;
+		$BITMAPINFOHEADER .= phpthumb_functions::LittleEndian2String(0, 4); // DWORD  biCompression;
+		$BITMAPINFOHEADER .= phpthumb_functions::LittleEndian2String(0, 4); // DWORD  biSizeImage;
+		$BITMAPINFOHEADER .= phpthumb_functions::LittleEndian2String(2835, 4); // LONG   biXPelsPerMeter;
+		$BITMAPINFOHEADER .= phpthumb_functions::LittleEndian2String(2835, 4); // LONG   biYPelsPerMeter;
+		$BITMAPINFOHEADER .= phpthumb_functions::LittleEndian2String(0, 4); // DWORD  biClrUsed;
+		$BITMAPINFOHEADER .= phpthumb_functions::LittleEndian2String(0, 4); // DWORD  biClrImportant;
 
 		return $BITMAPFILEHEADER.$BITMAPINFOHEADER.$BMP;
 	}
 
-	public function getid3_bmp(&$BMPdata, &$ThisFileInfo, $ExtractPalette=false, $ExtractData=false) {
+	public function getid3_bmp(&$BMPdata, &$ThisFileInfo, $ExtractPalette = false, $ExtractData = false) {
 
 		// shortcuts
 		$ThisFileInfo['bmp']['header']['raw'] = array();
@@ -100,11 +100,11 @@ 
 		$BMPheader = substr($BMPdata, $overalloffset, 14 + 40);
 		$overalloffset += (14 + 40);
 
-		$thisfile_bmp_header_raw['identifier']  = substr($BMPheader, $offset, 2);
+		$thisfile_bmp_header_raw['identifier'] = substr($BMPheader, $offset, 2);
 		$offset += 2;
 
 		if ($thisfile_bmp_header_raw['identifier'] != 'BM') {
-			$ThisFileInfo['error'][] = 'Expecting "BM" at offset '. (int) (@$ThisFileInfo[ 'avdataoffset']) .', found "'. $thisfile_bmp_header_raw[ 'identifier'].'"';
+			$ThisFileInfo['error'][] = 'Expecting "BM" at offset '.(int)(@$ThisFileInfo['avdataoffset']).', found "'.$thisfile_bmp_header_raw['identifier'].'"';
 			unset($ThisFileInfo['fileformat']);
 			unset($ThisFileInfo['bmp']);
 			return false;
@@ -153,7 +153,7 @@ 
 		$ThisFileInfo['fileformat']                  = 'bmp';
 		$ThisFileInfo['video']['dataformat']         = 'bmp';
 		$ThisFileInfo['video']['lossless']           = true;
-		$ThisFileInfo['video']['pixel_aspect_ratio'] = (float) 1;
+		$ThisFileInfo['video']['pixel_aspect_ratio'] = (float)1;
 
 		if ($thisfile_bmp['type_os'] == 'OS/2') {
 
@@ -301,11 +301,11 @@ 
 				$offset += 4;
 				$thisfile_bmp_header_raw['cs_type']      = $this->LittleEndian2Int(substr($BMPheader, $offset, 4));
 				$offset += 4;
-				$thisfile_bmp_header_raw['ciexyz_red']   =                         substr($BMPheader, $offset, 4);
+				$thisfile_bmp_header_raw['ciexyz_red']   = substr($BMPheader, $offset, 4);
 				$offset += 4;
-				$thisfile_bmp_header_raw['ciexyz_green'] =                         substr($BMPheader, $offset, 4);
+				$thisfile_bmp_header_raw['ciexyz_green'] = substr($BMPheader, $offset, 4);
 				$offset += 4;
-				$thisfile_bmp_header_raw['ciexyz_blue']  =                         substr($BMPheader, $offset, 4);
+				$thisfile_bmp_header_raw['ciexyz_blue']  = substr($BMPheader, $offset, 4);
 				$offset += 4;
 				$thisfile_bmp_header_raw['gamma_red']    = $this->LittleEndian2Int(substr($BMPheader, $offset, 4));
 				$offset += 4;
@@ -364,9 +364,9 @@ 
 					// BYTE    rgbGreen;
 					// BYTE    rgbRed;
 					// BYTE    rgbReserved;
-					$blue  = $this->LittleEndian2Int($BMPpalette[ $paletteoffset++ ]);
-					$green = $this->LittleEndian2Int($BMPpalette[ $paletteoffset++ ]);
-					$red   = $this->LittleEndian2Int($BMPpalette[ $paletteoffset++ ]);
+					$blue  = $this->LittleEndian2Int($BMPpalette[$paletteoffset++]);
+					$green = $this->LittleEndian2Int($BMPpalette[$paletteoffset++]);
+					$red   = $this->LittleEndian2Int($BMPpalette[$paletteoffset++]);
 					if (($thisfile_bmp['type_os'] == 'OS/2') && ($thisfile_bmp['type_version'] == 1)) {
 						// no padding byte
 					} else {
@@ -438,7 +438,7 @@ 
 						case 24:
 							for ($row = ($thisfile_bmp_header_raw['height'] - 1); $row >= 0; $row--) {
 								for ($col = 0; $col < $thisfile_bmp_header_raw['width']; $col++) {
-									$thisfile_bmp['data'][$row][$col] = (ord($BMPpixelData{$pixeldataoffset+2}) << 16) | (ord($BMPpixelData{$pixeldataoffset+1}) << 8) | ord($BMPpixelData{$pixeldataoffset});
+									$thisfile_bmp['data'][$row][$col] = (ord($BMPpixelData{$pixeldataoffset + 2}) << 16) | (ord($BMPpixelData{$pixeldataoffset + 1}) << 8) | ord($BMPpixelData{$pixeldataoffset});
 									$pixeldataoffset += 3;
 								}
 								while (($pixeldataoffset % 4) != 0) {
@@ -451,7 +451,7 @@ 
 						case 32:
 							for ($row = ($thisfile_bmp_header_raw['height'] - 1); $row >= 0; $row--) {
 								for ($col = 0; $col < $thisfile_bmp_header_raw['width']; $col++) {
-									$thisfile_bmp['data'][$row][$col] = (ord($BMPpixelData{$pixeldataoffset+3}) << 24) | (ord($BMPpixelData{$pixeldataoffset+2}) << 16) | (ord($BMPpixelData{$pixeldataoffset+1}) << 8) | ord($BMPpixelData{$pixeldataoffset});
+									$thisfile_bmp['data'][$row][$col] = (ord($BMPpixelData{$pixeldataoffset + 3}) << 24) | (ord($BMPpixelData{$pixeldataoffset + 2}) << 16) | (ord($BMPpixelData{$pixeldataoffset + 1}) << 8) | ord($BMPpixelData{$pixeldataoffset});
 									$pixeldataoffset += 4;
 								}
 								while (($pixeldataoffset % 4) != 0) {
@@ -477,8 +477,8 @@ 
 						case 8:
 							$pixelcounter = 0;
 							while ($pixeldataoffset < strlen($BMPpixelData)) {
-								$firstbyte  = $this->LittleEndian2Int($BMPpixelData[ $pixeldataoffset++ ]);
-								$secondbyte = $this->LittleEndian2Int($BMPpixelData[ $pixeldataoffset++ ]);
+								$firstbyte  = $this->LittleEndian2Int($BMPpixelData[$pixeldataoffset++]);
+								$secondbyte = $this->LittleEndian2Int($BMPpixelData[$pixeldataoffset++]);
 								if ($firstbyte == 0) {
 
 									// escaped/absolute mode - the first byte of the pair can be set to zero to
@@ -499,8 +499,8 @@ 
 											// delta - The 2 bytes following the escape contain unsigned values
 											// indicating the horizontal and vertical offsets of the next pixel
 											// from the current position.
-											$colincrement = $this->LittleEndian2Int($BMPpixelData[ $pixeldataoffset++ ]);
-											$rowincrement = $this->LittleEndian2Int($BMPpixelData[ $pixeldataoffset++ ]);
+											$colincrement = $this->LittleEndian2Int($BMPpixelData[$pixeldataoffset++]);
+											$rowincrement = $this->LittleEndian2Int($BMPpixelData[$pixeldataoffset++]);
 											$col = ($pixelcounter % $thisfile_bmp_header_raw['width']) + $colincrement;
 											$row = ($thisfile_bmp_header_raw['height'] - 1 - (($pixelcounter - $col) / $thisfile_bmp_header_raw['width'])) - $rowincrement;
 											$pixelcounter = ($row * $thisfile_bmp_header_raw['width']) + $col;
@@ -512,7 +512,7 @@ 
 											// number of bytes that follow, each of which contains the color index
 											// of a single pixel. Each run must be aligned on a word boundary.
 											for ($i = 0; $i < $secondbyte; $i++) {
-												$paletteindex = $this->LittleEndian2Int($BMPpixelData[ $pixeldataoffset++ ]);
+												$paletteindex = $this->LittleEndian2Int($BMPpixelData[$pixeldataoffset++]);
 												$col = $pixelcounter % $thisfile_bmp_header_raw['width'];
 												$row = $thisfile_bmp_header_raw['height'] - 1 - (($pixelcounter - $col) / $thisfile_bmp_header_raw['width']);
 												$thisfile_bmp['data'][$row][$col] = $thisfile_bmp['palette'][$paletteindex];
@@ -553,8 +553,8 @@ 
 						case 4:
 							$pixelcounter = 0;
 							while ($pixeldataoffset < strlen($BMPpixelData)) {
-								$firstbyte  = $this->LittleEndian2Int($BMPpixelData[ $pixeldataoffset++ ]);
-								$secondbyte = $this->LittleEndian2Int($BMPpixelData[ $pixeldataoffset++ ]);
+								$firstbyte  = $this->LittleEndian2Int($BMPpixelData[$pixeldataoffset++]);
+								$secondbyte = $this->LittleEndian2Int($BMPpixelData[$pixeldataoffset++]);
 								if ($firstbyte == 0) {
 
 									// escaped/absolute mode - the first byte of the pair can be set to zero to
@@ -575,8 +575,8 @@ 
 											// delta - The 2 bytes following the escape contain unsigned values
 											// indicating the horizontal and vertical offsets of the next pixel
 											// from the current position.
-											$colincrement = $this->LittleEndian2Int($BMPpixelData[ $pixeldataoffset++ ]);
-											$rowincrement = $this->LittleEndian2Int($BMPpixelData[ $pixeldataoffset++ ]);
+											$colincrement = $this->LittleEndian2Int($BMPpixelData[$pixeldataoffset++]);
+											$rowincrement = $this->LittleEndian2Int($BMPpixelData[$pixeldataoffset++]);
 											$col = ($pixelcounter % $thisfile_bmp_header_raw['width']) + $colincrement;
 											$row = ($thisfile_bmp_header_raw['height'] - 1 - (($pixelcounter - $col) / $thisfile_bmp_header_raw['width'])) - $rowincrement;
 											$pixelcounter = ($row * $thisfile_bmp_header_raw['width']) + $col;
@@ -589,7 +589,7 @@ 
 											// each run must be aligned on a word boundary.
 											$paletteindexes = array();
 											for ($i = 0, $iMax = ceil($secondbyte / 2); $i < $iMax; $i++) {
-												$paletteindexbyte = $this->LittleEndian2Int($BMPpixelData[ $pixeldataoffset++ ]);
+												$paletteindexbyte = $this->LittleEndian2Int($BMPpixelData[$pixeldataoffset++]);
 												$paletteindexes[] = ($paletteindexbyte & 0xF0) >> 4;
 												$paletteindexes[] = ($paletteindexbyte & 0x0F);
 											}
@@ -661,9 +661,9 @@ 
 									$pixelvalue = $this->LittleEndian2Int(substr($BMPpixelData, $pixeldataoffset, $thisfile_bmp_header_raw['bits_per_pixel'] / 8));
 									$pixeldataoffset += $thisfile_bmp_header_raw['bits_per_pixel'] / 8;
 
-									$red   = (int) round(((($pixelvalue & $thisfile_bmp_header_raw[ 'red_mask'])   >> $redshift)   / ($thisfile_bmp_header_raw[ 'red_mask']   >> $redshift))   * 255);
-									$green = (int) round(((($pixelvalue & $thisfile_bmp_header_raw[ 'green_mask']) >> $greenshift) / ($thisfile_bmp_header_raw[ 'green_mask'] >> $greenshift)) * 255);
-									$blue  = (int) round(((($pixelvalue & $thisfile_bmp_header_raw[ 'blue_mask'])  >> $blueshift)  / ($thisfile_bmp_header_raw[ 'blue_mask']  >> $blueshift))  * 255);
+									$red   = (int)round(((($pixelvalue & $thisfile_bmp_header_raw['red_mask']) >> $redshift) / ($thisfile_bmp_header_raw['red_mask'] >> $redshift)) * 255);
+									$green = (int)round(((($pixelvalue & $thisfile_bmp_header_raw['green_mask']) >> $greenshift) / ($thisfile_bmp_header_raw['green_mask'] >> $greenshift)) * 255);
+									$blue  = (int)round(((($pixelvalue & $thisfile_bmp_header_raw['blue_mask']) >> $blueshift) / ($thisfile_bmp_header_raw['blue_mask'] >> $blueshift)) * 255);
 									$thisfile_bmp['data'][$row][$col] = (($red << 16) | ($green << 8) | ($blue));
 								}
 								while (($pixeldataoffset % 4) != 0) {
@@ -696,7 +696,7 @@ 
 		return array($red, $green, $blue);
 	}
 
-	public function PlotPixelsGD(&$BMPdata, $truecolor=true) {
+	public function PlotPixelsGD(&$BMPdata, $truecolor = true) {
 		$imagewidth  = $BMPdata['header']['raw']['width'];
 		$imageheight = $BMPdata['header']['raw']['height'];
 
@@ -753,7 +753,7 @@ 
 			return false;
 		}
 		if (!phpthumb_functions::FunctionIsDisabled('set_time_limit')) {
-			set_time_limit((int) round($BMPinfo[ 'resolution_x'] * $BMPinfo[ 'resolution_y'] / 10000));
+			set_time_limit((int)round($BMPinfo['resolution_x'] * $BMPinfo['resolution_y'] / 10000));
 		}
 		$im = $this->PlotPixelsGD($BMPinfo['bmp']);
 		if (headers_sent()) {
@@ -804,7 +804,7 @@ 
 			$truncatednumber = 0;
 		}
 		if ($truncatednumber <= 1073741824) { // 2^30
-			$truncatednumber = (int) $truncatednumber;
+			$truncatednumber = (int)$truncatednumber;
 		}
 		return $truncatednumber;
 	}
@@ -834,10 +834,10 @@ 
 
 	public function FixedPoint2_30($rawdata) {
 		$binarystring = $this->BigEndian2Bin($rawdata);
-		return $this->Bin2Dec(substr($binarystring, 0, 2)) + (float) ($this->Bin2Dec(substr($binarystring, 2, 30)) / 1073741824);
+		return $this->Bin2Dec(substr($binarystring, 0, 2)) + (float)($this->Bin2Dec(substr($binarystring, 2, 30)) / 1073741824);
 	}
 
-	public function Bin2Dec($binstring, $signed=false) {
+	public function Bin2Dec($binstring, $signed = false) {
 		$signmult = 1;
 		if ($signed) {
 			if ($binstring{0} == '1') {
@@ -847,21 +847,21 @@ 
 		}
 		$decvalue = 0;
 		for ($i = 0, $iMax = strlen($binstring); $i < $iMax; $i++) {
-			$decvalue += ((int) $binstring[ strlen($binstring) - $i - 1 ]) * pow(2, $i);
+			$decvalue += ((int)$binstring[strlen($binstring) - $i - 1]) * pow(2, $i);
 		}
 		return $this->CastAsInt($decvalue * $signmult);
 	}
 
 	public function CastAsInt($floatnum) {
 		// convert to float if not already
-		$floatnum = (float) $floatnum;
+		$floatnum = (float)$floatnum;
 
 		// convert a float to type int, only if possible
 		if ($this->trunc($floatnum) == $floatnum) {
 			// it's not floating point
 			if ($floatnum <= 1073741824) { // 2^30
 				// it's within int range
-				$floatnum = (int) $floatnum;
+				$floatnum = (int)$floatnum;
 			}
 		}
 		return $floatnum;

htdocs/modules/system/class/thumbs/phpthumb.gif.php

Indentation +1075 added lines, -1075 removed lines

@@ -23,11 +23,11 @@ 
 
 function gif_loadFile($lpszFileName, $iIndex = 0)
 {
-	$gif = new CGIF();
-	if ($gif->loadFile($lpszFileName, $iIndex)) {
-		return $gif;
-	}
-	return false;
+    $gif = new CGIF();
+    if ($gif->loadFile($lpszFileName, $iIndex)) {
+        return $gif;
+    }
+    return false;
 }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -35,1141 +35,1141 @@ 
 // Added by James Heinrich <info@silisoftware.com> - December 10, 2003
 function gif_loadFileToGDimageResource($gifFilename, $bgColor = -1)
 {
-	if ($gif = gif_loadFile($gifFilename)) {
-
-		if (!phpthumb_functions::FunctionIsDisabled('set_time_limit')) {
-			// shouldn't take nearly this long
-			set_time_limit(120);
-		}
-		// general strategy: convert raw data to PNG then convert PNG data to GD image resource
-		$PNGdata = $gif->getPng($bgColor);
-		if ($img = @imagecreatefromstring($PNGdata)) {
-
-			// excellent - PNG image data successfully converted to GD image
-			return $img;
-
-		} elseif ($img = $gif->getGD_PixelPlotterVersion()) {
-
-			// problem: imagecreatefromstring() didn't like the PNG image data.
-			//   This has been known to happen in PHP v4.0.6
-			// solution: take the raw image data and create a new GD image and plot
-			//   pixel-by-pixel on the GD image. This is extremely slow, but it does
-			//   work and a slow solution is better than no solution, right? :)
-			return $img;
-
-		}
-	}
-	return false;
+    if ($gif = gif_loadFile($gifFilename)) {
+
+        if (!phpthumb_functions::FunctionIsDisabled('set_time_limit')) {
+            // shouldn't take nearly this long
+            set_time_limit(120);
+        }
+        // general strategy: convert raw data to PNG then convert PNG data to GD image resource
+        $PNGdata = $gif->getPng($bgColor);
+        if ($img = @imagecreatefromstring($PNGdata)) {
+
+            // excellent - PNG image data successfully converted to GD image
+            return $img;
+
+        } elseif ($img = $gif->getGD_PixelPlotterVersion()) {
+
+            // problem: imagecreatefromstring() didn't like the PNG image data.
+            //   This has been known to happen in PHP v4.0.6
+            // solution: take the raw image data and create a new GD image and plot
+            //   pixel-by-pixel on the GD image. This is extremely slow, but it does
+            //   work and a slow solution is better than no solution, right? :)
+            return $img;
+
+        }
+    }
+    return false;
 }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 function gif_outputAsBmp($gif, $lpszFileName, $bgColor = -1)
 {
-	if (!isset($gif) || (@get_class($gif) <> 'cgif') || !$gif->loaded() || ($lpszFileName == '')) {
-		return false;
-	}
-
-	$fd = $gif->getBmp($bgColor);
-	if (strlen($fd) <= 0) {
-		return false;
-	}
-
-	if (!($fh = @fopen($lpszFileName, 'wb'))) {
-		return false;
-	}
-	@fwrite($fh, $fd, strlen($fd));
-	@fflush($fh);
-	@fclose($fh);
-	return true;
+    if (!isset($gif) || (@get_class($gif) <> 'cgif') || !$gif->loaded() || ($lpszFileName == '')) {
+        return false;
+    }
+
+    $fd = $gif->getBmp($bgColor);
+    if (strlen($fd) <= 0) {
+        return false;
+    }
+
+    if (!($fh = @fopen($lpszFileName, 'wb'))) {
+        return false;
+    }
+    @fwrite($fh, $fd, strlen($fd));
+    @fflush($fh);
+    @fclose($fh);
+    return true;
 }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 function gif_outputAsPng($gif, $lpszFileName, $bgColor = -1)
 {
-	if (!isSet($gif) || (@get_class($gif) <> 'cgif') || !$gif->loaded() || ($lpszFileName == '')) {
-		return false;
-	}
-
-	$fd = $gif->getPng($bgColor);
-	if (strlen($fd) <= 0) {
-		return false;
-	}
-
-	if (!($fh = @fopen($lpszFileName, 'wb'))) {
-		return false;
-	}
-	@fwrite($fh, $fd, strlen($fd));
-	@fflush($fh);
-	@fclose($fh);
-	return true;
+    if (!isSet($gif) || (@get_class($gif) <> 'cgif') || !$gif->loaded() || ($lpszFileName == '')) {
+        return false;
+    }
+
+    $fd = $gif->getPng($bgColor);
+    if (strlen($fd) <= 0) {
+        return false;
+    }
+
+    if (!($fh = @fopen($lpszFileName, 'wb'))) {
+        return false;
+    }
+    @fwrite($fh, $fd, strlen($fd));
+    @fflush($fh);
+    @fclose($fh);
+    return true;
 }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 function gif_outputAsJpeg($gif, $lpszFileName, $bgColor = -1)
 {
-	// JPEG output that does not require cjpeg added by James Heinrich <info@silisoftware.com> - December 10, 2003
-	if ((strtoupper(substr(PHP_OS, 0, 3)) != 'WIN') && (file_exists('/usr/local/bin/cjpeg') || `which cjpeg`)) {
+    // JPEG output that does not require cjpeg added by James Heinrich <info@silisoftware.com> - December 10, 2003
+    if ((strtoupper(substr(PHP_OS, 0, 3)) != 'WIN') && (file_exists('/usr/local/bin/cjpeg') || `which cjpeg`)) {
 
-		if (gif_outputAsBmp($gif, $lpszFileName.'.bmp', $bgColor)) {
-			exec('cjpeg '.$lpszFileName.'.bmp >'.$lpszFileName.' 2>/dev/null');
-			@unlink($lpszFileName.'.bmp');
+        if (gif_outputAsBmp($gif, $lpszFileName.'.bmp', $bgColor)) {
+            exec('cjpeg '.$lpszFileName.'.bmp >'.$lpszFileName.' 2>/dev/null');
+            @unlink($lpszFileName.'.bmp');
 
-			if (@file_exists($lpszFileName)) {
-				if (@filesize($lpszFileName) > 0) {
-					return true;
-				}
+            if (@file_exists($lpszFileName)) {
+                if (@filesize($lpszFileName) > 0) {
+                    return true;
+                }
 
-				@unlink($lpszFileName);
-			}
-		}
+                @unlink($lpszFileName);
+            }
+        }
 
-	} else {
+    } else {
 
-		// either Windows, or cjpeg not found in path
-		if ($img = @imagecreatefromstring($gif->getPng($bgColor))) {
-			if (@imagejpeg($img, $lpszFileName)) {
-				return true;
-			}
-		}
+        // either Windows, or cjpeg not found in path
+        if ($img = @imagecreatefromstring($gif->getPng($bgColor))) {
+            if (@imagejpeg($img, $lpszFileName)) {
+                return true;
+            }
+        }
 
-	}
+    }
 
-	return false;
+    return false;
 }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 function gif_getSize($gif, &$width, &$height)
 {
-	if (isSet($gif) && (@get_class($gif) == 'cgif') && $gif->loaded()) {
-		$width  = $gif->width();
-		$height = $gif->height();
-	} elseif (@file_exists($gif)) {
-		$myGIF = new CGIF();
-		if (!$myGIF->getSize($gif, $width, $height)) {
-			return false;
-		}
-	} else {
-		return false;
-	}
-
-	return true;
+    if (isSet($gif) && (@get_class($gif) == 'cgif') && $gif->loaded()) {
+        $width  = $gif->width();
+        $height = $gif->height();
+    } elseif (@file_exists($gif)) {
+        $myGIF = new CGIF();
+        if (!$myGIF->getSize($gif, $width, $height)) {
+            return false;
+        }
+    } else {
+        return false;
+    }
+
+    return true;
 }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 class CGIFLZW
 {
-	public $MAX_LZW_BITS;
-	public $Fresh, $CodeSize, $SetCodeSize, $MaxCode, $MaxCodeSize, $FirstCode, $OldCode;
-	public $ClearCode, $EndCode, $Next, $Vals, $Stack, $sp, $Buf, $CurBit, $LastBit, $Done, $LastByte;
-
-	///////////////////////////////////////////////////////////////////////////
-
-	// CONSTRUCTOR
-	public function __construct()
-	{
-		$this->MAX_LZW_BITS = 12;
-		unSet($this->Next);
-		unSet($this->Vals);
-		unSet($this->Stack);
-		unSet($this->Buf);
-
-		$this->Next  = range(0, (1 << $this->MAX_LZW_BITS)       - 1);
-		$this->Vals  = range(0, (1 << $this->MAX_LZW_BITS)       - 1);
-		$this->Stack = range(0, (1 << ($this->MAX_LZW_BITS + 1)) - 1);
-		$this->Buf   = range(0, 279);
-	}
-
-	///////////////////////////////////////////////////////////////////////////
-
-	public function deCompress($data, &$datLen)
-	{
-		$stLen  = strlen($data);
-		$datLen = 0;
-		$ret    = '';
-
-		// INITIALIZATION
-		$this->LZWCommand($data, true);
-
-		while (($iIndex = $this->LZWCommand($data, false)) >= 0) {
-			$ret .= chr($iIndex);
-		}
-
-		$datLen = $stLen - strlen($data);
-
-		if ($iIndex != -2) {
-			return false;
-		}
-
-		return $ret;
-	}
-
-	///////////////////////////////////////////////////////////////////////////
-
-	public function LZWCommand(&$data, $bInit)
-	{
-		if ($bInit) {
-			$this->SetCodeSize = ord($data{0});
-			$data = substr($data, 1);
-
-			$this->CodeSize    = $this->SetCodeSize + 1;
-			$this->ClearCode   = 1 << $this->SetCodeSize;
-			$this->EndCode     = $this->ClearCode + 1;
-			$this->MaxCode     = $this->ClearCode + 2;
-			$this->MaxCodeSize = $this->ClearCode << 1;
-
-			$this->GetCode($data, $bInit);
-
-			$this->Fresh = 1;
-			for ($i = 0; $i < $this->ClearCode; $i++) {
-				$this->Next[$i] = 0;
-				$this->Vals[$i] = $i;
-			}
-
-			for (; $i < (1 << $this->MAX_LZW_BITS); $i++) {
-				$this->Next[$i] = 0;
-				$this->Vals[$i] = 0;
-			}
-
-			$this->sp = 0;
-			return 1;
-		}
-
-		if ($this->Fresh) {
-			$this->Fresh = 0;
-			do {
-				$this->FirstCode = $this->GetCode($data, $bInit);
-				$this->OldCode   = $this->FirstCode;
-			}
-			while ($this->FirstCode == $this->ClearCode);
-
-			return $this->FirstCode;
-		}
-
-		if ($this->sp > 0) {
-			$this->sp--;
-			return $this->Stack[$this->sp];
-		}
-
-		while (($Code = $this->GetCode($data, $bInit)) >= 0) {
-			if ($Code == $this->ClearCode) {
-				for ($i = 0; $i < $this->ClearCode; $i++) {
-					$this->Next[$i] = 0;
-					$this->Vals[$i] = $i;
-				}
-
-				for (; $i < (1 << $this->MAX_LZW_BITS); $i++) {
-					$this->Next[$i] = 0;
-					$this->Vals[$i] = 0;
-				}
-
-				$this->CodeSize    = $this->SetCodeSize + 1;
-				$this->MaxCodeSize = $this->ClearCode << 1;
-				$this->MaxCode     = $this->ClearCode + 2;
-				$this->sp          = 0;
-				$this->FirstCode   = $this->GetCode($data, $bInit);
-				$this->OldCode     = $this->FirstCode;
-
-				return $this->FirstCode;
-			}
-
-			if ($Code == $this->EndCode) {
-				return -2;
-			}
-
-			$InCode = $Code;
-			if ($Code >= $this->MaxCode) {
-				$this->Stack[$this->sp] = $this->FirstCode;
-				$this->sp++;
-				$Code = $this->OldCode;
-			}
-
-			while ($Code >= $this->ClearCode) {
-				$this->Stack[$this->sp] = $this->Vals[$Code];
-				$this->sp++;
-
-				if ($Code == $this->Next[$Code]) // Circular table entry, big GIF Error!
-					return -1;
-
-				$Code = $this->Next[$Code];
-			}
-
-			$this->FirstCode = $this->Vals[$Code];
-			$this->Stack[$this->sp] = $this->FirstCode;
-			$this->sp++;
-
-			if (($Code = $this->MaxCode) < (1 << $this->MAX_LZW_BITS)) {
-				$this->Next[$Code] = $this->OldCode;
-				$this->Vals[$Code] = $this->FirstCode;
-				$this->MaxCode++;
-
-				if (($this->MaxCode >= $this->MaxCodeSize) && ($this->MaxCodeSize < (1 << $this->MAX_LZW_BITS))) {
-					$this->MaxCodeSize *= 2;
-					$this->CodeSize++;
-				}
-			}
-
-			$this->OldCode = $InCode;
-			if ($this->sp > 0) {
-				$this->sp--;
-				return $this->Stack[$this->sp];
-			}
-		}
-
-		return $Code;
-	}
-
-	///////////////////////////////////////////////////////////////////////////
-
-	public function GetCode(&$data, $bInit)
-	{
-		if ($bInit) {
-			$this->CurBit   = 0;
-			$this->LastBit  = 0;
-			$this->Done     = 0;
-			$this->LastByte = 2;
-			return 1;
-		}
-
-		if (($this->CurBit + $this->CodeSize) >= $this->LastBit) {
-			if ($this->Done) {
-				if ($this->CurBit >= $this->LastBit) {
-					// Ran off the end of my bits
-					return 0;
-				}
-				return -1;
-			}
-
-			$this->Buf[0] = $this->Buf[$this->LastByte - 2];
-			$this->Buf[1] = $this->Buf[$this->LastByte - 1];
-
-			$Count = ord($data{0});
-			$data  = substr($data, 1);
-
-			if ($Count) {
-				for ($i = 0; $i < $Count; $i++) {
-					$this->Buf[2 + $i] = ord($data{$i});
-				}
-				$data = substr($data, $Count);
-			} else {
-				$this->Done = 1;
-			}
-
-			$this->LastByte = 2 + $Count;
-			$this->CurBit   = ($this->CurBit - $this->LastBit) + 16;
-			$this->LastBit  = (2 + $Count) << 3;
-		}
-
-		$iRet = 0;
-		for ($i = $this->CurBit, $j = 0; $j < $this->CodeSize; $i++, $j++) {
-			$iRet |= (($this->Buf[ (int) ($i / 8) ] & (1 << ($i % 8))) != 0) << $j;
-		}
-
-		$this->CurBit += $this->CodeSize;
-		return $iRet;
-	}
+    public $MAX_LZW_BITS;
+    public $Fresh, $CodeSize, $SetCodeSize, $MaxCode, $MaxCodeSize, $FirstCode, $OldCode;
+    public $ClearCode, $EndCode, $Next, $Vals, $Stack, $sp, $Buf, $CurBit, $LastBit, $Done, $LastByte;
+
+    ///////////////////////////////////////////////////////////////////////////
+
+    // CONSTRUCTOR
+    public function __construct()
+    {
+        $this->MAX_LZW_BITS = 12;
+        unSet($this->Next);
+        unSet($this->Vals);
+        unSet($this->Stack);
+        unSet($this->Buf);
+
+        $this->Next  = range(0, (1 << $this->MAX_LZW_BITS)       - 1);
+        $this->Vals  = range(0, (1 << $this->MAX_LZW_BITS)       - 1);
+        $this->Stack = range(0, (1 << ($this->MAX_LZW_BITS + 1)) - 1);
+        $this->Buf   = range(0, 279);
+    }
+
+    ///////////////////////////////////////////////////////////////////////////
+
+    public function deCompress($data, &$datLen)
+    {
+        $stLen  = strlen($data);
+        $datLen = 0;
+        $ret    = '';
+
+        // INITIALIZATION
+        $this->LZWCommand($data, true);
+
+        while (($iIndex = $this->LZWCommand($data, false)) >= 0) {
+            $ret .= chr($iIndex);
+        }
+
+        $datLen = $stLen - strlen($data);
+
+        if ($iIndex != -2) {
+            return false;
+        }
+
+        return $ret;
+    }
+
+    ///////////////////////////////////////////////////////////////////////////
+
+    public function LZWCommand(&$data, $bInit)
+    {
+        if ($bInit) {
+            $this->SetCodeSize = ord($data{0});
+            $data = substr($data, 1);
+
+            $this->CodeSize    = $this->SetCodeSize + 1;
+            $this->ClearCode   = 1 << $this->SetCodeSize;
+            $this->EndCode     = $this->ClearCode + 1;
+            $this->MaxCode     = $this->ClearCode + 2;
+            $this->MaxCodeSize = $this->ClearCode << 1;
+
+            $this->GetCode($data, $bInit);
+
+            $this->Fresh = 1;
+            for ($i = 0; $i < $this->ClearCode; $i++) {
+                $this->Next[$i] = 0;
+                $this->Vals[$i] = $i;
+            }
+
+            for (; $i < (1 << $this->MAX_LZW_BITS); $i++) {
+                $this->Next[$i] = 0;
+                $this->Vals[$i] = 0;
+            }
+
+            $this->sp = 0;
+            return 1;
+        }
+
+        if ($this->Fresh) {
+            $this->Fresh = 0;
+            do {
+                $this->FirstCode = $this->GetCode($data, $bInit);
+                $this->OldCode   = $this->FirstCode;
+            }
+            while ($this->FirstCode == $this->ClearCode);
+
+            return $this->FirstCode;
+        }
+
+        if ($this->sp > 0) {
+            $this->sp--;
+            return $this->Stack[$this->sp];
+        }
+
+        while (($Code = $this->GetCode($data, $bInit)) >= 0) {
+            if ($Code == $this->ClearCode) {
+                for ($i = 0; $i < $this->ClearCode; $i++) {
+                    $this->Next[$i] = 0;
+                    $this->Vals[$i] = $i;
+                }
+
+                for (; $i < (1 << $this->MAX_LZW_BITS); $i++) {
+                    $this->Next[$i] = 0;
+                    $this->Vals[$i] = 0;
+                }
+
+                $this->CodeSize    = $this->SetCodeSize + 1;
+                $this->MaxCodeSize = $this->ClearCode << 1;
+                $this->MaxCode     = $this->ClearCode + 2;
+                $this->sp          = 0;
+                $this->FirstCode   = $this->GetCode($data, $bInit);
+                $this->OldCode     = $this->FirstCode;
+
+                return $this->FirstCode;
+            }
+
+            if ($Code == $this->EndCode) {
+                return -2;
+            }
+
+            $InCode = $Code;
+            if ($Code >= $this->MaxCode) {
+                $this->Stack[$this->sp] = $this->FirstCode;
+                $this->sp++;
+                $Code = $this->OldCode;
+            }
+
+            while ($Code >= $this->ClearCode) {
+                $this->Stack[$this->sp] = $this->Vals[$Code];
+                $this->sp++;
+
+                if ($Code == $this->Next[$Code]) // Circular table entry, big GIF Error!
+                    return -1;
+
+                $Code = $this->Next[$Code];
+            }
+
+            $this->FirstCode = $this->Vals[$Code];
+            $this->Stack[$this->sp] = $this->FirstCode;
+            $this->sp++;
+
+            if (($Code = $this->MaxCode) < (1 << $this->MAX_LZW_BITS)) {
+                $this->Next[$Code] = $this->OldCode;
+                $this->Vals[$Code] = $this->FirstCode;
+                $this->MaxCode++;
+
+                if (($this->MaxCode >= $this->MaxCodeSize) && ($this->MaxCodeSize < (1 << $this->MAX_LZW_BITS))) {
+                    $this->MaxCodeSize *= 2;
+                    $this->CodeSize++;
+                }
+            }
+
+            $this->OldCode = $InCode;
+            if ($this->sp > 0) {
+                $this->sp--;
+                return $this->Stack[$this->sp];
+            }
+        }
+
+        return $Code;
+    }
+
+    ///////////////////////////////////////////////////////////////////////////
+
+    public function GetCode(&$data, $bInit)
+    {
+        if ($bInit) {
+            $this->CurBit   = 0;
+            $this->LastBit  = 0;
+            $this->Done     = 0;
+            $this->LastByte = 2;
+            return 1;
+        }
+
+        if (($this->CurBit + $this->CodeSize) >= $this->LastBit) {
+            if ($this->Done) {
+                if ($this->CurBit >= $this->LastBit) {
+                    // Ran off the end of my bits
+                    return 0;
+                }
+                return -1;
+            }
+
+            $this->Buf[0] = $this->Buf[$this->LastByte - 2];
+            $this->Buf[1] = $this->Buf[$this->LastByte - 1];
+
+            $Count = ord($data{0});
+            $data  = substr($data, 1);
+
+            if ($Count) {
+                for ($i = 0; $i < $Count; $i++) {
+                    $this->Buf[2 + $i] = ord($data{$i});
+                }
+                $data = substr($data, $Count);
+            } else {
+                $this->Done = 1;
+            }
+
+            $this->LastByte = 2 + $Count;
+            $this->CurBit   = ($this->CurBit - $this->LastBit) + 16;
+            $this->LastBit  = (2 + $Count) << 3;
+        }
+
+        $iRet = 0;
+        for ($i = $this->CurBit, $j = 0; $j < $this->CodeSize; $i++, $j++) {
+            $iRet |= (($this->Buf[ (int) ($i / 8) ] & (1 << ($i % 8))) != 0) << $j;
+        }
+
+        $this->CurBit += $this->CodeSize;
+        return $iRet;
+    }
 }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 class CGIFCOLORTABLE
 {
-	public $m_nColors;
-	public $m_arColors;
-
-	///////////////////////////////////////////////////////////////////////////
-
-	// CONSTRUCTOR
-	public function __construct()
-	{
-		unSet($this->m_nColors);
-		unSet($this->m_arColors);
-	}
-
-	///////////////////////////////////////////////////////////////////////////
-
-	public function load($lpData, $num)
-	{
-		$this->m_nColors  = 0;
-		$this->m_arColors = array();
-
-		for ($i = 0; $i < $num; $i++) {
-			$rgb = substr($lpData, $i * 3, 3);
-			if (strlen($rgb) < 3) {
-				return false;
-			}
-
-			$this->m_arColors[] = (ord($rgb{2}) << 16) + (ord($rgb{1}) << 8) + ord($rgb{0});
-			$this->m_nColors++;
-		}
-
-		return true;
-	}
-
-	///////////////////////////////////////////////////////////////////////////
-
-	public function toString()
-	{
-		$ret = '';
-
-		for ($i = 0; $i < $this->m_nColors; $i++) {
-			$ret .=
-				chr(($this->m_arColors[$i] & 0x000000FF))       . // R
-				chr(($this->m_arColors[$i] & 0x0000FF00) >>  8) . // G
-				chr(($this->m_arColors[$i] & 0x00FF0000) >> 16);  // B
-		}
-
-		return $ret;
-	}
-
-	///////////////////////////////////////////////////////////////////////////
-
-	public function toRGBQuad()
-	{
-		$ret = '';
-
-		for ($i = 0; $i < $this->m_nColors; $i++) {
-			$ret .=
-				chr(($this->m_arColors[$i] & 0x00FF0000) >> 16) . // B
-				chr(($this->m_arColors[$i] & 0x0000FF00) >>  8) . // G
-				chr(($this->m_arColors[$i] & 0x000000FF))       . // R
-				"\x00";
-		}
-
-		return $ret;
-	}
-
-	///////////////////////////////////////////////////////////////////////////
-
-	public function colorIndex($rgb)
-	{
-		$rgb = (int) $rgb & 0xFFFFFF;
-		$r1  = ($rgb & 0x0000FF);
-		$g1  = ($rgb & 0x00FF00) >>  8;
-		$b1  = ($rgb & 0xFF0000) >> 16;
-		$idx = -1;
-		$dif = 0;
-
-		for ($i = 0; $i < $this->m_nColors; $i++) {
-			$r2 = ($this->m_arColors[$i] & 0x000000FF);
-			$g2 = ($this->m_arColors[$i] & 0x0000FF00) >>  8;
-			$b2 = ($this->m_arColors[$i] & 0x00FF0000) >> 16;
-			$d  = abs($r2 - $r1) + abs($g2 - $g1) + abs($b2 - $b1);
-
-			if (($idx == -1) || ($d < $dif)) {
-				$idx = $i;
-				$dif = $d;
-			}
-		}
-
-		return $idx;
-	}
+    public $m_nColors;
+    public $m_arColors;
+
+    ///////////////////////////////////////////////////////////////////////////
+
+    // CONSTRUCTOR
+    public function __construct()
+    {
+        unSet($this->m_nColors);
+        unSet($this->m_arColors);
+    }
+
+    ///////////////////////////////////////////////////////////////////////////
+
+    public function load($lpData, $num)
+    {
+        $this->m_nColors  = 0;
+        $this->m_arColors = array();
+
+        for ($i = 0; $i < $num; $i++) {
+            $rgb = substr($lpData, $i * 3, 3);
+            if (strlen($rgb) < 3) {
+                return false;
+            }
+
+            $this->m_arColors[] = (ord($rgb{2}) << 16) + (ord($rgb{1}) << 8) + ord($rgb{0});
+            $this->m_nColors++;
+        }
+
+        return true;
+    }
+
+    ///////////////////////////////////////////////////////////////////////////
+
+    public function toString()
+    {
+        $ret = '';
+
+        for ($i = 0; $i < $this->m_nColors; $i++) {
+            $ret .=
+                chr(($this->m_arColors[$i] & 0x000000FF))       . // R
+                chr(($this->m_arColors[$i] & 0x0000FF00) >>  8) . // G
+                chr(($this->m_arColors[$i] & 0x00FF0000) >> 16);  // B
+        }
+
+        return $ret;
+    }
+
+    ///////////////////////////////////////////////////////////////////////////
+
+    public function toRGBQuad()
+    {
+        $ret = '';
+
+        for ($i = 0; $i < $this->m_nColors; $i++) {
+            $ret .=
+                chr(($this->m_arColors[$i] & 0x00FF0000) >> 16) . // B
+                chr(($this->m_arColors[$i] & 0x0000FF00) >>  8) . // G
+                chr(($this->m_arColors[$i] & 0x000000FF))       . // R
+                "\x00";
+        }
+
+        return $ret;
+    }
+
+    ///////////////////////////////////////////////////////////////////////////
+
+    public function colorIndex($rgb)
+    {
+        $rgb = (int) $rgb & 0xFFFFFF;
+        $r1  = ($rgb & 0x0000FF);
+        $g1  = ($rgb & 0x00FF00) >>  8;
+        $b1  = ($rgb & 0xFF0000) >> 16;
+        $idx = -1;
+        $dif = 0;
+
+        for ($i = 0; $i < $this->m_nColors; $i++) {
+            $r2 = ($this->m_arColors[$i] & 0x000000FF);
+            $g2 = ($this->m_arColors[$i] & 0x0000FF00) >>  8;
+            $b2 = ($this->m_arColors[$i] & 0x00FF0000) >> 16;
+            $d  = abs($r2 - $r1) + abs($g2 - $g1) + abs($b2 - $b1);
+
+            if (($idx == -1) || ($d < $dif)) {
+                $idx = $i;
+                $dif = $d;
+            }
+        }
+
+        return $idx;
+    }
 }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 class CGIFFILEHEADER
 {
-	public $m_lpVer;
-	public $m_nWidth;
-	public $m_nHeight;
-	public $m_bGlobalClr;
-	public $m_nColorRes;
-	public $m_bSorted;
-	public $m_nTableSize;
-	public $m_nBgColor;
-	public $m_nPixelRatio;
-	public $m_colorTable;
-
-	///////////////////////////////////////////////////////////////////////////
-
-	// CONSTRUCTOR
-	public function __construct()
-	{
-		unSet($this->m_lpVer);
-		unSet($this->m_nWidth);
-		unSet($this->m_nHeight);
-		unSet($this->m_bGlobalClr);
-		unSet($this->m_nColorRes);
-		unSet($this->m_bSorted);
-		unSet($this->m_nTableSize);
-		unSet($this->m_nBgColor);
-		unSet($this->m_nPixelRatio);
-		unSet($this->m_colorTable);
-	}
-
-	///////////////////////////////////////////////////////////////////////////
-
-	public function load($lpData, &$hdrLen)
-	{
-		$hdrLen = 0;
-
-		$this->m_lpVer = substr($lpData, 0, 6);
-		if (($this->m_lpVer <> 'GIF87a') && ($this->m_lpVer <> 'GIF89a')) {
-			return false;
-		}
-
-		$this->m_nWidth  = $this->w2i(substr($lpData, 6, 2));
-		$this->m_nHeight = $this->w2i(substr($lpData, 8, 2));
-		if (!$this->m_nWidth || !$this->m_nHeight) {
-			return false;
-		}
-
-		$b = ord($lpData[ 10 ]);
-		$this->m_bGlobalClr  = ($b & 0x80) ? true : false;
-		$this->m_nColorRes   = ($b & 0x70) >> 4;
-		$this->m_bSorted     = ($b & 0x08) ? true : false;
-		$this->m_nTableSize  = 2 << ($b & 0x07);
-		$this->m_nBgColor    = ord($lpData[ 11 ]);
-		$this->m_nPixelRatio = ord($lpData[ 12 ]);
-		$hdrLen = 13;
-
-		if ($this->m_bGlobalClr) {
-			$this->m_colorTable = new CGIFCOLORTABLE();
-			if (!$this->m_colorTable->load(substr($lpData, $hdrLen), $this->m_nTableSize)) {
-				return false;
-			}
-			$hdrLen += 3 * $this->m_nTableSize;
-		}
-
-		return true;
-	}
-
-	///////////////////////////////////////////////////////////////////////////
-
-	public function w2i($str)
-	{
-		return ord($str[ 0 ]) + (ord($str[ 1 ]) << 8);
-	}
+    public $m_lpVer;
+    public $m_nWidth;
+    public $m_nHeight;
+    public $m_bGlobalClr;
+    public $m_nColorRes;
+    public $m_bSorted;
+    public $m_nTableSize;
+    public $m_nBgColor;
+    public $m_nPixelRatio;
+    public $m_colorTable;
+
+    ///////////////////////////////////////////////////////////////////////////
+
+    // CONSTRUCTOR
+    public function __construct()
+    {
+        unSet($this->m_lpVer);
+        unSet($this->m_nWidth);
+        unSet($this->m_nHeight);
+        unSet($this->m_bGlobalClr);
+        unSet($this->m_nColorRes);
+        unSet($this->m_bSorted);
+        unSet($this->m_nTableSize);
+        unSet($this->m_nBgColor);
+        unSet($this->m_nPixelRatio);
+        unSet($this->m_colorTable);
+    }
+
+    ///////////////////////////////////////////////////////////////////////////
+
+    public function load($lpData, &$hdrLen)
+    {
+        $hdrLen = 0;
+
+        $this->m_lpVer = substr($lpData, 0, 6);
+        if (($this->m_lpVer <> 'GIF87a') && ($this->m_lpVer <> 'GIF89a')) {
+            return false;
+        }
+
+        $this->m_nWidth  = $this->w2i(substr($lpData, 6, 2));
+        $this->m_nHeight = $this->w2i(substr($lpData, 8, 2));
+        if (!$this->m_nWidth || !$this->m_nHeight) {
+            return false;
+        }
+
+        $b = ord($lpData[ 10 ]);
+        $this->m_bGlobalClr  = ($b & 0x80) ? true : false;
+        $this->m_nColorRes   = ($b & 0x70) >> 4;
+        $this->m_bSorted     = ($b & 0x08) ? true : false;
+        $this->m_nTableSize  = 2 << ($b & 0x07);
+        $this->m_nBgColor    = ord($lpData[ 11 ]);
+        $this->m_nPixelRatio = ord($lpData[ 12 ]);
+        $hdrLen = 13;
+
+        if ($this->m_bGlobalClr) {
+            $this->m_colorTable = new CGIFCOLORTABLE();
+            if (!$this->m_colorTable->load(substr($lpData, $hdrLen), $this->m_nTableSize)) {
+                return false;
+            }
+            $hdrLen += 3 * $this->m_nTableSize;
+        }
+
+        return true;
+    }
+
+    ///////////////////////////////////////////////////////////////////////////
+
+    public function w2i($str)
+    {
+        return ord($str[ 0 ]) + (ord($str[ 1 ]) << 8);
+    }
 }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 class CGIFIMAGEHEADER
 {
-	public $m_nLeft;
-	public $m_nTop;
-	public $m_nWidth;
-	public $m_nHeight;
-	public $m_bLocalClr;
-	public $m_bInterlace;
-	public $m_bSorted;
-	public $m_nTableSize;
-	public $m_colorTable;
-
-	///////////////////////////////////////////////////////////////////////////
-
-	// CONSTRUCTOR
-	public function __construct()
-	{
-		unSet($this->m_nLeft);
-		unSet($this->m_nTop);
-		unSet($this->m_nWidth);
-		unSet($this->m_nHeight);
-		unSet($this->m_bLocalClr);
-		unSet($this->m_bInterlace);
-		unSet($this->m_bSorted);
-		unSet($this->m_nTableSize);
-		unSet($this->m_colorTable);
-	}
-
-	///////////////////////////////////////////////////////////////////////////
-
-	public function load($lpData, &$hdrLen)
-	{
-		$hdrLen = 0;
-
-		$this->m_nLeft   = $this->w2i(substr($lpData, 0, 2));
-		$this->m_nTop    = $this->w2i(substr($lpData, 2, 2));
-		$this->m_nWidth  = $this->w2i(substr($lpData, 4, 2));
-		$this->m_nHeight = $this->w2i(substr($lpData, 6, 2));
-
-		if (!$this->m_nWidth || !$this->m_nHeight) {
-			return false;
-		}
-
-		$b = ord($lpData{8});
-		$this->m_bLocalClr  = ($b & 0x80) ? true : false;
-		$this->m_bInterlace = ($b & 0x40) ? true : false;
-		$this->m_bSorted    = ($b & 0x20) ? true : false;
-		$this->m_nTableSize = 2 << ($b & 0x07);
-		$hdrLen = 9;
-
-		if ($this->m_bLocalClr) {
-			$this->m_colorTable = new CGIFCOLORTABLE();
-			if (!$this->m_colorTable->load(substr($lpData, $hdrLen), $this->m_nTableSize)) {
-				return false;
-			}
-			$hdrLen += 3 * $this->m_nTableSize;
-		}
-
-		return true;
-	}
-
-	///////////////////////////////////////////////////////////////////////////
-
-	public function w2i($str)
-	{
-		return ord($str[ 0 ]) + (ord($str[ 1 ]) << 8);
-	}
+    public $m_nLeft;
+    public $m_nTop;
+    public $m_nWidth;
+    public $m_nHeight;
+    public $m_bLocalClr;
+    public $m_bInterlace;
+    public $m_bSorted;
+    public $m_nTableSize;
+    public $m_colorTable;
+
+    ///////////////////////////////////////////////////////////////////////////
+
+    // CONSTRUCTOR
+    public function __construct()
+    {
+        unSet($this->m_nLeft);
+        unSet($this->m_nTop);
+        unSet($this->m_nWidth);
+        unSet($this->m_nHeight);
+        unSet($this->m_bLocalClr);
+        unSet($this->m_bInterlace);
+        unSet($this->m_bSorted);
+        unSet($this->m_nTableSize);
+        unSet($this->m_colorTable);
+    }
+
+    ///////////////////////////////////////////////////////////////////////////
+
+    public function load($lpData, &$hdrLen)
+    {
+        $hdrLen = 0;
+
+        $this->m_nLeft   = $this->w2i(substr($lpData, 0, 2));
+        $this->m_nTop    = $this->w2i(substr($lpData, 2, 2));
+        $this->m_nWidth  = $this->w2i(substr($lpData, 4, 2));
+        $this->m_nHeight = $this->w2i(substr($lpData, 6, 2));
+
+        if (!$this->m_nWidth || !$this->m_nHeight) {
+            return false;
+        }
+
+        $b = ord($lpData{8});
+        $this->m_bLocalClr  = ($b & 0x80) ? true : false;
+        $this->m_bInterlace = ($b & 0x40) ? true : false;
+        $this->m_bSorted    = ($b & 0x20) ? true : false;
+        $this->m_nTableSize = 2 << ($b & 0x07);
+        $hdrLen = 9;
+
+        if ($this->m_bLocalClr) {
+            $this->m_colorTable = new CGIFCOLORTABLE();
+            if (!$this->m_colorTable->load(substr($lpData, $hdrLen), $this->m_nTableSize)) {
+                return false;
+            }
+            $hdrLen += 3 * $this->m_nTableSize;
+        }
+
+        return true;
+    }
+
+    ///////////////////////////////////////////////////////////////////////////
+
+    public function w2i($str)
+    {
+        return ord($str[ 0 ]) + (ord($str[ 1 ]) << 8);
+    }
 }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 class CGIFIMAGE
 {
-	public $m_disp;
-	public $m_bUser;
-	public $m_bTrans;
-	public $m_nDelay;
-	public $m_nTrans;
-	public $m_lpComm;
-	public $m_gih;
-	public $m_data;
-	public $m_lzw;
-
-	///////////////////////////////////////////////////////////////////////////
-
-	public function __construct()
-	{
-		unSet($this->m_disp);
-		unSet($this->m_bUser);
-		unSet($this->m_bTrans);
-		unSet($this->m_nDelay);
-		unSet($this->m_nTrans);
-		unSet($this->m_lpComm);
-		unSet($this->m_data);
-		$this->m_gih = new CGIFIMAGEHEADER();
-		$this->m_lzw = new CGIFLZW();
-	}
-
-	///////////////////////////////////////////////////////////////////////////
-
-	public function load($data, &$datLen)
-	{
-		$datLen = 0;
-
-		while (true) {
-			$b = ord($data{0});
-			$data = substr($data, 1);
-			$datLen++;
-
-			switch($b) {
-			case 0x21: // Extension
-				if (!$this->skipExt($data, $len = 0)) {
-					return false;
-				}
-				$datLen += $len;
-				break;
-
-			case 0x2C: // Image
-				// LOAD HEADER & COLOR TABLE
-				if (!$this->m_gih->load($data, $len = 0)) {
-					return false;
-				}
-				$data = substr($data, $len);
-				$datLen += $len;
-
-				// ALLOC BUFFER
-				if (!($this->m_data = $this->m_lzw->deCompress($data, $len = 0))) {
-					return false;
-				}
-				$data = substr($data, $len);
-				$datLen += $len;
-
-				if ($this->m_gih->m_bInterlace) {
-					$this->deInterlace();
-				}
-				return true;
-
-			case 0x3B: // EOF
-			default:
-				return false;
-			}
-		}
-		return false;
-	}
-
-	///////////////////////////////////////////////////////////////////////////
-
-	public function skipExt(&$data, &$extLen)
-	{
-		$extLen = 0;
-
-		$b = ord($data{0});
-		$data = substr($data, 1);
-		$extLen++;
-
-		switch($b) {
-		case 0xF9: // Graphic Control
-			$b = ord($data{1});
-			$this->m_disp   = ($b & 0x1C) >> 2;
-			$this->m_bUser  = ($b & 0x02) ? true : false;
-			$this->m_bTrans = ($b & 0x01) ? true : false;
-			$this->m_nDelay = $this->w2i(substr($data, 2, 2));
-			$this->m_nTrans = ord($data{4});
-			break;
-
-		case 0xFE: // Comment
-			$this->m_lpComm = substr($data, 1, ord($data{0}));
-			break;
-
-		case 0x01: // Plain text
-			break;
-
-		case 0xFF: // Application
-			break;
-		}
-
-		// SKIP DEFAULT AS DEFS MAY CHANGE
-		$b = ord($data{0});
-		$data = substr($data, 1);
-		$extLen++;
-		while ($b > 0) {
-			$data = substr($data, $b);
-			$extLen += $b;
-			$b    = ord($data{0});
-			$data = substr($data, 1);
-			$extLen++;
-		}
-		return true;
-	}
-
-	///////////////////////////////////////////////////////////////////////////
-
-	public function w2i($str)
-	{
-		return ord($str[ 0 ]) + (ord($str[ 1 ]) << 8);
-	}
-
-	///////////////////////////////////////////////////////////////////////////
-
-	public function deInterlace()
-	{
-		$data = $this->m_data;
-		$s = 0;
-		$y = 0;
-
-		for ($i = 0; $i < 4; $i++) {
-			switch($i) {
-			case 0:
-				$s = 8;
-				$y = 0;
-				break;
-
-			case 1:
-				$s = 8;
-				$y = 4;
-				break;
-
-			case 2:
-				$s = 4;
-				$y = 2;
-				break;
-
-			case 3:
-				$s = 2;
-				$y = 1;
-				break;
-			}
-
-			for (; $y < $this->m_gih->m_nHeight; $y += $s) {
-				$lne = substr($this->m_data, 0, $this->m_gih->m_nWidth);
-				$this->m_data = substr($this->m_data, $this->m_gih->m_nWidth);
-
-				$data =
-					substr($data, 0, $y * $this->m_gih->m_nWidth) .
-					$lne .
-					substr($data, ($y + 1) * $this->m_gih->m_nWidth);
-			}
-		}
-
-		$this->m_data = $data;
-	}
+    public $m_disp;
+    public $m_bUser;
+    public $m_bTrans;
+    public $m_nDelay;
+    public $m_nTrans;
+    public $m_lpComm;
+    public $m_gih;
+    public $m_data;
+    public $m_lzw;
+
+    ///////////////////////////////////////////////////////////////////////////
+
+    public function __construct()
+    {
+        unSet($this->m_disp);
+        unSet($this->m_bUser);
+        unSet($this->m_bTrans);
+        unSet($this->m_nDelay);
+        unSet($this->m_nTrans);
+        unSet($this->m_lpComm);
+        unSet($this->m_data);
+        $this->m_gih = new CGIFIMAGEHEADER();
+        $this->m_lzw = new CGIFLZW();
+    }
+
+    ///////////////////////////////////////////////////////////////////////////
+
+    public function load($data, &$datLen)
+    {
+        $datLen = 0;
+
+        while (true) {
+            $b = ord($data{0});
+            $data = substr($data, 1);
+            $datLen++;
+
+            switch($b) {
+            case 0x21: // Extension
+                if (!$this->skipExt($data, $len = 0)) {
+                    return false;
+                }
+                $datLen += $len;
+                break;
+
+            case 0x2C: // Image
+                // LOAD HEADER & COLOR TABLE
+                if (!$this->m_gih->load($data, $len = 0)) {
+                    return false;
+                }
+                $data = substr($data, $len);
+                $datLen += $len;
+
+                // ALLOC BUFFER
+                if (!($this->m_data = $this->m_lzw->deCompress($data, $len = 0))) {
+                    return false;
+                }
+                $data = substr($data, $len);
+                $datLen += $len;
+
+                if ($this->m_gih->m_bInterlace) {
+                    $this->deInterlace();
+                }
+                return true;
+
+            case 0x3B: // EOF
+            default:
+                return false;
+            }
+        }
+        return false;
+    }
+
+    ///////////////////////////////////////////////////////////////////////////
+
+    public function skipExt(&$data, &$extLen)
+    {
+        $extLen = 0;
+
+        $b = ord($data{0});
+        $data = substr($data, 1);
+        $extLen++;
+
+        switch($b) {
+        case 0xF9: // Graphic Control
+            $b = ord($data{1});
+            $this->m_disp   = ($b & 0x1C) >> 2;
+            $this->m_bUser  = ($b & 0x02) ? true : false;
+            $this->m_bTrans = ($b & 0x01) ? true : false;
+            $this->m_nDelay = $this->w2i(substr($data, 2, 2));
+            $this->m_nTrans = ord($data{4});
+            break;
+
+        case 0xFE: // Comment
+            $this->m_lpComm = substr($data, 1, ord($data{0}));
+            break;
+
+        case 0x01: // Plain text
+            break;
+
+        case 0xFF: // Application
+            break;
+        }
+
+        // SKIP DEFAULT AS DEFS MAY CHANGE
+        $b = ord($data{0});
+        $data = substr($data, 1);
+        $extLen++;
+        while ($b > 0) {
+            $data = substr($data, $b);
+            $extLen += $b;
+            $b    = ord($data{0});
+            $data = substr($data, 1);
+            $extLen++;
+        }
+        return true;
+    }
+
+    ///////////////////////////////////////////////////////////////////////////
+
+    public function w2i($str)
+    {
+        return ord($str[ 0 ]) + (ord($str[ 1 ]) << 8);
+    }
+
+    ///////////////////////////////////////////////////////////////////////////
+
+    public function deInterlace()
+    {
+        $data = $this->m_data;
+        $s = 0;
+        $y = 0;
+
+        for ($i = 0; $i < 4; $i++) {
+            switch($i) {
+            case 0:
+                $s = 8;
+                $y = 0;
+                break;
+
+            case 1:
+                $s = 8;
+                $y = 4;
+                break;
+
+            case 2:
+                $s = 4;
+                $y = 2;
+                break;
+
+            case 3:
+                $s = 2;
+                $y = 1;
+                break;
+            }
+
+            for (; $y < $this->m_gih->m_nHeight; $y += $s) {
+                $lne = substr($this->m_data, 0, $this->m_gih->m_nWidth);
+                $this->m_data = substr($this->m_data, $this->m_gih->m_nWidth);
+
+                $data =
+                    substr($data, 0, $y * $this->m_gih->m_nWidth) .
+                    $lne .
+                    substr($data, ($y + 1) * $this->m_gih->m_nWidth);
+            }
+        }
+
+        $this->m_data = $data;
+    }
 }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 class CGIF
 {
-	public $m_gfh;
-	public $m_lpData;
-	public $m_img;
-	public $m_bLoaded;
-
-	///////////////////////////////////////////////////////////////////////////
-
-	// CONSTRUCTOR
-	public function __construct()
-	{
-		$this->m_gfh     = new CGIFFILEHEADER();
-		$this->m_img     = new CGIFIMAGE();
-		$this->m_lpData  = '';
-		$this->m_bLoaded = false;
-	}
-
-	///////////////////////////////////////////////////////////////////////////
-
-	public function loadFile($lpszFileName, $iIndex)
-	{
-		if ($iIndex < 0) {
-			return false;
-		}
-
-		// READ FILE
-		if (!($fh = @fopen($lpszFileName, 'rb'))) {
-			return false;
-		}
-		$this->m_lpData = @fread($fh, @filesize($lpszFileName));
-		fclose($fh);
-
-		// GET FILE HEADER
-		if (!$this->m_gfh->load($this->m_lpData, $len = 0)) {
-			return false;
-		}
-		$this->m_lpData = substr($this->m_lpData, $len);
-
-		do {
-			if (!$this->m_img->load($this->m_lpData, $imgLen = 0)) {
-				return false;
-			}
-			$this->m_lpData = substr($this->m_lpData, $imgLen);
-		}
-		while ($iIndex-- > 0);
-
-		$this->m_bLoaded = true;
-		return true;
-	}
-
-	///////////////////////////////////////////////////////////////////////////
-
-	public function getSize($lpszFileName, &$width, &$height)
-	{
-		if (!($fh = @fopen($lpszFileName, 'rb'))) {
-			return false;
-		}
-		$data = @fread($fh, @filesize($lpszFileName));
-		@fclose($fh);
-
-		$gfh = new CGIFFILEHEADER();
-		if (!$gfh->load($data, $len = 0)) {
-			return false;
-		}
-
-		$width  = $gfh->m_nWidth;
-		$height = $gfh->m_nHeight;
-		return true;
-	}
-
-	///////////////////////////////////////////////////////////////////////////
-
-	public function getBmp($bgColor)
-	{
-		$out = '';
-
-		if (!$this->m_bLoaded) {
-			return false;
-		}
-
-		// PREPARE COLOR TABLE (RGBQUADs)
-		if ($this->m_img->m_gih->m_bLocalClr) {
-			$nColors = $this->m_img->m_gih->m_nTableSize;
-			$rgbq    = $this->m_img->m_gih->m_colorTable->toRGBQuad();
-			if ($bgColor != -1) {
-				$bgColor = $this->m_img->m_gih->m_colorTable->colorIndex($bgColor);
-			}
-		} elseif ($this->m_gfh->m_bGlobalClr) {
-			$nColors = $this->m_gfh->m_nTableSize;
-			$rgbq    = $this->m_gfh->m_colorTable->toRGBQuad();
-			if ($bgColor != -1) {
-				$bgColor = $this->m_gfh->m_colorTable->colorIndex($bgColor);
-			}
-		} else {
-			$nColors =  0;
-			$rgbq    = '';
-			$bgColor = -1;
-		}
-
-		// PREPARE BITMAP BITS
-		$data = $this->m_img->m_data;
-		$nPxl = ($this->m_gfh->m_nHeight - 1) * $this->m_gfh->m_nWidth;
-		$bmp  = '';
-		$nPad = ($this->m_gfh->m_nWidth % 4) ? 4 - ($this->m_gfh->m_nWidth % 4) : 0;
-		for ($y = 0; $y < $this->m_gfh->m_nHeight; $y++) {
-			for ($x = 0; $x < $this->m_gfh->m_nWidth; $x++, $nPxl++) {
-				if (
-					($x >= $this->m_img->m_gih->m_nLeft) &&
-					($y >= $this->m_img->m_gih->m_nTop) &&
-					($x <  ($this->m_img->m_gih->m_nLeft + $this->m_img->m_gih->m_nWidth)) &&
-					($y <  ($this->m_img->m_gih->m_nTop  + $this->m_img->m_gih->m_nHeight))) {
-					// PART OF IMAGE
-					if (@$this->m_img->m_bTrans && (ord($data{$nPxl}) == $this->m_img->m_nTrans)) {
-						// TRANSPARENT -> BACKGROUND
-						if ($bgColor == -1) {
-							$bmp .= chr($this->m_gfh->m_nBgColor);
-						} else {
-							$bmp .= chr($bgColor);
-						}
-					} else {
-						$bmp .= $data{$nPxl};
-					}
-				} else {
-					// BACKGROUND
-					if ($bgColor == -1) {
-						$bmp .= chr($this->m_gfh->m_nBgColor);
-					} else {
-						$bmp .= chr($bgColor);
-					}
-				}
-			}
-			$nPxl -= $this->m_gfh->m_nWidth << 1;
-
-			// ADD PADDING
-			for ($x = 0; $x < $nPad; $x++) {
-				$bmp .= "\x00";
-			}
-		}
-
-		// BITMAPFILEHEADER
-		$out .= 'BM';
-		$out .= $this->dword(14 + 40 + ($nColors << 2) + strlen($bmp));
-		$out .= "\x00\x00";
-		$out .= "\x00\x00";
-		$out .= $this->dword(14 + 40 + ($nColors << 2));
-
-		// BITMAPINFOHEADER
-		$out .= $this->dword(40);
-		$out .= $this->dword($this->m_gfh->m_nWidth);
-		$out .= $this->dword($this->m_gfh->m_nHeight);
-		$out .= "\x01\x00";
-		$out .= "\x08\x00";
-		$out .= "\x00\x00\x00\x00";
-		$out .= "\x00\x00\x00\x00";
-		$out .= "\x12\x0B\x00\x00";
-		$out .= "\x12\x0B\x00\x00";
-		$out .= $this->dword($nColors % 256);
-		$out .= "\x00\x00\x00\x00";
-
-		// COLOR TABLE
-		if ($nColors > 0) {
-			$out .= $rgbq;
-		}
-
-		// DATA
-		$out .= $bmp;
-
-		return $out;
-	}
-
-	///////////////////////////////////////////////////////////////////////////
-
-	public function getPng($bgColor)
-	{
-		$out = '';
-
-		if (!$this->m_bLoaded) {
-			return false;
-		}
-
-		// PREPARE COLOR TABLE (RGBQUADs)
-		if ($this->m_img->m_gih->m_bLocalClr) {
-			$nColors = $this->m_img->m_gih->m_nTableSize;
-			$pal     = $this->m_img->m_gih->m_colorTable->toString();
-			if ($bgColor != -1) {
-				$bgColor = $this->m_img->m_gih->m_colorTable->colorIndex($bgColor);
-			}
-		} elseif ($this->m_gfh->m_bGlobalClr) {
-			$nColors = $this->m_gfh->m_nTableSize;
-			$pal     = $this->m_gfh->m_colorTable->toString();
-			if ($bgColor != -1) {
-				$bgColor = $this->m_gfh->m_colorTable->colorIndex($bgColor);
-			}
-		} else {
-			$nColors =  0;
-			$pal     = '';
-			$bgColor = -1;
-		}
-
-		// PREPARE BITMAP BITS
-		$data = $this->m_img->m_data;
-		$nPxl = 0;
-		$bmp  = '';
-		for ($y = 0; $y < $this->m_gfh->m_nHeight; $y++) {
-			$bmp .= "\x00";
-			for ($x = 0; $x < $this->m_gfh->m_nWidth; $x++, $nPxl++) {
-				if (
-					($x >= $this->m_img->m_gih->m_nLeft) &&
-					($y >= $this->m_img->m_gih->m_nTop) &&
-					($x <  ($this->m_img->m_gih->m_nLeft + $this->m_img->m_gih->m_nWidth)) &&
-					($y <  ($this->m_img->m_gih->m_nTop  + $this->m_img->m_gih->m_nHeight))) {
-					// PART OF IMAGE
-					$bmp .= $data{$nPxl};
-				} else {
-					// BACKGROUND
-					if ($bgColor == -1) {
-						$bmp .= chr($this->m_gfh->m_nBgColor);
-					} else {
-						$bmp .= chr($bgColor);
-					}
-				}
-			}
-		}
-		$bmp = gzcompress($bmp, 9);
-
-		///////////////////////////////////////////////////////////////////////
-		// SIGNATURE
-		$out .= "\x89\x50\x4E\x47\x0D\x0A\x1A\x0A";
-		///////////////////////////////////////////////////////////////////////
-		// HEADER
-		$out .= "\x00\x00\x00\x0D";
-		$tmp  = 'IHDR';
-		$tmp .= $this->ndword($this->m_gfh->m_nWidth);
-		$tmp .= $this->ndword($this->m_gfh->m_nHeight);
-		$tmp .= "\x08\x03\x00\x00\x00";
-		$out .= $tmp;
-		$out .= $this->ndword(crc32($tmp));
-		///////////////////////////////////////////////////////////////////////
-		// PALETTE
-		if ($nColors > 0) {
-			$out .= $this->ndword($nColors * 3);
-			$tmp  = 'PLTE';
-			$tmp .= $pal;
-			$out .= $tmp;
-			$out .= $this->ndword(crc32($tmp));
-		}
-		///////////////////////////////////////////////////////////////////////
-		// TRANSPARENCY
-		if (@$this->m_img->m_bTrans && ($nColors > 0)) {
-			$out .= $this->ndword($nColors);
-			$tmp  = 'tRNS';
-			for ($i = 0; $i < $nColors; $i++) {
-				$tmp .= ($i == $this->m_img->m_nTrans) ? "\x00" : "\xFF";
-			}
-			$out .= $tmp;
-			$out .= $this->ndword(crc32($tmp));
-		}
-		///////////////////////////////////////////////////////////////////////
-		// DATA BITS
-		$out .= $this->ndword(strlen($bmp));
-		$tmp  = 'IDAT';
-		$tmp .= $bmp;
-		$out .= $tmp;
-		$out .= $this->ndword(crc32($tmp));
-		///////////////////////////////////////////////////////////////////////
-		// END OF FILE
-		$out .= "\x00\x00\x00\x00IEND\xAE\x42\x60\x82";
-
-		return $out;
-	}
-
-	///////////////////////////////////////////////////////////////////////////
-
-	// Added by James Heinrich <info@silisoftware.com> - January 5, 2003
-
-	// Takes raw image data and plots it pixel-by-pixel on a new GD image and returns that
-	// It's extremely slow, but the only solution when imagecreatefromstring() fails
-	public function getGD_PixelPlotterVersion()
-	{
-		if (!$this->m_bLoaded) {
-			return false;
-		}
-
-		// PREPARE COLOR TABLE (RGBQUADs)
-		if ($this->m_img->m_gih->m_bLocalClr) {
-			$pal = $this->m_img->m_gih->m_colorTable->toString();
-		} elseif ($this->m_gfh->m_bGlobalClr) {
-			$pal = $this->m_gfh->m_colorTable->toString();
-		} else {
-			die('No color table available in getGD_PixelPlotterVersion()');
-		}
-
-		$PlottingIMG = imagecreate($this->m_gfh->m_nWidth, $this->m_gfh->m_nHeight);
-		$NumColorsInPal = floor(strlen($pal) / 3);
-		$ThisImageColor = array();
-		for ($i = 0; $i < $NumColorsInPal; $i++) {
-			$ThisImageColor[$i] = imagecolorallocate(
-									$PlottingIMG,
-									ord($pal{(($i * 3) + 0)}),
-									ord($pal{(($i * 3) + 1)}),
-									ord($pal{(($i * 3) + 2)}));
-		}
-
-		// PREPARE BITMAP BITS
-		$data = $this->m_img->m_data;
-		$nPxl = ($this->m_gfh->m_nHeight - 1) * $this->m_gfh->m_nWidth;
-		for ($y = 0; $y < $this->m_gfh->m_nHeight; $y++) {
-			if (!phpthumb_functions::FunctionIsDisabled('set_time_limit')) {
-				set_time_limit(30);
-			}
-			for ($x = 0; $x < $this->m_gfh->m_nWidth; $x++, $nPxl++) {
-				if (
-					($x >= $this->m_img->m_gih->m_nLeft) &&
-					($y >= $this->m_img->m_gih->m_nTop) &&
-					($x <  ($this->m_img->m_gih->m_nLeft + $this->m_img->m_gih->m_nWidth)) &&
-					($y <  ($this->m_img->m_gih->m_nTop  + $this->m_img->m_gih->m_nHeight))) {
-					// PART OF IMAGE
-					if (@$this->m_img->m_bTrans && (ord($data{$nPxl}) == $this->m_img->m_nTrans)) {
-						imagesetpixel($PlottingIMG, $x, $this->m_gfh->m_nHeight - $y - 1, $ThisImageColor[$this->m_gfh->m_nBgColor]);
-					} else {
-						imagesetpixel($PlottingIMG, $x, $this->m_gfh->m_nHeight - $y - 1, $ThisImageColor[ord($data{$nPxl})]);
-					}
-				} else {
-					// BACKGROUND
-					imagesetpixel($PlottingIMG, $x, $this->m_gfh->m_nHeight - $y - 1, $ThisImageColor[$this->m_gfh->m_nBgColor]);
-				}
-			}
-			$nPxl -= $this->m_gfh->m_nWidth << 1;
-
-		}
-
-		return $PlottingIMG;
-	}
-
-	///////////////////////////////////////////////////////////////////////////
-
-	public function dword($val)
-	{
-		$val = (int) $val;
-		return chr($val & 0xFF).chr(($val & 0xFF00) >> 8).chr(($val & 0xFF0000) >> 16).chr(($val & 0xFF000000) >> 24);
-	}
-
-	///////////////////////////////////////////////////////////////////////////
-
-	public function ndword($val)
-	{
-		$val = (int) $val;
-		return chr(($val & 0xFF000000) >> 24).chr(($val & 0xFF0000) >> 16).chr(($val & 0xFF00) >> 8).chr($val & 0xFF);
-	}
-
-	///////////////////////////////////////////////////////////////////////////
-
-	public function width()
-	{
-		return $this->m_gfh->m_nWidth;
-	}
-
-	///////////////////////////////////////////////////////////////////////////
-
-	public function height()
-	{
-		return $this->m_gfh->m_nHeight;
-	}
-
-	///////////////////////////////////////////////////////////////////////////
-
-	public function comment()
-	{
-		return $this->m_img->m_lpComm;
-	}
-
-	///////////////////////////////////////////////////////////////////////////
-
-	public function loaded()
-	{
-		return $this->m_bLoaded;
-	}
+    public $m_gfh;
+    public $m_lpData;
+    public $m_img;
+    public $m_bLoaded;
+
+    ///////////////////////////////////////////////////////////////////////////
+
+    // CONSTRUCTOR
+    public function __construct()
+    {
+        $this->m_gfh     = new CGIFFILEHEADER();
+        $this->m_img     = new CGIFIMAGE();
+        $this->m_lpData  = '';
+        $this->m_bLoaded = false;
+    }
+
+    ///////////////////////////////////////////////////////////////////////////
+
+    public function loadFile($lpszFileName, $iIndex)
+    {
+        if ($iIndex < 0) {
+            return false;
+        }
+
+        // READ FILE
+        if (!($fh = @fopen($lpszFileName, 'rb'))) {
+            return false;
+        }
+        $this->m_lpData = @fread($fh, @filesize($lpszFileName));
+        fclose($fh);
+
+        // GET FILE HEADER
+        if (!$this->m_gfh->load($this->m_lpData, $len = 0)) {
+            return false;
+        }
+        $this->m_lpData = substr($this->m_lpData, $len);
+
+        do {
+            if (!$this->m_img->load($this->m_lpData, $imgLen = 0)) {
+                return false;
+            }
+            $this->m_lpData = substr($this->m_lpData, $imgLen);
+        }
+        while ($iIndex-- > 0);
+
+        $this->m_bLoaded = true;
+        return true;
+    }
+
+    ///////////////////////////////////////////////////////////////////////////
+
+    public function getSize($lpszFileName, &$width, &$height)
+    {
+        if (!($fh = @fopen($lpszFileName, 'rb'))) {
+            return false;
+        }
+        $data = @fread($fh, @filesize($lpszFileName));
+        @fclose($fh);
+
+        $gfh = new CGIFFILEHEADER();
+        if (!$gfh->load($data, $len = 0)) {
+            return false;
+        }
+
+        $width  = $gfh->m_nWidth;
+        $height = $gfh->m_nHeight;
+        return true;
+    }
+
+    ///////////////////////////////////////////////////////////////////////////
+
+    public function getBmp($bgColor)
+    {
+        $out = '';
+
+        if (!$this->m_bLoaded) {
+            return false;
+        }
+
+        // PREPARE COLOR TABLE (RGBQUADs)
+        if ($this->m_img->m_gih->m_bLocalClr) {
+            $nColors = $this->m_img->m_gih->m_nTableSize;
+            $rgbq    = $this->m_img->m_gih->m_colorTable->toRGBQuad();
+            if ($bgColor != -1) {
+                $bgColor = $this->m_img->m_gih->m_colorTable->colorIndex($bgColor);
+            }
+        } elseif ($this->m_gfh->m_bGlobalClr) {
+            $nColors = $this->m_gfh->m_nTableSize;
+            $rgbq    = $this->m_gfh->m_colorTable->toRGBQuad();
+            if ($bgColor != -1) {
+                $bgColor = $this->m_gfh->m_colorTable->colorIndex($bgColor);
+            }
+        } else {
+            $nColors =  0;
+            $rgbq    = '';
+            $bgColor = -1;
+        }
+
+        // PREPARE BITMAP BITS
+        $data = $this->m_img->m_data;
+        $nPxl = ($this->m_gfh->m_nHeight - 1) * $this->m_gfh->m_nWidth;
+        $bmp  = '';
+        $nPad = ($this->m_gfh->m_nWidth % 4) ? 4 - ($this->m_gfh->m_nWidth % 4) : 0;
+        for ($y = 0; $y < $this->m_gfh->m_nHeight; $y++) {
+            for ($x = 0; $x < $this->m_gfh->m_nWidth; $x++, $nPxl++) {
+                if (
+                    ($x >= $this->m_img->m_gih->m_nLeft) &&
+                    ($y >= $this->m_img->m_gih->m_nTop) &&
+                    ($x <  ($this->m_img->m_gih->m_nLeft + $this->m_img->m_gih->m_nWidth)) &&
+                    ($y <  ($this->m_img->m_gih->m_nTop  + $this->m_img->m_gih->m_nHeight))) {
+                    // PART OF IMAGE
+                    if (@$this->m_img->m_bTrans && (ord($data{$nPxl}) == $this->m_img->m_nTrans)) {
+                        // TRANSPARENT -> BACKGROUND
+                        if ($bgColor == -1) {
+                            $bmp .= chr($this->m_gfh->m_nBgColor);
+                        } else {
+                            $bmp .= chr($bgColor);
+                        }
+                    } else {
+                        $bmp .= $data{$nPxl};
+                    }
+                } else {
+                    // BACKGROUND
+                    if ($bgColor == -1) {
+                        $bmp .= chr($this->m_gfh->m_nBgColor);
+                    } else {
+                        $bmp .= chr($bgColor);
+                    }
+                }
+            }
+            $nPxl -= $this->m_gfh->m_nWidth << 1;
+
+            // ADD PADDING
+            for ($x = 0; $x < $nPad; $x++) {
+                $bmp .= "\x00";
+            }
+        }
+
+        // BITMAPFILEHEADER
+        $out .= 'BM';
+        $out .= $this->dword(14 + 40 + ($nColors << 2) + strlen($bmp));
+        $out .= "\x00\x00";
+        $out .= "\x00\x00";
+        $out .= $this->dword(14 + 40 + ($nColors << 2));
+
+        // BITMAPINFOHEADER
+        $out .= $this->dword(40);
+        $out .= $this->dword($this->m_gfh->m_nWidth);
+        $out .= $this->dword($this->m_gfh->m_nHeight);
+        $out .= "\x01\x00";
+        $out .= "\x08\x00";
+        $out .= "\x00\x00\x00\x00";
+        $out .= "\x00\x00\x00\x00";
+        $out .= "\x12\x0B\x00\x00";
+        $out .= "\x12\x0B\x00\x00";
+        $out .= $this->dword($nColors % 256);
+        $out .= "\x00\x00\x00\x00";
+
+        // COLOR TABLE
+        if ($nColors > 0) {
+            $out .= $rgbq;
+        }
+
+        // DATA
+        $out .= $bmp;
+
+        return $out;
+    }
+
+    ///////////////////////////////////////////////////////////////////////////
+
+    public function getPng($bgColor)
+    {
+        $out = '';
+
+        if (!$this->m_bLoaded) {
+            return false;
+        }
+
+        // PREPARE COLOR TABLE (RGBQUADs)
+        if ($this->m_img->m_gih->m_bLocalClr) {
+            $nColors = $this->m_img->m_gih->m_nTableSize;
+            $pal     = $this->m_img->m_gih->m_colorTable->toString();
+            if ($bgColor != -1) {
+                $bgColor = $this->m_img->m_gih->m_colorTable->colorIndex($bgColor);
+            }
+        } elseif ($this->m_gfh->m_bGlobalClr) {
+            $nColors = $this->m_gfh->m_nTableSize;
+            $pal     = $this->m_gfh->m_colorTable->toString();
+            if ($bgColor != -1) {
+                $bgColor = $this->m_gfh->m_colorTable->colorIndex($bgColor);
+            }
+        } else {
+            $nColors =  0;
+            $pal     = '';
+            $bgColor = -1;
+        }
+
+        // PREPARE BITMAP BITS
+        $data = $this->m_img->m_data;
+        $nPxl = 0;
+        $bmp  = '';
+        for ($y = 0; $y < $this->m_gfh->m_nHeight; $y++) {
+            $bmp .= "\x00";
+            for ($x = 0; $x < $this->m_gfh->m_nWidth; $x++, $nPxl++) {
+                if (
+                    ($x >= $this->m_img->m_gih->m_nLeft) &&
+                    ($y >= $this->m_img->m_gih->m_nTop) &&
+                    ($x <  ($this->m_img->m_gih->m_nLeft + $this->m_img->m_gih->m_nWidth)) &&
+                    ($y <  ($this->m_img->m_gih->m_nTop  + $this->m_img->m_gih->m_nHeight))) {
+                    // PART OF IMAGE
+                    $bmp .= $data{$nPxl};
+                } else {
+                    // BACKGROUND
+                    if ($bgColor == -1) {
+                        $bmp .= chr($this->m_gfh->m_nBgColor);
+                    } else {
+                        $bmp .= chr($bgColor);
+                    }
+                }
+            }
+        }
+        $bmp = gzcompress($bmp, 9);
+
+        ///////////////////////////////////////////////////////////////////////
+        // SIGNATURE
+        $out .= "\x89\x50\x4E\x47\x0D\x0A\x1A\x0A";
+        ///////////////////////////////////////////////////////////////////////
+        // HEADER
+        $out .= "\x00\x00\x00\x0D";
+        $tmp  = 'IHDR';
+        $tmp .= $this->ndword($this->m_gfh->m_nWidth);
+        $tmp .= $this->ndword($this->m_gfh->m_nHeight);
+        $tmp .= "\x08\x03\x00\x00\x00";
+        $out .= $tmp;
+        $out .= $this->ndword(crc32($tmp));
+        ///////////////////////////////////////////////////////////////////////
+        // PALETTE
+        if ($nColors > 0) {
+            $out .= $this->ndword($nColors * 3);
+            $tmp  = 'PLTE';
+            $tmp .= $pal;
+            $out .= $tmp;
+            $out .= $this->ndword(crc32($tmp));
+        }
+        ///////////////////////////////////////////////////////////////////////
+        // TRANSPARENCY
+        if (@$this->m_img->m_bTrans && ($nColors > 0)) {
+            $out .= $this->ndword($nColors);
+            $tmp  = 'tRNS';
+            for ($i = 0; $i < $nColors; $i++) {
+                $tmp .= ($i == $this->m_img->m_nTrans) ? "\x00" : "\xFF";
+            }
+            $out .= $tmp;
+            $out .= $this->ndword(crc32($tmp));
+        }
+        ///////////////////////////////////////////////////////////////////////
+        // DATA BITS
+        $out .= $this->ndword(strlen($bmp));
+        $tmp  = 'IDAT';
+        $tmp .= $bmp;
+        $out .= $tmp;
+        $out .= $this->ndword(crc32($tmp));
+        ///////////////////////////////////////////////////////////////////////
+        // END OF FILE
+        $out .= "\x00\x00\x00\x00IEND\xAE\x42\x60\x82";
+
+        return $out;
+    }
+
+    ///////////////////////////////////////////////////////////////////////////
+
+    // Added by James Heinrich <info@silisoftware.com> - January 5, 2003
+
+    // Takes raw image data and plots it pixel-by-pixel on a new GD image and returns that
+    // It's extremely slow, but the only solution when imagecreatefromstring() fails
+    public function getGD_PixelPlotterVersion()
+    {
+        if (!$this->m_bLoaded) {
+            return false;
+        }
+
+        // PREPARE COLOR TABLE (RGBQUADs)
+        if ($this->m_img->m_gih->m_bLocalClr) {
+            $pal = $this->m_img->m_gih->m_colorTable->toString();
+        } elseif ($this->m_gfh->m_bGlobalClr) {
+            $pal = $this->m_gfh->m_colorTable->toString();
+        } else {
+            die('No color table available in getGD_PixelPlotterVersion()');
+        }
+
+        $PlottingIMG = imagecreate($this->m_gfh->m_nWidth, $this->m_gfh->m_nHeight);
+        $NumColorsInPal = floor(strlen($pal) / 3);
+        $ThisImageColor = array();
+        for ($i = 0; $i < $NumColorsInPal; $i++) {
+            $ThisImageColor[$i] = imagecolorallocate(
+                                    $PlottingIMG,
+                                    ord($pal{(($i * 3) + 0)}),
+                                    ord($pal{(($i * 3) + 1)}),
+                                    ord($pal{(($i * 3) + 2)}));
+        }
+
+        // PREPARE BITMAP BITS
+        $data = $this->m_img->m_data;
+        $nPxl = ($this->m_gfh->m_nHeight - 1) * $this->m_gfh->m_nWidth;
+        for ($y = 0; $y < $this->m_gfh->m_nHeight; $y++) {
+            if (!phpthumb_functions::FunctionIsDisabled('set_time_limit')) {
+                set_time_limit(30);
+            }
+            for ($x = 0; $x < $this->m_gfh->m_nWidth; $x++, $nPxl++) {
+                if (
+                    ($x >= $this->m_img->m_gih->m_nLeft) &&
+                    ($y >= $this->m_img->m_gih->m_nTop) &&
+                    ($x <  ($this->m_img->m_gih->m_nLeft + $this->m_img->m_gih->m_nWidth)) &&
+                    ($y <  ($this->m_img->m_gih->m_nTop  + $this->m_img->m_gih->m_nHeight))) {
+                    // PART OF IMAGE
+                    if (@$this->m_img->m_bTrans && (ord($data{$nPxl}) == $this->m_img->m_nTrans)) {
+                        imagesetpixel($PlottingIMG, $x, $this->m_gfh->m_nHeight - $y - 1, $ThisImageColor[$this->m_gfh->m_nBgColor]);
+                    } else {
+                        imagesetpixel($PlottingIMG, $x, $this->m_gfh->m_nHeight - $y - 1, $ThisImageColor[ord($data{$nPxl})]);
+                    }
+                } else {
+                    // BACKGROUND
+                    imagesetpixel($PlottingIMG, $x, $this->m_gfh->m_nHeight - $y - 1, $ThisImageColor[$this->m_gfh->m_nBgColor]);
+                }
+            }
+            $nPxl -= $this->m_gfh->m_nWidth << 1;
+
+        }
+
+        return $PlottingIMG;
+    }
+
+    ///////////////////////////////////////////////////////////////////////////
+
+    public function dword($val)
+    {
+        $val = (int) $val;
+        return chr($val & 0xFF).chr(($val & 0xFF00) >> 8).chr(($val & 0xFF0000) >> 16).chr(($val & 0xFF000000) >> 24);
+    }
+
+    ///////////////////////////////////////////////////////////////////////////
+
+    public function ndword($val)
+    {
+        $val = (int) $val;
+        return chr(($val & 0xFF000000) >> 24).chr(($val & 0xFF0000) >> 16).chr(($val & 0xFF00) >> 8).chr($val & 0xFF);
+    }
+
+    ///////////////////////////////////////////////////////////////////////////
+
+    public function width()
+    {
+        return $this->m_gfh->m_nWidth;
+    }
+
+    ///////////////////////////////////////////////////////////////////////////
+
+    public function height()
+    {
+        return $this->m_gfh->m_nHeight;
+    }
+
+    ///////////////////////////////////////////////////////////////////////////
+
+    public function comment()
+    {
+        return $this->m_img->m_lpComm;
+    }
+
+    ///////////////////////////////////////////////////////////////////////////
+
+    public function loaded()
+    {
+        return $this->m_bLoaded;
+    }
 }

Switch Indentation +67 added lines, -67 removed lines

@@ -659,36 +659,36 @@ 
 			$datLen++;
 
 			switch($b) {
-			case 0x21: // Extension
-				if (!$this->skipExt($data, $len = 0)) {
-					return false;
-				}
-				$datLen += $len;
-				break;
-
-			case 0x2C: // Image
-				// LOAD HEADER & COLOR TABLE
-				if (!$this->m_gih->load($data, $len = 0)) {
-					return false;
-				}
-				$data = substr($data, $len);
-				$datLen += $len;
-
-				// ALLOC BUFFER
-				if (!($this->m_data = $this->m_lzw->deCompress($data, $len = 0))) {
-					return false;
-				}
-				$data = substr($data, $len);
-				$datLen += $len;
-
-				if ($this->m_gih->m_bInterlace) {
-					$this->deInterlace();
-				}
-				return true;
-
-			case 0x3B: // EOF
-			default:
-				return false;
+			    case 0x21: // Extension
+				    if (!$this->skipExt($data, $len = 0)) {
+					    return false;
+				    }
+				    $datLen += $len;
+				    break;
+
+			    case 0x2C: // Image
+				    // LOAD HEADER & COLOR TABLE
+				    if (!$this->m_gih->load($data, $len = 0)) {
+					    return false;
+				    }
+				    $data = substr($data, $len);
+				    $datLen += $len;
+
+				    // ALLOC BUFFER
+				    if (!($this->m_data = $this->m_lzw->deCompress($data, $len = 0))) {
+					    return false;
+				    }
+				    $data = substr($data, $len);
+				    $datLen += $len;
+
+				    if ($this->m_gih->m_bInterlace) {
+					    $this->deInterlace();
+				    }
+				    return true;
+
+			    case 0x3B: // EOF
+			    default:
+				    return false;
 			}
 		}
 		return false;
@@ -705,24 +705,24 @@ 
 		$extLen++;
 
 		switch($b) {
-		case 0xF9: // Graphic Control
-			$b = ord($data{1});
-			$this->m_disp   = ($b & 0x1C) >> 2;
-			$this->m_bUser  = ($b & 0x02) ? true : false;
-			$this->m_bTrans = ($b & 0x01) ? true : false;
-			$this->m_nDelay = $this->w2i(substr($data, 2, 2));
-			$this->m_nTrans = ord($data{4});
-			break;
-
-		case 0xFE: // Comment
-			$this->m_lpComm = substr($data, 1, ord($data{0}));
-			break;
-
-		case 0x01: // Plain text
-			break;
-
-		case 0xFF: // Application
-			break;
+		    case 0xF9: // Graphic Control
+			    $b = ord($data{1});
+			    $this->m_disp   = ($b & 0x1C) >> 2;
+			    $this->m_bUser  = ($b & 0x02) ? true : false;
+			    $this->m_bTrans = ($b & 0x01) ? true : false;
+			    $this->m_nDelay = $this->w2i(substr($data, 2, 2));
+			    $this->m_nTrans = ord($data{4});
+			    break;
+
+		    case 0xFE: // Comment
+			    $this->m_lpComm = substr($data, 1, ord($data{0}));
+			    break;
+
+		    case 0x01: // Plain text
+			    break;
+
+		    case 0xFF: // Application
+			    break;
 		}
 
 		// SKIP DEFAULT AS DEFS MAY CHANGE
@@ -756,25 +756,25 @@ 
 
 		for ($i = 0; $i < 4; $i++) {
 			switch($i) {
-			case 0:
-				$s = 8;
-				$y = 0;
-				break;
-
-			case 1:
-				$s = 8;
-				$y = 4;
-				break;
-
-			case 2:
-				$s = 4;
-				$y = 2;
-				break;
-
-			case 3:
-				$s = 2;
-				$y = 1;
-				break;
+			    case 0:
+				    $s = 8;
+				    $y = 0;
+				    break;
+
+			    case 1:
+				    $s = 8;
+				    $y = 4;
+				    break;
+
+			    case 2:
+				    $s = 4;
+				    $y = 2;
+				    break;
+
+			    case 3:
+				    $s = 2;
+				    $y = 1;
+				    break;
 			}
 
 			for (; $y < $this->m_gih->m_nHeight; $y += $s) {

Spacing +33 added lines, -33 removed lines

@@ -178,8 +178,8 @@ 
 		unSet($this->Stack);
 		unSet($this->Buf);
 
-		$this->Next  = range(0, (1 << $this->MAX_LZW_BITS)       - 1);
-		$this->Vals  = range(0, (1 << $this->MAX_LZW_BITS)       - 1);
+		$this->Next  = range(0, (1 << $this->MAX_LZW_BITS) - 1);
+		$this->Vals  = range(0, (1 << $this->MAX_LZW_BITS) - 1);
 		$this->Stack = range(0, (1 << ($this->MAX_LZW_BITS + 1)) - 1);
 		$this->Buf   = range(0, 279);
 	}
@@ -366,7 +366,7 @@ 
 
 		$iRet = 0;
 		for ($i = $this->CurBit, $j = 0; $j < $this->CodeSize; $i++, $j++) {
-			$iRet |= (($this->Buf[ (int) ($i / 8) ] & (1 << ($i % 8))) != 0) << $j;
+			$iRet |= (($this->Buf[(int)($i / 8)] & (1 << ($i % 8))) != 0) << $j;
 		}
 
 		$this->CurBit += $this->CodeSize;
@@ -418,9 +418,9 @@ 
 
 		for ($i = 0; $i < $this->m_nColors; $i++) {
 			$ret .=
-				chr(($this->m_arColors[$i] & 0x000000FF))       . // R
-				chr(($this->m_arColors[$i] & 0x0000FF00) >>  8) . // G
-				chr(($this->m_arColors[$i] & 0x00FF0000) >> 16);  // B
+				chr(($this->m_arColors[$i] & 0x000000FF)).// R
+				chr(($this->m_arColors[$i] & 0x0000FF00) >> 8).// G
+				chr(($this->m_arColors[$i] & 0x00FF0000) >> 16); // B
 		}
 
 		return $ret;
@@ -434,9 +434,9 @@ 
 
 		for ($i = 0; $i < $this->m_nColors; $i++) {
 			$ret .=
-				chr(($this->m_arColors[$i] & 0x00FF0000) >> 16) . // B
-				chr(($this->m_arColors[$i] & 0x0000FF00) >>  8) . // G
-				chr(($this->m_arColors[$i] & 0x000000FF))       . // R
+				chr(($this->m_arColors[$i] & 0x00FF0000) >> 16).// B
+				chr(($this->m_arColors[$i] & 0x0000FF00) >> 8).// G
+				chr(($this->m_arColors[$i] & 0x000000FF)).// R
 				"\x00";
 		}
 
@@ -447,16 +447,16 @@ 
 
 	public function colorIndex($rgb)
 	{
-		$rgb = (int) $rgb & 0xFFFFFF;
+		$rgb = (int)$rgb & 0xFFFFFF;
 		$r1  = ($rgb & 0x0000FF);
-		$g1  = ($rgb & 0x00FF00) >>  8;
+		$g1  = ($rgb & 0x00FF00) >> 8;
 		$b1  = ($rgb & 0xFF0000) >> 16;
 		$idx = -1;
 		$dif = 0;
 
 		for ($i = 0; $i < $this->m_nColors; $i++) {
 			$r2 = ($this->m_arColors[$i] & 0x000000FF);
-			$g2 = ($this->m_arColors[$i] & 0x0000FF00) >>  8;
+			$g2 = ($this->m_arColors[$i] & 0x0000FF00) >> 8;
 			$b2 = ($this->m_arColors[$i] & 0x00FF0000) >> 16;
 			$d  = abs($r2 - $r1) + abs($g2 - $g1) + abs($b2 - $b1);
 
@@ -519,13 +519,13 @@ 
 			return false;
 		}
 
-		$b = ord($lpData[ 10 ]);
+		$b = ord($lpData[10]);
 		$this->m_bGlobalClr  = ($b & 0x80) ? true : false;
 		$this->m_nColorRes   = ($b & 0x70) >> 4;
 		$this->m_bSorted     = ($b & 0x08) ? true : false;
 		$this->m_nTableSize  = 2 << ($b & 0x07);
-		$this->m_nBgColor    = ord($lpData[ 11 ]);
-		$this->m_nPixelRatio = ord($lpData[ 12 ]);
+		$this->m_nBgColor    = ord($lpData[11]);
+		$this->m_nPixelRatio = ord($lpData[12]);
 		$hdrLen = 13;
 
 		if ($this->m_bGlobalClr) {
@@ -543,7 +543,7 @@ 
 
 	public function w2i($str)
 	{
-		return ord($str[ 0 ]) + (ord($str[ 1 ]) << 8);
+		return ord($str[0]) + (ord($str[1]) << 8);
 	}
 }
 
@@ -614,7 +614,7 @@ 
 
 	public function w2i($str)
 	{
-		return ord($str[ 0 ]) + (ord($str[ 1 ]) << 8);
+		return ord($str[0]) + (ord($str[1]) << 8);
 	}
 }
 
@@ -658,7 +658,7 @@ 
 			$data = substr($data, 1);
 			$datLen++;
 
-			switch($b) {
+			switch ($b) {
 			case 0x21: // Extension
 				if (!$this->skipExt($data, $len = 0)) {
 					return false;
@@ -704,7 +704,7 @@ 
 		$data = substr($data, 1);
 		$extLen++;
 
-		switch($b) {
+		switch ($b) {
 		case 0xF9: // Graphic Control
 			$b = ord($data{1});
 			$this->m_disp   = ($b & 0x1C) >> 2;
@@ -743,7 +743,7 @@ 
 
 	public function w2i($str)
 	{
-		return ord($str[ 0 ]) + (ord($str[ 1 ]) << 8);
+		return ord($str[0]) + (ord($str[1]) << 8);
 	}
 
 	///////////////////////////////////////////////////////////////////////////
@@ -755,7 +755,7 @@ 
 		$y = 0;
 
 		for ($i = 0; $i < 4; $i++) {
-			switch($i) {
+			switch ($i) {
 			case 0:
 				$s = 8;
 				$y = 0;
@@ -782,8 +782,8 @@ 
 				$this->m_data = substr($this->m_data, $this->m_gih->m_nWidth);
 
 				$data =
-					substr($data, 0, $y * $this->m_gih->m_nWidth) .
-					$lne .
+					substr($data, 0, $y * $this->m_gih->m_nWidth).
+					$lne.
 					substr($data, ($y + 1) * $this->m_gih->m_nWidth);
 			}
 		}
@@ -889,7 +889,7 @@ 
 				$bgColor = $this->m_gfh->m_colorTable->colorIndex($bgColor);
 			}
 		} else {
-			$nColors =  0;
+			$nColors = 0;
 			$rgbq    = '';
 			$bgColor = -1;
 		}
@@ -904,8 +904,8 @@ 
 				if (
 					($x >= $this->m_img->m_gih->m_nLeft) &&
 					($y >= $this->m_img->m_gih->m_nTop) &&
-					($x <  ($this->m_img->m_gih->m_nLeft + $this->m_img->m_gih->m_nWidth)) &&
-					($y <  ($this->m_img->m_gih->m_nTop  + $this->m_img->m_gih->m_nHeight))) {
+					($x < ($this->m_img->m_gih->m_nLeft + $this->m_img->m_gih->m_nWidth)) &&
+					($y < ($this->m_img->m_gih->m_nTop + $this->m_img->m_gih->m_nHeight))) {
 					// PART OF IMAGE
 					if (@$this->m_img->m_bTrans && (ord($data{$nPxl}) == $this->m_img->m_nTrans)) {
 						// TRANSPARENT -> BACKGROUND
@@ -989,7 +989,7 @@ 
 				$bgColor = $this->m_gfh->m_colorTable->colorIndex($bgColor);
 			}
 		} else {
-			$nColors =  0;
+			$nColors = 0;
 			$pal     = '';
 			$bgColor = -1;
 		}
@@ -1004,8 +1004,8 @@ 
 				if (
 					($x >= $this->m_img->m_gih->m_nLeft) &&
 					($y >= $this->m_img->m_gih->m_nTop) &&
-					($x <  ($this->m_img->m_gih->m_nLeft + $this->m_img->m_gih->m_nWidth)) &&
-					($y <  ($this->m_img->m_gih->m_nTop  + $this->m_img->m_gih->m_nHeight))) {
+					($x < ($this->m_img->m_gih->m_nLeft + $this->m_img->m_gih->m_nWidth)) &&
+					($y < ($this->m_img->m_gih->m_nTop + $this->m_img->m_gih->m_nHeight))) {
 					// PART OF IMAGE
 					$bmp .= $data{$nPxl};
 				} else {
@@ -1109,8 +1109,8 @@ 
 				if (
 					($x >= $this->m_img->m_gih->m_nLeft) &&
 					($y >= $this->m_img->m_gih->m_nTop) &&
-					($x <  ($this->m_img->m_gih->m_nLeft + $this->m_img->m_gih->m_nWidth)) &&
-					($y <  ($this->m_img->m_gih->m_nTop  + $this->m_img->m_gih->m_nHeight))) {
+					($x < ($this->m_img->m_gih->m_nLeft + $this->m_img->m_gih->m_nWidth)) &&
+					($y < ($this->m_img->m_gih->m_nTop + $this->m_img->m_gih->m_nHeight))) {
 					// PART OF IMAGE
 					if (@$this->m_img->m_bTrans && (ord($data{$nPxl}) == $this->m_img->m_nTrans)) {
 						imagesetpixel($PlottingIMG, $x, $this->m_gfh->m_nHeight - $y - 1, $ThisImageColor[$this->m_gfh->m_nBgColor]);
@@ -1133,7 +1133,7 @@ 
 
 	public function dword($val)
 	{
-		$val = (int) $val;
+		$val = (int)$val;
 		return chr($val & 0xFF).chr(($val & 0xFF00) >> 8).chr(($val & 0xFF0000) >> 16).chr(($val & 0xFF000000) >> 24);
 	}
 
@@ -1141,7 +1141,7 @@ 
 
 	public function ndword($val)
 	{
-		$val = (int) $val;
+		$val = (int)$val;
 		return chr(($val & 0xFF000000) >> 24).chr(($val & 0xFF0000) >> 16).chr(($val & 0xFF00) >> 8).chr($val & 0xFF);
 	}
 

Braces +3 added lines, -1 removed lines

@@ -292,8 +292,10 @@
 				$this->Stack[$this->sp] = $this->Vals[$Code];
 				$this->sp++;
 
-				if ($Code == $this->Next[$Code]) // Circular table entry, big GIF Error!
+				if ($Code == $this->Next[$Code]) {
+				    // Circular table entry, big GIF Error!
 					return -1;
+				}
 
 				$Code = $this->Next[$Code];
 			}

htdocs/modules/system/class/thumbs/phpThumb.php

Indentation +457 added lines, -457 removed lines

@@ -14,7 +14,7 @@ 
 ini_set('display_errors', '1');
 ini_set('magic_quotes_runtime', '0');
 if (ini_get('magic_quotes_runtime')) {
-	die('"magic_quotes_runtime" is set in php.ini, cannot run phpThumb with this enabled');
+    die('"magic_quotes_runtime" is set in php.ini, cannot run phpThumb with this enabled');
 }
 // Set a default timezone if web server has not done already in php.ini
 if (!ini_get('date.timezone') && function_exists('date_default_timezone_set')) { // PHP >= 5.1.0
@@ -24,84 +24,84 @@ 
 
 // this script relies on the superglobal arrays, fake it here for old PHP versions
 if (PHP_VERSION < '4.1.0') {
-	$_SERVER = $HTTP_SERVER_VARS;
-	$_GET    = $HTTP_GET_VARS;
+    $_SERVER = $HTTP_SERVER_VARS;
+    $_GET    = $HTTP_GET_VARS;
 }
 
 function SendSaveAsFileHeaderIfNeeded() {
-	if (headers_sent()) {
-		return false;
-	}
-	global $phpThumb;
-	$downloadfilename = phpthumb_functions::SanitizeFilename(!empty($_GET['sia']) ? $_GET['sia'] : (!empty($_GET['down']) ? $_GET['down'] : 'phpThumb_generated_thumbnail.'.(!empty($_GET['f']) ? $_GET['f'] : 'jpg')));
-	if (!empty($downloadfilename)) {
-		$phpThumb->DebugMessage('SendSaveAsFileHeaderIfNeeded() sending header: Content-Disposition: '.(!empty($_GET['down']) ? 'attachment' : 'inline').'; filename="'.$downloadfilename.'"', __FILE__, __LINE__);
-		header('Content-Disposition: '.(!empty($_GET['down']) ? 'attachment' : 'inline').'; filename="'.$downloadfilename.'"');
-	}
-	return true;
+    if (headers_sent()) {
+        return false;
+    }
+    global $phpThumb;
+    $downloadfilename = phpthumb_functions::SanitizeFilename(!empty($_GET['sia']) ? $_GET['sia'] : (!empty($_GET['down']) ? $_GET['down'] : 'phpThumb_generated_thumbnail.'.(!empty($_GET['f']) ? $_GET['f'] : 'jpg')));
+    if (!empty($downloadfilename)) {
+        $phpThumb->DebugMessage('SendSaveAsFileHeaderIfNeeded() sending header: Content-Disposition: '.(!empty($_GET['down']) ? 'attachment' : 'inline').'; filename="'.$downloadfilename.'"', __FILE__, __LINE__);
+        header('Content-Disposition: '.(!empty($_GET['down']) ? 'attachment' : 'inline').'; filename="'.$downloadfilename.'"');
+    }
+    return true;
 }
 
 function RedirectToCachedFile() {
-	global $phpThumb;
-
-	$nice_cachefile = str_replace(DIRECTORY_SEPARATOR, '/', $phpThumb->cache_filename);
-	$nice_docroot   = str_replace(DIRECTORY_SEPARATOR, '/', rtrim($phpThumb->config_document_root, '/\\'));
-
-	$parsed_url = phpthumb_functions::ParseURLbetter(@$_SERVER['HTTP_REFERER']);
-
-	$nModified  = filemtime($phpThumb->cache_filename);
-
-	if ($phpThumb->config_nooffsitelink_enabled && !empty($_SERVER['HTTP_REFERER']) && !in_array(@$parsed_url['host'], $phpThumb->config_nooffsitelink_valid_domains)) {
-
-		$phpThumb->DebugMessage('Would have used cached (image/'.$phpThumb->thumbnailFormat.') file "'.$phpThumb->cache_filename.'" (Last-Modified: '.gmdate('D, d M Y H:i:s', $nModified).' GMT), but skipping because $_SERVER[HTTP_REFERER] ('.@$_SERVER['HTTP_REFERER'].') is not in $phpThumb->config_nooffsitelink_valid_domains ('.implode(';', $phpThumb->config_nooffsitelink_valid_domains).')', __FILE__, __LINE__);
-
-	} elseif ($phpThumb->phpThumbDebug) {
-
-		$phpThumb->DebugTimingMessage('skipped using cached image', __FILE__, __LINE__);
-		$phpThumb->DebugMessage('Would have used cached file, but skipping due to phpThumbDebug', __FILE__, __LINE__);
-		$phpThumb->DebugMessage('* Would have sent headers (1): Last-Modified: '.gmdate('D, d M Y H:i:s', $nModified).' GMT', __FILE__, __LINE__);
-		if ($getimagesize = @getimagesize($phpThumb->cache_filename)) {
-			$phpThumb->DebugMessage('* Would have sent headers (2): Content-Type: '.phpthumb_functions::ImageTypeToMIMEtype($getimagesize[2]), __FILE__, __LINE__);
-		}
-		if (preg_match('#^'.preg_quote($nice_docroot).'(.*)$#', $nice_cachefile, $matches)) {
-			$phpThumb->DebugMessage('* Would have sent headers (3): Location: '.dirname($matches[1]).'/'.urlencode(basename($matches[1])), __FILE__, __LINE__);
-		} else {
-			$phpThumb->DebugMessage('* Would have sent data: readfile('.$phpThumb->cache_filename.')', __FILE__, __LINE__);
-		}
-
-	} else {
-
-		if (headers_sent()) {
-			$phpThumb->ErrorImage('Headers already sent ('.basename(__FILE__).' line '.__LINE__.')');
-			exit;
-		}
-		SendSaveAsFileHeaderIfNeeded();
-
-		header('Pragma: private');
-		header('Cache-Control: max-age='.$phpThumb->getParameter('config_cache_maxage'));
-		header('Expires: '.date(DATE_RFC1123,  time() + $phpThumb->getParameter('config_cache_maxage')));
-		if (!empty($_SERVER['HTTP_IF_MODIFIED_SINCE']) && ($nModified == strtotime($_SERVER['HTTP_IF_MODIFIED_SINCE'])) && !empty($_SERVER['SERVER_PROTOCOL'])) {
-			header('Last-Modified: '.gmdate('D, d M Y H:i:s', $nModified).' GMT');
-			header($_SERVER['SERVER_PROTOCOL'].' 304 Not Modified');
-			exit;
-		}
-		header('Last-Modified: '.gmdate('D, d M Y H:i:s', $nModified).' GMT');
-		header('ETag: "'.md5_file($phpThumb->cache_filename).'"');
-		if ($getimagesize = @getimagesize($phpThumb->cache_filename)) {
-			header('Content-Type: '.phpthumb_functions::ImageTypeToMIMEtype($getimagesize[2]));
-		} elseif (preg_match('#\\.ico$#i', $phpThumb->cache_filename)) {
-			header('Content-Type: image/x-icon');
-		}
-		header('Content-Length: '.filesize($phpThumb->cache_filename));
-		if (empty($phpThumb->config_cache_force_passthru) && preg_match('#^'.preg_quote($nice_docroot).'(.*)$#', $nice_cachefile, $matches)) {
-			header('Location: '.dirname($matches[1]).'/'.urlencode(basename($matches[1])));
-		} else {
-			@readfile($phpThumb->cache_filename);
-		}
-		exit;
-
-	}
-	return true;
+    global $phpThumb;
+
+    $nice_cachefile = str_replace(DIRECTORY_SEPARATOR, '/', $phpThumb->cache_filename);
+    $nice_docroot   = str_replace(DIRECTORY_SEPARATOR, '/', rtrim($phpThumb->config_document_root, '/\\'));
+
+    $parsed_url = phpthumb_functions::ParseURLbetter(@$_SERVER['HTTP_REFERER']);
+
+    $nModified  = filemtime($phpThumb->cache_filename);
+
+    if ($phpThumb->config_nooffsitelink_enabled && !empty($_SERVER['HTTP_REFERER']) && !in_array(@$parsed_url['host'], $phpThumb->config_nooffsitelink_valid_domains)) {
+
+        $phpThumb->DebugMessage('Would have used cached (image/'.$phpThumb->thumbnailFormat.') file "'.$phpThumb->cache_filename.'" (Last-Modified: '.gmdate('D, d M Y H:i:s', $nModified).' GMT), but skipping because $_SERVER[HTTP_REFERER] ('.@$_SERVER['HTTP_REFERER'].') is not in $phpThumb->config_nooffsitelink_valid_domains ('.implode(';', $phpThumb->config_nooffsitelink_valid_domains).')', __FILE__, __LINE__);
+
+    } elseif ($phpThumb->phpThumbDebug) {
+
+        $phpThumb->DebugTimingMessage('skipped using cached image', __FILE__, __LINE__);
+        $phpThumb->DebugMessage('Would have used cached file, but skipping due to phpThumbDebug', __FILE__, __LINE__);
+        $phpThumb->DebugMessage('* Would have sent headers (1): Last-Modified: '.gmdate('D, d M Y H:i:s', $nModified).' GMT', __FILE__, __LINE__);
+        if ($getimagesize = @getimagesize($phpThumb->cache_filename)) {
+            $phpThumb->DebugMessage('* Would have sent headers (2): Content-Type: '.phpthumb_functions::ImageTypeToMIMEtype($getimagesize[2]), __FILE__, __LINE__);
+        }
+        if (preg_match('#^'.preg_quote($nice_docroot).'(.*)$#', $nice_cachefile, $matches)) {
+            $phpThumb->DebugMessage('* Would have sent headers (3): Location: '.dirname($matches[1]).'/'.urlencode(basename($matches[1])), __FILE__, __LINE__);
+        } else {
+            $phpThumb->DebugMessage('* Would have sent data: readfile('.$phpThumb->cache_filename.')', __FILE__, __LINE__);
+        }
+
+    } else {
+
+        if (headers_sent()) {
+            $phpThumb->ErrorImage('Headers already sent ('.basename(__FILE__).' line '.__LINE__.')');
+            exit;
+        }
+        SendSaveAsFileHeaderIfNeeded();
+
+        header('Pragma: private');
+        header('Cache-Control: max-age='.$phpThumb->getParameter('config_cache_maxage'));
+        header('Expires: '.date(DATE_RFC1123,  time() + $phpThumb->getParameter('config_cache_maxage')));
+        if (!empty($_SERVER['HTTP_IF_MODIFIED_SINCE']) && ($nModified == strtotime($_SERVER['HTTP_IF_MODIFIED_SINCE'])) && !empty($_SERVER['SERVER_PROTOCOL'])) {
+            header('Last-Modified: '.gmdate('D, d M Y H:i:s', $nModified).' GMT');
+            header($_SERVER['SERVER_PROTOCOL'].' 304 Not Modified');
+            exit;
+        }
+        header('Last-Modified: '.gmdate('D, d M Y H:i:s', $nModified).' GMT');
+        header('ETag: "'.md5_file($phpThumb->cache_filename).'"');
+        if ($getimagesize = @getimagesize($phpThumb->cache_filename)) {
+            header('Content-Type: '.phpthumb_functions::ImageTypeToMIMEtype($getimagesize[2]));
+        } elseif (preg_match('#\\.ico$#i', $phpThumb->cache_filename)) {
+            header('Content-Type: image/x-icon');
+        }
+        header('Content-Length: '.filesize($phpThumb->cache_filename));
+        if (empty($phpThumb->config_cache_force_passthru) && preg_match('#^'.preg_quote($nice_docroot).'(.*)$#', $nice_cachefile, $matches)) {
+            header('Location: '.dirname($matches[1]).'/'.urlencode(basename($matches[1])));
+        } else {
+            @readfile($phpThumb->cache_filename);
+        }
+        exit;
+
+    }
+    return true;
 }
 
 
@@ -109,8 +109,8 @@ 
 // instantiate a new phpThumb() object
 ob_start();
 if (!include_once( __DIR__ .'/phpthumb.class.php')) {
-	ob_end_flush();
-	die('failed to include_once("'.realpath( __DIR__ .'/phpthumb.class.php').'")');
+    ob_end_flush();
+    die('failed to include_once("'.realpath( __DIR__ .'/phpthumb.class.php').'")');
 }
 ob_end_clean();
 $phpThumb = new phpThumb();
@@ -118,256 +118,256 @@ 
 $phpThumb->setParameter('config_error_die_on_error', true);
 
 if (!phpthumb_functions::FunctionIsDisabled('set_time_limit')) {
-	set_time_limit(60);  // shouldn't take nearly this long in most cases, but with many filters and/or a slow server...
+    set_time_limit(60);  // shouldn't take nearly this long in most cases, but with many filters and/or a slow server...
 }
 
 // phpThumbDebug[0] used to be here, but may reveal too much
 // info when high_security_mode should be enabled (not set yet)
 
 if (file_exists( __DIR__ .'/phpThumb.config.php')) {
-	ob_start();
-	if (include_once( __DIR__ .'/phpThumb.config.php')) {
-		// great
-	} else {
-		ob_end_flush();
-		$phpThumb->config_disable_debug = false; // otherwise error message won't print
-		$phpThumb->ErrorImage('failed to include_once('. __DIR__ .'/phpThumb.config.php) - realpath="'.realpath( __DIR__ .'/phpThumb.config.php').'"');
-	}
-	ob_end_clean();
+    ob_start();
+    if (include_once( __DIR__ .'/phpThumb.config.php')) {
+        // great
+    } else {
+        ob_end_flush();
+        $phpThumb->config_disable_debug = false; // otherwise error message won't print
+        $phpThumb->ErrorImage('failed to include_once('. __DIR__ .'/phpThumb.config.php) - realpath="'.realpath( __DIR__ .'/phpThumb.config.php').'"');
+    }
+    ob_end_clean();
 } elseif (file_exists( __DIR__ .'/phpThumb.config.php.default')) {
-	$phpThumb->config_disable_debug = false; // otherwise error message won't print
-	$phpThumb->ErrorImage('Please rename "phpThumb.config.php.default" to "phpThumb.config.php"');
+    $phpThumb->config_disable_debug = false; // otherwise error message won't print
+    $phpThumb->ErrorImage('Please rename "phpThumb.config.php.default" to "phpThumb.config.php"');
 } else {
-	$phpThumb->config_disable_debug = false; // otherwise error message won't print
-	$phpThumb->ErrorImage('failed to include_once('. __DIR__ .'/phpThumb.config.php) - realpath="'.realpath( __DIR__ .'/phpThumb.config.php').'"');
+    $phpThumb->config_disable_debug = false; // otherwise error message won't print
+    $phpThumb->ErrorImage('failed to include_once('. __DIR__ .'/phpThumb.config.php) - realpath="'.realpath( __DIR__ .'/phpThumb.config.php').'"');
 }
 
 if (!empty($PHPTHUMB_CONFIG)) {
-	foreach ($PHPTHUMB_CONFIG as $key => $value) {
-		$keyname = 'config_'.$key;
-		$phpThumb->setParameter($keyname, $value);
-		if (!preg_match('#(password|mysql)#i', $key)) {
-			$phpThumb->DebugMessage('setParameter('.$keyname.', '.$phpThumb->phpThumbDebugVarDump($value).')', __FILE__, __LINE__);
-		}
-	}
-	if (!$phpThumb->config_disable_debug) {
-		// if debug mode is enabled, force phpThumbDebug output, do not allow normal thumbnails to be generated
-		$_GET['phpThumbDebug'] = (!empty($_GET['phpThumbDebug']) ? max(1, (int) $_GET[ 'phpThumbDebug']) : 9);
-		$phpThumb->setParameter('phpThumbDebug', $_GET['phpThumbDebug']);
-	}
+    foreach ($PHPTHUMB_CONFIG as $key => $value) {
+        $keyname = 'config_'.$key;
+        $phpThumb->setParameter($keyname, $value);
+        if (!preg_match('#(password|mysql)#i', $key)) {
+            $phpThumb->DebugMessage('setParameter('.$keyname.', '.$phpThumb->phpThumbDebugVarDump($value).')', __FILE__, __LINE__);
+        }
+    }
+    if (!$phpThumb->config_disable_debug) {
+        // if debug mode is enabled, force phpThumbDebug output, do not allow normal thumbnails to be generated
+        $_GET['phpThumbDebug'] = (!empty($_GET['phpThumbDebug']) ? max(1, (int) $_GET[ 'phpThumbDebug']) : 9);
+        $phpThumb->setParameter('phpThumbDebug', $_GET['phpThumbDebug']);
+    }
 } else {
-	$phpThumb->DebugMessage('$PHPTHUMB_CONFIG is empty', __FILE__, __LINE__);
+    $phpThumb->DebugMessage('$PHPTHUMB_CONFIG is empty', __FILE__, __LINE__);
 }
 
 if (empty($phpThumb->config_disable_pathinfo_parsing) && (empty($_GET) || isset($_GET['phpThumbDebug'])) && !empty($_SERVER['PATH_INFO'])) {
-	$_SERVER['PHP_SELF'] = str_replace($_SERVER['PATH_INFO'], '', @$_SERVER['PHP_SELF']);
-
-	$args = explode(';', substr($_SERVER['PATH_INFO'], 1));
-	$phpThumb->DebugMessage('PATH_INFO.$args set to ('.implode(')(', $args).')', __FILE__, __LINE__);
-	if (!empty($args)) {
-		$_GET['src'] = @$args[count($args) - 1];
-		$phpThumb->DebugMessage('PATH_INFO."src" = "'.$_GET['src'].'"', __FILE__, __LINE__);
-		if (preg_match('#^new\=([a-z0-9]+)#i', $_GET['src'], $matches)) {
-			unset($_GET['src']);
-			$_GET['new'] = $matches[1];
-		}
-	}
-	if (preg_match('#^([0-9]*)x?([0-9]*)$#i', @$args[count($args) - 2], $matches)) {
-		$_GET['w'] = $matches[1];
-		$_GET['h'] = $matches[2];
-		$phpThumb->DebugMessage('PATH_INFO."w"x"h" set to "'.$_GET['w'].'"x"'.$_GET['h'].'"', __FILE__, __LINE__);
-	}
-	for ($i = 0; $i < count($args) - 2; $i++) {
-		@list($key, $value) = explode('=', @$args[$i]);
-		if (substr($key, -2) == '[]') {
-			$array_key_name = substr($key, 0, -2);
-			$_GET[$array_key_name][] = $value;
-			$phpThumb->DebugMessage('PATH_INFO."'.$array_key_name.'[]" = "'.$value.'"', __FILE__, __LINE__);
-		} else {
-			$_GET[$key] = $value;
-			$phpThumb->DebugMessage('PATH_INFO."'.$key.'" = "'.$value.'"', __FILE__, __LINE__);
-		}
-	}
+    $_SERVER['PHP_SELF'] = str_replace($_SERVER['PATH_INFO'], '', @$_SERVER['PHP_SELF']);
+
+    $args = explode(';', substr($_SERVER['PATH_INFO'], 1));
+    $phpThumb->DebugMessage('PATH_INFO.$args set to ('.implode(')(', $args).')', __FILE__, __LINE__);
+    if (!empty($args)) {
+        $_GET['src'] = @$args[count($args) - 1];
+        $phpThumb->DebugMessage('PATH_INFO."src" = "'.$_GET['src'].'"', __FILE__, __LINE__);
+        if (preg_match('#^new\=([a-z0-9]+)#i', $_GET['src'], $matches)) {
+            unset($_GET['src']);
+            $_GET['new'] = $matches[1];
+        }
+    }
+    if (preg_match('#^([0-9]*)x?([0-9]*)$#i', @$args[count($args) - 2], $matches)) {
+        $_GET['w'] = $matches[1];
+        $_GET['h'] = $matches[2];
+        $phpThumb->DebugMessage('PATH_INFO."w"x"h" set to "'.$_GET['w'].'"x"'.$_GET['h'].'"', __FILE__, __LINE__);
+    }
+    for ($i = 0; $i < count($args) - 2; $i++) {
+        @list($key, $value) = explode('=', @$args[$i]);
+        if (substr($key, -2) == '[]') {
+            $array_key_name = substr($key, 0, -2);
+            $_GET[$array_key_name][] = $value;
+            $phpThumb->DebugMessage('PATH_INFO."'.$array_key_name.'[]" = "'.$value.'"', __FILE__, __LINE__);
+        } else {
+            $_GET[$key] = $value;
+            $phpThumb->DebugMessage('PATH_INFO."'.$key.'" = "'.$value.'"', __FILE__, __LINE__);
+        }
+    }
 }
 
 if (!empty($phpThumb->config_high_security_enabled)) {
-	if (empty($_GET['hash'])) {
-		$phpThumb->config_disable_debug = false; // otherwise error message won't print
-		$phpThumb->ErrorImage('ERROR: missing hash');
-	} elseif (phpthumb_functions::PasswordStrength($phpThumb->config_high_security_password) < 20) {
-		$phpThumb->config_disable_debug = false; // otherwise error message won't print
-		$phpThumb->ErrorImage('ERROR: $PHPTHUMB_CONFIG[high_security_password] is not complex enough');
-	} elseif ($_GET['hash'] != md5(str_replace($phpThumb->config_high_security_url_separator.'hash='.$_GET['hash'], '', $_SERVER['QUERY_STRING']).$phpThumb->config_high_security_password)) {
-		header('HTTP/1.0 403 Forbidden');
-		sleep(10); // deliberate delay to discourage password-guessing
-		$phpThumb->ErrorImage('ERROR: invalid hash');
-	}
+    if (empty($_GET['hash'])) {
+        $phpThumb->config_disable_debug = false; // otherwise error message won't print
+        $phpThumb->ErrorImage('ERROR: missing hash');
+    } elseif (phpthumb_functions::PasswordStrength($phpThumb->config_high_security_password) < 20) {
+        $phpThumb->config_disable_debug = false; // otherwise error message won't print
+        $phpThumb->ErrorImage('ERROR: $PHPTHUMB_CONFIG[high_security_password] is not complex enough');
+    } elseif ($_GET['hash'] != md5(str_replace($phpThumb->config_high_security_url_separator.'hash='.$_GET['hash'], '', $_SERVER['QUERY_STRING']).$phpThumb->config_high_security_password)) {
+        header('HTTP/1.0 403 Forbidden');
+        sleep(10); // deliberate delay to discourage password-guessing
+        $phpThumb->ErrorImage('ERROR: invalid hash');
+    }
 }
 
 ////////////////////////////////////////////////////////////////
 // Debug output, to try and help me diagnose problems
 $phpThumb->DebugTimingMessage('phpThumbDebug[0]', __FILE__, __LINE__);
 if (isset($_GET['phpThumbDebug']) && ($_GET['phpThumbDebug'] == '0')) {
-	$phpThumb->phpThumbDebug();
+    $phpThumb->phpThumbDebug();
 }
 ////////////////////////////////////////////////////////////////
 
 // returned the fixed string if the evil "magic_quotes_gpc" setting is on
 if (get_magic_quotes_gpc()) {
-	// deprecated: 'err', 'file', 'goto',
-	$RequestVarsToStripSlashes = array('src', 'wmf', 'down');
-	foreach ($RequestVarsToStripSlashes as $key) {
-		if (isset($_GET[$key])) {
-			if (is_string($_GET[$key])) {
-				$_GET[$key] = stripslashes($_GET[$key]);
-			} else {
-				unset($_GET[$key]);
-			}
-		}
-	}
+    // deprecated: 'err', 'file', 'goto',
+    $RequestVarsToStripSlashes = array('src', 'wmf', 'down');
+    foreach ($RequestVarsToStripSlashes as $key) {
+        if (isset($_GET[$key])) {
+            if (is_string($_GET[$key])) {
+                $_GET[$key] = stripslashes($_GET[$key]);
+            } else {
+                unset($_GET[$key]);
+            }
+        }
+    }
 }
 
 if (empty($_SERVER['PATH_INFO']) && empty($_SERVER['QUERY_STRING'])) {
-	$phpThumb->config_disable_debug = false; // otherwise error message won't print
-	$phpThumb->ErrorImage('ERROR: no parameters specified');
+    $phpThumb->config_disable_debug = false; // otherwise error message won't print
+    $phpThumb->ErrorImage('ERROR: no parameters specified');
 }
 
 if (!empty($_GET['src']) && isset($_GET['md5s']) && empty($_GET['md5s'])) {
-	$md5s = '';
-	if (preg_match('#^([a-z0-9]+)://#i', $_GET['src'], $protocol_matches)) {
-		if (preg_match('#^(f|ht)tps?://#i', $_GET['src'])) {
-			if ($rawImageData = phpthumb_functions::SafeURLread($_GET['src'], $error, $phpThumb->config_http_fopen_timeout, $phpThumb->config_http_follow_redirect)) {
-				$md5s = md5($rawImageData);
-			}
-		} else {
-			$phpThumb->ErrorImage('only FTP and HTTP/HTTPS protocols are allowed, "'.$protocol_matches[1].'" is not');
-		}
-	} else {
-		$SourceFilename = $phpThumb->ResolveFilenameToAbsolute($_GET['src']);
-		if (is_readable($SourceFilename)) {
-			$md5s = phpthumb_functions::md5_file_safe($SourceFilename);
-		} else {
-			$phpThumb->ErrorImage('ERROR: "'.$SourceFilename.'" cannot be read');
-		}
-	}
-	if (!empty($_SERVER['HTTP_REFERER'])) {
-		$phpThumb->ErrorImage('&md5s='.$md5s);
-	} else {
-		die('&md5s='.$md5s);
-	}
+    $md5s = '';
+    if (preg_match('#^([a-z0-9]+)://#i', $_GET['src'], $protocol_matches)) {
+        if (preg_match('#^(f|ht)tps?://#i', $_GET['src'])) {
+            if ($rawImageData = phpthumb_functions::SafeURLread($_GET['src'], $error, $phpThumb->config_http_fopen_timeout, $phpThumb->config_http_follow_redirect)) {
+                $md5s = md5($rawImageData);
+            }
+        } else {
+            $phpThumb->ErrorImage('only FTP and HTTP/HTTPS protocols are allowed, "'.$protocol_matches[1].'" is not');
+        }
+    } else {
+        $SourceFilename = $phpThumb->ResolveFilenameToAbsolute($_GET['src']);
+        if (is_readable($SourceFilename)) {
+            $md5s = phpthumb_functions::md5_file_safe($SourceFilename);
+        } else {
+            $phpThumb->ErrorImage('ERROR: "'.$SourceFilename.'" cannot be read');
+        }
+    }
+    if (!empty($_SERVER['HTTP_REFERER'])) {
+        $phpThumb->ErrorImage('&md5s='.$md5s);
+    } else {
+        die('&md5s='.$md5s);
+    }
 }
 
 if (!empty($_GET['src']) && empty($phpThumb->config_allow_local_http_src) && preg_match('#^http://'.@$_SERVER['HTTP_HOST'].'(.+)#i', $_GET['src'], $matches)) {
-	$phpThumb->ErrorImage('It is MUCH better to specify the "src" parameter as "'.$matches[1].'" instead of "'.$matches[0].'".'."\n\n".'If you really must do it this way, enable "allow_local_http_src" in phpThumb.config.php');
+    $phpThumb->ErrorImage('It is MUCH better to specify the "src" parameter as "'.$matches[1].'" instead of "'.$matches[0].'".'."\n\n".'If you really must do it this way, enable "allow_local_http_src" in phpThumb.config.php');
 }
 
 ////////////////////////////////////////////////////////////////
 // Debug output, to try and help me diagnose problems
 $phpThumb->DebugTimingMessage('phpThumbDebug[1]', __FILE__, __LINE__);
 if (isset($_GET['phpThumbDebug']) && ($_GET['phpThumbDebug'] == '1')) {
-	$phpThumb->phpThumbDebug();
+    $phpThumb->phpThumbDebug();
 }
 ////////////////////////////////////////////////////////////////
 
 $parsed_url_referer = phpthumb_functions::ParseURLbetter(@$_SERVER['HTTP_REFERER']);
 if ($phpThumb->config_nooffsitelink_require_refer && !in_array(@$parsed_url_referer['host'], $phpThumb->config_nohotlink_valid_domains)) {
-	$phpThumb->ErrorImage('config_nooffsitelink_require_refer enabled and '.(@$parsed_url_referer['host'] ? '"'.$parsed_url_referer['host'].'" is not an allowed referer' : 'no HTTP_REFERER exists'));
+    $phpThumb->ErrorImage('config_nooffsitelink_require_refer enabled and '.(@$parsed_url_referer['host'] ? '"'.$parsed_url_referer['host'].'" is not an allowed referer' : 'no HTTP_REFERER exists'));
 }
 $parsed_url_src = phpthumb_functions::ParseURLbetter(@$_GET['src']);
 if ($phpThumb->config_nohotlink_enabled && $phpThumb->config_nohotlink_erase_image && preg_match('#^(f|ht)tps?://#i', @$_GET['src']) && !in_array(@$parsed_url_src['host'], $phpThumb->config_nohotlink_valid_domains)) {
-	$phpThumb->ErrorImage($phpThumb->config_nohotlink_text_message);
+    $phpThumb->ErrorImage($phpThumb->config_nohotlink_text_message);
 }
 
 if ($phpThumb->config_mysql_query) {
-	if ($phpThumb->config_mysql_extension == 'mysqli') {
-
-		$found_missing_function = false;
-		foreach (array('mysqli_connect') as $required_mysqli_function) {
-			if (!function_exists($required_mysqli_function)) {
-				$found_missing_function = $required_mysqli_function;
-				break;
-			}
-		}
-		if ($found_missing_function) {
-			$phpThumb->ErrorImage('SQL function unavailable: '.$found_missing_function);
-		} else {
-			$mysqli = new mysqli($phpThumb->config_mysql_hostname, $phpThumb->config_mysql_username, $phpThumb->config_mysql_password, $phpThumb->config_mysql_database);
-			if ($mysqli->connect_error) {
-				$phpThumb->ErrorImage('MySQLi connect error ('.$mysqli->connect_errno.') '.$mysqli->connect_error);
-			} else {
-				if ($result = $mysqli->query($phpThumb->config_mysql_query)) {
-					if ($row = $result->fetch_array()) {
-
-						$result->free();
-						$mysqli->close();
-						$phpThumb->setSourceData($row[0]);
-						unset($row);
-
-					} else {
-						$result->free();
-						$mysqli->close();
-						$phpThumb->ErrorImage('no matching data in database.');
-					}
-				} else {
-					$mysqli->close();
-					$phpThumb->ErrorImage('Error in MySQL query: "'.$mysqli->error.'"');
-				}
-			}
-			unset($_GET['id']);
-		}
-
-	} elseif ($phpThumb->config_mysql_extension == 'mysql') {
-
-		$found_missing_function = false;
-		//foreach (array('mysql_connect', 'mysql_select_db', 'mysql_query', 'mysql_fetch_array', 'mysql_free_result', 'mysql_close', 'mysql_error') as $required_mysql_function) {
-		foreach (array('mysql_connect') as $required_mysql_function) {
-			if (!function_exists($required_mysql_function)) {
-				$found_missing_function = $required_mysql_function;
-				break;
-			}
-		}
-		if ($found_missing_function) {
-			$phpThumb->ErrorImage('SQL function unavailable: '.$found_missing_function);
-		} else {
-			if ($cid = @mysql_connect($phpThumb->config_mysql_hostname, $phpThumb->config_mysql_username, $phpThumb->config_mysql_password)) {
-				if (@mysql_select_db($phpThumb->config_mysql_database, $cid)) {
-					if ($result = @mysql_query($phpThumb->config_mysql_query, $cid)) {
-						if ($row = @mysql_fetch_array($result)) {
-
-							mysql_free_result($result);
-							mysql_close($cid);
-							$phpThumb->setSourceData($row[0]);
-							unset($row);
-
-						} else {
-							mysql_free_result($result);
-							mysql_close($cid);
-							$phpThumb->ErrorImage('no matching data in database.');
-						}
-					} else {
-						mysql_close($cid);
-						$phpThumb->ErrorImage('Error in MySQL query: "'.mysql_error($cid).'"');
-					}
-				} else {
-					mysql_close($cid);
-					$phpThumb->ErrorImage('cannot select MySQL database: "'.mysql_error($cid).'"');
-				}
-			} else {
-				$phpThumb->ErrorImage('cannot connect to MySQL server');
-			}
-			unset($_GET['id']);
-		}
-
-	} else {
-		$phpThumb->ErrorImage('config_mysql_extension not supported');
-	}
+    if ($phpThumb->config_mysql_extension == 'mysqli') {
+
+        $found_missing_function = false;
+        foreach (array('mysqli_connect') as $required_mysqli_function) {
+            if (!function_exists($required_mysqli_function)) {
+                $found_missing_function = $required_mysqli_function;
+                break;
+            }
+        }
+        if ($found_missing_function) {
+            $phpThumb->ErrorImage('SQL function unavailable: '.$found_missing_function);
+        } else {
+            $mysqli = new mysqli($phpThumb->config_mysql_hostname, $phpThumb->config_mysql_username, $phpThumb->config_mysql_password, $phpThumb->config_mysql_database);
+            if ($mysqli->connect_error) {
+                $phpThumb->ErrorImage('MySQLi connect error ('.$mysqli->connect_errno.') '.$mysqli->connect_error);
+            } else {
+                if ($result = $mysqli->query($phpThumb->config_mysql_query)) {
+                    if ($row = $result->fetch_array()) {
+
+                        $result->free();
+                        $mysqli->close();
+                        $phpThumb->setSourceData($row[0]);
+                        unset($row);
+
+                    } else {
+                        $result->free();
+                        $mysqli->close();
+                        $phpThumb->ErrorImage('no matching data in database.');
+                    }
+                } else {
+                    $mysqli->close();
+                    $phpThumb->ErrorImage('Error in MySQL query: "'.$mysqli->error.'"');
+                }
+            }
+            unset($_GET['id']);
+        }
+
+    } elseif ($phpThumb->config_mysql_extension == 'mysql') {
+
+        $found_missing_function = false;
+        //foreach (array('mysql_connect', 'mysql_select_db', 'mysql_query', 'mysql_fetch_array', 'mysql_free_result', 'mysql_close', 'mysql_error') as $required_mysql_function) {
+        foreach (array('mysql_connect') as $required_mysql_function) {
+            if (!function_exists($required_mysql_function)) {
+                $found_missing_function = $required_mysql_function;
+                break;
+            }
+        }
+        if ($found_missing_function) {
+            $phpThumb->ErrorImage('SQL function unavailable: '.$found_missing_function);
+        } else {
+            if ($cid = @mysql_connect($phpThumb->config_mysql_hostname, $phpThumb->config_mysql_username, $phpThumb->config_mysql_password)) {
+                if (@mysql_select_db($phpThumb->config_mysql_database, $cid)) {
+                    if ($result = @mysql_query($phpThumb->config_mysql_query, $cid)) {
+                        if ($row = @mysql_fetch_array($result)) {
+
+                            mysql_free_result($result);
+                            mysql_close($cid);
+                            $phpThumb->setSourceData($row[0]);
+                            unset($row);
+
+                        } else {
+                            mysql_free_result($result);
+                            mysql_close($cid);
+                            $phpThumb->ErrorImage('no matching data in database.');
+                        }
+                    } else {
+                        mysql_close($cid);
+                        $phpThumb->ErrorImage('Error in MySQL query: "'.mysql_error($cid).'"');
+                    }
+                } else {
+                    mysql_close($cid);
+                    $phpThumb->ErrorImage('cannot select MySQL database: "'.mysql_error($cid).'"');
+                }
+            } else {
+                $phpThumb->ErrorImage('cannot connect to MySQL server');
+            }
+            unset($_GET['id']);
+        }
+
+    } else {
+        $phpThumb->ErrorImage('config_mysql_extension not supported');
+    }
 }
 
 ////////////////////////////////////////////////////////////////
 // Debug output, to try and help me diagnose problems
 $phpThumb->DebugTimingMessage('phpThumbDebug[2]', __FILE__, __LINE__);
 if (isset($_GET['phpThumbDebug']) && ($_GET['phpThumbDebug'] == '2')) {
-	$phpThumb->phpThumbDebug();
+    $phpThumb->phpThumbDebug();
 }
 ////////////////////////////////////////////////////////////////
 
@@ -376,34 +376,34 @@ 
 // deprecated: 'err', 'file', 'goto',
 $allowedGETparameters = array('src', 'new', 'w', 'h', 'wp', 'hp', 'wl', 'hl', 'ws', 'hs', 'f', 'q', 'sx', 'sy', 'sw', 'sh', 'zc', 'bc', 'bg', 'bgt', 'fltr', 'xto', 'ra', 'ar', 'aoe', 'far', 'iar', 'maxb', 'down', 'phpThumbDebug', 'hash', 'md5s', 'sfn', 'dpi', 'sia', 'nocache');
 foreach ($_GET as $key => $value) {
-	if (!empty($PHPTHUMB_DEFAULTS_DISABLEGETPARAMS) && ($key != 'src')) {
-		// disabled, do not set parameter
-		$phpThumb->DebugMessage('ignoring $_GET['.$key.'] because of $PHPTHUMB_DEFAULTS_DISABLEGETPARAMS', __FILE__, __LINE__);
-	} elseif (in_array($key, $allowedGETparameters)) {
-		$phpThumb->DebugMessage('setParameter('.$key.', '.$phpThumb->phpThumbDebugVarDump($value).')', __FILE__, __LINE__);
-		$phpThumb->setParameter($key, $value);
-	} else {
-		$phpThumb->ErrorImage('Forbidden parameter: '.$key);
-	}
+    if (!empty($PHPTHUMB_DEFAULTS_DISABLEGETPARAMS) && ($key != 'src')) {
+        // disabled, do not set parameter
+        $phpThumb->DebugMessage('ignoring $_GET['.$key.'] because of $PHPTHUMB_DEFAULTS_DISABLEGETPARAMS', __FILE__, __LINE__);
+    } elseif (in_array($key, $allowedGETparameters)) {
+        $phpThumb->DebugMessage('setParameter('.$key.', '.$phpThumb->phpThumbDebugVarDump($value).')', __FILE__, __LINE__);
+        $phpThumb->setParameter($key, $value);
+    } else {
+        $phpThumb->ErrorImage('Forbidden parameter: '.$key);
+    }
 }
 
 if (!empty($PHPTHUMB_DEFAULTS) && is_array($PHPTHUMB_DEFAULTS)) {
-	$phpThumb->DebugMessage('setting $PHPTHUMB_DEFAULTS['.implode(';', array_keys($PHPTHUMB_DEFAULTS)).']', __FILE__, __LINE__);
-	foreach ($PHPTHUMB_DEFAULTS as $key => $value) {
-		if (!$PHPTHUMB_DEFAULTS_GETSTRINGOVERRIDE || !isset($_GET[$key])) { // set parameter to default value if config is set to allow _GET to override default, OR if no value is passed via _GET for this parameter
-			//$_GET[$key] = $value;
-			//$phpThumb->DebugMessage('PHPTHUMB_DEFAULTS assigning ('.(is_array($value) ? print_r($value, true) : $value).') to $_GET['.$key.']', __FILE__, __LINE__);
-			$phpThumb->setParameter($key, $value);
-			$phpThumb->DebugMessage('setParameter('.$key.', '.$phpThumb->phpThumbDebugVarDump($value).') from $PHPTHUMB_DEFAULTS', __FILE__, __LINE__);
-		}
-	}
+    $phpThumb->DebugMessage('setting $PHPTHUMB_DEFAULTS['.implode(';', array_keys($PHPTHUMB_DEFAULTS)).']', __FILE__, __LINE__);
+    foreach ($PHPTHUMB_DEFAULTS as $key => $value) {
+        if (!$PHPTHUMB_DEFAULTS_GETSTRINGOVERRIDE || !isset($_GET[$key])) { // set parameter to default value if config is set to allow _GET to override default, OR if no value is passed via _GET for this parameter
+            //$_GET[$key] = $value;
+            //$phpThumb->DebugMessage('PHPTHUMB_DEFAULTS assigning ('.(is_array($value) ? print_r($value, true) : $value).') to $_GET['.$key.']', __FILE__, __LINE__);
+            $phpThumb->setParameter($key, $value);
+            $phpThumb->DebugMessage('setParameter('.$key.', '.$phpThumb->phpThumbDebugVarDump($value).') from $PHPTHUMB_DEFAULTS', __FILE__, __LINE__);
+        }
+    }
 }
 
 ////////////////////////////////////////////////////////////////
 // Debug output, to try and help me diagnose problems
 $phpThumb->DebugTimingMessage('phpThumbDebug[3]', __FILE__, __LINE__);
 if (isset($_GET['phpThumbDebug']) && ($_GET['phpThumbDebug'] == '3')) {
-	$phpThumb->phpThumbDebug();
+    $phpThumb->phpThumbDebug();
 }
 ////////////////////////////////////////////////////////////////
 
@@ -422,214 +422,214 @@ 
 // check to see if file can be output from source with no processing or caching
 $CanPassThroughDirectly = true;
 if ($phpThumb->rawImageData) {
-	// data from SQL, should be fine
+    // data from SQL, should be fine
 } elseif (preg_match('#^http\://[^\\?&]+\\.(jpe?g|gif|png)$#i', $phpThumb->src)) {
-	// assume is ok to passthru if no other parameters specified
+    // assume is ok to passthru if no other parameters specified
 } elseif (preg_match('#^(f|ht)tp\://#i', $phpThumb->src)) {
-	$phpThumb->DebugMessage('$CanPassThroughDirectly=false because preg_match("#^(f|ht)tp\://#i", '.$phpThumb->src.')', __FILE__, __LINE__);
-	$CanPassThroughDirectly = false;
+    $phpThumb->DebugMessage('$CanPassThroughDirectly=false because preg_match("#^(f|ht)tp\://#i", '.$phpThumb->src.')', __FILE__, __LINE__);
+    $CanPassThroughDirectly = false;
 } elseif (!@is_readable($phpThumb->sourceFilename)) {
-	$phpThumb->DebugMessage('$CanPassThroughDirectly=false because !@is_readable('.$phpThumb->sourceFilename.')', __FILE__, __LINE__);
-	$CanPassThroughDirectly = false;
+    $phpThumb->DebugMessage('$CanPassThroughDirectly=false because !@is_readable('.$phpThumb->sourceFilename.')', __FILE__, __LINE__);
+    $CanPassThroughDirectly = false;
 } elseif (!@is_file($phpThumb->sourceFilename)) {
-	$phpThumb->DebugMessage('$CanPassThroughDirectly=false because !@is_file('.$phpThumb->sourceFilename.')', __FILE__, __LINE__);
-	$CanPassThroughDirectly = false;
+    $phpThumb->DebugMessage('$CanPassThroughDirectly=false because !@is_file('.$phpThumb->sourceFilename.')', __FILE__, __LINE__);
+    $CanPassThroughDirectly = false;
 }
 foreach ($_GET as $key => $value) {
-	switch ($key) {
-		case 'src':
-			// allowed
-			break;
-
-		case 'w':
-		case 'h':
-			// might be OK if exactly matches original
-			if (preg_match('#^http\://[^\\?&]+\\.(jpe?g|gif|png)$#i', $phpThumb->src)) {
-				// assume it is not ok for direct-passthru of remote image
-				$CanPassThroughDirectly = false;
-			}
-			break;
-
-		case 'phpThumbDebug':
-			// handled in direct-passthru code
-			break;
-
-		default:
-			// all other parameters will cause some processing,
-			// therefore cannot pass through original image unmodified
-			$CanPassThroughDirectly = false;
-			$UnAllowedGET[] = $key;
-			break;
-	}
+    switch ($key) {
+        case 'src':
+            // allowed
+            break;
+
+        case 'w':
+        case 'h':
+            // might be OK if exactly matches original
+            if (preg_match('#^http\://[^\\?&]+\\.(jpe?g|gif|png)$#i', $phpThumb->src)) {
+                // assume it is not ok for direct-passthru of remote image
+                $CanPassThroughDirectly = false;
+            }
+            break;
+
+        case 'phpThumbDebug':
+            // handled in direct-passthru code
+            break;
+
+        default:
+            // all other parameters will cause some processing,
+            // therefore cannot pass through original image unmodified
+            $CanPassThroughDirectly = false;
+            $UnAllowedGET[] = $key;
+            break;
+    }
 }
 if (!empty($UnAllowedGET)) {
-	$phpThumb->DebugMessage('$CanPassThroughDirectly=false because $_GET['.implode(';', array_unique($UnAllowedGET)).'] are set', __FILE__, __LINE__);
+    $phpThumb->DebugMessage('$CanPassThroughDirectly=false because $_GET['.implode(';', array_unique($UnAllowedGET)).'] are set', __FILE__, __LINE__);
 }
 
 ////////////////////////////////////////////////////////////////
 // Debug output, to try and help me diagnose problems
 $phpThumb->DebugTimingMessage('phpThumbDebug[4]', __FILE__, __LINE__);
 if (isset($_GET['phpThumbDebug']) && ($_GET['phpThumbDebug'] == '4')) {
-	$phpThumb->phpThumbDebug();
+    $phpThumb->phpThumbDebug();
 }
 ////////////////////////////////////////////////////////////////
 
 $phpThumb->DebugMessage('$CanPassThroughDirectly="'. (int) $CanPassThroughDirectly .'" && $phpThumb->src="'.$phpThumb->src.'"', __FILE__, __LINE__);
 while ($CanPassThroughDirectly && $phpThumb->src) {
-	// no parameters set, passthru
-
-	if (preg_match('#^http\://[^\\?&]+\.(jpe?g|gif|png)$#i', $phpThumb->src)) {
-		$phpThumb->DebugMessage('Passing HTTP source through directly as Location: redirect ('.$phpThumb->src.')', __FILE__, __LINE__);
-		header('Location: '.$phpThumb->src);
-		exit;
-	}
-
-	$SourceFilename = $phpThumb->ResolveFilenameToAbsolute($phpThumb->src);
-
-	// security and size checks
-	if ($phpThumb->getimagesizeinfo = @getimagesize($SourceFilename)) {
-		$phpThumb->DebugMessage('Direct passthru getimagesize() returned [w='.$phpThumb->getimagesizeinfo[0].';h='.$phpThumb->getimagesizeinfo[1].';t='.$phpThumb->getimagesizeinfo[2].']', __FILE__, __LINE__);
-
-		if (!@$_GET['w'] && !@$_GET['wp'] && !@$_GET['wl'] && !@$_GET['ws'] && !@$_GET['h'] && !@$_GET['hp'] && !@$_GET['hl'] && !@$_GET['hs']) {
-			// no resizing needed
-			$phpThumb->DebugMessage('Passing "'.$SourceFilename.'" through directly, no resizing required ("'.$phpThumb->getimagesizeinfo[0].'"x"'.$phpThumb->getimagesizeinfo[1].'")', __FILE__, __LINE__);
-		} elseif (($phpThumb->getimagesizeinfo[0] <= @$_GET['w']) && ($phpThumb->getimagesizeinfo[1] <= @$_GET['h']) && ((@$_GET['w'] == $phpThumb->getimagesizeinfo[0]) || (@$_GET['h'] == $phpThumb->getimagesizeinfo[1]))) {
-			// image fits into 'w'x'h' box, and at least one dimension matches exactly, therefore no resizing needed
-			$phpThumb->DebugMessage('Passing "'.$SourceFilename.'" through directly, no resizing required ("'.$phpThumb->getimagesizeinfo[0].'"x"'.$phpThumb->getimagesizeinfo[1].'" fits inside "'.@$_GET['w'].'"x"'.@$_GET['h'].'")', __FILE__, __LINE__);
-		} else {
-			$phpThumb->DebugMessage('Not passing "'.$SourceFilename.'" through directly because resizing required (from "'.$phpThumb->getimagesizeinfo[0].'"x"'.$phpThumb->getimagesizeinfo[1].'" to "'.@$_GET['w'].'"x"'.@$_GET['h'].'")', __FILE__, __LINE__);
-			break;
-		}
-		switch ($phpThumb->getimagesizeinfo[2]) {
-			case 1: // GIF
-			case 2: // JPG
-			case 3: // PNG
-				// great, let it through
-				break;
-			default:
-				// browser probably can't handle format, remangle it to JPEG/PNG/GIF
-				$phpThumb->DebugMessage('Not passing "'.$SourceFilename.'" through directly because $phpThumb->getimagesizeinfo[2] = "'.$phpThumb->getimagesizeinfo[2].'"', __FILE__, __LINE__);
-				break 2;
-		}
-
-		$ImageCreateFunctions = array(1=>'imagecreatefromgif', 2=>'imagecreatefromjpeg', 3=>'imagecreatefrompng');
-		$theImageCreateFunction = @$ImageCreateFunctions[$phpThumb->getimagesizeinfo[2]];
-		$dummyImage = false;
-		if ($phpThumb->config_disable_onlycreateable_passthru || (function_exists($theImageCreateFunction) && ($dummyImage = @$theImageCreateFunction($SourceFilename)))) {
-
-			// great
-			if (@is_resource($dummyImage)) {
-				unset($dummyImage);
-			}
-
-			if (headers_sent()) {
-				$phpThumb->ErrorImage('Headers already sent ('.basename(__FILE__).' line '.__LINE__.')');
-				exit;
-			}
-			if (!empty($_GET['phpThumbDebug'])) {
-				$phpThumb->DebugTimingMessage('skipped direct $SourceFilename passthru', __FILE__, __LINE__);
-				$phpThumb->DebugMessage('Would have passed "'.$SourceFilename.'" through directly, but skipping due to phpThumbDebug', __FILE__, __LINE__);
-				break;
-			}
-
-			SendSaveAsFileHeaderIfNeeded();
-			header('Last-Modified: '.gmdate('D, d M Y H:i:s', @filemtime($SourceFilename)).' GMT');
-			if ($contentType = phpthumb_functions::ImageTypeToMIMEtype(@$phpThumb->getimagesizeinfo[2])) {
-				header('Content-Type: '.$contentType);
-			}
-			@readfile($SourceFilename);
-			exit;
-
-		} else {
-			$phpThumb->DebugMessage('Not passing "'.$SourceFilename.'" through directly because ($phpThumb->config_disable_onlycreateable_passthru = "'.$phpThumb->config_disable_onlycreateable_passthru.'") and '.$theImageCreateFunction.'() failed', __FILE__, __LINE__);
-			break;
-		}
-
-	} else {
-		$phpThumb->DebugMessage('Not passing "'.$SourceFilename.'" through directly because getimagesize() failed', __FILE__, __LINE__);
-		break;
-	}
-	break;
+    // no parameters set, passthru
+
+    if (preg_match('#^http\://[^\\?&]+\.(jpe?g|gif|png)$#i', $phpThumb->src)) {
+        $phpThumb->DebugMessage('Passing HTTP source through directly as Location: redirect ('.$phpThumb->src.')', __FILE__, __LINE__);
+        header('Location: '.$phpThumb->src);
+        exit;
+    }
+
+    $SourceFilename = $phpThumb->ResolveFilenameToAbsolute($phpThumb->src);
+
+    // security and size checks
+    if ($phpThumb->getimagesizeinfo = @getimagesize($SourceFilename)) {
+        $phpThumb->DebugMessage('Direct passthru getimagesize() returned [w='.$phpThumb->getimagesizeinfo[0].';h='.$phpThumb->getimagesizeinfo[1].';t='.$phpThumb->getimagesizeinfo[2].']', __FILE__, __LINE__);
+
+        if (!@$_GET['w'] && !@$_GET['wp'] && !@$_GET['wl'] && !@$_GET['ws'] && !@$_GET['h'] && !@$_GET['hp'] && !@$_GET['hl'] && !@$_GET['hs']) {
+            // no resizing needed
+            $phpThumb->DebugMessage('Passing "'.$SourceFilename.'" through directly, no resizing required ("'.$phpThumb->getimagesizeinfo[0].'"x"'.$phpThumb->getimagesizeinfo[1].'")', __FILE__, __LINE__);
+        } elseif (($phpThumb->getimagesizeinfo[0] <= @$_GET['w']) && ($phpThumb->getimagesizeinfo[1] <= @$_GET['h']) && ((@$_GET['w'] == $phpThumb->getimagesizeinfo[0]) || (@$_GET['h'] == $phpThumb->getimagesizeinfo[1]))) {
+            // image fits into 'w'x'h' box, and at least one dimension matches exactly, therefore no resizing needed
+            $phpThumb->DebugMessage('Passing "'.$SourceFilename.'" through directly, no resizing required ("'.$phpThumb->getimagesizeinfo[0].'"x"'.$phpThumb->getimagesizeinfo[1].'" fits inside "'.@$_GET['w'].'"x"'.@$_GET['h'].'")', __FILE__, __LINE__);
+        } else {
+            $phpThumb->DebugMessage('Not passing "'.$SourceFilename.'" through directly because resizing required (from "'.$phpThumb->getimagesizeinfo[0].'"x"'.$phpThumb->getimagesizeinfo[1].'" to "'.@$_GET['w'].'"x"'.@$_GET['h'].'")', __FILE__, __LINE__);
+            break;
+        }
+        switch ($phpThumb->getimagesizeinfo[2]) {
+            case 1: // GIF
+            case 2: // JPG
+            case 3: // PNG
+                // great, let it through
+                break;
+            default:
+                // browser probably can't handle format, remangle it to JPEG/PNG/GIF
+                $phpThumb->DebugMessage('Not passing "'.$SourceFilename.'" through directly because $phpThumb->getimagesizeinfo[2] = "'.$phpThumb->getimagesizeinfo[2].'"', __FILE__, __LINE__);
+                break 2;
+        }
+
+        $ImageCreateFunctions = array(1=>'imagecreatefromgif', 2=>'imagecreatefromjpeg', 3=>'imagecreatefrompng');
+        $theImageCreateFunction = @$ImageCreateFunctions[$phpThumb->getimagesizeinfo[2]];
+        $dummyImage = false;
+        if ($phpThumb->config_disable_onlycreateable_passthru || (function_exists($theImageCreateFunction) && ($dummyImage = @$theImageCreateFunction($SourceFilename)))) {
+
+            // great
+            if (@is_resource($dummyImage)) {
+                unset($dummyImage);
+            }
+
+            if (headers_sent()) {
+                $phpThumb->ErrorImage('Headers already sent ('.basename(__FILE__).' line '.__LINE__.')');
+                exit;
+            }
+            if (!empty($_GET['phpThumbDebug'])) {
+                $phpThumb->DebugTimingMessage('skipped direct $SourceFilename passthru', __FILE__, __LINE__);
+                $phpThumb->DebugMessage('Would have passed "'.$SourceFilename.'" through directly, but skipping due to phpThumbDebug', __FILE__, __LINE__);
+                break;
+            }
+
+            SendSaveAsFileHeaderIfNeeded();
+            header('Last-Modified: '.gmdate('D, d M Y H:i:s', @filemtime($SourceFilename)).' GMT');
+            if ($contentType = phpthumb_functions::ImageTypeToMIMEtype(@$phpThumb->getimagesizeinfo[2])) {
+                header('Content-Type: '.$contentType);
+            }
+            @readfile($SourceFilename);
+            exit;
+
+        } else {
+            $phpThumb->DebugMessage('Not passing "'.$SourceFilename.'" through directly because ($phpThumb->config_disable_onlycreateable_passthru = "'.$phpThumb->config_disable_onlycreateable_passthru.'") and '.$theImageCreateFunction.'() failed', __FILE__, __LINE__);
+            break;
+        }
+
+    } else {
+        $phpThumb->DebugMessage('Not passing "'.$SourceFilename.'" through directly because getimagesize() failed', __FILE__, __LINE__);
+        break;
+    }
+    break;
 }
 
 ////////////////////////////////////////////////////////////////
 // Debug output, to try and help me diagnose problems
 $phpThumb->DebugTimingMessage('phpThumbDebug[5]', __FILE__, __LINE__);
 if (isset($_GET['phpThumbDebug']) && ($_GET['phpThumbDebug'] == '5')) {
-	$phpThumb->phpThumbDebug();
+    $phpThumb->phpThumbDebug();
 }
 ////////////////////////////////////////////////////////////////
 
 // check to see if file already exists in cache, and output it with no processing if it does
 $phpThumb->SetCacheFilename();
 if (@is_readable($phpThumb->cache_filename)) {
-	RedirectToCachedFile();
+    RedirectToCachedFile();
 } else {
-	$phpThumb->DebugMessage('Cached file "'.$phpThumb->cache_filename.'" does not exist, processing as normal', __FILE__, __LINE__);
+    $phpThumb->DebugMessage('Cached file "'.$phpThumb->cache_filename.'" does not exist, processing as normal', __FILE__, __LINE__);
 }
 
 ////////////////////////////////////////////////////////////////
 // Debug output, to try and help me diagnose problems
 $phpThumb->DebugTimingMessage('phpThumbDebug[6]', __FILE__, __LINE__);
 if (isset($_GET['phpThumbDebug']) && ($_GET['phpThumbDebug'] == '6')) {
-	$phpThumb->phpThumbDebug();
+    $phpThumb->phpThumbDebug();
 }
 ////////////////////////////////////////////////////////////////
 
 if ($phpThumb->rawImageData) {
 
-	// great
+    // great
 
 } elseif (!empty($_GET['new'])) {
 
-	// generate a blank image resource of the specified size/background color/opacity
-	if (($phpThumb->w <= 0) || ($phpThumb->h <= 0)) {
-		$phpThumb->ErrorImage('"w" and "h" parameters required for "new"');
-	}
-	@list($bghexcolor, $opacity) = explode('|', $_GET['new']);
-	if (!phpthumb_functions::IsHexColor($bghexcolor)) {
-		$phpThumb->ErrorImage('BGcolor parameter for "new" is not valid');
-	}
-	$opacity = ('' !== $opacity ? $opacity : 100);
-	if ($phpThumb->gdimg_source = phpthumb_functions::ImageCreateFunction($phpThumb->w, $phpThumb->h)) {
-		$alpha = (100 - min(100, max(0, $opacity))) * 1.27;
-		if ($alpha) {
-			$phpThumb->setParameter('is_alpha', true);
-			imagealphablending($phpThumb->gdimg_source, false);
-			imagesavealpha($phpThumb->gdimg_source, true);
-		}
-		$new_background_color = phpthumb_functions::ImageHexColorAllocate($phpThumb->gdimg_source, $bghexcolor, false, $alpha);
-		imagefilledrectangle($phpThumb->gdimg_source, 0, 0, $phpThumb->w, $phpThumb->h, $new_background_color);
-	} else {
-		$phpThumb->ErrorImage('failed to create "new" image ('.$phpThumb->w.'x'.$phpThumb->h.')');
-	}
+    // generate a blank image resource of the specified size/background color/opacity
+    if (($phpThumb->w <= 0) || ($phpThumb->h <= 0)) {
+        $phpThumb->ErrorImage('"w" and "h" parameters required for "new"');
+    }
+    @list($bghexcolor, $opacity) = explode('|', $_GET['new']);
+    if (!phpthumb_functions::IsHexColor($bghexcolor)) {
+        $phpThumb->ErrorImage('BGcolor parameter for "new" is not valid');
+    }
+    $opacity = ('' !== $opacity ? $opacity : 100);
+    if ($phpThumb->gdimg_source = phpthumb_functions::ImageCreateFunction($phpThumb->w, $phpThumb->h)) {
+        $alpha = (100 - min(100, max(0, $opacity))) * 1.27;
+        if ($alpha) {
+            $phpThumb->setParameter('is_alpha', true);
+            imagealphablending($phpThumb->gdimg_source, false);
+            imagesavealpha($phpThumb->gdimg_source, true);
+        }
+        $new_background_color = phpthumb_functions::ImageHexColorAllocate($phpThumb->gdimg_source, $bghexcolor, false, $alpha);
+        imagefilledrectangle($phpThumb->gdimg_source, 0, 0, $phpThumb->w, $phpThumb->h, $new_background_color);
+    } else {
+        $phpThumb->ErrorImage('failed to create "new" image ('.$phpThumb->w.'x'.$phpThumb->h.')');
+    }
 
 } elseif (!$phpThumb->src) {
 
-	$phpThumb->ErrorImage('Usage: '.$_SERVER['PHP_SELF'].'?src=/path/and/filename.jpg'."\n".'read Usage comments for details');
+    $phpThumb->ErrorImage('Usage: '.$_SERVER['PHP_SELF'].'?src=/path/and/filename.jpg'."\n".'read Usage comments for details');
 
 } elseif (preg_match('#^([a-z0-9]+)://#i', $_GET['src'], $protocol_matches)) {
 
-	if (preg_match('#^(f|ht)tps?://#i', $_GET['src'])) {
-		$phpThumb->DebugMessage('$phpThumb->src ('.$phpThumb->src.') is remote image, attempting to download', __FILE__, __LINE__);
-		if ($phpThumb->config_http_user_agent) {
-			$phpThumb->DebugMessage('Setting "user_agent" to "'.$phpThumb->config_http_user_agent.'"', __FILE__, __LINE__);
-			ini_set('user_agent', $phpThumb->config_http_user_agent);
-		}
-		$cleanedupurl = phpthumb_functions::CleanUpURLencoding($phpThumb->src);
-		$phpThumb->DebugMessage('CleanUpURLencoding('.$phpThumb->src.') returned "'.$cleanedupurl.'"', __FILE__, __LINE__);
-		$phpThumb->src = $cleanedupurl;
-		unset($cleanedupurl);
-		if ($rawImageData = phpthumb_functions::SafeURLread($phpThumb->src, $error, $phpThumb->config_http_fopen_timeout, $phpThumb->config_http_follow_redirect)) {
-			$phpThumb->DebugMessage('SafeURLread('.$phpThumb->src.') succeeded'.($error ? ' with messages: "'.$error.'"' : ''), __FILE__, __LINE__);
-			$phpThumb->DebugMessage('Setting source data from URL "'.$phpThumb->src.'"', __FILE__, __LINE__);
-			$phpThumb->setSourceData($rawImageData, urlencode($phpThumb->src));
-		} else {
-			$phpThumb->ErrorImage($error);
-		}
-	} else {
-		$phpThumb->ErrorImage('only FTP and HTTP/HTTPS protocols are allowed, "'.$protocol_matches[1].'" is not');
-	}
+    if (preg_match('#^(f|ht)tps?://#i', $_GET['src'])) {
+        $phpThumb->DebugMessage('$phpThumb->src ('.$phpThumb->src.') is remote image, attempting to download', __FILE__, __LINE__);
+        if ($phpThumb->config_http_user_agent) {
+            $phpThumb->DebugMessage('Setting "user_agent" to "'.$phpThumb->config_http_user_agent.'"', __FILE__, __LINE__);
+            ini_set('user_agent', $phpThumb->config_http_user_agent);
+        }
+        $cleanedupurl = phpthumb_functions::CleanUpURLencoding($phpThumb->src);
+        $phpThumb->DebugMessage('CleanUpURLencoding('.$phpThumb->src.') returned "'.$cleanedupurl.'"', __FILE__, __LINE__);
+        $phpThumb->src = $cleanedupurl;
+        unset($cleanedupurl);
+        if ($rawImageData = phpthumb_functions::SafeURLread($phpThumb->src, $error, $phpThumb->config_http_fopen_timeout, $phpThumb->config_http_follow_redirect)) {
+            $phpThumb->DebugMessage('SafeURLread('.$phpThumb->src.') succeeded'.($error ? ' with messages: "'.$error.'"' : ''), __FILE__, __LINE__);
+            $phpThumb->DebugMessage('Setting source data from URL "'.$phpThumb->src.'"', __FILE__, __LINE__);
+            $phpThumb->setSourceData($rawImageData, urlencode($phpThumb->src));
+        } else {
+            $phpThumb->ErrorImage($error);
+        }
+    } else {
+        $phpThumb->ErrorImage('only FTP and HTTP/HTTPS protocols are allowed, "'.$protocol_matches[1].'" is not');
+    }
 
 }
 
@@ -637,7 +637,7 @@ 
 // Debug output, to try and help me diagnose problems
 $phpThumb->DebugTimingMessage('phpThumbDebug[7]', __FILE__, __LINE__);
 if (isset($_GET['phpThumbDebug']) && ($_GET['phpThumbDebug'] == '7')) {
-	$phpThumb->phpThumbDebug();
+    $phpThumb->phpThumbDebug();
 }
 ////////////////////////////////////////////////////////////////
 
@@ -647,32 +647,32 @@ 
 // Debug output, to try and help me diagnose problems
 $phpThumb->DebugTimingMessage('phpThumbDebug[8]', __FILE__, __LINE__);
 if (isset($_GET['phpThumbDebug']) && ($_GET['phpThumbDebug'] == '8')) {
-	$phpThumb->phpThumbDebug();
+    $phpThumb->phpThumbDebug();
 }
 ////////////////////////////////////////////////////////////////
 
 if (!empty($phpThumb->config_high_security_enabled) && !empty($_GET['nocache'])) {
 
-	// cache disabled, don't write cachefile
+    // cache disabled, don't write cachefile
 
 } else {
 
-	phpthumb_functions::EnsureDirectoryExists(dirname($phpThumb->cache_filename));
-	if (is_writable(dirname($phpThumb->cache_filename)) || (file_exists($phpThumb->cache_filename) && is_writable($phpThumb->cache_filename))) {
+    phpthumb_functions::EnsureDirectoryExists(dirname($phpThumb->cache_filename));
+    if (is_writable(dirname($phpThumb->cache_filename)) || (file_exists($phpThumb->cache_filename) && is_writable($phpThumb->cache_filename))) {
 
-		$phpThumb->CleanUpCacheDirectory();
-		if ($phpThumb->RenderToFile($phpThumb->cache_filename) && is_readable($phpThumb->cache_filename)) {
-			chmod($phpThumb->cache_filename, 0644);
-			RedirectToCachedFile();
-		} else {
-			$phpThumb->DebugMessage('Failed: RenderToFile('.$phpThumb->cache_filename.')', __FILE__, __LINE__);
-		}
+        $phpThumb->CleanUpCacheDirectory();
+        if ($phpThumb->RenderToFile($phpThumb->cache_filename) && is_readable($phpThumb->cache_filename)) {
+            chmod($phpThumb->cache_filename, 0644);
+            RedirectToCachedFile();
+        } else {
+            $phpThumb->DebugMessage('Failed: RenderToFile('.$phpThumb->cache_filename.')', __FILE__, __LINE__);
+        }
 
-	} else {
+    } else {
 
-		$phpThumb->DebugMessage('Cannot write to $phpThumb->cache_filename ('.$phpThumb->cache_filename.') because that directory ('.dirname($phpThumb->cache_filename).') is not writable', __FILE__, __LINE__);
+        $phpThumb->DebugMessage('Cannot write to $phpThumb->cache_filename ('.$phpThumb->cache_filename.') because that directory ('.dirname($phpThumb->cache_filename).') is not writable', __FILE__, __LINE__);
 
-	}
+    }
 
 }
 
@@ -680,18 +680,18 @@ 
 // Debug output, to try and help me diagnose problems
 $phpThumb->DebugTimingMessage('phpThumbDebug[9]', __FILE__, __LINE__);
 if (isset($_GET['phpThumbDebug']) && ($_GET['phpThumbDebug'] == '9')) {
-	$phpThumb->phpThumbDebug();
+    $phpThumb->phpThumbDebug();
 }
 ////////////////////////////////////////////////////////////////
 
 if (!$phpThumb->OutputThumbnail()) {
-	$phpThumb->ErrorImage('Error in OutputThumbnail():'."\n".$phpThumb->debugmessages[(count($phpThumb->debugmessages) - 1)]);
+    $phpThumb->ErrorImage('Error in OutputThumbnail():'."\n".$phpThumb->debugmessages[(count($phpThumb->debugmessages) - 1)]);
 }
 
 ////////////////////////////////////////////////////////////////
 // Debug output, to try and help me diagnose problems
 $phpThumb->DebugTimingMessage('phpThumbDebug[10]', __FILE__, __LINE__);
 if (isset($_GET['phpThumbDebug']) && ($_GET['phpThumbDebug'] == '10')) {
-	$phpThumb->phpThumbDebug();
+    $phpThumb->phpThumbDebug();
 }
 ////////////////////////////////////////////////////////////////

Spacing +12 added lines, -12 removed lines

@@ -79,7 +79,7 @@ 
 
 		header('Pragma: private');
 		header('Cache-Control: max-age='.$phpThumb->getParameter('config_cache_maxage'));
-		header('Expires: '.date(DATE_RFC1123,  time() + $phpThumb->getParameter('config_cache_maxage')));
+		header('Expires: '.date(DATE_RFC1123, time() + $phpThumb->getParameter('config_cache_maxage')));
 		if (!empty($_SERVER['HTTP_IF_MODIFIED_SINCE']) && ($nModified == strtotime($_SERVER['HTTP_IF_MODIFIED_SINCE'])) && !empty($_SERVER['SERVER_PROTOCOL'])) {
 			header('Last-Modified: '.gmdate('D, d M Y H:i:s', $nModified).' GMT');
 			header($_SERVER['SERVER_PROTOCOL'].' 304 Not Modified');
@@ -108,9 +108,9 @@ 
 
 // instantiate a new phpThumb() object
 ob_start();
-if (!include_once( __DIR__ .'/phpthumb.class.php')) {
+if (!include_once(__DIR__.'/phpthumb.class.php')) {
 	ob_end_flush();
-	die('failed to include_once("'.realpath( __DIR__ .'/phpthumb.class.php').'")');
+	die('failed to include_once("'.realpath(__DIR__.'/phpthumb.class.php').'")');
 }
 ob_end_clean();
 $phpThumb = new phpThumb();
@@ -118,28 +118,28 @@ 
 $phpThumb->setParameter('config_error_die_on_error', true);
 
 if (!phpthumb_functions::FunctionIsDisabled('set_time_limit')) {
-	set_time_limit(60);  // shouldn't take nearly this long in most cases, but with many filters and/or a slow server...
+	set_time_limit(60); // shouldn't take nearly this long in most cases, but with many filters and/or a slow server...
 }
 
 // phpThumbDebug[0] used to be here, but may reveal too much
 // info when high_security_mode should be enabled (not set yet)
 
-if (file_exists( __DIR__ .'/phpThumb.config.php')) {
+if (file_exists(__DIR__.'/phpThumb.config.php')) {
 	ob_start();
-	if (include_once( __DIR__ .'/phpThumb.config.php')) {
+	if (include_once(__DIR__.'/phpThumb.config.php')) {
 		// great
 	} else {
 		ob_end_flush();
 		$phpThumb->config_disable_debug = false; // otherwise error message won't print
-		$phpThumb->ErrorImage('failed to include_once('. __DIR__ .'/phpThumb.config.php) - realpath="'.realpath( __DIR__ .'/phpThumb.config.php').'"');
+		$phpThumb->ErrorImage('failed to include_once('.__DIR__.'/phpThumb.config.php) - realpath="'.realpath(__DIR__.'/phpThumb.config.php').'"');
 	}
 	ob_end_clean();
-} elseif (file_exists( __DIR__ .'/phpThumb.config.php.default')) {
+} elseif (file_exists(__DIR__.'/phpThumb.config.php.default')) {
 	$phpThumb->config_disable_debug = false; // otherwise error message won't print
 	$phpThumb->ErrorImage('Please rename "phpThumb.config.php.default" to "phpThumb.config.php"');
 } else {
 	$phpThumb->config_disable_debug = false; // otherwise error message won't print
-	$phpThumb->ErrorImage('failed to include_once('. __DIR__ .'/phpThumb.config.php) - realpath="'.realpath( __DIR__ .'/phpThumb.config.php').'"');
+	$phpThumb->ErrorImage('failed to include_once('.__DIR__.'/phpThumb.config.php) - realpath="'.realpath(__DIR__.'/phpThumb.config.php').'"');
 }
 
 if (!empty($PHPTHUMB_CONFIG)) {
@@ -152,7 +152,7 @@ 
 	}
 	if (!$phpThumb->config_disable_debug) {
 		// if debug mode is enabled, force phpThumbDebug output, do not allow normal thumbnails to be generated
-		$_GET['phpThumbDebug'] = (!empty($_GET['phpThumbDebug']) ? max(1, (int) $_GET[ 'phpThumbDebug']) : 9);
+		$_GET['phpThumbDebug'] = (!empty($_GET['phpThumbDebug']) ? max(1, (int)$_GET['phpThumbDebug']) : 9);
 		$phpThumb->setParameter('phpThumbDebug', $_GET['phpThumbDebug']);
 	}
 } else {
@@ -371,7 +371,7 @@ 
 }
 ////////////////////////////////////////////////////////////////
 
-$PHPTHUMB_DEFAULTS_DISABLEGETPARAMS = (bool) ($phpThumb->config_cache_default_only_suffix && (strpos($phpThumb->config_cache_default_only_suffix, '*') !== false));
+$PHPTHUMB_DEFAULTS_DISABLEGETPARAMS = (bool)($phpThumb->config_cache_default_only_suffix && (strpos($phpThumb->config_cache_default_only_suffix, '*') !== false));
 
 // deprecated: 'err', 'file', 'goto',
 $allowedGETparameters = array('src', 'new', 'w', 'h', 'wp', 'hp', 'wl', 'hl', 'ws', 'hs', 'f', 'q', 'sx', 'sy', 'sw', 'sh', 'zc', 'bc', 'bg', 'bgt', 'fltr', 'xto', 'ra', 'ar', 'aoe', 'far', 'iar', 'maxb', 'down', 'phpThumbDebug', 'hash', 'md5s', 'sfn', 'dpi', 'sia', 'nocache');
@@ -474,7 +474,7 @@ 
 }
 ////////////////////////////////////////////////////////////////
 
-$phpThumb->DebugMessage('$CanPassThroughDirectly="'. (int) $CanPassThroughDirectly .'" && $phpThumb->src="'.$phpThumb->src.'"', __FILE__, __LINE__);
+$phpThumb->DebugMessage('$CanPassThroughDirectly="'.(int)$CanPassThroughDirectly.'" && $phpThumb->src="'.$phpThumb->src.'"', __FILE__, __LINE__);
 while ($CanPassThroughDirectly && $phpThumb->src) {
 	// no parameters set, passthru
 

htdocs/install/include/makedata.php

Indentation +5 added lines, -5 removed lines

@@ -198,9 +198,9 @@ 
     $dbm->insert('config', " VALUES (32, 0, 1, 'com_mode', '_MD_AM_COMMODE', 'flat', '_MD_AM_COMMODEDSC', 'select', 'text', 34)");
     $dbm->insert('config', " VALUES (33, 0, 1, 'com_order', '_MD_AM_COMORDER', '0', '_MD_AM_COMORDERDSC', 'select', 'int', 36)");
     $dbm->insert('config', " VALUES (34, 0, 2, 'bad_unames', '_MD_AM_BADUNAMES', '" . addslashes(serialize(array(
-                                                                                                               'webmaster',
-                                                                                                               '^xoops',
-                                                                                                               '^admin'))) . "', '_MD_AM_BADUNAMESDSC', 'textarea', 'array', 24)");
+                                                                                                                'webmaster',
+                                                                                                                '^xoops',
+                                                                                                                '^admin'))) . "', '_MD_AM_BADUNAMESDSC', 'textarea', 'array', 24)");
     $dbm->insert('config', " VALUES (35, 0, 2, 'bad_emails', '_MD_AM_BADEMAILS', '" . addslashes(serialize(array('xoops.org$'))) . "', '_MD_AM_BADEMAILSDSC', 'textarea', 'array', 26)");
     $dbm->insert('config', " VALUES (36, 0, 2, 'maxuname', '_MD_AM_MAXUNAME', '10', '_MD_AM_MAXUNAMEDSC', 'textbox', 'int', 3)");
     $dbm->insert('config', " VALUES (37, 0, 1, 'bad_ips', '_MD_AM_BADIPS', '" . addslashes(serialize(array('127.0.0.1'))) . "', '_MD_AM_BADIPSDSC', 'textarea', 'array', 42)");
@@ -208,8 +208,8 @@ 
     $dbm->insert('config', " VALUES (39, 0, 3, 'footer', '_MD_AM_FOOTER', 'Powered by XOOPS &#169; 2001-" . date('Y', time()) . " <a href=\"http://xoops.org\" rel=\"external\" title=\"The XOOPS Project\">The XOOPS Project</a>', '_MD_AM_FOOTERDSC', 'textarea', 'text', 20)");
     $dbm->insert('config', " VALUES (40, 0, 4, 'censor_enable', '_MD_AM_DOCENSOR', '0', '_MD_AM_DOCENSORDSC', 'yesno', 'int', 0)");
     $dbm->insert('config', " VALUES (41, 0, 4, 'censor_words', '_MD_AM_CENSORWRD', '" . addslashes(serialize(array(
-                                                                                                                 'fuck',
-                                                                                                                 'shit'))) . "', '_MD_AM_CENSORWRDDSC', 'textarea', 'array', 1)");
+                                                                                                                    'fuck',
+                                                                                                                    'shit'))) . "', '_MD_AM_CENSORWRDDSC', 'textarea', 'array', 1)");
     $dbm->insert('config', " VALUES (42, 0, 4, 'censor_replace', '_MD_AM_CENSORRPLC', '#OOPS#', '_MD_AM_CENSORRPLCDSC', 'textbox', 'text', 2)");
     $dbm->insert('config', " VALUES (43, 0, 3, 'meta_robots', '_MD_AM_METAROBOTS', 'index,follow', '_MD_AM_METAROBOTSDSC', 'textbox', 'text', 2)");
     $dbm->insert('config', " VALUES (44, 0, 5, 'enable_search', '_MD_AM_DOSEARCH', '1', '_MD_AM_DOSEARCHDSC', 'yesno', 'int', 0)");

Spacing +81 added lines, -81 removed lines

@@ -33,9 +33,9 @@ 
 // of missing fields in install file, when add new fields to database)
 function make_groups(&$dbm)
 {
-    $groups['XOOPS_GROUP_ADMIN']     = $dbm->insert('groups', " VALUES (1, '" . addslashes(_INSTALL_WEBMASTER) . "', '" . addslashes(_INSTALL_WEBMASTERD) . "', 'Admin')");
-    $groups['XOOPS_GROUP_USERS']     = $dbm->insert('groups', " VALUES (2, '" . addslashes(_INSTALL_REGUSERS) . "', '" . addslashes(_INSTALL_REGUSERSD) . "', 'User')");
-    $groups['XOOPS_GROUP_ANONYMOUS'] = $dbm->insert('groups', " VALUES (3, '" . addslashes(_INSTALL_ANONUSERS) . "', '" . addslashes(_INSTALL_ANONUSERSD) . "', 'Anonymous')");
+    $groups['XOOPS_GROUP_ADMIN']     = $dbm->insert('groups', " VALUES (1, '".addslashes(_INSTALL_WEBMASTER)."', '".addslashes(_INSTALL_WEBMASTERD)."', 'Admin')");
+    $groups['XOOPS_GROUP_USERS']     = $dbm->insert('groups', " VALUES (2, '".addslashes(_INSTALL_REGUSERS)."', '".addslashes(_INSTALL_REGUSERSD)."', 'User')");
+    $groups['XOOPS_GROUP_ANONYMOUS'] = $dbm->insert('groups', " VALUES (3, '".addslashes(_INSTALL_ANONUSERS)."', '".addslashes(_INSTALL_ANONUSERSD)."', 'Anonymous')");
     if (!$groups['XOOPS_GROUP_ADMIN'] || !$groups['XOOPS_GROUP_USERS'] || !$groups['XOOPS_GROUP_ANONYMOUS']) {
         return false;
     }
@@ -61,42 +61,42 @@ 
     $tables = array();
     // data for table 'groups_users_link'
     /* @var  $dbm Db_manager */
-    $dbm->insert('groups_users_link', ' VALUES (0, ' . $groups['XOOPS_GROUP_ADMIN'] . ', 1)');
-    $dbm->insert('groups_users_link', ' VALUES (0, ' . $groups['XOOPS_GROUP_USERS'] . ', 1)');
+    $dbm->insert('groups_users_link', ' VALUES (0, '.$groups['XOOPS_GROUP_ADMIN'].', 1)');
+    $dbm->insert('groups_users_link', ' VALUES (0, '.$groups['XOOPS_GROUP_USERS'].', 1)');
     // data for table 'group_permission'
-    $dbm->insert('group_permission', ' VALUES (0,' . $groups['XOOPS_GROUP_ADMIN'] . ",1,1,'module_admin')");
-    $dbm->insert('group_permission', ' VALUES (0,' . $groups['XOOPS_GROUP_ADMIN'] . ",1,1, 'module_read')");
-    $dbm->insert('group_permission', ' VALUES (0,' . $groups['XOOPS_GROUP_USERS'] . ",1,1,'module_read')");
-    $dbm->insert('group_permission', ' VALUES (0,' . $groups['XOOPS_GROUP_ANONYMOUS'] . ",1,1,'module_read')");
+    $dbm->insert('group_permission', ' VALUES (0,'.$groups['XOOPS_GROUP_ADMIN'].",1,1,'module_admin')");
+    $dbm->insert('group_permission', ' VALUES (0,'.$groups['XOOPS_GROUP_ADMIN'].",1,1, 'module_read')");
+    $dbm->insert('group_permission', ' VALUES (0,'.$groups['XOOPS_GROUP_USERS'].",1,1,'module_read')");
+    $dbm->insert('group_permission', ' VALUES (0,'.$groups['XOOPS_GROUP_ANONYMOUS'].",1,1,'module_read')");
 
-    $dbm->insert('group_permission', ' VALUES(0,' . $groups['XOOPS_GROUP_ADMIN'] . ",1,1,'system_admin')");
-    $dbm->insert('group_permission', ' VALUES(0,' . $groups['XOOPS_GROUP_ADMIN'] . ",2,1,'system_admin')");
-    $dbm->insert('group_permission', ' VALUES(0,' . $groups['XOOPS_GROUP_ADMIN'] . ",3,1,'system_admin')");
-    $dbm->insert('group_permission', ' VALUES(0,' . $groups['XOOPS_GROUP_ADMIN'] . ",4,1,'system_admin')");
-    $dbm->insert('group_permission', ' VALUES(0,' . $groups['XOOPS_GROUP_ADMIN'] . ",5,1,'system_admin')");
-    $dbm->insert('group_permission', ' VALUES(0,' . $groups['XOOPS_GROUP_ADMIN'] . ",6,1,'system_admin')");
-    $dbm->insert('group_permission', ' VALUES(0,' . $groups['XOOPS_GROUP_ADMIN'] . ",7,1,'system_admin')");
-    $dbm->insert('group_permission', ' VALUES(0,' . $groups['XOOPS_GROUP_ADMIN'] . ",8,1,'system_admin')");
-    $dbm->insert('group_permission', ' VALUES(0,' . $groups['XOOPS_GROUP_ADMIN'] . ",9,1,'system_admin')");
-    $dbm->insert('group_permission', ' VALUES(0,' . $groups['XOOPS_GROUP_ADMIN'] . ",10,1,'system_admin')");
-    $dbm->insert('group_permission', ' VALUES(0,' . $groups['XOOPS_GROUP_ADMIN'] . ",11,1,'system_admin')");
-    $dbm->insert('group_permission', ' VALUES(0,' . $groups['XOOPS_GROUP_ADMIN'] . ",12,1,'system_admin')");
-    $dbm->insert('group_permission', ' VALUES(0,' . $groups['XOOPS_GROUP_ADMIN'] . ",13,1,'system_admin')");
-    $dbm->insert('group_permission', ' VALUES(0,' . $groups['XOOPS_GROUP_ADMIN'] . ",14,1,'system_admin')");
-    $dbm->insert('group_permission', ' VALUES(0,' . $groups['XOOPS_GROUP_ADMIN'] . ",15,1,'system_admin')");
-    $dbm->insert('group_permission', ' VALUES(0,' . $groups['XOOPS_GROUP_ADMIN'] . ",16,1,'system_admin')");
-    $dbm->insert('group_permission', ' VALUES(0,' . $groups['XOOPS_GROUP_ADMIN'] . ",17,1,'system_admin')");
+    $dbm->insert('group_permission', ' VALUES(0,'.$groups['XOOPS_GROUP_ADMIN'].",1,1,'system_admin')");
+    $dbm->insert('group_permission', ' VALUES(0,'.$groups['XOOPS_GROUP_ADMIN'].",2,1,'system_admin')");
+    $dbm->insert('group_permission', ' VALUES(0,'.$groups['XOOPS_GROUP_ADMIN'].",3,1,'system_admin')");
+    $dbm->insert('group_permission', ' VALUES(0,'.$groups['XOOPS_GROUP_ADMIN'].",4,1,'system_admin')");
+    $dbm->insert('group_permission', ' VALUES(0,'.$groups['XOOPS_GROUP_ADMIN'].",5,1,'system_admin')");
+    $dbm->insert('group_permission', ' VALUES(0,'.$groups['XOOPS_GROUP_ADMIN'].",6,1,'system_admin')");
+    $dbm->insert('group_permission', ' VALUES(0,'.$groups['XOOPS_GROUP_ADMIN'].",7,1,'system_admin')");
+    $dbm->insert('group_permission', ' VALUES(0,'.$groups['XOOPS_GROUP_ADMIN'].",8,1,'system_admin')");
+    $dbm->insert('group_permission', ' VALUES(0,'.$groups['XOOPS_GROUP_ADMIN'].",9,1,'system_admin')");
+    $dbm->insert('group_permission', ' VALUES(0,'.$groups['XOOPS_GROUP_ADMIN'].",10,1,'system_admin')");
+    $dbm->insert('group_permission', ' VALUES(0,'.$groups['XOOPS_GROUP_ADMIN'].",11,1,'system_admin')");
+    $dbm->insert('group_permission', ' VALUES(0,'.$groups['XOOPS_GROUP_ADMIN'].",12,1,'system_admin')");
+    $dbm->insert('group_permission', ' VALUES(0,'.$groups['XOOPS_GROUP_ADMIN'].",13,1,'system_admin')");
+    $dbm->insert('group_permission', ' VALUES(0,'.$groups['XOOPS_GROUP_ADMIN'].",14,1,'system_admin')");
+    $dbm->insert('group_permission', ' VALUES(0,'.$groups['XOOPS_GROUP_ADMIN'].",15,1,'system_admin')");
+    $dbm->insert('group_permission', ' VALUES(0,'.$groups['XOOPS_GROUP_ADMIN'].",16,1,'system_admin')");
+    $dbm->insert('group_permission', ' VALUES(0,'.$groups['XOOPS_GROUP_ADMIN'].",17,1,'system_admin')");
     // data for table 'banner'
-    $dbm->insert('banner', " (bid, cid, imptotal, impmade, clicks, imageurl, clickurl, date, htmlbanner, htmlcode) VALUES (0, 1, 0, 1, 0, '" . XOOPS_URL . "/images/banners/xoops_flashbanner2.htm', 'http://www.xoops.org/', 1008813250, 1,'')");
-    $dbm->insert('banner', " (bid, cid, imptotal, impmade, clicks, imageurl, clickurl, date, htmlbanner, htmlcode) VALUES (0, 1, 0, 1, 0, '" . XOOPS_URL . "/images/banners/xoops_banner_2.gif', 'http://www.xoops.org/', 1008813250, 0, '')");
-    $dbm->insert('banner', " (bid, cid, imptotal, impmade, clicks, imageurl, clickurl, date, htmlbanner, htmlcode) VALUES (0, 1, 0, 1, 0, '" . XOOPS_URL . "/images/banners/banner.htm', 'http://www.xoops.org/', 1008813250, 1, '')");
-    $dbm->insert('banner', " (bid, cid, imptotal, impmade, clicks, imageurl, clickurl, date, htmlbanner, htmlcode) VALUES (0, 1, 0, 1, 0, '" . XOOPS_URL . "/images/banners/xoopsifyIt.gif', 'http://www.xoops.org/', 1008813250, 1, '')");
+    $dbm->insert('banner', " (bid, cid, imptotal, impmade, clicks, imageurl, clickurl, date, htmlbanner, htmlcode) VALUES (0, 1, 0, 1, 0, '".XOOPS_URL."/images/banners/xoops_flashbanner2.htm', 'http://www.xoops.org/', 1008813250, 1,'')");
+    $dbm->insert('banner', " (bid, cid, imptotal, impmade, clicks, imageurl, clickurl, date, htmlbanner, htmlcode) VALUES (0, 1, 0, 1, 0, '".XOOPS_URL."/images/banners/xoops_banner_2.gif', 'http://www.xoops.org/', 1008813250, 0, '')");
+    $dbm->insert('banner', " (bid, cid, imptotal, impmade, clicks, imageurl, clickurl, date, htmlbanner, htmlcode) VALUES (0, 1, 0, 1, 0, '".XOOPS_URL."/images/banners/banner.htm', 'http://www.xoops.org/', 1008813250, 1, '')");
+    $dbm->insert('banner', " (bid, cid, imptotal, impmade, clicks, imageurl, clickurl, date, htmlbanner, htmlcode) VALUES (0, 1, 0, 1, 0, '".XOOPS_URL."/images/banners/xoopsifyIt.gif', 'http://www.xoops.org/', 1008813250, 1, '')");
     // default theme
     $time = time();
-    $dbm->insert('tplset', " VALUES (1, 'default', 'XOOPS Default Template Set', '', " . $time . ')');
+    $dbm->insert('tplset', " VALUES (1, 'default', 'XOOPS Default Template Set', '', ".$time.')');
     // system modules
-    if (file_exists('../modules/system/language/' . $language . '/modinfo.php')) {
-        include '../modules/system/language/' . $language . '/modinfo.php';
+    if (file_exists('../modules/system/language/'.$language.'/modinfo.php')) {
+        include '../modules/system/language/'.$language.'/modinfo.php';
     } else {
         include '../modules/system/language/english/modinfo.php';
         $language = 'english';
@@ -106,46 +106,46 @@ 
     include_once '../modules/system/xoops_version.php';
     $time = time();
     // RMV-NOTIFY (updated for extra column in table)
-    $dbm->insert('modules', " VALUES (1, '" . _MI_SYSTEM_NAME . "', " . ($modversion['version'] * 100) . ', ' . $time . ", 0, 1, 'system', 0, 1, 0, 0, 0, 0)");
+    $dbm->insert('modules', " VALUES (1, '"._MI_SYSTEM_NAME."', ".($modversion['version'] * 100).', '.$time.", 0, 1, 'system', 0, 1, 0, 0, 0, 0)");
 
     foreach ($modversion['templates'] as $tplfile) {
         // Main templates
-        if ($fp = fopen('../modules/system/templates/' . $tplfile['file'], 'r')) {
-            $newtplid = $dbm->insert('tplfile', " VALUES (0, 1, 'system', 'default', '" . addslashes($tplfile['file']) . "', '" . addslashes($tplfile['description']) . "', " . $time . ', ' . $time . ", 'module')");
+        if ($fp = fopen('../modules/system/templates/'.$tplfile['file'], 'r')) {
+            $newtplid = $dbm->insert('tplfile', " VALUES (0, 1, 'system', 'default', '".addslashes($tplfile['file'])."', '".addslashes($tplfile['description'])."', ".$time.', '.$time.", 'module')");
             // $newtplid = $xoopsDB->getInsertId();
-            $tplsource = fread($fp, filesize('../modules/system/templates/' . $tplfile['file']));
+            $tplsource = fread($fp, filesize('../modules/system/templates/'.$tplfile['file']));
             fclose($fp);
-            $dbm->insert('tplsource', ' (tpl_id, tpl_source) VALUES (' . $newtplid . ", '" . addslashes($tplsource) . "')");
+            $dbm->insert('tplsource', ' (tpl_id, tpl_source) VALUES ('.$newtplid.", '".addslashes($tplsource)."')");
         }
         // Admin templates
-        if ($fp = fopen('../modules/system/templates/admin/' . $tplfile['file'], 'r')) {
-            $newtplid = $dbm->insert('tplfile', " VALUES (0, 1, 'system', 'default', '" . addslashes($tplfile['file']) . "', '" . addslashes($tplfile['description']) . "', " . $time . ', ' . $time . ", 'admin')");
+        if ($fp = fopen('../modules/system/templates/admin/'.$tplfile['file'], 'r')) {
+            $newtplid = $dbm->insert('tplfile', " VALUES (0, 1, 'system', 'default', '".addslashes($tplfile['file'])."', '".addslashes($tplfile['description'])."', ".$time.', '.$time.", 'admin')");
             // $newtplid = $xoopsDB->getInsertId();
-            $tplsource = fread($fp, filesize('../modules/system/templates/admin/' . $tplfile['file']));
+            $tplsource = fread($fp, filesize('../modules/system/templates/admin/'.$tplfile['file']));
             fclose($fp);
-            $dbm->insert('tplsource', ' (tpl_id, tpl_source) VALUES (' . $newtplid . ", '" . addslashes($tplsource) . "')");
+            $dbm->insert('tplsource', ' (tpl_id, tpl_source) VALUES ('.$newtplid.", '".addslashes($tplsource)."')");
         }
     }
 
     foreach ($modversion['blocks'] as $func_num => $newblock) {
-        if ($fp = fopen('../modules/system/templates/blocks/' . $newblock['template'], 'r')) {
+        if ($fp = fopen('../modules/system/templates/blocks/'.$newblock['template'], 'r')) {
             $visible = 0;
             if (in_array($newblock['template'], array('system_block_user.tpl', 'system_block_login.tpl', 'system_block_mainmenu.tpl'))) {
                 $visible = 1;
             }
             $options   = !isset($newblock['options']) ? '' : trim($newblock['options']);
             $edit_func = !isset($newblock['edit_func']) ? '' : trim($newblock['edit_func']);
-            $newbid    = $dbm->insert('newblocks', ' VALUES (0, 1, ' . $func_num . ", '" . addslashes($options) . "', '" . addslashes($newblock['name']) . "', '" . addslashes($newblock['name']) . "', '', 0, 0, " . $visible . ", 'S', 'H', 1, 'system', '" . addslashes($newblock['file']) . "', '" . addslashes($newblock['show_func']) . "', '" . addslashes($edit_func) . "', '" . addslashes($newblock['template']) . "', 0, " . $time . ')');
+            $newbid    = $dbm->insert('newblocks', ' VALUES (0, 1, '.$func_num.", '".addslashes($options)."', '".addslashes($newblock['name'])."', '".addslashes($newblock['name'])."', '', 0, 0, ".$visible.", 'S', 'H', 1, 'system', '".addslashes($newblock['file'])."', '".addslashes($newblock['show_func'])."', '".addslashes($edit_func)."', '".addslashes($newblock['template'])."', 0, ".$time.')');
             // $newbid = $xoopsDB->getInsertId();
-            $newtplid = $dbm->insert('tplfile', ' VALUES (0, ' . $newbid . ", 'system', 'default', '" . addslashes($newblock['template']) . "', '" . addslashes($newblock['description']) . "', " . $time . ', ' . $time . ", 'block')");
+            $newtplid = $dbm->insert('tplfile', ' VALUES (0, '.$newbid.", 'system', 'default', '".addslashes($newblock['template'])."', '".addslashes($newblock['description'])."', ".$time.', '.$time.", 'block')");
             // $newtplid = $xoopsDB->getInsertId();
-            $tplsource = fread($fp, filesize('../modules/system/templates/blocks/' . $newblock['template']));
+            $tplsource = fread($fp, filesize('../modules/system/templates/blocks/'.$newblock['template']));
             fclose($fp);
-            $dbm->insert('tplsource', ' (tpl_id, tpl_source) VALUES (' . $newtplid . ", '" . addslashes($tplsource) . "')");
-            $dbm->insert('group_permission', ' VALUES (0, ' . $groups['XOOPS_GROUP_ADMIN'] . ', ' . $newbid . ", 1, 'block_read')");
+            $dbm->insert('tplsource', ' (tpl_id, tpl_source) VALUES ('.$newtplid.", '".addslashes($tplsource)."')");
+            $dbm->insert('group_permission', ' VALUES (0, '.$groups['XOOPS_GROUP_ADMIN'].', '.$newbid.", 1, 'block_read')");
             // $dbm->insert("group_permission", " VALUES (0, ".$groups['XOOPS_GROUP_ADMIN'].", ".$newbid.", 'xoops_blockadmiin')");
-            $dbm->insert('group_permission', ' VALUES (0, ' . $groups['XOOPS_GROUP_USERS'] . ', ' . $newbid . ", 1, 'block_read')");
-            $dbm->insert('group_permission', ' VALUES (0, ' . $groups['XOOPS_GROUP_ANONYMOUS'] . ', ' . $newbid . ", 1, 'block_read')");
+            $dbm->insert('group_permission', ' VALUES (0, '.$groups['XOOPS_GROUP_USERS'].', '.$newbid.", 1, 'block_read')");
+            $dbm->insert('group_permission', ' VALUES (0, '.$groups['XOOPS_GROUP_ANONYMOUS'].', '.$newbid.", 1, 'block_read')");
         }
     }
     // data for table 'users'
@@ -153,63 +153,63 @@ 
     $regdate = time();
     // $dbadminname= addslashes($adminname);
     // RMV-NOTIFY (updated for extra columns in user table)
-    $dbm->insert('users', " VALUES (1,'','" . addslashes($adminname) . "','" . addslashes($adminmail) . "','" . XOOPS_URL . "/','avatars/blank.gif','" . $regdate . "','','','',1,'','','','','" . $temp . "',0,0,7,5,'default','0.0'," . time() . ",'flat',0,1,0,'','','',0)");
+    $dbm->insert('users', " VALUES (1,'','".addslashes($adminname)."','".addslashes($adminmail)."','".XOOPS_URL."/','avatars/blank.gif','".$regdate."','','','',1,'','','','','".$temp."',0,0,7,5,'default','0.0',".time().",'flat',0,1,0,'','','',0)");
     // data for table 'block_module_link'
-    $sql    = 'SELECT bid, side FROM ' . $dbm->prefix('newblocks');
+    $sql    = 'SELECT bid, side FROM '.$dbm->prefix('newblocks');
     $result = $dbm->query($sql);
 
     while (false !== ($myrow = $dbm->fetchArray($result))) {
         if ($myrow['side'] == 0) {
-            $dbm->insert('block_module_link', ' VALUES (' . $myrow['bid'] . ', 0)');
+            $dbm->insert('block_module_link', ' VALUES ('.$myrow['bid'].', 0)');
         } else {
-            $dbm->insert('block_module_link', ' VALUES (' . $myrow['bid'] . ', -1)');
+            $dbm->insert('block_module_link', ' VALUES ('.$myrow['bid'].', -1)');
         }
     }
     // data for table 'config'
     $dbm->insert('config', " VALUES (1, 0, 1, 'sitename', '_MD_AM_SITENAME', 'XOOPS Site', '_MD_AM_SITENAMEDSC', 'textbox', 'text', 0)");
     $dbm->insert('config', " VALUES (2, 0, 1, 'slogan', '_MD_AM_SLOGAN', 'Just Use it!', '_MD_AM_SLOGANDSC', 'textbox', 'text', 2)");
-    $dbm->insert('config', " VALUES (3, 0, 1, 'language', '_MD_AM_LANGUAGE', '" . addslashes($language) . "', '_MD_AM_LANGUAGEDSC', 'language', 'other', 4)");
+    $dbm->insert('config', " VALUES (3, 0, 1, 'language', '_MD_AM_LANGUAGE', '".addslashes($language)."', '_MD_AM_LANGUAGEDSC', 'language', 'other', 4)");
     $dbm->insert('config', " VALUES (4, 0, 1, 'startpage', '_MD_AM_STARTPAGE', '--', '_MD_AM_STARTPAGEDSC', 'startpage', 'other', 6)");
     $dbm->insert('config', " VALUES (5, 0, 1, 'server_TZ', '_MD_AM_SERVERTZ', '0', '_MD_AM_SERVERTZDSC', 'timezone', 'float', 8)");
     $dbm->insert('config', " VALUES (6, 0, 1, 'default_TZ', '_MD_AM_DEFAULTTZ', '0', '_MD_AM_DEFAULTTZDSC', 'timezone', 'float', 10)");
-    $dbm->insert('config', " VALUES (7, 0, 1, 'theme_set', '_MD_AM_DTHEME', '" . $defaultTheme ."', '_MD_AM_DTHEMEDSC', 'theme', 'other', 12)");
-    $dbm->insert('config', " VALUES (8, 0, 1, 'anonymous', '_MD_AM_ANONNAME', '" . addslashes(_INSTALL_ANON) . "', '_MD_AM_ANONNAMEDSC', 'textbox', 'text', 15)");
+    $dbm->insert('config', " VALUES (7, 0, 1, 'theme_set', '_MD_AM_DTHEME', '".$defaultTheme."', '_MD_AM_DTHEMEDSC', 'theme', 'other', 12)");
+    $dbm->insert('config', " VALUES (8, 0, 1, 'anonymous', '_MD_AM_ANONNAME', '".addslashes(_INSTALL_ANON)."', '_MD_AM_ANONNAMEDSC', 'textbox', 'text', 15)");
     $dbm->insert('config', " VALUES (9, 0, 1, 'gzip_compression', '_MD_AM_USEGZIP', '0', '_MD_AM_USEGZIPDSC', 'yesno', 'int', 16)");
-    $dbm->insert('config', " VALUES (10, 0, 1, 'usercookie', '_MD_AM_USERCOOKIE', 'xoops_user_" . dechex(time()) . "', '_MD_AM_USERCOOKIEDSC', 'textbox', 'text', 18)");
+    $dbm->insert('config', " VALUES (10, 0, 1, 'usercookie', '_MD_AM_USERCOOKIE', 'xoops_user_".dechex(time())."', '_MD_AM_USERCOOKIEDSC', 'textbox', 'text', 18)");
     $dbm->insert('config', " VALUES (11, 0, 1, 'session_expire', '_MD_AM_SESSEXPIRE', '15', '_MD_AM_SESSEXPIREDSC', 'textbox', 'int', 22)");
     $dbm->insert('config', " VALUES (12, 0, 1, 'banners', '_MD_AM_BANNERS', '1', '_MD_AM_BANNERSDSC', 'yesno', 'int', 26)");
     $dbm->insert('config', " VALUES (13, 0, 1, 'debug_mode', '_MD_AM_DEBUGMODE', '0', '_MD_AM_DEBUGMODEDSC', 'select', 'int', 24)");
     $dbm->insert('config', " VALUES (14, 0, 1, 'my_ip', '_MD_AM_MYIP', '127.0.0.1', '_MD_AM_MYIPDSC', 'textbox', 'text', 29)");
     $dbm->insert('config', " VALUES (15, 0, 1, 'use_ssl', '_MD_AM_USESSL', '0', '_MD_AM_USESSLDSC', 'yesno', 'int', 30)");
-    $dbm->insert('config', " VALUES (16, 0, 1, 'session_name', '_MD_AM_SESSNAME', 'xoops_session_" . dechex(time()) . "', '_MD_AM_SESSNAMEDSC', 'textbox', 'text', 20)");
+    $dbm->insert('config', " VALUES (16, 0, 1, 'session_name', '_MD_AM_SESSNAME', 'xoops_session_".dechex(time())."', '_MD_AM_SESSNAMEDSC', 'textbox', 'text', 20)");
     $dbm->insert('config', " VALUES (17, 0, 2, 'minpass', '_MD_AM_MINPASS', '5', '_MD_AM_MINPASSDSC', 'textbox', 'int', 1)");
     $dbm->insert('config', " VALUES (18, 0, 2, 'minuname', '_MD_AM_MINUNAME', '3', '_MD_AM_MINUNAMEDSC', 'textbox', 'int', 2)");
     $dbm->insert('config', " VALUES (19, 0, 2, 'new_user_notify', '_MD_AM_NEWUNOTIFY', '1', '_MD_AM_NEWUNOTIFYDSC', 'yesno', 'int', 4)");
-    $dbm->insert('config', " VALUES (20, 0, 2, 'new_user_notify_group', '_MD_AM_NOTIFYTO', " . $groups['XOOPS_GROUP_ADMIN'] . ", '_MD_AM_NOTIFYTODSC', 'group', 'int', 6)");
+    $dbm->insert('config', " VALUES (20, 0, 2, 'new_user_notify_group', '_MD_AM_NOTIFYTO', ".$groups['XOOPS_GROUP_ADMIN'].", '_MD_AM_NOTIFYTODSC', 'group', 'int', 6)");
     $dbm->insert('config', " VALUES (21, 0, 2, 'activation_type', '_MD_AM_ACTVTYPE', '0', '_MD_AM_ACTVTYPEDSC', 'select', 'int', 8)");
-    $dbm->insert('config', " VALUES (22, 0, 2, 'activation_group', '_MD_AM_ACTVGROUP', " . $groups['XOOPS_GROUP_ADMIN'] . ", '_MD_AM_ACTVGROUPDSC', 'group', 'int', 10)");
+    $dbm->insert('config', " VALUES (22, 0, 2, 'activation_group', '_MD_AM_ACTVGROUP', ".$groups['XOOPS_GROUP_ADMIN'].", '_MD_AM_ACTVGROUPDSC', 'group', 'int', 10)");
     $dbm->insert('config', " VALUES (23, 0, 2, 'uname_test_level', '_MD_AM_UNAMELVL', '0', '_MD_AM_UNAMELVLDSC', 'select', 'int', 12)");
     $dbm->insert('config', " VALUES (24, 0, 2, 'avatar_allow_upload', '_MD_AM_AVATARALLOW', '0', '_MD_AM_AVATARALWDSC', 'yesno', 'int', 14)");
     $dbm->insert('config', " VALUES (27, 0, 2, 'avatar_width', '_MD_AM_AVATARW', '128', '_MD_AM_AVATARWDSC', 'textbox', 'int', 16)");
     $dbm->insert('config', " VALUES (28, 0, 2, 'avatar_height', '_MD_AM_AVATARH', '128', '_MD_AM_AVATARHDSC', 'textbox', 'int', 18)");
     $dbm->insert('config', " VALUES (29, 0, 2, 'avatar_maxsize', '_MD_AM_AVATARMAX', '35000', '_MD_AM_AVATARMAXDSC', 'textbox', 'int', 20)");
-    $dbm->insert('config', " VALUES (30, 0, 1, 'adminmail', '_MD_AM_ADMINML', '" . addslashes($adminmail) . "', '_MD_AM_ADMINMLDSC', 'textbox', 'text', 3)");
+    $dbm->insert('config', " VALUES (30, 0, 1, 'adminmail', '_MD_AM_ADMINML', '".addslashes($adminmail)."', '_MD_AM_ADMINMLDSC', 'textbox', 'text', 3)");
     $dbm->insert('config', " VALUES (31, 0, 2, 'self_delete', '_MD_AM_SELFDELETE', '0', '_MD_AM_SELFDELETEDSC', 'yesno', 'int', 22)");
     $dbm->insert('config', " VALUES (32, 0, 1, 'com_mode', '_MD_AM_COMMODE', 'flat', '_MD_AM_COMMODEDSC', 'select', 'text', 34)");
     $dbm->insert('config', " VALUES (33, 0, 1, 'com_order', '_MD_AM_COMORDER', '0', '_MD_AM_COMORDERDSC', 'select', 'int', 36)");
-    $dbm->insert('config', " VALUES (34, 0, 2, 'bad_unames', '_MD_AM_BADUNAMES', '" . addslashes(serialize(array(
+    $dbm->insert('config', " VALUES (34, 0, 2, 'bad_unames', '_MD_AM_BADUNAMES', '".addslashes(serialize(array(
                                                                                                                'webmaster',
                                                                                                                '^xoops',
-                                                                                                               '^admin'))) . "', '_MD_AM_BADUNAMESDSC', 'textarea', 'array', 24)");
-    $dbm->insert('config', " VALUES (35, 0, 2, 'bad_emails', '_MD_AM_BADEMAILS', '" . addslashes(serialize(array('xoops.org$'))) . "', '_MD_AM_BADEMAILSDSC', 'textarea', 'array', 26)");
+                                                                                                               '^admin')))."', '_MD_AM_BADUNAMESDSC', 'textarea', 'array', 24)");
+    $dbm->insert('config', " VALUES (35, 0, 2, 'bad_emails', '_MD_AM_BADEMAILS', '".addslashes(serialize(array('xoops.org$')))."', '_MD_AM_BADEMAILSDSC', 'textarea', 'array', 26)");
     $dbm->insert('config', " VALUES (36, 0, 2, 'maxuname', '_MD_AM_MAXUNAME', '10', '_MD_AM_MAXUNAMEDSC', 'textbox', 'int', 3)");
-    $dbm->insert('config', " VALUES (37, 0, 1, 'bad_ips', '_MD_AM_BADIPS', '" . addslashes(serialize(array('127.0.0.1'))) . "', '_MD_AM_BADIPSDSC', 'textarea', 'array', 42)");
+    $dbm->insert('config', " VALUES (37, 0, 1, 'bad_ips', '_MD_AM_BADIPS', '".addslashes(serialize(array('127.0.0.1')))."', '_MD_AM_BADIPSDSC', 'textarea', 'array', 42)");
     $dbm->insert('config', " VALUES (38, 0, 3, 'meta_keywords', '_MD_AM_METAKEY', 'xoops, web application framework, cms, content management system', '_MD_AM_METAKEYDSC', 'textarea', 'text', 0)");
-    $dbm->insert('config', " VALUES (39, 0, 3, 'footer', '_MD_AM_FOOTER', 'Powered by XOOPS &#169; 2001-" . date('Y', time()) . " <a href=\"http://xoops.org\" rel=\"external\" title=\"The XOOPS Project\">The XOOPS Project</a>', '_MD_AM_FOOTERDSC', 'textarea', 'text', 20)");
+    $dbm->insert('config', " VALUES (39, 0, 3, 'footer', '_MD_AM_FOOTER', 'Powered by XOOPS &#169; 2001-".date('Y', time())." <a href=\"http://xoops.org\" rel=\"external\" title=\"The XOOPS Project\">The XOOPS Project</a>', '_MD_AM_FOOTERDSC', 'textarea', 'text', 20)");
     $dbm->insert('config', " VALUES (40, 0, 4, 'censor_enable', '_MD_AM_DOCENSOR', '0', '_MD_AM_DOCENSORDSC', 'yesno', 'int', 0)");
-    $dbm->insert('config', " VALUES (41, 0, 4, 'censor_words', '_MD_AM_CENSORWRD', '" . addslashes(serialize(array(
+    $dbm->insert('config', " VALUES (41, 0, 4, 'censor_words', '_MD_AM_CENSORWRD', '".addslashes(serialize(array(
                                                                                                                  'fuck',
-                                                                                                                 'shit'))) . "', '_MD_AM_CENSORWRDDSC', 'textarea', 'array', 1)");
+                                                                                                                 'shit')))."', '_MD_AM_CENSORWRDDSC', 'textarea', 'array', 1)");
     $dbm->insert('config', " VALUES (42, 0, 4, 'censor_replace', '_MD_AM_CENSORRPLC', '#OOPS#', '_MD_AM_CENSORRPLCDSC', 'textbox', 'text', 2)");
     $dbm->insert('config', " VALUES (43, 0, 3, 'meta_robots', '_MD_AM_METAROBOTS', 'index,follow', '_MD_AM_METAROBOTSDSC', 'textbox', 'text', 2)");
     $dbm->insert('config', " VALUES (44, 0, 5, 'enable_search', '_MD_AM_DOSEARCH', '1', '_MD_AM_DOSEARCHDSC', 'yesno', 'int', 0)");
@@ -218,17 +218,17 @@ 
     $dbm->insert('config', " VALUES (47, 0, 1, 'enable_badips', '_MD_AM_DOBADIPS', '0', '_MD_AM_DOBADIPSDSC', 'yesno', 'int', 40)");
     $dbm->insert('config', " VALUES (48, 0, 3, 'meta_rating', '_MD_AM_METARATING', 'general', '_MD_AM_METARATINGDSC', 'select', 'text', 4)");
     $dbm->insert('config', " VALUES (49, 0, 3, 'meta_author', '_MD_AM_METAAUTHOR', 'XOOPS', '_MD_AM_METAAUTHORDSC', 'textbox', 'text', 6)");
-    $dbm->insert('config', " VALUES (50, 0, 3, 'meta_copyright', '_MD_AM_METACOPYR', 'Copyright &#169; 2001-" . date('Y', time()) . "', '_MD_AM_METACOPYRDSC', 'textbox', 'text', 8)");
+    $dbm->insert('config', " VALUES (50, 0, 3, 'meta_copyright', '_MD_AM_METACOPYR', 'Copyright &#169; 2001-".date('Y', time())."', '_MD_AM_METACOPYRDSC', 'textbox', 'text', 8)");
     $dbm->insert('config', " VALUES (51, 0, 3, 'meta_description', '_MD_AM_METADESC', 'XOOPS is a dynamic Object Oriented based open source portal script written in PHP.', '_MD_AM_METADESCDSC', 'textarea', 'text', 1)");
     $dbm->insert('config', " VALUES (52, 0, 2, 'allow_chgmail', '_MD_AM_ALLWCHGMAIL', '0', '_MD_AM_ALLWCHGMAILDSC', 'yesno', 'int', 3)");
     $dbm->insert('config', " VALUES (53, 0, 1, 'use_mysession', '_MD_AM_USEMYSESS', '1', '_MD_AM_USEMYSESSDSC', 'yesno', 'int', 19)");
     $dbm->insert('config', " VALUES (54, 0, 2, 'reg_dispdsclmr', '_MD_AM_DSPDSCLMR', 1, '_MD_AM_DSPDSCLMRDSC', 'yesno', 'int', 30)");
-    $dbm->insert('config', " VALUES (55, 0, 2, 'reg_disclaimer', '_MD_AM_REGDSCLMR', '" . addslashes(_INSTALL_DISCLMR) . "', '_MD_AM_REGDSCLMRDSC', 'textarea', 'text', 32)");
+    $dbm->insert('config', " VALUES (55, 0, 2, 'reg_disclaimer', '_MD_AM_REGDSCLMR', '".addslashes(_INSTALL_DISCLMR)."', '_MD_AM_REGDSCLMRDSC', 'textarea', 'text', 32)");
     $dbm->insert('config', " VALUES (56, 0, 2, 'allow_register', '_MD_AM_ALLOWREG', 1, '_MD_AM_ALLOWREGDSC', 'yesno', 'int', 0)");
     $dbm->insert('config', " VALUES (57, 0, 1, 'theme_fromfile', '_MD_AM_THEMEFILE', '0', '_MD_AM_THEMEFILEDSC', 'yesno', 'int', 13)");
     $dbm->insert('config', " VALUES (58, 0, 1, 'closesite', '_MD_AM_CLOSESITE', '0', '_MD_AM_CLOSESITEDSC', 'yesno', 'int', 26)");
-    $dbm->insert('config', " VALUES (59, 0, 1, 'closesite_okgrp', '_MD_AM_CLOSESITEOK', '" . addslashes(serialize(array('1'))) . "', '_MD_AM_CLOSESITEOKDSC', 'group_multi', 'array', 27)");
-    $dbm->insert('config', " VALUES (60, 0, 1, 'closesite_text', '_MD_AM_CLOSESITETXT', '" . _INSTALL_L165 . "', '_MD_AM_CLOSESITETXTDSC', 'textarea', 'text', 28)");
+    $dbm->insert('config', " VALUES (59, 0, 1, 'closesite_okgrp', '_MD_AM_CLOSESITEOK', '".addslashes(serialize(array('1')))."', '_MD_AM_CLOSESITEOKDSC', 'group_multi', 'array', 27)");
+    $dbm->insert('config', " VALUES (60, 0, 1, 'closesite_text', '_MD_AM_CLOSESITETXT', '"._INSTALL_L165."', '_MD_AM_CLOSESITETXTDSC', 'textarea', 'text', 28)");
     $dbm->insert('config', " VALUES (61, 0, 1, 'sslpost_name', '_MD_AM_SSLPOST', 'xoops_ssl', '_MD_AM_SSLPOSTDSC', 'textbox', 'text', 31)");
     $dbm->insert('config', " VALUES (62, 0, 1, 'module_cache', '_MD_AM_MODCACHE', '', '_MD_AM_MODCACHEDSC', 'module_cache', 'array', 50)");
     $dbm->insert('config', " VALUES (63, 0, 1, 'template_set', '_MD_AM_DTPLSET', 'default', '_MD_AM_DTPLSETDSC', 'tplset', 'other', 14)");
@@ -241,7 +241,7 @@ 
     $dbm->insert('config', " VALUES (69,0,6,'from','_MD_AM_MAILFROM','','_MD_AM_MAILFROMDESC','textbox','text', 1)");
     $dbm->insert('config', " VALUES (70,0,6,'fromname','_MD_AM_MAILFROMNAME','','_MD_AM_MAILFROMNAMEDESC','textbox','text',2)");
     $dbm->insert('config', " VALUES (71, 0, 1, 'sslloginlink', '_MD_AM_SSLLINK', 'https://', '_MD_AM_SSLLINKDSC', 'textbox', 'text', 33)");
-    $dbm->insert('config', " VALUES (72, 0, 1, 'theme_set_allowed', '_MD_AM_THEMEOK', '" . serialize(array($defaultTheme)) . "', '_MD_AM_THEMEOKDSC', 'theme_multi', 'array', 13)");
+    $dbm->insert('config', " VALUES (72, 0, 1, 'theme_set_allowed', '_MD_AM_THEMEOK', '".serialize(array($defaultTheme))."', '_MD_AM_THEMEOKDSC', 'theme_multi', 'array', 13)");
     // RMV-NOTIFY... Need to specify which user is sender of notification PM
     $dbm->insert('config', " VALUES (73,0,6,'fromuid','_MD_AM_MAILFROMUID','1','_MD_AM_MAILFROMUIDDESC','user','int',3)");
 
@@ -252,7 +252,7 @@ 
     $dbm->insert('config', " VALUES (78,0,7,'ldap_manager_dn','_MD_AM_LDAP_MANAGER_DN','manager_dn','_MD_AM_LDAP_MANAGER_DN_DESC','textbox','text',5)");
     $dbm->insert('config', " VALUES (79,0,7,'ldap_manager_pass','_MD_AM_LDAP_MANAGER_PASS','manager_pass','_MD_AM_LDAP_MANAGER_PASS_DESC','password','text',6)");
     $dbm->insert('config', " VALUES (80,0,7,'ldap_version','_MD_AM_LDAP_VERSION','3','_MD_AM_LDAP_VERSION_DESC','textbox','text', 7)");
-    $dbm->insert('config', " VALUES (81,0,7,'ldap_users_bypass','_MD_AM_LDAP_USERS_BYPASS','" . serialize(array('admin')) . "','_MD_AM_LDAP_USERS_BYPASS_DESC','textarea','array',8)");
+    $dbm->insert('config', " VALUES (81,0,7,'ldap_users_bypass','_MD_AM_LDAP_USERS_BYPASS','".serialize(array('admin'))."','_MD_AM_LDAP_USERS_BYPASS_DESC','textarea','array',8)");
     $dbm->insert('config', " VALUES (82,0,7,'ldap_loginname_asdn','_MD_AM_LDAP_LOGINNAME_ASDN','uid_asdn','_MD_AM_LDAP_LOGINNAME_ASDN_D','yesno','int',9)");
     $dbm->insert('config', " VALUES (83,0,7,'ldap_loginldap_attr', '_MD_AM_LDAP_LOGINLDAP_ATTR', 'uid', '_MD_AM_LDAP_LOGINLDAP_ATTR_D', 'textbox', 'text', 10)");
     $dbm->insert('config', " VALUES (84,0,7,'ldap_filter_person','_MD_AM_LDAP_FILTER_PERSON','','_MD_AM_LDAP_FILTER_PERSON_DESC','textbox','text',11)");
@@ -314,30 +314,30 @@ 
     $editors = XoopsLists::getDirListAsArray('../class/xoopseditor');
     $conf    = 35;
     foreach ($editors as $dir) {
-        $dbm->insert('configoption', ' VALUES (' . $conf . ", '" . $dir . "', '" . $dir . "', 126)");
+        $dbm->insert('configoption', ' VALUES ('.$conf.", '".$dir."', '".$dir."', 126)");
         ++$conf;
     }
     foreach ($editors as $dir) {
-        $dbm->insert('configoption', ' VALUES (' . $conf . ", '" . $dir . "', '" . $dir . "', 127)");
+        $dbm->insert('configoption', ' VALUES ('.$conf.", '".$dir."', '".$dir."', 127)");
         ++$conf;
     }
     foreach ($editors as $dir) {
-        $dbm->insert('configoption', ' VALUES (' . $conf . ", '" . $dir . "', '" . $dir . "', 128)");
+        $dbm->insert('configoption', ' VALUES ('.$conf.", '".$dir."', '".$dir."', 128)");
         ++$conf;
     }
     $icons = XoopsLists::getDirListAsArray('../modules/system/images/icons');
     foreach ($icons as $dir) {
-        $dbm->insert('configoption', ' VALUES (' . $conf . ", '" . $dir . "', '" . $dir . "', 98)");
+        $dbm->insert('configoption', ' VALUES ('.$conf.", '".$dir."', '".$dir."', 98)");
         ++$conf;
     }
     $breadcrumb = XoopsLists::getDirListAsArray('../modules/system/images/breadcrumb');
     foreach ($breadcrumb as $dir) {
-        $dbm->insert('configoption', ' VALUES (' . $conf . ", '" . $dir . "', '" . $dir . "', 99)");
+        $dbm->insert('configoption', ' VALUES ('.$conf.", '".$dir."', '".$dir."', 99)");
         ++$conf;
     }
     $jqueryui = XoopsLists::getDirListAsArray('../modules/system/css/ui');
     foreach ($jqueryui as $dir) {
-        $dbm->insert('configoption', ' VALUES (' . $conf . ", '" . $dir . "', '" . $dir . "', 133)");
+        $dbm->insert('configoption', ' VALUES ('.$conf.", '".$dir."', '".$dir."', 133)");
         ++$conf;
     }
 

htdocs/install/include/config.php

Spacing +1 added lines, -1 removed lines

@@ -48,7 +48,7 @@
     'xml'      => array('XML', sprintf(PHP_EXTENSION, XML_PARSING)),
     'zlib'     => array('Zlib', sprintf(PHP_EXTENSION, ZLIB_COMPRESSION)),
     'gd'       => array(
-        (function_exists('gd_info') && $gdlib = @gd_info()) ? 'GD ' . $gdlib['GD Version'] : '',
+        (function_exists('gd_info') && $gdlib = @gd_info()) ? 'GD '.$gdlib['GD Version'] : '',
         sprintf(PHP_EXTENSION, IMAGE_FUNCTIONS)),
     'exif'     => array('Exif', sprintf(PHP_EXTENSION, IMAGE_METAS)),
     'curl'     => array('Curl', sprintf(PHP_EXTENSION, CURL_HTTP)),

htdocs/install/page_siteinit.php

Spacing +12 added lines, -12 removed lines

@@ -31,9 +31,9 @@ 
 $pageHasForm = true;
 $pageHasHelp = false;
 
-$vars =& $_SESSION['siteconfig'];
+$vars = & $_SESSION['siteconfig'];
 
-$error =& $_SESSION['error'];
+$error = & $_SESSION['error'];
 
 if ($_SERVER['REQUEST_METHOD'] === 'POST') {
     $vars['adminname']  = trim($_POST['adminname']);
@@ -75,7 +75,7 @@ 
         exit();
     }
 
-    $res = $dbm->query('SELECT COUNT(*) FROM ' . $dbm->db->prefix('users'));
+    $res = $dbm->query('SELECT COUNT(*) FROM '.$dbm->db->prefix('users'));
     list($isadmin) = $dbm->db->fetchRow($res);
 }
 
@@ -85,15 +85,15 @@ 
 if ($isadmin) {
     $pageHasForm = false;
     $pageHasHelp = false;
-    echo "<div class='alert alert-warning'>" . ADMIN_EXIST . "</div>\n";
+    echo "<div class='alert alert-warning'>".ADMIN_EXIST."</div>\n";
 } else {
         echo '<script type="text/javascript">
                 var desc = new Array();
-                desc[0] = "' . PASSWORD_VERY_WEAK . '";
-                desc[1] = "' . PASSWORD_WEAK . '";
-                desc[2] = "' . PASSWORD_BETTER . '";
-                desc[3] = "' . PASSWORD_MEDIUM . '";
-                desc[4] = "' . PASSWORD_STRONG . '";
+                desc[0] = "' . PASSWORD_VERY_WEAK.'";
+                desc[1] = "' . PASSWORD_WEAK.'";
+                desc[2] = "' . PASSWORD_BETTER.'";
+                desc[3] = "' . PASSWORD_MEDIUM.'";
+                desc[4] = "' . PASSWORD_STRONG.'";
         </script>';
 
     ?>
@@ -106,14 +106,14 @@ 
         echo xoFormField('adminname', $vars['adminname'], ADMIN_LOGIN_LABEL);
         if (isset($error['name'])) {
             foreach ($error['name'] as $errmsg) {
-                echo '<div class="alert alert-danger"><span class="fa fa-ban text-danger"></span> ' . $errmsg . '</div>';
+                echo '<div class="alert alert-danger"><span class="fa fa-ban text-danger"></span> '.$errmsg.'</div>';
             }
         }
 
         echo xoFormField('adminmail', $vars['adminmail'], ADMIN_EMAIL_LABEL);
         if (isset($error['email'])) {
             foreach ($error['email'] as $errmsg) {
-                echo '<div class="alert alert-danger"><span class="fa fa-ban text-danger"></span> ' . $errmsg . '</div>';
+                echo '<div class="alert alert-danger"><span class="fa fa-ban text-danger"></span> '.$errmsg.'</div>';
             }
         }
         ?>
@@ -125,7 +125,7 @@ 
                 echo xoPassField('adminpass2', '', ADMIN_CONFIRMPASS_LABEL);
                 if (isset($error['pass'])) {
                     foreach ($error['pass'] as $errmsg) {
-                        echo '<div class="alert alert-danger"><span class="fa fa-ban text-danger"></span> ' . $errmsg . '</div>';
+                        echo '<div class="alert alert-danger"><span class="fa fa-ban text-danger"></span> '.$errmsg.'</div>';
                     }
                 }
                 ?>

upgrade/upd-2.5.9-to-2.5.10/index.php

Spacing +6 added lines, -6 removed lines

@@ -50,7 +50,7 @@ 
             $row = $db->fetchRow($result);
             if ($row) {
                 $count = $row[0];
-                return (0 === (int) $count) ? true : false;
+                return (0 === (int)$count) ? true : false;
             }
         }
         return false;
@@ -81,7 +81,7 @@ 
      */
     public function check_protectordata()
     {
-        $destinationPath = XOOPS_VAR_PATH . '/protector/';
+        $destinationPath = XOOPS_VAR_PATH.'/protector/';
         return file_exists($destinationPath);
     }
 
@@ -93,8 +93,8 @@ 
     public function apply_protectordata()
     {
         $returnResult = false;
-        $sourcePath = XOOPS_PATH . '/modules/protector/configs/';
-        $destinationPath = XOOPS_VAR_PATH . '/protector/';
+        $sourcePath = XOOPS_PATH.'/modules/protector/configs/';
+        $destinationPath = XOOPS_VAR_PATH.'/protector/';
 
         if (!file_exists($destinationPath)) {
             mkdir($destinationPath);
@@ -104,8 +104,8 @@ 
             $returnResult = true;
             while (false !== ($entry = $directory->read())) {
                 if ('.' !== $entry && '..' !== $entry) {
-                    $src = $sourcePath . $entry;
-                    $dest = $destinationPath . $entry;
+                    $src = $sourcePath.$entry;
+                    $dest = $destinationPath.$entry;
                     $result = copy($src, $dest);
                     if (false === $result) {
                         $returnResult = false;