mambax7 / pedigree

phpthumb/phpthumb.bmp.php

Spacing +21 added lines, -21 removed lines

@@ -69,8 +69,8 @@ 
         for ($y = ($imageY - 1); $y >= 0; $y--) {
             $thisline = '';
             for ($x = 0; $x < $imageX; $x++) {
-                $argb     = phpthumb_functions::GetPixelColor($gd_image, $x, $y);
-                $thisline .= chr($argb['blue']) . chr($argb['green']) . chr($argb['red']);
+                $argb = phpthumb_functions::GetPixelColor($gd_image, $x, $y);
+                $thisline .= chr($argb['blue']).chr($argb['green']).chr($argb['red']);
             }
             while (strlen($thisline) % 4) {
                 $thisline .= "\x00";
@@ -80,7 +80,7 @@ 
 
         $bmpSize = strlen($BMP) + 14 + 40;
         // BITMAPFILEHEADER [14 bytes] - http://msdn.microsoft.com/library/en-us/gdi/bitmaps_62uq.asp
-        $BITMAPFILEHEADER = 'BM';                                                           // WORD    bfType;
+        $BITMAPFILEHEADER = 'BM'; // WORD    bfType;
         $BITMAPFILEHEADER .= phpthumb_functions::LittleEndian2String($bmpSize, 4); // DWORD   bfSize;
         $BITMAPFILEHEADER .= phpthumb_functions::LittleEndian2String(0, 2); // WORD    bfReserved1;
         $BITMAPFILEHEADER .= phpthumb_functions::LittleEndian2String(0, 2); // WORD    bfReserved2;
@@ -99,7 +99,7 @@ 
         $BITMAPINFOHEADER .= phpthumb_functions::LittleEndian2String(0, 4); // DWORD  biClrUsed;
         $BITMAPINFOHEADER .= phpthumb_functions::LittleEndian2String(0, 4); // DWORD  biClrImportant;
 
-        return $BITMAPFILEHEADER . $BITMAPINFOHEADER . $BMP;
+        return $BITMAPFILEHEADER.$BITMAPINFOHEADER.$BMP;
     }
 
     /**
@@ -114,9 +114,9 @@ 
 
         // shortcuts
         $ThisFileInfo['bmp']['header']['raw'] = [];
-        $thisfile_bmp                         =& $ThisFileInfo['bmp'];
-        $thisfile_bmp_header                  =& $thisfile_bmp['header'];
-        $thisfile_bmp_header_raw              =& $thisfile_bmp_header['raw'];
+        $thisfile_bmp                         = & $ThisFileInfo['bmp'];
+        $thisfile_bmp_header                  = & $thisfile_bmp['header'];
+        $thisfile_bmp_header_raw              = & $thisfile_bmp_header['raw'];
 
         // BITMAPFILEHEADER [14 bytes] - http://msdn.microsoft.com/library/en-us/gdi/bitmaps_62uq.asp
         // all versions
@@ -132,10 +132,10 @@ 
         $overalloffset += (14 + 40);
 
         $thisfile_bmp_header_raw['identifier'] = substr($BMPheader, $offset, 2);
-        $offset                                += 2;
+        $offset += 2;
 
         if ('BM' !== $thisfile_bmp_header_raw['identifier']) {
-            $ThisFileInfo['error'][] = 'Expecting "BM" at offset ' . (int)(@$ThisFileInfo['avdataoffset']) . ', found "' . $thisfile_bmp_header_raw['identifier'] . '"';
+            $ThisFileInfo['error'][] = 'Expecting "BM" at offset '.(int)(@$ThisFileInfo['avdataoffset']).', found "'.$thisfile_bmp_header_raw['identifier'].'"';
             unset($ThisFileInfo['fileformat']);
             unset($ThisFileInfo['bmp']);
 
@@ -209,7 +209,7 @@ 
 
             $ThisFileInfo['video']['resolution_x']    = $thisfile_bmp_header_raw['width'];
             $ThisFileInfo['video']['resolution_y']    = $thisfile_bmp_header_raw['height'];
-            $ThisFileInfo['video']['codec']           = 'BI_RGB ' . $thisfile_bmp_header_raw['bits_per_pixel'] . '-bit';
+            $ThisFileInfo['video']['codec']           = 'BI_RGB '.$thisfile_bmp_header_raw['bits_per_pixel'].'-bit';
             $ThisFileInfo['video']['bits_per_sample'] = $thisfile_bmp_header_raw['bits_per_pixel'];
 
             if ($thisfile_bmp['type_version'] >= 2) {
@@ -259,7 +259,7 @@ 
 
                 $thisfile_bmp_header['compression'] = $this->BMPcompressionOS2Lookup($thisfile_bmp_header_raw['compression']);
 
-                $ThisFileInfo['video']['codec'] = $thisfile_bmp_header['compression'] . ' ' . $thisfile_bmp_header_raw['bits_per_pixel'] . '-bit';
+                $ThisFileInfo['video']['codec'] = $thisfile_bmp_header['compression'].' '.$thisfile_bmp_header_raw['bits_per_pixel'].'-bit';
             }
         } elseif ('Windows' === $thisfile_bmp['type_os']) {
 
@@ -303,7 +303,7 @@ 
             $thisfile_bmp_header['compression']       = $this->BMPcompressionWindowsLookup($thisfile_bmp_header_raw['compression']);
             $ThisFileInfo['video']['resolution_x']    = $thisfile_bmp_header_raw['width'];
             $ThisFileInfo['video']['resolution_y']    = $thisfile_bmp_header_raw['height'];
-            $ThisFileInfo['video']['codec']           = $thisfile_bmp_header['compression'] . ' ' . $thisfile_bmp_header_raw['bits_per_pixel'] . '-bit';
+            $ThisFileInfo['video']['codec']           = $thisfile_bmp_header['compression'].' '.$thisfile_bmp_header_raw['bits_per_pixel'].'-bit';
             $ThisFileInfo['video']['bits_per_sample'] = $thisfile_bmp_header_raw['bits_per_pixel'];
 
             if (($thisfile_bmp['type_version'] >= 4) || (3 == $thisfile_bmp_header_raw['compression'])) {
@@ -469,7 +469,7 @@ 
                             for ($row = ($thisfile_bmp_header_raw['height'] - 1); $row >= 0; $row--) {
                                 for ($col = 0; $col < $thisfile_bmp_header_raw['width']; $col++) {
                                     $thisfile_bmp['data'][$row][$col] = (ord($BMPpixelData{$pixeldataoffset + 2}) << 16) | (ord($BMPpixelData{$pixeldataoffset + 1}) << 8) | ord($BMPpixelData{$pixeldataoffset});
-                                    $pixeldataoffset                  += 3;
+                                    $pixeldataoffset += 3;
                                 }
                                 while (0 != ($pixeldataoffset % 4)) {
                                     // lines are padded to nearest DWORD
@@ -482,7 +482,7 @@ 
                             for ($row = ($thisfile_bmp_header_raw['height'] - 1); $row >= 0; $row--) {
                                 for ($col = 0; $col < $thisfile_bmp_header_raw['width']; $col++) {
                                     $thisfile_bmp['data'][$row][$col] = (ord($BMPpixelData{$pixeldataoffset + 3}) << 24) | (ord($BMPpixelData{$pixeldataoffset + 2}) << 16) | (ord($BMPpixelData{$pixeldataoffset + 1}) << 8) | ord($BMPpixelData{$pixeldataoffset});
-                                    $pixeldataoffset                  += 4;
+                                    $pixeldataoffset += 4;
                                 }
                                 while (0 != ($pixeldataoffset % 4)) {
                                     // lines are padded to nearest DWORD
@@ -496,7 +496,7 @@ 
                             break;
 
                         default:
-                            $ThisFileInfo['error'][] = 'Unknown bits-per-pixel value (' . $thisfile_bmp_header_raw['bits_per_pixel'] . ') - cannot read pixel data';
+                            $ThisFileInfo['error'][] = 'Unknown bits-per-pixel value ('.$thisfile_bmp_header_raw['bits_per_pixel'].') - cannot read pixel data';
                             break;
                     }
                     break;
@@ -568,7 +568,7 @@ 
                             break;
 
                         default:
-                            $ThisFileInfo['error'][] = 'Unknown bits-per-pixel value (' . $thisfile_bmp_header_raw['bits_per_pixel'] . ') - cannot read pixel data';
+                            $ThisFileInfo['error'][] = 'Unknown bits-per-pixel value ('.$thisfile_bmp_header_raw['bits_per_pixel'].') - cannot read pixel data';
                             break;
                     }
                     break;
@@ -653,7 +653,7 @@ 
                             break;
 
                         default:
-                            $ThisFileInfo['error'][] = 'Unknown bits-per-pixel value (' . $thisfile_bmp_header_raw['bits_per_pixel'] . ') - cannot read pixel data';
+                            $ThisFileInfo['error'][] = 'Unknown bits-per-pixel value ('.$thisfile_bmp_header_raw['bits_per_pixel'].') - cannot read pixel data';
                             break;
                     }
                     break;
@@ -682,7 +682,7 @@ 
                             }
                             for ($row = ($thisfile_bmp_header_raw['height'] - 1); $row >= 0; $row--) {
                                 for ($col = 0; $col < $thisfile_bmp_header_raw['width']; $col++) {
-                                    $pixelvalue      = $this->LittleEndian2Int(substr($BMPpixelData, $pixeldataoffset, $thisfile_bmp_header_raw['bits_per_pixel'] / 8));
+                                    $pixelvalue = $this->LittleEndian2Int(substr($BMPpixelData, $pixeldataoffset, $thisfile_bmp_header_raw['bits_per_pixel'] / 8));
                                     $pixeldataoffset += $thisfile_bmp_header_raw['bits_per_pixel'] / 8;
 
                                     $red                              = (int)round(((($pixelvalue & $thisfile_bmp_header_raw['red_mask']) >> $redshift) / ($thisfile_bmp_header_raw['red_mask'] >> $redshift)) * 255);
@@ -698,13 +698,13 @@ 
                             break;
 
                         default:
-                            $ThisFileInfo['error'][] = 'Unknown bits-per-pixel value (' . $thisfile_bmp_header_raw['bits_per_pixel'] . ') - cannot read pixel data';
+                            $ThisFileInfo['error'][] = 'Unknown bits-per-pixel value ('.$thisfile_bmp_header_raw['bits_per_pixel'].') - cannot read pixel data';
                             break;
                     }
                     break;
 
                 default: // unhandled compression type
-                    $ThisFileInfo['error'][] = 'Unknown/unhandled compression type value (' . $thisfile_bmp_header_raw['compression'] . ') - cannot decompress pixel data';
+                    $ThisFileInfo['error'][] = 'Unknown/unhandled compression type value ('.$thisfile_bmp_header_raw['compression'].') - cannot decompress pixel data';
                     break;
             }
         }
@@ -795,7 +795,7 @@ 
         }
         $im = $this->PlotPixelsGD($BMPinfo['bmp']);
         if (headers_sent()) {
-            echo 'plotted ' . ($BMPinfo['resolution_x'] * $BMPinfo['resolution_y']) . ' pixels in ' . (time() - $starttime) . ' seconds<BR>';
+            echo 'plotted '.($BMPinfo['resolution_x'] * $BMPinfo['resolution_y']).' pixels in '.(time() - $starttime).' seconds<BR>';
             imagedestroy($im);
             exit;
         }

phpthumb/phpthumb.functions.php

Spacing +62 added lines, -62 removed lines

@@ -162,7 +162,7 @@ 
             return escapeshellarg($arg);
         }
 
-        return '\'' . str_replace('\'', '\\\'', $arg) . '\'';
+        return '\''.str_replace('\'', '\\\'', $arg).'\'';
     }
 
     /**
@@ -191,7 +191,7 @@ 
         if (empty($exif_info)) {
             // based on code by johnschaefer at gmx dot de
             // from PHP help on gd_info()
-            $exif_info     = [
+            $exif_info = [
                 'EXIF Support'           => '',
                 'EXIF Version'           => '',
                 'Supported EXIF Version' => '',
@@ -223,28 +223,28 @@ 
             return image_type_to_mime_type($imagetype);
         }
         static $image_type_to_mime_type = [
-            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',
         ];
 
@@ -277,7 +277,7 @@ 
         $len    = strlen($string);
         $output = '';
         for ($i = 0; $i < $len; $i++) {
-            $output .= ' 0x' . str_pad(dechex(ord($string{$i})), 2, '0', STR_PAD_LEFT);
+            $output .= ' 0x'.str_pad(dechex(ord($string{$i})), 2, '0', STR_PAD_LEFT);
         }
 
         return $output;
@@ -333,7 +333,7 @@ 
             return self::ImageColorAllocateAlphaSafe($gdimg_hexcolorallocate, $R, $G, $B, $alpha);
         }
         if ($dieOnInvalid) {
-            die('Invalid hex color string: "' . $HexColorString . '"');
+            die('Invalid hex color string: "'.$HexColorString.'"');
         }
 
         return imagecolorallocate($gdimg_hexcolorallocate, 0x00, 0x00, 0x00);
@@ -535,10 +535,10 @@ 
             $ImageCreateFunction = 'imagecreatetruecolor';
         }
         if (!function_exists($ImageCreateFunction)) {
-            return phpthumb::ErrorImage($ImageCreateFunction . '() does not exist - no GD support?');
+            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 phpthumb::ErrorImage('Invalid image dimensions: '.$ImageCreateFunction.'('.$x_size.', '.$y_size.')');
         }
 
         return $ImageCreateFunction(round($x_size), round($y_size));
@@ -762,10 +762,10 @@ 
         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[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")
             }
         }
@@ -783,7 +783,7 @@ 
         $size = false;
         $url  = self::ParseURLbetter($remotefile);
         if ($fp = @fsockopen($url['host'], ($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");
+            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);
             }
@@ -810,7 +810,7 @@ 
         $date = false;
         $url  = self::ParseURLbetter($remotefile);
         if ($fp = @fsockopen($url['host'], ($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");
+            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);
             }
@@ -840,7 +840,7 @@ 
         if ($fp = @fopen($filename, 'rb')) {
             $rawData = '';
             do {
-                $buffer  = fread($fp, 8192);
+                $buffer = fread($fp, 8192);
                 $rawData .= $buffer;
             } while (strlen($buffer) > 0);
             fclose($fp);
@@ -876,8 +876,8 @@ 
     {
         $intstring = '';
         while ($number > 0) {
-            $intstring = $intstring . chr($number & 255);
-            $number    >>= 8;
+            $intstring = $intstring.chr($number & 255);
+            $number >>= 8;
         }
 
         return str_pad($intstring, $minbytes, "\x00", STR_PAD_RIGHT);
@@ -935,10 +935,10 @@ 
             return false;
         }
         //if ($fp = @fsockopen($host, $port, $errno, $errstr, $timeout)) {
-        if ($fp = @fsockopen(((443 == $port) ? '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";
+        if ($fp = @fsockopen(((443 == $port) ? '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;
@@ -967,7 +967,7 @@ 
                                 break;
 
                             default:
-                                $errstr = $errno . ' ' . $errstr . ($header_newlocation ? '; Location: ' . $header_newlocation : '');
+                                $errstr = $errno.' '.$errstr.($header_newlocation ? '; Location: '.$header_newlocation : '');
                                 fclose($fp);
 
                                 return false;
@@ -1011,7 +1011,7 @@ 
         $CleanQueries = [];
         foreach ($queries as $key => $query) {
             @list($param, $value) = explode('=', $query);
-            $CleanQueries[] = strtr($param, $TranslationMatrix) . ($value ? '=' . strtr($value, $TranslationMatrix) : '');
+            $CleanQueries[] = strtr($param, $TranslationMatrix).($value ? '='.strtr($value, $TranslationMatrix) : '');
         }
         foreach ($CleanQueries as $key => $value) {
             if ('' === $value) {
@@ -1019,12 +1019,12 @@ 
             }
         }
 
-        $cleaned_url = $parse_url['scheme'] . '://';
-        $cleaned_url .= (@$parse_url['username'] ? $parse_url['host'] . (@$parse_url['password'] ? ':' . $parse_url['password'] : '') . '@' : '');
+        $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']) && (80 != $parse_url['port'])) ? ':' . $parse_url['port'] : '');
-        $cleaned_url .= '/' . implode('/', $CleanPathElements);
-        $cleaned_url .= (@$CleanQueries ? '?' . implode($queryseperator, $CleanQueries) : '');
+        $cleaned_url .= ((!empty($parse_url['port']) && (80 != $parse_url['port'])) ? ':'.$parse_url['port'] : '');
+        $cleaned_url .= '/'.implode('/', $CleanPathElements);
+        $cleaned_url .= (@$CleanQueries ? '?'.implode($queryseperator, $CleanQueries) : '');
 
         return $cleaned_url;
     }
@@ -1071,12 +1071,12 @@ 
 
         while (true) {
             $tryagain = false;
-            $rawData  = self::URLreadFsock(@$parsed_url['host'], @$parsed_url['path'] . '?' . @$parsed_url['query'], $errstr, true, (@$parsed_url['port'] ?: 80), $timeout);
+            $rawData  = self::URLreadFsock(@$parsed_url['host'], @$parsed_url['path'].'?'.@$parsed_url['query'], $errstr, true, (@$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] . '"';
+                    $error .= 'URL "'.$url.'" redirected to "'.$matches[1].'"';
 
                     $tryagain                         = true;
                     $alreadyLookedAtURLs[$matches[1]] = true;
@@ -1089,12 +1089,12 @@ 
         }
 
         if (false === $rawData) {
-            $error .= 'Error opening "' . $url . '":' . "\n\n" . $errstr;
+            $error .= 'Error opening "'.$url.'":'."\n\n".$errstr;
 
             return false;
         } elseif (null === $rawData) {
             // fall through
-            $error .= 'Error opening "' . $url . '":' . "\n\n" . $errstr;
+            $error .= 'Error opening "'.$url.'":'."\n\n".$errstr;
         } else {
             return $rawData;
         }
@@ -1105,14 +1105,14 @@ 
             curl_setopt($ch, CURLOPT_HEADER, false);
             curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
             curl_setopt($ch, CURLOPT_BINARYTRANSFER, true);
-            curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 2);    // changed for XOOPS
+            curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 2); // changed for XOOPS
             curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, true); // changed for XOOPS
             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); ';
+                $error .= 'CURL succeeded ('.strlen($rawData).' bytes); ';
 
                 return $rawData;
             }
@@ -1123,14 +1123,14 @@ 
 
         $BrokenURLfopenPHPversions = ['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 = '';
             ob_start();
             if ($fp = fopen($url, 'rb')) {
                 do {
-                    $buffer  = fread($fp, 8192);
+                    $buffer = fread($fp, 8192);
                     $rawData .= $buffer;
                 } while (strlen($buffer) > 0);
                 fclose($fp);
@@ -1140,11 +1140,11 @@ 
             ob_end_clean();
             $error .= $error_fopen;
             if (!$error_fopen) {
-                $error .= '; "allow_url_fopen" succeeded (' . strlen($rawData) . ' bytes); ';
+                $error .= '; "allow_url_fopen" succeeded ('.strlen($rawData).' bytes); ';
 
                 return $rawData;
             }
-            $error .= '; "allow_url_fopen" enabled but returned no data (' . $error_fopen . '); ';
+            $error .= '; "allow_url_fopen" enabled but returned no data ('.$error_fopen.'); ';
         } else {
             $error .= '"allow_url_fopen" disabled; ';
         }
@@ -1159,10 +1159,10 @@ 
     public static function EnsureDirectoryExists($dirname)
     {
         $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)
+            if (preg_match('#^'.preg_quote($open_basedir).'#', $dirname)
                 && (strlen($dirname) > strlen($open_basedir))) {
                 $startoffset = substr_count($open_basedir, DIRECTORY_SEPARATOR) + 1;
                 break;
@@ -1201,7 +1201,7 @@ 
         $dirname  = rtrim(realpath($dirname), '/\\');
         if ($dirhandle = @opendir($dirname)) {
             while (false !== ($file = readdir($dirhandle))) {
-                $fullfilename = $dirname . DIRECTORY_SEPARATOR . $file;
+                $fullfilename = $dirname.DIRECTORY_SEPARATOR.$file;
                 if (is_file($fullfilename)) {
                     $AllFiles[] = $fullfilename;
                 } elseif (is_dir($fullfilename)) {
@@ -1235,7 +1235,7 @@ 
      */
     public static function SanitizeFilename($filename)
     {
-        $filename = preg_replace('/[^' . preg_quote(' !#$%^()+,-.;<>=@[]_{}') . 'a-zA-Z0-9]/', '_', $filename);
+        $filename = preg_replace('/[^'.preg_quote(' !#$%^()+,-.;<>=@[]_{}').'a-zA-Z0-9]/', '_', $filename);
         if (self::version_compare_replacement(PHP_VERSION, '4.1.0', '>=')) {
             $filename = trim($filename, '.');
         }
@@ -1272,7 +1272,7 @@ 
         if (empty($gd_info)) {
             // based on code by johnschaefer at gmx dot de
             // from PHP help on gd_info()
-            $gd_info       = [
+            $gd_info = [
                 'GD Version'         => '',
                 'FreeType Support'   => false,
                 'FreeType Linkage'   => '',
@@ -1363,7 +1363,7 @@ 
         if (empty($preg_quote_array)) {
             $escapeables = '.\\+*?[^]$(){}=!<>|:';
             for ($i = 0; $i < strlen($escapeables); $i++) {
-                $strtr_preg_quote[$escapeables{$i}] = $delimiter . $escapeables{$i};
+                $strtr_preg_quote[$escapeables{$i}] = $delimiter.$escapeables{$i};
             }
         }
 
@@ -1385,7 +1385,7 @@ 
         if ($fp = @fopen($filename, 'rb')) {
             $rawData = '';
             do {
-                $buffer  = fread($fp, 8192);
+                $buffer = fread($fp, 8192);
                 $rawData .= $buffer;
             } while (strlen($buffer) > 0);
             fclose($fp);

phpthumb/phpthumb.class.php

Indentation +31 added lines, -31 removed lines

@@ -1588,10 +1588,10 @@ 
                 $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));
+                                    . ' && 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);
                 }
@@ -2204,9 +2204,9 @@ 
 
                             if (($method > 1)
                                 && !$this->ImageMagickSwitchAvailable([
-                                                                          'channel',
-                                                                          'contrast-stretch'
-                                                                      ])) {
+                                                                            '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
@@ -2311,11 +2311,11 @@ 
 
                         case 'bord':
                             if ($this->ImageMagickSwitchAvailable([
-                                                                      'border',
-                                                                      'bordercolor',
-                                                                      'thumbnail',
-                                                                      'crop'
-                                                                  ])) {
+                                                                        'border',
+                                                                        'bordercolor',
+                                                                        'thumbnail',
+                                                                        'crop'
+                                                                    ])) {
                                 if (!$this->zc) {
                                     @list($width, $rX, $rY, $color) = explode('|', $parameter);
                                     $width = (int)$width;
@@ -2335,7 +2335,7 @@ 
                                             $commandline = str_replace(
                                                 ' -' . $IMresizeParameter . ' "' . $matches[1] . 'x' . $matches[2] . '" ',
                                                 ' -' . $IMresizeParameter . ' ' . phpthumb_functions::escapeshellarg_replacement(($matches[1] - (2 * $width)) . 'x' . ($matches[2] - (2 * $width))) . ' ',
-                                                                       $commandline
+                                                                        $commandline
                                             );
                                         }
                                         $successfullyProcessedFilters[] = $filterkey;
@@ -3976,16 +3976,16 @@ 
                 $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).');
+                                            . $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) . '"');
@@ -4135,8 +4135,8 @@ 
                     $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');
