mambax7 / extgallery

class/pear/Image/Transform/Driver/Imlib.php

Spacing +8 added lines, -8 removed lines

@@ -18,7 +18,7 @@ 
 // {{{ requires
 
 //require_once __DIR__ . '/Image/Transform.php';
-require_once XOOPS_ROOT_PATH . '/modules/extgallery/class/pear/Image/Transform.php';
+require_once XOOPS_ROOT_PATH.'/modules/extgallery/class/pear/Image/Transform.php';
 
 // }}}
 // {{{ example usage
@@ -98,7 +98,7 @@ 
     {
         $this->image       = $image;
         $this->imageHandle = imlib_load_image($this->image);
-        $result            =& $this->_get_image_details($image);
+        $result            = & $this->_get_image_details($image);
         if (PEAR::isError($result)) {
             return $result;
         }
@@ -139,19 +139,19 @@ 
             'size'  => '12',
             'angle' => IMLIB_TEXT_TO_RIGHT,
         ];
-        $params         = array_merge($default_params, $params);
+        $params = array_merge($default_params, $params);
         extract($params);
 
         if (!is_array($color)) {
             if ('#' == $color[0]) {
                 $color = $this->colorhex2colorarray($color);
             } else {
-                require_once __DIR__ . '/Image/Transform/Driver/ColorsDefs.php';
+                require_once __DIR__.'/Image/Transform/Driver/ColorsDefs.php';
                 $color = isset($colornames[$color]) ? $colornames[$color] : false;
             }
         }
 
-        $fontResource = imlib_load_font($font . '/' . $size);
+        $fontResource = imlib_load_font($font.'/'.$size);
         imlib_text_draw($this->imageHandle, $fontResource, $x, $y, $text, $angle, $color[0], $color[1], $color[2], 255);
 
         return true;
@@ -250,7 +250,7 @@ 
         $this->imageHandle = $this->oldHandle;
         $this->resized     = false;
         if (!$return) {
-            return PEAR::raiseError('Couldn\'t save image. Reason: ' . $err, true);
+            return PEAR::raiseError('Couldn\'t save image. Reason: '.$err, true);
         }
 
         return true;
@@ -279,13 +279,13 @@ 
         $quality = (null === $quality) ? $this->_options['quality'] : $quality;
         imlib_image_set_format($this->imageHandle, $type);
         $err = 0;
-        header('Content-type: ' . $this->getMimeType($type));
+        header('Content-type: '.$this->getMimeType($type));
         $return            = imlib_dump_image($this->imageHandle, $err, $quality);
         $this->imageHandle = $this->oldHandle;
         $this->resized     = false;
         imlib_free_image($this->oldHandle);
         if (!$return) {
-            return PEAR::raiseError('Couldn\'t output image. Reason: ' . $err, true);
+            return PEAR::raiseError('Couldn\'t output image. Reason: '.$err, true);
         }
 
         return true;

class/pear/Image/Transform/Driver/Imagick/ImageTypes.php

Spacing +1 added lines, -1 removed lines

@@ -60,7 +60,7 @@
     'pcl'   => 'w',
     'pcx'   => 'rw',
     'pdb'   => 'rw',
-    'pdf'   => 'w',      // Requires Ghostscript to read
+    'pdf'   => 'w', // Requires Ghostscript to read
     'pfa'   => 'r',
     'pfb'   => 'r',
     'pgm'   => 'rw',

class/pear/Image/Transform/Driver/Imagick3.php

Spacing +6 added lines, -6 removed lines

@@ -23,7 +23,7 @@ 
  * @link       http://pear.php.net/package/Image_Transform
  */
 
