evolution-cms / evolution

manager/media/browser/mcpuk/lib/class_gd.php

Indentation +92 added lines, -92 removed lines

@@ -1,44 +1,44 @@ 
 <?php

 

 /** This file is part of KCFinder project

-  *

-  *      @desc GD extension class

-  *   @package KCFinder

-  *   @version 2.51

-  *    @author Pavel Tzonkov <pavelc@users.sourceforge.net>

-  * @copyright 2010, 2011 KCFinder Project

-  *   @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2

-  *   @license http://www.opensource.org/licenses/lgpl-2.1.php LGPLv2

-  *      @link http://kcfinder.sunhater.com

-  */

+ *

+ *      @desc GD extension class

+ *   @package KCFinder

+ *   @version 2.51

+ *    @author Pavel Tzonkov <pavelc@users.sourceforge.net>

+ * @copyright 2010, 2011 KCFinder Project

+ *   @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2

+ *   @license http://www.opensource.org/licenses/lgpl-2.1.php LGPLv2

+ *      @link http://kcfinder.sunhater.com

+ */

 

 class gd {

 

-  /** GD resource

-    * @var resource */

+    /** GD resource

+     * @var resource */

     protected $image;

 

-  /** Image width

-    * @var integer */

+    /** Image width

+     * @var integer */

     protected $width;

 

-  /** Image height

-    * @var integer */

+    /** Image height

+     * @var integer */

     protected $height;

 

-  /** Init error

-    * @var bool */

+    /** Init error

+     * @var bool */

     public $init_error = false;

 

-  /** Last builded image type constant (IMAGETYPE_XXX)

-    * @var integer */

+    /** Last builded image type constant (IMAGETYPE_XXX)

+     * @var integer */

     public $type;

 

-  /** Returns an array. Element 0 - GD resource. Element 1 - width. Element 2 - height.

-    * Returns FALSE on failure. The only one parameter $image can be an instance of this class,

-    * a GD resource, an array(width, height) or path to image file.

-    * @param mixed $image

-    * @return array */

+    /** Returns an array. Element 0 - GD resource. Element 1 - width. Element 2 - height.

+     * Returns FALSE on failure. The only one parameter $image can be an instance of this class,

+     * a GD resource, an array(width, height) or path to image file.

+     * @param mixed $image

+     * @return array */

 

     protected function build_image($image) {

 

@@ -87,16 +87,16 @@ 
         return $return;

     }

 

-  /** Parameter $image can be:

-    *   1. An instance of this class (copy instance).

-    *   2. A GD resource.

-    *   3. An array with two elements. First - width, second - height. Create a blank image.

-    *   4. A filename string. Get image form file.

-    * The non-required parameter $bigger_size is the bigger dimension (width or height) the image

-    * will be resized to. The other dimension (height or width) will be calculated autamaticaly

-    * @param mixed $image

-    * @param integer $bigger_size

-    * @return gd */

+    /** Parameter $image can be:

+     *   1. An instance of this class (copy instance).

+     *   2. A GD resource.

+     *   3. An array with two elements. First - width, second - height. Create a blank image.

+     *   4. A filename string. Get image form file.

+     * The non-required parameter $bigger_size is the bigger dimension (width or height) the image

+     * will be resized to. The other dimension (height or width) will be calculated autamaticaly

+     * @param mixed $image

+     * @param integer $bigger_size

+     * @return gd */

 

     public function __construct($image, $bigger_size=null) {

         $this->image = $this->width = $this->height = null;

@@ -123,30 +123,30 @@ 
         }

     }

 

-  /** Returns the GD resource

-    * @return resource */

+    /** Returns the GD resource

+     * @return resource */

 

     public function get_image() {

         return $this->image;

     }

 

-  /** Returns the image width

-    * @return integer */

+    /** Returns the image width

+     * @return integer */

 

     public function get_width() {

         return $this->width;

     }

 

-  /** Returns the image height

-    * @return integer */

+    /** Returns the image height

+     * @return integer */

 

     public function get_height() {

         return $this->height;

     }

 

-  /** Returns calculated proportional width from the given height

-    * @param integer $resized_height

-    * @return integer */

+    /** Returns calculated proportional width from the given height

+     * @param integer $resized_height

+     * @return integer */

 

     public function get_prop_width($resized_height) {

         $width = intval(($this->width * $resized_height) / $this->height);

@@ -154,9 +154,9 @@ 
         return $width;

     }

 

-  /** Returns calculated proportional height from the given width

-    * @param integer $resized_width

-    * @return integer */

+    /** Returns calculated proportional height from the given width

+     * @param integer $resized_width

+     * @return integer */

 

     public function get_prop_height($resized_width) {

         $height = intval(($this->height * $resized_width) / $this->width);

@@ -164,11 +164,11 @@ 
         return $height;

     }

 

-  /** Returns an array with calculated proportional width & height.

-    * The parameter $bigger_size is the bigger dimension (width or height) of calculated sizes.

-    * The other dimension (height or width) will be calculated autamaticaly

-    * @param integer $bigger_size

-    * @return array */

+    /** Returns an array with calculated proportional width & height.

+     * The parameter $bigger_size is the bigger dimension (width or height) of calculated sizes.

+     * The other dimension (height or width) will be calculated autamaticaly

+     * @param integer $bigger_size

+     * @return array */

 

     public function get_prop_size($bigger_size) {

 

@@ -186,10 +186,10 @@ 
         return array($width, $height);

     }

 

-  /** Resize image. Returns TRUE on success or FALSE on failure

-    * @param integer $width

-    * @param integer $height

-    * @return bool */

+    /** Resize image. Returns TRUE on success or FALSE on failure

+     * @param integer $width

+     * @param integer $height

+     * @return bool */

 

     public function resize($width, $height) {

         if (!$width) $width = 1;

@@ -203,10 +203,10 @@ 
         );

     }

 

-  /** Resize the given image source (GD, gd object or image file path) to fit in the own image.

-    * The outside ares will be cropped out. Returns TRUE on success or FALSE on failure

-    * @param mixed $src

-    * @return bool */

+    /** Resize the given image source (GD, gd object or image file path) to fit in the own image.

+     * The outside ares will be cropped out. Returns TRUE on success or FALSE on failure

+     * @param mixed $src

+     * @return bool */

 

     public function resize_crop($src) {

         $image_details = $this->build_image($src);

@@ -233,10 +233,10 @@ 
             return false;

     }

 

-  /** Resize image to fit in given resolution. Returns TRUE on success or FALSE on failure

-    * @param integer $width

-    * @param integer $height

-    * @return bool */

+    /** Resize image to fit in given resolution. Returns TRUE on success or FALSE on failure

+     * @param integer $width

+     * @param integer $height

+     * @return bool */

 

     public function resize_fit($width, $height) {

         if ((!$width && !$height) || (($width == $this->width) && ($height == $this->height)))

@@ -250,12 +250,12 @@ 
         return $this->resize($width, $height);

     }

 

-  /** Neka si predstavim vyobrazhaem pravoygylnik s razmeri $width i $height.

-    * Izobrazhenieto shte se preorazmeri taka che to shte izliza ot tozi pravoygylnik,

-    * no samo po edno (x ili y) izmerenie

-    * @param integer $width

-    * @param integer $height

-    * @return bool */

+    /** Neka si predstavim vyobrazhaem pravoygylnik s razmeri $width i $height.

+     * Izobrazhenieto shte se preorazmeri taka che to shte izliza ot tozi pravoygylnik,

+     * no samo po edno (x ili y) izmerenie

+     * @param integer $width

+     * @param integer $height

+     * @return bool */

 

     public function resize_overflow($width, $height) {

 

@@ -368,30 +368,30 @@ 
 

 

 

-			/*** gif transparent fix - 1.10.2013 ***/

+            /*** gif transparent fix - 1.10.2013 ***/

 

-			$transindex = imagecolortransparent($src);

-			$palletsize = imagecolorstotal($src);

-			if($transindex >= 0 && $transindex < $palletsize) {

-				$transcol = imagecolorsforindex($src, $transindex);

+            $transindex = imagecolortransparent($src);

+            $palletsize = imagecolorstotal($src);

+            if($transindex >= 0 && $transindex < $palletsize) {

+                $transcol = imagecolorsforindex($src, $transindex);

 

-			/*** end gif transparent fix ***/

+            /*** end gif transparent fix ***/

 

-				$transindex = imagecolorallocatealpha($this->image, $transcol['red'], $transcol['green'], $transcol['blue'], 127);

-				imagefilledrectangle($this->image, 0, 0, $dst_w, $dst_h, $transindex);

-				imagecopyresampled($this->image, $src, $dst_x, $dst_y, $src_x, $src_y, $dst_w, $dst_h, $src_w, $src_h);

-				imagecolortransparent($this->image, $transindex);

-				for($y=0; $y<$dst_h; ++$y)

-					for($x=0; $x<$dst_w; ++$x)

-						if(((imagecolorat($this->image, $x, $y)>>24) & 0x7F) >= 100) imagesetpixel($this->image, $x, $y, $transindex);

-				imagetruecolortopalette($this->image, true, 255);

-			}

-			else {

-				$transparent = imagecolorallocatealpha($this->image, 255, 255, 255, 127);

-				imagefilledrectangle($this->image, 0, 0, $dst_w, $dst_h, $transparent);

-				imagecopyresampled($this->image, $src, $dst_x, $dst_y, $src_x, $src_y, $dst_w, $dst_h, $src_w, $src_h);

-			}

-			return $this->image;

+                $transindex = imagecolorallocatealpha($this->image, $transcol['red'], $transcol['green'], $transcol['blue'], 127);

+                imagefilledrectangle($this->image, 0, 0, $dst_w, $dst_h, $transindex);

+                imagecopyresampled($this->image, $src, $dst_x, $dst_y, $src_x, $src_y, $dst_w, $dst_h, $src_w, $src_h);

+                imagecolortransparent($this->image, $transindex);

+                for($y=0; $y<$dst_h; ++$y)

+                    for($x=0; $x<$dst_w; ++$x)

+                        if(((imagecolorat($this->image, $x, $y)>>24) & 0x7F) >= 100) imagesetpixel($this->image, $x, $y, $transindex);

+                imagetruecolortopalette($this->image, true, 255);

+            }

+            else {

+                $transparent = imagecolorallocatealpha($this->image, 255, 255, 255, 127);

+                imagefilledrectangle($this->image, 0, 0, $dst_w, $dst_h, $transparent);

+                imagecopyresampled($this->image, $src, $dst_x, $dst_y, $src_x, $src_y, $dst_w, $dst_h, $src_w, $src_h);

+            }

+            return $this->image;

 

         } else

             return false;

