evolution-cms / evolution

manager/media/rss/rss_fetch.inc

Spacing +79 added lines, -79 removed lines

@@ -24,19 +24,19 @@ 
 }
 
 if (!defined('MAGPIE_DIR')) {
-    define('MAGPIE_DIR', dirname(__FILE__) . DIR_SEP);
+    define('MAGPIE_DIR', dirname(__FILE__).DIR_SEP);
 }
 
 if (!defined('MAGPIE_CACHE_DIR')) {
-    define('MAGPIE_CACHE_DIR', MODX_BASE_PATH . 'assets/cache/rss');
+    define('MAGPIE_CACHE_DIR', MODX_BASE_PATH.'assets/cache/rss');
 }
 
-require_once( MAGPIE_DIR . 'rss_parse.inc' );
-require_once( MAGPIE_DIR . 'rss_cache.inc' );
+require_once(MAGPIE_DIR.'rss_parse.inc');
+require_once(MAGPIE_DIR.'rss_cache.inc');
 
 // for including 3rd party libraries
-define('MAGPIE_EXTLIB', MAGPIE_DIR . 'extlib' . DIR_SEP);
-require_once( MAGPIE_EXTLIB . 'Snoopy.class.inc');
+define('MAGPIE_EXTLIB', MAGPIE_DIR.'extlib'.DIR_SEP);
+require_once(MAGPIE_EXTLIB.'Snoopy.class.inc');
 
 
 /*
@@ -89,21 +89,21 @@ 
 
 $MAGPIE_ERROR = "";
 
-function fetch_rss ($url) {
+function fetch_rss($url){
     // initialize constants
     init();
 
-    if ( !isset($url) ) {
+    if (!isset($url)) {
         error("fetch_rss called without a url");
         return false;
     }
 
     // if cache is disabled
-    if ( !MAGPIE_CACHE_ON ) {
+    if (!MAGPIE_CACHE_ON) {
         // fetch file, and parse it
-        $resp = _fetch_remote_file( $url );
-        if ( is_success( $resp->status ) ) {
-            return _response_to_rss( $resp );
+        $resp = _fetch_remote_file($url);
+        if (is_success($resp->status)) {
+            return _response_to_rss($resp);
         }
         else {
             error("Failed to fetch $url and cache is off");
@@ -118,34 +118,34 @@ 
         // 3. if cached obj fails freshness check, fetch remote
         // 4. if remote fails, return stale object, or error
 
-        $cache = new RSSCache( MAGPIE_CACHE_DIR, MAGPIE_CACHE_AGE );
+        $cache = new RSSCache(MAGPIE_CACHE_DIR, MAGPIE_CACHE_AGE);
 
         if (MAGPIE_DEBUG and $cache->ERROR) {
             debug($cache->ERROR, E_USER_WARNING);
         }
 
 
-        $cache_status    = 0;       // response of check_cache
+        $cache_status    = 0; // response of check_cache
         $request_headers = array(); // HTTP headers to send with fetch
-        $rss             = 0;       // parsed RSS object
-        $errormsg        = 0;       // errors, if any
+        $rss             = 0; // parsed RSS object
+        $errormsg        = 0; // errors, if any
 
         // store parsed XML by desired output encoding
         // as character munging happens at parse time
-        $cache_key       = $url . MAGPIE_OUTPUT_ENCODING;
+        $cache_key = $url.MAGPIE_OUTPUT_ENCODING;
 
         if (!$cache->ERROR) {
             // return cache HIT, MISS, or STALE
-            $cache_status = $cache->check_cache( $cache_key);
+            $cache_status = $cache->check_cache($cache_key);
         }
 
         // if object cached, and cache is fresh, return cached obj
-        if ( $cache_status == 'HIT' ) {
-            $rss = $cache->get( $cache_key );
-            if ( isset($rss) and $rss ) {
+        if ($cache_status == 'HIT') {
+            $rss = $cache->get($cache_key);
+            if (isset($rss) and $rss) {
                 // should be cache age
                 $rss->from_cache = 1;
-                if ( MAGPIE_DEBUG > 1) {
+                if (MAGPIE_DEBUG > 1) {
                     debug("MagpieRSS: Cache HIT", E_USER_NOTICE);
                 }
                 return $rss;
@@ -155,50 +155,50 @@ 
         // else attempt a conditional get
 
         // setup headers
-        if ( $cache_status == 'STALE' ) {
-            $rss = $cache->get( $cache_key );
-            if ( $rss and $rss->etag and $rss->last_modified ) {
+        if ($cache_status == 'STALE') {
+            $rss = $cache->get($cache_key);
+            if ($rss and $rss->etag and $rss->last_modified) {
                 $request_headers['If-None-Match'] = $rss->etag;
                 $request_headers['If-Last-Modified'] = $rss->last_modified;
             }
         }
 
-        $resp = _fetch_remote_file( $url, $request_headers );
+        $resp = _fetch_remote_file($url, $request_headers);
 
         if (isset($resp) and $resp) {
-          if ($resp->status == '304' ) {
+          if ($resp->status == '304') {
                 // we have the most current copy
-                if ( MAGPIE_DEBUG > 1) {
+                if (MAGPIE_DEBUG > 1) {
                     debug("Got 304 for $url");
                 }
                 // reset cache on 304 (at minutillo insistent prodding)
                 $cache->set($cache_key, $rss);
                 return $rss;
             }
-            elseif ( is_success( $resp->status ) ) {
-                $rss = _response_to_rss( $resp );
-                if ( $rss ) {
+            elseif (is_success($resp->status)) {
+                $rss = _response_to_rss($resp);
+                if ($rss) {
                     if (MAGPIE_DEBUG > 1) {
                         debug("Fetch successful");
                     }
                     // add object to cache
-                    $cache->set( $cache_key, $rss );
+                    $cache->set($cache_key, $rss);
                     return $rss;
                 }
             }
             else {
                 $errormsg = "Failed to fetch $url ";
-                if ( $resp->status == '-100' ) {
-                    $errormsg .= "(Request timed out after " . MAGPIE_FETCH_TIME_OUT . " seconds)";
+                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 {
-                    $errormsg .=  "(HTTP Response: " . $resp->response_code .')';
+                    $errormsg .= "(HTTP Response: ".$resp->response_code.')';
                 }
             }
         }
@@ -210,14 +210,14 @@ 
 
         // attempt to return cached object
         if ($rss) {
-            if ( MAGPIE_DEBUG ) {
+            if (MAGPIE_DEBUG) {
                 debug("Returning STALE object for $url");
             }
             return $rss;
         }
 
         // else we totally failed
-        error( $errormsg );
+        error($errormsg);
 
         return false;
 
@@ -229,21 +229,21 @@ 
     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
-        if ( isset($php_errormsg) ) {
+        if (isset($php_errormsg)) {
             $errormsg .= " ($php_errormsg)";
         }
-        if ( $errormsg ) {
+        if ($errormsg) {
             $errormsg = "MagpieRSS: $errormsg";
             $MAGPIE_ERROR = $errormsg;
-            trigger_error( $errormsg, $lvl);
+            trigger_error($errormsg, $lvl);
         }
 }
 
-function debug ($debugmsg, $lvl=E_USER_NOTICE) {
+function debug($debugmsg, $lvl = E_USER_NOTICE){
     trigger_error("MagpieRSS [debug] $debugmsg", $lvl);
 }
 
@@ -251,10 +251,10 @@ 
     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 ) {
+    if (isset($errormsg) and $errormsg) {
         $MAGPIE_ERROR = $errormsg;
     }
 
@@ -268,13 +268,13 @@ 
                 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;
     $client->read_timeout = MAGPIE_FETCH_TIME_OUT;
     $client->use_gzip = MAGPIE_USE_GZIP;
-    if (is_array($headers) ) {
+    if (is_array($headers)) {
         $client->rawheaders = $headers;
     }
 
@@ -289,14 +289,14 @@ 
     Input:      an HTTP response object (see Snoopy)
     Output:     parsed RSS object (see rss_parse)
 \*=======================================================================*/