-require_once __DIR__ . '/Image/Transform.php';
+require_once __DIR__.'/Image/Transform.php';
 
 /**
  * imagick PECL extension implementation for Image_Transform package
@@ -72,7 +72,7 @@ 
     public function __construct()
     {
         if (PEAR::loadExtension('imagick')) {
-            include __DIR__ . '/Image/Transform/Driver/Imagick/ImageTypes.php';
+            include __DIR__.'/Image/Transform/Driver/Imagick/ImageTypes.php';
         } else {
             $this->isError(PEAR::raiseError('Could not find the imagick extension.', IMAGE_TRANSFORM_ERROR_UNSUPPORTED));
         }
@@ -96,7 +96,7 @@ 
         } catch (ImagickException $e) {
             $this->free();
 
-            return $this->raiseError('Could not load image:' . $e->getMessage(), IMAGE_TRANSFORM_ERROR_IO);
+            return $this->raiseError('Could not load image:'.$e->getMessage(), IMAGE_TRANSFORM_ERROR_IO);
         }
 
         $this->image = $image;
@@ -162,7 +162,7 @@ 
         try {
             $this->imagick->rotateImage($pixel, $angle);
         } catch (ImagickException $e) {
-            return $this->raiseError('Cannot create a new imagick image for the rotation: ' . $e->getMessage(), IMAGE_TRANSFORM_ERROR_FAILED);
+            return $this->raiseError('Cannot create a new imagick image for the rotation: '.$e->getMessage(), IMAGE_TRANSFORM_ERROR_FAILED);
         }
         $info        = $this->imagick->getImageGeometry();
         $this->new_x = $info['width'];
@@ -247,7 +247,7 @@ 
         try {
             $this->imagick->writeImage($filename);
         } catch (ImagickException $e) {
-            return $this->raiseError('Could not save image to file: ' . $e->getMessage(), IMAGE_TRANSFORM_ERROR_IO);
+            return $this->raiseError('Could not save image to file: '.$e->getMessage(), IMAGE_TRANSFORM_ERROR_IO);
         }
 
         if (!$this->keep_settings_on_save) {
@@ -289,7 +289,7 @@ 
         } catch (ImagickException $e) {
             return $this->raiseError('Could not display image.', IMAGE_TRANSFORM_ERROR_IO);
         }
-        header('Content-type: ' . $this->getMimeType($type));
+        header('Content-type: '.$this->getMimeType($type));
         echo $image;
         $this->free();
 

class/pear/Image/Transform/Driver/Imagick2.php

Spacing +5 added lines, -5 removed lines

@@ -26,7 +26,7 @@ 
  */
 
 //require_once __DIR__ . '/Image/Transform.php';
-require_once XOOPS_ROOT_PATH . '/modules/extgallery/class/pear/Image/Image/Transform.php';
+require_once XOOPS_ROOT_PATH.'/modules/extgallery/class/pear/Image/Image/Transform.php';
 
 /**
  * imagick PECL extension implementation for Image_Transform package
@@ -75,7 +75,7 @@ 
     public function __construct()
     {
         if (PEAR::loadExtension('imagick')) {
-            include __DIR__ . '/Image/Transform/Driver/Imagick/ImageTypes.php';
+            include __DIR__.'/Image/Transform/Driver/Imagick/ImageTypes.php';
         } else {
             $this->isError(PEAR::raiseError('Couldn\'t find the imagick extension.', IMAGE_TRANSFORM_ERROR_UNSUPPORTED));
         }
@@ -191,7 +191,7 @@ 
         imagick_begindraw($this->imageHandle);
 
         foreach ($cmds as $cmd => $v) {
-            if (!call_user_func('imagick_' . $cmd, $this->imageHandle, $params[$v])) {
+            if (!call_user_func('imagick_'.$cmd, $this->imageHandle, $params[$v])) {
                 return $this->raiseError("Problem with adding Text::{$v} = {$params[$v]}", IMAGE_TRANSFORM_ERROR_FAILED);
             }
         }
@@ -263,7 +263,7 @@ 
         if (!($image = imagick_image2blob($this->imageHandle))) {
             return $this->raiseError('Couldn\'t display image.', IMAGE_TRANSFORM_ERROR_IO);
         }
-        header('Content-type: ' . imagick_getmimetype($this->imageHandle));
+        header('Content-type: '.imagick_getmimetype($this->imageHandle));
         echo $image;
         $this->free();
 
@@ -369,7 +369,7 @@ 
     public function raiseError($message, $code = 0)
     {
         if (is_resource($this->imageHandle)) {
-            $message .= "\nReason: " . imagick_failedreason($this->imageHandle) . "\nDescription: " . imagick_faileddescription($this->imageHandle);
+            $message .= "\nReason: ".imagick_failedreason($this->imageHandle)."\nDescription: ".imagick_faileddescription($this->imageHandle);
         }
 
         return PEAR::raiseError($message, $code);

class/pear/Image/Transform/Driver/Imagick.php

Spacing +7 added lines, -7 removed lines

@@ -25,7 +25,7 @@ 
 /**
  * Include of base class
  */