+                                                                                                                                                                                                                                                                    . $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);
@@ -4545,12 +4545,12 @@ 
         $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);
+                                                                                                                                                . "\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__);

Spacing +504 added lines, -504 removed lines

@@ -10,9 +10,9 @@ 
 //////////////////////////////////////////////////////////////
 
 ob_start();
-if (!require_once __DIR__ . '/phpthumb.functions.php') {
+if (!require_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();
 
@@ -25,42 +25,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 = [];  // 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 = []; // 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
@@ -130,7 +130,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;
@@ -147,7 +147,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     = []; // additional directories to allow source images to be read from
 
     // * HTTP fopen
@@ -227,7 +227,7 @@ 
     public function phpThumb()
     {
         $this->DebugTimingMessage('phpThumb() constructor', __FILE__, __LINE__);
-        $this->DebugMessage('phpThumb() v' . $this->phpthumb_version, __FILE__, __LINE__);
+        $this->DebugMessage('phpThumb() v'.$this->phpthumb_version, __FILE__, __LINE__);
 
         foreach ([ini_get('memory_limit'), get_cfg_var('memory_limit')] as $php_config_memory_limit) {
             if (strlen($php_config_memory_limit)) {
@@ -246,7 +246,7 @@ 
         $this->iswindows            = ('WIN' === strtoupper(substr(PHP_OS, 0, 3)));
         $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->config_cache_prefix  = (isset($_SERVER['SERVER_NAME']) ? $_SERVER['SERVER_NAME'].'_' : '');
 
         $this->purgeTempFiles(); // purge existing temp files if re-initializing object
 
@@ -275,7 +275,7 @@ 
     {
         foreach ($this->tempFilesToDelete as $tempFileToDelete) {
             if (file_exists($tempFileToDelete)) {
-                $this->DebugMessage('Deleting temp file "' . $tempFileToDelete . '"', __FILE__, __LINE__);
+                $this->DebugMessage('Deleting temp file "'.$tempFileToDelete.'"', __FILE__, __LINE__);
                 @unlink($tempFileToDelete);
             }
         }
@@ -300,12 +300,12 @@ 
             $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__);
+                $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.') 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__);
+        $this->DebugMessage('setSourceFilename('.$sourceFilename.') set $this->sourceFilename to "'.$this->sourceFilename.'"', __FILE__, __LINE__);
 
         return true;
     }
@@ -322,20 +322,20 @@ 
         //$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__);
+        $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 ?: 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');
+                $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->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')) {
+            $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) . ')');
+                $this->ErrorImage('setSourceData() failed to write to source cache ('.$this->config_cache_source_directory.DIRECTORY_SEPARATOR.urlencode($sourceFilename).')');
             }
         }
 
@@ -461,9 +461,9 @@ 
         //		}
         $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__);
+        $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->DebugMessage('memory_get_usage() after imagedestroy = '.(function_exists('memory_get_usage') ? @memory_get_usage() : 'n/a'), __FILE__, __LINE__);
 
         $this->phpThumbDebug('8i');
         $this->AntiOffsiteLinking();
@@ -498,7 +498,7 @@ 
             return false;
         }
         if ($this->useRawIMoutput) {
-            $this->DebugMessage('RenderOutput copying $this->IMresizedData (' . strlen($this->IMresizedData) . ' bytes) to $this->outputImage', __FILE__, __LINE__);
+            $this->DebugMessage('RenderOutput copying $this->IMresizedData ('.strlen($this->IMresizedData).' bytes) to $this->outputImage', __FILE__, __LINE__);
             $this->outputImageData = $this->IMresizedData;
 
             return true;
@@ -513,10 +513,10 @@ 
             $builtin_formats['png']  = (bool)($imagetypes & IMG_PNG);
         }
 
-        $this->DebugMessage('imageinterlace($this->gdimg_output, ' . (int)$this->config_output_interlace . ')', __FILE__, __LINE__);
+        $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__);
+        $this->DebugMessage('RenderOutput() attempting image'.strtolower(@$this->thumbnailFormat).'($this->gdimg_output)', __FILE__, __LINE__);
         ob_start();
         switch ($this->thumbnailFormat) {
             case 'wbmp':
@@ -563,7 +563,7 @@ 
                     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__);
+                        $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);
@@ -585,8 +585,8 @@ 
                 break;
 
             case 'bmp':
-                if (!@require_once __DIR__ . '/phpthumb.bmp.php') {
-                    $this->DebugMessage('Error including "' . __DIR__ . '/phpthumb.bmp.php" which is required for BMP format output', __FILE__, __LINE__);
+                if (!@require_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;
@@ -597,8 +597,8 @@ 
                 break;
 
             case 'ico':
-                if (!@require_once __DIR__ . '/phpthumb.ico.php') {
-                    $this->DebugMessage('Error including "' . __DIR__ . '/phpthumb.ico.php" which is required for ICO format output', __FILE__, __LINE__);
+                if (!@require_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;
@@ -610,19 +610,19 @@ 
                 break;
 
             default:
-                $this->DebugMessage('RenderOutput failed because $this->thumbnailFormat "' . $this->thumbnailFormat . '" is not valid', __FILE__, __LINE__);
+                $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__);
+            $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__);
+        $this->DebugMessage('RenderOutput() completing with $this->outputImageData = '.strlen($this->outputImageData).' bytes', __FILE__, __LINE__);
 
         return true;
     }
@@ -636,7 +636,7 @@ 
     public function RenderToFile($filename)
     {
         if (preg_match('#^[a-z0-9]+://#i', $filename)) {
-            $this->DebugMessage('RenderToFile() failed because $filename (' . $filename . ') is a URL', __FILE__, __LINE__);
+            $this->DebugMessage('RenderToFile() failed because $filename ('.$filename.') is a URL', __FILE__, __LINE__);
 
             return false;
         }
@@ -647,27 +647,27 @@ 
             $renderfilename = $this->ResolveFilenameToAbsolute($renderfilename);
         }
         if (!@is_writable(dirname($renderfilename))) {
-            $this->DebugMessage('RenderToFile() failed because "' . dirname($renderfilename) . '/" is not writable', __FILE__, __LINE__);
+            $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__);
+            $this->DebugMessage('RenderToFile() failed because "'.$renderfilename.'" is not writable', __FILE__, __LINE__);
 
             return false;
         }
 
         if ($this->RenderOutput()) {
             if (file_put_contents($renderfilename, $this->outputImageData)) {
-                $this->DebugMessage('RenderToFile(' . $renderfilename . ') succeeded', __FILE__, __LINE__);
+                $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__);
+                $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__);
+            $this->DebugMessage('RenderOutput ['.$this->thumbnailFormat.'('.$renderfilename.')] failed', __FILE__, __LINE__);
         }
 
         return false;
@@ -691,37 +691,37 @@ 
             return $this->ErrorImage('OutputThumbnail() failed - headers already sent');
         }
 
-        $downloadfilename = phpthumb_functions::SanitizeFilename(is_string($this->sia) ? $this->sia : ($this->down ?: 'phpThumb_generated_thumbnail' . '.' . $this->thumbnailFormat));
-        $this->DebugMessage('Content-Disposition header filename set to "' . $downloadfilename . '"', __FILE__, __LINE__);
+        $downloadfilename = phpthumb_functions::SanitizeFilename(is_string($this->sia) ? $this->sia : ($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 . '"');
+            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));
+            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__);
+            $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;
+                    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;
+                    header('Content-Type: '.phpthumb_functions::ImageTypeToMIMEtype($this->thumbnailFormat));
+                    $ImageOutFunction = 'image'.$this->thumbnailFormat;
                     @$ImageOutFunction($this->gdimg_output);
                     break;
 
                 case 'bmp':
-                    if (!@require_once __DIR__ . '/phpthumb.bmp.php') {
-                        $this->DebugMessage('Error including "' . __DIR__ . '/phpthumb.bmp.php" which is required for BMP format output', __FILE__, __LINE__);
+                    if (!@require_once __DIR__.'/phpthumb.bmp.php') {
+                        $this->DebugMessage('Error including "'.__DIR__.'/phpthumb.bmp.php" which is required for BMP format output', __FILE__, __LINE__);
 
                         return false;
                     }
@@ -734,7 +734,7 @@ 
 
                             return false;
                         }
-                        header('Content-Type: ' . phpthumb_functions::ImageTypeToMIMEtype($this->thumbnailFormat));
+                        header('Content-Type: '.phpthumb_functions::ImageTypeToMIMEtype($this->thumbnailFormat));
                         echo $bmp_data;
                     } else {
                         $this->DebugMessage('new phpthumb_bmp() failed', __FILE__, __LINE__);
@@ -744,8 +744,8 @@ 
                     break;
 
                 case 'ico':
-                    if (!@require_once __DIR__ . '/phpthumb.ico.php') {
-                        $this->DebugMessage('Error including "' . __DIR__ . '/phpthumb.ico.php" which is required for ICO format output', __FILE__, __LINE__);
+                    if (!@require_once __DIR__.'/phpthumb.ico.php') {
+                        $this->DebugMessage('Error including "'.__DIR__.'/phpthumb.ico.php" which is required for ICO format output', __FILE__, __LINE__);
 
                         return false;
                     }
@@ -759,7 +759,7 @@ 
 
                             return false;
                         }
-                        header('Content-Type: ' . phpthumb_functions::ImageTypeToMIMEtype($this->thumbnailFormat));
+                        header('Content-Type: '.phpthumb_functions::ImageTypeToMIMEtype($this->thumbnailFormat));
                         echo $ico_data;
                     } else {
                         $this->DebugMessage('new phpthumb_ico() failed', __FILE__, __LINE__);
@@ -769,7 +769,7 @@ 
                     break;
 
                 default:
-                    $this->DebugMessage('OutputThumbnail failed because $this->thumbnailFormat "' . $this->thumbnailFormat . '" is not valid', __FILE__, __LINE__);
+                    $this->DebugMessage('OutputThumbnail failed because $this->thumbnailFormat "'.$this->thumbnailFormat.'" is not valid', __FILE__, __LINE__);
 
                     return false;
                     break;
@@ -795,21 +795,21 @@ 
                             . ' files)', __FILE__, __LINE__);
 
         if (!is_writable($this->config_cache_directory)) {
-            $this->DebugMessage('CleanUpCacheDirectory() skipped because "' . $this->config_cache_directory . '" is not writable', __FILE__, __LINE__);
+            $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';
+        $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__);
+            $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__);
+            $this->DebugMessage('touch('.$phpThumbCacheStats_filename.') failed', __FILE__, __LINE__);
         }
 
         $DeletedKeys              = [];
@@ -820,7 +820,7 @@ 
             $CacheDirOldFilesSize     = [];
             $AllFilesInCacheDirectory = phpthumb_functions::GetAllFilesInSubfolders($this->config_cache_directory);
             foreach ($AllFilesInCacheDirectory as $fullfilename) {
-                if (preg_match('#' . preg_quote($this->config_cache_prefix) . '#i', $fullfilename)
+                if (preg_match('#'.preg_quote($this->config_cache_prefix).'#i', $fullfilename)
                     && file_exists($fullfilename)) {
                     $CacheDirOldFilesAge[$fullfilename] = @fileatime($fullfilename);
                     if (0 == $CacheDirOldFilesAge[$fullfilename]) {
@@ -830,7 +830,7 @@ 
                 }
             }
             if (empty($CacheDirOldFilesSize)) {
-                $this->DebugMessage('CleanUpCacheDirectory() skipped because $CacheDirOldFilesSize is empty (phpthumb_functions::GetAllFilesInSubfolders(' . $this->config_cache_directory . ') found no files)', __FILE__, __LINE__);
+                $this->DebugMessage('CleanUpCacheDirectory() skipped because $CacheDirOldFilesSize is empty (phpthumb_functions::GetAllFilesInSubfolders('.$this->config_cache_directory.') found no files)', __FILE__, __LINE__);
 
                 return true;
             }
@@ -839,7 +839,7 @@ 
                 // 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 ((0 == $filesize) && ($CacheDirOldFilesAge[$fullfilename] < $cutofftime)) {
-                    $this->DebugMessage('deleting "' . $fullfilename . '"', __FILE__, __LINE__);
+                    $this->DebugMessage('deleting "'.$fullfilename.'"', __FILE__, __LINE__);
                     if (@unlink($fullfilename)) {
                         $DeletedKeys['zerobyte'][] = $fullfilename;
                         unset($CacheDirOldFilesSize[$fullfilename]);
@@ -847,7 +847,7 @@ 
                     }
                 }
             }
-            $this->DebugMessage('CleanUpCacheDirectory() purged ' . count($DeletedKeys['zerobyte']) . ' zero-byte files', __FILE__, __LINE__);
+            $this->DebugMessage('CleanUpCacheDirectory() purged '.count($DeletedKeys['zerobyte']).' zero-byte files', __FILE__, __LINE__);
             asort($CacheDirOldFilesAge);
 
             if ($this->config_cache_maxfiles > 0) {
@@ -855,7 +855,7 @@ 
                 $DeletedKeys['maxfiles'] = [];
                 foreach ($CacheDirOldFilesAge as $fullfilename => $filedate) {
                     if ($TotalCachedFiles > $this->config_cache_maxfiles) {
-                        $this->DebugMessage('deleting "' . $fullfilename . '"', __FILE__, __LINE__);
+                        $this->DebugMessage('deleting "'.$fullfilename.'"', __FILE__, __LINE__);
                         if (@unlink($fullfilename)) {
                             $TotalCachedFiles--;
                             $DeletedKeys['maxfiles'][] = $fullfilename;
@@ -865,7 +865,7 @@ 
                         break;
                     }
                 }
-                $this->DebugMessage('CleanUpCacheDirectory() purged ' . count($DeletedKeys['maxfiles']) . ' files based on (config_cache_maxfiles=' . $this->config_cache_maxfiles . ')', __FILE__, __LINE__);
+                $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]);
@@ -878,7 +878,7 @@ 
                 foreach ($CacheDirOldFilesAge as $fullfilename => $filedate) {
                     if ($filedate > 0) {
                         if ($filedate < $mindate) {
-                            $this->DebugMessage('deleting "' . $fullfilename . '"', __FILE__, __LINE__);
+                            $this->DebugMessage('deleting "'.$fullfilename.'"', __FILE__, __LINE__);
                             if (@unlink($fullfilename)) {
                                 $DeletedKeys['maxage'][] = $fullfilename;
                             }
@@ -888,7 +888,7 @@ 
                         }
                     }
                 }
-                $this->DebugMessage('CleanUpCacheDirectory() purged ' . count($DeletedKeys['maxage']) . ' files based on (config_cache_maxage=' . $this->config_cache_maxage . ')', __FILE__, __LINE__);
+                $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]);
@@ -900,9 +900,9 @@ 
                 $DeletedKeys['maxsize'] = [];
                 foreach ($CacheDirOldFilesAge as $fullfilename => $filedate) {
                     if ($TotalCachedFileSize > $this->config_cache_maxsize) {
-                        $this->DebugMessage('deleting "' . $fullfilename . '"', __FILE__, __LINE__);
+                        $this->DebugMessage('deleting "'.$fullfilename.'"', __FILE__, __LINE__);
                         if (@unlink($fullfilename)) {
-                            $TotalCachedFileSize      -= $CacheDirOldFilesSize[$fullfilename];
+                            $TotalCachedFileSize -= $CacheDirOldFilesSize[$fullfilename];
                             $DeletedKeys['maxsize'][] = $fullfilename;
                         }
                     } else {
@@ -910,7 +910,7 @@ 
                         break;
                     }
                 }
-                $this->DebugMessage('CleanUpCacheDirectory() purged ' . count($DeletedKeys['maxsize']) . ' files based on (config_cache_maxsize=' . $this->config_cache_maxsize . ')', __FILE__, __LINE__);
+                $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]);
@@ -923,7 +923,7 @@ 
         foreach ($DeletedKeys as $key => $value) {
             $totalpurged += count($value);
         }
-        $this->DebugMessage('CleanUpCacheDirectory() purged ' . $totalpurged . ' files (from ' . count($AllFilesInCacheDirectory) . ') based on config settings', __FILE__, __LINE__);
+        $this->DebugMessage('CleanUpCacheDirectory() purged '.$totalpurged.' files (from '.count($AllFilesInCacheDirectory).') based on config settings', __FILE__, __LINE__);
         if ($totalpurged > 0) {
             $empty_dirs = [];
             foreach ($AllFilesInCacheDirectory as $fullfilename) {
@@ -942,10 +942,10 @@ 
                 } elseif (@rmdir($empty_dir)) {
                     $totalpurgeddirs++;
                 } else {
-                    $this->DebugMessage('failed to rmdir(' . $empty_dir . ')', __FILE__, __LINE__);
+                    $this->DebugMessage('failed to rmdir('.$empty_dir.')', __FILE__, __LINE__);
                 }
             }