-function _response_to_rss ($resp) {
-    $rss = new MagpieRSS( $resp->results, MAGPIE_OUTPUT_ENCODING, MAGPIE_INPUT_ENCODING, MAGPIE_DETECT_ENCODING );
+function _response_to_rss($resp){
+    $rss = new MagpieRSS($resp->results, MAGPIE_OUTPUT_ENCODING, MAGPIE_INPUT_ENCODING, MAGPIE_DETECT_ENCODING);
 
     // if RSS parsed successfully
-    if ( $rss and !$rss->ERROR) {
+    if ($rss and !$rss->ERROR) {
 
         // find Etag, and Last-Modified
-        foreach($resp->headers as $h) {
+        foreach ($resp->headers as $h) {
             // 2003-03-02 - Nicola Asuni (www.tecnick.com) - fixed bug "Undefined offset: 1"
             if (strpos($h, ": ")) {
                 list($field, $val) = explode(": ", $h, 2);
@@ -306,11 +306,11 @@ 
                 $val = "";
             }
 
-            if ( $field == 'ETag' ) {
+            if ($field == 'ETag') {
                 $rss->etag = $val;
             }
 
-            if ( $field == 'Last-Modified' ) {
+            if ($field == 'Last-Modified') {
                 $rss->last_modified = $val;
             }
         }
@@ -321,7 +321,7 @@ 
         $errormsg = "Failed to parse RSS file.";
 
         if ($rss) {
-            $errormsg .= " (" . $rss->ERROR . ")";
+            $errormsg .= " (".$rss->ERROR.")";
         }
         error($errormsg);
 
@@ -334,67 +334,67 @@ 
     Purpose:    setup constants with default values
                 check for user overrides
 \*=======================================================================*/
-function init () {
-    if ( defined('MAGPIE_INITALIZED') ) {
+function init(){
+    if (defined('MAGPIE_INITALIZED')) {
         return;
     }
     else {
         define('MAGPIE_INITALIZED', true);
     }
 
-    if ( !defined('MAGPIE_CACHE_ON') ) {
+    if (!defined('MAGPIE_CACHE_ON')) {
         define('MAGPIE_CACHE_ON', true);
     }
 
-    if ( !defined('MAGPIE_CACHE_DIR') ) {
+    if (!defined('MAGPIE_CACHE_DIR')) {
         define('MAGPIE_CACHE_DIR', './cache');
     }
 
-    if ( !defined('MAGPIE_CACHE_AGE') ) {
-        define('MAGPIE_CACHE_AGE', 60*60); // one hour
+    if (!defined('MAGPIE_CACHE_AGE')) {
+        define('MAGPIE_CACHE_AGE', 60 * 60); // one hour
     }
 
-    if ( !defined('MAGPIE_CACHE_FRESH_ONLY') ) {
+    if (!defined('MAGPIE_CACHE_FRESH_ONLY')) {
         define('MAGPIE_CACHE_FRESH_ONLY', false);
     }
 
-    if ( !defined('MAGPIE_OUTPUT_ENCODING') ) {
+    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);
     }
 
-    if ( !defined('MAGPIE_INPUT_ENCODING') ) {
+    if (!defined('MAGPIE_INPUT_ENCODING')) {
         define('MAGPIE_INPUT_ENCODING', null);
     }
 
-    if ( !defined('MAGPIE_DETECT_ENCODING') ) {
+    if (!defined('MAGPIE_DETECT_ENCODING')) {
         define('MAGPIE_DETECT_ENCODING', true);
     }
 
-    if ( !defined('MAGPIE_DEBUG') ) {
+    if (!defined('MAGPIE_DEBUG')) {
         define('MAGPIE_DEBUG', 0);
     }
 
-    if ( !defined('MAGPIE_USER_AGENT') ) {
-        $ua = 'MagpieRSS/'. MAGPIE_VERSION . ' (+http://magpierss.sf.net';
+    if (!defined('MAGPIE_USER_AGENT')) {
+        $ua = 'MagpieRSS/'.MAGPIE_VERSION.' (+http://magpierss.sf.net';
 
-        if ( MAGPIE_CACHE_ON ) {
-            $ua = $ua . ')';
+        if (MAGPIE_CACHE_ON) {
+            $ua = $ua.')';
         }
         else {
-            $ua = $ua . '; No cache)';
+            $ua = $ua.'; No cache)';
         }
 
         define('MAGPIE_USER_AGENT', $ua);
     }
 
-    if ( !defined('MAGPIE_FETCH_TIME_OUT') ) {
+    if (!defined('MAGPIE_FETCH_TIME_OUT')) {
         define('MAGPIE_FETCH_TIME_OUT', 5); // 5 second timeout
     }
 
     // use gzip encoding to fetch rss files if supported?
-    if ( !defined('MAGPIE_USE_GZIP') ) {
+    if (!defined('MAGPIE_USE_GZIP')) {
         define('MAGPIE_USE_GZIP', true);
     }
 }
@@ -417,7 +417,7 @@ 
     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 +425,7 @@ 
     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 +433,7 @@ 
     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 +441,7 @@ 
     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 +449,7 @@ 
     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 +457,6 @@ 
     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

Spacing +2 added lines, -2 removed lines

@@ -18,7 +18,7 @@ 
     header("Content-Type: text/javascript");
     die;
 }
-$file = "lang/" . $input->get['lng'] . ".php";
+$file = "lang/".$input->get['lng'].".php";
 $files = dir::content("lang", array(
     'types' => "file",
     'pattern' => '/^.*\.php$/'
@@ -33,4 +33,4 @@ 
 header("Content-Type: text/javascript; charset={$lang['_charset']}");
 foreach ($lang as $english => $native)
     if (substr($english, 0, 1) != "_")
-        echo "browser.labels['" . text::jsValue($english) . "']=\"" . text::jsValue($native) . "\";";
+        echo "browser.labels['".text::jsValue($english)."']=\"".text::jsValue($native)."\";";

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

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);

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

Spacing +15 added lines, -15 removed lines

@@ -12,7 +12,7 @@ 
   *      @link http://kcfinder.sunhater.com
   */
 
-class image_imagick extends image {
+class image_imagick extends image{
 
     static $MIMES = array(
         //'tif' => "image/tiff"
@@ -21,7 +21,7 @@ 
 
     // ABSTRACT PUBLIC METHODS
 
-    public function resize($width, $height) {//
+    public function resize($width, $height){//
         if (!$width) $width = 1;
         if (!$height) $height = 1;
         try {
@@ -34,7 +34,7 @@ 
         return true;
     }
 
-    public function resizeFit($width, $height, $background=false) {//
+    public function resizeFit($width, $height, $background = false){//
         if (!$width) $width = 1;
         if (!$height) $height = 1;
 
@@ -65,7 +65,7 @@ 
         }
     }
 
-    public function resizeCrop($width, $height, $offset=false) {
+    public function resizeCrop($width, $height, $offset = false){
         if (!$width) $width = 1;
         if (!$height) $height = 1;
 
@@ -115,7 +115,7 @@ 
         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 +127,7 @@ 
         return true;
     }
 
-    public function flipHorizontal() {
+    public function flipHorizontal(){
         try {
             $this->image->flopImage();
         } catch (Exception $e) {
@@ -136,7 +136,7 @@ 
         return true;
     }
 
-    public function flipVertical() {
+    public function flipVertical(){
         try {
             $this->image->flipImage();
         } catch (Exception $e) {
@@ -145,7 +145,7 @@ 
         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();
@@ -181,7 +181,7 @@ 
 
     // ABSTRACT PROTECTED METHODS
 
-    protected function getBlankImage($width, $height) {
+    protected function getBlankImage($width, $height){
         try {
             $img = new Imagick();
             $img->newImage($width, $height, "none");
@@ -192,7 +192,7 @@ 
         return $img;
     }
 
-    protected function getImage($image, &$width, &$height) {
+    protected function getImage($image, &$width, &$height){
 
         if (is_object($image) && ($image instanceof image_imagick)) {
             try {
@@ -234,11 +234,11 @@ 
 
     // 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 +250,7 @@ 
 
     // 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);
@@ -269,7 +269,7 @@ 
             echo $this->image;
 
         } else {
-            $file = $options['file'] . ".$type";
+            $file = $options['file'].".$type";
             try {
                 $this->image->writeImage($file);
             } catch (Exception $e) {
@@ -289,7 +289,7 @@ 
 
     // 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

Spacing +15 added lines, -15 removed lines

@@ -12,7 +12,7 @@ 
   *      @link http://kcfinder.sunhater.com
   */
 
-class image_gmagick extends image {
+class image_gmagick extends image{
 
     static $MIMES = array(
         //'tif' => "image/tiff"
@@ -21,7 +21,7 @@ 
 
     // ABSTRACT PUBLIC METHODS
 
-    public function resize($width, $height) {//
+    public function resize($width, $height){//
         if (!$width) $width = 1;
         if (!$height) $height = 1;
         try {
@@ -34,7 +34,7 @@ 
         return true;
     }
 
-    public function resizeFit($width, $height, $background=false) {//
+    public function resizeFit($width, $height, $background = false){//
         if (!$width) $width = 1;
         if (!$height) $height = 1;
 
@@ -69,7 +69,7 @@ 
         }
     }
 
-    public function resizeCrop($width, $height, $offset=false) {
+    public function resizeCrop($width, $height, $offset = false){
         if (!$width) $width = 1;
         if (!$height) $height = 1;
 
@@ -119,7 +119,7 @@ 
         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 +132,7 @@ 
         return true;
     }
 
-    public function flipHorizontal() {
+    public function flipHorizontal(){
         try {
             $this->image->flopImage();
         } catch (Exception $e) {
@@ -141,7 +141,7 @@ 
         return true;
     }
 
-    public function flipVertical() {
+    public function flipVertical(){
         try {
             $this->image->flipImage();
         } catch (Exception $e) {
@@ -150,7 +150,7 @@ 
         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();
@@ -185,7 +185,7 @@ 
 
     // ABSTRACT PROTECTED METHODS
 
-    protected function getBlankImage($width, $height) {
+    protected function getBlankImage($width, $height){
         try {
             $img = new Gmagick();
             $img->newImage($width, $height, "none");
@@ -195,7 +195,7 @@ 
         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;
@@ -232,11 +232,11 @@ 
 
     // 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 +248,7 @@ 
 
     // 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);
@@ -267,7 +267,7 @@ 
             echo $this->image;
 
         } else {
-            $file = $options['file'] . ".$type";
+            $file = $options['file'].".$type";
             try {
                 $this->image->writeImage($file);
             } catch (Exception $e) {
@@ -287,7 +287,7 @@ 
 
     // 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/actions/refresh_site.dynamic.php

Spacing +3 added lines, -3 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.");
 }
 
@@ -29,8 +29,8 @@ 
 
 <div class="tab-page">
 	<div class="container container-body">
-		<?php if($num_rows_pub)   printf('<p>' . $_lang["refresh_published"]   . '</p>', $num_rows_pub) ?>
-		<?php if($num_rows_unpub) printf('<p>' . $_lang["refresh_unpublished"] . '</p>', $num_rows_unpub) ?>
+		<?php if ($num_rows_pub)   printf('<p>'.$_lang["refresh_published"].'</p>', $num_rows_pub) ?>
+		<?php if ($num_rows_unpub) printf('<p>'.$_lang["refresh_unpublished"].'</p>', $num_rows_unpub) ?>
 		<?php
 		$modx->clearCache('full', true);
 		// invoke OnSiteRefresh event

manager/actions/help.static.php

Spacing +11 added lines, -11 removed lines

@@ -1,12 +1,12 @@ 
 <?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/";

 ?>

 

 <h1>

-	<?php echo $_style['page_help'];  echo $_lang['help']; ?>

+	<?php echo $_style['page_help']; echo $_lang['help']; ?>

 </h1>

 

 <div class="sectionBody">

@@ -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,22 +27,22 @@ 
 

 		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);

 			}

 

 			$hnLower = strtolower($helpname);

 			$helpname = isset($_lang[$hnLower]) ? $_lang[$hnLower] : str_replace('_', ' ', $helpname);

 

-			echo '<div class="tab-page" id="tab' . $k . 'Help">';

-			echo '<h2 class="tab">' . $helpname . '</h2>';

-			echo '<script type="text/javascript">tp.addTabPage( document.getElementById( "tab' . $k . 'Help" ) );</script>';

-			include_once($helpBasePath . "{$v}");

+			echo '<div class="tab-page" id="tab'.$k.'Help">';

+			echo '<h2 class="tab">'.$helpname.'</h2>';

+			echo '<script type="text/javascript">tp.addTabPage( document.getElementById( "tab'.$k.'Help" ) );</script>';

+			include_once($helpBasePath."{$v}");

 			echo '</div>';

 		}

 		?>

manager/actions/resource_selector.static.php

Spacing +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.");
 }
 if (!$modx->hasPermission('edit_module')) {
@@ -63,7 +63,7 @@ 
 
 }
 
-include_once MODX_MANAGER_PATH . "includes/header.inc.php";
+include_once MODX_MANAGER_PATH."includes/header.inc.php";
 ?>
 <script language="JavaScript" type="text/javascript">
     function saveSelection()
@@ -138,7 +138,7 @@ 
 </script>
 
 <h1>
-    <?= $title . " - " . $_lang['element_selector_title'] ?><i class="fa fa-question-circle help"></i>
+    <?= $title." - ".$_lang['element_selector_title'] ?><i class="fa fa-question-circle help"></i>
 </h1>
 
 <div id="actions">
@@ -177,15 +177,15 @@ 
             <div class="row">
                 <div class="table-responsive">
                     <?php
-                    include_once MODX_MANAGER_PATH . "includes/controls/datagrid.class.php";
+                    include_once MODX_MANAGER_PATH."includes/controls/datagrid.class.php";
                     $grd = new DataGrid('', $ds, $number_of_results); // set page size to 0 t show all items
                     $grd->noRecordMsg = $_lang["no_records_found"];
                     $grd->cssClass = "table data nowrap";
                     $grd->columnHeaderClass = "tableHeader";
                     $grd->itemClass = "tableItem";
                     $grd->altItemClass = "tableAltItem";
-                    $grd->columns = $_lang["name"] . " ," . $_lang["description"];
-                    $grd->colTypes = "template:<input type='" . ($sm == 'm' ? 'checkbox' : 'radio') . "' name='id[]' value='[+id+]' onclick='setCheckbox(this);'> [+value+]";
+                    $grd->columns = $_lang["name"]." ,".$_lang["description"];
+                    $grd->colTypes = "template:<input type='".($sm == 'm' ? 'checkbox' : 'radio')."' name='id[]' value='[+id+]' onclick='setCheckbox(this);'> [+value+]";
                     $grd->colWidths = "45%";
                     $grd->fields = "name,description";
                     if ($_REQUEST['listmode'] == '1') {

manager/actions/phpinfo.static.php

Spacing +1 added lines, -1 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.");
 }
 ?>