evolution-cms / evolution

manager/includes/controls/phpmailer/PHPMailer.php

Doc Comments +1 added lines, -1 removed lines

@@ -3968,7 +3968,7 @@
      * @param int|string $options Either a PATHINFO_* constant,
      *                            or a string name to return only the specified piece
      *
-     * @return string|array
+     * @return string
      */
     public static function mb_pathinfo($path, $options = null)
     {

Spacing +135 added lines, -136 removed lines

@@ -1076,10 +1076,10 @@ 
             $list = imap_rfc822_parse_adrlist($addrstr, '');
             foreach ($list as $address) {
                 if ('.SYNTAX-ERROR.' != $address->host) {
-                    if (static::validateAddress($address->mailbox . '@' . $address->host)) {
+                    if (static::validateAddress($address->mailbox.'@'.$address->host)) {
                         $addresses[] = [
                             'name' => (property_exists($address, 'personal') ? $address->personal : ''),
-                            'address' => $address->mailbox . '@' . $address->host,
+                            'address' => $address->mailbox.'@'.$address->host,
                         ];
                     }
                 }
@@ -1225,14 +1225,14 @@ 
                  * Feel free to use and redistribute this code. But please keep this copyright notice.
                  */
                 return (bool) preg_match(
-                    '/^(?!(?>(?1)"?(?>\\\[ -~]|[^"])"?(?1)){255,})(?!(?>(?1)"?(?>\\\[ -~]|[^"])"?(?1)){65,}@)' .
-                    '((?>(?>(?>((?>(?>(?>\x0D\x0A)?[\t ])+|(?>[\t ]*\x0D\x0A)?[\t ]+)?)(\((?>(?2)' .
-                    '(?>[\x01-\x08\x0B\x0C\x0E-\'*-\[\]-\x7F]|\\\[\x00-\x7F]|(?3)))*(?2)\)))+(?2))|(?2))?)' .
-                    '([!#-\'*+\/-9=?^-~-]+|"(?>(?2)(?>[\x01-\x08\x0B\x0C\x0E-!#-\[\]-\x7F]|\\\[\x00-\x7F]))*' .
-                    '(?2)")(?>(?1)\.(?1)(?4))*(?1)@(?!(?1)[a-z0-9-]{64,})(?1)(?>([a-z0-9](?>[a-z0-9-]*[a-z0-9])?)' .
-                    '(?>(?1)\.(?!(?1)[a-z0-9-]{64,})(?1)(?5)){0,126}|\[(?:(?>IPv6:(?>([a-f0-9]{1,4})(?>:(?6)){7}' .
-                    '|(?!(?:.*[a-f0-9][:\]]){8,})((?6)(?>:(?6)){0,6})?::(?7)?))|(?>(?>IPv6:(?>(?6)(?>:(?6)){5}:' .
-                    '|(?!(?:.*[a-f0-9]:){6,})(?8)?::(?>((?6)(?>:(?6)){0,4}):)?))?(25[0-5]|2[0-4][0-9]|1[0-9]{2}' .
+                    '/^(?!(?>(?1)"?(?>\\\[ -~]|[^"])"?(?1)){255,})(?!(?>(?1)"?(?>\\\[ -~]|[^"])"?(?1)){65,}@)'.
+                    '((?>(?>(?>((?>(?>(?>\x0D\x0A)?[\t ])+|(?>[\t ]*\x0D\x0A)?[\t ]+)?)(\((?>(?2)'.
+                    '(?>[\x01-\x08\x0B\x0C\x0E-\'*-\[\]-\x7F]|\\\[\x00-\x7F]|(?3)))*(?2)\)))+(?2))|(?2))?)'.
+                    '([!#-\'*+\/-9=?^-~-]+|"(?>(?2)(?>[\x01-\x08\x0B\x0C\x0E-!#-\[\]-\x7F]|\\\[\x00-\x7F]))*'.
+                    '(?2)")(?>(?1)\.(?1)(?4))*(?1)@(?!(?1)[a-z0-9-]{64,})(?1)(?>([a-z0-9](?>[a-z0-9-]*[a-z0-9])?)'.
+                    '(?>(?1)\.(?!(?1)[a-z0-9-]{64,})(?1)(?5)){0,126}|\[(?:(?>IPv6:(?>([a-f0-9]{1,4})(?>:(?6)){7}'.
+                    '|(?!(?:.*[a-f0-9][:\]]){8,})((?6)(?>:(?6)){0,6})?::(?7)?))|(?>(?>IPv6:(?>(?6)(?>:(?6)){5}:'.
+                    '|(?!(?:.*[a-f0-9]:){6,})(?8)?::(?>((?6)(?>:(?6)){0,4}):)?))?(25[0-5]|2[0-4][0-9]|1[0-9]{2}'.
                     '|[1-9]?[0-9])(?>\.(?9)){3}))\])(?1)$/isD',
                     $address
                 );
@@ -1243,7 +1243,7 @@ 
                  * @see http://www.whatwg.org/specs/web-apps/current-work/#e-mail-state-(type=email)
                  */
                 return (bool) preg_match(
-                    '/^[a-zA-Z0-9.!#$%&\'*+\/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}' .
+                    '/^[a-zA-Z0-9.!#$%&\'*+\/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}'.
                     '[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$/sD',
                     $address
                 );
@@ -1294,7 +1294,7 @@ 
                 $errorcode = 0;
                 $punycode = idn_to_ascii($domain, $errorcode, INTL_IDNA_VARIANT_UTS46);
                 if (false !== $punycode) {
-                    return substr($address, 0, $pos) . $punycode;
+                    return substr($address, 0, $pos).$punycode;
                 }
             }
         }
@@ -1358,8 +1358,8 @@ 
                     and version_compare(PHP_VERSION, '7.1.3', '<')))
         ) {
             trigger_error(
-                'Your version of PHP is affected by a bug that may result in corrupted messages.' .
-                ' To fix it, switch to sending using SMTP, disable the mail.add_x_header option in' .
+                'Your version of PHP is affected by a bug that may result in corrupted messages.'.
+                ' To fix it, switch to sending using SMTP, disable the mail.add_x_header option in'.
                 ' your php.ini, switch to MacOS or Linux, or upgrade your PHP to version 7.0.17+ or 7.1.3+.',
                 E_USER_WARNING
             );
@@ -1443,12 +1443,12 @@ 
                 )
             ) {
                 $header_dkim = $this->DKIM_Add(
-                    $this->MIMEHeader . $this->mailHeader,
+                    $this->MIMEHeader.$this->mailHeader,
                     $this->encodeHeader($this->secureHeader($this->Subject)),
                     $this->MIMEBody
                 );
-                $this->MIMEHeader = rtrim($this->MIMEHeader, "\r\n ") . static::$LE .
-                    static::normalizeBreaks($header_dkim) . static::$LE;
+                $this->MIMEHeader = rtrim($this->MIMEHeader, "\r\n ").static::$LE.
+                    static::normalizeBreaks($header_dkim).static::$LE;
             }
 
             return true;
@@ -1482,7 +1482,7 @@ 
                 case 'mail':
                     return $this->mailSend($this->MIMEHeader, $this->MIMEBody);
                 default:
-                    $sendMethod = $this->Mailer . 'Send';
+                    $sendMethod = $this->Mailer.'Send';
                     if (method_exists($this, $sendMethod)) {
                         return $this->$sendMethod($this->MIMEHeader, $this->MIMEBody);
                     }
@@ -1535,9 +1535,9 @@ 
             foreach ($this->SingleToArray as $toAddr) {
                 $mail = @popen($sendmail, 'w');
                 if (!$mail) {
-                    throw new Exception($this->lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
+                    throw new Exception($this->lang('execute').$this->Sendmail, self::STOP_CRITICAL);
                 }
-                fwrite($mail, 'To: ' . $toAddr . "\n");
+                fwrite($mail, 'To: '.$toAddr."\n");
                 fwrite($mail, $header);
                 fwrite($mail, $body);
                 $result = pclose($mail);
@@ -1552,13 +1552,13 @@ 
                     []
                 );
                 if (0 !== $result) {
-                    throw new Exception($this->lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
+                    throw new Exception($this->lang('execute').$this->Sendmail, self::STOP_CRITICAL);
                 }
             }
         } else {
             $mail = @popen($sendmail, 'w');
             if (!$mail) {
-                throw new Exception($this->lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
+                throw new Exception($this->lang('execute').$this->Sendmail, self::STOP_CRITICAL);
             }
             fwrite($mail, $header);
             fwrite($mail, $body);
@@ -1574,7 +1574,7 @@ 
                 []
             );
             if (0 !== $result) {
-                throw new Exception($this->lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
+                throw new Exception($this->lang('execute').$this->Sendmail, self::STOP_CRITICAL);
             }
         }
 
@@ -1732,7 +1732,7 @@ 
             $smtp_from = $this->Sender;
         }
         if (!$this->smtp->mail($smtp_from)) {
-            $this->setError($this->lang('from_failed') . $smtp_from . ' : ' . implode(',', $this->smtp->getError()));
+            $this->setError($this->lang('from_failed').$smtp_from.' : '.implode(',', $this->smtp->getError()));
             throw new Exception($this->ErrorInfo, self::STOP_CRITICAL);
         }
 
@@ -1753,7 +1753,7 @@ 
         }
 
         // Only send the DATA command if we have viable recipients
-        if ((count($this->all_recipients) > count($bad_rcpt)) and !$this->smtp->data($header . $body)) {
+        if ((count($this->all_recipients) > count($bad_rcpt)) and !$this->smtp->data($header.$body)) {
             throw new Exception($this->lang('data_not_accepted'), self::STOP_CRITICAL);
         }
 
@@ -1783,10 +1783,10 @@ 
         if (count($bad_rcpt) > 0) {
             $errstr = '';
             foreach ($bad_rcpt as $bad) {
-                $errstr .= $bad['to'] . ': ' . $bad['error'];
+                $errstr .= $bad['to'].': '.$bad['error'];
             }
             throw new Exception(
-                $this->lang('recipients_failed') . $errstr,
+                $this->lang('recipients_failed').$errstr,
                 self::STOP_CONTINUE
             );
         }
@@ -1836,7 +1836,7 @@ 
                 trim($hostentry),
                 $hostinfo
             )) {
-                static::edebug($this->lang('connect_host') . ' ' . $hostentry);
+                static::edebug($this->lang('connect_host').' '.$hostentry);
                 // Not a valid host entry
                 continue;
             }
@@ -1848,7 +1848,7 @@ 
 
             //Check the host name is a valid name or IP address before trying to use it
             if (!static::isValidHost($hostinfo[3])) {
-                static::edebug($this->lang('connect_host') . ' ' . $hostentry);
+                static::edebug($this->lang('connect_host').' '.$hostentry);
                 continue;
             }
             $prefix = '';
@@ -1868,7 +1868,7 @@ 
             if ('tls' === $secure or 'ssl' === $secure) {
                 //Check for an OpenSSL constant rather than using extension_loaded, which is sometimes disabled
                 if (!$sslext) {
-                    throw new Exception($this->lang('extension_missing') . 'openssl', self::STOP_CRITICAL);
+                    throw new Exception($this->lang('extension_missing').'openssl', self::STOP_CRITICAL);
                 }
             }
             $host = $hostinfo[3];
@@ -1877,7 +1877,7 @@ 
             if ($tport > 0 and $tport < 65536) {
                 $port = $tport;
             }
-            if ($this->smtp->connect($prefix . $host, $port, $this->Timeout, $options)) {
+            if ($this->smtp->connect($prefix.$host, $port, $this->Timeout, $options)) {
                 try {
                     if ($this->Helo) {
                         $hello = $this->Helo;
@@ -1994,14 +1994,14 @@ 
         ];
         if (empty($lang_path)) {
             // Calculate an absolute path so it can work if CWD is not here
-            $lang_path = __DIR__ . DIRECTORY_SEPARATOR . 'language' . DIRECTORY_SEPARATOR;
+            $lang_path = __DIR__.DIRECTORY_SEPARATOR.'language'.DIRECTORY_SEPARATOR;
         }
         //Validate $langcode
         if (!preg_match('/^[a-z]{2}(?:_[a-zA-Z]{2})?$/', $langcode)) {
             $langcode = 'en';
         }
         $foundlang = true;
-        $lang_file = $lang_path . 'phpmailer.lang-' . $langcode . '.php';
+        $lang_file = $lang_path.'phpmailer.lang-'.$langcode.'.php';
         // There is no English translation file
         if ('en' != $langcode) {
             // Make sure language file path is readable
@@ -2046,7 +2046,7 @@ 
             $addresses[] = $this->addrFormat($address);
         }
 
-        return $type . ': ' . implode(', ', $addresses) . static::$LE;
+        return $type.': '.implode(', ', $addresses).static::$LE;
     }
 
     /**
@@ -2063,9 +2063,9 @@ 
             return $this->secureHeader($addr[0]);
         }
 
-        return $this->encodeHeader($this->secureHeader($addr[1]), 'phrase') . ' <' . $this->secureHeader(
+        return $this->encodeHeader($this->secureHeader($addr[1]), 'phrase').' <'.$this->secureHeader(
                 $addr[0]
-            ) . '>';
+            ).'>';
     }
 
     /**
@@ -2122,10 +2122,10 @@ 
                             }
                             $part = substr($word, 0, $len);
                             $word = substr($word, $len);
-                            $buf .= ' ' . $part;
-                            $message .= $buf . sprintf('=%s', static::$LE);
+                            $buf .= ' '.$part;
+                            $message .= $buf.sprintf('=%s', static::$LE);
                         } else {
-                            $message .= $buf . $soft_break;
+                            $message .= $buf.$soft_break;
                         }
                         $buf = '';
                     }
@@ -2145,7 +2145,7 @@ 
                         $word = substr($word, $len);
 
                         if (strlen($word) > 0) {
-                            $message .= $part . sprintf('=%s', static::$LE);
+                            $message .= $part.sprintf('=%s', static::$LE);
                         } else {
                             $buf = $part;
                         }
@@ -2158,13 +2158,13 @@ 
                     $buf .= $word;
 
                     if (strlen($buf) > $length and '' != $buf_o) {
-                        $message .= $buf_o . $soft_break;
+                        $message .= $buf_o.$soft_break;
                         $buf = $word;
                     }
                 }
                 $firstword = false;
             }
-            $message .= $buf . static::$LE;
+            $message .= $buf.static::$LE;
         }
 
         return $message;
@@ -2310,7 +2310,7 @@ 
         if ('' == $this->XMailer) {
             $result .= $this->headerLine(
                 'X-Mailer',
-                'PHPMailer ' . self::VERSION . ' (https://github.com/PHPMailer/PHPMailer)'
+                'PHPMailer '.self::VERSION.' (https://github.com/PHPMailer/PHPMailer)'
             );
         } else {
             $myXmailer = trim($this->XMailer);
@@ -2320,7 +2320,7 @@ 
         }
 
         if ('' != $this->ConfirmReadingTo) {
-            $result .= $this->headerLine('Disposition-Notification-To', '<' . $this->ConfirmReadingTo . '>');
+            $result .= $this->headerLine('Disposition-Notification-To', '<'.$this->ConfirmReadingTo.'>');
         }
 
         // Add custom headers
@@ -2350,23 +2350,23 @@ 
         switch ($this->message_type) {
             case 'inline':
                 $result .= $this->headerLine('Content-Type', 'multipart/related;');
-                $result .= $this->textLine("\tboundary=\"" . $this->boundary[1] . '"');
+                $result .= $this->textLine("\tboundary=\"".$this->boundary[1].'"');
                 break;
             case 'attach':
             case 'inline_attach':
             case 'alt_attach':
             case 'alt_inline_attach':
                 $result .= $this->headerLine('Content-Type', 'multipart/mixed;');
-                $result .= $this->textLine("\tboundary=\"" . $this->boundary[1] . '"');
+                $result .= $this->textLine("\tboundary=\"".$this->boundary[1].'"');
                 break;
             case 'alt':
             case 'alt_inline':
                 $result .= $this->headerLine('Content-Type', 'multipart/alternative;');
-                $result .= $this->textLine("\tboundary=\"" . $this->boundary[1] . '"');
+                $result .= $this->textLine("\tboundary=\"".$this->boundary[1].'"');
                 break;
             default:
                 // Catches case 'plain': and case '':
-                $result .= $this->textLine('Content-Type: ' . $this->ContentType . '; charset=' . $this->CharSet);
+                $result .= $this->textLine('Content-Type: '.$this->ContentType.'; charset='.$this->CharSet);
                 $ismultipart = false;
                 break;
         }
@@ -2401,7 +2401,7 @@ 
      */
     public function getSentMIMEMessage()
     {
-        return rtrim($this->MIMEHeader . $this->mailHeader, "\n\r") . static::$LE . static::$LE . $this->MIMEBody;
+        return rtrim($this->MIMEHeader.$this->mailHeader, "\n\r").static::$LE.static::$LE.$this->MIMEBody;
     }
 
     /**
@@ -2438,12 +2438,12 @@ 
         $body = '';
         //Create unique IDs and preset boundaries
         $this->uniqueid = $this->generateId();
-        $this->boundary[1] = 'b1_' . $this->uniqueid;
-        $this->boundary[2] = 'b2_' . $this->uniqueid;
-        $this->boundary[3] = 'b3_' . $this->uniqueid;
+        $this->boundary[1] = 'b1_'.$this->uniqueid;
+        $this->boundary[2] = 'b2_'.$this->uniqueid;
+        $this->boundary[3] = 'b3_'.$this->uniqueid;
 
         if ($this->sign_key_file) {
-            $body .= $this->getMailMIME() . static::$LE;
+            $body .= $this->getMailMIME().static::$LE;
         }
 
         $this->setWordWrap();
@@ -2476,7 +2476,7 @@ 
             $altBodyEncoding = 'quoted-printable';
         }
         //Use this as a preamble in all multipart message types
-        $mimepre = 'This is a multi-part message in MIME format.' . static::$LE;
+        $mimepre = 'This is a multi-part message in MIME format.'.static::$LE;
         switch ($this->message_type) {
             case 'inline':
                 $body .= $mimepre;
@@ -2494,9 +2494,9 @@ 
                 break;
             case 'inline_attach':
                 $body .= $mimepre;
-                $body .= $this->textLine('--' . $this->boundary[1]);
+                $body .= $this->textLine('--'.$this->boundary[1]);
                 $body .= $this->headerLine('Content-Type', 'multipart/related;');
-                $body .= $this->textLine("\tboundary=\"" . $this->boundary[2] . '"');
+                $body .= $this->textLine("\tboundary=\"".$this->boundary[2].'"');
                 $body .= static::$LE;
                 $body .= $this->getBoundary($this->boundary[2], $bodyCharSet, '', $bodyEncoding);
                 $body .= $this->encodeString($this->Body, $bodyEncoding);
@@ -2525,9 +2525,9 @@ 
                 $body .= $this->getBoundary($this->boundary[1], $altBodyCharSet, 'text/plain', $altBodyEncoding);
                 $body .= $this->encodeString($this->AltBody, $altBodyEncoding);
                 $body .= static::$LE;
-                $body .= $this->textLine('--' . $this->boundary[1]);
+                $body .= $this->textLine('--'.$this->boundary[1]);
                 $body .= $this->headerLine('Content-Type', 'multipart/related;');
-                $body .= $this->textLine("\tboundary=\"" . $this->boundary[2] . '"');
+                $body .= $this->textLine("\tboundary=\"".$this->boundary[2].'"');
                 $body .= static::$LE;
                 $body .= $this->getBoundary($this->boundary[2], $bodyCharSet, 'text/html', $bodyEncoding);
                 $body .= $this->encodeString($this->Body, $bodyEncoding);
@@ -2538,9 +2538,9 @@ 
                 break;
             case 'alt_attach':
                 $body .= $mimepre;
-                $body .= $this->textLine('--' . $this->boundary[1]);
+                $body .= $this->textLine('--'.$this->boundary[1]);
                 $body .= $this->headerLine('Content-Type', 'multipart/alternative;');
-                $body .= $this->textLine("\tboundary=\"" . $this->boundary[2] . '"');
+                $body .= $this->textLine("\tboundary=\"".$this->boundary[2].'"');
                 $body .= static::$LE;
                 $body .= $this->getBoundary($this->boundary[2], $altBodyCharSet, 'text/plain', $altBodyEncoding);
                 $body .= $this->encodeString($this->AltBody, $altBodyEncoding);
@@ -2558,16 +2558,16 @@ 
                 break;
             case 'alt_inline_attach':
                 $body .= $mimepre;
-                $body .= $this->textLine('--' . $this->boundary[1]);
+                $body .= $this->textLine('--'.$this->boundary[1]);
                 $body .= $this->headerLine('Content-Type', 'multipart/alternative;');
-                $body .= $this->textLine("\tboundary=\"" . $this->boundary[2] . '"');
+                $body .= $this->textLine("\tboundary=\"".$this->boundary[2].'"');
                 $body .= static::$LE;
                 $body .= $this->getBoundary($this->boundary[2], $altBodyCharSet, 'text/plain', $altBodyEncoding);
                 $body .= $this->encodeString($this->AltBody, $altBodyEncoding);
                 $body .= static::$LE;
-                $body .= $this->textLine('--' . $this->boundary[2]);
+                $body .= $this->textLine('--'.$this->boundary[2]);
                 $body .= $this->headerLine('Content-Type', 'multipart/related;');
-                $body .= $this->textLine("\tboundary=\"" . $this->boundary[3] . '"');
+                $body .= $this->textLine("\tboundary=\"".$this->boundary[3].'"');
                 $body .= static::$LE;
                 $body .= $this->getBoundary($this->boundary[3], $bodyCharSet, 'text/html', $bodyEncoding);
                 $body .= $this->encodeString($this->Body, $bodyEncoding);
@@ -2594,12 +2594,12 @@ 
         } elseif ($this->sign_key_file) {
             try {
                 if (!defined('PKCS7_TEXT')) {
-                    throw new Exception($this->lang('extension_missing') . 'openssl');
+                    throw new Exception($this->lang('extension_missing').'openssl');
                 }
                 // @TODO would be nice to use php://temp streams here
                 $file = tempnam(sys_get_temp_dir(), 'mail');
                 if (false === file_put_contents($file, $body)) {
-                    throw new Exception($this->lang('signing') . ' Could not write temp file');
+                    throw new Exception($this->lang('signing').' Could not write temp file');
                 }
                 $signed = tempnam(sys_get_temp_dir(), 'signed');
                 //Workaround for PHP bug https://bugs.php.net/bug.php?id=69197
@@ -2607,16 +2607,16 @@ 
                     $sign = @openssl_pkcs7_sign(
                         $file,
                         $signed,
-                        'file://' . realpath($this->sign_cert_file),
-                        ['file://' . realpath($this->sign_key_file), $this->sign_key_pass],
+                        'file://'.realpath($this->sign_cert_file),
+                        ['file://'.realpath($this->sign_key_file), $this->sign_key_pass],
                         []
                     );
                 } else {
                     $sign = @openssl_pkcs7_sign(
                         $file,
                         $signed,
-                        'file://' . realpath($this->sign_cert_file),
-                        ['file://' . realpath($this->sign_key_file), $this->sign_key_pass],
+                        'file://'.realpath($this->sign_cert_file),
+                        ['file://'.realpath($this->sign_key_file), $this->sign_key_pass],
                         [],
                         PKCS7_DETACHED,
                         $this->sign_extracerts_file
@@ -2628,11 +2628,11 @@ 
                     @unlink($signed);
                     //The message returned by openssl contains both headers and body, so need to split them up
                     $parts = explode("\n\n", $body, 2);
-                    $this->MIMEHeader .= $parts[0] . static::$LE . static::$LE;
+                    $this->MIMEHeader .= $parts[0].static::$LE.static::$LE;
                     $body = $parts[1];
                 } else {
                     @unlink($signed);
-                    throw new Exception($this->lang('signing') . openssl_error_string());
+                    throw new Exception($this->lang('signing').openssl_error_string());
                 }
             } catch (Exception $exc) {
                 $body = '';
@@ -2667,7 +2667,7 @@ 
         if ('' == $encoding) {
             $encoding = $this->Encoding;
         }
-        $result .= $this->textLine('--' . $boundary);
+        $result .= $this->textLine('--'.$boundary);
         $result .= sprintf('Content-Type: %s; charset=%s', $contentType, $charSet);
         $result .= static::$LE;
         // RFC1341 part 5 says 7bit is assumed if not specified
@@ -2688,7 +2688,7 @@ 
      */
     protected function endBoundary($boundary)
     {
-        return static::$LE . '--' . $boundary . '--' . static::$LE;
+        return static::$LE.'--'.$boundary.'--'.static::$LE;
     }
 
     /**
@@ -2724,7 +2724,7 @@ 
      */
     public function headerLine($name, $value)
     {
-        return $name . ': ' . $value . static::$LE;
+        return $name.': '.$value.static::$LE;
     }
 
     /**
@@ -2736,7 +2736,7 @@ 
      */
     public function textLine($value)
     {
-        return $value . static::$LE;
+        return $value.static::$LE;
     }
 
     /**
@@ -2758,7 +2758,7 @@ 
     {
         try {
             if (!@is_file($path)) {
-                throw new Exception($this->lang('file_access') . $path, self::STOP_CONTINUE);
+                throw new Exception($this->lang('file_access').$path, self::STOP_CONTINUE);
             }
 
             // If a MIME type is not specified, try to work it out from the file name
@@ -2885,7 +2885,7 @@ 
                             'Content-Disposition: %s; filename="%s"%s',
                             $disposition,
                             $encoded_name,
-                            static::$LE . static::$LE
+                            static::$LE.static::$LE
                         );
                     } else {
                         if (!empty($encoded_name)) {
@@ -2893,13 +2893,13 @@ 
                                 'Content-Disposition: %s; filename=%s%s',
                                 $disposition,
                                 $encoded_name,
-                                static::$LE . static::$LE
+                                static::$LE.static::$LE
                             );
                         } else {
                             $mime[] = sprintf(
                                 'Content-Disposition: %s%s',
                                 $disposition,
-                                static::$LE . static::$LE
+                                static::$LE.static::$LE
                             );
                         }
                     }
@@ -2940,11 +2940,11 @@ 
     {
         try {
             if (!file_exists($path)) {
-                throw new Exception($this->lang('file_open') . $path, self::STOP_CONTINUE);
+                throw new Exception($this->lang('file_open').$path, self::STOP_CONTINUE);
             }
             $file_buffer = file_get_contents($path);
             if (false === $file_buffer) {
-                throw new Exception($this->lang('file_open') . $path, self::STOP_CONTINUE);
+                throw new Exception($this->lang('file_open').$path, self::STOP_CONTINUE);
             }
             $file_buffer = $this->encodeString($file_buffer, $encoding);
 
@@ -2991,7 +2991,7 @@ 
                 $encoded = $this->encodeQP($str);
                 break;
             default:
-                $this->setError($this->lang('encoding') . $encoding);
+                $this->setError($this->lang('encoding').$encoding);
                 break;
         }
 
@@ -3057,7 +3057,7 @@ 
                 $maxlen -= $maxlen % 4;
                 $encoded = trim(chunk_split($encoded, $maxlen, "\n"));
             }
-            $encoded = preg_replace('/^(.*)$/m', ' =?' . $this->CharSet . "?$encoding?\\1?=", $encoded);
+            $encoded = preg_replace('/^(.*)$/m', ' =?'.$this->CharSet."?$encoding?\\1?=", $encoded);
         } elseif ($matchcount > 0) {
             //1 or more chars need encoding, use Q-encode
             $encoding = 'Q';
@@ -3065,8 +3065,8 @@ 
             $maxlen = static::STD_LINE_LENGTH - $lengthsub - 8 - strlen($this->CharSet);
             $encoded = $this->encodeQ($str, $position);
             $encoded = $this->wrapText($encoded, $maxlen, true);
-            $encoded = str_replace('=' . static::$LE, "\n", trim($encoded));
-            $encoded = preg_replace('/^(.*)$/m', ' =?' . $this->CharSet . "?$encoding?\\1?=", $encoded);
+            $encoded = str_replace('='.static::$LE, "\n", trim($encoded));
+            $encoded = preg_replace('/^(.*)$/m', ' =?'.$this->CharSet."?$encoding?\\1?=", $encoded);
         } elseif (strlen($str) > $maxlen) {
             //No chars need encoding, but line is too long, so fold it
             $encoded = trim($this->wrapText($str, $maxlen, false));
@@ -3127,7 +3127,7 @@ 
      */
     public function base64EncodeWrapMB($str, $linebreak = null)
     {
-        $start = '=?' . $this->CharSet . '?B?';
+        $start = '=?'.$this->CharSet.'?B?';
         $end = '?=';
         $encoded = '';
         if (null === $linebreak) {
@@ -3150,7 +3150,7 @@ 
                 $chunk = base64_encode($chunk);
                 ++$lookBack;
             } while (strlen($chunk) > $length);
-            $encoded .= $chunk . $linebreak;
+            $encoded .= $chunk.$linebreak;
         }
 
         // Chomp the last linefeed
@@ -3203,7 +3203,7 @@ 
                 // RFC 2047 section 5.1
                 // Replace every high ascii, control, =, ? and _ characters
                 /** @noinspection SuspiciousAssignmentsInspection */
-                $pattern = '\000-\011\013\014\016-\037\075\077\137\177-\377' . $pattern;
+                $pattern = '\000-\011\013\014\016-\037\075\077\137\177-\377'.$pattern;
                 break;
         }
         $matches = [];
@@ -3216,7 +3216,7 @@ 
                 array_unshift($matches[0], '=');
             }
             foreach (array_unique($matches[0]) as $char) {
-                $encoded = str_replace($char, '=' . sprintf('%02X', ord($char)), $encoded);
+                $encoded = str_replace($char, '='.sprintf('%02X', ord($char)), $encoded);
             }
         }
         // Replace spaces with _ (more readable than =20)
