mambax7 / pedigree

include/class_eq_pie.php

Spacing +6 added lines, -6 removed lines

@@ -114,12 +114,12 @@ 
 
             $piePart = $value[1];
             if (isset($this->total) && $this->total > 0) {
-                $piePart100 = round($piePart / $this->total * 100, 2);  // value in percentage, the rounding and * 100 for extra accuracy for pie w/o gaps
+                $piePart100 = round($piePart / $this->total * 100, 2); // value in percentage, the rounding and * 100 for extra accuracy for pie w/o gaps
             } else {
                 $piePart100 = 0;
             }
 
-            $piePart360 = $piePart100 * 3.6;                    // in degrees
+            $piePart360 = $piePart100 * 3.6; // in degrees
 
             $colR      = hexdec(substr($value[2], 1, 2));
             $colG      = hexdec(substr($value[2], 3, 2));
@@ -146,11 +146,11 @@ 
         foreach ($EQpieData as $i => $value) {
             $piePart = $value[1];
             if (isset($this->total) && $this->total > 0) {
-                $piePart100 = round($piePart / $this->total * 100, 2);  // value in percentage, the rounding and * 100 for extra accuracy for pie w/o gaps
+                $piePart100 = round($piePart / $this->total * 100, 2); // value in percentage, the rounding and * 100 for extra accuracy for pie w/o gaps
             } else {
                 $piePart100 = 0;
             }
-            $piePart360 = $piePart100 * 3.6;                    // in degrees
+            $piePart360 = $piePart100 * 3.6; // in degrees
 
             $colR      = hexdec(substr($value[2], 1, 2));
             $colG      = hexdec(substr($value[2], 3, 2));
@@ -193,7 +193,7 @@ 
             foreach ($EQpieData as $i => $value) {
                 $piePart = $value[1];
                 if (isset($this->total) && $this->total > 0) {
-                    $piePart100 = round($piePart / $this->total * 100, 2);  // value in percentage, the rounding and * 100 for extra accuracy for pie w/o gaps
+                    $piePart100 = round($piePart / $this->total * 100, 2); // value in percentage, the rounding and * 100 for extra accuracy for pie w/o gaps
                 } else {
                     $piePart100 = 0;
                 }
@@ -205,7 +205,7 @@ 
                 imagefilledrectangle($legendImage, 5, $yOffset + 2, 5 + $box_width, $yOffset + $box_height + 2, $PartColor);
                 imagerectangle($legendImage, 5, $yOffset + 2, 5 + $box_width, $yOffset + $box_height + 2, $borderColor);
 
-                $text = $value[0] . ' ' . $piePart100 . '%';
+                $text = $value[0].' '.$piePart100.'%';
                 imagestring($legendImage, 2, '20', $yOffset, $text, $textColor);
                 $yOffset += 15;
             }

include/color.php

Spacing +2 added lines, -2 removed lines

@@ -216,8 +216,8 @@
      */
     public function changeLightness($degree = 10)
     {
-        $color1 =& $this->color1;
-        $color2 =& $this->color2;
+        $color1 = & $this->color1;
+        $color2 = & $this->color2;
 
         for ($x = 0; $x < 3; ++$x) {
             if (($color1[$x] + $degree) < 256) {

index.php

Spacing +14 added lines, -14 removed lines

@@ -3,35 +3,35 @@ 
 
 use XoopsModules\Pedigree;
 
-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 __DIR__ . '/welcome.php';
+require_once XOOPS_ROOT_PATH.'/modules/'.$moduleDirName.'/include/common.php';
+require_once __DIR__.'/welcome.php';
 
 $GLOBALS['xoopsOption']['template_main'] = 'pedigree_index.tpl';
 
 include $GLOBALS['xoops']->path('/header.php');
 
 //load javascript
-$xoTheme->addScript(XOOPS_URL . '/browse.php?Frameworks/jquery/jquery.js');
+$xoTheme->addScript(XOOPS_URL.'/browse.php?Frameworks/jquery/jquery.js');
 //$xoTheme->addScript(PEDIGREE_URL . '/assets/js/jquery.ThickBox/thickbox-compressed.js');
 
-$xoTheme->addScript(PEDIGREE_URL . '/assets/js/jquery.magnific-popup.min.js');
-$xoTheme->addScript(PEDIGREE_URL . '/assets/js/colpick.js');
+$xoTheme->addScript(PEDIGREE_URL.'/assets/js/jquery.magnific-popup.min.js');
+$xoTheme->addScript(PEDIGREE_URL.'/assets/js/colpick.js');
 
 //load CSS style sheets
-$xoTheme->addStylesheet(PEDIGREE_URL . '/assets/css/colpick.css');
-$xoTheme->addStylesheet(PEDIGREE_URL . '/assets/css/magnific-popup.css');
-$xoTheme->addStylesheet(PEDIGREE_URL . '/assets/css/style.css');
+$xoTheme->addStylesheet(PEDIGREE_URL.'/assets/css/colpick.css');
+$xoTheme->addStylesheet(PEDIGREE_URL.'/assets/css/magnific-popup.css');
+$xoTheme->addStylesheet(PEDIGREE_URL.'/assets/css/style.css');
 
 //$xoTheme->addStylesheet(PEDIGREE_URL . '/assets/css/jquery.ThickBox/thickbox.css');
 //$xoTheme->addStylesheet(PEDIGREE_URL . '/module.css');
 
-$GLOBALS['xoopsTpl']->assign('pedigree_url', PEDIGREE_URL . '/');
+$GLOBALS['xoopsTpl']->assign('pedigree_url', PEDIGREE_URL.'/');
 
 // Breadcrumb
 $breadcrumb = new Pedigree\Breadcrumb();
@@ -58,11 +58,11 @@ 
     if ($userField->isActive() && $userField->hasSearch()) {
         $fieldType   = $userField->getSetting('FieldType');
         $fieldObject = new $fieldType($userField, $animal);
-        $function    = 'user' . $iValue . $fieldObject->getSearchString();
+        $function    = 'user'.$iValue.$fieldObject->getSearchString();
         //echo $function."<br>";
         $usersearch[] = [
             'title'       => $userField->getSetting('SearchName'),
-            'searchid'    => 'user' . $iValue,
+            'searchid'    => 'user'.$iValue,
             'function'    => $function,
             'explanation' => $userField->getSetting('SearchExplanation'),
             'searchfield' => $fieldObject->searchfield()
@@ -71,7 +71,7 @@ 
 }
 
 //$catarray['letters']          = Pedigree\Utility::lettersChoice();
-$letter              = '';
+$letter = '';
 $myObject     = Pedigree\Helper::getInstance();
 $activeObject = 'Tree';
 $name         = 'naam';
@@ -79,7 +79,7 @@ 
 $link2        = '%25';
 
 $criteria = $myObject->getHandler('Tree')->getActiveCriteria();
-$criteria->setGroupby('UPPER(LEFT(' . $name . ',1))');
+$criteria->setGroupby('UPPER(LEFT('.$name.',1))');
 $catarray['letters'] = Pedigree\Utility::lettersChoice($myObject, $activeObject, $criteria, $name, $link, $link2);
 //$catarray['toolbar']          = pedigree_toolbar();
 $xoopsTpl->assign('catarray', $catarray);

dog.php

Spacing +38 added lines, -38 removed lines

@@ -5,11 +5,11 @@ 
 use XoopsModules\Pedigree;
 
 //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';
 
 // Get all HTTP post or get parameters into global variables that are prefixed with "param_"
 //import_request_variables("gp", "param_");
@@ -17,7 +17,7 @@ 
 extract($_POST, EXTR_PREFIX_ALL, 'param');
 
 $GLOBALS['xoopsOption']['template_main'] = 'pedigree_dog.tpl';
-include XOOPS_ROOT_PATH . '/header.php';
+include XOOPS_ROOT_PATH.'/header.php';
 
 global $xoopsUser, $xoopsTpl, $xoopsDB, $xoopsModuleConfig, $xoopsModule;
 global $numofcolumns, $numMatch, $pages, $columns, $dogs;
@@ -43,78 +43,78 @@ 
 }
 
 if (isset($_GET['delpicture']) && 'true' === $_GET['delpicture']) {
-    $delpicsql = 'UPDATE ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree') . " SET foto = '' WHERE id = '" . $id . "'";
+    $delpicsql = 'UPDATE '.$GLOBALS['xoopsDB']->prefix('pedigree_tree')." SET foto = '' WHERE id = '".$id."'";
     $GLOBALS['xoopsDB']->query($delpicsql);
 }
 //query
-$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))) {
     //name
     $naam = stripslashes($row['naam']);
-    $xoopsTpl->assign('xoops_pagetitle', $naam . ' -- detailed information');
+    $xoopsTpl->assign('xoops_pagetitle', $naam.' -- detailed information');
     //owner
     if ('0' != $row['id_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>';
         }
     } else {
-        $eig = '<a href="update.php?id=' . $row['id'] . '&fld=ow">' . _MA_PEDIGREE_UNKNOWN . '</a>';
+        $eig = '<a href="update.php?id='.$row['id'].'&fld=ow">'._MA_PEDIGREE_UNKNOWN.'</a>';
     }
     //breeder
     if ('0' != $row['id_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>';
         }
     } else {
-        $fok = '<a href="update.php?id=' . $row['id'] . '&fld=br">' . _MA_PEDIGREE_UNKNOWN . '</a>';
+        $fok = '<a href="update.php?id='.$row['id'].'&fld=br">'._MA_PEDIGREE_UNKNOWN.'</a>';
     }
     //gender
     if (0 == $row['roft']) {
-        $gender = '<img src="assets/images/male.gif"> ' . strtr(_MA_PEDIGREE_FLD_MALE, ['[male]' => $moduleConfig['male']]);
+        $gender = '<img src="assets/images/male.gif"> '.strtr(_MA_PEDIGREE_FLD_MALE, ['[male]' => $moduleConfig['male']]);
     } else {
-        $gender = '<img src="assets/images/female.gif"> ' . strtr(_MA_PEDIGREE_FLD_FEMA, ['[female]' => $moduleConfig['female']]);
+        $gender = '<img src="assets/images/female.gif"> '.strtr(_MA_PEDIGREE_FLD_FEMA, ['[female]' => $moduleConfig['female']]);
     }
     //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>';
         }
     } else {
-        $sire = '<img src="assets/images/male.gif"><a href="seldog.php?curval=' . $row['id'] . '&gend=0&letter=A">' . _MA_PEDIGREE_UNKNOWN . '</a>';
+        $sire = '<img src="assets/images/male.gif"><a href="seldog.php?curval='.$row['id'].'&gend=0&letter=A">'._MA_PEDIGREE_UNKNOWN.'</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>';
         }
     } else {
-        $dam = '<img src="assets/images/female.gif"><a href="seldog.php?curval=' . $row['id'] . '&gend=1&letter=A">' . _MA_PEDIGREE_UNKNOWN . '</a>';
+        $dam = '<img src="assets/images/female.gif"><a href="seldog.php?curval='.$row['id'].'&gend=1&letter=A">'._MA_PEDIGREE_UNKNOWN.'</a>';
     }
     //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>';
     } else {
-        $picture = '<a href="update.php?id=' . $row['id'] . '&fld=pc">' . _MA_PEDIGREE_UNKNOWN . '</a>';
+        $picture = '<a href="update.php?id='.$row['id'].'&fld=pc">'._MA_PEDIGREE_UNKNOWN.'</a>';
     }
     //inbred precentage
     if ('' == $row['coi']) {
         if (0 != $row['father'] && 0 != $row['mother']) {
-            $inbred = '<a href="coi.php?s=' . $row['father'] . '&d=' . $row['mother'] . '&dogid=' . $row['id'] . '&detail=1">' . strtr(_MA_PEDIGREE_COI_WAIT, ['[animalType]' => $moduleConfig['animalType']]) . '</a>';
+            $inbred = '<a href="coi.php?s='.$row['father'].'&d='.$row['mother'].'&dogid='.$row['id'].'&detail=1">'.strtr(_MA_PEDIGREE_COI_WAIT, ['[animalType]' => $moduleConfig['animalType']]).'</a>';
         } else {
             $inbred = _MA_PEDIGREE_COI_MORE;
         }
     } else {
-        $inbred = '<a href="coi.php?s=' . $row['father'] . '&d=' . $row['mother'] . '&dogid=' . $row['id'] . '&detail=1" title="' . strtr(_MA_PEDIGREE_COI_WAIT, ['[animalType]' => $moduleConfig['animalType']]) . '">' . $row['coi'] . ' %</a>';
+        $inbred = '<a href="coi.php?s='.$row['father'].'&d='.$row['mother'].'&dogid='.$row['id'].'&detail=1" title="'.strtr(_MA_PEDIGREE_COI_WAIT, ['[animalType]' => $moduleConfig['animalType']]).'">'.$row['coi'].' %</a>';
     }
     //brothers and sisters
     $bas = Pedigree\Utility::bas($id, $row['father'], $row['mother']);
