evolution-cms / evolution

manager/includes/controls/phpmailer/PHPMailer.php

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);
     }
 
     /**

manager/includes/version.inc.php

Spacing +3 added lines, -3 removed lines

@@ -1,5 +1,5 @@
 <?php
-$modx_version      = '1.5.0-beta';      // Current version number
-$modx_release_date = 'Jan 26, 2018';     // Date of release
-$modx_branch       = 'Evolution';        // Codebase name
+$modx_version      = '1.5.0-beta'; // Current version number
+$modx_release_date = 'Jan 26, 2018'; // Date of release
+$modx_branch       = 'Evolution'; // Codebase name
 $modx_full_appname = "{$modx_branch} {$modx_version} ({$modx_release_date})";

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

Spacing +5 added lines, -5 removed lines

@@ -1,16 +1,16 @@
 <?php
 $pattern = '/<img[\s\n]+.*src=[\s\n]*"([^"]+\.(jpg|jpeg|png|gif))"[^>]+>/i';
-preg_match_all($pattern , $value , $images);
-if($opt==='')
+preg_match_all($pattern, $value, $images);
+if ($opt === '')
 {
-    if($images[1][0])  return $images[1][0];
+    if ($images[1][0])  return $images[1][0];
     else               return '';
 }
 else
 {
-    foreach($images[0] as $i=>$image)
+    foreach ($images[0] as $i=>$image)
     {
-        if(strpos($image,$opt)!==false) return $images[1][$i];
+        if (strpos($image, $opt) !== false) return $images[1][$i];
     }
 }
 

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

Spacing +1 added lines, -1 removed lines

@@ -1,2 +1,2 @@
 <?php
-return preg_replace_callback("~(\b\w+\b)~",function($m) use($wrapat) {return wordwrap($m[1],$wrapat,' ',1);},$value);
+return preg_replace_callback("~(\b\w+\b)~", function($m) use($wrapat) {return wordwrap($m[1], $wrapat, ' ', 1); },$value);

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

Spacing +6 added lines, -6 removed lines

@@ -1,21 +1,21 @@
 <?php
 $text = $modx->filter->parseDocumentSource($value);
-$text = str_replace(array("\r\n","\r"),"\n",$text);
+$text = str_replace(array("\r\n", "\r"), "\n", $text);
 
 $blockElms  = 'br,table,tbody,tr,td,th,thead,tfoot,caption,colgroup,div';
 $blockElms .= ',dl,dd,dt,ul,ol,li,pre,select,option,form,map,area,blockquote';
 $blockElms .= ',address,math,style,input,p,h1,h2,h3,h4,h5,h6,hr,object,param,embed';
 $blockElms .= ',noframes,noscript,section,article,aside,hgroup,footer,address,code';
 $blockElms = explode(',', $blockElms);
-$lines = explode("\n",$text);
+$lines = explode("\n", $text);
 $c = count($lines);
-foreach($lines as $i=>$line)
+foreach ($lines as $i=>$line)
 {
     $line = rtrim($line);
-    if($i===$c-1) break;
-    foreach($blockElms as $block)
+    if ($i === $c - 1) break;
+    foreach ($blockElms as $block)
     {
-        if(preg_match("@</?{$block}" . '[^>]*>$@',$line))
+        if (preg_match("@</?{$block}".'[^>]*>$@', $line))
             continue 2;
     }
     $lines[$i] = "{$line}<br />";

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

Spacing +7 added lines, -7 removed lines

@@ -2,22 +2,22 @@
 $userID = abs($modx->getLoginUserID('web'));
 $modx->qs_hash = md5($modx->qs_hash."^{$userID}^");
 
-$groupNames = ($this->strlen($opt) > 0 ) ? explode(',',$opt) : array();
+$groupNames = ($this->strlen($opt) > 0) ? explode(',', $opt) : array();
 
 // if $groupNames is not an array return false
-if(!is_array($groupNames)) return 0;
+if (!is_array($groupNames)) return 0;
 
 // Creates an array with all webgroups the user id is in
 if (isset($modx->filter->cache['mo'][$userID])) $grpNames = $modx->filter->cache['mo'][$userID];
 else {
-    $from = sprintf("[+prefix+]webgroup_names wgn INNER JOIN [+prefix+]web_groups wg ON wg.webgroup=wgn.id AND wg.webuser='%s'",$userID);
-    $rs = $modx->db->select('wgn.name',$from);
-    $modx->filter->cache['mo'][$userID] = $grpNames = $modx->db->getColumn('name',$rs);
+    $from = sprintf("[+prefix+]webgroup_names wgn INNER JOIN [+prefix+]web_groups wg ON wg.webgroup=wgn.id AND wg.webuser='%s'", $userID);
+    $rs = $modx->db->select('wgn.name', $from);
+    $modx->filter->cache['mo'][$userID] = $grpNames = $modx->db->getColumn('name', $rs);
 }
 
 // Check if a supplied group matches a webgroup from the array we just created
-foreach($groupNames as $k=>$v) {
-    if(in_array(trim($v),$grpNames)) return 1;
+foreach ($groupNames as $k=>$v) {
+    if (in_array(trim($v), $grpNames)) return 1;
 }
 
 // If we get here the above logic did not find a match, so return false

install/actions/action_summary.php

Spacing +78 added lines, -78 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if( ! function_exists('f_owc')){
+if (!function_exists('f_owc')) {
     /**
      * @param $path
      * @param $data
@@ -12,30 +12,30 @@ 
             fwrite($hnd, $data);
             fclose($hnd);
 
-            if(null !== $mode) chmod($path, $mode);
-        }catch(Exception $e){
+            if (null !== $mode) chmod($path, $mode);
+        } catch (Exception $e) {
             // Nothing, this is NOT normal
             unset($e);
         }
     }
 }
 
-$installMode = isset($_POST['installmode']) ? (int)$_POST['installmode'] : 0;
-if( ! isset($_lang)) $_lang = array();
+$installMode = isset($_POST['installmode']) ? (int) $_POST['installmode'] : 0;
+if (!isset($_lang)) $_lang = array();
 
 echo '<div class="stepcontainer">
       <ul class="progressbar">
-          <li class="visited">' . $_lang['choose_language'] . '</li>
-          <li class="visited">' . $_lang['installation_mode'] . '</li>
-          <li class="visited">' . $_lang['optional_items'] . '</li>
-          <li class="active">' . $_lang['preinstall_validation'] . '</li>
-          <li>' . $_lang['install_results'] . '</li>
+          <li class="visited">' . $_lang['choose_language'].'</li>
+          <li class="visited">' . $_lang['installation_mode'].'</li>
+          <li class="visited">' . $_lang['optional_items'].'</li>
+          <li class="active">' . $_lang['preinstall_validation'].'</li>
+          <li>' . $_lang['install_results'].'</li>
   </ul>
   <div class="clearleft"></div>
 </div>';
 
-echo '<h2>' . $_lang['preinstall_validation'] . '</h2>';
-echo '<h3>' . $_lang['summary_setup_check'] . '</h3>';
+echo '<h2>'.$_lang['preinstall_validation'].'</h2>';
+echo '<h3>'.$_lang['summary_setup_check'].'</h3>';
 
 $errors = 0;
 
@@ -43,73 +43,73 @@ 
 // check PHP version
 define('PHP_MIN_VERSION', '5.4.0');
 $phpMinVersion = PHP_MIN_VERSION; // Maybe not necessary. For backward compatibility
-echo '<p>' . $_lang['checking_php_version'];
+echo '<p>'.$_lang['checking_php_version'];
 // -1 if left is less, 0 if equal, +1 if left is higher
 if (version_compare(phpversion(), PHP_MIN_VERSION) < 0) {
     $errors++;
-    $tmp = $_lang['you_running_php'] . phpversion() . str_replace('[+min_version+]', PHP_MIN_VERSION, $_lang["modx_requires_php"]);
-    echo '<span class="notok">' . $_lang['failed'] . '</span>' . $tmp . '</p>';
+    $tmp = $_lang['you_running_php'].phpversion().str_replace('[+min_version+]', PHP_MIN_VERSION, $_lang["modx_requires_php"]);
+    echo '<span class="notok">'.$_lang['failed'].'</span>'.$tmp.'</p>';
 } else {
-    echo '<span class="ok">' . $_lang['ok'] . '</span></p>';
+    echo '<span class="ok">'.$_lang['ok'].'</span></p>';
 }
 
 
 // check if iconv is available
-echo '<p>' . $_lang['checking_iconv'];
+echo '<p>'.$_lang['checking_iconv'];
 $iconv = (int) function_exists('iconv');
-if ($iconv == '0'){
-    echo '<span class="notok">' . $_lang['failed'].'</span></p><p><strong>'.$_lang['checking_iconv_note'].'</strong></p>';
+if ($iconv == '0') {
+    echo '<span class="notok">'.$_lang['failed'].'</span></p><p><strong>'.$_lang['checking_iconv_note'].'</strong></p>';
     $errors++;
 } else {
-    echo '<span class="ok">' . $_lang['ok'] . '</span></p>';
+    echo '<span class="ok">'.$_lang['ok'].'</span></p>';
 }
 // check sessions
-echo '<p>' . $_lang['checking_sessions'];
+echo '<p>'.$_lang['checking_sessions'];
 if ($_SESSION['test'] != 1) {
-    echo '<span class="notok">' . $_lang['failed'].  '</span></p>';
+    echo '<span class="notok">'.$_lang['failed'].'</span></p>';
     $errors++;
 } else {
-    echo '<span class="ok">' . $_lang['ok'] . '</span></p>';
+    echo '<span class="ok">'.$_lang['ok'].'</span></p>';
 }
 
 
 // check directories
 // cache exists?
-echo '<p>' . $_lang['checking_if_cache_exist'];
+echo '<p>'.$_lang['checking_if_cache_exist'];
 if (!file_exists("../assets/cache") || !file_exists("../assets/cache/rss")) {
-    echo '<span class="notok">' . $_lang['failed'] . '</span></p>';
+    echo '<span class="notok">'.$_lang['failed'].'</span></p>';
     $errors++;
 } else {
-    echo '<span class="ok">' . $_lang['ok'] . '</span></p>';
+    echo '<span class="ok">'.$_lang['ok'].'</span></p>';
 }
 
 
 // cache writable?
-echo '<p>' . $_lang['checking_if_cache_writable'];
+echo '<p>'.$_lang['checking_if_cache_writable'];
 if (!is_writable("../assets/cache")) {
     $errors++;
-    echo '<span class="notok">' . $_lang['failed'] . '</span></p>';
+    echo '<span class="notok">'.$_lang['failed'].'</span></p>';
 } else {
-    echo '<span class="ok">' . $_lang['ok'] . '</span></p>';
+    echo '<span class="ok">'.$_lang['ok'].'</span></p>';
 }
 
 
 // cache files writable?
-echo '<p>' . $_lang['checking_if_cache_file_writable'];
+echo '<p>'.$_lang['checking_if_cache_file_writable'];
 $tmp = "../assets/cache/siteCache.idx.php";
-if ( ! file_exists($tmp)) {
+if (!file_exists($tmp)) {
     f_owc($tmp, "<?php //EVO site cache file ?>");
 }
-if ( ! is_writable($tmp)) {
+if (!is_writable($tmp)) {
     $errors++;
-    echo '<span class="notok">' . $_lang['failed'] . '</span></p>';
+    echo '<span class="notok">'.$_lang['failed'].'</span></p>';
 } else {
     echo '<span class="ok">'.$_lang['ok'].'</span></p>';
 }
 
 
 echo '<p>'.$_lang['checking_if_cache_file2_writable'];
-if ( ! is_writable("../assets/cache/sitePublishing.idx.php")) {
+if (!is_writable("../assets/cache/sitePublishing.idx.php")) {
     $errors++;
     echo '<span class="notok">'.$_lang['failed'].'</span></p>';
 } else {
@@ -119,7 +119,7 @@ 
 
 // File Browser directories exists?
 echo '<p>'.$_lang['checking_if_images_exist'];
-switch(true){
+switch (true) {
     case !file_exists("../assets/images"):
     case !file_exists("../assets/files"):
     case !file_exists("../assets/backup"):
@@ -134,7 +134,7 @@ 
 
 // File Browser directories writable?
 echo '<p>'.$_lang['checking_if_images_writable'];
-switch(true){
+switch (true) {
     case !is_writable("../assets/images"):
     case !is_writable("../assets/files"):
     case !is_writable("../assets/backup"):
@@ -194,7 +194,7 @@ 
     $database_charset = substr($database_collation, 0, strpos($database_collation, '_') - 1);
     $database_connection_charset = $_POST['database_connection_charset'];
     $database_connection_method = $_POST['database_connection_method'];
-    $dbase = '`' . $_POST['database_name'] . '`';
+    $dbase = '`'.$_POST['database_name'].'`';
     $table_prefix = $_POST['tableprefix'];
 }
 echo '<p>'.$_lang['creating_database_connection'];
@@ -234,54 +234,54 @@ 
 
 // check table prefix
 if ($conn && $installMode == 0) {
-    echo '<p>' . $_lang['checking_table_prefix'] . $table_prefix . '`: ';
-    if ($rs= mysqli_query($conn, "SELECT COUNT(*) FROM $dbase.`" . $table_prefix . "site_content`")) {
-        echo '<span class="notok">' . $_lang['failed'] . '</span></b>' . $_lang['table_prefix_already_inuse'] . '</p>';
+    echo '<p>'.$_lang['checking_table_prefix'].$table_prefix.'`: ';
+    if ($rs = mysqli_query($conn, "SELECT COUNT(*) FROM $dbase.`".$table_prefix."site_content`")) {
+        echo '<span class="notok">'.$_lang['failed'].'</span></b>'.$_lang['table_prefix_already_inuse'].'</p>';
         $errors++;
-        echo "<p>" . $_lang['table_prefix_already_inuse_note'] . '</p>';
+        echo "<p>".$_lang['table_prefix_already_inuse_note'].'</p>';
     } else {
-        echo '<span class="ok">' . $_lang['ok'] . '</span></p>';
+        echo '<span class="ok">'.$_lang['ok'].'</span></p>';
     }
 } elseif ($conn && $installMode == 2) {
-    echo '<p>' . $_lang['checking_table_prefix'] . $table_prefix . '`: ';
-    if (!$rs = mysqli_query($conn, "SELECT COUNT(*) FROM $dbase.`" . $table_prefix . "site_content`")) {
-        echo '<span class="notok">' . $_lang['failed'] . '</span></b>' . $_lang['table_prefix_not_exist'] . '</p>';
+    echo '<p>'.$_lang['checking_table_prefix'].$table_prefix.'`: ';
+    if (!$rs = mysqli_query($conn, "SELECT COUNT(*) FROM $dbase.`".$table_prefix."site_content`")) {
+        echo '<span class="notok">'.$_lang['failed'].'</span></b>'.$_lang['table_prefix_not_exist'].'</p>';
         $errors++;
-        echo '<p>' . $_lang['table_prefix_not_exist_note'] . '</p>';
+        echo '<p>'.$_lang['table_prefix_not_exist_note'].'</p>';
   } else {
-        echo '<span class="ok">' . $_lang['ok'] . '</span></p>';
+        echo '<span class="ok">'.$_lang['ok'].'</span></p>';
   }
 }
 
 // check mysql version
 if ($conn) {
-    echo '<p>' . $_lang['checking_mysql_version'];
-    if ( version_compare(mysqli_get_server_info($conn), '5.0.51', '=') ) {
-        echo '<span class="notok">'  . $_lang['warning'] . '</span></b>&nbsp;&nbsp;<strong>' . $_lang['mysql_5051'] . '</strong></p>';
-        echo '<p><span class="notok">' . $_lang['mysql_5051_warning'] . '</span></p>';
+    echo '<p>'.$_lang['checking_mysql_version'];
+    if (version_compare(mysqli_get_server_info($conn), '5.0.51', '=')) {
+        echo '<span class="notok">'.$_lang['warning'].'</span></b>&nbsp;&nbsp;<strong>'.$_lang['mysql_5051'].'</strong></p>';
+        echo '<p><span class="notok">'.$_lang['mysql_5051_warning'].'</span></p>';
     } else {
-        echo '<span class="ok">' . $_lang['ok'] . '</span>&nbsp;&nbsp;<strong>' . $_lang['mysql_version_is'] . mysqli_get_server_info($conn) . '</strong></p>';
+        echo '<span class="ok">'.$_lang['ok'].'</span>&nbsp;&nbsp;<strong>'.$_lang['mysql_version_is'].mysqli_get_server_info($conn).'</strong></p>';
     }
 }
 
 // check for strict mode
 if ($conn) {
-    echo '<p>'. $_lang['checking_mysql_strict_mode'];
+    echo '<p>'.$_lang['checking_mysql_strict_mode'];
     $mysqlmode = mysqli_query($conn, "SELECT @@global.sql_mode");
-    if (mysqli_num_rows($mysqlmode) > 0){
+    if (mysqli_num_rows($mysqlmode) > 0) {
         $modes = mysqli_fetch_array($mysqlmode, MYSQLI_NUM);
         //$modes = array("STRICT_TRANS_TABLES"); // for testing
         // print_r($modes);
         foreach ($modes as $mode) {
             if (stristr($mode, "STRICT_TRANS_TABLES") !== false || stristr($mode, "STRICT_ALL_TABLES") !== false) {
-                echo '<span class="notok">' . $_lang['warning'] . '</span></b> <strong>&nbsp;&nbsp;' . $_lang['strict_mode'] . '</strong></p>';
-                echo '<p><span class="notok">' . $_lang['strict_mode_error'] . '</span></p>';
+                echo '<span class="notok">'.$_lang['warning'].'</span></b> <strong>&nbsp;&nbsp;'.$_lang['strict_mode'].'</strong></p>';
+                echo '<p><span class="notok">'.$_lang['strict_mode_error'].'</span></p>';
             } else {
-                echo '<span class="ok">' . $_lang['ok'] . '</span></p>';
+                echo '<span class="ok">'.$_lang['ok'].'</span></p>';
             }
         }
     } else {
-        echo '<span class="ok">' . $_lang['ok'] . '</span></p>';
+        echo '<span class="ok">'.$_lang['ok'].'</span></p>';
     }
 }
 // Version and strict mode check end
@@ -297,18 +297,18 @@ 
     f_owc("../assets/cache/installProc.inc.php", '<?php $installStartTime = '.time().'; ?>');
 }
 
-if($installMode > 0 && $_POST['installdata'] == "1") {
-    echo '<p class="notes"><strong>' . $_lang['sample_web_site'] . ':</strong> ' . $_lang['sample_web_site_note'] . '</p>';
+if ($installMode > 0 && $_POST['installdata'] == "1") {
+    echo '<p class="notes"><strong>'.$_lang['sample_web_site'].':</strong> '.$_lang['sample_web_site_note'].'</p>';
 }
 
 if ($errors > 0) {
     echo '<p>';
-    echo $_lang['setup_cannot_continue'] . ' ';
+    echo $_lang['setup_cannot_continue'].' ';
 
-    if($errors > 1){
-        echo $errors . " " . $_lang['errors'] . $_lang['please_correct_errors'] . $_lang['and_try_again_plural'];
-    }else{
-        echo $_lang['error'] . $_lang['please_correct_error'] . $_lang['and_try_again'];
+    if ($errors > 1) {
+        echo $errors." ".$_lang['errors'].$_lang['please_correct_errors'].$_lang['and_try_again_plural'];
+    } else {
+        echo $_lang['error'].$_lang['please_correct_error'].$_lang['and_try_again'];
     }
 
     echo $_lang['visit_forum'];
@@ -317,10 +317,10 @@ 
 
 echo '<p>&nbsp;</p>';
 
-$nextAction= $errors > 0 ? 'summary' : 'install';
-$nextButton= $errors > 0 ? $_lang['retry'] : $_lang['install'];
-$nextVisibility= $errors > 0 || isset($_POST['chkagree']) ? 'visible' : 'hidden';
-$agreeToggle= $errors > 0 ? '' : ' onclick="if(document.getElementById(\'chkagree\').checked){document.getElementById(\'nextbutton\').style.visibility=\'visible\';}else{document.getElementById(\'nextbutton\').style.visibility=\'hidden\';}"';
+$nextAction = $errors > 0 ? 'summary' : 'install';
+$nextButton = $errors > 0 ? $_lang['retry'] : $_lang['install'];
+$nextVisibility = $errors > 0 || isset($_POST['chkagree']) ? 'visible' : 'hidden';
+$agreeToggle = $errors > 0 ? '' : ' onclick="if(document.getElementById(\'chkagree\').checked){document.getElementById(\'nextbutton\').style.visibility=\'visible\';}else{document.getElementById(\'nextbutton\').style.visibility=\'hidden\';}"';
 ?>
 <form name="install" id="install_form" action="index.php?action=<?php echo $nextAction ?>" method="post">
   <div>
@@ -342,32 +342,32 @@ 
 
     <input type="hidden" value="<?php echo $_POST['installdata'] ?>" name="installdata" />
 <?php
-    $templates = isset ($_POST['template']) ? $_POST['template'] : array ();
+    $templates = isset ($_POST['template']) ? $_POST['template'] : array();
     foreach ($templates as $i => $template) echo '<input type="hidden" name="template[]" value="'.$template.'" />';
 
-    $tvs = isset ($_POST['tv']) ? $_POST['tv'] : array ();
+    $tvs = isset ($_POST['tv']) ? $_POST['tv'] : array();
     foreach ($tvs as $i => $tv) echo '<input type="hidden" name="tv[]" value="'.$tv.'" />';
 
-    $chunks = isset ($_POST['chunk']) ? $_POST['chunk'] : array ();
+    $chunks = isset ($_POST['chunk']) ? $_POST['chunk'] : array();
     foreach ($chunks as $i => $chunk) echo '<input type="hidden" name="chunk[]" value="'.$chunk.'" />';
 
-    $snippets = isset ($_POST['snippet']) ? $_POST['snippet'] : array ();
+    $snippets = isset ($_POST['snippet']) ? $_POST['snippet'] : array();
     foreach ($snippets as $i => $snippet) echo '<input type="hidden" name="snippet[]" value="'.$snippet.'" />';
 
-    $plugins = isset ($_POST['plugin']) ? $_POST['plugin'] : array ();
+    $plugins = isset ($_POST['plugin']) ? $_POST['plugin'] : array();
     foreach ($plugins as $i => $plugin) echo '<input type="hidden" name="plugin[]" value="'.$plugin.'" />';
 
-    $modules = isset ($_POST['module']) ? $_POST['module'] : array ();
+    $modules = isset ($_POST['module']) ? $_POST['module'] : array();
     foreach ($modules as $i => $module) echo '<input type="hidden" name="module[]" value="'.$module.'" />';
 ?>
 </div>
 
-<h2><?php echo $_lang['agree_to_terms'];?></h2>
+<h2><?php echo $_lang['agree_to_terms']; ?></h2>
 <p>
-<input type="checkbox" value="1" id="chkagree" name="chkagree" style="line-height:18px" <?php echo isset($_POST['chkagree']) ? 'checked="checked" ':""; ?><?php echo $agreeToggle;?>/><label for="chkagree" style="display:inline;float:none;line-height:18px;"> <?php echo $_lang['iagree_box']?> </label>
+<input type="checkbox" value="1" id="chkagree" name="chkagree" style="line-height:18px" <?php echo isset($_POST['chkagree']) ? 'checked="checked" ' : ""; ?><?php echo $agreeToggle; ?>/><label for="chkagree" style="display:inline;float:none;line-height:18px;"> <?php echo $_lang['iagree_box']?> </label>
 </p>
     <p class="buttonlinks">
         <a href="javascript:document.getElementById('install_form').action='index.php?action=options&language=<?php echo $install_language?>';document.getElementById('install_form').submit();" class="prev" title="<?php echo $_lang['btnback_value']?>"><span><?php echo $_lang['btnback_value']?></span></a>
-        <a id="nextbutton" href="javascript:document.getElementById('install_form').submit();" title="<?php echo $nextButton ?>" style="visibility:<?php echo $nextVisibility;?>"><span><?php echo $nextButton ?></span></a>
+        <a id="nextbutton" href="javascript:document.getElementById('install_form').submit();" title="<?php echo $nextButton ?>" style="visibility:<?php echo $nextVisibility; ?>"><span><?php echo $nextButton ?></span></a>
     </p>
 </form>

install/actions/action_mode.php

Spacing +11 added lines, -11 removed lines

@@ -1,8 +1,8 @@ 
 <?php
 // Determine upgradeability
 $upgradeable = 0;
-if (is_file($base_path . MGR_DIR . '/includes/config.inc.php')) { // Include the file so we can test its validity
-    include $base_path . MGR_DIR . '/includes/config.inc.php';
+if (is_file($base_path.MGR_DIR.'/includes/config.inc.php')) { // Include the file so we can test its validity
+    include $base_path.MGR_DIR.'/includes/config.inc.php';
     // We need to have all connection settings - tho prefix may be empty so we have to ignore it
     if (isset($dbase)) {
         if (!$conn = @mysqli_connect($database_server, $database_user, $database_password))
@@ -17,16 +17,16 @@ 
 }
 
 $ph['moduleName']       = $moduleName;
-$ph['displayNew']       = ($upgradeable!=0) ? 'display:none;' : '';
-$ph['displayUpg']       = ($upgradeable==0) ? 'display:none;' : '';
+$ph['displayNew']       = ($upgradeable != 0) ? 'display:none;' : '';
+$ph['displayUpg']       = ($upgradeable == 0) ? 'display:none;' : '';
 $ph['displayAdvUpg']    = $ph['displayUpg'];
-$ph['checkedNew']       = !$upgradeable     ? 'checked' : '';
-$ph['checkedUpg']       = ($_POST['installmode']==1 || $upgradeable==1) ? 'checked' : '';
-$ph['checkedAdvUpg']    = ($_POST['installmode']==2 || $upgradeable==2) ? 'checked' : '';
+$ph['checkedNew']       = !$upgradeable ? 'checked' : '';
+$ph['checkedUpg']       = ($_POST['installmode'] == 1 || $upgradeable == 1) ? 'checked' : '';
+$ph['checkedAdvUpg']    = ($_POST['installmode'] == 2 || $upgradeable == 2) ? 'checked' : '';
 $ph['install_language'] = $install_language;
-$ph['disabledUpg']      = ($upgradeable!=1) ? 'disabled' : '';
-$ph['disabledAdvUpg']   = ($upgradeable==0) ? 'disabled' : '';
+$ph['disabledUpg']      = ($upgradeable != 1) ? 'disabled' : '';
+$ph['disabledAdvUpg']   = ($upgradeable == 0) ? 'disabled' : '';
 
-$tpl = file_get_contents($base_path . 'install/actions/tpl_mode.html');
+$tpl = file_get_contents($base_path.'install/actions/tpl_mode.html');
 $content = parse($tpl, $ph);
-echo parse($content, $_lang,'[%','%]');
+echo parse($content, $_lang, '[%', '%]');

manager/media/rss/rss_utils.inc

Spacing +12 added lines, -12 removed lines

@@ -22,35 +22,35 @@
     NOTE: http://www.w3.org/TR/NOTE-datetime
 \*======================================================================*/
 