-            $this->DebugMessage('purged ' . $totalpurgeddirs . ' empty directories', __FILE__, __LINE__);
+            $this->DebugMessage('purged '.$totalpurgeddirs.' empty directories', __FILE__, __LINE__);
         }
 
         return true;
@@ -985,16 +985,16 @@ 
         }
         if ($this->rawImageData) {
             $this->sourceFilename = null;
-            $this->DebugMessage('ResolveSource() exiting because $this->rawImageData is set (' . number_format(strlen($this->rawImageData)) . ' bytes)', __FILE__, __LINE__);
+            $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__);
+            $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__);
+            $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');
         }
@@ -1009,12 +1009,12 @@ 
                     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');
+                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');
+            return $this->ErrorImage('"'.$this->sourceFilename.'" does not exist');
         } elseif (!@is_file($this->sourceFilename)) {
-            return $this->ErrorImage('"' . $this->sourceFilename . '" is not a file');
+            return $this->ErrorImage('"'.$this->sourceFilename.'" is not a file');
         }
 
         return true;
@@ -1033,10 +1033,10 @@ 
 
         $AvailableImageOutputFormats   = [];
         $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';
         }
 
@@ -1066,13 +1066,13 @@ 
         }
         if ($this->ImageMagickVersion()) {
             $IMformats = ['jpeg', 'png', 'gif', 'bmp', 'ico', 'wbmp'];
-            $this->DebugMessage('Addding ImageMagick formats to $AvailableImageOutputFormats (' . implode(';', $AvailableImageOutputFormats) . ')', __FILE__, __LINE__);
+            $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->DebugMessage('$AvailableImageOutputFormats = array('.implode(';', $AvailableImageOutputFormats).')', __FILE__, __LINE__);
 
         $this->f = preg_replace('#[^a-z]#', '', strtolower($this->f));
         if ('jpg' === strtolower($this->config_output_format)) {
@@ -1083,24 +1083,24 @@ 
         }
         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->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__);
+            $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->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__);
+            $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__);
+        $this->DebugMessage('$this->thumbnailQuality set to "'.$this->thumbnailQuality.'"', __FILE__, __LINE__);
 
         return true;
     }
@@ -1111,15 +1111,15 @@ 
     public function setCacheDirectory()
     {
         // resolve cache directory to absolute pathname
-        $this->DebugMessage('setCacheDirectory() starting with config_cache_directory = "' . $this->config_cache_directory . '"', __FILE__, __LINE__);
+        $this->DebugMessage('setCacheDirectory() starting with config_cache_directory = "'.$this->config_cache_directory.'"', __FILE__, __LINE__);
         if ('.' === substr($this->config_cache_directory, 0, 1)) {
             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');
+                    $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;
+                $this->config_cache_directory = dirname($this->ResolveFilenameToAbsolute($this->src)).DIRECTORY_SEPARATOR.$this->config_cache_directory;
             } else {
                 // $this->new is probably set
             }
@@ -1133,31 +1133,31 @@ 
         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__);
+                $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__);
+                    $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->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->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->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->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->DebugMessage('setting $this->config_temp_directory = $this->config_cache_directory ('.$this->config_cache_directory.')', __FILE__, __LINE__);
             $this->config_temp_directory = $this->config_cache_directory;
         }
 
@@ -1238,7 +1238,7 @@ 
     {
         if (!empty($allowed_dirs)) {
             foreach ($allowed_dirs as $one_dir) {
-                if (preg_match('#^' . preg_quote(str_replace(DIRECTORY_SEPARATOR, '/', $this->realPathSafe($one_dir))) . '#', $path)) {
+                if (preg_match('#^'.preg_quote(str_replace(DIRECTORY_SEPARATOR, '/', $this->realPathSafe($one_dir))).'#', $path)) {
                     return true;
                 }
             }
@@ -1258,7 +1258,7 @@ 
         static $open_basedirs = null;
         if (null === $open_basedirs) {
             $ini_text = ini_get('open_basedir');
-            $this->DebugMessage('open_basedir: "' . $ini_text . '"', __FILE__, __LINE__);
+            $this->DebugMessage('open_basedir: "'.$ini_text.'"', __FILE__, __LINE__);
             $open_basedirs = [];
             if (strlen($ini_text) > 0) {
                 foreach (preg_split('#[;:]#', $ini_text) as $key => $value) {
@@ -1279,7 +1279,7 @@ 
      */
     public function resolvePath($path, $allowed_dirs)
     {
-        $this->DebugMessage('resolvePath: ' . $path . ' (allowed_dirs: ' . print_r($allowed_dirs, true) . ')', __FILE__, __LINE__);
+        $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) {
@@ -1289,7 +1289,7 @@ 
                 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__);
+                $this->DebugMessage('resolvePath: checks disabled, returning '.$this->realPathSafe($path), __FILE__, __LINE__);
 
                 return $this->realPathSafe($path);
             }
@@ -1299,7 +1299,7 @@ 
         }
 
         do {
-            $this->DebugMessage('resolvePath: iteration, path=' . $path . ', base path = ' . $allowed_dirs[0], __FILE__, __LINE__);
+            $this->DebugMessage('resolvePath: iteration, path='.$path.', base path = '.$allowed_dirs[0], __FILE__, __LINE__);
 
             $parts = [];
             // do not use "cleaner" foreach version of this loop as later code relies on both $segments and $i
@@ -1315,10 +1315,10 @@ 
                 }
             }
 
-            $this->DebugMessage('resolvePath: stop at component ' . $i, __FILE__, __LINE__);
+            $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__);
+            $this->DebugMessage('resolvePath: stop at path='.$path, __FILE__, __LINE__);
             if (!$this->matchPath($path, $allowed_dirs)) {
                 $this->DebugMessage('resolvePath: no match, returning null', __FILE__, __LINE__);
 
@@ -1330,7 +1330,7 @@ 
             }
             // else it's symlink, rewrite path
             $path = readlink($path);
-            $this->DebugMessage('resolvePath: symlink matched, target=' . $path, __FILE__, __LINE__);
+            $this->DebugMessage('resolvePath: symlink matched, target='.$path, __FILE__, __LINE__);
 
             /*
             Replace base path with symlink target.
@@ -1345,7 +1345,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;
@@ -1365,29 +1365,29 @@ 
 
         // http://stackoverflow.com/questions/21421569
         $newfilename = preg_replace('#[\\/]+#', DIRECTORY_SEPARATOR, $filename);
-        if (!preg_match('#^' . DIRECTORY_SEPARATOR . '#', $newfilename)) {
-            $newfilename = __DIR__ . DIRECTORY_SEPARATOR . $newfilename;
+        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);
+            $newfilename = preg_replace('#'.DIRECTORY_SEPARATOR.'+#', DIRECTORY_SEPARATOR, $newfilename);
 
             // Replace all occurrences of /./ with /
-            $newfilename = preg_replace('#' . DIRECTORY_SEPARATOR . '\\.' . DIRECTORY_SEPARATOR . '#', DIRECTORY_SEPARATOR, $newfilename);
+            $newfilename = preg_replace('#'.DIRECTORY_SEPARATOR.'\\.'.DIRECTORY_SEPARATOR.'#', DIRECTORY_SEPARATOR, $newfilename);
 
             // Remove ./ if at the start
-            $newfilename = preg_replace('#^\\.' . DIRECTORY_SEPARATOR . '#', '', $newfilename);
+            $newfilename = preg_replace('#^\\.'.DIRECTORY_SEPARATOR.'#', '', $newfilename);
 
             // Remove /. if at the end
-            $newfilename = preg_replace('#' . DIRECTORY_SEPARATOR . '\\.$#', '', $newfilename);
+            $newfilename = preg_replace('#'.DIRECTORY_SEPARATOR.'\\.$#', '', $newfilename);
 
             // Replace /anything/../ with /
-            $newfilename = preg_replace('#' . DIRECTORY_SEPARATOR . '[^' . DIRECTORY_SEPARATOR . ']+' . DIRECTORY_SEPARATOR . '\\.\\.' . DIRECTORY_SEPARATOR . '#', DIRECTORY_SEPARATOR, $newfilename);
+            $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);
+            $newfilename = preg_replace('#'.DIRECTORY_SEPARATOR.'[^'.DIRECTORY_SEPARATOR.']+'.DIRECTORY_SEPARATOR.'\\.\\.$#', '', $newfilename);
         } while ($newfilename != $beforeloop);
 
         return $newfilename;
@@ -1419,7 +1419,7 @@ 
             // absolute pathname (Windows)
             $AbsoluteFilename = $filename;
         } elseif ('/' === $filename{0}) {
-            if (@is_readable($filename) && !@is_readable($this->config_document_root . $filename)) {
+            if (@is_readable($filename) && !@is_readable($this->config_document_root.$filename)) {
 
                 // absolute filename (*nix)
                 $AbsoluteFilename = $filename;
@@ -1431,40 +1431,40 @@ 
                 } 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__);
+                        $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__);
+                        $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")');
+                        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)) {
+                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__);
+                    $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__);
+                    $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 {
 
             // 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']))) {
-                    $AbsoluteFilename = $ApacheLookupURIarray['filename'] . DIRECTORY_SEPARATOR . $filename;
+                    $AbsoluteFilename = $ApacheLookupURIarray['filename'].DIRECTORY_SEPARATOR.$filename;
                 } else {
-                    $AbsoluteFilename = $this->realPathSafe('.') . DIRECTORY_SEPARATOR . $filename;
+                    $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__);
+                        $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__);
+                        $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');
+                        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');
                     }
                 }
             }
@@ -1480,19 +1480,19 @@ 
         }
         */
         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 = 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);
         }
         $AbsoluteFilename = $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))) . '#', $AbsoluteFilename)) {
-            $this->DebugMessage('!$this->config_allow_src_above_docroot therefore setting "' . $AbsoluteFilename . '" (outside "' . $this->realPathSafe($this->config_document_root) . '") to null', __FILE__, __LINE__);
+            && !preg_match('#^'.preg_quote(str_replace(DIRECTORY_SEPARATOR, '/', $this->realPathSafe($this->config_document_root))).'#', $AbsoluteFilename)) {
+            $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__)) . '#', $AbsoluteFilename)) {
-            $this->DebugMessage('!$this->config_allow_src_above_phpthumb therefore setting "' . $AbsoluteFilename . '" (outside "' . __DIR__ . '") to null', __FILE__, __LINE__);
+            && !preg_match('#^'.preg_quote(str_replace(DIRECTORY_SEPARATOR, '/', __DIR__)).'#', $AbsoluteFilename)) {
+            $this->DebugMessage('!$this->config_allow_src_above_phpthumb therefore setting "'.$AbsoluteFilename.'" (outside "'.__DIR__.'") to null', __FILE__, __LINE__);
 
             return false;
         }
@@ -1516,10 +1516,10 @@ 
             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
+                $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)));
+                $ls_filename                  = trim(phpthumb_functions::SafeExec('ls '.phpthumb_functions::escapeshellarg_replacement($filename)));
                 $file_exists_cache[$filename] = ($ls_filename == $filename);
             }
         }
@@ -1537,7 +1537,7 @@ 
             if ($this->iswindows) {
                 $WhichConvert = false;
             } else {
-                $IMwhichConvertCacheFilename = $this->config_cache_directory . DIRECTORY_SEPARATOR . 'phpThumbCacheIMwhichConvert.txt';
+                $IMwhichConvertCacheFilename = $this->config_cache_directory.DIRECTORY_SEPARATOR.'phpThumbCacheIMwhichConvert.txt';
                 if (false !== ($cachedwhichconvertstring = @file_get_contents($IMwhichConvertCacheFilename))) {
                     $WhichConvert = $cachedwhichconvertstring;
                 } else {
@@ -1563,7 +1563,7 @@ 
                 return $commandline;
             }
 
-            $IMcommandlineBaseCacheFilename = $this->config_cache_directory . DIRECTORY_SEPARATOR . 'phpThumbCacheIMcommandlineBase.txt';
+            $IMcommandlineBaseCacheFilename = $this->config_cache_directory.DIRECTORY_SEPARATOR.'phpThumbCacheIMcommandlineBase.txt';
             if (false !== ($commandline = @file_get_contents($IMcommandlineBaseCacheFilename))) {
                 return $commandline;
             }
@@ -1573,19 +1573,19 @@ 
             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->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('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)) {
-                $this->DebugMessage('using ImageMagick path from $this->config_imagemagick_path (' . $this->config_imagemagick_path . ')', __FILE__, __LINE__);
+                $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 '
@@ -1605,13 +1605,13 @@ 
                     // `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__);
+                    $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__);
+                    $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__);
+                    $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 = '';
                 }
             }
@@ -1632,7 +1632,7 @@ 
         if (null === $versionstring) {
             $versionstring = [0 => false, 1 => false];
 
-            $IMversionCacheFilename = $this->config_cache_directory . DIRECTORY_SEPARATOR . 'phpThumbCacheIMversion.txt';
+            $IMversionCacheFilename = $this->config_cache_directory.DIRECTORY_SEPARATOR.'phpThumbCacheIMversion.txt';
             if ($cachedversionstring = @file_get_contents($IMversionCacheFilename)) {
                 $versionstring    = explode("\n", $cachedversionstring, 2);
                 $versionstring[0] = ($versionstring[0] ?: false); // "false" is stored as an empty string in the cache file
@@ -1642,18 +1642,18 @@ 
                 $commandline = (null !== $commandline ? $commandline : '');
                 if ($commandline) {
                     $commandline .= ' --version';
-                    $this->DebugMessage('ImageMagick version checked with "' . $commandline . '"', __FILE__, __LINE__);
+                    $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 did not return recognized version string ('.$versionstring[1].')', __FILE__, __LINE__);
                     }
-                    $this->DebugMessage('ImageMagick convert --version says "' . @$matches[0] . '"', __FILE__, __LINE__);
+                    $this->DebugMessage('ImageMagick convert --version says "'.@$matches[0].'"', __FILE__, __LINE__);
                 }
 
-                @file_put_contents($IMversionCacheFilename, $versionstring[0] . "\n" . $versionstring[1]);
+                @file_put_contents($IMversionCacheFilename, $versionstring[0]."\n".$versionstring[1]);
             }
         }
 
@@ -1671,7 +1671,7 @@ 
             $IMoptions   = [];
             $commandline = $this->ImageMagickCommandlineBase();
             if (null !== $commandline) {
-                $commandline  .= ' -help';
+                $commandline .= ' -help';
                 $IMhelp_lines = explode("\n", phpthumb_functions::SafeExec($commandline));
                 foreach ($IMhelp_lines as $line) {
                     if (preg_match('#^[\\+\\-]([a-z\\-]+) #', trim($line), $matches)) {
@@ -1688,10 +1688,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;
@@ -1707,8 +1707,8 @@ 
             $IMformatsList = '';
             $commandline   = $this->ImageMagickCommandlineBase();
             if (null !== $commandline) {
-                $commandline   = dirname($commandline) . DIRECTORY_SEPARATOR . str_replace('convert', 'identify', basename($commandline));
-                $commandline   .= ' -list format';
+                $commandline   = dirname($commandline).DIRECTORY_SEPARATOR.str_replace('convert', 'identify', basename($commandline));
+                $commandline .= ' -list format';
                 $IMformatsList = phpthumb_functions::SafeExec($commandline);
             }
         }
@@ -1731,9 +1731,9 @@ 
                 fwrite($fp_tempfile, $this->rawImageData);
                 fclose($fp_tempfile);
                 $this->sourceFilename = $IMtempSourceFilename;
-                $this->DebugMessage('ImageMagickThumbnailToGD() setting $this->sourceFilename to "' . $IMtempSourceFilename . '" from $this->rawImageData (' . strlen($this->rawImageData) . ' bytes)', __FILE__, __LINE__);
+                $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__);
+                $this->DebugMessage('ImageMagickThumbnailToGD() FAILED setting $this->sourceFilename to "'.$IMtempSourceFilename.'" (failed to open for writing: "'.$tempfile_open_error.'")', __FILE__, __LINE__);
             }
             unset($tempfile_open_error, $IMtempSourceFilename);
 
@@ -1761,13 +1761,13 @@ 
             // '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->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__);
+        $this->DebugMessage('$this->useRawIMoutput='.($this->useRawIMoutput ? 'true' : 'false').' after checking $UnAllowedParameters', __FILE__, __LINE__);
         $ImageCreateFunction = '';
         $outputFormat        = $this->thumbnailFormat;
         if (phpthumb_functions::gd_version()) {
@@ -1786,7 +1786,7 @@ 
                         $ImageCreateFunction = 'imagecreatefromjpeg';
                         break;
                     default:
-                        $this->DebugMessage('Forcing output to PNG because $this->thumbnailFormat (' . $this->thumbnailFormat . ' is not a GD-supported format)', __FILE__, __LINE__);
+                        $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;
@@ -1842,10 +1842,10 @@ 
                     $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';
+                    $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);
@@ -1854,27 +1854,27 @@ 
 
                 if (null !== $this->dpi && $this->ImageMagickSwitchAvailable('density')) {
                     // for vector source formats only (WMF, PDF, etc)
-                    $commandline .= ' -flatten -density ' . phpthumb_functions::escapeshellarg_replacement($this->dpi);
+                    $commandline .= ' -flatten -density '.phpthumb_functions::escapeshellarg_replacement($this->dpi);
                 }
                 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__);
+                    $this->DebugMessage('getimagesize('.$this->sourceFilename.') SUCCEEDED: '.print_r($getimagesize, true), __FILE__, __LINE__);
                 } else {
-                    $this->DebugMessage('getimagesize(' . $this->sourceFilename . ') FAILED with error "' . $GetImageSizeError . '"', __FILE__, __LINE__);
+                    $this->DebugMessage('getimagesize('.$this->sourceFilename.') FAILED with error "'.$GetImageSizeError.'"', __FILE__, __LINE__);
                 }
                 if (is_array($getimagesize)) {
-                    $this->DebugMessage('getimagesize(' . $this->sourceFilename . ') returned [w=' . $getimagesize[0] . ';h=' . $getimagesize[1] . ';f=' . $getimagesize[2] . ']', __FILE__, __LINE__);
+                    $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->DebugMessage('source dimensions set to '.$this->source_width.'x'.$this->source_height, __FILE__, __LINE__);
                     $this->SetOrientationDependantWidthHeight();
 
-                    if (!preg_match('#(' . implode('|', $this->AlphaCapableFormats) . ')#i', $outputFormat)) {
+                    if (!preg_match('#('.implode('|', $this->AlphaCapableFormats).')#i', $outputFormat)) {
                         // not a transparency-capable format
-                        $commandline .= ' -background ' . phpthumb_functions::escapeshellarg_replacement('#' . ($this->bg ?: 'FFFFFF'));
+                        $commandline .= ' -background '.phpthumb_functions::escapeshellarg_replacement('#'.($this->bg ?: 'FFFFFF'));
                         if (IMAGETYPE_GIF == $getimagesize[2]) {
                             $commandline .= ' -flatten';
                         }
@@ -1901,8 +1901,8 @@ 
                             $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));
-                            $commandline .= ' -' . $IMresizeParameter . ' ' . phpthumb_functions::escapeshellarg_replacement(($IMuseExplicitImageOutputDimensions ? $thumbnailH : '') . 'x' . $thumbnailH);
+                            $thumbnailH = round(max($sideY, ($sideY * $zcAR) / $imAR));
+                            $commandline .= ' -'.$IMresizeParameter.' '.phpthumb_functions::escapeshellarg_replacement(($IMuseExplicitImageOutputDimensions ? $thumbnailH : '').'x'.$thumbnailH);
 
                             switch (strtoupper($this->zc)) {
                                 case 'T':
@@ -1937,26 +1937,26 @@ 
                             }
 
                             if (($wAll > 0) && ($hAll > 0)) {
-                                $commandline .= ' -crop ' . phpthumb_functions::escapeshellarg_replacement($wAll . 'x' . $hAll . '+0+0');
+                                $commandline .= ' -crop '.phpthumb_functions::escapeshellarg_replacement($wAll.'x'.$hAll.'+0+0');
                             } else {
-                                $commandline .= ' -crop ' . phpthumb_functions::escapeshellarg_replacement($side . 'x' . $side . '+0+0');
+                                $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__);
+                                $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);
+                            $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) {
@@ -1966,7 +1966,7 @@ 
                                     // 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__);
+                                    $this->DebugMessage('Skipping "-repage" because ImageMagick (v'.$this->ImageMagickVersion().') does not support it', __FILE__, __LINE__);
                                 }
                                 if ($IMuseExplicitImageOutputDimensions) {
                                     if ($this->w && !$this->h) {
@@ -1975,14 +1975,14 @@ 
                                         $this->w = ceil($this->h * ($this->source_width / $this->source_height));
                                     }
                                 }