@@ -137,46 +137,46 @@ 
     //name
     $items[] = [
         'header' => _MA_PEDIGREE_FLD_NAME,
-        'data'   => '<a href="pedigree.php?pedid=' . $row['id'] . '">' . $naam . '</a> (click to view pedigree)',
-        'edit'   => '<a href="update.php?id=' . $row['id'] . "&fld=nm\"><img src=' " . $pathIcon16 . "/edit.png' border='0' alt=_EDIT title=_EDIT></a>"
+        'data'   => '<a href="pedigree.php?pedid='.$row['id'].'">'.$naam.'</a> (click to view pedigree)',
+        'edit'   => '<a href="update.php?id='.$row['id']."&fld=nm\"><img src=' ".$pathIcon16."/edit.png' border='0' alt=_EDIT title=_EDIT></a>"
     ];
     if ('1' == $moduleConfig['ownerbreeder']) {
         //owner
         $items[] = [
             'header' => _MA_PEDIGREE_FLD_OWNE,
             'data'   => $eig,
-            'edit'   => '<a href="update.php?id=' . $row['id'] . "&fld=ow\"><img src=' " . $pathIcon16 . "/edit.png' border='0' alt=_EDIT title=_EDIT></a>"
+            'edit'   => '<a href="update.php?id='.$row['id']."&fld=ow\"><img src=' ".$pathIcon16."/edit.png' border='0' alt=_EDIT title=_EDIT></a>"
         ];
         //breeder
         $items[] = [
             'header' => _MA_PEDIGREE_FLD_BREE,
             'data'   => $fok,
-            'edit'   => '<a href="update.php?id=' . $row['id'] . "&fld=br\"><img src=' " . $pathIcon16 . "/edit.png' border='0' alt=_EDIT title=_EDIT></a>"
+            'edit'   => '<a href="update.php?id='.$row['id']."&fld=br\"><img src=' ".$pathIcon16."/edit.png' border='0' alt=_EDIT title=_EDIT></a>"
         ];
     }
     //gender
     $items[] = [
         'header' => _MA_PEDIGREE_FLD_GEND,
         'data'   => $gender,
-        'edit'   => '<a href="update.php?id=' . $row['id'] . "&fld=sx\"><img src=' " . $pathIcon16 . "/edit.png' border='0' alt=_EDIT title=_EDIT></a>"
+        'edit'   => '<a href="update.php?id='.$row['id']."&fld=sx\"><img src=' ".$pathIcon16."/edit.png' border='0' alt=_EDIT title=_EDIT></a>"
     ];
     //sire
     $items[] = [
         'header' => strtr(_MA_PEDIGREE_FLD_FATH, ['[father]' => $moduleConfig['father']]),
         'data'   => $sire,
-        'edit'   => '<a href="seldog.php?curval=' . $row['id'] . "&gend=0&letter=A\"><img src=' " . $pathIcon16 . "/edit.png' border='0' alt=_EDIT title=_EDIT></a>"
+        'edit'   => '<a href="seldog.php?curval='.$row['id']."&gend=0&letter=A\"><img src=' ".$pathIcon16."/edit.png' border='0' alt=_EDIT title=_EDIT></a>"
     ];
     //dam
     $items[] = [
         'header' => strtr(_MA_PEDIGREE_FLD_MOTH, ['[mother]' => $moduleConfig['mother']]),
         'data'   => $dam,
-        'edit'   => '<a href="seldog.php?curval=' . $row['id'] . "&gend=1&letter=A\"><img src=' " . $pathIcon16 . "/edit.png' border='0' alt=_EDIT title=_EDIT></a>"
+        'edit'   => '<a href="seldog.php?curval='.$row['id']."&gend=1&letter=A\"><img src=' ".$pathIcon16."/edit.png' border='0' alt=_EDIT title=_EDIT></a>"
     ];
     //picture
     $items[] = [
         'header' => _MA_PEDIGREE_FLD_PICT,
         'data'   => $picture,
-        'edit'   => '<a href="update.php?id=' . $row['id'] . "&fld=pc\"><img src=' " . $pathIcon16 . "/edit.png' border='0' alt=_EDIT title=_EDIT></a><a href=\"dog.php?id=" . $row['id'] . "&delpicture=true\"><img src=' " . $pathIcon16 . "/delete.png' border='0' alt=_DELETE title=_DELETE></a>"
+        'edit'   => '<a href="update.php?id='.$row['id']."&fld=pc\"><img src=' ".$pathIcon16."/edit.png' border='0' alt=_EDIT title=_EDIT></a><a href=\"dog.php?id=".$row['id']."&delpicture=true\"><img src=' ".$pathIcon16."/delete.png' border='0' alt=_DELETE title=_DELETE></a>"
     ];
 
     //userdefined fields
@@ -202,7 +202,7 @@ 
                 $items[] = [
                     'header' => $userField->getSetting('FieldName'),
                     'data'   => $fieldObject->showValue(),
-                    'edit'   => '<a href="update.php?id=' . $row['id'] . '&fld=' . $iValue . "\"><img src=' " . $pathIcon16 . "/edit.png' border='0' alt=_EDIT title=_EDIT></a>"
+                    'edit'   => '<a href="update.php?id='.$row['id'].'&fld='.$iValue."\"><img src=' ".$pathIcon16."/edit.png' border='0' alt=_EDIT title=_EDIT></a>"
                 ];
             }
         }
@@ -255,7 +255,7 @@ 
     if ('1' == $moduleConfig['proversion']) {
         $items[] = [
             'header' => 'Inbred Pedigree',
-            'data'   => '<a href="mpedigree.php?pedid=' . $row['id'] . '">Inbreeding pedigree</a>',
+            'data'   => '<a href="mpedigree.php?pedid='.$row['id'].'">Inbreeding pedigree</a>',
             'edit'   => ''
         ];
     }
@@ -268,13 +268,13 @@ 
 $xoopsTpl->assign('dogs', $dogs);
 $xoopsTpl->assign('columns', $columns);
 $xoopsTpl->assign('numofcolumns', $numofcolumns);
-$xoopsTpl->assign('nummatch', $numMatch . ' Animals found.');
+$xoopsTpl->assign('nummatch', $numMatch.' Animals found.');
 
 //bas
 $xoopsTpl->assign('dogs1', $dogs1);
 $xoopsTpl->assign('columns1', $columns1);
 $xoopsTpl->assign('numofcolumns1', $numofcolumns1);
-$xoopsTpl->assign('nummatch1', $nummatch1 . ' Animals found.');
+$xoopsTpl->assign('nummatch1', $nummatch1.' Animals found.');
 
 //both pups and bas
 $xoopsTpl->assign('width', 100 / $numofcolumns);
@@ -293,5 +293,5 @@ 
 $xoopsTpl->assign('delete', _DELETE);
 
 //comments and footer
-include XOOPS_ROOT_PATH . '/include/comment_view.php';
-include XOOPS_ROOT_PATH . '/footer.php';
+include XOOPS_ROOT_PATH.'/include/comment_view.php';
+include XOOPS_ROOT_PATH.'/footer.php';

phpthumb/phpThumb.php

Spacing +84 added lines, -84 removed lines

@@ -33,10 +33,10 @@ 
         return false;
     }
     global $phpThumb;
-    $downloadfilename = phpthumb_functions::SanitizeFilename(!empty($_GET['sia']) ? $_GET['sia'] : (!empty($_GET['down']) ? $_GET['down'] : 'phpThumb_generated_thumbnail.' . (!empty($_GET['f']) ? $_GET['f'] : 'jpg')));
+    $downloadfilename = phpthumb_functions::SanitizeFilename(!empty($_GET['sia']) ? $_GET['sia'] : (!empty($_GET['down']) ? $_GET['down'] : 'phpThumb_generated_thumbnail.'.(!empty($_GET['f']) ? $_GET['f'] : 'jpg')));
     if (!empty($downloadfilename)) {
-        $phpThumb->DebugMessage('SendSaveAsFileHeaderIfNeeded() sending header: Content-Disposition: ' . (!empty($_GET['down']) ? 'attachment' : 'inline') . '; filename="' . $downloadfilename . '"', __FILE__, __LINE__);
-        header('Content-Disposition: ' . (!empty($_GET['down']) ? 'attachment' : 'inline') . '; filename="' . $downloadfilename . '"');
+        $phpThumb->DebugMessage('SendSaveAsFileHeaderIfNeeded() sending header: Content-Disposition: '.(!empty($_GET['down']) ? 'attachment' : 'inline').'; filename="'.$downloadfilename.'"', __FILE__, __LINE__);
+        header('Content-Disposition: '.(!empty($_GET['down']) ? 'attachment' : 'inline').'; filename="'.$downloadfilename.'"');
     }
 
     return true;