@@ -419,7 +419,7 @@ 
     public function imagegif($filename=null) {

         if (is_null($filename) && !headers_sent())

             header("Content-Type: image/gif");

-			@imagesavealpha($this->image, true);

+            @imagesavealpha($this->image, true);

         return imagegif($this->image, $filename);

     }

 }

Spacing +39 added lines, -39 removed lines

@@ -12,7 +12,7 @@ 
   *      @link http://kcfinder.sunhater.com

   */

 

-class gd {

+class gd{

 

   /** GD resource

     * @var resource */

@@ -40,7 +40,7 @@ 
     * @param mixed $image

     * @return array */

 

-    protected function build_image($image) {

+    protected function build_image($image){

 

         if ($image instanceof gd) {

             $width = $image->get_width();

@@ -58,12 +58,12 @@ 
 

         } elseif (false !== (list($width, $height, $type) = @getimagesize($image))) {

             $image =

-                ($type == IMAGETYPE_GIF)      ? @imagecreatefromgif($image)  : (

-                ($type == IMAGETYPE_WBMP)     ? @imagecreatefromwbmp($image) : (

-                ($type == IMAGETYPE_JPEG)     ? @imagecreatefromjpeg($image) : (

+                ($type == IMAGETYPE_GIF) ? @imagecreatefromgif($image) : (

+                ($type == IMAGETYPE_WBMP) ? @imagecreatefromwbmp($image) : (

+                ($type == IMAGETYPE_JPEG) ? @imagecreatefromjpeg($image) : (

                 ($type == IMAGETYPE_JPEG2000) ? @imagecreatefromjpeg($image) : (

-                ($type == IMAGETYPE_PNG)      ? @imagecreatefrompng($image)  : (

-                ($type == IMAGETYPE_XBM)      ? @imagecreatefromxbm($image)  : false

+                ($type == IMAGETYPE_PNG) ? @imagecreatefrompng($image) : (

+                ($type == IMAGETYPE_XBM) ? @imagecreatefromxbm($image) : false

             )))));

 

             if ($type == IMAGETYPE_PNG)

@@ -98,7 +98,7 @@ 
     * @param integer $bigger_size

     * @return gd */

 

-    public function __construct($image, $bigger_size=null) {

+    public function __construct($image, $bigger_size = null){

         $this->image = $this->width = $this->height = null;

 

         $image_details = $this->build_image($image);

@@ -126,21 +126,21 @@ 
   /** Returns the GD resource

     * @return resource */

 

-    public function get_image() {

+    public function get_image(){

         return $this->image;

     }

 

   /** Returns the image width

     * @return integer */

 

-    public function get_width() {

+    public function get_width(){

         return $this->width;

     }

 

   /** Returns the image height

     * @return integer */

 

-    public function get_height() {

+    public function get_height(){

         return $this->height;

     }

 

@@ -148,7 +148,7 @@ 
     * @param integer $resized_height

     * @return integer */

 

-    public function get_prop_width($resized_height) {

+    public function get_prop_width($resized_height){

         $width = intval(($this->width * $resized_height) / $this->height);

         if (!$width) $width = 1;

         return $width;

@@ -158,7 +158,7 @@ 
     * @param integer $resized_width

     * @return integer */

 

-    public function get_prop_height($resized_width) {

+    public function get_prop_height($resized_width){

         $height = intval(($this->height * $resized_width) / $this->width);

         if (!$height) $height = 1;

         return $height;

@@ -170,7 +170,7 @@ 
     * @param integer $bigger_size

     * @return array */

 

-    public function get_prop_size($bigger_size) {

+    public function get_prop_size($bigger_size){

 

         if ($this->width > $this->height) {

             $width = $bigger_size;

@@ -191,7 +191,7 @@ 
     * @param integer $height

     * @return bool */

 

-    public function resize($width, $height) {

+    public function resize($width, $height){

         if (!$width) $width = 1;

         if (!$height) $height = 1;

         return (

@@ -208,7 +208,7 @@ 
     * @param mixed $src

     * @return bool */

 

-    public function resize_crop($src) {

+    public function resize_crop($src){

         $image_details = $this->build_image($src);

 

         if ($image_details !== false) {

@@ -238,7 +238,7 @@ 
     * @param integer $height

     * @return bool */

 

-    public function resize_fit($width, $height) {

+    public function resize_fit($width, $height){

         if ((!$width && !$height) || (($width == $this->width) && ($height == $this->height)))

             return true;

         if (!$width || (($height / $width) < ($this->height / $this->width)))

@@ -257,7 +257,7 @@ 
     * @param integer $height

     * @return bool */

 

-    public function resize_overflow($width, $height) {

+    public function resize_overflow($width, $height){

 

         $big = (($this->width / $this->height) > ($width / $height))

             ? ($this->width * $height) / $this->height

@@ -275,7 +275,7 @@ 
         return $return;

     }

 

-    public function gd_color() {

+    public function gd_color(){

         $args = func_get_args();

 

         $expr_rgb = '/^rgb\(\s*(\d{1,3})\s*\,\s*(\d{1,3})\s*\,\s*(\d{1,3})\s*\)$/i';

@@ -317,7 +317,7 @@ 
         return imagecolorallocate($this->image, $r, $g, $b);

     }

 

-    public function fill_color($color) {

+    public function fill_color($color){

         return $this->imagefilledrectangle(0, 0, $this->width - 1, $this->height - 1, $color);

     }

 

@@ -326,11 +326,11 @@ 
 

     public function imagecopy(

         $src,

-        $dst_x=0, $dst_y=0,

-        $src_x=0, $src_y=0,

-        $dst_w=null, $dst_h=null,

-        $src_w=null, $src_h=null

-    ) {

+        $dst_x = 0, $dst_y = 0,

+        $src_x = 0, $src_y = 0,

+        $dst_w = null, $dst_h = null,

+        $src_w = null, $src_h = null

+    ){

         $image_details = $this->build_image($src);

 

         if ($image_details !== false) {

@@ -348,11 +348,11 @@ 
 

     public function imagecopyresampled(

         $src,

-        $dst_x=0, $dst_y=0,

-        $src_x=0, $src_y=0,

-        $dst_w=null, $dst_h=null,

-        $src_w=null, $src_h=null

-    ) {

+        $dst_x = 0, $dst_y = 0,

+        $src_x = 0, $src_y = 0,

+        $dst_w = null, $dst_h = null,

+        $src_w = null, $src_h = null

+    ){

         $image_details = $this->build_image($src);

 

         if ($image_details !== false) {

@@ -363,7 +363,7 @@ 
             if (is_null($src_w)) $src_w = $src_width - $src_x;

             if (is_null($src_h)) $src_h = $src_height - $src_y;

             imagealphablending($this->image, false);

-            imagesavealpha($this->image,true);

+            imagesavealpha($this->image, true);

 

 

 

@@ -372,7 +372,7 @@ 
 

 			$transindex = imagecolortransparent($src);

 			$palletsize = imagecolorstotal($src);

-			if($transindex >= 0 && $transindex < $palletsize) {

+			if ($transindex >= 0 && $transindex < $palletsize) {

 				$transcol = imagecolorsforindex($src, $transindex);

 

 			/*** end gif transparent fix ***/

@@ -381,9 +381,9 @@ 
 				imagefilledrectangle($this->image, 0, 0, $dst_w, $dst_h, $transindex);

 				imagecopyresampled($this->image, $src, $dst_x, $dst_y, $src_x, $src_y, $dst_w, $dst_h, $src_w, $src_h);

 				imagecolortransparent($this->image, $transindex);

-				for($y=0; $y<$dst_h; ++$y)

-					for($x=0; $x<$dst_w; ++$x)

-						if(((imagecolorat($this->image, $x, $y)>>24) & 0x7F) >= 100) imagesetpixel($this->image, $x, $y, $transindex);

+				for ($y = 0; $y < $dst_h; ++$y)

+					for ($x = 0; $x < $dst_w; ++$x)

+						if (((imagecolorat($this->image, $x, $y) >> 24) & 0x7F) >= 100) imagesetpixel($this->image, $x, $y, $transindex);

 				imagetruecolortopalette($this->image, true, 255);

 			}

 			else {

@@ -397,26 +397,26 @@ 
             return false;

     }

 

-    public function imagefilledrectangle($x1, $y1, $x2, $y2, $color) {

+    public function imagefilledrectangle($x1, $y1, $x2, $y2, $color){

         $color = $this->gd_color($color);

         if ($color === false) return false;

         return imagefilledrectangle($this->image, $x1, $y1, $x2, $y2, $color);

     }

 

-    public function imagepng($filename=null, $quality=null, $filters=null) {

+    public function imagepng($filename = null, $quality = null, $filters = null){

         if (is_null($filename) && !headers_sent())

             header("Content-Type: image/png");

         @imagesavealpha($this->image, true);

         return imagepng($this->image, $filename, $quality, $filters);

     }

 

-    public function imagejpeg($filename=null, $quality=75) {

+    public function imagejpeg($filename = null, $quality = 75){

         if (is_null($filename) && !headers_sent())

             header("Content-Type: image/jpeg");

         return imagejpeg($this->image, $filename, $quality);

     }

 

-    public function imagegif($filename=null) {

+    public function imagegif($filename = null){

         if (is_null($filename) && !headers_sent())

             header("Content-Type: image/gif");

 			@imagesavealpha($this->image, true);

Braces +157 added lines, -92 removed lines

@@ -12,7 +12,8 @@ 
   *      @link http://kcfinder.sunhater.com

   */

 

-class gd {

+class gd
+{
 

   /** GD resource

     * @var resource */

@@ -40,23 +41,24 @@ 
     * @param mixed $image

     * @return array */

 

-    protected function build_image($image) {

+    protected function build_image($image)
+    {
 

-        if ($image instanceof gd) {

+        if ($image instanceof gd) {
             $width = $image->get_width();

             $height = $image->get_height();

             $image = $image->get_image();

 

-        } elseif (is_resource($image) && (get_resource_type($image) == "gd")) {

+        } elseif (is_resource($image) && (get_resource_type($image) == "gd")) {
             $width = @imagesx($image);

             $height = @imagesy($image);

 

-        } elseif (is_array($image)) {

+        } elseif (is_array($image)) {
             list($key, $width) = each($image);

             list($key, $height) = each($image);

             $image = imagecreatetruecolor($width, $height);

 

-        } elseif (false !== (list($width, $height, $type) = @getimagesize($image))) {

+        } elseif (false !== (list($width, $height, $type) = @getimagesize($image))) {
             $image =

                 ($type == IMAGETYPE_GIF)      ? @imagecreatefromgif($image)  : (

                 ($type == IMAGETYPE_WBMP)     ? @imagecreatefromwbmp($image) : (

@@ -66,8 +68,9 @@ 
                 ($type == IMAGETYPE_XBM)      ? @imagecreatefromxbm($image)  : false

             )))));

 

-            if ($type == IMAGETYPE_PNG)

-                imagealphablending($image, false);

+            if ($type == IMAGETYPE_PNG) {
+                            imagealphablending($image, false);
+            }
         }

 

         $return = (

@@ -81,8 +84,9 @@ 
             ? array($image, $width, $height)

             : false;

 

-        if (($return !== false) && isset($type))

-            $this->type = $type;

+        if (($return !== false) && isset($type)) {
+                    $this->type = $type;
+        }
 

         return $return;

     }

@@ -98,20 +102,22 @@ 
     * @param integer $bigger_size

     * @return gd */

 

-    public function __construct($image, $bigger_size=null) {

+    public function __construct($image, $bigger_size=null)
+    {
         $this->image = $this->width = $this->height = null;

 

         $image_details = $this->build_image($image);

 

-        if ($image_details !== false)

-            list($this->image, $this->width, $this->height) = $image_details;

-        else

-            $this->init_error = true;

+        if ($image_details !== false) {
+                    list($this->image, $this->width, $this->height) = $image_details;
+        } else {
+                    $this->init_error = true;
+        }
 

         if (!is_null($this->image) &&

             !is_null($bigger_size) &&

             (preg_match('/^[1-9][0-9]*$/', $bigger_size) !== false)

-        ) {

+        ) {
             $image = $this->image;

             list($width, $height) = $this->get_prop_size($bigger_size);

             $this->image = imagecreatetruecolor($width, $height);

@@ -126,21 +132,24 @@ 
   /** Returns the GD resource

     * @return resource */

 

-    public function get_image() {

+    public function get_image()
+    {
         return $this->image;

     }

 

   /** Returns the image width

     * @return integer */

 

-    public function get_width() {

+    public function get_width()
+    {
         return $this->width;

     }

 

   /** Returns the image height

     * @return integer */

 

-    public function get_height() {

+    public function get_height()
+    {
         return $this->height;

     }

 

@@ -148,9 +157,12 @@ 
     * @param integer $resized_height

     * @return integer */

 

-    public function get_prop_width($resized_height) {

+    public function get_prop_width($resized_height)
+    {
         $width = intval(($this->width * $resized_height) / $this->height);

-        if (!$width) $width = 1;

+        if (!$width) {
+            $width = 1;
+        }
         return $width;

     }

 

@@ -158,9 +170,12 @@ 
     * @param integer $resized_width

     * @return integer */

 

-    public function get_prop_height($resized_width) {

+    public function get_prop_height($resized_width)
+    {
         $height = intval(($this->height * $resized_width) / $this->width);

-        if (!$height) $height = 1;

+        if (!$height) {
+            $height = 1;
+        }
         return $height;

     }

 

@@ -170,18 +185,20 @@ 
     * @param integer $bigger_size

     * @return array */

 

-    public function get_prop_size($bigger_size) {

+    public function get_prop_size($bigger_size)
+    {
 

-        if ($this->width > $this->height) {

+        if ($this->width > $this->height) {
             $width = $bigger_size;

             $height = $this->get_prop_height($width);

 

-        } elseif ($this->height > $this->width) {

+        } elseif ($this->height > $this->width) {
             $height = $bigger_size;

             $width = $this->get_prop_width($height);

 

-        } else

-            $width = $height = $bigger_size;

+        } else {
+                    $width = $height = $bigger_size;
+        }
 

         return array($width, $height);

     }

@@ -191,9 +208,14 @@ 
     * @param integer $height

     * @return bool */

 

-    public function resize($width, $height) {

-        if (!$width) $width = 1;

-        if (!$height) $height = 1;

+    public function resize($width, $height)
+    {
+        if (!$width) {
+            $width = 1;
+        }
+        if (!$height) {
+            $height = 1;
+        }
         return (

             (false !== ($img = new gd(array($width, $height)))) &&

             $img->imagecopyresampled($this) &&

@@ -208,19 +230,20 @@ 
     * @param mixed $src

     * @return bool */

 

-    public function resize_crop($src) {

+    public function resize_crop($src)
+    {
         $image_details = $this->build_image($src);

 

-        if ($image_details !== false) {

+        if ($image_details !== false) {
             list($src, $src_width, $src_height) = $image_details;

 

-            if (($src_width / $src_height) > ($this->width / $this->height)) {

+            if (($src_width / $src_height) > ($this->width / $this->height)) {
                 $src_w = $this->get_prop_width($src_height);

                 $src_h = $src_height;

                 $src_x = intval(($src_width - $src_w) / 2);

                 $src_y = 0;

 

-            } else {

+            } else {
                 $src_w = $src_width;

                 $src_h = $this->get_prop_height($src_width);

                 $src_x = 0;

@@ -229,8 +252,9 @@ 
 

             return imagecopyresampled($this->image, $src, 0, 0, $src_x, $src_y, $this->width, $this->height, $src_w, $src_h);

 

-        } else

-            return false;

+        } else {
+                    return false;
+        }
     }

 

   /** Resize image to fit in given resolution. Returns TRUE on success or FALSE on failure

@@ -238,15 +262,22 @@ 
     * @param integer $height

     * @return bool */

 

-    public function resize_fit($width, $height) {

-        if ((!$width && !$height) || (($width == $this->width) && ($height == $this->height)))

-            return true;

-        if (!$width || (($height / $width) < ($this->height / $this->width)))

-            $width = intval(($this->width * $height) / $this->height);

-        elseif (!$height || (($width / $height) < ($this->width / $this->height)))

-            $height = intval(($this->height * $width) / $this->width);

-        if (!$width) $width = 1;

-        if (!$height) $height = 1;

+    public function resize_fit($width, $height)
+    {
+        if ((!$width && !$height) || (($width == $this->width) && ($height == $this->height))) {
+                    return true;
+        }
+        if (!$width || (($height / $width) < ($this->height / $this->width))) {
+                    $width = intval(($this->width * $height) / $this->height);
+        } elseif (!$height || (($width / $height) < ($this->width / $this->height))) {
+                    $height = intval(($this->height * $width) / $this->width);
+        }
+        if (!$width) {
+            $width = 1;
+        }
+        if (!$height) {
+            $height = 1;
+        }
         return $this->resize($width, $height);

     }

 

@@ -257,7 +288,8 @@ 
     * @param integer $height

     * @return bool */

 

-    public function resize_overflow($width, $height) {

+    public function resize_overflow($width, $height)
+    {
 

         $big = (($this->width / $this->height) > ($width / $height))

             ? ($this->width * $height) / $this->height

@@ -266,7 +298,7 @@ 
 

         $return = ($img = new gd($this->image, $big));

 

-        if ($return) {

+        if ($return) {
             $this->image = $img->get_image();

             $this->width = $img->get_width();

             $this->height = $img->get_height();

@@ -275,7 +307,8 @@ 
         return $return;

     }

 

-    public function gd_color() {

+    public function gd_color()
+    {
         $args = func_get_args();

 

         $expr_rgb = '/^rgb\(\s*(\d{1,3})\s*\,\s*(\d{1,3})\s*\,\s*(\d{1,3})\s*\)$/i';

@@ -283,22 +316,23 @@ 
         $expr_hex2 = '/^\#?([0-9a-f])([0-9a-f])([0-9a-f])$/i';

         $expr_byte = '/^([01]?\d?\d|2[0-4]\d|25[0-5])$/';

 

-        if (!isset($args[0]))

-            return false;

+        if (!isset($args[0])) {
+                    return false;
+        }
 

-        if (count($args[0]) == 3) {

+        if (count($args[0]) == 3) {
             list($r, $g, $b) = $args[0];

 

-        } elseif (preg_match($expr_rgb, $args[0])) {

+        } elseif (preg_match($expr_rgb, $args[0])) {
             list($r, $g, $b) = explode(" ", preg_replace($expr_rgb, "$1 $2 $3", $args[0]));

 

-        } elseif (preg_match($expr_hex1, $args[0])) {

+        } elseif (preg_match($expr_hex1, $args[0])) {
             list($r, $g, $b) = explode(" ", preg_replace($expr_hex1, "$1 $2 $3", $args[0]));

             $r = hexdec($r);

             $g = hexdec($g);

             $b = hexdec($b);

 

-        } elseif (preg_match($expr_hex2, $args[0])) {

+        } elseif (preg_match($expr_hex2, $args[0])) {
             list($r, $g, $b) = explode(" ", preg_replace($expr_hex2, "$1$1 $2$2 $3$3", $args[0]));

             $r = hexdec($r);

             $g = hexdec($g);

@@ -308,16 +342,18 @@ 
             preg_match($expr_byte, $args[0]) &&

             preg_match($expr_byte, $args[1]) &&

             preg_match($expr_byte, $args[2])

-        ) {

+        ) {
             list($r, $g, $b) = $args;

 

-        } else

-            return false;

+        } else {
+                    return false;
+        }
 

         return imagecolorallocate($this->image, $r, $g, $b);

     }

 

-    public function fill_color($color) {

+    public function fill_color($color)
+    {
         return $this->imagefilledrectangle(0, 0, $this->width - 1, $this->height - 1, $color);

     }

 

@@ -330,20 +366,29 @@ 
         $src_x=0, $src_y=0,

         $dst_w=null, $dst_h=null,

         $src_w=null, $src_h=null

-    ) {

+    ) {
         $image_details = $this->build_image($src);

 

-        if ($image_details !== false) {

+        if ($image_details !== false) {
             list($src, $src_width, $src_height) = $image_details;

 

-            if (is_null($dst_w)) $dst_w = $this->width - $dst_x;

-            if (is_null($dst_h)) $dst_h = $this->height - $dst_y;

-            if (is_null($src_w)) $src_w = $src_width - $src_x;

-            if (is_null($src_h)) $src_h = $src_height - $src_y;

+            if (is_null($dst_w)) {
+                $dst_w = $this->width - $dst_x;
+            }
+            if (is_null($dst_h)) {
+                $dst_h = $this->height - $dst_y;
+            }
+            if (is_null($src_w)) {
+                $src_w = $src_width - $src_x;
+            }
+            if (is_null($src_h)) {
+                $src_h = $src_height - $src_y;
+            }
             return imagecopy($this->image, $src, $dst_x, $dst_y, $src_x, $src_y, $src_w, $src_h);

 

-        } else

-            return false;

+        } else {
+                    return false;
+        }
     }

 

     public function imagecopyresampled(

@@ -352,16 +397,24 @@ 
         $src_x=0, $src_y=0,

         $dst_w=null, $dst_h=null,

         $src_w=null, $src_h=null

-    ) {

+    ) {
         $image_details = $this->build_image($src);

 

-        if ($image_details !== false) {

+        if ($image_details !== false) {
             list($src, $src_width, $src_height) = $image_details;

 

-            if (is_null($dst_w)) $dst_w = $this->width - $dst_x;

-            if (is_null($dst_h)) $dst_h = $this->height - $dst_y;

-            if (is_null($src_w)) $src_w = $src_width - $src_x;

-            if (is_null($src_h)) $src_h = $src_height - $src_y;

+            if (is_null($dst_w)) {
+                $dst_w = $this->width - $dst_x;
+            }
+            if (is_null($dst_h)) {
+                $dst_h = $this->height - $dst_y;
+            }
+            if (is_null($src_w)) {
+                $src_w = $src_width - $src_x;
+            }
+            if (is_null($src_h)) {
+                $src_h = $src_height - $src_y;
+            }
             imagealphablending($this->image, false);

             imagesavealpha($this->image,true);

 

@@ -372,7 +425,7 @@ 
 

 			$transindex = imagecolortransparent($src);

 			$palletsize = imagecolorstotal($src);

-			if($transindex >= 0 && $transindex < $palletsize) {

+			if($transindex >= 0 && $transindex < $palletsize) {
 				$transcol = imagecolorsforindex($src, $transindex);

 

 			/*** end gif transparent fix ***/

@@ -381,44 +434,56 @@ 
 				imagefilledrectangle($this->image, 0, 0, $dst_w, $dst_h, $transindex);

 				imagecopyresampled($this->image, $src, $dst_x, $dst_y, $src_x, $src_y, $dst_w, $dst_h, $src_w, $src_h);

 				imagecolortransparent($this->image, $transindex);

-				for($y=0; $y<$dst_h; ++$y)

-					for($x=0; $x<$dst_w; ++$x)

-						if(((imagecolorat($this->image, $x, $y)>>24) & 0x7F) >= 100) imagesetpixel($this->image, $x, $y, $transindex);

+				for($y=0; $y<$dst_h; ++$y) {
+									for($x=0;
+				}
+				$x<$dst_w; ++$x) {
+											if(((imagecolorat($this->image, $x, $y)>>24) & 0x7F) >= 100) imagesetpixel($this->image, $x, $y, $transindex);
+					}
 				imagetruecolortopalette($this->image, true, 255);

-			}

-			else {

+			} else {
 				$transparent = imagecolorallocatealpha($this->image, 255, 255, 255, 127);

 				imagefilledrectangle($this->image, 0, 0, $dst_w, $dst_h, $transparent);

 				imagecopyresampled($this->image, $src, $dst_x, $dst_y, $src_x, $src_y, $dst_w, $dst_h, $src_w, $src_h);

 			}

 			return $this->image;

 

-        } else

-            return false;

+        } else {
+                    return false;
+        }
     }

 

-    public function imagefilledrectangle($x1, $y1, $x2, $y2, $color) {

+    public function imagefilledrectangle($x1, $y1, $x2, $y2, $color)
+    {
         $color = $this->gd_color($color);

-        if ($color === false) return false;

+        if ($color === false) {
+            return false;
+        }
         return imagefilledrectangle($this->image, $x1, $y1, $x2, $y2, $color);

     }

 

-    public function imagepng($filename=null, $quality=null, $filters=null) {

-        if (is_null($filename) && !headers_sent())

-            header("Content-Type: image/png");

+    public function imagepng($filename=null, $quality=null, $filters=null)
+    {
+        if (is_null($filename) && !headers_sent()) {
+                    header("Content-Type: image/png");
+        }
         @imagesavealpha($this->image, true);

         return imagepng($this->image, $filename, $quality, $filters);

     }

 

-    public function imagejpeg($filename=null, $quality=75) {

-        if (is_null($filename) && !headers_sent())

-            header("Content-Type: image/jpeg");

+    public function imagejpeg($filename=null, $quality=75)
+    {
+        if (is_null($filename) && !headers_sent()) {
+                    header("Content-Type: image/jpeg");
+        }
         return imagejpeg($this->image, $filename, $quality);

     }

 

-    public function imagegif($filename=null) {

-        if (is_null($filename) && !headers_sent())

-            header("Content-Type: image/gif");

+    public function imagegif($filename=null)
+    {
+        if (is_null($filename) && !headers_sent()) {
+                    header("Content-Type: image/gif");
+        }
 			@imagesavealpha($this->image, true);

         return imagegif($this->image, $filename);

     }

manager/media/browser/mcpuk/js/browser/joiner.php

Braces +6 added lines, -4 removed lines

@@ -23,11 +23,13 @@
 
 foreach ($files as $file) {
     $fmtime = filemtime($file);
-    if (!isset($mtime) || ($fmtime > $mtime))
-        $mtime = $fmtime;
-}
+    if (!isset($mtime) || ($fmtime > $mtime)) {
+            $mtime = $fmtime;
+    }
+    }
 
 httpCache::checkMTime($mtime);
 header("Content-Type: text/javascript");
-foreach ($files as $file)
+foreach ($files as $file) {
     require $file;
+}

manager/media/browser/mcpuk/config.php

Indentation +11 added lines, -11 removed lines

@@ -1,16 +1,16 @@ 
 <?php
 
 /** This file is part of KCFinder project
-  *
-  *      @desc Base configuration file
-  *   @package KCFinder
-  *   @version 2.54
-  *    @author Pavel Tzonkov <sunhater@sunhater.com>
-  * @copyright 2010-2014 KCFinder Project
-  *   @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2
-  *   @license http://www.opensource.org/licenses/lgpl-2.1.php LGPLv2
-  *      @link http://kcfinder.sunhater.com
-  */
+ *
+ *      @desc Base configuration file
+ *   @package KCFinder
+ *   @version 2.54
+ *    @author Pavel Tzonkov <sunhater@sunhater.com>
+ * @copyright 2010-2014 KCFinder Project
+ *   @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2
+ *   @license http://www.opensource.org/licenses/lgpl-2.1.php LGPLv2
+ *      @link http://kcfinder.sunhater.com
+ */
 
 // IMPORTANT!!! Do not remove uncommented settings in this file even if
 // you are using session configuration.
@@ -70,7 +70,7 @@ 
     'dirnameChangeChars' => array(
         ' ' => "_",
         ':' => "."
-     ),
+        ),
     'mime_magic' => "",
 
     'maxImageWidth' => $modx->config['maxImageWidth'],

manager/media/browser/mcpuk/core/autoload.php

Spacing +12 added lines, -12 removed lines

@@ -26,7 +26,7 @@ 
 $modx = new DocumentParser;
 $modx->db->connect();
 startCMSSession();
-if(!isset($_SESSION['mgrValidated'])) {
+if (!isset($_SESSION['mgrValidated'])) {
         die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 define('IN_MANAGER_MODE', "true");
@@ -34,7 +34,7 @@ 
 
 $manager_language = $modx->config['manager_language'];
 // Pass language code from MODX to KCFinder
-if(!file_exists("../../../includes/lang/".$manager_language.".inc.php")) {
+if (!file_exists("../../../includes/lang/".$manager_language.".inc.php")) {
     $manager_language = "english"; // if not set, get the english language file.
 }
 include_once "../../../includes/lang/".$manager_language.".inc.php";
@@ -42,7 +42,7 @@ 
 
 // PHP VERSION CHECK
 if (substr(PHP_VERSION, 0, strpos(PHP_VERSION, '.')) < 5)
-    die("You are using PHP " . PHP_VERSION . " when KCFinder require at least version 5! Some systems has an option to change the active PHP version. Please refer to your hosting provider or upgrade your PHP distribution.");
+    die("You are using PHP ".PHP_VERSION." when KCFinder require at least version 5! Some systems has an option to change the active PHP version. Please refer to your hosting provider or upgrade your PHP distribution.");
 
 
 // SAFE MODE CHECK
@@ -51,7 +51,7 @@ 
 
 
 // MAGIC AUTOLOAD CLASSES FUNCTION
-function autoloadda9d06472ccb71b84928677ce2a6ca89($class) {
+function autoloadda9d06472ccb71b84928677ce2a6ca89($class){
     static $classes = null;
     if ($classes === null) {
         $classes = array(
@@ -75,7 +75,7 @@ 
         );
     }
     if (isset($classes[$class])) {
-        require dirname(__FILE__) . $classes[$class];
+        require dirname(__FILE__).$classes[$class];
     }
 }
 spl_autoload_register('autoloadda9d06472ccb71b84928677ce2a6ca89', true);
@@ -84,18 +84,18 @@ 
 // json_encode() IMPLEMENTATION IF JSON EXTENSION IS MISSING
 if (!function_exists("json_encode")) {
 
-    function kcfinder_json_string_encode($string) {
-        return '"' .
+    function kcfinder_json_string_encode($string){
+        return '"'.
             str_replace('/', "\\/",
             str_replace("\t", "\\t",
             str_replace("\r", "\\r",
             str_replace("\n", "\\n",
             str_replace('"', "\\\"",
             str_replace("\\", "\\\\",
-        $string)))))) . '"';
+        $string)))))).'"';
     }
 
-    function json_encode($data) {
+    function json_encode($data){
 
         if (is_array($data)) {
             $ret = array();
@@ -103,14 +103,14 @@ 
             // OBJECT
             if (array_keys($data) !== range(0, count($data) - 1)) {
                 foreach ($data as $key => $val)
-                    $ret[] = kcfinder_json_string_encode($key) . ':' . json_encode($val);
-                return "{" . implode(",", $ret) . "}";
+                    $ret[] = kcfinder_json_string_encode($key).':'.json_encode($val);
+                return "{".implode(",", $ret)."}";
 
             // ARRAY
             } else {
                 foreach ($data as $val)
                     $ret[] = json_encode($val);
-                return "[" . implode(",", $ret) . "]";
+                return "[".implode(",", $ret)."]";
             }
 
         // BOOLEAN OR NULL

install/lang.php

Indentation +26 added lines, -26 removed lines

@@ -16,35 +16,35 @@ 
 $install_language = "english";
 
 $_langFiles= array (
- "en" => "english",
- "bg" => "bulgarian",
- "cs" => "czech",
- "da" => "danish",
- "fi" => "finnish-utf8",
- "fr" => "francais-utf8",
- "de" => "german",
- "he" => "hebrew",
- "it" => "italian",
- "ja" => "japanese-utf8",
- "nl" => "nederlands-utf8",
- "no" => "norwegian",
- "fa" => "persian",
- "pl" => "polish-utf8",
- "pt" => "portuguese-br-utf8",
+    "en" => "english",
+    "bg" => "bulgarian",
+    "cs" => "czech",
+    "da" => "danish",
+    "fi" => "finnish-utf8",
+    "fr" => "francais-utf8",
+    "de" => "german",
+    "he" => "hebrew",
+    "it" => "italian",
+    "ja" => "japanese-utf8",
+    "nl" => "nederlands-utf8",
+    "no" => "norwegian",
+    "fa" => "persian",
+    "pl" => "polish-utf8",
+    "pt" => "portuguese-br-utf8",
 // "pt" => "portuguese",
- "ru" => "russian-UTF8",
- "es" => "spanish-utf8",
- "sv" => "svenska"
+    "ru" => "russian-UTF8",
+    "es" => "spanish-utf8",
+    "sv" => "svenska"
 );
 $_langISO6391 = substr($_SERVER["HTTP_ACCEPT_LANGUAGE"],0,2);
 if (!empty($_langFiles[$_langISO6391]))  $install_language = $_langFiles[$_langISO6391];
 
 
 if (isset($_POST['language']) && !stristr($_POST['language'],"..")) {
-	$install_language = $_POST['language'];
+    $install_language = $_POST['language'];
 } else {
-	if (isset($_GET['language']) && !stristr($_GET['language'],".."))
-		$install_language = $_GET['language'];
+    if (isset($_GET['language']) && !stristr($_GET['language'],".."))
+        $install_language = $_GET['language'];
 }
 # load language file
 require_once("lang/english.inc.php"); // As fallback
@@ -53,14 +53,14 @@ 
 $manager_language = $install_language;
 
 if (isset($_POST['managerlanguage']) && !stristr($_POST['managerlanguage'],"..")) {
-	$manager_language = $_POST['managerlanguage'];
+    $manager_language = $_POST['managerlanguage'];
 } else {
-	if (isset($_GET['managerlanguage']) && !stristr($_GET['managerlanguage'],".."))
-		$manager_language = $_GET['managerlanguage'];
+    if (isset($_GET['managerlanguage']) && !stristr($_GET['managerlanguage'],".."))
+        $manager_language = $_GET['managerlanguage'];
 }
 
 foreach($_lang as $k=>$v)
 {
-	if(strpos($v,'[+MGR_DIR+]')!==false)
-		$_lang[$k] = str_replace('[+MGR_DIR+]', MGR_DIR, $v);
+    if(strpos($v,'[+MGR_DIR+]')!==false)
+        $_lang[$k] = str_replace('[+MGR_DIR+]', MGR_DIR, $v);
 }

Spacing +9 added lines, -9 removed lines

@@ -10,12 +10,12 @@ 
  * Filename:       /install/lang.php
  */
 
-$_lang = array ();
+$_lang = array();
 
 #default fallback language file - english
 $install_language = "english";
 
-$_langFiles= array (
+$_langFiles = array(
  "en" => "english",
  "bg" => "bulgarian",
  "cs" => "czech",
@@ -36,14 +36,14 @@ 
  "es" => "spanish-utf8",
  "sv" => "svenska"
 );
-$_langISO6391 = substr($_SERVER["HTTP_ACCEPT_LANGUAGE"],0,2);
+$_langISO6391 = substr($_SERVER["HTTP_ACCEPT_LANGUAGE"], 0, 2);
 if (!empty($_langFiles[$_langISO6391]))  $install_language = $_langFiles[$_langISO6391];
 
 
-if (isset($_POST['language']) && !stristr($_POST['language'],"..")) {
+if (isset($_POST['language']) && !stristr($_POST['language'], "..")) {
 	$install_language = $_POST['language'];
 } else {
-	if (isset($_GET['language']) && !stristr($_GET['language'],".."))
+	if (isset($_GET['language']) && !stristr($_GET['language'], ".."))
 		$install_language = $_GET['language'];
 }
 # load language file
@@ -52,15 +52,15 @@ 
 
 $manager_language = $install_language;
 
-if (isset($_POST['managerlanguage']) && !stristr($_POST['managerlanguage'],"..")) {
+if (isset($_POST['managerlanguage']) && !stristr($_POST['managerlanguage'], "..")) {
 	$manager_language = $_POST['managerlanguage'];
 } else {
-	if (isset($_GET['managerlanguage']) && !stristr($_GET['managerlanguage'],".."))
+	if (isset($_GET['managerlanguage']) && !stristr($_GET['managerlanguage'], ".."))
 		$manager_language = $_GET['managerlanguage'];
 }
 
-foreach($_lang as $k=>$v)
+foreach ($_lang as $k=>$v)
 {
-	if(strpos($v,'[+MGR_DIR+]')!==false)
+	if (strpos($v, '[+MGR_DIR+]') !== false)
 		$_lang[$k] = str_replace('[+MGR_DIR+]', MGR_DIR, $v);
 }

Braces +16 added lines, -12 removed lines

@@ -37,15 +37,18 @@ 
  "sv" => "svenska"
 );
 $_langISO6391 = substr($_SERVER["HTTP_ACCEPT_LANGUAGE"],0,2);
-if (!empty($_langFiles[$_langISO6391]))  $install_language = $_langFiles[$_langISO6391];
+if (!empty($_langFiles[$_langISO6391])) {
+    $install_language = $_langFiles[$_langISO6391];
+}
 
 
 if (isset($_POST['language']) && !stristr($_POST['language'],"..")) {
 	$install_language = $_POST['language'];
 } else {
-	if (isset($_GET['language']) && !stristr($_GET['language'],".."))
-		$install_language = $_GET['language'];
-}
+	if (isset($_GET['language']) && !stristr($_GET['language'],"..")) {
+			$install_language = $_GET['language'];
+	}
+	}
 # load language file
 require_once("lang/english.inc.php"); // As fallback
 require_once("lang/".$install_language.".inc.php");
@@ -55,12 +58,13 @@ 
 if (isset($_POST['managerlanguage']) && !stristr($_POST['managerlanguage'],"..")) {
 	$manager_language = $_POST['managerlanguage'];
 } else {
-	if (isset($_GET['managerlanguage']) && !stristr($_GET['managerlanguage'],".."))
-		$manager_language = $_GET['managerlanguage'];
-}
+	if (isset($_GET['managerlanguage']) && !stristr($_GET['managerlanguage'],"..")) {
+			$manager_language = $_GET['managerlanguage'];
+	}
+	}
 
-foreach($_lang as $k=>$v)
-{
-	if(strpos($v,'[+MGR_DIR+]')!==false)
-		$_lang[$k] = str_replace('[+MGR_DIR+]', MGR_DIR, $v);
-}
+foreach($_lang as $k=>$v) {
+	if(strpos($v,'[+MGR_DIR+]')!==false) {
+			$_lang[$k] = str_replace('[+MGR_DIR+]', MGR_DIR, $v);
+	}
+	}

index.php

Indentation +13 added lines, -13 removed lines

@@ -47,7 +47,7 @@ 
 
 $autoloader = __DIR__.'/vendor/autoload.php';
 if (file_exists($autoloader) && is_readable($autoloader)) {
-	include_once($autoloader);
+    include_once($autoloader);
 }
 
 if(!isset($_SERVER['REQUEST_TIME_FLOAT'])) $_SERVER['REQUEST_TIME_FLOAT'] = microtime(true);
@@ -56,11 +56,11 @@ 
 if(is_file($base_path . 'assets/cache/siteManager.php'))
     include_once($base_path . 'assets/cache/siteManager.php');
 if(!defined('MGR_DIR') && is_dir("{$base_path}manager"))
-	define('MGR_DIR','manager');
+    define('MGR_DIR','manager');
 if(is_file($base_path . 'assets/cache/siteHostnames.php'))
     include_once($base_path . 'assets/cache/siteHostnames.php');
 if(!defined('MODX_SITE_HOSTNAMES'))
-	define('MODX_SITE_HOSTNAMES','');
+    define('MODX_SITE_HOSTNAMES','');
 
 // get start time
 $mstart = memory_get_usage();
@@ -84,7 +84,7 @@ 
 
 define("IN_PARSER_MODE", true);
 if (!defined('IN_MANAGER_MODE')) {
-	define("IN_MANAGER_MODE", false);
+    define("IN_MANAGER_MODE", false);
 }
 if (!defined('MODX_API_MODE')) {
     define('MODX_API_MODE', false);
@@ -92,12 +92,12 @@ 
 
 // get the required includes
 if(!isset($database_user) || $database_user=="") {
-	$rt = @include_once(dirname(__FILE__).'/'.MGR_DIR.'/includes/config.inc.php');
-	// Be sure config.inc.php is there and that it contains some important values
-	if(!$rt || !$database_type || !$database_server || !$database_user || !$dbase) {
-		readfile('install/not_installed.tpl');
-		exit;
-	}
+    $rt = @include_once(dirname(__FILE__).'/'.MGR_DIR.'/includes/config.inc.php');
+    // Be sure config.inc.php is there and that it contains some important values
+    if(!$rt || !$database_type || !$database_server || !$database_user || !$dbase) {
+        readfile('install/not_installed.tpl');
+        exit;
+    }
 }
 
 // start session
@@ -105,11 +105,11 @@ 
 
 // initiate a new document parser
 if (isset($coreClass) && class_exists($coreClass)) {
-	$modx = new $coreClass;
+    $modx = new $coreClass;
 }
 if (!isset($modx) || !($modx instanceof \DocumentParser)) {
-	include_once(MODX_MANAGER_PATH.'includes/document.parser.class.inc.php');
-	$modx = new \DocumentParser;
+    include_once(MODX_MANAGER_PATH.'includes/document.parser.class.inc.php');
+    $modx = new \DocumentParser;
 }
 
 // set some parser options

install/sqlParser.class.php

Indentation +121 added lines, -121 removed lines

@@ -4,138 +4,138 @@
 // SNUFFKIN/ Alex 2004
 
 class SqlParser {
-	public $host;
-	public $dbname;
-	public $prefix;
-	public $user;
-	public $password;
-	public $mysqlErrors;
-	public $conn;
-	public $installFailed;
-	public $sitename;
-	public $adminname;
-	public $adminemail;
-	public $adminpass;
-	public $managerlanguage;
-	public $mode;
-	public $fileManagerPath;
-	public $imgPath;
-	public $imgUrl;
-	public $dbMODx;
-	public $dbVersion;
+    public $host;
+    public $dbname;
+    public $prefix;
+    public $user;
+    public $password;
+    public $mysqlErrors;
+    public $conn;
+    public $installFailed;
+    public $sitename;
+    public $adminname;
+    public $adminemail;
+    public $adminpass;
+    public $managerlanguage;
+    public $mode;
+    public $fileManagerPath;
+    public $imgPath;
+    public $imgUrl;
+    public $dbMODx;
+    public $dbVersion;
     public $connection_charset;
     public $connection_method;
     public $ignoreDuplicateErrors;
 
-	public function __construct($host, $user, $password, $db, $prefix='modx_', $adminname, $adminemail, $adminpass, $connection_charset= 'utf8', $managerlanguage='english', $connection_method = 'SET CHARACTER SET', $auto_template_logic = 'parent') {
-		$this->host = $host;
-		$this->dbname = $db;
-		$this->prefix = $prefix;
-		$this->user = $user;
-		$this->password = $password;
-		$this->adminpass = $adminpass;
-		$this->adminname = $adminname;
-		$this->adminemail = $adminemail;
-		$this->connection_charset = $connection_charset;
-		$this->connection_method = $connection_method;
-		$this->ignoreDuplicateErrors = false;
-		$this->managerlanguage = $managerlanguage;
+    public function __construct($host, $user, $password, $db, $prefix='modx_', $adminname, $adminemail, $adminpass, $connection_charset= 'utf8', $managerlanguage='english', $connection_method = 'SET CHARACTER SET', $auto_template_logic = 'parent') {
+        $this->host = $host;
+        $this->dbname = $db;
+        $this->prefix = $prefix;
+        $this->user = $user;
+        $this->password = $password;
+        $this->adminpass = $adminpass;
+        $this->adminname = $adminname;
+        $this->adminemail = $adminemail;
+        $this->connection_charset = $connection_charset;
+        $this->connection_method = $connection_method;
+        $this->ignoreDuplicateErrors = false;
+        $this->managerlanguage = $managerlanguage;
         $this->autoTemplateLogic = $auto_template_logic;
-	}
+    }
 
-	public function connect() {
-		$this->conn = mysqli_connect($this->host, $this->user, $this->password);
-		mysqli_select_db($this->conn, $this->dbname);
-		if (function_exists('mysqli_set_charset')) mysqli_set_charset($this->conn, $this->connection_charset);
+    public function connect() {
+        $this->conn = mysqli_connect($this->host, $this->user, $this->password);
+        mysqli_select_db($this->conn, $this->dbname);
+        if (function_exists('mysqli_set_charset')) mysqli_set_charset($this->conn, $this->connection_charset);
 
-		$this->dbVersion = 3.23; // assume version 3.23
-		if(function_exists("mysqli_get_server_info")) {
-			$ver = mysqli_get_server_info($this->conn);
-			$this->dbMODx 	 = version_compare($ver,"4.0.2");
-			$this->dbVersion = (float) $ver; // Typecasting (float) instead of floatval() [PHP < 4.2]
-		}
+        $this->dbVersion = 3.23; // assume version 3.23
+        if(function_exists("mysqli_get_server_info")) {
+            $ver = mysqli_get_server_info($this->conn);
+            $this->dbMODx 	 = version_compare($ver,"4.0.2");
+            $this->dbVersion = (float) $ver; // Typecasting (float) instead of floatval() [PHP < 4.2]
+        }
 
         mysqli_query($this->conn,"{$this->connection_method} {$this->connection_charset}");
-	}
+    }
 
     public function process($filename) {
-	    global $custom_placeholders;
-
-		// check to make sure file exists
-		if (!file_exists($filename)) {
-			$this->mysqlErrors[] = array("error" => "File '$filename' not found");
-			$this->installFailed = true ;
-			return false;
-		}
-
-		$fh = fopen($filename, 'r');
-		$idata = '';
-
-		while (!feof($fh)) {
-			$idata .= fread($fh, 1024);
-		}
-
-		fclose($fh);
-		$idata = str_replace("\r", '', $idata);
-
-		// check if in upgrade mode
-		if ($this->mode=="upd") {
-			// remove non-upgradeable parts
-			$s = strpos($idata,"non-upgrade-able[[");
-			$e = strpos($idata,"]]non-upgrade-able")+17;
-			if($s && $e) $idata = str_replace(substr($idata,$s,$e-$s)," Removed non upgradeable items",$idata);
-		}
-
-		// replace {} tags
-		$idata = str_replace('{PREFIX}', $this->prefix, $idata);
-		$idata = str_replace('{ADMIN}', $this->adminname, $idata);
-		$idata = str_replace('{ADMINEMAIL}', $this->adminemail, $idata);
-		$idata = str_replace('{ADMINPASS}', $this->adminpass, $idata);
-		$idata = str_replace('{IMAGEPATH}', $this->imgPath, $idata);
-		$idata = str_replace('{IMAGEURL}', $this->imgUrl, $idata);
-		$idata = str_replace('{FILEMANAGERPATH}', $this->fileManagerPath, $idata);
-		$idata = str_replace('{MANAGERLANGUAGE}', $this->managerlanguage, $idata);
-		$idata = str_replace('{AUTOTEMPLATELOGIC}', $this->autoTemplateLogic, $idata);
-		/*$idata = str_replace('{VERSION}', $modx_version, $idata);*/
-
-		// Replace custom placeholders
-		foreach($custom_placeholders as $key=>$val) {
-			if (strpos($idata, '{'.$key.'}') !== false) {
-				$idata = str_replace('{'.$key.'}', $val, $idata);
-			}
-		}
-
-		$sql_array = explode("\n\n", $idata);
-
-		$num = 0;
-		foreach($sql_array as $sql_entry) {
-			$sql_do = trim($sql_entry, "\r\n; ");
-
-			if (preg_match('/^\#/', $sql_do)) continue;
-
-			// strip out comments and \n for mysql 3.x
-			if ($this->dbVersion <4.0) {
-				$sql_do = preg_replace("~COMMENT.*[^']?'.*[^']?'~","",$sql_do);
-				$sql_do = str_replace('\r', "", $sql_do);
-				$sql_do = str_replace('\n', "", $sql_do);
-			}
-
-
-			$num = $num + 1;
-			if ($sql_do) mysqli_query($this->conn, $sql_do);
-			if(mysqli_error($this->conn)) {
-				// Ignore duplicate and drop errors - Raymond
-				if ($this->ignoreDuplicateErrors){
-					if (mysqli_errno($this->conn) == 1060 || mysqli_errno($this->conn) == 1061 || mysqli_errno($this->conn) == 1062 ||mysqli_errno($this->conn) == 1091) continue;
-				}
-				// End Ignore duplicate
-				$this->mysqlErrors[] = array("error" => mysqli_error($this->conn), "sql" => $sql_do);
-				$this->installFailed = true;
-			}
-		}
-	}
+        global $custom_placeholders;
+
+        // check to make sure file exists
+        if (!file_exists($filename)) {
+            $this->mysqlErrors[] = array("error" => "File '$filename' not found");
+            $this->installFailed = true ;
+            return false;
+        }
+
+        $fh = fopen($filename, 'r');
+        $idata = '';
+
+        while (!feof($fh)) {
+            $idata .= fread($fh, 1024);
+        }
+
+        fclose($fh);
+        $idata = str_replace("\r", '', $idata);
+
+        // check if in upgrade mode
+        if ($this->mode=="upd") {
+            // remove non-upgradeable parts
+            $s = strpos($idata,"non-upgrade-able[[");
+            $e = strpos($idata,"]]non-upgrade-able")+17;
+            if($s && $e) $idata = str_replace(substr($idata,$s,$e-$s)," Removed non upgradeable items",$idata);
+        }
+
+        // replace {} tags
+        $idata = str_replace('{PREFIX}', $this->prefix, $idata);
+        $idata = str_replace('{ADMIN}', $this->adminname, $idata);
+        $idata = str_replace('{ADMINEMAIL}', $this->adminemail, $idata);
+        $idata = str_replace('{ADMINPASS}', $this->adminpass, $idata);
+        $idata = str_replace('{IMAGEPATH}', $this->imgPath, $idata);
+        $idata = str_replace('{IMAGEURL}', $this->imgUrl, $idata);
+        $idata = str_replace('{FILEMANAGERPATH}', $this->fileManagerPath, $idata);
+        $idata = str_replace('{MANAGERLANGUAGE}', $this->managerlanguage, $idata);
+        $idata = str_replace('{AUTOTEMPLATELOGIC}', $this->autoTemplateLogic, $idata);
+        /*$idata = str_replace('{VERSION}', $modx_version, $idata);*/
+
+        // Replace custom placeholders
+        foreach($custom_placeholders as $key=>$val) {
+            if (strpos($idata, '{'.$key.'}') !== false) {
+                $idata = str_replace('{'.$key.'}', $val, $idata);
+            }
+        }
+
+        $sql_array = explode("\n\n", $idata);
+
+        $num = 0;
+        foreach($sql_array as $sql_entry) {
+            $sql_do = trim($sql_entry, "\r\n; ");
+
+            if (preg_match('/^\#/', $sql_do)) continue;
+
+            // strip out comments and \n for mysql 3.x
+            if ($this->dbVersion <4.0) {
+                $sql_do = preg_replace("~COMMENT.*[^']?'.*[^']?'~","",$sql_do);
+                $sql_do = str_replace('\r', "", $sql_do);
+                $sql_do = str_replace('\n', "", $sql_do);
+            }
+
+
+            $num = $num + 1;
+            if ($sql_do) mysqli_query($this->conn, $sql_do);
+            if(mysqli_error($this->conn)) {
+                // Ignore duplicate and drop errors - Raymond
+                if ($this->ignoreDuplicateErrors){
+                    if (mysqli_errno($this->conn) == 1060 || mysqli_errno($this->conn) == 1061 || mysqli_errno($this->conn) == 1062 ||mysqli_errno($this->conn) == 1091) continue;
+                }
+                // End Ignore duplicate
+                $this->mysqlErrors[] = array("error" => mysqli_error($this->conn), "sql" => $sql_do);
+                $this->installFailed = true;
+            }
+        }
+    }
 
     public function close() {
-		mysqli_close($this->conn);
-	}
+        mysqli_close($this->conn);
+    }
 }

Spacing +20 added lines, -20 removed lines

@@ -3,7 +3,7 @@ 
 // MySQL Dump Parser
 // SNUFFKIN/ Alex 2004
 
-class SqlParser {
+class SqlParser{
 	public $host;
 	public $dbname;
 	public $prefix;
@@ -27,7 +27,7 @@ 
     public $connection_method;
     public $ignoreDuplicateErrors;
 
-	public function __construct($host, $user, $password, $db, $prefix='modx_', $adminname, $adminemail, $adminpass, $connection_charset= 'utf8', $managerlanguage='english', $connection_method = 'SET CHARACTER SET', $auto_template_logic = 'parent') {
+	public function __construct($host, $user, $password, $db, $prefix = 'modx_', $adminname, $adminemail, $adminpass, $connection_charset = 'utf8', $managerlanguage = 'english', $connection_method = 'SET CHARACTER SET', $auto_template_logic = 'parent'){
 		$this->host = $host;
 		$this->dbname = $db;
 		$this->prefix = $prefix;
@@ -43,28 +43,28 @@ 
         $this->autoTemplateLogic = $auto_template_logic;
 	}
 
-	public function connect() {
+	public function connect(){
 		$this->conn = mysqli_connect($this->host, $this->user, $this->password);
 		mysqli_select_db($this->conn, $this->dbname);
 		if (function_exists('mysqli_set_charset')) mysqli_set_charset($this->conn, $this->connection_charset);
 
 		$this->dbVersion = 3.23; // assume version 3.23
-		if(function_exists("mysqli_get_server_info")) {
+		if (function_exists("mysqli_get_server_info")) {
 			$ver = mysqli_get_server_info($this->conn);
-			$this->dbMODx 	 = version_compare($ver,"4.0.2");
+			$this->dbMODx 	 = version_compare($ver, "4.0.2");
 			$this->dbVersion = (float) $ver; // Typecasting (float) instead of floatval() [PHP < 4.2]
 		}
 
-        mysqli_query($this->conn,"{$this->connection_method} {$this->connection_charset}");
+        mysqli_query($this->conn, "{$this->connection_method} {$this->connection_charset}");
 	}
 
-    public function process($filename) {
+    public function process($filename){
 	    global $custom_placeholders;
 
 		// check to make sure file exists
 		if (!file_exists($filename)) {
 			$this->mysqlErrors[] = array("error" => "File '$filename' not found");
-			$this->installFailed = true ;
+			$this->installFailed = true;
 			return false;
 		}
 
@@ -79,11 +79,11 @@ 
 		$idata = str_replace("\r", '', $idata);
 
 		// check if in upgrade mode
-		if ($this->mode=="upd") {
+		if ($this->mode == "upd") {
 			// remove non-upgradeable parts
-			$s = strpos($idata,"non-upgrade-able[[");
-			$e = strpos($idata,"]]non-upgrade-able")+17;
-			if($s && $e) $idata = str_replace(substr($idata,$s,$e-$s)," Removed non upgradeable items",$idata);
+			$s = strpos($idata, "non-upgrade-able[[");
+			$e = strpos($idata, "]]non-upgrade-able") + 17;
+			if ($s && $e) $idata = str_replace(substr($idata, $s, $e - $s), " Removed non upgradeable items", $idata);
 		}
 
 		// replace {} tags
@@ -99,7 +99,7 @@ 
 		/*$idata = str_replace('{VERSION}', $modx_version, $idata);*/
 
 		// Replace custom placeholders
-		foreach($custom_placeholders as $key=>$val) {
+		foreach ($custom_placeholders as $key=>$val) {
 			if (strpos($idata, '{'.$key.'}') !== false) {
 				$idata = str_replace('{'.$key.'}', $val, $idata);
 			}
@@ -108,14 +108,14 @@ 
 		$sql_array = explode("\n\n", $idata);
 
 		$num = 0;
-		foreach($sql_array as $sql_entry) {
+		foreach ($sql_array as $sql_entry) {
 			$sql_do = trim($sql_entry, "\r\n; ");
 
 			if (preg_match('/^\#/', $sql_do)) continue;
 
 			// strip out comments and \n for mysql 3.x
-			if ($this->dbVersion <4.0) {
-				$sql_do = preg_replace("~COMMENT.*[^']?'.*[^']?'~","",$sql_do);
+			if ($this->dbVersion < 4.0) {
+				$sql_do = preg_replace("~COMMENT.*[^']?'.*[^']?'~", "", $sql_do);
 				$sql_do = str_replace('\r', "", $sql_do);
 				$sql_do = str_replace('\n', "", $sql_do);
 			}
@@ -123,10 +123,10 @@ 
 
 			$num = $num + 1;
 			if ($sql_do) mysqli_query($this->conn, $sql_do);
-			if(mysqli_error($this->conn)) {
+			if (mysqli_error($this->conn)) {
 				// Ignore duplicate and drop errors - Raymond
-				if ($this->ignoreDuplicateErrors){
-					if (mysqli_errno($this->conn) == 1060 || mysqli_errno($this->conn) == 1061 || mysqli_errno($this->conn) == 1062 ||mysqli_errno($this->conn) == 1091) continue;
+				if ($this->ignoreDuplicateErrors) {
+					if (mysqli_errno($this->conn) == 1060 || mysqli_errno($this->conn) == 1061 || mysqli_errno($this->conn) == 1062 || mysqli_errno($this->conn) == 1091) continue;
 				}
 				// End Ignore duplicate
 				$this->mysqlErrors[] = array("error" => mysqli_error($this->conn), "sql" => $sql_do);
@@ -135,7 +135,7 @@ 
 		}
 	}
 
-    public function close() {
+    public function close(){
 		mysqli_close($this->conn);
 	}
 }

Braces +26 added lines, -11 removed lines

@@ -3,7 +3,8 @@ 
 // MySQL Dump Parser
 // SNUFFKIN/ Alex 2004
 
-class SqlParser {
+class SqlParser
+{
 	public $host;
 	public $dbname;
 	public $prefix;
@@ -27,7 +28,8 @@ 
     public $connection_method;
     public $ignoreDuplicateErrors;
 
-	public function __construct($host, $user, $password, $db, $prefix='modx_', $adminname, $adminemail, $adminpass, $connection_charset= 'utf8', $managerlanguage='english', $connection_method = 'SET CHARACTER SET', $auto_template_logic = 'parent') {
+	public function __construct($host, $user, $password, $db, $prefix='modx_', $adminname, $adminemail, $adminpass, $connection_charset= 'utf8', $managerlanguage='english', $connection_method = 'SET CHARACTER SET', $auto_template_logic = 'parent')
+	{
 		$this->host = $host;
 		$this->dbname = $db;
 		$this->prefix = $prefix;
@@ -43,10 +45,13 @@ 
         $this->autoTemplateLogic = $auto_template_logic;
 	}
 
-	public function connect() {
+	public function connect()
+	{
 		$this->conn = mysqli_connect($this->host, $this->user, $this->password);
 		mysqli_select_db($this->conn, $this->dbname);
-		if (function_exists('mysqli_set_charset')) mysqli_set_charset($this->conn, $this->connection_charset);
+		if (function_exists('mysqli_set_charset')) {
+		    mysqli_set_charset($this->conn, $this->connection_charset);
+		}
 
 		$this->dbVersion = 3.23; // assume version 3.23
 		if(function_exists("mysqli_get_server_info")) {
@@ -58,7 +63,8 @@ 
         mysqli_query($this->conn,"{$this->connection_method} {$this->connection_charset}");
 	}
 
-    public function process($filename) {
+    public function process($filename)
+    {
 	    global $custom_placeholders;
 
 		// check to make sure file exists
@@ -83,7 +89,9 @@ 
 			// remove non-upgradeable parts
 			$s = strpos($idata,"non-upgrade-able[[");
 			$e = strpos($idata,"]]non-upgrade-able")+17;
-			if($s && $e) $idata = str_replace(substr($idata,$s,$e-$s)," Removed non upgradeable items",$idata);
+			if($s && $e) {
+			    $idata = str_replace(substr($idata,$s,$e-$s)," Removed non upgradeable items",$idata);
+			}
 		}
 
 		// replace {} tags
@@ -111,7 +119,9 @@ 
 		foreach($sql_array as $sql_entry) {
 			$sql_do = trim($sql_entry, "\r\n; ");
 
-			if (preg_match('/^\#/', $sql_do)) continue;
+			if (preg_match('/^\#/', $sql_do)) {
+			    continue;
+			}
 
 			// strip out comments and \n for mysql 3.x
 			if ($this->dbVersion <4.0) {
@@ -122,11 +132,15 @@ 
 
 
 			$num = $num + 1;
-			if ($sql_do) mysqli_query($this->conn, $sql_do);
+			if ($sql_do) {
+			    mysqli_query($this->conn, $sql_do);
+			}
 			if(mysqli_error($this->conn)) {
 				// Ignore duplicate and drop errors - Raymond
-				if ($this->ignoreDuplicateErrors){
-					if (mysqli_errno($this->conn) == 1060 || mysqli_errno($this->conn) == 1061 || mysqli_errno($this->conn) == 1062 ||mysqli_errno($this->conn) == 1091) continue;
+				if ($this->ignoreDuplicateErrors) {
+					if (mysqli_errno($this->conn) == 1060 || mysqli_errno($this->conn) == 1061 || mysqli_errno($this->conn) == 1062 ||mysqli_errno($this->conn) == 1091) {
+					    continue;
+					}
 				}
 				// End Ignore duplicate
 				$this->mysqlErrors[] = array("error" => mysqli_error($this->conn), "sql" => $sql_do);
@@ -135,7 +149,8 @@ 
 		}
 	}
 
-    public function close() {
+    public function close()
+    {
 		mysqli_close($this->conn);
 	}
 }