-                                $commandline .= ' -' . $IMresizeParameter . ' ' . phpthumb_functions::escapeshellarg_replacement($this->w . 'x' . $this->h);
+                                $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          = ((0 != round($nw)) ? round($nw) : '');
                                 $nh          = ((0 != round($nh)) ? round($nh) : '');
-                                $commandline .= ' -' . $IMresizeParameter . ' ' . phpthumb_functions::escapeshellarg_replacement($nw . 'x' . $nh . '!');
+                                $commandline .= ' -'.$IMresizeParameter.' '.phpthumb_functions::escapeshellarg_replacement($nw.'x'.$nh.'!');
                             } else {
                                 $this->w = ((($this->aoe || $this->far)
                                              && $this->w) ? $this->w : ($this->w ? phpthumb_functions::nonempty_min($this->w, $getimagesize[0]) : ''));
@@ -1999,21 +1999,21 @@ 
                                     list($nw, $nh) = phpthumb_functions::TranslateWHbyAngle($this->w, $this->h, $this->ra);
                                     $nw          = ((0 != round($nw)) ? round($nw) : '');
                                     $nh          = ((0 != round($nh)) ? round($nh) : '');
-                                    $commandline .= ' -' . $IMresizeParameter . ' ' . phpthumb_functions::escapeshellarg_replacement($nw . 'x' . $nh);
+                                    $commandline .= ' -'.$IMresizeParameter.' '.phpthumb_functions::escapeshellarg_replacement($nw.'x'.$nh);
                                 }
                             }
                         }
                     }
                 } else {
-                    $this->DebugMessage('getimagesize(' . $this->sourceFilename . ') failed', __FILE__, __LINE__);
+                    $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 ?: '9999') . 'x' . ($this->h ?: '9999') . $exactDimensionsBang);
+                            $commandline .= ' -'.$IMresizeParameter.' '.phpthumb_functions::escapeshellarg_replacement(($this->w ?: '9999').'x'.($this->h ?: '9999').$exactDimensionsBang);
                         } else {
-                            $commandline .= ' -' . $IMresizeParameter . ' ' . phpthumb_functions::escapeshellarg_replacement($this->w . 'x' . $this->h . $exactDimensionsBang);
+                            $commandline .= ' -'.$IMresizeParameter.' '.phpthumb_functions::escapeshellarg_replacement($this->w.'x'.$this->h.$exactDimensionsBang);
                         }
                     }
                 }
@@ -2021,16 +2021,16 @@ 
                 if ($this->ra) {
                     $this->ra = (int)$this->ra;
                     if ($this->ImageMagickSwitchAvailable('rotate')) {
-                        if (!preg_match('#(' . implode('|', $this->AlphaCapableFormats) . ')#i', $outputFormat)
+                        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);
+                            $commandline .= ' -rotate '.phpthumb_functions::escapeshellarg_replacement($this->ra);
                             if (0 != ($this->ra % 90)) {
-                                if (preg_match('#(' . implode('|', $this->AlphaCapableFormats) . ')#i', $outputFormat)) {
+                                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 ?: 'FFFFFF'));
+                                    $commandline .= ' -background '.phpthumb_functions::escapeshellarg_replacement('#'.($this->bg ?: 'FFFFFF'));
                                 }
                             }
                             $this->ra = 0;
@@ -2048,7 +2048,7 @@ 
                     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;
@@ -2079,7 +2079,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;
                             }
@@ -2091,7 +2091,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;
                             }
@@ -2108,8 +2108,8 @@ 
                         case 'clr':
                             if ($this->ImageMagickSwitchAvailable(['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 .= ' -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;
 
@@ -2118,7 +2118,7 @@ 
                                 @list($amount, $color) = explode('|', $parameter);
                                 $amount = ($amount ?: 80);
                                 if (!$color) {
-                                    $commandline                    .= ' -sepia-tone ' . phpthumb_functions::escapeshellarg_replacement(min(max($amount, 0), 100) . '%');
+                                    $commandline .= ' -sepia-tone '.phpthumb_functions::escapeshellarg_replacement(min(max($amount, 0), 100).'%');
                                     $successfullyProcessedFilters[] = $filterkey;
                                 }
                             }
@@ -2129,7 +2129,7 @@ 
                             $amount = min(max((float)$amount, 0.001), 10);
                             if ('1.000' !== number_format($amount, 3)) {
                                 if ($this->ImageMagickSwitchAvailable('gamma')) {
-                                    $commandline                    .= ' -gamma ' . phpthumb_functions::escapeshellarg_replacement($amount);
+                                    $commandline .= ' -gamma '.phpthumb_functions::escapeshellarg_replacement($amount);
                                     $successfullyProcessedFilters[] = $filterkey;
                                 }
                             }
@@ -2137,7 +2137,7 @@ 
 
                         case 'neg':
                             if ($this->ImageMagickSwitchAvailable('negate')) {
-                                $commandline                    .= ' -negate';
+                                $commandline .= ' -negate';
                                 $successfullyProcessedFilters[] = $filterkey;
                             }
                             break;
@@ -2145,7 +2145,7 @@ 
                         case 'th':
                             @list($amount) = explode('|', $parameter);
                             if ($this->ImageMagickSwitchAvailable(['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;
@@ -2157,7 +2157,7 @@ 
                                 @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                    .= ' -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;
                             }
@@ -2178,15 +2178,15 @@ 
                         case 'edge':
                             if ($this->ImageMagickSwitchAvailable('edge')) {
                                 $parameter                      = (!empty($parameter) ? $parameter : 2);
-                                $commandline                    .= ' -edge ' . phpthumb_functions::escapeshellarg_replacement(!empty($parameter) ? $parameter : 1);
+                                $commandline .= ' -edge '.phpthumb_functions::escapeshellarg_replacement(!empty($parameter) ? $parameter : 1);
                                 $successfullyProcessedFilters[] = $filterkey;
                             }
                             break;
 
                         case 'emb':
                             if ($this->ImageMagickSwitchAvailable(['emboss', 'negate'])) {
-                                $parameter   = (!empty($parameter) ? $parameter : 2);
-                                $commandline .= ' -emboss ' . phpthumb_functions::escapeshellarg_replacement($parameter);
+                                $parameter = (!empty($parameter) ? $parameter : 2);
+                                $commandline .= ' -emboss '.phpthumb_functions::escapeshellarg_replacement($parameter);
                                 if ($parameter < 2) {
                                     $commandline .= ' -negate'; // ImageMagick negates the image for some reason with '-emboss 1';
                                 }
@@ -2214,7 +2214,7 @@ 
                                 foreach ($this->fltr as $fltr_key => $fltr_value) {
                                     list($fltr_cmd) = explode('|', $fltr_value);
                                     if ('wb' === $fltr_cmd) {
-                                        $this->DebugMessage('Setting "lvl" filter method to "0" (from "' . $method . '") because white-balance filter also enabled', __FILE__, __LINE__);
+                                        $this->DebugMessage('Setting "lvl" filter method to "0" (from "'.$method.'") because white-balance filter also enabled', __FILE__, __LINE__);
                                         $method = 0;
                                     }
                                 }
@@ -2227,11 +2227,11 @@ 
                                 case 2: // ImageMagick "contrast-stretch"
                                     if ($this->ImageMagickSwitchAvailable('contrast-stretch')) {
                                         if ('*' !== $band) {
-                                            $commandline .= ' -channel ' . phpthumb_functions::escapeshellarg_replacement(strtoupper($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 . '%\'';
+                                        $commandline .= ' -contrast-stretch \''.$threshold.'%\'';
                                         if ('*' !== $band) {
                                             $commandline .= ' +channel';
                                         }
@@ -2241,7 +2241,7 @@ 
                                 case 3: // ImageMagick "normalize"
                                     if ($this->ImageMagickSwitchAvailable('normalize')) {
                                         if ('*' !== $band) {
-                                            $commandline .= ' -channel ' . phpthumb_functions::escapeshellarg_replacement(strtoupper($band));
+                                            $commandline .= ' -channel '.phpthumb_functions::escapeshellarg_replacement(strtoupper($band));
                                         }
                                         $commandline .= ' -normalize';
                                         if ('*' !== $band) {
@@ -2251,12 +2251,12 @@ 
                                     }
                                     break;
                                 default:
-                                    $this->DebugMessage('unsupported method (' . $method . ') for "lvl" filter', __FILE__, __LINE__);
+                                    $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__);
+                                $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;
 
@@ -2268,9 +2268,9 @@ 
                                 //$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 R -contrast-stretch \''.$threshold.'%\'';
+                                $commandline                    .= ' -channel G -contrast-stretch \''.$threshold.'%\'';
+                                $commandline                    .= ' -channel B -contrast-stretch \''.$threshold.'%\'';
                                 $commandline                    .= ' +channel';
                                 $successfullyProcessedFilters[] = $filterkey;
                             }
@@ -2280,7 +2280,7 @@ 
                             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);
+                                $commandline .= ' -blur '.phpthumb_functions::escapeshellarg_replacement($radius);
                                 $successfullyProcessedFilters[] = $filterkey;
                             }
                             break;
@@ -2290,10 +2290,10 @@ 
                             $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);
+                                $commandline                    .= ' -gaussian-blur '.phpthumb_functions::escapeshellarg_replacement($radius);
                                 $successfullyProcessedFilters[] = $filterkey;
                             } elseif ($this->ImageMagickSwitchAvailable('gaussian')) {
-                                $commandline                    .= ' -gaussian ' . phpthumb_functions::escapeshellarg_replacement($radius);
+                                $commandline                    .= ' -gaussian '.phpthumb_functions::escapeshellarg_replacement($radius);
                                 $successfullyProcessedFilters[] = $filterkey;
                             }
                             break;
@@ -2304,7 +2304,7 @@ 
                                 $amount                         = ($amount ? min(max((int)$radius, 0), 255) : 80);
                                 $radius                         = ($radius ? min(max((int)$radius, 0), 10) : 0.5);
                                 $threshold                      = (strlen($threshold) ? min(max((int)$radius, 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, '.', ''));
+                                $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;
@@ -2326,15 +2326,15 @@ 
                                             $color = ((!empty($this->bc)
                                                        && phpthumb_functions::IsHexColor($this->bc)) ? $this->bc : '000000');
                                         }
-                                        $commandline .= ' -border ' . phpthumb_functions::escapeshellarg_replacement($width);
-                                        $commandline .= ' -bordercolor ' . phpthumb_functions::escapeshellarg_replacement('#' . $color);
+                                        $commandline .= ' -border '.phpthumb_functions::escapeshellarg_replacement($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(' -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))) . ' ',
+                                                ' -'.$IMresizeParameter.' "'.$matches[1].'x'.$matches[2].'" ',
+                                                ' -'.$IMresizeParameter.' '.phpthumb_functions::escapeshellarg_replacement(($matches[1] - (2 * $width)).'x'.($matches[2] - (2 * $width))).' ',
                                                                        $commandline
                                             );
                                         }
@@ -2393,43 +2393,43 @@ 
                             break;
 
                         default:
-                            $this->DebugMessage('Unknown $this->fltr[' . $filterkey . '] (' . $filtercommand . ') -- deleting filter command', __FILE__, __LINE__);
+                            $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__);
+                        $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('Skipping $this->fltr['.$filterkey.'] ('.$filtercommand.') with ImageMagick', __FILE__, __LINE__);
                     }
                 }
-                $this->DebugMessage('Remaining $this->fltr after ImageMagick: (' . $this->phpThumbDebugVarDump($this->fltr) . ')', __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(['quality', 'interlace'])) {
-                        $commandline .= ' -quality ' . phpthumb_functions::escapeshellarg_replacement($this->thumbnailQuality);
+                        $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 .= ' ' . phpthumb_functions::escapeshellarg_replacement(preg_replace('#[/\\\\]#', DIRECTORY_SEPARATOR, $this->sourceFilename) . (('gif' === $outputFormat) ? '' : '[' . (int)$this->sfn . ']')); // [0] means first frame of (GIF) animation, can be ignored
-                $commandline .= ' ' . $outputFormat . ':' . phpthumb_functions::escapeshellarg_replacement($IMtempfilename);
+                $commandline .= ' '.phpthumb_functions::escapeshellarg_replacement(preg_replace('#[/\\\\]#', DIRECTORY_SEPARATOR, $this->sourceFilename).(('gif' === $outputFormat) ? '' : '['.(int)$this->sfn.']')); // [0] means first frame of (GIF) animation, can be ignored
+                $commandline .= ' '.$outputFormat.':'.phpthumb_functions::escapeshellarg_replacement($IMtempfilename);
                 if (!$this->iswindows) {
                     $commandline .= ' 2>&1';
                 }
-                $this->DebugMessage('ImageMagick called as (' . $commandline . ')', __FILE__, __LINE__);
+                $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__);
+                    $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__);
+                        $this->DebugMessage('Check to make sure that PHP has read+write permissions to "'.dirname($IMtempfilename).'"', __FILE__, __LINE__);
                     }
                 } else {
                     foreach ($successfullyProcessedFilters as $dummy => $filterkey) {
@@ -2437,7 +2437,7 @@ 
                     }
                     $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__);
+                    $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::'
@@ -2455,21 +2455,21 @@ 
                               && ($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__);
+                        $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__);
+                        $this->DebugMessage('$this->useRawIMoutput set to TRUE because '.@$ImageCreateFunction.'('.$IMtempfilename.') failed', __FILE__, __LINE__);
                     }
                     if (file_exists($IMtempfilename)) {
-                        $this->DebugMessage('deleting "' . $IMtempfilename . '"', __FILE__, __LINE__);
+                        $this->DebugMessage('deleting "'.$IMtempfilename.'"', __FILE__, __LINE__);
                         @unlink($IMtempfilename);
                     }
 
                     return true;
                 }
                 if (file_exists($IMtempfilename)) {
-                    $this->DebugMessage('deleting "' . $IMtempfilename . '"', __FILE__, __LINE__);
+                    $this->DebugMessage('deleting "'.$IMtempfilename.'"', __FILE__, __LINE__);
                     @unlink($IMtempfilename);
                 }
             } elseif ($this->issafemode) {
@@ -2477,7 +2477,7 @@ 
                 $this->useRawIMoutput = false;
             } else {
                 if (file_exists($IMtempfilename)) {
-                    $this->DebugMessage('deleting "' . $IMtempfilename . '"', __FILE__, __LINE__);
+                    $this->DebugMessage('deleting "'.$IMtempfilename.'"', __FILE__, __LINE__);
                     @unlink($IMtempfilename);
                 }
                 $this->DebugMessage('ImageMagickThumbnailToGD() aborting, phpThumb_tempnam() failed', __FILE__, __LINE__);
@@ -2501,15 +2501,15 @@ 
 
                 return false;
             }
-            if (!require_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 (!require_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->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"');
+                return $this->ErrorImage('Invalid hex color string "'.$this->config_background_hexcolor.'" for parameter "bg"');
             }
 
             $rotate_angle = 0;
@@ -2537,14 +2537,14 @@ 
                                             break;
 
                                         default:
-                                            $this->DebugMessage('EXIF auto-rotate failed because unknown $exif_data[Orientation] "' . @$exif_data['Orientation'] . '"', __FILE__, __LINE__);
+                                            $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__);
+                                    $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__);
+                                    $this->DebugMessage('failed: exif_read_data('.$this->sourceFilename.')', __FILE__, __LINE__);
 
                                     return false;
                                 }
@@ -2559,7 +2559,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;
                     }
@@ -2639,7 +2639,7 @@ 
                 $starpos = strpos($valid_domain, '*');
                 if (false !== $starpos) {
                     $valid_domain = substr($valid_domain, $starpos + 1);
-                    if (preg_match('#' . preg_quote($valid_domain) . '$#', $hostname)) {
+                    if (preg_match('#'.preg_quote($valid_domain).'$#', $hostname)) {
                         $domain_is_allowed[$hostname] = true;
                         break;
                     }
@@ -2665,7 +2665,7 @@ 
         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__);
+            $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);
@@ -2675,9 +2675,9 @@ 
             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) . ')');
+                $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__);
+                $this->DebugMessage('AntiOffsiteLinking() - "'.@$parsed_url['host'].'" is in $this->config_nooffsitelink_valid_domains ('.implode(';', $this->config_nooffsitelink_valid_domains).')', __FILE__, __LINE__);
             }
         }
 
@@ -2687,9 +2687,9 @@ 
             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__);
+                $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__);
+                $this->DebugMessage('AntiOffsiteLinking() - "'.$parsed_url['host'].'" is in $this->config_nohotlink_valid_domains ('.implode(';', $this->config_nohotlink_valid_domains).')', __FILE__, __LINE__);
             }
         }
 
@@ -2700,24 +2700,24 @@ 
         }
 
         if (!phpthumb_functions::IsHexColor($this->config_error_bgcolor)) {
-            return $this->ErrorImage('Invalid hex color string "' . $this->config_error_bgcolor . '" for $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');
+            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 (!require_once __DIR__ . '/phpthumb.filters.php') {
-                    $this->DebugMessage('Error including "' . __DIR__ . '/phpthumb.filters.php" which is required for applying watermark', __FILE__, __LINE__);
+                if (!require_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;
+                $phpthumbFilters->phpThumbObject = & $this;
                 $opacity                         = 50;
                 $margin                          = 5;
                 $phpthumbFilters->WatermarkOverlay($this->gdimg_output, $watermark_img, '*', $opacity, $margin);
@@ -2730,7 +2730,7 @@ 
                 $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__);
+                $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);
@@ -2756,7 +2756,7 @@ 
             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__);
+                $this->DebugMessage('skipping AlphaChannelFlatten() because ($this->thumbnailFormat == "'.$this->thumbnailFormat.'")', __FILE__, __LINE__);
 
                 return false;
                 break;
@@ -2768,7 +2768,7 @@ 
                     // 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__);
+                        $this->DebugMessage('AlphaChannelFlatten() failed because GD version is "'.phpthumb_functions::gd_version().'"', __FILE__, __LINE__);
 
                         return false;
                     }