@@ -72,43 +72,43 @@ 
     } elseif ($phpThumb->phpThumbDebug) {
         $phpThumb->DebugTimingMessage('skipped using cached image', __FILE__, __LINE__);
         $phpThumb->DebugMessage('Would have used cached file, but skipping due to phpThumbDebug', __FILE__, __LINE__);
-        $phpThumb->DebugMessage('* Would have sent headers (1): Last-Modified: ' . gmdate('D, d M Y H:i:s', $nModified) . ' GMT', __FILE__, __LINE__);
+        $phpThumb->DebugMessage('* Would have sent headers (1): Last-Modified: '.gmdate('D, d M Y H:i:s', $nModified).' GMT', __FILE__, __LINE__);
         if ($getimagesize = @getimagesize($phpThumb->cache_filename)) {
-            $phpThumb->DebugMessage('* Would have sent headers (2): Content-Type: ' . phpthumb_functions::ImageTypeToMIMEtype($getimagesize[2]), __FILE__, __LINE__);
+            $phpThumb->DebugMessage('* Would have sent headers (2): Content-Type: '.phpthumb_functions::ImageTypeToMIMEtype($getimagesize[2]), __FILE__, __LINE__);
         }
-        if (preg_match('#^' . preg_quote($nice_docroot) . '(.*)$#', $nice_cachefile, $matches)) {
-            $phpThumb->DebugMessage('* Would have sent headers (3): Location: ' . dirname($matches[1]) . '/' . urlencode(basename($matches[1])), __FILE__, __LINE__);
+        if (preg_match('#^'.preg_quote($nice_docroot).'(.*)$#', $nice_cachefile, $matches)) {
+            $phpThumb->DebugMessage('* Would have sent headers (3): Location: '.dirname($matches[1]).'/'.urlencode(basename($matches[1])), __FILE__, __LINE__);
         } else {
-            $phpThumb->DebugMessage('* Would have sent data: readfile(' . $phpThumb->cache_filename . ')', __FILE__, __LINE__);
+            $phpThumb->DebugMessage('* Would have sent data: readfile('.$phpThumb->cache_filename.')', __FILE__, __LINE__);
         }
     } else {
         if (headers_sent()) {
-            $phpThumb->ErrorImage('Headers already sent (' . basename(__FILE__) . ' line ' . __LINE__ . ')');
+            $phpThumb->ErrorImage('Headers already sent ('.basename(__FILE__).' line '.__LINE__.')');
             exit;
         }
         SendSaveAsFileHeaderIfNeeded();
 
         header('Cache-Control: private');
         header('Pragma: private');
-        header('Cache-Control: max-age=' . $phpThumb->getParameter('config_cache_maxage'));
-        header('Expires: ' . date(DATE_RFC1123, time() + $phpThumb->getParameter('config_cache_maxage')));
+        header('Cache-Control: max-age='.$phpThumb->getParameter('config_cache_maxage'));
+        header('Expires: '.date(DATE_RFC1123, time() + $phpThumb->getParameter('config_cache_maxage')));
         if (!empty($_SERVER['HTTP_IF_MODIFIED_SINCE']) && ($nModified == strtotime($_SERVER['HTTP_IF_MODIFIED_SINCE']))
             && !empty($_SERVER['SERVER_PROTOCOL'])) {
-            header('Last-Modified: ' . gmdate('D, d M Y H:i:s', $nModified) . ' GMT');
-            header($_SERVER['SERVER_PROTOCOL'] . ' 304 Not Modified');
+            header('Last-Modified: '.gmdate('D, d M Y H:i:s', $nModified).' GMT');
+            header($_SERVER['SERVER_PROTOCOL'].' 304 Not Modified');
             exit;
         }
-        header('Last-Modified: ' . gmdate('D, d M Y H:i:s', $nModified) . ' GMT');
-        header('ETag: "' . md5_file($phpThumb->cache_filename) . '"');
+        header('Last-Modified: '.gmdate('D, d M Y H:i:s', $nModified).' GMT');
+        header('ETag: "'.md5_file($phpThumb->cache_filename).'"');
         if ($getimagesize = @getimagesize($phpThumb->cache_filename)) {
-            header('Content-Type: ' . phpthumb_functions::ImageTypeToMIMEtype($getimagesize[2]));
+            header('Content-Type: '.phpthumb_functions::ImageTypeToMIMEtype($getimagesize[2]));
         } elseif (preg_match('#\\.ico$#i', $phpThumb->cache_filename)) {
             header('Content-Type: image/x-icon');
         }
-        header('Content-Length: ' . filesize($phpThumb->cache_filename));
+        header('Content-Length: '.filesize($phpThumb->cache_filename));
         if (empty($phpThumb->config_cache_force_passthru)
-            && preg_match('#^' . preg_quote($nice_docroot) . '(.*)$#', $nice_cachefile, $matches)) {
-            header('Location: ' . dirname($matches[1]) . '/' . urlencode(basename($matches[1])));
+            && preg_match('#^'.preg_quote($nice_docroot).'(.*)$#', $nice_cachefile, $matches)) {
+            header('Location: '.dirname($matches[1]).'/'.urlencode(basename($matches[1])));
         } else {
             @readfile($phpThumb->cache_filename);
         }
@@ -120,9 +120,9 @@ 
 
 // instantiate a new phpThumb() object
 ob_start();
-if (!require_once __DIR__ . '/phpthumb.class.php') {
+if (!require_once __DIR__.'/phpthumb.class.php') {
     ob_end_flush();
-    die('failed to include_once("' . realpath(__DIR__ . '/phpthumb.class.php') . '")');
+    die('failed to include_once("'.realpath(__DIR__.'/phpthumb.class.php').'")');
 }
 ob_end_clean();
 $phpThumb = new phpThumb();
@@ -130,36 +130,36 @@ 
 $phpThumb->setParameter('config_error_die_on_error', true);
 
 if (!phpthumb_functions::FunctionIsDisabled('set_time_limit')) {
-    set_time_limit(60);  // shouldn't take nearly this long in most cases, but with many filters and/or a slow server...
+    set_time_limit(60); // shouldn't take nearly this long in most cases, but with many filters and/or a slow server...
 }
 
 // phpThumbDebug[0] used to be here, but may reveal too much
 // info when high_security_mode should be enabled (not set yet)
 
-if (file_exists(__DIR__ . '/phpThumb.config.php')) {
+if (file_exists(__DIR__.'/phpThumb.config.php')) {
     ob_start();
-    if (require_once __DIR__ . '/phpThumb.config.php') {
+    if (require_once __DIR__.'/phpThumb.config.php') {
         // great
     } else {
         ob_end_flush();
         $phpThumb->config_disable_debug = false; // otherwise error message won't print
-        $phpThumb->ErrorImage('failed to include_once(' . __DIR__ . '/phpThumb.config.php) - realpath="' . realpath(__DIR__ . '/phpThumb.config.php') . '"');
+        $phpThumb->ErrorImage('failed to include_once('.__DIR__.'/phpThumb.config.php) - realpath="'.realpath(__DIR__.'/phpThumb.config.php').'"');
     }
     ob_end_clean();
-} elseif (file_exists(__DIR__ . '/phpThumb.config.php.default')) {
+} elseif (file_exists(__DIR__.'/phpThumb.config.php.default')) {
     $phpThumb->config_disable_debug = false; // otherwise error message won't print
     $phpThumb->ErrorImage('Please rename "phpThumb.config.php.default" to "phpThumb.config.php"');
 } else {
     $phpThumb->config_disable_debug = false; // otherwise error message won't print
-    $phpThumb->ErrorImage('failed to include_once(' . __DIR__ . '/phpThumb.config.php) - realpath="' . realpath(__DIR__ . '/phpThumb.config.php') . '"');
+    $phpThumb->ErrorImage('failed to include_once('.__DIR__.'/phpThumb.config.php) - realpath="'.realpath(__DIR__.'/phpThumb.config.php').'"');
 }
 
 if (!empty($PHPTHUMB_CONFIG)) {
     foreach ($PHPTHUMB_CONFIG as $key => $value) {
-        $keyname = 'config_' . $key;
+        $keyname = 'config_'.$key;
         $phpThumb->setParameter($keyname, $value);
         if (!preg_match('#(password|mysql)#i', $key)) {
-            $phpThumb->DebugMessage('setParameter(' . $keyname . ', ' . $phpThumb->phpThumbDebugVarDump($value) . ')', __FILE__, __LINE__);
+            $phpThumb->DebugMessage('setParameter('.$keyname.', '.$phpThumb->phpThumbDebugVarDump($value).')', __FILE__, __LINE__);
         }
     }
     if (!$phpThumb->config_disable_debug) {
@@ -176,10 +176,10 @@ 
     $_SERVER['PHP_SELF'] = str_replace($_SERVER['PATH_INFO'], '', @$_SERVER['PHP_SELF']);
 
     $args = explode(';', substr($_SERVER['PATH_INFO'], 1));
-    $phpThumb->DebugMessage('PATH_INFO.$args set to (' . implode(')(', $args) . ')', __FILE__, __LINE__);
+    $phpThumb->DebugMessage('PATH_INFO.$args set to ('.implode(')(', $args).')', __FILE__, __LINE__);
     if (!empty($args)) {
         $_GET['src'] = @$args[count($args) - 1];
-        $phpThumb->DebugMessage('PATH_INFO."src" = "' . $_GET['src'] . '"', __FILE__, __LINE__);
+        $phpThumb->DebugMessage('PATH_INFO."src" = "'.$_GET['src'].'"', __FILE__, __LINE__);
         if (preg_match('#^new\=([a-z0-9]+)#i', $_GET['src'], $matches)) {
             unset($_GET['src']);
             $_GET['new'] = $matches[1];
@@ -188,17 +188,17 @@ 
     if (preg_match('#^([0-9]*)x?([0-9]*)$#i', @$args[count($args) - 2], $matches)) {
         $_GET['w'] = $matches[1];
         $_GET['h'] = $matches[2];
-        $phpThumb->DebugMessage('PATH_INFO."w"x"h" set to "' . $_GET['w'] . '"x"' . $_GET['h'] . '"', __FILE__, __LINE__);
+        $phpThumb->DebugMessage('PATH_INFO."w"x"h" set to "'.$_GET['w'].'"x"'.$_GET['h'].'"', __FILE__, __LINE__);
     }
     for ($i = 0; $i < count($args) - 2; $i++) {
         @list($key, $value) = explode('=', @$args[$i]);
         if ('[]' === substr($key, -2)) {
             $array_key_name          = substr($key, 0, -2);
             $_GET[$array_key_name][] = $value;
-            $phpThumb->DebugMessage('PATH_INFO."' . $array_key_name . '[]" = "' . $value . '"', __FILE__, __LINE__);
+            $phpThumb->DebugMessage('PATH_INFO."'.$array_key_name.'[]" = "'.$value.'"', __FILE__, __LINE__);
         } else {
             $_GET[$key] = $value;
-            $phpThumb->DebugMessage('PATH_INFO."' . $key . '" = "' . $value . '"', __FILE__, __LINE__);
+            $phpThumb->DebugMessage('PATH_INFO."'.$key.'" = "'.$value.'"', __FILE__, __LINE__);
         }
     }
 }
@@ -210,7 +210,7 @@ 
     } elseif (phpthumb_functions::PasswordStrength($phpThumb->config_high_security_password) < 20) {
         $phpThumb->config_disable_debug = false; // otherwise error message won't print
         $phpThumb->ErrorImage('ERROR: $PHPTHUMB_CONFIG[high_security_password] is not complex enough');
-    } elseif ($_GET['hash'] != md5(str_replace($phpThumb->config_high_security_url_separator . 'hash=' . $_GET['hash'], '', $_SERVER['QUERY_STRING']) . $phpThumb->config_high_security_password)) {
+    } elseif ($_GET['hash'] != md5(str_replace($phpThumb->config_high_security_url_separator.'hash='.$_GET['hash'], '', $_SERVER['QUERY_STRING']).$phpThumb->config_high_security_password)) {
         header('HTTP/1.0 403 Forbidden');
         sleep(10); // deliberate delay to discourage password-guessing
         $phpThumb->ErrorImage('ERROR: invalid hash');
@@ -253,26 +253,26 @@ 
                 $md5s = md5($rawImageData);
             }
         } else {
-            $phpThumb->ErrorImage('only FTP and HTTP/HTTPS protocols are allowed, "' . $protocol_matches[1] . '" is not');
+            $phpThumb->ErrorImage('only FTP and HTTP/HTTPS protocols are allowed, "'.$protocol_matches[1].'" is not');
         }
     } else {
         $SourceFilename = $phpThumb->ResolveFilenameToAbsolute($_GET['src']);
         if (is_readable($SourceFilename)) {
             $md5s = phpthumb_functions::md5_file_safe($SourceFilename);
         } else {
-            $phpThumb->ErrorImage('ERROR: "' . $SourceFilename . '" cannot be read');
+            $phpThumb->ErrorImage('ERROR: "'.$SourceFilename.'" cannot be read');
         }
     }
    if (\Xmf\Request::hasVar('HTTP_REFERER', 'SERVER')) {
-        $phpThumb->ErrorImage('&md5s=' . $md5s);
+        $phpThumb->ErrorImage('&md5s='.$md5s);
     } else {
-        die('&md5s=' . $md5s);
+        die('&md5s='.$md5s);
     }
 }
 
 if (!empty($_GET['src']) && empty($phpThumb->config_allow_local_http_src)
-    && preg_match('#^http://' . @$_SERVER['HTTP_HOST'] . '(.+)#i', $_GET['src'], $matches)) {
-    $phpThumb->ErrorImage('It is MUCH better to specify the "src" parameter as "' . $matches[1] . '" instead of "' . $matches[0] . '".' . "\n\n" . 'If you really must do it this way, enable "allow_local_http_src" in phpThumb.config.php');
+    && preg_match('#^http://'.@$_SERVER['HTTP_HOST'].'(.+)#i', $_GET['src'], $matches)) {
+    $phpThumb->ErrorImage('It is MUCH better to specify the "src" parameter as "'.$matches[1].'" instead of "'.$matches[0].'".'."\n\n".'If you really must do it this way, enable "allow_local_http_src" in phpThumb.config.php');
 }
 
 ////////////////////////////////////////////////////////////////
@@ -286,7 +286,7 @@ 
 $parsed_url_referer = phpthumb_functions::ParseURLbetter(@$_SERVER['HTTP_REFERER']);
 if ($phpThumb->config_nooffsitelink_require_refer
     && !in_array(@$parsed_url_referer['host'], $phpThumb->config_nohotlink_valid_domains)) {
-    $phpThumb->ErrorImage('config_nooffsitelink_require_refer enabled and ' . (@$parsed_url_referer['host'] ? '"' . $parsed_url_referer['host'] . '" is not an allowed referer' : 'no HTTP_REFERER exists'));
+    $phpThumb->ErrorImage('config_nooffsitelink_require_refer enabled and '.(@$parsed_url_referer['host'] ? '"'.$parsed_url_referer['host'].'" is not an allowed referer' : 'no HTTP_REFERER exists'));
 }
 $parsed_url_src = phpthumb_functions::ParseURLbetter(@$_GET['src']);
 if ($phpThumb->config_nohotlink_enabled && $phpThumb->config_nohotlink_erase_image
@@ -305,11 +305,11 @@ 
             }
         }
         if ($found_missing_function) {
-            $phpThumb->ErrorImage('SQL function unavailable: ' . $found_missing_function);
+            $phpThumb->ErrorImage('SQL function unavailable: '.$found_missing_function);
         } else {
             $mysqli = new mysqli($phpThumb->config_mysql_hostname, $phpThumb->config_mysql_username, $phpThumb->config_mysql_password, $phpThumb->config_mysql_database);
             if ($mysqli->connect_error) {
-                $phpThumb->ErrorImage('MySQLi connect error (' . $mysqli->connect_errno . ') ' . $mysqli->connect_error);
+                $phpThumb->ErrorImage('MySQLi connect error ('.$mysqli->connect_errno.') '.$mysqli->connect_error);
             } else {
                 if ($result = $mysqli->query($phpThumb->config_mysql_query)) {
                     if ($row = $result->fetch_array()) {
@@ -324,7 +324,7 @@ 
                     }
                 } else {
                     $mysqli->close();
-                    $phpThumb->ErrorImage('Error in MySQL query: "' . $mysqli->error . '"');
+                    $phpThumb->ErrorImage('Error in MySQL query: "'.$mysqli->error.'"');
                 }
             }
             unset($_GET['id']);
@@ -339,7 +339,7 @@ 
             }
         }
         if ($found_missing_function) {
-            $phpThumb->ErrorImage('SQL function unavailable: ' . $found_missing_function);
+            $phpThumb->ErrorImage('SQL function unavailable: '.$found_missing_function);
         } else {
             if ($cid = @mysql_connect($phpThumb->config_mysql_hostname, $phpThumb->config_mysql_username, $phpThumb->config_mysql_password)) {
                 if (@mysqli_select_db($GLOBALS['xoopsDB']->conn, $phpThumb->config_mysql_database, $cid)) {
@@ -356,11 +356,11 @@ 
                         }
                     } else {
                         $GLOBALS['xoopsDB']->close($cid);
-                        $phpThumb->ErrorImage('Error in MySQL query: "' . $GLOBALS['xoopsDB']->error($cid) . '"');
+                        $phpThumb->ErrorImage('Error in MySQL query: "'.$GLOBALS['xoopsDB']->error($cid).'"');
                     }
                 } else {
                     $GLOBALS['xoopsDB']->close($cid);
-                    $phpThumb->ErrorImage('cannot select MySQL database: "' . $GLOBALS['xoopsDB']->error($cid) . '"');
+                    $phpThumb->ErrorImage('cannot select MySQL database: "'.$GLOBALS['xoopsDB']->error($cid).'"');
                 }
             } else {
                 $phpThumb->ErrorImage('cannot connect to MySQL server');
@@ -425,24 +425,24 @@ 
 foreach ($_GET as $key => $value) {
     if (!empty($PHPTHUMB_DEFAULTS_DISABLEGETPARAMS) && ('src' !== $key)) {
         // disabled, do not set parameter
-        $phpThumb->DebugMessage('ignoring $_GET[' . $key . '] because of $PHPTHUMB_DEFAULTS_DISABLEGETPARAMS', __FILE__, __LINE__);
+        $phpThumb->DebugMessage('ignoring $_GET['.$key.'] because of $PHPTHUMB_DEFAULTS_DISABLEGETPARAMS', __FILE__, __LINE__);
     } elseif (in_array($key, $allowedGETparameters)) {
-        $phpThumb->DebugMessage('setParameter(' . $key . ', ' . $phpThumb->phpThumbDebugVarDump($value) . ')', __FILE__, __LINE__);
+        $phpThumb->DebugMessage('setParameter('.$key.', '.$phpThumb->phpThumbDebugVarDump($value).')', __FILE__, __LINE__);
         $phpThumb->setParameter($key, $value);
     } else {
-        $phpThumb->ErrorImage('Forbidden parameter: ' . $key);
+        $phpThumb->ErrorImage('Forbidden parameter: '.$key);
     }
 }
 
 if (!empty($PHPTHUMB_DEFAULTS) && is_array($PHPTHUMB_DEFAULTS)) {
-    $phpThumb->DebugMessage('setting $PHPTHUMB_DEFAULTS[' . implode(';', array_keys($PHPTHUMB_DEFAULTS)) . ']', __FILE__, __LINE__);
+    $phpThumb->DebugMessage('setting $PHPTHUMB_DEFAULTS['.implode(';', array_keys($PHPTHUMB_DEFAULTS)).']', __FILE__, __LINE__);
     foreach ($PHPTHUMB_DEFAULTS as $key => $value) {
         if (!$PHPTHUMB_DEFAULTS_GETSTRINGOVERRIDE
             || !isset($_GET[$key])) { // set parameter to default value if config is set to allow _GET to override default, OR if no value is passed via _GET for this parameter
             //$_GET[$key] = $value;
             //$phpThumb->DebugMessage('PHPTHUMB_DEFAULTS assigning ('.(is_array($value) ? print_r($value, true) : $value).') to $_GET['.$key.']', __FILE__, __LINE__);
             $phpThumb->setParameter($key, $value);
-            $phpThumb->DebugMessage('setParameter(' . $key . ', ' . $phpThumb->phpThumbDebugVarDump($value) . ') from $PHPTHUMB_DEFAULTS', __FILE__, __LINE__);
+            $phpThumb->DebugMessage('setParameter('.$key.', '.$phpThumb->phpThumbDebugVarDump($value).') from $PHPTHUMB_DEFAULTS', __FILE__, __LINE__);
         }
     }
 }
@@ -474,13 +474,13 @@ 
 } elseif (preg_match('#^http\://[^\\?&]+\\.(jpe?g|gif|png)$#i', $phpThumb->src)) {
     // assume is ok to passthru if no other parameters specified
 } elseif (preg_match('#^(f|ht)tp\://#i', $phpThumb->src)) {
-    $phpThumb->DebugMessage('$CanPassThroughDirectly=false because preg_match("#^(f|ht)tp\://#i", ' . $phpThumb->src . ')', __FILE__, __LINE__);
+    $phpThumb->DebugMessage('$CanPassThroughDirectly=false because preg_match("#^(f|ht)tp\://#i", '.$phpThumb->src.')', __FILE__, __LINE__);
     $CanPassThroughDirectly = false;
 } elseif (!@is_readable($phpThumb->sourceFilename)) {
-    $phpThumb->DebugMessage('$CanPassThroughDirectly=false because !@is_readable(' . $phpThumb->sourceFilename . ')', __FILE__, __LINE__);
+    $phpThumb->DebugMessage('$CanPassThroughDirectly=false because !@is_readable('.$phpThumb->sourceFilename.')', __FILE__, __LINE__);
     $CanPassThroughDirectly = false;
 } elseif (!@is_file($phpThumb->sourceFilename)) {
-    $phpThumb->DebugMessage('$CanPassThroughDirectly=false because !@is_file(' . $phpThumb->sourceFilename . ')', __FILE__, __LINE__);
+    $phpThumb->DebugMessage('$CanPassThroughDirectly=false because !@is_file('.$phpThumb->sourceFilename.')', __FILE__, __LINE__);
     $CanPassThroughDirectly = false;
 }
 foreach ($_GET as $key => $value) {
@@ -511,7 +511,7 @@ 
     }
 }
 if (!empty($UnAllowedGET)) {
-    $phpThumb->DebugMessage('$CanPassThroughDirectly=false because $_GET[' . implode(';', array_unique($UnAllowedGET)) . '] are set', __FILE__, __LINE__);
+    $phpThumb->DebugMessage('$CanPassThroughDirectly=false because $_GET['.implode(';', array_unique($UnAllowedGET)).'] are set', __FILE__, __LINE__);
 }
 
 ////////////////////////////////////////////////////////////////