-require_once XOOPS_ROOT_PATH . '/modules/extgallery/class/pear/Image/Image/Transform.php';
+require_once XOOPS_ROOT_PATH.'/modules/extgallery/class/pear/Image/Image/Transform.php';
 
 /**
  * Image Transformation interface using old ImageMagick extension
@@ -59,7 +59,7 @@ 
         if (!PEAR::loadExtension('imagick')) {
             return PEAR::raiseError('The imagick extension can not be found.', true);
         }
-        include __DIR__ . '/Image/Transform/Driver/Imagick/ImageTypes.php';
+        include __DIR__.'/Image/Transform/Driver/Imagick/ImageTypes.php';
 
         //return true;
     } // End Image_IM
@@ -80,7 +80,7 @@ 
         }
 
         if (!imagick_read($this->imageHandle, $image)) {
-            return PEAR::raiseError('The image file ' . $image . ' does\'t exist', true);
+            return PEAR::raiseError('The image file '.$image.' does\'t exist', true);
         }
         $this->image = $image;
         $result      = $this->_get_image_details($image);
@@ -161,13 +161,13 @@ 
             'font'         => 'Arial.ttf',
             'resize_first' => false // Carry out the scaling of the image before annotation?
         ];
-        $params         = array_merge($default_params, $params);
+        $params = array_merge($default_params, $params);
         extract($params);
 
         $color = is_array($color) ? $this->colorarray2colorhex($color) : strtolower($color);
 
         imagick_annotate($this->imageHandle, [
-            'primitive' => "text $x,$y " . $text,
+            'primitive' => "text $x,$y ".$text,
             'pointsize' => $size,
             'antialias' => 0,
             'fill'      => $color,
@@ -206,11 +206,11 @@ 
     public function display($type = '', $quality = 75)
     {
         if ('' == $type) {
-            header('Content-type: image/' . $this->type);
+            header('Content-type: image/'.$this->type);
             if (!imagick_dump($this->imageHandle)) {
             }
         } else {
-            header('Content-type: image/' . $type);
+            header('Content-type: image/'.$type);
             if (!imagick_dump($this->imageHandle, $this->type)) {
             }
         }

class/pear/Image/Transform/Driver/NetPBM.php

Spacing +36 added lines, -36 removed lines

@@ -25,8 +25,8 @@ 
 
 //require_once __DIR__ . '/Image/Transform.php';
 //require_once __DIR__ . '/System.php';
-require_once XOOPS_ROOT_PATH . '/modules/extgallery/class/pear/Image/Transform.php';
-require_once XOOPS_ROOT_PATH . '/modules/extgallery/class/pear/System.php';
+require_once XOOPS_ROOT_PATH.'/modules/extgallery/class/pear/Image/Transform.php';
+require_once XOOPS_ROOT_PATH.'/modules/extgallery/class/pear/System.php';
 
 /**
  * NetPBM implementation for Image_Transform package
@@ -64,10 +64,10 @@ 
     public function __construct()
     {
         if (!defined('IMAGE_TRANSFORM_NETPBM_PATH')) {
-            $path = dirname(System::which('pnmscale')) . DIRECTORY_SEPARATOR;
+            $path = dirname(System::which('pnmscale')).DIRECTORY_SEPARATOR;
             define('IMAGE_TRANSFORM_NETPBM_PATH', $path);
         }
-        if (!System::which(IMAGE_TRANSFORM_NETPBM_PATH . 'pnmscale' . ((OS_WINDOWS) ? '.exe' : ''))) {
+        if (!System::which(IMAGE_TRANSFORM_NETPBM_PATH.'pnmscale'.((OS_WINDOWS) ? '.exe' : ''))) {
             $this->isError(PEAR::raiseError('Couldn\'t find "pnmscale" binary', IMAGE_TRANSFORM_ERROR_UNSUPPORTED));
         }
     } // End function Image_NetPBM
@@ -113,24 +113,24 @@ 
                 if ($scale_x == $new_y / $this->img_x
                     && $scale_x > 1
                     && floor($scale_x) == $scale_x) {
-                    if (System::which(IMAGE_TRANSFORM_NETPBM_PATH . 'pnmenlarge' . ((OS_WINDOWS) ? '.exe' : ''))) {
+                    if (System::which(IMAGE_TRANSFORM_NETPBM_PATH.'pnmenlarge'.((OS_WINDOWS) ? '.exe' : ''))) {
                         $this->command[] = $this->_prepare_cmd(IMAGE_TRANSFORM_NETPBM_PATH, 'pnmenlarge', $scale_x);
                     } else {
                         return PEAR::raiseError('Couldn\'t find "pnmenlarge" binary', IMAGE_TRANSFORM_ERROR_UNSUPPORTED);
                     }
                 } else {
-                    $this->command[] = $this->_prepare_cmd(IMAGE_TRANSFORM_NETPBM_PATH, 'pnmscale', '-nomix -width ' . ((int)$new_x) . ' -height ' . ((int)$new_y));
+                    $this->command[] = $this->_prepare_cmd(IMAGE_TRANSFORM_NETPBM_PATH, 'pnmscale', '-nomix -width '.((int)$new_x).' -height '.((int)$new_y));
                 }
                 break;
 
             case 'smooth':
             default:
-                $this->command[] = $this->_prepare_cmd(IMAGE_TRANSFORM_NETPBM_PATH, 'pnmscale', '-width ' . ((int)$new_x) . ' -height ' . ((int)$new_y));
+                $this->command[] = $this->_prepare_cmd(IMAGE_TRANSFORM_NETPBM_PATH, 'pnmscale', '-width '.((int)$new_x).' -height '.((int)$new_y));
                 // Smooth things if scaling by a factor more than 3
                 // (see pnmscale man page)
                 if ($new_x / $this->img_x > 3
                     || $new_y / $this->img_y > 3) {
-                    if (System::which(IMAGE_TRANSFORM_NETPBM_PATH . 'pnmsmooth' . ((OS_WINDOWS) ? '.exe' : ''))) {
+                    if (System::which(IMAGE_TRANSFORM_NETPBM_PATH.'pnmsmooth'.((OS_WINDOWS) ? '.exe' : ''))) {
                         $this->command[] = $this->_prepare_cmd(IMAGE_TRANSFORM_NETPBM_PATH, 'pnmsmooth');
                     } else {
                         return PEAR::raiseError('Couldn\'t find "pnmsmooth" binary', IMAGE_TRANSFORM_ERROR_UNSUPPORTED);
@@ -162,13 +162,13 @@ 
         // even if acceptable range is -90 to +90 (see pnmrotate man page)
         // Bring image to that range by using pamflip
         if ($angle > 45 && $angle < 315) {
-            if (!System::which(IMAGE_TRANSFORM_NETPBM_PATH . 'pamflip' . ((OS_WINDOWS) ? '.exe' : ''))) {
+            if (!System::which(IMAGE_TRANSFORM_NETPBM_PATH.'pamflip'.((OS_WINDOWS) ? '.exe' : ''))) {
                 return PEAR::raiseError('Couldn\'t find "pamflip" binary', IMAGE_TRANSFORM_ERROR_UNSUPPORTED);
             }
 
             $quarters        = floor(ceil($angle / 45) / 2);
-            $this->command[] = $this->_prepare_cmd(IMAGE_TRANSFORM_NETPBM_PATH, 'pamflip', '-rotate' . (360 - $quarters * 90));
-            $angle           -= $quarters * 90;
+            $this->command[] = $this->_prepare_cmd(IMAGE_TRANSFORM_NETPBM_PATH, 'pamflip', '-rotate'.(360 - $quarters * 90));
+            $angle -= $quarters * 90;
         }
 
         if (0 != $angle) {
@@ -176,7 +176,7 @@ 
                 $angle -= 360;
             }
 
-            if (!System::which(IMAGE_TRANSFORM_NETPBM_PATH . 'pnmrotate' . ((OS_WINDOWS) ? '.exe' : ''))) {
+            if (!System::which(IMAGE_TRANSFORM_NETPBM_PATH.'pnmrotate'.((OS_WINDOWS) ? '.exe' : ''))) {
                 return PEAR::raiseError('Couldn\'t find "pnmrotate" binary', IMAGE_TRANSFORM_ERROR_UNSUPPORTED);
             }
 
@@ -185,9 +185,9 @@ 
 
             $scaleMethod = $this->_getOption('scaleMethod', $options, 'smooth');
             if ('pixel' != $scaleMethod) {
-                $this->command[] = $this->_prepare_cmd(IMAGE_TRANSFORM_NETPBM_PATH, 'pnmrotate', '-background=' . $bgcolor . ' -' . (float)$angle);
+                $this->command[] = $this->_prepare_cmd(IMAGE_TRANSFORM_NETPBM_PATH, 'pnmrotate', '-background='.$bgcolor.' -'.(float)$angle);
             } else {
-                $this->command[] = $this->_prepare_cmd(IMAGE_TRANSFORM_NETPBM_PATH, 'pnmrotate', '-background=' . $bgcolor . ' -noantialias -' . (float)$angle);
+                $this->command[] = $this->_prepare_cmd(IMAGE_TRANSFORM_NETPBM_PATH, 'pnmrotate', '-background='.$bgcolor.' -noantialias -'.(float)$angle);
             }
         }
 
@@ -214,11 +214,11 @@ 
         if (0 != $x || 0 != $y
             || $width != $this->img_x
             || $height != $this->img_y) {
-            if (!System::which(IMAGE_TRANSFORM_NETPBM_PATH . 'pnmcut' . ((OS_WINDOWS) ? '.exe' : ''))) {
+            if (!System::which(IMAGE_TRANSFORM_NETPBM_PATH.'pnmcut'.((OS_WINDOWS) ? '.exe' : ''))) {
                 return PEAR::raiseError('Couldn\'t find "pnmcut" binary', IMAGE_TRANSFORM_ERROR_UNSUPPORTED);
             }
 
-            $this->command[] = $this->_prepare_cmd(IMAGE_TRANSFORM_NETPBM_PATH, 'pnmcut', '-left ' . ((int)$x) . ' -top ' . ((int)$y) . ' -width ' . ((int)$width) . ' -height ' . ((int)$height));
+            $this->command[] = $this->_prepare_cmd(IMAGE_TRANSFORM_NETPBM_PATH, 'pnmcut', '-left '.((int)$x).' -top '.((int)$y).' -width '.((int)$width).' -height '.((int)$height));
         }
 
         return true;
@@ -234,7 +234,7 @@ 
     public function gamma($outputgamma = 1.0)
     {
         if (1.0 != $outputgamme) {
-            if (!System::which(IMAGE_TRANSFORM_NETPBM_PATH . 'pnmgamma' . ((OS_WINDOWS) ? '.exe' : ''))) {
+            if (!System::which(IMAGE_TRANSFORM_NETPBM_PATH.'pnmgamma'.((OS_WINDOWS) ? '.exe' : ''))) {
                 return PEAR::raiseError('Couldn\'t find "pnmgamma" binary', IMAGE_TRANSFORM_ERROR_UNSUPPORTED);
             }
             $this->command[] = $this->_prepare_cmd(IMAGE_TRANSFORM_NETPBM_PATH, 'pnmgamma', (float)$outputgamma);
@@ -251,7 +251,7 @@ 
      **/
     public function flip()
     {
-        if (!System::which(IMAGE_TRANSFORM_NETPBM_PATH . 'pamflip' . ((OS_WINDOWS) ? '.exe' : ''))) {
+        if (!System::which(IMAGE_TRANSFORM_NETPBM_PATH.'pamflip'.((OS_WINDOWS) ? '.exe' : ''))) {
             return PEAR::raiseError('Couldn\'t find "pamflip" binary', IMAGE_TRANSFORM_ERROR_UNSUPPORTED);
         }
         $this->command[] = $this->_prepare_cmd(IMAGE_TRANSFORM_NETPBM_PATH, 'pamflip', '-topbottom');
@@ -267,7 +267,7 @@ 
      **/
     public function mirror()
     {
-        if (!System::which(IMAGE_TRANSFORM_NETPBM_PATH . 'pamflip' . ((OS_WINDOWS) ? '.exe' : ''))) {
+        if (!System::which(IMAGE_TRANSFORM_NETPBM_PATH.'pamflip'.((OS_WINDOWS) ? '.exe' : ''))) {
             return PEAR::raiseError('Couldn\'t find "pamflip" binary', IMAGE_TRANSFORM_ERROR_UNSUPPORTED);
         }
         $this->command[] = $this->_prepare_cmd(IMAGE_TRANSFORM_NETPBM_PATH, 'pamflip', '-leftright');
@@ -283,7 +283,7 @@ 
      **/
     public function greyscale()
     {
-        if (!System::which(IMAGE_TRANSFORM_NETPBM_PATH . 'ppmtopgm' . ((OS_WINDOWS) ? '.exe' : ''))) {
+        if (!System::which(IMAGE_TRANSFORM_NETPBM_PATH.'ppmtopgm'.((OS_WINDOWS) ? '.exe' : ''))) {
             return PEAR::raiseError('Couldn\'t find "ppmtopgm" binary', IMAGE_TRANSFORM_ERROR_UNSUPPORTED);
         }
         $this->command[] = $this->_prepare_cmd(IMAGE_TRANSFORM_NETPBM_PATH, 'ppmtopgm');
@@ -310,7 +310,7 @@ 
      */
     public function addText($params)
     {
-        if (!System::which(IMAGE_TRANSFORM_NETPBM_PATH . 'ppmlabel' . ((OS_WINDOWS) ? '.exe' : ''))) {
+        if (!System::which(IMAGE_TRANSFORM_NETPBM_PATH.'ppmlabel'.((OS_WINDOWS) ? '.exe' : ''))) {
             return PEAR::raiseError('Couldn\'t find "ppmlabel" binary', IMAGE_TRANSFORM_ERROR_UNSUPPORTED);
         }
 
@@ -322,7 +322,7 @@ 
         $color   = $this->_getColor('colorFont', $options, [0, 0, 0]);
         $color   = $this->colorarray2colorhex($color);
 
-        $this->command[] = $this->_prepare_cmd(IMAGE_TRANSFORM_NETPBM_PATH, 'ppmlabel', '-angle ' . ((int)$angle) . ' -colour ' . escapeshellarg($color) . ' -size ' . ((float)$size) . ' -x ' . ((int)$x) . ' -y ' . ((int)($y + $size)) . ' -text ' . escapeshellarg($text));
+        $this->command[] = $this->_prepare_cmd(IMAGE_TRANSFORM_NETPBM_PATH, 'ppmlabel', '-angle '.((int)$angle).' -colour '.escapeshellarg($color).' -size '.((float)$size).' -x '.((int)$x).' -y '.((int)($y + $size)).' -text '.escapeshellarg($text));
     } // End addText
 
     /**
@@ -335,14 +335,14 @@ 
      */
     public function _postProcess($type, $quality)
     {
-        array_unshift($this->command, $this->_prepare_cmd(IMAGE_TRANSFORM_NETPBM_PATH, strtolower($this->type) . 'topnm', escapeshellarg($this->image)));
+        array_unshift($this->command, $this->_prepare_cmd(IMAGE_TRANSFORM_NETPBM_PATH, strtolower($this->type).'topnm', escapeshellarg($this->image)));
         $arg     = '';
         $type    = strtolower($type);
         $program = '';
         switch ($type) {
             // ppmto* converters
             case 'gif':
-                if (!System::which(IMAGE_TRANSFORM_NETPBM_PATH . 'ppmquant' . ((OS_WINDOWS) ? '.exe' : ''))) {
+                if (!System::which(IMAGE_TRANSFORM_NETPBM_PATH.'ppmquant'.((OS_WINDOWS) ? '.exe' : ''))) {
                     return PEAR::raiseError('Couldn\'t find "ppmquant" binary', IMAGE_TRANSFORM_ERROR_UNSUPPORTED);
                 }
                 $this->command[] = $this->_prepare_cmd(IMAGE_TRANSFORM_NETPBM_PATH, 'ppmquant', 256);
@@ -367,14 +367,14 @@ 
             case 'uil':
             case 'xpm':
             case 'yuv':
-                $program = 'ppmto' . $type;
+                $program = 'ppmto'.$type;
                 break;
 
             // Windows icon
             case 'winicon':
             case 'ico':
                 $type    = 'winicon';
-                $program = 'ppmto' . $type;
+                $program = 'ppmto'.$type;
                 break;
 
             // pbmto* converters
@@ -407,7 +407,7 @@ 
             case 'ybm':
             case 'zinc':
             case '10x':
-                $program = 'pbmto' . $type;
+                $program = 'pbmto'.$type;
                 break;
 
             // pamto* converters
@@ -417,7 +417,7 @@ 
             case 'html':
             case 'pfm':
             case 'tga':
-                $program = 'pamto' . $type;
+                $program = 'pamto'.$type;
                 break;
 
             // pnmto* converters
@@ -431,7 +431,7 @@ 
                 $type = 'jpeg';
                 // no break
             case 'jpeg':
-                $arg = '--quality=' . $quality;
+                $arg = '--quality='.$quality;
                 // no break
             case 'jbig':
             case 'fits':
@@ -445,16 +445,16 @@ 
             case 'sir':
             case 'tiff':
             case 'xwd':
-                $program = 'pnmto' . $type;
+                $program = 'pnmto'.$type;
                 break;
 
         } // switch
 
         if ('' == $program) {
-            $program = 'pnmto' . $type;
+            $program = 'pnmto'.$type;
         }
 
-        if (!System::which(IMAGE_TRANSFORM_NETPBM_PATH . $program . ((OS_WINDOWS) ? '.exe' : ''))) {
+        if (!System::which(IMAGE_TRANSFORM_NETPBM_PATH.$program.((OS_WINDOWS) ? '.exe' : ''))) {
             return PEAR::raiseError("Couldn't find \"$program\" binary", IMAGE_TRANSFORM_ERROR_UNSUPPORTED);
         }
         $this->command[] = $this->_prepare_cmd(IMAGE_TRANSFORM_NETPBM_PATH, $program);
@@ -481,8 +481,8 @@ 
 
         $nullDevice = (OS_WINDOWS) ? 'nul' : '/dev/null';
 
-        $cmd = $this->_postProcess($type, $quality) . '> "' . $filename . '"';
-        exec($cmd . ' 2>  ' . $nullDevice, $res, $exit);
+        $cmd = $this->_postProcess($type, $quality).'> "'.$filename.'"';
+        exec($cmd.' 2>  '.$nullDevice, $res, $exit);
         if (!$this->keep_settings_on_save) {
             $this->free();
         }
@@ -506,9 +506,9 @@ 
         }
         $quality = $this->_getOption('quality', $options, 75);
 
-        header('Content-type: ' . $this->getMimeType($type));
+        header('Content-type: '.$this->getMimeType($type));
         $cmd = $this->_postProcess($type, $quality);
-        passthru($cmd . ' 2>&1');
+        passthru($cmd.' 2>&1');
         if (!$this->keep_settings_on_save) {
             $this->free();
         }

class/pear/Image/Transform/Driver/GD.php

Spacing +8 added lines, -8 removed lines

@@ -26,7 +26,7 @@ 
  */
 
 //require_once __DIR__ . '/Image/Transform.php';
-require_once XOOPS_ROOT_PATH . '/modules/extgallery/class/pear/Image/Transform.php';
+require_once XOOPS_ROOT_PATH.'/modules/extgallery/class/pear/Image/Transform.php';
 
 /**
  * GD implementation for Image_Transform package
@@ -140,7 +140,7 @@ 
             return PEAR::raiseError('Image type not supported for input', IMAGE_TRANSFORM_ERROR_UNSUPPORTED);
         }
 
-        $functionName      = 'ImageCreateFrom' . $this->type;
+        $functionName      = 'ImageCreateFrom'.$this->type;
         $this->imageHandle = $functionName($this->image);
         if (!$this->imageHandle) {
             $this->imageHandle = null;
@@ -172,7 +172,7 @@ 
      * @author Peter Bowyer
      * @access public
      */
-    public function addBorder($border_width=null, $color = '')
+    public function addBorder($border_width = null, $color = '')
     {
         $this->new_x = $this->img_x + 2 * $border_width;
         $this->new_y = $this->img_y + 2 * $border_width;
@@ -213,7 +213,7 @@ 
      *
      * @return bool|PEAR_Error TRUE or a PEAR_Error object on error
      */
-    public function addText($params=null)
+    public function addText($params = null)
     {
         $this->oldImage = $this->imageHandle;
         $params         = array_merge($this->_get_default_text_params(), $params);
@@ -383,7 +383,7 @@ 
      * @return bool|PEAR_Error TRUE on success or PEAR_Error object on error
      * @access protected
      */
-    public function _resize($new_x=null, $new_y=null, $options = null)
+    public function _resize($new_x = null, $new_y = null, $options = null)
     {
         if (true === $this->resized) {
             return PEAR::raiseError('You have already resized the image without saving it.  Your previous resizing will be overwritten', null, PEAR_ERROR_TRIGGER, E_USER_NOTICE);
@@ -464,13 +464,13 @@ 
         }
 
         if ('' == $filename) {
-            header('Content-type: ' . $this->getMimeType($type));
+            header('Content-type: '.$this->getMimeType($type));
             $action = 'output image';
         } else {
             $action = 'save image to file';
         }
 
-        $functionName = 'image' . $type;
+        $functionName = 'image'.$type;
         switch ($type) {
             case 'jpeg':
                 $result = $functionName($this->imageHandle, $filename, $quality);
@@ -483,7 +483,7 @@ 
                 }
         }
         if (!$result) {
-            return PEAR::raiseError('Couldn\'t ' . $action, IMAGE_TRANSFORM_ERROR_IO);
+            return PEAR::raiseError('Couldn\'t '.$action, IMAGE_TRANSFORM_ERROR_IO);
         }
         $this->imageHandle = $this->oldImage;
         if (!$this->keep_settings_on_save) {

class/pear/Image/Transform.php

Spacing +17 added lines, -17 removed lines

@@ -30,7 +30,7 @@ 
  * Include for error handling
  */
 //require_once __DIR__ . '/PEAR.php';
-require_once XOOPS_ROOT_PATH . '/modules/extgallery/class/pear/PEAR.php';
+require_once XOOPS_ROOT_PATH.'/modules/extgallery/class/pear/PEAR.php';
 
 /**
  * Error code for unsupported library, image format or methods
@@ -219,7 +219,7 @@ 
                 }
             }
             if (!$driver) {
-                return PEAR::raiseError('No image library specified and none can be found.' . ' You must specify driver in factory() call.', IMAGE_TRANSFORM_ERROR_ARGUMENT);
+                return PEAR::raiseError('No image library specified and none can be found.'.' You must specify driver in factory() call.', IMAGE_TRANSFORM_ERROR_ARGUMENT);
             }
         } else {
             switch (strtolower($driver)) {
@@ -239,25 +239,25 @@ 
         }
 
         //        $file = 'Image/Transform/Driver/' . $driver . '.php';
-        $file = __DIR__ . '/Transform/Driver/' . $driver . '.php';
+        $file = __DIR__.'/Transform/Driver/'.$driver.'.php';
         if (!@fclose(@fopen($file, 'r', true))) {
-            return PEAR::raiseError('Driver failed to load file ' . $file, IMAGE_TRANSFORM_DRIVER_FILE_MISSING);
+            return PEAR::raiseError('Driver failed to load file '.$file, IMAGE_TRANSFORM_DRIVER_FILE_MISSING);
         }
 
-        $classname = 'Image_Transform_Driver_' . $driver;
+        $classname = 'Image_Transform_Driver_'.$driver;
 
         if (!class_exists($classname)) {
             require_once $file;
 
             if (!class_exists($classname)) {
-                return PEAR::raiseError('Image library ' . $driver . ' not supported... aborting.', IMAGE_TRANSFORM_ERROR_UNSUPPORTED);
+                return PEAR::raiseError('Image library '.$driver.' not supported... aborting.', IMAGE_TRANSFORM_ERROR_UNSUPPORTED);
             }
         }
         $obj = new $classname();
 
         // Check startup error
-        if ($error =& $obj->isError()) {
-            $obj =& $error;
+        if ($error = & $obj->isError()) {
+            $obj = & $error;
         }
 
         return $obj;
@@ -274,7 +274,7 @@ 
     public function &isError($error = null)
     {
         if (null !== $error) {
-            $this->_error =& $error;
+            $this->_error = & $error;
         }
 
         return $this->_error;
@@ -912,7 +912,7 @@ 
             $this->img_x,
             $this->img_y,
             $this->_convert_image_type($this->type),
-            'height="' . $this->img_y . '" width="' . $this->img_x . '"',
+            'height="'.$this->img_y.'" width="'.$this->img_x.'"',
             'mime' => $this->getMimeType()
         ];
     }
@@ -952,10 +952,10 @@ 
     {
         if (!OS_WINDOWS
             || !preg_match('/\s/', $path)) {
-            return $path . $command . ' ' . $args;
+            return $path.$command.' '.$args;
         }
 
-        return 'start /D "' . $path . '" /B ' . $command . ' ' . $args;
+        return 'start /D "'.$path.'" /B '.$command.' '.$args;
     }
 
     /**
@@ -1086,8 +1086,8 @@ 
         // Find the filename of the original image:
         $filename = explode('.', basename($this->image));
         $filename = $filename[0];
-        header('Content-type: ' . $this->getMimeType($type));
-        header('Content-Disposition: inline; filename=' . $filename . '.' . $type);
+        header('Content-type: '.$this->getMimeType($type));
+        header('Content-Disposition: inline; filename='.$filename.'.'.$type);
     }
 
     /**
@@ -1122,7 +1122,7 @@ 
      */
     public function getTempDir()
     {
-        require_once __DIR__ . '/System.php';
+        require_once __DIR__.'/System.php';
 
         return System::tmpdir();
     }
@@ -1138,7 +1138,7 @@ 
     public function getTempFile($dirname = null)
     {
         if (null === $dirname) {
-            require_once __DIR__ . '/System.php';
+            require_once __DIR__.'/System.php';
             $dirname = System::tmpdir();
         }
 
@@ -1286,7 +1286,7 @@ 
                 return $this->colorhex2colorarray($color);
             }
             static $colornames = [];
-            require_once __DIR__ . '/Image/Transform/Driver/ColorsDefs.php';
+            require_once __DIR__.'/Image/Transform/Driver/ColorsDefs.php';
 
             return (isset($colornames[$color])) ? $colornames[$color] : $default;
         }

class/pear/System.php

Spacing +11 added lines, -11 removed lines

@@ -16,8 +16,8 @@ 
 /**
  * base class
  */
-require_once __DIR__ . '/PEAR.php';
-require_once __DIR__ . '/Console/Getopt.php';
+require_once __DIR__.'/PEAR.php';
+require_once __DIR__.'/Console/Getopt.php';
 
 $GLOBALS['_System_temp_files'] = [];
 
@@ -92,7 +92,7 @@ 
                 if (empty($a)) {
                     continue;
                 }
-                $argv[$k] = trim($a) ;
+                $argv[$k] = trim($a);
             }
         }
 
@@ -160,7 +160,7 @@ 
         natsort($list);
         if ($aktinst < $maxinst || 0 == $maxinst) {
             foreach ($list as $val) {
-                $path = $sPath . DIRECTORY_SEPARATOR . $val;
+                $path = $sPath.DIRECTORY_SEPARATOR.$val;
                 if (is_dir($path) && !is_link($path)) {
                     $tmp    = self::_dirToStruct($path, $maxinst, $aktinst + 1, $silent);
                     $struct = array_merge_recursive($struct, $tmp);
@@ -332,11 +332,11 @@ 
         for ($i = 0; $i < $count_args; $i++) {
             if ('>' == $args[$i]) {
                 $mode = 'wb';
-                $outputfile = $args[$i+1];
+                $outputfile = $args[$i + 1];
                 break;
             } elseif ('>>' == $args[$i]) {
                 $mode = 'ab+';
-                $outputfile = $args[$i+1];
+                $outputfile = $args[$i + 1];
                 break;
             } else {
                 $files[] = $args[$i];
@@ -475,7 +475,7 @@ 
             if ($var = isset($_ENV['windir']) ? $_ENV['windir'] : getenv('windir')) {
                 return $var;
             }
-            return getenv('SystemRoot') . '\temp';
+            return getenv('SystemRoot').'\temp';
         }
         if ($var = isset($_ENV['TMPDIR']) ? $_ENV['TMPDIR'] : getenv('TMPDIR')) {
             return $var;
@@ -526,7 +526,7 @@ 
 
         foreach ($exe_suffixes as $suff) {
             foreach ($path_elements as $dir) {
-                $file = $dir . DIRECTORY_SEPARATOR . $program . $suff;
+                $file = $dir.DIRECTORY_SEPARATOR.$program.$suff;
                 if (is_executable($file)) {
                     return $file;
                 }
@@ -573,7 +573,7 @@ 
         for ($i = 0; $i < $args_count; $i++) {
             switch ($args[$i]) {
                 case '-type':
-                    if (in_array($args[$i+1], ['d', 'f'])) {
+                    if (in_array($args[$i + 1], ['d', 'f'])) {
                         if ('d' == $args[$i + 1]) {
                             $do_files = false;
                         } else {
@@ -583,7 +583,7 @@ 
                     $i++;
                     break;
                 case '-name':
-                    $name = preg_quote($args[$i+1], '#');
+                    $name = preg_quote($args[$i + 1], '#');
                     // our magic characters ? and * have just been escaped,
                     // so now we change the escaped versions to PCRE operators
                     $name = strtr($name, ['\?' => '.', '\*' => '.*']);
@@ -591,7 +591,7 @@ 
                     $i++;
                     break;
                 case '-maxdepth':
-                    $depth = $args[$i+1];
+                    $depth = $args[$i + 1];
                     break;
             }
         }