@@ -2812,24 +2812,24 @@ 
 
                         return true;
                     } else {
-                        $this->DebugMessage('AlphaChannelFlatten() failed imagecreate(' . imagesx($this->gdimg_output) . ', ' . imagesy($this->gdimg_output) . ')', __FILE__, __LINE__);
+                        $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__);
+                    $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__);
+        $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->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"');
+                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);
@@ -2856,16 +2856,16 @@ 
     public function ApplyFilters()
     {
         if ($this->fltr && is_array($this->fltr)) {
-            if (!require_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 (!require_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;
+            $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__);
+                $this->DebugMessage('Attempting to process filter command "'.$command.'('.$parameter.')"', __FILE__, __LINE__);
                 switch ($command) {
                     case 'brit': // Brightness
                         $phpthumbFilters->Brightness($this->gdimg_output, $parameter);
@@ -2889,7 +2889,7 @@ 
 
                     case 'clr': // Colorize
                         if (phpthumb_functions::gd_version() < 2) {
-                            $this->DebugMessage('Skipping Colorize() because gd_version is "' . phpthumb_functions::gd_version() . '"', __FILE__, __LINE__);
+                            $this->DebugMessage('Skipping Colorize() because gd_version is "'.phpthumb_functions::gd_version().'"', __FILE__, __LINE__);
                             break;
                         }
                         @list($amount, $color) = explode('|', $parameter, 2);
@@ -2898,7 +2898,7 @@ 
 
                     case 'sep': // Sepia
                         if (phpthumb_functions::gd_version() < 2) {
-                            $this->DebugMessage('Skipping Sepia() because gd_version is "' . phpthumb_functions::gd_version() . '"', __FILE__, __LINE__);
+                            $this->DebugMessage('Skipping Sepia() because gd_version is "'.phpthumb_functions::gd_version().'"', __FILE__, __LINE__);
                             break;
                         }
                         @list($amount, $color) = explode('|', $parameter, 2);
@@ -2919,7 +2919,7 @@ 
 
                     case 'rcd': // ReduceColorDepth
                         if (phpthumb_functions::gd_version() < 2) {
-                            $this->DebugMessage('Skipping ReduceColorDepth() because gd_version is "' . phpthumb_functions::gd_version() . '"', __FILE__, __LINE__);
+                            $this->DebugMessage('Skipping ReduceColorDepth() because gd_version is "'.phpthumb_functions::gd_version().'"', __FILE__, __LINE__);
                             break;
                         }
                         @list($colors, $dither) = explode('|', $parameter, 2);
@@ -2960,7 +2960,7 @@ 
 
                     case 'hist': // Histogram overlay
                         if (phpthumb_functions::gd_version() < 2) {
-                            $this->DebugMessage('Skipping HistogramOverlay() because gd_version is "' . phpthumb_functions::gd_version() . '"', __FILE__, __LINE__);
+                            $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);
@@ -2982,7 +2982,7 @@ 
 
                     case 'drop': // DropShadow
                         if (phpthumb_functions::gd_version() < 2) {
-                            $this->DebugMessage('Skipping DropShadow() because gd_version is "' . phpthumb_functions::gd_version() . '"', __FILE__, __LINE__);
+                            $this->DebugMessage('Skipping DropShadow() because gd_version is "'.phpthumb_functions::gd_version().'"', __FILE__, __LINE__);
 
                             return false;
                         }
@@ -2993,7 +2993,7 @@ 
 
                     case 'mask': // Mask cropping
                         if (phpthumb_functions::gd_version() < 2) {
-                            $this->DebugMessage('Skipping Mask() because gd_version is "' . phpthumb_functions::gd_version() . '"', __FILE__, __LINE__);
+                            $this->DebugMessage('Skipping Mask() because gd_version is "'.phpthumb_functions::gd_version().'"', __FILE__, __LINE__);
 
                             return false;
                         }
@@ -3002,7 +3002,7 @@ 
                         if (@is_readable($mask_filename) && ($fp_mask = @fopen($mask_filename, 'rb'))) {
                             $MaskImageData = '';
                             do {
-                                $buffer        = fread($fp_mask, 8192);
+                                $buffer = fread($fp_mask, 8192);
                                 $MaskImageData .= $buffer;
                             } while (strlen($buffer) > 0);
                             fclose($fp_mask);
@@ -3016,16 +3016,16 @@ 
                                 $phpthumbFilters->ApplyMask($gdimg_mask, $this->gdimg_output);
                                 imagedestroy($gdimg_mask);
                             } else {
-                                $this->DebugMessage('ImageCreateFromStringReplacement() failed for "' . $mask_filename . '"', __FILE__, __LINE__);
+                                $this->DebugMessage('ImageCreateFromStringReplacement() failed for "'.$mask_filename.'"', __FILE__, __LINE__);
                             }
                         } else {
-                            $this->DebugMessage('Cannot open mask file "' . $mask_filename . '"', __FILE__, __LINE__);
+                            $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__);
+                            $this->DebugMessage('Skipping Ellipse() because gd_version is "'.phpthumb_functions::gd_version().'"', __FILE__, __LINE__);
 
                             return false;
                         }
@@ -3035,13 +3035,13 @@ 
 
                     case 'ric': // RoundedImageCorners
                         if (phpthumb_functions::gd_version() < 2) {
-                            $this->DebugMessage('Skipping RoundedImageCorners() because gd_version is "' . phpthumb_functions::gd_version() . '"', __FILE__, __LINE__);
+                            $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__);
+                            $this->DebugMessage('Skipping RoundedImageCorners('.$radius_x.', '.$radius_y.') because x/y radius is less than 1', __FILE__, __LINE__);
                             break;
                         }
                         $this->is_alpha = true;
@@ -3074,7 +3074,7 @@ 
                         if (@is_readable($filename) && ($fp_watermark = @fopen($filename, 'rb'))) {
                             $WatermarkImageData = '';
                             do {
-                                $buffer             = fread($fp_watermark, 8192);
+                                $buffer = fread($fp_watermark, 8192);
                                 $WatermarkImageData .= $buffer;
                             } while (strlen($buffer) > 0);
                             fclose($fp_watermark);
@@ -3099,11 +3099,11 @@ 
                                             $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__);
+                                            $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__);
+                                        $this->DebugMessage('phpthumb_functions::ImageCreateFunction('.imagesx($this->gdimg_output).', '.imagesy($this->gdimg_output).')', __FILE__, __LINE__);
                                     }
                                 } else { // overlay
 
@@ -3114,15 +3114,15 @@ 
                                         $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__);
+                                        $this->DebugMessage('phpthumb_functions::ImageCreateFunction('.$resized_x.', '.$resized_y.')', __FILE__, __LINE__);
                                     }
                                 }
                                 imagedestroy($img_watermark);
                             } else {
-                                $this->DebugMessage('ImageCreateFromStringReplacement() failed for "' . $filename . '"', __FILE__, __LINE__);
+                                $this->DebugMessage('ImageCreateFromStringReplacement() failed for "'.$filename.'"', __FILE__, __LINE__);
                             }
                         } else {
-                            $this->DebugMessage('Cannot open overlay file "' . $filename . '"', __FILE__, __LINE__);
+                            $this->DebugMessage('Cannot open overlay file "'.$filename.'"', __FILE__, __LINE__);
                         }
                         break;
 
@@ -3154,7 +3154,7 @@ 
                                     $watermark_max_width  = ($margin['x'] ?: imagesx($img_watermark));
                                     $watermark_max_height = ($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__);
+                                    $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);
@@ -3162,12 +3162,12 @@ 
                                             $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__);
+                                            $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;
+                                    $alignment        = $watermark_dest_x.'x'.$watermark_dest_y;
                                 }
                                 $phpthumbFilters->WatermarkOverlay($this->gdimg_output, $img_watermark, $alignment, $opacity, $margin['x'], $margin['y']);
                                 imagedestroy($img_watermark);
@@ -3175,10 +3175,10 @@ 
                                     imagedestroy($img_watermark2);
                                 }
                             } else {
-                                $this->DebugMessage('ImageCreateFromFilename() failed for "' . $filename . '"', __FILE__, __LINE__);
+                                $this->DebugMessage('ImageCreateFromFilename() failed for "'.$filename.'"', __FILE__, __LINE__);
                             }
                         } else {
-                            $this->DebugMessage('!is_readable(' . $filename . ')', __FILE__, __LINE__);
+                            $this->DebugMessage('!is_readable('.$filename.')', __FILE__, __LINE__);
                         }
                         break;
 
@@ -3197,7 +3197,7 @@ 
                         $fillextend = ($fillextend ?: '');
 
                         if (basename($ttffont) == $ttffont) {
-                            $ttffont = $this->realPathSafe($this->config_ttf_directory . DIRECTORY_SEPARATOR . $ttffont);
+                            $ttffont = $this->realPathSafe($this->config_ttf_directory.DIRECTORY_SEPARATOR.$ttffont);
                         } else {
                             $ttffont = $this->ResolveFilenameToAbsolute($ttffont);
                         }
@@ -3210,7 +3210,7 @@ 
                         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__);
+                            $this->DebugMessage('Skipping Blur() because gd_version is "'.phpthumb_functions::gd_version().'"', __FILE__, __LINE__);
                         }
                         break;
 
@@ -3237,12 +3237,12 @@ 
                         $threshold = (strlen($threshold) ? $threshold : 3);
                         if (phpthumb_functions::gd_version() >= 2.0) {
                             ob_start();
-                            if (!@require_once __DIR__ . '/phpthumb.unsharp.php') {
+                            if (!@require_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;
@@ -3250,7 +3250,7 @@ 
                             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__);
+                            $this->DebugMessage('Skipping unsharp mask because gd_version is "'.phpthumb_functions::gd_version().'"', __FILE__, __LINE__);
 
                             return false;
                         }
@@ -3270,7 +3270,7 @@ 
                             $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__);
+                        $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));
@@ -3279,11 +3279,11 @@ 
                                     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__);
+                                    $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__);
+                                $this->DebugMessage('ImageCreateFunction('.imagesx($this->gdimg_output).', '.imagesy($this->gdimg_output).') failed', __FILE__, __LINE__);
                             }
                         }
                         break;
@@ -3296,7 +3296,7 @@ 
                     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__);
+                            $this->DebugMessage('Skipping SourceTransparentColor hex color is invalid ('.$hexcolor.')', __FILE__, __LINE__);
 
                             return false;
                         }
@@ -3307,11 +3307,11 @@ 
                             $phpthumbFilters->ApplyMask($gdimg_mask, $this->gdimg_output);
                             imagedestroy($gdimg_mask);
                         } else {
-                            $this->DebugMessage('SourceTransparentColorMask() failed for "' . $hexcolor . ',' . $min_limit . ',' . $max_limit . '"', __FILE__, __LINE__);
+                            $this->DebugMessage('SourceTransparentColorMask() failed for "'.$hexcolor.','.$min_limit.','.$max_limit.'"', __FILE__, __LINE__);
                         }
                         break;
                 }
-                $this->DebugMessage('Finished processing filter command "' . $command . '(' . $parameter . ')"', __FILE__, __LINE__);
+                $this->DebugMessage('Finished processing filter command "'.$command.'('.$parameter.')"', __FILE__, __LINE__);
             }
         }
 
@@ -3324,7 +3324,7 @@ 
     public function MaxFileSize()
     {
         if (phpthumb_functions::gd_version() < 2) {
-            $this->DebugMessage('Skipping MaxFileSize() because gd_version is "' . phpthumb_functions::gd_version() . '"', __FILE__, __LINE__);
+            $this->DebugMessage('Skipping MaxFileSize() because gd_version is "'.phpthumb_functions::gd_version().'"', __FILE__, __LINE__);
 
             return false;
         }
@@ -3332,7 +3332,7 @@ 
             switch ($this->thumbnailFormat) {
                 case 'png':
                 case 'gif':
-                    $imgRenderFunction = 'image' . $this->thumbnailFormat;
+                    $imgRenderFunction = 'image'.$this->thumbnailFormat;
 
                     ob_start();
                     $imgRenderFunction($this->gdimg_output);
@@ -3395,7 +3395,7 @@ 
      */
     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__);
+        $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);
         //echo $this->thumbnailCropX.'<br>';
@@ -3410,7 +3410,7 @@ 
         $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__);
+        $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
@@ -3504,13 +3504,13 @@ 
             if ($this->bg || (@$current_transparent_color >= 0)) {
                 $this->config_background_hexcolor = ($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"');
+                    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__);
+        $this->DebugMessage('CreateGDoutput() returning canvas "'.$this->thumbnail_width.'x'.$this->thumbnail_height.'"', __FILE__, __LINE__);
 
         return true;
     }
@@ -3520,7 +3520,7 @@ 
      */
     public function SetOrientationDependantWidthHeight()
     {
-        $this->DebugMessage('SetOrientationDependantWidthHeight() starting with "' . $this->source_width . '"x"' . $this->source_height . '"', __FILE__, __LINE__);
+        $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);
@@ -3536,7 +3536,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;
     }
@@ -3556,7 +3556,7 @@ 
                 $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__);
+                $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__);
             }
@@ -3571,11 +3571,11 @@ 
             $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__);
+                $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->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__);
+                                                                                                                                                                                                                                                               * 5).'MB)', __FILE__, __LINE__);
             }
         }
 
@@ -3587,7 +3587,7 @@ 
             // great
             $this->getimagesizeinfo['filesize'] = @filesize($this->sourceFilename);
         } elseif (!$this->rawImageData) {
-            $this->DebugMessage('getimagesize("' . $this->sourceFilename . '") failed', __FILE__, __LINE__);
+            $this->DebugMessage('getimagesize("'.$this->sourceFilename.'") failed', __FILE__, __LINE__);
         }
 
         if ($this->config_prefer_imagemagick) {
@@ -3636,7 +3636,7 @@ 
                         $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__);
+                        return $this->ErrorImage('Failed - $this->ImageCreateFromStringReplacement($this->exif_thumbnail_data) in '.__FILE__.' on line '.__LINE__);
                     }
                 }
             }
@@ -3644,7 +3644,7 @@ 
             $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__);
+        $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) {
@@ -3653,15 +3653,15 @@ 
                     $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__);
+                        $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__);
+                        $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__);
+                        $this->DebugMessage('not using EXIF thumbnail because $this->h != $this->exif_thumbnail_height ('.$this->h.' != '.$this->exif_thumbnail_height.')', __FILE__, __LINE__);
                         break;
                     }
                     $CannotBeSetParameters = ['sx', 'sy', 'sh', 'sw', 'far', 'bg', 'bc', 'fltr', 'phpThumbDebug'];
@@ -3688,7 +3688,7 @@ 
             // 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__);
+            $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;
@@ -3728,10 +3728,10 @@ 
             // substitute source filename into * in $this->config_cache_default_only_suffix
             // (eg: '*_thumb' becomes 'picture_thumb.jpg')
             if (false === strpos($this->config_cache_default_only_suffix, '*')) {
-                $this->DebugMessage('aborting simplified caching filename because no * in "' . $this->config_cache_default_only_suffix . '"', __FILE__, __LINE__);
+                $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);
+                $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;
             }
@@ -3740,24 +3740,24 @@ 
         $this->cache_filename = '';
         if ($this->new) {
             $broad_directory_name = strtolower(md5($this->new));
-            $this->cache_filename .= '_new' . $broad_directory_name;
+            $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__);
+            $this->DebugMessage('SetCacheFilename() _raw set from $this->md5s = "'.$this->md5s.'"', __FILE__, __LINE__);
             $broad_directory_name = $this->md5s;
-            $this->cache_filename .= '_raw' . $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__);
+            $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;
+            $this->cache_filename .= '_raw'.$broad_directory_name;
         } else {
-            $this->DebugMessage('SetCacheFilename() _src set from md5($this->sourceFilename) "' . $this->sourceFilename . '" = "' . md5($this->sourceFilename) . '"', __FILE__, __LINE__);
+            $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;
+            $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']);
+            $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';
@@ -3766,12 +3766,12 @@ 
 
         $ParametersString = '';
         if ($this->fltr && is_array($this->fltr)) {
-            $ParametersString .= '_fltr' . implode('_fltr', $this->fltr);
+            $ParametersString .= '_fltr'.implode('_fltr', $this->fltr);
         }
         $FilenameParameters1 = ['ar', 'bg', 'bc', 'far', 'sx', 'sy', 'sw', 'sh', 'zc'];
         foreach ($FilenameParameters1 as $key) {
             if ($this->$key) {
-                $ParametersString .= '_' . $key . $this->$key;
+                $ParametersString .= '_'.$key.$this->$key;
             }
         }
         $FilenameParameters2 = [
@@ -3792,33 +3792,33 @@ 
         ];
         foreach ($FilenameParameters2 as $key) {
             if ($this->$key) {
-                $ParametersString .= '_' . $key . (int)$this->$key;
+                $ParametersString .= '_'.$key.(int)$this->$key;
             }
         }
         if ('jpeg' === $this->thumbnailFormat) {
             // 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));
+        $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);
+            $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);
-        $broad_directories    = '';
+        $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);
+            $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);
+        $this->cache_filename = $this->config_cache_directory.$broad_directories.DIRECTORY_SEPARATOR.$this->config_cache_prefix.rawurlencode($this->cache_filename);
 
         return true;
     }
@@ -3853,7 +3853,7 @@ 
         $ImageCreateWasAttempted = false;
         $gd_image                = false;
 
-        $this->DebugMessage('starting ImageCreateFromFilename(' . $filename . ')', __FILE__, __LINE__);
+        $this->DebugMessage('starting ImageCreateFromFilename('.$filename.')', __FILE__, __LINE__);
         if ($filename && ($getimagesizeinfo = @getimagesize($filename))) {
             if (!$this->SourceImageIsTooLarge($getimagesizeinfo[0], $getimagesizeinfo[1])) {
                 $ImageCreateFromFunction = [
@@ -3862,7 +3862,7 @@ 
                     3  => 'imagecreatefrompng',
                     15 => 'imagecreatefromwbmp',
                 ];
-                $this->DebugMessage('ImageCreateFromFilename found ($getimagesizeinfo[2]==' . @$getimagesizeinfo[2] . ')', __FILE__, __LINE__);
+                $this->DebugMessage('ImageCreateFromFilename found ($getimagesizeinfo[2]=='.@$getimagesizeinfo[2].')', __FILE__, __LINE__);
                 switch (@$getimagesizeinfo[2]) {
                     case 1:  // GIF
                     case 2:  // JPEG
@@ -3870,11 +3870,11 @@ 
                     case 15: // WBMP
                         $ImageCreateFromFunctionName = $ImageCreateFromFunction[$getimagesizeinfo[2]];
                         if (function_exists($ImageCreateFromFunctionName)) {
-                            $this->DebugMessage('Calling ' . $ImageCreateFromFunctionName . '(' . $filename . ')', __FILE__, __LINE__);
+                            $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__);
+                            $this->DebugMessage('NOT calling '.$ImageCreateFromFunctionName.'('.$filename.') because !function_exists('.$ImageCreateFromFunctionName.')', __FILE__, __LINE__);
                         }
                         break;
 
@@ -3890,16 +3890,16 @@ 
                     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__);
+                        $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__);
+                        $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 . ')',
+                    '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__
                 );
@@ -3907,13 +3907,13 @@ 
                 return false;
             }
         } else {
-            $this->DebugMessage('empty $filename or getimagesize(' . $filename . ') failed', __FILE__, __LINE__);
+            $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($ImageCreateFromFunctionName.'() was attempted but FAILED', __FILE__, __LINE__);
             }
             $this->DebugMessage('Populating $rawimagedata', __FILE__, __LINE__);
             $rawimagedata = '';
@@ -3926,10 +3926,10 @@ 
                 }
                 fclose($fp);
             } else {
-                $this->DebugMessage('cannot fopen(' . $filename . ')', __FILE__, __LINE__);
+                $this->DebugMessage('cannot fopen('.$filename.')', __FILE__, __LINE__);
             }
             if ($rawimagedata) {
-                $this->DebugMessage('attempting ImageCreateFromStringReplacement($rawimagedata (' . strlen($rawimagedata) . ' bytes), true)', __FILE__, __LINE__);
+                $this->DebugMessage('attempting ImageCreateFromStringReplacement($rawimagedata ('.strlen($rawimagedata).' bytes), true)', __FILE__, __LINE__);
                 $gd_image = $this->ImageCreateFromStringReplacement($rawimagedata, true);
             }
         }
@@ -3945,7 +3945,7 @@ 
         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__);
+            $this->DebugMessage('skipping SourceImageToGD() because $this->gdimg_source is already a resource ('.$this->source_width.'x'.$this->source_height.')', __FILE__, __LINE__);
 
             return true;
         }