@@ -522,13 +522,13 @@ 
 }
 ////////////////////////////////////////////////////////////////
 
-$phpThumb->DebugMessage('$CanPassThroughDirectly="' . (int)$CanPassThroughDirectly . '" && $phpThumb->src="' . $phpThumb->src . '"', __FILE__, __LINE__);
+$phpThumb->DebugMessage('$CanPassThroughDirectly="'.(int)$CanPassThroughDirectly.'" && $phpThumb->src="'.$phpThumb->src.'"', __FILE__, __LINE__);
 while ($CanPassThroughDirectly && $phpThumb->src) {
     // no parameters set, passthru
 
     if (preg_match('#^http\://[^\\?&]+\.(jpe?g|gif|png)$#i', $phpThumb->src)) {
-        $phpThumb->DebugMessage('Passing HTTP source through directly as Location: redirect (' . $phpThumb->src . ')', __FILE__, __LINE__);
-        header('Location: ' . $phpThumb->src);
+        $phpThumb->DebugMessage('Passing HTTP source through directly as Location: redirect ('.$phpThumb->src.')', __FILE__, __LINE__);
+        header('Location: '.$phpThumb->src);
         exit;
     }
 
@@ -536,20 +536,20 @@ 
 
     // security and size checks
     if ($phpThumb->getimagesizeinfo = @getimagesize($SourceFilename)) {
-        $phpThumb->DebugMessage('Direct passthru getimagesize() returned [w=' . $phpThumb->getimagesizeinfo[0] . ';h=' . $phpThumb->getimagesizeinfo[1] . ';t=' . $phpThumb->getimagesizeinfo[2] . ']', __FILE__, __LINE__);
+        $phpThumb->DebugMessage('Direct passthru getimagesize() returned [w='.$phpThumb->getimagesizeinfo[0].';h='.$phpThumb->getimagesizeinfo[1].';t='.$phpThumb->getimagesizeinfo[2].']', __FILE__, __LINE__);
 
         if (!@$_GET['w'] && !@$_GET['wp'] && !@$_GET['wl'] && !@$_GET['ws'] && !@$_GET['h'] && !@$_GET['hp']
             && !@$_GET['hl']
             && !@$_GET['hs']) {
             // no resizing needed
-            $phpThumb->DebugMessage('Passing "' . $SourceFilename . '" through directly, no resizing required ("' . $phpThumb->getimagesizeinfo[0] . '"x"' . $phpThumb->getimagesizeinfo[1] . '")', __FILE__, __LINE__);
+            $phpThumb->DebugMessage('Passing "'.$SourceFilename.'" through directly, no resizing required ("'.$phpThumb->getimagesizeinfo[0].'"x"'.$phpThumb->getimagesizeinfo[1].'")', __FILE__, __LINE__);
         } elseif (($phpThumb->getimagesizeinfo[0] <= @$_GET['w']) && ($phpThumb->getimagesizeinfo[1] <= @$_GET['h'])
                   && ((@$_GET['w'] == $phpThumb->getimagesizeinfo[0])
                       || (@$_GET['h'] == $phpThumb->getimagesizeinfo[1]))) {
             // image fits into 'w'x'h' box, and at least one dimension matches exactly, therefore no resizing needed
-            $phpThumb->DebugMessage('Passing "' . $SourceFilename . '" through directly, no resizing required ("' . $phpThumb->getimagesizeinfo[0] . '"x"' . $phpThumb->getimagesizeinfo[1] . '" fits inside "' . @$_GET['w'] . '"x"' . @$_GET['h'] . '")', __FILE__, __LINE__);
+            $phpThumb->DebugMessage('Passing "'.$SourceFilename.'" through directly, no resizing required ("'.$phpThumb->getimagesizeinfo[0].'"x"'.$phpThumb->getimagesizeinfo[1].'" fits inside "'.@$_GET['w'].'"x"'.@$_GET['h'].'")', __FILE__, __LINE__);
         } else {
-            $phpThumb->DebugMessage('Not passing "' . $SourceFilename . '" through directly because resizing required (from "' . $phpThumb->getimagesizeinfo[0] . '"x"' . $phpThumb->getimagesizeinfo[1] . '" to "' . @$_GET['w'] . '"x"' . @$_GET['h'] . '")', __FILE__, __LINE__);
+            $phpThumb->DebugMessage('Not passing "'.$SourceFilename.'" through directly because resizing required (from "'.$phpThumb->getimagesizeinfo[0].'"x"'.$phpThumb->getimagesizeinfo[1].'" to "'.@$_GET['w'].'"x"'.@$_GET['h'].'")', __FILE__, __LINE__);
             break;
         }
         switch ($phpThumb->getimagesizeinfo[2]) {
@@ -560,11 +560,11 @@ 
                 break;
             default:
                 // browser probably can't handle format, remangle it to JPEG/PNG/GIF
-                $phpThumb->DebugMessage('Not passing "' . $SourceFilename . '" through directly because $phpThumb->getimagesizeinfo[2] = "' . $phpThumb->getimagesizeinfo[2] . '"', __FILE__, __LINE__);
+                $phpThumb->DebugMessage('Not passing "'.$SourceFilename.'" through directly because $phpThumb->getimagesizeinfo[2] = "'.$phpThumb->getimagesizeinfo[2].'"', __FILE__, __LINE__);
                 break 2;
         }
 
-        $ImageCreateFunctions   = [
+        $ImageCreateFunctions = [
             1 => 'imagecreatefromgif',
             2 => 'imagecreatefromjpeg',
             3 => 'imagecreatefrompng'
@@ -581,28 +581,28 @@ 
             }
 
             if (headers_sent()) {
-                $phpThumb->ErrorImage('Headers already sent (' . basename(__FILE__) . ' line ' . __LINE__ . ')');
+                $phpThumb->ErrorImage('Headers already sent ('.basename(__FILE__).' line '.__LINE__.')');
                 exit;
             }
            if (\Xmf\Request::hasVar('phpThumbDebug', 'GET')) {
                 $phpThumb->DebugTimingMessage('skipped direct $SourceFilename passthru', __FILE__, __LINE__);
-                $phpThumb->DebugMessage('Would have passed "' . $SourceFilename . '" through directly, but skipping due to phpThumbDebug', __FILE__, __LINE__);
+                $phpThumb->DebugMessage('Would have passed "'.$SourceFilename.'" through directly, but skipping due to phpThumbDebug', __FILE__, __LINE__);
                 break;
             }
 
             SendSaveAsFileHeaderIfNeeded();
-            header('Last-Modified: ' . gmdate('D, d M Y H:i:s', @filemtime($SourceFilename)) . ' GMT');
+            header('Last-Modified: '.gmdate('D, d M Y H:i:s', @filemtime($SourceFilename)).' GMT');
             if ($contentType = phpthumb_functions::ImageTypeToMIMEtype(@$phpThumb->getimagesizeinfo[2])) {
-                header('Content-Type: ' . $contentType);
+                header('Content-Type: '.$contentType);
             }
             @readfile($SourceFilename);
             exit;
         } else {
-            $phpThumb->DebugMessage('Not passing "' . $SourceFilename . '" through directly because ($phpThumb->config_disable_onlycreateable_passthru = "' . $phpThumb->config_disable_onlycreateable_passthru . '") and ' . $theImageCreateFunction . '() failed', __FILE__, __LINE__);
+            $phpThumb->DebugMessage('Not passing "'.$SourceFilename.'" through directly because ($phpThumb->config_disable_onlycreateable_passthru = "'.$phpThumb->config_disable_onlycreateable_passthru.'") and '.$theImageCreateFunction.'() failed', __FILE__, __LINE__);
             break;
         }
     } else {
-        $phpThumb->DebugMessage('Not passing "' . $SourceFilename . '" through directly because getimagesize() failed', __FILE__, __LINE__);
+        $phpThumb->DebugMessage('Not passing "'.$SourceFilename.'" through directly because getimagesize() failed', __FILE__, __LINE__);
         break;
     }
     break;
@@ -621,7 +621,7 @@ 
 if (@is_readable($phpThumb->cache_filename)) {
     RedirectToCachedFile();
 } else {
-    $phpThumb->DebugMessage('Cached file "' . $phpThumb->cache_filename . '" does not exist, processing as normal', __FILE__, __LINE__);
+    $phpThumb->DebugMessage('Cached file "'.$phpThumb->cache_filename.'" does not exist, processing as normal', __FILE__, __LINE__);
 }
 
 ////////////////////////////////////////////////////////////////
@@ -656,30 +656,30 @@ 
         $new_background_color = phpthumb_functions::ImageHexColorAllocate($phpThumb->gdimg_source, $bghexcolor, false, $alpha);
         imagefilledrectangle($phpThumb->gdimg_source, 0, 0, $phpThumb->w, $phpThumb->h, $new_background_color);
     } else {
-        $phpThumb->ErrorImage('failed to create "new" image (' . $phpThumb->w . 'x' . $phpThumb->h . ')');
+        $phpThumb->ErrorImage('failed to create "new" image ('.$phpThumb->w.'x'.$phpThumb->h.')');
     }
 } elseif (!$phpThumb->src) {
-    $phpThumb->ErrorImage('Usage: ' . $_SERVER['PHP_SELF'] . '?src=/path/and/filename.jpg' . "\n" . 'read Usage comments for details');
+    $phpThumb->ErrorImage('Usage: '.$_SERVER['PHP_SELF'].'?src=/path/and/filename.jpg'."\n".'read Usage comments for details');
 } elseif (preg_match('#^([a-z0-9]+)://#i', $_GET['src'], $protocol_matches)) {
     if (preg_match('#^(f|ht)tps?://#i', $_GET['src'])) {
-        $phpThumb->DebugMessage('$phpThumb->src (' . $phpThumb->src . ') is remote image, attempting to download', __FILE__, __LINE__);
+        $phpThumb->DebugMessage('$phpThumb->src ('.$phpThumb->src.') is remote image, attempting to download', __FILE__, __LINE__);
         if ($phpThumb->config_http_user_agent) {
-            $phpThumb->DebugMessage('Setting "user_agent" to "' . $phpThumb->config_http_user_agent . '"', __FILE__, __LINE__);
+            $phpThumb->DebugMessage('Setting "user_agent" to "'.$phpThumb->config_http_user_agent.'"', __FILE__, __LINE__);
             ini_set('user_agent', $phpThumb->config_http_user_agent);
         }
         $cleanedupurl = phpthumb_functions::CleanUpURLencoding($phpThumb->src);
-        $phpThumb->DebugMessage('CleanUpURLencoding(' . $phpThumb->src . ') returned "' . $cleanedupurl . '"', __FILE__, __LINE__);
+        $phpThumb->DebugMessage('CleanUpURLencoding('.$phpThumb->src.') returned "'.$cleanedupurl.'"', __FILE__, __LINE__);
         $phpThumb->src = $cleanedupurl;
         unset($cleanedupurl);
         if ($rawImageData = phpthumb_functions::SafeURLread($phpThumb->src, $error, $phpThumb->config_http_fopen_timeout, $phpThumb->config_http_follow_redirect)) {
-            $phpThumb->DebugMessage('SafeURLread(' . $phpThumb->src . ') succeeded' . ($error ? ' with messsages: "' . $error . '"' : ''), __FILE__, __LINE__);
-            $phpThumb->DebugMessage('Setting source data from URL "' . $phpThumb->src . '"', __FILE__, __LINE__);
+            $phpThumb->DebugMessage('SafeURLread('.$phpThumb->src.') succeeded'.($error ? ' with messsages: "'.$error.'"' : ''), __FILE__, __LINE__);
+            $phpThumb->DebugMessage('Setting source data from URL "'.$phpThumb->src.'"', __FILE__, __LINE__);
             $phpThumb->setSourceData($rawImageData, urlencode($phpThumb->src));
         } else {
             $phpThumb->ErrorImage($error);
         }
     } else {
-        $phpThumb->ErrorImage('only FTP and HTTP/HTTPS protocols are allowed, "' . $protocol_matches[1] . '" is not');
+        $phpThumb->ErrorImage('only FTP and HTTP/HTTPS protocols are allowed, "'.$protocol_matches[1].'" is not');
     }
 }
 
