evolution-cms / evolution

manager/includes/extenders/modifiers/mdf_addbreak.inc.php

Braces +8 added lines, -7 removed lines

@@ -9,14 +9,15 @@
 $blockElms = explode(',', $blockElms);
 $lines = explode("\n",$text);
 $c = count($lines);
-foreach($lines as $i=>$line)
-{
+foreach($lines as $i=>$line) {
     $line = rtrim($line);
-    if($i===$c-1) break;
-    foreach($blockElms as $block)
-    {
-        if(preg_match("@</?{$block}" . '[^>]*>$@',$line))
-            continue 2;
+    if($i===$c-1) {
+        break;
+    }
+    foreach($blockElms as $block) {
+        if(preg_match("@</?{$block}" . '[^>]*>$@',$line)) {
+                    continue 2;
+        }
     }
     $lines[$i] = "{$line}<br />";
 }

manager/media/rss/rss_fetch.inc

Braces +38 added lines, -32 removed lines

@@ -89,7 +89,8 @@ 
 
 $MAGPIE_ERROR = "";
 
-function fetch_rss ($url) {
+function fetch_rss ($url)
+{
     // initialize constants
     init();
 
@@ -104,8 +105,7 @@ 
         $resp = _fetch_remote_file( $url );
         if ( is_success( $resp->status ) ) {
             return _response_to_rss( $resp );
-        }
-        else {
+        } else {
             error("Failed to fetch $url and cache is off");
             return false;
         }
@@ -174,8 +174,7 @@ 
                 // reset cache on 304 (at minutillo insistent prodding)
                 $cache->set($cache_key, $rss);
                 return $rss;
-            }
-            elseif ( is_success( $resp->status ) ) {
+            } elseif ( is_success( $resp->status ) ) {
                 $rss = _response_to_rss( $resp );
                 if ( $rss ) {
                     if (MAGPIE_DEBUG > 1) {
@@ -185,24 +184,20 @@ 
                     $cache->set( $cache_key, $rss );
                     return $rss;
                 }
-            }
-            else {
+            } else {
                 $errormsg = "Failed to fetch $url ";
                 if ( $resp->status == '-100' ) {
                     $errormsg .= "(Request timed out after " . MAGPIE_FETCH_TIME_OUT . " seconds)";
-                }
-                elseif ( $resp->error ) {
+                } elseif ( $resp->error ) {
                     # compensate for Snoopy's annoying habbit to tacking
                     # on '\n'
                     $http_error = substr($resp->error, 0, -2);
                     $errormsg .= "(HTTP Error: $http_error)";
-                }
-                else {
+                } else {
                     $errormsg .=  "(HTTP Response: " . $resp->response_code .')';
                 }
             }
-        }
-        else {
+        } else {
             $errormsg = "Unable to retrieve RSS file for unknown reasons.";
         }
 
@@ -229,7 +224,8 @@ 
     Purpose:    set MAGPIE_ERROR, and trigger error
 \*=======================================================================*/
 
-function error ($errormsg, $lvl=E_USER_WARNING) {
+function error ($errormsg, $lvl=E_USER_WARNING)
+{
         global $MAGPIE_ERROR;
 
         // append PHP's error message if track_errors enabled
@@ -243,7 +239,8 @@ 
         }
 }
 
-function debug ($debugmsg, $lvl=E_USER_NOTICE) {
+function debug ($debugmsg, $lvl=E_USER_NOTICE)
+{
     trigger_error("MagpieRSS [debug] $debugmsg", $lvl);
 }
 
@@ -251,7 +248,8 @@ 
     Function:   magpie_error
     Purpose:    accessor for the magpie error variable
 \*=======================================================================*/
-function magpie_error ($errormsg="") {
+function magpie_error ($errormsg="")
+{
     global $MAGPIE_ERROR;
 
     if ( isset($errormsg) and $errormsg ) {
@@ -268,7 +266,8 @@ 
                 headers to send along with the request (optional)
     Output:     an HTTP response object (see Snoopy.class.inc)
 \*=======================================================================*/
-function _fetch_remote_file ($url, $headers = "" ) {
+function _fetch_remote_file ($url, $headers = "" )
+{
     // Snoopy is an HTTP client in PHP
     $client = new Snoopy();
     $client->agent = MAGPIE_USER_AGENT;
@@ -289,7 +288,8 @@ 
     Input:      an HTTP response object (see Snoopy)
     Output:     parsed RSS object (see rss_parse)
 \*=======================================================================*/
-function _response_to_rss ($resp) {
+function _response_to_rss ($resp)
+{
     $rss = new MagpieRSS( $resp->results, MAGPIE_OUTPUT_ENCODING, MAGPIE_INPUT_ENCODING, MAGPIE_DETECT_ENCODING );
 
     // if RSS parsed successfully
@@ -300,8 +300,7 @@ 
             // 2003-03-02 - Nicola Asuni (www.tecnick.com) - fixed bug "Undefined offset: 1"
             if (strpos($h, ": ")) {
                 list($field, $val) = explode(": ", $h, 2);
-            }
-            else {
+            } else {
                 $field = $h;
                 $val = "";
             }
@@ -334,11 +333,11 @@ 
     Purpose:    setup constants with default values
                 check for user overrides
 \*=======================================================================*/
-function init () {
+function init ()
+{
     if ( defined('MAGPIE_INITALIZED') ) {
         return;
-    }
-    else {
+    } else {
         define('MAGPIE_INITALIZED', true);
     }
 
@@ -360,7 +359,9 @@ 
 
     if ( !defined('MAGPIE_OUTPUT_ENCODING') ) {
         global $modx_manager_charset;
-        if(empty($modx_manager_charset)) $modx_manager_charset = 'ISO-8859-1';
+        if(empty($modx_manager_charset)) {
+            $modx_manager_charset = 'ISO-8859-1';
+        }
         define('MAGPIE_OUTPUT_ENCODING', $modx_manager_charset);
     }
 
@@ -381,8 +382,7 @@ 
 
         if ( MAGPIE_CACHE_ON ) {
             $ua = $ua . ')';
-        }
-        else {
+        } else {
             $ua = $ua . '; No cache)';
         }
 
@@ -417,7 +417,8 @@ 
     Function:   is_info
     Purpose:    return true if Informational status code
 \*=======================================================================*/
-function is_info ($sc) {
+function is_info ($sc)
+{
     return $sc >= 100 && $sc < 200;
 }
 
@@ -425,7 +426,8 @@ 
     Function:   is_success
     Purpose:    return true if Successful status code
 \*=======================================================================*/
-function is_success ($sc) {
+function is_success ($sc)
+{
     return $sc >= 200 && $sc < 300;
 }
 
@@ -433,7 +435,8 @@ 
     Function:   is_redirect
     Purpose:    return true if Redirection status code
 \*=======================================================================*/
-function is_redirect ($sc) {
+function is_redirect ($sc)
+{
     return $sc >= 300 && $sc < 400;
 }
 
@@ -441,7 +444,8 @@ 
     Function:   is_error
     Purpose:    return true if Error status code
 \*=======================================================================*/
-function is_error ($sc) {
+function is_error ($sc)
+{
     return $sc >= 400 && $sc < 600;
 }
 
@@ -449,7 +453,8 @@ 
     Function:   is_client_error
     Purpose:    return true if Error status code, and its a client error
 \*=======================================================================*/
-function is_client_error ($sc) {
+function is_client_error ($sc)
+{
     return $sc >= 400 && $sc < 500;
 }
 
@@ -457,6 +462,7 @@ 
     Function:   is_client_error
     Purpose:    return true if Error status code, and its a server error
 \*=======================================================================*/
-function is_server_error ($sc) {
+function is_server_error ($sc)
+{
     return $sc >= 500 && $sc < 600;
 }

manager/media/browser/mcpuk/js_localize.php

Braces +5 added lines, -2 removed lines

@@ -28,9 +28,12 @@
     die;
 }
 $mtime = @filemtime($file);
-if ($mtime) httpCache::checkMTime($mtime);
+if ($mtime) {
+    httpCache::checkMTime($mtime);
+}
 require $file;
 header("Content-Type: text/javascript; charset={$lang['_charset']}");
-foreach ($lang as $english => $native)
+foreach ($lang as $english => $native) {
     if (substr($english, 0, 1) != "_")
         echo "browser.labels['" . text::jsValue($english) . "']=\"" . text::jsValue($native) . "\";";
+}

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

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/lib/class_image_imagick.php

Braces +81 added lines, -40 removed lines

@@ -12,7 +12,8 @@ 
   *      @link http://kcfinder.sunhater.com
   */
 
-class image_imagick extends image {
+class image_imagick extends image
+{
 
     static $MIMES = array(
         //'tif' => "image/tiff"
@@ -21,9 +22,15 @@ 
 
     // ABSTRACT PUBLIC METHODS
 
-    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;
+        }
         try {
             $this->image->scaleImage($width, $height);
         } catch (Exception $e) {
@@ -34,9 +41,15 @@ 
         return true;
     }
 
-    public function resizeFit($width, $height, $background=false) {//
-        if (!$width) $width = 1;
-        if (!$height) $height = 1;
+    public function resizeFit($width, $height, $background=false)
+    {
+//
+        if (!$width) {
+            $width = 1;
+        }
+        if (!$height) {
+            $height = 1;
+        }
 
         try {
             $this->image->scaleImage($width, $height, true);
@@ -65,43 +78,58 @@ 
         }
     }
 
-    public function resizeCrop($width, $height, $offset=false) {
-        if (!$width) $width = 1;
-        if (!$height) $height = 1;
+    public function resizeCrop($width, $height, $offset=false)
+    {
+        if (!$width) {
+            $width = 1;
+        }
+        if (!$height) {
+            $height = 1;
+        }
 
         if (($this->width / $this->height) > ($width / $height)) {
             $h = $height;
             $w = ($this->width * $h) / $this->height;
             $y = 0;
             if ($offset !== false) {
-                if ($offset > 0)
-                    $offset = -$offset;
-                if (($w + $offset) <= $width)
-                    $offset = $width - $w;
+                if ($offset > 0) {
+                                    $offset = -$offset;
+                }
+                if (($w + $offset) <= $width) {
+                                    $offset = $width - $w;
+                }
                 $x = $offset;
-            } else
-                $x = ($width - $w) / 2;
+            } else {
+                            $x = ($width - $w) / 2;
+            }
 
         } else {
             $w = $width;
             $h = ($this->height * $w) / $this->width;
             $x = 0;
             if ($offset !== false) {
-                if ($offset > 0)
-                    $offset = -$offset;
-                if (($h + $offset) <= $height)
-                    $offset = $height - $h;
+                if ($offset > 0) {
+                                    $offset = -$offset;
+                }
+                if (($h + $offset) <= $height) {
+                                    $offset = $height - $h;
+                }
                 $y = $offset;
-            } else
-                $y = ($height - $h) / 2;
+            } else {
+                            $y = ($height - $h) / 2;
+            }
         }
 
         $x = round($x);
         $y = round($y);
         $w = round($w);
         $h = round($h);
-        if (!$w) $w = 1;
-        if (!$h) $h = 1;
+        if (!$w) {
+            $w = 1;
+        }
+        if (!$h) {
+            $h = 1;
+        }
 
         try {
             $this->image->scaleImage($w, $h);
@@ -115,7 +143,8 @@ 
         return true;
     }
 
-    public function rotate($angle, $background="#000000") {
+    public function rotate($angle, $background="#000000")
+    {
         try {
             $this->image->rotateImage(new ImagickPixel($background), $angle);
             $size = $this->image->getImageGeometry();
@@ -127,7 +156,8 @@ 
         return true;
     }
 
-    public function flipHorizontal() {
+    public function flipHorizontal()
+    {
         try {
             $this->image->flopImage();
         } catch (Exception $e) {
@@ -136,7 +166,8 @@ 
         return true;
     }
 
-    public function flipVertical() {
+    public function flipVertical()
+    {
         try {
             $this->image->flipImage();
         } catch (Exception $e) {
@@ -145,7 +176,8 @@ 
         return true;
     }
 
-    public function watermark($file, $left=false, $top=false) {
+    public function watermark($file, $left=false, $top=false)
+    {
         try {
             $wm = new Imagick($file);
             $size = $wm->getImageGeometry();
@@ -167,8 +199,9 @@ 
         if ((($x + $w) > $this->width) ||
             (($y + $h) > $this->height) ||
             ($x < 0) || ($y < 0)
-        )
-            return false;
+        ) {
+                    return false;
+        }
 
         try {
             $this->image->compositeImage($wm, Imagick::COMPOSITE_DEFAULT, $x, $y);
@@ -181,7 +214,8 @@ 
 
     // ABSTRACT PROTECTED METHODS
 
-    protected function getBlankImage($width, $height) {
+    protected function getBlankImage($width, $height)
+    {
         try {
             $img = new Imagick();
             $img->newImage($width, $height, "none");
@@ -192,7 +226,8 @@ 
         return $img;
     }
 
-    protected function getImage($image, &$width, &$height) {
+    protected function getImage($image, &$width, &$height)
+    {
 
         if (is_object($image) && ($image instanceof image_imagick)) {
             try {
@@ -227,18 +262,21 @@ 
             $height = $size['height'];
             return $image;
 
-        } else
-            return false;
+        } else {
+                    return false;
+        }
     }
 
 
     // PSEUDO-ABSTRACT STATIC METHODS
 
-    static function available() {
+    static function available()
+    {
         return class_exists("Imagick");
     }
 
-    static function checkImage($file) {
+    static function checkImage($file)
+    {
         try {
             new Imagick($file);
         } catch (Exception $e) {
@@ -250,7 +288,8 @@ 
 
     // INHERIT METHODS
 
-    public function output($type="jpeg", array $options=array()) {
+    public function output($type="jpeg", array $options=array())
+    {
         $type = strtolower($type);
         try {
             $this->image->setImageFormat($type);
@@ -258,8 +297,9 @@ 
             return false;
         }
         $method = "optimize_$type";
-        if (method_exists($this, $method) && !$this->$method($options))
-            return false;
+        if (method_exists($this, $method) && !$this->$method($options)) {
+                    return false;
+        }
 
         if (!isset($options['file'])) {
             if (!headers_sent()) {
@@ -289,7 +329,8 @@ 
 
     // OWN METHODS
 
-    protected function optimize_jpeg(array $options=array()) {
+    protected function optimize_jpeg(array $options=array())
+    {
         $quality = isset($options['quality']) ? $options['quality'] : self::DEFAULT_JPEG_QUALITY;
         try {
             $this->image->setImageCompression(Imagick::COMPRESSION_JPEG);

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

Braces +81 added lines, -40 removed lines

@@ -12,7 +12,8 @@ 
   *      @link http://kcfinder.sunhater.com
   */
 
-class image_gmagick extends image {
+class image_gmagick extends image
+{
 
     static $MIMES = array(
         //'tif' => "image/tiff"
@@ -21,9 +22,15 @@ 
 
     // ABSTRACT PUBLIC METHODS
 
-    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;
+        }
         try {
             $this->image->scaleImage($width, $height);
         } catch (Exception $e) {
@@ -34,9 +41,15 @@ 
         return true;
     }
 
-    public function resizeFit($width, $height, $background=false) {//
-        if (!$width) $width = 1;
-        if (!$height) $height = 1;
+    public function resizeFit($width, $height, $background=false)
+    {
+//
+        if (!$width) {
+            $width = 1;
+        }
+        if (!$height) {
+            $height = 1;
+        }
 
         try {
             $this->image->scaleImage($width, $height, true);
@@ -69,43 +82,58 @@ 
         }
     }
 
-    public function resizeCrop($width, $height, $offset=false) {
-        if (!$width) $width = 1;
-        if (!$height) $height = 1;
+    public function resizeCrop($width, $height, $offset=false)
+    {
+        if (!$width) {
+            $width = 1;
+        }
+        if (!$height) {
+            $height = 1;
+        }
 
         if (($this->width / $this->height) > ($width / $height)) {
             $h = $height;
             $w = ($this->width * $h) / $this->height;
             $y = 0;
             if ($offset !== false) {
-                if ($offset > 0)
-                    $offset = -$offset;
-                if (($w + $offset) <= $width)
-                    $offset = $width - $w;
+                if ($offset > 0) {
+                                    $offset = -$offset;
+                }
+                if (($w + $offset) <= $width) {
+                                    $offset = $width - $w;
+                }
                 $x = $offset;
-            } else
-                $x = ($width - $w) / 2;
+            } else {
+                            $x = ($width - $w) / 2;
+            }
 
         } else {
             $w = $width;
             $h = ($this->height * $w) / $this->width;
             $x = 0;
             if ($offset !== false) {
-                if ($offset > 0)
-                    $offset = -$offset;
-                if (($h + $offset) <= $height)
-                    $offset = $height - $h;
+                if ($offset > 0) {
+                                    $offset = -$offset;
+                }
+                if (($h + $offset) <= $height) {
+                                    $offset = $height - $h;
+                }
                 $y = $offset;
-            } else
-                $y = ($height - $h) / 2;
+            } else {
+                            $y = ($height - $h) / 2;
+            }
         }
 
         $x = round($x);
         $y = round($y);
         $w = round($w);
         $h = round($h);
-        if (!$w) $w = 1;
-        if (!$h) $h = 1;
+        if (!$w) {
+            $w = 1;
+        }
+        if (!$h) {
+            $h = 1;
+        }
 
         try {
             $this->image->scaleImage($w, $h);
@@ -119,7 +147,8 @@ 
         return true;
     }
 
-    public function rotate($angle, $background="#000000") {
+    public function rotate($angle, $background="#000000")
+    {
         try {
             $this->image->rotateImage($background, $angle);
             $w = $this->image->getImageWidth();
@@ -132,7 +161,8 @@ 
         return true;
     }
 
-    public function flipHorizontal() {
+    public function flipHorizontal()
+    {
         try {
             $this->image->flopImage();
         } catch (Exception $e) {
@@ -141,7 +171,8 @@ 
         return true;
     }
 
-    public function flipVertical() {
+    public function flipVertical()
+    {
         try {
             $this->image->flipImage();
         } catch (Exception $e) {
@@ -150,7 +181,8 @@ 
         return true;
     }
 
-    public function watermark($file, $left=false, $top=false) {
+    public function watermark($file, $left=false, $top=false)
+    {
         try {
             $wm = new Gmagick($file);
             $w = $wm->getImageWidth();
@@ -171,8 +203,9 @@ 
         if ((($x + $w) > $this->width) ||
             (($y + $h) > $this->height) ||
             ($x < 0) || ($y < 0)
-        )
-            return false;
+        ) {
+                    return false;
+        }
 
         try {
             $this->image->compositeImage($wm, 1, $x, $y);
@@ -185,7 +218,8 @@ 
 
     // ABSTRACT PROTECTED METHODS
 
-    protected function getBlankImage($width, $height) {
+    protected function getBlankImage($width, $height)
+    {
         try {
             $img = new Gmagick();
             $img->newImage($width, $height, "none");
@@ -195,7 +229,8 @@ 
         return $img;
     }
 
-    protected function getImage($image, &$width, &$height) {
+    protected function getImage($image, &$width, &$height)
+    {
 
         if (is_object($image) && ($image instanceof image_gmagick)) {
             $width = $image->width;
@@ -225,18 +260,21 @@ 
             $height = $h;
             return $image;
 
-        } else
-            return false;
+        } else {
+                    return false;
+        }
     }
 
 
     // PSEUDO-ABSTRACT STATIC METHODS
 
-    static function available() {
+    static function available()
+    {
         return class_exists("Gmagick");
     }
 
-    static function checkImage($file) {
+    static function checkImage($file)
+    {
         try {
             new Gmagick($file);
         } catch (Exception $e) {
@@ -248,7 +286,8 @@ 
 
     // INHERIT METHODS
 
-    public function output($type="jpeg", array $options=array()) {
+    public function output($type="jpeg", array $options=array())
+    {
         $type = strtolower($type);
         try {
             $this->image->setImageFormat($type);
@@ -256,8 +295,9 @@ 
             return false;
         }
         $method = "optimize_$type";
-        if (method_exists($this, $method) && !$this->$method($options))
-            return false;
+        if (method_exists($this, $method) && !$this->$method($options)) {
+                    return false;
+        }
 
         if (!isset($options['file'])) {
             if (!headers_sent()) {
@@ -287,7 +327,8 @@ 
 
     // OWN METHODS
 
-    protected function optimize_jpeg(array $options=array()) {
+    protected function optimize_jpeg(array $options=array())
+    {
         $quality = isset($options['quality']) ? $options['quality'] : self::DEFAULT_JPEG_QUALITY;
         try {
             $this->image->setCompressionQuality($quality);

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

Braces +26 added lines, -36 removed lines

@@ -21,13 +21,17 @@ 
 
 	public function __construct($uri = null)
 	{
-		if ($uri) $this->load($uri);
+		if ($uri) {
+		    $this->load($uri);
+		}
 	}
 
 
 	public function load($uri)
 	{
-		if ($this->handle) $this->close();
+		if ($this->handle) {
+		    $this->close();
+		}
 
 		$this->uri = $uri;
 		$this->handle = fopen($uri, 'r');
@@ -36,15 +40,16 @@ 
 
 	public function close()
 	{
-		if (is_resource($this->handle)) fclose($this->handle);
+		if (is_resource($this->handle)) {
+		    fclose($this->handle);
+		}
 	}
 
 
 	public function getSize()
 	{
 		$this->strpos = 0;
-		if ($this->getType())
-		{
+		if ($this->getType()) {
 			return array_values($this->parseSize());
 		}
 
@@ -56,10 +61,8 @@ 
 	{
 		$this->strpos = 0;
 
-		if (!$this->type)
-		{
-			switch ($this->getChars(2))
-			{
+		if (!$this->type) {
+			switch ($this->getChars(2)) {
 				case "BM":
 					return $this->type = 'bmp';
 				case "GI":
@@ -81,8 +84,7 @@ 
 	{
 		$this->strpos = 0;
 
-		switch ($this->type)
-		{
+		switch ($this->type) {
 			case 'png':
 				return $this->parseSizeForPNG();
 			case 'gif':
@@ -127,10 +129,8 @@ 
 	{
 		$state = null;
 
-		while (true)
-		{
-			switch ($state)
-			{
+		while (true) {
+			switch ($state) {
 				default:
 					$this->getChars(2);
 					$state = 'started';
@@ -138,27 +138,22 @@ 
 
 				case 'started':
 					$b = $this->getByte();
-					if ($b === false) return false;
+					if ($b === false) {
+					    return false;
+					}
 
 					$state = $b == 0xFF ? 'sof' : 'started';
 					break;
 
 				case 'sof':
 					$b = $this->getByte();
-					if (in_array($b, range(0xe0, 0xef)))
-					{
+					if (in_array($b, range(0xe0, 0xef))) {
 						$state = 'skipframe';
-					}
-					elseif (in_array($b, array_merge(range(0xC0,0xC3), range(0xC5,0xC7), range(0xC9,0xCB), range(0xCD,0xCF))))
-					{
+					} elseif (in_array($b, array_merge(range(0xC0,0xC3), range(0xC5,0xC7), range(0xC9,0xCB), range(0xCD,0xCF)))) {
 						$state = 'readsize';
-					}
-					elseif ($b == 0xFF)
-					{
+					} elseif ($b == 0xFF) {
 						$state = 'sof';
-					}
-					else
-					{
+					} else {
 						$state = 'skipframe';
 					}
 					break;
@@ -187,21 +182,16 @@ 
 		$response = null;
 
 		// do we need more data?
-		if ($this->strpos + $n -1 >= strlen($this->str))
-		{
+		if ($this->strpos + $n -1 >= strlen($this->str)) {
 			$end = ($this->strpos + $n);
 
-			while (strlen($this->str) < $end && $response !== false)
-			{
+			while (strlen($this->str) < $end && $response !== false) {
 				// read more from the file handle
 				$need = $end - ftell($this->handle);
 
-				if ($response = fread($this->handle, $need))
-				{
+				if ($response = fread($this->handle, $need)) {
 					$this->str .= $response;
-				}
-				else
-				{
+				} else {
 					return false;
 				}
 			}

manager/actions/help.static.php

Braces +6 added lines, -6 removed lines

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

-if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {

+if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
 	die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");

 }

 $helpBasePath = "actions/help/";

@@ -16,9 +16,9 @@ 
 		</script>

 

 		<?php

-		if($handle = opendir('actions/help')) {

-			while(false !== ($file = readdir($handle))) {

-				if($file != "." && $file != ".." && $file != ".svn" && $file != 'index.html' && !is_dir($helpBasePath . $file)) {

+		if($handle = opendir('actions/help')) {
+			while(false !== ($file = readdir($handle))) {
+				if($file != "." && $file != ".." && $file != ".svn" && $file != 'index.html' && !is_dir($helpBasePath . $file)) {
 					$help[] = $file;

 				}

 			}

@@ -27,12 +27,12 @@ 
 

 		natcasesort($help);

 

-		foreach($help as $k => $v) {

+		foreach($help as $k => $v) {
 

 			$helpname = substr($v, 0, strrpos($v, '.'));

 

 			$prefix = substr($helpname, 0, 2);

-			if(is_numeric($prefix)) {

+			if(is_numeric($prefix)) {
 				$helpname = substr($helpname, 2, strlen($helpname) - 1);

 			}