@@ -3964,7 +3964,7 @@ 
                             $this->DebugMessage('ImageMagickThumbnailToGD() failed', __FILE__, __LINE__);
                         }
                     } else {
-                        $this->DebugMessage('failed to put $this->rawImageData into temp file "' . $tempnam . '"', __FILE__, __LINE__);
+                        $this->DebugMessage('failed to put $this->rawImageData into temp file "'.$tempnam.'"', __FILE__, __LINE__);
                     }
                 } else {
                     $this->DebugMessage('failed to generate temp file name', __FILE__, __LINE__);
@@ -3988,7 +3988,7 @@ 
                                          . 'M).');
             }
             if ($this->md5s && ($this->md5s != md5($this->rawImageData))) {
-                return $this->ErrorImage('$this->md5s != md5($this->rawImageData)' . "\n" . '"' . $this->md5s . '" != ' . "\n" . '"' . 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');
@@ -3997,17 +3997,17 @@ 
             if (!$this->gdimg_source) {
                 if ('BM' === substr($this->rawImageData, 0, 2)) {
                     $this->getimagesizeinfo[2] = 6; // BMP
-                } elseif (substr($this->rawImageData, 0, 4) === 'II' . "\x2A\x00") {
+                } elseif (substr($this->rawImageData, 0, 4) === 'II'."\x2A\x00") {
                     $this->getimagesizeinfo[2] = 7; // TIFF (littlendian)
-                } elseif (substr($this->rawImageData, 0, 4) === 'MM' . "\x00\x2A") {
+                } 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->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) . '"');
+                return $this->ErrorImage('$this->md5s != md5(sourceFilename)'."\n".'"'.$this->md5s.'" != '."\n".'"'.phpthumb_functions::md5_file_safe($this->sourceFilename).'"');
             }
             switch (@$this->getimagesizeinfo[2]) {
                 case 1:
@@ -4043,17 +4043,17 @@ 
                     break;
                 }
                 if ((0 != $this->thumbnailCropX) || (0 != $this->thumbnailCropY)) {
-                    $this->DebugMessage('Not using EXIF thumbnail data because source cropping is enabled (' . $this->thumbnailCropX . ',' . $this->thumbnailCropY . ')', __FILE__, __LINE__);
+                    $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__);
+                    $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__);
+                    $this->DebugMessage('not using EXIF thumbnail because $source_ar != $exif_ar ('.$source_ar.' != '.$exif_ar.')', __FILE__, __LINE__);
                     break;
                 }
             }
@@ -4128,15 +4128,15 @@ 
                                             . ceil(($memory_get_usage + (5 * $this->getimagesizeinfo[0] * $this->getimagesizeinfo[1])) / 1048576)
                                             . 'M).';
                     } elseif (!$GDreadSupport) {
-                        $errormessages[] = 'GD does not have read support for "' . $imageHeader . '".';
+                        $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 "'
+                    $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');
+                                                                                                                                                                                                                                                                  . '"')).'), 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);
@@ -4152,10 +4152,10 @@ 
             switch (@$this->getimagesizeinfo[2]) {
                 case 6:
                     ob_start();
-                    if (!@require_once __DIR__ . '/phpthumb.bmp.php') {
+                    if (!@require_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')) {
@@ -4196,10 +4196,10 @@ 
                         $HeaderFourBytes = fread($fp, 4);
                         fclose($fp);
                     } else {
-                        return $this->ErrorImage('failed to open "' . $this->sourceFilename . '" SourceImageToGD() [' . __LINE__ . ']');
+                        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__ . ']');
+                    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.');
@@ -4215,7 +4215,7 @@ 
                     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__ . ']');
+                return $this->ErrorImage('Unknown image type identified by "'.$HeaderFourBytes.'" ('.phpthumb_functions::HexCharDisplay($HeaderFourBytes).') in SourceImageToGD() ['.__LINE__.']');
             }
         }
 
@@ -4250,11 +4250,11 @@ 
         } 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 . '"';
+            return 'string('.strlen($var).')'.str_repeat(' ', max(0, 3 - strlen(strlen($var)))).' "'.$var.'"';
         } elseif (is_int($var)) {
-            return 'integer     ' . $var;
+            return 'integer     '.$var;
         } elseif (is_float($var)) {
-            return 'float       ' . $var;
+            return 'float       '.$var;
         } elseif (is_array($var)) {
             ob_start();
             var_dump($var);
@@ -4280,7 +4280,7 @@ 
             return $this->ErrorImage('phpThumbDebug disabled');
         }
 
-        $FunctionsExistance  = [
+        $FunctionsExistance = [
             'exif_thumbnail',
             'gd_info',
             'image_type_to_mime_type',
@@ -4309,7 +4309,7 @@ 
             'imagepng',
             'imagewbmp'
         ];
-        $ParameterNames      = [
+        $ParameterNames = [
             'src',
             'new',
             'w',
@@ -4366,7 +4366,7 @@ 
             'disable_pathinfo_parsing',
             'disable_imagecopyresampled'
         ];
-        $OtherVariableNames  = [
+        $OtherVariableNames = [
             'phpThumbDebug',
             'thumbnailQuality',
             'thumbnailFormat',
@@ -4389,101 +4389,101 @@ 
         ];
 
         $DebugOutput   = [];
-        $DebugOutput[] = 'phpThumb() version          = ' . $this->phpthumb_version;
-        $DebugOutput[] = 'PHP_VERSION                = ' . @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[] = 'phpThumb() version          = '.$this->phpthumb_version;
+        $DebugOutput[] = 'PHP_VERSION                = '.@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[] = '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();
+        $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->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[] = '[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[] = '$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;
+            $varname       = 'config_'.$varname;
             $value         = $this->$varname;
-            $DebugOutput[] = '$this->' . str_pad($varname, 37, ' ', STR_PAD_RIGHT) . ' = ' . $this->phpThumbDebugVarDump($value);
+            $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[] = '$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[] = '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[] = '$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[] = '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[] = '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[] = '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);
+                $DebugOutput[] = 'ApacheLookupURIarray.'.str_pad($key, 15, ' ', STR_PAD_RIGHT).' = '.$this->phpThumbDebugVarDump($value);
             }
         } else {
             $DebugOutput[] = 'ApacheLookupURIarray() -- FAILED';
@@ -4492,27 +4492,27 @@ 
 
         if (isset($_GET) && is_array($_GET)) {
             foreach ($_GET as $key => $value) {
-                $DebugOutput[] = '$_GET[' . $key . ']' . str_repeat(' ', 30 - strlen($key)) . '= ' . $this->phpThumbDebugVarDump($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[] = '$_POST['.$key.']'.str_repeat(' ', 29 - strlen($key)).'= '.$this->phpThumbDebugVarDump($value);
             }
         }
         $DebugOutput[] = '';
 
         $DebugOutput[] = '$this->debugmessages:';
         foreach ($this->debugmessages as $errorstring) {
-            $DebugOutput[] = '  * ' . $errorstring;
+            $DebugOutput[] = '  * '.$errorstring;
         }
         $DebugOutput[] = '';
 
         $DebugOutput[] = '$this->debugtiming:';
         foreach ($this->debugtiming as $timestamp => $timingstring) {
-            $DebugOutput[] = '  * ' . $timestamp . ' ' . $timingstring;
+            $DebugOutput[] = '  * '.$timestamp.' '.$timingstring;
         }
-        $DebugOutput[] = '  * Total processing time: ' . number_format(max(array_keys($this->debugtiming)) - min(array_keys($this->debugtiming)), 6);
+        $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
 
@@ -4544,7 +4544,7 @@ 
         $width  = ($width ?: $this->config_error_image_width);
         $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.'
+        $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"
@@ -4570,7 +4570,7 @@ 
             if (('showerror' === $this->err) || $this->phpThumbDebug) {
                 // fall through and actually show error message even if default error image is set
             } else {
-                header('Location: ' . ($this->err ?: $this->config_error_message_image_default));
+                header('Location: '.($this->err ?: $this->config_error_message_image_default));
                 exit;
             }
         }
@@ -4584,7 +4584,7 @@ 
                 header('Content-type: text/plain');
                 echo $text;
             } else {
-                echo '<pre>' . htmlspecialchars($text, ENT_QUOTES | ENT_HTML5) . '</pre>';
+                echo '<pre>'.htmlspecialchars($text, ENT_QUOTES | ENT_HTML5).'</pre>';
             }
             exit;
         }
@@ -4599,9 +4599,9 @@ 
         $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>';
+            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>';
+            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);
@@ -4630,7 +4630,7 @@ 
             imagedestroy($gdimg_error);
         }
         if (!headers_sent()) {
-            echo "\n" . '**Failed to send graphical error image, dumping error message as text:**<br>' . "\n\n" . $text;
+            echo "\n".'**Failed to send graphical error image, dumping error message as text:**<br>'."\n\n".$text;
         }
         exit;
     }
@@ -4657,7 +4657,7 @@ 
                 }
                 exit;
             } else {
-                $this->DebugMessage('ImageCreateFromStringReplacement() failed: gd_version says "' . phpthumb_functions::gd_version() . '"', __FILE__, __LINE__);
+                $this->DebugMessage('ImageCreateFromStringReplacement() failed: gd_version says "'.phpthumb_functions::gd_version().'"', __FILE__, __LINE__);
 
                 return false;
             }
@@ -4680,11 +4680,11 @@ 
             case "\xFF\xD8\xFF":
                 $ICFSreplacementFunctionName = 'imagecreatefromjpeg';
                 break;
-            case "\x89" . 'PN':
+            case "\x89".'PN':
                 $ICFSreplacementFunctionName = 'imagecreatefrompng';
                 break;
             default:
-                $this->DebugMessage('ImageCreateFromStringReplacement() failed: unknown fileformat signature "' . phpthumb_functions::HexCharDisplay(substr($RawImageData, 0, 3)) . '"', __FILE__, __LINE__);
+                $this->DebugMessage('ImageCreateFromStringReplacement() failed: unknown fileformat signature "'.phpthumb_functions::HexCharDisplay(substr($RawImageData, 0, 3)).'"', __FILE__, __LINE__);
 
                 return false;
                 break;
@@ -4699,8 +4699,8 @@ 
 
                     // Need to create from GIF file, but imagecreatefromgif does not exist
                     ob_start();
-                    if (!@require_once __DIR__ . '/phpthumb.gif.php') {
-                        $ErrorMessage = 'Failed to include required file "' . __DIR__ . '/phpthumb.gif.php" in ' . __FILE__ . ' on line ' . __LINE__;
+                    if (!@require_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();
@@ -4710,49 +4710,49 @@ 
                             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__);
+                            $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__;
+                            $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__;
+                        $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__);
+                    $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__);
+                    $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';
+                $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';
+                    $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__);
+            $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';
+            $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';
+                $ErrorMessage = 'ImageCreateFromStringReplacement() failed in '.__FILE__.' on line '.__LINE__.': cannot create temp file in SAFE_MODE';
             }
         }
         if ($DieOnErrors && $ErrorMessage) {
@@ -4777,7 +4777,7 @@ 
      */
     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__);
+        $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);
         }
@@ -4814,7 +4814,7 @@ 
         $this->InitializeTempDirSetting();
         $tempnam                           = $this->realPathSafe(tempnam($this->config_temp_directory, 'pThumb'));
         $this->tempFilesToDelete[$tempnam] = $tempnam;
-        $this->DebugMessage('phpThumb_tempnam() returning "' . $tempnam . '"', __FILE__, __LINE__);
+        $this->DebugMessage('phpThumb_tempnam() returning "'.$tempnam.'"', __FILE__, __LINE__);
 
         return $tempnam;
     }
@@ -4827,7 +4827,7 @@ 
      */
     public function DebugMessage($message, $file = '', $line = '')
     {
-        $this->debugmessages[] = $message . ($file ? ' in file "' . (basename($file) ?: $file) . '"' : '') . ($line ? ' on line ' . $line : '');
+        $this->debugmessages[] = $message.($file ? ' in file "'.(basename($file) ?: $file).'"' : '').($line ? ' on line '.$line : '');
 
         return true;
     }
@@ -4844,7 +4844,7 @@ 
         if (!$timestamp) {
             $timestamp = array_sum(explode(' ', microtime()));
         }
-        $this->debugtiming[number_format($timestamp, 6, '.', '')] = ': ' . $message . ($file ? ' in file "' . (basename($file) ?: $file) . '"' : '') . ($line ? ' on line ' . $line : '');
+        $this->debugtiming[number_format($timestamp, 6, '.', '')] = ': '.$message.($file ? ' in file "'.(basename($file) ?: $file).'"' : '').($line ? ' on line '.$line : '');
 
         return true;
     }

phpthumb/phpthumb.ico.php

Spacing +23 added lines, -23 removed lines

@@ -43,9 +43,9 @@ 
                     $b    = $argb['blue'];
 
                     if (32 == $bpp[$key]) {
-                        $icXOR[$key] .= chr($b) . chr($g) . chr($r) . chr($a);
+                        $icXOR[$key] .= chr($b).chr($g).chr($r).chr($a);
                     } elseif (24 == $bpp[$key]) {
-                        $icXOR[$key] .= chr($b) . chr($g) . chr($r);
+                        $icXOR[$key] .= chr($b).chr($g).chr($r);
                     }
 
                     if ($a < 128) {
@@ -72,41 +72,41 @@ 
 
             // 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]);

latest.php

Indentation +11 added lines, -11 removed lines

@@ -60,17 +60,17 @@
 
 //query
 $queryString = 'SELECT d.id AS d_id, d.naam AS d_naam, d.roft AS d_roft, d.mother AS d_mother, d.father AS d_father, d.foto AS d_foto, d.user AS d_user, f.id AS f_id, f.naam AS f_naam, m.id AS m_id, m.naam AS m_naam, u.uname AS u_uname FROM '
-               . $GLOBALS['xoopsDB']->prefix('pedigree_tree')
-               . ' d LEFT JOIN '
-               . $GLOBALS['xoopsDB']->prefix('pedigree_tree')
-               . ' f ON d.father = f.id LEFT JOIN '
-               . $GLOBALS['xoopsDB']->prefix('pedigree_tree')
-               . ' m ON d.mother = m.id LEFT JOIN '
-               . $GLOBALS['xoopsDB']->prefix('users')
-               . ' u ON d.user = u.uid ORDER BY d.id DESC LIMIT '
-               . $st
-               . ', '
-               . $perPage;
+                . $GLOBALS['xoopsDB']->prefix('pedigree_tree')
+                . ' d LEFT JOIN '
+                . $GLOBALS['xoopsDB']->prefix('pedigree_tree')
+                . ' f ON d.father = f.id LEFT JOIN '
+                . $GLOBALS['xoopsDB']->prefix('pedigree_tree')
+                . ' m ON d.mother = m.id LEFT JOIN '
+                . $GLOBALS['xoopsDB']->prefix('users')
+                . ' u ON d.user = u.uid ORDER BY d.id DESC LIMIT '
+                . $st
+                . ', '
+                . $perPage;
 $result      = $GLOBALS['xoopsDB']->query($queryString);
 $pathIcon16  = \Xmf\Module\Admin::iconUrl('', 16);
 

Spacing +12 added lines, -12 removed lines

@@ -6,13 +6,13 @@ 
 
 
 //require_once  dirname(dirname(__DIR__)) . '/mainfile.php';
-require_once __DIR__ . '/header.php';
+require_once __DIR__.'/header.php';
 
 $moduleDirName = basename(__DIR__);
 xoops_loadLanguage('main', $moduleDirName);
 
 // Include any common code for this module.
-require_once XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/include/common.php';
+require_once XOOPS_ROOT_PATH.'/modules/'.$moduleDirName.'/include/common.php';
 //path taken
 
 $GLOBALS['xoopsOption']['template_main'] = 'pedigree_latest.tpl';
@@ -41,7 +41,7 @@ 
 }
 
 //count total number of animals
-$numanimal = 'SELECT id FROM ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree') . ' NOLIMIT';
+$numanimal = 'SELECT id FROM '.$GLOBALS['xoopsDB']->prefix('pedigree_tree').' NOLIMIT';
 $numRes    = $GLOBALS['xoopsDB']->query($numanimal);
 //total number of animals the query will find
 $numResults = $GLOBALS['xoopsDB']->getRowsNum($numRes);
@@ -55,7 +55,7 @@ 
 
 //create numbers
 for ($x = 1; $x < ($numPages + 1); ++$x) {
-    $pages = $x . '&nbsp;&nbsp';
+    $pages = $x.'&nbsp;&nbsp';
 }
 
 //query
@@ -79,7 +79,7 @@ 
     $gender = '';
     if (!empty($GLOBALS['xoopsUser'])) {
         if ($row['d_user'] == $GLOBALS['xoopsUser']->getVar('uid') || true === $modadmin) {
-            $gender = '<a href="dog.php?id=' . $row['d_id'] . '"><img src=' . $pathIcon16 . '/edit.png alt=' . _EDIT . '></a><a href="delete.php?id=' . $row['d_id'] . '"><img src=' . $pathIcon16 . '/delete.png alt=' . _DELETE . '></a>';
+            $gender = '<a href="dog.php?id='.$row['d_id'].'"><img src='.$pathIcon16.'/edit.png alt='._EDIT.'></a><a href="delete.php?id='.$row['d_id'].'"><img src='.$pathIcon16.'/delete.png alt='._DELETE.'></a>';
         } else {
             $gender = '';
         }
@@ -100,21 +100,21 @@ 
     if ('' == $row['f_naam']) {
         $dad = _MA_PEDIGREE_UNKNOWN;
     } else {
-        $dad = '<a href="pedigree.php?pedid=' . $row['f_id'] . '">' . stripslashes($row['f_naam']) . '</a>';
+        $dad = '<a href="pedigree.php?pedid='.$row['f_id'].'">'.stripslashes($row['f_naam']).'</a>';
     }
     if ('' == $row['m_naam']) {
         $mom = _MA_PEDIGREE_UNKNOWN;
     } else {
-        $mom = '<a href="pedigree.php?pedid=' . $row['m_id'] . '">' . stripslashes($row['m_naam']) . '</a>';
+        $mom = '<a href="pedigree.php?pedid='.$row['m_id'].'">'.stripslashes($row['m_naam']).'</a>';
     }
-    $parents = $dad . ' x ' . $mom;
+    $parents = $dad.' x '.$mom;
     //create array for animals
     $animals[] = [
         'id'      => $row['d_id'],
-        'name'    => stripslashes($row['d_naam']) . $camera,
+        'name'    => stripslashes($row['d_naam']).$camera,
         'gender'  => $gender,
         'parents' => $parents,
-        'addedby' => '<a href="../../userinfo.php?uid=' . $row['d_user'] . '">' . $row['u_uname'] . '</a>'
+        'addedby' => '<a href="../../userinfo.php?uid='.$row['d_user'].'">'.$row['u_uname'].'</a>'
     ];
     //reset rights ready for the next dog
     $editdel = '0';
@@ -134,7 +134,7 @@ 
 }
 //create string
 $matches     = strtr(_MA_PEDIGREE_MATCHES, ['[animalTypes]' => $moduleConfig['animalTypes']]);
-$nummatchstr = $numResults . $matches . ($st + 1) . '-' . $lastshown . ' (' . $numPages . ' pages)';
+$nummatchstr = $numResults.$matches.($st + 1).'-'.$lastshown.' ('.$numPages.' pages)';
 $xoopsTpl->assign('nummatch', $nummatchstr);
 if (isset($pages)) {
     $xoopsTpl->assign('pages', $pages);
@@ -143,4 +143,4 @@ 
 $xoopsTpl->assign('parents', _MA_PEDIGREE_PA);
 $xoopsTpl->assign('addedby', _MA_PEDIGREE_FLD_DBUS);
 //comments and footer
-include XOOPS_ROOT_PATH . '/footer.php';
+include XOOPS_ROOT_PATH.'/footer.php';

coi.php

Indentation +17 added lines, -17 removed lines

@@ -272,15 +272,15 @@ 
     global $nl, $detail, $depth, $IDs;
     // print_r ($IDs) ;
     echo $nl
-         . '<br>'
-         . $nl
-         . '<table border="3" cellpadding="4" width="85%"" cellpadding="0" cellspacing="0">'
-         . $nl
-         . '<tr><th colspan="10" align="center">SKETCH &nbsp; PEDIGREE &nbsp; OF COMMON PROGENY</th></tr>'
-         . $nl
-         . '<tr align="center" valign="middle"><th>Progeny</th><th>'
-         . _('Sire / Dam')
-         . '</th>';
+            . '<br>'
+            . $nl
+            . '<table border="3" cellpadding="4" width="85%"" cellpadding="0" cellspacing="0">'
+            . $nl
+            . '<tr><th colspan="10" align="center">SKETCH &nbsp; PEDIGREE &nbsp; OF COMMON PROGENY</th></tr>'
+            . $nl
+            . '<tr align="center" valign="middle"><th>Progeny</th><th>'
+            . _('Sire / Dam')
+            . '</th>';
     if ($depth >= 2) {
         echo '<th>' . _('Grandparents') . '</th>' . $nl;
     }
@@ -950,14 +950,14 @@ 
 }
 
 $title   = strtr(_MA_PEDIGREE_FLD_FATH, ['[father]' => $moduleConfig['father']])