@@ -714,10 +714,10 @@ 
             chmod($phpThumb->cache_filename, 0644);
             RedirectToCachedFile();
         } else {
-            $phpThumb->DebugMessage('Failed: RenderToFile(' . $phpThumb->cache_filename . ')', __FILE__, __LINE__);
+            $phpThumb->DebugMessage('Failed: RenderToFile('.$phpThumb->cache_filename.')', __FILE__, __LINE__);
         }
     } else {
-        $phpThumb->DebugMessage('Cannot write to $phpThumb->cache_filename (' . $phpThumb->cache_filename . ') because that directory (' . dirname($phpThumb->cache_filename) . ') is not writable', __FILE__, __LINE__);
+        $phpThumb->DebugMessage('Cannot write to $phpThumb->cache_filename ('.$phpThumb->cache_filename.') because that directory ('.dirname($phpThumb->cache_filename).') is not writable', __FILE__, __LINE__);
     }
 }
 
@@ -730,7 +730,7 @@ 
 ////////////////////////////////////////////////////////////////
 
 if (!$phpThumb->OutputThumbnail()) {
-    $phpThumb->ErrorImage('Error in OutputThumbnail():' . "\n" . $phpThumb->debugmessages[count($phpThumb->debugmessages) - 1]);
+    $phpThumb->ErrorImage('Error in OutputThumbnail():'."\n".$phpThumb->debugmessages[count($phpThumb->debugmessages) - 1]);
 }
 
 ////////////////////////////////////////////////////////////////

phpthumb/phpthumb.gif.php

Spacing +14 added lines, -14 removed lines

