XOOPS / XoopsCore25

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.config.php

Indentation +23 added lines, -23 removed lines

@@ -112,12 +112,12 @@ 
 $PHPTHUMB_CONFIG['prefer_imagemagick']        = true;  // If true, use ImageMagick to resize thumbnails if possible, since it is usually faster than GD functions; if false only use ImageMagick if PHP memory limit is too low.
 $PHPTHUMB_CONFIG['imagemagick_use_thumbnail'] = true;  // If true, use ImageMagick's "-thumbnail" resizing parameter (if available) which removes extra non-image metadata (profiles, EXIF info, etc) resulting in much smaller filesize; if false, use "-resize" paramter which retains this info
 if (strtoupper(substr(PHP_OS, 0, 3)) == 'WIN') {
-	// Windows: set absolute pathname
-	$PHPTHUMB_CONFIG['imagemagick_path'] = 'C:/ImageMagick/convert.exe';
+    // Windows: set absolute pathname
+    $PHPTHUMB_CONFIG['imagemagick_path'] = 'C:/ImageMagick/convert.exe';
 } else {
-	// *nix: set absolute pathname to "convert", or leave as null if "convert" is in the path (location detected with `which`)
-	//$PHPTHUMB_CONFIG['imagemagick_path'] = '/usr/local/bin/convert';
-	$PHPTHUMB_CONFIG['imagemagick_path'] = null;
+    // *nix: set absolute pathname to "convert", or leave as null if "convert" is in the path (location detected with `which`)
+    //$PHPTHUMB_CONFIG['imagemagick_path'] = '/usr/local/bin/convert';
+    $PHPTHUMB_CONFIG['imagemagick_path'] = null;
 }
 
 
@@ -248,22 +248,22 @@ 
 $GLOBALS['PHPTHUMB_CONFIG'] = $PHPTHUMB_CONFIG;
 function phpThumbURL($ParameterString, $path_to_phpThumb='phpThumb.php') {
     global $PHPTHUMB_CONFIG;
-	if (is_array($ParameterString)) {
-		$ParameterStringArray = $ParameterString;
-	} else {
-		parse_str($ParameterString, $ParameterStringArray);
-	}
-	$ParamterStringEncodedArray = array();
-	foreach ($ParameterStringArray as $key => $value) {
-		if (is_array($value)) {
-			// e.g. fltr[] is passed as an array
-			foreach ($value as $subvalue) {
-				$ParamterStringEncodedArray[] = $key.'[]='.rawurlencode($subvalue);
-			}
-		} else {
-			$ParamterStringEncodedArray[] = $key.'='.rawurlencode($value);
-		}
-	}
-	$ParameterString = implode($PHPTHUMB_CONFIG['high_security_url_separator'], $ParamterStringEncodedArray);
-	return $path_to_phpThumb.'?'.$ParameterString.$PHPTHUMB_CONFIG['high_security_url_separator'].'hash='.md5($ParameterString.$PHPTHUMB_CONFIG['high_security_password']);
+    if (is_array($ParameterString)) {
+        $ParameterStringArray = $ParameterString;
+    } else {
+        parse_str($ParameterString, $ParameterStringArray);
+    }
+    $ParamterStringEncodedArray = array();
+    foreach ($ParameterStringArray as $key => $value) {
+        if (is_array($value)) {
+            // e.g. fltr[] is passed as an array
+            foreach ($value as $subvalue) {
+                $ParamterStringEncodedArray[] = $key.'[]='.rawurlencode($subvalue);
+            }
+        } else {
+            $ParamterStringEncodedArray[] = $key.'='.rawurlencode($value);
+        }
+    }
+    $ParameterString = implode($PHPTHUMB_CONFIG['high_security_url_separator'], $ParamterStringEncodedArray);
+    return $path_to_phpThumb.'?'.$ParameterString.$PHPTHUMB_CONFIG['high_security_url_separator'].'hash='.md5($ParameterString.$PHPTHUMB_CONFIG['high_security_password']);
 }

Spacing +53 added lines, -53 removed lines

@@ -10,13 +10,13 @@ 
 //            THIS CONFIG FILE ONLY APPLIES TO phpThumb.php //
 //                                                         ///
 //////////////////////////////////////////////////////////////
-require dirname(dirname(__DIR__)) . '/header.php';
+require dirname(dirname(__DIR__)).'/header.php';
 define('phpThumbConfigFileVersion', '1.7.15');
 ob_start();
 if (!class_exists('phpthumb_functions')) { // normally include_once should take care of this, but see https://github.com/JamesHeinrich/phpThumb/issues/94
-if (!file_exists(__DIR__ . '/phpthumb.functions.php') || !include_once(__DIR__ . '/phpthumb.functions.php')) {
+if (!file_exists(__DIR__.'/phpthumb.functions.php') || !include_once(__DIR__.'/phpthumb.functions.php')) {
     ob_end_flush();
-    die('failed to include_once(phpthumb.functions.php) - realpath="' . realpath(__DIR__ . '/phpthumb.functions.php') . '"');
+    die('failed to include_once(phpthumb.functions.php) - realpath="'.realpath(__DIR__.'/phpthumb.functions.php').'"');
 }
 }
 ob_end_clean();
@@ -25,7 +25,7 @@ 
 
 /****************************************************************************************/
 /* START USER CONFIGURATION SECTION: */
-global $PHPTHUMB_CONFIG;  // declare as global to prevent scope issues (when including phpThumb.config.php inside functions inside included files, etc)
+global $PHPTHUMB_CONFIG; // declare as global to prevent scope issues (when including phpThumb.config.php inside functions inside included files, etc)
 $PHPTHUMB_CONFIG = array();
 
 // * DocumentRoot configuration
@@ -40,20 +40,20 @@ 
 
 
 // * Security configuration
-$PHPTHUMB_CONFIG['disable_debug']               = true;    // DO NOT DISABLE THIS ON ANY PUBLIC-ACCESSIBLE SERVER. Prevents phpThumb from displaying any information about your system. If true, phpThumbDebug and error messages will be disabled. If set to false (debug messages enabled) then debug mode will be FORCED -- ONLY debug output will be presented, no actual thumbnail (to avoid accidentally leaving debug mode enabled on a production server)
-$PHPTHUMB_CONFIG['high_security_enabled']       = true;    // DO NOT DISABLE THIS ON ANY PUBLIC-ACCESSIBLE SERVER. If disabled, your server is more vulnerable to hacking attempts, both on your server and via your server to other servers. When enabled, requires 'high_security_password' set to be set and requires the use of phpThumbURL() function (at the bottom of phpThumb.config.php) to generate hashed URLs
-$PHPTHUMB_CONFIG['high_security_password']      = '';      // required if 'high_security_enabled' is true, and must be at complex (uppercase, lowercase, numbers, punctuation, etc -- punctuation is strongest, lowercase is weakest; see PasswordStrength() in phpthumb.functions.php). You can use a password generator like http://silisoftware.com/tools/password-random.php to generate a strong password
-
-$PHPTHUMB_CONFIG['high_security_url_separator'] = '&';     // should almost always be left as '&'. Must be a single character. Do not change to '&' -- htmlspecialchars wrapped around phpThumbURL() takes care of this without breaking the hash
-$PHPTHUMB_CONFIG['allow_src_above_docroot']     = false;   // if false (default) only allow src within document_root; if true, allow src to be anywhere in filesystem
-$PHPTHUMB_CONFIG['allow_src_above_phpthumb']    = true;    // if true (default), allow src to be anywhere in filesystem; if false only allow src within sub-directory of phpThumb installation
-$PHPTHUMB_CONFIG['auto_allow_symlinks']         = true;    // if true (default), allow symlink target directories without explicitly whitelisting them
+$PHPTHUMB_CONFIG['disable_debug']               = true; // DO NOT DISABLE THIS ON ANY PUBLIC-ACCESSIBLE SERVER. Prevents phpThumb from displaying any information about your system. If true, phpThumbDebug and error messages will be disabled. If set to false (debug messages enabled) then debug mode will be FORCED -- ONLY debug output will be presented, no actual thumbnail (to avoid accidentally leaving debug mode enabled on a production server)
+$PHPTHUMB_CONFIG['high_security_enabled']       = true; // DO NOT DISABLE THIS ON ANY PUBLIC-ACCESSIBLE SERVER. If disabled, your server is more vulnerable to hacking attempts, both on your server and via your server to other servers. When enabled, requires 'high_security_password' set to be set and requires the use of phpThumbURL() function (at the bottom of phpThumb.config.php) to generate hashed URLs
+$PHPTHUMB_CONFIG['high_security_password']      = ''; // required if 'high_security_enabled' is true, and must be at complex (uppercase, lowercase, numbers, punctuation, etc -- punctuation is strongest, lowercase is weakest; see PasswordStrength() in phpthumb.functions.php). You can use a password generator like http://silisoftware.com/tools/password-random.php to generate a strong password
+
+$PHPTHUMB_CONFIG['high_security_url_separator'] = '&'; // should almost always be left as '&'. Must be a single character. Do not change to '&' -- htmlspecialchars wrapped around phpThumbURL() takes care of this without breaking the hash
+$PHPTHUMB_CONFIG['allow_src_above_docroot']     = false; // if false (default) only allow src within document_root; if true, allow src to be anywhere in filesystem
+$PHPTHUMB_CONFIG['allow_src_above_phpthumb']    = true; // if true (default), allow src to be anywhere in filesystem; if false only allow src within sub-directory of phpThumb installation
+$PHPTHUMB_CONFIG['auto_allow_symlinks']         = true; // if true (default), allow symlink target directories without explicitly whitelisting them
 $PHPTHUMB_CONFIG['additional_allowed_dirs']     = array(); // array of additional directories to allow source images to be read from
 
 // * Cache directory configuration (choose only one of these - leave the other lines commented-out):
 // Note: this directory must be writable (usually chmod 777 is neccesary) for caching to work.
 // If the directory is not writable no error will be generated but caching will be disabled.
-$PHPTHUMB_CONFIG['cache_directory'] = XOOPS_CACHE_PATH;                            // set the cache directory relative to the phpThumb() installation
+$PHPTHUMB_CONFIG['cache_directory'] = XOOPS_CACHE_PATH; // set the cache directory relative to the phpThumb() installation
 //$PHPTHUMB_CONFIG['cache_directory'] = $PHPTHUMB_CONFIG['document_root'].'/phpthumb/cache/'; // set the cache directory to an absolute directory for all source images
 //$PHPTHUMB_CONFIG['cache_directory'] = './cache/';                                           // set the cache directory relative to the source image - must start with '.' (will not work to cache URL- or database-sourced images, please use an absolute directory name)
 //$PHPTHUMB_CONFIG['cache_directory'] = null;                                                 // disable thumbnail caching (not recommended)
@@ -69,35 +69,35 @@ 
 //   based on last-access date and/or number of files and/or total filesize.
 
 //$PHPTHUMB_CONFIG['cache_maxage'] = null;            // never delete cached thumbnails based on last-access time
-$PHPTHUMB_CONFIG['cache_maxage'] = 86400 * 30;        // delete cached thumbnails that haven't been accessed in more than [30 days] (value is maximum time since last access in seconds to avoid deletion)
+$PHPTHUMB_CONFIG['cache_maxage'] = 86400 * 30; // delete cached thumbnails that haven't been accessed in more than [30 days] (value is maximum time since last access in seconds to avoid deletion)
 
 //$PHPTHUMB_CONFIG['cache_maxsize'] = null;           // never delete cached thumbnails based on byte size of cache directory
 $PHPTHUMB_CONFIG['cache_maxsize'] = 10 * 1024 * 1024; // delete least-recently-accessed cached thumbnails when more than [10MB] of cached files are present (value is maximum bytesize of all cached files). Note: this only counts file size, does not count space "wasted" by directory entries in the cache structure -- see notes under $PHPTHUMB_CONFIG['cache_directory_depth']
 
 //$PHPTHUMB_CONFIG['cache_maxfiles'] = null;          // never delete cached thumbnails based on number of cached files
-$PHPTHUMB_CONFIG['cache_maxfiles'] = 200;             // delete least-recently-accessed cached thumbnails when more than [200] cached files are present (value is maximum number of cached files to keep)
+$PHPTHUMB_CONFIG['cache_maxfiles'] = 200; // delete least-recently-accessed cached thumbnails when more than [200] cached files are present (value is maximum number of cached files to keep)
 
 // * Source image cache configuration
-$PHPTHUMB_CONFIG['cache_source_enabled']   = true;                               // if true, source images obtained via HTTP are cached to $PHPTHUMB_CONFIG['cache_source_directory']
-$PHPTHUMB_CONFIG['cache_source_directory'] = XOOPS_CACHE_PATH;  // set the cache directory for unprocessed source images
+$PHPTHUMB_CONFIG['cache_source_enabled']   = true; // if true, source images obtained via HTTP are cached to $PHPTHUMB_CONFIG['cache_source_directory']
+$PHPTHUMB_CONFIG['cache_source_directory'] = XOOPS_CACHE_PATH; // set the cache directory for unprocessed source images
 
 // * cache source modification date configuration
 $PHPTHUMB_CONFIG['cache_source_filemtime_ignore_local']  = false; // if true, local source images will not be checked for modification date and cached image will be used if available, even if source image is changed or removed
-$PHPTHUMB_CONFIG['cache_source_filemtime_ignore_remote'] = true;  // if true, remote source images will not be checked for modification date and cached image will be used if available, even if source image is changed or removed. WARNING: cached performance MUCH slower if this is set to false.
+$PHPTHUMB_CONFIG['cache_source_filemtime_ignore_remote'] = true; // if true, remote source images will not be checked for modification date and cached image will be used if available, even if source image is changed or removed. WARNING: cached performance MUCH slower if this is set to false.
 
 // * Simplified cache filename configuration
 // Instead of creating unique cache filenames for all parameter combinations, create "simple" cache files (eg: "pic_thumb.jpg")
 // If cache_default_only_suffix is non-empty, GETstring parameters (except 'src') are ignored and only $PHPTHUMB_DEFAULTS
 // parameters (set at the bottom of phpThumb.config.php) are used for processing.
 // The '*' character MUST be used to represent the source image name
-$PHPTHUMB_CONFIG['cache_default_only_suffix'] = '';           // cached in normal phpThumb manner
+$PHPTHUMB_CONFIG['cache_default_only_suffix'] = ''; // cached in normal phpThumb manner
 //$PHPTHUMB_CONFIG['cache_default_only_suffix'] = '*_thumb';  // cache 'pic.jpg' becomes 'pic_thumb.jpg' (or 'pic_thumb.png' if PNG output is selected, etc)
 //$PHPTHUMB_CONFIG['cache_default_only_suffix'] = 'small-*';  // cache 'pic.jpg' becomes 'small-pic.jpg' (or 'small-pic.png' if PNG output is selected, etc)
 
-$PHPTHUMB_CONFIG['cache_prefix'] = 'phpThumb_cache_' . (isset($_SERVER['SERVER_NAME']) ? str_replace('www.', '', $_SERVER['SERVER_NAME']) . '_' : ''); // keep cache file separate by domain
+$PHPTHUMB_CONFIG['cache_prefix'] = 'phpThumb_cache_'.(isset($_SERVER['SERVER_NAME']) ? str_replace('www.', '', $_SERVER['SERVER_NAME']).'_' : ''); // keep cache file separate by domain
 //$PHPTHUMB_CONFIG['cache_prefix'] = 'phpThumb_cache';                                                                                             // allow phpThumb to share 1 set of cached files even if accessed under different servername/domains on same server
 
-$PHPTHUMB_CONFIG['cache_force_passthru'] = true;  // if true, cached image data will always be passed to browser; if false, HTTP redirect will be used instead
+$PHPTHUMB_CONFIG['cache_force_passthru'] = true; // if true, cached image data will always be passed to browser; if false, HTTP redirect will be used instead
 
 // * Temp directory configuration
 // phpThumb() may need to create temp files. Usually the system temp dir is writable and can be used.
@@ -105,12 +105,12 @@ 
 // you should change this to a full pathname to a directory you do have write access to.
 //$PHPTHUMB_CONFIG['temp_directory'] = null;                               // attempt to auto-detect
 //$PHPTHUMB_CONFIG['temp_directory'] = '/tmp/persistent/phpthumb/cache/';  // set to absolute path
-$PHPTHUMB_CONFIG['temp_directory'] = $PHPTHUMB_CONFIG['cache_directory'];  // set to same as cache directory
+$PHPTHUMB_CONFIG['temp_directory'] = $PHPTHUMB_CONFIG['cache_directory']; // set to same as cache directory
 
 
 // ImageMagick configuration
-$PHPTHUMB_CONFIG['prefer_imagemagick']        = true;  // If true, use ImageMagick to resize thumbnails if possible, since it is usually faster than GD functions; if false only use ImageMagick if PHP memory limit is too low.
-$PHPTHUMB_CONFIG['imagemagick_use_thumbnail'] = true;  // If true, use ImageMagick's "-thumbnail" resizing parameter (if available) which removes extra non-image metadata (profiles, EXIF info, etc) resulting in much smaller filesize; if false, use "-resize" paramter which retains this info
+$PHPTHUMB_CONFIG['prefer_imagemagick']        = true; // If true, use ImageMagick to resize thumbnails if possible, since it is usually faster than GD functions; if false only use ImageMagick if PHP memory limit is too low.
+$PHPTHUMB_CONFIG['imagemagick_use_thumbnail'] = true; // If true, use ImageMagick's "-thumbnail" resizing parameter (if available) which removes extra non-image metadata (profiles, EXIF info, etc) resulting in much smaller filesize; if false, use "-resize" paramter which retains this info
 if (strtoupper(substr(PHP_OS, 0, 3)) == 'WIN') {
 	// Windows: set absolute pathname
 	$PHPTHUMB_CONFIG['imagemagick_path'] = 'C:/ImageMagick/convert.exe';
@@ -131,7 +131,7 @@ 
 // As a general guideline, this number will be about 20% of your PHP memory configuration, so 8M = 1,677,722; 16M = 3,355,443; 32M = 6,710,886; etc.
 if (phpthumb_functions::version_compare_replacement(phpversion(), '4.3.2', '>=') && !defined('memory_get_usage') && !@ini_get('memory_limit')) {
     // memory_get_usage() will only be defined if your PHP is compiled with the --enable-memory-limit configuration option.
-    $PHPTHUMB_CONFIG['max_source_pixels'] = 0;         // no memory limit
+    $PHPTHUMB_CONFIG['max_source_pixels'] = 0; // no memory limit
 } else {
     // calculate default max_source_pixels as 1/6 of memory limit configuration
     $PHPTHUMB_CONFIG['max_source_pixels'] = round(max((int)(ini_get('memory_limit')), (int)(get_cfg_var('memory_limit'))) * 1048576 / 6);
@@ -144,41 +144,41 @@ 
 
 // * Default output configuration:
 $PHPTHUMB_CONFIG['output_format']    = 'png'; // default output format ('jpeg', 'png' or 'gif') - thumbnail will be output in this format (if available in your version of GD or ImageMagick). This is only used if the "f" parameter is not specified, and if the thumbnail can't be output in the input format.
-$PHPTHUMB_CONFIG['output_maxwidth']  = 0;      // default maximum thumbnail width.  If this is zero then default width  is the width  of the source image. This is always overridden by ?w=___ GETstring parameter
-$PHPTHUMB_CONFIG['output_maxheight'] = 0;      // default maximum thumbnail height. If this is zero then default height is the height of the source image. This is always overridden by ?h=___ GETstring parameter
-$PHPTHUMB_CONFIG['output_interlace'] = true;   // if true: interlaced output for GIF/PNG, progressive output for JPEG; if false: non-interlaced for GIF/PNG, baseline for JPEG.
+$PHPTHUMB_CONFIG['output_maxwidth']  = 0; // default maximum thumbnail width.  If this is zero then default width  is the width  of the source image. This is always overridden by ?w=___ GETstring parameter
+$PHPTHUMB_CONFIG['output_maxheight'] = 0; // default maximum thumbnail height. If this is zero then default height is the height of the source image. This is always overridden by ?h=___ GETstring parameter
+$PHPTHUMB_CONFIG['output_interlace'] = true; // if true: interlaced output for GIF/PNG, progressive output for JPEG; if false: non-interlaced for GIF/PNG, baseline for JPEG.
 
 // * Error message configuration
-$PHPTHUMB_CONFIG['error_image_width']           = 300;      // default width for error images
-$PHPTHUMB_CONFIG['error_image_height']          = 100;      // default height for error images
-$PHPTHUMB_CONFIG['error_message_image_default'] = '';       // Set this to the name of a generic error image (e.g. '/images/error.png') that you want displayed in place of any error message that may occur. This setting is overridden by the 'err' parameter, which does the same thing.
+$PHPTHUMB_CONFIG['error_image_width']           = 300; // default width for error images
+$PHPTHUMB_CONFIG['error_image_height']          = 100; // default height for error images
+$PHPTHUMB_CONFIG['error_message_image_default'] = ''; // Set this to the name of a generic error image (e.g. '/images/error.png') that you want displayed in place of any error message that may occur. This setting is overridden by the 'err' parameter, which does the same thing.
 $PHPTHUMB_CONFIG['error_bgcolor']               = 'CCCCFF'; // background color of error message images
 $PHPTHUMB_CONFIG['error_textcolor']             = 'FF0000'; // color of text in error messages
-$PHPTHUMB_CONFIG['error_fontsize']              = 1;        // size of text in error messages, from 1 (smallest) to 5 (largest)
-$PHPTHUMB_CONFIG['error_die_on_error']          = true;     // die with error message on any fatal error (recommended with standalone phpThumb.php)
-$PHPTHUMB_CONFIG['error_silent_die_on_error']   = false;    // simply die with no output of any kind on fatal errors (not recommended)
-$PHPTHUMB_CONFIG['error_die_on_source_failure'] = true;     // die with error message if source image cannot be processed by phpThumb() (usually because source image is corrupt in some way). If false the source image will be passed through unprocessed, if true (default) an error message will be displayed.
+$PHPTHUMB_CONFIG['error_fontsize']              = 1; // size of text in error messages, from 1 (smallest) to 5 (largest)
+$PHPTHUMB_CONFIG['error_die_on_error']          = true; // die with error message on any fatal error (recommended with standalone phpThumb.php)
+$PHPTHUMB_CONFIG['error_silent_die_on_error']   = false; // simply die with no output of any kind on fatal errors (not recommended)
+$PHPTHUMB_CONFIG['error_die_on_source_failure'] = true; // die with error message if source image cannot be processed by phpThumb() (usually because source image is corrupt in some way). If false the source image will be passed through unprocessed, if true (default) an error message will be displayed.
 
 // * Off-server Thumbnailing Configuration:
-$PHPTHUMB_CONFIG['nohotlink_enabled']       = false;                                    // If false will allow thumbnailing from any source domain, if true then only domains in 'nohotlink_valid_domains' will be accepted
-$PHPTHUMB_CONFIG['nohotlink_valid_domains'] = array(@$_SERVER['HTTP_HOST']);            // This is the list of domains for which thumbnails are allowed to be created. Note: domain only, do not include port numbers. The default value of the current domain should be fine in most cases, but if neccesary you can add more domains in here, in the format "www.example.com"
-$PHPTHUMB_CONFIG['nohotlink_erase_image']   = true;                                     // if true thumbnail is covered up with $PHPTHUMB_CONFIG['nohotlink_fill_color'] before text is applied, if false text is written over top of thumbnail
+$PHPTHUMB_CONFIG['nohotlink_enabled']       = false; // If false will allow thumbnailing from any source domain, if true then only domains in 'nohotlink_valid_domains' will be accepted
+$PHPTHUMB_CONFIG['nohotlink_valid_domains'] = array(@$_SERVER['HTTP_HOST']); // This is the list of domains for which thumbnails are allowed to be created. Note: domain only, do not include port numbers. The default value of the current domain should be fine in most cases, but if neccesary you can add more domains in here, in the format "www.example.com"
+$PHPTHUMB_CONFIG['nohotlink_erase_image']   = true; // if true thumbnail is covered up with $PHPTHUMB_CONFIG['nohotlink_fill_color'] before text is applied, if false text is written over top of thumbnail
 $PHPTHUMB_CONFIG['nohotlink_text_message']  = 'Off-server thumbnailing is not allowed'; // text of error message
 
 // * Off-server Linking Configuration:
-$PHPTHUMB_CONFIG['nooffsitelink_enabled']       = false;                                       // If false will allow thumbnails to be linked to from any domain, if true only domains listed below in 'nooffsitelink_valid_domains' will be allowed.
-$PHPTHUMB_CONFIG['nooffsitelink_valid_domains'] = array(@$_SERVER['HTTP_HOST']);              // This is the list of domains for which thumbnails are allowed to be created. The default value of the current domain should be fine in most cases, but if neccesary you can add more domains in here, in the format 'www.example.com'
-$PHPTHUMB_CONFIG['nooffsitelink_require_refer'] = false;                                      // If false will allow standalone calls to phpThumb(). If true then only requests with a $_SERVER['HTTP_REFERER'] value in 'nooffsitelink_valid_domains' are allowed.
-$PHPTHUMB_CONFIG['nooffsitelink_erase_image']   = false;                                      // if true thumbnail is covered up with $PHPTHUMB_CONFIG['nohotlink_fill_color'] before text is applied, if false text is written over top of thumbnail
-$PHPTHUMB_CONFIG['nooffsitelink_watermark_src'] = '/demo/images/watermark.png';                // webroot-relative image to overlay on hotlinked images
-$PHPTHUMB_CONFIG['nooffsitelink_text_message']  = 'Image taken from ' . @$_SERVER['HTTP_HOST']; // text of error message (used if [nooffsitelink_watermark_src] is not a valid image)
+$PHPTHUMB_CONFIG['nooffsitelink_enabled']       = false; // If false will allow thumbnails to be linked to from any domain, if true only domains listed below in 'nooffsitelink_valid_domains' will be allowed.
+$PHPTHUMB_CONFIG['nooffsitelink_valid_domains'] = array(@$_SERVER['HTTP_HOST']); // This is the list of domains for which thumbnails are allowed to be created. The default value of the current domain should be fine in most cases, but if neccesary you can add more domains in here, in the format 'www.example.com'
+$PHPTHUMB_CONFIG['nooffsitelink_require_refer'] = false; // If false will allow standalone calls to phpThumb(). If true then only requests with a $_SERVER['HTTP_REFERER'] value in 'nooffsitelink_valid_domains' are allowed.
+$PHPTHUMB_CONFIG['nooffsitelink_erase_image']   = false; // if true thumbnail is covered up with $PHPTHUMB_CONFIG['nohotlink_fill_color'] before text is applied, if false text is written over top of thumbnail
+$PHPTHUMB_CONFIG['nooffsitelink_watermark_src'] = '/demo/images/watermark.png'; // webroot-relative image to overlay on hotlinked images
+$PHPTHUMB_CONFIG['nooffsitelink_text_message']  = 'Image taken from '.@$_SERVER['HTTP_HOST']; // text of error message (used if [nooffsitelink_watermark_src] is not a valid image)
 
 // * Border & Background default colors
 $PHPTHUMB_CONFIG['border_hexcolor']     = '000000'; // Default border color - usual HTML-style hex color notation (overidden with 'bc' parameter)
 $PHPTHUMB_CONFIG['background_hexcolor'] = 'FFFFFF'; // Default background color when thumbnail aspect ratio does not match fixed-dimension box - usual HTML-style hex color notation (overridden with 'bg' parameter)
 
 // * Watermark configuration
-$PHPTHUMB_CONFIG['ttf_directory'] = __DIR__ . '/fonts'; // Base directory for TTF font files
+$PHPTHUMB_CONFIG['ttf_directory'] = __DIR__.'/fonts'; // Base directory for TTF font files
 //$PHPTHUMB_CONFIG['ttf_directory'] = 'c:/windows/fonts';
 
 // * MySQL configuration
@@ -201,18 +201,18 @@ 
 //$PHPTHUMB_CONFIG['http_user_agent'] = '';                                                                                      // PHP default: none
 //$PHPTHUMB_CONFIG['http_user_agent'] = 'Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1)';                                    // Windows XP, Internet Explorer
 //$PHPTHUMB_CONFIG['http_user_agent'] = 'Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.7.12) Gecko/20050915 Firefox/1.0.7'; // Windows XP, Firefox
-$PHPTHUMB_CONFIG['http_user_agent'] = @$_SERVER['HTTP_USER_AGENT'];                                                                // use client user-agent
+$PHPTHUMB_CONFIG['http_user_agent'] = @$_SERVER['HTTP_USER_AGENT']; // use client user-agent
 
 
 // * Compatability settings
-$PHPTHUMB_CONFIG['disable_pathinfo_parsing']        = false;   // if true, $_SERVER[PATH_INFO] is not parsed. May be needed on some server configurations to allow normal behavior.
-$PHPTHUMB_CONFIG['disable_imagecopyresampled']      = false;  // if true, imagecopyresampled is replaced with ImageCopyResampleBicubic. May be needed for buggy versions of PHP-GD.
-$PHPTHUMB_CONFIG['disable_onlycreateable_passthru'] = true;   // if true, any image that can be parsed by getimagesize() can be passed through; if false, only images that can be converted to GD by ImageCreateFrom(JPEG|GIF|PNG) functions are allowed
-$PHPTHUMB_CONFIG['disable_realpath']                = false;  // PHP realpath() function requires that "the running script must have executable permissions on all directories in the hierarchy, otherwise realpath() will return FALSE". Set config_disable_realpath=false to enable alternate filename-parsing that does not use realpath() function (but also does not resolve symbolic links)
+$PHPTHUMB_CONFIG['disable_pathinfo_parsing']        = false; // if true, $_SERVER[PATH_INFO] is not parsed. May be needed on some server configurations to allow normal behavior.
+$PHPTHUMB_CONFIG['disable_imagecopyresampled']      = false; // if true, imagecopyresampled is replaced with ImageCopyResampleBicubic. May be needed for buggy versions of PHP-GD.
+$PHPTHUMB_CONFIG['disable_onlycreateable_passthru'] = true; // if true, any image that can be parsed by getimagesize() can be passed through; if false, only images that can be converted to GD by ImageCreateFrom(JPEG|GIF|PNG) functions are allowed
+$PHPTHUMB_CONFIG['disable_realpath']                = false; // PHP realpath() function requires that "the running script must have executable permissions on all directories in the hierarchy, otherwise realpath() will return FALSE". Set config_disable_realpath=false to enable alternate filename-parsing that does not use realpath() function (but also does not resolve symbolic links)
 
 
 // * HTTP remote file opening settings
-$PHPTHUMB_CONFIG['http_fopen_timeout']   = 10;   // timeout (in seconds) for fopen / curl / fsockopen
+$PHPTHUMB_CONFIG['http_fopen_timeout']   = 10; // timeout (in seconds) for fopen / curl / fsockopen
 $PHPTHUMB_CONFIG['http_follow_redirect'] = true; // if true (default), follow "302 Found" redirects to new URL; if false, return error message
 
 // * Speed optimizations configuration
@@ -227,7 +227,7 @@ 
 /* START DEFAULT PARAMETERS SECTION */
 // If any parameters are constant across ALL images, you can set them here
 
-$PHPTHUMB_DEFAULTS_GETSTRINGOVERRIDE = true;  // if true, any parameters in the URL will override the defaults set here; if false, any parameters set here cannot be overridden in the URL
+$PHPTHUMB_DEFAULTS_GETSTRINGOVERRIDE = true; // if true, any parameters in the URL will override the defaults set here; if false, any parameters set here cannot be overridden in the URL
 $PHPTHUMB_DEFAULTS_DISABLEGETPARAMS  = false; // if true, GETstring parameters will be ignored (except for 'src') and only below default parameters will be used; if false, both default and GETstring parameters will be used (depending on $PHPTHUMB_DEFAULTS_GETSTRINGOVERRIDE). Will be auto-set true if !empty($PHPTHUMB_CONFIG['cache_default_only_suffix'])
 
 //$PHPTHUMB_DEFAULTS['w']    = 200;
@@ -246,7 +246,7 @@ 
 //   echo '<img src="'.htmlspecialchars(phpThumbURL('src=/images/pic.jpg&w=50', '/phpThumb/phpThumb.php')).'">';
 
 $GLOBALS['PHPTHUMB_CONFIG'] = $PHPTHUMB_CONFIG;
-function phpThumbURL($ParameterString, $path_to_phpThumb='phpThumb.php') {
+function phpThumbURL($ParameterString, $path_to_phpThumb = 'phpThumb.php') {
     global $PHPTHUMB_CONFIG;
 	if (is_array($ParameterString)) {
 		$ParameterStringArray = $ParameterString;

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

Indentation +103 added lines, -103 removed lines

@@ -43,107 +43,107 @@
 
 class phpUnsharpMask {
 
-	public static function applyUnsharpMask(&$img, $amount, $radius, $threshold) {
-
-		// $img is an image that is already created within php using
-		// imgcreatetruecolor. No url! $img must be a truecolor image.
-
-		// Attempt to calibrate the parameters to Photoshop:
-		$amount = min($amount, 500) * 0.016;
-		$radius = abs(round(min(50, $radius) * 2)); // Only integers make sense.
-		$threshold = min(255, $threshold);
-		if ($radius == 0) {
-			return true;
-		}
-		$w = imagesx($img);
-		$h = imagesy($img);
-		$imgCanvas = imagecreatetruecolor($w, $h);
-		$imgBlur   = imagecreatetruecolor($w, $h);
-
-		// Gaussian blur matrix:
-		//
-		//    1    2    1
-		//    2    4    2
-		//    1    2    1
-		//
-		//////////////////////////////////////////////////
-
-		if (function_exists('imageconvolution')) { // PHP >= 5.1
-			$matrix = array(
-				array(1, 2, 1),
-				array(2, 4, 2),
-				array(1, 2, 1)
-			);
-			imagecopy($imgBlur, $img, 0, 0, 0, 0, $w, $h);
-			imageconvolution($imgBlur, $matrix, 16, 0);
-
-		} else {
-
-			// 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,   $img,       0, 0, 1, 0, $w - 1, $h);               // left
-				imagecopymerge($imgBlur,   $img,       1, 0, 0, 0, $w    , $h,     50);       // right
-				imagecopymerge($imgBlur,   $img,       0, 0, 0, 0, $w    , $h,     50);       // center
-				imagecopy(     $imgCanvas, $imgBlur,   0, 0, 0, 0, $w    , $h);
-				imagecopymerge($imgBlur,   $imgCanvas, 0, 0, 0, 1, $w    , $h - 1, 33.33333); // up
-				imagecopymerge($imgBlur,   $imgCanvas, 0, 1, 0, 0, $w    , $h,     25);       // down
-			}
-		}
-
-		if ($threshold > 0){
-			// Calculate the difference between the blurred pixels and the original
-			// and set the pixels
-			for ($x = 0; $x < $w-1; $x++)    { // each row
-				for ($y = 0; $y < $h; $y++)    { // each pixel
-
-					$rgbOrig = imagecolorat($img, $x, $y);
-					$rOrig = (($rgbOrig >> 16) & 0xFF);
-					$gOrig = (($rgbOrig >>  8) & 0xFF);
-					$bOrig =  ($rgbOrig        & 0xFF);
-
-					$rgbBlur = imagecolorat($imgBlur, $x, $y);
-
-					$rBlur = (($rgbBlur >> 16) & 0xFF);
-					$gBlur = (($rgbBlur >>  8) & 0xFF);
-					$bBlur =  ($rgbBlur        & 0xFF);
-
-					// When the masked pixels differ less from the original
-					// than the threshold specifies, they are set to their original value.
-					$rNew = ((abs($rOrig - $rBlur) >= $threshold) ? max(0, min(255, ($amount * ($rOrig - $rBlur)) + $rOrig)) : $rOrig);
-					$gNew = ((abs($gOrig - $gBlur) >= $threshold) ? max(0, min(255, ($amount * ($gOrig - $gBlur)) + $gOrig)) : $gOrig);
-					$bNew = ((abs($bOrig - $bBlur) >= $threshold) ? max(0, min(255, ($amount * ($bOrig - $bBlur)) + $bOrig)) : $bOrig);
-
-					if (($rOrig != $rNew) || ($gOrig != $gNew) || ($bOrig != $bNew)) {
-						$pixCol = imagecolorallocate($img, $rNew, $gNew, $bNew);
-						imagesetpixel($img, $x, $y, $pixCol);
-					}
-				}
-			}
-		} else {
-			for ($x = 0; $x < $w; $x++)    { // each row
-				for ($y = 0; $y < $h; $y++)    { // each pixel
-					$rgbOrig = imagecolorat($img, $x, $y);
-					$rOrig = (($rgbOrig >> 16) & 0xFF);
-					$gOrig = (($rgbOrig >>  8) & 0xFF);
-					$bOrig =  ($rgbOrig        & 0xFF);
-
-					$rgbBlur = imagecolorat($imgBlur, $x, $y);
-
-					$rBlur = (($rgbBlur >> 16) & 0xFF);
-					$gBlur = (($rgbBlur >>  8) & 0xFF);
-					$bBlur =  ($rgbBlur        & 0xFF);
-
-					$rNew = min(255, max(0, ($amount * ($rOrig - $rBlur)) + $rOrig));
-					$gNew = min(255, max(0, ($amount * ($gOrig - $gBlur)) + $gOrig));
-					$bNew = min(255, max(0, ($amount * ($bOrig - $bBlur)) + $bOrig));
-					$rgbNew = ($rNew << 16) + ($gNew <<8) + $bNew;
-					imagesetpixel($img, $x, $y, $rgbNew);
-				}
-			}
-		}
-		imagedestroy($imgCanvas);
-		imagedestroy($imgBlur);
-		return true;
-	}
+    public static function applyUnsharpMask(&$img, $amount, $radius, $threshold) {
+
+        // $img is an image that is already created within php using
+        // imgcreatetruecolor. No url! $img must be a truecolor image.
+
+        // Attempt to calibrate the parameters to Photoshop:
+        $amount = min($amount, 500) * 0.016;
+        $radius = abs(round(min(50, $radius) * 2)); // Only integers make sense.
+        $threshold = min(255, $threshold);
+        if ($radius == 0) {
+            return true;
+        }
+        $w = imagesx($img);
+        $h = imagesy($img);
+        $imgCanvas = imagecreatetruecolor($w, $h);
+        $imgBlur   = imagecreatetruecolor($w, $h);
+
+        // Gaussian blur matrix:
+        //
+        //    1    2    1
+        //    2    4    2
+        //    1    2    1
+        //
+        //////////////////////////////////////////////////
+
+        if (function_exists('imageconvolution')) { // PHP >= 5.1
+            $matrix = array(
+                array(1, 2, 1),
+                array(2, 4, 2),
+                array(1, 2, 1)
+            );
+            imagecopy($imgBlur, $img, 0, 0, 0, 0, $w, $h);
+            imageconvolution($imgBlur, $matrix, 16, 0);
+
+        } else {
+
+            // 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,   $img,       0, 0, 1, 0, $w - 1, $h);               // left
+                imagecopymerge($imgBlur,   $img,       1, 0, 0, 0, $w    , $h,     50);       // right
+                imagecopymerge($imgBlur,   $img,       0, 0, 0, 0, $w    , $h,     50);       // center
+                imagecopy(     $imgCanvas, $imgBlur,   0, 0, 0, 0, $w    , $h);
+                imagecopymerge($imgBlur,   $imgCanvas, 0, 0, 0, 1, $w    , $h - 1, 33.33333); // up
+                imagecopymerge($imgBlur,   $imgCanvas, 0, 1, 0, 0, $w    , $h,     25);       // down
+            }
+        }
+
+        if ($threshold > 0){
+            // Calculate the difference between the blurred pixels and the original
+            // and set the pixels
+            for ($x = 0; $x < $w-1; $x++)    { // each row
+                for ($y = 0; $y < $h; $y++)    { // each pixel
+
+                    $rgbOrig = imagecolorat($img, $x, $y);
+                    $rOrig = (($rgbOrig >> 16) & 0xFF);
+                    $gOrig = (($rgbOrig >>  8) & 0xFF);
+                    $bOrig =  ($rgbOrig        & 0xFF);
+
+                    $rgbBlur = imagecolorat($imgBlur, $x, $y);
+
+                    $rBlur = (($rgbBlur >> 16) & 0xFF);
+                    $gBlur = (($rgbBlur >>  8) & 0xFF);
+                    $bBlur =  ($rgbBlur        & 0xFF);
+
+                    // When the masked pixels differ less from the original
+                    // than the threshold specifies, they are set to their original value.
+                    $rNew = ((abs($rOrig - $rBlur) >= $threshold) ? max(0, min(255, ($amount * ($rOrig - $rBlur)) + $rOrig)) : $rOrig);
+                    $gNew = ((abs($gOrig - $gBlur) >= $threshold) ? max(0, min(255, ($amount * ($gOrig - $gBlur)) + $gOrig)) : $gOrig);
+                    $bNew = ((abs($bOrig - $bBlur) >= $threshold) ? max(0, min(255, ($amount * ($bOrig - $bBlur)) + $bOrig)) : $bOrig);
+
+                    if (($rOrig != $rNew) || ($gOrig != $gNew) || ($bOrig != $bNew)) {
+                        $pixCol = imagecolorallocate($img, $rNew, $gNew, $bNew);
+                        imagesetpixel($img, $x, $y, $pixCol);
+                    }
+                }
+            }
+        } else {
+            for ($x = 0; $x < $w; $x++)    { // each row
+                for ($y = 0; $y < $h; $y++)    { // each pixel
+                    $rgbOrig = imagecolorat($img, $x, $y);
+                    $rOrig = (($rgbOrig >> 16) & 0xFF);
+                    $gOrig = (($rgbOrig >>  8) & 0xFF);
+                    $bOrig =  ($rgbOrig        & 0xFF);
+
+                    $rgbBlur = imagecolorat($imgBlur, $x, $y);
+
+                    $rBlur = (($rgbBlur >> 16) & 0xFF);
+                    $gBlur = (($rgbBlur >>  8) & 0xFF);
+                    $bBlur =  ($rgbBlur        & 0xFF);
+
+                    $rNew = min(255, max(0, ($amount * ($rOrig - $rBlur)) + $rOrig));
+                    $gNew = min(255, max(0, ($amount * ($gOrig - $gBlur)) + $gOrig));
+                    $bNew = min(255, max(0, ($amount * ($bOrig - $bBlur)) + $bOrig));
+                    $rgbNew = ($rNew << 16) + ($gNew <<8) + $bNew;
+                    imagesetpixel($img, $x, $y, $rgbNew);
+                }
+            }
+        }
+        imagedestroy($imgCanvas);
+        imagedestroy($imgBlur);
+        return true;
+    }
 }

Spacing +21 added lines, -21 removed lines

@@ -81,32 +81,32 @@ 
 
 			// 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,   $img,       0, 0, 1, 0, $w - 1, $h);               // left
-				imagecopymerge($imgBlur,   $img,       1, 0, 0, 0, $w    , $h,     50);       // right
-				imagecopymerge($imgBlur,   $img,       0, 0, 0, 0, $w    , $h,     50);       // center
-				imagecopy(     $imgCanvas, $imgBlur,   0, 0, 0, 0, $w    , $h);
-				imagecopymerge($imgBlur,   $imgCanvas, 0, 0, 0, 1, $w    , $h - 1, 33.33333); // up
-				imagecopymerge($imgBlur,   $imgCanvas, 0, 1, 0, 0, $w    , $h,     25);       // down
+			for ($i = 0; $i < $radius; $i++) {
+				imagecopy($imgBlur, $img, 0, 0, 1, 0, $w - 1, $h); // left
+				imagecopymerge($imgBlur, $img, 1, 0, 0, 0, $w, $h, 50); // right
+				imagecopymerge($imgBlur, $img, 0, 0, 0, 0, $w, $h, 50); // center
+				imagecopy($imgCanvas, $imgBlur, 0, 0, 0, 0, $w, $h);
+				imagecopymerge($imgBlur, $imgCanvas, 0, 0, 0, 1, $w, $h - 1, 33.33333); // up
+				imagecopymerge($imgBlur, $imgCanvas, 0, 1, 0, 0, $w, $h, 25); // down
 			}
 		}
 
-		if ($threshold > 0){
+		if ($threshold > 0) {
 			// Calculate the difference between the blurred pixels and the original
 			// and set the pixels
-			for ($x = 0; $x < $w-1; $x++)    { // each row
-				for ($y = 0; $y < $h; $y++)    { // each pixel
+			for ($x = 0; $x < $w - 1; $x++) { // each row
+				for ($y = 0; $y < $h; $y++) { // each pixel
 
 					$rgbOrig = imagecolorat($img, $x, $y);
 					$rOrig = (($rgbOrig >> 16) & 0xFF);
-					$gOrig = (($rgbOrig >>  8) & 0xFF);
-					$bOrig =  ($rgbOrig        & 0xFF);
+					$gOrig = (($rgbOrig >> 8) & 0xFF);
+					$bOrig = ($rgbOrig & 0xFF);
 
 					$rgbBlur = imagecolorat($imgBlur, $x, $y);
 
 					$rBlur = (($rgbBlur >> 16) & 0xFF);
-					$gBlur = (($rgbBlur >>  8) & 0xFF);
-					$bBlur =  ($rgbBlur        & 0xFF);
+					$gBlur = (($rgbBlur >> 8) & 0xFF);
+					$bBlur = ($rgbBlur & 0xFF);
 
 					// When the masked pixels differ less from the original
 					// than the threshold specifies, they are set to their original value.
@@ -121,23 +121,23 @@ 
 				}
 			}
 		} else {
-			for ($x = 0; $x < $w; $x++)    { // each row
-				for ($y = 0; $y < $h; $y++)    { // each pixel
+			for ($x = 0; $x < $w; $x++) { // each row
+				for ($y = 0; $y < $h; $y++) { // each pixel
 					$rgbOrig = imagecolorat($img, $x, $y);
 					$rOrig = (($rgbOrig >> 16) & 0xFF);
-					$gOrig = (($rgbOrig >>  8) & 0xFF);
-					$bOrig =  ($rgbOrig        & 0xFF);
+					$gOrig = (($rgbOrig >> 8) & 0xFF);
+					$bOrig = ($rgbOrig & 0xFF);
 
 					$rgbBlur = imagecolorat($imgBlur, $x, $y);
 
 					$rBlur = (($rgbBlur >> 16) & 0xFF);
-					$gBlur = (($rgbBlur >>  8) & 0xFF);
-					$bBlur =  ($rgbBlur        & 0xFF);
+					$gBlur = (($rgbBlur >> 8) & 0xFF);
+					$bBlur = ($rgbBlur & 0xFF);
 
 					$rNew = min(255, max(0, ($amount * ($rOrig - $rBlur)) + $rOrig));
 					$gNew = min(255, max(0, ($amount * ($gOrig - $gBlur)) + $gOrig));
 					$bNew = min(255, max(0, ($amount * ($bOrig - $bBlur)) + $bOrig));
-					$rgbNew = ($rNew << 16) + ($gNew <<8) + $bNew;
+					$rgbNew = ($rNew << 16) + ($gNew << 8) + $bNew;
 					imagesetpixel($img, $x, $y, $rgbNew);
 				}
 			}

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/index.php

Indentation +6 added lines, -6 removed lines

@@ -1,10 +1,10 @@
 <?php
 if (!file_exists('phpThumb.config.php')) {
-	if (file_exists('phpThumb.config.php.default')) {
-		echo 'WARNING! "phpThumb.config.php.default" MUST be renamed to "phpThumb.config.php"';
-	} else {
-		echo 'WARNING! "phpThumb.config.php" should exist but does not';
-	}
-	exit;
+    if (file_exists('phpThumb.config.php.default')) {
+        echo 'WARNING! "phpThumb.config.php.default" MUST be renamed to "phpThumb.config.php"';
+    } else {
+        echo 'WARNING! "phpThumb.config.php" should exist but does not';
+    }
+    exit;
 }
 header('Location: ./demo/');

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

Indentation +104 added lines, -104 removed lines

@@ -12,109 +12,109 @@
 
 class phpthumb_ico {
 
-	public function GD2ICOstring(&$gd_image_array) {
-		$ImageWidths  = array();
-		$ImageHeights = array();
-		$bpp          = array();
-		$totalcolors  = array();
-		$icXOR        = array();
-		$icAND        = array();
-		$icANDmask    = array();
-		foreach ($gd_image_array as $key => $gd_image) {
-
-			$ImageWidths[$key]  = imagesx($gd_image);
-			$ImageHeights[$key] = imagesy($gd_image);
-			$bpp[$key]          = imageistruecolor($gd_image) ? 32 : 24;
-			$totalcolors[$key]  = imagecolorstotal($gd_image);
-
-			$icXOR[$key] = '';
-			for ($y = $ImageHeights[$key] - 1; $y >= 0; $y--) {
-				for ($x = 0; $x < $ImageWidths[$key]; $x++) {
-					$argb = phpthumb_functions::GetPixelColor($gd_image, $x, $y);
-					$a = round(255 * ((127 - $argb['alpha']) / 127));
-					$r = $argb['red'];
-					$g = $argb['green'];
-					$b = $argb['blue'];
-
-					if ($bpp[$key] == 32) {
-						$icXOR[$key] .= chr($b).chr($g).chr($r).chr($a);
-					} elseif ($bpp[$key] == 24) {
-						$icXOR[$key] .= chr($b).chr($g).chr($r);
-					}
-
-					if ($a < 128) {
-						@$icANDmask[$key][$y] .= '1';
-					} else {
-						@$icANDmask[$key][$y] .= '0';
-					}
-				}
-				// mask bits are 32-bit aligned per scanline
-				while (strlen($icANDmask[$key][$y]) % 32) {
-					$icANDmask[$key][$y] .= '0';
-				}
-			}
-			$icAND[$key] = '';
-			foreach ($icANDmask[$key] as $y => $scanlinemaskbits) {
-				for ($i = 0, $iMax = strlen($scanlinemaskbits); $i < $iMax; $i += 8) {
-					$icAND[$key] .= chr(bindec(str_pad(substr($scanlinemaskbits, $i, 8), 8, '0', STR_PAD_LEFT)));
-				}
-			}
-
-		}
-
-		foreach ($gd_image_array as $key => $gd_image) {
-			$biSizeImage = $ImageWidths[$key] * $ImageHeights[$key] * ($bpp[$key] / 8);
-
-			// BITMAPINFOHEADER - 40 bytes
-			$BitmapInfoHeader[$key]  = '';
-			$BitmapInfoHeader[$key] .= "\x28\x00\x00\x00";                              // DWORD  biSize;
-			$BitmapInfoHeader[$key] .= phpthumb_functions::LittleEndian2String($ImageWidths[$key], 4);      // LONG   biWidth;
-			// The biHeight member specifies the combined
-			// height of the XOR and AND masks.
-			$BitmapInfoHeader[$key] .= phpthumb_functions::LittleEndian2String($ImageHeights[$key] * 2, 4); // LONG   biHeight;
-			$BitmapInfoHeader[$key] .= "\x01\x00";                                      // WORD   biPlanes;
-			$BitmapInfoHeader[$key] .= chr($bpp[$key])."\x00";                          // wBitCount;
-			$BitmapInfoHeader[$key] .= "\x00\x00\x00\x00";                              // DWORD  biCompression;
-			$BitmapInfoHeader[$key] .= phpthumb_functions::LittleEndian2String($biSizeImage, 4);            // DWORD  biSizeImage;
-			$BitmapInfoHeader[$key] .= "\x00\x00\x00\x00";                              // LONG   biXPelsPerMeter;
-			$BitmapInfoHeader[$key] .= "\x00\x00\x00\x00";                              // LONG   biYPelsPerMeter;
-			$BitmapInfoHeader[$key] .= "\x00\x00\x00\x00";                              // DWORD  biClrUsed;
-			$BitmapInfoHeader[$key] .= "\x00\x00\x00\x00";                              // DWORD  biClrImportant;
-		}
-
-
-		$icondata  = "\x00\x00";                                      // idReserved;   // Reserved (must be 0)
-		$icondata .= "\x01\x00";                                      // idType;       // Resource Type (1 for icons)
-		$icondata .= phpthumb_functions::LittleEndian2String(count($gd_image_array), 2);  // idCount;      // How many images?
-
-		$dwImageOffset = 6 + (count($gd_image_array) * 16);
-		foreach ($gd_image_array as $key => $gd_image) {
-			// ICONDIRENTRY   idEntries[1]; // An entry for each image (idCount of 'em)
-
-			$icondata .= chr($ImageWidths[$key]);                     // bWidth;          // Width, in pixels, of the image
-			$icondata .= chr($ImageHeights[$key]);                    // bHeight;         // Height, in pixels, of the image
-			$icondata .= chr($totalcolors[$key]);                     // bColorCount;     // Number of colors in image (0 if >=8bpp)
-			$icondata .= "\x00";                                      // bReserved;       // Reserved ( must be 0)
-
-			$icondata .= "\x01\x00";                                  // wPlanes;         // Color Planes
-			$icondata .= chr($bpp[$key])."\x00";                      // wBitCount;       // Bits per pixel
-
-			$dwBytesInRes = 40 + strlen($icXOR[$key]) + strlen($icAND[$key]);
-			$icondata .= phpthumb_functions::LittleEndian2String($dwBytesInRes, 4);       // dwBytesInRes;    // How many bytes in this resource?
-
-			$icondata .= phpthumb_functions::LittleEndian2String($dwImageOffset, 4);      // dwImageOffset;   // Where in the file is this image?
-			$dwImageOffset += strlen($BitmapInfoHeader[$key]);
-			$dwImageOffset += strlen($icXOR[$key]);
-			$dwImageOffset += strlen($icAND[$key]);
-		}
-
-		foreach ($gd_image_array as $key => $gd_image) {
-			$icondata .= $BitmapInfoHeader[$key];
-			$icondata .= $icXOR[$key];
-			$icondata .= $icAND[$key];
-		}
-
-		return $icondata;
-	}
+    public function GD2ICOstring(&$gd_image_array) {
+        $ImageWidths  = array();
+        $ImageHeights = array();
+        $bpp          = array();
+        $totalcolors  = array();
+        $icXOR        = array();
+        $icAND        = array();
+        $icANDmask    = array();
+        foreach ($gd_image_array as $key => $gd_image) {
+
+            $ImageWidths[$key]  = imagesx($gd_image);
+            $ImageHeights[$key] = imagesy($gd_image);
+            $bpp[$key]          = imageistruecolor($gd_image) ? 32 : 24;
+            $totalcolors[$key]  = imagecolorstotal($gd_image);
+
+            $icXOR[$key] = '';
+            for ($y = $ImageHeights[$key] - 1; $y >= 0; $y--) {
+                for ($x = 0; $x < $ImageWidths[$key]; $x++) {
+                    $argb = phpthumb_functions::GetPixelColor($gd_image, $x, $y);
+                    $a = round(255 * ((127 - $argb['alpha']) / 127));
+                    $r = $argb['red'];
+                    $g = $argb['green'];
+                    $b = $argb['blue'];
+
+                    if ($bpp[$key] == 32) {
+                        $icXOR[$key] .= chr($b).chr($g).chr($r).chr($a);
+                    } elseif ($bpp[$key] == 24) {
+                        $icXOR[$key] .= chr($b).chr($g).chr($r);
+                    }
+
+                    if ($a < 128) {
+                        @$icANDmask[$key][$y] .= '1';
+                    } else {
+                        @$icANDmask[$key][$y] .= '0';
+                    }
+                }
+                // mask bits are 32-bit aligned per scanline
+                while (strlen($icANDmask[$key][$y]) % 32) {
+                    $icANDmask[$key][$y] .= '0';
+                }
+            }
+            $icAND[$key] = '';
+            foreach ($icANDmask[$key] as $y => $scanlinemaskbits) {
+                for ($i = 0, $iMax = strlen($scanlinemaskbits); $i < $iMax; $i += 8) {
+                    $icAND[$key] .= chr(bindec(str_pad(substr($scanlinemaskbits, $i, 8), 8, '0', STR_PAD_LEFT)));
+                }
+            }
+
+        }
+
+        foreach ($gd_image_array as $key => $gd_image) {
+            $biSizeImage = $ImageWidths[$key] * $ImageHeights[$key] * ($bpp[$key] / 8);
+
+            // BITMAPINFOHEADER - 40 bytes
+            $BitmapInfoHeader[$key]  = '';
+            $BitmapInfoHeader[$key] .= "\x28\x00\x00\x00";                              // DWORD  biSize;
+            $BitmapInfoHeader[$key] .= phpthumb_functions::LittleEndian2String($ImageWidths[$key], 4);      // LONG   biWidth;
+            // The biHeight member specifies the combined
+            // height of the XOR and AND masks.
+            $BitmapInfoHeader[$key] .= phpthumb_functions::LittleEndian2String($ImageHeights[$key] * 2, 4); // LONG   biHeight;
+            $BitmapInfoHeader[$key] .= "\x01\x00";                                      // WORD   biPlanes;
+            $BitmapInfoHeader[$key] .= chr($bpp[$key])."\x00";                          // wBitCount;
+            $BitmapInfoHeader[$key] .= "\x00\x00\x00\x00";                              // DWORD  biCompression;
+            $BitmapInfoHeader[$key] .= phpthumb_functions::LittleEndian2String($biSizeImage, 4);            // DWORD  biSizeImage;
+            $BitmapInfoHeader[$key] .= "\x00\x00\x00\x00";                              // LONG   biXPelsPerMeter;
+            $BitmapInfoHeader[$key] .= "\x00\x00\x00\x00";                              // LONG   biYPelsPerMeter;
+            $BitmapInfoHeader[$key] .= "\x00\x00\x00\x00";                              // DWORD  biClrUsed;
+            $BitmapInfoHeader[$key] .= "\x00\x00\x00\x00";                              // DWORD  biClrImportant;
+        }
+
+
+        $icondata  = "\x00\x00";                                      // idReserved;   // Reserved (must be 0)
+        $icondata .= "\x01\x00";                                      // idType;       // Resource Type (1 for icons)
+        $icondata .= phpthumb_functions::LittleEndian2String(count($gd_image_array), 2);  // idCount;      // How many images?
+
+        $dwImageOffset = 6 + (count($gd_image_array) * 16);
+        foreach ($gd_image_array as $key => $gd_image) {
+            // ICONDIRENTRY   idEntries[1]; // An entry for each image (idCount of 'em)
+
+            $icondata .= chr($ImageWidths[$key]);                     // bWidth;          // Width, in pixels, of the image
+            $icondata .= chr($ImageHeights[$key]);                    // bHeight;         // Height, in pixels, of the image
+            $icondata .= chr($totalcolors[$key]);                     // bColorCount;     // Number of colors in image (0 if >=8bpp)
+            $icondata .= "\x00";                                      // bReserved;       // Reserved ( must be 0)
+
+            $icondata .= "\x01\x00";                                  // wPlanes;         // Color Planes
+            $icondata .= chr($bpp[$key])."\x00";                      // wBitCount;       // Bits per pixel
+
+            $dwBytesInRes = 40 + strlen($icXOR[$key]) + strlen($icAND[$key]);
+            $icondata .= phpthumb_functions::LittleEndian2String($dwBytesInRes, 4);       // dwBytesInRes;    // How many bytes in this resource?
+
+            $icondata .= phpthumb_functions::LittleEndian2String($dwImageOffset, 4);      // dwImageOffset;   // Where in the file is this image?
+            $dwImageOffset += strlen($BitmapInfoHeader[$key]);
+            $dwImageOffset += strlen($icXOR[$key]);
+            $dwImageOffset += strlen($icAND[$key]);
+        }
+
+        foreach ($gd_image_array as $key => $gd_image) {
+            $icondata .= $BitmapInfoHeader[$key];
+            $icondata .= $icXOR[$key];
+            $icondata .= $icAND[$key];
+        }
+
+        return $icondata;
+    }
 
 }

Spacing +21 added lines, -21 removed lines

@@ -67,42 +67,42 @@
 
 			// BITMAPINFOHEADER - 40 bytes
 			$BitmapInfoHeader[$key]  = '';
-			$BitmapInfoHeader[$key] .= "\x28\x00\x00\x00";                              // DWORD  biSize;
-			$BitmapInfoHeader[$key] .= phpthumb_functions::LittleEndian2String($ImageWidths[$key], 4);      // LONG   biWidth;
+			$BitmapInfoHeader[$key] .= "\x28\x00\x00\x00"; // DWORD  biSize;
+			$BitmapInfoHeader[$key] .= phpthumb_functions::LittleEndian2String($ImageWidths[$key], 4); // LONG   biWidth;
 			// The biHeight member specifies the combined
 			// height of the XOR and AND masks.
 			$BitmapInfoHeader[$key] .= phpthumb_functions::LittleEndian2String($ImageHeights[$key] * 2, 4); // LONG   biHeight;
-			$BitmapInfoHeader[$key] .= "\x01\x00";                                      // WORD   biPlanes;
-			$BitmapInfoHeader[$key] .= chr($bpp[$key])."\x00";                          // wBitCount;
-			$BitmapInfoHeader[$key] .= "\x00\x00\x00\x00";                              // DWORD  biCompression;
-			$BitmapInfoHeader[$key] .= phpthumb_functions::LittleEndian2String($biSizeImage, 4);            // DWORD  biSizeImage;
-			$BitmapInfoHeader[$key] .= "\x00\x00\x00\x00";                              // LONG   biXPelsPerMeter;
-			$BitmapInfoHeader[$key] .= "\x00\x00\x00\x00";                              // LONG   biYPelsPerMeter;
-			$BitmapInfoHeader[$key] .= "\x00\x00\x00\x00";                              // DWORD  biClrUsed;
-			$BitmapInfoHeader[$key] .= "\x00\x00\x00\x00";                              // DWORD  biClrImportant;
+			$BitmapInfoHeader[$key] .= "\x01\x00"; // WORD   biPlanes;
+			$BitmapInfoHeader[$key] .= chr($bpp[$key])."\x00"; // wBitCount;
+			$BitmapInfoHeader[$key] .= "\x00\x00\x00\x00"; // DWORD  biCompression;
+			$BitmapInfoHeader[$key] .= phpthumb_functions::LittleEndian2String($biSizeImage, 4); // DWORD  biSizeImage;
+			$BitmapInfoHeader[$key] .= "\x00\x00\x00\x00"; // LONG   biXPelsPerMeter;
+			$BitmapInfoHeader[$key] .= "\x00\x00\x00\x00"; // LONG   biYPelsPerMeter;
+			$BitmapInfoHeader[$key] .= "\x00\x00\x00\x00"; // DWORD  biClrUsed;
+			$BitmapInfoHeader[$key] .= "\x00\x00\x00\x00"; // DWORD  biClrImportant;
 		}
 
 
-		$icondata  = "\x00\x00";                                      // idReserved;   // Reserved (must be 0)
-		$icondata .= "\x01\x00";                                      // idType;       // Resource Type (1 for icons)
-		$icondata .= phpthumb_functions::LittleEndian2String(count($gd_image_array), 2);  // idCount;      // How many images?
+		$icondata  = "\x00\x00"; // idReserved;   // Reserved (must be 0)
+		$icondata .= "\x01\x00"; // idType;       // Resource Type (1 for icons)
+		$icondata .= phpthumb_functions::LittleEndian2String(count($gd_image_array), 2); // idCount;      // How many images?
 
 		$dwImageOffset = 6 + (count($gd_image_array) * 16);
 		foreach ($gd_image_array as $key => $gd_image) {
 			// ICONDIRENTRY   idEntries[1]; // An entry for each image (idCount of 'em)
 
-			$icondata .= chr($ImageWidths[$key]);                     // bWidth;          // Width, in pixels, of the image
-			$icondata .= chr($ImageHeights[$key]);                    // bHeight;         // Height, in pixels, of the image
-			$icondata .= chr($totalcolors[$key]);                     // bColorCount;     // Number of colors in image (0 if >=8bpp)
-			$icondata .= "\x00";                                      // bReserved;       // Reserved ( must be 0)
+			$icondata .= chr($ImageWidths[$key]); // bWidth;          // Width, in pixels, of the image
+			$icondata .= chr($ImageHeights[$key]); // bHeight;         // Height, in pixels, of the image
+			$icondata .= chr($totalcolors[$key]); // bColorCount;     // Number of colors in image (0 if >=8bpp)
+			$icondata .= "\x00"; // bReserved;       // Reserved ( must be 0)
 
-			$icondata .= "\x01\x00";                                  // wPlanes;         // Color Planes
-			$icondata .= chr($bpp[$key])."\x00";                      // wBitCount;       // Bits per pixel
+			$icondata .= "\x01\x00"; // wPlanes;         // Color Planes
+			$icondata .= chr($bpp[$key])."\x00"; // wBitCount;       // Bits per pixel
 
 			$dwBytesInRes = 40 + strlen($icXOR[$key]) + strlen($icAND[$key]);
-			$icondata .= phpthumb_functions::LittleEndian2String($dwBytesInRes, 4);       // dwBytesInRes;    // How many bytes in this resource?
+			$icondata .= phpthumb_functions::LittleEndian2String($dwBytesInRes, 4); // dwBytesInRes;    // How many bytes in this resource?
 
-			$icondata .= phpthumb_functions::LittleEndian2String($dwImageOffset, 4);      // dwImageOffset;   // Where in the file is this image?
+			$icondata .= phpthumb_functions::LittleEndian2String($dwImageOffset, 4); // dwImageOffset;   // Where in the file is this image?
 			$dwImageOffset += strlen($BitmapInfoHeader[$key]);
 			$dwImageOffset += strlen($icXOR[$key]);
 			$dwImageOffset += strlen($icAND[$key]);

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

Indentation +4302 added lines, -4302 removed lines

@@ -11,390 +11,390 @@ 
 
 ob_start();
 if (!include_once( __DIR__ .'/phpthumb.functions.php')) {
-	ob_end_flush();
-	die('failed to include_once("'. __DIR__ .'/phpthumb.functions.php")');
+    ob_end_flush();
+    die('failed to include_once("'. __DIR__ .'/phpthumb.functions.php")');
 }
 ob_end_clean();
 
 class phpthumb {
 
-	// public:
-	// START PARAMETERS (for object mode and phpThumb.php)
-	// See phpthumb.readme.txt for descriptions of what each of these values are
-	public $src  = null;     // SouRCe filename
-	public $new  = null;     // NEW image (phpThumb.php only)
-	public $w    = null;     // Width
-	public $h    = null;     // Height
-	public $wp   = null;     // Width  (Portrait Images Only)
-	public $hp   = null;     // Height (Portrait Images Only)
-	public $wl   = null;     // Width  (Landscape Images Only)
-	public $hl   = null;     // Height (Landscape Images Only)
-	public $ws   = null;     // Width  (Square Images Only)
-	public $hs   = null;     // Height (Square Images Only)
-	public $f    = null;     // output image Format
-	public $q    = 75;       // jpeg output Quality
-	public $sx   = null;     // Source crop top-left X position
-	public $sy   = null;     // Source crop top-left Y position
-	public $sw   = null;     // Source crop Width
-	public $sh   = null;     // Source crop Height
-	public $zc   = null;     // Zoom Crop
-	public $bc   = null;     // Border Color
-	public $bg   = null;     // BackGround color
-	public $fltr = array();  // FiLTeRs
-	public $goto = null;     // GO TO url after processing
-	public $err  = null;     // default ERRor image filename
-	public $xto  = null;     // extract eXif Thumbnail Only
-	public $ra   = null;     // Rotate by Angle
-	public $ar   = null;     // Auto Rotate
-	public $aoe  = null;     // Allow Output Enlargement
-	public $far  = null;     // Fixed Aspect Ratio
-	public $iar  = null;     // Ignore Aspect Ratio
-	public $maxb = null;     // MAXimum Bytes
-	public $down = null;     // DOWNload thumbnail filename
-	public $md5s = null;     // MD5 hash of Source image
-	public $sfn  = 0;        // Source Frame Number
-	public $dpi  = 150;      // Dots Per Inch for vector source formats
-	public $sia  = null;     // Save Image As filename
-
-	public $file = null;     // >>>deprecated, DO NOT USE, will be removed in future versions<<<
-
-	public $phpThumbDebug = null;
-	// END PARAMETERS
-
-
-	// public:
-	// START CONFIGURATION OPTIONS (for object mode only)
-	// See phpThumb.config.php for descriptions of what each of these settings do
-
-	// * Directory Configuration
-	public $config_cache_directory                      = null;
-	public $config_cache_directory_depth                = 0;
-	public $config_cache_disable_warning                = true;
-	public $config_cache_source_enabled                 = false;
-	public $config_cache_source_directory               = null;
-	public $config_temp_directory                       = null;
-	public $config_document_root                        = null;
-
-	// * Default output configuration:
-	public $config_output_format                        = 'jpeg';
-	public $config_output_maxwidth                      = 0;
-	public $config_output_maxheight                     = 0;
-	public $config_output_interlace                     = true;
-
-	// * Error message configuration
-	public $config_error_image_width                    = 400;
-	public $config_error_image_height                   = 100;
-	public $config_error_message_image_default          = '';
-	public $config_error_bgcolor                        = 'CCCCFF';
-	public $config_error_textcolor                      = 'FF0000';
-	public $config_error_fontsize                       = 1;
-	public $config_error_die_on_error                   = false;
-	public $config_error_silent_die_on_error            = false;
-	public $config_error_die_on_source_failure          = true;
-
-	// * Anti-Hotlink Configuration:
-	public $config_nohotlink_enabled                    = true;
-	public $config_nohotlink_valid_domains              = array();
-	public $config_nohotlink_erase_image                = true;
-	public $config_nohotlink_text_message               = 'Off-server thumbnailing is not allowed';
-	// * Off-server Linking Configuration:
-	public $config_nooffsitelink_enabled                = false;
-	public $config_nooffsitelink_valid_domains          = array();
-	public $config_nooffsitelink_require_refer          = false;
-	public $config_nooffsitelink_erase_image            = true;
-	public $config_nooffsitelink_watermark_src          = '';
-	public $config_nooffsitelink_text_message           = 'Off-server linking is not allowed';
-
-	// * Border & Background default colors
-	public $config_border_hexcolor                      = '000000';
-	public $config_background_hexcolor                  = 'FFFFFF';
-
-	// * TrueType Fonts
-	public $config_ttf_directory                        = './fonts';
-
-	public $config_max_source_pixels                    = null;
-	public $config_use_exif_thumbnail_for_speed         = false;
-	public $config_allow_local_http_src                 = false;
-
-	public $config_imagemagick_path                     = null;
-	public $config_prefer_imagemagick                   = true;
-	public $config_imagemagick_use_thumbnail            = true;
-
-	public $config_cache_maxage                         = null;
-	public $config_cache_maxsize                        = null;
-	public $config_cache_maxfiles                       = null;
-	public $config_cache_source_filemtime_ignore_local  = false;
-	public $config_cache_source_filemtime_ignore_remote = true;
-	public $config_cache_default_only_suffix            = false;
-	public $config_cache_force_passthru                 = true;
-	public $config_cache_prefix                         = '';    // default value set in the constructor below
-
-	// * MySQL
-	public $config_mysql_extension                      = null;
-	public $config_mysql_query                          = null;
-	public $config_mysql_hostname                       = null;
-	public $config_mysql_username                       = null;
-	public $config_mysql_password                       = null;
-	public $config_mysql_database                       = null;
-
-	// * Security
-	public $config_high_security_enabled                = true;
-	public $config_high_security_password               = null;
-	public $config_high_security_url_separator          = '&';
-	public $config_disable_debug                        = true;
-	public $config_allow_src_above_docroot              = false;
-	public $config_allow_src_above_phpthumb             = true;
-	public $config_auto_allow_symlinks                  = true;    // allow symlink target directories without explicitly whitelisting them
-	public $config_additional_allowed_dirs              = array(); // additional directories to allow source images to be read from
-	public $config_file_create_mask                     = 0755;
-	public $config_dir_create_mask                      = 0755;
-
-	// * HTTP fopen
-	public $config_http_fopen_timeout                   = 10;
-	public $config_http_follow_redirect                 = true;
-
-	// * Compatability
-	public $config_disable_pathinfo_parsing             = false;
-	public $config_disable_imagecopyresampled           = false;
-	public $config_disable_onlycreateable_passthru      = false;
-	public $config_disable_realpath                     = false;
-
-	public $config_http_user_agent                      = 'Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.7.12) Gecko/20050915 Firefox/1.0.7';
-
-	// END CONFIGURATION OPTIONS
-
-
-	// public: error messages (read-only; persistant)
-	public $debugmessages = array();
-	public $debugtiming   = array();
-	public $fatalerror    = null;
-
-
-	// private: (should not be modified directly)
-	public $thumbnailQuality = 75;
-	public $thumbnailFormat  = null;
-
-	public $sourceFilename   = null;
-	public $rawImageData     = null;
-	public $IMresizedData    = null;
-	public $outputImageData  = null;
-
-	public $useRawIMoutput   = false;
-
-	public $gdimg_output     = null;
-	public $gdimg_source     = null;
-
-	public $getimagesizeinfo = null;
-
-	public $source_width  = null;
-	public $source_height = null;
-
-	public $thumbnailCropX = null;
-	public $thumbnailCropY = null;
-	public $thumbnailCropW = null;
-	public $thumbnailCropH = null;
-
-	public $exif_thumbnail_width  = null;
-	public $exif_thumbnail_height = null;
-	public $exif_thumbnail_type   = null;
-	public $exif_thumbnail_data   = null;
-	public $exif_raw_data         = null;
-
-	public $thumbnail_width        = null;
-	public $thumbnail_height       = null;
-	public $thumbnail_image_width  = null;
-	public $thumbnail_image_height = null;
-
-	public $tempFilesToDelete = array();
-	public $cache_filename    = null;
-
-	public $AlphaCapableFormats = array( 'png', 'ico', 'gif');
-	public $is_alpha = false;
-
-	public $iswindows        = null;
-	public $issafemode       = null;
-	public $php_memory_limit = null;
-
-	public $phpthumb_version = '1.7.15-201802181529';
-
-	//////////////////////////////////////////////////////////////////////
-
-	// public: constructor
-	public function __construct() {
-		$this->phpThumb();
-	}
-
-	public function phpThumb() {
-		$this->DebugTimingMessage('phpThumb() constructor', __FILE__, __LINE__);
-		$this->DebugMessage('phpThumb() v'.$this->phpthumb_version, __FILE__, __LINE__);
-
-		foreach (array(ini_get('memory_limit'), get_cfg_var('memory_limit')) as $php_config_memory_limit) {
-			if ('' !== $php_config_memory_limit) {
-				if (strtoupper($php_config_memory_limit[ strlen($php_config_memory_limit) - 1 ]) == 'G') { // PHP memory limit expressed in Gigabytes
-					$php_config_memory_limit = (int) substr($php_config_memory_limit, 0, -1) * 1073741824;
-				} elseif (strtoupper($php_config_memory_limit[ strlen($php_config_memory_limit) - 1 ]) == 'M') { // PHP memory limit expressed in Megabytes
-					$php_config_memory_limit = (int) substr($php_config_memory_limit, 0, -1) * 1048576;
-				}
-				$this->php_memory_limit = max($this->php_memory_limit, $php_config_memory_limit);
-			}
-		}
-		if ($this->php_memory_limit > 0) { // could be "-1" for "no limit"
-			$this->config_max_source_pixels = round($this->php_memory_limit * 0.20); // 20% of memory_limit
-		}
-
-		$this->iswindows  = (bool) (strtoupper(substr(PHP_OS, 0, 3)) == 'WIN');
-		$this->issafemode = (bool) preg_match('#(1|ON)#i', ini_get('safe_mode'));
-		$this->config_document_root = (!empty($_SERVER['DOCUMENT_ROOT']) ? $_SERVER['DOCUMENT_ROOT']   : $this->config_document_root);
-		$this->config_cache_prefix  = ( isset($_SERVER['SERVER_NAME'])   ? $_SERVER['SERVER_NAME'].'_' : '');
-
-		$this->purgeTempFiles(); // purge existing temp files if re-initializing object
-
-		$php_sapi_name = strtolower(function_exists('php_sapi_name') ? PHP_SAPI : '');
-		if ($php_sapi_name == 'cli') {
-			$this->config_allow_src_above_docroot = true;
-		}
-
-		if (!$this->config_disable_debug) {
-			// if debug mode is enabled, force phpThumbDebug output, do not allow normal thumbnails to be generated
-			$this->phpThumbDebug = (null === $this->phpThumbDebug ? 9 : max(1, (int) $this->phpThumbDebug));
-		}
-	}
-
-	public function __destruct() {
-		$this->purgeTempFiles();
-	}
-
-	// public:
-	public function purgeTempFiles() {
-		foreach ($this->tempFilesToDelete as $tempFileToDelete) {
-			if (file_exists($tempFileToDelete)) {
-				$this->DebugMessage('Deleting temp file "'.$tempFileToDelete.'"', __FILE__, __LINE__);
-				@unlink($tempFileToDelete);
-			}
-		}
-		$this->tempFilesToDelete = array();
-		return true;
-	}
-
-	// public:
-	public function setSourceFilename($sourceFilename) {
-		//$this->resetObject();
-		//$this->rawImageData   = null;
-		$this->sourceFilename = $sourceFilename;
-		$this->src            = $sourceFilename;
-		if (null === $this->config_output_format) {
-			$sourceFileExtension = strtolower(substr(strrchr($sourceFilename, '.'), 1));
-			if (preg_match('#^[a-z]{3,4}$#', $sourceFileExtension)) {
-				$this->config_output_format = $sourceFileExtension;
-				$this->DebugMessage('setSourceFilename('.$sourceFilename.') set $this->config_output_format to "'.$sourceFileExtension.'"', __FILE__, __LINE__);
-			} else {
-				$this->DebugMessage('setSourceFilename('.$sourceFilename.') did NOT set $this->config_output_format to "'.$sourceFileExtension.'" because it did not seem like an appropriate image format', __FILE__, __LINE__);
-			}
-		}
-		$this->DebugMessage('setSourceFilename('.$sourceFilename.') set $this->sourceFilename to "'.$this->sourceFilename.'"', __FILE__, __LINE__);
-		return true;
-	}
-
-	// public:
-	public function setSourceData($rawImageData, $sourceFilename='') {
-		//$this->resetObject();
-		//$this->sourceFilename = null;
-		$this->rawImageData   = $rawImageData;
-		$this->DebugMessage('setSourceData() setting $this->rawImageData ('.strlen($this->rawImageData).' bytes; magic="'.substr($this->rawImageData, 0, 4).'" ('.phpthumb_functions::HexCharDisplay(substr($this->rawImageData, 0, 4)).'))', __FILE__, __LINE__);
-		if ($this->config_cache_source_enabled) {
-			$sourceFilename = ($sourceFilename ? $sourceFilename : md5($rawImageData));
-			if (!is_dir($this->config_cache_source_directory)) {
-				$this->ErrorImage('$this->config_cache_source_directory ('.$this->config_cache_source_directory.') is not a directory');
-			} elseif (!@is_writable($this->config_cache_source_directory)) {
-				$this->ErrorImage('$this->config_cache_source_directory ('.$this->config_cache_source_directory.') is not writable');
-			}
-			$this->DebugMessage('setSourceData() attempting to save source image to "'.$this->config_cache_source_directory.DIRECTORY_SEPARATOR.urlencode($sourceFilename).'"', __FILE__, __LINE__);
-			if ($fp = @fopen($this->config_cache_source_directory.DIRECTORY_SEPARATOR.urlencode($sourceFilename), 'wb')) {
-				fwrite($fp, $rawImageData);
-				fclose($fp);
-			} elseif (!$this->phpThumbDebug) {
-				$this->ErrorImage('setSourceData() failed to write to source cache ('.$this->config_cache_source_directory.DIRECTORY_SEPARATOR.urlencode($sourceFilename).')');
-			}
-		}
-		return true;
-	}
-
-	// public:
-	public function setSourceImageResource($gdimg) {
-		//$this->resetObject();
-		$this->gdimg_source = $gdimg;
-		return true;
-	}
-
-	// public:
-	public function setParameter($param, $value) {
-		if ($param == 'src') {
-			$this->setSourceFilename($this->ResolveFilenameToAbsolute($value));
-		} elseif (@is_array($this->$param)) {
-			if (is_array($value)) {
-				foreach ($value as $arraykey => $arrayvalue) {
-					array_push($this->$param, $arrayvalue);
-				}
-			} else {
-				array_push($this->$param, $value);
-			}
-		} else {
-			$this->$param = $value;
-		}
-		return true;
-	}
-
-	// public:
-	public function getParameter($param) {
-		//if (property_exists('phpThumb', $param)) {
-			return $this->$param;
-		//}
-		//$this->DebugMessage('setParameter() attempting to get non-existant parameter "'.$param.'"', __FILE__, __LINE__);
-		//return false;
-	}
-
-
-	// public:
-	public function GenerateThumbnail() {
-
-		$this->setOutputFormat();
-			$this->phpThumbDebug('8a');
-		$this->ResolveSource();
-			$this->phpThumbDebug('8b');
-		$this->SetCacheFilename();
-			$this->phpThumbDebug('8c');
-		$this->ExtractEXIFgetImageSize();
-			$this->phpThumbDebug('8d');
-		if ($this->useRawIMoutput) {
-			$this->DebugMessage('Skipping rest of GenerateThumbnail() because ($this->useRawIMoutput == true)', __FILE__, __LINE__);
-			return true;
-		}
-			$this->phpThumbDebug('8e');
-		if (!$this->SourceImageToGD()) {
-			$this->DebugMessage('SourceImageToGD() failed', __FILE__, __LINE__);
-			return false;
-		}
-			$this->phpThumbDebug('8f');
-		$this->Rotate();
-			$this->phpThumbDebug('8g');
-		$this->CreateGDoutput();
-			$this->phpThumbDebug('8h');
-
-		// default values, also applicable for far="C"
-		$destination_offset_x = round(($this->thumbnail_width  - $this->thumbnail_image_width)  / 2);
-		$destination_offset_y = round(($this->thumbnail_height - $this->thumbnail_image_height) / 2);
-		if (($this->far == 'L') || ($this->far == 'TL') || ($this->far == 'BL')) {
-			$destination_offset_x = 0;
-		}
-		if (($this->far == 'R') || ($this->far == 'TR') || ($this->far == 'BR')) {
-			$destination_offset_x =  round($this->thumbnail_width  - $this->thumbnail_image_width);
-		}
-		if (($this->far == 'T') || ($this->far == 'TL') || ($this->far == 'TR')) {
-			$destination_offset_y = 0;
-		}
-		if (($this->far == 'B') || ($this->far == 'BL') || ($this->far == 'BR')) {
-			$destination_offset_y =  round($this->thumbnail_height - $this->thumbnail_image_height);
-		}
+    // public:
+    // START PARAMETERS (for object mode and phpThumb.php)
+    // See phpthumb.readme.txt for descriptions of what each of these values are
+    public $src  = null;     // SouRCe filename
+    public $new  = null;     // NEW image (phpThumb.php only)
+    public $w    = null;     // Width
+    public $h    = null;     // Height
+    public $wp   = null;     // Width  (Portrait Images Only)
+    public $hp   = null;     // Height (Portrait Images Only)
+    public $wl   = null;     // Width  (Landscape Images Only)
+    public $hl   = null;     // Height (Landscape Images Only)
+    public $ws   = null;     // Width  (Square Images Only)
+    public $hs   = null;     // Height (Square Images Only)
+    public $f    = null;     // output image Format
+    public $q    = 75;       // jpeg output Quality
+    public $sx   = null;     // Source crop top-left X position
+    public $sy   = null;     // Source crop top-left Y position
+    public $sw   = null;     // Source crop Width
+    public $sh   = null;     // Source crop Height
+    public $zc   = null;     // Zoom Crop
+    public $bc   = null;     // Border Color
+    public $bg   = null;     // BackGround color
+    public $fltr = array();  // FiLTeRs
+    public $goto = null;     // GO TO url after processing
+    public $err  = null;     // default ERRor image filename
+    public $xto  = null;     // extract eXif Thumbnail Only
+    public $ra   = null;     // Rotate by Angle
+    public $ar   = null;     // Auto Rotate
+    public $aoe  = null;     // Allow Output Enlargement
+    public $far  = null;     // Fixed Aspect Ratio
+    public $iar  = null;     // Ignore Aspect Ratio
+    public $maxb = null;     // MAXimum Bytes
+    public $down = null;     // DOWNload thumbnail filename
+    public $md5s = null;     // MD5 hash of Source image
+    public $sfn  = 0;        // Source Frame Number
+    public $dpi  = 150;      // Dots Per Inch for vector source formats
+    public $sia  = null;     // Save Image As filename
+
+    public $file = null;     // >>>deprecated, DO NOT USE, will be removed in future versions<<<
+
+    public $phpThumbDebug = null;
+    // END PARAMETERS
+
+
+    // public:
+    // START CONFIGURATION OPTIONS (for object mode only)
+    // See phpThumb.config.php for descriptions of what each of these settings do
+
+    // * Directory Configuration
+    public $config_cache_directory                      = null;
+    public $config_cache_directory_depth                = 0;
+    public $config_cache_disable_warning                = true;
+    public $config_cache_source_enabled                 = false;
+    public $config_cache_source_directory               = null;
+    public $config_temp_directory                       = null;
+    public $config_document_root                        = null;
+
+    // * Default output configuration:
+    public $config_output_format                        = 'jpeg';
+    public $config_output_maxwidth                      = 0;
+    public $config_output_maxheight                     = 0;
+    public $config_output_interlace                     = true;
+
+    // * Error message configuration
+    public $config_error_image_width                    = 400;
+    public $config_error_image_height                   = 100;
+    public $config_error_message_image_default          = '';
+    public $config_error_bgcolor                        = 'CCCCFF';
+    public $config_error_textcolor                      = 'FF0000';
+    public $config_error_fontsize                       = 1;
+    public $config_error_die_on_error                   = false;
+    public $config_error_silent_die_on_error            = false;
+    public $config_error_die_on_source_failure          = true;
+
+    // * Anti-Hotlink Configuration:
+    public $config_nohotlink_enabled                    = true;
+    public $config_nohotlink_valid_domains              = array();
+    public $config_nohotlink_erase_image                = true;
+    public $config_nohotlink_text_message               = 'Off-server thumbnailing is not allowed';
+    // * Off-server Linking Configuration:
+    public $config_nooffsitelink_enabled                = false;
+    public $config_nooffsitelink_valid_domains          = array();
+    public $config_nooffsitelink_require_refer          = false;
+    public $config_nooffsitelink_erase_image            = true;
+    public $config_nooffsitelink_watermark_src          = '';
+    public $config_nooffsitelink_text_message           = 'Off-server linking is not allowed';
+
+    // * Border & Background default colors
+    public $config_border_hexcolor                      = '000000';
+    public $config_background_hexcolor                  = 'FFFFFF';
+
+    // * TrueType Fonts
+    public $config_ttf_directory                        = './fonts';
+
+    public $config_max_source_pixels                    = null;
+    public $config_use_exif_thumbnail_for_speed         = false;
+    public $config_allow_local_http_src                 = false;
+
+    public $config_imagemagick_path                     = null;
+    public $config_prefer_imagemagick                   = true;
+    public $config_imagemagick_use_thumbnail            = true;
+
+    public $config_cache_maxage                         = null;
+    public $config_cache_maxsize                        = null;
+    public $config_cache_maxfiles                       = null;
+    public $config_cache_source_filemtime_ignore_local  = false;
+    public $config_cache_source_filemtime_ignore_remote = true;
+    public $config_cache_default_only_suffix            = false;
+    public $config_cache_force_passthru                 = true;
+    public $config_cache_prefix                         = '';    // default value set in the constructor below
+
+    // * MySQL
+    public $config_mysql_extension                      = null;
+    public $config_mysql_query                          = null;
+    public $config_mysql_hostname                       = null;
+    public $config_mysql_username                       = null;
+    public $config_mysql_password                       = null;
+    public $config_mysql_database                       = null;
+
+    // * Security
+    public $config_high_security_enabled                = true;
+    public $config_high_security_password               = null;
+    public $config_high_security_url_separator          = '&';
+    public $config_disable_debug                        = true;
+    public $config_allow_src_above_docroot              = false;
+    public $config_allow_src_above_phpthumb             = true;
+    public $config_auto_allow_symlinks                  = true;    // allow symlink target directories without explicitly whitelisting them
+    public $config_additional_allowed_dirs              = array(); // additional directories to allow source images to be read from
+    public $config_file_create_mask                     = 0755;
+    public $config_dir_create_mask                      = 0755;
+
+    // * HTTP fopen
+    public $config_http_fopen_timeout                   = 10;
+    public $config_http_follow_redirect                 = true;
+
+    // * Compatability
+    public $config_disable_pathinfo_parsing             = false;
+    public $config_disable_imagecopyresampled           = false;
+    public $config_disable_onlycreateable_passthru      = false;
+    public $config_disable_realpath                     = false;
+
+    public $config_http_user_agent                      = 'Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.7.12) Gecko/20050915 Firefox/1.0.7';
+
+    // END CONFIGURATION OPTIONS
+
+
+    // public: error messages (read-only; persistant)
+    public $debugmessages = array();
+    public $debugtiming   = array();
+    public $fatalerror    = null;
+
+
+    // private: (should not be modified directly)
+    public $thumbnailQuality = 75;
+    public $thumbnailFormat  = null;
+
+    public $sourceFilename   = null;
+    public $rawImageData     = null;
+    public $IMresizedData    = null;
+    public $outputImageData  = null;
+
+    public $useRawIMoutput   = false;
+
+    public $gdimg_output     = null;
+    public $gdimg_source     = null;
+
+    public $getimagesizeinfo = null;
+
+    public $source_width  = null;
+    public $source_height = null;
+
+    public $thumbnailCropX = null;
+    public $thumbnailCropY = null;
+    public $thumbnailCropW = null;
+    public $thumbnailCropH = null;
+
+    public $exif_thumbnail_width  = null;
+    public $exif_thumbnail_height = null;
+    public $exif_thumbnail_type   = null;
+    public $exif_thumbnail_data   = null;
+    public $exif_raw_data         = null;
+
+    public $thumbnail_width        = null;
+    public $thumbnail_height       = null;
+    public $thumbnail_image_width  = null;
+    public $thumbnail_image_height = null;
+
+    public $tempFilesToDelete = array();
+    public $cache_filename    = null;
+
+    public $AlphaCapableFormats = array( 'png', 'ico', 'gif');
+    public $is_alpha = false;
+
+    public $iswindows        = null;
+    public $issafemode       = null;
+    public $php_memory_limit = null;
+
+    public $phpthumb_version = '1.7.15-201802181529';
+
+    //////////////////////////////////////////////////////////////////////
+
+    // public: constructor
+    public function __construct() {
+        $this->phpThumb();
+    }
+
+    public function phpThumb() {
+        $this->DebugTimingMessage('phpThumb() constructor', __FILE__, __LINE__);
+        $this->DebugMessage('phpThumb() v'.$this->phpthumb_version, __FILE__, __LINE__);
+
+        foreach (array(ini_get('memory_limit'), get_cfg_var('memory_limit')) as $php_config_memory_limit) {
+            if ('' !== $php_config_memory_limit) {
+                if (strtoupper($php_config_memory_limit[ strlen($php_config_memory_limit) - 1 ]) == 'G') { // PHP memory limit expressed in Gigabytes
+                    $php_config_memory_limit = (int) substr($php_config_memory_limit, 0, -1) * 1073741824;
+                } elseif (strtoupper($php_config_memory_limit[ strlen($php_config_memory_limit) - 1 ]) == 'M') { // PHP memory limit expressed in Megabytes
+                    $php_config_memory_limit = (int) substr($php_config_memory_limit, 0, -1) * 1048576;
+                }
+                $this->php_memory_limit = max($this->php_memory_limit, $php_config_memory_limit);
+            }
+        }
+        if ($this->php_memory_limit > 0) { // could be "-1" for "no limit"
+            $this->config_max_source_pixels = round($this->php_memory_limit * 0.20); // 20% of memory_limit
+        }
+
+        $this->iswindows  = (bool) (strtoupper(substr(PHP_OS, 0, 3)) == 'WIN');
+        $this->issafemode = (bool) preg_match('#(1|ON)#i', ini_get('safe_mode'));
+        $this->config_document_root = (!empty($_SERVER['DOCUMENT_ROOT']) ? $_SERVER['DOCUMENT_ROOT']   : $this->config_document_root);
+        $this->config_cache_prefix  = ( isset($_SERVER['SERVER_NAME'])   ? $_SERVER['SERVER_NAME'].'_' : '');
+
+        $this->purgeTempFiles(); // purge existing temp files if re-initializing object
+
+        $php_sapi_name = strtolower(function_exists('php_sapi_name') ? PHP_SAPI : '');
+        if ($php_sapi_name == 'cli') {
+            $this->config_allow_src_above_docroot = true;
+        }
+
+        if (!$this->config_disable_debug) {
+            // if debug mode is enabled, force phpThumbDebug output, do not allow normal thumbnails to be generated
+            $this->phpThumbDebug = (null === $this->phpThumbDebug ? 9 : max(1, (int) $this->phpThumbDebug));
+        }
+    }
+
+    public function __destruct() {
+        $this->purgeTempFiles();
+    }
+
+    // public:
+    public function purgeTempFiles() {
+        foreach ($this->tempFilesToDelete as $tempFileToDelete) {
+            if (file_exists($tempFileToDelete)) {
+                $this->DebugMessage('Deleting temp file "'.$tempFileToDelete.'"', __FILE__, __LINE__);
+                @unlink($tempFileToDelete);
+            }
+        }
+        $this->tempFilesToDelete = array();
+        return true;
+    }
+
+    // public:
+    public function setSourceFilename($sourceFilename) {
+        //$this->resetObject();
+        //$this->rawImageData   = null;
+        $this->sourceFilename = $sourceFilename;
+        $this->src            = $sourceFilename;
+        if (null === $this->config_output_format) {
+            $sourceFileExtension = strtolower(substr(strrchr($sourceFilename, '.'), 1));
+            if (preg_match('#^[a-z]{3,4}$#', $sourceFileExtension)) {
+                $this->config_output_format = $sourceFileExtension;
+                $this->DebugMessage('setSourceFilename('.$sourceFilename.') set $this->config_output_format to "'.$sourceFileExtension.'"', __FILE__, __LINE__);
+            } else {
+                $this->DebugMessage('setSourceFilename('.$sourceFilename.') did NOT set $this->config_output_format to "'.$sourceFileExtension.'" because it did not seem like an appropriate image format', __FILE__, __LINE__);
+            }
+        }
+        $this->DebugMessage('setSourceFilename('.$sourceFilename.') set $this->sourceFilename to "'.$this->sourceFilename.'"', __FILE__, __LINE__);
+        return true;
+    }
+
+    // public:
+    public function setSourceData($rawImageData, $sourceFilename='') {
+        //$this->resetObject();
+        //$this->sourceFilename = null;
+        $this->rawImageData   = $rawImageData;
+        $this->DebugMessage('setSourceData() setting $this->rawImageData ('.strlen($this->rawImageData).' bytes; magic="'.substr($this->rawImageData, 0, 4).'" ('.phpthumb_functions::HexCharDisplay(substr($this->rawImageData, 0, 4)).'))', __FILE__, __LINE__);
+        if ($this->config_cache_source_enabled) {
+            $sourceFilename = ($sourceFilename ? $sourceFilename : md5($rawImageData));
+            if (!is_dir($this->config_cache_source_directory)) {
+                $this->ErrorImage('$this->config_cache_source_directory ('.$this->config_cache_source_directory.') is not a directory');
+            } elseif (!@is_writable($this->config_cache_source_directory)) {
+                $this->ErrorImage('$this->config_cache_source_directory ('.$this->config_cache_source_directory.') is not writable');
+            }
+            $this->DebugMessage('setSourceData() attempting to save source image to "'.$this->config_cache_source_directory.DIRECTORY_SEPARATOR.urlencode($sourceFilename).'"', __FILE__, __LINE__);
+            if ($fp = @fopen($this->config_cache_source_directory.DIRECTORY_SEPARATOR.urlencode($sourceFilename), 'wb')) {
+                fwrite($fp, $rawImageData);
+                fclose($fp);
+            } elseif (!$this->phpThumbDebug) {
+                $this->ErrorImage('setSourceData() failed to write to source cache ('.$this->config_cache_source_directory.DIRECTORY_SEPARATOR.urlencode($sourceFilename).')');
+            }
+        }
+        return true;
+    }
+
+    // public:
+    public function setSourceImageResource($gdimg) {
+        //$this->resetObject();
+        $this->gdimg_source = $gdimg;
+        return true;
+    }
+
+    // public:
+    public function setParameter($param, $value) {
+        if ($param == 'src') {
+            $this->setSourceFilename($this->ResolveFilenameToAbsolute($value));
+        } elseif (@is_array($this->$param)) {
+            if (is_array($value)) {
+                foreach ($value as $arraykey => $arrayvalue) {
+                    array_push($this->$param, $arrayvalue);
+                }
+            } else {
+                array_push($this->$param, $value);
+            }
+        } else {
+            $this->$param = $value;
+        }
+        return true;
+    }
+
+    // public:
+    public function getParameter($param) {
+        //if (property_exists('phpThumb', $param)) {
+            return $this->$param;
+        //}
+        //$this->DebugMessage('setParameter() attempting to get non-existant parameter "'.$param.'"', __FILE__, __LINE__);
+        //return false;
+    }
+
+
+    // public:
+    public function GenerateThumbnail() {
+
+        $this->setOutputFormat();
+            $this->phpThumbDebug('8a');
+        $this->ResolveSource();
+            $this->phpThumbDebug('8b');
+        $this->SetCacheFilename();
+            $this->phpThumbDebug('8c');
+        $this->ExtractEXIFgetImageSize();
+            $this->phpThumbDebug('8d');
+        if ($this->useRawIMoutput) {
+            $this->DebugMessage('Skipping rest of GenerateThumbnail() because ($this->useRawIMoutput == true)', __FILE__, __LINE__);
+            return true;
+        }
+            $this->phpThumbDebug('8e');
+        if (!$this->SourceImageToGD()) {
+            $this->DebugMessage('SourceImageToGD() failed', __FILE__, __LINE__);
+            return false;
+        }
+            $this->phpThumbDebug('8f');
+        $this->Rotate();
+            $this->phpThumbDebug('8g');
+        $this->CreateGDoutput();
+            $this->phpThumbDebug('8h');
+
+        // default values, also applicable for far="C"
+        $destination_offset_x = round(($this->thumbnail_width  - $this->thumbnail_image_width)  / 2);
+        $destination_offset_y = round(($this->thumbnail_height - $this->thumbnail_image_height) / 2);
+        if (($this->far == 'L') || ($this->far == 'TL') || ($this->far == 'BL')) {
+            $destination_offset_x = 0;
+        }
+        if (($this->far == 'R') || ($this->far == 'TR') || ($this->far == 'BR')) {
+            $destination_offset_x =  round($this->thumbnail_width  - $this->thumbnail_image_width);
+        }
+        if (($this->far == 'T') || ($this->far == 'TL') || ($this->far == 'TR')) {
+            $destination_offset_y = 0;
+        }
+        if (($this->far == 'B') || ($this->far == 'BL') || ($this->far == 'BR')) {
+            $destination_offset_y =  round($this->thumbnail_height - $this->thumbnail_image_height);
+        }
 
 //		// copy/resize image to appropriate dimensions
 //		$borderThickness = 0;
@@ -410,100 +410,100 @@ 
 //			//$this->DebugMessage('Skipping ImageResizeFunction() because BorderThickness="'.$borderThickness.'"', __FILE__, __LINE__);
 //			$this->thumbnail_image_height /= 2;
 //		}
-		$this->ImageResizeFunction(
-			$this->gdimg_output,
-			$this->gdimg_source,
-			$destination_offset_x,
-			$destination_offset_y,
-			$this->thumbnailCropX,
-			$this->thumbnailCropY,
-			$this->thumbnail_image_width,
-			$this->thumbnail_image_height,
-			$this->thumbnailCropW,
-			$this->thumbnailCropH
-		);
-
-		$this->DebugMessage('memory_get_usage() after copy-resize = '.(function_exists('memory_get_usage') ? @memory_get_usage() : 'n/a'), __FILE__, __LINE__);
-		imagedestroy($this->gdimg_source);
-		$this->DebugMessage('memory_get_usage() after imagedestroy = '.(function_exists('memory_get_usage') ? @memory_get_usage() : 'n/a'), __FILE__, __LINE__);
-
-			$this->phpThumbDebug('8i');
-		$this->AntiOffsiteLinking();
-			$this->phpThumbDebug('8j');
-		$this->ApplyFilters();
-			$this->phpThumbDebug('8k');
-		$this->AlphaChannelFlatten();
-			$this->phpThumbDebug('8l');
-		$this->MaxFileSize();
-			$this->phpThumbDebug('8m');
-
-		$this->DebugMessage('GenerateThumbnail() completed successfully', __FILE__, __LINE__);
-		return true;
-	}
-
-
-	// public:
-	public function RenderOutput() {
-		if (!$this->useRawIMoutput && !is_resource($this->gdimg_output)) {
-			$this->DebugMessage('RenderOutput() failed because !is_resource($this->gdimg_output)', __FILE__, __LINE__);
-			return false;
-		}
-		if (!$this->thumbnailFormat) {
-			$this->DebugMessage('RenderOutput() failed because $this->thumbnailFormat is empty', __FILE__, __LINE__);
-			return false;
-		}
-		if ($this->useRawIMoutput) {
-			$this->DebugMessage('RenderOutput copying $this->IMresizedData ('.strlen($this->IMresizedData).' bytes) to $this->outputImage', __FILE__, __LINE__);
-			$this->outputImageData = $this->IMresizedData;
-			return true;
-		}
-
-		$builtin_formats = array();
-		if (function_exists('imagetypes')) {
-			$imagetypes = imagetypes();
-			$builtin_formats['wbmp'] = (bool) ($imagetypes & IMG_WBMP);
-			$builtin_formats['jpg']  = (bool) ($imagetypes & IMG_JPG);
-			$builtin_formats['gif']  = (bool) ($imagetypes & IMG_GIF);
-			$builtin_formats['png']  = (bool) ($imagetypes & IMG_PNG);
-		}
-
-		$this->DebugMessage('imageinterlace($this->gdimg_output, '. (int) $this->config_output_interlace .')', __FILE__, __LINE__);
-		imageinterlace($this->gdimg_output, (int) $this->config_output_interlace);
-
-		$this->DebugMessage('RenderOutput() attempting image'.strtolower(@$this->thumbnailFormat).'($this->gdimg_output)', __FILE__, __LINE__);
-		ob_start();
-		switch ($this->thumbnailFormat) {
-			case 'wbmp':
-				if (empty($builtin_formats['wbmp'])) {
-					$this->DebugMessage('GD does not have required built-in support for WBMP output', __FILE__, __LINE__);
-					ob_end_clean();
-					return false;
-				}
-				imagejpeg($this->gdimg_output, null, $this->thumbnailQuality);
-				$this->outputImageData = ob_get_contents();
-				break;
-
-			case 'jpeg':
-			case 'jpg':  // should be "jpeg" not "jpg" but just in case...
-				if (empty($builtin_formats['jpg'])) {
-					$this->DebugMessage('GD does not have required built-in support for JPEG output', __FILE__, __LINE__);
-					ob_end_clean();
-					return false;
-				}
-				imagejpeg($this->gdimg_output, null, $this->thumbnailQuality);
-				$this->outputImageData = ob_get_contents();
-				break;
-
-			case 'png':
-				if (empty($builtin_formats['png'])) {
-					$this->DebugMessage('GD does not have required built-in support for PNG output', __FILE__, __LINE__);
-					ob_end_clean();
-					return false;
-				}
-				if (phpthumb_functions::version_compare_replacement(PHP_VERSION, '5.1.2', '>=')) {
-					// https://github.com/JamesHeinrich/phpThumb/issues/24
-
-					/* http://php.net/manual/en/function.imagepng.php:
+        $this->ImageResizeFunction(
+            $this->gdimg_output,
+            $this->gdimg_source,
+            $destination_offset_x,
+            $destination_offset_y,
+            $this->thumbnailCropX,
+            $this->thumbnailCropY,
+            $this->thumbnail_image_width,
+            $this->thumbnail_image_height,
+            $this->thumbnailCropW,
+            $this->thumbnailCropH
+        );
+
+        $this->DebugMessage('memory_get_usage() after copy-resize = '.(function_exists('memory_get_usage') ? @memory_get_usage() : 'n/a'), __FILE__, __LINE__);
+        imagedestroy($this->gdimg_source);
+        $this->DebugMessage('memory_get_usage() after imagedestroy = '.(function_exists('memory_get_usage') ? @memory_get_usage() : 'n/a'), __FILE__, __LINE__);
+
+            $this->phpThumbDebug('8i');
+        $this->AntiOffsiteLinking();
+            $this->phpThumbDebug('8j');
+        $this->ApplyFilters();
+            $this->phpThumbDebug('8k');
+        $this->AlphaChannelFlatten();
+            $this->phpThumbDebug('8l');
+        $this->MaxFileSize();
+            $this->phpThumbDebug('8m');
+
+        $this->DebugMessage('GenerateThumbnail() completed successfully', __FILE__, __LINE__);
+        return true;
+    }
+
+
+    // public:
+    public function RenderOutput() {
+        if (!$this->useRawIMoutput && !is_resource($this->gdimg_output)) {
+            $this->DebugMessage('RenderOutput() failed because !is_resource($this->gdimg_output)', __FILE__, __LINE__);
+            return false;
+        }
+        if (!$this->thumbnailFormat) {
+            $this->DebugMessage('RenderOutput() failed because $this->thumbnailFormat is empty', __FILE__, __LINE__);
+            return false;
+        }
+        if ($this->useRawIMoutput) {
+            $this->DebugMessage('RenderOutput copying $this->IMresizedData ('.strlen($this->IMresizedData).' bytes) to $this->outputImage', __FILE__, __LINE__);
+            $this->outputImageData = $this->IMresizedData;
+            return true;
+        }
+
+        $builtin_formats = array();
+        if (function_exists('imagetypes')) {
+            $imagetypes = imagetypes();
+            $builtin_formats['wbmp'] = (bool) ($imagetypes & IMG_WBMP);
+            $builtin_formats['jpg']  = (bool) ($imagetypes & IMG_JPG);
+            $builtin_formats['gif']  = (bool) ($imagetypes & IMG_GIF);
+            $builtin_formats['png']  = (bool) ($imagetypes & IMG_PNG);
+        }
+
+        $this->DebugMessage('imageinterlace($this->gdimg_output, '. (int) $this->config_output_interlace .')', __FILE__, __LINE__);
+        imageinterlace($this->gdimg_output, (int) $this->config_output_interlace);
+
+        $this->DebugMessage('RenderOutput() attempting image'.strtolower(@$this->thumbnailFormat).'($this->gdimg_output)', __FILE__, __LINE__);
+        ob_start();
+        switch ($this->thumbnailFormat) {
+            case 'wbmp':
+                if (empty($builtin_formats['wbmp'])) {
+                    $this->DebugMessage('GD does not have required built-in support for WBMP output', __FILE__, __LINE__);
+                    ob_end_clean();
+                    return false;
+                }
+                imagejpeg($this->gdimg_output, null, $this->thumbnailQuality);
+                $this->outputImageData = ob_get_contents();
+                break;
+
+            case 'jpeg':
+            case 'jpg':  // should be "jpeg" not "jpg" but just in case...
+                if (empty($builtin_formats['jpg'])) {
+                    $this->DebugMessage('GD does not have required built-in support for JPEG output', __FILE__, __LINE__);
+                    ob_end_clean();
+                    return false;
+                }
+                imagejpeg($this->gdimg_output, null, $this->thumbnailQuality);
+                $this->outputImageData = ob_get_contents();
+                break;
+
+            case 'png':
+                if (empty($builtin_formats['png'])) {
+                    $this->DebugMessage('GD does not have required built-in support for PNG output', __FILE__, __LINE__);
+                    ob_end_clean();
+                    return false;
+                }
+                if (phpthumb_functions::version_compare_replacement(PHP_VERSION, '5.1.2', '>=')) {
+                    // https://github.com/JamesHeinrich/phpThumb/issues/24
+
+                    /* http://php.net/manual/en/function.imagepng.php:
 					from php source (gd.h):
 					2.0.12: Compression level: 0-9 or -1, where 0 is NO COMPRESSION at all,
 					:: 1 is FASTEST but produces larger files, 9 provides the best
@@ -511,684 +511,684 @@ 
 					:: -1 selects the default compiled into the zlib library.
 					Conclusion: Based on the Zlib manual (http://www.zlib.net/manual.html) the default compression level is set to 6.
 					*/
-					if (($this->thumbnailQuality >= -1) && ($this->thumbnailQuality <= 9)) {
-						$PNGquality = $this->thumbnailQuality;
-					} else {
-						$this->DebugMessage('Specified thumbnailQuality "'.$this->thumbnailQuality.'" is outside the accepted range (0-9, or -1). Using 6 as default value.', __FILE__, __LINE__);
-						$PNGquality = 6;
-					}
-					imagepng($this->gdimg_output, null, $PNGquality);
-				} else {
-					imagepng($this->gdimg_output);
-				}
-				$this->outputImageData = ob_get_contents();
-				break;
-
-			case 'gif':
-				if (empty($builtin_formats['gif'])) {
-					$this->DebugMessage('GD does not have required built-in support for GIF output', __FILE__, __LINE__);
-					ob_end_clean();
-					return false;
-				}
-				imagegif($this->gdimg_output);
-				$this->outputImageData = ob_get_contents();
-				break;
-
-			case 'bmp':
-				if (!@include_once( __DIR__ .'/phpthumb.bmp.php')) {
-					$this->DebugMessage('Error including "'. __DIR__ .'/phpthumb.bmp.php" which is required for BMP format output', __FILE__, __LINE__);
-					ob_end_clean();
-					return false;
-				}
-				$phpthumb_bmp = new phpthumb_bmp();
-				$this->outputImageData = $phpthumb_bmp->GD2BMPstring($this->gdimg_output);
-				unset($phpthumb_bmp);
-				break;
-
-			case 'ico':
-				if (!@include_once( __DIR__ .'/phpthumb.ico.php')) {
-					$this->DebugMessage('Error including "'. __DIR__ .'/phpthumb.ico.php" which is required for ICO format output', __FILE__, __LINE__);
-					ob_end_clean();
-					return false;
-				}
-				$phpthumb_ico = new phpthumb_ico();
-				$arrayOfOutputImages = array($this->gdimg_output);
-				$this->outputImageData = $phpthumb_ico->GD2ICOstring($arrayOfOutputImages);
-				unset($phpthumb_ico);
-				break;
-
-			default:
-				$this->DebugMessage('RenderOutput failed because $this->thumbnailFormat "'.$this->thumbnailFormat.'" is not valid', __FILE__, __LINE__);
-				ob_end_clean();
-				return false;
-		}
-		ob_end_clean();
-		if (!$this->outputImageData) {
-			$this->DebugMessage('RenderOutput() for "'.$this->thumbnailFormat.'" failed', __FILE__, __LINE__);
-			ob_end_clean();
-			return false;
-		}
-		$this->DebugMessage('RenderOutput() completing with $this->outputImageData = '.strlen($this->outputImageData).' bytes', __FILE__, __LINE__);
-		return true;
-	}
-
-
-	// public:
-	public function RenderToFile($filename) {
-		if (preg_match('#^[a-z0-9]+://#i', $filename)) {
-			$this->DebugMessage('RenderToFile() failed because $filename ('.$filename.') is a URL', __FILE__, __LINE__);
-			return false;
-		}
-		// render thumbnail to this file only, do not cache, do not output to browser
-		//$renderfilename = $this->ResolveFilenameToAbsolute(dirname($filename)).DIRECTORY_SEPARATOR.basename($filename);
-		$renderfilename = $filename;
-		if (($filename{0} != '/') && ($filename{0} != '\\') && ($filename{1} != ':')) {
-			$renderfilename = $this->ResolveFilenameToAbsolute($renderfilename);
-		}
-		if (!@is_writable(dirname($renderfilename))) {
-			$this->DebugMessage('RenderToFile() failed because "'.dirname($renderfilename).'/" is not writable', __FILE__, __LINE__);
-			return false;
-		}
-		if (@is_file($renderfilename) && !@is_writable($renderfilename)) {
-			$this->DebugMessage('RenderToFile() failed because "'.$renderfilename.'" is not writable', __FILE__, __LINE__);
-			return false;
-		}
-
-		if ($this->RenderOutput()) {
-			if (file_put_contents($renderfilename, $this->outputImageData)) {
-				@chmod($renderfilename, $this->getParameter('config_file_create_mask'));
-				$this->DebugMessage('RenderToFile('.$renderfilename.') succeeded', __FILE__, __LINE__);
-				return true;
-			}
-			if (!@file_exists($renderfilename)) {
-				$this->DebugMessage('RenderOutput ['.$this->thumbnailFormat.'('.$renderfilename.')] did not appear to fail, but the output image does not exist either...', __FILE__, __LINE__);
-			}
-		} else {
-			$this->DebugMessage('RenderOutput ['.$this->thumbnailFormat.'('.$renderfilename.')] failed', __FILE__, __LINE__);
-		}
-		return false;
-	}
-
-
-	// public:
-	public function OutputThumbnail() {
-		$this->purgeTempFiles();
-
-		if (!$this->useRawIMoutput && !is_resource($this->gdimg_output)) {
-			$this->DebugMessage('OutputThumbnail() failed because !is_resource($this->gdimg_output)', __FILE__, __LINE__);
-			return false;
-		}
-		if (headers_sent()) {
-			return $this->ErrorImage('OutputThumbnail() failed - headers already sent');
-		}
-
-		$downloadfilename = phpthumb_functions::SanitizeFilename(is_string($this->sia) ? $this->sia : ($this->down ? $this->down : 'phpThumb_generated_thumbnail'.'.'.$this->thumbnailFormat));
-		$this->DebugMessage('Content-Disposition header filename set to "'.$downloadfilename.'"', __FILE__, __LINE__);
-		if ($downloadfilename) {
-			header('Content-Disposition: '.($this->down ? 'attachment' : 'inline').'; filename="'.$downloadfilename.'"');
-		} else {
-			$this->DebugMessage('failed to send Content-Disposition header because $downloadfilename is empty', __FILE__, __LINE__);
-		}
-
-		if ($this->useRawIMoutput) {
-
-			header('Content-Type: '.phpthumb_functions::ImageTypeToMIMEtype($this->thumbnailFormat));
-			echo $this->IMresizedData;
-
-		} else {
-
-			$this->DebugMessage('imageinterlace($this->gdimg_output, '. (int) $this->config_output_interlace .')', __FILE__, __LINE__);
-			imageinterlace($this->gdimg_output, (int) $this->config_output_interlace);
-			switch ($this->thumbnailFormat) {
-				case 'jpeg':
-					header('Content-Type: '.phpthumb_functions::ImageTypeToMIMEtype($this->thumbnailFormat));
-					$ImageOutFunction = 'image'.$this->thumbnailFormat;
-					@$ImageOutFunction($this->gdimg_output, null, $this->thumbnailQuality);
-					break;
-
-				case 'png':
-				case 'gif':
-					header('Content-Type: '.phpthumb_functions::ImageTypeToMIMEtype($this->thumbnailFormat));
-					$ImageOutFunction = 'image'.$this->thumbnailFormat;
-					@$ImageOutFunction($this->gdimg_output);
-					break;
-
-				case 'bmp':
-					if (!@include_once( __DIR__ .'/phpthumb.bmp.php')) {
-						$this->DebugMessage('Error including "'. __DIR__ .'/phpthumb.bmp.php" which is required for BMP format output', __FILE__, __LINE__);
-						return false;
-					}
-					$phpthumb_bmp = new phpthumb_bmp();
-					if (is_object($phpthumb_bmp)) {
-						$bmp_data = $phpthumb_bmp->GD2BMPstring($this->gdimg_output);
-						unset($phpthumb_bmp);
-						if (!$bmp_data) {
-							$this->DebugMessage('$phpthumb_bmp->GD2BMPstring() failed', __FILE__, __LINE__);
-							return false;
-						}
-						header('Content-Type: '.phpthumb_functions::ImageTypeToMIMEtype($this->thumbnailFormat));
-						echo $bmp_data;
-					} else {
-						$this->DebugMessage('new phpthumb_bmp() failed', __FILE__, __LINE__);
-						return false;
-					}
-					break;
-
-				case 'ico':
-					if (!@include_once( __DIR__ .'/phpthumb.ico.php')) {
-						$this->DebugMessage('Error including "'. __DIR__ .'/phpthumb.ico.php" which is required for ICO format output', __FILE__, __LINE__);
-						return false;
-					}
-					$phpthumb_ico = new phpthumb_ico();
-					if (is_object($phpthumb_ico)) {
-						$arrayOfOutputImages = array($this->gdimg_output);
-						$ico_data = $phpthumb_ico->GD2ICOstring($arrayOfOutputImages);
-						unset($phpthumb_ico);
-						if (!$ico_data) {
-							$this->DebugMessage('$phpthumb_ico->GD2ICOstring() failed', __FILE__, __LINE__);
-							return false;
-						}
-						header('Content-Type: '.phpthumb_functions::ImageTypeToMIMEtype($this->thumbnailFormat));
-						echo $ico_data;
-					} else {
-						$this->DebugMessage('new phpthumb_ico() failed', __FILE__, __LINE__);
-						return false;
-					}
-					break;
-
-				default:
-					$this->DebugMessage('OutputThumbnail failed because $this->thumbnailFormat "'.$this->thumbnailFormat.'" is not valid', __FILE__, __LINE__);
-					return false;
-					break;
-			}
-
-		}
-		return true;
-	}
-
-
-	// public:
-	public function CleanUpCacheDirectory() {
-		$this->DebugMessage('CleanUpCacheDirectory() set to purge ('.(null === $this->config_cache_maxage ? 'NULL' : number_format($this->config_cache_maxage / 86400, 1)).' days; '.(null === $this->config_cache_maxsize ? 'NULL' : number_format($this->config_cache_maxsize / 1048576, 2)).' MB; '.(null === $this->config_cache_maxfiles ? 'NULL' : number_format($this->config_cache_maxfiles)).' files)', __FILE__, __LINE__);
-
-		if (!is_writable($this->config_cache_directory)) {
-			$this->DebugMessage('CleanUpCacheDirectory() skipped because "'.$this->config_cache_directory.'" is not writable', __FILE__, __LINE__);
-			return true;
-		}
-
-		// cache status of cache directory for 1 hour to avoid hammering the filesystem functions
-		$phpThumbCacheStats_filename = $this->config_cache_directory.DIRECTORY_SEPARATOR.'phpThumbCacheStats.txt';
-		if (file_exists($phpThumbCacheStats_filename) && is_readable($phpThumbCacheStats_filename) && (filemtime($phpThumbCacheStats_filename) >= (time() - 3600))) {
-			$this->DebugMessage('CleanUpCacheDirectory() skipped because "'.$phpThumbCacheStats_filename.'" is recently modified', __FILE__, __LINE__);
-			return true;
-		}
-		if (!@touch($phpThumbCacheStats_filename)) {
-			$this->DebugMessage('touch('.$phpThumbCacheStats_filename.') failed', __FILE__, __LINE__);
-		}
-
-		$DeletedKeys = array();
-		$AllFilesInCacheDirectory = array();
-		if (($this->config_cache_maxage > 0) || ($this->config_cache_maxsize > 0) || ($this->config_cache_maxfiles > 0)) {
-			$CacheDirOldFilesAge  = array();
-			$CacheDirOldFilesSize = array();
-			$AllFilesInCacheDirectory = phpthumb_functions::GetAllFilesInSubfolders($this->config_cache_directory);
-			foreach ($AllFilesInCacheDirectory as $fullfilename) {
-				if (preg_match('#'.preg_quote($this->config_cache_prefix).'#i', $fullfilename) && file_exists($fullfilename)) {
-					$CacheDirOldFilesAge[$fullfilename] = @fileatime($fullfilename);
-					if ($CacheDirOldFilesAge[$fullfilename] == 0) {
-						$CacheDirOldFilesAge[$fullfilename] = @filemtime($fullfilename);
-					}
-					$CacheDirOldFilesSize[$fullfilename] = @filesize($fullfilename);
-				}
-			}
-			if (empty($CacheDirOldFilesSize)) {
-				$this->DebugMessage('CleanUpCacheDirectory() skipped because $CacheDirOldFilesSize is empty (phpthumb_functions::GetAllFilesInSubfolders('.$this->config_cache_directory.') found no files)', __FILE__, __LINE__);
-				return true;
-			}
-			$DeletedKeys['zerobyte'] = array();
-			foreach ($CacheDirOldFilesSize as $fullfilename => $filesize) {
-				// purge all zero-size files more than an hour old (to prevent trying to delete just-created and/or in-use files)
-				$cutofftime = time() - 3600;
-				if (($filesize == 0) && ($CacheDirOldFilesAge[$fullfilename] < $cutofftime)) {
-					$this->DebugMessage('deleting "'.$fullfilename.'"', __FILE__, __LINE__);
-					if (@unlink($fullfilename)) {
-						$DeletedKeys['zerobyte'][] = $fullfilename;
-						unset($CacheDirOldFilesSize[$fullfilename]);
-						unset($CacheDirOldFilesAge[$fullfilename]);
-					}
-				}
-			}
-			$this->DebugMessage('CleanUpCacheDirectory() purged '.count($DeletedKeys['zerobyte']).' zero-byte files', __FILE__, __LINE__);
-			asort($CacheDirOldFilesAge);
-
-			if ($this->config_cache_maxfiles > 0) {
-				$TotalCachedFiles = count($CacheDirOldFilesAge);
-				$DeletedKeys['maxfiles'] = array();
-				foreach ($CacheDirOldFilesAge as $fullfilename => $filedate) {
-					if ($TotalCachedFiles > $this->config_cache_maxfiles) {
-						$this->DebugMessage('deleting "'.$fullfilename.'"', __FILE__, __LINE__);
-						if (@unlink($fullfilename)) {
-							$TotalCachedFiles--;
-							$DeletedKeys['maxfiles'][] = $fullfilename;
-						}
-					} else {
-						// there are few enough files to keep the rest
-						break;
-					}
-				}
-				$this->DebugMessage('CleanUpCacheDirectory() purged '.count($DeletedKeys['maxfiles']).' files based on (config_cache_maxfiles='.$this->config_cache_maxfiles.')', __FILE__, __LINE__);
-				foreach ($DeletedKeys['maxfiles'] as $fullfilename) {
-					unset($CacheDirOldFilesAge[$fullfilename]);
-					unset($CacheDirOldFilesSize[$fullfilename]);
-				}
-			}
-
-			if ($this->config_cache_maxage > 0) {
-				$mindate = time() - $this->config_cache_maxage;
-				$DeletedKeys['maxage'] = array();
-				foreach ($CacheDirOldFilesAge as $fullfilename => $filedate) {
-					if ($filedate > 0) {
-						if ($filedate < $mindate) {
-							$this->DebugMessage('deleting "'.$fullfilename.'"', __FILE__, __LINE__);
-							if (@unlink($fullfilename)) {
-								$DeletedKeys['maxage'][] = $fullfilename;
-							}
-						} else {
-							// the rest of the files are new enough to keep
-							break;
-						}
-					}
-				}
-				$this->DebugMessage('CleanUpCacheDirectory() purged '.count($DeletedKeys['maxage']).' files based on (config_cache_maxage='.$this->config_cache_maxage.')', __FILE__, __LINE__);
-				foreach ($DeletedKeys['maxage'] as $fullfilename) {
-					unset($CacheDirOldFilesAge[$fullfilename]);
-					unset($CacheDirOldFilesSize[$fullfilename]);
-				}
-			}
-
-			if ($this->config_cache_maxsize > 0) {
-				$TotalCachedFileSize = array_sum($CacheDirOldFilesSize);
-				$DeletedKeys['maxsize'] = array();
-				foreach ($CacheDirOldFilesAge as $fullfilename => $filedate) {
-					if ($TotalCachedFileSize > $this->config_cache_maxsize) {
-						$this->DebugMessage('deleting "'.$fullfilename.'"', __FILE__, __LINE__);
-						if (@unlink($fullfilename)) {
-							$TotalCachedFileSize -= $CacheDirOldFilesSize[$fullfilename];
-							$DeletedKeys['maxsize'][] = $fullfilename;
-						}
-					} else {
-						// the total filesizes are small enough to keep the rest of the files
-						break;
-					}
-				}
-				$this->DebugMessage('CleanUpCacheDirectory() purged '.count($DeletedKeys['maxsize']).' files based on (config_cache_maxsize='.$this->config_cache_maxsize.')', __FILE__, __LINE__);
-				foreach ($DeletedKeys['maxsize'] as $fullfilename) {
-					unset($CacheDirOldFilesAge[$fullfilename]);
-					unset($CacheDirOldFilesSize[$fullfilename]);
-				}
-			}
-
-		} else {
-			$this->DebugMessage('skipping CleanUpCacheDirectory() because config set to not use it', __FILE__, __LINE__);
-		}
-		$totalpurged = 0;
-		foreach ($DeletedKeys as $key => $value) {
-			$totalpurged += count($value);
-		}
-		$this->DebugMessage('CleanUpCacheDirectory() purged '.$totalpurged.' files (from '.count($AllFilesInCacheDirectory).') based on config settings', __FILE__, __LINE__);
-		if ($totalpurged > 0) {
-			$empty_dirs = array();
-			foreach ($AllFilesInCacheDirectory as $fullfilename) {
-				if (is_dir($fullfilename)) {
-					$empty_dirs[$this->realPathSafe($fullfilename)] = 1;
-				} else {
-					unset($empty_dirs[$this->realPathSafe(dirname($fullfilename))]);
-				}
-			}
-			krsort($empty_dirs);
-			$totalpurgeddirs = 0;
-			foreach ($empty_dirs as $empty_dir => $dummy) {
-				if ($empty_dir == $this->config_cache_directory) {
-					// shouldn't happen, but just in case, don't let it delete actual cache directory
-					continue;
-				} elseif (@rmdir($empty_dir)) {
-					$totalpurgeddirs++;
-				} else {
-					$this->DebugMessage('failed to rmdir('.$empty_dir.')', __FILE__, __LINE__);
-				}
-			}
-			$this->DebugMessage('purged '.$totalpurgeddirs.' empty directories', __FILE__, __LINE__);
-		}
-		return true;
-	}
-
-	//////////////////////////////////////////////////////////////////////
-
-	// private: re-initializator (call between rendering multiple images with one object)
-	public function resetObject() {
-		$class_vars = get_class_vars(get_class($this));
-		foreach ($class_vars as $key => $value) {
-			// do not clobber debug or config info
-			if (!preg_match('#^(config_|debug|fatalerror)#i', $key)) {
-				$this->$key = $value;
-			}
-		}
-		$this->phpThumb(); // re-initialize some class variables
-		return true;
-	}
-
-	//////////////////////////////////////////////////////////////////////
-
-	public function ResolveSource() {
-		if (is_resource($this->gdimg_source)) {
-			$this->DebugMessage('ResolveSource() exiting because is_resource($this->gdimg_source)', __FILE__, __LINE__);
-			return true;
-		}
-		if ($this->rawImageData) {
-			$this->sourceFilename = null;
-			$this->DebugMessage('ResolveSource() exiting because $this->rawImageData is set ('.number_format(strlen($this->rawImageData)).' bytes)', __FILE__, __LINE__);
-			return true;
-		}
-		if ($this->sourceFilename) {
-			$this->sourceFilename = $this->ResolveFilenameToAbsolute($this->sourceFilename);
-			$this->DebugMessage('$this->sourceFilename set to "'.$this->sourceFilename.'"', __FILE__, __LINE__);
-		} elseif ($this->src) {
-			$this->sourceFilename = $this->ResolveFilenameToAbsolute($this->src);
-			$this->DebugMessage('$this->sourceFilename set to "'.$this->sourceFilename.'" from $this->src ('.$this->src.')', __FILE__, __LINE__);
-		} else {
-			return $this->ErrorImage('$this->sourceFilename and $this->src are both empty');
-		}
-		if ($this->iswindows && ((substr($this->sourceFilename, 0, 2) == '//') || (substr($this->sourceFilename, 0, 2) == '\\\\'))) {
-			// Windows \\share\filename.ext
-		} elseif (preg_match('#^[a-z0-9]+://#i', $this->sourceFilename, $protocol_matches)) {
-			if (preg_match('#^(f|ht)tps?\://#i', $this->sourceFilename)) {
-				// URL
-				if ($this->config_http_user_agent) {
-					ini_set('user_agent', $this->config_http_user_agent);
-				}
-			} else {
-				return $this->ErrorImage('only FTP and HTTP/HTTPS protocols are allowed, "'.$protocol_matches[1].'" is not');
-		}
-		} elseif (!@file_exists($this->sourceFilename)) {
-			return $this->ErrorImage('"'.$this->sourceFilename.'" does not exist');
-		} elseif (!@is_file($this->sourceFilename)) {
-			return $this->ErrorImage('"'.$this->sourceFilename.'" is not a file');
-		}
-		return true;
-	}
-
-
-	public function setOutputFormat() {
-		static $alreadyCalled = false;
-		if ($this->thumbnailFormat && $alreadyCalled) {
-			return true;
-		}
-		$alreadyCalled = true;
-
-		$AvailableImageOutputFormats = array();
-		$AvailableImageOutputFormats[] = 'text';
-		if (@is_readable( __DIR__ .'/phpthumb.ico.php')) {
-			$AvailableImageOutputFormats[] = 'ico';
-		}
-		if (@is_readable( __DIR__ .'/phpthumb.bmp.php')) {
-			$AvailableImageOutputFormats[] = 'bmp';
-		}
-
-		$this->thumbnailFormat = 'ico';
-
-		// Set default output format based on what image types are available
-		if (function_exists('imagetypes')) {
-			$imagetypes = imagetypes();
-			if ($imagetypes & IMG_WBMP) {
-				$this->thumbnailFormat         = 'wbmp';
-				$AvailableImageOutputFormats[] = 'wbmp';
-			}
-			if ($imagetypes & IMG_GIF) {
-				$this->thumbnailFormat         = 'gif';
-				$AvailableImageOutputFormats[] = 'gif';
-			}
-			if ($imagetypes & IMG_PNG) {
-				$this->thumbnailFormat         = 'png';
-				$AvailableImageOutputFormats[] = 'png';
-			}
-			if ($imagetypes & IMG_JPG) {
-				$this->thumbnailFormat         = 'jpeg';
-				$AvailableImageOutputFormats[] = 'jpeg';
-			}
-		} else {
-			$this->DebugMessage('imagetypes() does not exist - GD support might not be enabled?',  __FILE__, __LINE__);
-		}
-		if ($this->ImageMagickVersion()) {
-			$IMformats = array('jpeg', 'png', 'gif', 'bmp', 'ico', 'wbmp');
-			$this->DebugMessage('Addding ImageMagick formats to $AvailableImageOutputFormats ('.implode(';', $AvailableImageOutputFormats).')', __FILE__, __LINE__);
-			foreach ($IMformats as $key => $format) {
-				$AvailableImageOutputFormats[] = $format;
-			}
-		}
-		$AvailableImageOutputFormats = array_unique($AvailableImageOutputFormats);
-		$this->DebugMessage('$AvailableImageOutputFormats = array('.implode(';', $AvailableImageOutputFormats).')', __FILE__, __LINE__);
-
-		$this->f = preg_replace('#[^a-z]#', '', strtolower($this->f));
-		if (strtolower($this->config_output_format) == 'jpg') {
-			$this->config_output_format = 'jpeg';
-		}
-		if (strtolower($this->f) == 'jpg') {
-			$this->f = 'jpeg';
-		}
-		if (phpthumb_functions::CaseInsensitiveInArray($this->config_output_format, $AvailableImageOutputFormats)) {
-			// set output format to config default if that format is available
-			$this->DebugMessage('$this->thumbnailFormat set to $this->config_output_format "'.strtolower($this->config_output_format).'"', __FILE__, __LINE__);
-			$this->thumbnailFormat = strtolower($this->config_output_format);
-		} elseif ($this->config_output_format) {
-			$this->DebugMessage('$this->thumbnailFormat staying as "'.$this->thumbnailFormat.'" because $this->config_output_format ('.strtolower($this->config_output_format).') is not in $AvailableImageOutputFormats', __FILE__, __LINE__);
-		}
-		if ($this->f && (phpthumb_functions::CaseInsensitiveInArray($this->f, $AvailableImageOutputFormats))) {
-			// override output format if $this->f is set and that format is available
-			$this->DebugMessage('$this->thumbnailFormat set to $this->f "'.strtolower($this->f).'"', __FILE__, __LINE__);
-			$this->thumbnailFormat = strtolower($this->f);
-		} elseif ($this->f) {
-			$this->DebugMessage('$this->thumbnailFormat staying as "'.$this->thumbnailFormat.'" because $this->f ('.strtolower($this->f).') is not in $AvailableImageOutputFormats', __FILE__, __LINE__);
-		}
-
-		// for JPEG images, quality 1 (worst) to 99 (best)
-		// quality < 25 is nasty, with not much size savings - not recommended
-		// problems with 100 - invalid JPEG?
-		$this->thumbnailQuality = max(1, min(99, ($this->q ? (int) $this->q : 75)));
-		$this->DebugMessage('$this->thumbnailQuality set to "'.$this->thumbnailQuality.'"', __FILE__, __LINE__);
-
-		return true;
-	}
-
-
-	public function setCacheDirectory() {
-		// resolve cache directory to absolute pathname
-		$this->DebugMessage('setCacheDirectory() starting with config_cache_directory = "'.$this->config_cache_directory.'"', __FILE__, __LINE__);
-		if ($this->config_cache_directory[ 0 ] == '.') {
-			if (preg_match('#^(f|ht)tps?\://#i', $this->src)) {
-				if (!$this->config_cache_disable_warning) {
-					$this->ErrorImage('$this->config_cache_directory ('.$this->config_cache_directory.') cannot be used for remote images. Adjust "cache_directory" or "cache_disable_warning" in phpThumb.config.php');
-				}
-			} elseif ($this->src) {
-				// resolve relative cache directory to source image
-				$this->config_cache_directory = dirname($this->ResolveFilenameToAbsolute($this->src)).DIRECTORY_SEPARATOR.$this->config_cache_directory;
-			} else {
-				// $this->new is probably set
-			}
-		}
-		if (substr($this->config_cache_directory, -1) == '/') {
-			$this->config_cache_directory = substr($this->config_cache_directory, 0, -1);
-		}
-		if ($this->iswindows) {
-			$this->config_cache_directory = str_replace('/', DIRECTORY_SEPARATOR, $this->config_cache_directory);
-		}
-		if ($this->config_cache_directory) {
-			$real_cache_path = $this->realPathSafe($this->config_cache_directory);
-			if (!$real_cache_path) {
-				$this->DebugMessage('$this->realPathSafe($this->config_cache_directory) failed for "'.$this->config_cache_directory.'"', __FILE__, __LINE__);
-				if (!is_dir($this->config_cache_directory)) {
-					$this->DebugMessage('!is_dir('.$this->config_cache_directory.')', __FILE__, __LINE__);
-				}
-			}
-			if ($real_cache_path) {
-				$this->DebugMessage('setting config_cache_directory to $this->realPathSafe('.$this->config_cache_directory.') = "'.$real_cache_path.'"', __FILE__, __LINE__);
-				$this->config_cache_directory = $real_cache_path;
-			}
-		}
-		if (!is_dir($this->config_cache_directory)) {
-			if (!$this->config_cache_disable_warning) {
-				$this->ErrorImage('$this->config_cache_directory ('.$this->config_cache_directory.') does not exist. Adjust "cache_directory" or "cache_disable_warning" in phpThumb.config.php');
-			}
-			$this->DebugMessage('$this->config_cache_directory ('.$this->config_cache_directory.') is not a directory', __FILE__, __LINE__);
-			$this->config_cache_directory = null;
-		} elseif (!@is_writable($this->config_cache_directory)) {
-			$this->DebugMessage('$this->config_cache_directory is not writable ('.$this->config_cache_directory.')', __FILE__, __LINE__);
-		}
-
-		$this->InitializeTempDirSetting();
-		if (!@is_dir($this->config_temp_directory) && !@is_writable($this->config_temp_directory) && @is_dir($this->config_cache_directory) && @is_writable($this->config_cache_directory)) {
-			$this->DebugMessage('setting $this->config_temp_directory = $this->config_cache_directory ('.$this->config_cache_directory.')', __FILE__, __LINE__);
-			$this->config_temp_directory = $this->config_cache_directory;
-		}
-		return true;
-	}
-
-	/* Takes the array of path segments up to now, and the next segment (maybe a modifier: empty, . or ..)
+                    if (($this->thumbnailQuality >= -1) && ($this->thumbnailQuality <= 9)) {
+                        $PNGquality = $this->thumbnailQuality;
+                    } else {
+                        $this->DebugMessage('Specified thumbnailQuality "'.$this->thumbnailQuality.'" is outside the accepted range (0-9, or -1). Using 6 as default value.', __FILE__, __LINE__);
+                        $PNGquality = 6;
+                    }
+                    imagepng($this->gdimg_output, null, $PNGquality);
+                } else {
+                    imagepng($this->gdimg_output);
+                }
+                $this->outputImageData = ob_get_contents();
+                break;
+
+            case 'gif':
+                if (empty($builtin_formats['gif'])) {
+                    $this->DebugMessage('GD does not have required built-in support for GIF output', __FILE__, __LINE__);
+                    ob_end_clean();
+                    return false;
+                }
+                imagegif($this->gdimg_output);
+                $this->outputImageData = ob_get_contents();
+                break;
+
+            case 'bmp':
+                if (!@include_once( __DIR__ .'/phpthumb.bmp.php')) {
+                    $this->DebugMessage('Error including "'. __DIR__ .'/phpthumb.bmp.php" which is required for BMP format output', __FILE__, __LINE__);
+                    ob_end_clean();
+                    return false;
+                }
+                $phpthumb_bmp = new phpthumb_bmp();
+                $this->outputImageData = $phpthumb_bmp->GD2BMPstring($this->gdimg_output);
+                unset($phpthumb_bmp);
+                break;
+
+            case 'ico':
+                if (!@include_once( __DIR__ .'/phpthumb.ico.php')) {
+                    $this->DebugMessage('Error including "'. __DIR__ .'/phpthumb.ico.php" which is required for ICO format output', __FILE__, __LINE__);
+                    ob_end_clean();
+                    return false;
+                }
+                $phpthumb_ico = new phpthumb_ico();
+                $arrayOfOutputImages = array($this->gdimg_output);
+                $this->outputImageData = $phpthumb_ico->GD2ICOstring($arrayOfOutputImages);
+                unset($phpthumb_ico);
+                break;
+
+            default:
+                $this->DebugMessage('RenderOutput failed because $this->thumbnailFormat "'.$this->thumbnailFormat.'" is not valid', __FILE__, __LINE__);
+                ob_end_clean();
+                return false;
+        }
+        ob_end_clean();
+        if (!$this->outputImageData) {
+            $this->DebugMessage('RenderOutput() for "'.$this->thumbnailFormat.'" failed', __FILE__, __LINE__);
+            ob_end_clean();
+            return false;
+        }
+        $this->DebugMessage('RenderOutput() completing with $this->outputImageData = '.strlen($this->outputImageData).' bytes', __FILE__, __LINE__);
+        return true;
+    }
+
+
+    // public:
+    public function RenderToFile($filename) {
+        if (preg_match('#^[a-z0-9]+://#i', $filename)) {
+            $this->DebugMessage('RenderToFile() failed because $filename ('.$filename.') is a URL', __FILE__, __LINE__);
+            return false;
+        }
+        // render thumbnail to this file only, do not cache, do not output to browser
+        //$renderfilename = $this->ResolveFilenameToAbsolute(dirname($filename)).DIRECTORY_SEPARATOR.basename($filename);
+        $renderfilename = $filename;
+        if (($filename{0} != '/') && ($filename{0} != '\\') && ($filename{1} != ':')) {
+            $renderfilename = $this->ResolveFilenameToAbsolute($renderfilename);
+        }
+        if (!@is_writable(dirname($renderfilename))) {
+            $this->DebugMessage('RenderToFile() failed because "'.dirname($renderfilename).'/" is not writable', __FILE__, __LINE__);
+            return false;
+        }
+        if (@is_file($renderfilename) && !@is_writable($renderfilename)) {
+            $this->DebugMessage('RenderToFile() failed because "'.$renderfilename.'" is not writable', __FILE__, __LINE__);
+            return false;
+        }
+
+        if ($this->RenderOutput()) {
+            if (file_put_contents($renderfilename, $this->outputImageData)) {
+                @chmod($renderfilename, $this->getParameter('config_file_create_mask'));
+                $this->DebugMessage('RenderToFile('.$renderfilename.') succeeded', __FILE__, __LINE__);
+                return true;
+            }
+            if (!@file_exists($renderfilename)) {
+                $this->DebugMessage('RenderOutput ['.$this->thumbnailFormat.'('.$renderfilename.')] did not appear to fail, but the output image does not exist either...', __FILE__, __LINE__);
+            }
+        } else {
+            $this->DebugMessage('RenderOutput ['.$this->thumbnailFormat.'('.$renderfilename.')] failed', __FILE__, __LINE__);
+        }
+        return false;
+    }
+
+
+    // public:
+    public function OutputThumbnail() {
+        $this->purgeTempFiles();
+
+        if (!$this->useRawIMoutput && !is_resource($this->gdimg_output)) {
+            $this->DebugMessage('OutputThumbnail() failed because !is_resource($this->gdimg_output)', __FILE__, __LINE__);
+            return false;
+        }
+        if (headers_sent()) {
+            return $this->ErrorImage('OutputThumbnail() failed - headers already sent');
+        }
+
+        $downloadfilename = phpthumb_functions::SanitizeFilename(is_string($this->sia) ? $this->sia : ($this->down ? $this->down : 'phpThumb_generated_thumbnail'.'.'.$this->thumbnailFormat));
+        $this->DebugMessage('Content-Disposition header filename set to "'.$downloadfilename.'"', __FILE__, __LINE__);
+        if ($downloadfilename) {
+            header('Content-Disposition: '.($this->down ? 'attachment' : 'inline').'; filename="'.$downloadfilename.'"');
+        } else {
+            $this->DebugMessage('failed to send Content-Disposition header because $downloadfilename is empty', __FILE__, __LINE__);
+        }
+
+        if ($this->useRawIMoutput) {
+
+            header('Content-Type: '.phpthumb_functions::ImageTypeToMIMEtype($this->thumbnailFormat));
+            echo $this->IMresizedData;
+
+        } else {
+
+            $this->DebugMessage('imageinterlace($this->gdimg_output, '. (int) $this->config_output_interlace .')', __FILE__, __LINE__);
+            imageinterlace($this->gdimg_output, (int) $this->config_output_interlace);
+            switch ($this->thumbnailFormat) {
+                case 'jpeg':
+                    header('Content-Type: '.phpthumb_functions::ImageTypeToMIMEtype($this->thumbnailFormat));
+                    $ImageOutFunction = 'image'.$this->thumbnailFormat;
+                    @$ImageOutFunction($this->gdimg_output, null, $this->thumbnailQuality);
+                    break;
+
+                case 'png':
+                case 'gif':
+                    header('Content-Type: '.phpthumb_functions::ImageTypeToMIMEtype($this->thumbnailFormat));
+                    $ImageOutFunction = 'image'.$this->thumbnailFormat;
+                    @$ImageOutFunction($this->gdimg_output);
+                    break;
+
+                case 'bmp':
+                    if (!@include_once( __DIR__ .'/phpthumb.bmp.php')) {
+                        $this->DebugMessage('Error including "'. __DIR__ .'/phpthumb.bmp.php" which is required for BMP format output', __FILE__, __LINE__);
+                        return false;
+                    }
+                    $phpthumb_bmp = new phpthumb_bmp();
+                    if (is_object($phpthumb_bmp)) {
+                        $bmp_data = $phpthumb_bmp->GD2BMPstring($this->gdimg_output);
+                        unset($phpthumb_bmp);
+                        if (!$bmp_data) {
+                            $this->DebugMessage('$phpthumb_bmp->GD2BMPstring() failed', __FILE__, __LINE__);
+                            return false;
+                        }
+                        header('Content-Type: '.phpthumb_functions::ImageTypeToMIMEtype($this->thumbnailFormat));
+                        echo $bmp_data;
+                    } else {
+                        $this->DebugMessage('new phpthumb_bmp() failed', __FILE__, __LINE__);
+                        return false;
+                    }
+                    break;
+
+                case 'ico':
+                    if (!@include_once( __DIR__ .'/phpthumb.ico.php')) {
+                        $this->DebugMessage('Error including "'. __DIR__ .'/phpthumb.ico.php" which is required for ICO format output', __FILE__, __LINE__);
+                        return false;
+                    }
+                    $phpthumb_ico = new phpthumb_ico();
+                    if (is_object($phpthumb_ico)) {
+                        $arrayOfOutputImages = array($this->gdimg_output);
+                        $ico_data = $phpthumb_ico->GD2ICOstring($arrayOfOutputImages);
+                        unset($phpthumb_ico);
+                        if (!$ico_data) {
+                            $this->DebugMessage('$phpthumb_ico->GD2ICOstring() failed', __FILE__, __LINE__);
+                            return false;
+                        }
+                        header('Content-Type: '.phpthumb_functions::ImageTypeToMIMEtype($this->thumbnailFormat));
+                        echo $ico_data;
+                    } else {
+                        $this->DebugMessage('new phpthumb_ico() failed', __FILE__, __LINE__);
+                        return false;
+                    }
+                    break;
+
+                default:
+                    $this->DebugMessage('OutputThumbnail failed because $this->thumbnailFormat "'.$this->thumbnailFormat.'" is not valid', __FILE__, __LINE__);
+                    return false;
+                    break;
+            }
+
+        }
+        return true;
+    }
+
+
+    // public:
+    public function CleanUpCacheDirectory() {
+        $this->DebugMessage('CleanUpCacheDirectory() set to purge ('.(null === $this->config_cache_maxage ? 'NULL' : number_format($this->config_cache_maxage / 86400, 1)).' days; '.(null === $this->config_cache_maxsize ? 'NULL' : number_format($this->config_cache_maxsize / 1048576, 2)).' MB; '.(null === $this->config_cache_maxfiles ? 'NULL' : number_format($this->config_cache_maxfiles)).' files)', __FILE__, __LINE__);
+
+        if (!is_writable($this->config_cache_directory)) {
+            $this->DebugMessage('CleanUpCacheDirectory() skipped because "'.$this->config_cache_directory.'" is not writable', __FILE__, __LINE__);
+            return true;
+        }
+
+        // cache status of cache directory for 1 hour to avoid hammering the filesystem functions
+        $phpThumbCacheStats_filename = $this->config_cache_directory.DIRECTORY_SEPARATOR.'phpThumbCacheStats.txt';
+        if (file_exists($phpThumbCacheStats_filename) && is_readable($phpThumbCacheStats_filename) && (filemtime($phpThumbCacheStats_filename) >= (time() - 3600))) {
+            $this->DebugMessage('CleanUpCacheDirectory() skipped because "'.$phpThumbCacheStats_filename.'" is recently modified', __FILE__, __LINE__);
+            return true;
+        }
+        if (!@touch($phpThumbCacheStats_filename)) {
+            $this->DebugMessage('touch('.$phpThumbCacheStats_filename.') failed', __FILE__, __LINE__);
+        }
+
+        $DeletedKeys = array();
+        $AllFilesInCacheDirectory = array();
+        if (($this->config_cache_maxage > 0) || ($this->config_cache_maxsize > 0) || ($this->config_cache_maxfiles > 0)) {
+            $CacheDirOldFilesAge  = array();
+            $CacheDirOldFilesSize = array();
+            $AllFilesInCacheDirectory = phpthumb_functions::GetAllFilesInSubfolders($this->config_cache_directory);
+            foreach ($AllFilesInCacheDirectory as $fullfilename) {
+                if (preg_match('#'.preg_quote($this->config_cache_prefix).'#i', $fullfilename) && file_exists($fullfilename)) {
+                    $CacheDirOldFilesAge[$fullfilename] = @fileatime($fullfilename);
+                    if ($CacheDirOldFilesAge[$fullfilename] == 0) {
+                        $CacheDirOldFilesAge[$fullfilename] = @filemtime($fullfilename);
+                    }
+                    $CacheDirOldFilesSize[$fullfilename] = @filesize($fullfilename);
+                }
+            }
+            if (empty($CacheDirOldFilesSize)) {
+                $this->DebugMessage('CleanUpCacheDirectory() skipped because $CacheDirOldFilesSize is empty (phpthumb_functions::GetAllFilesInSubfolders('.$this->config_cache_directory.') found no files)', __FILE__, __LINE__);
+                return true;
+            }
+            $DeletedKeys['zerobyte'] = array();
+            foreach ($CacheDirOldFilesSize as $fullfilename => $filesize) {
+                // purge all zero-size files more than an hour old (to prevent trying to delete just-created and/or in-use files)
+                $cutofftime = time() - 3600;
+                if (($filesize == 0) && ($CacheDirOldFilesAge[$fullfilename] < $cutofftime)) {
+                    $this->DebugMessage('deleting "'.$fullfilename.'"', __FILE__, __LINE__);
+                    if (@unlink($fullfilename)) {
+                        $DeletedKeys['zerobyte'][] = $fullfilename;
+                        unset($CacheDirOldFilesSize[$fullfilename]);
+                        unset($CacheDirOldFilesAge[$fullfilename]);
+                    }
+                }
+            }
+            $this->DebugMessage('CleanUpCacheDirectory() purged '.count($DeletedKeys['zerobyte']).' zero-byte files', __FILE__, __LINE__);
+            asort($CacheDirOldFilesAge);
+
+            if ($this->config_cache_maxfiles > 0) {
+                $TotalCachedFiles = count($CacheDirOldFilesAge);
+                $DeletedKeys['maxfiles'] = array();
+                foreach ($CacheDirOldFilesAge as $fullfilename => $filedate) {
+                    if ($TotalCachedFiles > $this->config_cache_maxfiles) {
+                        $this->DebugMessage('deleting "'.$fullfilename.'"', __FILE__, __LINE__);
+                        if (@unlink($fullfilename)) {
+                            $TotalCachedFiles--;
+                            $DeletedKeys['maxfiles'][] = $fullfilename;
+                        }
+                    } else {
+                        // there are few enough files to keep the rest
+                        break;
+                    }
+                }
+                $this->DebugMessage('CleanUpCacheDirectory() purged '.count($DeletedKeys['maxfiles']).' files based on (config_cache_maxfiles='.$this->config_cache_maxfiles.')', __FILE__, __LINE__);
+                foreach ($DeletedKeys['maxfiles'] as $fullfilename) {
+                    unset($CacheDirOldFilesAge[$fullfilename]);
+                    unset($CacheDirOldFilesSize[$fullfilename]);
+                }
+            }
+
+            if ($this->config_cache_maxage > 0) {
+                $mindate = time() - $this->config_cache_maxage;
+                $DeletedKeys['maxage'] = array();
+                foreach ($CacheDirOldFilesAge as $fullfilename => $filedate) {
+                    if ($filedate > 0) {
+                        if ($filedate < $mindate) {
+                            $this->DebugMessage('deleting "'.$fullfilename.'"', __FILE__, __LINE__);
+                            if (@unlink($fullfilename)) {
+                                $DeletedKeys['maxage'][] = $fullfilename;
+                            }
+                        } else {
+                            // the rest of the files are new enough to keep
+                            break;
+                        }
+                    }
+                }
+                $this->DebugMessage('CleanUpCacheDirectory() purged '.count($DeletedKeys['maxage']).' files based on (config_cache_maxage='.$this->config_cache_maxage.')', __FILE__, __LINE__);
+                foreach ($DeletedKeys['maxage'] as $fullfilename) {
+                    unset($CacheDirOldFilesAge[$fullfilename]);
+                    unset($CacheDirOldFilesSize[$fullfilename]);
+                }
+            }
+
+            if ($this->config_cache_maxsize > 0) {
+                $TotalCachedFileSize = array_sum($CacheDirOldFilesSize);
+                $DeletedKeys['maxsize'] = array();
+                foreach ($CacheDirOldFilesAge as $fullfilename => $filedate) {
+                    if ($TotalCachedFileSize > $this->config_cache_maxsize) {
+                        $this->DebugMessage('deleting "'.$fullfilename.'"', __FILE__, __LINE__);
+                        if (@unlink($fullfilename)) {
+                            $TotalCachedFileSize -= $CacheDirOldFilesSize[$fullfilename];
+                            $DeletedKeys['maxsize'][] = $fullfilename;
+                        }
+                    } else {
+                        // the total filesizes are small enough to keep the rest of the files
+                        break;
+                    }
+                }
+                $this->DebugMessage('CleanUpCacheDirectory() purged '.count($DeletedKeys['maxsize']).' files based on (config_cache_maxsize='.$this->config_cache_maxsize.')', __FILE__, __LINE__);
+                foreach ($DeletedKeys['maxsize'] as $fullfilename) {
+                    unset($CacheDirOldFilesAge[$fullfilename]);
+                    unset($CacheDirOldFilesSize[$fullfilename]);
+                }
+            }
+
+        } else {
+            $this->DebugMessage('skipping CleanUpCacheDirectory() because config set to not use it', __FILE__, __LINE__);
+        }
+        $totalpurged = 0;
+        foreach ($DeletedKeys as $key => $value) {
+            $totalpurged += count($value);
+        }
+        $this->DebugMessage('CleanUpCacheDirectory() purged '.$totalpurged.' files (from '.count($AllFilesInCacheDirectory).') based on config settings', __FILE__, __LINE__);
+        if ($totalpurged > 0) {
+            $empty_dirs = array();
+            foreach ($AllFilesInCacheDirectory as $fullfilename) {
+                if (is_dir($fullfilename)) {
+                    $empty_dirs[$this->realPathSafe($fullfilename)] = 1;
+                } else {
+                    unset($empty_dirs[$this->realPathSafe(dirname($fullfilename))]);
+                }
+            }
+            krsort($empty_dirs);
+            $totalpurgeddirs = 0;
+            foreach ($empty_dirs as $empty_dir => $dummy) {
+                if ($empty_dir == $this->config_cache_directory) {
+                    // shouldn't happen, but just in case, don't let it delete actual cache directory
+                    continue;
+                } elseif (@rmdir($empty_dir)) {
+                    $totalpurgeddirs++;
+                } else {
+                    $this->DebugMessage('failed to rmdir('.$empty_dir.')', __FILE__, __LINE__);
+                }
+            }
+            $this->DebugMessage('purged '.$totalpurgeddirs.' empty directories', __FILE__, __LINE__);
+        }
+        return true;
+    }
+
+    //////////////////////////////////////////////////////////////////////
+
+    // private: re-initializator (call between rendering multiple images with one object)
+    public function resetObject() {
+        $class_vars = get_class_vars(get_class($this));
+        foreach ($class_vars as $key => $value) {
+            // do not clobber debug or config info
+            if (!preg_match('#^(config_|debug|fatalerror)#i', $key)) {
+                $this->$key = $value;
+            }
+        }
+        $this->phpThumb(); // re-initialize some class variables
+        return true;
+    }
+
+    //////////////////////////////////////////////////////////////////////
+
+    public function ResolveSource() {
+        if (is_resource($this->gdimg_source)) {
+            $this->DebugMessage('ResolveSource() exiting because is_resource($this->gdimg_source)', __FILE__, __LINE__);
+            return true;
+        }
+        if ($this->rawImageData) {
+            $this->sourceFilename = null;
+            $this->DebugMessage('ResolveSource() exiting because $this->rawImageData is set ('.number_format(strlen($this->rawImageData)).' bytes)', __FILE__, __LINE__);
+            return true;
+        }
+        if ($this->sourceFilename) {
+            $this->sourceFilename = $this->ResolveFilenameToAbsolute($this->sourceFilename);
+            $this->DebugMessage('$this->sourceFilename set to "'.$this->sourceFilename.'"', __FILE__, __LINE__);
+        } elseif ($this->src) {
+            $this->sourceFilename = $this->ResolveFilenameToAbsolute($this->src);
+            $this->DebugMessage('$this->sourceFilename set to "'.$this->sourceFilename.'" from $this->src ('.$this->src.')', __FILE__, __LINE__);
+        } else {
+            return $this->ErrorImage('$this->sourceFilename and $this->src are both empty');
+        }
+        if ($this->iswindows && ((substr($this->sourceFilename, 0, 2) == '//') || (substr($this->sourceFilename, 0, 2) == '\\\\'))) {
+            // Windows \\share\filename.ext
+        } elseif (preg_match('#^[a-z0-9]+://#i', $this->sourceFilename, $protocol_matches)) {
+            if (preg_match('#^(f|ht)tps?\://#i', $this->sourceFilename)) {
+                // URL
+                if ($this->config_http_user_agent) {
+                    ini_set('user_agent', $this->config_http_user_agent);
+                }
+            } else {
+                return $this->ErrorImage('only FTP and HTTP/HTTPS protocols are allowed, "'.$protocol_matches[1].'" is not');
+        }
+        } elseif (!@file_exists($this->sourceFilename)) {
+            return $this->ErrorImage('"'.$this->sourceFilename.'" does not exist');
+        } elseif (!@is_file($this->sourceFilename)) {
+            return $this->ErrorImage('"'.$this->sourceFilename.'" is not a file');
+        }
+        return true;
+    }
+
+
+    public function setOutputFormat() {
+        static $alreadyCalled = false;
+        if ($this->thumbnailFormat && $alreadyCalled) {
+            return true;
+        }
+        $alreadyCalled = true;
+
+        $AvailableImageOutputFormats = array();
+        $AvailableImageOutputFormats[] = 'text';
+        if (@is_readable( __DIR__ .'/phpthumb.ico.php')) {
+            $AvailableImageOutputFormats[] = 'ico';
+        }
+        if (@is_readable( __DIR__ .'/phpthumb.bmp.php')) {
+            $AvailableImageOutputFormats[] = 'bmp';
+        }
+
+        $this->thumbnailFormat = 'ico';
+
+        // Set default output format based on what image types are available
+        if (function_exists('imagetypes')) {
+            $imagetypes = imagetypes();
+            if ($imagetypes & IMG_WBMP) {
+                $this->thumbnailFormat         = 'wbmp';
+                $AvailableImageOutputFormats[] = 'wbmp';
+            }
+            if ($imagetypes & IMG_GIF) {
+                $this->thumbnailFormat         = 'gif';
+                $AvailableImageOutputFormats[] = 'gif';
+            }
+            if ($imagetypes & IMG_PNG) {
+                $this->thumbnailFormat         = 'png';
+                $AvailableImageOutputFormats[] = 'png';
+            }
+            if ($imagetypes & IMG_JPG) {
+                $this->thumbnailFormat         = 'jpeg';
+                $AvailableImageOutputFormats[] = 'jpeg';
+            }
+        } else {
+            $this->DebugMessage('imagetypes() does not exist - GD support might not be enabled?',  __FILE__, __LINE__);
+        }
+        if ($this->ImageMagickVersion()) {
+            $IMformats = array('jpeg', 'png', 'gif', 'bmp', 'ico', 'wbmp');
+            $this->DebugMessage('Addding ImageMagick formats to $AvailableImageOutputFormats ('.implode(';', $AvailableImageOutputFormats).')', __FILE__, __LINE__);
+            foreach ($IMformats as $key => $format) {
+                $AvailableImageOutputFormats[] = $format;
+            }
+        }
+        $AvailableImageOutputFormats = array_unique($AvailableImageOutputFormats);
+        $this->DebugMessage('$AvailableImageOutputFormats = array('.implode(';', $AvailableImageOutputFormats).')', __FILE__, __LINE__);
+
+        $this->f = preg_replace('#[^a-z]#', '', strtolower($this->f));
+        if (strtolower($this->config_output_format) == 'jpg') {
+            $this->config_output_format = 'jpeg';
+        }
+        if (strtolower($this->f) == 'jpg') {
+            $this->f = 'jpeg';
+        }
+        if (phpthumb_functions::CaseInsensitiveInArray($this->config_output_format, $AvailableImageOutputFormats)) {
+            // set output format to config default if that format is available
+            $this->DebugMessage('$this->thumbnailFormat set to $this->config_output_format "'.strtolower($this->config_output_format).'"', __FILE__, __LINE__);
+            $this->thumbnailFormat = strtolower($this->config_output_format);
+        } elseif ($this->config_output_format) {
+            $this->DebugMessage('$this->thumbnailFormat staying as "'.$this->thumbnailFormat.'" because $this->config_output_format ('.strtolower($this->config_output_format).') is not in $AvailableImageOutputFormats', __FILE__, __LINE__);
+        }
+        if ($this->f && (phpthumb_functions::CaseInsensitiveInArray($this->f, $AvailableImageOutputFormats))) {
+            // override output format if $this->f is set and that format is available
+            $this->DebugMessage('$this->thumbnailFormat set to $this->f "'.strtolower($this->f).'"', __FILE__, __LINE__);
+            $this->thumbnailFormat = strtolower($this->f);
+        } elseif ($this->f) {
+            $this->DebugMessage('$this->thumbnailFormat staying as "'.$this->thumbnailFormat.'" because $this->f ('.strtolower($this->f).') is not in $AvailableImageOutputFormats', __FILE__, __LINE__);
+        }
+
+        // for JPEG images, quality 1 (worst) to 99 (best)
+        // quality < 25 is nasty, with not much size savings - not recommended
+        // problems with 100 - invalid JPEG?
+        $this->thumbnailQuality = max(1, min(99, ($this->q ? (int) $this->q : 75)));
+        $this->DebugMessage('$this->thumbnailQuality set to "'.$this->thumbnailQuality.'"', __FILE__, __LINE__);
+
+        return true;
+    }
+
+
+    public function setCacheDirectory() {
+        // resolve cache directory to absolute pathname
+        $this->DebugMessage('setCacheDirectory() starting with config_cache_directory = "'.$this->config_cache_directory.'"', __FILE__, __LINE__);
+        if ($this->config_cache_directory[ 0 ] == '.') {
+            if (preg_match('#^(f|ht)tps?\://#i', $this->src)) {
+                if (!$this->config_cache_disable_warning) {
+                    $this->ErrorImage('$this->config_cache_directory ('.$this->config_cache_directory.') cannot be used for remote images. Adjust "cache_directory" or "cache_disable_warning" in phpThumb.config.php');
+                }
+            } elseif ($this->src) {
+                // resolve relative cache directory to source image
+                $this->config_cache_directory = dirname($this->ResolveFilenameToAbsolute($this->src)).DIRECTORY_SEPARATOR.$this->config_cache_directory;
+            } else {
+                // $this->new is probably set
+            }
+        }
+        if (substr($this->config_cache_directory, -1) == '/') {
+            $this->config_cache_directory = substr($this->config_cache_directory, 0, -1);
+        }
+        if ($this->iswindows) {
+            $this->config_cache_directory = str_replace('/', DIRECTORY_SEPARATOR, $this->config_cache_directory);
+        }
+        if ($this->config_cache_directory) {
+            $real_cache_path = $this->realPathSafe($this->config_cache_directory);
+            if (!$real_cache_path) {
+                $this->DebugMessage('$this->realPathSafe($this->config_cache_directory) failed for "'.$this->config_cache_directory.'"', __FILE__, __LINE__);
+                if (!is_dir($this->config_cache_directory)) {
+                    $this->DebugMessage('!is_dir('.$this->config_cache_directory.')', __FILE__, __LINE__);
+                }
+            }
+            if ($real_cache_path) {
+                $this->DebugMessage('setting config_cache_directory to $this->realPathSafe('.$this->config_cache_directory.') = "'.$real_cache_path.'"', __FILE__, __LINE__);
+                $this->config_cache_directory = $real_cache_path;
+            }
+        }
+        if (!is_dir($this->config_cache_directory)) {
+            if (!$this->config_cache_disable_warning) {
+                $this->ErrorImage('$this->config_cache_directory ('.$this->config_cache_directory.') does not exist. Adjust "cache_directory" or "cache_disable_warning" in phpThumb.config.php');
+            }
+            $this->DebugMessage('$this->config_cache_directory ('.$this->config_cache_directory.') is not a directory', __FILE__, __LINE__);
+            $this->config_cache_directory = null;
+        } elseif (!@is_writable($this->config_cache_directory)) {
+            $this->DebugMessage('$this->config_cache_directory is not writable ('.$this->config_cache_directory.')', __FILE__, __LINE__);
+        }
+
+        $this->InitializeTempDirSetting();
+        if (!@is_dir($this->config_temp_directory) && !@is_writable($this->config_temp_directory) && @is_dir($this->config_cache_directory) && @is_writable($this->config_cache_directory)) {
+            $this->DebugMessage('setting $this->config_temp_directory = $this->config_cache_directory ('.$this->config_cache_directory.')', __FILE__, __LINE__);
+            $this->config_temp_directory = $this->config_cache_directory;
+        }
+        return true;
+    }
+
+    /* Takes the array of path segments up to now, and the next segment (maybe a modifier: empty, . or ..)
 	   Applies it, adding or removing from $segments as a result. Returns nothing. */
-	// http://support.silisoftware.com/phpBB3/viewtopic.php?t=961
-	public function applyPathSegment(&$segments, $segment) {
-		if ($segment == '.') {
-			return; // always remove
-		}
-		if ($segment == '') {
-			$test = array_pop($segments);
-			if (null === $test) {
-				$segments[] = $segment; // keep the first empty block
-			} elseif ($test == '') {
-				$test = array_pop($segments);
-				if (null === $test) {
-					$segments[] = $test;
-					$segments[] = $segment; // keep the second one too
-				} else { // put both back and ignore segment
-					$segments[] = $test;
-					$segments[] = $test;
-				}
-			} else {
-				$segments[] = $test; // ignore empty blocks
-			}
-		} else {
-			if ($segment == '..') {
-				$test = array_pop($segments);
-				if (null === $test) {
-					$segments[] = $segment;
-				} elseif ($test == '..') {
-					$segments[] = $test;
-					$segments[] = $segment;
-				} else {
-					if ($test == '') {
-						$segments[] = $test;
-					} // else nothing, remove both
-				}
-			} else {
-				$segments[] = $segment;
-			}
-		}
-	}
-
-	/* Takes array of path components, normalizes it: removes empty slots and '.', collapses '..' and folder names.  Returns array. */
-	// http://support.silisoftware.com/phpBB3/viewtopic.php?t=961
-	public function normalizePath($segments) {
-		$parts = array();
-		foreach ($segments as $segment) {
-			$this->applyPathSegment($parts, $segment);
-		}
-		return $parts;
-	}
-
-	/* True if the provided path points (without resolving symbolic links) into one of the allowed directories. */
-	// http://support.silisoftware.com/phpBB3/viewtopic.php?t=961
-	public function matchPath($path, $allowed_dirs) {
-		if (!empty($allowed_dirs)) {
-			foreach ($allowed_dirs as $one_dir) {
-				if (preg_match('#^'.preg_quote(str_replace(DIRECTORY_SEPARATOR, '/', $this->realPathSafe($one_dir))).'#', $path)) {
-					return true;
-				}
-			}
-		}
-		return false;
-	}
-
-	/* True if the provided path points inside one of open_basedirs (or if open_basedirs are disabled) */
-	// http://support.silisoftware.com/phpBB3/viewtopic.php?t=961
-	public function isInOpenBasedir($path) {
-		static $open_basedirs = null;
-		if (null === $open_basedirs) {
-			$ini_text = ini_get('open_basedir');
-			$this->DebugMessage('open_basedir: "'.$ini_text.'"', __FILE__, __LINE__);
-			$open_basedirs = array();
-			if (strlen($ini_text) > 0) {
-				foreach (preg_split('#[;:]#', $ini_text) as $key => $value) {
-					$open_basedirs[$key] = $this->realPathSafe($value);
-				}
-			}
-		}
-		return (empty($open_basedirs) || $this->matchPath($path, $open_basedirs));
-	}
-
-	/* Resolves all symlinks in $path, checking that each continuous part ends in an allowed zone. Returns null, if any component leads outside of allowed zone. */
-	// http://support.silisoftware.com/phpBB3/viewtopic.php?t=961
-	public function resolvePath($path, $allowed_dirs) {
-		$this->DebugMessage('resolvePath: '.$path.' (allowed_dirs: '.print_r($allowed_dirs, true).')', __FILE__, __LINE__);
-
-		// add base path to the top of the list
-		if (!$this->config_allow_src_above_docroot) {
-			array_unshift($allowed_dirs, $this->realPathSafe($this->config_document_root));
-		} else {
-			if (!$this->config_allow_src_above_phpthumb) {
-				array_unshift($allowed_dirs, $this->realPathSafe( __DIR__ ));
-			} else {
-				// no checks are needed, offload the work to realpath and forget about it
-				$this->DebugMessage('resolvePath: checks disabled, returning '.$this->realPathSafe($path), __FILE__, __LINE__);
-				return $this->realPathSafe($path);
-			}
-		}
-		if ($path == '') {
-			return null; // save us trouble
-		}
-
-		do {
-			$this->DebugMessage('resolvePath: iteration, path='.$path.', base path = '.$allowed_dirs[0], __FILE__, __LINE__);
-
-			$parts = array();
-			// do not use "cleaner" foreach version of this loop as later code relies on both $segments and $i
-			// http://support.silisoftware.com/phpBB3/viewtopic.php?t=964
-			$segments = explode(DIRECTORY_SEPARATOR, $path);
-			for ($i = 0, $iMax = count($segments); $i < $iMax; $i++) {
-				$this->applyPathSegment($parts, $segments[$i]);
-				$thispart = implode(DIRECTORY_SEPARATOR, $parts);
-				if ($this->isInOpenBasedir($thispart)) {
-					if (is_link($thispart)) {
-						break;
-					}
-				}
-			}
-
-			$this->DebugMessage('resolvePath: stop at component '.$i, __FILE__, __LINE__);
-			// test the part up to here
-			$path = implode(DIRECTORY_SEPARATOR, $parts);
-			$this->DebugMessage('resolvePath: stop at path='.$path, __FILE__, __LINE__);
-			if (!$this->matchPath($path, $allowed_dirs)) {
-				$this->DebugMessage('resolvePath: no match, returning null', __FILE__, __LINE__);
-				return null;
-			}
-			if ($i >= count($segments)) { // reached end
-				$this->DebugMessage('resolvePath: path parsed, over', __FILE__, __LINE__);
-				break;
-			}
-			// else it's symlink, rewrite path
-			$path = readlink($path);
-			$this->DebugMessage('resolvePath: symlink matched, target='.$path, __FILE__, __LINE__);
-
-			/*
+    // http://support.silisoftware.com/phpBB3/viewtopic.php?t=961
+    public function applyPathSegment(&$segments, $segment) {
+        if ($segment == '.') {
+            return; // always remove
+        }
+        if ($segment == '') {
+            $test = array_pop($segments);
+            if (null === $test) {
+                $segments[] = $segment; // keep the first empty block
+            } elseif ($test == '') {
+                $test = array_pop($segments);
+                if (null === $test) {
+                    $segments[] = $test;
+                    $segments[] = $segment; // keep the second one too
+                } else { // put both back and ignore segment
+                    $segments[] = $test;
+                    $segments[] = $test;
+                }
+            } else {
+                $segments[] = $test; // ignore empty blocks
+            }
+        } else {
+            if ($segment == '..') {
+                $test = array_pop($segments);
+                if (null === $test) {
+                    $segments[] = $segment;
+                } elseif ($test == '..') {
+                    $segments[] = $test;
+                    $segments[] = $segment;
+                } else {
+                    if ($test == '') {
+                        $segments[] = $test;
+                    } // else nothing, remove both
+                }
+            } else {
+                $segments[] = $segment;
+            }
+        }
+    }
+
+    /* Takes array of path components, normalizes it: removes empty slots and '.', collapses '..' and folder names.  Returns array. */
+    // http://support.silisoftware.com/phpBB3/viewtopic.php?t=961
+    public function normalizePath($segments) {
+        $parts = array();
+        foreach ($segments as $segment) {
+            $this->applyPathSegment($parts, $segment);
+        }
+        return $parts;
+    }
+
+    /* True if the provided path points (without resolving symbolic links) into one of the allowed directories. */
+    // http://support.silisoftware.com/phpBB3/viewtopic.php?t=961
+    public function matchPath($path, $allowed_dirs) {
+        if (!empty($allowed_dirs)) {
+            foreach ($allowed_dirs as $one_dir) {
+                if (preg_match('#^'.preg_quote(str_replace(DIRECTORY_SEPARATOR, '/', $this->realPathSafe($one_dir))).'#', $path)) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
+    /* True if the provided path points inside one of open_basedirs (or if open_basedirs are disabled) */
+    // http://support.silisoftware.com/phpBB3/viewtopic.php?t=961
+    public function isInOpenBasedir($path) {
+        static $open_basedirs = null;
+        if (null === $open_basedirs) {
+            $ini_text = ini_get('open_basedir');
+            $this->DebugMessage('open_basedir: "'.$ini_text.'"', __FILE__, __LINE__);
+            $open_basedirs = array();
+            if (strlen($ini_text) > 0) {
+                foreach (preg_split('#[;:]#', $ini_text) as $key => $value) {
+                    $open_basedirs[$key] = $this->realPathSafe($value);
+                }
+            }
+        }
+        return (empty($open_basedirs) || $this->matchPath($path, $open_basedirs));
+    }
+
+    /* Resolves all symlinks in $path, checking that each continuous part ends in an allowed zone. Returns null, if any component leads outside of allowed zone. */
+    // http://support.silisoftware.com/phpBB3/viewtopic.php?t=961
+    public function resolvePath($path, $allowed_dirs) {
+        $this->DebugMessage('resolvePath: '.$path.' (allowed_dirs: '.print_r($allowed_dirs, true).')', __FILE__, __LINE__);
+
+        // add base path to the top of the list
+        if (!$this->config_allow_src_above_docroot) {
+            array_unshift($allowed_dirs, $this->realPathSafe($this->config_document_root));
+        } else {
+            if (!$this->config_allow_src_above_phpthumb) {
+                array_unshift($allowed_dirs, $this->realPathSafe( __DIR__ ));
+            } else {
+                // no checks are needed, offload the work to realpath and forget about it
+                $this->DebugMessage('resolvePath: checks disabled, returning '.$this->realPathSafe($path), __FILE__, __LINE__);
+                return $this->realPathSafe($path);
+            }
+        }
+        if ($path == '') {
+            return null; // save us trouble
+        }
+
+        do {
+            $this->DebugMessage('resolvePath: iteration, path='.$path.', base path = '.$allowed_dirs[0], __FILE__, __LINE__);
+
+            $parts = array();
+            // do not use "cleaner" foreach version of this loop as later code relies on both $segments and $i
+            // http://support.silisoftware.com/phpBB3/viewtopic.php?t=964
+            $segments = explode(DIRECTORY_SEPARATOR, $path);
+            for ($i = 0, $iMax = count($segments); $i < $iMax; $i++) {
+                $this->applyPathSegment($parts, $segments[$i]);
+                $thispart = implode(DIRECTORY_SEPARATOR, $parts);
+                if ($this->isInOpenBasedir($thispart)) {
+                    if (is_link($thispart)) {
+                        break;
+                    }
+                }
+            }
+
+            $this->DebugMessage('resolvePath: stop at component '.$i, __FILE__, __LINE__);
+            // test the part up to here
+            $path = implode(DIRECTORY_SEPARATOR, $parts);
+            $this->DebugMessage('resolvePath: stop at path='.$path, __FILE__, __LINE__);
+            if (!$this->matchPath($path, $allowed_dirs)) {
+                $this->DebugMessage('resolvePath: no match, returning null', __FILE__, __LINE__);
+                return null;
+            }
+            if ($i >= count($segments)) { // reached end
+                $this->DebugMessage('resolvePath: path parsed, over', __FILE__, __LINE__);
+                break;
+            }
+            // else it's symlink, rewrite path
+            $path = readlink($path);
+            $this->DebugMessage('resolvePath: symlink matched, target='.$path, __FILE__, __LINE__);
+
+            /*
 			Replace base path with symlink target.
 			Assuming:
 			  /www/img/external -> /external
@@ -1198,134 +1198,134 @@ 
 			  GET /www/img/external/../www/img/pic.jpg
 			So there's only one base path which is the last symlink target, but any number of stable whitelisted paths.
 			*/
-			if ($this->config_auto_allow_symlinks) {
-				$allowed_dirs[0] = $path;
-			}
-			$path = $path.DIRECTORY_SEPARATOR.implode(DIRECTORY_SEPARATOR, array_slice($segments,$i + 1));
-		} while (true);
-		return $path;
-	}
-
-
-	public function realPathSafe($filename) {
-		// http://php.net/manual/en/function.realpath.php -- "Note: The running script must have executable permissions on all directories in the hierarchy, otherwise realpath() will return FALSE"
-		// realPathSafe() provides a reasonable facsimile of realpath() but does not resolve symbolic links, nor does it check that the file/path actually exists
-		if (!$this->config_disable_realpath) {
-			return realpath($filename);
-		}
-
-		// http://stackoverflow.com/questions/21421569
-		$newfilename = preg_replace('#[\\/]+#', DIRECTORY_SEPARATOR, $filename);
-		if (!preg_match('#^'.DIRECTORY_SEPARATOR.'#', $newfilename)) {
-			$newfilename =  __DIR__ .DIRECTORY_SEPARATOR.$newfilename;
-		}
-		do {
-			$beforeloop = $newfilename;
-
-			// Replace all sequences of more than one / with a single one [[ If you're working on a system that treats // at the start of a path as special, make sure you replace multiple / characters at the start with two of them. This is the only place where POSIX allows (but does not mandate) special handling for multiples, in all other cases, multiple / characters are equivalent to a single one.]]
-			$newfilename = preg_replace('#'.DIRECTORY_SEPARATOR.'+#', DIRECTORY_SEPARATOR, $newfilename);
-
-			// Replace all occurrences of /./ with /
-			$newfilename = preg_replace('#'.DIRECTORY_SEPARATOR.'\\.'.DIRECTORY_SEPARATOR.'#', DIRECTORY_SEPARATOR, $newfilename);
-
-			// Remove ./ if at the start
-			$newfilename = preg_replace('#^\\.'.DIRECTORY_SEPARATOR.'#', '', $newfilename);
-
-			// Remove /. if at the end
-			$newfilename = preg_replace('#'.DIRECTORY_SEPARATOR.'\\.$#', '', $newfilename);
-
-			// Replace /anything/../ with /
-			$newfilename = preg_replace('#'.DIRECTORY_SEPARATOR.'[^'.DIRECTORY_SEPARATOR.']+'.DIRECTORY_SEPARATOR.'\\.\\.'.DIRECTORY_SEPARATOR.'#', DIRECTORY_SEPARATOR, $newfilename);
-
-			// Remove /anything/.. if at the end
-			$newfilename = preg_replace('#'.DIRECTORY_SEPARATOR.'[^'.DIRECTORY_SEPARATOR.']+'.DIRECTORY_SEPARATOR.'\\.\\.$#', '', $newfilename);
-
-		} while ($newfilename != $beforeloop);
-		return $newfilename;
-	}
-
-
-	public function ResolveFilenameToAbsolute($filename) {
-		if (empty($filename)) {
-			return false;
-		}
-
-		if (preg_match('#^[a-z0-9]+\:/{1,2}#i', $filename)) {
-			// eg: http://host/path/file.jpg (HTTP URL)
-			// eg: ftp://host/path/file.jpg  (FTP URL)
-			// eg: data1:/path/file.jpg      (Netware path)
-
-			//$AbsoluteFilename = $filename;
-			return $filename;
-
-		} elseif ($this->iswindows && isset($filename{1}) && ($filename{1} == ':')) {
-
-			// absolute pathname (Windows)
-			$AbsoluteFilename = $filename;
-
-		} elseif ($this->iswindows && ((substr($filename, 0, 2) == '//') || (substr($filename, 0, 2) == '\\\\'))) {
-
-			// absolute pathname (Windows)
-			$AbsoluteFilename = $filename;
-
-		} elseif ($filename{0} == '/') {
-
-			if (@is_readable($filename) && !@is_readable($this->config_document_root.$filename)) {
-
-				// absolute filename (*nix)
-				$AbsoluteFilename = $filename;
-
-			} elseif (isset($filename{1}) && ($filename{1} == '~')) {
+            if ($this->config_auto_allow_symlinks) {
+                $allowed_dirs[0] = $path;
+            }
+            $path = $path.DIRECTORY_SEPARATOR.implode(DIRECTORY_SEPARATOR, array_slice($segments,$i + 1));
+        } while (true);
+        return $path;
+    }
 
-				// /~user/path
-				if ($ApacheLookupURIarray = phpthumb_functions::ApacheLookupURIarray($filename)) {
-					$AbsoluteFilename = $ApacheLookupURIarray['filename'];
-				} else {
-					$AbsoluteFilename = $this->realPathSafe($filename);
-					if (@is_readable($AbsoluteFilename)) {
-						$this->DebugMessage('phpthumb_functions::ApacheLookupURIarray() failed for "'.$filename.'", but the correct filename ('.$AbsoluteFilename.') seems to have been resolved with $this->realPathSafe($filename)', __FILE__, __LINE__);
-					} elseif (is_dir(dirname($AbsoluteFilename))) {
-						$this->DebugMessage('phpthumb_functions::ApacheLookupURIarray() failed for "'.dirname($filename).'", but the correct directory ('.dirname($AbsoluteFilename).') seems to have been resolved with $this->realPathSafe(.)', __FILE__, __LINE__);
-					} else {
-						return $this->ErrorImage('phpthumb_functions::ApacheLookupURIarray() failed for "'.$filename.'". This has been known to fail on Apache2 - try using the absolute filename for the source image (ex: "/home/user/httpdocs/image.jpg" instead of "/~user/image.jpg")');
-					}
-				}
 
-			} else {
+    public function realPathSafe($filename) {
+        // http://php.net/manual/en/function.realpath.php -- "Note: The running script must have executable permissions on all directories in the hierarchy, otherwise realpath() will return FALSE"
+        // realPathSafe() provides a reasonable facsimile of realpath() but does not resolve symbolic links, nor does it check that the file/path actually exists
+        if (!$this->config_disable_realpath) {
+            return realpath($filename);
+        }
 
-				// relative filename (any OS)
-				if (preg_match('#^'.preg_quote($this->config_document_root).'#', $filename)) {
-					$AbsoluteFilename = $filename;
-					$this->DebugMessage('ResolveFilenameToAbsolute() NOT prepending $this->config_document_root ('.$this->config_document_root.') to $filename ('.$filename.') resulting in ($AbsoluteFilename = "'.$AbsoluteFilename.'")', __FILE__, __LINE__);
-				} else {
-					$AbsoluteFilename = $this->config_document_root.$filename;
-					$this->DebugMessage('ResolveFilenameToAbsolute() prepending $this->config_document_root ('.$this->config_document_root.') to $filename ('.$filename.') resulting in ($AbsoluteFilename = "'.$AbsoluteFilename.'")', __FILE__, __LINE__);
-				}
+        // http://stackoverflow.com/questions/21421569
+        $newfilename = preg_replace('#[\\/]+#', DIRECTORY_SEPARATOR, $filename);
+        if (!preg_match('#^'.DIRECTORY_SEPARATOR.'#', $newfilename)) {
+            $newfilename =  __DIR__ .DIRECTORY_SEPARATOR.$newfilename;
+        }
+        do {
+            $beforeloop = $newfilename;
+
+            // Replace all sequences of more than one / with a single one [[ If you're working on a system that treats // at the start of a path as special, make sure you replace multiple / characters at the start with two of them. This is the only place where POSIX allows (but does not mandate) special handling for multiples, in all other cases, multiple / characters are equivalent to a single one.]]
+            $newfilename = preg_replace('#'.DIRECTORY_SEPARATOR.'+#', DIRECTORY_SEPARATOR, $newfilename);
+
+            // Replace all occurrences of /./ with /
+            $newfilename = preg_replace('#'.DIRECTORY_SEPARATOR.'\\.'.DIRECTORY_SEPARATOR.'#', DIRECTORY_SEPARATOR, $newfilename);
+
+            // Remove ./ if at the start
+            $newfilename = preg_replace('#^\\.'.DIRECTORY_SEPARATOR.'#', '', $newfilename);
+
+            // Remove /. if at the end
+            $newfilename = preg_replace('#'.DIRECTORY_SEPARATOR.'\\.$#', '', $newfilename);
+
+            // Replace /anything/../ with /
+            $newfilename = preg_replace('#'.DIRECTORY_SEPARATOR.'[^'.DIRECTORY_SEPARATOR.']+'.DIRECTORY_SEPARATOR.'\\.\\.'.DIRECTORY_SEPARATOR.'#', DIRECTORY_SEPARATOR, $newfilename);
+
+            // Remove /anything/.. if at the end
+            $newfilename = preg_replace('#'.DIRECTORY_SEPARATOR.'[^'.DIRECTORY_SEPARATOR.']+'.DIRECTORY_SEPARATOR.'\\.\\.$#', '', $newfilename);
+
+        } while ($newfilename != $beforeloop);
+        return $newfilename;
+    }
+
+
+    public function ResolveFilenameToAbsolute($filename) {
+        if (empty($filename)) {
+            return false;
+        }
+
+        if (preg_match('#^[a-z0-9]+\:/{1,2}#i', $filename)) {
+            // eg: http://host/path/file.jpg (HTTP URL)
+            // eg: ftp://host/path/file.jpg  (FTP URL)
+            // eg: data1:/path/file.jpg      (Netware path)
+
+            //$AbsoluteFilename = $filename;
+            return $filename;
+
+        } elseif ($this->iswindows && isset($filename{1}) && ($filename{1} == ':')) {
+
+            // absolute pathname (Windows)
+            $AbsoluteFilename = $filename;
+
+        } elseif ($this->iswindows && ((substr($filename, 0, 2) == '//') || (substr($filename, 0, 2) == '\\\\'))) {
+
+            // absolute pathname (Windows)
+            $AbsoluteFilename = $filename;
+
+        } elseif ($filename{0} == '/') {
+
+            if (@is_readable($filename) && !@is_readable($this->config_document_root.$filename)) {
+
+                // absolute filename (*nix)
+                $AbsoluteFilename = $filename;
+
+            } elseif (isset($filename{1}) && ($filename{1} == '~')) {
+
+                // /~user/path
+                if ($ApacheLookupURIarray = phpthumb_functions::ApacheLookupURIarray($filename)) {
+                    $AbsoluteFilename = $ApacheLookupURIarray['filename'];
+                } else {
+                    $AbsoluteFilename = $this->realPathSafe($filename);
+                    if (@is_readable($AbsoluteFilename)) {
+                        $this->DebugMessage('phpthumb_functions::ApacheLookupURIarray() failed for "'.$filename.'", but the correct filename ('.$AbsoluteFilename.') seems to have been resolved with $this->realPathSafe($filename)', __FILE__, __LINE__);
+                    } elseif (is_dir(dirname($AbsoluteFilename))) {
+                        $this->DebugMessage('phpthumb_functions::ApacheLookupURIarray() failed for "'.dirname($filename).'", but the correct directory ('.dirname($AbsoluteFilename).') seems to have been resolved with $this->realPathSafe(.)', __FILE__, __LINE__);
+                    } else {
+                        return $this->ErrorImage('phpthumb_functions::ApacheLookupURIarray() failed for "'.$filename.'". This has been known to fail on Apache2 - try using the absolute filename for the source image (ex: "/home/user/httpdocs/image.jpg" instead of "/~user/image.jpg")');
+                    }
+                }
+
+            } else {
+
+                // relative filename (any OS)
+                if (preg_match('#^'.preg_quote($this->config_document_root).'#', $filename)) {
+                    $AbsoluteFilename = $filename;
+                    $this->DebugMessage('ResolveFilenameToAbsolute() NOT prepending $this->config_document_root ('.$this->config_document_root.') to $filename ('.$filename.') resulting in ($AbsoluteFilename = "'.$AbsoluteFilename.'")', __FILE__, __LINE__);
+                } else {
+                    $AbsoluteFilename = $this->config_document_root.$filename;
+                    $this->DebugMessage('ResolveFilenameToAbsolute() prepending $this->config_document_root ('.$this->config_document_root.') to $filename ('.$filename.') resulting in ($AbsoluteFilename = "'.$AbsoluteFilename.'")', __FILE__, __LINE__);
+                }
+
+            }
 
-			}
+        } else {
 
-		} else {
+            // relative to current directory (any OS)
+            $AbsoluteFilename =  __DIR__ .DIRECTORY_SEPARATOR.preg_replace('#[/\\\\]#', DIRECTORY_SEPARATOR, $filename);
+
+            if (substr(dirname(@$_SERVER['PHP_SELF']), 0, 2) == '/~') {
+                if ($ApacheLookupURIarray = phpthumb_functions::ApacheLookupURIarray(dirname(@$_SERVER['PHP_SELF']))) {
+                    $AbsoluteFilename = $ApacheLookupURIarray['filename'].DIRECTORY_SEPARATOR.$filename;
+                } else {
+                    $AbsoluteFilename = $this->realPathSafe('.').DIRECTORY_SEPARATOR.$filename;
+                    if (@is_readable($AbsoluteFilename)) {
+                        $this->DebugMessage('phpthumb_functions::ApacheLookupURIarray() failed for "'.dirname(@$_SERVER['PHP_SELF']).'", but the correct filename ('.$AbsoluteFilename.') seems to have been resolved with $this->realPathSafe(.)/$filename', __FILE__, __LINE__);
+                    } elseif (is_dir(dirname($AbsoluteFilename))) {
+                        $this->DebugMessage('phpthumb_functions::ApacheLookupURIarray() failed for "'.dirname(@$_SERVER['PHP_SELF']).'", but the correct directory ('.dirname($AbsoluteFilename).') seems to have been resolved with $this->realPathSafe(.)', __FILE__, __LINE__);
+                    } else {
+                        return $this->ErrorImage('phpthumb_functions::ApacheLookupURIarray() failed for "'.dirname(@$_SERVER['PHP_SELF']).'". This has been known to fail on Apache2 - try using the absolute filename for the source image');
+                    }
+                }
+            }
 
-			// relative to current directory (any OS)
-			$AbsoluteFilename =  __DIR__ .DIRECTORY_SEPARATOR.preg_replace('#[/\\\\]#', DIRECTORY_SEPARATOR, $filename);
-
-			if (substr(dirname(@$_SERVER['PHP_SELF']), 0, 2) == '/~') {
-				if ($ApacheLookupURIarray = phpthumb_functions::ApacheLookupURIarray(dirname(@$_SERVER['PHP_SELF']))) {
-					$AbsoluteFilename = $ApacheLookupURIarray['filename'].DIRECTORY_SEPARATOR.$filename;
-				} else {
-					$AbsoluteFilename = $this->realPathSafe('.').DIRECTORY_SEPARATOR.$filename;
-					if (@is_readable($AbsoluteFilename)) {
-						$this->DebugMessage('phpthumb_functions::ApacheLookupURIarray() failed for "'.dirname(@$_SERVER['PHP_SELF']).'", but the correct filename ('.$AbsoluteFilename.') seems to have been resolved with $this->realPathSafe(.)/$filename', __FILE__, __LINE__);
-					} elseif (is_dir(dirname($AbsoluteFilename))) {
-						$this->DebugMessage('phpthumb_functions::ApacheLookupURIarray() failed for "'.dirname(@$_SERVER['PHP_SELF']).'", but the correct directory ('.dirname($AbsoluteFilename).') seems to have been resolved with $this->realPathSafe(.)', __FILE__, __LINE__);
-					} else {
-						return $this->ErrorImage('phpthumb_functions::ApacheLookupURIarray() failed for "'.dirname(@$_SERVER['PHP_SELF']).'". This has been known to fail on Apache2 - try using the absolute filename for the source image');
-					}
-				}
-			}
-
-		}
-		/*
+        }
+        /*
 		// removed 2014-May-30: http://support.silisoftware.com/phpBB3/viewtopic.php?t=961
 		if (is_link($AbsoluteFilename)) {
 			$this->DebugMessage('is_link()==true, changing "'.$AbsoluteFilename.'" to "'.readlink($AbsoluteFilename).'"', __FILE__, __LINE__);
@@ -1335,317 +1335,317 @@ 
 			$AbsoluteFilename = $this->realPathSafe($AbsoluteFilename);
 		}
 		*/
-		if ($this->iswindows) {
-			$AbsoluteFilename = preg_replace('#^'.preg_quote($this->realPathSafe($this->config_document_root)).'#i', str_replace('\\', '\\\\', $this->realPathSafe($this->config_document_root)), $AbsoluteFilename);
-			$AbsoluteFilename = str_replace(DIRECTORY_SEPARATOR, '/', $AbsoluteFilename);
-		}
-		$resolvedAbsoluteFilename = $this->resolvePath($AbsoluteFilename, $this->config_additional_allowed_dirs);
-		if (!$this->config_allow_src_above_docroot && !preg_match('#^'.preg_quote(str_replace(DIRECTORY_SEPARATOR, '/', $this->realPathSafe($this->config_document_root))).'#', $resolvedAbsoluteFilename)) {
-			$this->DebugMessage('!$this->config_allow_src_above_docroot therefore setting "'.$AbsoluteFilename.'" (outside "'.$this->realPathSafe($this->config_document_root).'") to null', __FILE__, __LINE__);
-			return false;
-		}
-		if (!$this->config_allow_src_above_phpthumb && !preg_match('#^'.preg_quote(str_replace(DIRECTORY_SEPARATOR, '/',  __DIR__ )).'#', $resolvedAbsoluteFilename)) {
-			$this->DebugMessage('!$this->config_allow_src_above_phpthumb therefore setting "'.$AbsoluteFilename.'" (outside "'. __DIR__ .'") to null', __FILE__, __LINE__);
-			return false;
-		}
-		return $resolvedAbsoluteFilename;
-	}
-
-
-	public function file_exists_ignoreopenbasedir($filename, $cached=true) {
-		static $open_basedirs = null;
-		static $file_exists_cache = array();
-		if (!$cached || !isset($file_exists_cache[$filename])) {
-			if (null === $open_basedirs) {
-				$open_basedirs = preg_split('#[;:]#', ini_get('open_basedir'));
-			}
-			if (empty($open_basedirs) || in_array(dirname($filename), $open_basedirs)) {
-				$file_exists_cache[$filename] = file_exists($filename);
-			} elseif ($this->iswindows) {
-				$ls_filename = trim(phpthumb_functions::SafeExec('dir /b '.phpthumb_functions::escapeshellarg_replacement($filename)));
-				$file_exists_cache[$filename] = ($ls_filename == basename($filename));  // command dir /b return only filename without path
-			} else {
-				$ls_filename = trim(phpthumb_functions::SafeExec('ls '.phpthumb_functions::escapeshellarg_replacement($filename)));
-				$file_exists_cache[$filename] = ($ls_filename == $filename);
-			}
-		}
-		return $file_exists_cache[$filename];
-	}
-
-
-	public function ImageMagickWhichConvert() {
-		static $WhichConvert = null;
-		if (null === $WhichConvert) {
-			if ($this->iswindows) {
-				$WhichConvert = false;
-			} else {
-				$IMwhichConvertCacheFilename = $this->config_cache_directory.DIRECTORY_SEPARATOR.'phpThumbCacheIMwhichConvert.txt';
-				if (($cachedwhichconvertstring = @file_get_contents($IMwhichConvertCacheFilename)) !== false) {
-					$WhichConvert = $cachedwhichconvertstring;
-				} else {
-					$WhichConvert = trim(phpthumb_functions::SafeExec('which convert'));
-					@file_put_contents($IMwhichConvertCacheFilename, $WhichConvert);
-					@chmod($IMwhichConvertCacheFilename, $this->getParameter('config_file_create_mask'));
-				}
-			}
-		}
-		return $WhichConvert;
-	}
-
-
-	public function ImageMagickCommandlineBase() {
-		static $commandline = null;
-		if (null === $commandline) {
-			if ($this->issafemode) {
-				$commandline = '';
-				return $commandline;
-			}
-
-			$IMcommandlineBaseCacheFilename = $this->config_cache_directory.DIRECTORY_SEPARATOR.'phpThumbCacheIMcommandlineBase.txt';
-			if (($commandline = @file_get_contents($IMcommandlineBaseCacheFilename)) !== false) {
-				return $commandline;
-			}
-
-			$commandline = (null !== $this->config_imagemagick_path ? $this->config_imagemagick_path : '');
-
-			if ($this->config_imagemagick_path && ($this->config_imagemagick_path != $this->realPathSafe($this->config_imagemagick_path))) {
-				if (@is_executable($this->realPathSafe($this->config_imagemagick_path))) {
-					$this->DebugMessage('Changing $this->config_imagemagick_path ('.$this->config_imagemagick_path.') to $this->realPathSafe($this->config_imagemagick_path) ('.$this->realPathSafe($this->config_imagemagick_path).')', __FILE__, __LINE__);
-					$this->config_imagemagick_path = $this->realPathSafe($this->config_imagemagick_path);
-				} else {
-					$this->DebugMessage('Leaving $this->config_imagemagick_path as ('.$this->config_imagemagick_path.') because !is_execuatable($this->realPathSafe($this->config_imagemagick_path)) ('.$this->realPathSafe($this->config_imagemagick_path).')', __FILE__, __LINE__);
-				}
-			}
-			$this->DebugMessage('                  file_exists('.$this->config_imagemagick_path.') = '. (int) (@file_exists($this->config_imagemagick_path)), __FILE__, __LINE__);
-			$this->DebugMessage('file_exists_ignoreopenbasedir('.$this->config_imagemagick_path.') = '. (int) $this->file_exists_ignoreopenbasedir($this->config_imagemagick_path), __FILE__, __LINE__);
-			$this->DebugMessage('                      is_file('.$this->config_imagemagick_path.') = '. (int) (@is_file($this->config_imagemagick_path)), __FILE__, __LINE__);
-			$this->DebugMessage('                is_executable('.$this->config_imagemagick_path.') = '. (int) (@is_executable($this->config_imagemagick_path)), __FILE__, __LINE__);
-
-			if ($this->file_exists_ignoreopenbasedir($this->config_imagemagick_path)) {
-
-				$this->DebugMessage('using ImageMagick path from $this->config_imagemagick_path ('.$this->config_imagemagick_path.')', __FILE__, __LINE__);
-				if ($this->iswindows) {
-					$commandline = substr($this->config_imagemagick_path, 0, 2).' && cd '.phpthumb_functions::escapeshellarg_replacement(str_replace('/', DIRECTORY_SEPARATOR, substr(dirname($this->config_imagemagick_path), 2))).' && '.phpthumb_functions::escapeshellarg_replacement(basename($this->config_imagemagick_path));
-				} else {
-					$commandline = phpthumb_functions::escapeshellarg_replacement($this->config_imagemagick_path);
-				}
-
-			} else {
-
-				$which_convert = $this->ImageMagickWhichConvert();
-				$IMversion     = $this->ImageMagickVersion();
-
-				if ($which_convert && ($which_convert{0} == '/') && $this->file_exists_ignoreopenbasedir($which_convert)) {
-
-					// `which convert` *should* return the path if "convert" exist, or nothing if it doesn't
-					// other things *may* get returned, like "sh: convert: not found" or "no convert in /usr/local/bin /usr/sbin /usr/bin /usr/ccs/bin"
-					// so only do this if the value returned exists as a file
-					$this->DebugMessage('using ImageMagick path from `which convert` ('.$which_convert.')', __FILE__, __LINE__);
-					$commandline = 'convert';
-
-				} elseif ($IMversion) {
-
-					$this->DebugMessage('setting ImageMagick path to $this->config_imagemagick_path ('.$this->config_imagemagick_path.') ['.$IMversion.']', __FILE__, __LINE__);
-					$commandline = $this->config_imagemagick_path;
-
-				} else {
-
-					$this->DebugMessage('ImageMagickThumbnailToGD() aborting because cannot find convert in $this->config_imagemagick_path ('.$this->config_imagemagick_path.'), and `which convert` returned ('.$which_convert.')', __FILE__, __LINE__);
-					$commandline = '';
-
-				}
-
-			}
-
-			@file_put_contents($IMcommandlineBaseCacheFilename, $commandline);
-			@chmod($IMcommandlineBaseCacheFilename, $this->getParameter('config_file_create_mask'));
-		}
-		return $commandline;
-	}
-
-
-	public function ImageMagickVersion($returnRAW=false) {
-		static $versionstring = null;
-		if (null === $versionstring) {
-			$versionstring = array(0=>false, 1=>false);
-
-			$IMversionCacheFilename = $this->config_cache_directory.DIRECTORY_SEPARATOR.'phpThumbCacheIMversion.txt';
-			if ($cachedversionstring = @file_get_contents($IMversionCacheFilename)) {
-
-				$versionstring = explode("\n", $cachedversionstring, 2);
-				$versionstring[0] = ($versionstring[0] ? $versionstring[0] : false); // "false" is stored as an empty string in the cache file
-				$versionstring[1] = ($versionstring[1] ? $versionstring[1] : false); // "false" is stored as an empty string in the cache file
-
-			} else {
-
-				$commandline = $this->ImageMagickCommandlineBase();
-				$commandline = (null !== $commandline ? $commandline : '');
-				if ($commandline) {
-					$commandline .= ' --version';
-					$this->DebugMessage('ImageMagick version checked with "'.$commandline.'"', __FILE__, __LINE__);
-					$versionstring[1] = trim(phpthumb_functions::SafeExec($commandline));
-					if (preg_match('#^Version: [^0-9]*([ 0-9\\.\\:Q/\\-]+)#i', $versionstring[1], $matches)) {
-						$versionstring[0] = trim($matches[1]);
-					} else {
-						$versionstring[0] = false;
-						$this->DebugMessage('ImageMagick did not return recognized version string ('.$versionstring[1].')', __FILE__, __LINE__);
-					}
-					$this->DebugMessage('ImageMagick convert --version says "'.@$matches[0].'"', __FILE__, __LINE__);
-				}
-
-				@file_put_contents($IMversionCacheFilename, $versionstring[0]."\n".$versionstring[1]);
-				@chmod($IMversionCacheFilename, $this->getParameter('config_file_create_mask'));
-
-			}
-		}
-		return $versionstring[ (int) $returnRAW ];
-	}
-
-
-	public function ImageMagickSwitchAvailable($switchname) {
-		static $IMoptions = null;
-		if (null === $IMoptions) {
-			$IMoptions = array();
-			$commandline = $this->ImageMagickCommandlineBase();
-			if (null !== $commandline) {
-				$commandline .= ' -help';
-				$IMhelp_lines = explode("\n", phpthumb_functions::SafeExec($commandline));
-				foreach ($IMhelp_lines as $line) {
-					if (preg_match('#^[\\+\\-]([a-z\\-]+) #', trim($line), $matches)) {
-						$IMoptions[$matches[1]] = true;
-					}
-				}
-			}
-		}
-		if (is_array($switchname)) {
-			$allOK = true;
-			foreach ($switchname as $key => $value) {
-				if (!isset($IMoptions[$value])) {
-					$allOK = false;
-					break;
-				}
-			}
-			$this->DebugMessage('ImageMagickSwitchAvailable('.implode(';', $switchname).') = '. (int) $allOK .'', __FILE__, __LINE__);
-		} else {
-			$allOK = isset($IMoptions[$switchname]);
-			$this->DebugMessage('ImageMagickSwitchAvailable('.$switchname.') = '. (int) $allOK .'', __FILE__, __LINE__);
-		}
-		return $allOK;
-	}
-
-
-	public function ImageMagickFormatsList() {
-		static $IMformatsList = null;
-		if (null === $IMformatsList) {
-			$IMformatsList = '';
-			$commandline = $this->ImageMagickCommandlineBase();
-			if (null !== $commandline) {
-				$commandline = dirname($commandline).DIRECTORY_SEPARATOR.str_replace('convert', 'identify', basename($commandline));
-				$commandline .= ' -list format';
-				$IMformatsList = phpthumb_functions::SafeExec($commandline);
-			}
-		}
-		return $IMformatsList;
-	}
-
-
-	public function SourceDataToTempFile() {
-		if ($IMtempSourceFilename = $this->phpThumb_tempnam()) {
-			$IMtempSourceFilename = $this->realPathSafe($IMtempSourceFilename);
-			ob_start();
-			$fp_tempfile = fopen($IMtempSourceFilename, 'wb');
-			$tempfile_open_error  = ob_get_contents();
-			ob_end_clean();
-			if ($fp_tempfile) {
-				fwrite($fp_tempfile, $this->rawImageData);
-				fclose($fp_tempfile);
-				@chmod($IMtempSourceFilename, $this->getParameter('config_file_create_mask'));
-				$this->sourceFilename = $IMtempSourceFilename;
-				$this->DebugMessage('ImageMagickThumbnailToGD() setting $this->sourceFilename to "'.$IMtempSourceFilename.'" from $this->rawImageData ('.strlen($this->rawImageData).' bytes)', __FILE__, __LINE__);
-			} else {
-				$this->DebugMessage('ImageMagickThumbnailToGD() FAILED setting $this->sourceFilename to "'.$IMtempSourceFilename.'" (failed to open for writing: "'.$tempfile_open_error.'")', __FILE__, __LINE__);
-			}
-			unset($tempfile_open_error, $IMtempSourceFilename);
-			return true;
-		}
-		$this->DebugMessage('SourceDataToTempFile() FAILED because $this->phpThumb_tempnam() failed', __FILE__, __LINE__);
-		return false;
-	}
-
-
-	public function ImageMagickThumbnailToGD() {
-		// http://www.imagemagick.org/script/command-line-options.php
-
-		$this->useRawIMoutput = true;
-		if (phpthumb_functions::gd_version()) {
-			// if GD is not available, must use whatever ImageMagick can output
-
-			// $UnAllowedParameters contains options that can only be processed in GD, not ImageMagick
-			// note: 'fltr' *may* need to be processed by GD, but we'll check that in more detail below
-			$UnAllowedParameters = array('xto', 'ar', 'bg', 'bc');
-			// 'ra' may be part of this list, if not a multiple of 90 degrees
-			foreach ($UnAllowedParameters as $parameter) {
-				if (isset($this->$parameter)) {
-					$this->DebugMessage('$this->useRawIMoutput=false because "'.$parameter.'" is set', __FILE__, __LINE__);
-					$this->useRawIMoutput = false;
-					break;
-				}
-			}
-		}
-		$this->DebugMessage('$this->useRawIMoutput='.($this->useRawIMoutput ? 'true' : 'false').' after checking $UnAllowedParameters', __FILE__, __LINE__);
-		$ImageCreateFunction = '';
-		$outputFormat = $this->thumbnailFormat;
-		if (phpthumb_functions::gd_version()) {
-			if ($this->useRawIMoutput) {
-				switch ($this->thumbnailFormat) {
-					case 'gif':
-						$ImageCreateFunction = 'imagecreatefromgif';
-						$this->is_alpha = true;
-						break;
-					case 'png':
-						$ImageCreateFunction = 'imagecreatefrompng';
-						$this->is_alpha = true;
-						break;
-					case 'jpg':
-					case 'jpeg':
-						$ImageCreateFunction = 'imagecreatefromjpeg';
-						break;
-					default:
-						$this->DebugMessage('Forcing output to PNG because $this->thumbnailFormat ('.$this->thumbnailFormat.' is not a GD-supported format)', __FILE__, __LINE__);
-						$outputFormat = 'png';
-						$ImageCreateFunction = 'imagecreatefrompng';
-						$this->is_alpha = true;
-						$this->useRawIMoutput = false;
-						break;
-				}
-				if (!function_exists(@$ImageCreateFunction)) {
-					// ImageMagickThumbnailToGD() depends on imagecreatefrompng/imagecreatefromgif
-					//$this->DebugMessage('ImageMagickThumbnailToGD() aborting because '.@$ImageCreateFunction.'() is not available', __FILE__, __LINE__);
-					$this->useRawIMoutput = true;
-					//return false;
-				}
-			} else {
-				$outputFormat = 'png';
-				$ImageCreateFunction = 'imagecreatefrompng';
-				$this->is_alpha = true;
-				$this->useRawIMoutput = false;
-			}
-		}
-
-		// http://freealter.org/doc_distrib/ImageMagick-5.1.1/www/convert.html
-		if (!$this->sourceFilename && $this->rawImageData) {
-			$this->SourceDataToTempFile();
-		}
-		if (!$this->sourceFilename) {
-			$this->DebugMessage('ImageMagickThumbnailToGD() aborting because $this->sourceFilename is empty', __FILE__, __LINE__);
-			$this->useRawIMoutput = false;
-			return false;
-		}
-		if ($this->issafemode) {
-			$this->DebugMessage('ImageMagickThumbnailToGD() aborting because safe_mode is enabled', __FILE__, __LINE__);
-			$this->useRawIMoutput = false;
-			return false;
-		}
+        if ($this->iswindows) {
+            $AbsoluteFilename = preg_replace('#^'.preg_quote($this->realPathSafe($this->config_document_root)).'#i', str_replace('\\', '\\\\', $this->realPathSafe($this->config_document_root)), $AbsoluteFilename);
+            $AbsoluteFilename = str_replace(DIRECTORY_SEPARATOR, '/', $AbsoluteFilename);
+        }
+        $resolvedAbsoluteFilename = $this->resolvePath($AbsoluteFilename, $this->config_additional_allowed_dirs);
+        if (!$this->config_allow_src_above_docroot && !preg_match('#^'.preg_quote(str_replace(DIRECTORY_SEPARATOR, '/', $this->realPathSafe($this->config_document_root))).'#', $resolvedAbsoluteFilename)) {
+            $this->DebugMessage('!$this->config_allow_src_above_docroot therefore setting "'.$AbsoluteFilename.'" (outside "'.$this->realPathSafe($this->config_document_root).'") to null', __FILE__, __LINE__);
+            return false;
+        }
+        if (!$this->config_allow_src_above_phpthumb && !preg_match('#^'.preg_quote(str_replace(DIRECTORY_SEPARATOR, '/',  __DIR__ )).'#', $resolvedAbsoluteFilename)) {
+            $this->DebugMessage('!$this->config_allow_src_above_phpthumb therefore setting "'.$AbsoluteFilename.'" (outside "'. __DIR__ .'") to null', __FILE__, __LINE__);
+            return false;
+        }
+        return $resolvedAbsoluteFilename;
+    }
+
+
+    public function file_exists_ignoreopenbasedir($filename, $cached=true) {
+        static $open_basedirs = null;
+        static $file_exists_cache = array();
+        if (!$cached || !isset($file_exists_cache[$filename])) {
+            if (null === $open_basedirs) {
+                $open_basedirs = preg_split('#[;:]#', ini_get('open_basedir'));
+            }
+            if (empty($open_basedirs) || in_array(dirname($filename), $open_basedirs)) {
+                $file_exists_cache[$filename] = file_exists($filename);
+            } elseif ($this->iswindows) {
+                $ls_filename = trim(phpthumb_functions::SafeExec('dir /b '.phpthumb_functions::escapeshellarg_replacement($filename)));
+                $file_exists_cache[$filename] = ($ls_filename == basename($filename));  // command dir /b return only filename without path
+            } else {
+                $ls_filename = trim(phpthumb_functions::SafeExec('ls '.phpthumb_functions::escapeshellarg_replacement($filename)));
+                $file_exists_cache[$filename] = ($ls_filename == $filename);
+            }
+        }
+        return $file_exists_cache[$filename];
+    }
+
+
+    public function ImageMagickWhichConvert() {
+        static $WhichConvert = null;
+        if (null === $WhichConvert) {
+            if ($this->iswindows) {
+                $WhichConvert = false;
+            } else {
+                $IMwhichConvertCacheFilename = $this->config_cache_directory.DIRECTORY_SEPARATOR.'phpThumbCacheIMwhichConvert.txt';
+                if (($cachedwhichconvertstring = @file_get_contents($IMwhichConvertCacheFilename)) !== false) {
+                    $WhichConvert = $cachedwhichconvertstring;
+                } else {
+                    $WhichConvert = trim(phpthumb_functions::SafeExec('which convert'));
+                    @file_put_contents($IMwhichConvertCacheFilename, $WhichConvert);
+                    @chmod($IMwhichConvertCacheFilename, $this->getParameter('config_file_create_mask'));
+                }
+            }
+        }
+        return $WhichConvert;
+    }
+
+
+    public function ImageMagickCommandlineBase() {
+        static $commandline = null;
+        if (null === $commandline) {
+            if ($this->issafemode) {
+                $commandline = '';
+                return $commandline;
+            }
+
+            $IMcommandlineBaseCacheFilename = $this->config_cache_directory.DIRECTORY_SEPARATOR.'phpThumbCacheIMcommandlineBase.txt';
+            if (($commandline = @file_get_contents($IMcommandlineBaseCacheFilename)) !== false) {
+                return $commandline;
+            }
+
+            $commandline = (null !== $this->config_imagemagick_path ? $this->config_imagemagick_path : '');
+
+            if ($this->config_imagemagick_path && ($this->config_imagemagick_path != $this->realPathSafe($this->config_imagemagick_path))) {
+                if (@is_executable($this->realPathSafe($this->config_imagemagick_path))) {
+                    $this->DebugMessage('Changing $this->config_imagemagick_path ('.$this->config_imagemagick_path.') to $this->realPathSafe($this->config_imagemagick_path) ('.$this->realPathSafe($this->config_imagemagick_path).')', __FILE__, __LINE__);
+                    $this->config_imagemagick_path = $this->realPathSafe($this->config_imagemagick_path);
+                } else {
+                    $this->DebugMessage('Leaving $this->config_imagemagick_path as ('.$this->config_imagemagick_path.') because !is_execuatable($this->realPathSafe($this->config_imagemagick_path)) ('.$this->realPathSafe($this->config_imagemagick_path).')', __FILE__, __LINE__);
+                }
+            }
+            $this->DebugMessage('                  file_exists('.$this->config_imagemagick_path.') = '. (int) (@file_exists($this->config_imagemagick_path)), __FILE__, __LINE__);
+            $this->DebugMessage('file_exists_ignoreopenbasedir('.$this->config_imagemagick_path.') = '. (int) $this->file_exists_ignoreopenbasedir($this->config_imagemagick_path), __FILE__, __LINE__);
+            $this->DebugMessage('                      is_file('.$this->config_imagemagick_path.') = '. (int) (@is_file($this->config_imagemagick_path)), __FILE__, __LINE__);
+            $this->DebugMessage('                is_executable('.$this->config_imagemagick_path.') = '. (int) (@is_executable($this->config_imagemagick_path)), __FILE__, __LINE__);
+
+            if ($this->file_exists_ignoreopenbasedir($this->config_imagemagick_path)) {
+
+                $this->DebugMessage('using ImageMagick path from $this->config_imagemagick_path ('.$this->config_imagemagick_path.')', __FILE__, __LINE__);
+                if ($this->iswindows) {
+                    $commandline = substr($this->config_imagemagick_path, 0, 2).' && cd '.phpthumb_functions::escapeshellarg_replacement(str_replace('/', DIRECTORY_SEPARATOR, substr(dirname($this->config_imagemagick_path), 2))).' && '.phpthumb_functions::escapeshellarg_replacement(basename($this->config_imagemagick_path));
+                } else {
+                    $commandline = phpthumb_functions::escapeshellarg_replacement($this->config_imagemagick_path);
+                }
+
+            } else {
+
+                $which_convert = $this->ImageMagickWhichConvert();
+                $IMversion     = $this->ImageMagickVersion();
+
+                if ($which_convert && ($which_convert{0} == '/') && $this->file_exists_ignoreopenbasedir($which_convert)) {
+
+                    // `which convert` *should* return the path if "convert" exist, or nothing if it doesn't
+                    // other things *may* get returned, like "sh: convert: not found" or "no convert in /usr/local/bin /usr/sbin /usr/bin /usr/ccs/bin"
+                    // so only do this if the value returned exists as a file
+                    $this->DebugMessage('using ImageMagick path from `which convert` ('.$which_convert.')', __FILE__, __LINE__);
+                    $commandline = 'convert';
+
+                } elseif ($IMversion) {
+
+                    $this->DebugMessage('setting ImageMagick path to $this->config_imagemagick_path ('.$this->config_imagemagick_path.') ['.$IMversion.']', __FILE__, __LINE__);
+                    $commandline = $this->config_imagemagick_path;
+
+                } else {
+
+                    $this->DebugMessage('ImageMagickThumbnailToGD() aborting because cannot find convert in $this->config_imagemagick_path ('.$this->config_imagemagick_path.'), and `which convert` returned ('.$which_convert.')', __FILE__, __LINE__);
+                    $commandline = '';
+
+                }
+
+            }
+
+            @file_put_contents($IMcommandlineBaseCacheFilename, $commandline);
+            @chmod($IMcommandlineBaseCacheFilename, $this->getParameter('config_file_create_mask'));
+        }
+        return $commandline;
+    }
+
+
+    public function ImageMagickVersion($returnRAW=false) {
+        static $versionstring = null;
+        if (null === $versionstring) {
+            $versionstring = array(0=>false, 1=>false);
+
+            $IMversionCacheFilename = $this->config_cache_directory.DIRECTORY_SEPARATOR.'phpThumbCacheIMversion.txt';
+            if ($cachedversionstring = @file_get_contents($IMversionCacheFilename)) {
+
+                $versionstring = explode("\n", $cachedversionstring, 2);
+                $versionstring[0] = ($versionstring[0] ? $versionstring[0] : false); // "false" is stored as an empty string in the cache file
+                $versionstring[1] = ($versionstring[1] ? $versionstring[1] : false); // "false" is stored as an empty string in the cache file
+
+            } else {
+
+                $commandline = $this->ImageMagickCommandlineBase();
+                $commandline = (null !== $commandline ? $commandline : '');
+                if ($commandline) {
+                    $commandline .= ' --version';
+                    $this->DebugMessage('ImageMagick version checked with "'.$commandline.'"', __FILE__, __LINE__);
+                    $versionstring[1] = trim(phpthumb_functions::SafeExec($commandline));
+                    if (preg_match('#^Version: [^0-9]*([ 0-9\\.\\:Q/\\-]+)#i', $versionstring[1], $matches)) {
+                        $versionstring[0] = trim($matches[1]);
+                    } else {
+                        $versionstring[0] = false;
+                        $this->DebugMessage('ImageMagick did not return recognized version string ('.$versionstring[1].')', __FILE__, __LINE__);
+                    }
+                    $this->DebugMessage('ImageMagick convert --version says "'.@$matches[0].'"', __FILE__, __LINE__);
+                }
+
+                @file_put_contents($IMversionCacheFilename, $versionstring[0]."\n".$versionstring[1]);
+                @chmod($IMversionCacheFilename, $this->getParameter('config_file_create_mask'));
+
+            }
+        }
+        return $versionstring[ (int) $returnRAW ];
+    }
+
+
+    public function ImageMagickSwitchAvailable($switchname) {
+        static $IMoptions = null;
+        if (null === $IMoptions) {
+            $IMoptions = array();
+            $commandline = $this->ImageMagickCommandlineBase();
+            if (null !== $commandline) {
+                $commandline .= ' -help';
+                $IMhelp_lines = explode("\n", phpthumb_functions::SafeExec($commandline));
+                foreach ($IMhelp_lines as $line) {
+                    if (preg_match('#^[\\+\\-]([a-z\\-]+) #', trim($line), $matches)) {
+                        $IMoptions[$matches[1]] = true;
+                    }
+                }
+            }
+        }
+        if (is_array($switchname)) {
+            $allOK = true;
+            foreach ($switchname as $key => $value) {
+                if (!isset($IMoptions[$value])) {
+                    $allOK = false;
+                    break;
+                }
+            }
+            $this->DebugMessage('ImageMagickSwitchAvailable('.implode(';', $switchname).') = '. (int) $allOK .'', __FILE__, __LINE__);
+        } else {
+            $allOK = isset($IMoptions[$switchname]);
+            $this->DebugMessage('ImageMagickSwitchAvailable('.$switchname.') = '. (int) $allOK .'', __FILE__, __LINE__);
+        }
+        return $allOK;
+    }
+
+
+    public function ImageMagickFormatsList() {
+        static $IMformatsList = null;
+        if (null === $IMformatsList) {
+            $IMformatsList = '';
+            $commandline = $this->ImageMagickCommandlineBase();
+            if (null !== $commandline) {
+                $commandline = dirname($commandline).DIRECTORY_SEPARATOR.str_replace('convert', 'identify', basename($commandline));
+                $commandline .= ' -list format';
+                $IMformatsList = phpthumb_functions::SafeExec($commandline);
+            }
+        }
+        return $IMformatsList;
+    }
+
+
+    public function SourceDataToTempFile() {
+        if ($IMtempSourceFilename = $this->phpThumb_tempnam()) {
+            $IMtempSourceFilename = $this->realPathSafe($IMtempSourceFilename);
+            ob_start();
+            $fp_tempfile = fopen($IMtempSourceFilename, 'wb');
+            $tempfile_open_error  = ob_get_contents();
+            ob_end_clean();
+            if ($fp_tempfile) {
+                fwrite($fp_tempfile, $this->rawImageData);
+                fclose($fp_tempfile);
+                @chmod($IMtempSourceFilename, $this->getParameter('config_file_create_mask'));
+                $this->sourceFilename = $IMtempSourceFilename;
+                $this->DebugMessage('ImageMagickThumbnailToGD() setting $this->sourceFilename to "'.$IMtempSourceFilename.'" from $this->rawImageData ('.strlen($this->rawImageData).' bytes)', __FILE__, __LINE__);
+            } else {
+                $this->DebugMessage('ImageMagickThumbnailToGD() FAILED setting $this->sourceFilename to "'.$IMtempSourceFilename.'" (failed to open for writing: "'.$tempfile_open_error.'")', __FILE__, __LINE__);
+            }
+            unset($tempfile_open_error, $IMtempSourceFilename);
+            return true;
+        }
+        $this->DebugMessage('SourceDataToTempFile() FAILED because $this->phpThumb_tempnam() failed', __FILE__, __LINE__);
+        return false;
+    }
+
+
+    public function ImageMagickThumbnailToGD() {
+        // http://www.imagemagick.org/script/command-line-options.php
+
+        $this->useRawIMoutput = true;
+        if (phpthumb_functions::gd_version()) {
+            // if GD is not available, must use whatever ImageMagick can output
+
+            // $UnAllowedParameters contains options that can only be processed in GD, not ImageMagick
+            // note: 'fltr' *may* need to be processed by GD, but we'll check that in more detail below
+            $UnAllowedParameters = array('xto', 'ar', 'bg', 'bc');
+            // 'ra' may be part of this list, if not a multiple of 90 degrees
+            foreach ($UnAllowedParameters as $parameter) {
+                if (isset($this->$parameter)) {
+                    $this->DebugMessage('$this->useRawIMoutput=false because "'.$parameter.'" is set', __FILE__, __LINE__);
+                    $this->useRawIMoutput = false;
+                    break;
+                }
+            }
+        }
+        $this->DebugMessage('$this->useRawIMoutput='.($this->useRawIMoutput ? 'true' : 'false').' after checking $UnAllowedParameters', __FILE__, __LINE__);
+        $ImageCreateFunction = '';
+        $outputFormat = $this->thumbnailFormat;
+        if (phpthumb_functions::gd_version()) {
+            if ($this->useRawIMoutput) {
+                switch ($this->thumbnailFormat) {
+                    case 'gif':
+                        $ImageCreateFunction = 'imagecreatefromgif';
+                        $this->is_alpha = true;
+                        break;
+                    case 'png':
+                        $ImageCreateFunction = 'imagecreatefrompng';
+                        $this->is_alpha = true;
+                        break;
+                    case 'jpg':
+                    case 'jpeg':
+                        $ImageCreateFunction = 'imagecreatefromjpeg';
+                        break;
+                    default:
+                        $this->DebugMessage('Forcing output to PNG because $this->thumbnailFormat ('.$this->thumbnailFormat.' is not a GD-supported format)', __FILE__, __LINE__);
+                        $outputFormat = 'png';
+                        $ImageCreateFunction = 'imagecreatefrompng';
+                        $this->is_alpha = true;
+                        $this->useRawIMoutput = false;
+                        break;
+                }
+                if (!function_exists(@$ImageCreateFunction)) {
+                    // ImageMagickThumbnailToGD() depends on imagecreatefrompng/imagecreatefromgif
+                    //$this->DebugMessage('ImageMagickThumbnailToGD() aborting because '.@$ImageCreateFunction.'() is not available', __FILE__, __LINE__);
+                    $this->useRawIMoutput = true;
+                    //return false;
+                }
+            } else {
+                $outputFormat = 'png';
+                $ImageCreateFunction = 'imagecreatefrompng';
+                $this->is_alpha = true;
+                $this->useRawIMoutput = false;
+            }
+        }
+
+        // http://freealter.org/doc_distrib/ImageMagick-5.1.1/www/convert.html
+        if (!$this->sourceFilename && $this->rawImageData) {
+            $this->SourceDataToTempFile();
+        }
+        if (!$this->sourceFilename) {
+            $this->DebugMessage('ImageMagickThumbnailToGD() aborting because $this->sourceFilename is empty', __FILE__, __LINE__);
+            $this->useRawIMoutput = false;
+            return false;
+        }
+        if ($this->issafemode) {
+            $this->DebugMessage('ImageMagickThumbnailToGD() aborting because safe_mode is enabled', __FILE__, __LINE__);
+            $this->useRawIMoutput = false;
+            return false;
+        }
 // TO BE FIXED
 //if (true) {
 //	$this->DebugMessage('ImageMagickThumbnailToGD() aborting it is broken right now', __FILE__, __LINE__);
@@ -1653,2741 +1653,2741 @@ 
 //	return false;
 //}
 
-		$commandline = $this->ImageMagickCommandlineBase();
-		if ($commandline) {
-			$commandline .= ' '.phpthumb_functions::escapeshellarg_replacement(preg_replace('#[/\\\\]#', DIRECTORY_SEPARATOR, $this->sourceFilename).(($outputFormat == 'gif') ? '' : '['. (int) $this->sfn .']')); // [0] means first frame of (GIF) animation, can be ignored
-			if ($IMtempfilename = $this->phpThumb_tempnam()) {
-				$IMtempfilename = $this->realPathSafe($IMtempfilename);
-
-				$IMuseExplicitImageOutputDimensions = false;
-				if ($this->ImageMagickSwitchAvailable('thumbnail') && $this->config_imagemagick_use_thumbnail) {
-					$IMresizeParameter = 'thumbnail';
-				} else {
-					$IMresizeParameter = 'resize';
-
-					// some (older? around 2002) versions of IM won't accept "-resize 100x" but require "-resize 100x100"
-					$commandline_test = $this->ImageMagickCommandlineBase().' logo: -resize 1x '.phpthumb_functions::escapeshellarg_replacement($IMtempfilename).' 2>&1';
-					$IMresult_test = phpthumb_functions::SafeExec($commandline_test);
-					$IMuseExplicitImageOutputDimensions = preg_match('#image dimensions are zero#i', $IMresult_test);
-					$this->DebugMessage('IMuseExplicitImageOutputDimensions = '. (int) $IMuseExplicitImageOutputDimensions, __FILE__, __LINE__);
-					if ($fp_im_temp = @fopen($IMtempfilename, 'wb')) {
-						// erase temp image so ImageMagick logo doesn't get output if other processing fails
-						fclose($fp_im_temp);
-						@chmod($IMtempfilename, $this->getParameter('config_file_create_mask'));
-					}
-				}
-
-
-				ob_start();
-				$getimagesize = getimagesize($this->sourceFilename);
-				$GetImageSizeError = ob_get_contents();
-				ob_end_clean();
-				if (is_array($getimagesize)) {
-					$this->DebugMessage('getimagesize('.$this->sourceFilename.') SUCCEEDED: '.print_r($getimagesize, true), __FILE__, __LINE__);
-				} else {
-					$this->DebugMessage('getimagesize('.$this->sourceFilename.') FAILED with error "'.$GetImageSizeError.'"', __FILE__, __LINE__);
-				}
-				if (null !== $this->dpi && $this->ImageMagickSwitchAvailable('density')) {
-					// for vector source formats only (WMF, PDF, etc)
-					if (is_array($getimagesize) && isset($getimagesize[2]) && ($getimagesize[2] == IMAGETYPE_PNG)) {
-						// explicitly exclude PNG from "-flatten" to make sure transparency is preserved
-						// https://github.com/JamesHeinrich/phpThumb/issues/65
-					} else {
-						$commandline .= ' -flatten';
-						$commandline .= ' -density '.phpthumb_functions::escapeshellarg_replacement($this->dpi);
-					}
-				}
-				if (is_array($getimagesize)) {
-					$this->DebugMessage('getimagesize('.$this->sourceFilename.') returned [w='.$getimagesize[0].';h='.$getimagesize[1].';f='.$getimagesize[2].']', __FILE__, __LINE__);
-					$this->source_width  = $getimagesize[0];
-					$this->source_height = $getimagesize[1];
-					$this->DebugMessage('source dimensions set to '.$this->source_width.'x'.$this->source_height, __FILE__, __LINE__);
-					$this->SetOrientationDependantWidthHeight();
-
-					if (!preg_match('#('.implode('|', $this->AlphaCapableFormats).')#i', $outputFormat)) {
-						// not a transparency-capable format
-						$commandline .= ' -background '.phpthumb_functions::escapeshellarg_replacement('#'.($this->bg ? $this->bg : 'FFFFFF'));
-						if ($getimagesize[2] == IMAGETYPE_GIF) {
-							$commandline .= ' -flatten';
-						}
-					} else {
-						if ($getimagesize[2] == IMAGETYPE_PNG && !$this->bg) {
-							$commandline .= ' -background none';
-						}
-					}
-					if ($getimagesize[2] == IMAGETYPE_GIF) {
-						$commandline .= ' -coalesce'; // may be needed for animated GIFs
-					}
-					if ($this->source_width || $this->source_height) {
-						if ($this->zc) {
-
-							$borderThickness = 0;
-							if (!empty($this->fltr)) {
-								foreach ($this->fltr as $key => $value) {
-									if (preg_match('#^bord\|([0-9]+)#', $value, $matches)) {
-										$borderThickness = $matches[1];
-										break;
-									}
-								}
-							}
-							$wAll = (int) max($this->w, $this->wp, $this->wl, $this->ws) - (2 * $borderThickness);
-							$hAll = (int) max($this->h, $this->hp, $this->hl, $this->hs) - (2 * $borderThickness);
-							$imAR = $this->source_width / $this->source_height;
-							$zcAR = (($wAll && $hAll) ? $wAll / $hAll : 1);
-							$side  = phpthumb_functions::nonempty_min($this->source_width, $this->source_height, max($wAll, $hAll));
-							$sideX = phpthumb_functions::nonempty_min($this->source_width,                       $wAll, round($hAll * $zcAR));
-							$sideY = phpthumb_functions::nonempty_min(                     $this->source_height, $hAll, round($wAll / $zcAR));
-
-							$thumbnailH = round(max($sideY, ($sideY * $zcAR) / $imAR));
-							if ($this->aoe == 1) {
-								$commandline .= ' -'.$IMresizeParameter.' "'.$wAll.'x'.$hAll.'^"';
-							} else {
-								$commandline .= ' -'.$IMresizeParameter.' '.phpthumb_functions::escapeshellarg_replacement(($IMuseExplicitImageOutputDimensions ? $thumbnailH : '').'x'.$thumbnailH);
-							}
-
-							switch (strtoupper($this->zc)) {
-								case 'T':
-									$commandline .= ' -gravity north';
-									break;
-								case 'B':
-									$commandline .= ' -gravity south';
-									break;
-								case 'L':
-									$commandline .= ' -gravity west';
-									break;
-								case 'R':
-									$commandline .= ' -gravity east';
-									break;
-								case 'TL':
-									$commandline .= ' -gravity northwest';
-									break;
-								case 'TR':
-									$commandline .= ' -gravity northeast';
-									break;
-								case 'BL':
-									$commandline .= ' -gravity southwest';
-									break;
-								case 'BR':
-									$commandline .= ' -gravity southeast';
-									break;
-								case '1':
-								case 'C':
-								default:
-									$commandline .= ' -gravity center';
-									break;
-							}
-
-							if (($wAll > 0) && ($hAll > 0)) {
-								$commandline .= ' -crop '.phpthumb_functions::escapeshellarg_replacement($wAll.'x'.$hAll.'+0+0');
-							} else {
-								$commandline .= ' -crop '.phpthumb_functions::escapeshellarg_replacement($side.'x'.$side.'+0+0');
-							}
-							if ($this->ImageMagickSwitchAvailable('repage')) {
-								$commandline .= ' +repage';
-							} else {
-								$this->DebugMessage('Skipping "+repage" because ImageMagick (v'.$this->ImageMagickVersion().') does not support it', __FILE__, __LINE__);
-							}
-
-						} elseif ($this->sw || $this->sh || $this->sx || $this->sy) {
-
-							$crop_param   = '';
-							$crop_param  .=     ($this->sw ? (($this->sw < 2) ? round($this->sw * $this->source_width)  : $this->sw) : $this->source_width);
-							$crop_param  .= 'x'.($this->sh ? (($this->sh < 2) ? round($this->sh * $this->source_height) : $this->sh) : $this->source_height);
-							$crop_param  .= '+'.(($this->sx < 2) ? round($this->sx * $this->source_width)  : $this->sx);
-							$crop_param  .= '+'.(($this->sy < 2) ? round($this->sy * $this->source_height) : $this->sy);
+        $commandline = $this->ImageMagickCommandlineBase();
+        if ($commandline) {
+            $commandline .= ' '.phpthumb_functions::escapeshellarg_replacement(preg_replace('#[/\\\\]#', DIRECTORY_SEPARATOR, $this->sourceFilename).(($outputFormat == 'gif') ? '' : '['. (int) $this->sfn .']')); // [0] means first frame of (GIF) animation, can be ignored
+            if ($IMtempfilename = $this->phpThumb_tempnam()) {
+                $IMtempfilename = $this->realPathSafe($IMtempfilename);
+
+                $IMuseExplicitImageOutputDimensions = false;
+                if ($this->ImageMagickSwitchAvailable('thumbnail') && $this->config_imagemagick_use_thumbnail) {
+                    $IMresizeParameter = 'thumbnail';
+                } else {
+                    $IMresizeParameter = 'resize';
+
+                    // some (older? around 2002) versions of IM won't accept "-resize 100x" but require "-resize 100x100"
+                    $commandline_test = $this->ImageMagickCommandlineBase().' logo: -resize 1x '.phpthumb_functions::escapeshellarg_replacement($IMtempfilename).' 2>&1';
+                    $IMresult_test = phpthumb_functions::SafeExec($commandline_test);
+                    $IMuseExplicitImageOutputDimensions = preg_match('#image dimensions are zero#i', $IMresult_test);
+                    $this->DebugMessage('IMuseExplicitImageOutputDimensions = '. (int) $IMuseExplicitImageOutputDimensions, __FILE__, __LINE__);
+                    if ($fp_im_temp = @fopen($IMtempfilename, 'wb')) {
+                        // erase temp image so ImageMagick logo doesn't get output if other processing fails
+                        fclose($fp_im_temp);
+                        @chmod($IMtempfilename, $this->getParameter('config_file_create_mask'));
+                    }
+                }
+
+
+                ob_start();
+                $getimagesize = getimagesize($this->sourceFilename);
+                $GetImageSizeError = ob_get_contents();
+                ob_end_clean();
+                if (is_array($getimagesize)) {
+                    $this->DebugMessage('getimagesize('.$this->sourceFilename.') SUCCEEDED: '.print_r($getimagesize, true), __FILE__, __LINE__);
+                } else {
+                    $this->DebugMessage('getimagesize('.$this->sourceFilename.') FAILED with error "'.$GetImageSizeError.'"', __FILE__, __LINE__);
+                }
+                if (null !== $this->dpi && $this->ImageMagickSwitchAvailable('density')) {
+                    // for vector source formats only (WMF, PDF, etc)
+                    if (is_array($getimagesize) && isset($getimagesize[2]) && ($getimagesize[2] == IMAGETYPE_PNG)) {
+                        // explicitly exclude PNG from "-flatten" to make sure transparency is preserved
+                        // https://github.com/JamesHeinrich/phpThumb/issues/65
+                    } else {
+                        $commandline .= ' -flatten';
+                        $commandline .= ' -density '.phpthumb_functions::escapeshellarg_replacement($this->dpi);
+                    }
+                }
+                if (is_array($getimagesize)) {
+                    $this->DebugMessage('getimagesize('.$this->sourceFilename.') returned [w='.$getimagesize[0].';h='.$getimagesize[1].';f='.$getimagesize[2].']', __FILE__, __LINE__);
+                    $this->source_width  = $getimagesize[0];
+                    $this->source_height = $getimagesize[1];
+                    $this->DebugMessage('source dimensions set to '.$this->source_width.'x'.$this->source_height, __FILE__, __LINE__);
+                    $this->SetOrientationDependantWidthHeight();
+
+                    if (!preg_match('#('.implode('|', $this->AlphaCapableFormats).')#i', $outputFormat)) {
+                        // not a transparency-capable format
+                        $commandline .= ' -background '.phpthumb_functions::escapeshellarg_replacement('#'.($this->bg ? $this->bg : 'FFFFFF'));
+                        if ($getimagesize[2] == IMAGETYPE_GIF) {
+                            $commandline .= ' -flatten';
+                        }
+                    } else {
+                        if ($getimagesize[2] == IMAGETYPE_PNG && !$this->bg) {
+                            $commandline .= ' -background none';
+                        }
+                    }
+                    if ($getimagesize[2] == IMAGETYPE_GIF) {
+                        $commandline .= ' -coalesce'; // may be needed for animated GIFs
+                    }
+                    if ($this->source_width || $this->source_height) {
+                        if ($this->zc) {
+
+                            $borderThickness = 0;
+                            if (!empty($this->fltr)) {
+                                foreach ($this->fltr as $key => $value) {
+                                    if (preg_match('#^bord\|([0-9]+)#', $value, $matches)) {
+                                        $borderThickness = $matches[1];
+                                        break;
+                                    }
+                                }
+                            }
+                            $wAll = (int) max($this->w, $this->wp, $this->wl, $this->ws) - (2 * $borderThickness);
+                            $hAll = (int) max($this->h, $this->hp, $this->hl, $this->hs) - (2 * $borderThickness);
+                            $imAR = $this->source_width / $this->source_height;
+                            $zcAR = (($wAll && $hAll) ? $wAll / $hAll : 1);
+                            $side  = phpthumb_functions::nonempty_min($this->source_width, $this->source_height, max($wAll, $hAll));
+                            $sideX = phpthumb_functions::nonempty_min($this->source_width,                       $wAll, round($hAll * $zcAR));
+                            $sideY = phpthumb_functions::nonempty_min(                     $this->source_height, $hAll, round($wAll / $zcAR));
+
+                            $thumbnailH = round(max($sideY, ($sideY * $zcAR) / $imAR));
+                            if ($this->aoe == 1) {
+                                $commandline .= ' -'.$IMresizeParameter.' "'.$wAll.'x'.$hAll.'^"';
+                            } else {
+                                $commandline .= ' -'.$IMresizeParameter.' '.phpthumb_functions::escapeshellarg_replacement(($IMuseExplicitImageOutputDimensions ? $thumbnailH : '').'x'.$thumbnailH);
+                            }
+
+                            switch (strtoupper($this->zc)) {
+                                case 'T':
+                                    $commandline .= ' -gravity north';
+                                    break;
+                                case 'B':
+                                    $commandline .= ' -gravity south';
+                                    break;
+                                case 'L':
+                                    $commandline .= ' -gravity west';
+                                    break;
+                                case 'R':
+                                    $commandline .= ' -gravity east';
+                                    break;
+                                case 'TL':
+                                    $commandline .= ' -gravity northwest';
+                                    break;
+                                case 'TR':
+                                    $commandline .= ' -gravity northeast';
+                                    break;
+                                case 'BL':
+                                    $commandline .= ' -gravity southwest';
+                                    break;
+                                case 'BR':
+                                    $commandline .= ' -gravity southeast';
+                                    break;
+                                case '1':
+                                case 'C':
+                                default:
+                                    $commandline .= ' -gravity center';
+                                    break;
+                            }
+
+                            if (($wAll > 0) && ($hAll > 0)) {
+                                $commandline .= ' -crop '.phpthumb_functions::escapeshellarg_replacement($wAll.'x'.$hAll.'+0+0');
+                            } else {
+                                $commandline .= ' -crop '.phpthumb_functions::escapeshellarg_replacement($side.'x'.$side.'+0+0');
+                            }
+                            if ($this->ImageMagickSwitchAvailable('repage')) {
+                                $commandline .= ' +repage';
+                            } else {
+                                $this->DebugMessage('Skipping "+repage" because ImageMagick (v'.$this->ImageMagickVersion().') does not support it', __FILE__, __LINE__);
+                            }
+
+                        } elseif ($this->sw || $this->sh || $this->sx || $this->sy) {
+
+                            $crop_param   = '';
+                            $crop_param  .=     ($this->sw ? (($this->sw < 2) ? round($this->sw * $this->source_width)  : $this->sw) : $this->source_width);
+                            $crop_param  .= 'x'.($this->sh ? (($this->sh < 2) ? round($this->sh * $this->source_height) : $this->sh) : $this->source_height);
+                            $crop_param  .= '+'.(($this->sx < 2) ? round($this->sx * $this->source_width)  : $this->sx);
+                            $crop_param  .= '+'.(($this->sy < 2) ? round($this->sy * $this->source_height) : $this->sy);
 // TO BE FIXED
 // makes 1x1 output
 // http://trainspotted.com/phpThumb/phpThumb.php?src=/content/CNR/47/CNR-4728-LD-L-20110723-898.jpg&w=100&h=100&far=1&f=png&fltr[]=lvl&sx=0.05&sy=0.25&sw=0.92&sh=0.42
 // '/usr/bin/convert' -density 150 -thumbnail 100x100 -contrast-stretch '0.1%' '/var/www/vhosts/trainspotted.com/httpdocs/content/CNR/47/CNR-4728-LD-L-20110723-898.jpg[0]' png:'/var/www/vhosts/trainspotted.com/httpdocs/phpThumb/_cache/pThumbIIUlvj'
-							$commandline .= ' -crop '.phpthumb_functions::escapeshellarg_replacement($crop_param);
+                            $commandline .= ' -crop '.phpthumb_functions::escapeshellarg_replacement($crop_param);
 
-							// this is broken for aoe=1, but unsure how to fix. Send advice to info@silisoftware.com
-							if ($this->w || $this->h) {
-								//if ($this->ImageMagickSwitchAvailable('repage')) {
+                            // this is broken for aoe=1, but unsure how to fix. Send advice to info@silisoftware.com
+                            if ($this->w || $this->h) {
+                                //if ($this->ImageMagickSwitchAvailable('repage')) {
 if (false) {
 // TO BE FIXED
 // newer versions of ImageMagick require -repage <geometry>
-									$commandline .= ' -repage';
-								} else {
-									$this->DebugMessage('Skipping "-repage" because ImageMagick (v'.$this->ImageMagickVersion().') does not support it', __FILE__, __LINE__);
-								}
-								if ($IMuseExplicitImageOutputDimensions) {
-									if ($this->w && !$this->h) {
-										$this->h = ceil($this->w / ($this->source_width / $this->source_height));
-									} elseif ($this->h && !$this->w) {
-										$this->w = ceil($this->h * ($this->source_width / $this->source_height));
-									}
-								}
-								$commandline .= ' -'.$IMresizeParameter.' '.phpthumb_functions::escapeshellarg_replacement($this->w.'x'.$this->h);
-							}
-
-						} else {
-
-							if ($this->iar && ((int) $this->w > 0) && ((int) $this->h > 0)) {
-
-								list($nw, $nh) = phpthumb_functions::TranslateWHbyAngle($this->w, $this->h, $this->ra);
-								$nw = ((round($nw) != 0) ? round($nw) : '');
-								$nh = ((round($nh) != 0) ? round($nh) : '');
-								$commandline .= ' -'.$IMresizeParameter.' '.phpthumb_functions::escapeshellarg_replacement($nw.'x'.$nh.'!');
-
-							} elseif ($this->far && ((int) $this->w > 0) && ((int) $this->h > 0)) {
-
-								$commandline .= ' -'.$IMresizeParameter.' '.phpthumb_functions::escapeshellarg_replacement(phpthumb_functions::nonempty_min($this->w, $getimagesize[0]).'x'.phpthumb_functions::nonempty_min($this->h, $getimagesize[1]));
-								$commandline .= ' -gravity center';
-								$commandline .= ' -background '.phpthumb_functions::escapeshellarg_replacement('#'.$this->bg);
-								$commandline .= ' -extent '.phpthumb_functions::escapeshellarg_replacement($this->w.'x'.$this->h);
-
-							} else {
-
-								$this->w = (($this->aoe && $this->w) ? $this->w : ($this->w ? phpthumb_functions::nonempty_min($this->w, $getimagesize[0]) : ''));
-								$this->h = (($this->aoe && $this->h) ? $this->h : ($this->h ? phpthumb_functions::nonempty_min($this->h, $getimagesize[1]) : ''));
-								if ($this->w || $this->h) {
-									if ($IMuseExplicitImageOutputDimensions) {
-										if ($this->w && !$this->h) {
-											$this->h = ceil($this->w / ($this->source_width / $this->source_height));
-										} elseif ($this->h && !$this->w) {
-											$this->w = ceil($this->h * ($this->source_width / $this->source_height));
-										}
-									}
-									list($nw, $nh) = phpthumb_functions::TranslateWHbyAngle($this->w, $this->h, $this->ra);
-									$nw = ((round($nw) != 0) ? round($nw) : '');
-									$nh = ((round($nh) != 0) ? round($nh) : '');
-									$commandline .= ' -'.$IMresizeParameter.' '.phpthumb_functions::escapeshellarg_replacement($nw.'x'.$nh);
-								}
-
-							}
-						}
-					}
-
-				} else {
-
-					$this->DebugMessage('getimagesize('.$this->sourceFilename.') failed', __FILE__, __LINE__);
-					if ($this->w || $this->h) {
-						$exactDimensionsBang = (($this->iar && ((int) $this->w > 0) && ((int) $this->h > 0)) ? '!' : '');
-						if ($IMuseExplicitImageOutputDimensions) {
-							// unknown source aspect ratio, just put large number and hope IM figures it out
-							$commandline .= ' -'.$IMresizeParameter.' '.phpthumb_functions::escapeshellarg_replacement(($this->w ? $this->w : '9999').'x'.($this->h ? $this->h : '9999').$exactDimensionsBang);
-						} else {
-							$commandline .= ' -'.$IMresizeParameter.' '.phpthumb_functions::escapeshellarg_replacement($this->w.'x'.$this->h.$exactDimensionsBang);
-						}
-					}
-
-				}
-
-				if ($this->ra) {
-					$this->ra = (int) $this->ra;
-					if ($this->ImageMagickSwitchAvailable('rotate')) {
-						if (!preg_match('#('.implode('|', $this->AlphaCapableFormats).')#i', $outputFormat) || phpthumb_functions::version_compare_replacement($this->ImageMagickVersion(), '6.3.7', '>=')) {
-							$this->DebugMessage('Using ImageMagick rotate', __FILE__, __LINE__);
-							$commandline .= ' -rotate '.phpthumb_functions::escapeshellarg_replacement($this->ra);
-							if (($this->ra % 90) != 0) {
-								if (preg_match('#('.implode('|', $this->AlphaCapableFormats).')#i', $outputFormat)) {
-									// alpha-capable format
-									$commandline .= ' -background rgba(255,255,255,0)';
-								} else {
-									$commandline .= ' -background '.phpthumb_functions::escapeshellarg_replacement('#'.($this->bg ? $this->bg : 'FFFFFF'));
-								}
-							}
-							$this->ra = 0;
-						} else {
-							$this->DebugMessage('Not using ImageMagick rotate because alpha background buggy before v6.3.7', __FILE__, __LINE__);
-						}
-					} else {
-						$this->DebugMessage('Not using ImageMagick rotate because not supported', __FILE__, __LINE__);
-					}
-				}
-
-				$successfullyProcessedFilters = array();
-				foreach ($this->fltr as $filterkey => $filtercommand) {
-					@list($command, $parameter) = explode('|', $filtercommand, 2);
-					switch ($command) {
-						case 'brit':
-							if ($this->ImageMagickSwitchAvailable('modulate')) {
-								$commandline .= ' -modulate '.phpthumb_functions::escapeshellarg_replacement((100 + (int) $parameter).',100,100');
-								$successfullyProcessedFilters[] = $filterkey;
-							}
-							break;
-
-						case 'cont':
-							if ($this->ImageMagickSwitchAvailable('contrast')) {
-								$contDiv10 = round((int) $parameter / 10);
-								if ($contDiv10 > 0) {
-									$contDiv10 = min($contDiv10, 100);
-									for ($i = 0; $i < $contDiv10; $i++) {
-										$commandline .= ' -contrast'; // increase contrast by 10%
-									}
-								} elseif ($contDiv10 < 0) {
-									$contDiv10 = max($contDiv10, -100);
-									for ($i = $contDiv10; $i < 0; $i++) {
-										$commandline .= ' +contrast'; // decrease contrast by 10%
-									}
-								} else {
-									// do nothing
-								}
-								$successfullyProcessedFilters[] = $filterkey;
-							}
-							break;
-
-						case 'ds':
-							if ($this->ImageMagickSwitchAvailable(array('colorspace', 'modulate'))) {
-								if ($parameter == 100) {
-									$commandline .= ' -colorspace GRAY';
-									$commandline .= ' -modulate 100,0,100';
-								} else {
-									$commandline .= ' -modulate '.phpthumb_functions::escapeshellarg_replacement('100,'.(100 - (int) $parameter).',100');
-								}
-								$successfullyProcessedFilters[] = $filterkey;
-							}
-							break;
-
-						case 'sat':
-							if ($this->ImageMagickSwitchAvailable(array('colorspace', 'modulate'))) {
-								if ($parameter == -100) {
-									$commandline .= ' -colorspace GRAY';
-									$commandline .= ' -modulate 100,0,100';
-								} else {
-									$commandline .= ' -modulate '.phpthumb_functions::escapeshellarg_replacement('100,'.(100 + (int) $parameter).',100');
-								}
-								$successfullyProcessedFilters[] = $filterkey;
-							}
-							break;
-
-						case 'gray':
-							if ($this->ImageMagickSwitchAvailable(array('colorspace', 'modulate'))) {
-								$commandline .= ' -colorspace GRAY';
-								$commandline .= ' -modulate 100,0,100';
-								$successfullyProcessedFilters[] = $filterkey;
-							}
-							break;
-
-						case 'clr':
-							if ($this->ImageMagickSwitchAvailable(array('fill', 'colorize'))) {
-								@list($amount, $color) = explode('|', $parameter);
-								$commandline .= ' -fill '.phpthumb_functions::escapeshellarg_replacement('#'.preg_replace('#[^0-9A-F]#i', '', $color));
-								$commandline .= ' -colorize '.phpthumb_functions::escapeshellarg_replacement(min(max((int) $amount, 0), 100));
-							}
-							break;
-
-						case 'sep':
-							if ($this->ImageMagickSwitchAvailable('sepia-tone')) {
-								@list($amount, $color) = explode('|', $parameter);
-								$amount = ($amount ? $amount : 80);
-								if (!$color) {
-									$commandline .= ' -sepia-tone '.phpthumb_functions::escapeshellarg_replacement(min(max((int) $amount, 0), 100).'%');
-									$successfullyProcessedFilters[] = $filterkey;
-								}
-							}
-							break;
-
-						case 'gam':
-							@list($amount) = explode('|', $parameter);
-							$amount = min(max((float) $amount, 0.001), 10);
-							if (number_format($amount, 3) != '1.000') {
-								if ($this->ImageMagickSwitchAvailable('gamma')) {
-									$commandline .= ' -gamma '.phpthumb_functions::escapeshellarg_replacement($amount);
-									$successfullyProcessedFilters[] = $filterkey;
-								}
-							}
-							break;
-
-						case 'neg':
-							if ($this->ImageMagickSwitchAvailable('negate')) {
-								$commandline .= ' -negate';
-								$successfullyProcessedFilters[] = $filterkey;
-							}
-							break;
-
-						case 'th':
-							@list($amount) = explode('|', $parameter);
-							if ($this->ImageMagickSwitchAvailable(array('threshold', 'dither', 'monochrome'))) {
-								$commandline .= ' -threshold '.phpthumb_functions::escapeshellarg_replacement(round(min(max((int) $amount, 0), 255) / 2.55).'%');
-								$commandline .= ' -dither';
-								$commandline .= ' -monochrome';
-								$successfullyProcessedFilters[] = $filterkey;
-							}
-							break;
-
-						case 'rcd':
-							if ($this->ImageMagickSwitchAvailable(array('colors', 'dither'))) {
-								@list($colors, $dither) = explode('|', $parameter);
-								$colors = ($colors                ?  (int) $colors : 256);
-								$dither  = ((strlen($dither) > 0) ? (bool) $dither : true);
-								$commandline .= ' -colors '.phpthumb_functions::escapeshellarg_replacement(max($colors, 8)); // ImageMagick will otherwise fail with "cannot quantize to fewer than 8 colors"
-								$commandline .= ($dither ? ' -dither' : ' +dither');
-								$successfullyProcessedFilters[] = $filterkey;
-							}
-							break;
-
-						case 'flip':
-							if ($this->ImageMagickSwitchAvailable(array('flip', 'flop'))) {
-								if (strpos(strtolower($parameter), 'x') !== false) {
-									$commandline .= ' -flop';
-								}
-								if (strpos(strtolower($parameter), 'y') !== false) {
-									$commandline .= ' -flip';
-								}
-								$successfullyProcessedFilters[] = $filterkey;
-							}
-							break;
-
-						case 'edge':
-							if ($this->ImageMagickSwitchAvailable('edge')) {
-								$parameter = (!empty($parameter) ? $parameter : 2);
-								$commandline .= ' -edge '.phpthumb_functions::escapeshellarg_replacement(!empty($parameter) ? (int) $parameter : 1);
-								$successfullyProcessedFilters[] = $filterkey;
-							}
-							break;
-
-						case 'emb':
-							if ($this->ImageMagickSwitchAvailable(array('emboss', 'negate'))) {
-								$parameter = (!empty($parameter) ? $parameter : 2);
-								$commandline .= ' -emboss '.phpthumb_functions::escapeshellarg_replacement((int) $parameter);
-								if ($parameter < 2) {
-									$commandline .= ' -negate'; // ImageMagick negates the image for some reason with '-emboss 1';
-								}
-								$successfullyProcessedFilters[] = $filterkey;
-							}
-							break;
-
-						case 'lvl':
-							@list($band, $method, $threshold) = explode('|', $parameter);
-							$band      = ($band ? preg_replace('#[^RGBA\\*]#', '', strtoupper($band))       : '*');
-							$method    = ((strlen($method) > 0)    ? (int) $method :   2);
-							$threshold = ((strlen($threshold) > 0) ? min(max((float) $threshold, 0), 100) : 0.1);
-
-							$band = preg_replace('#[^RGBA\\*]#', '', strtoupper($band));
-
-							if (($method > 1) && !$this->ImageMagickSwitchAvailable(array('channel', 'contrast-stretch'))) {
-								// Because ImageMagick processing happens before PHP-GD filters, and because some
-								// clipping is involved in the "lvl" filter, if "lvl" happens before "wb" then the
-								// "wb" filter will have (almost) no effect. Therefore, if "wb" is enabled then
-								// force the "lvl" filter to be processed by GD, not ImageMagick.
-								foreach ($this->fltr as $fltr_key => $fltr_value) {
-									list($fltr_cmd) = explode('|', $fltr_value);
-									if ($fltr_cmd == 'wb') {
-										$this->DebugMessage('Setting "lvl" filter method to "0" (from "'.$method.'") because white-balance filter also enabled', __FILE__, __LINE__);
-										$method = 0;
-									}
-								}
-							}
-
-							switch ($method) {
-								case 0: // internal RGB
-								case 1: // internal grayscale
-									break;
-								case 2: // ImageMagick "contrast-stretch"
-									if ($this->ImageMagickSwitchAvailable('contrast-stretch')) {
-										if ($band != '*') {
-											$commandline .= ' -channel '.phpthumb_functions::escapeshellarg_replacement(strtoupper($band));
-										}
-										$threshold = preg_replace('#[^0-9\\.]#', '', $threshold); // should be unneccesary, but just to be double-sure
-										//$commandline .= ' -contrast-stretch '.phpthumb_functions::escapeshellarg_replacement($threshold.'%');
-										$commandline .= ' -contrast-stretch \''.$threshold.'%\'';
-										if ($band != '*') {
-											$commandline .= ' +channel';
-										}
-										$successfullyProcessedFilters[] = $filterkey;
-									}
-									break;
-								case 3: // ImageMagick "normalize"
-									if ($this->ImageMagickSwitchAvailable('normalize')) {
-										if ($band != '*') {
-											$commandline .= ' -channel '.phpthumb_functions::escapeshellarg_replacement(strtoupper($band));
-										}
-										$commandline .= ' -normalize';
-										if ($band != '*') {
-											$commandline .= ' +channel';
-										}
-										$successfullyProcessedFilters[] = $filterkey;
-									}
-									break;
-								default:
-									$this->DebugMessage('unsupported method ('.$method.') for "lvl" filter', __FILE__, __LINE__);
-									break;
-							}
-							if (isset($this->fltr[$filterkey]) && ($method > 1)) {
-								$this->fltr[$filterkey] = $command.'|'.$band.'|0|'.$threshold;
-								$this->DebugMessage('filter "lvl" remapped from method "'.$method.'" to method "0" because ImageMagick support is missing', __FILE__, __LINE__);
-							}
-							break;
-
-						case 'wb':
-							if ($this->ImageMagickSwitchAvailable(array('channel', 'contrast-stretch'))) {
-								@list($threshold) = explode('|', $parameter);
-								$threshold = (!empty($threshold) ? min(max((float) $threshold, 0), 100) : 0.1);
-								$threshold = preg_replace('#[^0-9\\.]#', '', $threshold); // should be unneccesary, but just to be double-sure
-								//$commandline .= ' -channel R -contrast-stretch '.phpthumb_functions::escapeshellarg_replacement($threshold.'%'); // doesn't work on Windows because most versions of PHP do not properly
-								//$commandline .= ' -channel G -contrast-stretch '.phpthumb_functions::escapeshellarg_replacement($threshold.'%'); // escape special characters (such as %) and just replace them with spaces
-								//$commandline .= ' -channel B -contrast-stretch '.phpthumb_functions::escapeshellarg_replacement($threshold.'%'); // https://bugs.php.net/bug.php?id=43261
-								$commandline .= ' -channel R -contrast-stretch \''.$threshold.'%\'';
-								$commandline .= ' -channel G -contrast-stretch \''.$threshold.'%\'';
-								$commandline .= ' -channel B -contrast-stretch \''.$threshold.'%\'';
-								$commandline .= ' +channel';
-								$successfullyProcessedFilters[] = $filterkey;
-							}
-							break;
-
-						case 'blur':
-							if ($this->ImageMagickSwitchAvailable('blur')) {
-								@list($radius) = explode('|', $parameter);
-								$radius = (!empty($radius) ? min(max((int) $radius, 0), 25) : 1);
-								$commandline .= ' -blur '.phpthumb_functions::escapeshellarg_replacement($radius);
-								$successfullyProcessedFilters[] = $filterkey;
-							}
-							break;
-
-						case 'gblr':
-							@list($radius) = explode('|', $parameter);
-							$radius = (!empty($radius) ? min(max((int) $radius, 0), 25) : 1);
-							// "-gaussian" changed to "-gaussian-blur" sometime around 2009
-							if ($this->ImageMagickSwitchAvailable('gaussian-blur')) {
-								$commandline .= ' -gaussian-blur '.phpthumb_functions::escapeshellarg_replacement($radius);
-								$successfullyProcessedFilters[] = $filterkey;
-							} elseif ($this->ImageMagickSwitchAvailable('gaussian')) {
-								$commandline .= ' -gaussian '.phpthumb_functions::escapeshellarg_replacement($radius);
-								$successfullyProcessedFilters[] = $filterkey;
-							}
-							break;
-
-						case 'usm':
-							if ($this->ImageMagickSwitchAvailable('unsharp')) {
-								@list($amount, $radius, $threshold) = explode('|', $parameter);
-								$amount    = ($amount            ? min(max((int) $amount,    0), 255) : 80);
-								$radius    = ($radius            ? min(max((int) $radius,    0),  10) : 0.5);
-								$threshold = (strlen($threshold) ? min(max((int) $threshold, 0),  50) : 3);
-								$commandline .= ' -unsharp '.phpthumb_functions::escapeshellarg_replacement(number_format(($radius * 2) - 1, 2, '.', '').'x1+'.number_format($amount / 100, 2, '.', '').'+'.number_format($threshold / 100, 2, '.', ''));
-								$successfullyProcessedFilters[] = $filterkey;
-							}
-							break;
-
-						case 'bord':
-							if ($this->ImageMagickSwitchAvailable(array('border', 'bordercolor', 'thumbnail', 'crop'))) {
-								if (!$this->zc) {
-									@list($width, $rX, $rY, $color) = explode('|', $parameter);
-									$width = (int) $width;
-									$rX    = (int) $rX;
-									$rY    = (int) $rY;
-									if ($width && !$rX && !$rY) {
-										if (!phpthumb_functions::IsHexColor($color)) {
-											$color = ((!empty($this->bc) && phpthumb_functions::IsHexColor($this->bc)) ? $this->bc : '000000');
-										}
-										$commandline .= ' -border '.phpthumb_functions::escapeshellarg_replacement((int) $width);
-										$commandline .= ' -bordercolor '.phpthumb_functions::escapeshellarg_replacement('#'.$color);
-
-										if (preg_match('# \\-crop "([0-9]+)x([0-9]+)\\+0\\+0" #', $commandline, $matches)) {
-											$commandline = str_replace(' -crop "'.$matches[1].'x'.$matches[2].'+0+0" ', ' -crop '.phpthumb_functions::escapeshellarg_replacement(($matches[1] - (2 * $width)).'x'.($matches[2] - (2 * $width)).'+0+0').' ', $commandline);
-										} elseif (preg_match('# \\-'.$IMresizeParameter.' "([0-9]+)x([0-9]+)" #', $commandline, $matches)) {
-											$commandline = str_replace(' -'.$IMresizeParameter.' "'.$matches[1].'x'.$matches[2].'" ', ' -'.$IMresizeParameter.' '.phpthumb_functions::escapeshellarg_replacement(($matches[1] - (2 * $width)).'x'.($matches[2] - (2 * $width))).' ', $commandline);
-										}
-										$successfullyProcessedFilters[] = $filterkey;
-									}
-								}
-							}
-							break;
-
-						case 'crop':
-							break;
-
-						case 'sblr':
-							break;
-
-						case 'mean':
-							break;
-
-						case 'smth':
-							break;
-
-						case 'bvl':
-							break;
-
-						case 'wmi':
-							break;
-
-						case 'wmt':
-							break;
-
-						case 'over':
-							break;
-
-						case 'hist':
-							break;
-
-						case 'fram':
-							break;
-
-						case 'drop':
-							break;
-
-						case 'mask':
-							break;
-
-						case 'elip':
-							break;
-
-						case 'ric':
-							break;
-
-						case 'stc':
-							break;
-
-						case 'size':
-							break;
-
-						default:
-							$this->DebugMessage('Unknown $this->fltr['.$filterkey.'] ('.$filtercommand.') -- deleting filter command', __FILE__, __LINE__);
-							$successfullyProcessedFilters[] = $filterkey;
-							break;
-					}
-					if (!isset($this->fltr[$filterkey])) {
-						$this->DebugMessage('Processed $this->fltr['.$filterkey.'] ('.$filtercommand.') with ImageMagick', __FILE__, __LINE__);
-					} else {
-						$this->DebugMessage('Skipping $this->fltr['.$filterkey.'] ('.$filtercommand.') with ImageMagick', __FILE__, __LINE__);
-					}
-				}
-				$this->DebugMessage('Remaining $this->fltr after ImageMagick: ('.$this->phpThumbDebugVarDump($this->fltr).')', __FILE__, __LINE__);
-				if (count($this->fltr) > 0) {
-					$this->useRawIMoutput = false;
-				}
-
-				if (preg_match('#jpe?g#i', $outputFormat) && $this->q) {
-					if ($this->ImageMagickSwitchAvailable(array('quality', 'interlace'))) {
-						$commandline .= ' -quality '.phpthumb_functions::escapeshellarg_replacement($this->thumbnailQuality);
-						if ($this->config_output_interlace) {
-							// causes weird things with animated GIF... leave for JPEG only
-							$commandline .= ' -interlace line '; // Use Line or Plane to create an interlaced PNG or GIF or progressive JPEG image
-						}
-					}
-				}
-				$commandline .= ' '.$outputFormat.':'.phpthumb_functions::escapeshellarg_replacement($IMtempfilename);
-				if (!$this->iswindows) {
-					$commandline .= ' 2>&1';
-				}
-				$this->DebugMessage('ImageMagick called as ('.$commandline.')', __FILE__, __LINE__);
-				$IMresult = phpthumb_functions::SafeExec($commandline);
-				clearstatcache();
-				if (!@file_exists($IMtempfilename) || !@filesize($IMtempfilename)) {
-					$this->FatalError('ImageMagick failed with message ('.trim($IMresult).')');
-					$this->DebugMessage('ImageMagick failed with message ('.trim($IMresult).')', __FILE__, __LINE__);
-					if ($this->iswindows && !$IMresult) {
-						$this->DebugMessage('Check to make sure that PHP has read+write permissions to "'.dirname($IMtempfilename).'"', __FILE__, __LINE__);
-					}
-
-				} else {
-
-					foreach ($successfullyProcessedFilters as $dummy => $filterkey) {
-						unset($this->fltr[$filterkey]);
-					}
-					$this->IMresizedData = file_get_contents($IMtempfilename);
-					$getimagesize_imresized = @getimagesize($IMtempfilename);
-					$this->DebugMessage('getimagesize('.$IMtempfilename.') returned [w='.$getimagesize_imresized[0].';h='.$getimagesize_imresized[1].';f='.$getimagesize_imresized[2].']', __FILE__, __LINE__);
-					if (($this->config_max_source_pixels > 0) && (($getimagesize_imresized[0] * $getimagesize_imresized[1]) > $this->config_max_source_pixels)) {
-						$this->DebugMessage('skipping ImageMagickThumbnailToGD::'.$ImageCreateFunction.'() because IM output is too large ('.$getimagesize_imresized[0].'x'.$getimagesize_imresized[0].' = '.($getimagesize_imresized[0] * $getimagesize_imresized[1]).' > '.$this->config_max_source_pixels.')', __FILE__, __LINE__);
-					} elseif (function_exists(@$ImageCreateFunction) && ($this->gdimg_source = @$ImageCreateFunction($IMtempfilename))) {
-						$this->source_width  = imagesx($this->gdimg_source);
-						$this->source_height = imagesy($this->gdimg_source);
-						$this->DebugMessage('ImageMagickThumbnailToGD::'.$ImageCreateFunction.'() succeeded, $this->gdimg_source is now ('.$this->source_width.'x'.$this->source_height.')', __FILE__, __LINE__);
-						$this->DebugMessage('ImageMagickThumbnailToGD() returning $this->IMresizedData ('.strlen($this->IMresizedData).' bytes)', __FILE__, __LINE__);
-					} else {
-						$this->useRawIMoutput = true;
-						$this->DebugMessage('$this->useRawIMoutput set to TRUE because '.@$ImageCreateFunction.'('.$IMtempfilename.') failed', __FILE__, __LINE__);
-					}
-					if (file_exists($IMtempfilename)) {
-						$this->DebugMessage('deleting "'.$IMtempfilename.'"', __FILE__, __LINE__);
-						@unlink($IMtempfilename);
-					}
-					return true;
-
-				}
-				if (file_exists($IMtempfilename)) {
-					$this->DebugMessage('deleting "'.$IMtempfilename.'"', __FILE__, __LINE__);
-					@unlink($IMtempfilename);
-				}
-
-			} elseif ($this->issafemode) {
-				$this->DebugMessage('ImageMagickThumbnailToGD() aborting because PHP safe_mode is enabled and phpThumb_tempnam() failed', __FILE__, __LINE__);
-				$this->useRawIMoutput = false;
-			} else {
-				if (file_exists($IMtempfilename)) {
-					$this->DebugMessage('deleting "'.$IMtempfilename.'"', __FILE__, __LINE__);
-					@unlink($IMtempfilename);
-				}
-				$this->DebugMessage('ImageMagickThumbnailToGD() aborting, phpThumb_tempnam() failed', __FILE__, __LINE__);
-			}
-		} else {
-			$this->DebugMessage('ImageMagickThumbnailToGD() aborting because ImageMagickCommandlineBase() failed', __FILE__, __LINE__);
-		}
-		$this->useRawIMoutput = false;
-		return false;
-	}
-
-
-	public function Rotate() {
-		if ($this->ra || $this->ar) {
-			if (!function_exists('imagerotate')) {
-				$this->DebugMessage('!function_exists(imagerotate)', __FILE__, __LINE__);
-				return false;
-			}
-			if (!include_once( __DIR__ .'/phpthumb.filters.php')) {
-				$this->DebugMessage('Error including "'. __DIR__ .'/phpthumb.filters.php" which is required for applying filters ('.implode(';', $this->fltr).')', __FILE__, __LINE__);
-				return false;
-			}
-
-			$this->config_background_hexcolor = ($this->bg ? $this->bg : $this->config_background_hexcolor);
-			if (!phpthumb_functions::IsHexColor($this->config_background_hexcolor)) {
-				return $this->ErrorImage('Invalid hex color string "'.$this->config_background_hexcolor.'" for parameter "bg"');
-			}
-
-			$rotate_angle = 0;
-			if ($this->ra) {
-
-				$rotate_angle = (float) $this->ra;
-
-			} else {
-
-				if ($this->ar == 'x') {
-					if (phpthumb_functions::version_compare_replacement(PHP_VERSION, '4.2.0', '>=')) {
-						if ($this->sourceFilename) {
-							if (function_exists('exif_read_data')) {
-								if ($exif_data = @exif_read_data($this->sourceFilename, 'IFD0')) {
-									// http://sylvana.net/jpegcrop/exif_orientation.html
-									switch (@$exif_data['Orientation']) {
-										case 1:
-											$rotate_angle = 0;
-											break;
-										case 3:
-											$rotate_angle = 180;
-											break;
-										case 6:
-											$rotate_angle = 270;
-											break;
-										case 8:
-											$rotate_angle = 90;
-											break;
-
-										default:
-											$this->DebugMessage('EXIF auto-rotate failed because unknown $exif_data[Orientation] "'.@$exif_data['Orientation'].'"', __FILE__, __LINE__);
-											return false;
-											break;
-									}
-									$this->DebugMessage('EXIF auto-rotate set to '.$rotate_angle.' degrees ($exif_data[Orientation] = "'.@$exif_data['Orientation'].'")', __FILE__, __LINE__);
-								} else {
-									$this->DebugMessage('failed: exif_read_data('.$this->sourceFilename.')', __FILE__, __LINE__);
-									return false;
-								}
-							} else {
-								$this->DebugMessage('!function_exists(exif_read_data)', __FILE__, __LINE__);
-								return false;
-							}
-						} else {
-							$this->DebugMessage('Cannot auto-rotate from EXIF data because $this->sourceFilename is empty', __FILE__, __LINE__);
-							return false;
-						}
-					} else {
-						$this->DebugMessage('Cannot auto-rotate from EXIF data because PHP is less than v4.2.0 ('. PHP_VERSION .')', __FILE__, __LINE__);
-						return false;
-					}
-				} elseif (($this->ar == 'l') && ($this->source_height > $this->source_width)) {
-					$rotate_angle = 270;
-				} elseif (($this->ar == 'L') && ($this->source_height > $this->source_width)) {
-					$rotate_angle = 90;
-				} elseif (($this->ar == 'p') && ($this->source_width > $this->source_height)) {
-					$rotate_angle = 90;
-				} elseif (($this->ar == 'P') && ($this->source_width > $this->source_height)) {
-					$rotate_angle = 270;
-				}
-
-			}
-			if ($rotate_angle % 90) {
-				$this->is_alpha = true;
-			}
-			phpthumb_filters::ImprovedImageRotate($this->gdimg_source, $rotate_angle, $this->config_background_hexcolor, $this->bg, $this);
-			$this->source_width  = imagesx($this->gdimg_source);
-			$this->source_height = imagesy($this->gdimg_source);
-		}
-		return true;
-	}
-
-
-	public function FixedAspectRatio() {
-		// optional fixed-dimension images (regardless of aspect ratio)
-
-		if (!$this->far) {
-			// do nothing
-			return true;
-		}
-
-		if (!$this->w || !$this->h) {
-			return false;
-		}
-		$this->thumbnail_width  = $this->w;
-		$this->thumbnail_height = $this->h;
-		$this->is_alpha = true;
-		if ($this->thumbnail_image_width >= $this->thumbnail_width) {
-
-			$aspectratio = $this->thumbnail_image_height / $this->thumbnail_image_width;
-			if ($this->w) {
-				$this->thumbnail_image_height = round($this->thumbnail_image_width * $aspectratio);
-				$this->thumbnail_height = ($this->h ? $this->h : $this->thumbnail_image_height);
-			} elseif ($this->thumbnail_image_height < $this->thumbnail_height) {
-				$this->thumbnail_image_height = $this->thumbnail_height;
-				$this->thumbnail_image_width  = round($this->thumbnail_image_height / $aspectratio);
-			}
-
-		} else {
-
-			$aspectratio = $this->thumbnail_image_width / $this->thumbnail_image_height;
-			if ($this->h) {
-				$this->thumbnail_image_width = round($this->thumbnail_image_height * $aspectratio);
-			} elseif ($this->thumbnail_image_width < $this->thumbnail_width) {
-				$this->thumbnail_image_width = $this->thumbnail_width;
-				$this->thumbnail_image_height  = round($this->thumbnail_image_width / $aspectratio);
-			}
-
-		}
-		return true;
-	}
-
-
-	public function OffsiteDomainIsAllowed($hostname, $allowed_domains) {
-		static $domain_is_allowed = array();
-		$hostname = strtolower($hostname);
-		if (!isset($domain_is_allowed[$hostname])) {
-			$domain_is_allowed[$hostname] = false;
-			foreach ($allowed_domains as $valid_domain) {
-				$starpos = strpos($valid_domain, '*');
-				if ($starpos !== false) {
-					$valid_domain = substr($valid_domain, $starpos + 1);
-					if (preg_match('#'.preg_quote($valid_domain).'$#', $hostname)) {
-						$domain_is_allowed[$hostname] = true;
-						break;
-					}
-				} else {
-					if (strtolower($valid_domain) === $hostname) {
-						$domain_is_allowed[$hostname] = true;
-						break;
-					}
-				}
-			}
-		}
-		return $domain_is_allowed[$hostname];
-	}
-
-
-	public function AntiOffsiteLinking() {
-		// Optional anti-offsite hijacking of the thumbnail script
-		$allow   = true;
-		if ($allow && $this->config_nooffsitelink_enabled && (@$_SERVER['HTTP_REFERER'] || $this->config_nooffsitelink_require_refer)) {
-			$this->DebugMessage('AntiOffsiteLinking() checking $_SERVER[HTTP_REFERER] "'.@$_SERVER['HTTP_REFERER'].'"', __FILE__, __LINE__);
-			foreach ($this->config_nooffsitelink_valid_domains as $key => $valid_domain) {
-				// $_SERVER['HTTP_HOST'] contains the port number, so strip it out here to make default configuration work
-				list($clean_domain) = explode(':', $valid_domain);
-				$this->config_nooffsitelink_valid_domains[$key] = $clean_domain;
-			}
-			$parsed_url = phpthumb_functions::ParseURLbetter(@$_SERVER['HTTP_REFERER']);
-			if (!$this->OffsiteDomainIsAllowed(@$parsed_url['host'], $this->config_nooffsitelink_valid_domains)) {
-				$allow   = false;
-				//$this->DebugMessage('AntiOffsiteLinking() - "'.@$parsed_url['host'].'" is NOT in $this->config_nooffsitelink_valid_domains ('.implode(';', $this->config_nooffsitelink_valid_domains).')', __FILE__, __LINE__);
-				$this->ErrorImage('AntiOffsiteLinking() - "'.@$parsed_url['host'].'" is NOT in $this->config_nooffsitelink_valid_domains ('.implode(';', $this->config_nooffsitelink_valid_domains).')');
-			} else {
-				$this->DebugMessage('AntiOffsiteLinking() - "'.@$parsed_url['host'].'" is in $this->config_nooffsitelink_valid_domains ('.implode(';', $this->config_nooffsitelink_valid_domains).')', __FILE__, __LINE__);
-			}
-		}
-
-		if ($allow && $this->config_nohotlink_enabled && preg_match('#^(f|ht)tps?\://#i', $this->src)) {
-			$parsed_url = phpthumb_functions::ParseURLbetter($this->src);
-			//if (!phpthumb_functions::CaseInsensitiveInArray(@$parsed_url['host'], $this->config_nohotlink_valid_domains)) {
-			if (!$this->OffsiteDomainIsAllowed(@$parsed_url['host'], $this->config_nohotlink_valid_domains)) {
-				// This domain is not allowed
-				$allow = false;
-				$this->DebugMessage('AntiOffsiteLinking() - "'.$parsed_url['host'].'" is NOT in $this->config_nohotlink_valid_domains ('.implode(';', $this->config_nohotlink_valid_domains).')', __FILE__, __LINE__);
-			} else {
-				$this->DebugMessage('AntiOffsiteLinking() - "'.$parsed_url['host'].'" is in $this->config_nohotlink_valid_domains ('.implode(';', $this->config_nohotlink_valid_domains).')', __FILE__, __LINE__);
-			}
-		}
-
-		if ($allow) {
-			$this->DebugMessage('AntiOffsiteLinking() says this is allowed', __FILE__, __LINE__);
-			return true;
-		}
-
-		if (!phpthumb_functions::IsHexColor($this->config_error_bgcolor)) {
-			return $this->ErrorImage('Invalid hex color string "'.$this->config_error_bgcolor.'" for $this->config_error_bgcolor');
-		}
-		if (!phpthumb_functions::IsHexColor($this->config_error_textcolor)) {
-			return $this->ErrorImage('Invalid hex color string "'.$this->config_error_textcolor.'" for $this->config_error_textcolor');
-		}
-		if ($this->config_nooffsitelink_erase_image) {
-
-			return $this->ErrorImage($this->config_nooffsitelink_text_message, $this->thumbnail_width, $this->thumbnail_height);
-
-		} else {
-
-			$this->config_nooffsitelink_watermark_src = $this->ResolveFilenameToAbsolute($this->config_nooffsitelink_watermark_src);
-			if (is_file($this->config_nooffsitelink_watermark_src)) {
-
-				if (!include_once( __DIR__ .'/phpthumb.filters.php')) {
-					$this->DebugMessage('Error including "'. __DIR__ .'/phpthumb.filters.php" which is required for applying watermark', __FILE__, __LINE__);
-					return false;
-				}
-				$watermark_img = $this->ImageCreateFromStringReplacement(file_get_contents($this->config_nooffsitelink_watermark_src));
-				$phpthumbFilters = new phpthumb_filters();
-				$phpthumbFilters->phpThumbObject = &$this;
-				$opacity = 50;
-				$margin  = 5;
-				$phpthumbFilters->WatermarkOverlay($this->gdimg_output, $watermark_img, '*', $opacity, $margin);
-				imagedestroy($watermark_img);
-				unset($phpthumbFilters);
-
-			} else {
-
-				$nohotlink_text_array = explode("\n", wordwrap($this->config_nooffsitelink_text_message, floor($this->thumbnail_width / imagefontwidth($this->config_error_fontsize)), "\n"));
-				$nohotlink_text_color = phpthumb_functions::ImageHexColorAllocate($this->gdimg_output, $this->config_error_textcolor);
-
-				$topoffset = round(($this->thumbnail_height - (count($nohotlink_text_array) * imagefontheight($this->config_error_fontsize))) / 2);
-
-				$rowcounter = 0;
-				$this->DebugMessage('AntiOffsiteLinking() writing '.count($nohotlink_text_array).' lines of text "'.$this->config_nooffsitelink_text_message.'" (in #'.$this->config_error_textcolor.') on top of image', __FILE__, __LINE__);
-				foreach ($nohotlink_text_array as $textline) {
-					$leftoffset = max(0, round(($this->thumbnail_width - (strlen($textline) * imagefontwidth($this->config_error_fontsize))) / 2));
-					imagestring($this->gdimg_output, $this->config_error_fontsize, $leftoffset, $topoffset + ($rowcounter++ * imagefontheight($this->config_error_fontsize)), $textline, $nohotlink_text_color);
-				}
-
-			}
-
-		}
-		return true;
-	}
-
-
-	public function AlphaChannelFlatten() {
-		if (!$this->is_alpha) {
-			// image doesn't have alpha transparency, no need to flatten
-			$this->DebugMessage('skipping AlphaChannelFlatten() because !$this->is_alpha', __FILE__, __LINE__);
-			return false;
-		}
-		switch ($this->thumbnailFormat) {
-			case 'png':
-			case 'ico':
-				// image has alpha transparency, but output as PNG or ICO which can handle it
-				$this->DebugMessage('skipping AlphaChannelFlatten() because ($this->thumbnailFormat == "'.$this->thumbnailFormat.'")', __FILE__, __LINE__);
-				return false;
-				break;
-
-			case 'gif':
-				// image has alpha transparency, but output as GIF which can handle only single-color transparency
-				$CurrentImageColorTransparent = imagecolortransparent($this->gdimg_output);
-				if ($CurrentImageColorTransparent == -1) {
-					// no transparent color defined
-
-					if (phpthumb_functions::gd_version() < 2.0) {
-						$this->DebugMessage('AlphaChannelFlatten() failed because GD version is "'.phpthumb_functions::gd_version().'"', __FILE__, __LINE__);
-						return false;
-					}
-
-					if ($img_alpha_mixdown_dither = @imagecreatetruecolor(imagesx($this->gdimg_output), imagesy($this->gdimg_output))) {
-
-						$dither_color = array();
-						for ($i = 0; $i <= 255; $i++) {
-							$dither_color[$i] = imagecolorallocate($img_alpha_mixdown_dither, $i, $i, $i);
-						}
-
-						// scan through current truecolor image copy alpha channel to temp image as grayscale
-						for ($x = 0; $x < $this->thumbnail_width; $x++) {
-							for ($y = 0; $y < $this->thumbnail_height; $y++) {
-								$PixelColor = phpthumb_functions::GetPixelColor($this->gdimg_output, $x, $y);
-								imagesetpixel($img_alpha_mixdown_dither, $x, $y, $dither_color[($PixelColor['alpha'] * 2)]);
-							}
-						}
-
-						// dither alpha channel grayscale version down to 2 colors
-						imagetruecolortopalette($img_alpha_mixdown_dither, true, 2);
-
-						// reduce color palette to 256-1 colors (leave one palette position for transparent color)
-						imagetruecolortopalette($this->gdimg_output, true, 255);
-
-						// allocate a new color for transparent color index
-						$TransparentColor = imagecolorallocate($this->gdimg_output, 1, 254, 253);
-						imagecolortransparent($this->gdimg_output, $TransparentColor);
-
-						// scan through alpha channel image and note pixels with >50% transparency
-						for ($x = 0; $x < $this->thumbnail_width; $x++) {
-							for ($y = 0; $y < $this->thumbnail_height; $y++) {
-								$AlphaChannelPixel = phpthumb_functions::GetPixelColor($img_alpha_mixdown_dither, $x, $y);
-								if ($AlphaChannelPixel['red'] > 127) {
-									imagesetpixel($this->gdimg_output, $x, $y, $TransparentColor);
-								}
-							}
-						}
-						imagedestroy($img_alpha_mixdown_dither);
-
-						$this->DebugMessage('AlphaChannelFlatten() set image to 255+1 colors with transparency for GIF output', __FILE__, __LINE__);
-						return true;
-
-					} else {
-						$this->DebugMessage('AlphaChannelFlatten() failed imagecreate('.imagesx($this->gdimg_output).', '.imagesy($this->gdimg_output).')', __FILE__, __LINE__);
-						return false;
-					}
-
-				} else {
-					// a single transparent color already defined, leave as-is
-					$this->DebugMessage('skipping AlphaChannelFlatten() because ($this->thumbnailFormat == "'.$this->thumbnailFormat.'") and imagecolortransparent() returned "'.$CurrentImageColorTransparent.'"', __FILE__, __LINE__);
-					return true;
-				}
-				break;
-		}
-		$this->DebugMessage('continuing AlphaChannelFlatten() for output format "'.$this->thumbnailFormat.'"', __FILE__, __LINE__);
-		// image has alpha transparency, and is being output in a format that doesn't support it -- flatten
-		if ($gdimg_flatten_temp = phpthumb_functions::ImageCreateFunction($this->thumbnail_width, $this->thumbnail_height)) {
-
-			$this->config_background_hexcolor = ($this->bg ? $this->bg : $this->config_background_hexcolor);
-			if (!phpthumb_functions::IsHexColor($this->config_background_hexcolor)) {
-				return $this->ErrorImage('Invalid hex color string "'.$this->config_background_hexcolor.'" for parameter "bg"');
-			}
-			$background_color = phpthumb_functions::ImageHexColorAllocate($this->gdimg_output, $this->config_background_hexcolor);
-			imagefilledrectangle($gdimg_flatten_temp, 0, 0, $this->thumbnail_width, $this->thumbnail_height, $background_color);
-			imagecopy($gdimg_flatten_temp, $this->gdimg_output, 0, 0, 0, 0, $this->thumbnail_width, $this->thumbnail_height);
-
-			imagealphablending($this->gdimg_output, true);
-			imagesavealpha($this->gdimg_output, false);
-			imagecolortransparent($this->gdimg_output, -1);
-			imagecopy($this->gdimg_output, $gdimg_flatten_temp, 0, 0, 0, 0, $this->thumbnail_width, $this->thumbnail_height);
-
-			imagedestroy($gdimg_flatten_temp);
-			return true;
-
-		} else {
-			$this->DebugMessage('ImageCreateFunction() failed', __FILE__, __LINE__);
-		}
-		return false;
-	}
-
-
-	public function ApplyFilters() {
-		if ($this->fltr && is_array($this->fltr)) {
-			if (!include_once( __DIR__ .'/phpthumb.filters.php')) {
-				$this->DebugMessage('Error including "'. __DIR__ .'/phpthumb.filters.php" which is required for applying filters ('.implode(';', $this->fltr).')', __FILE__, __LINE__);
-				return false;
-			}
-			$phpthumbFilters = new phpthumb_filters();
-			$phpthumbFilters->phpThumbObject = &$this;
-			foreach ($this->fltr as $filtercommand) {
-				@list($command, $parameter) = explode('|', $filtercommand, 2);
-				$this->DebugMessage('Attempting to process filter command "'.$command.'('.$parameter.')"', __FILE__, __LINE__);
-				switch ($command) {
-					case 'brit': // Brightness
-						$phpthumbFilters->Brightness($this->gdimg_output, $parameter);
-						break;
-
-					case 'cont': // Contrast
-						$phpthumbFilters->Contrast($this->gdimg_output, $parameter);
-						break;
-
-					case 'ds': // Desaturation
-						$phpthumbFilters->Desaturate($this->gdimg_output, $parameter, '');
-						break;
-
-					case 'sat': // Saturation
-						$phpthumbFilters->Saturation($this->gdimg_output, $parameter, '');
-						break;
-
-					case 'gray': // Grayscale
-						$phpthumbFilters->Grayscale($this->gdimg_output);
-						break;
-
-					case 'clr': // Colorize
-						if (phpthumb_functions::gd_version() < 2) {
-							$this->DebugMessage('Skipping Colorize() because gd_version is "'.phpthumb_functions::gd_version().'"', __FILE__, __LINE__);
-							break;
-						}
-						@list($amount, $color) = explode('|', $parameter, 2);
-						$phpthumbFilters->Colorize($this->gdimg_output, $amount, $color);
-						break;
-
-					case 'sep': // Sepia
-						if (phpthumb_functions::gd_version() < 2) {
-							$this->DebugMessage('Skipping Sepia() because gd_version is "'.phpthumb_functions::gd_version().'"', __FILE__, __LINE__);
-							break;
-						}
-						@list($amount, $color) = explode('|', $parameter, 2);
-						$phpthumbFilters->Sepia($this->gdimg_output, $amount, $color);
-						break;
-
-					case 'gam': // Gamma correction
-						$phpthumbFilters->Gamma($this->gdimg_output, $parameter);
-						break;
-
-					case 'neg': // Negative colors
-						$phpthumbFilters->Negative($this->gdimg_output);
-						break;
-
-					case 'th': // Threshold
-						$phpthumbFilters->Threshold($this->gdimg_output, $parameter);
-						break;
-
-					case 'rcd': // ReduceColorDepth
-						if (phpthumb_functions::gd_version() < 2) {
-							$this->DebugMessage('Skipping ReduceColorDepth() because gd_version is "'.phpthumb_functions::gd_version().'"', __FILE__, __LINE__);
-							break;
-						}
-						@list($colors, $dither) = explode('|', $parameter, 2);
-						$colors = ($colors                ?  (int) $colors : 256);
-						$dither  = ((strlen($dither) > 0) ? (bool) $dither : true);
-						$phpthumbFilters->ReduceColorDepth($this->gdimg_output, $colors, $dither);
-						break;
-
-					case 'flip': // Flip
-						$phpthumbFilters->Flip($this->gdimg_output, (strpos(strtolower($parameter), 'x') !== false), (strpos(strtolower($parameter), 'y') !== false));
-						break;
-
-					case 'edge': // EdgeDetect
-						$phpthumbFilters->EdgeDetect($this->gdimg_output);
-						break;
-
-					case 'emb': // Emboss
-						$phpthumbFilters->Emboss($this->gdimg_output);
-						break;
-
-					case 'bvl': // Bevel
-						@list($width, $color1, $color2) = explode('|', $parameter, 3);
-						$phpthumbFilters->Bevel($this->gdimg_output, $width, $color1, $color2);
-						break;
-
-					case 'lvl': // autoLevels
-						@list($band, $method, $threshold) = explode('|', $parameter, 3);
-						$band      = ($band ? preg_replace('#[^RGBA\\*]#', '', strtoupper($band)) : '*');
-						$method    = ((strlen($method) > 0)    ? (int) $method :   2);
-						$threshold = ((strlen($threshold) > 0) ? (float) $threshold : 0.1);
-
-						$phpthumbFilters->HistogramStretch($this->gdimg_output, $band, $method, $threshold);
-						break;
-
-					case 'wb': // WhiteBalance
-						$phpthumbFilters->WhiteBalance($this->gdimg_output, $parameter);
-						break;
-
-					case 'hist': // Histogram overlay
-						if (phpthumb_functions::gd_version() < 2) {
-							$this->DebugMessage('Skipping HistogramOverlay() because gd_version is "'.phpthumb_functions::gd_version().'"', __FILE__, __LINE__);
-							break;
-						}
-						@list($bands, $colors, $width, $height, $alignment, $opacity, $margin_x, $margin_y) = explode('|', $parameter, 8);
-						$bands     = ($bands     ? $bands     :  '*');
-						$colors    = ($colors    ? $colors    :   '');
-						$width     = ($width     ? $width     : 0.25);
-						$height    = ($height    ? $height    : 0.25);
-						$alignment = ($alignment ? $alignment : 'BR');
-						$opacity   = ($opacity   ? $opacity   :   50);
-						$margin_x  = ($margin_x  ? $margin_x  :    5);
-						// $margin_y -- it wasn't forgotten, let the value always pass unchanged
-						$phpthumbFilters->HistogramOverlay($this->gdimg_output, $bands, $colors, $width, $height, $alignment, $opacity, $margin_x, $margin_y);
-						break;
-
-					case 'fram': // Frame
-						@list($frame_width, $edge_width, $color_frame, $color1, $color2) = explode('|', $parameter, 5);
-						$phpthumbFilters->Frame($this->gdimg_output, $frame_width, $edge_width, $color_frame, $color1, $color2);
-						break;
-
-					case 'drop': // DropShadow
-						if (phpthumb_functions::gd_version() < 2) {
-							$this->DebugMessage('Skipping DropShadow() because gd_version is "'.phpthumb_functions::gd_version().'"', __FILE__, __LINE__);
-							return false;
-						}
-						$this->is_alpha = true;
-						@list($distance, $width, $color, $angle, $fade) = explode('|', $parameter, 5);
-						$phpthumbFilters->DropShadow($this->gdimg_output, $distance, $width, $color, $angle, $fade);
-						break;
-
-					case 'mask': // Mask cropping
-						if (phpthumb_functions::gd_version() < 2) {
-							$this->DebugMessage('Skipping Mask() because gd_version is "'.phpthumb_functions::gd_version().'"', __FILE__, __LINE__);
-							return false;
-						}
-						@list($mask_filename, $invert) = explode('|', $parameter, 2);
-						$mask_filename = $this->ResolveFilenameToAbsolute($mask_filename);
-						if (@is_readable($mask_filename) && ($fp_mask = @fopen($mask_filename, 'rb'))) {
-							$MaskImageData = '';
-							do {
-								$buffer = fread($fp_mask, 8192);
-								$MaskImageData .= $buffer;
-							} while (strlen($buffer) > 0);
-							fclose($fp_mask);
-							if ($gdimg_mask = $this->ImageCreateFromStringReplacement($MaskImageData)) {
-								if ($invert && phpthumb_functions::version_compare_replacement(PHP_VERSION, '5.0.0', '>=') && phpthumb_functions::gd_is_bundled()) {
-									imagefilter($gdimg_mask, IMG_FILTER_NEGATE);
-								}
-								$this->is_alpha = true;
-								$phpthumbFilters->ApplyMask($gdimg_mask, $this->gdimg_output);
-								imagedestroy($gdimg_mask);
-							} else {
-								$this->DebugMessage('ImageCreateFromStringReplacement() failed for "'.$mask_filename.'"', __FILE__, __LINE__);
-							}
-						} else {
-							$this->DebugMessage('Cannot open mask file "'.$mask_filename.'"', __FILE__, __LINE__);
-						}
-						break;
-
-					case 'elip': // Ellipse cropping
-						if (phpthumb_functions::gd_version() < 2) {
-							$this->DebugMessage('Skipping Ellipse() because gd_version is "'.phpthumb_functions::gd_version().'"', __FILE__, __LINE__);
-							return false;
-						}
-						$this->is_alpha = true;
-						$phpthumbFilters->Ellipse($this->gdimg_output);
-						break;
-
-					case 'ric': // RoundedImageCorners
-						if (phpthumb_functions::gd_version() < 2) {
-							$this->DebugMessage('Skipping RoundedImageCorners() because gd_version is "'.phpthumb_functions::gd_version().'"', __FILE__, __LINE__);
-							return false;
-						}
-						@list($radius_x, $radius_y) = explode('|', $parameter, 2);
-						if (($radius_x < 1) || ($radius_y < 1)) {
-							$this->DebugMessage('Skipping RoundedImageCorners('.$radius_x.', '.$radius_y.') because x/y radius is less than 1', __FILE__, __LINE__);
-							break;
-						}
-						$this->is_alpha = true;
-						$phpthumbFilters->RoundedImageCorners($this->gdimg_output, $radius_x, $radius_y);
-						break;
-
-					case 'crop': // Crop
-						@list($left, $right, $top, $bottom) = explode('|', $parameter, 4);
-						$phpthumbFilters->Crop($this->gdimg_output, $left, $right, $top, $bottom);
-						break;
-
-					case 'bord': // Border
-						@list($border_width, $radius_x, $radius_y, $hexcolor_border) = explode('|', $parameter, 4);
-						$this->is_alpha = true;
-						$phpthumbFilters->ImageBorder($this->gdimg_output, $border_width, $radius_x, $radius_y, $hexcolor_border);
-						break;
-
-					case 'over': // Overlay
-						@list($filename, $underlay, $margin, $opacity) = explode('|', $parameter, 4);
-						$underlay = (bool) ($underlay              ? $underlay : false);
-						$margin   =        ((strlen($margin)  > 0) ? $margin   : ($underlay ? 0.1 : 0.0));
-						$opacity  =        ((strlen($opacity) > 0) ? $opacity  : 100);
-						if (($margin > 0) && ($margin < 1)) {
-							$margin = min(0.499, $margin);
-						} elseif (($margin > -1) && ($margin < 0)) {
-							$margin = max(-0.499, $margin);
-						}
-
-						$filename = $this->ResolveFilenameToAbsolute($filename);
-						if (@is_readable($filename) && ($fp_watermark = @fopen($filename, 'rb'))) {
-							$WatermarkImageData = '';
-							do {
-								$buffer = fread($fp_watermark, 8192);
-								$WatermarkImageData .= $buffer;
-							} while (strlen($buffer) > 0);
-							fclose($fp_watermark);
-							if ($img_watermark = $this->ImageCreateFromStringReplacement($WatermarkImageData)) {
-								if (($margin > 0) && ($margin < 1)) {
-									$resized_x = max(1, imagesx($this->gdimg_output) - round(2 * (imagesx($this->gdimg_output) * $margin)));
-									$resized_y = max(1, imagesy($this->gdimg_output) - round(2 * (imagesy($this->gdimg_output) * $margin)));
-								} else {
-									$resized_x = max(1, imagesx($this->gdimg_output) - round(2 * $margin));
-									$resized_y = max(1, imagesy($this->gdimg_output) - round(2 * $margin));
-								}
-
-								if ($underlay) {
-
-									if ($img_watermark_resized = phpthumb_functions::ImageCreateFunction(imagesx($this->gdimg_output), imagesy($this->gdimg_output))) {
-										imagealphablending($img_watermark_resized, false);
-										imagesavealpha($img_watermark_resized, true);
-										$this->ImageResizeFunction($img_watermark_resized, $img_watermark, 0, 0, 0, 0, imagesx($img_watermark_resized), imagesy($img_watermark_resized), imagesx($img_watermark), imagesy($img_watermark));
-										if ($img_source_resized = phpthumb_functions::ImageCreateFunction($resized_x, $resized_y)) {
-											imagealphablending($img_source_resized, false);
-											imagesavealpha($img_source_resized, true);
-											$this->ImageResizeFunction($img_source_resized, $this->gdimg_output, 0, 0, 0, 0, imagesx($img_source_resized), imagesy($img_source_resized), imagesx($this->gdimg_output), imagesy($this->gdimg_output));
-											$phpthumbFilters->WatermarkOverlay($img_watermark_resized, $img_source_resized, 'C', $opacity, $margin);
-											imagecopy($this->gdimg_output, $img_watermark_resized, 0, 0, 0, 0, imagesx($this->gdimg_output), imagesy($this->gdimg_output));
-										} else {
-											$this->DebugMessage('phpthumb_functions::ImageCreateFunction('.$resized_x.', '.$resized_y.')', __FILE__, __LINE__);
-										}
-										imagedestroy($img_watermark_resized);
-									} else {
-										$this->DebugMessage('phpthumb_functions::ImageCreateFunction('.imagesx($this->gdimg_output).', '.imagesy($this->gdimg_output).')', __FILE__, __LINE__);
-									}
-
-								} else { // overlay
-
-									if ($img_watermark_resized = phpthumb_functions::ImageCreateFunction($resized_x, $resized_y)) {
-										imagealphablending($img_watermark_resized, false);
-										imagesavealpha($img_watermark_resized, true);
-										$this->ImageResizeFunction($img_watermark_resized, $img_watermark, 0, 0, 0, 0, imagesx($img_watermark_resized), imagesy($img_watermark_resized), imagesx($img_watermark), imagesy($img_watermark));
-										$phpthumbFilters->WatermarkOverlay($this->gdimg_output, $img_watermark_resized, 'C', $opacity, $margin);
-										imagedestroy($img_watermark_resized);
-									} else {
-										$this->DebugMessage('phpthumb_functions::ImageCreateFunction('.$resized_x.', '.$resized_y.')', __FILE__, __LINE__);
-									}
-
-								}
-								imagedestroy($img_watermark);
-
-							} else {
-								$this->DebugMessage('ImageCreateFromStringReplacement() failed for "'.$filename.'"', __FILE__, __LINE__);
-							}
-						} else {
-							$this->DebugMessage('Cannot open overlay file "'.$filename.'"', __FILE__, __LINE__);
-						}
-						break;
-
-					case 'wmi': // WaterMarkImage
-						@list($filename, $alignment, $opacity, $margin['x'], $margin['y'], $rotate_angle) = explode('|', $parameter, 6);
-						// $margin can be pixel margin or percent margin if $alignment is text, or max width/height if $alignment is position like "50x75"
-						$alignment    = ($alignment            ? $alignment            : 'BR');
-						$opacity      = (strlen($opacity)      ? (int) $opacity : 50);
-						$rotate_angle = (strlen($rotate_angle) ? (int) $rotate_angle : 0);
-						if (!preg_match('#^([0-9\\.\\-]*)x([0-9\\.\\-]*)$#i', $alignment, $matches)) {
-							$margins = array('x', 'y');
-							foreach ($margins as $xy) {
-								$margin[$xy] = (strlen($margin[$xy]) ? $margin[$xy] : 5);
-								if (($margin[$xy] > 0) && ($margin[$xy] < 1)) {
-									$margin[$xy] = min(0.499, $margin[$xy]);
-								} elseif (($margin[$xy] > -1) && ($margin[$xy] < 0)) {
-									$margin[$xy] = max(-0.499, $margin[$xy]);
-								}
-							}
-						}
-
-						$filename = $this->ResolveFilenameToAbsolute($filename);
-						if (@is_readable($filename)) {
-							if ($img_watermark = $this->ImageCreateFromFilename($filename)) {
-								if ($rotate_angle !== 0) {
-									$phpthumbFilters->ImprovedImageRotate($img_watermark, $rotate_angle, 'FFFFFF', null, $this);
-								}
-								if (preg_match('#^([0-9\\.\\-]*)x([0-9\\.\\-]*)$#i', $alignment, $matches)) {
-									$watermark_max_width  = (int) ($margin[ 'x'] ? $margin[ 'x'] : imagesx($img_watermark));
-									$watermark_max_height = (int) ($margin[ 'y'] ? $margin[ 'y'] : imagesy($img_watermark));
-									$scale = phpthumb_functions::ScaleToFitInBox(imagesx($img_watermark), imagesy($img_watermark), $watermark_max_width, $watermark_max_height, true, true);
-									$this->DebugMessage('Scaling watermark by a factor of '.number_format($scale, 4), __FILE__, __LINE__);
-									if (($scale > 1) || ($scale < 1)) {
-										if ($img_watermark2 = phpthumb_functions::ImageCreateFunction($scale * imagesx($img_watermark), $scale * imagesy($img_watermark))) {
-											imagealphablending($img_watermark2, false);
-											imagesavealpha($img_watermark2, true);
-											$this->ImageResizeFunction($img_watermark2, $img_watermark, 0, 0, 0, 0, imagesx($img_watermark2), imagesy($img_watermark2), imagesx($img_watermark), imagesy($img_watermark));
-											$img_watermark = $img_watermark2;
-										} else {
-											$this->DebugMessage('ImageCreateFunction('.($scale * imagesx($img_watermark)).', '.($scale * imagesx($img_watermark)).') failed', __FILE__, __LINE__);
-										}
-									}
-									$watermark_dest_x = round($matches[1] - (imagesx($img_watermark) / 2));
-									$watermark_dest_y = round($matches[2] - (imagesy($img_watermark) / 2));
-									$alignment = $watermark_dest_x.'x'.$watermark_dest_y;
-								}
-								$phpthumbFilters->WatermarkOverlay($this->gdimg_output, $img_watermark, $alignment, $opacity, $margin['x'], $margin['y']);
-								imagedestroy($img_watermark);
-								if (isset($img_watermark2) && is_resource($img_watermark2)) {
-									imagedestroy($img_watermark2);
-								}
-							} else {
-								$this->DebugMessage('ImageCreateFromFilename() failed for "'.$filename.'"', __FILE__, __LINE__);
-							}
-						} else {
-							$this->DebugMessage('!is_readable('.$filename.')', __FILE__, __LINE__);
-						}
-						break;
-
-					case 'wmt': // WaterMarkText
-						@list($text, $size, $alignment, $hex_color, $ttffont, $opacity, $margin, $angle, $bg_color, $bg_opacity, $fillextend, $lineheight) = explode('|', $parameter, 12);
-						$text       = ($text            ? $text       : '');
-						$size       = ($size            ? $size       : 3);
-						$alignment  = ($alignment       ? $alignment  : 'BR');
-						$hex_color  = ($hex_color       ? $hex_color  : '000000');
-						$ttffont    = ($ttffont         ? $ttffont    : '');
-						$opacity    = (strlen($opacity) ? $opacity    : 50);
-						$margin     = (strlen($margin)  ? $margin     : 5);
-						$angle      = (strlen($angle)   ? $angle      : 0);
-						$bg_color   = ($bg_color        ? $bg_color   : false);
-						$bg_opacity = ($bg_opacity      ? $bg_opacity : 0);
-						$fillextend = ($fillextend      ? $fillextend : '');
-						$lineheight = ($lineheight      ? $lineheight : 1.0);
-
-						if (basename($ttffont) == $ttffont) {
-							$ttffont = $this->realPathSafe($this->config_ttf_directory.DIRECTORY_SEPARATOR.$ttffont);
-						} else {
-							$ttffont = $this->ResolveFilenameToAbsolute($ttffont);
-						}
-						$phpthumbFilters->WatermarkText($this->gdimg_output, $text, $size, $alignment, $hex_color, $ttffont, $opacity, $margin, $angle, $bg_color, $bg_opacity, $fillextend, $lineheight);
-						break;
-
-					case 'blur': // Blur
-						@list($radius) = explode('|', $parameter, 1);
-						$radius = ($radius ? $radius : 1);
-						if (phpthumb_functions::gd_version() >= 2) {
-							$phpthumbFilters->Blur($this->gdimg_output, $radius);
-						} else {
-							$this->DebugMessage('Skipping Blur() because gd_version is "'.phpthumb_functions::gd_version().'"', __FILE__, __LINE__);
-						}
-						break;
-
-					case 'gblr': // Gaussian Blur
-						$phpthumbFilters->BlurGaussian($this->gdimg_output);
-						break;
-
-					case 'sblr': // Selective Blur
-						$phpthumbFilters->BlurSelective($this->gdimg_output);
-						break;
-
-					case 'mean': // MeanRemoval blur
-						$phpthumbFilters->MeanRemoval($this->gdimg_output);
-						break;
-
-					case 'smth': // Smooth blur
-						$phpthumbFilters->Smooth($this->gdimg_output, $parameter);
-						break;
-
-					case 'usm': // UnSharpMask sharpening
-						@list($amount, $radius, $threshold) = explode('|', $parameter, 3);
-						$amount    = ($amount            ? $amount    : 80);
-						$radius    = ($radius            ? $radius    : 0.5);
-						$threshold = (strlen($threshold) ? $threshold : 3);
-						if (phpthumb_functions::gd_version() >= 2.0) {
-							ob_start();
-							if (!@include_once( __DIR__ .'/phpthumb.unsharp.php')) {
-								$include_error = ob_get_contents();
-								if ($include_error) {
-									$this->DebugMessage('include_once("'. __DIR__ .'/phpthumb.unsharp.php") generated message: "'.$include_error.'"', __FILE__, __LINE__);
-								}
-								$this->DebugMessage('Error including "'. __DIR__ .'/phpthumb.unsharp.php" which is required for unsharp masking', __FILE__, __LINE__);
-								ob_end_clean();
-								return false;
-							}
-							ob_end_clean();
-							phpUnsharpMask::applyUnsharpMask($this->gdimg_output, $amount, $radius, $threshold);
-						} else {
-							$this->DebugMessage('Skipping unsharp mask because gd_version is "'.phpthumb_functions::gd_version().'"', __FILE__, __LINE__);
-							return false;
-						}
-						break;
-
-					case 'size': // Resize
-						@list($newwidth, $newheight, $stretch) = explode('|', $parameter);
-						$newwidth  = (!$newwidth  ? imagesx($this->gdimg_output) : ((($newwidth  > 0) && ($newwidth  < 1)) ? round($newwidth  * imagesx($this->gdimg_output)) : round($newwidth)));
-						$newheight = (!$newheight ? imagesy($this->gdimg_output) : ((($newheight > 0) && ($newheight < 1)) ? round($newheight * imagesy($this->gdimg_output)) : round($newheight)));
-						$stretch   = ($stretch ? true : false);
-						if ($stretch) {
-							$scale_x = phpthumb_functions::ScaleToFitInBox(imagesx($this->gdimg_output), imagesx($this->gdimg_output), $newwidth,  $newwidth,  true, true);
-							$scale_y = phpthumb_functions::ScaleToFitInBox(imagesy($this->gdimg_output), imagesy($this->gdimg_output), $newheight, $newheight, true, true);
-						} else {
-							$scale_x = phpthumb_functions::ScaleToFitInBox(imagesx($this->gdimg_output), imagesy($this->gdimg_output), $newwidth, $newheight, true, true);
-							$scale_y = $scale_x;
-						}
-						$this->DebugMessage('Scaling watermark ('.($stretch ? 'with' : 'without').' stretch) by a factor of "'.number_format($scale_x, 4).' x '.number_format($scale_y, 4).'"', __FILE__, __LINE__);
-						if (($scale_x > 1) || ($scale_x < 1) || ($scale_y > 1) || ($scale_y < 1)) {
-							if ($img_temp = phpthumb_functions::ImageCreateFunction(imagesx($this->gdimg_output), imagesy($this->gdimg_output))) {
-								imagecopy($img_temp, $this->gdimg_output, 0, 0, 0, 0, imagesx($this->gdimg_output), imagesy($this->gdimg_output));
-								if ($this->gdimg_output = phpthumb_functions::ImageCreateFunction($scale_x * imagesx($img_temp), $scale_y * imagesy($img_temp))) {
-									imagealphablending($this->gdimg_output, false);
-									imagesavealpha($this->gdimg_output, true);
-									$this->ImageResizeFunction($this->gdimg_output, $img_temp, 0, 0, 0, 0, imagesx($this->gdimg_output), imagesy($this->gdimg_output), imagesx($img_temp), imagesy($img_temp));
-								} else {
-									$this->DebugMessage('ImageCreateFunction('.($scale_x * imagesx($img_temp)).', '.($scale_y * imagesy($img_temp)).') failed', __FILE__, __LINE__);
-								}
-								imagedestroy($img_temp);
-							} else {
-								$this->DebugMessage('ImageCreateFunction('.imagesx($this->gdimg_output).', '.imagesy($this->gdimg_output).') failed', __FILE__, __LINE__);
-							}
-						}
-						break;
-
-					case 'rot': // ROTate
-						@list($angle, $bgcolor) = explode('|', $parameter, 2);
-						$phpthumbFilters->ImprovedImageRotate($this->gdimg_output, $angle, $bgcolor, null, $this);
-						break;
-
-					case 'stc': // Source Transparent Color
-						@list($hexcolor, $min_limit, $max_limit) = explode('|', $parameter, 3);
-						if (!phpthumb_functions::IsHexColor($hexcolor)) {
-							$this->DebugMessage('Skipping SourceTransparentColor hex color is invalid ('.$hexcolor.')', __FILE__, __LINE__);
-							return false;
-						}
-						$min_limit = (strlen($min_limit) ? $min_limit :  5);
-						$max_limit = (strlen($max_limit) ? $max_limit : 10);
-						if ($gdimg_mask = $phpthumbFilters->SourceTransparentColorMask($this->gdimg_output, $hexcolor, $min_limit, $max_limit)) {
-							$this->is_alpha = true;
-							$phpthumbFilters->ApplyMask($gdimg_mask, $this->gdimg_output);
-							imagedestroy($gdimg_mask);
-						} else {
-							$this->DebugMessage('SourceTransparentColorMask() failed for "'.$hexcolor.','.$min_limit.','.$max_limit.'"', __FILE__, __LINE__);
-						}
-						break;
-				}
-				$this->DebugMessage('Finished processing filter command "'.$command.'('.$parameter.')"', __FILE__, __LINE__);
-			}
-		}
-		return true;
-	}
-
-
-	public function MaxFileSize() {
-		if (phpthumb_functions::gd_version() < 2) {
-			$this->DebugMessage('Skipping MaxFileSize() because gd_version is "'.phpthumb_functions::gd_version().'"', __FILE__, __LINE__);
-			return false;
-		}
-		if ($this->maxb > 0) {
-			switch ($this->thumbnailFormat) {
-				case 'png':
-				case 'gif':
-					$imgRenderFunction = 'image'.$this->thumbnailFormat;
-
-					ob_start();
-					$imgRenderFunction($this->gdimg_output);
-					$imgdata = ob_get_contents();
-					ob_end_clean();
-
-					if (strlen($imgdata) > $this->maxb) {
-						for ($i = 8; $i >= 1; $i--) {
-							$tempIMG = imagecreatetruecolor(imagesx($this->gdimg_output), imagesy($this->gdimg_output));
-							imagecopy($tempIMG, $this->gdimg_output, 0, 0, 0, 0, imagesx($this->gdimg_output), imagesy($this->gdimg_output));
-							imagetruecolortopalette($tempIMG, true, pow(2, $i));
-							ob_start();
-							$imgRenderFunction($tempIMG);
-							$imgdata = ob_get_contents();
-							ob_end_clean();
-
-							if (strlen($imgdata) <= $this->maxb) {
-								imagetruecolortopalette($this->gdimg_output, true, pow(2, $i));
-								break;
-							}
-						}
-					}
-					break;
-
-				case 'jpeg':
-					ob_start();
-					imagejpeg($this->gdimg_output);
-					$imgdata = ob_get_contents();
-					ob_end_clean();
-
-					if (strlen($imgdata) > $this->maxb) {
-						for ($i = 3; $i < 20; $i++) {
-							$q = round(100 * (1 - log10($i / 2)));
-							ob_start();
-							imagejpeg($this->gdimg_output, null, $q);
-							$imgdata = ob_get_contents();
-							ob_end_clean();
-
-							$this->thumbnailQuality = $q;
-							if (strlen($imgdata) <= $this->maxb) {
-								break;
-							}
-						}
-					}
-					if (strlen($imgdata) > $this->maxb) {
-						return false;
-					}
-					break;
-
-				default:
-					return false;
-			}
-		}
-		return true;
-	}
-
-
-	public function CalculateThumbnailDimensions() {
-		$this->DebugMessage('CalculateThumbnailDimensions() starting with [W,H,sx,sy,sw,sh] initially set to ['.$this->source_width.','.$this->source_height.','.$this->sx.','.$this->sy.','.$this->sw.','.$this->sh.']', __FILE__, __LINE__);
+                                    $commandline .= ' -repage';
+                                } else {
+                                    $this->DebugMessage('Skipping "-repage" because ImageMagick (v'.$this->ImageMagickVersion().') does not support it', __FILE__, __LINE__);
+                                }
+                                if ($IMuseExplicitImageOutputDimensions) {
+                                    if ($this->w && !$this->h) {
+                                        $this->h = ceil($this->w / ($this->source_width / $this->source_height));
+                                    } elseif ($this->h && !$this->w) {
+                                        $this->w = ceil($this->h * ($this->source_width / $this->source_height));
+                                    }
+                                }
+                                $commandline .= ' -'.$IMresizeParameter.' '.phpthumb_functions::escapeshellarg_replacement($this->w.'x'.$this->h);
+                            }
+
+                        } else {
+
+                            if ($this->iar && ((int) $this->w > 0) && ((int) $this->h > 0)) {
+
+                                list($nw, $nh) = phpthumb_functions::TranslateWHbyAngle($this->w, $this->h, $this->ra);
+                                $nw = ((round($nw) != 0) ? round($nw) : '');
+                                $nh = ((round($nh) != 0) ? round($nh) : '');
+                                $commandline .= ' -'.$IMresizeParameter.' '.phpthumb_functions::escapeshellarg_replacement($nw.'x'.$nh.'!');
+
+                            } elseif ($this->far && ((int) $this->w > 0) && ((int) $this->h > 0)) {
+
+                                $commandline .= ' -'.$IMresizeParameter.' '.phpthumb_functions::escapeshellarg_replacement(phpthumb_functions::nonempty_min($this->w, $getimagesize[0]).'x'.phpthumb_functions::nonempty_min($this->h, $getimagesize[1]));
+                                $commandline .= ' -gravity center';
+                                $commandline .= ' -background '.phpthumb_functions::escapeshellarg_replacement('#'.$this->bg);
+                                $commandline .= ' -extent '.phpthumb_functions::escapeshellarg_replacement($this->w.'x'.$this->h);
+
+                            } else {
+
+                                $this->w = (($this->aoe && $this->w) ? $this->w : ($this->w ? phpthumb_functions::nonempty_min($this->w, $getimagesize[0]) : ''));
+                                $this->h = (($this->aoe && $this->h) ? $this->h : ($this->h ? phpthumb_functions::nonempty_min($this->h, $getimagesize[1]) : ''));
+                                if ($this->w || $this->h) {
+                                    if ($IMuseExplicitImageOutputDimensions) {
+                                        if ($this->w && !$this->h) {
+                                            $this->h = ceil($this->w / ($this->source_width / $this->source_height));
+                                        } elseif ($this->h && !$this->w) {
+                                            $this->w = ceil($this->h * ($this->source_width / $this->source_height));
+                                        }
+                                    }
+                                    list($nw, $nh) = phpthumb_functions::TranslateWHbyAngle($this->w, $this->h, $this->ra);
+                                    $nw = ((round($nw) != 0) ? round($nw) : '');
+                                    $nh = ((round($nh) != 0) ? round($nh) : '');
+                                    $commandline .= ' -'.$IMresizeParameter.' '.phpthumb_functions::escapeshellarg_replacement($nw.'x'.$nh);
+                                }
+
+                            }
+                        }
+                    }
+
+                } else {
+
+                    $this->DebugMessage('getimagesize('.$this->sourceFilename.') failed', __FILE__, __LINE__);
+                    if ($this->w || $this->h) {
+                        $exactDimensionsBang = (($this->iar && ((int) $this->w > 0) && ((int) $this->h > 0)) ? '!' : '');
+                        if ($IMuseExplicitImageOutputDimensions) {
+                            // unknown source aspect ratio, just put large number and hope IM figures it out
+                            $commandline .= ' -'.$IMresizeParameter.' '.phpthumb_functions::escapeshellarg_replacement(($this->w ? $this->w : '9999').'x'.($this->h ? $this->h : '9999').$exactDimensionsBang);
+                        } else {
+                            $commandline .= ' -'.$IMresizeParameter.' '.phpthumb_functions::escapeshellarg_replacement($this->w.'x'.$this->h.$exactDimensionsBang);
+                        }
+                    }
+
+                }
+
+                if ($this->ra) {
+                    $this->ra = (int) $this->ra;
+                    if ($this->ImageMagickSwitchAvailable('rotate')) {
+                        if (!preg_match('#('.implode('|', $this->AlphaCapableFormats).')#i', $outputFormat) || phpthumb_functions::version_compare_replacement($this->ImageMagickVersion(), '6.3.7', '>=')) {
+                            $this->DebugMessage('Using ImageMagick rotate', __FILE__, __LINE__);
+                            $commandline .= ' -rotate '.phpthumb_functions::escapeshellarg_replacement($this->ra);
+                            if (($this->ra % 90) != 0) {
+                                if (preg_match('#('.implode('|', $this->AlphaCapableFormats).')#i', $outputFormat)) {
+                                    // alpha-capable format
+                                    $commandline .= ' -background rgba(255,255,255,0)';
+                                } else {
+                                    $commandline .= ' -background '.phpthumb_functions::escapeshellarg_replacement('#'.($this->bg ? $this->bg : 'FFFFFF'));
+                                }
+                            }
+                            $this->ra = 0;
+                        } else {
+                            $this->DebugMessage('Not using ImageMagick rotate because alpha background buggy before v6.3.7', __FILE__, __LINE__);
+                        }
+                    } else {
+                        $this->DebugMessage('Not using ImageMagick rotate because not supported', __FILE__, __LINE__);
+                    }
+                }
+
+                $successfullyProcessedFilters = array();
+                foreach ($this->fltr as $filterkey => $filtercommand) {
+                    @list($command, $parameter) = explode('|', $filtercommand, 2);
+                    switch ($command) {
+                        case 'brit':
+                            if ($this->ImageMagickSwitchAvailable('modulate')) {
+                                $commandline .= ' -modulate '.phpthumb_functions::escapeshellarg_replacement((100 + (int) $parameter).',100,100');
+                                $successfullyProcessedFilters[] = $filterkey;
+                            }
+                            break;
+
+                        case 'cont':
+                            if ($this->ImageMagickSwitchAvailable('contrast')) {
+                                $contDiv10 = round((int) $parameter / 10);
+                                if ($contDiv10 > 0) {
+                                    $contDiv10 = min($contDiv10, 100);
+                                    for ($i = 0; $i < $contDiv10; $i++) {
+                                        $commandline .= ' -contrast'; // increase contrast by 10%
+                                    }
+                                } elseif ($contDiv10 < 0) {
+                                    $contDiv10 = max($contDiv10, -100);
+                                    for ($i = $contDiv10; $i < 0; $i++) {
+                                        $commandline .= ' +contrast'; // decrease contrast by 10%
+                                    }
+                                } else {
+                                    // do nothing
+                                }
+                                $successfullyProcessedFilters[] = $filterkey;
+                            }
+                            break;
+
+                        case 'ds':
+                            if ($this->ImageMagickSwitchAvailable(array('colorspace', 'modulate'))) {
+                                if ($parameter == 100) {
+                                    $commandline .= ' -colorspace GRAY';
+                                    $commandline .= ' -modulate 100,0,100';
+                                } else {
+                                    $commandline .= ' -modulate '.phpthumb_functions::escapeshellarg_replacement('100,'.(100 - (int) $parameter).',100');
+                                }
+                                $successfullyProcessedFilters[] = $filterkey;
+                            }
+                            break;
+
+                        case 'sat':
+                            if ($this->ImageMagickSwitchAvailable(array('colorspace', 'modulate'))) {
+                                if ($parameter == -100) {
+                                    $commandline .= ' -colorspace GRAY';
+                                    $commandline .= ' -modulate 100,0,100';
+                                } else {
+                                    $commandline .= ' -modulate '.phpthumb_functions::escapeshellarg_replacement('100,'.(100 + (int) $parameter).',100');
+                                }
+                                $successfullyProcessedFilters[] = $filterkey;
+                            }
+                            break;
+
+                        case 'gray':
+                            if ($this->ImageMagickSwitchAvailable(array('colorspace', 'modulate'))) {
+                                $commandline .= ' -colorspace GRAY';
+                                $commandline .= ' -modulate 100,0,100';
+                                $successfullyProcessedFilters[] = $filterkey;
+                            }
+                            break;
+
+                        case 'clr':
+                            if ($this->ImageMagickSwitchAvailable(array('fill', 'colorize'))) {
+                                @list($amount, $color) = explode('|', $parameter);
+                                $commandline .= ' -fill '.phpthumb_functions::escapeshellarg_replacement('#'.preg_replace('#[^0-9A-F]#i', '', $color));
+                                $commandline .= ' -colorize '.phpthumb_functions::escapeshellarg_replacement(min(max((int) $amount, 0), 100));
+                            }
+                            break;
+
+                        case 'sep':
+                            if ($this->ImageMagickSwitchAvailable('sepia-tone')) {
+                                @list($amount, $color) = explode('|', $parameter);
+                                $amount = ($amount ? $amount : 80);
+                                if (!$color) {
+                                    $commandline .= ' -sepia-tone '.phpthumb_functions::escapeshellarg_replacement(min(max((int) $amount, 0), 100).'%');
+                                    $successfullyProcessedFilters[] = $filterkey;
+                                }
+                            }
+                            break;
+
+                        case 'gam':
+                            @list($amount) = explode('|', $parameter);
+                            $amount = min(max((float) $amount, 0.001), 10);
+                            if (number_format($amount, 3) != '1.000') {
+                                if ($this->ImageMagickSwitchAvailable('gamma')) {
+                                    $commandline .= ' -gamma '.phpthumb_functions::escapeshellarg_replacement($amount);
+                                    $successfullyProcessedFilters[] = $filterkey;
+                                }
+                            }
+                            break;
+
+                        case 'neg':
+                            if ($this->ImageMagickSwitchAvailable('negate')) {
+                                $commandline .= ' -negate';
+                                $successfullyProcessedFilters[] = $filterkey;
+                            }
+                            break;
+
+                        case 'th':
+                            @list($amount) = explode('|', $parameter);
+                            if ($this->ImageMagickSwitchAvailable(array('threshold', 'dither', 'monochrome'))) {
+                                $commandline .= ' -threshold '.phpthumb_functions::escapeshellarg_replacement(round(min(max((int) $amount, 0), 255) / 2.55).'%');
+                                $commandline .= ' -dither';
+                                $commandline .= ' -monochrome';
+                                $successfullyProcessedFilters[] = $filterkey;
+                            }
+                            break;
+
+                        case 'rcd':
+                            if ($this->ImageMagickSwitchAvailable(array('colors', 'dither'))) {
+                                @list($colors, $dither) = explode('|', $parameter);
+                                $colors = ($colors                ?  (int) $colors : 256);
+                                $dither  = ((strlen($dither) > 0) ? (bool) $dither : true);
+                                $commandline .= ' -colors '.phpthumb_functions::escapeshellarg_replacement(max($colors, 8)); // ImageMagick will otherwise fail with "cannot quantize to fewer than 8 colors"
+                                $commandline .= ($dither ? ' -dither' : ' +dither');
+                                $successfullyProcessedFilters[] = $filterkey;
+                            }
+                            break;
+
+                        case 'flip':
+                            if ($this->ImageMagickSwitchAvailable(array('flip', 'flop'))) {
+                                if (strpos(strtolower($parameter), 'x') !== false) {
+                                    $commandline .= ' -flop';
+                                }
+                                if (strpos(strtolower($parameter), 'y') !== false) {
+                                    $commandline .= ' -flip';
+                                }
+                                $successfullyProcessedFilters[] = $filterkey;
+                            }
+                            break;
+
+                        case 'edge':
+                            if ($this->ImageMagickSwitchAvailable('edge')) {
+                                $parameter = (!empty($parameter) ? $parameter : 2);
+                                $commandline .= ' -edge '.phpthumb_functions::escapeshellarg_replacement(!empty($parameter) ? (int) $parameter : 1);
+                                $successfullyProcessedFilters[] = $filterkey;
+                            }
+                            break;
+
+                        case 'emb':
+                            if ($this->ImageMagickSwitchAvailable(array('emboss', 'negate'))) {
+                                $parameter = (!empty($parameter) ? $parameter : 2);
+                                $commandline .= ' -emboss '.phpthumb_functions::escapeshellarg_replacement((int) $parameter);
+                                if ($parameter < 2) {
+                                    $commandline .= ' -negate'; // ImageMagick negates the image for some reason with '-emboss 1';
+                                }
+                                $successfullyProcessedFilters[] = $filterkey;
+                            }
+                            break;
+
+                        case 'lvl':
+                            @list($band, $method, $threshold) = explode('|', $parameter);
+                            $band      = ($band ? preg_replace('#[^RGBA\\*]#', '', strtoupper($band))       : '*');
+                            $method    = ((strlen($method) > 0)    ? (int) $method :   2);
+                            $threshold = ((strlen($threshold) > 0) ? min(max((float) $threshold, 0), 100) : 0.1);
+
+                            $band = preg_replace('#[^RGBA\\*]#', '', strtoupper($band));
+
+                            if (($method > 1) && !$this->ImageMagickSwitchAvailable(array('channel', 'contrast-stretch'))) {
+                                // Because ImageMagick processing happens before PHP-GD filters, and because some
+                                // clipping is involved in the "lvl" filter, if "lvl" happens before "wb" then the
+                                // "wb" filter will have (almost) no effect. Therefore, if "wb" is enabled then
+                                // force the "lvl" filter to be processed by GD, not ImageMagick.
+                                foreach ($this->fltr as $fltr_key => $fltr_value) {
+                                    list($fltr_cmd) = explode('|', $fltr_value);
+                                    if ($fltr_cmd == 'wb') {
+                                        $this->DebugMessage('Setting "lvl" filter method to "0" (from "'.$method.'") because white-balance filter also enabled', __FILE__, __LINE__);
+                                        $method = 0;
+                                    }
+                                }
+                            }
+
+                            switch ($method) {
+                                case 0: // internal RGB
+                                case 1: // internal grayscale
+                                    break;
+                                case 2: // ImageMagick "contrast-stretch"
+                                    if ($this->ImageMagickSwitchAvailable('contrast-stretch')) {
+                                        if ($band != '*') {
+                                            $commandline .= ' -channel '.phpthumb_functions::escapeshellarg_replacement(strtoupper($band));
+                                        }
+                                        $threshold = preg_replace('#[^0-9\\.]#', '', $threshold); // should be unneccesary, but just to be double-sure
+                                        //$commandline .= ' -contrast-stretch '.phpthumb_functions::escapeshellarg_replacement($threshold.'%');
+                                        $commandline .= ' -contrast-stretch \''.$threshold.'%\'';
+                                        if ($band != '*') {
+                                            $commandline .= ' +channel';
+                                        }
+                                        $successfullyProcessedFilters[] = $filterkey;
+                                    }
+                                    break;
+                                case 3: // ImageMagick "normalize"
+                                    if ($this->ImageMagickSwitchAvailable('normalize')) {
+                                        if ($band != '*') {
+                                            $commandline .= ' -channel '.phpthumb_functions::escapeshellarg_replacement(strtoupper($band));
+                                        }
+                                        $commandline .= ' -normalize';
+                                        if ($band != '*') {
+                                            $commandline .= ' +channel';
+                                        }
+                                        $successfullyProcessedFilters[] = $filterkey;
+                                    }
+                                    break;
+                                default:
+                                    $this->DebugMessage('unsupported method ('.$method.') for "lvl" filter', __FILE__, __LINE__);
+                                    break;
+                            }
+                            if (isset($this->fltr[$filterkey]) && ($method > 1)) {
+                                $this->fltr[$filterkey] = $command.'|'.$band.'|0|'.$threshold;
+                                $this->DebugMessage('filter "lvl" remapped from method "'.$method.'" to method "0" because ImageMagick support is missing', __FILE__, __LINE__);
+                            }
+                            break;
+
+                        case 'wb':
+                            if ($this->ImageMagickSwitchAvailable(array('channel', 'contrast-stretch'))) {
+                                @list($threshold) = explode('|', $parameter);
+                                $threshold = (!empty($threshold) ? min(max((float) $threshold, 0), 100) : 0.1);
+                                $threshold = preg_replace('#[^0-9\\.]#', '', $threshold); // should be unneccesary, but just to be double-sure
+                                //$commandline .= ' -channel R -contrast-stretch '.phpthumb_functions::escapeshellarg_replacement($threshold.'%'); // doesn't work on Windows because most versions of PHP do not properly
+                                //$commandline .= ' -channel G -contrast-stretch '.phpthumb_functions::escapeshellarg_replacement($threshold.'%'); // escape special characters (such as %) and just replace them with spaces
+                                //$commandline .= ' -channel B -contrast-stretch '.phpthumb_functions::escapeshellarg_replacement($threshold.'%'); // https://bugs.php.net/bug.php?id=43261
+                                $commandline .= ' -channel R -contrast-stretch \''.$threshold.'%\'';
+                                $commandline .= ' -channel G -contrast-stretch \''.$threshold.'%\'';
+                                $commandline .= ' -channel B -contrast-stretch \''.$threshold.'%\'';
+                                $commandline .= ' +channel';
+                                $successfullyProcessedFilters[] = $filterkey;
+                            }
+                            break;
+
+                        case 'blur':
+                            if ($this->ImageMagickSwitchAvailable('blur')) {
+                                @list($radius) = explode('|', $parameter);
+                                $radius = (!empty($radius) ? min(max((int) $radius, 0), 25) : 1);
+                                $commandline .= ' -blur '.phpthumb_functions::escapeshellarg_replacement($radius);
+                                $successfullyProcessedFilters[] = $filterkey;
+                            }
+                            break;
+
+                        case 'gblr':
+                            @list($radius) = explode('|', $parameter);
+                            $radius = (!empty($radius) ? min(max((int) $radius, 0), 25) : 1);
+                            // "-gaussian" changed to "-gaussian-blur" sometime around 2009
+                            if ($this->ImageMagickSwitchAvailable('gaussian-blur')) {
+                                $commandline .= ' -gaussian-blur '.phpthumb_functions::escapeshellarg_replacement($radius);
+                                $successfullyProcessedFilters[] = $filterkey;
+                            } elseif ($this->ImageMagickSwitchAvailable('gaussian')) {
+                                $commandline .= ' -gaussian '.phpthumb_functions::escapeshellarg_replacement($radius);
+                                $successfullyProcessedFilters[] = $filterkey;
+                            }
+                            break;
+
+                        case 'usm':
+                            if ($this->ImageMagickSwitchAvailable('unsharp')) {
+                                @list($amount, $radius, $threshold) = explode('|', $parameter);
+                                $amount    = ($amount            ? min(max((int) $amount,    0), 255) : 80);
+                                $radius    = ($radius            ? min(max((int) $radius,    0),  10) : 0.5);
+                                $threshold = (strlen($threshold) ? min(max((int) $threshold, 0),  50) : 3);
+                                $commandline .= ' -unsharp '.phpthumb_functions::escapeshellarg_replacement(number_format(($radius * 2) - 1, 2, '.', '').'x1+'.number_format($amount / 100, 2, '.', '').'+'.number_format($threshold / 100, 2, '.', ''));
+                                $successfullyProcessedFilters[] = $filterkey;
+                            }
+                            break;
+
+                        case 'bord':
+                            if ($this->ImageMagickSwitchAvailable(array('border', 'bordercolor', 'thumbnail', 'crop'))) {
+                                if (!$this->zc) {
+                                    @list($width, $rX, $rY, $color) = explode('|', $parameter);
+                                    $width = (int) $width;
+                                    $rX    = (int) $rX;
+                                    $rY    = (int) $rY;
+                                    if ($width && !$rX && !$rY) {
+                                        if (!phpthumb_functions::IsHexColor($color)) {
+                                            $color = ((!empty($this->bc) && phpthumb_functions::IsHexColor($this->bc)) ? $this->bc : '000000');
+                                        }
+                                        $commandline .= ' -border '.phpthumb_functions::escapeshellarg_replacement((int) $width);
+                                        $commandline .= ' -bordercolor '.phpthumb_functions::escapeshellarg_replacement('#'.$color);
+
+                                        if (preg_match('# \\-crop "([0-9]+)x([0-9]+)\\+0\\+0" #', $commandline, $matches)) {
+                                            $commandline = str_replace(' -crop "'.$matches[1].'x'.$matches[2].'+0+0" ', ' -crop '.phpthumb_functions::escapeshellarg_replacement(($matches[1] - (2 * $width)).'x'.($matches[2] - (2 * $width)).'+0+0').' ', $commandline);
+                                        } elseif (preg_match('# \\-'.$IMresizeParameter.' "([0-9]+)x([0-9]+)" #', $commandline, $matches)) {
+                                            $commandline = str_replace(' -'.$IMresizeParameter.' "'.$matches[1].'x'.$matches[2].'" ', ' -'.$IMresizeParameter.' '.phpthumb_functions::escapeshellarg_replacement(($matches[1] - (2 * $width)).'x'.($matches[2] - (2 * $width))).' ', $commandline);
+                                        }
+                                        $successfullyProcessedFilters[] = $filterkey;
+                                    }
+                                }
+                            }
+                            break;
+
+                        case 'crop':
+                            break;
+
+                        case 'sblr':
+                            break;
+
+                        case 'mean':
+                            break;
+
+                        case 'smth':
+                            break;
+
+                        case 'bvl':
+                            break;
+
+                        case 'wmi':
+                            break;
+
+                        case 'wmt':
+                            break;
+
+                        case 'over':
+                            break;
+
+                        case 'hist':
+                            break;
+
+                        case 'fram':
+                            break;
+
+                        case 'drop':
+                            break;
+
+                        case 'mask':
+                            break;
+
+                        case 'elip':
+                            break;
+
+                        case 'ric':
+                            break;
+
+                        case 'stc':
+                            break;
+
+                        case 'size':
+                            break;
+
+                        default:
+                            $this->DebugMessage('Unknown $this->fltr['.$filterkey.'] ('.$filtercommand.') -- deleting filter command', __FILE__, __LINE__);
+                            $successfullyProcessedFilters[] = $filterkey;
+                            break;
+                    }
+                    if (!isset($this->fltr[$filterkey])) {
+                        $this->DebugMessage('Processed $this->fltr['.$filterkey.'] ('.$filtercommand.') with ImageMagick', __FILE__, __LINE__);
+                    } else {
+                        $this->DebugMessage('Skipping $this->fltr['.$filterkey.'] ('.$filtercommand.') with ImageMagick', __FILE__, __LINE__);
+                    }
+                }
+                $this->DebugMessage('Remaining $this->fltr after ImageMagick: ('.$this->phpThumbDebugVarDump($this->fltr).')', __FILE__, __LINE__);
+                if (count($this->fltr) > 0) {
+                    $this->useRawIMoutput = false;
+                }
+
+                if (preg_match('#jpe?g#i', $outputFormat) && $this->q) {
+                    if ($this->ImageMagickSwitchAvailable(array('quality', 'interlace'))) {
+                        $commandline .= ' -quality '.phpthumb_functions::escapeshellarg_replacement($this->thumbnailQuality);
+                        if ($this->config_output_interlace) {
+                            // causes weird things with animated GIF... leave for JPEG only
+                            $commandline .= ' -interlace line '; // Use Line or Plane to create an interlaced PNG or GIF or progressive JPEG image
+                        }
+                    }
+                }
+                $commandline .= ' '.$outputFormat.':'.phpthumb_functions::escapeshellarg_replacement($IMtempfilename);
+                if (!$this->iswindows) {
+                    $commandline .= ' 2>&1';
+                }
+                $this->DebugMessage('ImageMagick called as ('.$commandline.')', __FILE__, __LINE__);
+                $IMresult = phpthumb_functions::SafeExec($commandline);
+                clearstatcache();
+                if (!@file_exists($IMtempfilename) || !@filesize($IMtempfilename)) {
+                    $this->FatalError('ImageMagick failed with message ('.trim($IMresult).')');
+                    $this->DebugMessage('ImageMagick failed with message ('.trim($IMresult).')', __FILE__, __LINE__);
+                    if ($this->iswindows && !$IMresult) {
+                        $this->DebugMessage('Check to make sure that PHP has read+write permissions to "'.dirname($IMtempfilename).'"', __FILE__, __LINE__);
+                    }
+
+                } else {
+
+                    foreach ($successfullyProcessedFilters as $dummy => $filterkey) {
+                        unset($this->fltr[$filterkey]);
+                    }
+                    $this->IMresizedData = file_get_contents($IMtempfilename);
+                    $getimagesize_imresized = @getimagesize($IMtempfilename);
+                    $this->DebugMessage('getimagesize('.$IMtempfilename.') returned [w='.$getimagesize_imresized[0].';h='.$getimagesize_imresized[1].';f='.$getimagesize_imresized[2].']', __FILE__, __LINE__);
+                    if (($this->config_max_source_pixels > 0) && (($getimagesize_imresized[0] * $getimagesize_imresized[1]) > $this->config_max_source_pixels)) {
+                        $this->DebugMessage('skipping ImageMagickThumbnailToGD::'.$ImageCreateFunction.'() because IM output is too large ('.$getimagesize_imresized[0].'x'.$getimagesize_imresized[0].' = '.($getimagesize_imresized[0] * $getimagesize_imresized[1]).' > '.$this->config_max_source_pixels.')', __FILE__, __LINE__);
+                    } elseif (function_exists(@$ImageCreateFunction) && ($this->gdimg_source = @$ImageCreateFunction($IMtempfilename))) {
+                        $this->source_width  = imagesx($this->gdimg_source);
+                        $this->source_height = imagesy($this->gdimg_source);
+                        $this->DebugMessage('ImageMagickThumbnailToGD::'.$ImageCreateFunction.'() succeeded, $this->gdimg_source is now ('.$this->source_width.'x'.$this->source_height.')', __FILE__, __LINE__);
+                        $this->DebugMessage('ImageMagickThumbnailToGD() returning $this->IMresizedData ('.strlen($this->IMresizedData).' bytes)', __FILE__, __LINE__);
+                    } else {
+                        $this->useRawIMoutput = true;
+                        $this->DebugMessage('$this->useRawIMoutput set to TRUE because '.@$ImageCreateFunction.'('.$IMtempfilename.') failed', __FILE__, __LINE__);
+                    }
+                    if (file_exists($IMtempfilename)) {
+                        $this->DebugMessage('deleting "'.$IMtempfilename.'"', __FILE__, __LINE__);
+                        @unlink($IMtempfilename);
+                    }
+                    return true;
+
+                }
+                if (file_exists($IMtempfilename)) {
+                    $this->DebugMessage('deleting "'.$IMtempfilename.'"', __FILE__, __LINE__);
+                    @unlink($IMtempfilename);
+                }
+
+            } elseif ($this->issafemode) {
+                $this->DebugMessage('ImageMagickThumbnailToGD() aborting because PHP safe_mode is enabled and phpThumb_tempnam() failed', __FILE__, __LINE__);
+                $this->useRawIMoutput = false;
+            } else {
+                if (file_exists($IMtempfilename)) {
+                    $this->DebugMessage('deleting "'.$IMtempfilename.'"', __FILE__, __LINE__);
+                    @unlink($IMtempfilename);
+                }
+                $this->DebugMessage('ImageMagickThumbnailToGD() aborting, phpThumb_tempnam() failed', __FILE__, __LINE__);
+            }
+        } else {
+            $this->DebugMessage('ImageMagickThumbnailToGD() aborting because ImageMagickCommandlineBase() failed', __FILE__, __LINE__);
+        }
+        $this->useRawIMoutput = false;
+        return false;
+    }
+
+
+    public function Rotate() {
+        if ($this->ra || $this->ar) {
+            if (!function_exists('imagerotate')) {
+                $this->DebugMessage('!function_exists(imagerotate)', __FILE__, __LINE__);
+                return false;
+            }
+            if (!include_once( __DIR__ .'/phpthumb.filters.php')) {
+                $this->DebugMessage('Error including "'. __DIR__ .'/phpthumb.filters.php" which is required for applying filters ('.implode(';', $this->fltr).')', __FILE__, __LINE__);
+                return false;
+            }
+
+            $this->config_background_hexcolor = ($this->bg ? $this->bg : $this->config_background_hexcolor);
+            if (!phpthumb_functions::IsHexColor($this->config_background_hexcolor)) {
+                return $this->ErrorImage('Invalid hex color string "'.$this->config_background_hexcolor.'" for parameter "bg"');
+            }
+
+            $rotate_angle = 0;
+            if ($this->ra) {
+
+                $rotate_angle = (float) $this->ra;
+
+            } else {
+
+                if ($this->ar == 'x') {
+                    if (phpthumb_functions::version_compare_replacement(PHP_VERSION, '4.2.0', '>=')) {
+                        if ($this->sourceFilename) {
+                            if (function_exists('exif_read_data')) {
+                                if ($exif_data = @exif_read_data($this->sourceFilename, 'IFD0')) {
+                                    // http://sylvana.net/jpegcrop/exif_orientation.html
+                                    switch (@$exif_data['Orientation']) {
+                                        case 1:
+                                            $rotate_angle = 0;
+                                            break;
+                                        case 3:
+                                            $rotate_angle = 180;
+                                            break;
+                                        case 6:
+                                            $rotate_angle = 270;
+                                            break;
+                                        case 8:
+                                            $rotate_angle = 90;
+                                            break;
+
+                                        default:
+                                            $this->DebugMessage('EXIF auto-rotate failed because unknown $exif_data[Orientation] "'.@$exif_data['Orientation'].'"', __FILE__, __LINE__);
+                                            return false;
+                                            break;
+                                    }
+                                    $this->DebugMessage('EXIF auto-rotate set to '.$rotate_angle.' degrees ($exif_data[Orientation] = "'.@$exif_data['Orientation'].'")', __FILE__, __LINE__);
+                                } else {
+                                    $this->DebugMessage('failed: exif_read_data('.$this->sourceFilename.')', __FILE__, __LINE__);
+                                    return false;
+                                }
+                            } else {
+                                $this->DebugMessage('!function_exists(exif_read_data)', __FILE__, __LINE__);
+                                return false;
+                            }
+                        } else {
+                            $this->DebugMessage('Cannot auto-rotate from EXIF data because $this->sourceFilename is empty', __FILE__, __LINE__);
+                            return false;
+                        }
+                    } else {
+                        $this->DebugMessage('Cannot auto-rotate from EXIF data because PHP is less than v4.2.0 ('. PHP_VERSION .')', __FILE__, __LINE__);
+                        return false;
+                    }
+                } elseif (($this->ar == 'l') && ($this->source_height > $this->source_width)) {
+                    $rotate_angle = 270;
+                } elseif (($this->ar == 'L') && ($this->source_height > $this->source_width)) {
+                    $rotate_angle = 90;
+                } elseif (($this->ar == 'p') && ($this->source_width > $this->source_height)) {
+                    $rotate_angle = 90;
+                } elseif (($this->ar == 'P') && ($this->source_width > $this->source_height)) {
+                    $rotate_angle = 270;
+                }
+
+            }
+            if ($rotate_angle % 90) {
+                $this->is_alpha = true;
+            }
+            phpthumb_filters::ImprovedImageRotate($this->gdimg_source, $rotate_angle, $this->config_background_hexcolor, $this->bg, $this);
+            $this->source_width  = imagesx($this->gdimg_source);
+            $this->source_height = imagesy($this->gdimg_source);
+        }
+        return true;
+    }
+
+
+    public function FixedAspectRatio() {
+        // optional fixed-dimension images (regardless of aspect ratio)
+
+        if (!$this->far) {
+            // do nothing
+            return true;
+        }
+
+        if (!$this->w || !$this->h) {
+            return false;
+        }
+        $this->thumbnail_width  = $this->w;
+        $this->thumbnail_height = $this->h;
+        $this->is_alpha = true;
+        if ($this->thumbnail_image_width >= $this->thumbnail_width) {
+
+            $aspectratio = $this->thumbnail_image_height / $this->thumbnail_image_width;
+            if ($this->w) {
+                $this->thumbnail_image_height = round($this->thumbnail_image_width * $aspectratio);
+                $this->thumbnail_height = ($this->h ? $this->h : $this->thumbnail_image_height);
+            } elseif ($this->thumbnail_image_height < $this->thumbnail_height) {
+                $this->thumbnail_image_height = $this->thumbnail_height;
+                $this->thumbnail_image_width  = round($this->thumbnail_image_height / $aspectratio);
+            }
+
+        } else {
+
+            $aspectratio = $this->thumbnail_image_width / $this->thumbnail_image_height;
+            if ($this->h) {
+                $this->thumbnail_image_width = round($this->thumbnail_image_height * $aspectratio);
+            } elseif ($this->thumbnail_image_width < $this->thumbnail_width) {
+                $this->thumbnail_image_width = $this->thumbnail_width;
+                $this->thumbnail_image_height  = round($this->thumbnail_image_width / $aspectratio);
+            }
+
+        }
+        return true;
+    }
+
+
+    public function OffsiteDomainIsAllowed($hostname, $allowed_domains) {
+        static $domain_is_allowed = array();
+        $hostname = strtolower($hostname);
+        if (!isset($domain_is_allowed[$hostname])) {
+            $domain_is_allowed[$hostname] = false;
+            foreach ($allowed_domains as $valid_domain) {
+                $starpos = strpos($valid_domain, '*');
+                if ($starpos !== false) {
+                    $valid_domain = substr($valid_domain, $starpos + 1);
+                    if (preg_match('#'.preg_quote($valid_domain).'$#', $hostname)) {
+                        $domain_is_allowed[$hostname] = true;
+                        break;
+                    }
+                } else {
+                    if (strtolower($valid_domain) === $hostname) {
+                        $domain_is_allowed[$hostname] = true;
+                        break;
+                    }
+                }
+            }
+        }
+        return $domain_is_allowed[$hostname];
+    }
+
+
+    public function AntiOffsiteLinking() {
+        // Optional anti-offsite hijacking of the thumbnail script
+        $allow   = true;
+        if ($allow && $this->config_nooffsitelink_enabled && (@$_SERVER['HTTP_REFERER'] || $this->config_nooffsitelink_require_refer)) {
+            $this->DebugMessage('AntiOffsiteLinking() checking $_SERVER[HTTP_REFERER] "'.@$_SERVER['HTTP_REFERER'].'"', __FILE__, __LINE__);
+            foreach ($this->config_nooffsitelink_valid_domains as $key => $valid_domain) {
+                // $_SERVER['HTTP_HOST'] contains the port number, so strip it out here to make default configuration work
+                list($clean_domain) = explode(':', $valid_domain);
+                $this->config_nooffsitelink_valid_domains[$key] = $clean_domain;
+            }
+            $parsed_url = phpthumb_functions::ParseURLbetter(@$_SERVER['HTTP_REFERER']);
+            if (!$this->OffsiteDomainIsAllowed(@$parsed_url['host'], $this->config_nooffsitelink_valid_domains)) {
+                $allow   = false;
+                //$this->DebugMessage('AntiOffsiteLinking() - "'.@$parsed_url['host'].'" is NOT in $this->config_nooffsitelink_valid_domains ('.implode(';', $this->config_nooffsitelink_valid_domains).')', __FILE__, __LINE__);
+                $this->ErrorImage('AntiOffsiteLinking() - "'.@$parsed_url['host'].'" is NOT in $this->config_nooffsitelink_valid_domains ('.implode(';', $this->config_nooffsitelink_valid_domains).')');
+            } else {
+                $this->DebugMessage('AntiOffsiteLinking() - "'.@$parsed_url['host'].'" is in $this->config_nooffsitelink_valid_domains ('.implode(';', $this->config_nooffsitelink_valid_domains).')', __FILE__, __LINE__);
+            }
+        }
+
+        if ($allow && $this->config_nohotlink_enabled && preg_match('#^(f|ht)tps?\://#i', $this->src)) {
+            $parsed_url = phpthumb_functions::ParseURLbetter($this->src);
+            //if (!phpthumb_functions::CaseInsensitiveInArray(@$parsed_url['host'], $this->config_nohotlink_valid_domains)) {
+            if (!$this->OffsiteDomainIsAllowed(@$parsed_url['host'], $this->config_nohotlink_valid_domains)) {
+                // This domain is not allowed
+                $allow = false;
+                $this->DebugMessage('AntiOffsiteLinking() - "'.$parsed_url['host'].'" is NOT in $this->config_nohotlink_valid_domains ('.implode(';', $this->config_nohotlink_valid_domains).')', __FILE__, __LINE__);
+            } else {
+                $this->DebugMessage('AntiOffsiteLinking() - "'.$parsed_url['host'].'" is in $this->config_nohotlink_valid_domains ('.implode(';', $this->config_nohotlink_valid_domains).')', __FILE__, __LINE__);
+            }
+        }
+
+        if ($allow) {
+            $this->DebugMessage('AntiOffsiteLinking() says this is allowed', __FILE__, __LINE__);
+            return true;
+        }
+
+        if (!phpthumb_functions::IsHexColor($this->config_error_bgcolor)) {
+            return $this->ErrorImage('Invalid hex color string "'.$this->config_error_bgcolor.'" for $this->config_error_bgcolor');
+        }
+        if (!phpthumb_functions::IsHexColor($this->config_error_textcolor)) {
+            return $this->ErrorImage('Invalid hex color string "'.$this->config_error_textcolor.'" for $this->config_error_textcolor');
+        }
+        if ($this->config_nooffsitelink_erase_image) {
+
+            return $this->ErrorImage($this->config_nooffsitelink_text_message, $this->thumbnail_width, $this->thumbnail_height);
+
+        } else {
+
+            $this->config_nooffsitelink_watermark_src = $this->ResolveFilenameToAbsolute($this->config_nooffsitelink_watermark_src);
+            if (is_file($this->config_nooffsitelink_watermark_src)) {
+
+                if (!include_once( __DIR__ .'/phpthumb.filters.php')) {
+                    $this->DebugMessage('Error including "'. __DIR__ .'/phpthumb.filters.php" which is required for applying watermark', __FILE__, __LINE__);
+                    return false;
+                }
+                $watermark_img = $this->ImageCreateFromStringReplacement(file_get_contents($this->config_nooffsitelink_watermark_src));
+                $phpthumbFilters = new phpthumb_filters();
+                $phpthumbFilters->phpThumbObject = &$this;
+                $opacity = 50;
+                $margin  = 5;
+                $phpthumbFilters->WatermarkOverlay($this->gdimg_output, $watermark_img, '*', $opacity, $margin);
+                imagedestroy($watermark_img);
+                unset($phpthumbFilters);
+
+            } else {
+
+                $nohotlink_text_array = explode("\n", wordwrap($this->config_nooffsitelink_text_message, floor($this->thumbnail_width / imagefontwidth($this->config_error_fontsize)), "\n"));
+                $nohotlink_text_color = phpthumb_functions::ImageHexColorAllocate($this->gdimg_output, $this->config_error_textcolor);
+
+                $topoffset = round(($this->thumbnail_height - (count($nohotlink_text_array) * imagefontheight($this->config_error_fontsize))) / 2);
+
+                $rowcounter = 0;
+                $this->DebugMessage('AntiOffsiteLinking() writing '.count($nohotlink_text_array).' lines of text "'.$this->config_nooffsitelink_text_message.'" (in #'.$this->config_error_textcolor.') on top of image', __FILE__, __LINE__);
+                foreach ($nohotlink_text_array as $textline) {
+                    $leftoffset = max(0, round(($this->thumbnail_width - (strlen($textline) * imagefontwidth($this->config_error_fontsize))) / 2));
+                    imagestring($this->gdimg_output, $this->config_error_fontsize, $leftoffset, $topoffset + ($rowcounter++ * imagefontheight($this->config_error_fontsize)), $textline, $nohotlink_text_color);
+                }
+
+            }
+
+        }
+        return true;
+    }
+
+
+    public function AlphaChannelFlatten() {
+        if (!$this->is_alpha) {
+            // image doesn't have alpha transparency, no need to flatten
+            $this->DebugMessage('skipping AlphaChannelFlatten() because !$this->is_alpha', __FILE__, __LINE__);
+            return false;
+        }
+        switch ($this->thumbnailFormat) {
+            case 'png':
+            case 'ico':
+                // image has alpha transparency, but output as PNG or ICO which can handle it
+                $this->DebugMessage('skipping AlphaChannelFlatten() because ($this->thumbnailFormat == "'.$this->thumbnailFormat.'")', __FILE__, __LINE__);
+                return false;
+                break;
+
+            case 'gif':
+                // image has alpha transparency, but output as GIF which can handle only single-color transparency
+                $CurrentImageColorTransparent = imagecolortransparent($this->gdimg_output);
+                if ($CurrentImageColorTransparent == -1) {
+                    // no transparent color defined
+
+                    if (phpthumb_functions::gd_version() < 2.0) {
+                        $this->DebugMessage('AlphaChannelFlatten() failed because GD version is "'.phpthumb_functions::gd_version().'"', __FILE__, __LINE__);
+                        return false;
+                    }
+
+                    if ($img_alpha_mixdown_dither = @imagecreatetruecolor(imagesx($this->gdimg_output), imagesy($this->gdimg_output))) {
+
+                        $dither_color = array();
+                        for ($i = 0; $i <= 255; $i++) {
+                            $dither_color[$i] = imagecolorallocate($img_alpha_mixdown_dither, $i, $i, $i);
+                        }
+
+                        // scan through current truecolor image copy alpha channel to temp image as grayscale
+                        for ($x = 0; $x < $this->thumbnail_width; $x++) {
+                            for ($y = 0; $y < $this->thumbnail_height; $y++) {
+                                $PixelColor = phpthumb_functions::GetPixelColor($this->gdimg_output, $x, $y);
+                                imagesetpixel($img_alpha_mixdown_dither, $x, $y, $dither_color[($PixelColor['alpha'] * 2)]);
+                            }
+                        }
+
+                        // dither alpha channel grayscale version down to 2 colors
+                        imagetruecolortopalette($img_alpha_mixdown_dither, true, 2);
+
+                        // reduce color palette to 256-1 colors (leave one palette position for transparent color)
+                        imagetruecolortopalette($this->gdimg_output, true, 255);
+
+                        // allocate a new color for transparent color index
+                        $TransparentColor = imagecolorallocate($this->gdimg_output, 1, 254, 253);
+                        imagecolortransparent($this->gdimg_output, $TransparentColor);
+
+                        // scan through alpha channel image and note pixels with >50% transparency
+                        for ($x = 0; $x < $this->thumbnail_width; $x++) {
+                            for ($y = 0; $y < $this->thumbnail_height; $y++) {
+                                $AlphaChannelPixel = phpthumb_functions::GetPixelColor($img_alpha_mixdown_dither, $x, $y);
+                                if ($AlphaChannelPixel['red'] > 127) {
+                                    imagesetpixel($this->gdimg_output, $x, $y, $TransparentColor);
+                                }
+                            }
+                        }
+                        imagedestroy($img_alpha_mixdown_dither);
+
+                        $this->DebugMessage('AlphaChannelFlatten() set image to 255+1 colors with transparency for GIF output', __FILE__, __LINE__);
+                        return true;
+
+                    } else {
+                        $this->DebugMessage('AlphaChannelFlatten() failed imagecreate('.imagesx($this->gdimg_output).', '.imagesy($this->gdimg_output).')', __FILE__, __LINE__);
+                        return false;
+                    }
+
+                } else {
+                    // a single transparent color already defined, leave as-is
+                    $this->DebugMessage('skipping AlphaChannelFlatten() because ($this->thumbnailFormat == "'.$this->thumbnailFormat.'") and imagecolortransparent() returned "'.$CurrentImageColorTransparent.'"', __FILE__, __LINE__);
+                    return true;
+                }
+                break;
+        }
+        $this->DebugMessage('continuing AlphaChannelFlatten() for output format "'.$this->thumbnailFormat.'"', __FILE__, __LINE__);
+        // image has alpha transparency, and is being output in a format that doesn't support it -- flatten
+        if ($gdimg_flatten_temp = phpthumb_functions::ImageCreateFunction($this->thumbnail_width, $this->thumbnail_height)) {
+
+            $this->config_background_hexcolor = ($this->bg ? $this->bg : $this->config_background_hexcolor);
+            if (!phpthumb_functions::IsHexColor($this->config_background_hexcolor)) {
+                return $this->ErrorImage('Invalid hex color string "'.$this->config_background_hexcolor.'" for parameter "bg"');
+            }
+            $background_color = phpthumb_functions::ImageHexColorAllocate($this->gdimg_output, $this->config_background_hexcolor);
+            imagefilledrectangle($gdimg_flatten_temp, 0, 0, $this->thumbnail_width, $this->thumbnail_height, $background_color);
+            imagecopy($gdimg_flatten_temp, $this->gdimg_output, 0, 0, 0, 0, $this->thumbnail_width, $this->thumbnail_height);
+
+            imagealphablending($this->gdimg_output, true);
+            imagesavealpha($this->gdimg_output, false);
+            imagecolortransparent($this->gdimg_output, -1);
+            imagecopy($this->gdimg_output, $gdimg_flatten_temp, 0, 0, 0, 0, $this->thumbnail_width, $this->thumbnail_height);
+
+            imagedestroy($gdimg_flatten_temp);
+            return true;
+
+        } else {
+            $this->DebugMessage('ImageCreateFunction() failed', __FILE__, __LINE__);
+        }
+        return false;
+    }
+
+
+    public function ApplyFilters() {
+        if ($this->fltr && is_array($this->fltr)) {
+            if (!include_once( __DIR__ .'/phpthumb.filters.php')) {
+                $this->DebugMessage('Error including "'. __DIR__ .'/phpthumb.filters.php" which is required for applying filters ('.implode(';', $this->fltr).')', __FILE__, __LINE__);
+                return false;
+            }
+            $phpthumbFilters = new phpthumb_filters();
+            $phpthumbFilters->phpThumbObject = &$this;
+            foreach ($this->fltr as $filtercommand) {
+                @list($command, $parameter) = explode('|', $filtercommand, 2);
+                $this->DebugMessage('Attempting to process filter command "'.$command.'('.$parameter.')"', __FILE__, __LINE__);
+                switch ($command) {
+                    case 'brit': // Brightness
+                        $phpthumbFilters->Brightness($this->gdimg_output, $parameter);
+                        break;
+
+                    case 'cont': // Contrast
+                        $phpthumbFilters->Contrast($this->gdimg_output, $parameter);
+                        break;
+
+                    case 'ds': // Desaturation
+                        $phpthumbFilters->Desaturate($this->gdimg_output, $parameter, '');
+                        break;
+
+                    case 'sat': // Saturation
+                        $phpthumbFilters->Saturation($this->gdimg_output, $parameter, '');
+                        break;
+
+                    case 'gray': // Grayscale
+                        $phpthumbFilters->Grayscale($this->gdimg_output);
+                        break;
+
+                    case 'clr': // Colorize
+                        if (phpthumb_functions::gd_version() < 2) {
+                            $this->DebugMessage('Skipping Colorize() because gd_version is "'.phpthumb_functions::gd_version().'"', __FILE__, __LINE__);
+                            break;
+                        }
+                        @list($amount, $color) = explode('|', $parameter, 2);
+                        $phpthumbFilters->Colorize($this->gdimg_output, $amount, $color);
+                        break;
+
+                    case 'sep': // Sepia
+                        if (phpthumb_functions::gd_version() < 2) {
+                            $this->DebugMessage('Skipping Sepia() because gd_version is "'.phpthumb_functions::gd_version().'"', __FILE__, __LINE__);
+                            break;
+                        }
+                        @list($amount, $color) = explode('|', $parameter, 2);
+                        $phpthumbFilters->Sepia($this->gdimg_output, $amount, $color);
+                        break;
+
+                    case 'gam': // Gamma correction
+                        $phpthumbFilters->Gamma($this->gdimg_output, $parameter);
+                        break;
+
+                    case 'neg': // Negative colors
+                        $phpthumbFilters->Negative($this->gdimg_output);
+                        break;
+
+                    case 'th': // Threshold
+                        $phpthumbFilters->Threshold($this->gdimg_output, $parameter);
+                        break;
+
+                    case 'rcd': // ReduceColorDepth
+                        if (phpthumb_functions::gd_version() < 2) {
+                            $this->DebugMessage('Skipping ReduceColorDepth() because gd_version is "'.phpthumb_functions::gd_version().'"', __FILE__, __LINE__);
+                            break;
+                        }
+                        @list($colors, $dither) = explode('|', $parameter, 2);
+                        $colors = ($colors                ?  (int) $colors : 256);
+                        $dither  = ((strlen($dither) > 0) ? (bool) $dither : true);
+                        $phpthumbFilters->ReduceColorDepth($this->gdimg_output, $colors, $dither);
+                        break;
+
+                    case 'flip': // Flip
+                        $phpthumbFilters->Flip($this->gdimg_output, (strpos(strtolower($parameter), 'x') !== false), (strpos(strtolower($parameter), 'y') !== false));
+                        break;
+
+                    case 'edge': // EdgeDetect
+                        $phpthumbFilters->EdgeDetect($this->gdimg_output);
+                        break;
+
+                    case 'emb': // Emboss
+                        $phpthumbFilters->Emboss($this->gdimg_output);
+                        break;
+
+                    case 'bvl': // Bevel
+                        @list($width, $color1, $color2) = explode('|', $parameter, 3);
+                        $phpthumbFilters->Bevel($this->gdimg_output, $width, $color1, $color2);
+                        break;
+
+                    case 'lvl': // autoLevels
+                        @list($band, $method, $threshold) = explode('|', $parameter, 3);
+                        $band      = ($band ? preg_replace('#[^RGBA\\*]#', '', strtoupper($band)) : '*');
+                        $method    = ((strlen($method) > 0)    ? (int) $method :   2);
+                        $threshold = ((strlen($threshold) > 0) ? (float) $threshold : 0.1);
+
+                        $phpthumbFilters->HistogramStretch($this->gdimg_output, $band, $method, $threshold);
+                        break;
+
+                    case 'wb': // WhiteBalance
+                        $phpthumbFilters->WhiteBalance($this->gdimg_output, $parameter);
+                        break;
+
+                    case 'hist': // Histogram overlay
+                        if (phpthumb_functions::gd_version() < 2) {
+                            $this->DebugMessage('Skipping HistogramOverlay() because gd_version is "'.phpthumb_functions::gd_version().'"', __FILE__, __LINE__);
+                            break;
+                        }
+                        @list($bands, $colors, $width, $height, $alignment, $opacity, $margin_x, $margin_y) = explode('|', $parameter, 8);
+                        $bands     = ($bands     ? $bands     :  '*');
+                        $colors    = ($colors    ? $colors    :   '');
+                        $width     = ($width     ? $width     : 0.25);
+                        $height    = ($height    ? $height    : 0.25);
+                        $alignment = ($alignment ? $alignment : 'BR');
+                        $opacity   = ($opacity   ? $opacity   :   50);
+                        $margin_x  = ($margin_x  ? $margin_x  :    5);
+                        // $margin_y -- it wasn't forgotten, let the value always pass unchanged
+                        $phpthumbFilters->HistogramOverlay($this->gdimg_output, $bands, $colors, $width, $height, $alignment, $opacity, $margin_x, $margin_y);
+                        break;
+
+                    case 'fram': // Frame
+                        @list($frame_width, $edge_width, $color_frame, $color1, $color2) = explode('|', $parameter, 5);
+                        $phpthumbFilters->Frame($this->gdimg_output, $frame_width, $edge_width, $color_frame, $color1, $color2);
+                        break;
+
+                    case 'drop': // DropShadow
+                        if (phpthumb_functions::gd_version() < 2) {
+                            $this->DebugMessage('Skipping DropShadow() because gd_version is "'.phpthumb_functions::gd_version().'"', __FILE__, __LINE__);
+                            return false;
+                        }
+                        $this->is_alpha = true;
+                        @list($distance, $width, $color, $angle, $fade) = explode('|', $parameter, 5);
+                        $phpthumbFilters->DropShadow($this->gdimg_output, $distance, $width, $color, $angle, $fade);
+                        break;
+
+                    case 'mask': // Mask cropping
+                        if (phpthumb_functions::gd_version() < 2) {
+                            $this->DebugMessage('Skipping Mask() because gd_version is "'.phpthumb_functions::gd_version().'"', __FILE__, __LINE__);
+                            return false;
+                        }
+                        @list($mask_filename, $invert) = explode('|', $parameter, 2);
+                        $mask_filename = $this->ResolveFilenameToAbsolute($mask_filename);
+                        if (@is_readable($mask_filename) && ($fp_mask = @fopen($mask_filename, 'rb'))) {
+                            $MaskImageData = '';
+                            do {
+                                $buffer = fread($fp_mask, 8192);
+                                $MaskImageData .= $buffer;
+                            } while (strlen($buffer) > 0);
+                            fclose($fp_mask);
+                            if ($gdimg_mask = $this->ImageCreateFromStringReplacement($MaskImageData)) {
+                                if ($invert && phpthumb_functions::version_compare_replacement(PHP_VERSION, '5.0.0', '>=') && phpthumb_functions::gd_is_bundled()) {
+                                    imagefilter($gdimg_mask, IMG_FILTER_NEGATE);
+                                }
+                                $this->is_alpha = true;
+                                $phpthumbFilters->ApplyMask($gdimg_mask, $this->gdimg_output);
+                                imagedestroy($gdimg_mask);
+                            } else {
+                                $this->DebugMessage('ImageCreateFromStringReplacement() failed for "'.$mask_filename.'"', __FILE__, __LINE__);
+                            }
+                        } else {
+                            $this->DebugMessage('Cannot open mask file "'.$mask_filename.'"', __FILE__, __LINE__);
+                        }
+                        break;
+
+                    case 'elip': // Ellipse cropping
+                        if (phpthumb_functions::gd_version() < 2) {
+                            $this->DebugMessage('Skipping Ellipse() because gd_version is "'.phpthumb_functions::gd_version().'"', __FILE__, __LINE__);
+                            return false;
+                        }
+                        $this->is_alpha = true;
+                        $phpthumbFilters->Ellipse($this->gdimg_output);
+                        break;
+
+                    case 'ric': // RoundedImageCorners
+                        if (phpthumb_functions::gd_version() < 2) {
+                            $this->DebugMessage('Skipping RoundedImageCorners() because gd_version is "'.phpthumb_functions::gd_version().'"', __FILE__, __LINE__);
+                            return false;
+                        }
+                        @list($radius_x, $radius_y) = explode('|', $parameter, 2);
+                        if (($radius_x < 1) || ($radius_y < 1)) {
+                            $this->DebugMessage('Skipping RoundedImageCorners('.$radius_x.', '.$radius_y.') because x/y radius is less than 1', __FILE__, __LINE__);
+                            break;
+                        }
+                        $this->is_alpha = true;
+                        $phpthumbFilters->RoundedImageCorners($this->gdimg_output, $radius_x, $radius_y);
+                        break;
+
+                    case 'crop': // Crop
+                        @list($left, $right, $top, $bottom) = explode('|', $parameter, 4);
+                        $phpthumbFilters->Crop($this->gdimg_output, $left, $right, $top, $bottom);
+                        break;
+
+                    case 'bord': // Border
+                        @list($border_width, $radius_x, $radius_y, $hexcolor_border) = explode('|', $parameter, 4);
+                        $this->is_alpha = true;
+                        $phpthumbFilters->ImageBorder($this->gdimg_output, $border_width, $radius_x, $radius_y, $hexcolor_border);
+                        break;
+
+                    case 'over': // Overlay
+                        @list($filename, $underlay, $margin, $opacity) = explode('|', $parameter, 4);
+                        $underlay = (bool) ($underlay              ? $underlay : false);
+                        $margin   =        ((strlen($margin)  > 0) ? $margin   : ($underlay ? 0.1 : 0.0));
+                        $opacity  =        ((strlen($opacity) > 0) ? $opacity  : 100);
+                        if (($margin > 0) && ($margin < 1)) {
+                            $margin = min(0.499, $margin);
+                        } elseif (($margin > -1) && ($margin < 0)) {
+                            $margin = max(-0.499, $margin);
+                        }
+
+                        $filename = $this->ResolveFilenameToAbsolute($filename);
+                        if (@is_readable($filename) && ($fp_watermark = @fopen($filename, 'rb'))) {
+                            $WatermarkImageData = '';
+                            do {
+                                $buffer = fread($fp_watermark, 8192);
+                                $WatermarkImageData .= $buffer;
+                            } while (strlen($buffer) > 0);
+                            fclose($fp_watermark);
+                            if ($img_watermark = $this->ImageCreateFromStringReplacement($WatermarkImageData)) {
+                                if (($margin > 0) && ($margin < 1)) {
+                                    $resized_x = max(1, imagesx($this->gdimg_output) - round(2 * (imagesx($this->gdimg_output) * $margin)));
+                                    $resized_y = max(1, imagesy($this->gdimg_output) - round(2 * (imagesy($this->gdimg_output) * $margin)));
+                                } else {
+                                    $resized_x = max(1, imagesx($this->gdimg_output) - round(2 * $margin));
+                                    $resized_y = max(1, imagesy($this->gdimg_output) - round(2 * $margin));
+                                }
+
+                                if ($underlay) {
+
+                                    if ($img_watermark_resized = phpthumb_functions::ImageCreateFunction(imagesx($this->gdimg_output), imagesy($this->gdimg_output))) {
+                                        imagealphablending($img_watermark_resized, false);
+                                        imagesavealpha($img_watermark_resized, true);
+                                        $this->ImageResizeFunction($img_watermark_resized, $img_watermark, 0, 0, 0, 0, imagesx($img_watermark_resized), imagesy($img_watermark_resized), imagesx($img_watermark), imagesy($img_watermark));
+                                        if ($img_source_resized = phpthumb_functions::ImageCreateFunction($resized_x, $resized_y)) {
+                                            imagealphablending($img_source_resized, false);
+                                            imagesavealpha($img_source_resized, true);
+                                            $this->ImageResizeFunction($img_source_resized, $this->gdimg_output, 0, 0, 0, 0, imagesx($img_source_resized), imagesy($img_source_resized), imagesx($this->gdimg_output), imagesy($this->gdimg_output));
+                                            $phpthumbFilters->WatermarkOverlay($img_watermark_resized, $img_source_resized, 'C', $opacity, $margin);
+                                            imagecopy($this->gdimg_output, $img_watermark_resized, 0, 0, 0, 0, imagesx($this->gdimg_output), imagesy($this->gdimg_output));
+                                        } else {
+                                            $this->DebugMessage('phpthumb_functions::ImageCreateFunction('.$resized_x.', '.$resized_y.')', __FILE__, __LINE__);
+                                        }
+                                        imagedestroy($img_watermark_resized);
+                                    } else {
+                                        $this->DebugMessage('phpthumb_functions::ImageCreateFunction('.imagesx($this->gdimg_output).', '.imagesy($this->gdimg_output).')', __FILE__, __LINE__);
+                                    }
+
+                                } else { // overlay
+
+                                    if ($img_watermark_resized = phpthumb_functions::ImageCreateFunction($resized_x, $resized_y)) {
+                                        imagealphablending($img_watermark_resized, false);
+                                        imagesavealpha($img_watermark_resized, true);
+                                        $this->ImageResizeFunction($img_watermark_resized, $img_watermark, 0, 0, 0, 0, imagesx($img_watermark_resized), imagesy($img_watermark_resized), imagesx($img_watermark), imagesy($img_watermark));
+                                        $phpthumbFilters->WatermarkOverlay($this->gdimg_output, $img_watermark_resized, 'C', $opacity, $margin);
+                                        imagedestroy($img_watermark_resized);
+                                    } else {
+                                        $this->DebugMessage('phpthumb_functions::ImageCreateFunction('.$resized_x.', '.$resized_y.')', __FILE__, __LINE__);
+                                    }
+
+                                }
+                                imagedestroy($img_watermark);
+
+                            } else {
+                                $this->DebugMessage('ImageCreateFromStringReplacement() failed for "'.$filename.'"', __FILE__, __LINE__);
+                            }
+                        } else {
+                            $this->DebugMessage('Cannot open overlay file "'.$filename.'"', __FILE__, __LINE__);
+                        }
+                        break;
+
+                    case 'wmi': // WaterMarkImage
+                        @list($filename, $alignment, $opacity, $margin['x'], $margin['y'], $rotate_angle) = explode('|', $parameter, 6);
+                        // $margin can be pixel margin or percent margin if $alignment is text, or max width/height if $alignment is position like "50x75"
+                        $alignment    = ($alignment            ? $alignment            : 'BR');
+                        $opacity      = (strlen($opacity)      ? (int) $opacity : 50);
+                        $rotate_angle = (strlen($rotate_angle) ? (int) $rotate_angle : 0);
+                        if (!preg_match('#^([0-9\\.\\-]*)x([0-9\\.\\-]*)$#i', $alignment, $matches)) {
+                            $margins = array('x', 'y');
+                            foreach ($margins as $xy) {
+                                $margin[$xy] = (strlen($margin[$xy]) ? $margin[$xy] : 5);
+                                if (($margin[$xy] > 0) && ($margin[$xy] < 1)) {
+                                    $margin[$xy] = min(0.499, $margin[$xy]);
+                                } elseif (($margin[$xy] > -1) && ($margin[$xy] < 0)) {
+                                    $margin[$xy] = max(-0.499, $margin[$xy]);
+                                }
+                            }
+                        }
+
+                        $filename = $this->ResolveFilenameToAbsolute($filename);
+                        if (@is_readable($filename)) {
+                            if ($img_watermark = $this->ImageCreateFromFilename($filename)) {
+                                if ($rotate_angle !== 0) {
+                                    $phpthumbFilters->ImprovedImageRotate($img_watermark, $rotate_angle, 'FFFFFF', null, $this);
+                                }
+                                if (preg_match('#^([0-9\\.\\-]*)x([0-9\\.\\-]*)$#i', $alignment, $matches)) {
+                                    $watermark_max_width  = (int) ($margin[ 'x'] ? $margin[ 'x'] : imagesx($img_watermark));
+                                    $watermark_max_height = (int) ($margin[ 'y'] ? $margin[ 'y'] : imagesy($img_watermark));
+                                    $scale = phpthumb_functions::ScaleToFitInBox(imagesx($img_watermark), imagesy($img_watermark), $watermark_max_width, $watermark_max_height, true, true);
+                                    $this->DebugMessage('Scaling watermark by a factor of '.number_format($scale, 4), __FILE__, __LINE__);
+                                    if (($scale > 1) || ($scale < 1)) {
+                                        if ($img_watermark2 = phpthumb_functions::ImageCreateFunction($scale * imagesx($img_watermark), $scale * imagesy($img_watermark))) {
+                                            imagealphablending($img_watermark2, false);
+                                            imagesavealpha($img_watermark2, true);
+                                            $this->ImageResizeFunction($img_watermark2, $img_watermark, 0, 0, 0, 0, imagesx($img_watermark2), imagesy($img_watermark2), imagesx($img_watermark), imagesy($img_watermark));
+                                            $img_watermark = $img_watermark2;
+                                        } else {
+                                            $this->DebugMessage('ImageCreateFunction('.($scale * imagesx($img_watermark)).', '.($scale * imagesx($img_watermark)).') failed', __FILE__, __LINE__);
+                                        }
+                                    }
+                                    $watermark_dest_x = round($matches[1] - (imagesx($img_watermark) / 2));
+                                    $watermark_dest_y = round($matches[2] - (imagesy($img_watermark) / 2));
+                                    $alignment = $watermark_dest_x.'x'.$watermark_dest_y;
+                                }
+                                $phpthumbFilters->WatermarkOverlay($this->gdimg_output, $img_watermark, $alignment, $opacity, $margin['x'], $margin['y']);
+                                imagedestroy($img_watermark);
+                                if (isset($img_watermark2) && is_resource($img_watermark2)) {
+                                    imagedestroy($img_watermark2);
+                                }
+                            } else {
+                                $this->DebugMessage('ImageCreateFromFilename() failed for "'.$filename.'"', __FILE__, __LINE__);
+                            }
+                        } else {
+                            $this->DebugMessage('!is_readable('.$filename.')', __FILE__, __LINE__);
+                        }
+                        break;
+
+                    case 'wmt': // WaterMarkText
+                        @list($text, $size, $alignment, $hex_color, $ttffont, $opacity, $margin, $angle, $bg_color, $bg_opacity, $fillextend, $lineheight) = explode('|', $parameter, 12);
+                        $text       = ($text            ? $text       : '');
+                        $size       = ($size            ? $size       : 3);
+                        $alignment  = ($alignment       ? $alignment  : 'BR');
+                        $hex_color  = ($hex_color       ? $hex_color  : '000000');
+                        $ttffont    = ($ttffont         ? $ttffont    : '');
+                        $opacity    = (strlen($opacity) ? $opacity    : 50);
+                        $margin     = (strlen($margin)  ? $margin     : 5);
+                        $angle      = (strlen($angle)   ? $angle      : 0);
+                        $bg_color   = ($bg_color        ? $bg_color   : false);
+                        $bg_opacity = ($bg_opacity      ? $bg_opacity : 0);
+                        $fillextend = ($fillextend      ? $fillextend : '');
+                        $lineheight = ($lineheight      ? $lineheight : 1.0);
+
+                        if (basename($ttffont) == $ttffont) {
+                            $ttffont = $this->realPathSafe($this->config_ttf_directory.DIRECTORY_SEPARATOR.$ttffont);
+                        } else {
+                            $ttffont = $this->ResolveFilenameToAbsolute($ttffont);
+                        }
+                        $phpthumbFilters->WatermarkText($this->gdimg_output, $text, $size, $alignment, $hex_color, $ttffont, $opacity, $margin, $angle, $bg_color, $bg_opacity, $fillextend, $lineheight);
+                        break;
+
+                    case 'blur': // Blur
+                        @list($radius) = explode('|', $parameter, 1);
+                        $radius = ($radius ? $radius : 1);
+                        if (phpthumb_functions::gd_version() >= 2) {
+                            $phpthumbFilters->Blur($this->gdimg_output, $radius);
+                        } else {
+                            $this->DebugMessage('Skipping Blur() because gd_version is "'.phpthumb_functions::gd_version().'"', __FILE__, __LINE__);
+                        }
+                        break;
+
+                    case 'gblr': // Gaussian Blur
+                        $phpthumbFilters->BlurGaussian($this->gdimg_output);
+                        break;
+
+                    case 'sblr': // Selective Blur
+                        $phpthumbFilters->BlurSelective($this->gdimg_output);
+                        break;
+
+                    case 'mean': // MeanRemoval blur
+                        $phpthumbFilters->MeanRemoval($this->gdimg_output);
+                        break;
+
+                    case 'smth': // Smooth blur
+                        $phpthumbFilters->Smooth($this->gdimg_output, $parameter);
+                        break;
+
+                    case 'usm': // UnSharpMask sharpening
+                        @list($amount, $radius, $threshold) = explode('|', $parameter, 3);
+                        $amount    = ($amount            ? $amount    : 80);
+                        $radius    = ($radius            ? $radius    : 0.5);
+                        $threshold = (strlen($threshold) ? $threshold : 3);
+                        if (phpthumb_functions::gd_version() >= 2.0) {
+                            ob_start();
+                            if (!@include_once( __DIR__ .'/phpthumb.unsharp.php')) {
+                                $include_error = ob_get_contents();
+                                if ($include_error) {
+                                    $this->DebugMessage('include_once("'. __DIR__ .'/phpthumb.unsharp.php") generated message: "'.$include_error.'"', __FILE__, __LINE__);
+                                }
+                                $this->DebugMessage('Error including "'. __DIR__ .'/phpthumb.unsharp.php" which is required for unsharp masking', __FILE__, __LINE__);
+                                ob_end_clean();
+                                return false;
+                            }
+                            ob_end_clean();
+                            phpUnsharpMask::applyUnsharpMask($this->gdimg_output, $amount, $radius, $threshold);
+                        } else {
+                            $this->DebugMessage('Skipping unsharp mask because gd_version is "'.phpthumb_functions::gd_version().'"', __FILE__, __LINE__);
+                            return false;
+                        }
+                        break;
+
+                    case 'size': // Resize
+                        @list($newwidth, $newheight, $stretch) = explode('|', $parameter);
+                        $newwidth  = (!$newwidth  ? imagesx($this->gdimg_output) : ((($newwidth  > 0) && ($newwidth  < 1)) ? round($newwidth  * imagesx($this->gdimg_output)) : round($newwidth)));
+                        $newheight = (!$newheight ? imagesy($this->gdimg_output) : ((($newheight > 0) && ($newheight < 1)) ? round($newheight * imagesy($this->gdimg_output)) : round($newheight)));
+                        $stretch   = ($stretch ? true : false);
+                        if ($stretch) {
+                            $scale_x = phpthumb_functions::ScaleToFitInBox(imagesx($this->gdimg_output), imagesx($this->gdimg_output), $newwidth,  $newwidth,  true, true);
+                            $scale_y = phpthumb_functions::ScaleToFitInBox(imagesy($this->gdimg_output), imagesy($this->gdimg_output), $newheight, $newheight, true, true);
+                        } else {
+                            $scale_x = phpthumb_functions::ScaleToFitInBox(imagesx($this->gdimg_output), imagesy($this->gdimg_output), $newwidth, $newheight, true, true);
+                            $scale_y = $scale_x;
+                        }
+                        $this->DebugMessage('Scaling watermark ('.($stretch ? 'with' : 'without').' stretch) by a factor of "'.number_format($scale_x, 4).' x '.number_format($scale_y, 4).'"', __FILE__, __LINE__);
+                        if (($scale_x > 1) || ($scale_x < 1) || ($scale_y > 1) || ($scale_y < 1)) {
+                            if ($img_temp = phpthumb_functions::ImageCreateFunction(imagesx($this->gdimg_output), imagesy($this->gdimg_output))) {
+                                imagecopy($img_temp, $this->gdimg_output, 0, 0, 0, 0, imagesx($this->gdimg_output), imagesy($this->gdimg_output));
+                                if ($this->gdimg_output = phpthumb_functions::ImageCreateFunction($scale_x * imagesx($img_temp), $scale_y * imagesy($img_temp))) {
+                                    imagealphablending($this->gdimg_output, false);
+                                    imagesavealpha($this->gdimg_output, true);
+                                    $this->ImageResizeFunction($this->gdimg_output, $img_temp, 0, 0, 0, 0, imagesx($this->gdimg_output), imagesy($this->gdimg_output), imagesx($img_temp), imagesy($img_temp));
+                                } else {
+                                    $this->DebugMessage('ImageCreateFunction('.($scale_x * imagesx($img_temp)).', '.($scale_y * imagesy($img_temp)).') failed', __FILE__, __LINE__);
+                                }
+                                imagedestroy($img_temp);
+                            } else {
+                                $this->DebugMessage('ImageCreateFunction('.imagesx($this->gdimg_output).', '.imagesy($this->gdimg_output).') failed', __FILE__, __LINE__);
+                            }
+                        }
+                        break;
+
+                    case 'rot': // ROTate
+                        @list($angle, $bgcolor) = explode('|', $parameter, 2);
+                        $phpthumbFilters->ImprovedImageRotate($this->gdimg_output, $angle, $bgcolor, null, $this);
+                        break;
+
+                    case 'stc': // Source Transparent Color
+                        @list($hexcolor, $min_limit, $max_limit) = explode('|', $parameter, 3);
+                        if (!phpthumb_functions::IsHexColor($hexcolor)) {
+                            $this->DebugMessage('Skipping SourceTransparentColor hex color is invalid ('.$hexcolor.')', __FILE__, __LINE__);
+                            return false;
+                        }
+                        $min_limit = (strlen($min_limit) ? $min_limit :  5);
+                        $max_limit = (strlen($max_limit) ? $max_limit : 10);
+                        if ($gdimg_mask = $phpthumbFilters->SourceTransparentColorMask($this->gdimg_output, $hexcolor, $min_limit, $max_limit)) {
+                            $this->is_alpha = true;
+                            $phpthumbFilters->ApplyMask($gdimg_mask, $this->gdimg_output);
+                            imagedestroy($gdimg_mask);
+                        } else {
+                            $this->DebugMessage('SourceTransparentColorMask() failed for "'.$hexcolor.','.$min_limit.','.$max_limit.'"', __FILE__, __LINE__);
+                        }
+                        break;
+                }
+                $this->DebugMessage('Finished processing filter command "'.$command.'('.$parameter.')"', __FILE__, __LINE__);
+            }
+        }
+        return true;
+    }
+
+
+    public function MaxFileSize() {
+        if (phpthumb_functions::gd_version() < 2) {
+            $this->DebugMessage('Skipping MaxFileSize() because gd_version is "'.phpthumb_functions::gd_version().'"', __FILE__, __LINE__);
+            return false;
+        }
+        if ($this->maxb > 0) {
+            switch ($this->thumbnailFormat) {
+                case 'png':
+                case 'gif':
+                    $imgRenderFunction = 'image'.$this->thumbnailFormat;
+
+                    ob_start();
+                    $imgRenderFunction($this->gdimg_output);
+                    $imgdata = ob_get_contents();
+                    ob_end_clean();
+
+                    if (strlen($imgdata) > $this->maxb) {
+                        for ($i = 8; $i >= 1; $i--) {
+                            $tempIMG = imagecreatetruecolor(imagesx($this->gdimg_output), imagesy($this->gdimg_output));
+                            imagecopy($tempIMG, $this->gdimg_output, 0, 0, 0, 0, imagesx($this->gdimg_output), imagesy($this->gdimg_output));
+                            imagetruecolortopalette($tempIMG, true, pow(2, $i));
+                            ob_start();
+                            $imgRenderFunction($tempIMG);
+                            $imgdata = ob_get_contents();
+                            ob_end_clean();
+
+                            if (strlen($imgdata) <= $this->maxb) {
+                                imagetruecolortopalette($this->gdimg_output, true, pow(2, $i));
+                                break;
+                            }
+                        }
+                    }
+                    break;
+
+                case 'jpeg':
+                    ob_start();
+                    imagejpeg($this->gdimg_output);
+                    $imgdata = ob_get_contents();
+                    ob_end_clean();
+
+                    if (strlen($imgdata) > $this->maxb) {
+                        for ($i = 3; $i < 20; $i++) {
+                            $q = round(100 * (1 - log10($i / 2)));
+                            ob_start();
+                            imagejpeg($this->gdimg_output, null, $q);
+                            $imgdata = ob_get_contents();
+                            ob_end_clean();
+
+                            $this->thumbnailQuality = $q;
+                            if (strlen($imgdata) <= $this->maxb) {
+                                break;
+                            }
+                        }
+                    }
+                    if (strlen($imgdata) > $this->maxb) {
+                        return false;
+                    }
+                    break;
+
+                default:
+                    return false;
+            }
+        }
+        return true;
+    }
+
+
+    public function CalculateThumbnailDimensions() {
+        $this->DebugMessage('CalculateThumbnailDimensions() starting with [W,H,sx,sy,sw,sh] initially set to ['.$this->source_width.','.$this->source_height.','.$this->sx.','.$this->sy.','.$this->sw.','.$this->sh.']', __FILE__, __LINE__);
 //echo $this->source_width.'x'.$this->source_height.'<hr>';
-		$this->thumbnailCropX = ($this->sx ? (($this->sx >= 2) ? $this->sx : round($this->sx * $this->source_width))  : 0);
+        $this->thumbnailCropX = ($this->sx ? (($this->sx >= 2) ? $this->sx : round($this->sx * $this->source_width))  : 0);
 //echo $this->thumbnailCropX.'<br>';
-		$this->thumbnailCropY = ($this->sy ? (($this->sy >= 2) ? $this->sy : round($this->sy * $this->source_height)) : 0);
+        $this->thumbnailCropY = ($this->sy ? (($this->sy >= 2) ? $this->sy : round($this->sy * $this->source_height)) : 0);
 //echo $this->thumbnailCropY.'<br>';
-		$this->thumbnailCropW = ($this->sw ? (($this->sw >= 2) ? $this->sw : round($this->sw * $this->source_width))  : $this->source_width);
+        $this->thumbnailCropW = ($this->sw ? (($this->sw >= 2) ? $this->sw : round($this->sw * $this->source_width))  : $this->source_width);
 //echo $this->thumbnailCropW.'<br>';
-		$this->thumbnailCropH = ($this->sh ? (($this->sh >= 2) ? $this->sh : round($this->sh * $this->source_height)) : $this->source_height);
+        $this->thumbnailCropH = ($this->sh ? (($this->sh >= 2) ? $this->sh : round($this->sh * $this->source_height)) : $this->source_height);
 //echo $this->thumbnailCropH.'<hr>';
 
-		// limit source area to original image area
-		$this->thumbnailCropW = max(1, min($this->thumbnailCropW, $this->source_width  - $this->thumbnailCropX));
-		$this->thumbnailCropH = max(1, min($this->thumbnailCropH, $this->source_height - $this->thumbnailCropY));
-
-		$this->DebugMessage('CalculateThumbnailDimensions() starting with [x,y,w,h] initially set to ['.$this->thumbnailCropX.','.$this->thumbnailCropY.','.$this->thumbnailCropW.','.$this->thumbnailCropH.']', __FILE__, __LINE__);
-
-
-		if ($this->zc && $this->w && $this->h) {
-			// Zoom Crop
-			// retain proportional resizing we did above, but crop off larger dimension so smaller
-			// dimension fully fits available space
-
-			$scaling_X = $this->source_width  / $this->w;
-			$scaling_Y = $this->source_height / $this->h;
-			if ($scaling_X > $scaling_Y) {
-				// some of the width will need to be cropped
-				$allowable_width = $this->source_width / $scaling_X * $scaling_Y;
-				$this->thumbnailCropW = round($allowable_width);
-				$this->thumbnailCropX = round(($this->source_width - $allowable_width) / 2);
-
-			} elseif ($scaling_Y > $scaling_X) {
-				// some of the height will need to be cropped
-				$allowable_height = $this->source_height / $scaling_Y * $scaling_X;
-				$this->thumbnailCropH = round($allowable_height);
-				$this->thumbnailCropY = round(($this->source_height - $allowable_height) / 2);
-
-			} else {
-				// image fits perfectly, no cropping needed
-			}
-			$this->thumbnail_width  = $this->w;
-			$this->thumbnail_height = $this->h;
-			$this->thumbnail_image_width  = $this->thumbnail_width;
-			$this->thumbnail_image_height = $this->thumbnail_height;
-
-		} elseif ($this->iar && $this->w && $this->h) {
-
-			// Ignore Aspect Ratio
-			// stretch image to fit exactly 'w' x 'h'
-			$this->thumbnail_width  = $this->w;
-			$this->thumbnail_height = $this->h;
-			$this->thumbnail_image_width  = $this->thumbnail_width;
-			$this->thumbnail_image_height = $this->thumbnail_height;
-
-		} else {
-
-			$original_aspect_ratio = $this->thumbnailCropW / $this->thumbnailCropH;
-			if ($this->aoe) {
-				if ($this->w && $this->h) {
-					$maxwidth  = min($this->w, $this->h * $original_aspect_ratio);
-					$maxheight = min($this->h, $this->w / $original_aspect_ratio);
-				} elseif ($this->w) {
-					$maxwidth  = $this->w;
-					$maxheight = $this->w / $original_aspect_ratio;
-				} elseif ($this->h) {
-					$maxwidth  = $this->h * $original_aspect_ratio;
-					$maxheight = $this->h;
-				} else {
-					$maxwidth  = $this->thumbnailCropW;
-					$maxheight = $this->thumbnailCropH;
-				}
-			} else {
-				$maxwidth  = phpthumb_functions::nonempty_min($this->w, $this->thumbnailCropW, $this->config_output_maxwidth);
-				$maxheight = phpthumb_functions::nonempty_min($this->h, $this->thumbnailCropH, $this->config_output_maxheight);
+        // limit source area to original image area
+        $this->thumbnailCropW = max(1, min($this->thumbnailCropW, $this->source_width  - $this->thumbnailCropX));
+        $this->thumbnailCropH = max(1, min($this->thumbnailCropH, $this->source_height - $this->thumbnailCropY));
+
+        $this->DebugMessage('CalculateThumbnailDimensions() starting with [x,y,w,h] initially set to ['.$this->thumbnailCropX.','.$this->thumbnailCropY.','.$this->thumbnailCropW.','.$this->thumbnailCropH.']', __FILE__, __LINE__);
+
+
+        if ($this->zc && $this->w && $this->h) {
+            // Zoom Crop
+            // retain proportional resizing we did above, but crop off larger dimension so smaller
+            // dimension fully fits available space
+
+            $scaling_X = $this->source_width  / $this->w;
+            $scaling_Y = $this->source_height / $this->h;
+            if ($scaling_X > $scaling_Y) {
+                // some of the width will need to be cropped
+                $allowable_width = $this->source_width / $scaling_X * $scaling_Y;
+                $this->thumbnailCropW = round($allowable_width);
+                $this->thumbnailCropX = round(($this->source_width - $allowable_width) / 2);
+
+            } elseif ($scaling_Y > $scaling_X) {
+                // some of the height will need to be cropped
+                $allowable_height = $this->source_height / $scaling_Y * $scaling_X;
+                $this->thumbnailCropH = round($allowable_height);
+                $this->thumbnailCropY = round(($this->source_height - $allowable_height) / 2);
+
+            } else {
+                // image fits perfectly, no cropping needed
+            }
+            $this->thumbnail_width  = $this->w;
+            $this->thumbnail_height = $this->h;
+            $this->thumbnail_image_width  = $this->thumbnail_width;
+            $this->thumbnail_image_height = $this->thumbnail_height;
+
+        } elseif ($this->iar && $this->w && $this->h) {
+
+            // Ignore Aspect Ratio
+            // stretch image to fit exactly 'w' x 'h'
+            $this->thumbnail_width  = $this->w;
+            $this->thumbnail_height = $this->h;
+            $this->thumbnail_image_width  = $this->thumbnail_width;
+            $this->thumbnail_image_height = $this->thumbnail_height;
+
+        } else {
+
+            $original_aspect_ratio = $this->thumbnailCropW / $this->thumbnailCropH;
+            if ($this->aoe) {
+                if ($this->w && $this->h) {
+                    $maxwidth  = min($this->w, $this->h * $original_aspect_ratio);
+                    $maxheight = min($this->h, $this->w / $original_aspect_ratio);
+                } elseif ($this->w) {
+                    $maxwidth  = $this->w;
+                    $maxheight = $this->w / $original_aspect_ratio;
+                } elseif ($this->h) {
+                    $maxwidth  = $this->h * $original_aspect_ratio;
+                    $maxheight = $this->h;
+                } else {
+                    $maxwidth  = $this->thumbnailCropW;
+                    $maxheight = $this->thumbnailCropH;
+                }
+            } else {
+                $maxwidth  = phpthumb_functions::nonempty_min($this->w, $this->thumbnailCropW, $this->config_output_maxwidth);
+                $maxheight = phpthumb_functions::nonempty_min($this->h, $this->thumbnailCropH, $this->config_output_maxheight);
 //echo $maxwidth.'x'.$maxheight.'<br>';
-				$maxwidth  = min($maxwidth, $maxheight * $original_aspect_ratio);
-				$maxheight = min($maxheight, $maxwidth / $original_aspect_ratio);
+                $maxwidth  = min($maxwidth, $maxheight * $original_aspect_ratio);
+                $maxheight = min($maxheight, $maxwidth / $original_aspect_ratio);
 //echo $maxwidth.'x'.$maxheight.'<hr>';
-			}
-
-			$this->thumbnail_image_width  = $maxwidth;
-			$this->thumbnail_image_height = $maxheight;
-			$this->thumbnail_width  = $maxwidth;
-			$this->thumbnail_height = $maxheight;
-
-			$this->FixedAspectRatio();
-		}
-
-		$this->thumbnail_width  = max(1, floor($this->thumbnail_width));
-		$this->thumbnail_height = max(1, floor($this->thumbnail_height));
-		return true;
-	}
-
-
-	public function CreateGDoutput() {
-		$this->CalculateThumbnailDimensions();
-
-		// create the GD image (either true-color or 256-color, depending on GD version)
-		$this->gdimg_output = phpthumb_functions::ImageCreateFunction($this->thumbnail_width, $this->thumbnail_height);
-
-		// images that have transparency must have the background filled with the configured 'bg' color otherwise the transparent color will appear as black
-		imagesavealpha($this->gdimg_output, true);
-		if ($this->is_alpha && phpthumb_functions::gd_version() >= 2) {
-
-			imagealphablending($this->gdimg_output, false);
-			$output_full_alpha = phpthumb_functions::ImageColorAllocateAlphaSafe($this->gdimg_output, 255, 255, 255, 127);
-			imagefilledrectangle($this->gdimg_output, 0, 0, $this->thumbnail_width, $this->thumbnail_height, $output_full_alpha);
-
-		} else {
-
-			$current_transparent_color = imagecolortransparent($this->gdimg_source);
-			if ($this->bg || (@$current_transparent_color >= 0)) {
-
-				$this->config_background_hexcolor = ($this->bg ? $this->bg : $this->config_background_hexcolor);
-				if (!phpthumb_functions::IsHexColor($this->config_background_hexcolor)) {
-					return $this->ErrorImage('Invalid hex color string "'.$this->config_background_hexcolor.'" for parameter "bg"');
-				}
-				$background_color = phpthumb_functions::ImageHexColorAllocate($this->gdimg_output, $this->config_background_hexcolor);
-				imagefilledrectangle($this->gdimg_output, 0, 0, $this->thumbnail_width, $this->thumbnail_height, $background_color);
-
-			}
-
-		}
-		$this->DebugMessage('CreateGDoutput() returning canvas "'.$this->thumbnail_width.'x'.$this->thumbnail_height.'"', __FILE__, __LINE__);
-		return true;
-	}
-
-	public function SetOrientationDependantWidthHeight() {
-		$this->DebugMessage('SetOrientationDependantWidthHeight() starting with "'.$this->source_width.'"x"'.$this->source_height.'"', __FILE__, __LINE__);
-		if ($this->source_height > $this->source_width) {
-			// portrait
-			$this->w = phpthumb_functions::OneOfThese($this->wp, $this->w, $this->ws, $this->wl);
-			$this->h = phpthumb_functions::OneOfThese($this->hp, $this->h, $this->hs, $this->hl);
-		} elseif ($this->source_height < $this->source_width) {
-			// landscape
-			$this->w = phpthumb_functions::OneOfThese($this->wl, $this->w, $this->ws, $this->wp);
-			$this->h = phpthumb_functions::OneOfThese($this->hl, $this->h, $this->hs, $this->hp);
-		} else {
-			// square
-			$this->w = phpthumb_functions::OneOfThese($this->ws, $this->w, $this->wl, $this->wp);
-			$this->h = phpthumb_functions::OneOfThese($this->hs, $this->h, $this->hl, $this->hp);
-		}
-		//$this->w = round($this->w ? $this->w : (($this->h && $this->source_height) ? $this->h * $this->source_width  / $this->source_height : $this->w));
-		//$this->h = round($this->h ? $this->h : (($this->w && $this->source_width)  ? $this->w * $this->source_height / $this->source_width  : $this->h));
-		$this->DebugMessage('SetOrientationDependantWidthHeight() setting w="'. (int) $this->w .'", h="'. (int) $this->h .'"', __FILE__, __LINE__);
-		return true;
-	}
-
-	public function ExtractEXIFgetImageSize() {
-		$this->DebugMessage('starting ExtractEXIFgetImageSize()', __FILE__, __LINE__);
-
-		if (preg_match('#^http:#i', $this->src) && !$this->sourceFilename && $this->rawImageData) {
-			$this->SourceDataToTempFile();
-		}
-		if (null === $this->getimagesizeinfo) {
-			if ($this->sourceFilename) {
-				$this->getimagesizeinfo = @getimagesize($this->sourceFilename);
-				$this->source_width  = $this->getimagesizeinfo[0];
-				$this->source_height = $this->getimagesizeinfo[1];
-				$this->DebugMessage('getimagesize('.$this->sourceFilename.') says image is '.$this->source_width.'x'.$this->source_height, __FILE__, __LINE__);
-			} else {
-				$this->DebugMessage('skipping getimagesize() because $this->sourceFilename is empty', __FILE__, __LINE__);
-			}
-		} else {
-			$this->DebugMessage('skipping getimagesize() because !is_null($this->getimagesizeinfo)', __FILE__, __LINE__);
-		}
-
-		if (is_resource($this->gdimg_source)) {
-
-			$this->source_width  = imagesx($this->gdimg_source);
-			$this->source_height = imagesy($this->gdimg_source);
-
-			$this->SetOrientationDependantWidthHeight();
-
-		} elseif ($this->rawImageData && !$this->sourceFilename) {
-
-			if ($this->SourceImageIsTooLarge($this->source_width, $this->source_height)) {
-				$this->DebugMessage('NOT bypassing EXIF and getimagesize sections because source image is too large for GD ('.$this->source_width.'x'.$this->source_width.'='.($this->source_width * $this->source_height * 5).'MB)', __FILE__, __LINE__);
-			} else {
-				$this->DebugMessage('bypassing EXIF and getimagesize sections because $this->rawImageData is set, and $this->sourceFilename is not set, and source image is not too large for GD ('.$this->source_width.'x'.$this->source_width.'='.($this->source_width * $this->source_height * 5).'MB)', __FILE__, __LINE__);
-			}
-
-		}
-
-		if (!empty($this->getimagesizeinfo)) {
-			// great
-			$this->getimagesizeinfo['filesize'] = @filesize($this->sourceFilename);
-		} elseif (!$this->rawImageData) {
-			$this->DebugMessage('getimagesize("'.$this->sourceFilename.'") failed', __FILE__, __LINE__);
-		}
-
-		if ($this->config_prefer_imagemagick) {
-			if ($this->ImageMagickThumbnailToGD()) {
-				return true;
-			}
-			$this->DebugMessage('ImageMagickThumbnailToGD() failed', __FILE__, __LINE__);
-		}
-
-		$this->source_width  = $this->getimagesizeinfo[0];
-		$this->source_height = $this->getimagesizeinfo[1];
-
-		$this->SetOrientationDependantWidthHeight();
-
-		if (phpthumb_functions::version_compare_replacement(PHP_VERSION, '4.2.0', '>=') && function_exists('exif_read_data')) {
-			switch ($this->getimagesizeinfo[2]) {
-				case IMAGETYPE_JPEG:
-				case IMAGETYPE_TIFF_II:
-				case IMAGETYPE_TIFF_MM:
-					$this->exif_raw_data = @exif_read_data($this->sourceFilename, 0, true);
-					break;
-			}
-		}
-		if (function_exists('exif_thumbnail') && ($this->getimagesizeinfo[2] == IMAGETYPE_JPEG)) {
-			// Extract EXIF info from JPEGs
-
-			$this->exif_thumbnail_width  = '';
-			$this->exif_thumbnail_height = '';
-			$this->exif_thumbnail_type   = '';
-
-			// The parameters width, height and imagetype are available since PHP v4.3.0
-			if (phpthumb_functions::version_compare_replacement(PHP_VERSION, '4.3.0', '>=')) {
-
-				$this->exif_thumbnail_data = @exif_thumbnail($this->sourceFilename, $this->exif_thumbnail_width, $this->exif_thumbnail_height, $this->exif_thumbnail_type);
-
-			} else {
-
-				// older versions of exif_thumbnail output an error message but NOT return false on failure
-				ob_start();
-				$this->exif_thumbnail_data = exif_thumbnail($this->sourceFilename);
-				$exit_thumbnail_error = ob_get_contents();
-				ob_end_clean();
-				if (!$exit_thumbnail_error && $this->exif_thumbnail_data) {
-
-					if ($gdimg_exif_temp = $this->ImageCreateFromStringReplacement($this->exif_thumbnail_data, false)) {
-						$this->exif_thumbnail_width  = imagesx($gdimg_exif_temp);
-						$this->exif_thumbnail_height = imagesy($gdimg_exif_temp);
-						$this->exif_thumbnail_type   = 2; // (2 == JPEG) before PHP v4.3.0 only JPEG format EXIF thumbnails are returned
-						unset($gdimg_exif_temp);
-					} else {
-						return $this->ErrorImage('Failed - $this->ImageCreateFromStringReplacement($this->exif_thumbnail_data) in '.__FILE__.' on line '.__LINE__);
-					}
-
-				}
-
-			}
-
-		} elseif (!function_exists('exif_thumbnail')) {
-
-			$this->DebugMessage('exif_thumbnail() does not exist, cannot extract EXIF thumbnail', __FILE__, __LINE__);
-
-		}
-
-		$this->DebugMessage('EXIF thumbnail extraction: (size='.strlen($this->exif_thumbnail_data).'; type="'.$this->exif_thumbnail_type.'"; '. (int) $this->exif_thumbnail_width .'x'. (int) $this->exif_thumbnail_height .')', __FILE__, __LINE__);
-
-		// see if EXIF thumbnail can be used directly with no processing
-		if ($this->config_use_exif_thumbnail_for_speed && $this->exif_thumbnail_data) {
-			while (true) {
-				if (!$this->xto) {
-					$source_ar = $this->source_width / $this->source_height;
-					$exif_ar = $this->exif_thumbnail_width / $this->exif_thumbnail_height;
-					if (number_format($source_ar, 2) != number_format($exif_ar, 2)) {
-						$this->DebugMessage('not using EXIF thumbnail because $source_ar != $exif_ar ('.$source_ar.' != '.$exif_ar.')', __FILE__, __LINE__);
-						break;
-					}
-					if ($this->w && ($this->w != $this->exif_thumbnail_width)) {
-						$this->DebugMessage('not using EXIF thumbnail because $this->w != $this->exif_thumbnail_width ('.$this->w.' != '.$this->exif_thumbnail_width.')', __FILE__, __LINE__);
-						break;
-					}
-					if ($this->h && ($this->h != $this->exif_thumbnail_height)) {
-						$this->DebugMessage('not using EXIF thumbnail because $this->h != $this->exif_thumbnail_height ('.$this->h.' != '.$this->exif_thumbnail_height.')', __FILE__, __LINE__);
-						break;
-					}
-					$CannotBeSetParameters = array('sx', 'sy', 'sh', 'sw', 'far', 'bg', 'bc', 'fltr', 'phpThumbDebug');
-					foreach ($CannotBeSetParameters as $parameter) {
-						if ($this->$parameter) {
-							break 2;
-						}
-					}
-				}
-
-				$this->DebugMessage('setting $this->gdimg_source = $this->ImageCreateFromStringReplacement($this->exif_thumbnail_data)', __FILE__, __LINE__);
-				$this->gdimg_source = $this->ImageCreateFromStringReplacement($this->exif_thumbnail_data);
-				$this->source_width  = imagesx($this->gdimg_source);
-				$this->source_height = imagesy($this->gdimg_source);
-				return true;
-			}
-		}
-
-		if (($this->config_max_source_pixels > 0) && (($this->source_width * $this->source_height) > $this->config_max_source_pixels)) {
-
-			// Source image is larger than would fit in available PHP memory.
-			// If ImageMagick is installed, use it to generate the thumbnail.
-			// Else, if an EXIF thumbnail is available, use that as the source image.
-			// Otherwise, no choice but to fail with an error message
-			$this->DebugMessage('image is '.$this->source_width.'x'.$this->source_height.' and therefore contains more pixels ('.($this->source_width * $this->source_height).') than $this->config_max_source_pixels setting ('.$this->config_max_source_pixels.')', __FILE__, __LINE__);
-			if (!$this->config_prefer_imagemagick && $this->ImageMagickThumbnailToGD()) {
-				// excellent, we have a thumbnailed source image
-				return true;
-			}
-
-		}
-		return true;
-	}
-
-
-	public function SetCacheFilename() {
-		if (null !== $this->cache_filename) {
-			$this->DebugMessage('$this->cache_filename already set, skipping SetCacheFilename()', __FILE__, __LINE__);
-			return true;
-		}
-		if (null === $this->config_cache_directory) {
-			$this->setCacheDirectory();
-			if (!$this->config_cache_directory) {
-				$this->DebugMessage('SetCacheFilename() failed because $this->config_cache_directory is empty', __FILE__, __LINE__);
-				return false;
-			}
-		}
-		$this->setOutputFormat();
-
-		if (!$this->sourceFilename && !$this->rawImageData && $this->src) {
-			$this->sourceFilename = $this->ResolveFilenameToAbsolute($this->src);
-		}
-
-		if ($this->config_cache_default_only_suffix && $this->sourceFilename) {
-			// simplified cache filenames:
-			// only use default parameters in phpThumb.config.php
-			// substitute source filename into * in $this->config_cache_default_only_suffix
-			// (eg: '*_thumb' becomes 'picture_thumb.jpg')
-			if (strpos($this->config_cache_default_only_suffix, '*') === false) {
-				$this->DebugMessage('aborting simplified caching filename because no * in "'.$this->config_cache_default_only_suffix.'"', __FILE__, __LINE__);
-			} else {
-				preg_match('#(.+)(\\.[a-z0-9]+)?$#i', basename($this->sourceFilename), $matches);
-				$this->cache_filename = $this->config_cache_directory.DIRECTORY_SEPARATOR.rawurlencode(str_replace('*', @$matches[1], $this->config_cache_default_only_suffix)).'.'.strtolower($this->thumbnailFormat);
-				return true;
-			}
-		}
-
-		$this->cache_filename = '';
-		if ($this->new) {
-			$broad_directory_name = strtolower(md5($this->new));
-			$this->cache_filename .= '_new'.$broad_directory_name;
-		} elseif ($this->md5s) {
-			// source image MD5 hash provided
-			$this->DebugMessage('SetCacheFilename() _raw set from $this->md5s = "'.$this->md5s.'"', __FILE__, __LINE__);
-			$broad_directory_name = $this->md5s;
-			$this->cache_filename .= '_raw'.$this->md5s;
-		} elseif (!$this->src && $this->rawImageData) {
-			$this->DebugMessage('SetCacheFilename() _raw set from md5($this->rawImageData) = "'.md5($this->rawImageData).'"', __FILE__, __LINE__);
-			$broad_directory_name = strtolower(md5($this->rawImageData));
-			$this->cache_filename .= '_raw'.$broad_directory_name;
-		} else {
-			$this->DebugMessage('SetCacheFilename() _src set from md5($this->sourceFilename) "'.$this->sourceFilename.'" = "'.md5($this->sourceFilename).'"', __FILE__, __LINE__);
-			$broad_directory_name = strtolower(md5($this->sourceFilename));
-			$this->cache_filename .= '_src'.$broad_directory_name;
-		}
-		if (!empty($_SERVER['HTTP_REFERER']) && $this->config_nooffsitelink_enabled) {
-			$parsed_url1 = @phpthumb_functions::ParseURLbetter(@$_SERVER['HTTP_REFERER']);
-			$parsed_url2 = @phpthumb_functions::ParseURLbetter('http://'.@$_SERVER['HTTP_HOST']);
-			if (@$parsed_url1['host'] && @$parsed_url2['host'] && ($parsed_url1['host'] != $parsed_url2['host'])) {
-				// include "_offsite" only if nooffsitelink_enabled and if referrer doesn't match the domain of the current server
-				$this->cache_filename .= '_offsite';
-			}
-		}
-
-		$ParametersString = '';
-		if ($this->fltr && is_array($this->fltr)) {
-			$ParametersString .= '_fltr'.implode('_fltr', $this->fltr);
-		}
-		$FilenameParameters1 = array('ar', 'bg', 'bc', 'far', 'sx', 'sy', 'sw', 'sh', 'zc');
-		foreach ($FilenameParameters1 as $key) {
-			if ($this->$key) {
-				$ParametersString .= '_'.$key.$this->$key;
-			}
-		}
-		$FilenameParameters2 = array('h', 'w', 'wl', 'wp', 'ws', 'hp', 'hs', 'xto', 'ra', 'iar', 'aoe', 'maxb', 'sfn', 'dpi');
-		foreach ($FilenameParameters2 as $key) {
-			if ($this->$key) {
-				$ParametersString .= '_'.$key. (int) $this->$key;
-			}
-		}
-		if ($this->thumbnailFormat == 'jpeg') {
-			// only JPEG output has variable quality option
-			$ParametersString .= '_q'. (int) $this->thumbnailQuality;
-		}
-		$this->DebugMessage('SetCacheFilename() _par set from md5('.$ParametersString.')', __FILE__, __LINE__);
-		$this->cache_filename .= '_par'.strtolower(md5($ParametersString));
-
-		if ($this->md5s) {
-			// source image MD5 hash provided
-			// do not source image modification date --
-			// cached image will be used even if file was modified or removed
-		} elseif (!$this->config_cache_source_filemtime_ignore_remote && preg_match('#^(f|ht)tps?\://#i', $this->src)) {
-			$this->cache_filename .= '_dat'. (int) phpthumb_functions::filedate_remote($this->src);
-		} elseif (!$this->config_cache_source_filemtime_ignore_local && $this->src && !$this->rawImageData) {
-			$this->cache_filename .= '_dat'. (int) (@filemtime($this->sourceFilename));
-		}
-
-		$this->cache_filename .= '.'.strtolower($this->thumbnailFormat);
-		$broad_directories = '';
-		for ($i = 0; $i < $this->config_cache_directory_depth; $i++) {
-			$broad_directories .= DIRECTORY_SEPARATOR.substr($broad_directory_name, 0, $i + 1);
-		}
-
-		$this->cache_filename = $this->config_cache_directory.$broad_directories.DIRECTORY_SEPARATOR.$this->config_cache_prefix.rawurlencode($this->cache_filename);
-		return true;
-	}
-
-
-	public function SourceImageIsTooLarge($width, $height) {
-		if (!$this->config_max_source_pixels) {
-			return false;
-		}
-		if ($this->php_memory_limit && function_exists('memory_get_usage')) {
-			$available_memory = $this->php_memory_limit - memory_get_usage();
-			return (bool) (($width * $height * 5) > $available_memory);
-		}
-		return (bool) (($width * $height) > $this->config_max_source_pixels);
-	}
-
-	public function ImageCreateFromFilename($filename) {
-		// try to create GD image source directly via GD, if possible,
-		// rather than buffering to memory and creating with imagecreatefromstring
-		$ImageCreateWasAttempted = false;
-		$gd_image = false;
-
-		$this->DebugMessage('starting ImageCreateFromFilename('.$filename.')', __FILE__, __LINE__);
-		if ($filename && ($getimagesizeinfo = @getimagesize($filename))) {
-			if (!$this->SourceImageIsTooLarge($getimagesizeinfo[0], $getimagesizeinfo[1])) {
-				$ImageCreateFromFunction = array(
-					1  => 'imagecreatefromgif',
-					2  => 'imagecreatefromjpeg',
-					3  => 'imagecreatefrompng',
-					15 => 'imagecreatefromwbmp',
-				);
-				$this->DebugMessage('ImageCreateFromFilename found ($getimagesizeinfo[2]=='.@$getimagesizeinfo[2].')', __FILE__, __LINE__);
-				switch (@$getimagesizeinfo[2]) {
-					case 1:  // GIF
-					case 2:  // JPEG
-					case 3:  // PNG
-					case 15: // WBMP
-						$ImageCreateFromFunctionName = $ImageCreateFromFunction[$getimagesizeinfo[2]];
-						if (function_exists($ImageCreateFromFunctionName)) {
-							$this->DebugMessage('Calling '.$ImageCreateFromFunctionName.'('.$filename.')', __FILE__, __LINE__);
-							$ImageCreateWasAttempted = true;
-							$gd_image = $ImageCreateFromFunctionName($filename);
-						} else {
-							$this->DebugMessage('NOT calling '.$ImageCreateFromFunctionName.'('.$filename.') because !function_exists('.$ImageCreateFromFunctionName.')', __FILE__, __LINE__);
-						}
-						break;
-
-					case 4:  // SWF
-					case 5:  // PSD
-					case 6:  // BMP
-					case 7:  // TIFF (LE)
-					case 8:  // TIFF (BE)
-					case 9:  // JPC
-					case 10: // JP2
-					case 11: // JPX
-					case 12: // JB2
-					case 13: // SWC
-					case 14: // IFF
-					case 16: // XBM
-						$this->DebugMessage('No built-in image creation function for image type "'.@$getimagesizeinfo[2].'" ($getimagesizeinfo[2])', __FILE__, __LINE__);
-						break;
-
-					default:
-						$this->DebugMessage('Unknown value for $getimagesizeinfo[2]: "'.@$getimagesizeinfo[2].'"', __FILE__, __LINE__);
-						break;
-				}
-			} else {
-				$this->DebugMessage('image is '.$getimagesizeinfo[0].'x'.$getimagesizeinfo[1].' and therefore contains more pixels ('.($getimagesizeinfo[0] * $getimagesizeinfo[1]).') than $this->config_max_source_pixels setting ('.$this->config_max_source_pixels.')', __FILE__, __LINE__);
-				return false;
-			}
-		} else {
-			$this->DebugMessage('empty $filename or getimagesize('.$filename.') failed', __FILE__, __LINE__);
-		}
-
-		if (!$gd_image) {
-			// cannot create from filename, attempt to create source image with imagecreatefromstring, if possible
-			if ($ImageCreateWasAttempted) {
-				$this->DebugMessage($ImageCreateFromFunctionName.'() was attempted but FAILED', __FILE__, __LINE__);
-			}
-			$this->DebugMessage('Populating $rawimagedata', __FILE__, __LINE__);
-			$rawimagedata = '';
-			if ($fp = @fopen($filename, 'rb')) {
-				$filesize = filesize($filename);
-				$blocksize = 8192;
-				$blockreads = ceil($filesize / $blocksize);
-				for ($i = 0; $i < $blockreads; $i++) {
-					$rawimagedata .= fread($fp, $blocksize);
-				}
-				fclose($fp);
-			} else {
-				$this->DebugMessage('cannot fopen('.$filename.')', __FILE__, __LINE__);
-			}
-			if ($rawimagedata) {
-				$this->DebugMessage('attempting ImageCreateFromStringReplacement($rawimagedata ('.strlen($rawimagedata).' bytes), true)', __FILE__, __LINE__);
-				$gd_image = $this->ImageCreateFromStringReplacement($rawimagedata, true);
-			}
-		}
-		return $gd_image;
-	}
-
-	public function SourceImageToGD() {
-		if (is_resource($this->gdimg_source)) {
-			$this->source_width  = imagesx($this->gdimg_source);
-			$this->source_height = imagesy($this->gdimg_source);
-			$this->DebugMessage('skipping SourceImageToGD() because $this->gdimg_source is already a resource ('.$this->source_width.'x'.$this->source_height.')', __FILE__, __LINE__);
-			return true;
-		}
-		$this->DebugMessage('starting SourceImageToGD()', __FILE__, __LINE__);
-
-		if ($this->config_prefer_imagemagick) {
-			if (empty($this->sourceFilename) && !empty($this->rawImageData)) {
-				$this->DebugMessage('Copying raw image data to temp file and trying again with ImageMagick', __FILE__, __LINE__);
-				if ($tempnam = $this->phpThumb_tempnam()) {
-					if (file_put_contents($tempnam, $this->rawImageData)) {
-						$this->sourceFilename = $tempnam;
-						if ($this->ImageMagickThumbnailToGD()) {
-							// excellent, we have a thumbnailed source image
-							$this->DebugMessage('ImageMagickThumbnailToGD() succeeded', __FILE__, __LINE__);
-						} else {
-							$this->DebugMessage('ImageMagickThumbnailToGD() failed', __FILE__, __LINE__);
-						}
-						@chmod($tempnam, $this->getParameter('config_file_create_mask'));
-					} else {
-						$this->DebugMessage('failed to put $this->rawImageData into temp file "'.$tempnam.'"', __FILE__, __LINE__);
-					}
-				} else {
-					$this->DebugMessage('failed to generate temp file name', __FILE__, __LINE__);
-				}
-			}
-		}
-		if (!$this->gdimg_source && $this->rawImageData) {
-
-			if ($this->SourceImageIsTooLarge($this->source_width, $this->source_height)) {
-				$memory_get_usage = (function_exists('memory_get_usage') ? memory_get_usage() : 0);
-				return $this->ErrorImage('Source image is too large ('.$this->source_width.'x'.$this->source_height.' = '.number_format($this->source_width * $this->source_height / 1000000, 1).'Mpx, max='.number_format($this->config_max_source_pixels / 1000000, 1).'Mpx) for GD creation (either install ImageMagick or increase PHP memory_limit to at least '.ceil(($memory_get_usage + (5 * $this->source_width * $this->source_height)) / 1048576).'M).');
-			}
-			if ($this->md5s && ($this->md5s != md5($this->rawImageData))) {
-				return $this->ErrorImage('$this->md5s != md5($this->rawImageData)'."\n".'"'.$this->md5s.'" != '."\n".'"'.md5($this->rawImageData).'"');
-			}
-			//if ($this->issafemode) {
-			//	return $this->ErrorImage('Cannot generate thumbnails from raw image data when PHP SAFE_MODE enabled');
-			//}
-			$this->gdimg_source = $this->ImageCreateFromStringReplacement($this->rawImageData);
-			if (!$this->gdimg_source) {
-				if (substr($this->rawImageData, 0, 2) === 'BM') {
-					$this->getimagesizeinfo[2] = 6; // BMP
-				} elseif (substr($this->rawImageData, 0, 4) === 'II'."\x2A\x00") {
-					$this->getimagesizeinfo[2] = 7; // TIFF (littlendian)
-				} elseif (substr($this->rawImageData, 0, 4) === 'MM'."\x00\x2A") {
-					$this->getimagesizeinfo[2] = 8; // TIFF (bigendian)
-				}
-				$this->DebugMessage('SourceImageToGD.ImageCreateFromStringReplacement() failed with unknown image type "'.substr($this->rawImageData, 0, 4).'" ('.phpthumb_functions::HexCharDisplay(substr($this->rawImageData, 0, 4)).')', __FILE__, __LINE__);
+            }
+
+            $this->thumbnail_image_width  = $maxwidth;
+            $this->thumbnail_image_height = $maxheight;
+            $this->thumbnail_width  = $maxwidth;
+            $this->thumbnail_height = $maxheight;
+
+            $this->FixedAspectRatio();
+        }
+
+        $this->thumbnail_width  = max(1, floor($this->thumbnail_width));
+        $this->thumbnail_height = max(1, floor($this->thumbnail_height));
+        return true;
+    }
+
+
+    public function CreateGDoutput() {
+        $this->CalculateThumbnailDimensions();
+
+        // create the GD image (either true-color or 256-color, depending on GD version)
+        $this->gdimg_output = phpthumb_functions::ImageCreateFunction($this->thumbnail_width, $this->thumbnail_height);
+
+        // images that have transparency must have the background filled with the configured 'bg' color otherwise the transparent color will appear as black
+        imagesavealpha($this->gdimg_output, true);
+        if ($this->is_alpha && phpthumb_functions::gd_version() >= 2) {
+
+            imagealphablending($this->gdimg_output, false);
+            $output_full_alpha = phpthumb_functions::ImageColorAllocateAlphaSafe($this->gdimg_output, 255, 255, 255, 127);
+            imagefilledrectangle($this->gdimg_output, 0, 0, $this->thumbnail_width, $this->thumbnail_height, $output_full_alpha);
+
+        } else {
+
+            $current_transparent_color = imagecolortransparent($this->gdimg_source);
+            if ($this->bg || (@$current_transparent_color >= 0)) {
+
+                $this->config_background_hexcolor = ($this->bg ? $this->bg : $this->config_background_hexcolor);
+                if (!phpthumb_functions::IsHexColor($this->config_background_hexcolor)) {
+                    return $this->ErrorImage('Invalid hex color string "'.$this->config_background_hexcolor.'" for parameter "bg"');
+                }
+                $background_color = phpthumb_functions::ImageHexColorAllocate($this->gdimg_output, $this->config_background_hexcolor);
+                imagefilledrectangle($this->gdimg_output, 0, 0, $this->thumbnail_width, $this->thumbnail_height, $background_color);
+
+            }
+
+        }
+        $this->DebugMessage('CreateGDoutput() returning canvas "'.$this->thumbnail_width.'x'.$this->thumbnail_height.'"', __FILE__, __LINE__);
+        return true;
+    }
+
+    public function SetOrientationDependantWidthHeight() {
+        $this->DebugMessage('SetOrientationDependantWidthHeight() starting with "'.$this->source_width.'"x"'.$this->source_height.'"', __FILE__, __LINE__);
+        if ($this->source_height > $this->source_width) {
+            // portrait
+            $this->w = phpthumb_functions::OneOfThese($this->wp, $this->w, $this->ws, $this->wl);
+            $this->h = phpthumb_functions::OneOfThese($this->hp, $this->h, $this->hs, $this->hl);
+        } elseif ($this->source_height < $this->source_width) {
+            // landscape
+            $this->w = phpthumb_functions::OneOfThese($this->wl, $this->w, $this->ws, $this->wp);
+            $this->h = phpthumb_functions::OneOfThese($this->hl, $this->h, $this->hs, $this->hp);
+        } else {
+            // square
+            $this->w = phpthumb_functions::OneOfThese($this->ws, $this->w, $this->wl, $this->wp);
+            $this->h = phpthumb_functions::OneOfThese($this->hs, $this->h, $this->hl, $this->hp);
+        }
+        //$this->w = round($this->w ? $this->w : (($this->h && $this->source_height) ? $this->h * $this->source_width  / $this->source_height : $this->w));
+        //$this->h = round($this->h ? $this->h : (($this->w && $this->source_width)  ? $this->w * $this->source_height / $this->source_width  : $this->h));
+        $this->DebugMessage('SetOrientationDependantWidthHeight() setting w="'. (int) $this->w .'", h="'. (int) $this->h .'"', __FILE__, __LINE__);
+        return true;
+    }
+
+    public function ExtractEXIFgetImageSize() {
+        $this->DebugMessage('starting ExtractEXIFgetImageSize()', __FILE__, __LINE__);
+
+        if (preg_match('#^http:#i', $this->src) && !$this->sourceFilename && $this->rawImageData) {
+            $this->SourceDataToTempFile();
+        }
+        if (null === $this->getimagesizeinfo) {
+            if ($this->sourceFilename) {
+                $this->getimagesizeinfo = @getimagesize($this->sourceFilename);
+                $this->source_width  = $this->getimagesizeinfo[0];
+                $this->source_height = $this->getimagesizeinfo[1];
+                $this->DebugMessage('getimagesize('.$this->sourceFilename.') says image is '.$this->source_width.'x'.$this->source_height, __FILE__, __LINE__);
+            } else {
+                $this->DebugMessage('skipping getimagesize() because $this->sourceFilename is empty', __FILE__, __LINE__);
+            }
+        } else {
+            $this->DebugMessage('skipping getimagesize() because !is_null($this->getimagesizeinfo)', __FILE__, __LINE__);
+        }
+
+        if (is_resource($this->gdimg_source)) {
+
+            $this->source_width  = imagesx($this->gdimg_source);
+            $this->source_height = imagesy($this->gdimg_source);
+
+            $this->SetOrientationDependantWidthHeight();
+
+        } elseif ($this->rawImageData && !$this->sourceFilename) {
+
+            if ($this->SourceImageIsTooLarge($this->source_width, $this->source_height)) {
+                $this->DebugMessage('NOT bypassing EXIF and getimagesize sections because source image is too large for GD ('.$this->source_width.'x'.$this->source_width.'='.($this->source_width * $this->source_height * 5).'MB)', __FILE__, __LINE__);
+            } else {
+                $this->DebugMessage('bypassing EXIF and getimagesize sections because $this->rawImageData is set, and $this->sourceFilename is not set, and source image is not too large for GD ('.$this->source_width.'x'.$this->source_width.'='.($this->source_width * $this->source_height * 5).'MB)', __FILE__, __LINE__);
+            }
+
+        }
+
+        if (!empty($this->getimagesizeinfo)) {
+            // great
+            $this->getimagesizeinfo['filesize'] = @filesize($this->sourceFilename);
+        } elseif (!$this->rawImageData) {
+            $this->DebugMessage('getimagesize("'.$this->sourceFilename.'") failed', __FILE__, __LINE__);
+        }
+
+        if ($this->config_prefer_imagemagick) {
+            if ($this->ImageMagickThumbnailToGD()) {
+                return true;
+            }
+            $this->DebugMessage('ImageMagickThumbnailToGD() failed', __FILE__, __LINE__);
+        }
+
+        $this->source_width  = $this->getimagesizeinfo[0];
+        $this->source_height = $this->getimagesizeinfo[1];
+
+        $this->SetOrientationDependantWidthHeight();
+
+        if (phpthumb_functions::version_compare_replacement(PHP_VERSION, '4.2.0', '>=') && function_exists('exif_read_data')) {
+            switch ($this->getimagesizeinfo[2]) {
+                case IMAGETYPE_JPEG:
+                case IMAGETYPE_TIFF_II:
+                case IMAGETYPE_TIFF_MM:
+                    $this->exif_raw_data = @exif_read_data($this->sourceFilename, 0, true);
+                    break;
+            }
+        }
+        if (function_exists('exif_thumbnail') && ($this->getimagesizeinfo[2] == IMAGETYPE_JPEG)) {
+            // Extract EXIF info from JPEGs
+
+            $this->exif_thumbnail_width  = '';
+            $this->exif_thumbnail_height = '';
+            $this->exif_thumbnail_type   = '';
+
+            // The parameters width, height and imagetype are available since PHP v4.3.0
+            if (phpthumb_functions::version_compare_replacement(PHP_VERSION, '4.3.0', '>=')) {
+
+                $this->exif_thumbnail_data = @exif_thumbnail($this->sourceFilename, $this->exif_thumbnail_width, $this->exif_thumbnail_height, $this->exif_thumbnail_type);
+
+            } else {
+
+                // older versions of exif_thumbnail output an error message but NOT return false on failure
+                ob_start();
+                $this->exif_thumbnail_data = exif_thumbnail($this->sourceFilename);
+                $exit_thumbnail_error = ob_get_contents();
+                ob_end_clean();
+                if (!$exit_thumbnail_error && $this->exif_thumbnail_data) {
+
+                    if ($gdimg_exif_temp = $this->ImageCreateFromStringReplacement($this->exif_thumbnail_data, false)) {
+                        $this->exif_thumbnail_width  = imagesx($gdimg_exif_temp);
+                        $this->exif_thumbnail_height = imagesy($gdimg_exif_temp);
+                        $this->exif_thumbnail_type   = 2; // (2 == JPEG) before PHP v4.3.0 only JPEG format EXIF thumbnails are returned
+                        unset($gdimg_exif_temp);
+                    } else {
+                        return $this->ErrorImage('Failed - $this->ImageCreateFromStringReplacement($this->exif_thumbnail_data) in '.__FILE__.' on line '.__LINE__);
+                    }
+
+                }
+
+            }
+
+        } elseif (!function_exists('exif_thumbnail')) {
+
+            $this->DebugMessage('exif_thumbnail() does not exist, cannot extract EXIF thumbnail', __FILE__, __LINE__);
+
+        }
+
+        $this->DebugMessage('EXIF thumbnail extraction: (size='.strlen($this->exif_thumbnail_data).'; type="'.$this->exif_thumbnail_type.'"; '. (int) $this->exif_thumbnail_width .'x'. (int) $this->exif_thumbnail_height .')', __FILE__, __LINE__);
+
+        // see if EXIF thumbnail can be used directly with no processing
+        if ($this->config_use_exif_thumbnail_for_speed && $this->exif_thumbnail_data) {
+            while (true) {
+                if (!$this->xto) {
+                    $source_ar = $this->source_width / $this->source_height;
+                    $exif_ar = $this->exif_thumbnail_width / $this->exif_thumbnail_height;
+                    if (number_format($source_ar, 2) != number_format($exif_ar, 2)) {
+                        $this->DebugMessage('not using EXIF thumbnail because $source_ar != $exif_ar ('.$source_ar.' != '.$exif_ar.')', __FILE__, __LINE__);
+                        break;
+                    }
+                    if ($this->w && ($this->w != $this->exif_thumbnail_width)) {
+                        $this->DebugMessage('not using EXIF thumbnail because $this->w != $this->exif_thumbnail_width ('.$this->w.' != '.$this->exif_thumbnail_width.')', __FILE__, __LINE__);
+                        break;
+                    }
+                    if ($this->h && ($this->h != $this->exif_thumbnail_height)) {
+                        $this->DebugMessage('not using EXIF thumbnail because $this->h != $this->exif_thumbnail_height ('.$this->h.' != '.$this->exif_thumbnail_height.')', __FILE__, __LINE__);
+                        break;
+                    }
+                    $CannotBeSetParameters = array('sx', 'sy', 'sh', 'sw', 'far', 'bg', 'bc', 'fltr', 'phpThumbDebug');
+                    foreach ($CannotBeSetParameters as $parameter) {
+                        if ($this->$parameter) {
+                            break 2;
+                        }
+                    }
+                }
+
+                $this->DebugMessage('setting $this->gdimg_source = $this->ImageCreateFromStringReplacement($this->exif_thumbnail_data)', __FILE__, __LINE__);
+                $this->gdimg_source = $this->ImageCreateFromStringReplacement($this->exif_thumbnail_data);
+                $this->source_width  = imagesx($this->gdimg_source);
+                $this->source_height = imagesy($this->gdimg_source);
+                return true;
+            }
+        }
+
+        if (($this->config_max_source_pixels > 0) && (($this->source_width * $this->source_height) > $this->config_max_source_pixels)) {
+
+            // Source image is larger than would fit in available PHP memory.
+            // If ImageMagick is installed, use it to generate the thumbnail.
+            // Else, if an EXIF thumbnail is available, use that as the source image.
+            // Otherwise, no choice but to fail with an error message
+            $this->DebugMessage('image is '.$this->source_width.'x'.$this->source_height.' and therefore contains more pixels ('.($this->source_width * $this->source_height).') than $this->config_max_source_pixels setting ('.$this->config_max_source_pixels.')', __FILE__, __LINE__);
+            if (!$this->config_prefer_imagemagick && $this->ImageMagickThumbnailToGD()) {
+                // excellent, we have a thumbnailed source image
+                return true;
+            }
+
+        }
+        return true;
+    }
+
+
+    public function SetCacheFilename() {
+        if (null !== $this->cache_filename) {
+            $this->DebugMessage('$this->cache_filename already set, skipping SetCacheFilename()', __FILE__, __LINE__);
+            return true;
+        }
+        if (null === $this->config_cache_directory) {
+            $this->setCacheDirectory();
+            if (!$this->config_cache_directory) {
+                $this->DebugMessage('SetCacheFilename() failed because $this->config_cache_directory is empty', __FILE__, __LINE__);
+                return false;
+            }
+        }
+        $this->setOutputFormat();
+
+        if (!$this->sourceFilename && !$this->rawImageData && $this->src) {
+            $this->sourceFilename = $this->ResolveFilenameToAbsolute($this->src);
+        }
+
+        if ($this->config_cache_default_only_suffix && $this->sourceFilename) {
+            // simplified cache filenames:
+            // only use default parameters in phpThumb.config.php
+            // substitute source filename into * in $this->config_cache_default_only_suffix
+            // (eg: '*_thumb' becomes 'picture_thumb.jpg')
+            if (strpos($this->config_cache_default_only_suffix, '*') === false) {
+                $this->DebugMessage('aborting simplified caching filename because no * in "'.$this->config_cache_default_only_suffix.'"', __FILE__, __LINE__);
+            } else {
+                preg_match('#(.+)(\\.[a-z0-9]+)?$#i', basename($this->sourceFilename), $matches);
+                $this->cache_filename = $this->config_cache_directory.DIRECTORY_SEPARATOR.rawurlencode(str_replace('*', @$matches[1], $this->config_cache_default_only_suffix)).'.'.strtolower($this->thumbnailFormat);
+                return true;
+            }
+        }
+
+        $this->cache_filename = '';
+        if ($this->new) {
+            $broad_directory_name = strtolower(md5($this->new));
+            $this->cache_filename .= '_new'.$broad_directory_name;
+        } elseif ($this->md5s) {
+            // source image MD5 hash provided
+            $this->DebugMessage('SetCacheFilename() _raw set from $this->md5s = "'.$this->md5s.'"', __FILE__, __LINE__);
+            $broad_directory_name = $this->md5s;
+            $this->cache_filename .= '_raw'.$this->md5s;
+        } elseif (!$this->src && $this->rawImageData) {
+            $this->DebugMessage('SetCacheFilename() _raw set from md5($this->rawImageData) = "'.md5($this->rawImageData).'"', __FILE__, __LINE__);
+            $broad_directory_name = strtolower(md5($this->rawImageData));
+            $this->cache_filename .= '_raw'.$broad_directory_name;
+        } else {
+            $this->DebugMessage('SetCacheFilename() _src set from md5($this->sourceFilename) "'.$this->sourceFilename.'" = "'.md5($this->sourceFilename).'"', __FILE__, __LINE__);
+            $broad_directory_name = strtolower(md5($this->sourceFilename));
+            $this->cache_filename .= '_src'.$broad_directory_name;
+        }
+        if (!empty($_SERVER['HTTP_REFERER']) && $this->config_nooffsitelink_enabled) {
+            $parsed_url1 = @phpthumb_functions::ParseURLbetter(@$_SERVER['HTTP_REFERER']);
+            $parsed_url2 = @phpthumb_functions::ParseURLbetter('http://'.@$_SERVER['HTTP_HOST']);
+            if (@$parsed_url1['host'] && @$parsed_url2['host'] && ($parsed_url1['host'] != $parsed_url2['host'])) {
+                // include "_offsite" only if nooffsitelink_enabled and if referrer doesn't match the domain of the current server
+                $this->cache_filename .= '_offsite';
+            }
+        }
+
+        $ParametersString = '';
+        if ($this->fltr && is_array($this->fltr)) {
+            $ParametersString .= '_fltr'.implode('_fltr', $this->fltr);
+        }
+        $FilenameParameters1 = array('ar', 'bg', 'bc', 'far', 'sx', 'sy', 'sw', 'sh', 'zc');
+        foreach ($FilenameParameters1 as $key) {
+            if ($this->$key) {
+                $ParametersString .= '_'.$key.$this->$key;
+            }
+        }
+        $FilenameParameters2 = array('h', 'w', 'wl', 'wp', 'ws', 'hp', 'hs', 'xto', 'ra', 'iar', 'aoe', 'maxb', 'sfn', 'dpi');
+        foreach ($FilenameParameters2 as $key) {
+            if ($this->$key) {
+                $ParametersString .= '_'.$key. (int) $this->$key;
+            }
+        }
+        if ($this->thumbnailFormat == 'jpeg') {
+            // only JPEG output has variable quality option
+            $ParametersString .= '_q'. (int) $this->thumbnailQuality;
+        }
+        $this->DebugMessage('SetCacheFilename() _par set from md5('.$ParametersString.')', __FILE__, __LINE__);
+        $this->cache_filename .= '_par'.strtolower(md5($ParametersString));
+
+        if ($this->md5s) {
+            // source image MD5 hash provided
+            // do not source image modification date --
+            // cached image will be used even if file was modified or removed
+        } elseif (!$this->config_cache_source_filemtime_ignore_remote && preg_match('#^(f|ht)tps?\://#i', $this->src)) {
+            $this->cache_filename .= '_dat'. (int) phpthumb_functions::filedate_remote($this->src);
+        } elseif (!$this->config_cache_source_filemtime_ignore_local && $this->src && !$this->rawImageData) {
+            $this->cache_filename .= '_dat'. (int) (@filemtime($this->sourceFilename));
+        }
+
+        $this->cache_filename .= '.'.strtolower($this->thumbnailFormat);
+        $broad_directories = '';
+        for ($i = 0; $i < $this->config_cache_directory_depth; $i++) {
+            $broad_directories .= DIRECTORY_SEPARATOR.substr($broad_directory_name, 0, $i + 1);
+        }
+
+        $this->cache_filename = $this->config_cache_directory.$broad_directories.DIRECTORY_SEPARATOR.$this->config_cache_prefix.rawurlencode($this->cache_filename);
+        return true;
+    }
+
+
+    public function SourceImageIsTooLarge($width, $height) {
+        if (!$this->config_max_source_pixels) {
+            return false;
+        }
+        if ($this->php_memory_limit && function_exists('memory_get_usage')) {
+            $available_memory = $this->php_memory_limit - memory_get_usage();
+            return (bool) (($width * $height * 5) > $available_memory);
+        }
+        return (bool) (($width * $height) > $this->config_max_source_pixels);
+    }
+
+    public function ImageCreateFromFilename($filename) {
+        // try to create GD image source directly via GD, if possible,
+        // rather than buffering to memory and creating with imagecreatefromstring
+        $ImageCreateWasAttempted = false;
+        $gd_image = false;
+
+        $this->DebugMessage('starting ImageCreateFromFilename('.$filename.')', __FILE__, __LINE__);
+        if ($filename && ($getimagesizeinfo = @getimagesize($filename))) {
+            if (!$this->SourceImageIsTooLarge($getimagesizeinfo[0], $getimagesizeinfo[1])) {
+                $ImageCreateFromFunction = array(
+                    1  => 'imagecreatefromgif',
+                    2  => 'imagecreatefromjpeg',
+                    3  => 'imagecreatefrompng',
+                    15 => 'imagecreatefromwbmp',
+                );
+                $this->DebugMessage('ImageCreateFromFilename found ($getimagesizeinfo[2]=='.@$getimagesizeinfo[2].')', __FILE__, __LINE__);
+                switch (@$getimagesizeinfo[2]) {
+                    case 1:  // GIF
+                    case 2:  // JPEG
+                    case 3:  // PNG
+                    case 15: // WBMP
+                        $ImageCreateFromFunctionName = $ImageCreateFromFunction[$getimagesizeinfo[2]];
+                        if (function_exists($ImageCreateFromFunctionName)) {
+                            $this->DebugMessage('Calling '.$ImageCreateFromFunctionName.'('.$filename.')', __FILE__, __LINE__);
+                            $ImageCreateWasAttempted = true;
+                            $gd_image = $ImageCreateFromFunctionName($filename);
+                        } else {
+                            $this->DebugMessage('NOT calling '.$ImageCreateFromFunctionName.'('.$filename.') because !function_exists('.$ImageCreateFromFunctionName.')', __FILE__, __LINE__);
+                        }
+                        break;
+
+                    case 4:  // SWF
+                    case 5:  // PSD
+                    case 6:  // BMP
+                    case 7:  // TIFF (LE)
+                    case 8:  // TIFF (BE)
+                    case 9:  // JPC
+                    case 10: // JP2
+                    case 11: // JPX
+                    case 12: // JB2
+                    case 13: // SWC
+                    case 14: // IFF
+                    case 16: // XBM
+                        $this->DebugMessage('No built-in image creation function for image type "'.@$getimagesizeinfo[2].'" ($getimagesizeinfo[2])', __FILE__, __LINE__);
+                        break;
+
+                    default:
+                        $this->DebugMessage('Unknown value for $getimagesizeinfo[2]: "'.@$getimagesizeinfo[2].'"', __FILE__, __LINE__);
+                        break;
+                }
+            } else {
+                $this->DebugMessage('image is '.$getimagesizeinfo[0].'x'.$getimagesizeinfo[1].' and therefore contains more pixels ('.($getimagesizeinfo[0] * $getimagesizeinfo[1]).') than $this->config_max_source_pixels setting ('.$this->config_max_source_pixels.')', __FILE__, __LINE__);
+                return false;
+            }
+        } else {
+            $this->DebugMessage('empty $filename or getimagesize('.$filename.') failed', __FILE__, __LINE__);
+        }
+
+        if (!$gd_image) {
+            // cannot create from filename, attempt to create source image with imagecreatefromstring, if possible
+            if ($ImageCreateWasAttempted) {
+                $this->DebugMessage($ImageCreateFromFunctionName.'() was attempted but FAILED', __FILE__, __LINE__);
+            }
+            $this->DebugMessage('Populating $rawimagedata', __FILE__, __LINE__);
+            $rawimagedata = '';
+            if ($fp = @fopen($filename, 'rb')) {
+                $filesize = filesize($filename);
+                $blocksize = 8192;
+                $blockreads = ceil($filesize / $blocksize);
+                for ($i = 0; $i < $blockreads; $i++) {
+                    $rawimagedata .= fread($fp, $blocksize);
+                }
+                fclose($fp);
+            } else {
+                $this->DebugMessage('cannot fopen('.$filename.')', __FILE__, __LINE__);
+            }
+            if ($rawimagedata) {
+                $this->DebugMessage('attempting ImageCreateFromStringReplacement($rawimagedata ('.strlen($rawimagedata).' bytes), true)', __FILE__, __LINE__);
+                $gd_image = $this->ImageCreateFromStringReplacement($rawimagedata, true);
+            }
+        }
+        return $gd_image;
+    }
+
+    public function SourceImageToGD() {
+        if (is_resource($this->gdimg_source)) {
+            $this->source_width  = imagesx($this->gdimg_source);
+            $this->source_height = imagesy($this->gdimg_source);
+            $this->DebugMessage('skipping SourceImageToGD() because $this->gdimg_source is already a resource ('.$this->source_width.'x'.$this->source_height.')', __FILE__, __LINE__);
+            return true;
+        }
+        $this->DebugMessage('starting SourceImageToGD()', __FILE__, __LINE__);
+
+        if ($this->config_prefer_imagemagick) {
+            if (empty($this->sourceFilename) && !empty($this->rawImageData)) {
+                $this->DebugMessage('Copying raw image data to temp file and trying again with ImageMagick', __FILE__, __LINE__);
+                if ($tempnam = $this->phpThumb_tempnam()) {
+                    if (file_put_contents($tempnam, $this->rawImageData)) {
+                        $this->sourceFilename = $tempnam;
+                        if ($this->ImageMagickThumbnailToGD()) {
+                            // excellent, we have a thumbnailed source image
+                            $this->DebugMessage('ImageMagickThumbnailToGD() succeeded', __FILE__, __LINE__);
+                        } else {
+                            $this->DebugMessage('ImageMagickThumbnailToGD() failed', __FILE__, __LINE__);
+                        }
+                        @chmod($tempnam, $this->getParameter('config_file_create_mask'));
+                    } else {
+                        $this->DebugMessage('failed to put $this->rawImageData into temp file "'.$tempnam.'"', __FILE__, __LINE__);
+                    }
+                } else {
+                    $this->DebugMessage('failed to generate temp file name', __FILE__, __LINE__);
+                }
+            }
+        }
+        if (!$this->gdimg_source && $this->rawImageData) {
+
+            if ($this->SourceImageIsTooLarge($this->source_width, $this->source_height)) {
+                $memory_get_usage = (function_exists('memory_get_usage') ? memory_get_usage() : 0);
+                return $this->ErrorImage('Source image is too large ('.$this->source_width.'x'.$this->source_height.' = '.number_format($this->source_width * $this->source_height / 1000000, 1).'Mpx, max='.number_format($this->config_max_source_pixels / 1000000, 1).'Mpx) for GD creation (either install ImageMagick or increase PHP memory_limit to at least '.ceil(($memory_get_usage + (5 * $this->source_width * $this->source_height)) / 1048576).'M).');
+            }
+            if ($this->md5s && ($this->md5s != md5($this->rawImageData))) {
+                return $this->ErrorImage('$this->md5s != md5($this->rawImageData)'."\n".'"'.$this->md5s.'" != '."\n".'"'.md5($this->rawImageData).'"');
+            }
+            //if ($this->issafemode) {
+            //	return $this->ErrorImage('Cannot generate thumbnails from raw image data when PHP SAFE_MODE enabled');
+            //}
+            $this->gdimg_source = $this->ImageCreateFromStringReplacement($this->rawImageData);
+            if (!$this->gdimg_source) {
+                if (substr($this->rawImageData, 0, 2) === 'BM') {
+                    $this->getimagesizeinfo[2] = 6; // BMP
+                } elseif (substr($this->rawImageData, 0, 4) === 'II'."\x2A\x00") {
+                    $this->getimagesizeinfo[2] = 7; // TIFF (littlendian)
+                } elseif (substr($this->rawImageData, 0, 4) === 'MM'."\x00\x2A") {
+                    $this->getimagesizeinfo[2] = 8; // TIFF (bigendian)
+                }
+                $this->DebugMessage('SourceImageToGD.ImageCreateFromStringReplacement() failed with unknown image type "'.substr($this->rawImageData, 0, 4).'" ('.phpthumb_functions::HexCharDisplay(substr($this->rawImageData, 0, 4)).')', __FILE__, __LINE__);
 //				return $this->ErrorImage('Unknown image type identified by "'.substr($this->rawImageData, 0, 4).'" ('.phpthumb_functions::HexCharDisplay(substr($this->rawImageData, 0, 4)).') in SourceImageToGD()['.__LINE__.']');
-			}
-
-		} elseif (!$this->gdimg_source && $this->sourceFilename) {
-
-			if ($this->md5s && ($this->md5s != phpthumb_functions::md5_file_safe($this->sourceFilename))) {
-				return $this->ErrorImage('$this->md5s != md5(sourceFilename)'."\n".'"'.$this->md5s.'" != '."\n".'"'.phpthumb_functions::md5_file_safe($this->sourceFilename).'"');
-			}
-			switch (@$this->getimagesizeinfo[2]) {
-				case 1:
-				case 3:
-					// GIF or PNG input file may have transparency
-					$this->is_alpha = true;
-					break;
-			}
-			if (!$this->SourceImageIsTooLarge($this->source_width, $this->source_height)) {
-				$this->gdimg_source = $this->ImageCreateFromFilename($this->sourceFilename);
-			}
-
-		}
-
-		while (true) {
-			if ($this->gdimg_source) {
-				$this->DebugMessage('Not using EXIF thumbnail data because $this->gdimg_source is already set', __FILE__, __LINE__);
-				break;
-			}
-			if (!$this->exif_thumbnail_data) {
-				$this->DebugMessage('Not using EXIF thumbnail data because $this->exif_thumbnail_data is empty', __FILE__, __LINE__);
-				break;
-			}
-			if (ini_get('safe_mode')) {
-				if (!$this->SourceImageIsTooLarge($this->source_width, $this->source_height)) {
-					$this->DebugMessage('Using EXIF thumbnail data because source image too large and safe_mode enabled', __FILE__, __LINE__);
-					$this->aoe = true;
-				} else {
-					break;
-				}
-			} else {
-				if (!$this->config_use_exif_thumbnail_for_speed) {
-					$this->DebugMessage('Not using EXIF thumbnail data because $this->config_use_exif_thumbnail_for_speed is FALSE', __FILE__, __LINE__);
-					break;
-				}
-				if (($this->thumbnailCropX != 0) || ($this->thumbnailCropY != 0)) {
-					$this->DebugMessage('Not using EXIF thumbnail data because source cropping is enabled ('.$this->thumbnailCropX.','.$this->thumbnailCropY.')', __FILE__, __LINE__);
-					break;
-				}
-				if (($this->w > $this->exif_thumbnail_width) || ($this->h > $this->exif_thumbnail_height)) {
-					$this->DebugMessage('Not using EXIF thumbnail data because EXIF thumbnail is too small ('.$this->exif_thumbnail_width.'x'.$this->exif_thumbnail_height.' vs '.$this->w.'x'.$this->h.')', __FILE__, __LINE__);
-					break;
-				}
-				$source_ar = $this->source_width / $this->source_height;
-				$exif_ar   = $this->exif_thumbnail_width / $this->exif_thumbnail_height;
-				if (number_format($source_ar, 2) != number_format($exif_ar, 2)) {
-					$this->DebugMessage('not using EXIF thumbnail because $source_ar != $exif_ar ('.$source_ar.' != '.$exif_ar.')', __FILE__, __LINE__);
-					break;
-				}
-			}
-
-			// EXIF thumbnail exists, and is equal to or larger than destination thumbnail, and will be use as source image
-			$this->DebugMessage('Trying to use EXIF thumbnail as source image', __FILE__, __LINE__);
-
-			if ($gdimg_exif_temp = $this->ImageCreateFromStringReplacement($this->exif_thumbnail_data, false)) {
-
-				$this->DebugMessage('Successfully using EXIF thumbnail as source image', __FILE__, __LINE__);
-				$this->gdimg_source   = $gdimg_exif_temp;
-				$this->source_width   = $this->exif_thumbnail_width;
-				$this->source_height  = $this->exif_thumbnail_height;
-				$this->thumbnailCropW = $this->source_width;
-				$this->thumbnailCropH = $this->source_height;
-				return true;
-
-			} else {
-				$this->DebugMessage('$this->ImageCreateFromStringReplacement($this->exif_thumbnail_data, false) failed', __FILE__, __LINE__);
-			}
-
-			break;
-		}
-
-		if (!$this->gdimg_source) {
-			$this->DebugMessage('$this->gdimg_source is still empty', __FILE__, __LINE__);
-
-			$this->DebugMessage('ImageMagickThumbnailToGD() failed', __FILE__, __LINE__);
-
-			$imageHeader = '';
-			$gd_info = gd_info();
-			$GDreadSupport = false;
-			switch (@$this->getimagesizeinfo[2]) {
-				case 1:
-					$imageHeader = 'Content-Type: image/gif';
-					$GDreadSupport = (bool) @$gd_info['GIF Read Support'];
-					break;
-				case 2:
-					$imageHeader = 'Content-Type: image/jpeg';
-					$GDreadSupport = (bool) @$gd_info['JPG Support'];
-					break;
-				case 3:
-					$imageHeader = 'Content-Type: image/png';
-					$GDreadSupport = (bool) @$gd_info['PNG Support'];
-					break;
-			}
-			if ($imageHeader) {
-				// cannot create image for whatever reason (maybe imagecreatefromjpeg et al are not available?)
-				// and ImageMagick is not available either, no choice but to output original (not resized/modified) data and exit
-				if ($this->config_error_die_on_source_failure) {
-					$errormessages = array();
-					$errormessages[] = 'All attempts to create GD image source failed.';
-					if ($this->fatalerror) {
-						$errormessages[] = $this->fatalerror;
-					}
-					if ($this->issafemode) {
-						$errormessages[] = 'Safe Mode enabled, therefore ImageMagick is unavailable. (disable Safe Mode if possible)';
-					} elseif (!$this->ImageMagickVersion()) {
-						$errormessages[] = 'ImageMagick is not installed (it is highly recommended that you install it).';
-					}
-					if ($this->SourceImageIsTooLarge($this->getimagesizeinfo[0], $this->getimagesizeinfo[1])) {
-						$memory_get_usage = (function_exists('memory_get_usage') ? memory_get_usage() : 0);
-						$errormessages[] = 'Source image is too large ('.$this->getimagesizeinfo[0].'x'.$this->getimagesizeinfo[1].' = '.number_format($this->getimagesizeinfo[0] * $this->getimagesizeinfo[1] / 1000000, 1).'Mpx, max='.number_format($this->config_max_source_pixels / 1000000, 1).'Mpx) for GD creation (either install ImageMagick or increase PHP memory_limit to at least '.ceil(($memory_get_usage + (5 * $this->getimagesizeinfo[0] * $this->getimagesizeinfo[1])) / 1048576).'M).';
-					} elseif (!$GDreadSupport) {
-						$errormessages[] = 'GD does not have read support for "'.$imageHeader.'".';
-					} else {
-						$errormessages[] = 'Source image probably corrupt.';
-					}
-					$this->ErrorImage(implode("\n", $errormessages));
-
-				} else {
-					$this->DebugMessage('All attempts to create GD image source failed ('.(ini_get('safe_mode') ? 'Safe Mode enabled, ImageMagick unavailable and source image probably too large for GD': ($GDreadSupport ? 'source image probably corrupt' : 'GD does not have read support for "'.$imageHeader.'"')).'), cannot generate thumbnail');
-					//$this->DebugMessage('All attempts to create GD image source failed ('.($GDreadSupport ? 'source image probably corrupt' : 'GD does not have read support for "'.$imageHeader.'"').'), outputing raw image', __FILE__, __LINE__);
-					//if (!$this->phpThumbDebug) {
-					//	header($imageHeader);
-					//	echo $this->rawImageData;
-					//	exit;
-					//}
-					return false;
-				}
-			}
-
-			//switch (substr($this->rawImageData, 0, 2)) {
-			//	case 'BM':
-			switch (@$this->getimagesizeinfo[2]) {
-				case 6:
-					ob_start();
-					if (!@include_once( __DIR__ .'/phpthumb.bmp.php')) {
-						ob_end_clean();
-						return $this->ErrorImage('include_once('. __DIR__ .'/phpthumb.bmp.php) failed');
-					}
-					ob_end_clean();
-					if ($fp = @fopen($this->sourceFilename, 'rb')) {
-						$this->rawImageData = '';
-						while (!feof($fp)) {
-							$this->rawImageData .= fread($fp, 32768);
-						}
-						fclose($fp);
-					}
-					$phpthumb_bmp = new phpthumb_bmp();
-					$this->gdimg_source = $phpthumb_bmp->phpthumb_bmp2gd($this->rawImageData, (phpthumb_functions::gd_version() >= 2.0));
-					unset($phpthumb_bmp);
-					if ($this->gdimg_source) {
-						$this->DebugMessage('$phpthumb_bmp->phpthumb_bmp2gd() succeeded', __FILE__, __LINE__);
-					} else {
-						return $this->ErrorImage($this->ImageMagickVersion() ? 'ImageMagick failed on BMP source conversion' : 'phpthumb_bmp2gd() failed');
-					}
-					break;
-			//}
-			//switch (substr($this->rawImageData, 0, 4)) {
-			//	case 'II'."\x2A\x00":
-			//	case 'MM'."\x00\x2A":
-				case 7:
-				case 8:
-					return $this->ErrorImage($this->ImageMagickVersion() ? 'ImageMagick failed on TIFF source conversion' : 'ImageMagick is unavailable and phpThumb() does not support TIFF source images without it');
-					break;
-
-				//case "\xD7\xCD\xC6\x9A":
-				//	return $this->ErrorImage($this->ImageMagickVersion() ? 'ImageMagick failed on WMF source conversion' : 'ImageMagick is unavailable and phpThumb() does not support WMF source images without it');
-				//	break;
-			}
-
-			if (!$this->gdimg_source) {
-				if ($this->rawImageData) {
-					$HeaderFourBytes = substr($this->rawImageData, 0, 4);
-				} elseif ($this->sourceFilename) {
-					if ($fp = @fopen($this->sourceFilename, 'rb')) {
-						$HeaderFourBytes = fread($fp, 4);
-						fclose($fp);
-					} else {
-						return $this->ErrorImage('failed to open "'.$this->sourceFilename.'" SourceImageToGD() ['.__LINE__.']');
-					}
-				} else {
-					return $this->ErrorImage('Unable to create image, neither filename nor image data suppplied in SourceImageToGD() ['.__LINE__.']');
-				}
-				if (!$this->ImageMagickVersion() && !phpthumb_functions::gd_version()) {
-					return $this->ErrorImage('Neither GD nor ImageMagick seem to be installed on this server. At least one (preferably GD), or better both, MUST be installed for phpThumb to work.');
-				} elseif ($HeaderFourBytes == "\xD7\xCD\xC6\x9A") { // WMF
-					return $this->ErrorImage($this->ImageMagickVersion() ? 'ImageMagick failed on WMF source conversion' : 'ImageMagick is unavailable and phpThumb() does not support WMF source images without it');
-				} elseif ($HeaderFourBytes == '%PDF') { // "%PDF"
-					return $this->ErrorImage($this->ImageMagickVersion() ? 'ImageMagick and GhostScript are both required for PDF source images; GhostScript may not be properly configured' : 'ImageMagick and/or GhostScript are unavailable and phpThumb() does not support PDF source images without them');
-				} elseif (substr($HeaderFourBytes, 0, 3) == "\xFF\xD8\xFF") { // JPEG
-					return $this->ErrorImage('Image (JPEG) is too large for PHP-GD memory_limit, please install ImageMagick or increase php.ini memory_limit setting');
-				} elseif ($HeaderFourBytes == '%PNG') { // "%PNG"
-					return $this->ErrorImage('Image (PNG) is too large for PHP-GD memory_limit, please install ImageMagick or increase php.ini memory_limit setting');
-				} elseif (substr($HeaderFourBytes, 0, 3) == 'GIF') { // GIF
-					return $this->ErrorImage('Image (GIF) is too large for PHP-GD memory_limit, please install ImageMagick or increase php.ini memory_limit setting');
-				}
-				return $this->ErrorImage('Unknown image type identified by "'.$HeaderFourBytes.'" ('.phpthumb_functions::HexCharDisplay($HeaderFourBytes).') in SourceImageToGD() ['.__LINE__.']');
-			}
-		}
-
-		if (!$this->gdimg_source) {
-			if ($gdimg_exif_temp = $this->ImageCreateFromStringReplacement($this->exif_thumbnail_data, false)) {
-				$this->DebugMessage('All other attempts failed, but successfully using EXIF thumbnail as source image', __FILE__, __LINE__);
-				$this->gdimg_source = $gdimg_exif_temp;
-				// override allow-enlarging setting if EXIF thumbnail is the only source available
-				// otherwise thumbnails larger than the EXIF thumbnail will be created at EXIF size
-				$this->aoe = true;
-				return true;
-			}
-			return false;
-		}
-
-		$this->source_width  = imagesx($this->gdimg_source);
-		$this->source_height = imagesy($this->gdimg_source);
-		return true;
-	}
-
-
-	public function phpThumbDebugVarDump($var) {
-		if (null === $var) {
-			return 'NULL';
-		} elseif (is_bool($var)) {
-			return ($var ? 'TRUE' : 'FALSE');
-		} elseif (is_string($var)) {
-			return 'string('.strlen($var).')'.str_repeat(' ', max(0, 3 - strlen(strlen($var)))).' "'.$var.'"';
-		} elseif (is_int($var)) {
-			return 'integer     '.$var;
-		} elseif (is_float($var)) {
-			return 'float       '.$var;
-		} elseif (is_array($var)) {
-			ob_start();
-			var_dump($var);
-			$vardumpoutput = ob_get_contents();
-			ob_end_clean();
-			return strtr($vardumpoutput, "\n\r\t", '   ');
-		}
-		return gettype($var);
-	}
-
-	public function phpThumbDebug($level='') {
-		if ($level && ($this->phpThumbDebug !== $level)) {
-			return true;
-		}
-		if ($this->config_disable_debug) {
-			return $this->ErrorImage('phpThumbDebug disabled');
-		}
-
-		$FunctionsExistance  = array('exif_thumbnail', 'gd_info', 'image_type_to_mime_type', 'getimagesize', 'imagecopyresampled', 'imagecopyresized', 'imagecreate', 'imagecreatefromstring', 'imagecreatetruecolor', 'imageistruecolor', 'imagerotate', 'imagetypes', 'version_compare', 'imagecreatefromgif', 'imagecreatefromjpeg', 'imagecreatefrompng', 'imagecreatefromwbmp', 'imagecreatefromxbm', 'imagecreatefromxpm', 'imagecreatefromstring', 'imagecreatefromgd', 'imagecreatefromgd2', 'imagecreatefromgd2part', 'imagejpeg', 'imagegif', 'imagepng', 'imagewbmp');
-		$ParameterNames      = array('src', 'new', 'w', 'h', 'f', 'q', 'sx', 'sy', 'sw', 'sh', 'far', 'bg', 'bc', 'file', 'goto', 'err', 'xto', 'ra', 'ar', 'aoe', 'iar', 'maxb');
-		$ConfigVariableNames = array('document_root', 'temp_directory', 'output_format', 'output_maxwidth', 'output_maxheight', 'error_message_image_default', 'error_bgcolor', 'error_textcolor', 'error_fontsize', 'error_die_on_error', 'error_silent_die_on_error', 'error_die_on_source_failure', 'nohotlink_enabled', 'nohotlink_valid_domains', 'nohotlink_erase_image', 'nohotlink_text_message', 'nooffsitelink_enabled', 'nooffsitelink_valid_domains', 'nooffsitelink_require_refer', 'nooffsitelink_erase_image', 'nooffsitelink_text_message', 'high_security_enabled', 'allow_src_above_docroot', 'allow_src_above_phpthumb', 'max_source_pixels', 'use_exif_thumbnail_for_speed', 'border_hexcolor', 'background_hexcolor', 'ttf_directory', 'disable_pathinfo_parsing', 'disable_imagecopyresampled');
-		$OtherVariableNames  = array('phpThumbDebug', 'thumbnailQuality', 'thumbnailFormat', 'gdimg_output', 'gdimg_source', 'sourceFilename', 'source_width', 'source_height', 'thumbnailCropX', 'thumbnailCropY', 'thumbnailCropW', 'thumbnailCropH', 'exif_thumbnail_width', 'exif_thumbnail_height', 'exif_thumbnail_type', 'thumbnail_width', 'thumbnail_height', 'thumbnail_image_width', 'thumbnail_image_height');
-
-		$DebugOutput = array();
-		$DebugOutput[] = 'phpThumb() version          = '.$this->phpthumb_version;
-		$DebugOutput[] = 'phpversion()                = '.@PHP_VERSION;
-		$DebugOutput[] = 'PHP_OS                      = '.PHP_OS;
-		$DebugOutput[] = '$_SERVER[SERVER_SOFTWARE]   = '.@$_SERVER['SERVER_SOFTWARE'];
-		$DebugOutput[] = '__FILE__                    = '.__FILE__;
-		$DebugOutput[] = 'realpath(.)                 = '.@realpath('.');
-		$DebugOutput[] = '$_SERVER[PHP_SELF]          = '.@$_SERVER['PHP_SELF'];
-		$DebugOutput[] = '$_SERVER[HOST_NAME]         = '.@$_SERVER['HOST_NAME'];
-		$DebugOutput[] = '$_SERVER[HTTP_REFERER]      = '.@$_SERVER['HTTP_REFERER'];
-		$DebugOutput[] = '$_SERVER[QUERY_STRING]      = '.@$_SERVER['QUERY_STRING'];
-		$DebugOutput[] = '$_SERVER[PATH_INFO]         = '.@$_SERVER['PATH_INFO'];
-		$DebugOutput[] = '$_SERVER[DOCUMENT_ROOT]     = '.@$_SERVER['DOCUMENT_ROOT'];
-		$DebugOutput[] = 'getenv(DOCUMENT_ROOT)       = '.@getenv('DOCUMENT_ROOT');
-		$DebugOutput[] = '';
-
-		$DebugOutput[] = 'get_magic_quotes_gpc()         = '.$this->phpThumbDebugVarDump(@get_magic_quotes_gpc());
-		$DebugOutput[] = 'get_magic_quotes_runtime()     = '.$this->phpThumbDebugVarDump(@get_magic_quotes_runtime());
-		$DebugOutput[] = 'error_reporting()              = '.$this->phpThumbDebugVarDump(error_reporting());
-		$DebugOutput[] = 'ini_get(error_reporting)       = '.$this->phpThumbDebugVarDump(@ini_get('error_reporting'));
-		$DebugOutput[] = 'ini_get(display_errors)        = '.$this->phpThumbDebugVarDump(@ini_get('display_errors'));
-		$DebugOutput[] = 'ini_get(allow_url_fopen)       = '.$this->phpThumbDebugVarDump(@ini_get('allow_url_fopen'));
-		$DebugOutput[] = 'ini_get(disable_functions)     = '.$this->phpThumbDebugVarDump(@ini_get('disable_functions'));
-		$DebugOutput[] = 'get_cfg_var(disable_functions) = '.$this->phpThumbDebugVarDump(@get_cfg_var('disable_functions'));
-		$DebugOutput[] = 'ini_get(safe_mode)             = '.$this->phpThumbDebugVarDump(@ini_get('safe_mode'));
-		$DebugOutput[] = 'ini_get(open_basedir)          = '.$this->phpThumbDebugVarDump(@ini_get('open_basedir'));
-		$DebugOutput[] = 'ini_get(max_execution_time)    = '.$this->phpThumbDebugVarDump(@ini_get('max_execution_time'));
-		$DebugOutput[] = 'ini_get(memory_limit)          = '.$this->phpThumbDebugVarDump(@ini_get('memory_limit'));
-		$DebugOutput[] = 'get_cfg_var(memory_limit)      = '.$this->phpThumbDebugVarDump(@get_cfg_var('memory_limit'));
-		$DebugOutput[] = 'memory_get_usage()             = '.(function_exists('memory_get_usage') ? $this->phpThumbDebugVarDump(@memory_get_usage()) : 'n/a');
-		$DebugOutput[] = '';
-
-		$DebugOutput[] = '$this->config_prefer_imagemagick            = '.$this->phpThumbDebugVarDump($this->config_prefer_imagemagick);
-		$DebugOutput[] = '$this->config_imagemagick_path              = '.$this->phpThumbDebugVarDump($this->config_imagemagick_path);
-		$DebugOutput[] = '$this->ImageMagickWhichConvert()            = '.$this->ImageMagickWhichConvert();
-		$IMpathUsed = ($this->config_imagemagick_path ? $this->config_imagemagick_path : $this->ImageMagickWhichConvert());
-		$DebugOutput[] = '[actual ImageMagick path used]              = '.$this->phpThumbDebugVarDump($IMpathUsed);
-		$DebugOutput[] = 'file_exists([actual ImageMagick path used]) = '.$this->phpThumbDebugVarDump(@file_exists($IMpathUsed));
-		$DebugOutput[] = 'ImageMagickVersion(false)                   = '.$this->ImageMagickVersion(false);
-		$DebugOutput[] = 'ImageMagickVersion(true)                    = '.$this->ImageMagickVersion(true);
-		$DebugOutput[] = '';
-
-		$DebugOutput[] = '$this->config_cache_directory               = '.$this->phpThumbDebugVarDump($this->config_cache_directory);
-		$DebugOutput[] = '$this->config_cache_directory_depth         = '.$this->phpThumbDebugVarDump($this->config_cache_directory_depth);
-		$DebugOutput[] = '$this->config_cache_disable_warning         = '.$this->phpThumbDebugVarDump($this->config_cache_disable_warning);
-		$DebugOutput[] = '$this->config_cache_maxage                  = '.$this->phpThumbDebugVarDump($this->config_cache_maxage);
-		$DebugOutput[] = '$this->config_cache_maxsize                 = '.$this->phpThumbDebugVarDump($this->config_cache_maxsize);
-		$DebugOutput[] = '$this->config_cache_maxfiles                = '.$this->phpThumbDebugVarDump($this->config_cache_maxfiles);
-		$DebugOutput[] = '$this->config_cache_force_passthru          = '.$this->phpThumbDebugVarDump($this->config_cache_force_passthru);
-		$DebugOutput[] = '$this->cache_filename                       = '.$this->phpThumbDebugVarDump($this->cache_filename);
-		$DebugOutput[] = 'is_readable($this->config_cache_directory)  = '.$this->phpThumbDebugVarDump(@is_readable($this->config_cache_directory));
-		$DebugOutput[] = 'is_writable($this->config_cache_directory)  = '.$this->phpThumbDebugVarDump(@is_writable($this->config_cache_directory));
-		$DebugOutput[] = 'is_readable($this->cache_filename)          = '.$this->phpThumbDebugVarDump(@is_readable($this->cache_filename));
-		$DebugOutput[] = 'is_writable($this->cache_filename)          = '.(@file_exists($this->cache_filename) ? $this->phpThumbDebugVarDump(@is_writable($this->cache_filename)) : 'n/a');
-		$DebugOutput[] = '';
-
-		foreach ($ConfigVariableNames as $varname) {
-			$varname = 'config_'.$varname;
-			$value = $this->$varname;
-			$DebugOutput[] = '$this->'.str_pad($varname, 37, ' ', STR_PAD_RIGHT).' = '.$this->phpThumbDebugVarDump($value);
-		}
-		$DebugOutput[] = '';
-		foreach ($OtherVariableNames as $varname) {
-			$value = $this->$varname;
-			$DebugOutput[] = '$this->'.str_pad($varname, 27, ' ', STR_PAD_RIGHT).' = '.$this->phpThumbDebugVarDump($value);
-		}
-		$DebugOutput[] = 'strlen($this->rawImageData)        = '.strlen(@$this->rawImageData);
-		$DebugOutput[] = 'strlen($this->exif_thumbnail_data) = '.strlen(@$this->exif_thumbnail_data);
-		$DebugOutput[] = '';
-
-		foreach ($ParameterNames as $varname) {
-			$value = $this->$varname;
-			$DebugOutput[] = '$this->'.str_pad($varname, 4, ' ', STR_PAD_RIGHT).' = '.$this->phpThumbDebugVarDump($value);
-		}
-		$DebugOutput[] = '';
-
-		foreach ($FunctionsExistance as $functionname) {
-			$DebugOutput[] = 'builtin_function_exists('.$functionname.')'.str_repeat(' ', 23 - strlen($functionname)).' = '.$this->phpThumbDebugVarDump(phpthumb_functions::builtin_function_exists($functionname));
-		}
-		$DebugOutput[] = '';
-
-		$gd_info = gd_info();
-		foreach ($gd_info as $key => $value) {
-			$DebugOutput[] = 'gd_info.'.str_pad($key, 34, ' ', STR_PAD_RIGHT).' = '.$this->phpThumbDebugVarDump($value);
-		}
-		$DebugOutput[] = '';
-
-		$exif_info = phpthumb_functions::exif_info();
-		foreach ($exif_info as $key => $value) {
-			$DebugOutput[] = 'exif_info.'.str_pad($key, 26, ' ', STR_PAD_RIGHT).' = '.$this->phpThumbDebugVarDump($value);
-		}
-		$DebugOutput[] = '';
-
-		if ($ApacheLookupURIarray = phpthumb_functions::ApacheLookupURIarray(dirname(@$_SERVER['PHP_SELF']))) {
-			foreach ($ApacheLookupURIarray as $key => $value) {
-				$DebugOutput[] = 'ApacheLookupURIarray.'.str_pad($key, 15, ' ', STR_PAD_RIGHT).' = '.$this->phpThumbDebugVarDump($value);
-			}
-		} else {
-				$DebugOutput[] = 'ApacheLookupURIarray() -- FAILED';
-		}
-		$DebugOutput[] = '';
-
-		if (isset($_GET) && is_array($_GET)) {
-			foreach ($_GET as $key => $value) {
-				$DebugOutput[] = '$_GET['.$key.']'.str_repeat(' ', 30 - strlen($key)).'= '.$this->phpThumbDebugVarDump($value);
-			}
-		}
-		if (isset($_POST) && is_array($_POST)) {
-			foreach ($_POST as $key => $value) {
-				$DebugOutput[] = '$_POST['.$key.']'.str_repeat(' ', 29 - strlen($key)).'= '.$this->phpThumbDebugVarDump($value);
-			}
-		}
-		$DebugOutput[] = '';
-
-		$DebugOutput[] = '$this->debugmessages:';
-		foreach ($this->debugmessages as $errorstring) {
-			$DebugOutput[] = '  * '.$errorstring;
-		}
-		$DebugOutput[] = '';
-
-		$DebugOutput[] = '$this->debugtiming:';
-		foreach ($this->debugtiming as $timestamp => $timingstring) {
-			$DebugOutput[] = '  * '.$timestamp.' '.$timingstring;
-		}
-		$DebugOutput[] = '  * Total processing time: '.number_format(max(array_keys($this->debugtiming)) - min(array_keys($this->debugtiming)), 6);
-
-		$this->f = (isset($_GET['f']) ? $_GET['f'] : $this->f); // debug modes 0-2 don't recognize text mode otherwise
-		return $this->ErrorImage(implode("\n", $DebugOutput), 700, 500, true);
-	}
-
-	public function FatalError($text) {
-		if (null === $this->fatalerror) {
-			$this->fatalerror = $text;
-		}
-		return true;
-	}
-
-	public function ErrorImage($text, $width=0, $height=0, $forcedisplay=false) {
-		$width  = ($width  ? $width  : $this->config_error_image_width);
-		$height = ($height ? $height : $this->config_error_image_height);
-
-		$text = 'phpThumb() v'.$this->phpthumb_version."\n".'http://phpthumb.sourceforge.net'."\n\n".($this->config_disable_debug ? 'Error messages disabled.'."\n\n".'edit phpThumb.config.php and (temporarily) set'."\n".'$PHPTHUMB_CONFIG[\'disable_debug\'] = false;'."\n".'to view the details of this error' : $text);
-
-		$this->FatalError($text);
-		$this->DebugMessage($text, __FILE__, __LINE__);
-		$this->purgeTempFiles();
-		if ($this->config_error_silent_die_on_error) {
-			exit;
-		}
-		if ($this->phpThumbDebug && !$forcedisplay) {
-			return false;
-		}
-		if (!$this->config_error_die_on_error && !$forcedisplay) {
-			return false;
-		}
-		if ($this->err || $this->config_error_message_image_default) {
-			// Show generic custom error image instead of error message
-			// for use on production sites where you don't want debug messages
-			if (($this->err == 'showerror') || $this->phpThumbDebug) {
-				// fall through and actually show error message even if default error image is set
-			} else {
-				header('Location: '.($this->err ? $this->err : $this->config_error_message_image_default));
-				exit;
-			}
-		}
-		$this->setOutputFormat();
-		if (!$this->thumbnailFormat || !$this->config_disable_debug || (phpthumb_functions::gd_version() < 1)) {
-			$this->thumbnailFormat = 'text';
-		}
-		if (@$this->thumbnailFormat == 'text') {
-			// bypass all GD functions and output text error message
-			if (!headers_sent()) {
-				header('Content-type: text/plain');
-				echo $text;
-			} else {
-				echo '<pre>'.htmlspecialchars($text).'</pre>';
-			}
-			exit;
-		}
-
-		$FontWidth  = imagefontwidth($this->config_error_fontsize);
-		$FontHeight = imagefontheight($this->config_error_fontsize);
-
-		$LinesOfText = explode("\n", @wordwrap($text, floor($width / $FontWidth), "\n", true));
-		$height = max($height, count($LinesOfText) * $FontHeight);
-
-		$headers_file = '';
-		$headers_line = '';
-		if (phpthumb_functions::version_compare_replacement(PHP_VERSION, '4.3.0', '>=') && headers_sent($headers_file, $headers_line)) {
-
-			echo "\n".'**Headers already sent in file "'.$headers_file.'" on line "'.$headers_line.'", dumping error message as text:**<br><pre>'."\n\n".$text."\n".'</pre>';
-
-		} elseif (headers_sent()) {
-
-			echo "\n".'**Headers already sent, dumping error message as text:**<br><pre>'."\n\n".$text."\n".'</pre>';
-
-		} elseif ($gdimg_error = imagecreate($width, $height)) {
-
-			$background_color = phpthumb_functions::ImageHexColorAllocate($gdimg_error, $this->config_error_bgcolor,   true);
-			$text_color       = phpthumb_functions::ImageHexColorAllocate($gdimg_error, $this->config_error_textcolor, true);
-			imagefilledrectangle($gdimg_error, 0, 0, $width, $height, $background_color);
-			$lineYoffset = 0;
-			foreach ($LinesOfText as $line) {
-				imagestring($gdimg_error, $this->config_error_fontsize, 2, $lineYoffset, $line, $text_color);
-				$lineYoffset += $FontHeight;
-			}
-			if (function_exists('imagetypes')) {
-				$imagetypes = imagetypes();
-				if ($imagetypes & IMG_PNG) {
-					header('Content-Type: image/png');
-					imagepng($gdimg_error);
-				} elseif ($imagetypes & IMG_GIF) {
-					header('Content-Type: image/gif');
-					imagegif($gdimg_error);
-				} elseif ($imagetypes & IMG_JPG) {
-					header('Content-Type: image/jpeg');
-					imagejpeg($gdimg_error);
-				} elseif ($imagetypes & IMG_WBMP) {
-					header('Content-Type: image/vnd.wap.wbmp');
-					imagewbmp($gdimg_error);
-				}
-			}
-			imagedestroy($gdimg_error);
-
-		}
-		if (!headers_sent()) {
-			echo "\n".'**Failed to send graphical error image, dumping error message as text:**<br>'."\n\n".$text;
-		}
-		exit;
-	}
-
-	public function ImageCreateFromStringReplacement(&$RawImageData, $DieOnErrors=false) {
-		// there are serious bugs in the non-bundled versions of GD which may cause
-		// PHP to segfault when calling imagecreatefromstring() - avoid if at all possible
-		// when not using a bundled version of GD2
-		if (!phpthumb_functions::gd_version()) {
-			if ($DieOnErrors) {
-				if (!headers_sent()) {
-					// base64-encoded error image in GIF format
-					$ERROR_NOGD = 'R0lGODlhIAAgALMAAAAAABQUFCQkJDY2NkZGRldXV2ZmZnJycoaGhpSUlKWlpbe3t8XFxdXV1eTk5P7+/iwAAAAAIAAgAAAE/vDJSau9WILtTAACUinDNijZtAHfCojS4W5H+qxD8xibIDE9h0OwWaRWDIljJSkUJYsN4bihMB8th3IToAKs1VtYM75cyV8sZ8vygtOE5yMKmGbO4jRdICQCjHdlZzwzNW4qZSQmKDaNjhUMBX4BBAlmMywFSRWEmAI6b5gAlhNxokGhooAIK5o/pi9vEw4Lfj4OLTAUpj6IabMtCwlSFw0DCKBoFqwAB04AjI54PyZ+yY3TD0ss2YcVmN/gvpcu4TOyFivWqYJlbAHPpOntvxNAACcmGHjZzAZqzSzcq5fNjxFmAFw9iFRunD1epU6tsIPmFCAJnWYE0FURk7wJDA0MTKpEzoWAAskiAAA7';
-					header('Content-Type: image/gif');
-					echo base64_decode($ERROR_NOGD);
-				} else {
-					echo '*** ERROR: No PHP-GD support available ***';
-				}
-				exit;
-			} else {
-				$this->DebugMessage('ImageCreateFromStringReplacement() failed: gd_version says "'.phpthumb_functions::gd_version().'"', __FILE__, __LINE__);
-				return false;
-			}
-		}
-		if (phpthumb_functions::gd_is_bundled()) {
-			$this->DebugMessage('ImageCreateFromStringReplacement() calling built-in imagecreatefromstring()', __FILE__, __LINE__);
-			return @imagecreatefromstring($RawImageData);
-		}
-		if ($this->issafemode) {
-			$this->DebugMessage('ImageCreateFromStringReplacement() failed: cannot create temp file in SAFE_MODE', __FILE__, __LINE__);
-			return false;
-		}
-
-		switch (substr($RawImageData, 0, 3)) {
-			case 'GIF':
-				$ICFSreplacementFunctionName = 'imagecreatefromgif';
-				break;
-			case "\xFF\xD8\xFF":
-				$ICFSreplacementFunctionName = 'imagecreatefromjpeg';
-				break;
-			case "\x89".'PN':
-				$ICFSreplacementFunctionName = 'imagecreatefrompng';
-				break;
-			default:
-				$this->DebugMessage('ImageCreateFromStringReplacement() failed: unknown fileformat signature "'.phpthumb_functions::HexCharDisplay(substr($RawImageData, 0, 3)).'"', __FILE__, __LINE__);
-				return false;
-				break;
-		}
-		$ErrorMessage = '';
-		if ($tempnam = $this->phpThumb_tempnam()) {
-			if ($fp_tempnam = @fopen($tempnam, 'wb')) {
-				fwrite($fp_tempnam, $RawImageData);
-				fclose($fp_tempnam);
-				@chmod($tempnam, $this->getParameter('config_file_create_mask'));
-				if (($ICFSreplacementFunctionName == 'imagecreatefromgif') && !function_exists($ICFSreplacementFunctionName)) {
-
-					// Need to create from GIF file, but imagecreatefromgif does not exist
-					ob_start();
-					if (!@include_once( __DIR__ .'/phpthumb.gif.php')) {
-						$ErrorMessage = 'Failed to include required file "'. __DIR__ .'/phpthumb.gif.php" in '.__FILE__.' on line '.__LINE__;
-						$this->DebugMessage($ErrorMessage, __FILE__, __LINE__);
-					}
-					ob_end_clean();
-					// gif_loadFileToGDimageResource() cannot read from raw data, write to file first
-					if ($tempfilename = $this->phpThumb_tempnam()) {
-						if ($fp_tempfile = @fopen($tempfilename, 'wb')) {
-							fwrite($fp_tempfile, $RawImageData);
-							fclose($fp_tempfile);
-							$gdimg_source = gif_loadFileToGDimageResource($tempfilename);
-							$this->DebugMessage('gif_loadFileToGDimageResource('.$tempfilename.') completed', __FILE__, __LINE__);
-							$this->DebugMessage('deleting "'.$tempfilename.'"', __FILE__, __LINE__);
-							unlink($tempfilename);
-							return $gdimg_source;
-						} else {
-							$ErrorMessage = 'Failed to open tempfile in '.__FILE__.' on line '.__LINE__;
-							$this->DebugMessage($ErrorMessage, __FILE__, __LINE__);
-						}
-					} else {
-						$ErrorMessage = 'Failed to open generate tempfile name in '.__FILE__.' on line '.__LINE__;
-						$this->DebugMessage($ErrorMessage, __FILE__, __LINE__);
-					}
-
-				} elseif (function_exists($ICFSreplacementFunctionName) && ($gdimg_source = @$ICFSreplacementFunctionName($tempnam))) {
-
-					// great
-					$this->DebugMessage($ICFSreplacementFunctionName.'('.$tempnam.') succeeded', __FILE__, __LINE__);
-					$this->DebugMessage('deleting "'.$tempnam.'"', __FILE__, __LINE__);
-					unlink($tempnam);
-					return $gdimg_source;
-
-				} else {
-
-					// GD functions not available, or failed to create image
-					$this->DebugMessage($ICFSreplacementFunctionName.'('.$tempnam.') '.(function_exists($ICFSreplacementFunctionName) ? 'failed' : 'does not exist'), __FILE__, __LINE__);
-					if (isset($_GET['phpThumbDebug'])) {
-						$this->phpThumbDebug();
-					}
-
-				}
-			} else {
-				$ErrorMessage = 'Failed to fopen('.$tempnam.', "wb") in '.__FILE__.' on line '.__LINE__."\n".'You may need to set $PHPTHUMB_CONFIG[temp_directory] in phpThumb.config.php';
-				if ($this->issafemode) {
-					$ErrorMessage = 'ImageCreateFromStringReplacement() failed in '.__FILE__.' on line '.__LINE__.': cannot create temp file in SAFE_MODE';
-				}
-				$this->DebugMessage($ErrorMessage, __FILE__, __LINE__);
-			}
-			$this->DebugMessage('deleting "'.$tempnam.'"', __FILE__, __LINE__);
-			@unlink($tempnam);
-		} else {
-			$ErrorMessage = 'Failed to generate phpThumb_tempnam() in '.__FILE__.' on line '.__LINE__."\n".'You may need to set $PHPTHUMB_CONFIG[temp_directory] in phpThumb.config.php';
-			if ($this->issafemode) {
-				$ErrorMessage = 'ImageCreateFromStringReplacement() failed in '.__FILE__.' on line '.__LINE__.': cannot create temp file in SAFE_MODE';
-			}
-		}
-		if ($DieOnErrors && $ErrorMessage) {
-			return $this->ErrorImage($ErrorMessage);
-		}
-		return false;
-	}
-
-	public function ImageResizeFunction(&$dst_im, &$src_im, $dstX, $dstY, $srcX, $srcY, $dstW, $dstH, $srcW, $srcH) {
-		$this->DebugMessage('ImageResizeFunction($o, $s, '.$dstX.', '.$dstY.', '.$srcX.', '.$srcY.', '.$dstW.', '.$dstH.', '.$srcW.', '.$srcH.')', __FILE__, __LINE__);
-		if (($dstW == $srcW) && ($dstH == $srcH)) {
-			return imagecopy($dst_im, $src_im, $dstX, $dstY, $srcX, $srcY, $srcW, $srcH);
-		}
-		if (phpthumb_functions::gd_version() >= 2.0) {
-			if ($this->config_disable_imagecopyresampled) {
-				return phpthumb_functions::ImageCopyResampleBicubic($dst_im, $src_im, $dstX, $dstY, $srcX, $srcY, $dstW, $dstH, $srcW, $srcH);
-			}
-			return imagecopyresampled($dst_im, $src_im, $dstX, $dstY, $srcX, $srcY, $dstW, $dstH, $srcW, $srcH);
-		}
-		return imagecopyresized($dst_im, $src_im, $dstX, $dstY, $srcX, $srcY, $dstW, $dstH, $srcW, $srcH);
-	}
-
-	public function InitializeTempDirSetting() {
-		$this->config_temp_directory = ($this->config_temp_directory ? $this->config_temp_directory : $this->realPathSafe((function_exists('sys_get_temp_dir') ? sys_get_temp_dir() : ''))); // sys_get_temp_dir added in PHP v5.2.1
-		$this->config_temp_directory = ($this->config_temp_directory ? $this->config_temp_directory : $this->realPathSafe(ini_get('upload_tmp_dir')));
-		$this->config_temp_directory = ($this->config_temp_directory ? $this->config_temp_directory : $this->realPathSafe(getenv('TMPDIR')));
-		$this->config_temp_directory = ($this->config_temp_directory ? $this->config_temp_directory : $this->realPathSafe(getenv('TMP')));
-		return true;
-	}
-
-	public function phpThumb_tempnam() {
-		$this->InitializeTempDirSetting();
-		$tempnam = $this->realPathSafe(tempnam($this->config_temp_directory, 'pThumb'));
-		$this->tempFilesToDelete[$tempnam] = $tempnam;
-		$this->DebugMessage('phpThumb_tempnam() returning "'.$tempnam.'"', __FILE__, __LINE__);
-		return $tempnam;
-	}
-
-	public function DebugMessage($message, $file='', $line='') {
-		$this->debugmessages[] = $message.($file ? ' in file "'.(basename($file) ? basename($file) : $file).'"' : '').($line ? ' on line '.$line : '');
-		return true;
-	}
-
-	public function DebugTimingMessage($message, $file='', $line='', $timestamp=0) {
-		if (!$timestamp) {
-			$timestamp = array_sum(explode(' ', microtime()));
-		}
-		$this->debugtiming[number_format($timestamp, 6, '.', '')] = ': '.$message.($file ? ' in file "'.(basename($file) ? basename($file) : $file).'"' : '').($line ? ' on line '.$line : '');
-		return true;
-	}
+            }
+
+        } elseif (!$this->gdimg_source && $this->sourceFilename) {
+
+            if ($this->md5s && ($this->md5s != phpthumb_functions::md5_file_safe($this->sourceFilename))) {
+                return $this->ErrorImage('$this->md5s != md5(sourceFilename)'."\n".'"'.$this->md5s.'" != '."\n".'"'.phpthumb_functions::md5_file_safe($this->sourceFilename).'"');
+            }
+            switch (@$this->getimagesizeinfo[2]) {
+                case 1:
+                case 3:
+                    // GIF or PNG input file may have transparency
+                    $this->is_alpha = true;
+                    break;
+            }
+            if (!$this->SourceImageIsTooLarge($this->source_width, $this->source_height)) {
+                $this->gdimg_source = $this->ImageCreateFromFilename($this->sourceFilename);
+            }
+
+        }
+
+        while (true) {
+            if ($this->gdimg_source) {
+                $this->DebugMessage('Not using EXIF thumbnail data because $this->gdimg_source is already set', __FILE__, __LINE__);
+                break;
+            }
+            if (!$this->exif_thumbnail_data) {
+                $this->DebugMessage('Not using EXIF thumbnail data because $this->exif_thumbnail_data is empty', __FILE__, __LINE__);
+                break;
+            }
+            if (ini_get('safe_mode')) {
+                if (!$this->SourceImageIsTooLarge($this->source_width, $this->source_height)) {
+                    $this->DebugMessage('Using EXIF thumbnail data because source image too large and safe_mode enabled', __FILE__, __LINE__);
+                    $this->aoe = true;
+                } else {
+                    break;
+                }
+            } else {
+                if (!$this->config_use_exif_thumbnail_for_speed) {
+                    $this->DebugMessage('Not using EXIF thumbnail data because $this->config_use_exif_thumbnail_for_speed is FALSE', __FILE__, __LINE__);
+                    break;
+                }
+                if (($this->thumbnailCropX != 0) || ($this->thumbnailCropY != 0)) {
+                    $this->DebugMessage('Not using EXIF thumbnail data because source cropping is enabled ('.$this->thumbnailCropX.','.$this->thumbnailCropY.')', __FILE__, __LINE__);
+                    break;
+                }
+                if (($this->w > $this->exif_thumbnail_width) || ($this->h > $this->exif_thumbnail_height)) {
+                    $this->DebugMessage('Not using EXIF thumbnail data because EXIF thumbnail is too small ('.$this->exif_thumbnail_width.'x'.$this->exif_thumbnail_height.' vs '.$this->w.'x'.$this->h.')', __FILE__, __LINE__);
+                    break;
+                }
+                $source_ar = $this->source_width / $this->source_height;
+                $exif_ar   = $this->exif_thumbnail_width / $this->exif_thumbnail_height;
+                if (number_format($source_ar, 2) != number_format($exif_ar, 2)) {
+                    $this->DebugMessage('not using EXIF thumbnail because $source_ar != $exif_ar ('.$source_ar.' != '.$exif_ar.')', __FILE__, __LINE__);
+                    break;
+                }
+            }
+
+            // EXIF thumbnail exists, and is equal to or larger than destination thumbnail, and will be use as source image
+            $this->DebugMessage('Trying to use EXIF thumbnail as source image', __FILE__, __LINE__);
+
+            if ($gdimg_exif_temp = $this->ImageCreateFromStringReplacement($this->exif_thumbnail_data, false)) {
+
+                $this->DebugMessage('Successfully using EXIF thumbnail as source image', __FILE__, __LINE__);
+                $this->gdimg_source   = $gdimg_exif_temp;
+                $this->source_width   = $this->exif_thumbnail_width;
+                $this->source_height  = $this->exif_thumbnail_height;
+                $this->thumbnailCropW = $this->source_width;
+                $this->thumbnailCropH = $this->source_height;
+                return true;
+
+            } else {
+                $this->DebugMessage('$this->ImageCreateFromStringReplacement($this->exif_thumbnail_data, false) failed', __FILE__, __LINE__);
+            }
+
+            break;
+        }
+
+        if (!$this->gdimg_source) {
+            $this->DebugMessage('$this->gdimg_source is still empty', __FILE__, __LINE__);
+
+            $this->DebugMessage('ImageMagickThumbnailToGD() failed', __FILE__, __LINE__);
+
+            $imageHeader = '';
+            $gd_info = gd_info();
+            $GDreadSupport = false;
+            switch (@$this->getimagesizeinfo[2]) {
+                case 1:
+                    $imageHeader = 'Content-Type: image/gif';
+                    $GDreadSupport = (bool) @$gd_info['GIF Read Support'];
+                    break;
+                case 2:
+                    $imageHeader = 'Content-Type: image/jpeg';
+                    $GDreadSupport = (bool) @$gd_info['JPG Support'];
+                    break;
+                case 3:
+                    $imageHeader = 'Content-Type: image/png';
+                    $GDreadSupport = (bool) @$gd_info['PNG Support'];
+                    break;
+            }
+            if ($imageHeader) {
+                // cannot create image for whatever reason (maybe imagecreatefromjpeg et al are not available?)
+                // and ImageMagick is not available either, no choice but to output original (not resized/modified) data and exit
+                if ($this->config_error_die_on_source_failure) {
+                    $errormessages = array();
+                    $errormessages[] = 'All attempts to create GD image source failed.';
+                    if ($this->fatalerror) {
+                        $errormessages[] = $this->fatalerror;
+                    }
+                    if ($this->issafemode) {
+                        $errormessages[] = 'Safe Mode enabled, therefore ImageMagick is unavailable. (disable Safe Mode if possible)';
+                    } elseif (!$this->ImageMagickVersion()) {
+                        $errormessages[] = 'ImageMagick is not installed (it is highly recommended that you install it).';
+                    }
+                    if ($this->SourceImageIsTooLarge($this->getimagesizeinfo[0], $this->getimagesizeinfo[1])) {
+                        $memory_get_usage = (function_exists('memory_get_usage') ? memory_get_usage() : 0);
+                        $errormessages[] = 'Source image is too large ('.$this->getimagesizeinfo[0].'x'.$this->getimagesizeinfo[1].' = '.number_format($this->getimagesizeinfo[0] * $this->getimagesizeinfo[1] / 1000000, 1).'Mpx, max='.number_format($this->config_max_source_pixels / 1000000, 1).'Mpx) for GD creation (either install ImageMagick or increase PHP memory_limit to at least '.ceil(($memory_get_usage + (5 * $this->getimagesizeinfo[0] * $this->getimagesizeinfo[1])) / 1048576).'M).';
+                    } elseif (!$GDreadSupport) {
+                        $errormessages[] = 'GD does not have read support for "'.$imageHeader.'".';
+                    } else {
+                        $errormessages[] = 'Source image probably corrupt.';
+                    }
+                    $this->ErrorImage(implode("\n", $errormessages));
+
+                } else {
+                    $this->DebugMessage('All attempts to create GD image source failed ('.(ini_get('safe_mode') ? 'Safe Mode enabled, ImageMagick unavailable and source image probably too large for GD': ($GDreadSupport ? 'source image probably corrupt' : 'GD does not have read support for "'.$imageHeader.'"')).'), cannot generate thumbnail');
+                    //$this->DebugMessage('All attempts to create GD image source failed ('.($GDreadSupport ? 'source image probably corrupt' : 'GD does not have read support for "'.$imageHeader.'"').'), outputing raw image', __FILE__, __LINE__);
+                    //if (!$this->phpThumbDebug) {
+                    //	header($imageHeader);
+                    //	echo $this->rawImageData;
+                    //	exit;
+                    //}
+                    return false;
+                }
+            }
+
+            //switch (substr($this->rawImageData, 0, 2)) {
+            //	case 'BM':
+            switch (@$this->getimagesizeinfo[2]) {
+                case 6:
+                    ob_start();
+                    if (!@include_once( __DIR__ .'/phpthumb.bmp.php')) {
+                        ob_end_clean();
+                        return $this->ErrorImage('include_once('. __DIR__ .'/phpthumb.bmp.php) failed');
+                    }
+                    ob_end_clean();
+                    if ($fp = @fopen($this->sourceFilename, 'rb')) {
+                        $this->rawImageData = '';
+                        while (!feof($fp)) {
+                            $this->rawImageData .= fread($fp, 32768);
+                        }
+                        fclose($fp);
+                    }
+                    $phpthumb_bmp = new phpthumb_bmp();
+                    $this->gdimg_source = $phpthumb_bmp->phpthumb_bmp2gd($this->rawImageData, (phpthumb_functions::gd_version() >= 2.0));
+                    unset($phpthumb_bmp);
+                    if ($this->gdimg_source) {
+                        $this->DebugMessage('$phpthumb_bmp->phpthumb_bmp2gd() succeeded', __FILE__, __LINE__);
+                    } else {
+                        return $this->ErrorImage($this->ImageMagickVersion() ? 'ImageMagick failed on BMP source conversion' : 'phpthumb_bmp2gd() failed');
+                    }
+                    break;
+            //}
+            //switch (substr($this->rawImageData, 0, 4)) {
+            //	case 'II'."\x2A\x00":
+            //	case 'MM'."\x00\x2A":
+                case 7:
+                case 8:
+                    return $this->ErrorImage($this->ImageMagickVersion() ? 'ImageMagick failed on TIFF source conversion' : 'ImageMagick is unavailable and phpThumb() does not support TIFF source images without it');
+                    break;
+
+                //case "\xD7\xCD\xC6\x9A":
+                //	return $this->ErrorImage($this->ImageMagickVersion() ? 'ImageMagick failed on WMF source conversion' : 'ImageMagick is unavailable and phpThumb() does not support WMF source images without it');
+                //	break;
+            }
+
+            if (!$this->gdimg_source) {
+                if ($this->rawImageData) {
+                    $HeaderFourBytes = substr($this->rawImageData, 0, 4);
+                } elseif ($this->sourceFilename) {
+                    if ($fp = @fopen($this->sourceFilename, 'rb')) {
+                        $HeaderFourBytes = fread($fp, 4);
+                        fclose($fp);
+                    } else {
+                        return $this->ErrorImage('failed to open "'.$this->sourceFilename.'" SourceImageToGD() ['.__LINE__.']');
+                    }
+                } else {
+                    return $this->ErrorImage('Unable to create image, neither filename nor image data suppplied in SourceImageToGD() ['.__LINE__.']');
+                }
+                if (!$this->ImageMagickVersion() && !phpthumb_functions::gd_version()) {
+                    return $this->ErrorImage('Neither GD nor ImageMagick seem to be installed on this server. At least one (preferably GD), or better both, MUST be installed for phpThumb to work.');
+                } elseif ($HeaderFourBytes == "\xD7\xCD\xC6\x9A") { // WMF
+                    return $this->ErrorImage($this->ImageMagickVersion() ? 'ImageMagick failed on WMF source conversion' : 'ImageMagick is unavailable and phpThumb() does not support WMF source images without it');
+                } elseif ($HeaderFourBytes == '%PDF') { // "%PDF"
+                    return $this->ErrorImage($this->ImageMagickVersion() ? 'ImageMagick and GhostScript are both required for PDF source images; GhostScript may not be properly configured' : 'ImageMagick and/or GhostScript are unavailable and phpThumb() does not support PDF source images without them');
+                } elseif (substr($HeaderFourBytes, 0, 3) == "\xFF\xD8\xFF") { // JPEG
+                    return $this->ErrorImage('Image (JPEG) is too large for PHP-GD memory_limit, please install ImageMagick or increase php.ini memory_limit setting');
+                } elseif ($HeaderFourBytes == '%PNG') { // "%PNG"
+                    return $this->ErrorImage('Image (PNG) is too large for PHP-GD memory_limit, please install ImageMagick or increase php.ini memory_limit setting');
+                } elseif (substr($HeaderFourBytes, 0, 3) == 'GIF') { // GIF
+                    return $this->ErrorImage('Image (GIF) is too large for PHP-GD memory_limit, please install ImageMagick or increase php.ini memory_limit setting');
+                }
+                return $this->ErrorImage('Unknown image type identified by "'.$HeaderFourBytes.'" ('.phpthumb_functions::HexCharDisplay($HeaderFourBytes).') in SourceImageToGD() ['.__LINE__.']');
+            }
+        }
+
+        if (!$this->gdimg_source) {
+            if ($gdimg_exif_temp = $this->ImageCreateFromStringReplacement($this->exif_thumbnail_data, false)) {
+                $this->DebugMessage('All other attempts failed, but successfully using EXIF thumbnail as source image', __FILE__, __LINE__);
+                $this->gdimg_source = $gdimg_exif_temp;
+                // override allow-enlarging setting if EXIF thumbnail is the only source available
+                // otherwise thumbnails larger than the EXIF thumbnail will be created at EXIF size
+                $this->aoe = true;
+                return true;
+            }
+            return false;
+        }
+
+        $this->source_width  = imagesx($this->gdimg_source);
+        $this->source_height = imagesy($this->gdimg_source);
+        return true;
+    }
+
+
+    public function phpThumbDebugVarDump($var) {
+        if (null === $var) {
+            return 'NULL';
+        } elseif (is_bool($var)) {
+            return ($var ? 'TRUE' : 'FALSE');
+        } elseif (is_string($var)) {
+            return 'string('.strlen($var).')'.str_repeat(' ', max(0, 3 - strlen(strlen($var)))).' "'.$var.'"';
+        } elseif (is_int($var)) {
+            return 'integer     '.$var;
+        } elseif (is_float($var)) {
+            return 'float       '.$var;
+        } elseif (is_array($var)) {
+            ob_start();
+            var_dump($var);
+            $vardumpoutput = ob_get_contents();
+            ob_end_clean();
+            return strtr($vardumpoutput, "\n\r\t", '   ');
+        }
+        return gettype($var);
+    }
+
+    public function phpThumbDebug($level='') {
+        if ($level && ($this->phpThumbDebug !== $level)) {
+            return true;
+        }
+        if ($this->config_disable_debug) {
+            return $this->ErrorImage('phpThumbDebug disabled');
+        }
+
+        $FunctionsExistance  = array('exif_thumbnail', 'gd_info', 'image_type_to_mime_type', 'getimagesize', 'imagecopyresampled', 'imagecopyresized', 'imagecreate', 'imagecreatefromstring', 'imagecreatetruecolor', 'imageistruecolor', 'imagerotate', 'imagetypes', 'version_compare', 'imagecreatefromgif', 'imagecreatefromjpeg', 'imagecreatefrompng', 'imagecreatefromwbmp', 'imagecreatefromxbm', 'imagecreatefromxpm', 'imagecreatefromstring', 'imagecreatefromgd', 'imagecreatefromgd2', 'imagecreatefromgd2part', 'imagejpeg', 'imagegif', 'imagepng', 'imagewbmp');
+        $ParameterNames      = array('src', 'new', 'w', 'h', 'f', 'q', 'sx', 'sy', 'sw', 'sh', 'far', 'bg', 'bc', 'file', 'goto', 'err', 'xto', 'ra', 'ar', 'aoe', 'iar', 'maxb');
+        $ConfigVariableNames = array('document_root', 'temp_directory', 'output_format', 'output_maxwidth', 'output_maxheight', 'error_message_image_default', 'error_bgcolor', 'error_textcolor', 'error_fontsize', 'error_die_on_error', 'error_silent_die_on_error', 'error_die_on_source_failure', 'nohotlink_enabled', 'nohotlink_valid_domains', 'nohotlink_erase_image', 'nohotlink_text_message', 'nooffsitelink_enabled', 'nooffsitelink_valid_domains', 'nooffsitelink_require_refer', 'nooffsitelink_erase_image', 'nooffsitelink_text_message', 'high_security_enabled', 'allow_src_above_docroot', 'allow_src_above_phpthumb', 'max_source_pixels', 'use_exif_thumbnail_for_speed', 'border_hexcolor', 'background_hexcolor', 'ttf_directory', 'disable_pathinfo_parsing', 'disable_imagecopyresampled');
+        $OtherVariableNames  = array('phpThumbDebug', 'thumbnailQuality', 'thumbnailFormat', 'gdimg_output', 'gdimg_source', 'sourceFilename', 'source_width', 'source_height', 'thumbnailCropX', 'thumbnailCropY', 'thumbnailCropW', 'thumbnailCropH', 'exif_thumbnail_width', 'exif_thumbnail_height', 'exif_thumbnail_type', 'thumbnail_width', 'thumbnail_height', 'thumbnail_image_width', 'thumbnail_image_height');
+
+        $DebugOutput = array();
+        $DebugOutput[] = 'phpThumb() version          = '.$this->phpthumb_version;
+        $DebugOutput[] = 'phpversion()                = '.@PHP_VERSION;
+        $DebugOutput[] = 'PHP_OS                      = '.PHP_OS;
+        $DebugOutput[] = '$_SERVER[SERVER_SOFTWARE]   = '.@$_SERVER['SERVER_SOFTWARE'];
+        $DebugOutput[] = '__FILE__                    = '.__FILE__;
+        $DebugOutput[] = 'realpath(.)                 = '.@realpath('.');
+        $DebugOutput[] = '$_SERVER[PHP_SELF]          = '.@$_SERVER['PHP_SELF'];
+        $DebugOutput[] = '$_SERVER[HOST_NAME]         = '.@$_SERVER['HOST_NAME'];
+        $DebugOutput[] = '$_SERVER[HTTP_REFERER]      = '.@$_SERVER['HTTP_REFERER'];
+        $DebugOutput[] = '$_SERVER[QUERY_STRING]      = '.@$_SERVER['QUERY_STRING'];
+        $DebugOutput[] = '$_SERVER[PATH_INFO]         = '.@$_SERVER['PATH_INFO'];
+        $DebugOutput[] = '$_SERVER[DOCUMENT_ROOT]     = '.@$_SERVER['DOCUMENT_ROOT'];
+        $DebugOutput[] = 'getenv(DOCUMENT_ROOT)       = '.@getenv('DOCUMENT_ROOT');
+        $DebugOutput[] = '';
+
+        $DebugOutput[] = 'get_magic_quotes_gpc()         = '.$this->phpThumbDebugVarDump(@get_magic_quotes_gpc());
+        $DebugOutput[] = 'get_magic_quotes_runtime()     = '.$this->phpThumbDebugVarDump(@get_magic_quotes_runtime());
+        $DebugOutput[] = 'error_reporting()              = '.$this->phpThumbDebugVarDump(error_reporting());
+        $DebugOutput[] = 'ini_get(error_reporting)       = '.$this->phpThumbDebugVarDump(@ini_get('error_reporting'));
+        $DebugOutput[] = 'ini_get(display_errors)        = '.$this->phpThumbDebugVarDump(@ini_get('display_errors'));
+        $DebugOutput[] = 'ini_get(allow_url_fopen)       = '.$this->phpThumbDebugVarDump(@ini_get('allow_url_fopen'));
+        $DebugOutput[] = 'ini_get(disable_functions)     = '.$this->phpThumbDebugVarDump(@ini_get('disable_functions'));
+        $DebugOutput[] = 'get_cfg_var(disable_functions) = '.$this->phpThumbDebugVarDump(@get_cfg_var('disable_functions'));
+        $DebugOutput[] = 'ini_get(safe_mode)             = '.$this->phpThumbDebugVarDump(@ini_get('safe_mode'));
+        $DebugOutput[] = 'ini_get(open_basedir)          = '.$this->phpThumbDebugVarDump(@ini_get('open_basedir'));
+        $DebugOutput[] = 'ini_get(max_execution_time)    = '.$this->phpThumbDebugVarDump(@ini_get('max_execution_time'));
+        $DebugOutput[] = 'ini_get(memory_limit)          = '.$this->phpThumbDebugVarDump(@ini_get('memory_limit'));
+        $DebugOutput[] = 'get_cfg_var(memory_limit)      = '.$this->phpThumbDebugVarDump(@get_cfg_var('memory_limit'));
+        $DebugOutput[] = 'memory_get_usage()             = '.(function_exists('memory_get_usage') ? $this->phpThumbDebugVarDump(@memory_get_usage()) : 'n/a');
+        $DebugOutput[] = '';
+
+        $DebugOutput[] = '$this->config_prefer_imagemagick            = '.$this->phpThumbDebugVarDump($this->config_prefer_imagemagick);
+        $DebugOutput[] = '$this->config_imagemagick_path              = '.$this->phpThumbDebugVarDump($this->config_imagemagick_path);
+        $DebugOutput[] = '$this->ImageMagickWhichConvert()            = '.$this->ImageMagickWhichConvert();
+        $IMpathUsed = ($this->config_imagemagick_path ? $this->config_imagemagick_path : $this->ImageMagickWhichConvert());
+        $DebugOutput[] = '[actual ImageMagick path used]              = '.$this->phpThumbDebugVarDump($IMpathUsed);
+        $DebugOutput[] = 'file_exists([actual ImageMagick path used]) = '.$this->phpThumbDebugVarDump(@file_exists($IMpathUsed));
+        $DebugOutput[] = 'ImageMagickVersion(false)                   = '.$this->ImageMagickVersion(false);
+        $DebugOutput[] = 'ImageMagickVersion(true)                    = '.$this->ImageMagickVersion(true);
+        $DebugOutput[] = '';
+
+        $DebugOutput[] = '$this->config_cache_directory               = '.$this->phpThumbDebugVarDump($this->config_cache_directory);
+        $DebugOutput[] = '$this->config_cache_directory_depth         = '.$this->phpThumbDebugVarDump($this->config_cache_directory_depth);
+        $DebugOutput[] = '$this->config_cache_disable_warning         = '.$this->phpThumbDebugVarDump($this->config_cache_disable_warning);
+        $DebugOutput[] = '$this->config_cache_maxage                  = '.$this->phpThumbDebugVarDump($this->config_cache_maxage);
+        $DebugOutput[] = '$this->config_cache_maxsize                 = '.$this->phpThumbDebugVarDump($this->config_cache_maxsize);
+        $DebugOutput[] = '$this->config_cache_maxfiles                = '.$this->phpThumbDebugVarDump($this->config_cache_maxfiles);
+        $DebugOutput[] = '$this->config_cache_force_passthru          = '.$this->phpThumbDebugVarDump($this->config_cache_force_passthru);
+        $DebugOutput[] = '$this->cache_filename                       = '.$this->phpThumbDebugVarDump($this->cache_filename);
+        $DebugOutput[] = 'is_readable($this->config_cache_directory)  = '.$this->phpThumbDebugVarDump(@is_readable($this->config_cache_directory));
+        $DebugOutput[] = 'is_writable($this->config_cache_directory)  = '.$this->phpThumbDebugVarDump(@is_writable($this->config_cache_directory));
+        $DebugOutput[] = 'is_readable($this->cache_filename)          = '.$this->phpThumbDebugVarDump(@is_readable($this->cache_filename));
+        $DebugOutput[] = 'is_writable($this->cache_filename)          = '.(@file_exists($this->cache_filename) ? $this->phpThumbDebugVarDump(@is_writable($this->cache_filename)) : 'n/a');
+        $DebugOutput[] = '';
+
+        foreach ($ConfigVariableNames as $varname) {
+            $varname = 'config_'.$varname;
+            $value = $this->$varname;
+            $DebugOutput[] = '$this->'.str_pad($varname, 37, ' ', STR_PAD_RIGHT).' = '.$this->phpThumbDebugVarDump($value);
+        }
+        $DebugOutput[] = '';
+        foreach ($OtherVariableNames as $varname) {
+            $value = $this->$varname;
+            $DebugOutput[] = '$this->'.str_pad($varname, 27, ' ', STR_PAD_RIGHT).' = '.$this->phpThumbDebugVarDump($value);
+        }
+        $DebugOutput[] = 'strlen($this->rawImageData)        = '.strlen(@$this->rawImageData);
+        $DebugOutput[] = 'strlen($this->exif_thumbnail_data) = '.strlen(@$this->exif_thumbnail_data);
+        $DebugOutput[] = '';
+
+        foreach ($ParameterNames as $varname) {
+            $value = $this->$varname;
+            $DebugOutput[] = '$this->'.str_pad($varname, 4, ' ', STR_PAD_RIGHT).' = '.$this->phpThumbDebugVarDump($value);
+        }
+        $DebugOutput[] = '';
+
+        foreach ($FunctionsExistance as $functionname) {
+            $DebugOutput[] = 'builtin_function_exists('.$functionname.')'.str_repeat(' ', 23 - strlen($functionname)).' = '.$this->phpThumbDebugVarDump(phpthumb_functions::builtin_function_exists($functionname));
+        }
+        $DebugOutput[] = '';
+
+        $gd_info = gd_info();
+        foreach ($gd_info as $key => $value) {
+            $DebugOutput[] = 'gd_info.'.str_pad($key, 34, ' ', STR_PAD_RIGHT).' = '.$this->phpThumbDebugVarDump($value);
+        }
+        $DebugOutput[] = '';
+
+        $exif_info = phpthumb_functions::exif_info();
+        foreach ($exif_info as $key => $value) {
+            $DebugOutput[] = 'exif_info.'.str_pad($key, 26, ' ', STR_PAD_RIGHT).' = '.$this->phpThumbDebugVarDump($value);
+        }
+        $DebugOutput[] = '';
+
+        if ($ApacheLookupURIarray = phpthumb_functions::ApacheLookupURIarray(dirname(@$_SERVER['PHP_SELF']))) {
+            foreach ($ApacheLookupURIarray as $key => $value) {
+                $DebugOutput[] = 'ApacheLookupURIarray.'.str_pad($key, 15, ' ', STR_PAD_RIGHT).' = '.$this->phpThumbDebugVarDump($value);
+            }
+        } else {
+                $DebugOutput[] = 'ApacheLookupURIarray() -- FAILED';
+        }
+        $DebugOutput[] = '';
+
+        if (isset($_GET) && is_array($_GET)) {
+            foreach ($_GET as $key => $value) {
+                $DebugOutput[] = '$_GET['.$key.']'.str_repeat(' ', 30 - strlen($key)).'= '.$this->phpThumbDebugVarDump($value);
+            }
+        }
+        if (isset($_POST) && is_array($_POST)) {
+            foreach ($_POST as $key => $value) {
+                $DebugOutput[] = '$_POST['.$key.']'.str_repeat(' ', 29 - strlen($key)).'= '.$this->phpThumbDebugVarDump($value);
+            }
+        }
+        $DebugOutput[] = '';
+
+        $DebugOutput[] = '$this->debugmessages:';
+        foreach ($this->debugmessages as $errorstring) {
+            $DebugOutput[] = '  * '.$errorstring;
+        }
+        $DebugOutput[] = '';
+
+        $DebugOutput[] = '$this->debugtiming:';
+        foreach ($this->debugtiming as $timestamp => $timingstring) {
+            $DebugOutput[] = '  * '.$timestamp.' '.$timingstring;
+        }
+        $DebugOutput[] = '  * Total processing time: '.number_format(max(array_keys($this->debugtiming)) - min(array_keys($this->debugtiming)), 6);
+
+        $this->f = (isset($_GET['f']) ? $_GET['f'] : $this->f); // debug modes 0-2 don't recognize text mode otherwise
+        return $this->ErrorImage(implode("\n", $DebugOutput), 700, 500, true);
+    }
+
+    public function FatalError($text) {
+        if (null === $this->fatalerror) {
+            $this->fatalerror = $text;
+        }
+        return true;
+    }
+
+    public function ErrorImage($text, $width=0, $height=0, $forcedisplay=false) {
+        $width  = ($width  ? $width  : $this->config_error_image_width);
+        $height = ($height ? $height : $this->config_error_image_height);
+
+        $text = 'phpThumb() v'.$this->phpthumb_version."\n".'http://phpthumb.sourceforge.net'."\n\n".($this->config_disable_debug ? 'Error messages disabled.'."\n\n".'edit phpThumb.config.php and (temporarily) set'."\n".'$PHPTHUMB_CONFIG[\'disable_debug\'] = false;'."\n".'to view the details of this error' : $text);
+
+        $this->FatalError($text);
+        $this->DebugMessage($text, __FILE__, __LINE__);
+        $this->purgeTempFiles();
+        if ($this->config_error_silent_die_on_error) {
+            exit;
+        }
+        if ($this->phpThumbDebug && !$forcedisplay) {
+            return false;
+        }
+        if (!$this->config_error_die_on_error && !$forcedisplay) {
+            return false;
+        }
+        if ($this->err || $this->config_error_message_image_default) {
+            // Show generic custom error image instead of error message
+            // for use on production sites where you don't want debug messages
+            if (($this->err == 'showerror') || $this->phpThumbDebug) {
+                // fall through and actually show error message even if default error image is set
+            } else {
+                header('Location: '.($this->err ? $this->err : $this->config_error_message_image_default));
+                exit;
+            }
+        }
+        $this->setOutputFormat();
+        if (!$this->thumbnailFormat || !$this->config_disable_debug || (phpthumb_functions::gd_version() < 1)) {
+            $this->thumbnailFormat = 'text';
+        }
+        if (@$this->thumbnailFormat == 'text') {
+            // bypass all GD functions and output text error message
+            if (!headers_sent()) {
+                header('Content-type: text/plain');
+                echo $text;
+            } else {
+                echo '<pre>'.htmlspecialchars($text).'</pre>';
+            }
+            exit;
+        }
+
+        $FontWidth  = imagefontwidth($this->config_error_fontsize);
+        $FontHeight = imagefontheight($this->config_error_fontsize);
+
+        $LinesOfText = explode("\n", @wordwrap($text, floor($width / $FontWidth), "\n", true));
+        $height = max($height, count($LinesOfText) * $FontHeight);
+
+        $headers_file = '';
+        $headers_line = '';
+        if (phpthumb_functions::version_compare_replacement(PHP_VERSION, '4.3.0', '>=') && headers_sent($headers_file, $headers_line)) {
+
+            echo "\n".'**Headers already sent in file "'.$headers_file.'" on line "'.$headers_line.'", dumping error message as text:**<br><pre>'."\n\n".$text."\n".'</pre>';
+
+        } elseif (headers_sent()) {
+
+            echo "\n".'**Headers already sent, dumping error message as text:**<br><pre>'."\n\n".$text."\n".'</pre>';
+
+        } elseif ($gdimg_error = imagecreate($width, $height)) {
+
+            $background_color = phpthumb_functions::ImageHexColorAllocate($gdimg_error, $this->config_error_bgcolor,   true);
+            $text_color       = phpthumb_functions::ImageHexColorAllocate($gdimg_error, $this->config_error_textcolor, true);
+            imagefilledrectangle($gdimg_error, 0, 0, $width, $height, $background_color);
+            $lineYoffset = 0;
+            foreach ($LinesOfText as $line) {
+                imagestring($gdimg_error, $this->config_error_fontsize, 2, $lineYoffset, $line, $text_color);
+                $lineYoffset += $FontHeight;
+            }
+            if (function_exists('imagetypes')) {
+                $imagetypes = imagetypes();
+                if ($imagetypes & IMG_PNG) {
+                    header('Content-Type: image/png');
+                    imagepng($gdimg_error);
+                } elseif ($imagetypes & IMG_GIF) {
+                    header('Content-Type: image/gif');
+                    imagegif($gdimg_error);
+                } elseif ($imagetypes & IMG_JPG) {
+                    header('Content-Type: image/jpeg');
+                    imagejpeg($gdimg_error);
+                } elseif ($imagetypes & IMG_WBMP) {
+                    header('Content-Type: image/vnd.wap.wbmp');
+                    imagewbmp($gdimg_error);
+                }
+            }
+            imagedestroy($gdimg_error);
+
+        }
+        if (!headers_sent()) {
+            echo "\n".'**Failed to send graphical error image, dumping error message as text:**<br>'."\n\n".$text;
+        }
+        exit;
+    }
+
+    public function ImageCreateFromStringReplacement(&$RawImageData, $DieOnErrors=false) {
+        // there are serious bugs in the non-bundled versions of GD which may cause
+        // PHP to segfault when calling imagecreatefromstring() - avoid if at all possible
+        // when not using a bundled version of GD2
+        if (!phpthumb_functions::gd_version()) {
+            if ($DieOnErrors) {
+                if (!headers_sent()) {
+                    // base64-encoded error image in GIF format
+                    $ERROR_NOGD = 'R0lGODlhIAAgALMAAAAAABQUFCQkJDY2NkZGRldXV2ZmZnJycoaGhpSUlKWlpbe3t8XFxdXV1eTk5P7+/iwAAAAAIAAgAAAE/vDJSau9WILtTAACUinDNijZtAHfCojS4W5H+qxD8xibIDE9h0OwWaRWDIljJSkUJYsN4bihMB8th3IToAKs1VtYM75cyV8sZ8vygtOE5yMKmGbO4jRdICQCjHdlZzwzNW4qZSQmKDaNjhUMBX4BBAlmMywFSRWEmAI6b5gAlhNxokGhooAIK5o/pi9vEw4Lfj4OLTAUpj6IabMtCwlSFw0DCKBoFqwAB04AjI54PyZ+yY3TD0ss2YcVmN/gvpcu4TOyFivWqYJlbAHPpOntvxNAACcmGHjZzAZqzSzcq5fNjxFmAFw9iFRunD1epU6tsIPmFCAJnWYE0FURk7wJDA0MTKpEzoWAAskiAAA7';
+                    header('Content-Type: image/gif');
+                    echo base64_decode($ERROR_NOGD);
+                } else {
+                    echo '*** ERROR: No PHP-GD support available ***';
+                }
+                exit;
+            } else {
+                $this->DebugMessage('ImageCreateFromStringReplacement() failed: gd_version says "'.phpthumb_functions::gd_version().'"', __FILE__, __LINE__);
+                return false;
+            }
+        }
+        if (phpthumb_functions::gd_is_bundled()) {
+            $this->DebugMessage('ImageCreateFromStringReplacement() calling built-in imagecreatefromstring()', __FILE__, __LINE__);
+            return @imagecreatefromstring($RawImageData);
+        }
+        if ($this->issafemode) {
+            $this->DebugMessage('ImageCreateFromStringReplacement() failed: cannot create temp file in SAFE_MODE', __FILE__, __LINE__);
+            return false;
+        }
+
+        switch (substr($RawImageData, 0, 3)) {
+            case 'GIF':
+                $ICFSreplacementFunctionName = 'imagecreatefromgif';
+                break;
+            case "\xFF\xD8\xFF":
+                $ICFSreplacementFunctionName = 'imagecreatefromjpeg';
+                break;
+            case "\x89".'PN':
+                $ICFSreplacementFunctionName = 'imagecreatefrompng';
+                break;
+            default:
+                $this->DebugMessage('ImageCreateFromStringReplacement() failed: unknown fileformat signature "'.phpthumb_functions::HexCharDisplay(substr($RawImageData, 0, 3)).'"', __FILE__, __LINE__);
+                return false;
+                break;
+        }
+        $ErrorMessage = '';
+        if ($tempnam = $this->phpThumb_tempnam()) {
+            if ($fp_tempnam = @fopen($tempnam, 'wb')) {
+                fwrite($fp_tempnam, $RawImageData);
+                fclose($fp_tempnam);
+                @chmod($tempnam, $this->getParameter('config_file_create_mask'));
+                if (($ICFSreplacementFunctionName == 'imagecreatefromgif') && !function_exists($ICFSreplacementFunctionName)) {
+
+                    // Need to create from GIF file, but imagecreatefromgif does not exist
+                    ob_start();
+                    if (!@include_once( __DIR__ .'/phpthumb.gif.php')) {
+                        $ErrorMessage = 'Failed to include required file "'. __DIR__ .'/phpthumb.gif.php" in '.__FILE__.' on line '.__LINE__;
+                        $this->DebugMessage($ErrorMessage, __FILE__, __LINE__);
+                    }
+                    ob_end_clean();
+                    // gif_loadFileToGDimageResource() cannot read from raw data, write to file first
+                    if ($tempfilename = $this->phpThumb_tempnam()) {
+                        if ($fp_tempfile = @fopen($tempfilename, 'wb')) {
+                            fwrite($fp_tempfile, $RawImageData);
+                            fclose($fp_tempfile);
+                            $gdimg_source = gif_loadFileToGDimageResource($tempfilename);
+                            $this->DebugMessage('gif_loadFileToGDimageResource('.$tempfilename.') completed', __FILE__, __LINE__);
+                            $this->DebugMessage('deleting "'.$tempfilename.'"', __FILE__, __LINE__);
+                            unlink($tempfilename);
+                            return $gdimg_source;
+                        } else {
+                            $ErrorMessage = 'Failed to open tempfile in '.__FILE__.' on line '.__LINE__;
+                            $this->DebugMessage($ErrorMessage, __FILE__, __LINE__);
+                        }
+                    } else {
+                        $ErrorMessage = 'Failed to open generate tempfile name in '.__FILE__.' on line '.__LINE__;
+                        $this->DebugMessage($ErrorMessage, __FILE__, __LINE__);
+                    }
+
+                } elseif (function_exists($ICFSreplacementFunctionName) && ($gdimg_source = @$ICFSreplacementFunctionName($tempnam))) {
+
+                    // great
+                    $this->DebugMessage($ICFSreplacementFunctionName.'('.$tempnam.') succeeded', __FILE__, __LINE__);
+                    $this->DebugMessage('deleting "'.$tempnam.'"', __FILE__, __LINE__);
+                    unlink($tempnam);
+                    return $gdimg_source;
+
+                } else {
+
+                    // GD functions not available, or failed to create image
+                    $this->DebugMessage($ICFSreplacementFunctionName.'('.$tempnam.') '.(function_exists($ICFSreplacementFunctionName) ? 'failed' : 'does not exist'), __FILE__, __LINE__);
+                    if (isset($_GET['phpThumbDebug'])) {
+                        $this->phpThumbDebug();
+                    }
+
+                }
+            } else {
+                $ErrorMessage = 'Failed to fopen('.$tempnam.', "wb") in '.__FILE__.' on line '.__LINE__."\n".'You may need to set $PHPTHUMB_CONFIG[temp_directory] in phpThumb.config.php';
+                if ($this->issafemode) {
+                    $ErrorMessage = 'ImageCreateFromStringReplacement() failed in '.__FILE__.' on line '.__LINE__.': cannot create temp file in SAFE_MODE';
+                }
+                $this->DebugMessage($ErrorMessage, __FILE__, __LINE__);
+            }
+            $this->DebugMessage('deleting "'.$tempnam.'"', __FILE__, __LINE__);
+            @unlink($tempnam);
+        } else {
+            $ErrorMessage = 'Failed to generate phpThumb_tempnam() in '.__FILE__.' on line '.__LINE__."\n".'You may need to set $PHPTHUMB_CONFIG[temp_directory] in phpThumb.config.php';
+            if ($this->issafemode) {
+                $ErrorMessage = 'ImageCreateFromStringReplacement() failed in '.__FILE__.' on line '.__LINE__.': cannot create temp file in SAFE_MODE';
+            }
+        }
+        if ($DieOnErrors && $ErrorMessage) {
+            return $this->ErrorImage($ErrorMessage);
+        }
+        return false;
+    }
+
+    public function ImageResizeFunction(&$dst_im, &$src_im, $dstX, $dstY, $srcX, $srcY, $dstW, $dstH, $srcW, $srcH) {
+        $this->DebugMessage('ImageResizeFunction($o, $s, '.$dstX.', '.$dstY.', '.$srcX.', '.$srcY.', '.$dstW.', '.$dstH.', '.$srcW.', '.$srcH.')', __FILE__, __LINE__);
+        if (($dstW == $srcW) && ($dstH == $srcH)) {
+            return imagecopy($dst_im, $src_im, $dstX, $dstY, $srcX, $srcY, $srcW, $srcH);
+        }
+        if (phpthumb_functions::gd_version() >= 2.0) {
+            if ($this->config_disable_imagecopyresampled) {
+                return phpthumb_functions::ImageCopyResampleBicubic($dst_im, $src_im, $dstX, $dstY, $srcX, $srcY, $dstW, $dstH, $srcW, $srcH);
+            }
+            return imagecopyresampled($dst_im, $src_im, $dstX, $dstY, $srcX, $srcY, $dstW, $dstH, $srcW, $srcH);
+        }
+        return imagecopyresized($dst_im, $src_im, $dstX, $dstY, $srcX, $srcY, $dstW, $dstH, $srcW, $srcH);
+    }
+
+    public function InitializeTempDirSetting() {
+        $this->config_temp_directory = ($this->config_temp_directory ? $this->config_temp_directory : $this->realPathSafe((function_exists('sys_get_temp_dir') ? sys_get_temp_dir() : ''))); // sys_get_temp_dir added in PHP v5.2.1
+        $this->config_temp_directory = ($this->config_temp_directory ? $this->config_temp_directory : $this->realPathSafe(ini_get('upload_tmp_dir')));
+        $this->config_temp_directory = ($this->config_temp_directory ? $this->config_temp_directory : $this->realPathSafe(getenv('TMPDIR')));
+        $this->config_temp_directory = ($this->config_temp_directory ? $this->config_temp_directory : $this->realPathSafe(getenv('TMP')));
+        return true;
+    }
+
+    public function phpThumb_tempnam() {
+        $this->InitializeTempDirSetting();
+        $tempnam = $this->realPathSafe(tempnam($this->config_temp_directory, 'pThumb'));
+        $this->tempFilesToDelete[$tempnam] = $tempnam;
+        $this->DebugMessage('phpThumb_tempnam() returning "'.$tempnam.'"', __FILE__, __LINE__);
+        return $tempnam;
+    }
+
+    public function DebugMessage($message, $file='', $line='') {
+        $this->debugmessages[] = $message.($file ? ' in file "'.(basename($file) ? basename($file) : $file).'"' : '').($line ? ' on line '.$line : '');
+        return true;
+    }
+
+    public function DebugTimingMessage($message, $file='', $line='', $timestamp=0) {
+        if (!$timestamp) {
+            $timestamp = array_sum(explode(' ', microtime()));
+        }
+        $this->debugtiming[number_format($timestamp, 6, '.', '')] = ': '.$message.($file ? ' in file "'.(basename($file) ? basename($file) : $file).'"' : '').($line ? ' on line '.$line : '');
+        return true;
+    }
 
 }

Spacing +205 added lines, -205 removed lines

@@ -10,9 +10,9 @@ 
 //////////////////////////////////////////////////////////////
 
 ob_start();
-if (!include_once( __DIR__ .'/phpthumb.functions.php')) {
+if (!include_once(__DIR__.'/phpthumb.functions.php')) {
 	ob_end_flush();
-	die('failed to include_once("'. __DIR__ .'/phpthumb.functions.php")');
+	die('failed to include_once("'.__DIR__.'/phpthumb.functions.php")');
 }
 ob_end_clean();
 
@@ -21,42 +21,42 @@ 
 	// public:
 	// START PARAMETERS (for object mode and phpThumb.php)
 	// See phpthumb.readme.txt for descriptions of what each of these values are
-	public $src  = null;     // SouRCe filename
-	public $new  = null;     // NEW image (phpThumb.php only)
-	public $w    = null;     // Width
-	public $h    = null;     // Height
-	public $wp   = null;     // Width  (Portrait Images Only)
-	public $hp   = null;     // Height (Portrait Images Only)
-	public $wl   = null;     // Width  (Landscape Images Only)
-	public $hl   = null;     // Height (Landscape Images Only)
-	public $ws   = null;     // Width  (Square Images Only)
-	public $hs   = null;     // Height (Square Images Only)
-	public $f    = null;     // output image Format
-	public $q    = 75;       // jpeg output Quality
-	public $sx   = null;     // Source crop top-left X position
-	public $sy   = null;     // Source crop top-left Y position
-	public $sw   = null;     // Source crop Width
-	public $sh   = null;     // Source crop Height
-	public $zc   = null;     // Zoom Crop
-	public $bc   = null;     // Border Color
-	public $bg   = null;     // BackGround color
-	public $fltr = array();  // FiLTeRs
-	public $goto = null;     // GO TO url after processing
-	public $err  = null;     // default ERRor image filename
-	public $xto  = null;     // extract eXif Thumbnail Only
-	public $ra   = null;     // Rotate by Angle
-	public $ar   = null;     // Auto Rotate
-	public $aoe  = null;     // Allow Output Enlargement
-	public $far  = null;     // Fixed Aspect Ratio
-	public $iar  = null;     // Ignore Aspect Ratio
-	public $maxb = null;     // MAXimum Bytes
-	public $down = null;     // DOWNload thumbnail filename
-	public $md5s = null;     // MD5 hash of Source image
-	public $sfn  = 0;        // Source Frame Number
-	public $dpi  = 150;      // Dots Per Inch for vector source formats
-	public $sia  = null;     // Save Image As filename
-
-	public $file = null;     // >>>deprecated, DO NOT USE, will be removed in future versions<<<
+	public $src  = null; // SouRCe filename
+	public $new  = null; // NEW image (phpThumb.php only)
+	public $w    = null; // Width
+	public $h    = null; // Height
+	public $wp   = null; // Width  (Portrait Images Only)
+	public $hp   = null; // Height (Portrait Images Only)
+	public $wl   = null; // Width  (Landscape Images Only)
+	public $hl   = null; // Height (Landscape Images Only)
+	public $ws   = null; // Width  (Square Images Only)
+	public $hs   = null; // Height (Square Images Only)
+	public $f    = null; // output image Format
+	public $q    = 75; // jpeg output Quality
+	public $sx   = null; // Source crop top-left X position
+	public $sy   = null; // Source crop top-left Y position
+	public $sw   = null; // Source crop Width
+	public $sh   = null; // Source crop Height
+	public $zc   = null; // Zoom Crop
+	public $bc   = null; // Border Color
+	public $bg   = null; // BackGround color
+	public $fltr = array(); // FiLTeRs
+	public $goto = null; // GO TO url after processing
+	public $err  = null; // default ERRor image filename
+	public $xto  = null; // extract eXif Thumbnail Only
+	public $ra   = null; // Rotate by Angle
+	public $ar   = null; // Auto Rotate
+	public $aoe  = null; // Allow Output Enlargement
+	public $far  = null; // Fixed Aspect Ratio
+	public $iar  = null; // Ignore Aspect Ratio
+	public $maxb = null; // MAXimum Bytes
+	public $down = null; // DOWNload thumbnail filename
+	public $md5s = null; // MD5 hash of Source image
+	public $sfn  = 0; // Source Frame Number
+	public $dpi  = 150; // Dots Per Inch for vector source formats
+	public $sia  = null; // Save Image As filename
+
+	public $file = null; // >>>deprecated, DO NOT USE, will be removed in future versions<<<
 
 	public $phpThumbDebug = null;
 	// END PARAMETERS
@@ -127,7 +127,7 @@ 
 	public $config_cache_source_filemtime_ignore_remote = true;
 	public $config_cache_default_only_suffix            = false;
 	public $config_cache_force_passthru                 = true;
-	public $config_cache_prefix                         = '';    // default value set in the constructor below
+	public $config_cache_prefix                         = ''; // default value set in the constructor below
 
 	// * MySQL
 	public $config_mysql_extension                      = null;
@@ -144,7 +144,7 @@ 
 	public $config_disable_debug                        = true;
 	public $config_allow_src_above_docroot              = false;
 	public $config_allow_src_above_phpthumb             = true;
-	public $config_auto_allow_symlinks                  = true;    // allow symlink target directories without explicitly whitelisting them
+	public $config_auto_allow_symlinks                  = true; // allow symlink target directories without explicitly whitelisting them
 	public $config_additional_allowed_dirs              = array(); // additional directories to allow source images to be read from
 	public $config_file_create_mask                     = 0755;
 	public $config_dir_create_mask                      = 0755;
@@ -208,7 +208,7 @@ 
 	public $tempFilesToDelete = array();
 	public $cache_filename    = null;
 
-	public $AlphaCapableFormats = array( 'png', 'ico', 'gif');
+	public $AlphaCapableFormats = array('png', 'ico', 'gif');
 	public $is_alpha = false;
 
 	public $iswindows        = null;
@@ -230,10 +230,10 @@ 
 
 		foreach (array(ini_get('memory_limit'), get_cfg_var('memory_limit')) as $php_config_memory_limit) {
 			if ('' !== $php_config_memory_limit) {
-				if (strtoupper($php_config_memory_limit[ strlen($php_config_memory_limit) - 1 ]) == 'G') { // PHP memory limit expressed in Gigabytes
-					$php_config_memory_limit = (int) substr($php_config_memory_limit, 0, -1) * 1073741824;
-				} elseif (strtoupper($php_config_memory_limit[ strlen($php_config_memory_limit) - 1 ]) == 'M') { // PHP memory limit expressed in Megabytes
-					$php_config_memory_limit = (int) substr($php_config_memory_limit, 0, -1) * 1048576;
+				if (strtoupper($php_config_memory_limit[strlen($php_config_memory_limit) - 1]) == 'G') { // PHP memory limit expressed in Gigabytes
+					$php_config_memory_limit = (int)substr($php_config_memory_limit, 0, -1) * 1073741824;
+				} elseif (strtoupper($php_config_memory_limit[strlen($php_config_memory_limit) - 1]) == 'M') { // PHP memory limit expressed in Megabytes
+					$php_config_memory_limit = (int)substr($php_config_memory_limit, 0, -1) * 1048576;
 				}
 				$this->php_memory_limit = max($this->php_memory_limit, $php_config_memory_limit);
 			}
@@ -242,10 +242,10 @@ 
 			$this->config_max_source_pixels = round($this->php_memory_limit * 0.20); // 20% of memory_limit
 		}
 
-		$this->iswindows  = (bool) (strtoupper(substr(PHP_OS, 0, 3)) == 'WIN');
-		$this->issafemode = (bool) preg_match('#(1|ON)#i', ini_get('safe_mode'));
-		$this->config_document_root = (!empty($_SERVER['DOCUMENT_ROOT']) ? $_SERVER['DOCUMENT_ROOT']   : $this->config_document_root);
-		$this->config_cache_prefix  = ( isset($_SERVER['SERVER_NAME'])   ? $_SERVER['SERVER_NAME'].'_' : '');
+		$this->iswindows  = (bool)(strtoupper(substr(PHP_OS, 0, 3)) == 'WIN');
+		$this->issafemode = (bool)preg_match('#(1|ON)#i', ini_get('safe_mode'));
+		$this->config_document_root = (!empty($_SERVER['DOCUMENT_ROOT']) ? $_SERVER['DOCUMENT_ROOT'] : $this->config_document_root);
+		$this->config_cache_prefix  = (isset($_SERVER['SERVER_NAME']) ? $_SERVER['SERVER_NAME'].'_' : '');
 
 		$this->purgeTempFiles(); // purge existing temp files if re-initializing object
 
@@ -256,7 +256,7 @@ 
 
 		if (!$this->config_disable_debug) {
 			// if debug mode is enabled, force phpThumbDebug output, do not allow normal thumbnails to be generated
-			$this->phpThumbDebug = (null === $this->phpThumbDebug ? 9 : max(1, (int) $this->phpThumbDebug));
+			$this->phpThumbDebug = (null === $this->phpThumbDebug ? 9 : max(1, (int)$this->phpThumbDebug));
 		}
 	}
 
@@ -296,10 +296,10 @@ 
 	}
 
 	// public:
-	public function setSourceData($rawImageData, $sourceFilename='') {
+	public function setSourceData($rawImageData, $sourceFilename = '') {
 		//$this->resetObject();
 		//$this->sourceFilename = null;
-		$this->rawImageData   = $rawImageData;
+		$this->rawImageData = $rawImageData;
 		$this->DebugMessage('setSourceData() setting $this->rawImageData ('.strlen($this->rawImageData).' bytes; magic="'.substr($this->rawImageData, 0, 4).'" ('.phpthumb_functions::HexCharDisplay(substr($this->rawImageData, 0, 4)).'))', __FILE__, __LINE__);
 		if ($this->config_cache_source_enabled) {
 			$sourceFilename = ($sourceFilename ? $sourceFilename : md5($rawImageData));
@@ -381,19 +381,19 @@ 
 			$this->phpThumbDebug('8h');
 
 		// default values, also applicable for far="C"
-		$destination_offset_x = round(($this->thumbnail_width  - $this->thumbnail_image_width)  / 2);
+		$destination_offset_x = round(($this->thumbnail_width - $this->thumbnail_image_width) / 2);
 		$destination_offset_y = round(($this->thumbnail_height - $this->thumbnail_image_height) / 2);
 		if (($this->far == 'L') || ($this->far == 'TL') || ($this->far == 'BL')) {
 			$destination_offset_x = 0;
 		}
 		if (($this->far == 'R') || ($this->far == 'TR') || ($this->far == 'BR')) {
-			$destination_offset_x =  round($this->thumbnail_width  - $this->thumbnail_image_width);
+			$destination_offset_x = round($this->thumbnail_width - $this->thumbnail_image_width);
 		}
 		if (($this->far == 'T') || ($this->far == 'TL') || ($this->far == 'TR')) {
 			$destination_offset_y = 0;
 		}
 		if (($this->far == 'B') || ($this->far == 'BL') || ($this->far == 'BR')) {
-			$destination_offset_y =  round($this->thumbnail_height - $this->thumbnail_image_height);
+			$destination_offset_y = round($this->thumbnail_height - $this->thumbnail_image_height);
 		}
 
 //		// copy/resize image to appropriate dimensions
@@ -461,14 +461,14 @@ 
 		$builtin_formats = array();
 		if (function_exists('imagetypes')) {
 			$imagetypes = imagetypes();
-			$builtin_formats['wbmp'] = (bool) ($imagetypes & IMG_WBMP);
-			$builtin_formats['jpg']  = (bool) ($imagetypes & IMG_JPG);
-			$builtin_formats['gif']  = (bool) ($imagetypes & IMG_GIF);
-			$builtin_formats['png']  = (bool) ($imagetypes & IMG_PNG);
+			$builtin_formats['wbmp'] = (bool)($imagetypes & IMG_WBMP);
+			$builtin_formats['jpg']  = (bool)($imagetypes & IMG_JPG);
+			$builtin_formats['gif']  = (bool)($imagetypes & IMG_GIF);
+			$builtin_formats['png']  = (bool)($imagetypes & IMG_PNG);
 		}
 
-		$this->DebugMessage('imageinterlace($this->gdimg_output, '. (int) $this->config_output_interlace .')', __FILE__, __LINE__);
-		imageinterlace($this->gdimg_output, (int) $this->config_output_interlace);
+		$this->DebugMessage('imageinterlace($this->gdimg_output, '.(int)$this->config_output_interlace.')', __FILE__, __LINE__);
+		imageinterlace($this->gdimg_output, (int)$this->config_output_interlace);
 
 		$this->DebugMessage('RenderOutput() attempting image'.strtolower(@$this->thumbnailFormat).'($this->gdimg_output)', __FILE__, __LINE__);
 		ob_start();
@@ -535,8 +535,8 @@ 
 				break;
 
 			case 'bmp':
-				if (!@include_once( __DIR__ .'/phpthumb.bmp.php')) {
-					$this->DebugMessage('Error including "'. __DIR__ .'/phpthumb.bmp.php" which is required for BMP format output', __FILE__, __LINE__);
+				if (!@include_once(__DIR__.'/phpthumb.bmp.php')) {
+					$this->DebugMessage('Error including "'.__DIR__.'/phpthumb.bmp.php" which is required for BMP format output', __FILE__, __LINE__);
 					ob_end_clean();
 					return false;
 				}
@@ -546,8 +546,8 @@ 
 				break;
 
 			case 'ico':
-				if (!@include_once( __DIR__ .'/phpthumb.ico.php')) {
-					$this->DebugMessage('Error including "'. __DIR__ .'/phpthumb.ico.php" which is required for ICO format output', __FILE__, __LINE__);
+				if (!@include_once(__DIR__.'/phpthumb.ico.php')) {
+					$this->DebugMessage('Error including "'.__DIR__.'/phpthumb.ico.php" which is required for ICO format output', __FILE__, __LINE__);
 					ob_end_clean();
 					return false;
 				}
@@ -637,8 +637,8 @@ 
 
 		} else {
 
-			$this->DebugMessage('imageinterlace($this->gdimg_output, '. (int) $this->config_output_interlace .')', __FILE__, __LINE__);
-			imageinterlace($this->gdimg_output, (int) $this->config_output_interlace);
+			$this->DebugMessage('imageinterlace($this->gdimg_output, '.(int)$this->config_output_interlace.')', __FILE__, __LINE__);
+			imageinterlace($this->gdimg_output, (int)$this->config_output_interlace);
 			switch ($this->thumbnailFormat) {
 				case 'jpeg':
 					header('Content-Type: '.phpthumb_functions::ImageTypeToMIMEtype($this->thumbnailFormat));
@@ -654,8 +654,8 @@ 
 					break;
 
 				case 'bmp':
-					if (!@include_once( __DIR__ .'/phpthumb.bmp.php')) {
-						$this->DebugMessage('Error including "'. __DIR__ .'/phpthumb.bmp.php" which is required for BMP format output', __FILE__, __LINE__);
+					if (!@include_once(__DIR__.'/phpthumb.bmp.php')) {
+						$this->DebugMessage('Error including "'.__DIR__.'/phpthumb.bmp.php" which is required for BMP format output', __FILE__, __LINE__);
 						return false;
 					}
 					$phpthumb_bmp = new phpthumb_bmp();
@@ -675,8 +675,8 @@ 
 					break;
 
 				case 'ico':
-					if (!@include_once( __DIR__ .'/phpthumb.ico.php')) {
-						$this->DebugMessage('Error including "'. __DIR__ .'/phpthumb.ico.php" which is required for ICO format output', __FILE__, __LINE__);
+					if (!@include_once(__DIR__.'/phpthumb.ico.php')) {
+						$this->DebugMessage('Error including "'.__DIR__.'/phpthumb.ico.php" which is required for ICO format output', __FILE__, __LINE__);
 						return false;
 					}
 					$phpthumb_ico = new phpthumb_ico();
@@ -927,10 +927,10 @@ 
 
 		$AvailableImageOutputFormats = array();
 		$AvailableImageOutputFormats[] = 'text';
-		if (@is_readable( __DIR__ .'/phpthumb.ico.php')) {
+		if (@is_readable(__DIR__.'/phpthumb.ico.php')) {
 			$AvailableImageOutputFormats[] = 'ico';
 		}
-		if (@is_readable( __DIR__ .'/phpthumb.bmp.php')) {
+		if (@is_readable(__DIR__.'/phpthumb.bmp.php')) {
 			$AvailableImageOutputFormats[] = 'bmp';
 		}
 
@@ -956,7 +956,7 @@ 
 				$AvailableImageOutputFormats[] = 'jpeg';
 			}
 		} else {
-			$this->DebugMessage('imagetypes() does not exist - GD support might not be enabled?',  __FILE__, __LINE__);
+			$this->DebugMessage('imagetypes() does not exist - GD support might not be enabled?', __FILE__, __LINE__);
 		}
 		if ($this->ImageMagickVersion()) {
 			$IMformats = array('jpeg', 'png', 'gif', 'bmp', 'ico', 'wbmp');
@@ -993,7 +993,7 @@ 
 		// for JPEG images, quality 1 (worst) to 99 (best)
 		// quality < 25 is nasty, with not much size savings - not recommended
 		// problems with 100 - invalid JPEG?
-		$this->thumbnailQuality = max(1, min(99, ($this->q ? (int) $this->q : 75)));
+		$this->thumbnailQuality = max(1, min(99, ($this->q ? (int)$this->q : 75)));
 		$this->DebugMessage('$this->thumbnailQuality set to "'.$this->thumbnailQuality.'"', __FILE__, __LINE__);
 
 		return true;
@@ -1003,7 +1003,7 @@ 
 	public function setCacheDirectory() {
 		// resolve cache directory to absolute pathname
 		$this->DebugMessage('setCacheDirectory() starting with config_cache_directory = "'.$this->config_cache_directory.'"', __FILE__, __LINE__);
-		if ($this->config_cache_directory[ 0 ] == '.') {
+		if ($this->config_cache_directory[0] == '.') {
 			if (preg_match('#^(f|ht)tps?\://#i', $this->src)) {
 				if (!$this->config_cache_disable_warning) {
 					$this->ErrorImage('$this->config_cache_directory ('.$this->config_cache_directory.') cannot be used for remote images. Adjust "cache_directory" or "cache_disable_warning" in phpThumb.config.php');
@@ -1144,7 +1144,7 @@ 
 			array_unshift($allowed_dirs, $this->realPathSafe($this->config_document_root));
 		} else {
 			if (!$this->config_allow_src_above_phpthumb) {
-				array_unshift($allowed_dirs, $this->realPathSafe( __DIR__ ));
+				array_unshift($allowed_dirs, $this->realPathSafe(__DIR__));
 			} else {
 				// no checks are needed, offload the work to realpath and forget about it
 				$this->DebugMessage('resolvePath: checks disabled, returning '.$this->realPathSafe($path), __FILE__, __LINE__);
@@ -1201,7 +1201,7 @@ 
 			if ($this->config_auto_allow_symlinks) {
 				$allowed_dirs[0] = $path;
 			}
-			$path = $path.DIRECTORY_SEPARATOR.implode(DIRECTORY_SEPARATOR, array_slice($segments,$i + 1));
+			$path = $path.DIRECTORY_SEPARATOR.implode(DIRECTORY_SEPARATOR, array_slice($segments, $i + 1));
 		} while (true);
 		return $path;
 	}
@@ -1217,7 +1217,7 @@ 
 		// http://stackoverflow.com/questions/21421569
 		$newfilename = preg_replace('#[\\/]+#', DIRECTORY_SEPARATOR, $filename);
 		if (!preg_match('#^'.DIRECTORY_SEPARATOR.'#', $newfilename)) {
-			$newfilename =  __DIR__ .DIRECTORY_SEPARATOR.$newfilename;
+			$newfilename = __DIR__.DIRECTORY_SEPARATOR.$newfilename;
 		}
 		do {
 			$beforeloop = $newfilename;
@@ -1307,7 +1307,7 @@ 
 		} else {
 
 			// relative to current directory (any OS)
-			$AbsoluteFilename =  __DIR__ .DIRECTORY_SEPARATOR.preg_replace('#[/\\\\]#', DIRECTORY_SEPARATOR, $filename);
+			$AbsoluteFilename = __DIR__.DIRECTORY_SEPARATOR.preg_replace('#[/\\\\]#', DIRECTORY_SEPARATOR, $filename);
 
 			if (substr(dirname(@$_SERVER['PHP_SELF']), 0, 2) == '/~') {
 				if ($ApacheLookupURIarray = phpthumb_functions::ApacheLookupURIarray(dirname(@$_SERVER['PHP_SELF']))) {
@@ -1344,15 +1344,15 @@ 
 			$this->DebugMessage('!$this->config_allow_src_above_docroot therefore setting "'.$AbsoluteFilename.'" (outside "'.$this->realPathSafe($this->config_document_root).'") to null', __FILE__, __LINE__);
 			return false;
 		}
-		if (!$this->config_allow_src_above_phpthumb && !preg_match('#^'.preg_quote(str_replace(DIRECTORY_SEPARATOR, '/',  __DIR__ )).'#', $resolvedAbsoluteFilename)) {
-			$this->DebugMessage('!$this->config_allow_src_above_phpthumb therefore setting "'.$AbsoluteFilename.'" (outside "'. __DIR__ .'") to null', __FILE__, __LINE__);
+		if (!$this->config_allow_src_above_phpthumb && !preg_match('#^'.preg_quote(str_replace(DIRECTORY_SEPARATOR, '/', __DIR__)).'#', $resolvedAbsoluteFilename)) {
+			$this->DebugMessage('!$this->config_allow_src_above_phpthumb therefore setting "'.$AbsoluteFilename.'" (outside "'.__DIR__.'") to null', __FILE__, __LINE__);
 			return false;
 		}
 		return $resolvedAbsoluteFilename;
 	}
 
 
-	public function file_exists_ignoreopenbasedir($filename, $cached=true) {
+	public function file_exists_ignoreopenbasedir($filename, $cached = true) {
 		static $open_basedirs = null;
 		static $file_exists_cache = array();
 		if (!$cached || !isset($file_exists_cache[$filename])) {
@@ -1363,7 +1363,7 @@ 
 				$file_exists_cache[$filename] = file_exists($filename);
 			} elseif ($this->iswindows) {
 				$ls_filename = trim(phpthumb_functions::SafeExec('dir /b '.phpthumb_functions::escapeshellarg_replacement($filename)));
-				$file_exists_cache[$filename] = ($ls_filename == basename($filename));  // command dir /b return only filename without path
+				$file_exists_cache[$filename] = ($ls_filename == basename($filename)); // command dir /b return only filename without path
 			} else {
 				$ls_filename = trim(phpthumb_functions::SafeExec('ls '.phpthumb_functions::escapeshellarg_replacement($filename)));
 				$file_exists_cache[$filename] = ($ls_filename == $filename);
@@ -1416,10 +1416,10 @@ 
 					$this->DebugMessage('Leaving $this->config_imagemagick_path as ('.$this->config_imagemagick_path.') because !is_execuatable($this->realPathSafe($this->config_imagemagick_path)) ('.$this->realPathSafe($this->config_imagemagick_path).')', __FILE__, __LINE__);
 				}
 			}
-			$this->DebugMessage('                  file_exists('.$this->config_imagemagick_path.') = '. (int) (@file_exists($this->config_imagemagick_path)), __FILE__, __LINE__);
-			$this->DebugMessage('file_exists_ignoreopenbasedir('.$this->config_imagemagick_path.') = '. (int) $this->file_exists_ignoreopenbasedir($this->config_imagemagick_path), __FILE__, __LINE__);
-			$this->DebugMessage('                      is_file('.$this->config_imagemagick_path.') = '. (int) (@is_file($this->config_imagemagick_path)), __FILE__, __LINE__);
-			$this->DebugMessage('                is_executable('.$this->config_imagemagick_path.') = '. (int) (@is_executable($this->config_imagemagick_path)), __FILE__, __LINE__);
+			$this->DebugMessage('                  file_exists('.$this->config_imagemagick_path.') = '.(int)(@file_exists($this->config_imagemagick_path)), __FILE__, __LINE__);
+			$this->DebugMessage('file_exists_ignoreopenbasedir('.$this->config_imagemagick_path.') = '.(int)$this->file_exists_ignoreopenbasedir($this->config_imagemagick_path), __FILE__, __LINE__);
+			$this->DebugMessage('                      is_file('.$this->config_imagemagick_path.') = '.(int)(@is_file($this->config_imagemagick_path)), __FILE__, __LINE__);
+			$this->DebugMessage('                is_executable('.$this->config_imagemagick_path.') = '.(int)(@is_executable($this->config_imagemagick_path)), __FILE__, __LINE__);
 
 			if ($this->file_exists_ignoreopenbasedir($this->config_imagemagick_path)) {
 
@@ -1464,7 +1464,7 @@ 
 	}
 
 
-	public function ImageMagickVersion($returnRAW=false) {
+	public function ImageMagickVersion($returnRAW = false) {
 		static $versionstring = null;
 		if (null === $versionstring) {
 			$versionstring = array(0=>false, 1=>false);
@@ -1498,7 +1498,7 @@ 
 
 			}
 		}
-		return $versionstring[ (int) $returnRAW ];
+		return $versionstring[(int)$returnRAW];
 	}
 
 
@@ -1525,10 +1525,10 @@ 
 					break;
 				}
 			}
-			$this->DebugMessage('ImageMagickSwitchAvailable('.implode(';', $switchname).') = '. (int) $allOK .'', __FILE__, __LINE__);
+			$this->DebugMessage('ImageMagickSwitchAvailable('.implode(';', $switchname).') = '.(int)$allOK.'', __FILE__, __LINE__);
 		} else {
 			$allOK = isset($IMoptions[$switchname]);
-			$this->DebugMessage('ImageMagickSwitchAvailable('.$switchname.') = '. (int) $allOK .'', __FILE__, __LINE__);
+			$this->DebugMessage('ImageMagickSwitchAvailable('.$switchname.') = '.(int)$allOK.'', __FILE__, __LINE__);
 		}
 		return $allOK;
 	}
@@ -1655,7 +1655,7 @@ 
 
 		$commandline = $this->ImageMagickCommandlineBase();
 		if ($commandline) {
-			$commandline .= ' '.phpthumb_functions::escapeshellarg_replacement(preg_replace('#[/\\\\]#', DIRECTORY_SEPARATOR, $this->sourceFilename).(($outputFormat == 'gif') ? '' : '['. (int) $this->sfn .']')); // [0] means first frame of (GIF) animation, can be ignored
+			$commandline .= ' '.phpthumb_functions::escapeshellarg_replacement(preg_replace('#[/\\\\]#', DIRECTORY_SEPARATOR, $this->sourceFilename).(($outputFormat == 'gif') ? '' : '['.(int)$this->sfn.']')); // [0] means first frame of (GIF) animation, can be ignored
 			if ($IMtempfilename = $this->phpThumb_tempnam()) {
 				$IMtempfilename = $this->realPathSafe($IMtempfilename);
 
@@ -1669,7 +1669,7 @@ 
 					$commandline_test = $this->ImageMagickCommandlineBase().' logo: -resize 1x '.phpthumb_functions::escapeshellarg_replacement($IMtempfilename).' 2>&1';
 					$IMresult_test = phpthumb_functions::SafeExec($commandline_test);
 					$IMuseExplicitImageOutputDimensions = preg_match('#image dimensions are zero#i', $IMresult_test);
-					$this->DebugMessage('IMuseExplicitImageOutputDimensions = '. (int) $IMuseExplicitImageOutputDimensions, __FILE__, __LINE__);
+					$this->DebugMessage('IMuseExplicitImageOutputDimensions = '.(int)$IMuseExplicitImageOutputDimensions, __FILE__, __LINE__);
 					if ($fp_im_temp = @fopen($IMtempfilename, 'wb')) {
 						// erase temp image so ImageMagick logo doesn't get output if other processing fails
 						fclose($fp_im_temp);
@@ -1730,13 +1730,13 @@ 
 									}
 								}
 							}
-							$wAll = (int) max($this->w, $this->wp, $this->wl, $this->ws) - (2 * $borderThickness);
-							$hAll = (int) max($this->h, $this->hp, $this->hl, $this->hs) - (2 * $borderThickness);
+							$wAll = (int)max($this->w, $this->wp, $this->wl, $this->ws) - (2 * $borderThickness);
+							$hAll = (int)max($this->h, $this->hp, $this->hl, $this->hs) - (2 * $borderThickness);
 							$imAR = $this->source_width / $this->source_height;
 							$zcAR = (($wAll && $hAll) ? $wAll / $hAll : 1);
 							$side  = phpthumb_functions::nonempty_min($this->source_width, $this->source_height, max($wAll, $hAll));
-							$sideX = phpthumb_functions::nonempty_min($this->source_width,                       $wAll, round($hAll * $zcAR));
-							$sideY = phpthumb_functions::nonempty_min(                     $this->source_height, $hAll, round($wAll / $zcAR));
+							$sideX = phpthumb_functions::nonempty_min($this->source_width, $wAll, round($hAll * $zcAR));
+							$sideY = phpthumb_functions::nonempty_min($this->source_height, $hAll, round($wAll / $zcAR));
 
 							$thumbnailH = round(max($sideY, ($sideY * $zcAR) / $imAR));
 							if ($this->aoe == 1) {
@@ -1791,9 +1791,9 @@ 
 						} elseif ($this->sw || $this->sh || $this->sx || $this->sy) {
 
 							$crop_param   = '';
-							$crop_param  .=     ($this->sw ? (($this->sw < 2) ? round($this->sw * $this->source_width)  : $this->sw) : $this->source_width);
+							$crop_param  .= ($this->sw ? (($this->sw < 2) ? round($this->sw * $this->source_width) : $this->sw) : $this->source_width);
 							$crop_param  .= 'x'.($this->sh ? (($this->sh < 2) ? round($this->sh * $this->source_height) : $this->sh) : $this->source_height);
-							$crop_param  .= '+'.(($this->sx < 2) ? round($this->sx * $this->source_width)  : $this->sx);
+							$crop_param  .= '+'.(($this->sx < 2) ? round($this->sx * $this->source_width) : $this->sx);
 							$crop_param  .= '+'.(($this->sy < 2) ? round($this->sy * $this->source_height) : $this->sy);
 // TO BE FIXED
 // makes 1x1 output
@@ -1823,14 +1823,14 @@ 
 
 						} else {
 
-							if ($this->iar && ((int) $this->w > 0) && ((int) $this->h > 0)) {
+							if ($this->iar && ((int)$this->w > 0) && ((int)$this->h > 0)) {
 
 								list($nw, $nh) = phpthumb_functions::TranslateWHbyAngle($this->w, $this->h, $this->ra);
 								$nw = ((round($nw) != 0) ? round($nw) : '');
 								$nh = ((round($nh) != 0) ? round($nh) : '');
 								$commandline .= ' -'.$IMresizeParameter.' '.phpthumb_functions::escapeshellarg_replacement($nw.'x'.$nh.'!');
 
-							} elseif ($this->far && ((int) $this->w > 0) && ((int) $this->h > 0)) {
+							} elseif ($this->far && ((int)$this->w > 0) && ((int)$this->h > 0)) {
 
 								$commandline .= ' -'.$IMresizeParameter.' '.phpthumb_functions::escapeshellarg_replacement(phpthumb_functions::nonempty_min($this->w, $getimagesize[0]).'x'.phpthumb_functions::nonempty_min($this->h, $getimagesize[1]));
 								$commandline .= ' -gravity center';
@@ -1863,7 +1863,7 @@ 
 
 					$this->DebugMessage('getimagesize('.$this->sourceFilename.') failed', __FILE__, __LINE__);
 					if ($this->w || $this->h) {
-						$exactDimensionsBang = (($this->iar && ((int) $this->w > 0) && ((int) $this->h > 0)) ? '!' : '');
+						$exactDimensionsBang = (($this->iar && ((int)$this->w > 0) && ((int)$this->h > 0)) ? '!' : '');
 						if ($IMuseExplicitImageOutputDimensions) {
 							// unknown source aspect ratio, just put large number and hope IM figures it out
 							$commandline .= ' -'.$IMresizeParameter.' '.phpthumb_functions::escapeshellarg_replacement(($this->w ? $this->w : '9999').'x'.($this->h ? $this->h : '9999').$exactDimensionsBang);
@@ -1875,7 +1875,7 @@ 
 				}
 
 				if ($this->ra) {
-					$this->ra = (int) $this->ra;
+					$this->ra = (int)$this->ra;
 					if ($this->ImageMagickSwitchAvailable('rotate')) {
 						if (!preg_match('#('.implode('|', $this->AlphaCapableFormats).')#i', $outputFormat) || phpthumb_functions::version_compare_replacement($this->ImageMagickVersion(), '6.3.7', '>=')) {
 							$this->DebugMessage('Using ImageMagick rotate', __FILE__, __LINE__);
@@ -1903,14 +1903,14 @@ 
 					switch ($command) {
 						case 'brit':
 							if ($this->ImageMagickSwitchAvailable('modulate')) {
-								$commandline .= ' -modulate '.phpthumb_functions::escapeshellarg_replacement((100 + (int) $parameter).',100,100');
+								$commandline .= ' -modulate '.phpthumb_functions::escapeshellarg_replacement((100 + (int)$parameter).',100,100');
 								$successfullyProcessedFilters[] = $filterkey;
 							}
 							break;
 
 						case 'cont':
 							if ($this->ImageMagickSwitchAvailable('contrast')) {
-								$contDiv10 = round((int) $parameter / 10);
+								$contDiv10 = round((int)$parameter / 10);
 								if ($contDiv10 > 0) {
 									$contDiv10 = min($contDiv10, 100);
 									for ($i = 0; $i < $contDiv10; $i++) {
@@ -1934,7 +1934,7 @@ 
 									$commandline .= ' -colorspace GRAY';
 									$commandline .= ' -modulate 100,0,100';
 								} else {
-									$commandline .= ' -modulate '.phpthumb_functions::escapeshellarg_replacement('100,'.(100 - (int) $parameter).',100');
+									$commandline .= ' -modulate '.phpthumb_functions::escapeshellarg_replacement('100,'.(100 - (int)$parameter).',100');
 								}
 								$successfullyProcessedFilters[] = $filterkey;
 							}
@@ -1946,7 +1946,7 @@ 
 									$commandline .= ' -colorspace GRAY';
 									$commandline .= ' -modulate 100,0,100';
 								} else {
-									$commandline .= ' -modulate '.phpthumb_functions::escapeshellarg_replacement('100,'.(100 + (int) $parameter).',100');
+									$commandline .= ' -modulate '.phpthumb_functions::escapeshellarg_replacement('100,'.(100 + (int)$parameter).',100');
 								}
 								$successfullyProcessedFilters[] = $filterkey;
 							}
@@ -1964,7 +1964,7 @@ 
 							if ($this->ImageMagickSwitchAvailable(array('fill', 'colorize'))) {
 								@list($amount, $color) = explode('|', $parameter);
 								$commandline .= ' -fill '.phpthumb_functions::escapeshellarg_replacement('#'.preg_replace('#[^0-9A-F]#i', '', $color));
-								$commandline .= ' -colorize '.phpthumb_functions::escapeshellarg_replacement(min(max((int) $amount, 0), 100));
+								$commandline .= ' -colorize '.phpthumb_functions::escapeshellarg_replacement(min(max((int)$amount, 0), 100));
 							}
 							break;
 
@@ -1973,7 +1973,7 @@ 
 								@list($amount, $color) = explode('|', $parameter);
 								$amount = ($amount ? $amount : 80);
 								if (!$color) {
-									$commandline .= ' -sepia-tone '.phpthumb_functions::escapeshellarg_replacement(min(max((int) $amount, 0), 100).'%');
+									$commandline .= ' -sepia-tone '.phpthumb_functions::escapeshellarg_replacement(min(max((int)$amount, 0), 100).'%');
 									$successfullyProcessedFilters[] = $filterkey;
 								}
 							}
@@ -1981,7 +1981,7 @@ 
 
 						case 'gam':
 							@list($amount) = explode('|', $parameter);
-							$amount = min(max((float) $amount, 0.001), 10);
+							$amount = min(max((float)$amount, 0.001), 10);
 							if (number_format($amount, 3) != '1.000') {
 								if ($this->ImageMagickSwitchAvailable('gamma')) {
 									$commandline .= ' -gamma '.phpthumb_functions::escapeshellarg_replacement($amount);
@@ -2000,7 +2000,7 @@ 
 						case 'th':
 							@list($amount) = explode('|', $parameter);
 							if ($this->ImageMagickSwitchAvailable(array('threshold', 'dither', 'monochrome'))) {
-								$commandline .= ' -threshold '.phpthumb_functions::escapeshellarg_replacement(round(min(max((int) $amount, 0), 255) / 2.55).'%');
+								$commandline .= ' -threshold '.phpthumb_functions::escapeshellarg_replacement(round(min(max((int)$amount, 0), 255) / 2.55).'%');
 								$commandline .= ' -dither';
 								$commandline .= ' -monochrome';
 								$successfullyProcessedFilters[] = $filterkey;
@@ -2010,8 +2010,8 @@ 
 						case 'rcd':
 							if ($this->ImageMagickSwitchAvailable(array('colors', 'dither'))) {
 								@list($colors, $dither) = explode('|', $parameter);
-								$colors = ($colors                ?  (int) $colors : 256);
-								$dither  = ((strlen($dither) > 0) ? (bool) $dither : true);
+								$colors = ($colors ? (int)$colors : 256);
+								$dither = ((strlen($dither) > 0) ? (bool)$dither : true);
 								$commandline .= ' -colors '.phpthumb_functions::escapeshellarg_replacement(max($colors, 8)); // ImageMagick will otherwise fail with "cannot quantize to fewer than 8 colors"
 								$commandline .= ($dither ? ' -dither' : ' +dither');
 								$successfullyProcessedFilters[] = $filterkey;
@@ -2033,7 +2033,7 @@ 
 						case 'edge':
 							if ($this->ImageMagickSwitchAvailable('edge')) {
 								$parameter = (!empty($parameter) ? $parameter : 2);
-								$commandline .= ' -edge '.phpthumb_functions::escapeshellarg_replacement(!empty($parameter) ? (int) $parameter : 1);
+								$commandline .= ' -edge '.phpthumb_functions::escapeshellarg_replacement(!empty($parameter) ? (int)$parameter : 1);
 								$successfullyProcessedFilters[] = $filterkey;
 							}
 							break;
@@ -2041,7 +2041,7 @@ 
 						case 'emb':
 							if ($this->ImageMagickSwitchAvailable(array('emboss', 'negate'))) {
 								$parameter = (!empty($parameter) ? $parameter : 2);
-								$commandline .= ' -emboss '.phpthumb_functions::escapeshellarg_replacement((int) $parameter);
+								$commandline .= ' -emboss '.phpthumb_functions::escapeshellarg_replacement((int)$parameter);
 								if ($parameter < 2) {
 									$commandline .= ' -negate'; // ImageMagick negates the image for some reason with '-emboss 1';
 								}
@@ -2051,9 +2051,9 @@ 
 
 						case 'lvl':
 							@list($band, $method, $threshold) = explode('|', $parameter);
-							$band      = ($band ? preg_replace('#[^RGBA\\*]#', '', strtoupper($band))       : '*');
-							$method    = ((strlen($method) > 0)    ? (int) $method :   2);
-							$threshold = ((strlen($threshold) > 0) ? min(max((float) $threshold, 0), 100) : 0.1);
+							$band      = ($band ? preg_replace('#[^RGBA\\*]#', '', strtoupper($band)) : '*');
+							$method    = ((strlen($method) > 0) ? (int)$method : 2);
+							$threshold = ((strlen($threshold) > 0) ? min(max((float)$threshold, 0), 100) : 0.1);
 
 							$band = preg_replace('#[^RGBA\\*]#', '', strtoupper($band));
 
@@ -2114,7 +2114,7 @@ 
 						case 'wb':
 							if ($this->ImageMagickSwitchAvailable(array('channel', 'contrast-stretch'))) {
 								@list($threshold) = explode('|', $parameter);
-								$threshold = (!empty($threshold) ? min(max((float) $threshold, 0), 100) : 0.1);
+								$threshold = (!empty($threshold) ? min(max((float)$threshold, 0), 100) : 0.1);
 								$threshold = preg_replace('#[^0-9\\.]#', '', $threshold); // should be unneccesary, but just to be double-sure
 								//$commandline .= ' -channel R -contrast-stretch '.phpthumb_functions::escapeshellarg_replacement($threshold.'%'); // doesn't work on Windows because most versions of PHP do not properly
 								//$commandline .= ' -channel G -contrast-stretch '.phpthumb_functions::escapeshellarg_replacement($threshold.'%'); // escape special characters (such as %) and just replace them with spaces
@@ -2130,7 +2130,7 @@ 
 						case 'blur':
 							if ($this->ImageMagickSwitchAvailable('blur')) {
 								@list($radius) = explode('|', $parameter);
-								$radius = (!empty($radius) ? min(max((int) $radius, 0), 25) : 1);
+								$radius = (!empty($radius) ? min(max((int)$radius, 0), 25) : 1);
 								$commandline .= ' -blur '.phpthumb_functions::escapeshellarg_replacement($radius);
 								$successfullyProcessedFilters[] = $filterkey;
 							}
@@ -2138,7 +2138,7 @@ 
 
 						case 'gblr':
 							@list($radius) = explode('|', $parameter);
-							$radius = (!empty($radius) ? min(max((int) $radius, 0), 25) : 1);
+							$radius = (!empty($radius) ? min(max((int)$radius, 0), 25) : 1);
 							// "-gaussian" changed to "-gaussian-blur" sometime around 2009
 							if ($this->ImageMagickSwitchAvailable('gaussian-blur')) {
 								$commandline .= ' -gaussian-blur '.phpthumb_functions::escapeshellarg_replacement($radius);
@@ -2152,9 +2152,9 @@ 
 						case 'usm':
 							if ($this->ImageMagickSwitchAvailable('unsharp')) {
 								@list($amount, $radius, $threshold) = explode('|', $parameter);
-								$amount    = ($amount            ? min(max((int) $amount,    0), 255) : 80);
-								$radius    = ($radius            ? min(max((int) $radius,    0),  10) : 0.5);
-								$threshold = (strlen($threshold) ? min(max((int) $threshold, 0),  50) : 3);
+								$amount    = ($amount ? min(max((int)$amount, 0), 255) : 80);
+								$radius    = ($radius ? min(max((int)$radius, 0), 10) : 0.5);
+								$threshold = (strlen($threshold) ? min(max((int)$threshold, 0), 50) : 3);
 								$commandline .= ' -unsharp '.phpthumb_functions::escapeshellarg_replacement(number_format(($radius * 2) - 1, 2, '.', '').'x1+'.number_format($amount / 100, 2, '.', '').'+'.number_format($threshold / 100, 2, '.', ''));
 								$successfullyProcessedFilters[] = $filterkey;
 							}
@@ -2164,14 +2164,14 @@ 
 							if ($this->ImageMagickSwitchAvailable(array('border', 'bordercolor', 'thumbnail', 'crop'))) {
 								if (!$this->zc) {
 									@list($width, $rX, $rY, $color) = explode('|', $parameter);
-									$width = (int) $width;
-									$rX    = (int) $rX;
-									$rY    = (int) $rY;
+									$width = (int)$width;
+									$rX    = (int)$rX;
+									$rY    = (int)$rY;
 									if ($width && !$rX && !$rY) {
 										if (!phpthumb_functions::IsHexColor($color)) {
 											$color = ((!empty($this->bc) && phpthumb_functions::IsHexColor($this->bc)) ? $this->bc : '000000');
 										}
-										$commandline .= ' -border '.phpthumb_functions::escapeshellarg_replacement((int) $width);
+										$commandline .= ' -border '.phpthumb_functions::escapeshellarg_replacement((int)$width);
 										$commandline .= ' -bordercolor '.phpthumb_functions::escapeshellarg_replacement('#'.$color);
 
 										if (preg_match('# \\-crop "([0-9]+)x([0-9]+)\\+0\\+0" #', $commandline, $matches)) {
@@ -2327,8 +2327,8 @@ 
 				$this->DebugMessage('!function_exists(imagerotate)', __FILE__, __LINE__);
 				return false;
 			}
-			if (!include_once( __DIR__ .'/phpthumb.filters.php')) {
-				$this->DebugMessage('Error including "'. __DIR__ .'/phpthumb.filters.php" which is required for applying filters ('.implode(';', $this->fltr).')', __FILE__, __LINE__);
+			if (!include_once(__DIR__.'/phpthumb.filters.php')) {
+				$this->DebugMessage('Error including "'.__DIR__.'/phpthumb.filters.php" which is required for applying filters ('.implode(';', $this->fltr).')', __FILE__, __LINE__);
 				return false;
 			}
 
@@ -2340,7 +2340,7 @@ 
 			$rotate_angle = 0;
 			if ($this->ra) {
 
-				$rotate_angle = (float) $this->ra;
+				$rotate_angle = (float)$this->ra;
 
 			} else {
 
@@ -2383,7 +2383,7 @@ 
 							return false;
 						}
 					} else {
-						$this->DebugMessage('Cannot auto-rotate from EXIF data because PHP is less than v4.2.0 ('. PHP_VERSION .')', __FILE__, __LINE__);
+						$this->DebugMessage('Cannot auto-rotate from EXIF data because PHP is less than v4.2.0 ('.PHP_VERSION.')', __FILE__, __LINE__);
 						return false;
 					}
 				} elseif (($this->ar == 'l') && ($this->source_height > $this->source_width)) {
@@ -2440,7 +2440,7 @@ 
 				$this->thumbnail_image_width = round($this->thumbnail_image_height * $aspectratio);
 			} elseif ($this->thumbnail_image_width < $this->thumbnail_width) {
 				$this->thumbnail_image_width = $this->thumbnail_width;
-				$this->thumbnail_image_height  = round($this->thumbnail_image_width / $aspectratio);
+				$this->thumbnail_image_height = round($this->thumbnail_image_width / $aspectratio);
 			}
 
 		}
@@ -2475,7 +2475,7 @@ 
 
 	public function AntiOffsiteLinking() {
 		// Optional anti-offsite hijacking of the thumbnail script
-		$allow   = true;
+		$allow = true;
 		if ($allow && $this->config_nooffsitelink_enabled && (@$_SERVER['HTTP_REFERER'] || $this->config_nooffsitelink_require_refer)) {
 			$this->DebugMessage('AntiOffsiteLinking() checking $_SERVER[HTTP_REFERER] "'.@$_SERVER['HTTP_REFERER'].'"', __FILE__, __LINE__);
 			foreach ($this->config_nooffsitelink_valid_domains as $key => $valid_domain) {
@@ -2485,7 +2485,7 @@ 
 			}
 			$parsed_url = phpthumb_functions::ParseURLbetter(@$_SERVER['HTTP_REFERER']);
 			if (!$this->OffsiteDomainIsAllowed(@$parsed_url['host'], $this->config_nooffsitelink_valid_domains)) {
-				$allow   = false;
+				$allow = false;
 				//$this->DebugMessage('AntiOffsiteLinking() - "'.@$parsed_url['host'].'" is NOT in $this->config_nooffsitelink_valid_domains ('.implode(';', $this->config_nooffsitelink_valid_domains).')', __FILE__, __LINE__);
 				$this->ErrorImage('AntiOffsiteLinking() - "'.@$parsed_url['host'].'" is NOT in $this->config_nooffsitelink_valid_domains ('.implode(';', $this->config_nooffsitelink_valid_domains).')');
 			} else {
@@ -2525,8 +2525,8 @@ 
 			$this->config_nooffsitelink_watermark_src = $this->ResolveFilenameToAbsolute($this->config_nooffsitelink_watermark_src);
 			if (is_file($this->config_nooffsitelink_watermark_src)) {
 
-				if (!include_once( __DIR__ .'/phpthumb.filters.php')) {
-					$this->DebugMessage('Error including "'. __DIR__ .'/phpthumb.filters.php" which is required for applying watermark', __FILE__, __LINE__);
+				if (!include_once(__DIR__.'/phpthumb.filters.php')) {
+					$this->DebugMessage('Error including "'.__DIR__.'/phpthumb.filters.php" which is required for applying watermark', __FILE__, __LINE__);
 					return false;
 				}
 				$watermark_img = $this->ImageCreateFromStringReplacement(file_get_contents($this->config_nooffsitelink_watermark_src));
@@ -2664,8 +2664,8 @@ 
 
 	public function ApplyFilters() {
 		if ($this->fltr && is_array($this->fltr)) {
-			if (!include_once( __DIR__ .'/phpthumb.filters.php')) {
-				$this->DebugMessage('Error including "'. __DIR__ .'/phpthumb.filters.php" which is required for applying filters ('.implode(';', $this->fltr).')', __FILE__, __LINE__);
+			if (!include_once(__DIR__.'/phpthumb.filters.php')) {
+				$this->DebugMessage('Error including "'.__DIR__.'/phpthumb.filters.php" which is required for applying filters ('.implode(';', $this->fltr).')', __FILE__, __LINE__);
 				return false;
 			}
 			$phpthumbFilters = new phpthumb_filters();
@@ -2730,8 +2730,8 @@ 
 							break;
 						}
 						@list($colors, $dither) = explode('|', $parameter, 2);
-						$colors = ($colors                ?  (int) $colors : 256);
-						$dither  = ((strlen($dither) > 0) ? (bool) $dither : true);
+						$colors = ($colors ? (int)$colors : 256);
+						$dither = ((strlen($dither) > 0) ? (bool)$dither : true);
 						$phpthumbFilters->ReduceColorDepth($this->gdimg_output, $colors, $dither);
 						break;
 
@@ -2755,8 +2755,8 @@ 
 					case 'lvl': // autoLevels
 						@list($band, $method, $threshold) = explode('|', $parameter, 3);
 						$band      = ($band ? preg_replace('#[^RGBA\\*]#', '', strtoupper($band)) : '*');
-						$method    = ((strlen($method) > 0)    ? (int) $method :   2);
-						$threshold = ((strlen($threshold) > 0) ? (float) $threshold : 0.1);
+						$method    = ((strlen($method) > 0) ? (int)$method : 2);
+						$threshold = ((strlen($threshold) > 0) ? (float)$threshold : 0.1);
 
 						$phpthumbFilters->HistogramStretch($this->gdimg_output, $band, $method, $threshold);
 						break;
@@ -2771,13 +2771,13 @@ 
 							break;
 						}
 						@list($bands, $colors, $width, $height, $alignment, $opacity, $margin_x, $margin_y) = explode('|', $parameter, 8);
-						$bands     = ($bands     ? $bands     :  '*');
-						$colors    = ($colors    ? $colors    :   '');
-						$width     = ($width     ? $width     : 0.25);
-						$height    = ($height    ? $height    : 0.25);
+						$bands     = ($bands ? $bands : '*');
+						$colors    = ($colors ? $colors : '');
+						$width     = ($width ? $width : 0.25);
+						$height    = ($height ? $height : 0.25);
 						$alignment = ($alignment ? $alignment : 'BR');
-						$opacity   = ($opacity   ? $opacity   :   50);
-						$margin_x  = ($margin_x  ? $margin_x  :    5);
+						$opacity   = ($opacity ? $opacity : 50);
+						$margin_x  = ($margin_x ? $margin_x : 5);
 						// $margin_y -- it wasn't forgotten, let the value always pass unchanged
 						$phpthumbFilters->HistogramOverlay($this->gdimg_output, $bands, $colors, $width, $height, $alignment, $opacity, $margin_x, $margin_y);
 						break;
@@ -2862,9 +2862,9 @@ 
 
 					case 'over': // Overlay
 						@list($filename, $underlay, $margin, $opacity) = explode('|', $parameter, 4);
-						$underlay = (bool) ($underlay              ? $underlay : false);
-						$margin   =        ((strlen($margin)  > 0) ? $margin   : ($underlay ? 0.1 : 0.0));
-						$opacity  =        ((strlen($opacity) > 0) ? $opacity  : 100);
+						$underlay = (bool)($underlay ? $underlay : false);
+						$margin   = ((strlen($margin) > 0) ? $margin : ($underlay ? 0.1 : 0.0));
+						$opacity  = ((strlen($opacity) > 0) ? $opacity : 100);
 						if (($margin > 0) && ($margin < 1)) {
 							$margin = min(0.499, $margin);
 						} elseif (($margin > -1) && ($margin < 0)) {
@@ -2934,9 +2934,9 @@ 
 					case 'wmi': // WaterMarkImage
 						@list($filename, $alignment, $opacity, $margin['x'], $margin['y'], $rotate_angle) = explode('|', $parameter, 6);
 						// $margin can be pixel margin or percent margin if $alignment is text, or max width/height if $alignment is position like "50x75"
-						$alignment    = ($alignment            ? $alignment            : 'BR');
-						$opacity      = (strlen($opacity)      ? (int) $opacity : 50);
-						$rotate_angle = (strlen($rotate_angle) ? (int) $rotate_angle : 0);
+						$alignment    = ($alignment ? $alignment : 'BR');
+						$opacity      = (strlen($opacity) ? (int)$opacity : 50);
+						$rotate_angle = (strlen($rotate_angle) ? (int)$rotate_angle : 0);
 						if (!preg_match('#^([0-9\\.\\-]*)x([0-9\\.\\-]*)$#i', $alignment, $matches)) {
 							$margins = array('x', 'y');
 							foreach ($margins as $xy) {
@@ -2956,8 +2956,8 @@ 
 									$phpthumbFilters->ImprovedImageRotate($img_watermark, $rotate_angle, 'FFFFFF', null, $this);
 								}
 								if (preg_match('#^([0-9\\.\\-]*)x([0-9\\.\\-]*)$#i', $alignment, $matches)) {
-									$watermark_max_width  = (int) ($margin[ 'x'] ? $margin[ 'x'] : imagesx($img_watermark));
-									$watermark_max_height = (int) ($margin[ 'y'] ? $margin[ 'y'] : imagesy($img_watermark));
+									$watermark_max_width  = (int)($margin['x'] ? $margin['x'] : imagesx($img_watermark));
+									$watermark_max_height = (int)($margin['y'] ? $margin['y'] : imagesy($img_watermark));
 									$scale = phpthumb_functions::ScaleToFitInBox(imagesx($img_watermark), imagesy($img_watermark), $watermark_max_width, $watermark_max_height, true, true);
 									$this->DebugMessage('Scaling watermark by a factor of '.number_format($scale, 4), __FILE__, __LINE__);
 									if (($scale > 1) || ($scale < 1)) {
@@ -2989,18 +2989,18 @@ 
 
 					case 'wmt': // WaterMarkText
 						@list($text, $size, $alignment, $hex_color, $ttffont, $opacity, $margin, $angle, $bg_color, $bg_opacity, $fillextend, $lineheight) = explode('|', $parameter, 12);
-						$text       = ($text            ? $text       : '');
-						$size       = ($size            ? $size       : 3);
-						$alignment  = ($alignment       ? $alignment  : 'BR');
-						$hex_color  = ($hex_color       ? $hex_color  : '000000');
-						$ttffont    = ($ttffont         ? $ttffont    : '');
-						$opacity    = (strlen($opacity) ? $opacity    : 50);
-						$margin     = (strlen($margin)  ? $margin     : 5);
-						$angle      = (strlen($angle)   ? $angle      : 0);
-						$bg_color   = ($bg_color        ? $bg_color   : false);
-						$bg_opacity = ($bg_opacity      ? $bg_opacity : 0);
-						$fillextend = ($fillextend      ? $fillextend : '');
-						$lineheight = ($lineheight      ? $lineheight : 1.0);
+						$text       = ($text ? $text : '');
+						$size       = ($size ? $size : 3);
+						$alignment  = ($alignment ? $alignment : 'BR');
+						$hex_color  = ($hex_color ? $hex_color : '000000');
+						$ttffont    = ($ttffont ? $ttffont : '');
+						$opacity    = (strlen($opacity) ? $opacity : 50);
+						$margin     = (strlen($margin) ? $margin : 5);
+						$angle      = (strlen($angle) ? $angle : 0);
+						$bg_color   = ($bg_color ? $bg_color : false);
+						$bg_opacity = ($bg_opacity ? $bg_opacity : 0);
+						$fillextend = ($fillextend ? $fillextend : '');
+						$lineheight = ($lineheight ? $lineheight : 1.0);
 
 						if (basename($ttffont) == $ttffont) {
 							$ttffont = $this->realPathSafe($this->config_ttf_directory.DIRECTORY_SEPARATOR.$ttffont);
@@ -3038,17 +3038,17 @@ 
 
 					case 'usm': // UnSharpMask sharpening
 						@list($amount, $radius, $threshold) = explode('|', $parameter, 3);
-						$amount    = ($amount            ? $amount    : 80);
-						$radius    = ($radius            ? $radius    : 0.5);
+						$amount    = ($amount ? $amount : 80);
+						$radius    = ($radius ? $radius : 0.5);
 						$threshold = (strlen($threshold) ? $threshold : 3);
 						if (phpthumb_functions::gd_version() >= 2.0) {
 							ob_start();
-							if (!@include_once( __DIR__ .'/phpthumb.unsharp.php')) {
+							if (!@include_once(__DIR__.'/phpthumb.unsharp.php')) {
 								$include_error = ob_get_contents();
 								if ($include_error) {
-									$this->DebugMessage('include_once("'. __DIR__ .'/phpthumb.unsharp.php") generated message: "'.$include_error.'"', __FILE__, __LINE__);
+									$this->DebugMessage('include_once("'.__DIR__.'/phpthumb.unsharp.php") generated message: "'.$include_error.'"', __FILE__, __LINE__);
 								}
-								$this->DebugMessage('Error including "'. __DIR__ .'/phpthumb.unsharp.php" which is required for unsharp masking', __FILE__, __LINE__);
+								$this->DebugMessage('Error including "'.__DIR__.'/phpthumb.unsharp.php" which is required for unsharp masking', __FILE__, __LINE__);
 								ob_end_clean();
 								return false;
 							}
@@ -3062,11 +3062,11 @@ 
 
 					case 'size': // Resize
 						@list($newwidth, $newheight, $stretch) = explode('|', $parameter);
-						$newwidth  = (!$newwidth  ? imagesx($this->gdimg_output) : ((($newwidth  > 0) && ($newwidth  < 1)) ? round($newwidth  * imagesx($this->gdimg_output)) : round($newwidth)));
+						$newwidth  = (!$newwidth ? imagesx($this->gdimg_output) : ((($newwidth > 0) && ($newwidth < 1)) ? round($newwidth * imagesx($this->gdimg_output)) : round($newwidth)));
 						$newheight = (!$newheight ? imagesy($this->gdimg_output) : ((($newheight > 0) && ($newheight < 1)) ? round($newheight * imagesy($this->gdimg_output)) : round($newheight)));
 						$stretch   = ($stretch ? true : false);
 						if ($stretch) {
-							$scale_x = phpthumb_functions::ScaleToFitInBox(imagesx($this->gdimg_output), imagesx($this->gdimg_output), $newwidth,  $newwidth,  true, true);
+							$scale_x = phpthumb_functions::ScaleToFitInBox(imagesx($this->gdimg_output), imagesx($this->gdimg_output), $newwidth, $newwidth, true, true);
 							$scale_y = phpthumb_functions::ScaleToFitInBox(imagesy($this->gdimg_output), imagesy($this->gdimg_output), $newheight, $newheight, true, true);
 						} else {
 							$scale_x = phpthumb_functions::ScaleToFitInBox(imagesx($this->gdimg_output), imagesy($this->gdimg_output), $newwidth, $newheight, true, true);
@@ -3101,7 +3101,7 @@ 
 							$this->DebugMessage('Skipping SourceTransparentColor hex color is invalid ('.$hexcolor.')', __FILE__, __LINE__);
 							return false;
 						}
-						$min_limit = (strlen($min_limit) ? $min_limit :  5);
+						$min_limit = (strlen($min_limit) ? $min_limit : 5);
 						$max_limit = (strlen($max_limit) ? $max_limit : 10);
 						if ($gdimg_mask = $phpthumbFilters->SourceTransparentColorMask($this->gdimg_output, $hexcolor, $min_limit, $max_limit)) {
 							$this->is_alpha = true;
@@ -3189,17 +3189,17 @@ 
 	public function CalculateThumbnailDimensions() {
 		$this->DebugMessage('CalculateThumbnailDimensions() starting with [W,H,sx,sy,sw,sh] initially set to ['.$this->source_width.','.$this->source_height.','.$this->sx.','.$this->sy.','.$this->sw.','.$this->sh.']', __FILE__, __LINE__);
 //echo $this->source_width.'x'.$this->source_height.'<hr>';
-		$this->thumbnailCropX = ($this->sx ? (($this->sx >= 2) ? $this->sx : round($this->sx * $this->source_width))  : 0);
+		$this->thumbnailCropX = ($this->sx ? (($this->sx >= 2) ? $this->sx : round($this->sx * $this->source_width)) : 0);
 //echo $this->thumbnailCropX.'<br>';
 		$this->thumbnailCropY = ($this->sy ? (($this->sy >= 2) ? $this->sy : round($this->sy * $this->source_height)) : 0);
 //echo $this->thumbnailCropY.'<br>';
-		$this->thumbnailCropW = ($this->sw ? (($this->sw >= 2) ? $this->sw : round($this->sw * $this->source_width))  : $this->source_width);
+		$this->thumbnailCropW = ($this->sw ? (($this->sw >= 2) ? $this->sw : round($this->sw * $this->source_width)) : $this->source_width);
 //echo $this->thumbnailCropW.'<br>';
 		$this->thumbnailCropH = ($this->sh ? (($this->sh >= 2) ? $this->sh : round($this->sh * $this->source_height)) : $this->source_height);
 //echo $this->thumbnailCropH.'<hr>';
 
 		// limit source area to original image area
-		$this->thumbnailCropW = max(1, min($this->thumbnailCropW, $this->source_width  - $this->thumbnailCropX));
+		$this->thumbnailCropW = max(1, min($this->thumbnailCropW, $this->source_width - $this->thumbnailCropX));
 		$this->thumbnailCropH = max(1, min($this->thumbnailCropH, $this->source_height - $this->thumbnailCropY));
 
 		$this->DebugMessage('CalculateThumbnailDimensions() starting with [x,y,w,h] initially set to ['.$this->thumbnailCropX.','.$this->thumbnailCropY.','.$this->thumbnailCropW.','.$this->thumbnailCropH.']', __FILE__, __LINE__);
@@ -3210,7 +3210,7 @@ 
 			// retain proportional resizing we did above, but crop off larger dimension so smaller
 			// dimension fully fits available space
 
-			$scaling_X = $this->source_width  / $this->w;
+			$scaling_X = $this->source_width / $this->w;
 			$scaling_Y = $this->source_height / $this->h;
 			if ($scaling_X > $scaling_Y) {
 				// some of the width will need to be cropped
@@ -3331,7 +3331,7 @@ 
 		}
 		//$this->w = round($this->w ? $this->w : (($this->h && $this->source_height) ? $this->h * $this->source_width  / $this->source_height : $this->w));
 		//$this->h = round($this->h ? $this->h : (($this->w && $this->source_width)  ? $this->w * $this->source_height / $this->source_width  : $this->h));
-		$this->DebugMessage('SetOrientationDependantWidthHeight() setting w="'. (int) $this->w .'", h="'. (int) $this->h .'"', __FILE__, __LINE__);
+		$this->DebugMessage('SetOrientationDependantWidthHeight() setting w="'.(int)$this->w.'", h="'.(int)$this->h.'"', __FILE__, __LINE__);
 		return true;
 	}
 
@@ -3439,7 +3439,7 @@ 
 
 		}
 
-		$this->DebugMessage('EXIF thumbnail extraction: (size='.strlen($this->exif_thumbnail_data).'; type="'.$this->exif_thumbnail_type.'"; '. (int) $this->exif_thumbnail_width .'x'. (int) $this->exif_thumbnail_height .')', __FILE__, __LINE__);
+		$this->DebugMessage('EXIF thumbnail extraction: (size='.strlen($this->exif_thumbnail_data).'; type="'.$this->exif_thumbnail_type.'"; '.(int)$this->exif_thumbnail_width.'x'.(int)$this->exif_thumbnail_height.')', __FILE__, __LINE__);
 
 		// see if EXIF thumbnail can be used directly with no processing
 		if ($this->config_use_exif_thumbnail_for_speed && $this->exif_thumbnail_data) {
@@ -3564,12 +3564,12 @@ 
 		$FilenameParameters2 = array('h', 'w', 'wl', 'wp', 'ws', 'hp', 'hs', 'xto', 'ra', 'iar', 'aoe', 'maxb', 'sfn', 'dpi');
 		foreach ($FilenameParameters2 as $key) {
 			if ($this->$key) {
-				$ParametersString .= '_'.$key. (int) $this->$key;
+				$ParametersString .= '_'.$key.(int)$this->$key;
 			}
 		}
 		if ($this->thumbnailFormat == 'jpeg') {
 			// only JPEG output has variable quality option
-			$ParametersString .= '_q'. (int) $this->thumbnailQuality;
+			$ParametersString .= '_q'.(int)$this->thumbnailQuality;
 		}
 		$this->DebugMessage('SetCacheFilename() _par set from md5('.$ParametersString.')', __FILE__, __LINE__);
 		$this->cache_filename .= '_par'.strtolower(md5($ParametersString));
@@ -3579,9 +3579,9 @@ 
 			// do not source image modification date --
 			// cached image will be used even if file was modified or removed
 		} elseif (!$this->config_cache_source_filemtime_ignore_remote && preg_match('#^(f|ht)tps?\://#i', $this->src)) {
-			$this->cache_filename .= '_dat'. (int) phpthumb_functions::filedate_remote($this->src);
+			$this->cache_filename .= '_dat'.(int)phpthumb_functions::filedate_remote($this->src);
 		} elseif (!$this->config_cache_source_filemtime_ignore_local && $this->src && !$this->rawImageData) {
-			$this->cache_filename .= '_dat'. (int) (@filemtime($this->sourceFilename));
+			$this->cache_filename .= '_dat'.(int)(@filemtime($this->sourceFilename));
 		}
 
 		$this->cache_filename .= '.'.strtolower($this->thumbnailFormat);
@@ -3601,9 +3601,9 @@ 
 		}
 		if ($this->php_memory_limit && function_exists('memory_get_usage')) {
 			$available_memory = $this->php_memory_limit - memory_get_usage();
-			return (bool) (($width * $height * 5) > $available_memory);
+			return (bool)(($width * $height * 5) > $available_memory);
 		}
-		return (bool) (($width * $height) > $this->config_max_source_pixels);
+		return (bool)(($width * $height) > $this->config_max_source_pixels);
 	}
 
 	public function ImageCreateFromFilename($filename) {
@@ -3831,15 +3831,15 @@ 
 			switch (@$this->getimagesizeinfo[2]) {
 				case 1:
 					$imageHeader = 'Content-Type: image/gif';
-					$GDreadSupport = (bool) @$gd_info['GIF Read Support'];
+					$GDreadSupport = (bool)@$gd_info['GIF Read Support'];
 					break;
 				case 2:
 					$imageHeader = 'Content-Type: image/jpeg';
-					$GDreadSupport = (bool) @$gd_info['JPG Support'];
+					$GDreadSupport = (bool)@$gd_info['JPG Support'];
 					break;
 				case 3:
 					$imageHeader = 'Content-Type: image/png';
-					$GDreadSupport = (bool) @$gd_info['PNG Support'];
+					$GDreadSupport = (bool)@$gd_info['PNG Support'];
 					break;
 			}
 			if ($imageHeader) {
@@ -3867,7 +3867,7 @@ 
 					$this->ErrorImage(implode("\n", $errormessages));
 
 				} else {
-					$this->DebugMessage('All attempts to create GD image source failed ('.(ini_get('safe_mode') ? 'Safe Mode enabled, ImageMagick unavailable and source image probably too large for GD': ($GDreadSupport ? 'source image probably corrupt' : 'GD does not have read support for "'.$imageHeader.'"')).'), cannot generate thumbnail');
+					$this->DebugMessage('All attempts to create GD image source failed ('.(ini_get('safe_mode') ? 'Safe Mode enabled, ImageMagick unavailable and source image probably too large for GD' : ($GDreadSupport ? 'source image probably corrupt' : 'GD does not have read support for "'.$imageHeader.'"')).'), cannot generate thumbnail');
 					//$this->DebugMessage('All attempts to create GD image source failed ('.($GDreadSupport ? 'source image probably corrupt' : 'GD does not have read support for "'.$imageHeader.'"').'), outputing raw image', __FILE__, __LINE__);
 					//if (!$this->phpThumbDebug) {
 					//	header($imageHeader);
@@ -3883,9 +3883,9 @@ 
 			switch (@$this->getimagesizeinfo[2]) {
 				case 6:
 					ob_start();
-					if (!@include_once( __DIR__ .'/phpthumb.bmp.php')) {
+					if (!@include_once(__DIR__.'/phpthumb.bmp.php')) {
 						ob_end_clean();
-						return $this->ErrorImage('include_once('. __DIR__ .'/phpthumb.bmp.php) failed');
+						return $this->ErrorImage('include_once('.__DIR__.'/phpthumb.bmp.php) failed');
 					}
 					ob_end_clean();
 					if ($fp = @fopen($this->sourceFilename, 'rb')) {
@@ -3987,7 +3987,7 @@ 
 		return gettype($var);
 	}
 
-	public function phpThumbDebug($level='') {
+	public function phpThumbDebug($level = '') {
 		if ($level && ($this->phpThumbDebug !== $level)) {
 			return true;
 		}
@@ -4137,8 +4137,8 @@ 
 		return true;
 	}
 
-	public function ErrorImage($text, $width=0, $height=0, $forcedisplay=false) {
-		$width  = ($width  ? $width  : $this->config_error_image_width);
+	public function ErrorImage($text, $width = 0, $height = 0, $forcedisplay = false) {
+		$width  = ($width ? $width : $this->config_error_image_width);
 		$height = ($height ? $height : $this->config_error_image_height);
 
 		$text = 'phpThumb() v'.$this->phpthumb_version."\n".'http://phpthumb.sourceforge.net'."\n\n".($this->config_disable_debug ? 'Error messages disabled.'."\n\n".'edit phpThumb.config.php and (temporarily) set'."\n".'$PHPTHUMB_CONFIG[\'disable_debug\'] = false;'."\n".'to view the details of this error' : $text);
@@ -4198,7 +4198,7 @@ 
 
 		} elseif ($gdimg_error = imagecreate($width, $height)) {
 
-			$background_color = phpthumb_functions::ImageHexColorAllocate($gdimg_error, $this->config_error_bgcolor,   true);
+			$background_color = phpthumb_functions::ImageHexColorAllocate($gdimg_error, $this->config_error_bgcolor, true);
 			$text_color       = phpthumb_functions::ImageHexColorAllocate($gdimg_error, $this->config_error_textcolor, true);
 			imagefilledrectangle($gdimg_error, 0, 0, $width, $height, $background_color);
 			$lineYoffset = 0;
@@ -4231,7 +4231,7 @@ 
 		exit;
 	}
 
-	public function ImageCreateFromStringReplacement(&$RawImageData, $DieOnErrors=false) {
+	public function ImageCreateFromStringReplacement(&$RawImageData, $DieOnErrors = false) {
 		// there are serious bugs in the non-bundled versions of GD which may cause
 		// PHP to segfault when calling imagecreatefromstring() - avoid if at all possible
 		// when not using a bundled version of GD2
@@ -4285,8 +4285,8 @@ 
 
 					// Need to create from GIF file, but imagecreatefromgif does not exist
 					ob_start();
-					if (!@include_once( __DIR__ .'/phpthumb.gif.php')) {
-						$ErrorMessage = 'Failed to include required file "'. __DIR__ .'/phpthumb.gif.php" in '.__FILE__.' on line '.__LINE__;
+					if (!@include_once(__DIR__.'/phpthumb.gif.php')) {
+						$ErrorMessage = 'Failed to include required file "'.__DIR__.'/phpthumb.gif.php" in '.__FILE__.' on line '.__LINE__;
 						$this->DebugMessage($ErrorMessage, __FILE__, __LINE__);
 					}
 					ob_end_clean();
@@ -4377,12 +4377,12 @@ 
 		return $tempnam;
 	}
 
-	public function DebugMessage($message, $file='', $line='') {
+	public function DebugMessage($message, $file = '', $line = '') {
 		$this->debugmessages[] = $message.($file ? ' in file "'.(basename($file) ? basename($file) : $file).'"' : '').($line ? ' on line '.$line : '');
 		return true;
 	}
 
-	public function DebugTimingMessage($message, $file='', $line='', $timestamp=0) {
+	public function DebugTimingMessage($message, $file = '', $line = '', $timestamp = 0) {
 		if (!$timestamp) {
 			$timestamp = array_sum(explode(' ', microtime()));
 		}

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/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;