-function parse_w3cdtf ( $date_str ) {
+function parse_w3cdtf($date_str){
 
     # regex to match wc3dtf
     $pat = "/(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2})(:(\d{2}))?(?:([-+])(\d{2}):?(\d{2})|(Z))?/";
 
-    if ( preg_match( $pat, $date_str, $match ) ) {
-        list( $year, $month, $day, $hours, $minutes, $seconds) =
-            array( $match[1], $match[2], $match[3], $match[4], $match[5], $match[6]);
+    if (preg_match($pat, $date_str, $match)) {
+        list($year, $month, $day, $hours, $minutes, $seconds) =
+            array($match[1], $match[2], $match[3], $match[4], $match[5], $match[6]);
 
         # calc epoch for current date assuming GMT
-        $epoch = gmmktime( $hours, $minutes, $seconds, $month, $day, $year);
+        $epoch = gmmktime($hours, $minutes, $seconds, $month, $day, $year);
 
         $offset = 0;
-        if ( $match[10] == 'Z' ) {
+        if ($match[10] == 'Z') {
             # zulu time, aka GMT
         }
         else {
-            list( $tz_mod, $tz_hour, $tz_min ) =
-                array( $match[8], $match[9], $match[10]);
+            list($tz_mod, $tz_hour, $tz_min) =
+                array($match[8], $match[9], $match[10]);
 
             # zero out the variables
-            if ( ! $tz_hour ) { $tz_hour = 0; }
-            if ( ! $tz_min ) { $tz_min = 0; }
+            if (!$tz_hour) { $tz_hour = 0; }
+            if (!$tz_min) { $tz_min = 0; }
 
-            $offset_secs = (($tz_hour*60)+$tz_min)*60;
+            $offset_secs = (($tz_hour * 60) + $tz_min) * 60;
 
             # is timezone ahead of GMT?  then subtract offset
             #
-            if ( $tz_mod == '+' ) {
+            if ($tz_mod == '+') {
                 $offset_secs = $offset_secs * -1;
             }