@@ -141,9 +141,9 @@ 
 {
     // JPEG output that does not require cjpeg added by James Heinrich <info@silisoftware.com> - December 10, 2003
     if (('WIN' !== strtoupper(substr(PHP_OS, 0, 3))) && (file_exists('/usr/local/bin/cjpeg') || shell_exec('which cjpeg'))) {
-        if (gif_outputAsBmp($gif, $lpszFileName . '.bmp', $bgColor)) {
-            exec('cjpeg ' . $lpszFileName . '.bmp >' . $lpszFileName . ' 2>/dev/null');
-            @unlink($lpszFileName . '.bmp');
+        if (gif_outputAsBmp($gif, $lpszFileName.'.bmp', $bgColor)) {
+            exec('cjpeg '.$lpszFileName.'.bmp >'.$lpszFileName.' 2>/dev/null');
+            @unlink($lpszFileName.'.bmp');
 
             if (@file_exists($lpszFileName)) {
                 if (@filesize($lpszFileName) > 0) {
@@ -500,9 +500,9 @@ 
         $ret = '';
 
         for ($i = 0; $i < $this->m_nColors; $i++) {
-            $ret .= chr($this->m_arColors[$i] & 0x000000FF) . // R
-                    chr(($this->m_arColors[$i] & 0x0000FF00) >> 8) . // G
-                    chr(($this->m_arColors[$i] & 0x00FF0000) >> 16);  // B
+            $ret .= chr($this->m_arColors[$i] & 0x000000FF).// R
+                    chr(($this->m_arColors[$i] & 0x0000FF00) >> 8).// G
+                    chr(($this->m_arColors[$i] & 0x00FF0000) >> 16); // B
         }
 
         return $ret;
@@ -518,9 +518,9 @@ 
         $ret = '';
 
         for ($i = 0; $i < $this->m_nColors; $i++) {
-            $ret .= chr(($this->m_arColors[$i] & 0x00FF0000) >> 16) . // B
-                    chr(($this->m_arColors[$i] & 0x0000FF00) >> 8) . // G
-                    chr($this->m_arColors[$i] & 0x000000FF) . // R
+            $ret .= chr(($this->m_arColors[$i] & 0x00FF0000) >> 16).// B
+                    chr(($this->m_arColors[$i] & 0x0000FF00) >> 8).// G
+                    chr($this->m_arColors[$i] & 0x000000FF).// R
                     "\x00";
         }
 
@@ -791,14 +791,14 @@ 
                     if (!$this->m_gih->load($data, $len = 0)) {
                         return false;
                     }
-                    $data   = substr($data, $len);
+                    $data = substr($data, $len);
                     $datLen += $len;
 
                     // ALLOC BUFFER
                     if (!($this->m_data = $this->m_lzw->deCompress($data, $len = 0))) {
                         return false;
                     }
-                    $data   = substr($data, $len);
+                    $data = substr($data, $len);
                     $datLen += $len;
 
                     if ($this->m_gih->m_bInterlace) {
@@ -913,7 +913,7 @@ 
                 $lne          = substr($this->m_data, 0, $this->m_gih->m_nWidth);
                 $this->m_data = substr($this->m_data, $this->m_gih->m_nWidth);
 
-                $data = substr($data, 0, $y * $this->m_gih->m_nWidth) . $lne . substr($data, ($y + 1) * $this->m_gih->m_nWidth);
+                $data = substr($data, 0, $y * $this->m_gih->m_nWidth).$lne.substr($data, ($y + 1) * $this->m_gih->m_nWidth);
             }
         }
 
@@ -1286,7 +1286,7 @@ 
     {
         $val = (int)$val;
 
-        return chr($val & 0xFF) . chr(($val & 0xFF00) >> 8) . chr(($val & 0xFF0000) >> 16) . chr(($val & 0xFF000000) >> 24);
+        return chr($val & 0xFF).chr(($val & 0xFF00) >> 8).chr(($val & 0xFF0000) >> 16).chr(($val & 0xFF000000) >> 24);
     }
 
     ///////////////////////////////////////////////////////////////////////////
@@ -1299,7 +1299,7 @@ 
     {
         $val = (int)$val;
 
-        return chr(($val & 0xFF000000) >> 24) . chr(($val & 0xFF0000) >> 16) . chr(($val & 0xFF00) >> 8) . chr($val & 0xFF);
+        return chr(($val & 0xFF000000) >> 24).chr(($val & 0xFF0000) >> 16).chr(($val & 0xFF00) >> 8).chr($val & 0xFF);
     }
 
     ///////////////////////////////////////////////////////////////////////////

phpthumb/phpThumb.config.php

Spacing +49 added lines, -49 removed lines

@@ -9,11 +9,11 @@ 
 //            THIS CONFIG FILE ONLY APPLIES TO phpThumb.php //
 //                                                         ///
 //////////////////////////////////////////////////////////////
-require dirname(dirname(__DIR__)) . '/header.php';
+require dirname(dirname(__DIR__)).'/header.php';
 ob_start();
-if (!file_exists(__DIR__ . '/phpthumb.functions.php') || !require_once __DIR__ . '/phpthumb.functions.php') {
+if (!file_exists(__DIR__.'/phpthumb.functions.php') || !require_once __DIR__.'/phpthumb.functions.php') {
     ob_end_flush();
-    die('failed to include_once(phpthumb.functions.php) - realpath="' . realpath(__DIR__ . '/phpthumb.functions.php') . '"');
+    die('failed to include_once(phpthumb.functions.php) - realpath="'.realpath(__DIR__.'/phpthumb.functions.php').'"');
 }
 ob_end_clean();
 
@@ -32,7 +32,7 @@ 
 // * Cache directory configuration (choose only one of these - leave the other lines commented-out):
 // Note: this directory must be writable (usually chmod 777 is neccesary) for caching to work.
 // If the directory is not writable no error will be generated but caching will be disabled.
-$PHPTHUMB_CONFIG['cache_directory'] = XOOPS_CACHE_PATH;                            // set the cache directory relative to the phpThumb() installation
+$PHPTHUMB_CONFIG['cache_directory'] = XOOPS_CACHE_PATH; // set the cache directory relative to the phpThumb() installation
 //$PHPTHUMB_CONFIG['cache_directory'] = $PHPTHUMB_CONFIG['document_root'].'/phpthumb/cache/'; // set the cache directory to an absolute directory for all source images
 //$PHPTHUMB_CONFIG['cache_directory'] = './cache/';                                           // set the cache directory relative to the source image - must start with '.' (will not work to cache URL- or database-sourced images, please use an absolute directory name)
 //$PHPTHUMB_CONFIG['cache_directory'] = null;                                                 // disable thumbnail caching (not recommended)
@@ -50,35 +50,35 @@ 
 //   based on last-access date and/or number of files and/or total filesize.
 
 //$PHPTHUMB_CONFIG['cache_maxage'] = null;            // never delete cached thumbnails based on last-access time
-$PHPTHUMB_CONFIG['cache_maxage'] = 86400 * 30;        // delete cached thumbnails that haven't been accessed in more than [30 days] (value is maximum time since last access in seconds to avoid deletion)
+$PHPTHUMB_CONFIG['cache_maxage'] = 86400 * 30; // delete cached thumbnails that haven't been accessed in more than [30 days] (value is maximum time since last access in seconds to avoid deletion)
 
 //$PHPTHUMB_CONFIG['cache_maxsize'] = null;           // never delete cached thumbnails based on byte size of cache directory
 $PHPTHUMB_CONFIG['cache_maxsize'] = 10 * 1024 * 1024; // delete least-recently-accessed cached thumbnails when more than [10MB] of cached files are present (value is maximum bytesize of all cached files)
 
 //$PHPTHUMB_CONFIG['cache_maxfiles'] = null;          // never delete cached thumbnails based on number of cached files
-$PHPTHUMB_CONFIG['cache_maxfiles'] = 200;             // delete least-recently-accessed cached thumbnails when more than [200] cached files are present (value is maximum number of cached files to keep)
+$PHPTHUMB_CONFIG['cache_maxfiles'] = 200; // delete least-recently-accessed cached thumbnails when more than [200] cached files are present (value is maximum number of cached files to keep)
 
 // * Source image cache configuration
-$PHPTHUMB_CONFIG['cache_source_enabled']   = true;                               // if true, source images obtained via HTTP are cached to $PHPTHUMB_CONFIG['cache_source_directory']
-$PHPTHUMB_CONFIG['cache_source_directory'] = XOOPS_CACHE_PATH;  // set the cache directory for unprocessed source images
+$PHPTHUMB_CONFIG['cache_source_enabled']   = true; // if true, source images obtained via HTTP are cached to $PHPTHUMB_CONFIG['cache_source_directory']
+$PHPTHUMB_CONFIG['cache_source_directory'] = XOOPS_CACHE_PATH; // set the cache directory for unprocessed source images
 
 // * cache source modification date configuration
 $PHPTHUMB_CONFIG['cache_source_filemtime_ignore_local']  = false; // if true, local source images will not be checked for modification date and cached image will be used if available, even if source image is changed or removed
-$PHPTHUMB_CONFIG['cache_source_filemtime_ignore_remote'] = true;  // if true, remote source images will not be checked for modification date and cached image will be used if available, even if source image is changed or removed. WARNING: cached performance MUCH slower if this is set to false.
+$PHPTHUMB_CONFIG['cache_source_filemtime_ignore_remote'] = true; // if true, remote source images will not be checked for modification date and cached image will be used if available, even if source image is changed or removed. WARNING: cached performance MUCH slower if this is set to false.
 
 // * Simplified cache filename configuration
 // Instead of creating unique cache filenames for all parameter combinations, create "simple" cache files (eg: "pic_thumb.jpg")
 // If cache_default_only_suffix is non-empty, GETstring parameters (except 'src') are ignored and only $PHPTHUMB_DEFAULTS
 // parameters (set at the bottom of phpThumb.config.php) are used for processing.
 // The '*' character MUST be used to represent the source image name
-$PHPTHUMB_CONFIG['cache_default_only_suffix'] = '';           // cached in normal phpThumb manner
+$PHPTHUMB_CONFIG['cache_default_only_suffix'] = ''; // cached in normal phpThumb manner
 //$PHPTHUMB_CONFIG['cache_default_only_suffix'] = '*_thumb';  // cache 'pic.jpg' becomes 'pic_thumb.jpg' (or 'pic_thumb.png' if PNG output is selected, etc)
 //$PHPTHUMB_CONFIG['cache_default_only_suffix'] = 'small-*';  // cache 'pic.jpg' becomes 'small-pic.jpg' (or 'small-pic.png' if PNG output is selected, etc)
 
-$PHPTHUMB_CONFIG['cache_prefix'] = 'phpThumb_cache_' . (isset($_SERVER['SERVER_NAME']) ? str_replace('www.', '', $_SERVER['SERVER_NAME']) . '_' : ''); // keep cache file separate by domain
+$PHPTHUMB_CONFIG['cache_prefix'] = 'phpThumb_cache_'.(isset($_SERVER['SERVER_NAME']) ? str_replace('www.', '', $_SERVER['SERVER_NAME']).'_' : ''); // keep cache file separate by domain
 //$PHPTHUMB_CONFIG['cache_prefix'] = 'phpThumb_cache';                                                                                             // allow phpThumb to share 1 set of cached files even if accessed under different servername/domains on same server
 
-$PHPTHUMB_CONFIG['cache_force_passthru'] = true;  // if true, cached image data will always be passed to browser; if false, HTTP redirect will be used instead
+$PHPTHUMB_CONFIG['cache_force_passthru'] = true; // if true, cached image data will always be passed to browser; if false, HTTP redirect will be used instead
 
 // * Temp directory configuration
 // phpThumb() may need to create temp files. Usually the system temp dir is writable and can be used.
@@ -86,7 +86,7 @@ 
 // you should change this to a full pathname to a directory you do have write access to.
 //$PHPTHUMB_CONFIG['temp_directory'] = null;                               // attempt to auto-detect
 //$PHPTHUMB_CONFIG['temp_directory'] = '/tmp/persistent/phpthumb/cache/';  // set to absolute path
-$PHPTHUMB_CONFIG['temp_directory'] = $PHPTHUMB_CONFIG['cache_directory'];  // set to same as cache directory
+$PHPTHUMB_CONFIG['temp_directory'] = $PHPTHUMB_CONFIG['cache_directory']; // set to same as cache directory
 
 // NOTE: "max_source_pixels" only affects GD-resized thumbnails. If you have ImageMagick
 //       installed it will bypass most of these limits
@@ -104,7 +104,7 @@ 
 if (phpthumb_functions::version_compare_replacement(PHP_VERSION, '4.3.2', '>=') && !defined('memory_get_usage')
     && !@ini_get('memory_limit')) {
     // memory_get_usage() will only be defined if your PHP is compiled with the --enable-memory-limit configuration option.
-    $PHPTHUMB_CONFIG['max_source_pixels'] = 0;         // no memory limit
+    $PHPTHUMB_CONFIG['max_source_pixels'] = 0; // no memory limit
 } else {
     // calculate default max_source_pixels as 1/6 of memory limit configuration
     $PHPTHUMB_CONFIG['max_source_pixels'] = round(max((int)ini_get('memory_limit'), (int)get_cfg_var('memory_limit')) * 1048576 / 6);
@@ -115,8 +115,8 @@ 
 }
 
 // ImageMagick configuration
-$PHPTHUMB_CONFIG['prefer_imagemagick']        = true;  // If true, use ImageMagick to resize thumbnails if possible, since it is usually faster than GD functions; if false only use ImageMagick if PHP memory limit is too low.
-$PHPTHUMB_CONFIG['imagemagick_use_thumbnail'] = true;  // If true, use ImageMagick's "-thumbnail" resizing parameter (if available) which removes extra non-image metadata (profiles, EXIF info, etc) resulting in much smaller filesize; if false, use "-resize" paramter which retains this info
+$PHPTHUMB_CONFIG['prefer_imagemagick']        = true; // If true, use ImageMagick to resize thumbnails if possible, since it is usually faster than GD functions; if false only use ImageMagick if PHP memory limit is too low.
+$PHPTHUMB_CONFIG['imagemagick_use_thumbnail'] = true; // If true, use ImageMagick's "-thumbnail" resizing parameter (if available) which removes extra non-image metadata (profiles, EXIF info, etc) resulting in much smaller filesize; if false, use "-resize" paramter which retains this info
 if ('WIN' === strtoupper(substr(PHP_OS, 0, 3))) {
     // Windows: set absolute pathname
     $PHPTHUMB_CONFIG['imagemagick_path'] = 'C:/ImageMagick/convert.exe';
@@ -128,41 +128,41 @@ 
 
 // * Default output configuration:
 $PHPTHUMB_CONFIG['output_format']    = 'png'; // default output format ('jpeg', 'png' or 'gif') - thumbnail will be output in this format (if available in your version of GD or ImageMagick). This is only used if the "f" parameter is not specified, and if the thumbnail can't be output in the input format.
-$PHPTHUMB_CONFIG['output_maxwidth']  = 0;      // default maximum thumbnail width.  If this is zero then default width  is the width  of the source image. This is always overridden by ?w=___ GETstring parameter
-$PHPTHUMB_CONFIG['output_maxheight'] = 0;      // default maximum thumbnail height. If this is zero then default height is the height of the source image. This is always overridden by ?h=___ GETstring parameter
-$PHPTHUMB_CONFIG['output_interlace'] = true;   // if true: interlaced output for GIF/PNG, progressive output for JPEG; if false: non-interlaced for GIF/PNG, baseline for JPEG.
+$PHPTHUMB_CONFIG['output_maxwidth']  = 0; // default maximum thumbnail width.  If this is zero then default width  is the width  of the source image. This is always overridden by ?w=___ GETstring parameter
+$PHPTHUMB_CONFIG['output_maxheight'] = 0; // default maximum thumbnail height. If this is zero then default height is the height of the source image. This is always overridden by ?h=___ GETstring parameter
+$PHPTHUMB_CONFIG['output_interlace'] = true; // if true: interlaced output for GIF/PNG, progressive output for JPEG; if false: non-interlaced for GIF/PNG, baseline for JPEG.
 
 // * Error message configuration
-$PHPTHUMB_CONFIG['error_image_width']           = 300;      // default width for error images
-$PHPTHUMB_CONFIG['error_image_height']          = 100;      // default height for error images
-$PHPTHUMB_CONFIG['error_message_image_default'] = '';       // Set this to the name of a generic error image (e.g. '/images/error.png') that you want displayed in place of any error message that may occur. This setting is overridden by the 'err' parameter, which does the same thing.
+$PHPTHUMB_CONFIG['error_image_width']           = 300; // default width for error images
+$PHPTHUMB_CONFIG['error_image_height']          = 100; // default height for error images
+$PHPTHUMB_CONFIG['error_message_image_default'] = ''; // Set this to the name of a generic error image (e.g. '/images/error.png') that you want displayed in place of any error message that may occur. This setting is overridden by the 'err' parameter, which does the same thing.
 $PHPTHUMB_CONFIG['error_bgcolor']               = 'CCCCFF'; // background color of error message images
 $PHPTHUMB_CONFIG['error_textcolor']             = 'FF0000'; // color of text in error messages
-$PHPTHUMB_CONFIG['error_fontsize']              = 1;        // size of text in error messages, from 1 (smallest) to 5 (largest)
-$PHPTHUMB_CONFIG['error_die_on_error']          = true;     // die with error message on any fatal error (recommended with standalone phpThumb.php)
-$PHPTHUMB_CONFIG['error_silent_die_on_error']   = false;    // simply die with no output of any kind on fatal errors (not recommended)
-$PHPTHUMB_CONFIG['error_die_on_source_failure'] = true;     // die with error message if source image cannot be processed by phpThumb() (usually because source image is corrupt in some way). If false the source image will be passed through unprocessed, if true (default) an error message will be displayed.
+$PHPTHUMB_CONFIG['error_fontsize']              = 1; // size of text in error messages, from 1 (smallest) to 5 (largest)
+$PHPTHUMB_CONFIG['error_die_on_error']          = true; // die with error message on any fatal error (recommended with standalone phpThumb.php)
+$PHPTHUMB_CONFIG['error_silent_die_on_error']   = false; // simply die with no output of any kind on fatal errors (not recommended)
+$PHPTHUMB_CONFIG['error_die_on_source_failure'] = true; // die with error message if source image cannot be processed by phpThumb() (usually because source image is corrupt in some way). If false the source image will be passed through unprocessed, if true (default) an error message will be displayed.
 
 // * Off-server Thumbnailing Configuration:
-$PHPTHUMB_CONFIG['nohotlink_enabled']       = false;                                    // If false will allow thumbnailing from any source domain
-$PHPTHUMB_CONFIG['nohotlink_valid_domains'] = [@$_SERVER['HTTP_HOST']];            // This is the list of domains for which thumbnails are allowed to be created. Note: domain only, do not include port numbers. The default value of the current domain should be fine in most cases, but if neccesary you can add more domains in here, in the format "www.example.com"
-$PHPTHUMB_CONFIG['nohotlink_erase_image']   = true;                                     // if true thumbnail is covered up with $PHPTHUMB_CONFIG['nohotlink_fill_color'] before text is applied, if false text is written over top of thumbnail
+$PHPTHUMB_CONFIG['nohotlink_enabled']       = false; // If false will allow thumbnailing from any source domain
+$PHPTHUMB_CONFIG['nohotlink_valid_domains'] = [@$_SERVER['HTTP_HOST']]; // This is the list of domains for which thumbnails are allowed to be created. Note: domain only, do not include port numbers. The default value of the current domain should be fine in most cases, but if neccesary you can add more domains in here, in the format "www.example.com"
+$PHPTHUMB_CONFIG['nohotlink_erase_image']   = true; // if true thumbnail is covered up with $PHPTHUMB_CONFIG['nohotlink_fill_color'] before text is applied, if false text is written over top of thumbnail
 $PHPTHUMB_CONFIG['nohotlink_text_message']  = 'Off-server thumbnailing is not allowed'; // text of error message
 
 // * Off-server Linking Configuration:
-$PHPTHUMB_CONFIG['nooffsitelink_enabled']       = false;                                       // If false will allow thumbnails to be linked to from any domain, if true only domains listed below in 'nooffsitelink_valid_domains' will be allowed.
-$PHPTHUMB_CONFIG['nooffsitelink_valid_domains'] = [@$_SERVER['HTTP_HOST']];              // This is the list of domains for which thumbnails are allowed to be created. The default value of the current domain should be fine in most cases, but if neccesary you can add more domains in here, in the format 'www.example.com'
-$PHPTHUMB_CONFIG['nooffsitelink_require_refer'] = false;                                      // If false will allow standalone calls to phpThumb(). If true then only requests with a Request::getString('HTTP_REFERER', '', 'SERVER') value in 'nooffsitelink_valid_domains' are allowed.
-$PHPTHUMB_CONFIG['nooffsitelink_erase_image']   = false;                                      // if true thumbnail is covered up with $PHPTHUMB_CONFIG['nohotlink_fill_color'] before text is applied, if false text is written over top of thumbnail
-$PHPTHUMB_CONFIG['nooffsitelink_watermark_src'] = '/demo/images/watermark.png';                // webroot-relative image to overlay on hotlinked images
-$PHPTHUMB_CONFIG['nooffsitelink_text_message']  = 'Image taken from ' . @$_SERVER['HTTP_HOST']; // text of error message (used if [nooffsitelink_watermark_src] is not a valid image)
+$PHPTHUMB_CONFIG['nooffsitelink_enabled']       = false; // If false will allow thumbnails to be linked to from any domain, if true only domains listed below in 'nooffsitelink_valid_domains' will be allowed.
+$PHPTHUMB_CONFIG['nooffsitelink_valid_domains'] = [@$_SERVER['HTTP_HOST']]; // This is the list of domains for which thumbnails are allowed to be created. The default value of the current domain should be fine in most cases, but if neccesary you can add more domains in here, in the format 'www.example.com'
+$PHPTHUMB_CONFIG['nooffsitelink_require_refer'] = false; // If false will allow standalone calls to phpThumb(). If true then only requests with a Request::getString('HTTP_REFERER', '', 'SERVER') value in 'nooffsitelink_valid_domains' are allowed.
+$PHPTHUMB_CONFIG['nooffsitelink_erase_image']   = false; // if true thumbnail is covered up with $PHPTHUMB_CONFIG['nohotlink_fill_color'] before text is applied, if false text is written over top of thumbnail
+$PHPTHUMB_CONFIG['nooffsitelink_watermark_src'] = '/demo/images/watermark.png'; // webroot-relative image to overlay on hotlinked images
+$PHPTHUMB_CONFIG['nooffsitelink_text_message']  = 'Image taken from '.@$_SERVER['HTTP_HOST']; // text of error message (used if [nooffsitelink_watermark_src] is not a valid image)
 
 // * Border & Background default colors
 $PHPTHUMB_CONFIG['border_hexcolor']     = '000000'; // Default border color - usual HTML-style hex color notation (overridden with 'bc' parameter)
 $PHPTHUMB_CONFIG['background_hexcolor'] = 'FFFFFF'; // Default background color when thumbnail aspect ratio does not match fixed-dimension box - usual HTML-style hex color notation (overridden with 'bg' parameter)
 
 // * Watermark configuration
-$PHPTHUMB_CONFIG['ttf_directory'] = __DIR__ . '/fonts'; // Base directory for TTF font files
+$PHPTHUMB_CONFIG['ttf_directory'] = __DIR__.'/fonts'; // Base directory for TTF font files
 //$PHPTHUMB_CONFIG['ttf_directory'] = 'c:/windows/fonts';
 
 // * MySQL configuration
@@ -180,13 +180,13 @@ 
 $PHPTHUMB_CONFIG['mysql_database'] = '';
 
 // * Security configuration
-$PHPTHUMB_CONFIG['high_security_enabled']    = false;  // if enabled, requires 'high_security_password' set to be set and requires the use of phpThumbURL() function (at the bottom of phpThumb.config.php) to generate hashed URLs
-$PHPTHUMB_CONFIG['high_security_password']   = '';     // required if 'high_security_enabled' is true, and must be at complex (uppercase, lowercase, numbers, punctuation, etc -- punctuation is strongest, lowercase is weakest; see PasswordStrength() in phpThumb.php). You can use a password generator like http://silisoftware.com/tools/password-random.php to generate a strong password
-$PHPTHUMB_CONFIG['disable_debug']            = true;   // prevent phpThumb from displaying any information about your system. If true, phpThumbDebug and error messages will be disabled
-$PHPTHUMB_CONFIG['allow_src_above_docroot']  = true;  // if true, allow src to be anywhere in filesystem; if false (default) only allow src within document_root
-$PHPTHUMB_CONFIG['allow_src_above_phpthumb'] = true;   // if true (default), allow src to be anywhere in filesystem; if false only allow src within sub-directory of phpThumb installation
-$PHPTHUMB_CONFIG['allow_parameter_file']     = false;  // if true, allow use of 'file' parameter; if false (default) the 'file' parameter is disabled/ignored
-$PHPTHUMB_CONFIG['allow_parameter_goto']     = false;  // if true, allow use of 'goto' parameter; if false (default) the 'goto' parameter is disabled/ignored
+$PHPTHUMB_CONFIG['high_security_enabled']    = false; // if enabled, requires 'high_security_password' set to be set and requires the use of phpThumbURL() function (at the bottom of phpThumb.config.php) to generate hashed URLs
+$PHPTHUMB_CONFIG['high_security_password']   = ''; // required if 'high_security_enabled' is true, and must be at complex (uppercase, lowercase, numbers, punctuation, etc -- punctuation is strongest, lowercase is weakest; see PasswordStrength() in phpThumb.php). You can use a password generator like http://silisoftware.com/tools/password-random.php to generate a strong password
+$PHPTHUMB_CONFIG['disable_debug']            = true; // prevent phpThumb from displaying any information about your system. If true, phpThumbDebug and error messages will be disabled
+$PHPTHUMB_CONFIG['allow_src_above_docroot']  = true; // if true, allow src to be anywhere in filesystem; if false (default) only allow src within document_root
+$PHPTHUMB_CONFIG['allow_src_above_phpthumb'] = true; // if true (default), allow src to be anywhere in filesystem; if false only allow src within sub-directory of phpThumb installation
+$PHPTHUMB_CONFIG['allow_parameter_file']     = false; // if true, allow use of 'file' parameter; if false (default) the 'file' parameter is disabled/ignored
+$PHPTHUMB_CONFIG['allow_parameter_goto']     = false; // if true, allow use of 'goto' parameter; if false (default) the 'goto' parameter is disabled/ignored
 
 // * HTTP UserAgent configuration
 //$PHPTHUMB_CONFIG['http_user_agent'] = '';                                                                                      // PHP default: none
@@ -194,12 +194,12 @@ 
 $PHPTHUMB_CONFIG['http_user_agent'] = 'Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.7.12) Gecko/20050915 Firefox/1.0.7'; // Windows XP, Firefox
 
 // * Compatibility settings
-$PHPTHUMB_CONFIG['disable_pathinfo_parsing']        = false;  // if true, $_SERVER[PATH_INFO] is not parsed. May be needed on some server configurations to allow normal behavior.
-$PHPTHUMB_CONFIG['disable_imagecopyresampled']      = false;  // if true, ImageCopyResampled is replaced with ImageCopyResampleBicubic. May be needed for buggy versions of PHP-GD.
-$PHPTHUMB_CONFIG['disable_onlycreateable_passthru'] = true;   // if true, any image that can be parsed by getimagesize() can be passed through; if false, only images that can be converted to GD by ImageCreateFrom(JPEG|GIF|PNG) functions are allowed
+$PHPTHUMB_CONFIG['disable_pathinfo_parsing']        = false; // if true, $_SERVER[PATH_INFO] is not parsed. May be needed on some server configurations to allow normal behavior.
+$PHPTHUMB_CONFIG['disable_imagecopyresampled']      = false; // if true, ImageCopyResampled is replaced with ImageCopyResampleBicubic. May be needed for buggy versions of PHP-GD.
+$PHPTHUMB_CONFIG['disable_onlycreateable_passthru'] = true; // if true, any image that can be parsed by getimagesize() can be passed through; if false, only images that can be converted to GD by ImageCreateFrom(JPEG|GIF|PNG) functions are allowed
 
 // * HTTP remote file opening settings
-$PHPTHUMB_CONFIG['http_fopen_timeout']   = 10;   // timeout (in seconds) for fopen / curl / fsockopen
+$PHPTHUMB_CONFIG['http_fopen_timeout']   = 10; // timeout (in seconds) for fopen / curl / fsockopen
 $PHPTHUMB_CONFIG['http_follow_redirect'] = true; // if true (default), follow "302 Found" redirects to new URL; if false, return error message
 
 // * Speed optimizations configuration
@@ -213,7 +213,7 @@ 
 // START DEFAULT PARAMETERS SECTION
 // If any parameters are constant across ALL images, you can set them here
 
-$PHPTHUMB_DEFAULTS_GETSTRINGOVERRIDE = true;  // if true, any parameters in the URL will override the defaults set here; if false, any parameters set here cannot be overridden in the URL
+$PHPTHUMB_DEFAULTS_GETSTRINGOVERRIDE = true; // if true, any parameters in the URL will override the defaults set here; if false, any parameters set here cannot be overridden in the URL
 $PHPTHUMB_DEFAULTS_DISABLEGETPARAMS  = false; // if true, GETstring parameters will be ignored (except for 'src') and only below default parameters will be used; if false, both default and GETstring parameters will be used (depending on $PHPTHUMB_DEFAULTS_GETSTRINGOVERRIDE). Will be auto-set true if !empty($PHPTHUMB_CONFIG['cache_default_only_suffix'])
 
 //$PHPTHUMB_DEFAULTS['w']    = 200;
@@ -236,7 +236,7 @@ 
 {
     global $PHPTHUMB_CONFIG;
 
-    return str_replace(@$PHPTHUMB_CONFIG['document_root'], '', __DIR__) . DIRECTORY_SEPARATOR . 'phpThumb.php?' . $ParameterString . '&hash=' . md5($ParameterString . @$PHPTHUMB_CONFIG['high_security_password']);
+    return str_replace(@$PHPTHUMB_CONFIG['document_root'], '', __DIR__).DIRECTORY_SEPARATOR.'phpThumb.php?'.$ParameterString.'&hash='.md5($ParameterString.@$PHPTHUMB_CONFIG['high_security_password']);
 }
 
 ///////////////////////////////////////////////////////////////////////////////

phpthumb/phpthumb.unsharp.php

Spacing +4 added lines, -4 removed lines

@@ -92,12 +92,12 @@
             // Move copies of the image around one pixel at the time and merge them with weight
             // according to the matrix. The same matrix is simply repeated for higher radii.
             for ($i = 0; $i < $radius; $i++) {
-                imagecopy($imgBlur, $img, 0, 0, 1, 0, $w - 1, $h);               // left
-                imagecopymerge($imgBlur, $img, 1, 0, 0, 0, $w, $h, 50);       // right
-                imagecopymerge($imgBlur, $img, 0, 0, 0, 0, $w, $h, 50);       // center
+                imagecopy($imgBlur, $img, 0, 0, 1, 0, $w - 1, $h); // left
+                imagecopymerge($imgBlur, $img, 1, 0, 0, 0, $w, $h, 50); // right
+                imagecopymerge($imgBlur, $img, 0, 0, 0, 0, $w, $h, 50); // center
                 imagecopy($imgCanvas, $imgBlur, 0, 0, 0, 0, $w, $h);
                 imagecopymerge($imgBlur, $imgCanvas, 0, 0, 0, 1, $w, $h - 1, 33.33333); // up
-                imagecopymerge($imgBlur, $imgCanvas, 0, 1, 0, 0, $w, $h, 25);       // down
+                imagecopymerge($imgBlur, $imgCanvas, 0, 1, 0, 0, $w, $h, 25); // down
             }
         }
 

phpthumb/phpthumb.filters.php

Spacing +30 added lines, -30 removed lines

@@ -44,7 +44,7 @@ 
     public function ApplyMask(&$gdimg_mask, &$gdimg_image)
     {
         if (phpthumb_functions::gd_version() < 2) {
-            $this->DebugMessage('Skipping ApplyMask() because gd_version is "' . phpthumb_functions::gd_version() . '"', __FILE__, __LINE__);
+            $this->DebugMessage('Skipping ApplyMask() because gd_version is "'.phpthumb_functions::gd_version().'"', __FILE__, __LINE__);
 
             return false;
         }
@@ -80,7 +80,7 @@ 
             }
         } else {
             // alpha merging requires PHP v4.3.2+
-            $this->DebugMessage('Skipping ApplyMask() technique because PHP is v"' . PHP_VERSION . '"', __FILE__, __LINE__);
+            $this->DebugMessage('Skipping ApplyMask() technique because PHP is v"'.PHP_VERSION.'"', __FILE__, __LINE__);
         }
 
         return true;
@@ -139,13 +139,13 @@ 
             // Move copies of the image around one pixel at the time and merge them with weight
             // according to the matrix. The same matrix is simply repeated for higher radii.
             for ($i = 0; $i < $radius; $i++) {
-                imagecopy($imgBlur, $gdimg, 0, 0, 1, 1, $w - 1, $h - 1);            // up left
-                imagecopymerge($imgBlur, $gdimg, 1, 1, 0, 0, $w, $h, 50.00000);  // down right
-                imagecopymerge($imgBlur, $gdimg, 0, 1, 1, 0, $w - 1, $h, 33.33333);  // down left
-                imagecopymerge($imgBlur, $gdimg, 1, 0, 0, 1, $w, $h - 1, 25.00000);  // up right
-                imagecopymerge($imgBlur, $gdimg, 0, 0, 1, 0, $w - 1, $h, 33.33333);  // left
-                imagecopymerge($imgBlur, $gdimg, 1, 0, 0, 0, $w, $h, 25.00000);  // right
-                imagecopymerge($imgBlur, $gdimg, 0, 0, 0, 1, $w, $h - 1, 20.00000);  // up
+                imagecopy($imgBlur, $gdimg, 0, 0, 1, 1, $w - 1, $h - 1); // up left
+                imagecopymerge($imgBlur, $gdimg, 1, 1, 0, 0, $w, $h, 50.00000); // down right
+                imagecopymerge($imgBlur, $gdimg, 0, 1, 1, 0, $w - 1, $h, 33.33333); // down left
+                imagecopymerge($imgBlur, $gdimg, 1, 0, 0, 1, $w, $h - 1, 25.00000); // up right
+                imagecopymerge($imgBlur, $gdimg, 0, 0, 1, 0, $w - 1, $h, 33.33333); // left
+                imagecopymerge($imgBlur, $gdimg, 1, 0, 0, 0, $w, $h, 25.00000); // right
+                imagecopymerge($imgBlur, $gdimg, 0, 0, 0, 1, $w, $h - 1, 20.00000); // up
                 imagecopymerge($imgBlur, $gdimg, 0, 1, 0, 0, $w, $h, 16.666667); // down
                 imagecopymerge($imgBlur, $gdimg, 0, 0, 0, 0, $w, $h, 50.000000); // center
                 imagecopy($gdimg, $imgBlur, 0, 0, 0, 0, $w, $h);
@@ -213,7 +213,7 @@ 
             if (imagefilter($gdimg, IMG_FILTER_BRIGHTNESS, $amount)) {
                 return true;
             }
-            $this->DebugMessage('FAILED: imagefilter($gdimg, IMG_FILTER_BRIGHTNESS, ' . $amount . ')', __FILE__, __LINE__);
+            $this->DebugMessage('FAILED: imagefilter($gdimg, IMG_FILTER_BRIGHTNESS, '.$amount.')', __FILE__, __LINE__);
             // fall through and try it the hard way
         }
 
@@ -253,7 +253,7 @@ 
             if (imagefilter($gdimg, IMG_FILTER_CONTRAST, $amount)) {
                 return true;
             }
-            $this->DebugMessage('FAILED: imagefilter($gdimg, IMG_FILTER_CONTRAST, ' . $amount . ')', __FILE__, __LINE__);
+            $this->DebugMessage('FAILED: imagefilter($gdimg, IMG_FILTER_CONTRAST, '.$amount.')', __FILE__, __LINE__);
             // fall through and try it the hard way
         }
 
@@ -718,7 +718,7 @@ 
             'a' => 'alpha',
             '*' => (0 == $method) ? 'all' : 'gray'
         ];
-        $band     = substr($band, 0, 1);
+        $band = substr($band, 0, 1);
         if (!isset($keys[$band])) {
             return false;
         }
@@ -940,7 +940,7 @@ 
 
             return true;
         } else {
-            $this->DebugMessage('FAILED: $gd_border_canvas = phpthumb_functions::ImageCreateFunction(' . $output_width . ', ' . $output_height . ')', __FILE__, __LINE__);
+            $this->DebugMessage('FAILED: $gd_border_canvas = phpthumb_functions::ImageCreateFunction('.$output_width.', '.$output_height.')', __FILE__, __LINE__);
         }
 
         return false;
@@ -1115,15 +1115,15 @@ 
 
                 self::ApplyMask($gdimg_cornermask, $gdimg);
                 imagedestroy($gdimg_cornermask);
-                $this->DebugMessage('RoundedImageCorners(' . $radius_x . ', ' . $radius_y . ') succeeded', __FILE__, __LINE__);
+                $this->DebugMessage('RoundedImageCorners('.$radius_x.', '.$radius_y.') succeeded', __FILE__, __LINE__);
 
                 return true;
             } else {
-                $this->DebugMessage('FAILED: $gdimg_cornermask = phpthumb_functions::ImageCreateFunction(' . imagesx($gdimg) . ', ' . imagesy($gdimg) . ')', __FILE__, __LINE__);
+                $this->DebugMessage('FAILED: $gdimg_cornermask = phpthumb_functions::ImageCreateFunction('.imagesx($gdimg).', '.imagesy($gdimg).')', __FILE__, __LINE__);
             }
             imagedestroy($gdimg_cornermask_triple);
         } else {
-            $this->DebugMessage('FAILED: $gdimg_cornermask_triple = phpthumb_functions::ImageCreateFunction(' . ($radius_x * 6) . ', ' . ($radius_y * 6) . ')', __FILE__, __LINE__);
+            $this->DebugMessage('FAILED: $gdimg_cornermask_triple = phpthumb_functions::ImageCreateFunction('.($radius_x * 6).', '.($radius_y * 6).')', __FILE__, __LINE__);
         }
 
         return false;