@@ -3241,7 +3241,7 @@ 
         $encoding = 'base64',
         $type = '',
         $disposition = 'attachment'
-    ) {
+    ){
         // If a MIME type is not specified, try to work it out from the file name
         if ('' == $type) {
             $type = static::filenameToType($filename);
@@ -3281,7 +3281,7 @@ 
     public function addEmbeddedImage($path, $cid, $name = '', $encoding = 'base64', $type = '', $disposition = 'inline')
     {
         if (!@is_file($path)) {
-            $this->setError($this->lang('file_access') . $path);
+            $this->setError($this->lang('file_access').$path);
 
             return false;
         }
@@ -3335,7 +3335,7 @@ 
         $encoding = 'base64',
         $type = '',
         $disposition = 'inline'
-    ) {
+    ){
         // If a MIME type is not specified, try to work it out from the name
         if ('' == $type and !empty($name)) {
             $type = static::filenameToType($name);
@@ -3425,7 +3425,7 @@ 
     {
         $this->RecipientsQueue = array_filter(
             $this->RecipientsQueue,
-            function ($params) use ($kind) {
+            function($params) use ($kind) {
                 return $params[0] != $kind;
             }
         );
@@ -3515,15 +3515,15 @@ 
         if ('smtp' == $this->Mailer and null !== $this->smtp) {
             $lasterror = $this->smtp->getError();
             if (!empty($lasterror['error'])) {
-                $msg .= $this->lang('smtp_error') . $lasterror['error'];
+                $msg .= $this->lang('smtp_error').$lasterror['error'];
                 if (!empty($lasterror['detail'])) {
-                    $msg .= ' Detail: ' . $lasterror['detail'];
+                    $msg .= ' Detail: '.$lasterror['detail'];
                 }
                 if (!empty($lasterror['smtp_code'])) {
-                    $msg .= ' SMTP code: ' . $lasterror['smtp_code'];
+                    $msg .= ' SMTP code: '.$lasterror['smtp_code'];
                 }
                 if (!empty($lasterror['smtp_code_ex'])) {
-                    $msg .= ' Additional SMTP info: ' . $lasterror['smtp_code_ex'];
+                    $msg .= ' Additional SMTP info: '.$lasterror['smtp_code_ex'];
                 }
             }
         }
@@ -3596,7 +3596,7 @@ 
             //Is it a valid IPv4 address?
             return (bool) filter_var($host, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4);
         }
-        if (filter_var('http://' . $host, FILTER_VALIDATE_URL, FILTER_FLAG_HOST_REQUIRED)) {
+        if (filter_var('http://'.$host, FILTER_VALIDATE_URL, FILTER_FLAG_HOST_REQUIRED)) {
             //Is it a syntactically valid hostname?
             return true;
         }
@@ -3622,7 +3622,7 @@ 
                 //Include a link to troubleshooting docs on SMTP connection failure
                 //this is by far the biggest cause of support questions
                 //but it's usually not PHPMailer's fault.
-                return $this->language[$key] . ' https://github.com/PHPMailer/PHPMailer/wiki/Troubleshooting';
+                return $this->language[$key].' https://github.com/PHPMailer/PHPMailer/wiki/Troubleshooting';
             }
 
             return $this->language[$key];
@@ -3710,14 +3710,14 @@ 
                     }
                     //Hash the decoded data, not the URL so that the same data-URI image used in multiple places
                     //will only be embedded once, even if it used a different encoding
-                    $cid = hash('sha256', $data) . '@phpmailer.0'; // RFC2392 S 2
+                    $cid = hash('sha256', $data).'@phpmailer.0'; // RFC2392 S 2
 
                     if (!$this->cidExists($cid)) {
-                        $this->addStringEmbeddedImage($data, $cid, 'embed' . $imgindex, 'base64', $match[1]);
+                        $this->addStringEmbeddedImage($data, $cid, 'embed'.$imgindex, 'base64', $match[1]);
                     }
                     $message = str_replace(
                         $images[0][$imgindex],
-                        $images[1][$imgindex] . '="cid:' . $cid . '"',
+                        $images[1][$imgindex].'="cid:'.$cid.'"',
                         $message
                     );
                     continue;
@@ -3736,7 +3736,7 @@ 
                     if ('.' == $directory) {
                         $directory = '';
                     }
-                    $cid = hash('sha256', $url) . '@phpmailer.0'; // RFC2392 S 2
+                    $cid = hash('sha256', $url).'@phpmailer.0'; // RFC2392 S 2
                     if (strlen($basedir) > 1 and '/' != substr($basedir, -1)) {
                         $basedir .= '/';
                     }
@@ -3744,7 +3744,7 @@ 
                         $directory .= '/';
                     }
                     if ($this->addEmbeddedImage(
-                        $basedir . $directory . $filename,
+                        $basedir.$directory.$filename,
                         $cid,
                         $filename,
                         'base64',
@@ -3752,8 +3752,8 @@ 
                     )
                     ) {
                         $message = preg_replace(
-                            '/' . $images[1][$imgindex] . '=["\']' . preg_quote($url, '/') . '["\']/Ui',
-                            $images[1][$imgindex] . '="cid:' . $cid . '"',
+                            '/'.$images[1][$imgindex].'=["\']'.preg_quote($url, '/').'["\']/Ui',
+                            $images[1][$imgindex].'="cid:'.$cid.'"',
                             $message
                         );
                     }
@@ -4027,7 +4027,7 @@ 
 
             return true;
         }
-        $this->setError($this->lang('variable_set') . $name);
+        $this->setError($this->lang('variable_set').$name);
 
         return false;
     }
@@ -4121,7 +4121,7 @@ 
             if (((0x21 <= $ord) and ($ord <= 0x3A)) or $ord == 0x3C or ((0x3E <= $ord) and ($ord <= 0x7E))) {
                 $line .= $txt[$i];
             } else {
-                $line .= '=' . sprintf('%02X', $ord);
+                $line .= '='.sprintf('%02X', $ord);
             }
         }
 