-           . ' ('
-           . stripslashes(Pedigree\Utility::showParent($codec2))
-           . ')'
-           . _MA_PEDIGREE_COI_AND
-           . strtr(_MA_PEDIGREE_FLD_MOTH, ['[mother]' => $moduleConfig['mother']])
-           . ' ('
-           . stripslashes(Pedigree\Utility::showParent($codec1))
-           . ')';
+            . ' ('
+            . stripslashes(Pedigree\Utility::showParent($codec2))
+            . ')'
+            . _MA_PEDIGREE_COI_AND
+            . strtr(_MA_PEDIGREE_FLD_MOTH, ['[mother]' => $moduleConfig['mother']])
+            . ' ('
+            . stripslashes(Pedigree\Utility::showParent($codec1))
+            . ')';
 $content = stripslashes(one_animal($codec2));
 $content .= stripslashes(one_animal($codec1));
 $val = '';

Spacing +39 added lines, -39 removed lines

@@ -6,13 +6,13 @@ 
 ini_set('memory_limit', '32M');
 
 //require_once  dirname(dirname(__DIR__)) . '/mainfile.php';
-require_once __DIR__ . '/header.php';
+require_once __DIR__.'/header.php';
 $moduleDirName = basename(__DIR__);
 xoops_loadLanguage('main', $moduleDirName);
-require_once XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/include/common.php';
+require_once XOOPS_ROOT_PATH.'/modules/'.$moduleDirName.'/include/common.php';
 
 $GLOBALS['xoopsOption']['template_main'] = 'pedigree_coi.tpl';
-include XOOPS_ROOT_PATH . '/header.php';
+include XOOPS_ROOT_PATH.'/header.php';
 
 //get module configuration
 /** @var XoopsModuleHandler $moduleHandler */
@@ -69,7 +69,7 @@ 
 }
 
 $empty = []; // an empty array
-$sql1  = 'SELECT id, father, mother, roft FROM ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree') . ' WHERE id ';
+$sql1  = 'SELECT id, father, mother, roft FROM '.$GLOBALS['xoopsDB']->prefix('pedigree_tree').' WHERE id ';
 
 // input data arrays:
 $IDs     = $empty;
@@ -216,7 +216,7 @@ 
             $j     = min($im, 6);
             $c     = $couls[$j];
             $first = 0;
-            echo '<font color=' . $c . ' size="+2"><b>*' . $i . '*</b></font>';
+            echo '<font color='.$c.' size="+2"><b>*'.$i.'*</b></font>';
         }
     }
 
@@ -242,10 +242,10 @@ 
         $ani          = set_name($ID);
         $name         = $ani[1];
         $name         = $ID;
-        $cell_content = Pedigree\Utility::showParent($name) . $nl;
+        $cell_content = Pedigree\Utility::showParent($name).$nl;
     }
     $rowspan = 1 << ($depth - $gen);
-    echo '<td rowspan=' . $rowspan . ' align="center" class="' . $class . '">' . $cell_content . "</td>$nl";
+    echo '<td rowspan='.$rowspan.' align="center" class="'.$class.'">'.$cell_content."</td>$nl";
     if ($gen < $depth) {
         $sire = 0;
         if ($ind || 0 == $gen) {
@@ -282,26 +282,26 @@ 
          . _('Sire / Dam')
          . '</th>';
     if ($depth >= 2) {
-        echo '<th>' . _('Grandparents') . '</th>' . $nl;
+        echo '<th>'._('Grandparents').'</th>'.$nl;
     }
     if ($depth >= 3) {
-        echo '<th>' . _('Great-Grandparents') . '</th>' . $nl;
+        echo '<th>'._('Great-Grandparents').'</th>'.$nl;
     }
     if ($depth >= 4) {
-        echo '<th>3xGr. P.</th>' . $nl;
+        echo '<th>3xGr. P.</th>'.$nl;
     }
     if ($depth >= 5) {
-        echo '<th>4xGr. P.</th>' . $nl;
+        echo '<th>4xGr. P.</th>'.$nl;
     }
     if ($depth >= 6) {
-        echo '<th>5xGr. P.</th>' . $nl;
+        echo '<th>5xGr. P.</th>'.$nl;
     }
     if ($depth >= 7) {
-        echo '<th>6xGr. P.</th>' . $nl;
+        echo '<th>6xGr. P.</th>'.$nl;
     }
     echo '</tr><tr>';
     output_animal(0, 0, '0'); /* output the sketch pedigree */
-    echo $nl . '</tr></table>' . $nl . '<p>' . $nl;
+    echo $nl.'</tr></table>'.$nl.'<p>'.$nl;
 
     return 0;
 }
@@ -435,7 +435,7 @@ 
         /* $list1 = join (' ', $listall) ; $list2 = join ('+', $listnew) ;
              echo "<!-- P ($nloop) $list1/$list2 -->$nl" ; */
 //        $listall = array_merge($listall, $listnew);
-        $listall[] =  $listnew;
+        $listall[] = $listnew;
     }
     //    $listall = call_user_func_array('array_merge', $listall);
     $listall = array_merge(...$listall);
@@ -487,7 +487,7 @@ 
         $listnew = array_diff(array_unique($liste), $listall);
         // $list1 = join (' ', $listall) ; $list2 = join ('+', $listnew) ; echo "M ($nloop) $list1/$list2 $nl" ;
 //        $listall = array_merge($listall, $listnew);
-        $listall[] =  $listnew;
+        $listall[] = $listnew;
     }
 //    $listall = call_user_func_array('array_merge', $listall);
     $listall = array_merge(...$listall);
@@ -688,7 +688,7 @@ 
                     ++$nbtot;
                 }
                 if ($j > $nloop - 10) {
-                    $listing .= "Loop $j: Animal #$s " . $IDs[$s] . $nl;
+                    $listing .= "Loop $j: Animal #$s ".$IDs[$s].$nl;
                 }
             }
             if (false !== ($d = $mothers[$i])) {
@@ -703,7 +703,7 @@ 
                     ++$nbtot;
                 }
                 if ($j > $nloop - 10) {
-                    $listing .= "Loop $j: Animal #$d " . $IDs[$d] . $nl;
+                    $listing .= "Loop $j: Animal #$d ".$IDs[$d].$nl;
                 }
             }
         }
@@ -741,7 +741,7 @@ 
     $ID   = (int)$ID;
     $ani  = [];
     if ($ID) {
-        $sqlQuery    = 'SELECT id, naam, roft FROM ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree') . " WHERE id = '$ID'";
+        $sqlQuery    = 'SELECT id, naam, roft FROM '.$GLOBALS['xoopsDB']->prefix('pedigree_tree')." WHERE id = '$ID'";
         $queryResult = $GLOBALS['xoopsDB']->query($sqlQuery);
         $ani         = $GLOBALS['xoopsDB']->fetchBoth($queryResult);
         /*
@@ -782,7 +782,7 @@ 
         return '&nbsp;';
     }
     $e   = str_replace(' ', '+', $ems);
-    $res = '<a href="#" style="text-decoration:none;" onClick="' . "window.open('http://www.somali.asso.fr/eros/decode_ems.php?$e'," . "'', 'resizable=no,width=570,height=370')" . '"' . "><b>$ems</b></a>";
+    $res = '<a href="#" style="text-decoration:none;" onClick="'."window.open('http://www.somali.asso.fr/eros/decode_ems.php?$e',"."'', 'resizable=no,width=570,height=370')".'"'."><b>$ems</b></a>";
 
     return $res;
 }
@@ -804,7 +804,7 @@ 
     if (is_array($animal)) {
     list($ID, $name, $sex, $hd, $ems) = $animal;
     }
-    $sqlQuery    = 'SELECT SQL_CACHE COUNT(id) FROM ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree') . " where father = '$ID' or mother = '$ID'";
+    $sqlQuery    = 'SELECT SQL_CACHE COUNT(id) FROM '.$GLOBALS['xoopsDB']->prefix('pedigree_tree')." where father = '$ID' or mother = '$ID'";
     $queryResult = $GLOBALS['xoopsDB']->queryF($sqlQuery);
     $nb          = $GLOBALS['xoopsDB']->fetchBoth($queryResult);
     $nb_children = $nb[0];
@@ -812,7 +812,7 @@ 
         $nb_children = _MA_PEDIGREE_COI_NO;
     }
     //$dogid = $animal[0];
-    $content .= '<tr><td><a href="dog.php?id=' . $ID . '">' . stripslashes($name) . '</a>';
+    $content .= '<tr><td><a href="dog.php?id='.$ID.'">'.stripslashes($name).'</a>';
     // if ($nb_enf == 0) echo ' &oslash;' ;
     if ($val) {
         $content .= $val;
@@ -823,7 +823,7 @@ 
     if (0 == $sex) {
         $geslacht = '<img src="assets/images/male.gif">';
     }
-    $content .= '</td><td>' . $geslacht . '</td><td>' . $nb_children . _MA_PEDIGREE_COI_OFF . '</td></tr>';
+    $content .= '</td><td>'.$geslacht.'</td><td>'.$nb_children._MA_PEDIGREE_COI_OFF.'</td></tr>';
 
     return $content;
 }
@@ -873,7 +873,7 @@ 
 }
 
 if (isset($a)) {
-    $sqlQuery    = 'SELECT id, father, mother, roft FROM ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree') . " WHERE id  = '$a'";
+    $sqlQuery    = 'SELECT id, father, mother, roft FROM '.$GLOBALS['xoopsDB']->prefix('pedigree_tree')." WHERE id  = '$a'";
     $queryResult = $GLOBALS['xoopsDB']->query($sqlQuery);
     $rowhond     = $GLOBALS['xoopsDB']->fetchBoth($queryResult);
     $a           = $rowhond['id'];
@@ -888,7 +888,7 @@ 
 $xoopsTpl->assign('pcontent', strtr(_MA_PEDIGREE_COI_CKRI_CT, ['[animalType]' => $moduleConfig['animalType']]));
 
 if (!$s && !$d) {
-    $error = _MA_PEDIGREE_COI_SPANF1 . $a . _MA_PEDIGREE_COI_SPANF2;
+    $error = _MA_PEDIGREE_COI_SPANF1.$a._MA_PEDIGREE_COI_SPANF2;
     $xoopsTpl->assign('COIerror', $error);
 }
 
@@ -922,7 +922,7 @@ 
     $codec2 = 0;
 }
 
-$sqlQuery    = 'SELECT father, mother, roft FROM ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree') . " WHERE id  = '$codec1'";
+$sqlQuery    = 'SELECT father, mother, roft FROM '.$GLOBALS['xoopsDB']->prefix('pedigree_tree')." WHERE id  = '$codec1'";
 $queryResult = $GLOBALS['xoopsDB']->query($sqlQuery);
 $rowhond     = $GLOBALS['xoopsDB']->fetchBoth($queryResult);
 $a1          = $rowhond['id'];
@@ -932,7 +932,7 @@ 
 
 // echo "sqlquery:".$sqlQuery."<br>";
 
-$sqlQuery    = 'SELECT father, mother, roft FROM ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree') . " WHERE id  = '$codec2'";
+$sqlQuery    = 'SELECT father, mother, roft FROM '.$GLOBALS['xoopsDB']->prefix('pedigree_tree')." WHERE id  = '$codec2'";
 $queryResult = $GLOBALS['xoopsDB']->query($sqlQuery);
 $rowhond     = $GLOBALS['xoopsDB']->fetchBoth($queryResult);
 $a2          = $rowhond['id'];
@@ -949,7 +949,7 @@ 
     $xoopsTpl->assign('COIerror', _MA_PEDIGREE_COI_SGPU);
 }
 
-$title   = strtr(_MA_PEDIGREE_FLD_FATH, ['[father]' => $moduleConfig['father']])
+$title = strtr(_MA_PEDIGREE_FLD_FATH, ['[father]' => $moduleConfig['father']])
            . ' ('
            . stripslashes(Pedigree\Utility::showParent($codec2))
            . ')'
@@ -970,10 +970,10 @@ 
 ]));
 
 $de_cujus = 0;
-$sire_ID  = Request::getInt('s', 0, 'GET');//$_GET['s'];
-$dam_ID   = Request::getInt('d', 0, 'GET');//$_GET['d'];
+$sire_ID  = Request::getInt('s', 0, 'GET'); //$_GET['s'];
+$dam_ID   = Request::getInt('d', 0, 'GET'); //$_GET['d'];
 
-$rec     = 'SELECT id FROM ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree') . " WHERE father = '" . $sire_ID . "' AND mother = '" . $dam_ID . "' ORDER BY naam";
+$rec = 'SELECT id FROM '.$GLOBALS['xoopsDB']->prefix('pedigree_tree')." WHERE father = '".$sire_ID."' AND mother = '".$dam_ID."' ORDER BY naam";
 $result   = $GLOBALS['xoopsDB']->query($rec);
 $content  = '';
 while (false !== ($row = $GLOBALS['xoopsDB']->fetchArray($result))) {
@@ -1063,14 +1063,14 @@ 
         }
     }
 }
-$w = _MA_PEDIGREE_COI_TVI . ' ' . $w;
+$w = _MA_PEDIGREE_COI_TVI.' '.$w;
 
 $nb_all = 0;
 count_all(0, 0); // count all ascendants in flat tree
 
 $nbmax  = (2 << $nb_gen) - 2;
-$asctc  = _MA_PEDIGREE_COI_ASTC . $nb_gen . _MA_PEDIGREE_COI_ASTCGEN . $nbmax . ')';
-$ascuni = _MA_PEDIGREE_COI_ASDKA . $nb_gen . _MA_PEDIGREE_COI_ASGEN;
+$asctc  = _MA_PEDIGREE_COI_ASTC.$nb_gen._MA_PEDIGREE_COI_ASTCGEN.$nbmax.')';
+$ascuni = _MA_PEDIGREE_COI_ASDKA.$nb_gen._MA_PEDIGREE_COI_ASGEN;
 $xoopsTpl->assign('ASCtitle', _MA_PEDIGREE_COI_ACTIT);
 $xoopsTpl->assign('ASCtc', $asctc);
 $xoopsTpl->assign('ASCuni', $ascuni);
@@ -1097,7 +1097,7 @@ 
 ]));
 $xoopsTpl->assign('COIcoi', _MA_PEDIGREE_COI_COI);
 $dogid = Request::getInt('dogid', 0, 'GET');
-$query = 'UPDATE ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree') . ' SET coi=' . $f1 . ' WHERE id = ' . $dogid;
+$query = 'UPDATE '.$GLOBALS['xoopsDB']->prefix('pedigree_tree').' SET coi='.$f1.' WHERE id = '.$dogid;
 $GLOBALS['xoopsDB']->queryF($query);
 arsort($deltaf);
 $j = 1;
@@ -1111,7 +1111,7 @@ 
     $animal = set_name($IDs[$i]);
     $name   = $animal[1];
     if (!$name) {
-        $name = $i . ' [' . $IDs[$i] . ']';
+        $name = $i.' ['.$IDs[$i].']';
     }
     if ($v > 0.0001 && $v < 1.0) {
         $dogs[] = ['id' => $code, 'name' => stripslashes($name), 'coi' => 100 * $v];
@@ -1189,9 +1189,9 @@ 
 $xoopsTpl->assign('SSDbsd', strtr(_MA_PEDIGREE_COI_SDDbsd, ['[father]' => $moduleConfig['father'], '[mother]' => $moduleConfig['mother']]));
 $xoopsTpl->assign('SSDcor', $SSDcor);
 
-$xoopsTpl->assign('SSDS', _MA_PEDIGREE_COI_COI . _MA_PEDIGREE_FROM . strtr(_MA_PEDIGREE_FLD_FATH, ['[father]' => $moduleConfig['father']]));
+$xoopsTpl->assign('SSDS', _MA_PEDIGREE_COI_COI._MA_PEDIGREE_FROM.strtr(_MA_PEDIGREE_FLD_FATH, ['[father]' => $moduleConfig['father']]));
 $xoopsTpl->assign('SSDsire', $SSDsire);
-$xoopsTpl->assign('SSDM', _MA_PEDIGREE_COI_COI . _MA_PEDIGREE_FROM . strtr(_MA_PEDIGREE_FLD_MOTH, ['[mother]' => $moduleConfig['mother']]));
+$xoopsTpl->assign('SSDM', _MA_PEDIGREE_COI_COI._MA_PEDIGREE_FROM.strtr(_MA_PEDIGREE_FLD_MOTH, ['[mother]' => $moduleConfig['mother']]));
 $xoopsTpl->assign('SSDdam', $SSDdam);
 
 // echo "SSDsire : ".$SSDsire."<br>";
@@ -1213,4 +1213,4 @@ 
 $xoopsTpl->assign('explain', _MA_PEDIGREE_EXPLAIN);
 
 //comments and footer
-include XOOPS_ROOT_PATH . '/footer.php';
+include XOOPS_ROOT_PATH.'/footer.php';

pedigree.php

Indentation +12 added lines, -12 removed lines

@@ -162,18 +162,18 @@
 
     //add data to smarty template
     $GLOBALS['xoopsTpl']->assign([
-                                     'page_title' => stripslashes($row['d_naam']),
-                                     'd'          => $d,  //assign dog
-                                     //assign config options
-                                     'male'       => "<img src='assets/images/male.gif'>",
-                                     'female'     => "<img src='assets/images/female.gif'>",
-                                     //assign extra display options
-                                     'unknown'    => 'Unknown',
-                                     'SD'         => _MA_PEDIGREE_SD,
-                                     'PA'         => _MA_PEDIGREE_PA,
-                                     'GP'         => _MA_PEDIGREE_GP,
-                                     'GGP'        => _MA_PEDIGREE_GGP
-                                 ]);
+                                        'page_title' => stripslashes($row['d_naam']),
+                                        'd'          => $d,  //assign dog
+                                        //assign config options
+                                        'male'       => "<img src='assets/images/male.gif'>",
+                                        'female'     => "<img src='assets/images/female.gif'>",
+                                        //assign extra display options
+                                        'unknown'    => 'Unknown',
+                                        'SD'         => _MA_PEDIGREE_SD,
+                                        'PA'         => _MA_PEDIGREE_PA,
+                                        'GP'         => _MA_PEDIGREE_GP,
+                                        'GGP'        => _MA_PEDIGREE_GGP
+                                    ]);
 
     //    include __DIR__ . '/footer.php';
 }

Spacing +37 added lines, -37 removed lines

@@ -27,10 +27,10 @@ 
 $moduleDirName = basename(__DIR__);
 $mydirpath     = dirname(__DIR__);
 
-require_once  dirname(dirname(__DIR__)) . '/mainfile.php';
-require_once __DIR__ . '/header.php';
-require_once $rootPath . '/include/cp_functions.php';
-require_once $rootPath . '/include/cp_header.php';
+require_once  dirname(dirname(__DIR__)).'/mainfile.php';
+require_once __DIR__.'/header.php';
+require_once $rootPath.'/include/cp_functions.php';
+require_once $rootPath.'/include/cp_header.php';
 //require_once $rootPath . '/class/xoopsformloader.php';
 
 //require_once dirname(dirname(__DIR__)) . '/mainfile.php';
@@ -41,7 +41,7 @@ 
 //require_once __DIR__ . '/header.php';
 
 // Include any common code for this module.
-require_once XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/include/common.php';
+require_once XOOPS_ROOT_PATH.'/modules/'.$moduleDirName.'/include/common.php';
 //require_once(XOOPS_ROOT_PATH ."/modules/" . $xoopsModule->dirname() . "/include/css.php");
 
 // Get all HTTP post or get parameters into global variables that are prefixed with "param_"
@@ -73,7 +73,7 @@ 
 pedigree_main();
 
 //include XOOPS_ROOT_PATH . "/footer.php";
-include __DIR__ . '/footer.php';
+include __DIR__.'/footer.php';
 
 //
 // Displays the "Main" tab of the module
@@ -94,29 +94,29 @@ 
     $querystring = 'SELECT ';
 
     foreach ($qarray as $key) {
-        $querystring .= $key . '.id as ' . $key . '_id, ';
-        $querystring .= $key . '.naam as ' . $key . '_naam, ';
-        $querystring .= $key . '.mother as ' . $key . '_mother, ';
-        $querystring .= $key . '.father as ' . $key . '_father, ';
-        $querystring .= $key . '.roft as ' . $key . '_roft, ';
-        $querystring .= $key . '.foto as ' . $key . '_foto, ';
+        $querystring .= $key.'.id as '.$key.'_id, ';
+        $querystring .= $key.'.naam as '.$key.'_naam, ';
+        $querystring .= $key.'.mother as '.$key.'_mother, ';
+        $querystring .= $key.'.father as '.$key.'_father, ';
+        $querystring .= $key.'.roft as '.$key.'_roft, ';
+        $querystring .= $key.'.foto as '.$key.'_foto, ';
     }
 
-    $querystring .= 'mmm.coi as mmm_coi FROM ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree') . ' d
-                 LEFT JOIN ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree') . ' f ON d.father = f.id
-                 LEFT JOIN ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree') . ' m ON d.mother = m.id
-                 LEFT JOIN ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree') . ' ff ON f.father = ff.id
-                 LEFT JOIN ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree') . ' fff ON ff.father = fff.id
-                 LEFT JOIN ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree') . ' ffm ON ff.mother = ffm.id
-                 LEFT JOIN ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree') . ' mf ON m.father = mf.id
-                 LEFT JOIN ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree') . ' mff ON mf.father = mff.id
-                 LEFT JOIN ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree') . ' mfm ON mf.mother = mfm.id
-                 LEFT JOIN ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree') . ' fm ON f.mother = fm.id
-                 LEFT JOIN ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree') . ' fmf ON fm.father = fmf.id
-                 LEFT JOIN ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree') . ' fmm ON fm.mother = fmm.id
-                 LEFT JOIN ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree') . ' mm ON m.mother = mm.id
-                 LEFT JOIN ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree') . ' mmf ON mm.father = mmf.id
-                 LEFT JOIN ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree') . " mmm ON mm.mother = mmm.id
+    $querystring .= 'mmm.coi as mmm_coi FROM '.$GLOBALS['xoopsDB']->prefix('pedigree_tree').' d
+                 LEFT JOIN ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree').' f ON d.father = f.id
+                 LEFT JOIN ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree').' m ON d.mother = m.id
+                 LEFT JOIN ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree').' ff ON f.father = ff.id
+                 LEFT JOIN ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree').' fff ON ff.father = fff.id
+                 LEFT JOIN ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree').' ffm ON ff.mother = ffm.id
+                 LEFT JOIN ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree').' mf ON m.father = mf.id
+                 LEFT JOIN ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree').' mff ON mf.father = mff.id
+                 LEFT JOIN ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree').' mfm ON mf.mother = mfm.id
+                 LEFT JOIN ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree').' fm ON f.mother = fm.id
+                 LEFT JOIN ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree').' fmf ON fm.father = fmf.id
+                 LEFT JOIN ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree').' fmm ON fm.mother = fmm.id
+                 LEFT JOIN ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree').' mm ON m.mother = mm.id
+                 LEFT JOIN ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree').' mmf ON mm.father = mmf.id
+                 LEFT JOIN ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree')." mmm ON mm.mother = mmm.id
                  WHERE d.id={$id}";
 
     $result = $GLOBALS['xoopsDB']->query($querystring);
@@ -126,17 +126,17 @@ 
         //create array for animal (and all parents)
         foreach ($qarray as $key) {
             $d[$key] = [
-                'id'     => $row[$key . '_id'],
-                'name'   => stripslashes($row[$key . '_naam']),
-                'mother' => $row[$key . '_mother'],
-                'father' => $row[$key . '_father'],
-                'roft'   => $row[$key . '_roft'],
+                'id'     => $row[$key.'_id'],
+                'name'   => stripslashes($row[$key.'_naam']),
+                'mother' => $row[$key.'_mother'],
+                'father' => $row[$key.'_father'],
+                'roft'   => $row[$key.'_roft'],
                 'nhsb'   => ''
             ];
-            if ((3 != strlen($key) || (0 != $moduleConfig['lastimage'])) && ('' !== $row[$key . '_foto'])) {
+            if ((3 != strlen($key) || (0 != $moduleConfig['lastimage'])) && ('' !== $row[$key.'_foto'])) {
                 //show image in last row of pedigree if image exists
-                $d[$key]['photo']    = PEDIGREE_UPLOAD_URL . '/images/thumbnails/' . $row[$key . '_foto'] . '_150.jpeg';
-                $d[$key]['photoBig'] = PEDIGREE_UPLOAD_URL . '/images/' . $row[$key . '_foto'] . '.jpeg';
+                $d[$key]['photo']    = PEDIGREE_UPLOAD_URL.'/images/thumbnails/'.$row[$key.'_foto'].'_150.jpeg';
+                $d[$key]['photoBig'] = PEDIGREE_UPLOAD_URL.'/images/'.$row[$key.'_foto'].'.jpeg';
             }
 
             $d[$key]['overig'] = '';
@@ -153,7 +153,7 @@ 
                 if ($userField->isActive() && $userField->inPedigree()) {
                     $fieldType = $userField->getSetting('FieldType');
                     $fieldObj  = new $fieldType($userField, $animal);
-                    $pedidata  .= $fieldObj->showField() . '<br>';
+                    $pedidata .= $fieldObj->showField().'<br>';
                 }
                 $d[$key]['hd'] = $pedidata;
             }
@@ -163,7 +163,7 @@ 
     //add data to smarty template
     $GLOBALS['xoopsTpl']->assign([
                                      'page_title' => stripslashes($row['d_naam']),
-                                     'd'          => $d,  //assign dog
+                                     'd'          => $d, //assign dog
                                      //assign config options
                                      'male'       => "<img src='assets/images/male.gif'>",
                                      'female'     => "<img src='assets/images/female.gif'>",

header.php

Spacing +2 added lines, -2 removed lines

@@ -19,8 +19,8 @@
 
 use XoopsModules\Pedigree;
 
-require_once  dirname(dirname(__DIR__)) . '/mainfile.php';
-require_once __DIR__ . '/include/common.php';
+require_once  dirname(dirname(__DIR__)).'/mainfile.php';
+require_once __DIR__.'/include/common.php';
 
 /** @var Pedigree\Helper $helper */
 $helper = Pedigree\Helper::getInstance();