@@ -1225,11 +1225,11 @@ 
             if (imagefilter($gdimg, IMG_FILTER_SMOOTH, $amount)) {
                 return true;
             }
-            $this->DebugMessage('FAILED: imagefilter($gdimg, IMG_FILTER_SMOOTH, ' . $amount . ')', __FILE__, __LINE__);
+            $this->DebugMessage('FAILED: imagefilter($gdimg, IMG_FILTER_SMOOTH, '.$amount.')', __FILE__, __LINE__);
             // fall through and try it the hard way
         }
         // currently not implemented "the hard way"
-        $this->DebugMessage('FAILED: phpthumb_filters::Smooth($gdimg, ' . $amount . ') [function not implemented]', __FILE__, __LINE__);
+        $this->DebugMessage('FAILED: phpthumb_filters::Smooth($gdimg, '.$amount.') [function not implemented]', __FILE__, __LINE__);
 
         return false;
     }
@@ -1423,18 +1423,18 @@ 
             '^y'  => imagesy($gdimg),
             '^^'  => '^',
         ];
-        $text          = strtr($text, $metaTextArray);
+        $text = strtr($text, $metaTextArray);
 
         $text      = str_replace("\r\n", "\n", $text);
         $text      = str_replace("\r", "\n", $text);
         $textlines = explode("\n", $text);