@@ -4141,14 +4141,13 @@ 
     {
         if (!defined('PKCS7_TEXT')) {
             if ($this->exceptions) {
-                throw new Exception($this->lang('extension_missing') . 'openssl');
+                throw new Exception($this->lang('extension_missing').'openssl');
             }
 
             return '';
         }
         $privKeyStr = !empty($this->DKIM_private_string) ?
-            $this->DKIM_private_string :
-            file_get_contents($this->DKIM_private);
+            $this->DKIM_private_string : file_get_contents($this->DKIM_private);
         if ('' != $this->DKIM_passphrase) {
             $privKey = openssl_pkey_get_private($privKeyStr, $this->DKIM_passphrase);
         } else {
@@ -4200,7 +4199,7 @@ 
             //But then says to delete space before and after the colon.
             //Net result is the same as trimming both ends of the value.
             //by elimination, the same applies to the field name
-            $lines[$key] = trim($heading, " \t") . ':' . trim($value, " \t");
+            $lines[$key] = trim($heading, " \t").':'.trim($value, " \t");
         }
 
         return implode("\r\n", $lines);
@@ -4226,7 +4225,7 @@ 
         $body = static::normalizeBreaks($body, "\r\n");
 
         //Reduce multiple trailing line breaks to a single one
-        return rtrim($body, "\r\n") . "\r\n";
+        return rtrim($body, "\r\n")."\r\n";
     }
 
     /**
@@ -4282,33 +4281,33 @@ 
         if ('' == $this->DKIM_identity) {
             $ident = '';
         } else {
-            $ident = ' i=' . $this->DKIM_identity . ';';
-        }
-        $dkimhdrs = 'DKIM-Signature: v=1; a=' .
-            $DKIMsignatureType . '; q=' .
-            $DKIMquery . '; l=' .
-            $DKIMlen . '; s=' .
-            $this->DKIM_selector .
-            ";\r\n" .
-            "\tt=" . $DKIMtime . '; c=' . $DKIMcanonicalization . ";\r\n" .
-            "\th=From:To:Date:Subject;\r\n" .
-            "\td=" . $this->DKIM_domain . ';' . $ident . "\r\n" .
-            "\tz=$from\r\n" .
-            "\t|$to\r\n" .
-            "\t|$date\r\n" .
-            "\t|$subject;\r\n" .
-            "\tbh=" . $DKIMb64 . ";\r\n" .
+            $ident = ' i='.$this->DKIM_identity.';';
+        }
+        $dkimhdrs = 'DKIM-Signature: v=1; a='.
+            $DKIMsignatureType.'; q='.
+            $DKIMquery.'; l='.
+            $DKIMlen.'; s='.
+            $this->DKIM_selector.
+            ";\r\n".
+            "\tt=".$DKIMtime.'; c='.$DKIMcanonicalization.";\r\n".
+            "\th=From:To:Date:Subject;\r\n".
+            "\td=".$this->DKIM_domain.';'.$ident."\r\n".
+            "\tz=$from\r\n".
+            "\t|$to\r\n".
+            "\t|$date\r\n".
+            "\t|$subject;\r\n".
+            "\tbh=".$DKIMb64.";\r\n".
             "\tb=";
         $toSign = $this->DKIM_HeaderC(
-            $from_header . "\r\n" .
-            $to_header . "\r\n" .
-            $date_header . "\r\n" .
-            $subject_header . "\r\n" .
+            $from_header."\r\n".
+            $to_header."\r\n".
+            $date_header."\r\n".
+            $subject_header."\r\n".
             $dkimhdrs
         );
         $signed = $this->DKIM_Sign($toSign);
 
-        return static::normalizeBreaks($dkimhdrs . $signed) . static::$LE;
+        return static::normalizeBreaks($dkimhdrs.$signed).static::$LE;
     }
 
     /**
@@ -4321,7 +4320,7 @@ 
      */
     public static function hasLineLongerThanMax($str)
     {
-        return (bool) preg_match('/^(.{' . (self::MAX_LINE_LENGTH + strlen(static::$LE)) . ',})/m', $str);
+        return (bool) preg_match('/^(.{'.(self::MAX_LINE_LENGTH + strlen(static::$LE)).',})/m', $str);
     }
 
     /**

Braces +3 added lines, -2 removed lines

@@ -2059,7 +2059,8 @@ 
      */
     public function addrFormat($addr)
     {
-        if (empty($addr[1])) { // No name provided
+        if (empty($addr[1])) {
+// No name provided
             return $this->secureHeader($addr[0]);
         }
 
@@ -3425,7 +3426,7 @@ 
     {
         $this->RecipientsQueue = array_filter(
             $this->RecipientsQueue,
-            function ($params) use ($kind) {
+            function ($params) use ($kind){
                 return $params[0] != $kind;
             }
         );

manager/includes/controls/phpmailer/POP3.php

Doc Comments +1 added lines, -1 removed lines

@@ -209,7 +209,7 @@
      * Connect to a POP3 server.
      *
      * @param string   $host
-     * @param int|bool $port
+     * @param integer $port
      * @param int      $tval
      *
      * @return bool

Spacing +4 added lines, -4 removed lines

@@ -149,7 +149,7 @@ 
         $username = '',
         $password = '',
         $debug_level = 0
-    ) {
+    ){
         $pop = new self();
 
         return $pop->authorise($host, $port, $timeout, $username, $password, $debug_level);
@@ -288,11 +288,11 @@ 
         }
 
         // Send the Username
-        $this->sendString("USER $username" . static::LE);
+        $this->sendString("USER $username".static::LE);
         $pop3_response = $this->getResponse();
         if ($this->checkResponse($pop3_response)) {
             // Send the Password
-            $this->sendString("PASS $password" . static::LE);
+            $this->sendString("PASS $password".static::LE);
             $pop3_response = $this->getResponse();
             if ($this->checkResponse($pop3_response)) {
                 return true;
@@ -412,7 +412,7 @@ 
     protected function catchWarning($errno, $errstr, $errfile, $errline)
     {
         $this->setError(
-            'Connecting to the POP3 server raised a PHP warning:' .
+            'Connecting to the POP3 server raised a PHP warning:'.
             "errno: $errno errstr: $errstr; errfile: $errfile; errline: $errline"
         );
     }

Braces +2 added lines, -1 removed lines

@@ -344,7 +344,8 @@
     protected function sendString($string)
     {
         if ($this->pop_conn) {
-            if ($this->do_debug >= 2) { //Show client messages when debug >= 2
+            if ($this->do_debug >= 2) {
+//Show client messages when debug >= 2
                 echo 'Client -> Server: ', $string;
             }
 

Upper-Lower-Casing +2 added lines, -2 removed lines

@@ -288,11 +288,11 @@
         }
 
         // Send the Username
-        $this->sendString("USER $username" . static::LE);
+        $this->sendString("user $username" . static::LE);
         $pop3_response = $this->getResponse();
         if ($this->checkResponse($pop3_response)) {
             // Send the Password
-            $this->sendString("PASS $password" . static::LE);
+            $this->sendString("pass $password" . static::LE);
             $pop3_response = $this->getResponse();
             if ($this->checkResponse($pop3_response)) {
                 return true;

manager/includes/controls/phpmailer/SMTP.php

Doc Comments +1 added lines, -1 removed lines

@@ -1314,7 +1314,7 @@
      * If no reply has been received yet, it will return null.
      * If no pattern was matched, it will return false.
      *
-     * @return bool|null|string
+     * @return string
      *
      * @see recordLastTransactionID()
      */

Spacing +31 added lines, -31 removed lines

@@ -307,7 +307,7 @@ 
         }
         // Connect to the SMTP server
         $this->edebug(
-            "Connection: opening to $host:$port, timeout=$timeout, options=" .
+            "Connection: opening to $host:$port, timeout=$timeout, options=".
             (count($options) > 0 ? var_export($options, true) : 'array()'),
             self::DEBUG_CONNECTION
         );
@@ -317,7 +317,7 @@ 
             $socket_context = stream_context_create($options);
             set_error_handler([$this, 'errorHandler']);
             $this->smtp_conn = stream_socket_client(
-                $host . ':' . $port,
+                $host.':'.$port,
                 $errno,
                 $errstr,
                 $timeout,
@@ -350,7 +350,7 @@ 
                 (string) $errstr
             );
             $this->edebug(
-                'SMTP ERROR: ' . $this->error['error']
+                'SMTP ERROR: '.$this->error['error']
                 . ": $errstr ($errno)",
                 self::DEBUG_CLIENT
             );
@@ -370,7 +370,7 @@ 
         }
         // Get any announcement
         $announce = $this->get_lines();
-        $this->edebug('SERVER -> CLIENT: ' . $announce, self::DEBUG_SERVER);
+        $this->edebug('SERVER -> CLIENT: '.$announce, self::DEBUG_SERVER);
 
         return true;
     }
@@ -426,7 +426,7 @@ 
         $password,
         $authtype = null,
         $OAuth = null
-    ) {
+    ){
         if (!$this->server_caps) {
             $this->setError('Authentication is not allowed before HELO/EHLO');
 
@@ -443,15 +443,15 @@ 
                 return false;
             }
 
-            $this->edebug('Auth method requested: ' . ($authtype ? $authtype : 'UNKNOWN'), self::DEBUG_LOWLEVEL);
+            $this->edebug('Auth method requested: '.($authtype ? $authtype : 'UNKNOWN'), self::DEBUG_LOWLEVEL);
             $this->edebug(
-                'Auth methods available on the server: ' . implode(',', $this->server_caps['AUTH']),
+                'Auth methods available on the server: '.implode(',', $this->server_caps['AUTH']),
                 self::DEBUG_LOWLEVEL
             );
 
             //If we have requested a specific auth type, check the server supports it before trying others
             if (!in_array($authtype, $this->server_caps['AUTH'])) {
-                $this->edebug('Requested auth method not available: ' . $authtype, self::DEBUG_LOWLEVEL);
+                $this->edebug('Requested auth method not available: '.$authtype, self::DEBUG_LOWLEVEL);
                 $authtype = null;
             }
 
@@ -469,7 +469,7 @@ 
 
                     return false;
                 }
-                self::edebug('Auth method selected: ' . $authtype, self::DEBUG_LOWLEVEL);
+                self::edebug('Auth method selected: '.$authtype, self::DEBUG_LOWLEVEL);
             }
 
             if (!in_array($authtype, $this->server_caps['AUTH'])) {
@@ -489,7 +489,7 @@ 
                 // Send encoded username and password
                 if (!$this->sendCommand(
                     'User & Password',
-                    base64_encode("\0" . $username . "\0" . $password),
+                    base64_encode("\0".$username."\0".$password),
                     235
                 )
                 ) {
@@ -517,7 +517,7 @@ 
                 $challenge = base64_decode(substr($this->last_reply, 4));
 
                 // Build the response
-                $response = $username . ' ' . $this->hmac($challenge, $password);
+                $response = $username.' '.$this->hmac($challenge, $password);
 
                 // send encoded credentials
                 return $this->sendCommand('Username', base64_encode($response), 235);
@@ -529,7 +529,7 @@ 
                 $oauth = $OAuth->getOauth64();
 
                 // Start authentication
-                if (!$this->sendCommand('AUTH', 'AUTH XOAUTH2 ' . $oauth, 235)) {
+                if (!$this->sendCommand('AUTH', 'AUTH XOAUTH2 '.$oauth, 235)) {
                     return false;
                 }
                 break;
@@ -576,7 +576,7 @@ 
         $k_ipad = $key ^ $ipad;
         $k_opad = $key ^ $opad;
 
-        return md5($k_opad . pack('H*', md5($k_ipad . $data)));
+        return md5($k_opad.pack('H*', md5($k_ipad.$data)));
     }
 
     /**
@@ -691,7 +691,7 @@ 
                 }
                 //If processing headers add a LWSP-char to the front of new line RFC822 section 3.1.1
                 if ($in_headers) {
-                    $line = "\t" . $line;
+                    $line = "\t".$line;
                 }
             }
             $lines_out[] = $line;
@@ -700,9 +700,9 @@ 
             foreach ($lines_out as $line_out) {
                 //RFC2821 section 4.5.2
                 if (!empty($line_out) and $line_out[0] == '.') {
-                    $line_out = '.' . $line_out;
+                    $line_out = '.'.$line_out;
                 }
-                $this->client_send($line_out . static::LE, 'DATA');
+                $this->client_send($line_out.static::LE, 'DATA');
             }
         }
 
@@ -748,7 +748,7 @@ 
      */
     protected function sendHello($hello, $host)
     {
-        $noerror = $this->sendCommand($hello, $hello . ' ' . $host, 250);
+        $noerror = $this->sendCommand($hello, $hello.' '.$host, 250);
         $this->helo_rply = $this->last_reply;
         if ($noerror) {
             $this->parseHelloFields($hello);
@@ -819,7 +819,7 @@ 
 
         return $this->sendCommand(
             'MAIL FROM',
-            'MAIL FROM:<' . $from . '>' . $useVerp,
+            'MAIL FROM:<'.$from.'>'.$useVerp,
             250
         );
     }
@@ -859,7 +859,7 @@ 
     {
         return $this->sendCommand(
             'RCPT TO',
-            'RCPT TO:<' . $address . '>',
+            'RCPT TO:<'.$address.'>',
             [250, 251]
         );
     }
@@ -898,7 +898,7 @@ 
 
             return false;
         }
-        $this->client_send($commandstring . static::LE, $command);
+        $this->client_send($commandstring.static::LE, $command);
 
         $this->last_reply = $this->get_lines();
         // Fetch SMTP code and possible error code explanation
@@ -908,8 +908,8 @@ 
             $code_ex = (count($matches) > 2 ? $matches[2] : null);
             // Cut off error code from each response line
             $detail = preg_replace(
-                "/{$code}[ -]" .
-                ($code_ex ? str_replace('.', '\\.', $code_ex) . ' ' : '') . '/m',
+                "/{$code}[ -]".
+                ($code_ex ? str_replace('.', '\\.', $code_ex).' ' : '').'/m',
                 '',
                 $this->last_reply
             );
@@ -920,7 +920,7 @@ 
             $detail = substr($this->last_reply, 4);
         }
 
-        $this->edebug('SERVER -> CLIENT: ' . $this->last_reply, self::DEBUG_SERVER);
+        $this->edebug('SERVER -> CLIENT: '.$this->last_reply, self::DEBUG_SERVER);
 
         if (!in_array($code, (array) $expect)) {
             $this->setError(
@@ -930,7 +930,7 @@ 
                 $code_ex
             );
             $this->edebug(
-                'SMTP ERROR: ' . $this->error['error'] . ': ' . $this->last_reply,
+                'SMTP ERROR: '.$this->error['error'].': '.$this->last_reply,
                 self::DEBUG_CLIENT
             );
 
@@ -996,7 +996,7 @@ 
     public function turn()
     {
         $this->setError('The SMTP TURN command is not implemented');
-        $this->edebug('SMTP NOTICE: ' . $this->error['error'], self::DEBUG_CLIENT);
+        $this->edebug('SMTP NOTICE: '.$this->error['error'], self::DEBUG_CLIENT);
 
         return false;
     }
@@ -1017,7 +1017,7 @@ 
             in_array($command, ['User & Password', 'Username', 'Password'], true)) {
             $this->edebug('CLIENT -> SERVER: <credentials hidden>', self::DEBUG_CLIENT);
         } else {
-            $this->edebug('CLIENT -> SERVER: ' . $data, self::DEBUG_CLIENT);
+            $this->edebug('CLIENT -> SERVER: '.$data, self::DEBUG_CLIENT);
         }
         set_error_handler([$this, 'errorHandler']);
         $result = fwrite($this->smtp_conn, $data);
@@ -1123,14 +1123,14 @@ 
             //Must pass vars in here as params are by reference
             if (!stream_select($selR, $selW, $selW, $this->Timelimit)) {
                 $this->edebug(
-                    'SMTP -> get_lines(): timed-out (' . $this->Timeout . ' sec)',
+                    'SMTP -> get_lines(): timed-out ('.$this->Timeout.' sec)',
                     self::DEBUG_LOWLEVEL
                 );
                 break;
             }
             //Deliberate noise suppression - errors are handled afterwards
             $str = @fgets($this->smtp_conn, 515);
-            $this->edebug('SMTP INBOUND: "' . trim($str) . '"', self::DEBUG_LOWLEVEL);
+            $this->edebug('SMTP INBOUND: "'.trim($str).'"', self::DEBUG_LOWLEVEL);
             $data .= $str;
             // If response is only 3 chars (not valid, but RFC5321 S4.2 says it must be handled),
             // or 4th character is a space, we are done reading, break the loop,
@@ -1142,7 +1142,7 @@ 
             $info = stream_get_meta_data($this->smtp_conn);
             if ($info['timed_out']) {
                 $this->edebug(
-                    'SMTP -> get_lines(): timed-out (' . $this->Timeout . ' sec)',
+                    'SMTP -> get_lines(): timed-out ('.$this->Timeout.' sec)',
                     self::DEBUG_LOWLEVEL
                 );
                 break;
@@ -1150,8 +1150,8 @@ 
             // Now check if reads took too long
             if ($endtime and time() > $endtime) {
                 $this->edebug(
-                    'SMTP -> get_lines(): timelimit reached (' .
-                    $this->Timelimit . ' sec)',
+                    'SMTP -> get_lines(): timelimit reached ('.
+                    $this->Timelimit.' sec)',
                     self::DEBUG_LOWLEVEL
                 );
                 break;

Upper-Lower-Casing +2 added lines, -2 removed lines

@@ -888,7 +888,7 @@ 
     protected function sendCommand($command, $commandstring, $expect)
     {
         if (!$this->connected()) {
-            $this->setError("Called $command without being connected");
+            $this->setError("called $command without being connected");
 
             return false;
         }
@@ -970,7 +970,7 @@ 
      */
     public function verify($name)
     {
-        return $this->sendCommand('VRFY', "VRFY $name", [250, 251]);
+        return $this->sendCommand('VRFY', "vrfy $name", [250, 251]);
     }
 
     /**

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

Doc Comments +9 added lines

@@ -666,6 +666,9 @@ 
             return json_encode(array('version' => false));
     }
 
+    /**
+     * @param string $dir
+     */
     protected function moveUploadFile($file, $dir) {
         $message = $this->checkUploadedFile($file);
 
@@ -697,6 +700,9 @@ 
         return "/" . basename($target);
     }
 
+    /**
+     * @param string $file
+     */
     protected function sendDefaultThumb($file=null) {
         if ($file !== null) {
             $ext = file::getExtension($file);
@@ -873,6 +879,9 @@ 
         return "";
     }
 
+    /**
+     * @param string $message
+     */
     protected function errorMsg($message, array $data=null) {
         if (in_array($this->action, array("thumb", "upload", "download", "downloadDir")))
             die($this->label($message, $data));

Indentation +58 added lines, -58 removed lines

@@ -1,16 +1,16 @@ 
 <?php
 
 /** This file is part of KCFinder project
-  *
-  *      @desc Browser actions class
-  *   @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 Browser actions class
+ *   @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
+ */
 
 class browser extends uploader {
     protected $action;
@@ -709,54 +709,54 @@ 
         die;
     }
 
-	protected function getFiles($dir) {
-		$thumbDir = "{$this->config['uploadDir']}/{$this->config['thumbsDir']}/$dir";
-		$dir = "{$this->config['uploadDir']}/$dir";
-		$return = array();
-		$files = dir::content($dir, array('types' => "file"));
-		if ($files === false)
-			return $return;
-
-		foreach ($files as $file) {
-			$ext = file::getExtension($file);
-			$smallThumb = false;
-			if (in_array(strtolower($ext), array('png', 'jpg', 'gif', 'jpeg' )) ) {
-				$size = @getimagesize($file);
-				if (is_array($size) && count($size)) {
-					$thumb_file = "$thumbDir/" . basename($file);
-					if (!is_file($thumb_file) || filemtime($file) > filemtime($thumb_file))
-						$this->makeThumb($file);
-					$smallThumb =
-						($size[0] <= $this->config['thumbWidth']) &&
-						($size[1] <= $this->config['thumbHeight']) &&
-						in_array($size[2], array(IMAGETYPE_GIF, IMAGETYPE_PNG, IMAGETYPE_JPEG));
-				}
-			}
-			$stat = stat($file);
-			if ($stat === false) continue;
-			$name = basename($file);
-			$types = $this->config['types'];
-			$types = explode(' ',$types['images'].' '.$types['image']);
-			if (substr($name,0,1) == '.' && !$this->config['showHiddenFiles']) continue;
-			if ($this->type == 'images' && !in_array(strtolower($ext),$types)) continue;
-			$bigIcon = file_exists("themes/{$this->config['theme']}/img/files/big/$ext.png");
-			$smallIcon = file_exists("themes/{$this->config['theme']}/img/files/small/$ext.png");
-			$thumb = file_exists("$thumbDir/$name");
-			$return[] = array(
-				'name' => stripcslashes($name),
-				'size' => $stat['size'],
-				'mtime' => $stat['mtime'],
-				'date' => @strftime($this->dateTimeSmall, $stat['mtime']),
-				'readable' => is_readable($file),
-				'writable' => file::isWritable($file),
-				'bigIcon' => $bigIcon,
-				'smallIcon' => $smallIcon,
-				'thumb' => $thumb,
-				'smallThumb' => $smallThumb
-			);
-		}
-		return $return;
-	}
+    protected function getFiles($dir) {
+        $thumbDir = "{$this->config['uploadDir']}/{$this->config['thumbsDir']}/$dir";
+        $dir = "{$this->config['uploadDir']}/$dir";
+        $return = array();
+        $files = dir::content($dir, array('types' => "file"));
+        if ($files === false)
+            return $return;
+
+        foreach ($files as $file) {
+            $ext = file::getExtension($file);
+            $smallThumb = false;
+            if (in_array(strtolower($ext), array('png', 'jpg', 'gif', 'jpeg' )) ) {
+                $size = @getimagesize($file);
+                if (is_array($size) && count($size)) {
+                    $thumb_file = "$thumbDir/" . basename($file);
+                    if (!is_file($thumb_file) || filemtime($file) > filemtime($thumb_file))
+                        $this->makeThumb($file);
+                    $smallThumb =
+                        ($size[0] <= $this->config['thumbWidth']) &&
+                        ($size[1] <= $this->config['thumbHeight']) &&
+                        in_array($size[2], array(IMAGETYPE_GIF, IMAGETYPE_PNG, IMAGETYPE_JPEG));
+                }
+            }
+            $stat = stat($file);
+            if ($stat === false) continue;
+            $name = basename($file);
+            $types = $this->config['types'];
+            $types = explode(' ',$types['images'].' '.$types['image']);
+            if (substr($name,0,1) == '.' && !$this->config['showHiddenFiles']) continue;
+            if ($this->type == 'images' && !in_array(strtolower($ext),$types)) continue;
+            $bigIcon = file_exists("themes/{$this->config['theme']}/img/files/big/$ext.png");
+            $smallIcon = file_exists("themes/{$this->config['theme']}/img/files/small/$ext.png");
+            $thumb = file_exists("$thumbDir/$name");
+            $return[] = array(
+                'name' => stripcslashes($name),
+                'size' => $stat['size'],
+                'mtime' => $stat['mtime'],
+                'date' => @strftime($this->dateTimeSmall, $stat['mtime']),
+                'readable' => is_readable($file),
+                'writable' => file::isWritable($file),
+                'bigIcon' => $bigIcon,
+                'smallIcon' => $smallIcon,
+                'thumb' => $thumb,
+                'smallThumb' => $smallThumb
+            );
+        }
+        return $return;
+    }
 
     protected function getTree($dir, $index=0) {
         $path = explode("/", $dir);

Spacing +88 added lines, -88 removed lines

@@ -12,12 +12,12 @@ 
   *      @link http://kcfinder.sunhater.com
   */
 
-class browser extends uploader {
+class browser extends uploader{
     protected $action;
     protected $thumbsDir;
     protected $thumbsTypeDir;
 
-    public function __construct($modx) {
+    public function __construct($modx){
         parent::__construct($modx);
 
         if (isset($this->post['dir'])) {
@@ -32,7 +32,7 @@ 
             $this->get['dir'] = $dir;
         }
 
-        $thumbsDir = $this->config['uploadDir'] . "/" . $this->config['thumbsDir'];
+        $thumbsDir = $this->config['uploadDir']."/".$this->config['thumbsDir'];
         if ((
                 !is_dir($thumbsDir) &&
                 !@mkdir($thumbsDir, $this->config['dirPerms'])
@@ -70,9 +70,9 @@ 
             $this->config['theme'] = $this->get['theme'];
     }
 
-    public function action() {
+    public function action(){
         $act = isset($this->get['act']) ? $this->get['act'] : "browser";
-        if(!preg_match('@^[0-9a-zA-Z_]+$@', $act)) $this->errorMsg("Unknown error.");
+        if (!preg_match('@^[0-9a-zA-Z_]+$@', $act)) $this->errorMsg("Unknown error.");
         if (!method_exists($this, "act_$act"))
             $act = "browser";
         $this->action = $act;
@@ -94,7 +94,7 @@ 
             $this->session['dir'] = $this->type;
         else {
             $type = $this->getTypeFromPath($this->session['dir']);
-            $dir = $this->config['uploadDir'] . "/" . $this->session['dir'];
+            $dir = $this->config['uploadDir']."/".$this->session['dir'];
             if (($type != $this->type) || !is_dir($dir) || !is_readable($dir))
                 $this->session['dir'] = $this->type;
         }
@@ -115,7 +115,7 @@ 
             : $return;
     }
 
-    protected function act_browser() {
+    protected function act_browser(){
         if (isset($this->get['dir']) &&
             is_dir("{$this->typeDir}/{$this->get['dir']}") &&
             is_readable("{$this->typeDir}/{$this->get['dir']}")
@@ -125,7 +125,7 @@ 
         return $this->output();
     }
 
-    protected function act_init() {
+    protected function act_init(){
         $tree = $this->getDirInfo($this->typeDir);
         $tree['dirs'] = $this->getTree($this->session['dir']);
         if (!is_array($tree['dirs']) || !count($tree['dirs']))
@@ -140,7 +140,7 @@ 
         return json_encode($data);
     }
 
-    protected function act_thumb() {
+    protected function act_thumb(){
         $this->getDir($this->get['dir'], true);
         if (!isset($this->get['file']) || !isset($this->get['dir']))
             $this->sendDefaultThumb();
@@ -149,7 +149,7 @@ 
             $this->sendDefaultThumb();
         $file = "{$this->thumbsDir}/{$this->type}/{$this->get['dir']}/$file";
         if (!is_file($file) || !is_readable($file)) {
-            $file = "{$this->config['uploadDir']}/{$this->type}/{$this->get['dir']}/" . basename($file);
+            $file = "{$this->config['uploadDir']}/{$this->type}/{$this->get['dir']}/".basename($file);
             if (!is_file($file) || !is_readable($file))
                 $this->sendDefaultThumb($file);
             $image = image::factory($this->imageDriver, $file);
@@ -171,13 +171,13 @@ 
         httpCache::file($file, "image/jpeg");
     }
 
-    protected function act_expand() {
+    protected function act_expand(){
         return json_encode(array('dirs' => $this->getDirs($this->postDir())));
     }
 
-    protected function act_chDir() {
+    protected function act_chDir(){
         $this->postDir(); // Just for existing check
-        $this->session['dir'] = $this->type . "/" . $this->post['dir'];
+        $this->session['dir'] = $this->type."/".$this->post['dir'];
         $dirWritable = dir::isWritable("{$this->config['uploadDir']}/{$this->session['dir']}");
         return json_encode(array(
             'files' => $this->getFiles($this->session['dir']),
@@ -185,7 +185,7 @@ 
         ));
     }
 
-    protected function act_newDir() {
+    protected function act_newDir(){
         if (!$this->config['access']['dirs']['create'] ||
             !isset($this->post['dir']) ||
             !isset($this->post['newDir'])
@@ -207,7 +207,7 @@ 
         return true;
     }
 
-    protected function act_renameDir() {
+    protected function act_renameDir(){
         if (!$this->config['access']['dirs']['rename'] ||
             !isset($this->post['dir']) ||
             !isset($this->post['newName'])
@@ -222,15 +222,15 @@ 
             $this->errorMsg("Unallowable characters in folder name.");
         if (substr($newName, 0, 1) == ".")
             $this->errorMsg("Folder name shouldn't begins with '.'");
-        if (!@rename($dir, dirname($dir) . "/$newName"))
+        if (!@rename($dir, dirname($dir)."/$newName"))
             $this->errorMsg("Cannot rename the folder.");
         $thumbDir = "$this->thumbsTypeDir/{$this->post['dir']}";
         if (is_dir($thumbDir))
-            @rename($thumbDir, dirname($thumbDir) . "/$newName");
+            @rename($thumbDir, dirname($thumbDir)."/$newName");
         return json_encode(array('name' => $newName));
     }
 
-    protected function act_deleteDir() {
+    protected function act_deleteDir(){
         if (!$this->config['access']['dirs']['delete'] ||
             !isset($this->post['dir']) ||
             !strlen(trim($this->post['dir']))
@@ -250,7 +250,7 @@ 
         return true;
     }
 
-    protected function act_upload() {
+    protected function act_upload(){
         if (!$this->config['access']['files']['upload'] ||
             !isset($this->post['dir'])
         )
@@ -275,11 +275,11 @@ 
             return $this->moveUploadFile($this->file, $dir);
     }
 
-    protected function act_download() {
+    protected function act_download(){
         $dir = $this->postDir();
         if (!isset($this->post['dir']) ||
             !isset($this->post['file']) ||
-            strpos($this->post['file'],'../')!==false ||
+            strpos($this->post['file'], '../') !== false ||
             (false === ($file = "$dir/{$this->post['file']}")) ||
             !file_exists($file) || !is_readable($file)
         )
@@ -290,19 +290,19 @@ 
         header("Cache-Control: must-revalidate, post-check=0, pre-check=0");
         header("Cache-Control: private", false);
         header("Content-Type: application/octet-stream");
-        header('Content-Disposition: attachment; filename="' . str_replace('"', "_", $this->post['file']) . '"');
+        header('Content-Disposition: attachment; filename="'.str_replace('"', "_", $this->post['file']).'"');
         header("Content-Transfer-Encoding:­ binary");
-        header("Content-Length: " . filesize($file));
+        header("Content-Length: ".filesize($file));
         readfile($file);
         die;
     }
 
-    protected function act_rename() {
+    protected function act_rename(){
         $dir = $this->postDir();
         if (!$this->config['access']['files']['rename'] ||
             !isset($this->post['dir']) ||
             !isset($this->post['file']) ||
-            strpos($this->post['file'],'../')!==false ||
+            strpos($this->post['file'], '../') !== false ||
             !isset($this->post['newName']) ||
             (false === ($file = "$dir/{$this->post['file']}")) ||
             !file_exists($file) || !is_readable($file) || !file::isWritable($file)
@@ -337,16 +337,16 @@ 
         $thumbFile = "$thumbDir/{$this->post['file']}";
 
         if (file_exists($thumbFile))
-            @rename($thumbFile, "$thumbDir/" . basename($newName));
+            @rename($thumbFile, "$thumbDir/".basename($newName));
         return true;
     }
 
-    protected function act_delete() {
+    protected function act_delete(){
         $dir = $this->postDir();
         if (!$this->config['access']['files']['delete'] ||
             !isset($this->post['dir']) ||
             !isset($this->post['file']) ||
-            strpos($this->post['file'],'../')!==false ||
+            strpos($this->post['file'], '../') !== false ||
             (false === ($file = "$dir/{$this->post['file']}")) ||
             !file_exists($file) || !is_readable($file) || !file::isWritable($file) ||
             !@unlink($file)
@@ -358,7 +358,7 @@ 
         return true;
     }
 
-    protected function act_cp_cbd() {
+    protected function act_cp_cbd(){
         $dir = $this->postDir();
         if (!$this->config['access']['files']['copy'] ||
             !isset($this->post['dir']) ||
@@ -369,7 +369,7 @@ 
             $this->errorMsg("Unknown error.");
 
         $error = array();
-        foreach($this->post['files'] as $file) {
+        foreach ($this->post['files'] as $file) {
             $file = path::normalize($file);
             if (substr($file, 0, 1) == ".") continue;
             $type = explode("/", $file);
@@ -382,11 +382,11 @@ 
             if (!file_exists($path))
                 $error[] = $this->label("The file '{file}' does not exist.", $replace);
             elseif (substr($base, 0, 1) == ".")
-                $error[] = "$base: " . $this->label("File name shouldn't begins with '.'");
+                $error[] = "$base: ".$this->label("File name shouldn't begins with '.'");
             elseif (!$this->validateExtension($ext, $type))
-                $error[] = "$base: " . $this->label("Denied file extension.");
+                $error[] = "$base: ".$this->label("Denied file extension.");
             elseif (file_exists("$dir/$base"))
-                $error[] = "$base: " . $this->label("A file or folder with that name already exists.");
+                $error[] = "$base: ".$this->label("A file or folder with that name already exists.");
             elseif (!is_readable($path) || !is_file($path))
                 $error[] = $this->label("Cannot read '{file}'.", $replace);
             elseif (!@copy($path, "$dir/$base"))
@@ -409,7 +409,7 @@ 
         return true;
     }
 
-    protected function act_mv_cbd() {
+    protected function act_mv_cbd(){
         $dir = $this->postDir();
         if (!$this->config['access']['files']['move'] ||
             !isset($this->post['dir']) ||
@@ -420,7 +420,7 @@ 
             $this->errorMsg("Unknown error.");
 
         $error = array();
-        foreach($this->post['files'] as $file) {
+        foreach ($this->post['files'] as $file) {
             $file = path::normalize($file);
             if (substr($file, 0, 1) == ".") continue;
             $type = explode("/", $file);
@@ -433,11 +433,11 @@ 
             if (!file_exists($path))
                 $error[] = $this->label("The file '{file}' does not exist.", $replace);
             elseif (substr($base, 0, 1) == ".")
-                $error[] = "$base: " . $this->label("File name shouldn't begins with '.'");
+                $error[] = "$base: ".$this->label("File name shouldn't begins with '.'");
             elseif (!$this->validateExtension($ext, $type))
-                $error[] = "$base: " . $this->label("Denied file extension.");
+                $error[] = "$base: ".$this->label("Denied file extension.");
             elseif (file_exists("$dir/$base"))
-                $error[] = "$base: " . $this->label("A file or folder with that name already exists.");
+                $error[] = "$base: ".$this->label("A file or folder with that name already exists.");
             elseif (!is_readable($path) || !is_file($path))
                 $error[] = $this->label("Cannot read '{file}'.", $replace);
             elseif (!file::isWritable($path) || !@rename($path, "$dir/$base"))
@@ -460,7 +460,7 @@ 
         return true;
     }
 
-    protected function act_rm_cbd() {
+    protected function act_rm_cbd(){
         if (!$this->config['access']['files']['delete'] ||
             !isset($this->post['files']) ||
             !is_array($this->post['files']) ||
@@ -469,7 +469,7 @@ 
             $this->errorMsg("Unknown error.");
 
         $error = array();
-        foreach($this->post['files'] as $file) {
+        foreach ($this->post['files'] as $file) {
             $file = path::normalize($file);
             if (substr($file, 0, 1) == ".") continue;
             $type = explode("/", $file);
@@ -492,25 +492,25 @@ 
         return true;
     }
 
-    protected function act_downloadDir() {
+    protected function act_downloadDir(){
         $dir = $this->postDir();
         if (!isset($this->post['dir']) || $this->config['denyZipDownload'])
             $this->errorMsg("Unknown error.");
-        $filename = basename($dir) . ".zip";
+        $filename = basename($dir).".zip";
         do {
-            $file = md5(time() . session_id());
+            $file = md5(time().session_id());
             $file = "{$this->config['uploadDir']}/$file.zip";
         } while (file_exists($file));
         new zipFolder($file, $dir);
         header("Content-Type: application/x-zip");
-        header('Content-Disposition: attachment; filename="' . str_replace('"', "_", $filename) . '"');
-        header("Content-Length: " . filesize($file));
+        header('Content-Disposition: attachment; filename="'.str_replace('"', "_", $filename).'"');
+        header("Content-Length: ".filesize($file));
         readfile($file);
         unlink($file);
         die;
     }
 
-    protected function act_downloadSelected() {
+    protected function act_downloadSelected(){
         $dir = $this->postDir();
         if (!isset($this->post['dir']) ||
             !isset($this->post['files']) ||
@@ -531,7 +531,7 @@ 
         }
 
         do {
-            $file = md5(time() . session_id());
+            $file = md5(time().session_id());
             $file = "{$this->config['uploadDir']}/$file.zip";
         } while (file_exists($file));
 
@@ -543,14 +543,14 @@ 
             $zip->close();
         }
         header("Content-Type: application/x-zip");
-        header('Content-Disposition: attachment; filename="selected_files_' . basename($file) . '"');
-        header("Content-Length: " . filesize($file));
+        header('Content-Disposition: attachment; filename="selected_files_'.basename($file).'"');
+        header("Content-Length: ".filesize($file));
         readfile($file);
         unlink($file);
         die;
     }
 
-    protected function act_downloadClipboard() {
+    protected function act_downloadClipboard(){
         if (!isset($this->post['files']) ||
             !is_array($this->post['files']) ||
             $this->config['denyZipDownload']
@@ -566,14 +566,14 @@ 
             $type = $type[0];
             if ($type != $this->type)
                 continue;
-            $file = $this->config['uploadDir'] . "/$file";
+            $file = $this->config['uploadDir']."/$file";
             if (!is_file($file) || !is_readable($file))
                 continue;
             $zipFiles[] = $file;
         }
 
         do {
-            $file = md5(time() . session_id());
+            $file = md5(time().session_id());
             $file = "{$this->config['uploadDir']}/$file.zip";
         } while (file_exists($file));
 
@@ -585,14 +585,14 @@ 
             $zip->close();
         }
         header("Content-Type: application/x-zip");
-        header('Content-Disposition: attachment; filename="clipboard_' . basename($file) . '"');
-        header("Content-Length: " . filesize($file));
+        header('Content-Disposition: attachment; filename="clipboard_'.basename($file).'"');
+        header("Content-Length: ".filesize($file));
         readfile($file);
         unlink($file);
         die;
     }
 
-    protected function act_check4Update() {
+    protected function act_check4Update(){
         if ($this->config['denyUpdateCheck'])
             return json_encode(array('version' => false));
 
@@ -632,24 +632,24 @@ 
         // Curl extension
         ) {} elseif (
             function_exists("curl_init") &&
-            (false !== (   $curl = @curl_init($url)                                    )) &&
-            (              @ob_start()                 ||  (@curl_close($curl) && false)) &&
-            (              @curl_exec($curl)           ||  (@curl_close($curl) && false)) &&
-            ((false !== (  $ver = @ob_get_clean()   )) ||  (@curl_close($curl) && false)) &&
-            (              @curl_close($curl)          ||  true                         ) &&
+            (false !== ($curl = @curl_init($url))) &&
+            (@ob_start() || (@curl_close($curl) && false)) &&
+            (@curl_exec($curl) || (@curl_close($curl) && false)) &&
+            ((false !== ($ver = @ob_get_clean())) || (@curl_close($curl) && false)) &&
+            (@curl_close($curl) || true) &&
             preg_match($pattern, $ver)
 
         // Socket extension
         ) {} elseif (function_exists('socket_create')) {
             $cmd =
-                "GET $path " . strtoupper($protocol) . "/1.1\r\n" .
-                "Host: $host\r\n" .
+                "GET $path ".strtoupper($protocol)."/1.1\r\n".
+                "Host: $host\r\n".
                 "Connection: Close\r\n\r\n";
 
-            if ((false !== (  $socket = @socket_create(AF_INET, SOCK_STREAM, SOL_TCP)  )) &&
-                (false !==    @socket_connect($socket, $host, $port)                    ) &&
-                (false !==    @socket_write($socket, $cmd, strlen($cmd))                ) &&
-                (false !== (  $ver = @socket_read($socket, 2048)                       )) &&
+            if ((false !== ($socket = @socket_create(AF_INET, SOCK_STREAM, SOL_TCP))) &&
+                (false !== @socket_connect($socket, $host, $port)) &&
+                (false !== @socket_write($socket, $cmd, strlen($cmd))) &&
+                (false !== ($ver = @socket_read($socket, 2048))) &&
                 preg_match($responsePattern, $ver, $match)
             )
                 $ver = $match[2];
@@ -666,7 +666,7 @@ 
             return json_encode(array('version' => false));
     }
 
-    protected function moveUploadFile($file, $dir) {
+    protected function moveUploadFile($file, $dir){
         $message = $this->checkUploadedFile($file);
 
         if ($message !== true) {
@@ -676,28 +676,28 @@ 
         }
 
         $filename = $this->normalizeFilename($file['name']);
-        $target = "$dir/" . file::getInexistantFilename($filename, $dir);
+        $target = "$dir/".file::getInexistantFilename($filename, $dir);
 
         if (!@move_uploaded_file($file['tmp_name'], $target) &&
             !@rename($file['tmp_name'], $target) &&
             !@copy($file['tmp_name'], $target)
         ) {
             @unlink($file['tmp_name']);
-            return "{$file['name']}: " . $this->label("Cannot move uploaded file to target folder.");
+            return "{$file['name']}: ".$this->label("Cannot move uploaded file to target folder.");
         } elseif (function_exists('chmod'))
             chmod($target, $this->config['filePerms']);
         
-        $this->modx->invokeEvent('OnFileBrowserUpload',array(
+        $this->modx->invokeEvent('OnFileBrowserUpload', array(
             'filepath'=>realpath($dir),
-            'filename'=>str_replace("/","",str_replace($dir,"",realpath($target)))
+            'filename'=>str_replace("/", "", str_replace($dir, "", realpath($target)))
         ));
         
         $this->makeThumb($target);
         
-        return "/" . basename($target);
+        return "/".basename($target);
     }
 
-    protected function sendDefaultThumb($file=null) {
+    protected function sendDefaultThumb($file = null){
         if ($file !== null) {
             $ext = file::getExtension($file);
             $thumb = "themes/{$this->config['theme']}/img/files/big/$ext.png";
@@ -709,7 +709,7 @@ 
         die;
     }
 
-	protected function getFiles($dir) {
+	protected function getFiles($dir){
 		$thumbDir = "{$this->config['uploadDir']}/{$this->config['thumbsDir']}/$dir";
 		$dir = "{$this->config['uploadDir']}/$dir";
 		$return = array();
@@ -720,10 +720,10 @@ 
 		foreach ($files as $file) {
 			$ext = file::getExtension($file);
 			$smallThumb = false;
-			if (in_array(strtolower($ext), array('png', 'jpg', 'gif', 'jpeg' )) ) {
+			if (in_array(strtolower($ext), array('png', 'jpg', 'gif', 'jpeg'))) {
 				$size = @getimagesize($file);
 				if (is_array($size) && count($size)) {
-					$thumb_file = "$thumbDir/" . basename($file);
+					$thumb_file = "$thumbDir/".basename($file);
 					if (!is_file($thumb_file) || filemtime($file) > filemtime($thumb_file))
 						$this->makeThumb($file);
 					$smallThumb =
@@ -736,9 +736,9 @@ 
 			if ($stat === false) continue;
 			$name = basename($file);
 			$types = $this->config['types'];
-			$types = explode(' ',$types['images'].' '.$types['image']);
-			if (substr($name,0,1) == '.' && !$this->config['showHiddenFiles']) continue;
-			if ($this->type == 'images' && !in_array(strtolower($ext),$types)) continue;
+			$types = explode(' ', $types['images'].' '.$types['image']);
+			if (substr($name, 0, 1) == '.' && !$this->config['showHiddenFiles']) continue;
+			if ($this->type == 'images' && !in_array(strtolower($ext), $types)) continue;
 			$bigIcon = file_exists("themes/{$this->config['theme']}/img/files/big/$ext.png");
 			$smallIcon = file_exists("themes/{$this->config['theme']}/img/files/small/$ext.png");
 			$thumb = file_exists("$thumbDir/$name");
@@ -758,7 +758,7 @@ 
 		return $return;
 	}
 
-    protected function getTree($dir, $index=0) {
+    protected function getTree($dir, $index = 0){
         $path = explode("/", $dir);
 
         $pdir = "";
@@ -793,25 +793,25 @@ 
         return $dirs;
     }
 
-    protected function postDir($existent=true) {
+    protected function postDir($existent = true){
         $dir = $this->typeDir;
         if (isset($this->post['dir']))
-            $dir .= "/" . $this->post['dir'];
+            $dir .= "/".$this->post['dir'];
         if ($existent && (!is_dir($dir) || !is_readable($dir)))
             $this->errorMsg("Inexistant or inaccessible folder.");
         return $dir;
     }
 
-    protected function getDir($existent=true) {
+    protected function getDir($existent = true){
         $dir = $this->typeDir;
         if (isset($this->get['dir']))
-            $dir .= "/" . $this->get['dir'];
+            $dir .= "/".$this->get['dir'];
         if ($existent && (!is_dir($dir) || !is_readable($dir)))
             $this->errorMsg("Inexistant or inaccessible folder.");
         return $dir;
     }
 
-    protected function getDirs($dir) {
+    protected function getDirs($dir){
         $dirs = dir::content($dir, array('types' => "dir"));
         $return = array();
         if (is_array($dirs)) {
@@ -826,7 +826,7 @@ 
         return $return;
     }
 
-    protected function getDirInfo($dir, $removable=false) {
+    protected function getDirInfo($dir, $removable = false){
         if ((substr(basename($dir), 0, 1) == ".") || !is_dir($dir) || !is_readable($dir))
             return false;
         $dirs = dir::content($dir, array('types' => "dir"));
@@ -853,7 +853,7 @@ 
         return $info;
     }
 
-    protected function output($data=null, $template=null) {
+    protected function output($data = null, $template = null){
         if (!is_array($data)) $data = array();
         if ($template === null)
             $template = $this->action;
@@ -873,7 +873,7 @@ 
         return "";
     }
 
-    protected function errorMsg($message, array $data=null) {
+    protected function errorMsg($message, array $data = null){
         if (in_array($this->action, array("thumb", "upload", "download", "downloadDir")))
             die($this->label($message, $data));
         if (($this->action === null) || ($this->action == "browser"))

Braces +413 added lines, -261 removed lines

@@ -12,23 +12,29 @@ 
   *      @link http://kcfinder.sunhater.com
   */
 
-class browser extends uploader {
+class browser extends uploader
+{
     protected $action;
     protected $thumbsDir;
     protected $thumbsTypeDir;
 
-    public function __construct($modx) {
+    public function __construct($modx)
+    {
         parent::__construct($modx);
 
         if (isset($this->post['dir'])) {
             $dir = $this->checkInputDir($this->post['dir'], true, false);
-            if ($dir === false) unset($this->post['dir']);
+            if ($dir === false) {
+                unset($this->post['dir']);
+            }
             $this->post['dir'] = $dir;
         }
 
         if (isset($this->get['dir'])) {
             $dir = $this->checkInputDir($this->get['dir'], true, false);
-            if ($dir === false) unset($this->get['dir']);
+            if ($dir === false) {
+                unset($this->get['dir']);
+            }
             $this->get['dir'] = $dir;
         }
 
@@ -44,8 +50,9 @@ 
                 !is_dir("$thumbsDir/{$this->type}") &&
                 !@mkdir("$thumbsDir/{$this->type}", $this->config['dirPerms'])
             )
-        )
-            $this->errorMsg("Cannot access or create thumbnails folder.");
+        ) {
+                    $this->errorMsg("Cannot access or create thumbnails folder.");
+        }
 
         $this->thumbsDir = $thumbsDir;
         $this->thumbsTypeDir = "$thumbsDir/{$this->type}";
@@ -58,23 +65,29 @@ 
 
         if (is_array($files) && count($files)) {
             $time = time();
-            foreach ($files as $file)
-                if (is_file($file) && ($time - filemtime($file) > 3600))
+            foreach ($files as $file) {
+                            if (is_file($file) && ($time - filemtime($file) > 3600))
                     unlink($file);
+            }
         }
 
         if (isset($this->get['theme']) &&
             ($this->get['theme'] == basename($this->get['theme'])) &&
             is_dir("themes/{$this->get['theme']}")
-        )
-            $this->config['theme'] = $this->get['theme'];
+        ) {
+                    $this->config['theme'] = $this->get['theme'];
+        }
     }
 
-    public function action() {
+    public function action()
+    {
         $act = isset($this->get['act']) ? $this->get['act'] : "browser";
-        if(!preg_match('@^[0-9a-zA-Z_]+$@', $act)) $this->errorMsg("Unknown error.");
-        if (!method_exists($this, "act_$act"))
-            $act = "browser";
+        if(!preg_match('@^[0-9a-zA-Z_]+$@', $act)) {
+            $this->errorMsg("Unknown error.");
+        }
+        if (!method_exists($this, "act_$act")) {
+                    $act = "browser";
+        }
         $this->action = $act;
         $method = "act_$act";
 
@@ -82,21 +95,22 @@ 
             $message = $this->label("You don't have permissions to browse server.");
             if (in_array($act, array("browser", "upload")) ||
                 (substr($act, 0, 8) == "download")
-            )
-                $this->backMsg($message);
-            else {
+            ) {
+                            $this->backMsg($message);
+            } else {
                 header("Content-Type: text/plain; charset={$this->charset}");
                 die(json_encode(array('error' => $message)));
             }
         }
 
-        if (!isset($this->session['dir']))
-            $this->session['dir'] = $this->type;
-        else {
+        if (!isset($this->session['dir'])) {
+                    $this->session['dir'] = $this->type;
+        } else {
             $type = $this->getTypeFromPath($this->session['dir']);
             $dir = $this->config['uploadDir'] . "/" . $this->session['dir'];
-            if (($type != $this->type) || !is_dir($dir) || !is_readable($dir))
-                $this->session['dir'] = $this->type;
+            if (($type != $this->type) || !is_dir($dir) || !is_readable($dir)) {
+                            $this->session['dir'] = $this->type;
+            }
         }
         $this->session['dir'] = path::normalize($this->session['dir']);
 
@@ -106,8 +120,9 @@ 
         } elseif (
             (substr($act, 0, 8) != "download") &&
             !in_array($act, array("thumb", "upload"))
-        )
-            header("Content-Type: text/plain; charset={$this->charset}");
+        ) {
+                    header("Content-Type: text/plain; charset={$this->charset}");
+        }
 
         $return = $this->$method();
         echo ($return === true)
@@ -115,21 +130,25 @@ 
             : $return;
     }
 
-    protected function act_browser() {
+    protected function act_browser()
+    {
         if (isset($this->get['dir']) &&
             is_dir("{$this->typeDir}/{$this->get['dir']}") &&
             is_readable("{$this->typeDir}/{$this->get['dir']}")
-        )
-            $this->session['dir'] = path::normalize("{$this->type}/{$this->get['dir']}");
+        ) {
+                    $this->session['dir'] = path::normalize("{$this->type}/{$this->get['dir']}");
+        }
 
         return $this->output();
     }
 
-    protected function act_init() {
+    protected function act_init()
+    {
         $tree = $this->getDirInfo($this->typeDir);
         $tree['dirs'] = $this->getTree($this->session['dir']);
-        if (!is_array($tree['dirs']) || !count($tree['dirs']))
-            unset($tree['dirs']);
+        if (!is_array($tree['dirs']) || !count($tree['dirs'])) {
+                    unset($tree['dirs']);
+        }
         $files = $this->getFiles($this->session['dir']);
         $dirWritable = dir::isWritable("{$this->config['uploadDir']}/{$this->session['dir']}");
         $data = array(
@@ -140,21 +159,26 @@ 
         return json_encode($data);
     }
 
-    protected function act_thumb() {
+    protected function act_thumb()
+    {
         $this->getDir($this->get['dir'], true);
-        if (!isset($this->get['file']) || !isset($this->get['dir']))
-            $this->sendDefaultThumb();
+        if (!isset($this->get['file']) || !isset($this->get['dir'])) {
+                    $this->sendDefaultThumb();
+        }
         $file = $this->get['file'];
-        if (basename($file) != $file)
-            $this->sendDefaultThumb();
+        if (basename($file) != $file) {
+                    $this->sendDefaultThumb();
+        }
         $file = "{$this->thumbsDir}/{$this->type}/{$this->get['dir']}/$file";
         if (!is_file($file) || !is_readable($file)) {
             $file = "{$this->config['uploadDir']}/{$this->type}/{$this->get['dir']}/" . basename($file);
-            if (!is_file($file) || !is_readable($file))
-                $this->sendDefaultThumb($file);
+            if (!is_file($file) || !is_readable($file)) {
+                            $this->sendDefaultThumb($file);
+            }
             $image = image::factory($this->imageDriver, $file);
-            if ($image->initError)
-                $this->sendDefaultThumb($file);
+            if ($image->initError) {
+                            $this->sendDefaultThumb($file);
+            }
             list($tmp, $tmp, $type) = getimagesize($file);
             if (in_array($type, array(IMAGETYPE_GIF, IMAGETYPE_JPEG, IMAGETYPE_PNG)) &&
                 ($image->width <= $this->config['thumbWidth']) &&
@@ -165,17 +189,20 @@ 
                     ($type == IMAGETYPE_PNG) ? "png" : "jpeg");
                 $mime = "image/$mime";
                 httpCache::file($file, $mime);
-            } else
-                $this->sendDefaultThumb($file);
+            } else {
+                            $this->sendDefaultThumb($file);
+            }
         }
         httpCache::file($file, "image/jpeg");
     }
 
-    protected function act_expand() {
+    protected function act_expand()
+    {
         return json_encode(array('dirs' => $this->getDirs($this->postDir())));
     }
 
-    protected function act_chDir() {
+    protected function act_chDir()
+    {
         $this->postDir(); // Just for existing check
         $this->session['dir'] = $this->type . "/" . $this->post['dir'];
         $dirWritable = dir::isWritable("{$this->config['uploadDir']}/{$this->session['dir']}");
@@ -185,81 +212,104 @@ 
         ));
     }
 
-    protected function act_newDir() {
+    protected function act_newDir()
+    {
         if (!$this->config['access']['dirs']['create'] ||
             !isset($this->post['dir']) ||
             !isset($this->post['newDir'])
-        )
-            $this->errorMsg("Unknown error.");
+        ) {
+                    $this->errorMsg("Unknown error.");
+        }
 
         $dir = $this->postDir();
         $newDir = $this->normalizeDirname(trim($this->post['newDir']));
-        if (!strlen($newDir))
-            $this->errorMsg("Please enter new folder name.");
-        if (preg_match('/[\/\\\\]/s', $newDir))
-            $this->errorMsg("Unallowable characters in folder name.");
-        if (substr($newDir, 0, 1) == ".")
-            $this->errorMsg("Folder name shouldn't begins with '.'");
-        if (file_exists("$dir/$newDir"))
-            $this->errorMsg("A file or folder with that name already exists.");
-        if (!@mkdir("$dir/$newDir", $this->config['dirPerms']))
-            $this->errorMsg("Cannot create {dir} folder.", array('dir' => $newDir));
+        if (!strlen($newDir)) {
+                    $this->errorMsg("Please enter new folder name.");
+        }
+        if (preg_match('/[\/\\\\]/s', $newDir)) {
+                    $this->errorMsg("Unallowable characters in folder name.");
+        }
+        if (substr($newDir, 0, 1) == ".") {
+                    $this->errorMsg("Folder name shouldn't begins with '.'");
+        }
+        if (file_exists("$dir/$newDir")) {
+                    $this->errorMsg("A file or folder with that name already exists.");
+        }
+        if (!@mkdir("$dir/$newDir", $this->config['dirPerms'])) {
+                    $this->errorMsg("Cannot create {dir} folder.", array('dir' => $newDir));
+        }
         return true;
     }
 
-    protected function act_renameDir() {
+    protected function act_renameDir()
+    {
         if (!$this->config['access']['dirs']['rename'] ||
             !isset($this->post['dir']) ||
             !isset($this->post['newName'])
-        )
-            $this->errorMsg("Unknown error.");
+        ) {
+                    $this->errorMsg("Unknown error.");
+        }
 
         $dir = $this->postDir();
         $newName = $this->normalizeDirname(trim($this->post['newName']));
-        if (!strlen($newName))
-            $this->errorMsg("Please enter new folder name.");
-        if (preg_match('/[\/\\\\]/s', $newName))
-            $this->errorMsg("Unallowable characters in folder name.");
-        if (substr($newName, 0, 1) == ".")
-            $this->errorMsg("Folder name shouldn't begins with '.'");
-        if (!@rename($dir, dirname($dir) . "/$newName"))
-            $this->errorMsg("Cannot rename the folder.");
+        if (!strlen($newName)) {
+                    $this->errorMsg("Please enter new folder name.");
+        }
+        if (preg_match('/[\/\\\\]/s', $newName)) {
+                    $this->errorMsg("Unallowable characters in folder name.");
+        }
+        if (substr($newName, 0, 1) == ".") {
+                    $this->errorMsg("Folder name shouldn't begins with '.'");
+        }
+        if (!@rename($dir, dirname($dir) . "/$newName")) {
+                    $this->errorMsg("Cannot rename the folder.");
+        }
         $thumbDir = "$this->thumbsTypeDir/{$this->post['dir']}";
-        if (is_dir($thumbDir))
-            @rename($thumbDir, dirname($thumbDir) . "/$newName");
+        if (is_dir($thumbDir)) {
+                    @rename($thumbDir, dirname($thumbDir) . "/$newName");
+        }
         return json_encode(array('name' => $newName));
     }
 
-    protected function act_deleteDir() {
+    protected function act_deleteDir()
+    {
         if (!$this->config['access']['dirs']['delete'] ||
             !isset($this->post['dir']) ||
             !strlen(trim($this->post['dir']))
-        )
-            $this->errorMsg("Unknown error.");
+        ) {
+                    $this->errorMsg("Unknown error.");
+        }
 
         $dir = $this->postDir();
 
-        if (!dir::isWritable($dir))
-            $this->errorMsg("Cannot delete the folder.");
+        if (!dir::isWritable($dir)) {
+                    $this->errorMsg("Cannot delete the folder.");
+        }
         $result = !dir::prune($dir, false);
-        if (is_array($result) && count($result))
-            $this->errorMsg("Failed to delete {count} files/folders.",
+        if (is_array($result) && count($result)) {
+                    $this->errorMsg("Failed to delete {count} files/folders.",
                 array('count' => count($result)));
+        }
         $thumbDir = "$this->thumbsTypeDir/{$this->post['dir']}";
-        if (is_dir($thumbDir)) dir::prune($thumbDir);
+        if (is_dir($thumbDir)) {
+            dir::prune($thumbDir);
+        }
         return true;
     }
 
-    protected function act_upload() {
+    protected function act_upload()
+    {
         if (!$this->config['access']['files']['upload'] ||
             !isset($this->post['dir'])
-        )
-            $this->errorMsg("Unknown error.");
+        ) {
+                    $this->errorMsg("Unknown error.");
+        }
 
         $dir = $this->postDir();
 
-        if (!dir::isWritable($dir))
-            $this->errorMsg("Cannot access or write to upload folder.");
+        if (!dir::isWritable($dir)) {
+                    $this->errorMsg("Cannot access or write to upload folder.");
+        }
 
         if (is_array($this->file['name'])) {
             $return = array();
@@ -271,19 +321,22 @@ 
                 ), $dir);
             }
             return implode("\n", $return);
-        } else
-            return $this->moveUploadFile($this->file, $dir);
+        } else {
+                    return $this->moveUploadFile($this->file, $dir);
+        }
     }
 
-    protected function act_download() {
+    protected function act_download()
+    {
         $dir = $this->postDir();
         if (!isset($this->post['dir']) ||
             !isset($this->post['file']) ||
             strpos($this->post['file'],'../')!==false ||
             (false === ($file = "$dir/{$this->post['file']}")) ||
             !file_exists($file) || !is_readable($file)
-        )
-            $this->errorMsg("Unknown error.");
+        ) {
+                    $this->errorMsg("Unknown error.");
+        }
 
         header("Pragma: public");
         header("Expires: 0");
@@ -297,7 +350,8 @@ 
         die;
     }
 
-    protected function act_rename() {
+    protected function act_rename()
+    {
         $dir = $this->postDir();
         if (!$this->config['access']['files']['rename'] ||
             !isset($this->post['dir']) ||
@@ -306,42 +360,52 @@ 
             !isset($this->post['newName']) ||
             (false === ($file = "$dir/{$this->post['file']}")) ||
             !file_exists($file) || !is_readable($file) || !file::isWritable($file)
-        )
-            $this->errorMsg("Unknown error.");
+        ) {
+                    $this->errorMsg("Unknown error.");
+        }
 
         if (isset($this->config['denyExtensionRename']) &&
             $this->config['denyExtensionRename'] &&
             (file::getExtension($this->post['file'], true) !==
                 file::getExtension($this->post['newName'], true)
             )
-        )
-            $this->errorMsg("You cannot rename the extension of files!");
+        ) {
+                    $this->errorMsg("You cannot rename the extension of files!");
+        }
 
         $newName = $this->normalizeFilename(trim($this->post['newName']));
-        if (!strlen($newName))
-            $this->errorMsg("Please enter new file name.");
-        if (preg_match('/[\/\\\\]/s', $newName))
-            $this->errorMsg("Unallowable characters in file name.");
-        if (substr($newName, 0, 1) == ".")
-            $this->errorMsg("File name shouldn't begins with '.'");
+        if (!strlen($newName)) {
+                    $this->errorMsg("Please enter new file name.");
+        }
+        if (preg_match('/[\/\\\\]/s', $newName)) {
+                    $this->errorMsg("Unallowable characters in file name.");
+        }
+        if (substr($newName, 0, 1) == ".") {
+                    $this->errorMsg("File name shouldn't begins with '.'");
+        }
         $newName = "$dir/$newName";
-        if (file_exists($newName))
-            $this->errorMsg("A file or folder with that name already exists.");
+        if (file_exists($newName)) {
+                    $this->errorMsg("A file or folder with that name already exists.");
+        }
         $ext = file::getExtension($newName);
-        if (!$this->validateExtension($ext, $this->type))
-            $this->errorMsg("Denied file extension.");
-        if (!@rename($file, $newName))
-            $this->errorMsg("Unknown error.");
+        if (!$this->validateExtension($ext, $this->type)) {
+                    $this->errorMsg("Denied file extension.");
+        }
+        if (!@rename($file, $newName)) {
+                    $this->errorMsg("Unknown error.");
+        }
 
         $thumbDir = "{$this->thumbsTypeDir}/{$this->post['dir']}";
         $thumbFile = "$thumbDir/{$this->post['file']}";
 
-        if (file_exists($thumbFile))
-            @rename($thumbFile, "$thumbDir/" . basename($newName));
+        if (file_exists($thumbFile)) {
+                    @rename($thumbFile, "$thumbDir/" . basename($newName));
+        }
         return true;
     }
 
-    protected function act_delete() {
+    protected function act_delete()
+    {
         $dir = $this->postDir();
         if (!$this->config['access']['files']['delete'] ||
             !isset($this->post['dir']) ||
@@ -350,152 +414,184 @@ 
             (false === ($file = "$dir/{$this->post['file']}")) ||
             !file_exists($file) || !is_readable($file) || !file::isWritable($file) ||
             !@unlink($file)
-        )
-            $this->errorMsg("Unknown error.");
+        ) {
+                    $this->errorMsg("Unknown error.");
+        }
 
         $thumb = "{$this->thumbsTypeDir}/{$this->post['dir']}/{$this->post['file']}";
-        if (file_exists($thumb)) @unlink($thumb);
+        if (file_exists($thumb)) {
+            @unlink($thumb);
+        }
         return true;
     }
 
-    protected function act_cp_cbd() {
+    protected function act_cp_cbd()
+    {
         $dir = $this->postDir();
         if (!$this->config['access']['files']['copy'] ||
             !isset($this->post['dir']) ||
             !is_dir($dir) || !is_readable($dir) || !dir::isWritable($dir) ||
             !isset($this->post['files']) || !is_array($this->post['files']) ||
             !count($this->post['files'])
-        )
-            $this->errorMsg("Unknown error.");
+        ) {
+                    $this->errorMsg("Unknown error.");
+        }
 
         $error = array();
         foreach($this->post['files'] as $file) {
             $file = path::normalize($file);
-            if (substr($file, 0, 1) == ".") continue;
+            if (substr($file, 0, 1) == ".") {
+                continue;
+            }
             $type = explode("/", $file);
             $type = $type[0];
-            if ($type != $this->type) continue;
+            if ($type != $this->type) {
+                continue;
+            }
             $path = "{$this->config['uploadDir']}/$file";
             $base = basename($file);
             $replace = array('file' => $base);
             $ext = file::getExtension($base);
-            if (!file_exists($path))
-                $error[] = $this->label("The file '{file}' does not exist.", $replace);
-            elseif (substr($base, 0, 1) == ".")
-                $error[] = "$base: " . $this->label("File name shouldn't begins with '.'");
-            elseif (!$this->validateExtension($ext, $type))
-                $error[] = "$base: " . $this->label("Denied file extension.");
-            elseif (file_exists("$dir/$base"))
-                $error[] = "$base: " . $this->label("A file or folder with that name already exists.");
-            elseif (!is_readable($path) || !is_file($path))
-                $error[] = $this->label("Cannot read '{file}'.", $replace);
-            elseif (!@copy($path, "$dir/$base"))
-                $error[] = $this->label("Cannot copy '{file}'.", $replace);
-            else {
-                if (function_exists("chmod"))
-                    @chmod("$dir/$base", $this->config['filePerms']);
+            if (!file_exists($path)) {
+                            $error[] = $this->label("The file '{file}' does not exist.", $replace);
+            } elseif (substr($base, 0, 1) == ".") {
+                            $error[] = "$base: " . $this->label("File name shouldn't begins with '.'");
+            } elseif (!$this->validateExtension($ext, $type)) {
+                            $error[] = "$base: " . $this->label("Denied file extension.");
+            } elseif (file_exists("$dir/$base")) {
+                            $error[] = "$base: " . $this->label("A file or folder with that name already exists.");
+            } elseif (!is_readable($path) || !is_file($path)) {
+                            $error[] = $this->label("Cannot read '{file}'.", $replace);
+            } elseif (!@copy($path, "$dir/$base")) {
+                            $error[] = $this->label("Cannot copy '{file}'.", $replace);
+            } else {
+                if (function_exists("chmod")) {
+                                    @chmod("$dir/$base", $this->config['filePerms']);
+                }
                 $fromThumb = "{$this->thumbsDir}/$file";
                 if (is_file($fromThumb) && is_readable($fromThumb)) {
                     $toThumb = "{$this->thumbsTypeDir}/{$this->post['dir']}";
-                    if (!is_dir($toThumb))
-                        @mkdir($toThumb, $this->config['dirPerms'], true);
+                    if (!is_dir($toThumb)) {
+                                            @mkdir($toThumb, $this->config['dirPerms'], true);
+                    }
                     $toThumb .= "/$base";
                     @copy($fromThumb, $toThumb);
                 }
             }
         }
-        if (count($error))
-            return json_encode(array('error' => $error));
+        if (count($error)) {
+                    return json_encode(array('error' => $error));
+        }
         return true;
     }
 
-    protected function act_mv_cbd() {
+    protected function act_mv_cbd()
+    {
         $dir = $this->postDir();
         if (!$this->config['access']['files']['move'] ||
             !isset($this->post['dir']) ||
             !is_dir($dir) || !is_readable($dir) || !dir::isWritable($dir) ||
             !isset($this->post['files']) || !is_array($this->post['files']) ||
             !count($this->post['files'])
-        )
-            $this->errorMsg("Unknown error.");
+        ) {
+                    $this->errorMsg("Unknown error.");
+        }
 
         $error = array();
         foreach($this->post['files'] as $file) {
             $file = path::normalize($file);
-            if (substr($file, 0, 1) == ".") continue;
+            if (substr($file, 0, 1) == ".") {
+                continue;
+            }
             $type = explode("/", $file);
             $type = $type[0];
-            if ($type != $this->type) continue;
+            if ($type != $this->type) {
+                continue;
+            }
             $path = "{$this->config['uploadDir']}/$file";
             $base = basename($file);
             $replace = array('file' => $base);
             $ext = file::getExtension($base);
-            if (!file_exists($path))
-                $error[] = $this->label("The file '{file}' does not exist.", $replace);
-            elseif (substr($base, 0, 1) == ".")
-                $error[] = "$base: " . $this->label("File name shouldn't begins with '.'");
-            elseif (!$this->validateExtension($ext, $type))
-                $error[] = "$base: " . $this->label("Denied file extension.");
-            elseif (file_exists("$dir/$base"))
-                $error[] = "$base: " . $this->label("A file or folder with that name already exists.");
-            elseif (!is_readable($path) || !is_file($path))
-                $error[] = $this->label("Cannot read '{file}'.", $replace);
-            elseif (!file::isWritable($path) || !@rename($path, "$dir/$base"))
-                $error[] = $this->label("Cannot move '{file}'.", $replace);
-            else {
-                if (function_exists("chmod"))
-                    @chmod("$dir/$base", $this->config['filePerms']);
+            if (!file_exists($path)) {
+                            $error[] = $this->label("The file '{file}' does not exist.", $replace);
+            } elseif (substr($base, 0, 1) == ".") {
+                            $error[] = "$base: " . $this->label("File name shouldn't begins with '.'");
+            } elseif (!$this->validateExtension($ext, $type)) {
+                            $error[] = "$base: " . $this->label("Denied file extension.");
+            } elseif (file_exists("$dir/$base")) {
+                            $error[] = "$base: " . $this->label("A file or folder with that name already exists.");
+            } elseif (!is_readable($path) || !is_file($path)) {
+                            $error[] = $this->label("Cannot read '{file}'.", $replace);
+            } elseif (!file::isWritable($path) || !@rename($path, "$dir/$base")) {
+                            $error[] = $this->label("Cannot move '{file}'.", $replace);
+            } else {
+                if (function_exists("chmod")) {
+                                    @chmod("$dir/$base", $this->config['filePerms']);
+                }
                 $fromThumb = "{$this->thumbsDir}/$file";
                 if (is_file($fromThumb) && is_readable($fromThumb)) {
                     $toThumb = "{$this->thumbsTypeDir}/{$this->post['dir']}";
-                    if (!is_dir($toThumb))
-                        @mkdir($toThumb, $this->config['dirPerms'], true);
+                    if (!is_dir($toThumb)) {
+                                            @mkdir($toThumb, $this->config['dirPerms'], true);
+                    }
                     $toThumb .= "/$base";
                     @rename($fromThumb, $toThumb);
                 }
             }
         }
-        if (count($error))
-            return json_encode(array('error' => $error));
+        if (count($error)) {
+                    return json_encode(array('error' => $error));
+        }
         return true;
     }
 
-    protected function act_rm_cbd() {
+    protected function act_rm_cbd()
+    {
         if (!$this->config['access']['files']['delete'] ||
             !isset($this->post['files']) ||
             !is_array($this->post['files']) ||
             !count($this->post['files'])
-        )
-            $this->errorMsg("Unknown error.");
+        ) {
+                    $this->errorMsg("Unknown error.");
+        }
 
         $error = array();
         foreach($this->post['files'] as $file) {
             $file = path::normalize($file);
-            if (substr($file, 0, 1) == ".") continue;
+            if (substr($file, 0, 1) == ".") {
+                continue;
+            }
             $type = explode("/", $file);
             $type = $type[0];
-            if ($type != $this->type) continue;
+            if ($type != $this->type) {
+                continue;
+            }
             $path = "{$this->config['uploadDir']}/$file";
             $base = basename($file);
             $replace = array('file' => $base);
-            if (!is_file($path))
-                $error[] = $this->label("The file '{file}' does not exist.", $replace);
-            elseif (!@unlink($path))
-                $error[] = $this->label("Cannot delete '{file}'.", $replace);
-            else {
+            if (!is_file($path)) {
+                            $error[] = $this->label("The file '{file}' does not exist.", $replace);
+            } elseif (!@unlink($path)) {
+                            $error[] = $this->label("Cannot delete '{file}'.", $replace);
+            } else {
                 $thumb = "{$this->thumbsDir}/$file";
-                if (is_file($thumb)) @unlink($thumb);
+                if (is_file($thumb)) {
+                    @unlink($thumb);
+                }
             }
         }
-        if (count($error))
-            return json_encode(array('error' => $error));
+        if (count($error)) {
+                    return json_encode(array('error' => $error));
+        }
         return true;
     }
 
-    protected function act_downloadDir() {
+    protected function act_downloadDir()
+    {
         $dir = $this->postDir();
-        if (!isset($this->post['dir']) || $this->config['denyZipDownload'])
-            $this->errorMsg("Unknown error.");
+        if (!isset($this->post['dir']) || $this->config['denyZipDownload']) {
+                    $this->errorMsg("Unknown error.");
+        }
         $filename = basename($dir) . ".zip";
         do {
             $file = md5(time() . session_id());
@@ -510,23 +606,27 @@ 
         die;
     }
 
-    protected function act_downloadSelected() {
+    protected function act_downloadSelected()
+    {
         $dir = $this->postDir();
         if (!isset($this->post['dir']) ||
             !isset($this->post['files']) ||
             !is_array($this->post['files']) ||
             $this->config['denyZipDownload']
-        )
-            $this->errorMsg("Unknown error.");
+        ) {
+                    $this->errorMsg("Unknown error.");
+        }
 
         $zipFiles = array();
         foreach ($this->post['files'] as $file) {
             $file = path::normalize($file);
-            if ((substr($file, 0, 1) == ".") || (strpos($file, '/') !== false))
-                continue;
+            if ((substr($file, 0, 1) == ".") || (strpos($file, '/') !== false)) {
+                            continue;
+            }
             $file = "$dir/$file";
-            if (!is_file($file) || !is_readable($file))
-                continue;
+            if (!is_file($file) || !is_readable($file)) {
+                            continue;
+            }
             $zipFiles[] = $file;
         }
 
@@ -538,8 +638,9 @@ 
         $zip = new ZipArchive();
         $res = $zip->open($file, ZipArchive::CREATE);
         if ($res === TRUE) {
-            foreach ($zipFiles as $cfile)
-                $zip->addFile($cfile, basename($cfile));
+            foreach ($zipFiles as $cfile) {
+                            $zip->addFile($cfile, basename($cfile));
+            }
             $zip->close();
         }
         header("Content-Type: application/x-zip");
@@ -550,25 +651,30 @@ 
         die;
     }
 
-    protected function act_downloadClipboard() {
+    protected function act_downloadClipboard()
+    {
         if (!isset($this->post['files']) ||
             !is_array($this->post['files']) ||
             $this->config['denyZipDownload']
-        )
-            $this->errorMsg("Unknown error.");
+        ) {
+                    $this->errorMsg("Unknown error.");
+        }
 
         $zipFiles = array();
         foreach ($this->post['files'] as $file) {
             $file = path::normalize($file);
-            if ((substr($file, 0, 1) == "."))
-                continue;
+            if ((substr($file, 0, 1) == ".")) {
+                            continue;
+            }
             $type = explode("/", $file);
             $type = $type[0];
-            if ($type != $this->type)
-                continue;
+            if ($type != $this->type) {
+                            continue;
+            }
             $file = $this->config['uploadDir'] . "/$file";
-            if (!is_file($file) || !is_readable($file))
-                continue;
+            if (!is_file($file) || !is_readable($file)) {
+                            continue;
+            }
             $zipFiles[] = $file;
         }
 
@@ -580,8 +686,9 @@ 
         $zip = new ZipArchive();
         $res = $zip->open($file, ZipArchive::CREATE);
         if ($res === TRUE) {
-            foreach ($zipFiles as $cfile)
-                $zip->addFile($cfile, basename($cfile));
+            foreach ($zipFiles as $cfile) {
+                            $zip->addFile($cfile, basename($cfile));
+            }
             $zip->close();
         }
         header("Content-Type: application/x-zip");
@@ -592,16 +699,19 @@ 
         die;
     }
 
-    protected function act_check4Update() {
-        if ($this->config['denyUpdateCheck'])
-            return json_encode(array('version' => false));
+    protected function act_check4Update()
+    {
+        if ($this->config['denyUpdateCheck']) {
+                    return json_encode(array('version' => false));
+        }
 
         // Caching HTTP request for 6 hours
         if (isset($this->session['checkVersion']) &&
             isset($this->session['checkVersionTime']) &&
             ((time() - $this->session['checkVersionTime']) < 21600)
-        )
-            return json_encode(array('version' => $this->session['checkVersion']));
+        ) {
+                    return json_encode(array('version' => $this->session['checkVersion']));
+        }
 
         $protocol = "http";
         $host = "kcfinder.sunhater.com";
@@ -651,27 +761,32 @@ 
                 (false !==    @socket_write($socket, $cmd, strlen($cmd))                ) &&
                 (false !== (  $ver = @socket_read($socket, 2048)                       )) &&
                 preg_match($responsePattern, $ver, $match)
-            )
-                $ver = $match[2];
+            ) {
+                            $ver = $match[2];
+            }
 
-            if (isset($socket) && is_resource($socket))
-                @socket_close($socket);
+            if (isset($socket) && is_resource($socket)) {
+                            @socket_close($socket);
+            }
         }
 
         if (isset($ver) && preg_match($pattern, $ver)) {
             $this->session['checkVersion'] = $ver;
             $this->session['checkVersionTime'] = time();
             return json_encode(array('version' => $ver));
-        } else
-            return json_encode(array('version' => false));
+        } else {
+                    return json_encode(array('version' => false));
+        }
     }
 
-    protected function moveUploadFile($file, $dir) {
+    protected function moveUploadFile($file, $dir)
+    {
         $message = $this->checkUploadedFile($file);
 
         if ($message !== true) {
-            if (isset($file['tmp_name']))
-                @unlink($file['tmp_name']);
+            if (isset($file['tmp_name'])) {
+                            @unlink($file['tmp_name']);
+            }
             return "{$file['name']}: $message";
         }
 
@@ -684,8 +799,9 @@ 
         ) {
             @unlink($file['tmp_name']);
             return "{$file['name']}: " . $this->label("Cannot move uploaded file to target folder.");
-        } elseif (function_exists('chmod'))
-            chmod($target, $this->config['filePerms']);
+        } elseif (function_exists('chmod')) {
+                    chmod($target, $this->config['filePerms']);
+        }
         
         $this->modx->invokeEvent('OnFileBrowserUpload',array(
             'filepath'=>realpath($dir),
@@ -697,25 +813,29 @@ 
         return "/" . basename($target);
     }
 
-    protected function sendDefaultThumb($file=null) {
+    protected function sendDefaultThumb($file=null)
+    {
         if ($file !== null) {
             $ext = file::getExtension($file);
             $thumb = "themes/{$this->config['theme']}/img/files/big/$ext.png";
         }
-        if (!isset($thumb) || !file_exists($thumb))
-            $thumb = "themes/{$this->config['theme']}/img/files/big/..png";
+        if (!isset($thumb) || !file_exists($thumb)) {
+                    $thumb = "themes/{$this->config['theme']}/img/files/big/..png";
+        }
         header("Content-Type: image/png");
         readfile($thumb);
         die;
     }
 
-	protected function getFiles($dir) {
+	protected function getFiles($dir)
+	{
 		$thumbDir = "{$this->config['uploadDir']}/{$this->config['thumbsDir']}/$dir";
 		$dir = "{$this->config['uploadDir']}/$dir";
 		$return = array();
 		$files = dir::content($dir, array('types' => "file"));
-		if ($files === false)
-			return $return;
+		if ($files === false) {
+					return $return;
+		}
 
 		foreach ($files as $file) {
 			$ext = file::getExtension($file);
@@ -724,8 +844,9 @@ 
 				$size = @getimagesize($file);
 				if (is_array($size) && count($size)) {
 					$thumb_file = "$thumbDir/" . basename($file);
-					if (!is_file($thumb_file) || filemtime($file) > filemtime($thumb_file))
-						$this->makeThumb($file);
+					if (!is_file($thumb_file) || filemtime($file) > filemtime($thumb_file)) {
+											$this->makeThumb($file);
+					}
 					$smallThumb =
 						($size[0] <= $this->config['thumbWidth']) &&
 						($size[1] <= $this->config['thumbHeight']) &&
@@ -733,12 +854,18 @@ 
 				}
 			}
 			$stat = stat($file);
-			if ($stat === false) continue;
+			if ($stat === false) {
+			    continue;
+			}
 			$name = basename($file);
 			$types = $this->config['types'];
 			$types = explode(' ',$types['images'].' '.$types['image']);
-			if (substr($name,0,1) == '.' && !$this->config['showHiddenFiles']) continue;
-			if ($this->type == 'images' && !in_array(strtolower($ext),$types)) continue;
+			if (substr($name,0,1) == '.' && !$this->config['showHiddenFiles']) {
+			    continue;
+			}
+			if ($this->type == 'images' && !in_array(strtolower($ext),$types)) {
+			    continue;
+			}
 			$bigIcon = file_exists("themes/{$this->config['theme']}/img/files/big/$ext.png");
 			$smallIcon = file_exists("themes/{$this->config['theme']}/img/files/small/$ext.png");
 			$thumb = file_exists("$thumbDir/$name");
@@ -758,14 +885,17 @@ 
 		return $return;
 	}
 
-    protected function getTree($dir, $index=0) {
+    protected function getTree($dir, $index=0)
+    {
         $path = explode("/", $dir);
 
         $pdir = "";
-        for ($i = 0; ($i <= $index && $i < count($path)); $i++)
-            $pdir .= "/{$path[$i]}";
-        if (strlen($pdir))
-            $pdir = substr($pdir, 1);
+        for ($i = 0; ($i <= $index && $i < count($path)); $i++) {
+                    $pdir .= "/{$path[$i]}";
+        }
+        if (strlen($pdir)) {
+                    $pdir = substr($pdir, 1);
+        }
 
         $fdir = "{$this->config['uploadDir']}/$pdir";
 
@@ -787,38 +917,48 @@ 
                     }
                 }
             }
-        } else
-            return false;
+        } else {
+                    return false;
+        }
 
         return $dirs;
     }
 
-    protected function postDir($existent=true) {
+    protected function postDir($existent=true)
+    {
         $dir = $this->typeDir;
-        if (isset($this->post['dir']))
-            $dir .= "/" . $this->post['dir'];
-        if ($existent && (!is_dir($dir) || !is_readable($dir)))
-            $this->errorMsg("Inexistant or inaccessible folder.");
+        if (isset($this->post['dir'])) {
+                    $dir .= "/" . $this->post['dir'];
+        }
+        if ($existent && (!is_dir($dir) || !is_readable($dir))) {
+                    $this->errorMsg("Inexistant or inaccessible folder.");
+        }
         return $dir;
     }
 
-    protected function getDir($existent=true) {
+    protected function getDir($existent=true)
+    {
         $dir = $this->typeDir;
-        if (isset($this->get['dir']))
-            $dir .= "/" . $this->get['dir'];
-        if ($existent && (!is_dir($dir) || !is_readable($dir)))
-            $this->errorMsg("Inexistant or inaccessible folder.");
+        if (isset($this->get['dir'])) {
+                    $dir .= "/" . $this->get['dir'];
+        }
+        if ($existent && (!is_dir($dir) || !is_readable($dir))) {
+                    $this->errorMsg("Inexistant or inaccessible folder.");
+        }
         return $dir;
     }
 
-    protected function getDirs($dir) {
+    protected function getDirs($dir)
+    {
         $dirs = dir::content($dir, array('types' => "dir"));
         $return = array();
         if (is_array($dirs)) {
             $writable = dir::isWritable($dir);
             foreach ($dirs as $cdir) {
                 $info = $this->getDirInfo($cdir);
-                if ($info === false) continue;
+                if ($info === false) {
+                    continue;
+                }
                 $info['removable'] = $writable && $info['writable'];
                 $return[] = $info;
             }
@@ -826,17 +966,21 @@ 
         return $return;
     }
 
-    protected function getDirInfo($dir, $removable=false) {
-        if ((substr(basename($dir), 0, 1) == ".") || !is_dir($dir) || !is_readable($dir))
-            return false;
+    protected function getDirInfo($dir, $removable=false)
+    {
+        if ((substr(basename($dir), 0, 1) == ".") || !is_dir($dir) || !is_readable($dir)) {
+                    return false;
+        }
         $dirs = dir::content($dir, array('types' => "dir"));
         if (is_array($dirs)) {
-            foreach ($dirs as $key => $cdir)
-                if (substr(basename($cdir), 0, 1) == ".")
+            foreach ($dirs as $key => $cdir) {
+                            if (substr(basename($cdir), 0, 1) == ".")
                     unset($dirs[$key]);
+            }
             $hasDirs = count($dirs) ? true : false;
-        } else
-            $hasDirs = false;
+        } else {
+                    $hasDirs = false;
+        }
 
         $writable = dir::isWritable($dir);
         $info = array(
@@ -847,24 +991,30 @@ 
             'hasDirs' => $hasDirs
         );
 
-        if ($dir == "{$this->config['uploadDir']}/{$this->session['dir']}")
-            $info['current'] = true;
+        if ($dir == "{$this->config['uploadDir']}/{$this->session['dir']}") {
+                    $info['current'] = true;
+        }
 
         return $info;
     }
 
-    protected function output($data=null, $template=null) {
-        if (!is_array($data)) $data = array();
-        if ($template === null)
-            $template = $this->action;
+    protected function output($data=null, $template=null)
+    {
+        if (!is_array($data)) {
+            $data = array();
+        }
+        if ($template === null) {
+                    $template = $this->action;
+        }
 
         if (file_exists("tpl/tpl_$template.php")) {
             ob_start();
             $eval = "unset(\$data);unset(\$template);unset(\$eval);";
             $_ = $data;
-            foreach (array_keys($data) as $key)
-                if (preg_match('/^[a-z\d_]+$/i', $key))
+            foreach (array_keys($data) as $key) {
+                            if (preg_match('/^[a-z\d_]+$/i', $key))
                     $eval .= "\$$key=\$_['$key'];";
+            }
             $eval .= "unset(\$_);require \"tpl/tpl_$template.php\";";
             eval($eval);
             return ob_get_clean();
@@ -873,12 +1023,14 @@ 
         return "";
     }
 
-    protected function errorMsg($message, array $data=null) {
-        if (in_array($this->action, array("thumb", "upload", "download", "downloadDir")))
-            die($this->label($message, $data));
-        if (($this->action === null) || ($this->action == "browser"))
-            $this->backMsg($message, $data);
-        else {
+    protected function errorMsg($message, array $data=null)
+    {
+        if (in_array($this->action, array("thumb", "upload", "download", "downloadDir"))) {
+                    die($this->label($message, $data));
+        }
+        if (($this->action === null) || ($this->action == "browser")) {
+                    $this->backMsg($message, $data);
+        } else {
             $message = $this->label($message, $data);
             die(json_encode(array('error' => $message)));
         }

Upper-Lower-Casing +3 added lines, -3 removed lines

@@ -537,7 +537,7 @@ 
 
         $zip = new ZipArchive();
         $res = $zip->open($file, ZipArchive::CREATE);
-        if ($res === TRUE) {
+        if ($res === true) {
             foreach ($zipFiles as $cfile)
                 $zip->addFile($cfile, basename($cfile));
             $zip->close();
@@ -579,7 +579,7 @@ 
 
         $zip = new ZipArchive();
         $res = $zip->open($file, ZipArchive::CREATE);
-        if ($res === TRUE) {
+        if ($res === true) {
             foreach ($zipFiles as $cfile)
                 $zip->addFile($cfile, basename($cfile));
             $zip->close();
@@ -642,7 +642,7 @@ 
         // Socket extension
         ) {} elseif (function_exists('socket_create')) {
             $cmd =
-                "GET $path " . strtoupper($protocol) . "/1.1\r\n" .
+                "get $path " . strtoupper($protocol) . "/1.1\r\n" .
                 "Host: $host\r\n" .
                 "Connection: Close\r\n\r\n";
 

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

Doc Comments +18 added lines

@@ -385,6 +385,9 @@ 
 	}
 
 
+	/**
+	 * @return string
+	 */
 	protected function normalizeFilename($filename) {
 		if ($this->getTransaliasSettings()) {
         		$format = strrchr($filename, ".");
@@ -394,6 +397,9 @@ 
         	return $filename;
 	}
 
+	/**
+	 * @param string $dirname
+	 */
 	protected function normalizeDirname($dirname) {
         return $this->modx->stripAlias($dirname);
     }
@@ -506,6 +512,9 @@ 
         return (is_dir($path) && is_readable($path)) ? $return : false;
     }
 
+    /**
+     * @param string $ext
+     */
     protected function validateExtension($ext, $type) {
         $ext = trim(strtolower($ext));
         if (!isset($this->types[$type]))
@@ -531,11 +540,17 @@ 
         return in_array($ext, $exts);
     }
 
+    /**
+     * @return string
+     */
     protected function getTypeFromPath($path) {
         return preg_match('/^([^\/]*)\/.*$/', $path, $patt)
             ? $patt[1] : $path;
     }
 
+    /**
+     * @param string $path
+     */
     protected function removeTypeFromPath($path) {
         return preg_match('/^[^\/]*\/(.*)$/', $path, $patt)
             ? $patt[1] : "";
@@ -728,6 +743,9 @@ 
         die;
     }
 
+    /**
+     * @param string $url
+     */
     protected function callBack($url, $message="") {
         $message = text::jsValue($message);
         $CKfuncNum = isset($this->opener['CKEditor']['funcNum'])

Braces +238 added lines, -149 removed lines

@@ -12,7 +12,8 @@ 
   *      @link http://kcfinder.sunhater.com
   */
 
-class uploader {
+class uploader
+{
 
 /** Release version */
     const VERSION = "2.54";
@@ -104,17 +105,21 @@ 
 /** Magic method which allows read-only access to protected or private class properties
   * @param string $property
   * @return mixed */
-    public function __get($property) {
+    public function __get($property)
+    {
         return property_exists($this, $property) ? $this->$property : null;
     }
 
-    public function __construct($modx) {
+    public function __construct($modx)
+    {
 
         //MODX
         try {
             if ($modx instanceof DocumentParser) {
                 $this->modx = $modx;
-            } else throw new Exception('MODX should be instance of DocumentParser');
+            } else {
+                throw new Exception('MODX should be instance of DocumentParser');
+            }
         } catch (Exception $e) {
             die($e->getMessage());
         }
@@ -129,26 +134,34 @@ 
         // SET CMS INTEGRATION ATTRIBUTE
         if (isset($this->get['cms']) &&
             in_array($this->get['cms'], array("drupal"))
-        )
-            $this->cms = $this->get['cms'];
+        ) {
+                    $this->cms = $this->get['cms'];
+        }
 
 		// LINKING UPLOADED FILE
-        if (count($_FILES))
-            $this->file = &$_FILES[key($_FILES)];
+        if (count($_FILES)) {
+                    $this->file = &$_FILES[key($_FILES)];
+        }
 
         // LOAD DEFAULT CONFIGURATION
         require "config.php";
 
         // SETTING UP SESSION
-        if (isset($_CONFIG['_sessionLifetime']))
-            ini_set('session.gc_maxlifetime', $_CONFIG['_sessionLifetime'] * 60);
-        if (isset($_CONFIG['_sessionDir']))
-            ini_set('session.save_path', $_CONFIG['_sessionDir']);
-        if (isset($_CONFIG['_sessionDomain']))
-            ini_set('session.cookie_domain', $_CONFIG['_sessionDomain']);
+        if (isset($_CONFIG['_sessionLifetime'])) {
+                    ini_set('session.gc_maxlifetime', $_CONFIG['_sessionLifetime'] * 60);
+        }
+        if (isset($_CONFIG['_sessionDir'])) {
+                    ini_set('session.save_path', $_CONFIG['_sessionDir']);
+        }
+        if (isset($_CONFIG['_sessionDomain'])) {
+                    ini_set('session.cookie_domain', $_CONFIG['_sessionDomain']);
+        }
         switch ($this->cms) {
             case "drupal": break;
-            default: if (!session_id()) session_start(); break;
+            default: if (!session_id()) {
+                session_start();
+            }
+            break;
         }
 
         // RELOAD DEFAULT CONFIGURATION
@@ -159,31 +172,37 @@ 
         if (isset($_CONFIG['_sessionVar']) &&
             is_array($_CONFIG['_sessionVar'])
         ) {
-            foreach ($_CONFIG['_sessionVar'] as $key => $val)
-                if ((substr($key, 0, 1) != "_") && isset($_CONFIG[$key]))
+            foreach ($_CONFIG['_sessionVar'] as $key => $val) {
+                            if ((substr($key, 0, 1) != "_") && isset($_CONFIG[$key]))
                     $this->config[$key] = $val;
-            if (!isset($this->config['_sessionVar']['self']))
-                $this->config['_sessionVar']['self'] = array();
+            }
+            if (!isset($this->config['_sessionVar']['self'])) {
+                            $this->config['_sessionVar']['self'] = array();
+            }
             $this->session = &$this->config['_sessionVar']['self'];
-        } else
-            $this->session = &$_SESSION;
+        } else {
+                    $this->session = &$_SESSION;
+        }
 
         // IMAGE DRIVER INIT
         if (isset($this->config['imageDriversPriority'])) {
             $this->config['imageDriversPriority'] =
                 text::clearWhitespaces($this->config['imageDriversPriority']);
             $driver = image::getDriver(explode(' ', $this->config['imageDriversPriority']));
-            if ($driver !== false)
-                $this->imageDriver = $driver;
+            if ($driver !== false) {
+                            $this->imageDriver = $driver;
+            }
         }
         if ((!isset($driver) || ($driver === false)) &&
             (image::getDriver(array($this->imageDriver)) === false)
-        )
-            die("Cannot find any of the supported PHP image extensions!");
+        ) {
+                    die("Cannot find any of the supported PHP image extensions!");
+        }
 
         // WATERMARK INIT
-        if (isset($this->config['watermark']) && is_string($this->config['watermark']))
-            $this->config['watermark'] = array('file' => $this->config['watermark']);
+        if (isset($this->config['watermark']) && is_string($this->config['watermark'])) {
+                    $this->config['watermark'] = array('file' => $this->config['watermark']);
+        }
 
         // GET TYPE DIRECTORY
         $this->types = &$this->config['types'];
@@ -197,9 +216,10 @@ 
 
         // LOAD TYPE DIRECTORY SPECIFIC CONFIGURATION IF EXISTS
         if (is_array($this->types[$this->type])) {
-            foreach ($this->types[$this->type] as $key => $val)
-                if (in_array($key, $this->typeSettings))
+            foreach ($this->types[$this->type] as $key => $val) {
+                            if (in_array($key, $this->typeSettings))
                     $this->config[$key] = $val;
+            }
             $this->types[$this->type] = isset($this->types[$this->type]['type'])
                 ? $this->types[$this->type]['type'] : "";
         }
@@ -209,12 +229,14 @@ 
         $ip = '/^' . implode('\.', array($ip, $ip, $ip, $ip)) . '$/';
         if (preg_match($ip, $_SERVER['HTTP_HOST']) ||
             preg_match('/^[^\.]+$/', $_SERVER['HTTP_HOST'])
-        )
-            $this->config['cookieDomain'] = "";
-        elseif (!strlen($this->config['cookieDomain']))
-            $this->config['cookieDomain'] = $_SERVER['HTTP_HOST'];
-        if (!strlen($this->config['cookiePath']))
-            $this->config['cookiePath'] = "/";
+        ) {
+                    $this->config['cookieDomain'] = "";
+        } elseif (!strlen($this->config['cookieDomain'])) {
+                    $this->config['cookieDomain'] = $_SERVER['HTTP_HOST'];
+        }
+        if (!strlen($this->config['cookiePath'])) {
+                    $this->config['cookiePath'] = "/";
+        }
 
         // UPLOAD FOLDER INIT
 
@@ -250,26 +272,30 @@ 
             $this->typeDir = "{$this->config['uploadDir']}/{$this->type}";
             $this->typeURL = "{$this->config['uploadURL']}/{$this->type}";
         }
-        if (!is_dir($this->config['uploadDir']))
-            @mkdir($this->config['uploadDir'], $this->config['dirPerms']);
+        if (!is_dir($this->config['uploadDir'])) {
+                    @mkdir($this->config['uploadDir'], $this->config['dirPerms']);
+        }
 
         // HOST APPLICATIONS INIT
-        if (isset($this->get['CKEditorFuncNum']))
-            $this->opener['CKEditor']['funcNum'] = $this->get['CKEditorFuncNum'];
+        if (isset($this->get['CKEditorFuncNum'])) {
+                    $this->opener['CKEditor']['funcNum'] = $this->get['CKEditorFuncNum'];
+        }
         if (isset($this->get['opener']) &&
             (strtolower($this->get['opener']) == "tinymce") &&
             isset($this->config['_tinyMCEPath']) &&
             strlen($this->config['_tinyMCEPath'])
-        )
-            $this->opener['TinyMCE'] = true;
+        ) {
+                    $this->opener['TinyMCE'] = true;
+        }
 
         // LOCALIZATION
-        foreach ($this->langInputNames as $key)
-            if (isset($this->get[$key]) &&
+        foreach ($this->langInputNames as $key) {
+                    if (isset($this->get[$key]) &&
                 preg_match('/^[a-z][a-z\._\-]*$/i', $this->get[$key]) &&
                 file_exists("lang/" . strtolower($this->get[$key]) . ".php")
             ) {
                 $this->lang = $this->get[$key];
+        }
                 break;
             }
         $this->localize($this->lang);
@@ -280,31 +306,39 @@ 
         ) {
             $htaccess = "{$this->config['uploadDir']}/.htaccess";
             if (!file_exists($htaccess)) {
-                if (!@file_put_contents($htaccess, $this->get_htaccess()))
-                    $this->backMsg("Cannot write to upload folder. {$this->config['uploadDir']}");
+                if (!@file_put_contents($htaccess, $this->get_htaccess())) {
+                                    $this->backMsg("Cannot write to upload folder. {$this->config['uploadDir']}");
+                }
             } else {
-                if (false === ($data = @file_get_contents($htaccess)))
-                    $this->backMsg("Cannot read .htaccess");
-                if (($data != $this->get_htaccess()) && !@file_put_contents($htaccess, $data))
-                    $this->backMsg("Incorrect .htaccess file. Cannot rewrite it!");
+                if (false === ($data = @file_get_contents($htaccess))) {
+                                    $this->backMsg("Cannot read .htaccess");
+                }
+                if (($data != $this->get_htaccess()) && !@file_put_contents($htaccess, $data)) {
+                                    $this->backMsg("Incorrect .htaccess file. Cannot rewrite it!");
+                }
             }
         }
 
         // CHECK & CREATE UPLOAD FOLDER
         if (!is_dir($this->typeDir)) {
-            if (!mkdir($this->typeDir, $this->config['dirPerms']))
-                $this->backMsg("Cannot create {dir} folder.", array('dir' => $this->type));
-        } elseif (!is_readable($this->typeDir))
-            $this->backMsg("Cannot read upload folder.");
+            if (!mkdir($this->typeDir, $this->config['dirPerms'])) {
+                            $this->backMsg("Cannot create {dir} folder.", array('dir' => $this->type));
+            }
+        } elseif (!is_readable($this->typeDir)) {
+                    $this->backMsg("Cannot read upload folder.");
+        }
     }
 
-    public function upload() {
+    public function upload()
+    {
         $config = &$this->config;
         $file = &$this->file;
         $url = $message = "";
 
         if ($config['disabled'] || !$config['access']['files']['upload']) {
-            if (isset($file['tmp_name'])) @unlink($file['tmp_name']);
+            if (isset($file['tmp_name'])) {
+                @unlink($file['tmp_name']);
+            }
             $message = $this->label("You don't have permissions to upload files.");
 
         } elseif (true === ($message = $this->checkUploadedFile())) {
@@ -315,9 +349,9 @@ 
                 (false !== ($gdir = $this->checkInputDir($this->get['dir'])))
             ) {
                 $udir = path::normalize("$dir$gdir");
-                if (substr($udir, 0, strlen($dir)) !== $dir)
-                    $message = $this->label("Unknown error.");
-                else {
+                if (substr($udir, 0, strlen($dir)) !== $dir) {
+                                    $message = $this->label("Unknown error.");
+                } else {
                     $l = strlen($dir);
                     $dir = "$udir/";
                     $udir = substr($udir, $l);
@@ -325,8 +359,9 @@ 
             }
 
             if (!strlen($message)) {
-                if (!is_dir(path::normalize($dir)))
-                    @mkdir(path::normalize($dir), $this->config['dirPerms'], true);
+                if (!is_dir(path::normalize($dir))) {
+                                    @mkdir(path::normalize($dir), $this->config['dirPerms'], true);
+                }
 
                 $filename = $this->normalizeFilename($file['name']);
                 $target = file::getInexistantFilename($dir . $filename);
@@ -334,21 +369,25 @@ 
                 if (!@move_uploaded_file($file['tmp_name'], $target) &&
                     !@rename($file['tmp_name'], $target) &&
                     !@copy($file['tmp_name'], $target)
-                )
-                    $message = $this->label("Cannot move uploaded file to target folder.");
-                else {
-                    if (function_exists('chmod'))
-                        @chmod($target, $this->config['filePerms']);
+                ) {
+                                    $message = $this->label("Cannot move uploaded file to target folder.");
+                } else {
+                    if (function_exists('chmod')) {
+                                            @chmod($target, $this->config['filePerms']);
+                    }
                     $this->makeThumb($target);
                     $url = $this->typeURL;
-                    if (isset($udir)) $url .= "/$udir";
+                    if (isset($udir)) {
+                        $url .= "/$udir";
+                    }
                     $url .= "/" . basename($target);
                     if (preg_match('/^([a-z]+)\:\/\/([^\/^\:]+)(\:(\d+))?\/(.+)$/', $url, $patt)) {
                         list($unused, $protocol, $domain, $unused, $port, $path) = $patt;
                         $base = "$protocol://$domain" . (strlen($port) ? ":$port" : "") . "/";
                         $url = $base . path::urlPathEncode($path);
-                    } else
-                        $url = path::urlPathEncode($url);
+                    } else {
+                                            $url = path::urlPathEncode($url);
+                    }
                 }
             }
         }
@@ -356,16 +395,19 @@ 
         if (strlen($message) &&
             isset($this->file['tmp_name']) &&
             file_exists($this->file['tmp_name'])
-        )
-            @unlink($this->file['tmp_name']);
+        ) {
+                    @unlink($this->file['tmp_name']);
+        }
 
-        if (strlen($message) && method_exists($this, 'errorMsg'))
-            $this->errorMsg($message);
+        if (strlen($message) && method_exists($this, 'errorMsg')) {
+                    $this->errorMsg($message);
+        }
         $this->callBack($url, $message);
     }
 
 
-	protected function getTransaliasSettings() {
+	protected function getTransaliasSettings()
+	{
 		$modx = evolutionCMS();
 
 		// Cleaning uploaded filename?
@@ -385,7 +427,8 @@ 
 	}
 
 
-	protected function normalizeFilename($filename) {
+	protected function normalizeFilename($filename)
+	{
 		if ($this->getTransaliasSettings()) {
         		$format = strrchr($filename, ".");
         		$filename = str_replace($format, "", $filename);
@@ -394,16 +437,19 @@ 
         	return $filename;
 	}
 
-	protected function normalizeDirname($dirname) {
+	protected function normalizeDirname($dirname)
+	{
         return $this->modx->stripAlias($dirname);
     }
 
-    protected function checkUploadedFile(array $aFile=null) {
+    protected function checkUploadedFile(array $aFile=null)
+    {
         $config = &$this->config;
         $file = ($aFile === null) ? $this->file : $aFile;
 
-        if (!is_array($file) || !isset($file['name']))
-            return $this->label("Unknown error");
+        if (!is_array($file) || !isset($file['name'])) {
+                    return $this->label("Unknown error");
+        }
 
         if (is_array($file['name'])) {
             foreach ($file['name'] as $i => $name) {
@@ -412,8 +458,9 @@ 
                     'tmp_name' => $file['tmp_name'][$i],
                     'error' => $file['error'][$i]
                 ));
-                if ($return !== true)
-                    return "$name: $return";
+                if ($return !== true) {
+                                    return "$name: $return";
+                }
             }
             return true;
         }
@@ -422,8 +469,8 @@ 
         $typePatt = strtolower(text::clearWhitespaces($this->types[$this->type]));
 
         // CHECK FOR UPLOAD ERRORS
-        if ($file['error'])
-            return
+        if ($file['error']) {
+                    return
                 ($file['error'] == UPLOAD_ERR_INI_SIZE) ?
                     $this->label("The uploaded file exceeds {size} bytes.",
                         array('size' => ini_get('upload_max_filesize'))) : (
@@ -440,14 +487,17 @@ 
                     $this->label("Failed to write file.") :
                     $this->label("Unknown error.")
             )))));
+        }
 
         // HIDDEN FILENAMES CHECK
-        elseif (substr($file['name'], 0, 1) == ".")
-            return $this->label("File name shouldn't begins with '.'");
+        elseif (substr($file['name'], 0, 1) == ".") {
+                    return $this->label("File name shouldn't begins with '.'");
+        }
 
         // EXTENSION CHECK
-        elseif (!$this->validateExtension($extension, $this->type))
-            return $this->label("Denied file extension.");
+        elseif (!$this->validateExtension($extension, $this->type)) {
+                    return $this->label("Denied file extension.");
+        }
 
         // SPECIAL DIRECTORY TYPES CHECK (e.g. *img)
         elseif (preg_match('/^\*([^ ]+)(.*)?$/s', $typePatt, $patt)) {
@@ -457,70 +507,84 @@ 
                 $type = new $class();
                 $cfg = $config;
                 $cfg['filename'] = $file['name'];
-                if (strlen($params))
-                    $cfg['params'] = trim($params);
+                if (strlen($params)) {
+                                    $cfg['params'] = trim($params);
+                }
                 $response = $type->checkFile($file['tmp_name'], $cfg);
-                if ($response !== true)
-                    return $this->label($response);
-            } else
-                return $this->label("Non-existing directory type.");
+                if ($response !== true) {
+                                    return $this->label($response);
+                }
+            } else {
+                            return $this->label("Non-existing directory type.");
+            }
         }
 
         // IMAGE RESIZE
         $img = image::factory($this->imageDriver, $file['tmp_name']);
-        if (!$img->initError && !$this->imageResize($img, $file['tmp_name']))
-            return $this->label("The image is too big and/or cannot be resized.");
+        if (!$img->initError && !$this->imageResize($img, $file['tmp_name'])) {
+                    return $this->label("The image is too big and/or cannot be resized.");
+        }
 
 
 	// CHECK FOR MODX MAX FILE SIZE
 	$actualfilesize=filesize($file['tmp_name']);
-	if (isset($this->config['maxfilesize']) && $actualfilesize > $this->config['maxfilesize'])
-	    return $this->label("File is too big: ".$actualfilesize." Bytes. (max ".$this->config['maxfilesize']." Bytes)");
+	if (isset($this->config['maxfilesize']) && $actualfilesize > $this->config['maxfilesize']) {
+		    return $this->label("File is too big: ".$actualfilesize." Bytes. (max ".$this->config['maxfilesize']." Bytes)");
+	}
 
         return true;
     }
 
-    protected function checkInputDir($dir, $inclType=true, $existing=true) {
+    protected function checkInputDir($dir, $inclType=true, $existing=true)
+    {
         $dir = path::normalize($dir);
-        if (substr($dir, 0, 1) == "/")
-            $dir = substr($dir, 1);
+        if (substr($dir, 0, 1) == "/") {
+                    $dir = substr($dir, 1);
+        }
 
-        if ((substr($dir, 0, 1) == ".") || (substr(basename($dir), 0, 1) == "."))
-            return false;
+        if ((substr($dir, 0, 1) == ".") || (substr(basename($dir), 0, 1) == ".")) {
+                    return false;
+        }
 
         if ($inclType) {
             $first = explode("/", $dir);
             $first = $first[0];
-            if ($first != $this->type)
-                return false;
+            if ($first != $this->type) {
+                            return false;
+            }
             $return = $this->removeTypeFromPath($dir);
         } else {
             $return = $dir;
             $dir = "{$this->type}/$dir";
         }
 
-        if (!$existing)
-            return $return;
+        if (!$existing) {
+                    return $return;
+        }
 
         $path = "{$this->config['uploadDir']}/$dir";
         return (is_dir($path) && is_readable($path)) ? $return : false;
     }
 
-    protected function validateExtension($ext, $type) {
+    protected function validateExtension($ext, $type)
+    {
         $ext = trim(strtolower($ext));
-        if (!isset($this->types[$type]))
-            return false;
+        if (!isset($this->types[$type])) {
+                    return false;
+        }
 
         $exts = strtolower(text::clearWhitespaces($this->config['deniedExts']));
         if (strlen($exts)) {
             $exts = explode(" ", $exts);
-            if (in_array($ext, $exts))
-                return false;
+            if (in_array($ext, $exts)) {
+                            return false;
+            }
         }
 
         $exts = trim($this->types[$type]);
-        if (!strlen($exts) || substr($exts, 0, 1) == "*")
-            return true;
+        if (!strlen($exts) || substr($exts, 0, 1) == "*") {
+                    return true;
+        }
 
         if (substr($exts, 0, 1) == "!") {
             $exts = explode(" ", trim(strtolower(substr($exts, 1))));
@@ -531,26 +595,32 @@ 
         return in_array($ext, $exts);
     }
 
-    protected function getTypeFromPath($path) {
+    protected function getTypeFromPath($path)
+    {
         return preg_match('/^([^\/]*)\/.*$/', $path, $patt)
             ? $patt[1] : $path;
     }
 
-    protected function removeTypeFromPath($path) {
+    protected function removeTypeFromPath($path)
+    {
         return preg_match('/^[^\/]*\/(.*)$/', $path, $patt)
             ? $patt[1] : "";
     }
 
-    protected function imageResize($image, $file=null) {
+    protected function imageResize($image, $file=null)
+    {
 
         if (!($image instanceof image)) {
             $img = image::factory($this->imageDriver, $image);
-            if ($img->initError) return false;
+            if ($img->initError) {
+                return false;
+            }
             $file = $image;
-        } elseif ($file === null)
-            return false;
-        else
-            $img = $image;
+        } elseif ($file === null) {
+                    return false;
+        } else {
+                    $img = $image;
+        }
 
         $orientation = 1;
         if (function_exists("exif_read_data")) {
@@ -572,8 +642,9 @@ 
             )
             ) &&
             ($orientation == 1)
-        )
-            return true;
+        ) {
+                    return true;
+        }
 
 
         // PROPORTIONAL RESIZE
@@ -593,15 +664,17 @@ 
                 $width = $img->getPropWidth($height);
             }
 
-            if (isset($width) && isset($height) && !$img->resize($width, $height))
-                return false;
+            if (isset($width) && isset($height) && !$img->resize($width, $height)) {
+                            return false;
+            }
 
         // RESIZE TO FIT
         } elseif (
             $this->config['maxImageWidth'] && $this->config['maxImageHeight'] &&
             !$img->resizeFit($this->config['maxImageWidth'], $this->config['maxImageHeight'])
-        )
-            return false;
+        ) {
+                    return false;
+        }
 
         // AUTO FLIP AND ROTATE FROM EXIF
         if ((($orientation == 2) && !$img->flipHorizontal()) ||
@@ -611,11 +684,13 @@ 
             (($orientation == 6) && !$img->rotate(90)) ||
             (($orientation == 7) && (!$img->flipHorizontal() || !$img->rotate(90))) ||
             (($orientation == 8) && !$img->rotate(270))
-        )
-            return false;
-        if (($orientation >= 2) && ($orientation <= 8) && ($this->imageDriver == "imagick"))
-            try {
+        ) {
+                    return false;
+        }
+        if (($orientation >= 2) && ($orientation <= 8) && ($this->imageDriver == "imagick")) {
+                    try {
                 $img->image->setImageProperty('exif:Orientation', "1");
+        }
             } catch (Exception $e) {}
 
         // WATERMARK
@@ -646,22 +721,26 @@ 
 
     }
 
-    protected function makeThumb($file, $overwrite=true) {
+    protected function makeThumb($file, $overwrite=true)
+    {
         $img = image::factory($this->imageDriver, $file);
 
         // Drop files which are not images
-        if ($img->initError)
-            return true;
+        if ($img->initError) {
+                    return true;
+        }
 
         $thumb = substr($file, strlen($this->config['uploadDir']));
         $thumb = $this->config['uploadDir'] . "/" . $this->config['thumbsDir'] . "/" . $thumb;
         $thumb = path::normalize($thumb);
         $thumbDir = dirname($thumb);
-        if (!is_dir($thumbDir) && !@mkdir($thumbDir, $this->config['dirPerms'], true))
-            return false;
+        if (!is_dir($thumbDir) && !@mkdir($thumbDir, $this->config['dirPerms'], true)) {
+                    return false;
+        }
 
-        if (!$overwrite && is_file($thumb))
-            return true;
+        if (!$overwrite && is_file($thumb)) {
+                    return true;
+        }
 
         // Images with smaller resolutions than thumbnails
         /*if (($img->width <= $this->config['thumbWidth']) &&
@@ -674,8 +753,9 @@ 
 
         // Resize image
         } else */
-        if (!$img->resizeFit($this->config['thumbWidth'], $this->config['thumbHeight']))
-            return false;
+        if (!$img->resizeFit($this->config['thumbWidth'], $this->config['thumbHeight'])) {
+                    return false;
+        }
 
         if ( $this->imageDriver == 'gd' ) {
             $width  = imagesx( $img->image );
@@ -697,7 +777,8 @@ 
         ));
     }
 
-    protected function localize($langCode) {
+    protected function localize($langCode)
+    {
         require "lang/{$langCode}.php";
         setlocale(LC_ALL, $lang['_locale']);
         $this->charset = $lang['_charset'];
@@ -712,27 +793,34 @@ 
         $this->labels = $lang;
     }
 
-    protected function label($string, array $data=null) {
+    protected function label($string, array $data=null)
+    {
         $return = isset($this->labels[$string]) ? $this->labels[$string] : $string;
-        if (is_array($data))
-            foreach ($data as $key => $val)
+        if (is_array($data)) {
+                    foreach ($data as $key => $val)
                 $return = str_replace("{{$key}}", $val, $return);
+        }
         return $return;
     }
 
-    protected function backMsg($message, array $data=null) {
+    protected function backMsg($message, array $data=null)
+    {
         $message = $this->label($message, $data);
-        if (isset($this->file['tmp_name']) && file_exists($this->file['tmp_name']))
-            @unlink($this->file['tmp_name']);
+        if (isset($this->file['tmp_name']) && file_exists($this->file['tmp_name'])) {
+                    @unlink($this->file['tmp_name']);
+        }
         $this->callBack("", $message);
         die;
     }
 
-    protected function callBack($url, $message="") {
+    protected function callBack($url, $message="")
+    {
         $message = text::jsValue($message);
         $CKfuncNum = isset($this->opener['CKEditor']['funcNum'])
             ? $this->opener['CKEditor']['funcNum'] : 0;
-        if (!$CKfuncNum) $CKfuncNum = 0;
+        if (!$CKfuncNum) {
+            $CKfuncNum = 0;
+        }
         header("Content-Type: text/html; charset={$this->charset}");
 
 ?><html>
@@ -769,7 +857,8 @@ 
 
     }
 
-    protected function get_htaccess() {
+    protected function get_htaccess()
+    {
         return "<IfModule mod_php4.c>
   php_value engine off
 </IfModule>

Indentation +74 added lines, -74 removed lines

@@ -1,16 +1,16 @@ 
 <?php
 
 /** This file is part of KCFinder project
-  *
-  *      @desc Uploader class
-  *   @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 Uploader class
+ *   @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
+ */
 
 class uploader {
 
@@ -18,92 +18,92 @@ 
     const VERSION = "2.54";
 
 /** Config session-overrided settings
-  * @var array */
+ * @var array */
     protected $config = array();
 
 /** Default image driver
-  * @var string */
+ * @var string */
     protected $imageDriver = "gd";
 
 /** Opener applocation properties
-  *   $opener['name']                 Got from $_GET['opener'];
-  *   $opener['CKEditor']['funcNum']  CKEditor function number (got from $_GET)
-  *   $opener['TinyMCE']              Boolean
-  * @var array */
+ *   $opener['name']                 Got from $_GET['opener'];
+ *   $opener['CKEditor']['funcNum']  CKEditor function number (got from $_GET)
+ *   $opener['TinyMCE']              Boolean
+ * @var array */
     protected $opener = array();
 
 /** Got from $_GET['type'] or first one $config['types'] array key, if inexistant
-  * @var string */
+ * @var string */
     protected $type;
 
 /** Helper property. Local filesystem path to the Type Directory
-  * Equivalent: $config['uploadDir'] . "/" . $type
-  * @var string */
+ * Equivalent: $config['uploadDir'] . "/" . $type
+ * @var string */
     protected $typeDir;
 
 /** Helper property. Web URL to the Type Directory
-  * Equivalent: $config['uploadURL'] . "/" . $type
-  * @var string */
+ * Equivalent: $config['uploadURL'] . "/" . $type
+ * @var string */
     protected $typeURL;
 
 /** Linked to $config['types']
-  * @var array */
+ * @var array */
     protected $types = array();
 
 /** Settings which can override default settings if exists as keys in $config['types'][$type] array
-  * @var array */
+ * @var array */
     protected $typeSettings = array('disabled', 'theme', 'dirPerms', 'filePerms', 'denyZipDownload', 'maxImageWidth', 'maxImageHeight', 'thumbWidth', 'thumbHeight', 'jpegQuality', 'access', 'filenameChangeChars', 'dirnameChangeChars', 'denyExtensionRename', 'deniedExts', 'watermark');
 
 /** Got from language file
-  * @var string */
+ * @var string */
     protected $charset;
 
 /** The language got from $_GET['lng'] or $_GET['lang'] or... Please see next property
-  * @var string */
+ * @var string */
     protected $lang = 'en';
 
 /** Possible language $_GET keys
-  * @var array */
+ * @var array */
     protected $langInputNames = array('lang', 'langCode', 'lng', 'language', 'lang_code');
 
 /** Uploaded file(s) info. Linked to first $_FILES element
-  * @var array */
+ * @var array */
     protected $file;
 
 /** Next three properties are got from the current language file
-  * @var string */
+ * @var string */
     protected $dateTimeFull;   // Currently not used
     protected $dateTimeMid;    // Currently not used
     protected $dateTimeSmall;
 
 /** Contain Specified language labels
-  * @var array */
+ * @var array */
     protected $labels = array();
 
 /** Contain unprocessed $_GET array. Please use this instead of $_GET
-  * @var array */
+ * @var array */
     protected $get;
 
 /** Contain unprocessed $_POST array. Please use this instead of $_POST
-  * @var array */
+ * @var array */
     protected $post;
 
 /** Contain unprocessed $_COOKIE array. Please use this instead of $_COOKIE
-  * @var array */
+ * @var array */
     protected $cookie;
 
 /** Session array. Please use this property instead of $_SESSION
-  * @var array */
+ * @var array */
     protected $session;
 
 /** CMS integration attribute (got from $_GET['cms'])
-  * @var string */
+ * @var string */
     protected $cms = "";
 
     protected $modx = null;
 /** Magic method which allows read-only access to protected or private class properties
-  * @param string $property
-  * @return mixed */
+     * @param string $property
+     * @return mixed */
     public function __get($property) {
         return property_exists($this, $property) ? $this->$property : null;
     }
@@ -132,7 +132,7 @@ 
         )
             $this->cms = $this->get['cms'];
 
-		// LINKING UPLOADED FILE
+        // LINKING UPLOADED FILE
         if (count($_FILES))
             $this->file = &$_FILES[key($_FILES)];
 
@@ -228,8 +228,8 @@ 
             $this->config['uploadDir'] = strlen($this->config['uploadDir'])
                 ? path::normalize($this->config['uploadDir'])
                 : path::url2fullPath("/$path");
-         $this->typeDir = "{$this->config['uploadDir']}/{$this->type}";
-         $this->typeURL = "{$this->config['siteURL']}/{$this->config['uploadURL']}/{$this->type}";
+            $this->typeDir = "{$this->config['uploadDir']}/{$this->type}";
+            $this->typeURL = "{$this->config['siteURL']}/{$this->config['uploadURL']}/{$this->type}";
 
         // SITE ROOT
         } elseif ($this->config['uploadURL'] == "/") {
@@ -365,36 +365,36 @@ 
     }
 
 
-	protected function getTransaliasSettings() {
-		$modx = evolutionCMS();
-
-		// Cleaning uploaded filename?
-		$setting = $modx->getDatabase()->select('count(*)', $modx->getFullTableName('system_settings'), 'setting_name="clean_uploaded_filename" AND setting_value=1');
-		if ($modx->getDatabase()->getValue($setting)>0) {
-			// Transalias plugin active?
-			$res = $modx->getDatabase()->select('properties', $modx->getFullTableName('site_plugins'), 'name="TransAlias" AND disabled=0');
-			if ($properties = $modx->getDatabase()->getValue($res)) {
-				$properties = $modx->parseProperties($properties, 'TransAlias', 'plugin');
-			} else {
-				$properties = NULL;
-			}
-		} else {
-			$properties = NULL;
-		}
-		return $properties;
-	}
-
-
-	protected function normalizeFilename($filename) {
-		if ($this->getTransaliasSettings()) {
-        		$format = strrchr($filename, ".");
-        		$filename = str_replace($format, "", $filename);
-            		$filename = $this->modx->stripAlias($filename).$format;
-        	}
-        	return $filename;
-	}
-
-	protected function normalizeDirname($dirname) {
+    protected function getTransaliasSettings() {
+        $modx = evolutionCMS();
+
+        // Cleaning uploaded filename?
+        $setting = $modx->getDatabase()->select('count(*)', $modx->getFullTableName('system_settings'), 'setting_name="clean_uploaded_filename" AND setting_value=1');
+        if ($modx->getDatabase()->getValue($setting)>0) {
+            // Transalias plugin active?
+            $res = $modx->getDatabase()->select('properties', $modx->getFullTableName('site_plugins'), 'name="TransAlias" AND disabled=0');
+            if ($properties = $modx->getDatabase()->getValue($res)) {
+                $properties = $modx->parseProperties($properties, 'TransAlias', 'plugin');
+            } else {
+                $properties = NULL;
+            }
+        } else {
+            $properties = NULL;
+        }
+        return $properties;
+    }
+
+
+    protected function normalizeFilename($filename) {
+        if ($this->getTransaliasSettings()) {
+                $format = strrchr($filename, ".");
+                $filename = str_replace($format, "", $filename);
+                    $filename = $this->modx->stripAlias($filename).$format;
+            }
+            return $filename;
+    }
+
+    protected function normalizeDirname($dirname) {
         return $this->modx->stripAlias($dirname);
     }
 
@@ -472,10 +472,10 @@ 
             return $this->label("The image is too big and/or cannot be resized.");
 
 
-	// CHECK FOR MODX MAX FILE SIZE
-	$actualfilesize=filesize($file['tmp_name']);
-	if (isset($this->config['maxfilesize']) && $actualfilesize > $this->config['maxfilesize'])
-	    return $this->label("File is too big: ".$actualfilesize." Bytes. (max ".$this->config['maxfilesize']." Bytes)");
+    // CHECK FOR MODX MAX FILE SIZE
+    $actualfilesize=filesize($file['tmp_name']);
+    if (isset($this->config['maxfilesize']) && $actualfilesize > $this->config['maxfilesize'])
+        return $this->label("File is too big: ".$actualfilesize." Bytes. (max ".$this->config['maxfilesize']." Bytes)");
 
         return true;
     }
@@ -627,7 +627,7 @@ 
             $top = isset($this->config['watermark']['top'])
                 ? $this->config['watermark']['top'] : false;
             $img->watermark($this->config['watermark']['file'], $left, $top);
-		}
+        }
 
         $options = array( 'file' => $file );
 

Spacing +46 added lines, -47 removed lines

@@ -12,7 +12,7 @@ 
   *      @link http://kcfinder.sunhater.com
   */
 
-class uploader {
+class uploader{
 
 /** Release version */
     const VERSION = "2.54";
@@ -72,8 +72,8 @@ 
 
 /** Next three properties are got from the current language file
   * @var string */
-    protected $dateTimeFull;   // Currently not used
-    protected $dateTimeMid;    // Currently not used
+    protected $dateTimeFull; // Currently not used
+    protected $dateTimeMid; // Currently not used
     protected $dateTimeSmall;
 
 /** Contain Specified language labels
@@ -104,11 +104,11 @@ 
 /** Magic method which allows read-only access to protected or private class properties
   * @param string $property
   * @return mixed */
-    public function __get($property) {
+    public function __get($property){
         return property_exists($this, $property) ? $this->$property : null;
     }
 
-    public function __construct($modx) {
+    public function __construct($modx){
 
         //MODX
         try {
@@ -206,7 +206,7 @@ 
 
         // COOKIES INIT
         $ip = '(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)';
-        $ip = '/^' . implode('\.', array($ip, $ip, $ip, $ip)) . '$/';
+        $ip = '/^'.implode('\.', array($ip, $ip, $ip, $ip)).'$/';
         if (preg_match($ip, $_SERVER['HTTP_HOST']) ||
             preg_match('/^[^\.]+$/', $_SERVER['HTTP_HOST'])
         )
@@ -224,7 +224,7 @@ 
         ) {
             list($unused, $protocol, $domain, $unused, $port, $path) = $patt;
             $path = path::normalize($path);
-            $this->config['uploadURL'] = "$protocol://$domain" . (strlen($port) ? ":$port" : "") . "/$path";
+            $this->config['uploadURL'] = "$protocol://$domain".(strlen($port) ? ":$port" : "")."/$path";
             $this->config['uploadDir'] = strlen($this->config['uploadDir'])
                 ? path::normalize($this->config['uploadDir'])
                 : path::url2fullPath("/$path");
@@ -267,7 +267,7 @@ 
         foreach ($this->langInputNames as $key)
             if (isset($this->get[$key]) &&
                 preg_match('/^[a-z][a-z\._\-]*$/i', $this->get[$key]) &&
-                file_exists("lang/" . strtolower($this->get[$key]) . ".php")
+                file_exists("lang/".strtolower($this->get[$key]).".php")
             ) {
                 $this->lang = $this->get[$key];
                 break;
@@ -298,7 +298,7 @@ 
             $this->backMsg("Cannot read upload folder.");
     }
 
-    public function upload() {
+    public function upload(){
         $config = &$this->config;
         $file = &$this->file;
         $url = $message = "";
@@ -329,7 +329,7 @@ 
                     @mkdir(path::normalize($dir), $this->config['dirPerms'], true);
 
                 $filename = $this->normalizeFilename($file['name']);
-                $target = file::getInexistantFilename($dir . $filename);
+                $target = file::getInexistantFilename($dir.$filename);
 
                 if (!@move_uploaded_file($file['tmp_name'], $target) &&
                     !@rename($file['tmp_name'], $target) &&
@@ -342,11 +342,11 @@ 
                     $this->makeThumb($target);
                     $url = $this->typeURL;
                     if (isset($udir)) $url .= "/$udir";
-                    $url .= "/" . basename($target);
+                    $url .= "/".basename($target);
                     if (preg_match('/^([a-z]+)\:\/\/([^\/^\:]+)(\:(\d+))?\/(.+)$/', $url, $patt)) {
                         list($unused, $protocol, $domain, $unused, $port, $path) = $patt;
-                        $base = "$protocol://$domain" . (strlen($port) ? ":$port" : "") . "/";
-                        $url = $base . path::urlPathEncode($path);
+                        $base = "$protocol://$domain".(strlen($port) ? ":$port" : "")."/";
+                        $url = $base.path::urlPathEncode($path);
                     } else
                         $url = path::urlPathEncode($url);
                 }
@@ -365,12 +365,12 @@ 
     }
 
 
-	protected function getTransaliasSettings() {
+	protected function getTransaliasSettings(){
 		$modx = evolutionCMS();
 
 		// Cleaning uploaded filename?
 		$setting = $modx->getDatabase()->select('count(*)', $modx->getFullTableName('system_settings'), 'setting_name="clean_uploaded_filename" AND setting_value=1');
-		if ($modx->getDatabase()->getValue($setting)>0) {
+		if ($modx->getDatabase()->getValue($setting) > 0) {
 			// Transalias plugin active?
 			$res = $modx->getDatabase()->select('properties', $modx->getFullTableName('site_plugins'), 'name="TransAlias" AND disabled=0');
 			if ($properties = $modx->getDatabase()->getValue($res)) {
@@ -385,7 +385,7 @@ 
 	}
 
 
-	protected function normalizeFilename($filename) {
+	protected function normalizeFilename($filename){
 		if ($this->getTransaliasSettings()) {
         		$format = strrchr($filename, ".");
         		$filename = str_replace($format, "", $filename);
@@ -394,11 +394,11 @@ 
         	return $filename;
 	}
 
-	protected function normalizeDirname($dirname) {
+	protected function normalizeDirname($dirname){
         return $this->modx->stripAlias($dirname);
     }
 
-    protected function checkUploadedFile(array $aFile=null) {
+    protected function checkUploadedFile(array $aFile = null){
         $config = &$this->config;
         $file = ($aFile === null) ? $this->file : $aFile;
 
@@ -437,8 +437,7 @@ 
                 ($file['error'] == UPLOAD_ERR_NO_TMP_DIR) ?
                     $this->label("Missing a temporary folder.") : (
                 ($file['error'] == UPLOAD_ERR_CANT_WRITE) ?
-                    $this->label("Failed to write file.") :
-                    $this->label("Unknown error.")
+                    $this->label("Failed to write file.") : $this->label("Unknown error.")
             )))));
 
         // HIDDEN FILENAMES CHECK
@@ -473,14 +472,14 @@ 
 
 
 	// CHECK FOR MODX MAX FILE SIZE
-	$actualfilesize=filesize($file['tmp_name']);
+	$actualfilesize = filesize($file['tmp_name']);
 	if (isset($this->config['maxfilesize']) && $actualfilesize > $this->config['maxfilesize'])
 	    return $this->label("File is too big: ".$actualfilesize." Bytes. (max ".$this->config['maxfilesize']." Bytes)");
 
         return true;
     }
 
-    protected function checkInputDir($dir, $inclType=true, $existing=true) {
+    protected function checkInputDir($dir, $inclType = true, $existing = true){
         $dir = path::normalize($dir);
         if (substr($dir, 0, 1) == "/")
             $dir = substr($dir, 1);
@@ -506,7 +505,7 @@ 
         return (is_dir($path) && is_readable($path)) ? $return : false;
     }
 
-    protected function validateExtension($ext, $type) {
+    protected function validateExtension($ext, $type){
         $ext = trim(strtolower($ext));
         if (!isset($this->types[$type]))
             return false;
@@ -531,17 +530,17 @@ 
         return in_array($ext, $exts);
     }
 
-    protected function getTypeFromPath($path) {
+    protected function getTypeFromPath($path){
         return preg_match('/^([^\/]*)\/.*$/', $path, $patt)
             ? $patt[1] : $path;
     }
 
-    protected function removeTypeFromPath($path) {
+    protected function removeTypeFromPath($path){
         return preg_match('/^[^\/]*\/(.*)$/', $path, $patt)
             ? $patt[1] : "";
     }
 
-    protected function imageResize($image, $file=null) {
+    protected function imageResize($image, $file = null){
 
         if (!($image instanceof image)) {
             $img = image::factory($this->imageDriver, $image);
@@ -629,24 +628,24 @@ 
             $img->watermark($this->config['watermark']['file'], $left, $top);
 		}
 
-        $options = array( 'file' => $file );
+        $options = array('file' => $file);
 
-        $type = exif_imagetype( $file );
+        $type = exif_imagetype($file);
 
-        switch ( $type ) {
+        switch ($type) {
             case IMAGETYPE_GIF:
-                return $img->output( 'gif', $options );
+                return $img->output('gif', $options);
 
             case IMAGETYPE_PNG:
-                return $img->output( 'png', $options );
+                return $img->output('png', $options);
 
             default:
-                return $img->output( 'jpeg', array_merge( $options, array( 'quality' => $this->config['jpegQuality'] ) ) );
+                return $img->output('jpeg', array_merge($options, array('quality' => $this->config['jpegQuality'])));
         }
 
     }
 
-    protected function makeThumb($file, $overwrite=true) {
+    protected function makeThumb($file, $overwrite = true){
         $img = image::factory($this->imageDriver, $file);
 
         // Drop files which are not images
@@ -654,7 +653,7 @@ 
             return true;
 
         $thumb = substr($file, strlen($this->config['uploadDir']));
-        $thumb = $this->config['uploadDir'] . "/" . $this->config['thumbsDir'] . "/" . $thumb;
+        $thumb = $this->config['uploadDir']."/".$this->config['thumbsDir']."/".$thumb;
         $thumb = path::normalize($thumb);
         $thumbDir = dirname($thumb);
         if (!is_dir($thumbDir) && !@mkdir($thumbDir, $this->config['dirPerms'], true))
@@ -677,15 +676,15 @@ 
         if (!$img->resizeFit($this->config['thumbWidth'], $this->config['thumbHeight']))
             return false;
 
-        if ( $this->imageDriver == 'gd' ) {
-            $width  = imagesx( $img->image );
-            $height = imagesy( $img->image );
-            $back   = image::factory( $this->imageDriver, array( $width, $height ) );
-            $tile   = image::factory( $this->imageDriver, __DIR__ . '/../themes/' . $this->config['theme'] . '/img/bg_transparent.png' );
+        if ($this->imageDriver == 'gd') {
+            $width  = imagesx($img->image);
+            $height = imagesy($img->image);
+            $back   = image::factory($this->imageDriver, array($width, $height));
+            $tile   = image::factory($this->imageDriver, __DIR__.'/../themes/'.$this->config['theme'].'/img/bg_transparent.png');
 
-            imagesettile( $back->image, $tile->image );
-            imagefilledrectangle( $back->image, 0, 0, $width, $height, IMG_COLOR_TILED );
-            imagecopy( $back->image, $img->image, 0, 0, 0, 0, $width, $height );
+            imagesettile($back->image, $tile->image);
+            imagefilledrectangle($back->image, 0, 0, $width, $height, IMG_COLOR_TILED);
+            imagecopy($back->image, $img->image, 0, 0, 0, 0, $width, $height);
 
             $img = $back;
         }
@@ -697,7 +696,7 @@ 
         ));
     }
 
-    protected function localize($langCode) {
+    protected function localize($langCode){
         require "lang/{$langCode}.php";
         setlocale(LC_ALL, $lang['_locale']);
         $this->charset = $lang['_charset'];
@@ -712,7 +711,7 @@ 
         $this->labels = $lang;
     }
 
-    protected function label($string, array $data=null) {
+    protected function label($string, array $data = null){
         $return = isset($this->labels[$string]) ? $this->labels[$string] : $string;
         if (is_array($data))
             foreach ($data as $key => $val)
@@ -720,7 +719,7 @@ 
         return $return;
     }
 
-    protected function backMsg($message, array $data=null) {
+    protected function backMsg($message, array $data = null){
         $message = $this->label($message, $data);
         if (isset($this->file['tmp_name']) && file_exists($this->file['tmp_name']))
             @unlink($this->file['tmp_name']);
@@ -728,7 +727,7 @@ 
         die;
     }
 
-    protected function callBack($url, $message="") {
+    protected function callBack($url, $message = ""){
         $message = text::jsValue($message);
         $CKfuncNum = isset($this->opener['CKEditor']['funcNum'])
             ? $this->opener['CKEditor']['funcNum'] : 0;
@@ -769,7 +768,7 @@ 
 
     }
 
-    protected function get_htaccess() {
+    protected function get_htaccess(){
         return "<IfModule mod_php4.c>
   php_value engine off
 </IfModule>

Upper-Lower-Casing +2 added lines, -2 removed lines

@@ -376,10 +376,10 @@
 			if ($properties = $modx->getDatabase()->getValue($res)) {
 				$properties = $modx->parseProperties($properties, 'TransAlias', 'plugin');
 			} else {
-				$properties = NULL;
+				$properties = null;
 			}
 		} else {
-			$properties = NULL;
+			$properties = null;
 		}
 		return $properties;
 	}

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

Doc Comments +6 added lines

@@ -183,6 +183,9 @@ 
 	}
 
 
+	/**
+	 * @param integer $n
+	 */
 	private function getChars($n)
 	{
 		$response = null;
@@ -225,6 +228,9 @@ 
 	}
 
 
+	/**
+	 * @param false|string $str
+	 */
 	private function readInt($str)
 	{
 		$size = unpack("C*", $str);

Spacing +2 added lines, -2 removed lines

@@ -150,7 +150,7 @@ 
 					{
 						$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';
 					}
@@ -188,7 +188,7 @@ 
 		$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);
 

Indentation +218 added lines, -218 removed lines

@@ -13,227 +13,227 @@
 
 class fastImage
 {
-	private $strpos = 0;
-	private $str;
-	private $uri;
-	private $type;
-	private $handle;
+    private $strpos = 0;
+    private $str;
+    private $uri;
+    private $type;
+    private $handle;
 
-	public function __construct($uri = null)
-	{
-		if ($uri) $this->load($uri);
-	}
+    public function __construct($uri = null)
+    {
+        if ($uri) $this->load($uri);
+    }
 
 
-	public function load($uri)
-	{
-		if ($this->handle) $this->close();
-
-		$this->uri = $uri;
-		$this->handle = fopen($uri, 'r');
-	}
-
-
-	public function close()
-	{
-		if (is_resource($this->handle)) fclose($this->handle);
-	}
+    public function load($uri)
+    {
+        if ($this->handle) $this->close();
+
+        $this->uri = $uri;
+        $this->handle = fopen($uri, 'r');
+    }
+
+
+    public function close()
+    {
+        if (is_resource($this->handle)) fclose($this->handle);
+    }
 
 
-	public function getSize()
-	{
-		$this->strpos = 0;
-		if ($this->getType())
-		{
-			return array_values($this->parseSize());
-		}
-
-		return false;
-	}
-
-
-	public function getType()
-	{
-		$this->strpos = 0;
-
-		if (!$this->type)
-		{
-			switch ($this->getChars(2))
-			{
-				case "BM":
-					return $this->type = 'bmp';
-				case "GI":
-					return $this->type = 'gif';
-				case chr(0xFF).chr(0xd8):
-					return $this->type = 'jpeg';
-				case chr(0x89).'P':
-					return $this->type = 'png';
-				default:
-					return false;
-			}
-		}
-
-		return $this->type;
-	}
-
-
-	private function parseSize()
-	{
-		$this->strpos = 0;
-
-		switch ($this->type)
-		{
-			case 'png':
-				return $this->parseSizeForPNG();
-			case 'gif':
-				return $this->parseSizeForGIF();
-			case 'bmp':
-				return $this->parseSizeForBMP();
-			case 'jpeg':
-				return $this->parseSizeForJPEG();
-		}
-
-		return null;
-	}
-
-
-	private function parseSizeForPNG()
-	{
-		$chars = $this->getChars(25);
-
-		return unpack("N*", substr($chars, 16, 8));
-	}
-
-
-	private function parseSizeForGIF()
-	{
-		$chars = $this->getChars(11);
-
-		return unpack("S*", substr($chars, 6, 4));
-	}
-
-
-	private function parseSizeForBMP()
-	{
-		$chars = $this->getChars(29);
-	 	$chars = substr($chars, 14, 14);
-		$type = unpack('C', $chars);
-
-		return (reset($type) == 40) ? unpack('L*', substr($chars, 4)) : unpack('L*', substr($chars, 4, 8));
-	}
-
-
-	private function parseSizeForJPEG()
-	{
-		$state = null;
-
-		while (true)
-		{
-			switch ($state)
-			{
-				default:
-					$this->getChars(2);
-					$state = 'started';
-					break;
-
-				case 'started':
-					$b = $this->getByte();
-					if ($b === false) return false;
-
-					$state = $b == 0xFF ? 'sof' : 'started';
-					break;
-
-				case 'sof':
-					$b = $this->getByte();
-					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))))
-					{
-						$state = 'readsize';
-					}
-					elseif ($b == 0xFF)
-					{
-						$state = 'sof';
-					}
-					else
-					{
-						$state = 'skipframe';
-					}
-					break;
-
-				case 'skipframe':
-					$skip = $this->readInt($this->getChars(2)) - 2;
-					$state = 'doskip';
-					break;
-
-				case 'doskip':
-					$this->getChars($skip);
-					$state = 'started';
-					break;
-
-				case 'readsize':
-					$c = $this->getChars(7);
-
-					return array($this->readInt(substr($c, 5, 2)), $this->readInt(substr($c, 3, 2)));
-			}
-		}
-	}
-
-
-	private function getChars($n)
-	{
-		$response = null;
-
-		// do we need more data?
-		if ($this->strpos + $n -1 >= strlen($this->str))
-		{
-			$end = ($this->strpos + $n);
-
-			while (strlen($this->str) < $end && $response !== false)
-			{
-				// read more from the file handle
-				$need = $end - ftell($this->handle);
-
-				if ($response = fread($this->handle, $need))
-				{
-					$this->str .= $response;
-				}
-				else
-				{
-					return false;
-				}
-			}
-		}
-
-		$result = substr($this->str, $this->strpos, $n);
-		$this->strpos += $n;
-
-		// we are dealing with bytes here, so force the encoding
-		return mb_convert_encoding($result, "8BIT");
-	}
-
-
-	private function getByte()
-	{
-		$c = $this->getChars(1);
-		$b = unpack("C", $c);
-
-		return reset($b);
-	}
-
-
-	private function readInt($str)
-	{
-		$size = unpack("C*", $str);
-
-	    	return ($size[1] << 8) + $size[2];
-	}
-
-
-	public function __destruct()
-	{
-		$this->close();
-	}
+    public function getSize()
+    {
+        $this->strpos = 0;
+        if ($this->getType())
+        {
+            return array_values($this->parseSize());
+        }
+
+        return false;
+    }
+
+
+    public function getType()
+    {
+        $this->strpos = 0;
+
+        if (!$this->type)
+        {
+            switch ($this->getChars(2))
+            {
+                case "BM":
+                    return $this->type = 'bmp';
+                case "GI":
+                    return $this->type = 'gif';
+                case chr(0xFF).chr(0xd8):
+                    return $this->type = 'jpeg';
+                case chr(0x89).'P':
+                    return $this->type = 'png';
+                default:
+                    return false;
+            }
+        }
+
+        return $this->type;
+    }
+
+
+    private function parseSize()
+    {
+        $this->strpos = 0;
+
+        switch ($this->type)
+        {
+            case 'png':
+                return $this->parseSizeForPNG();
+            case 'gif':
+                return $this->parseSizeForGIF();
+            case 'bmp':
+                return $this->parseSizeForBMP();
+            case 'jpeg':
+                return $this->parseSizeForJPEG();
+        }
+
+        return null;
+    }
+
+
+    private function parseSizeForPNG()
+    {
+        $chars = $this->getChars(25);
+
+        return unpack("N*", substr($chars, 16, 8));
+    }
+
+
+    private function parseSizeForGIF()
+    {
+        $chars = $this->getChars(11);
+
+        return unpack("S*", substr($chars, 6, 4));
+    }
+
+
+    private function parseSizeForBMP()
+    {
+        $chars = $this->getChars(29);
+            $chars = substr($chars, 14, 14);
+        $type = unpack('C', $chars);
+
+        return (reset($type) == 40) ? unpack('L*', substr($chars, 4)) : unpack('L*', substr($chars, 4, 8));
+    }
+
+
+    private function parseSizeForJPEG()
+    {
+        $state = null;
+
+        while (true)
+        {
+            switch ($state)
+            {
+                default:
+                    $this->getChars(2);
+                    $state = 'started';
+                    break;
+
+                case 'started':
+                    $b = $this->getByte();
+                    if ($b === false) return false;
+
+                    $state = $b == 0xFF ? 'sof' : 'started';
+                    break;
+
+                case 'sof':
+                    $b = $this->getByte();
+                    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))))
+                    {
+                        $state = 'readsize';
+                    }
+                    elseif ($b == 0xFF)
+                    {
+                        $state = 'sof';
+                    }
+                    else
+                    {
+                        $state = 'skipframe';
+                    }
+                    break;
+
+                case 'skipframe':
+                    $skip = $this->readInt($this->getChars(2)) - 2;
+                    $state = 'doskip';
+                    break;
+
+                case 'doskip':
+                    $this->getChars($skip);
+                    $state = 'started';
+                    break;
+
+                case 'readsize':
+                    $c = $this->getChars(7);
+
+                    return array($this->readInt(substr($c, 5, 2)), $this->readInt(substr($c, 3, 2)));
+            }
+        }
+    }
+
+
+    private function getChars($n)
+    {
+        $response = null;
+
+        // do we need more data?
+        if ($this->strpos + $n -1 >= strlen($this->str))
+        {
+            $end = ($this->strpos + $n);
+
+            while (strlen($this->str) < $end && $response !== false)
+            {
+                // read more from the file handle
+                $need = $end - ftell($this->handle);
+
+                if ($response = fread($this->handle, $need))
+                {
+                    $this->str .= $response;
+                }
+                else
+                {
+                    return false;
+                }
+            }
+        }
+
+        $result = substr($this->str, $this->strpos, $n);
+        $this->strpos += $n;
+
+        // we are dealing with bytes here, so force the encoding
+        return mb_convert_encoding($result, "8BIT");
+    }
+
+
+    private function getByte()
+    {
+        $c = $this->getChars(1);
+        $b = unpack("C", $c);
+
+        return reset($b);
+    }
+
+
+    private function readInt($str)
+    {
+        $size = unpack("C*", $str);
+
+            return ($size[1] << 8) + $size[2];
+    }
+
+
+    public function __destruct()
+    {
+        $this->close();
+    }
 }

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/media/browser/mcpuk/lib/class_gd.php

Doc Comments +8 added lines, -2 removed lines

@@ -168,7 +168,7 @@ 
     * 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 */

+    * @return integer[] */

 

     public function get_prop_size($bigger_size) {

 

@@ -255,7 +255,7 @@ 
     * no samo po edno (x ili y) izmerenie

     * @param integer $width

     * @param integer $height

-    * @return bool */

+    * @return gd */

 

     public function resize_overflow($width, $height) {

 

@@ -397,6 +397,12 @@ 
             return false;

     }

 

+    /**
+     * @param integer $x1
+     * @param integer $y1
+     * @param integer $x2
+     * @param integer $y2
+     */
     public function imagefilledrectangle($x1, $y1, $x2, $y2, $color) {

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

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

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

Doc Comments -1 removed lines

@@ -179,7 +179,6 @@
 
 /** Resize and crop the image to fit in given resolution. Returns TRUE on
   * success or FALSE on failure
-  * @param mixed $src
   * @param integer $offset
   * @return bool */
     abstract public function resizeCrop($width, $height, $offset=false);

Indentation +93 added lines, -93 removed lines

@@ -1,45 +1,45 @@ 
 <?php
 
 /** This file is part of KCFinder project
-  *
-  *      @desc Abstract image driver class
-  *   @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 Abstract image driver class
+ *   @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
+ */
 
 abstract class image {
     const DEFAULT_JPEG_QUALITY = 75;
 
 /** Image resource or object
-  * @var mixed */
+ * @var mixed */
     protected $image;
 
 /** Image width in pixels
-  * @var integer */
+ * @var integer */
     protected $width;
 
 /** Image height in pixels
-  * @var integer */
+ * @var integer */
     protected $height;
 
 /** Init error
-  * @var bool */
+ * @var bool */
     protected $initError = false;
 
 /** Driver specific options
-  * @var array */
+ * @var array */
     protected $options = array();
 
 
 /** Magic method which allows read-only access to all protected or private
-  * class properties
-  * @param string $property
-  * @return mixed */
+ * class properties
+ * @param string $property
+ * @return mixed */
 
     final public function __get($property) {
         return property_exists($this, $property) ? $this->$property : null;
@@ -47,15 +47,15 @@ 
 
 
 /** Constructor. Parameter $image should be:
-  *   1. An instance of image driver class (copy instance).
-  *   2. An image represented by the type of the $image property
-  *      (resource or object).
-  *   3. An array with two elements. First - width, second - height.
-  *      Creates a blank image.
-  *   4. A filename string. Get image form file.
-  * Second paramaeter is used by pass some specific image driver options
-  * @param mixed $image
-  * @param array $options */
+ *   1. An instance of image driver class (copy instance).
+ *   2. An image represented by the type of the $image property
+ *      (resource or object).
+ *   3. An array with two elements. First - width, second - height.
+ *      Creates a blank image.
+ *   4. A filename string. Get image form file.
+ * Second paramaeter is used by pass some specific image driver options
+ * @param mixed $image
+ * @param array $options */
 
     public function __construct($image, array $options=array()) {
         $this->image = $this->width = $this->height = null;
@@ -70,10 +70,10 @@ 
 
 
 /** Factory pattern to load selected driver. $image and $options are passed
-  * to the constructor of the image driver
-  * @param string $driver
-  * @param mixed $image
-  * @return object */
+ * to the constructor of the image driver
+ * @param string $driver
+ * @param mixed $image
+ * @return object */
 
     final static function factory($driver, $image, array $options=array()) {
         $class = "image_$driver";
@@ -82,9 +82,9 @@ 
 
 
 /** Checks if the drivers in the array parameter could be used. Returns first
-  * found one
-  * @param array $drivers
-  * @return string */
+ * found one
+ * @param array $drivers
+ * @return string */
 
     final static function getDriver(array $drivers=array('gd')) {
         foreach ($drivers as $driver) {
@@ -101,9 +101,9 @@ 
 
 
 /** Returns an array. Element 0 - image resource. Element 1 - width. Element 2 - height.
-  * Returns FALSE on failure.
-  * @param mixed $image
-  * @return array */
+ * Returns FALSE on failure.
+ * @param mixed $image
+ * @return array */
 
     final protected function buildImage($image) {
         $class = get_class($this);
@@ -128,8 +128,8 @@ 
 
 
 /** Returns calculated proportional width from the given height
-  * @param integer $resizedHeight
-  * @return integer */
+ * @param integer $resizedHeight
+ * @return integer */
 
     final public function getPropWidth($resizedHeight) {
         $width = round(($this->width * $resizedHeight) / $this->height);
@@ -139,8 +139,8 @@ 
 
 
 /** Returns calculated proportional height from the given width
-  * @param integer $resizedWidth
-  * @return integer */
+ * @param integer $resizedWidth
+ * @return integer */
 
     final public function getPropHeight($resizedWidth) {
         $height = round(($this->height * $resizedWidth) / $this->width);
@@ -150,45 +150,45 @@ 
 
 
 /** Checks if PHP needs some extra extensions to use the image driver. This
-  * static method should be implemented into driver classes like abstract
-  * methods
-  * @return bool */
+ * static method should be implemented into driver classes like abstract
+ * methods
+ * @return bool */
     static function available() { return false; }
 
 /** Checks if file is an image. This static method should be implemented into
-  * driver classes like abstract methods
-  * @param string $file
-  * @return bool */
+ * driver classes like abstract methods
+ * @param string $file
+ * @return bool */
     static function checkImage($file) { return false; }
 
 /** Resize image. Should return TRUE on success or FALSE on failure
-  * @param integer $width
-  * @param integer $height
-  * @return bool */
+ * @param integer $width
+ * @param integer $height
+ * @return bool */
     abstract public function resize($width, $height);
 
 /** Resize image to fit in given resolution. Should returns TRUE on success
-  * or FALSE on failure. If $background is set, the image size will be
-  * $width x $height and the empty spaces (if any) will be filled with defined
-  * color. Background color examples: "#5f5", "#ff67ca", array(255, 255, 255)
-  * @param integer $width
-  * @param integer $height
-  * @param mixed $background
-  * @return bool */
+ * or FALSE on failure. If $background is set, the image size will be
+ * $width x $height and the empty spaces (if any) will be filled with defined
+ * color. Background color examples: "#5f5", "#ff67ca", array(255, 255, 255)
+ * @param integer $width
+ * @param integer $height
+ * @param mixed $background
+ * @return bool */
     abstract public function resizeFit($width, $height, $background=false);
 
 /** Resize and crop the image to fit in given resolution. Returns TRUE on
-  * success or FALSE on failure
-  * @param mixed $src
-  * @param integer $offset
-  * @return bool */
+ * success or FALSE on failure
+ * @param mixed $src
+ * @param integer $offset
+ * @return bool */
     abstract public function resizeCrop($width, $height, $offset=false);
 
 
 /** Rotate image
-  * @param integer $angle
-  * @param string $background
-  * @return bool */
+ * @param integer $angle
+ * @param string $background
+ * @return bool */
     abstract public function rotate($angle, $background="#000000");
 
     abstract public function flipHorizontal();
@@ -196,44 +196,44 @@ 
     abstract public function flipVertical();
 
 /** Apply a PNG or GIF watermark to the image. $top and $left parameters sets
-  * the offset of the watermark in pixels. Boolean and NULL values are possible
-  * too. In default case (FALSE, FALSE) the watermark should be applyed to
-  * the bottom right corner. NULL values means center aligning. If the
-  * watermark is bigger than the image or it's partialy or fully outside the
-  * image, it shoudn't be applied
-  * @param string $file
-  * @param mixed $top
-  * @param mixed $left
-  * @return bool */
+ * the offset of the watermark in pixels. Boolean and NULL values are possible
+ * too. In default case (FALSE, FALSE) the watermark should be applyed to
+ * the bottom right corner. NULL values means center aligning. If the
+ * watermark is bigger than the image or it's partialy or fully outside the
+ * image, it shoudn't be applied
+ * @param string $file
+ * @param mixed $top
+ * @param mixed $left
+ * @return bool */
     abstract public function watermark($file, $left=false, $top=false);
 
 /** Should output the image. Second parameter is used to pass some options like
-  *   'file' - if is set, the output will be written to a file
-  *   'quality' - compression quality
-  * It's possible to use extra specific options required by image type ($type)
-  * @param string $type
-  * @param array $options
-  * @return bool */
+ *   'file' - if is set, the output will be written to a file
+ *   'quality' - compression quality
+ * It's possible to use extra specific options required by image type ($type)
+ * @param string $type
+ * @param array $options
+ * @return bool */
     abstract public function output($type='jpeg', array $options=array());
 
 /** This method should create a blank image with selected size. Should returns
-  * resource or object related to the created image, which will be passed to
-  * $image property
-  * @param integer $width
-  * @param integer $height
-  * @return mixed */
+ * resource or object related to the created image, which will be passed to
+ * $image property
+ * @param integer $width
+ * @param integer $height
+ * @return mixed */
     abstract protected function getBlankImage($width, $height);
 
 /** This method should create an image from source image. Only first parameter
-  * ($image) is input. Its type should be filename string or a type of the
-  * $image property. See the constructor reference for details. The
-  * parametters $width and $height are output only. Should returns resource or
-  * object related to the created image, which will be passed to $image
-  * property
-  * @param mixed $image
-  * @param integer $width
-  * @param integer $height
-  * @return mixed */
+ * ($image) is input. Its type should be filename string or a type of the
+ * $image property. See the constructor reference for details. The
+ * parametters $width and $height are output only. Should returns resource or
+ * object related to the created image, which will be passed to $image
+ * property
+ * @param mixed $image
+ * @param integer $width
+ * @param integer $height
+ * @return mixed */
     abstract protected function getImage($image, &$width, &$height);
 
 }

Spacing +15 added lines, -15 removed lines

@@ -12,7 +12,7 @@ 
   *      @link http://kcfinder.sunhater.com
   */
 
-abstract class image {
+abstract class image{
     const DEFAULT_JPEG_QUALITY = 75;
 
 /** Image resource or object
@@ -41,7 +41,7 @@ 
   * @param string $property
   * @return mixed */
 
-    final public function __get($property) {
+    final public function __get($property){
         return property_exists($this, $property) ? $this->$property : null;
     }
 
@@ -57,7 +57,7 @@ 
   * @param mixed $image
   * @param array $options */
 
-    public function __construct($image, array $options=array()) {
+    public function __construct($image, array $options = array()){
         $this->image = $this->width = $this->height = null;
         $imageDetails = $this->buildImage($image);
 
@@ -75,7 +75,7 @@ 
   * @param mixed $image
   * @return object */
 
-    final static function factory($driver, $image, array $options=array()) {
+    final static function factory($driver, $image, array $options = array()){
         $class = "image_$driver";
         return new $class($image, $options);
     }
@@ -86,7 +86,7 @@ 
   * @param array $drivers
   * @return string */
 
-    final static function getDriver(array $drivers=array('gd')) {
+    final static function getDriver(array $drivers = array('gd')){
         foreach ($drivers as $driver) {
             if (!preg_match('/^[a-z0-9\_]+$/i', $driver))
                 continue;
@@ -105,7 +105,7 @@ 
   * @param mixed $image
   * @return array */
 
-    final protected function buildImage($image) {
+    final protected function buildImage($image){
         $class = get_class($this);
 
         if ($image instanceof $class) {
@@ -131,7 +131,7 @@ 
   * @param integer $resizedHeight
   * @return integer */
 
-    final public function getPropWidth($resizedHeight) {
+    final public function getPropWidth($resizedHeight){
         $width = round(($this->width * $resizedHeight) / $this->height);
         if (!$width) $width = 1;
         return $width;
@@ -142,7 +142,7 @@ 
   * @param integer $resizedWidth
   * @return integer */
 
-    final public function getPropHeight($resizedWidth) {
+    final public function getPropHeight($resizedWidth){
         $height = round(($this->height * $resizedWidth) / $this->width);
         if (!$height) $height = 1;
         return $height;
@@ -153,13 +153,13 @@ 
   * static method should be implemented into driver classes like abstract
   * methods
   * @return bool */
-    static function available() { return false; }
+    static function available(){ return false; }
 
 /** Checks if file is an image. This static method should be implemented into
   * driver classes like abstract methods
   * @param string $file
   * @return bool */
-    static function checkImage($file) { return false; }
+    static function checkImage($file){ return false; }
 
 /** Resize image. Should return TRUE on success or FALSE on failure
   * @param integer $width
@@ -175,21 +175,21 @@ 
   * @param integer $height
   * @param mixed $background
   * @return bool */
-    abstract public function resizeFit($width, $height, $background=false);
+    abstract public function resizeFit($width, $height, $background = false);
 
 /** Resize and crop the image to fit in given resolution. Returns TRUE on
   * success or FALSE on failure
   * @param mixed $src
   * @param integer $offset
   * @return bool */
-    abstract public function resizeCrop($width, $height, $offset=false);
+    abstract public function resizeCrop($width, $height, $offset = false);
 
 
 /** Rotate image
   * @param integer $angle
   * @param string $background
   * @return bool */
-    abstract public function rotate($angle, $background="#000000");
+    abstract public function rotate($angle, $background = "#000000");
 
     abstract public function flipHorizontal();
 
@@ -205,7 +205,7 @@ 
   * @param mixed $top
   * @param mixed $left
   * @return bool */
-    abstract public function watermark($file, $left=false, $top=false);
+    abstract public function watermark($file, $left = false, $top = false);
 
 /** Should output the image. Second parameter is used to pass some options like
   *   'file' - if is set, the output will be written to a file
@@ -214,7 +214,7 @@ 
   * @param string $type
   * @param array $options
   * @return bool */
-    abstract public function output($type='jpeg', array $options=array());
+    abstract public function output($type = 'jpeg', array $options = array());
 
 /** This method should create a blank image with selected size. Should returns
   * resource or object related to the created image, which will be passed to

Braces +42 added lines, -21 removed lines

@@ -12,7 +12,8 @@ 
   *      @link http://kcfinder.sunhater.com
   */
 
-abstract class image {
+abstract class image
+{
     const DEFAULT_JPEG_QUALITY = 75;
 
 /** Image resource or object
@@ -41,7 +42,8 @@ 
   * @param string $property
   * @return mixed */
 
-    final public function __get($property) {
+    final public function __get($property)
+    {
         return property_exists($this, $property) ? $this->$property : null;
     }
 
@@ -57,14 +59,16 @@ 
   * @param mixed $image
   * @param array $options */
 
-    public function __construct($image, array $options=array()) {
+    public function __construct($image, array $options=array())
+    {
         $this->image = $this->width = $this->height = null;
         $imageDetails = $this->buildImage($image);
 
-        if ($imageDetails !== false)
-            list($this->image, $this->width, $this->height) = $imageDetails;
-        else
-            $this->initError = true;
+        if ($imageDetails !== false) {
+                    list($this->image, $this->width, $this->height) = $imageDetails;
+        } else {
+                    $this->initError = true;
+        }
         $this->options = $options;
     }
 
@@ -75,7 +79,8 @@ 
   * @param mixed $image
   * @return object */
 
-    final static function factory($driver, $image, array $options=array()) {
+    final static function factory($driver, $image, array $options=array())
+    {
         $class = "image_$driver";
         return new $class($image, $options);
     }
@@ -86,14 +91,18 @@ 
   * @param array $drivers
   * @return string */
 
-    final static function getDriver(array $drivers=array('gd')) {
+    final static function getDriver(array $drivers=array('gd'))
+    {
         foreach ($drivers as $driver) {
-            if (!preg_match('/^[a-z0-9\_]+$/i', $driver))
-                continue;
+            if (!preg_match('/^[a-z0-9\_]+$/i', $driver)) {
+                            continue;
+            }
             $class = "image_$driver";
             if (class_exists($class) && method_exists($class, "available")) {
                 eval("\$avail = $class::available();");
-                if ($avail) return $driver;
+                if ($avail) {
+                    return $driver;
+                }
             }
         }
         return false;
@@ -105,7 +114,8 @@ 
   * @param mixed $image
   * @return array */
 
-    final protected function buildImage($image) {
+    final protected function buildImage($image)
+    {
         $class = get_class($this);
 
         if ($image instanceof $class) {
@@ -118,8 +128,9 @@ 
             list($key, $height) = each($image);
             $img = $this->getBlankImage($width, $height);
 
-        } else
-            $img = $this->getImage($image, $width, $height);
+        } else {
+                    $img = $this->getImage($image, $width, $height);
+        }
 
         return ($img !== false)
             ? array($img, $width, $height)
@@ -131,9 +142,12 @@ 
   * @param integer $resizedHeight
   * @return integer */
 
-    final public function getPropWidth($resizedHeight) {
+    final public function getPropWidth($resizedHeight)
+    {
         $width = round(($this->width * $resizedHeight) / $this->height);
-        if (!$width) $width = 1;
+        if (!$width) {
+            $width = 1;
+        }
         return $width;
     }
 
@@ -142,9 +156,12 @@ 
   * @param integer $resizedWidth
   * @return integer */
 
-    final public function getPropHeight($resizedWidth) {
+    final public function getPropHeight($resizedWidth)
+    {
         $height = round(($this->height * $resizedWidth) / $this->width);
-        if (!$height) $height = 1;
+        if (!$height) {
+            $height = 1;
+        }
         return $height;
     }
 
@@ -153,13 +170,17 @@ 
   * static method should be implemented into driver classes like abstract
   * methods
   * @return bool */
-    static function available() { return false; }
+    static function available()
+    {
+return false; }
 
 /** Checks if file is an image. This static method should be implemented into
   * driver classes like abstract methods
   * @param string $file
   * @return bool */
-    static function checkImage($file) { return false; }
+    static function checkImage($file)
+    {
+return false; }
 
 /** Resize image. Should return TRUE on success or FALSE on failure
   * @param integer $width

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

Doc Comments +5 added lines

@@ -327,6 +327,11 @@
         return imagecolorallocate($this->image, $r, $g, $b);
     }
 
+    /**
+     * @param integer $x1
+     * @param integer $y1
+     * @param boolean $color
+     */
     protected function imageFilledRectangle($x1, $y1, $x2, $y2, $color) {
         $color = $this->gdColor($color);
         if ($color === false) return false;

Indentation +10 added lines, -10 removed lines

@@ -1,16 +1,16 @@
 <?php
 
 /** This file is part of KCFinder project
-  *
-  *      @desc GD image driver class
-  *   @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 GD image driver class
+ *   @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
+ */
 
 class image_gd extends image {
 

Spacing +26 added lines, -26 removed lines

@@ -12,12 +12,12 @@ 
   *      @link http://kcfinder.sunhater.com
   */
 
-class image_gd extends image {
+class image_gd extends image{
 
 
     // ABSTRACT PUBLIC METHODS
 
-    public function resize($width, $height) {
+    public function resize($width, $height){
         if (!$width) $width = 1;
         if (!$height) $height = 1;
         return (
@@ -29,7 +29,7 @@ 
         );
     }
 
-    public function resizeFit($width, $height, $background=false) {
+    public function resizeFit($width, $height, $background = false){
         if ((!$width && !$height) || (($width == $this->width) && ($height == $this->height)))
             return true;
         if (!$width || (($height / $width) < ($this->height / $this->width))) {
@@ -67,7 +67,7 @@ 
         }
     }
 
-    public function resizeCrop($width, $height, $offset=false) {
+    public function resizeCrop($width, $height, $offset = false){
 
         if (($this->width / $this->height) > ($width / $height)) {
             $h = $height;
@@ -117,7 +117,7 @@ 
         return $return;
     }
 
-    public function rotate($angle, $background="#000000") {
+    public function rotate($angle, $background = "#000000"){
         $angle = -$angle;
         $img = @imagerotate($this->image, $angle, $this->gdColor($background));
         if ($img === false)
@@ -128,7 +128,7 @@ 
         return true;
     }
 
-    public function flipHorizontal() {
+    public function flipHorizontal(){
         $img = imagecreatetruecolor($this->width, $this->height);
             imagealphablending($img, false);
             imagesavealpha($img, true);
@@ -139,7 +139,7 @@ 
         return true;
     }
 
-    public function flipVertical() {
+    public function flipVertical(){
         $img = imagecreatetruecolor($this->width, $this->height);
             imagealphablending($img, false);
             imagesavealpha($img, true);
@@ -150,7 +150,7 @@ 
         return true;
     }
 
-    public function watermark($file, $left=false, $top=false) {
+    public function watermark($file, $left = false, $top = false){
         $info = getimagesize($file);
         list($w, $h, $t) = $info;
         if (!in_array($t, array(IMAGETYPE_PNG, IMAGETYPE_GIF)))
@@ -187,7 +187,7 @@ 
         return true;
     }
 
-    public function output($type='jpeg', array $options=array()) {
+    public function output($type = 'jpeg', array $options = array()){
         $method = "output_$type";
         if (!method_exists($this, $method))
             return false;
@@ -197,7 +197,7 @@ 
 
     // ABSTRACT PROTECTED METHODS
 
-    protected function getBlankImage($width, $height) {
+    protected function getBlankImage($width, $height){
         $img = @imagecreatetruecolor($width, $height);
 //        imagealphablending($img, false);
 //        imagesavealpha($img, true);
@@ -207,7 +207,7 @@ 
         return $img;
     }
 
-    protected function getImage($image, &$width, &$height) {
+    protected function getImage($image, &$width, &$height){
 
         if (is_resource($image) && (get_resource_type($image) == "gd")) {
             $width = @imagesx($image);
@@ -218,11 +218,11 @@ 
             (false !== (list($width, $height, $t) = @getimagesize($image)))
         ) {
             $image =
-                ($t == IMAGETYPE_GIF)  ? @imagecreatefromgif($image)  : (
+                ($t == IMAGETYPE_GIF) ? @imagecreatefromgif($image) : (
                 ($t == IMAGETYPE_WBMP) ? @imagecreatefromwbmp($image) : (
                 ($t == IMAGETYPE_JPEG) ? @imagecreatefromjpeg($image) : (
-                ($t == IMAGETYPE_PNG)  ? @imagecreatefrompng($image)  : (
-                ($t == IMAGETYPE_XBM)  ? @imagecreatefromxbm($image)  : false
+                ($t == IMAGETYPE_PNG) ? @imagecreatefrompng($image) : (
+                ($t == IMAGETYPE_XBM) ? @imagecreatefromxbm($image) : false
             ))));
 
             return $image;
@@ -234,22 +234,22 @@ 
 
     // PSEUDO-ABSTRACT STATIC METHODS
 
-    static function available() {
+    static function available(){
         return function_exists("imagecreatefromjpeg");
     }
 
-    static function checkImage($file) {
+    static function checkImage($file){
         if (!is_string($file) ||
             ((false === (list($width, $height, $t) = @getimagesize($file))))
         )
             return false;
 
         $img =
-            ($t == IMAGETYPE_GIF)  ? @imagecreatefromgif($file)  : (
+            ($t == IMAGETYPE_GIF) ? @imagecreatefromgif($file) : (
             ($t == IMAGETYPE_WBMP) ? @imagecreatefromwbmp($file) : (
             ($t == IMAGETYPE_JPEG) ? @imagecreatefromjpeg($file) : (
-            ($t == IMAGETYPE_PNG)  ? @imagecreatefrompng($file)  : (
-            ($t == IMAGETYPE_XBM)  ? @imagecreatefromxbm($file)  : false
+            ($t == IMAGETYPE_PNG) ? @imagecreatefrompng($file) : (
+            ($t == IMAGETYPE_XBM) ? @imagecreatefromxbm($file) : false
         ))));
 
         return ($img !== false);
@@ -258,7 +258,7 @@ 
 
     // OWN METHODS
 
-    protected function output_png(array $options=array()) {
+    protected function output_png(array $options = array()){
         $file = isset($options['file']) ? $options['file'] : null;
         $quality = isset($options['quality']) ? $options['quality'] : null;
         $filters = isset($options['filters']) ? $options['filters'] : null;
@@ -268,7 +268,7 @@ 
         return imagepng($this->image, $file, $quality, $filters);
     }
 
-    protected function output_jpeg(array $options=array()) {
+    protected function output_jpeg(array $options = array()){
         $file = isset($options['file']) ? $options['file'] : null;
         $quality = isset($options['quality'])
             ? $options['quality']
@@ -278,14 +278,14 @@ 
         return imagejpeg($this->image, $file, $quality);
     }
 
-    protected function output_gif(array $options=array()) {
+    protected function output_gif(array $options = array()){
         $file = isset($options['file']) ? $options['file'] : null;
         if (isset($options['file']) && !headers_sent())
             header("Content-Type: image/gif");
         return imagegif($this->image, $file);
     }
 
-    protected function gdColor() {
+    protected function gdColor(){
         $args = func_get_args();
 
         $exprRGB = '/^rgb\(\s*(\d{1,3})\s*\,\s*(\d{1,3})\s*\,\s*(\d{1,3})\s*\)$/i';
@@ -327,15 +327,15 @@ 
         return imagecolorallocate($this->image, $r, $g, $b);
     }
 
-    protected function imageFilledRectangle($x1, $y1, $x2, $y2, $color) {
+    protected function imageFilledRectangle($x1, $y1, $x2, $y2, $color){
         $color = $this->gdColor($color);
         if ($color === false) return false;
         return imageFilledRectangle($this->image, $x1, $y1, $x2, $y2, $color);
     }
 
     protected function imageCopyResampled(
-        $src, $dstX=0, $dstY=0, $srcX=0, $srcY=0, $dstW=null, $dstH=null, $srcW=null, $srcH=null
-    ) {
+        $src, $dstX = 0, $dstY = 0, $srcX = 0, $srcY = 0, $dstW = null, $dstH = null, $srcW = null, $srcH = null
+    ){
         $imageDetails = $this->buildImage($src);
 
         if ($imageDetails === false)

Braces +148 added lines, -85 removed lines

@@ -12,14 +12,20 @@ 
   *      @link http://kcfinder.sunhater.com
   */
 
-class image_gd extends image {
+class image_gd extends image
+{
 
 
     // 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;
+        }
         return (
             (false !== ($img = new image_gd(array($width, $height)))) &&
             $img->imageCopyResampled($this) &&
@@ -29,9 +35,11 @@ 
         );
     }
 
-    public function resizeFit($width, $height, $background=false) {
-        if ((!$width && !$height) || (($width == $this->width) && ($height == $this->height)))
-            return true;
+    public function resizeFit($width, $height, $background=false)
+    {
+        if ((!$width && !$height) || (($width == $this->width) && ($height == $this->height))) {
+                    return true;
+        }
         if (!$width || (($height / $width) < ($this->height / $this->width))) {
             $h = $height;
             $w = round(($this->width * $h) / $this->height);
@@ -42,13 +50,16 @@ 
             $w = $width;
             $h = $height;
         }
-        if (!$w) $w = 1;
-        if (!$h) $h = 1;
-
-        if ($background === false)
-            return $this->resize($w, $h);
+        if (!$w) {
+            $w = 1;
+        }
+        if (!$h) {
+            $h = 1;
+        }
 
-        else {
+        if ($background === false) {
+                    return $this->resize($w, $h);
+        } else {
             $img = new image_gd(array($width, $height));
             $x = round(($width - $w) / 2);
             $y = round(($height - $h) / 2);
@@ -56,8 +67,9 @@ 
             if ((false === $this->resize($w, $h)) ||
                 (false === $img->imageFilledRectangle(0, 0, $width, $height, $background)) ||
                 (false === $img->imageCopyResampled($this->image, $x, $y, 0, 0, $w, $h))
-            )
-                return false;
+            ) {
+                            return false;
+            }
 
             $this->image = $img->image;
             $this->width = $width;
@@ -67,41 +79,52 @@ 
         }
     }
 
-    public function resizeCrop($width, $height, $offset=false) {
+    public function resizeCrop($width, $height, $offset=false)
+    {
 
         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;
+        }
 
         $return = (
             (false !== ($img = new image_gd(array($width, $height))))) &&
@@ -117,50 +140,59 @@ 
         return $return;
     }
 
-    public function rotate($angle, $background="#000000") {
+    public function rotate($angle, $background="#000000")
+    {
         $angle = -$angle;
         $img = @imagerotate($this->image, $angle, $this->gdColor($background));
-        if ($img === false)
-            return false;
+        if ($img === false) {
+                    return false;
+        }
         $this->width = imagesx($img);
         $this->height = imagesy($img);
         $this->image = $img;
         return true;
     }
 
-    public function flipHorizontal() {
+    public function flipHorizontal()
+    {
         $img = imagecreatetruecolor($this->width, $this->height);
             imagealphablending($img, false);
             imagesavealpha($img, true);
-        if (imagecopyresampled($img, $this->image, 0, 0, ($this->width - 1), 0, $this->width, $this->height, -$this->width, $this->height))
-            $this->image = $img;
-        else
-            return false;
+        if (imagecopyresampled($img, $this->image, 0, 0, ($this->width - 1), 0, $this->width, $this->height, -$this->width, $this->height)) {
+                    $this->image = $img;
+        } else {
+                    return false;
+        }
         return true;
     }
 
-    public function flipVertical() {
+    public function flipVertical()
+    {
         $img = imagecreatetruecolor($this->width, $this->height);
             imagealphablending($img, false);
             imagesavealpha($img, true);
-        if (imagecopyresampled($img, $this->image, 0, 0, 0, ($this->height - 1), $this->width, $this->height, $this->width, -$this->height))
-            $this->image = $img;
-        else
-            return false;
+        if (imagecopyresampled($img, $this->image, 0, 0, 0, ($this->height - 1), $this->width, $this->height, $this->width, -$this->height)) {
+                    $this->image = $img;
+        } else {
+                    return false;
+        }
         return true;
     }
 
-    public function watermark($file, $left=false, $top=false) {
+    public function watermark($file, $left=false, $top=false)
+    {
         $info = getimagesize($file);
         list($w, $h, $t) = $info;
-        if (!in_array($t, array(IMAGETYPE_PNG, IMAGETYPE_GIF)))
-            return false;
+        if (!in_array($t, array(IMAGETYPE_PNG, IMAGETYPE_GIF))) {
+                    return false;
+        }
         $imagecreate = ($t == IMAGETYPE_PNG) ? "imagecreatefrompng" : "imagecreatefromgif";
 
         if (!@imagealphablending($this->image, true) ||
             (false === ($wm = @$imagecreate($file)))
-        )
-            return false;
+        ) {
+                    return false;
+        }
 
         $w = imagesx($wm);
         $h = imagesy($wm);
@@ -176,28 +208,33 @@ 
         if ((($x + $w) > $this->width) ||
             (($y + $h) > $this->height) ||
             ($x < 0) || ($y < 0)
-        )
-            return false;
+        ) {
+                    return false;
+        }
 
-        if (($wm === false) || !@imagecopy($this->image, $wm, $x, $y, 0, 0, $w, $h))
-            return false;
+        if (($wm === false) || !@imagecopy($this->image, $wm, $x, $y, 0, 0, $w, $h)) {
+                    return false;
+        }
 
         @imagealphablending($this->image, false);
         @imagesavealpha($this->image, true);
         return true;
     }
 
-    public function output($type='jpeg', array $options=array()) {
+    public function output($type='jpeg', array $options=array())
+    {
         $method = "output_$type";
-        if (!method_exists($this, $method))
-            return false;
+        if (!method_exists($this, $method)) {
+                    return false;
+        }
         return $this->$method($options);
     }
 
 
     // ABSTRACT PROTECTED METHODS
 
-    protected function getBlankImage($width, $height) {
+    protected function getBlankImage($width, $height)
+    {
         $img = @imagecreatetruecolor($width, $height);
 //        imagealphablending($img, false);
 //        imagesavealpha($img, true);
@@ -207,7 +244,8 @@ 
         return $img;
     }
 
-    protected function getImage($image, &$width, &$height) {
+    protected function getImage($image, &$width, &$height)
+    {
 
         if (is_resource($image) && (get_resource_type($image) == "gd")) {
             $width = @imagesx($image);
@@ -227,22 +265,26 @@ 
 
             return $image;
 
-        } else
-            return false;
+        } else {
+                    return false;
+        }
     }
 
 
     // PSEUDO-ABSTRACT STATIC METHODS
 
-    static function available() {
+    static function available()
+    {
         return function_exists("imagecreatefromjpeg");
     }
 
-    static function checkImage($file) {
+    static function checkImage($file)
+    {
         if (!is_string($file) ||
             ((false === (list($width, $height, $t) = @getimagesize($file))))
-        )
-            return false;
+        ) {
+                    return false;
+        }
 
         $img =
             ($t == IMAGETYPE_GIF)  ? @imagecreatefromgif($file)  : (
@@ -258,34 +300,41 @@ 
 
     // OWN METHODS
 
-    protected function output_png(array $options=array()) {
+    protected function output_png(array $options=array())
+    {
         $file = isset($options['file']) ? $options['file'] : null;
         $quality = isset($options['quality']) ? $options['quality'] : null;
         $filters = isset($options['filters']) ? $options['filters'] : null;
-        if (($file === null) && !headers_sent())
-            header("Content-Type: image/png");
+        if (($file === null) && !headers_sent()) {
+                    header("Content-Type: image/png");
+        }
         @imagesavealpha($this->image, true);
         return imagepng($this->image, $file, $quality, $filters);
     }
 
-    protected function output_jpeg(array $options=array()) {
+    protected function output_jpeg(array $options=array())
+    {
         $file = isset($options['file']) ? $options['file'] : null;
         $quality = isset($options['quality'])
             ? $options['quality']
             : self::DEFAULT_JPEG_QUALITY;
-        if (($file === null) && !headers_sent())
-            header("Content-Type: image/jpeg");
+        if (($file === null) && !headers_sent()) {
+                    header("Content-Type: image/jpeg");
+        }
         return imagejpeg($this->image, $file, $quality);
     }
 
-    protected function output_gif(array $options=array()) {
+    protected function output_gif(array $options=array())
+    {
         $file = isset($options['file']) ? $options['file'] : null;
-        if (isset($options['file']) && !headers_sent())
-            header("Content-Type: image/gif");
+        if (isset($options['file']) && !headers_sent()) {
+                    header("Content-Type: image/gif");
+        }
         return imagegif($this->image, $file);
     }
 
-    protected function gdColor() {
+    protected function gdColor()
+    {
         $args = func_get_args();
 
         $exprRGB = '/^rgb\(\s*(\d{1,3})\s*\,\s*(\d{1,3})\s*\,\s*(\d{1,3})\s*\)$/i';
@@ -293,8 +342,9 @@ 
         $exprHex2 = '/^\#?([0-9a-f])([0-9a-f])([0-9a-f])$/i';
         $exprByte = '/^([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) {
             list($r, $g, $b) = $args[0];
@@ -321,15 +371,19 @@ 
         ) {
             list($r, $g, $b) = $args;
 
-        } else
-            return false;
+        } else {
+                    return false;
+        }
 
         return imagecolorallocate($this->image, $r, $g, $b);
     }
 
-    protected function imageFilledRectangle($x1, $y1, $x2, $y2, $color) {
+    protected function imageFilledRectangle($x1, $y1, $x2, $y2, $color)
+    {
         $color = $this->gdColor($color);
-        if ($color === false) return false;
+        if ($color === false) {
+            return false;
+        }
         return imageFilledRectangle($this->image, $x1, $y1, $x2, $y2, $color);
     }
 
@@ -338,15 +392,24 @@ 
     ) {
         $imageDetails = $this->buildImage($src);
 
-        if ($imageDetails === false)
-            return false;
+        if ($imageDetails === false) {
+                    return false;
+        }
 
         list($src, $srcWidth, $srcHeight) = $imageDetails;
 
-        if (is_null($dstW)) $dstW = $this->width - $dstW;
-        if (is_null($dstH)) $dstH = $this->height - $dstY;
-        if (is_null($srcW)) $srcW = $srcWidth - $srcX;
-        if (is_null($srcH)) $srcH = $srcHeight - $srcY;
+        if (is_null($dstW)) {
+            $dstW = $this->width - $dstW;
+        }
+        if (is_null($dstH)) {
+            $dstH = $this->height - $dstY;
+        }
+        if (is_null($srcW)) {
+            $srcW = $srcWidth - $srcX;
+        }
+        if (is_null($srcH)) {
+            $srcH = $srcHeight - $srcY;
+        }
         return imageCopyResampled($this->image, $src, $dstX, $dstY, $srcX, $srcY, $dstW, $dstH, $srcW, $srcH);
     }
 }