update.php

Spacing +29 added lines, -29 removed lines

@@ -6,21 +6,21 @@ 
 
 
 //require_once  dirname(dirname(__DIR__)) . '/mainfile.php';
-require_once __DIR__ . '/header.php';
+require_once __DIR__.'/header.php';
 $moduleDirName = basename(__DIR__);
 xoops_loadLanguage('main', $moduleDirName);
 // Include any common code for this module.
-require_once XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/include/common.php';
+require_once XOOPS_ROOT_PATH.'/modules/'.$moduleDirName.'/include/common.php';
 
 $GLOBALS['xoopsOption']['template_main'] = 'pedigree_update.tpl';
-include XOOPS_ROOT_PATH . '/header.php';
+include XOOPS_ROOT_PATH.'/header.php';
 
 $xoopsTpl->assign('page_title', 'Pedigree database - Update details');
 
 //check for access
 $xoopsModule = XoopsModule::getByDirname($moduleDirName);
 if (empty($GLOBALS['xoopsUser']) || !($GLOBALS['xoopsUser'] instanceof \XoopsUser)) {
-    redirect_header('javascript:history.go(-1)', 3, _NOPERM . '<br>' . _MA_PEDIGREE_REGIST);
+    redirect_header('javascript:history.go(-1)', 3, _NOPERM.'<br>'._MA_PEDIGREE_REGIST);
 }
 // ( $xoopsUser->isAdmin($xoopsModule->mid() ) )
 
@@ -35,7 +35,7 @@ 
 $configHandler = xoops_getHandler('config');
 $moduleConfig  = $configHandler->getConfigsByCat(0, $module->getVar('mid'));
 */
-$helper     = Pedigree\Helper::getInstance(false);
+$helper = Pedigree\Helper::getInstance(false);
 $moduleConfig = $helper->getConfig();
 
 $myts = \MyTextSanitizer::getInstance();
@@ -48,7 +48,7 @@ 
 */
 
 //query (find values for this dog (and format them))
-$queryString = 'SELECT * FROM ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree') . ' WHERE id=' . $id;
+$queryString = 'SELECT * FROM '.$GLOBALS['xoopsDB']->prefix('pedigree_tree').' WHERE id='.$id;
 $result      = $GLOBALS['xoopsDB']->query($queryString);
 
 while (false !== ($row = $GLOBALS['xoopsDB']->fetchArray($result))) {
@@ -56,48 +56,48 @@ 
     $id = $row['id'];
     //name
     $naam     = htmlentities(stripslashes($row['naam']), ENT_QUOTES);
-    $namelink = '<a href="dog.php?id=' . $row['id'] . '">' . stripslashes($row['naam']) . '</a>';
+    $namelink = '<a href="dog.php?id='.$row['id'].'">'.stripslashes($row['naam']).'</a>';
     //owner
-    $queryeig = 'SELECT id, lastname, firstname FROM ' . $GLOBALS['xoopsDB']->prefix('pedigree_owner') . ' WHERE id=' . $row['id_owner'];
+    $queryeig = 'SELECT id, lastname, firstname FROM '.$GLOBALS['xoopsDB']->prefix('pedigree_owner').' WHERE id='.$row['id_owner'];
     $reseig   = $GLOBALS['xoopsDB']->query($queryeig);
     while (false !== ($roweig = $GLOBALS['xoopsDB']->fetchArray($reseig))) {
-        $eig = '<a href="owner.php?ownid=' . $roweig['id'] . '">' . $roweig['firstname'] . ' ' . $roweig['lastname'] . '</a>';
+        $eig = '<a href="owner.php?ownid='.$roweig['id'].'">'.$roweig['firstname'].' '.$roweig['lastname'].'</a>';
     }
     $curvaleig = $row['id_owner'];
     //breeder
-    $queryfok = 'SELECT id, lastname, firstname FROM ' . $GLOBALS['xoopsDB']->prefix('pedigree_owner') . ' WHERE id=' . $row['id_breeder'];
+    $queryfok = 'SELECT id, lastname, firstname FROM '.$GLOBALS['xoopsDB']->prefix('pedigree_owner').' WHERE id='.$row['id_breeder'];
     $resfok   = $GLOBALS['xoopsDB']->query($queryfok);
     while (false !== ($rowfok = $GLOBALS['xoopsDB']->fetchArray($resfok))) {
-        $fok = '<a href="owner.php?ownid=' . $rowfok['id'] . '">' . $rowfok['firstname'] . ' ' . $rowfok['lastname'] . '</a>';
+        $fok = '<a href="owner.php?ownid='.$rowfok['id'].'">'.$rowfok['firstname'].' '.$rowfok['lastname'].'</a>';
     }
     $curvalfok = $row['id_breeder'];
     //gender
     if ('0' == $row['roft']) {
-        $gender = '<img src="assets/images/male.gif"> ' . _MA_PEDIGREE_FLD_MALE;
+        $gender = '<img src="assets/images/male.gif"> '._MA_PEDIGREE_FLD_MALE;
     } else {
-        $gender = '<img src="assets/images/female.gif"> ' . _MA_PEDIGREE_FLD_FEMA;
+        $gender = '<img src="assets/images/female.gif"> '._MA_PEDIGREE_FLD_FEMA;
     }
     $curvalroft = $row['roft'];
     //Sire
     if (0 != $row['father']) {
-        $querysire = 'SELECT naam FROM ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree') . ' WHERE id=' . $row['father'];
+        $querysire = 'SELECT naam FROM '.$GLOBALS['xoopsDB']->prefix('pedigree_tree').' WHERE id='.$row['father'];
         $ressire   = $GLOBALS['xoopsDB']->query($querysire);
         while (false !== ($rowsire = $GLOBALS['xoopsDB']->fetchArray($ressire))) {
-            $sire = '<img src="assets/images/male.gif"><a href="dog.php?id=' . $row['father'] . '">' . stripslashes($rowsire['naam']) . '</a>';
+            $sire = '<img src="assets/images/male.gif"><a href="dog.php?id='.$row['father'].'">'.stripslashes($rowsire['naam']).'</a>';
         }
     }
     //Dam
     if (0 != $row['mother']) {
-        $querydam = 'SELECT naam FROM ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree') . ' WHERE id=' . $row['mother'];
+        $querydam = 'SELECT naam FROM '.$GLOBALS['xoopsDB']->prefix('pedigree_tree').' WHERE id='.$row['mother'];
         $resdam   = $GLOBALS['xoopsDB']->query($querydam);
         while (false !== ($rowdam = $GLOBALS['xoopsDB']->fetchArray($resdam))) {
-            $dam = '<img src="assets/images/female.gif"><a href="dog.php?id=' . $row['mother'] . '">' . stripslashes($rowdam['naam']) . '</a>';
+            $dam = '<img src="assets/images/female.gif"><a href="dog.php?id='.$row['mother'].'">'.stripslashes($rowdam['naam']).'</a>';
         }
     }
     //picture
     $picture = '';
     if ('' != $row['foto']) {
-        $picture = '<img src=' . PEDIGREE_UPLOAD_URL . '/images/thumbnails/' . $row['foto'] . '_400.jpeg>';
+        $picture = '<img src='.PEDIGREE_UPLOAD_URL.'/images/thumbnails/'.$row['foto'].'_400.jpeg>';
         $foto    = $row['foto'];
     } else {
         $foto = '';
@@ -107,7 +107,7 @@ 
 }
 
 //create form
-include XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
+include XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
 $form = new \XoopsThemeForm($naam, 'updatedata', 'updatepage.php', 'post', true);
 $form->setExtra("enctype='multipart/form-data'");
 //hidden value current record owner
@@ -118,7 +118,7 @@ 
 $form->addElement(new \XoopsFormHiddenToken($name = 'XOOPS_TOKEN_REQUEST', $timeout = 360));
 //name
 if ('nm' === $fld || 'all' === $fld) {
-    $form->addElement(new \XoopsFormText('<b>' . _MA_PEDIGREE_FLD_NAME . '</b>', 'naam', $size = 50, $maxsize = 255, $value = $naam));
+    $form->addElement(new \XoopsFormText('<b>'._MA_PEDIGREE_FLD_NAME.'</b>', 'naam', $size = 50, $maxsize = 255, $value = $naam));
     $form->addElement(new \XoopsFormLabel(_MA_PEDIGREE_EXPLAIN, _MA_PEDIGREE_FLD_NAME_EX));
     $form->addElement(new \XoopsFormHidden('dbtable', 'pedigree_tree'));
     $form->addElement(new \XoopsFormHidden('dbfield', 'naam'));
@@ -126,12 +126,12 @@ 
 } else {
     //owner
     if ('ow' === $fld || 'all' === $fld) {
-        $owner_select = new \XoopsFormSelect('<b>' . _MA_PEDIGREE_FLD_OWNE . '</b>', $name = 'id_owner', $value = null, $size = 1, $multiple = false);
-        $queryeig     = 'SELECT id, lastname, firstname FROM ' . $GLOBALS['xoopsDB']->prefix('pedigree_owner') . ' ORDER BY `lastname`';
+        $owner_select = new \XoopsFormSelect('<b>'._MA_PEDIGREE_FLD_OWNE.'</b>', $name = 'id_owner', $value = null, $size = 1, $multiple = false);
+        $queryeig     = 'SELECT id, lastname, firstname FROM '.$GLOBALS['xoopsDB']->prefix('pedigree_owner').' ORDER BY `lastname`';
         $reseig       = $GLOBALS['xoopsDB']->query($queryeig);
         $owner_select->addOption(0, $name = _MA_PEDIGREE_UNKNOWN);
         while (false !== ($roweig = $GLOBALS['xoopsDB']->fetchArray($reseig))) {
-            $owner_select->addOption($roweig['id'], $name = $roweig['lastname'] . ', ' . $roweig['firstname']);
+            $owner_select->addOption($roweig['id'], $name = $roweig['lastname'].', '.$roweig['firstname']);
         }
         $form->addElement($owner_select);
         $form->addElement(new \XoopsFormLabel(_MA_PEDIGREE_EXPLAIN, _MA_PEDIGREE_FLD_OWNE_EX));
@@ -143,12 +143,12 @@ 
 
 //breeder
 if ('br' === $fld || 'all' === $fld) {
-    $breeder_select = new \XoopsFormSelect('<b>' . _MA_PEDIGREE_FLD_BREE . '</b>', $name = 'id_breeder', $value = null, $size = 1, $multiple = false);
-    $queryfok       = 'SELECT id, lastname, firstname FROM ' . $GLOBALS['xoopsDB']->prefix('pedigree_owner') . ' ORDER BY `lastname`';
+    $breeder_select = new \XoopsFormSelect('<b>'._MA_PEDIGREE_FLD_BREE.'</b>', $name = 'id_breeder', $value = null, $size = 1, $multiple = false);
+    $queryfok       = 'SELECT id, lastname, firstname FROM '.$GLOBALS['xoopsDB']->prefix('pedigree_owner').' ORDER BY `lastname`';
     $resfok         = $GLOBALS['xoopsDB']->query($queryfok);
     $breeder_select->addOption(0, $name = _MA_PEDIGREE_UNKNOWN);
     while (false !== ($rowfok = $GLOBALS['xoopsDB']->fetchArray($resfok))) {
-        $breeder_select->addOption($rowfok['id'], $name = $rowfok['lastname'] . ', ' . $rowfok['firstname']);
+        $breeder_select->addOption($rowfok['id'], $name = $rowfok['lastname'].', '.$rowfok['firstname']);
     }
     $form->addElement($breeder_select);
     $form->addElement(new \XoopsFormLabel(_MA_PEDIGREE_EXPLAIN, _MA_PEDIGREE_FLD_BREE_EX));
@@ -159,7 +159,7 @@ 
 
 //gender
 if ('sx' === $fld || 'all' === $fld) {
-    $gender_radio = new \XoopsFormRadio('<b>' . _MA_PEDIGREE_FLD_GEND . '</b>', 'roft', $value = null);
+    $gender_radio = new \XoopsFormRadio('<b>'._MA_PEDIGREE_FLD_GEND.'</b>', 'roft', $value = null);
     $gender_radio->addOptionArray(['0' => _MA_PEDIGREE_FLD_MALE, '1' => _MA_PEDIGREE_FLD_FEMA]);
     $form->addElement($gender_radio);
     $form->addElement(new \XoopsFormLabel(_MA_PEDIGREE_EXPLAIN, _MA_PEDIGREE_FLD_GEND_EX));
@@ -200,7 +200,7 @@ 
             $explain = $userField->getSetting('FieldExplanation');
             $form->addElement(new \XoopsFormLabel(_MA_PEDIGREE_EXPLAIN, $explain));
             $form->addElement(new \XoopsFormHidden('dbtable', 'pedigree_tree'));
-            $form->addElement(new \XoopsFormHidden('dbfield', 'user' . $iValue));
+            $form->addElement(new \XoopsFormHidden('dbfield', 'user'.$iValue));
         }
     }
 }
@@ -213,4 +213,4 @@ 
 $xoopsTpl->assign('form', $form->render());
 
 //footer
-include XOOPS_ROOT_PATH . '/footer.php';
+include XOOPS_ROOT_PATH.'/footer.php';