-        $this->DebugMessage('Processing ' . count($textlines) . ' lines of text', __FILE__, __LINE__);
+        $this->DebugMessage('Processing '.count($textlines).' lines of text', __FILE__, __LINE__);
 
         if (@is_readable($ttffont) && is_file($ttffont)) {
             $opacity           = 100 - (int)max(min($opacity, 100), 0);
             $letter_color_text = phpthumb_functions::ImageHexColorAllocate($gdimg, $hex_color, false, $opacity * 1.27);
 
-            $this->DebugMessage('Using TTF font "' . $ttffont . '"', __FILE__, __LINE__);
+            $this->DebugMessage('Using TTF font "'.$ttffont.'"', __FILE__, __LINE__);
 
             $TTFbox = imagettfbbox($size, $angle, $ttffont, $text);
 
@@ -1535,7 +1535,7 @@ 
                 $y_TL = preg_match('#y#i', $fillextend) ? 0 : min($y1, $y2);
                 $x_BR = preg_match('#x#i', $fillextend) ? imagesx($gdimg) : max($x1, $x2);
                 $y_BR = preg_match('#y#i', $fillextend) ? imagesy($gdimg) : max($y1, $y2);
-                $this->DebugMessage('WatermarkText() calling imagefilledrectangle($gdimg, ' . $x_TL . ', ' . $y_TL . ', ' . $x_BR . ', ' . $y_BR . ', $text_color_background)', __FILE__, __LINE__);
+                $this->DebugMessage('WatermarkText() calling imagefilledrectangle($gdimg, '.$x_TL.', '.$y_TL.', '.$x_BR.', '.$y_BR.', $text_color_background)', __FILE__, __LINE__);
                 imagefilledrectangle($gdimg, $x_TL, $y_TL, $x_BR, $y_BR, $text_color_background);
 
                 // end block for background color only
@@ -1570,7 +1570,7 @@ 
                     }
 
                     //imagettftext($gdimg, $size, $angle, $text_origin_x, $text_origin_y, $letter_color_text, $ttffont, $text);
-                    $this->DebugMessage('WatermarkText() calling imagettftext($gdimg, ' . $size . ', ' . $angle . ', ' . $text_origin_x . ', ' . ($text_origin_y + $y_offset) . ', $letter_color_text, ' . $ttffont . ', ' . $line . ')', __FILE__, __LINE__);
+                    $this->DebugMessage('WatermarkText() calling imagettftext($gdimg, '.$size.', '.$angle.', '.$text_origin_x.', '.($text_origin_y + $y_offset).', $letter_color_text, '.$ttffont.', '.$line.')', __FILE__, __LINE__);
                     imagettftext($gdimg, $size, $angle, $text_origin_x, $text_origin_y + $y_offset, $letter_color_text, $ttffont, $line);
 
                     $y_offset += $char_height;
@@ -1580,12 +1580,12 @@ 
             return true;
         } else {
             $size = min(5, max(1, $size));
-            $this->DebugMessage('Using built-in font (size=' . $size . ') for text watermark' . ($ttffont ? ' because $ttffont !is_readable(' . $ttffont . ')' : ''), __FILE__, __LINE__);
+            $this->DebugMessage('Using built-in font (size='.$size.') for text watermark'.($ttffont ? ' because $ttffont !is_readable('.$ttffont.')' : ''), __FILE__, __LINE__);
 
             $text_width  = 0;
             $text_height = 0;
             foreach ($textlines as $dummy => $line) {
-                $text_width  = max($text_width, imagefontwidth($size) * strlen($line));
+                $text_width = max($text_width, imagefontwidth($size) * strlen($line));
                 $text_height += imagefontheight($size);
             }
             if ($img_watermark = phpthumb_functions::ImageCreateFunction($text_width, $text_height)) {
@@ -1596,7 +1596,7 @@ 
                 } else {
                     $text_color_background = phpthumb_functions::ImageHexColorAllocate($img_watermark, 'FFFFFF', false, 127);
                 }
-                $this->DebugMessage('WatermarkText() calling imagefilledrectangle($img_watermark, 0, 0, ' . imagesx($img_watermark) . ', ' . imagesy($img_watermark) . ', $text_color_background)', __FILE__, __LINE__);
+                $this->DebugMessage('WatermarkText() calling imagefilledrectangle($img_watermark, 0, 0, '.imagesx($img_watermark).', '.imagesy($img_watermark).', $text_color_background)', __FILE__, __LINE__);
                 imagefilledrectangle($img_watermark, 0, 0, imagesx($img_watermark), imagesy($img_watermark), $text_color_background);
 
                 $img_watermark_mask    = false;
@@ -1675,10 +1675,10 @@ 
                             }
                             break;
                     }
-                    $this->DebugMessage('WatermarkText() calling imagestring($img_watermark, ' . $size . ', ' . $x_offset . ', ' . ($key * imagefontheight($size)) . ', ' . $line . ', $text_color_watermark)', __FILE__, __LINE__);
+                    $this->DebugMessage('WatermarkText() calling imagestring($img_watermark, '.$size.', '.$x_offset.', '.($key * imagefontheight($size)).', '.$line.', $text_color_watermark)', __FILE__, __LINE__);
                     imagestring($img_watermark, $size, $x_offset, $key * imagefontheight($size), $line, $text_color_watermark);
                     if ($angle && $img_watermark_mask) {
-                        $this->DebugMessage('WatermarkText() calling imagestring($img_watermark_mask, ' . $size . ', ' . $x_offset . ', ' . ($key * imagefontheight($size)) . ', ' . $text . ', $mask_color_watermark)', __FILE__, __LINE__);
+                        $this->DebugMessage('WatermarkText() calling imagestring($img_watermark_mask, '.$size.', '.$x_offset.', '.($key * imagefontheight($size)).', '.$text.', $mask_color_watermark)', __FILE__, __LINE__);
                         imagestring($img_watermark_mask, $size, $x_offset, $key * imagefontheight($size), $text, $mask_color_watermark);
                     }
                 }
@@ -1688,8 +1688,8 @@ 
                     self::ApplyMask($img_watermark_mask, $img_watermark);
                 }
                 //phpthumb_filters::WatermarkOverlay($gdimg, $img_watermark, $alignment, $opacity, $margin);
-                $this->DebugMessage('WatermarkText() calling phpthumb_filters::WatermarkOverlay($gdimg, $img_watermark, ' . ($originOffsetX . 'x' . $originOffsetY) . ', ' . $opacity . ', 0)', __FILE__, __LINE__);
-                self::WatermarkOverlay($gdimg, $img_watermark, $originOffsetX . 'x' . $originOffsetY, $opacity, 0);
+                $this->DebugMessage('WatermarkText() calling phpthumb_filters::WatermarkOverlay($gdimg, $img_watermark, '.($originOffsetX.'x'.$originOffsetY).', '.$opacity.', 0)', __FILE__, __LINE__);
+                self::WatermarkOverlay($gdimg, $img_watermark, $originOffsetX.'x'.$originOffsetY, $opacity, 0);
                 imagedestroy($img_watermark);
 
                 return true;