nilsteampassnet / TeamPass

includes/libraries/Authentication/TwoFactorAuth/Providers/Qr/QRServerProvider.php

Doc Comments +3 added lines

@@ -51,6 +51,9 @@
         return $this->getContent($this->getUrl($qrtext, $size));
     }
     
+    /**
+     * @param string $value
+     */
     private function decodeColor($value) 
     {
         return vsprintf('%d-%d-%d', sscanf($value, "%02x%02x%02x"));

Spacing +8 added lines, -8 removed lines

@@ -59,13 +59,13 @@
     public function getUrl($qrtext, $size) 
     {
         return 'https://api.qrserver.com/v1/create-qr-code/'
-            . '?size=' . $size . 'x' . $size
-            . '&ecc=' . strtoupper($this->errorcorrectionlevel)
-            . '&margin=' . $this->margin
-            . '&qzone=' . $this->qzone
-            . '&bgcolor=' . $this->decodeColor($this->bgcolor)
-            . '&color=' . $this->decodeColor($this->color)
-            . '&format=' . strtolower($this->format)
-            . '&data=' . rawurlencode($qrtext);
+            . '?size='.$size.'x'.$size
+            . '&ecc='.strtoupper($this->errorcorrectionlevel)
+            . '&margin='.$this->margin
+            . '&qzone='.$this->qzone
+            . '&bgcolor='.$this->decodeColor($this->bgcolor)
+            . '&color='.$this->decodeColor($this->color)
+            . '&format='.strtolower($this->format)
+            . '&data='.rawurlencode($qrtext);
     }
 }
\ No newline at end of file

Braces +3 added lines, -2 removed lines

@@ -14,8 +14,9 @@
 
     function __construct($verifyssl = false, $errorcorrectionlevel = 'L', $margin = 4, $qzone = 1, $bgcolor = 'ffffff', $color = '000000', $format = 'png') 
     {
-        if (!is_bool($verifyssl))
-            throw new QRException('VerifySSL must be bool');
+        if (!is_bool($verifyssl)) {
+                    throw new QRException('VerifySSL must be bool');
+        }
 
         $this->verifyssl = $verifyssl;
         

Indentation +6 added lines, -6 removed lines

@@ -32,16 +32,16 @@
     {
         switch (strtolower($this->format))
         {
-        	case 'png':
+            case 'png':
                 return 'image/png';
-        	case 'gif':
+            case 'gif':
                 return 'image/gif';
-        	case 'jpg':
-        	case 'jpeg':
+            case 'jpg':
+            case 'jpeg':
                 return 'image/jpeg';
-        	case 'svg':
+            case 'svg':
                 return 'image/svg+xml';
-        	case 'eps':
+            case 'eps':
                 return 'application/postscript';
         }
         throw new \QRException(sprintf('Unknown MIME-type: %s', $this->format));

includes/libraries/Authentication/TwoFactorAuth/TwoFactorAuth.php

Doc Comments +1 added lines

@@ -139,6 +139,7 @@
 
     /**
      * Get data-uri of QRCode
+     * @param string $label
      */
     public function getQRCodeImageAsDataUri($label, $secret, $size = 200)
     {

Spacing +18 added lines, -18 removed lines

@@ -36,7 +36,7 @@ 
 
         $algorithm = strtolower(trim($algorithm));
         if (!in_array($algorithm, self::$_supportedalgos))
-            throw new TwoFactorAuthException('Unsupported algorithm: ' . $algorithm);
+            throw new TwoFactorAuthException('Unsupported algorithm: '.$algorithm);
         $this->algorithm = $algorithm;
         $this->qrcodeprovider = $qrcodeprovider;
         $this->rngprovider = $rngprovider;
@@ -52,13 +52,13 @@ 
     public function createSecret($bits = 80, $requirecryptosecure = true)
     {
         $secret = '';
-        $bytes = ceil($bits / 5);   //We use 5 bits of each byte (since we have a 32-character 'alphabet' / BASE32)
+        $bytes = ceil($bits / 5); //We use 5 bits of each byte (since we have a 32-character 'alphabet' / BASE32)
         $rngprovider = $this->getRngprovider();
         if ($requirecryptosecure && !$rngprovider->isCryptographicallySecure())
             throw new TwoFactorAuthException('RNG provider is not cryptographically secure');
         $rnd = $rngprovider->getRandomBytes($bytes);
         for ($i = 0; $i < $bytes; $i++)
-            $secret .= self::$_base32[ord($rnd[$i]) & 31];  //Mask out left 3 bits for 0-31 values
+            $secret .= self::$_base32[ord($rnd[$i]) & 31]; //Mask out left 3 bits for 0-31 values
         return $secret;
     }
 
@@ -69,11 +69,11 @@ 
     {
         $secretkey = $this->base32Decode($secret);
 
-        $timestamp = "\0\0\0\0" . pack('N*', $this->getTimeSlice($this->getTime($time)));  // Pack time into binary string
-        $hashhmac = hash_hmac($this->algorithm, $timestamp, $secretkey, true);             // Hash it with users secret key
-        $hashpart = substr($hashhmac, ord(substr($hashhmac, -1)) & 0x0F, 4);               // Use last nibble of result as index/offset and grab 4 bytes of the result
-        $value = unpack('N', $hashpart);                                                   // Unpack binary value
-        $value = $value[1] & 0x7FFFFFFF;                                                   // Drop MSB, keep only 31 bits
+        $timestamp = "\0\0\0\0".pack('N*', $this->getTimeSlice($this->getTime($time))); // Pack time into binary string
+        $hashhmac = hash_hmac($this->algorithm, $timestamp, $secretkey, true); // Hash it with users secret key
+        $hashpart = substr($hashhmac, ord(substr($hashhmac, -1)) & 0x0F, 4); // Use last nibble of result as index/offset and grab 4 bytes of the result
+        $value = unpack('N', $hashpart); // Unpack binary value
+        $value = $value[1] & 0x7FFFFFFF; // Drop MSB, keep only 31 bits
 
         return str_pad($value % pow(10, $this->digits), $this->digits, '0', STR_PAD_LEFT);
     }
@@ -90,7 +90,7 @@ 
         for ($i = -$discrepancy; $i <= $discrepancy; $i++)
             $result |= $this->codeEquals($this->getCode($secret, $timetamp + ($i * $this->period)), $code);
 
-        return (bool)$result;
+        return (bool) $result;
     }
 
     /**
@@ -102,7 +102,7 @@ 
         }
         // In general, it's not possible to prevent length leaks. So it's OK to leak the length. The important part is that
         // we don't leak information about the difference of the two strings.
-        if (strlen($safe)===strlen($user)) {
+        if (strlen($safe) === strlen($user)) {
             $result = 0;
             for ($i = 0; $i < strlen($safe); $i++)
                 $result |= (ord($safe[$i]) ^ ord($user[$i]));
@@ -161,7 +161,7 @@ 
 
     private function getTimeSlice($time = null, $offset = 0)
     {
-        return (int)floor($time / $this->period) + ($offset * $this->period);
+        return (int) floor($time / $this->period) + ($offset * $this->period);
     }
 
     /**
@@ -169,17 +169,17 @@ 
      */
     public function getQRText($label, $secret)
     {
-        return 'otpauth://totp/' . rawurlencode($label)
-            . '?secret=' . rawurlencode($secret)
-            . '&issuer=' . rawurlencode($this->issuer)
-            . '&period=' . intval($this->period)
-            . '&algorithm=' . rawurlencode(strtoupper($this->algorithm))
-            . '&digits=' . intval($this->digits);
+        return 'otpauth://totp/'.rawurlencode($label)
+            . '?secret='.rawurlencode($secret)
+            . '&issuer='.rawurlencode($this->issuer)
+            . '&period='.intval($this->period)
+            . '&algorithm='.rawurlencode(strtoupper($this->algorithm))
+            . '&digits='.intval($this->digits);
     }
 
     private function base32Decode($value)
     {
-        if (strlen($value)==0) return '';
+        if (strlen($value) == 0) return '';
 
         if (preg_match('/[^'.preg_quote(self::$_base32dict).']/', $value) !== 0)
             throw new TwoFactorAuthException('Invalid base32 string');

Braces +49 added lines, -31 removed lines

@@ -26,17 +26,20 @@ 
     function __construct($issuer = null, $digits = 6, $period = 30, $algorithm = 'sha1', IQRCodeProvider $qrcodeprovider = null, IRNGProvider $rngprovider = null, ITimeProvider $timeprovider = null)
     {
         $this->issuer = $issuer;
-        if (!is_int($digits) || $digits <= 0)
-            throw new TwoFactorAuthException('Digits must be int > 0');
+        if (!is_int($digits) || $digits <= 0) {
+                    throw new TwoFactorAuthException('Digits must be int > 0');
+        }
         $this->digits = $digits;
 
-        if (!is_int($period) || $period <= 0)
-            throw new TwoFactorAuthException('Period must be int > 0');
+        if (!is_int($period) || $period <= 0) {
+                    throw new TwoFactorAuthException('Period must be int > 0');
+        }
         $this->period = $period;
 
         $algorithm = strtolower(trim($algorithm));
-        if (!in_array($algorithm, self::$_supportedalgos))
-            throw new TwoFactorAuthException('Unsupported algorithm: ' . $algorithm);
+        if (!in_array($algorithm, self::$_supportedalgos)) {
+                    throw new TwoFactorAuthException('Unsupported algorithm: ' . $algorithm);
+        }
         $this->algorithm = $algorithm;
         $this->qrcodeprovider = $qrcodeprovider;
         $this->rngprovider = $rngprovider;
@@ -54,11 +57,14 @@ 
         $secret = '';
         $bytes = ceil($bits / 5);   //We use 5 bits of each byte (since we have a 32-character 'alphabet' / BASE32)
         $rngprovider = $this->getRngprovider();
-        if ($requirecryptosecure && !$rngprovider->isCryptographicallySecure())
-            throw new TwoFactorAuthException('RNG provider is not cryptographically secure');
+        if ($requirecryptosecure && !$rngprovider->isCryptographicallySecure()) {
+                    throw new TwoFactorAuthException('RNG provider is not cryptographically secure');
+        }
         $rnd = $rngprovider->getRandomBytes($bytes);
-        for ($i = 0; $i < $bytes; $i++)
-            $secret .= self::$_base32[ord($rnd[$i]) & 31];  //Mask out left 3 bits for 0-31 values
+        for ($i = 0; $i < $bytes; $i++) {
+                    $secret .= self::$_base32[ord($rnd[$i]) & 31];
+        }
+        //Mask out left 3 bits for 0-31 values
         return $secret;
     }
 
@@ -87,8 +93,9 @@ 
         $timetamp = $this->getTime($time);
 
         // To keep safe from timing-attachs we iterate *all* possible codes even though we already may have verified a code is correct
-        for ($i = -$discrepancy; $i <= $discrepancy; $i++)
-            $result |= $this->codeEquals($this->getCode($secret, $timetamp + ($i * $this->period)), $code);
+        for ($i = -$discrepancy; $i <= $discrepancy; $i++) {
+                    $result |= $this->codeEquals($this->getCode($secret, $timetamp + ($i * $this->period)), $code);
+        }
 
         return (bool)$result;
     }
@@ -104,8 +111,9 @@ 
         // we don't leak information about the difference of the two strings.
         if (strlen($safe)===strlen($user)) {
             $result = 0;
-            for ($i = 0; $i < strlen($safe); $i++)
-                $result |= (ord($safe[$i]) ^ ord($user[$i]));
+            for ($i = 0; $i < strlen($safe); $i++) {
+                            $result |= (ord($safe[$i]) ^ ord($user[$i]));
+            }
             return $result === 0;
         }
         return false;
@@ -116,8 +124,9 @@ 
      */
     public function getQRCodeImageAsDataUri($label, $secret, $size = 200)
     {
-        if (!is_int($size) || $size <= 0)
-            throw new TwoFactorAuthException('Size must be int > 0');
+        if (!is_int($size) || $size <= 0) {
+                    throw new TwoFactorAuthException('Size must be int > 0');
+        }
 
         $qrcodeprovider = $this->getQrCodeProvider();
         return 'data:'
@@ -131,26 +140,30 @@ 
      */
     public function ensureCorrectTime(array $timeproviders = null, $leniency = 5)
     {
-        if ($timeproviders != null && !is_array($timeproviders))
-            throw new TwoFactorAuthException('No timeproviders specified');
+        if ($timeproviders != null && !is_array($timeproviders)) {
+                    throw new TwoFactorAuthException('No timeproviders specified');
+        }
 
-        if ($timeproviders == null)
-            $timeproviders = array(
+        if ($timeproviders == null) {
+                    $timeproviders = array(
                 new Providers\Time\ConvertUnixTimeDotComTimeProvider(),
                 new Providers\Time\HttpTimeProvider()
             );
+        }
 
         // Get default time provider
         $timeprovider = $this->getTimeProvider();
 
         // Iterate specified time providers
         foreach ($timeproviders as $t) {
-            if (!($t instanceof ITimeProvider))
-                throw new TwoFactorAuthException('Object does not implement ITimeProvider');
+            if (!($t instanceof ITimeProvider)) {
+                            throw new TwoFactorAuthException('Object does not implement ITimeProvider');
+            }
 
             // Get time from default time provider and compare to specific time provider and throw if time difference is more than specified number of seconds leniency
-            if (abs($timeprovider->getTime() - $t->getTime()) > $leniency)
-                throw new TwoFactorAuthException(sprintf('Time for timeprovider is off by more than %d seconds when compared to %s', $leniency, get_class($t)));
+            if (abs($timeprovider->getTime() - $t->getTime()) > $leniency) {
+                            throw new TwoFactorAuthException(sprintf('Time for timeprovider is off by more than %d seconds when compared to %s', $leniency, get_class($t)));
+            }
         }
     }
 
@@ -179,23 +192,28 @@ 
 
     private function base32Decode($value)
     {
-        if (strlen($value)==0) return '';
+        if (strlen($value)==0) {
+            return '';
+        }
 
-        if (preg_match('/[^'.preg_quote(self::$_base32dict).']/', $value) !== 0)
-            throw new TwoFactorAuthException('Invalid base32 string');
+        if (preg_match('/[^'.preg_quote(self::$_base32dict).']/', $value) !== 0) {
+                    throw new TwoFactorAuthException('Invalid base32 string');
+        }
 
         $buffer = '';
         foreach (str_split($value) as $char)
         {
-            if ($char !== '=')
-                $buffer .= str_pad(decbin(self::$_base32lookup[$char]), 5, 0, STR_PAD_LEFT);
+            if ($char !== '=') {
+                            $buffer .= str_pad(decbin(self::$_base32lookup[$char]), 5, 0, STR_PAD_LEFT);
+            }
         }
         $length = strlen($buffer);
         $blocks = trim(chunk_split(substr($buffer, 0, $length - ($length % 8)), 8, ' '));
 
         $output = '';
-        foreach (explode(' ', $blocks) as $block)
-            $output .= chr(bindec(str_pad($block, 8, 0, STR_PAD_RIGHT)));
+        foreach (explode(' ', $blocks) as $block) {
+                    $output .= chr(bindec(str_pad($block, 8, 0, STR_PAD_RIGHT)));
+        }
         return $output;
     }
 

includes/libraries/Email/Phpmailer/class.pop3.php

Doc Comments +1 added lines, -1 removed lines

@@ -200,7 +200,7 @@
      * Connect to a POP3 server.
      * @access public
      * @param string $host
-     * @param integer|boolean $port
+     * @param integer $port
      * @param integer $tval
      * @return boolean
      */

Spacing +4 added lines, -4 removed lines

@@ -169,13 +169,13 @@ 
         if (false === $port) {
             $this->port = $this->POP3_PORT;
         } else {
-            $this->port = (integer)$port;
+            $this->port = (integer) $port;
         }
         // If no timeout value provided, use default
         if (false === $timeout) {
             $this->tval = $this->POP3_TIMEOUT;
         } else {
-            $this->tval = (integer)$timeout;
+            $this->tval = (integer) $timeout;
         }
         $this->do_debug = $debug_level;
         $this->username = $username;
@@ -276,11 +276,11 @@ 
         }
 
         // Send the Username
-        $this->sendString("USER $username" . self::CRLF);
+        $this->sendString("USER $username".self::CRLF);
         $pop3_response = $this->getResponse();
         if ($this->checkResponse($pop3_response)) {
             // Send the Password
-            $this->sendString("PASS $password" . self::CRLF);
+            $this->sendString("PASS $password".self::CRLF);
             $pop3_response = $this->getResponse();
             if ($this->checkResponse($pop3_response)) {
                 return true;

includes/libraries/Authentication/TwoFactorAuth/Providers/Qr/QRicketProvider.php

Spacing +6 added lines, -6 removed lines

@@ -44,11 +44,11 @@
     public function getUrl($qrtext, $size) 
     {
         return 'http://qrickit.com/api/qr'
-            . '?qrsize=' . $size
-            . '&e=' . strtolower($this->errorcorrectionlevel)
-            . '&bgdcolor=' . $this->bgcolor
-            . '&fgdcolor=' . $this->color
-            . '&t=' . strtolower($this->format)
-            . '&d=' . rawurlencode($qrtext);
+            . '?qrsize='.$size
+            . '&e='.strtolower($this->errorcorrectionlevel)
+            . '&bgdcolor='.$this->bgcolor
+            . '&fgdcolor='.$this->color
+            . '&t='.strtolower($this->format)
+            . '&d='.rawurlencode($qrtext);
     }
 }
\ No newline at end of file

Indentation +3 added lines, -3 removed lines

@@ -27,11 +27,11 @@
     {
         switch (strtolower($this->format))
         {
-        	case 'p':
+            case 'p':
                 return 'image/png';
-        	case 'g':
+            case 'g':
                 return 'image/gif';
-        	case 'j':
+            case 'j':
                 return 'image/jpeg';
         }
         throw new \QRException(sprintf('Unknown MIME-type: %s', $this->format));

includes/libraries/Authentication/TwoFactorAuth/Providers/Rng/CSRNGProvider.php

Spacing +1 added lines, -1 removed lines

@@ -6,7 +6,7 @@
 class CSRNGProvider implements IRNGProvider
 {
     public function getRandomBytes($bytecount) {
-        return random_bytes($bytecount);    // PHP7+
+        return random_bytes($bytecount); // PHP7+
     }
 
     public function isCryptographicallySecure() {

includes/libraries/Email/Phpmailer/language/phpmailer.lang-ar.php

Indentation +1 added lines, -1 removed lines

@@ -19,7 +19,7 @@
 $PHPMAILER_LANG['mailer_not_supported'] = ' برنامج الإرسال غير مدعوم.';
 $PHPMAILER_LANG['provide_address']      = 'يجب توفير عنوان البريد الإلكتروني لمستلم واحد على الأقل.';
 $PHPMAILER_LANG['recipients_failed']    = 'خطأ SMTP: الأخطاء التالية ' .
-                                          'فشل في الارسال لكل من : ';
+                                            'فشل في الارسال لكل من : ';
 $PHPMAILER_LANG['signing']              = 'خطأ في التوقيع: ';
 $PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP Connect() غير ممكن.';
 $PHPMAILER_LANG['smtp_error']           = 'خطأ على مستوى الخادم SMTP: ';

Spacing +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
 $PHPMAILER_LANG['invalid_address']      = 'الإرسال غير ممكن لأن عنوان البريد الإلكتروني غير صالح: ';
 $PHPMAILER_LANG['mailer_not_supported'] = ' برنامج الإرسال غير مدعوم.';
 $PHPMAILER_LANG['provide_address']      = 'يجب توفير عنوان البريد الإلكتروني لمستلم واحد على الأقل.';
-$PHPMAILER_LANG['recipients_failed']    = 'خطأ SMTP: الأخطاء التالية ' .
+$PHPMAILER_LANG['recipients_failed']    = 'خطأ SMTP: الأخطاء التالية '.
                                           'فشل في الارسال لكل من : ';
 $PHPMAILER_LANG['signing']              = 'خطأ في التوقيع: ';
 $PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP Connect() غير ممكن.';

includes/libraries/Email/Phpmailer/class.smtp.php

Spacing +34 added lines, -34 removed lines

@@ -227,21 +227,21 @@ 
                 break;
             case 'html':
                 //Cleans up output a bit for a better looking, HTML-safe output
-                echo gmdate('Y-m-d H:i:s') . ' ' . htmlentities(
+                echo gmdate('Y-m-d H:i:s').' '.htmlentities(
                     preg_replace('/[\r\n]+/', '', $str),
                     ENT_QUOTES,
                     'UTF-8'
-                ) . "<br>\n";
+                )."<br>\n";
                 break;
             case 'echo':
             default:
                 //Normalize line breaks
                 $str = preg_replace('/(\r\n|\r|\n)/ms', "\n", $str);
-                echo gmdate('Y-m-d H:i:s') . "\t" . str_replace(
+                echo gmdate('Y-m-d H:i:s')."\t".str_replace(
                     "\n",
                     "\n                   \t                  ",
                     trim($str)
-                ) . "\n";
+                )."\n";
         }
     }
 
@@ -275,7 +275,7 @@ 
         }
         // Connect to the SMTP server
         $this->edebug(
-            "Connection: opening to $host:$port, timeout=$timeout, options=" .
+            "Connection: opening to $host:$port, timeout=$timeout, options=".
             var_export($options, true),
             self::DEBUG_CONNECTION
         );
@@ -285,7 +285,7 @@ 
             $socket_context = stream_context_create($options);
             set_error_handler(array($this, 'errorHandler'));
             $this->smtp_conn = stream_socket_client(
-                $host . ":" . $port,
+                $host.":".$port,
                 $errno,
                 $errstr,
                 $timeout,
@@ -317,7 +317,7 @@ 
                 $errstr
             );
             $this->edebug(
-                'SMTP ERROR: ' . $this->error['error']
+                'SMTP ERROR: '.$this->error['error']
                 . ": $errstr ($errno)",
                 self::DEBUG_CLIENT
             );
@@ -336,7 +336,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;
     }
 
@@ -406,9 +406,9 @@ 
                 return false;
             }
 
-            self::edebug('Auth method requested: ' . ($authtype ? $authtype : 'UNKNOWN'), self::DEBUG_LOWLEVEL);
+            self::edebug('Auth method requested: '.($authtype ? $authtype : 'UNKNOWN'), self::DEBUG_LOWLEVEL);
             self::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
             );
 
@@ -423,7 +423,7 @@ 
                     $this->setError('No supported authentication methods found');
                     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'])) {
@@ -442,7 +442,7 @@ 
                 // Send encoded username and password
                 if (!$this->sendCommand(
                     'User & Password',
-                    base64_encode("\0" . $username . "\0" . $password),
+                    base64_encode("\0".$username."\0".$password),
                     235
                 )
                 ) {
@@ -470,7 +470,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;
@@ -501,7 +501,7 @@ 
 
                 if (!$this->sendCommand(
                     'AUTH NTLM',
-                    'AUTH NTLM ' . base64_encode($msg1),
+                    'AUTH NTLM '.base64_encode($msg1),
                     334
                 )
                 ) {
@@ -533,7 +533,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);
@@ -577,7 +577,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)));
     }
 
     /**
@@ -689,7 +689,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;
@@ -698,9 +698,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 . self::CRLF);
+                $this->client_send($line_out.self::CRLF);
             }
         }
 
@@ -727,7 +727,7 @@ 
     public function hello($host = '')
     {
         //Try extended hello first (RFC 2821)
-        return (boolean)($this->sendHello('EHLO', $host) or $this->sendHello('HELO', $host));
+        return (boolean) ($this->sendHello('EHLO', $host) or $this->sendHello('HELO', $host));
     }
 
     /**
@@ -741,7 +741,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);
@@ -809,7 +809,7 @@ 
         $useVerp = ($this->do_verp ? ' XVERP' : '');
         return $this->sendCommand(
             'MAIL FROM',
-            'MAIL FROM:<' . $from . '>' . $useVerp,
+            'MAIL FROM:<'.$from.'>'.$useVerp,
             250
         );
     }
@@ -846,7 +846,7 @@ 
     {
         return $this->sendCommand(
             'RCPT TO',
-            'RCPT TO:<' . $address . '>',
+            'RCPT TO:<'.$address.'>',
             array(250, 251)
         );
     }
@@ -882,7 +882,7 @@ 
             $this->setError("Command '$command' contained line breaks");
             return false;
         }
-        $this->client_send($commandstring . self::CRLF);
+        $this->client_send($commandstring.self::CRLF);
 
         $this->last_reply = $this->get_lines();
         // Fetch SMTP code and possible error code explanation
@@ -892,8 +892,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
             );
@@ -904,9 +904,9 @@ 
             $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)) {
+        if (!in_array($code, (array) $expect)) {
             $this->setError(
                 "$command command failed",
                 $detail,
@@ -914,7 +914,7 @@ 
                 $code_ex
             );
             $this->edebug(
-                'SMTP ERROR: ' . $this->error['error'] . ': ' . $this->last_reply,
+                'SMTP ERROR: '.$this->error['error'].': '.$this->last_reply,
                 self::DEBUG_CLIENT
             );
             return false;
@@ -976,7 +976,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;
     }
 
@@ -1102,7 +1102,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;
@@ -1110,8 +1110,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;
@@ -1225,7 +1225,7 @@ 
             $errmsg
         );
         $this->edebug(
-            $notice . ' Error #' . $errno . ': ' . $errmsg . " [$errfile line $errline]",
+            $notice.' Error #'.$errno.': '.$errmsg." [$errfile line $errline]",
             self::DEBUG_CONNECTION
         );
     }

includes/libraries/Email/Phpmailer/class.phpmailer.php

Spacing +167 added lines, -168 removed lines

@@ -657,7 +657,7 @@ 
     public function __construct($exceptions = null)
     {
         if ($exceptions !== null) {
-            $this->exceptions = (boolean)$exceptions;
+            $this->exceptions = (boolean) $exceptions;
         }
     }
 
@@ -736,11 +736,11 @@ 
             default:
                 //Normalize line breaks
                 $str = preg_replace('/\r\n?/ms', "\n", $str);
-                echo gmdate('Y-m-d H:i:s') . "\t" . str_replace(
+                echo gmdate('Y-m-d H:i:s')."\t".str_replace(
                     "\n",
                     "\n                   \t                  ",
                     trim($str)
-                ) . "\n";
+                )."\n";
         }
     }
 
@@ -872,7 +872,7 @@ 
         $name = trim(preg_replace('/[\r\n]+/', '', $name)); //Strip breaks and trim
         if (($pos = strrpos($address, '@')) === false) {
             // At-sign is misssing.
-            $error_message = $this->lang('invalid_address') . " (addAnAddress $kind): $address";
+            $error_message = $this->lang('invalid_address')." (addAnAddress $kind): $address";
             $this->setError($error_message);
             $this->edebug($error_message);
             if ($this->exceptions) {
@@ -913,7 +913,7 @@ 
     protected function addAnAddress($kind, $address, $name = '')
     {
         if (!in_array($kind, array('to', 'cc', 'bcc', 'Reply-To'))) {
-            $error_message = $this->lang('Invalid recipient kind: ') . $kind;
+            $error_message = $this->lang('Invalid recipient kind: ').$kind;
             $this->setError($error_message);
             $this->edebug($error_message);
             if ($this->exceptions) {
@@ -922,7 +922,7 @@ 
             return false;
         }
         if (!$this->validateAddress($address)) {
-            $error_message = $this->lang('invalid_address') . " (addAnAddress $kind): $address";
+            $error_message = $this->lang('invalid_address')." (addAnAddress $kind): $address";
             $this->setError($error_message);
             $this->edebug($error_message);
             if ($this->exceptions) {
@@ -963,10 +963,10 @@ 
             $list = imap_rfc822_parse_adrlist($addrstr, '');
             foreach ($list as $address) {
                 if ($address->host != '.SYNTAX-ERROR.') {
-                    if ($this->validateAddress($address->mailbox . '@' . $address->host)) {
+                    if ($this->validateAddress($address->mailbox.'@'.$address->host)) {
                         $addresses[] = array(
                             'name' => (property_exists($address, 'personal') ? $address->personal : ''),
-                            'address' => $address->mailbox . '@' . $address->host
+                            'address' => $address->mailbox.'@'.$address->host
                         );
                     }
                 }
@@ -1016,7 +1016,7 @@ 
         if (($pos = strrpos($address, '@')) === false or
             (!$this->has8bitChars(substr($address, ++$pos)) or !$this->idnSupported()) and
             !$this->validateAddress($address)) {
-            $error_message = $this->lang('invalid_address') . " (setFrom) $address";
+            $error_message = $this->lang('invalid_address')." (setFrom) $address";
             $this->setError($error_message);
             $this->edebug($error_message);
             if ($this->exceptions) {
@@ -1107,30 +1107,30 @@ 
                  * @copyright 2009-2010 Michael Rushton
                  * Feel free to use and redistribute this code. But please keep this copyright notice.
                  */
-                return (boolean)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}' .
+                return (boolean) 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-9]?[0-9])(?>\.(?9)){3}))\])(?1)$/isD',
                     $address
                 );
             case 'pcre':
                 //An older regex that doesn't need a recent PCRE
-                return (boolean)preg_match(
-                    '/^(?!(?>"?(?>\\\[ -~]|[^"])"?){255,})(?!(?>"?(?>\\\[ -~]|[^"])"?){65,}@)(?>' .
-                    '[!#-\'*+\/-9=?^-~-]+|"(?>(?>[\x01-\x08\x0B\x0C\x0E-!#-\[\]-\x7F]|\\\[\x00-\xFF]))*")' .
-                    '(?>\.(?>[!#-\'*+\/-9=?^-~-]+|"(?>(?>[\x01-\x08\x0B\x0C\x0E-!#-\[\]-\x7F]|\\\[\x00-\xFF]))*"))*' .
-                    '@(?>(?![a-z0-9-]{64,})(?>[a-z0-9](?>[a-z0-9-]*[a-z0-9])?)(?>\.(?![a-z0-9-]{64,})' .
-                    '(?>[a-z0-9](?>[a-z0-9-]*[a-z0-9])?)){0,126}|\[(?:(?>IPv6:(?>(?>[a-f0-9]{1,4})(?>:' .
-                    '[a-f0-9]{1,4}){7}|(?!(?:.*[a-f0-9][:\]]){8,})(?>[a-f0-9]{1,4}(?>:[a-f0-9]{1,4}){0,6})?' .
-                    '::(?>[a-f0-9]{1,4}(?>:[a-f0-9]{1,4}){0,6})?))|(?>(?>IPv6:(?>[a-f0-9]{1,4}(?>:' .
-                    '[a-f0-9]{1,4}){5}:|(?!(?:.*[a-f0-9]:){6,})(?>[a-f0-9]{1,4}(?>:[a-f0-9]{1,4}){0,4})?' .
-                    '::(?>(?:[a-f0-9]{1,4}(?>:[a-f0-9]{1,4}){0,4}):)?))?(?>25[0-5]|2[0-4][0-9]|1[0-9]{2}' .
+                return (boolean) preg_match(
+                    '/^(?!(?>"?(?>\\\[ -~]|[^"])"?){255,})(?!(?>"?(?>\\\[ -~]|[^"])"?){65,}@)(?>'.
+                    '[!#-\'*+\/-9=?^-~-]+|"(?>(?>[\x01-\x08\x0B\x0C\x0E-!#-\[\]-\x7F]|\\\[\x00-\xFF]))*")'.
+                    '(?>\.(?>[!#-\'*+\/-9=?^-~-]+|"(?>(?>[\x01-\x08\x0B\x0C\x0E-!#-\[\]-\x7F]|\\\[\x00-\xFF]))*"))*'.
+                    '@(?>(?![a-z0-9-]{64,})(?>[a-z0-9](?>[a-z0-9-]*[a-z0-9])?)(?>\.(?![a-z0-9-]{64,})'.
+                    '(?>[a-z0-9](?>[a-z0-9-]*[a-z0-9])?)){0,126}|\[(?:(?>IPv6:(?>(?>[a-f0-9]{1,4})(?>:'.
+                    '[a-f0-9]{1,4}){7}|(?!(?:.*[a-f0-9][:\]]){8,})(?>[a-f0-9]{1,4}(?>:[a-f0-9]{1,4}){0,6})?'.
+                    '::(?>[a-f0-9]{1,4}(?>:[a-f0-9]{1,4}){0,6})?))|(?>(?>IPv6:(?>[a-f0-9]{1,4}(?>:'.
+                    '[a-f0-9]{1,4}){5}:|(?!(?:.*[a-f0-9]:){6,})(?>[a-f0-9]{1,4}(?>:[a-f0-9]{1,4}){0,4})?'.
+                    '::(?>(?:[a-f0-9]{1,4}(?>:[a-f0-9]{1,4}){0,4}):)?))?(?>25[0-5]|2[0-4][0-9]|1[0-9]{2}'.
                     '|[1-9]?[0-9])(?>\.(?>25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9]?[0-9])){3}))\])$/isD',
                     $address
                 );
@@ -1139,8 +1139,8 @@ 
                  * This is the pattern used in the HTML5 spec for validation of 'email' type form input elements.
                  * @link http://www.whatwg.org/specs/web-apps/current-work/#e-mail-state-(type=email)
                  */
-                return (boolean)preg_match(
-                    '/^[a-zA-Z0-9.!#$%&\'*+\/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}' .
+                return (boolean) 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])?)*$/sD',
                     $address
                 );
@@ -1152,7 +1152,7 @@ 
                     and strpos($address, '@') != strlen($address) - 1);
             case 'php':
             default:
-                return (boolean)filter_var($address, FILTER_VALIDATE_EMAIL);
+                return (boolean) filter_var($address, FILTER_VALIDATE_EMAIL);
         }
     }
 
@@ -1189,9 +1189,8 @@ 
             if ($this->has8bitChars($domain) and @mb_check_encoding($domain, $this->CharSet)) {
                 $domain = mb_convert_encoding($domain, 'UTF-8', $this->CharSet);
                 if (($punycode = defined('INTL_IDNA_VARIANT_UTS46') ?
-                    idn_to_ascii($domain, 0, INTL_IDNA_VARIANT_UTS46) :
-                    idn_to_ascii($domain)) !== false) {
-                    return substr($address, 0, $pos) . $punycode;
+                    idn_to_ascii($domain, 0, INTL_IDNA_VARIANT_UTS46) : idn_to_ascii($domain)) !== false) {
+                    return substr($address, 0, $pos).$punycode;
                 }
             }
         }
@@ -1249,7 +1248,7 @@ 
                 }
                 $this->$address_kind = $this->punyencodeAddress($this->$address_kind);
                 if (!$this->validateAddress($this->$address_kind)) {
-                    $error_message = $this->lang('invalid_address') . ' (punyEncode) ' . $this->$address_kind;
+                    $error_message = $this->lang('invalid_address').' (punyEncode) '.$this->$address_kind;
                     $this->setError($error_message);
                     $this->edebug($error_message);
                     if ($this->exceptions) {
@@ -1300,12 +1299,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 ") . self::CRLF .
-                    str_replace("\r\n", "\n", $header_dkim) . self::CRLF;
+                $this->MIMEHeader = rtrim($this->MIMEHeader, "\r\n ").self::CRLF.
+                    str_replace("\r\n", "\n", $header_dkim).self::CRLF;
             }
             return true;
         } catch (phpmailerException $exc) {
@@ -1385,9 +1384,9 @@ 
         if ($this->SingleTo) {
             foreach ($this->SingleToArray as $toAddr) {
                 if (!@$mail = popen($sendmail, 'w')) {
-                    throw new phpmailerException($this->lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
+                    throw new phpmailerException($this->lang('execute').$this->Sendmail, self::STOP_CRITICAL);
                 }
-                fputs($mail, 'To: ' . $toAddr . "\n");
+                fputs($mail, 'To: '.$toAddr."\n");
                 fputs($mail, $header);
                 fputs($mail, $body);
                 $result = pclose($mail);
@@ -1401,12 +1400,12 @@ 
                     $this->From
                 );
                 if ($result != 0) {
-                    throw new phpmailerException($this->lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
+                    throw new phpmailerException($this->lang('execute').$this->Sendmail, self::STOP_CRITICAL);
                 }
             }
         } else {
             if (!@$mail = popen($sendmail, 'w')) {
-                throw new phpmailerException($this->lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
+                throw new phpmailerException($this->lang('execute').$this->Sendmail, self::STOP_CRITICAL);
             }
             fputs($mail, $header);
             fputs($mail, $body);
@@ -1421,7 +1420,7 @@ 
                 $this->From
             );
             if ($result != 0) {
-                throw new phpmailerException($this->lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
+                throw new phpmailerException($this->lang('execute').$this->Sendmail, self::STOP_CRITICAL);
             }
         }
         return true;
@@ -1546,7 +1545,7 @@ 
             $smtp_from = $this->From;
         }
         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 phpmailerException($this->ErrorInfo, self::STOP_CRITICAL);
         }
 
@@ -1565,7 +1564,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 phpmailerException($this->lang('data_not_accepted'), self::STOP_CRITICAL);
         }
         if ($this->SMTPKeepAlive) {
@@ -1578,10 +1577,10 @@ 
         if (count($bad_rcpt) > 0) {
             $errstr = '';
             foreach ($bad_rcpt as $bad) {
-                $errstr .= $bad['to'] . ': ' . $bad['error'];
+                $errstr .= $bad['to'].': '.$bad['error'];
             }
             throw new phpmailerException(
-                $this->lang('recipients_failed') . $errstr,
+                $this->lang('recipients_failed').$errstr,
                 self::STOP_CONTINUE
             );
         }
@@ -1653,11 +1652,11 @@ 
             }
             $host = $hostinfo[3];
             $port = $this->Port;
-            $tport = (integer)$hostinfo[4];
+            $tport = (integer) $hostinfo[4];
             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;
@@ -1772,14 +1771,14 @@ 
         );
         if (empty($lang_path)) {
             // Calculate an absolute path so it can work if CWD is not here
-            $lang_path = dirname(__FILE__). DIRECTORY_SEPARATOR . 'language'. DIRECTORY_SEPARATOR;
+            $lang_path = dirname(__FILE__).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 ($langcode != 'en') {
             // Make sure language file path is readable
@@ -1792,7 +1791,7 @@ 
             }
         }
         $this->language = $PHPMAILER_LANG;
-        return (boolean)$foundlang; // Returns false if language not found
+        return (boolean) $foundlang; // Returns false if language not found
     }
 
     /**
@@ -1820,7 +1819,7 @@ 
         foreach ($addr as $address) {
             $addresses[] = $this->addrFormat($address);
         }
-        return $type . ': ' . implode(', ', $addresses) . $this->LE;
+        return $type.': '.implode(', ', $addresses).$this->LE;
     }
 
     /**
@@ -1835,9 +1834,9 @@ 
         if (empty($addr[1])) { // No name provided
             return $this->secureHeader($addr[0]);
         } else {
-            return $this->encodeHeader($this->secureHeader($addr[1]), 'phrase') . ' <' . $this->secureHeader(
+            return $this->encodeHeader($this->secureHeader($addr[1]), 'phrase').' <'.$this->secureHeader(
                 $addr[0]
-            ) . '>';
+            ).'>';
         }
     }
 
@@ -1894,10 +1893,10 @@ 
                             }
                             $part = substr($word, 0, $len);
                             $word = substr($word, $len);
-                            $buf .= ' ' . $part;
-                            $message .= $buf . sprintf('=%s', self::CRLF);
+                            $buf .= ' '.$part;
+                            $message .= $buf.sprintf('=%s', self::CRLF);
                         } else {
-                            $message .= $buf . $soft_break;
+                            $message .= $buf.$soft_break;
                         }
                         $buf = '';
                     }
@@ -1917,7 +1916,7 @@ 
                         $word = substr($word, $len);
 
                         if (strlen($word) > 0) {
-                            $message .= $part . sprintf('=%s', self::CRLF);
+                            $message .= $part.sprintf('=%s', self::CRLF);
                         } else {
                             $buf = $part;
                         }
@@ -1930,13 +1929,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 . self::CRLF;
+            $message .= $buf.self::CRLF;
         }
 
         return $message;
@@ -2082,7 +2081,7 @@ 
         if ($this->XMailer == '') {
             $result .= $this->headerLine(
                 'X-Mailer',
-                'PHPMailer ' . $this->Version . ' (https://github.com/PHPMailer/PHPMailer)'
+                'PHPMailer '.$this->Version.' (https://github.com/PHPMailer/PHPMailer)'
             );
         } else {
             $myXmailer = trim($this->XMailer);
@@ -2092,7 +2091,7 @@ 
         }
 
         if ($this->ConfirmReadingTo != '') {
-            $result .= $this->headerLine('Disposition-Notification-To', '<' . $this->ConfirmReadingTo . '>');
+            $result .= $this->headerLine('Disposition-Notification-To', '<'.$this->ConfirmReadingTo.'>');
         }
 
         // Add custom headers
@@ -2122,23 +2121,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;
         }
@@ -2172,7 +2171,7 @@ 
      */
     public function getSentMIMEMessage()
     {
-        return rtrim($this->MIMEHeader . $this->mailHeader, "\n\r") . self::CRLF . self::CRLF . $this->MIMEBody;
+        return rtrim($this->MIMEHeader.$this->mailHeader, "\n\r").self::CRLF.self::CRLF.$this->MIMEBody;
     }
 
     /**
@@ -2195,12 +2194,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() . $this->LE;
+            $body .= $this->getMailMIME().$this->LE;
         }
 
         $this->setWordWrap();
@@ -2233,31 +2232,31 @@ 
             $altBodyEncoding = 'quoted-printable';
         }
         //Use this as a preamble in all multipart message types
-        $mimepre = "This is a multi-part message in MIME format." . $this->LE . $this->LE;
+        $mimepre = "This is a multi-part message in MIME format.".$this->LE.$this->LE;
         switch ($this->message_type) {
             case 'inline':
                 $body .= $mimepre;
                 $body .= $this->getBoundary($this->boundary[1], $bodyCharSet, '', $bodyEncoding);
                 $body .= $this->encodeString($this->Body, $bodyEncoding);
-                $body .= $this->LE . $this->LE;
+                $body .= $this->LE.$this->LE;
                 $body .= $this->attachAll('inline', $this->boundary[1]);
                 break;
             case 'attach':
                 $body .= $mimepre;
                 $body .= $this->getBoundary($this->boundary[1], $bodyCharSet, '', $bodyEncoding);
                 $body .= $this->encodeString($this->Body, $bodyEncoding);
-                $body .= $this->LE . $this->LE;
+                $body .= $this->LE.$this->LE;
                 $body .= $this->attachAll('attachment', $this->boundary[1]);
                 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 .= $this->LE;
                 $body .= $this->getBoundary($this->boundary[2], $bodyCharSet, '', $bodyEncoding);
                 $body .= $this->encodeString($this->Body, $bodyEncoding);
-                $body .= $this->LE . $this->LE;
+                $body .= $this->LE.$this->LE;
                 $body .= $this->attachAll('inline', $this->boundary[2]);
                 $body .= $this->LE;
                 $body .= $this->attachAll('attachment', $this->boundary[1]);
@@ -2266,14 +2265,14 @@ 
                 $body .= $mimepre;
                 $body .= $this->getBoundary($this->boundary[1], $altBodyCharSet, 'text/plain', $altBodyEncoding);
                 $body .= $this->encodeString($this->AltBody, $altBodyEncoding);
-                $body .= $this->LE . $this->LE;
+                $body .= $this->LE.$this->LE;
                 $body .= $this->getBoundary($this->boundary[1], $bodyCharSet, 'text/html', $bodyEncoding);
                 $body .= $this->encodeString($this->Body, $bodyEncoding);
-                $body .= $this->LE . $this->LE;
+                $body .= $this->LE.$this->LE;
                 if (!empty($this->Ical)) {
                     $body .= $this->getBoundary($this->boundary[1], '', 'text/calendar; method=REQUEST', '');
                     $body .= $this->encodeString($this->Ical, $this->Encoding);
-                    $body .= $this->LE . $this->LE;
+                    $body .= $this->LE.$this->LE;
                 }
                 $body .= $this->endBoundary($this->boundary[1]);
                 break;
@@ -2281,50 +2280,50 @@ 
                 $body .= $mimepre;
                 $body .= $this->getBoundary($this->boundary[1], $altBodyCharSet, 'text/plain', $altBodyEncoding);
                 $body .= $this->encodeString($this->AltBody, $altBodyEncoding);
-                $body .= $this->LE . $this->LE;
-                $body .= $this->textLine('--' . $this->boundary[1]);
+                $body .= $this->LE.$this->LE;
+                $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 .= $this->LE;
                 $body .= $this->getBoundary($this->boundary[2], $bodyCharSet, 'text/html', $bodyEncoding);
                 $body .= $this->encodeString($this->Body, $bodyEncoding);
-                $body .= $this->LE . $this->LE;
+                $body .= $this->LE.$this->LE;
                 $body .= $this->attachAll('inline', $this->boundary[2]);
                 $body .= $this->LE;
                 $body .= $this->endBoundary($this->boundary[1]);
                 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 .= $this->LE;
                 $body .= $this->getBoundary($this->boundary[2], $altBodyCharSet, 'text/plain', $altBodyEncoding);
                 $body .= $this->encodeString($this->AltBody, $altBodyEncoding);
-                $body .= $this->LE . $this->LE;
+                $body .= $this->LE.$this->LE;
                 $body .= $this->getBoundary($this->boundary[2], $bodyCharSet, 'text/html', $bodyEncoding);
                 $body .= $this->encodeString($this->Body, $bodyEncoding);
-                $body .= $this->LE . $this->LE;
+                $body .= $this->LE.$this->LE;
                 $body .= $this->endBoundary($this->boundary[2]);
                 $body .= $this->LE;
                 $body .= $this->attachAll('attachment', $this->boundary[1]);
                 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 .= $this->LE;
                 $body .= $this->getBoundary($this->boundary[2], $altBodyCharSet, 'text/plain', $altBodyEncoding);
                 $body .= $this->encodeString($this->AltBody, $altBodyEncoding);
-                $body .= $this->LE . $this->LE;
-                $body .= $this->textLine('--' . $this->boundary[2]);
+                $body .= $this->LE.$this->LE;
+                $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 .= $this->LE;
                 $body .= $this->getBoundary($this->boundary[3], $bodyCharSet, 'text/html', $bodyEncoding);
                 $body .= $this->encodeString($this->Body, $bodyEncoding);
-                $body .= $this->LE . $this->LE;
+                $body .= $this->LE.$this->LE;
                 $body .= $this->attachAll('inline', $this->boundary[3]);
                 $body .= $this->LE;
                 $body .= $this->endBoundary($this->boundary[2]);
@@ -2344,12 +2343,12 @@ 
         } elseif ($this->sign_key_file) {
             try {
                 if (!defined('PKCS7_TEXT')) {
-                    throw new phpmailerException($this->lang('extension_missing') . 'openssl');
+                    throw new phpmailerException($this->lang('extension_missing').'openssl');
                 }
                 // @TODO would be nice to use php://temp streams here, but need to wrap for PHP < 5.1
                 $file = tempnam(sys_get_temp_dir(), 'mail');
                 if (false === file_put_contents($file, $body)) {
-                    throw new phpmailerException($this->lang('signing') . ' Could not write temp file');
+                    throw new phpmailerException($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
@@ -2357,16 +2356,16 @@ 
                     $sign = @openssl_pkcs7_sign(
                         $file,
                         $signed,
-                        'file://' . realpath($this->sign_cert_file),
-                        array('file://' . realpath($this->sign_key_file), $this->sign_key_pass),
+                        'file://'.realpath($this->sign_cert_file),
+                        array('file://'.realpath($this->sign_key_file), $this->sign_key_pass),
                         null
                     );
                 } else {
                     $sign = @openssl_pkcs7_sign(
                         $file,
                         $signed,
-                        'file://' . realpath($this->sign_cert_file),
-                        array('file://' . realpath($this->sign_key_file), $this->sign_key_pass),
+                        'file://'.realpath($this->sign_cert_file),
+                        array('file://'.realpath($this->sign_key_file), $this->sign_key_pass),
                         null,
                         PKCS7_DETACHED,
                         $this->sign_extracerts_file
@@ -2378,12 +2377,12 @@ 
                     @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] . $this->LE . $this->LE;
+                    $this->MIMEHeader .= $parts[0].$this->LE.$this->LE;
                     $body = $parts[1];
                 } else {
                     @unlink($file);
                     @unlink($signed);
-                    throw new phpmailerException($this->lang('signing') . openssl_error_string());
+                    throw new phpmailerException($this->lang('signing').openssl_error_string());
                 }
             } catch (phpmailerException $exc) {
                 $body = '';
@@ -2416,7 +2415,7 @@ 
         if ($encoding == '') {
             $encoding = $this->Encoding;
         }
-        $result .= $this->textLine('--' . $boundary);
+        $result .= $this->textLine('--'.$boundary);
         $result .= sprintf('Content-Type: %s; charset=%s', $contentType, $charSet);
         $result .= $this->LE;
         // RFC1341 part 5 says 7bit is assumed if not specified
@@ -2436,7 +2435,7 @@ 
      */
     protected function endBoundary($boundary)
     {
-        return $this->LE . '--' . $boundary . '--' . $this->LE;
+        return $this->LE.'--'.$boundary.'--'.$this->LE;
     }
 
     /**
@@ -2473,7 +2472,7 @@ 
      */
     public function headerLine($name, $value)
     {
-        return $name . ': ' . $value . $this->LE;
+        return $name.': '.$value.$this->LE;
     }
 
     /**
@@ -2484,7 +2483,7 @@ 
      */
     public function textLine($value)
     {
-        return $value . $this->LE;
+        return $value.$this->LE;
     }
 
     /**
@@ -2503,7 +2502,7 @@ 
     {
         try {
             if (!@is_file($path)) {
-                throw new phpmailerException($this->lang('file_access') . $path, self::STOP_CONTINUE);
+                throw new phpmailerException($this->lang('file_access').$path, self::STOP_CONTINUE);
             }
 
             // If a MIME type is not specified, try to work it out from the file name
@@ -2627,7 +2626,7 @@ 
                             'Content-Disposition: %s; filename="%s"%s',
                             $disposition,
                             $encoded_name,
-                            $this->LE . $this->LE
+                            $this->LE.$this->LE
                         );
                     } else {
                         if (!empty($encoded_name)) {
@@ -2635,13 +2634,13 @@ 
                                 'Content-Disposition: %s; filename=%s%s',
                                 $disposition,
                                 $encoded_name,
-                                $this->LE . $this->LE
+                                $this->LE.$this->LE
                             );
                         } else {
                             $mime[] = sprintf(
                                 'Content-Disposition: %s%s',
                                 $disposition,
-                                $this->LE . $this->LE
+                                $this->LE.$this->LE
                             );
                         }
                     }
@@ -2655,13 +2654,13 @@ 
                     if ($this->isError()) {
                         return '';
                     }
-                    $mime[] = $this->LE . $this->LE;
+                    $mime[] = $this->LE.$this->LE;
                 } else {
                     $mime[] = $this->encodeFile($path, $encoding);
                     if ($this->isError()) {
                         return '';
                     }
-                    $mime[] = $this->LE . $this->LE;
+                    $mime[] = $this->LE.$this->LE;
                 }
             }
         }
@@ -2684,7 +2683,7 @@ 
     {
         try {
             if (!is_readable($path)) {
-                throw new phpmailerException($this->lang('file_open') . $path, self::STOP_CONTINUE);
+                throw new phpmailerException($this->lang('file_open').$path, self::STOP_CONTINUE);
             }
             $magic_quotes = get_magic_quotes_runtime();
             if ($magic_quotes) {
@@ -2743,7 +2742,7 @@ 
                 $encoded = $this->encodeQP($str);
                 break;
             default:
-                $this->setError($this->lang('encoding') . $encoding);
+                $this->setError($this->lang('encoding').$encoding);
                 break;
         }
         return $encoded;
@@ -2806,10 +2805,10 @@ 
             $encoding = 'Q';
             $encoded = $this->encodeQ($str, $position);
             $encoded = $this->wrapText($encoded, $maxlen, true);
-            $encoded = str_replace('=' . self::CRLF, "\n", trim($encoded));
+            $encoded = str_replace('='.self::CRLF, "\n", trim($encoded));
         }
 
-        $encoded = preg_replace('/^(.*)$/m', ' =?' . $this->CharSet . "?$encoding?\\1?=", $encoded);
+        $encoded = preg_replace('/^(.*)$/m', ' =?'.$this->CharSet."?$encoding?\\1?=", $encoded);
         $encoded = trim(str_replace("\n", $this->LE, $encoded));
 
         return $encoded;
@@ -2837,7 +2836,7 @@ 
      */
     public function has8bitChars($text)
     {
-        return (boolean)preg_match('/[\x80-\xFF]/', $text);
+        return (boolean) preg_match('/[\x80-\xFF]/', $text);
     }
 
     /**
@@ -2852,7 +2851,7 @@ 
      */
     public function base64EncodeWrapMB($str, $linebreak = null)
     {
-        $start = '=?' . $this->CharSet . '?B?';
+        $start = '=?'.$this->CharSet.'?B?';
         $end = '?=';
         $encoded = '';
         if ($linebreak === null) {
@@ -2875,7 +2874,7 @@ 
                 $chunk = base64_encode($chunk);
                 $lookBack++;
             } while (strlen($chunk) > $length);
-            $encoded .= $chunk . $linebreak;
+            $encoded .= $chunk.$linebreak;
         }
 
         // Chomp the last linefeed
@@ -2904,7 +2903,7 @@ 
             array(' ', "\r\n=2E", "\r\n", '='),
             rawurlencode($string)
         );
-        return preg_replace('/[^\r\n]{' . ($line_max - 3) . '}[^=\r\n]{2}/', "$0=\r\n", $string);
+        return preg_replace('/[^\r\n]{'.($line_max - 3).'}[^=\r\n]{2}/', "$0=\r\n", $string);
     }
 
     /**
@@ -2953,7 +2952,7 @@ 
             default:
                 // RFC 2047 section 5.1
                 // Replace every high ascii, control, =, ? and _ characters
-                $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 = array();
@@ -2966,7 +2965,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 every spaces to _ (more readable than =20)
@@ -3028,7 +3027,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;
         }
 
@@ -3243,15 +3242,15 @@ 
         if ($this->Mailer == 'smtp' and !is_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'];
                 }
             }
         }
@@ -3310,7 +3309,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];
         } else {
@@ -3408,11 +3407,11 @@ 
                     } else {
                         $data = rawurldecode($data);
                     }
-                    $cid = md5($url) . '@phpmailer.0'; // RFC2392 S 2
-                    if ($this->addStringEmbeddedImage($data, $cid, 'embed' . $imgindex, 'base64', $match[1])) {
+                    $cid = md5($url).'@phpmailer.0'; // RFC2392 S 2
+                    if ($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
                         );
                     }
@@ -3433,21 +3432,21 @@ 
                     if ($directory == '.') {
                         $directory = '';
                     }
-                    $cid = md5($url) . '@phpmailer.0'; // RFC2392 S 2
+                    $cid = md5($url).'@phpmailer.0'; // RFC2392 S 2
                     if (strlen($directory) > 1 && substr($directory, -1) != '/') {
                         $directory .= '/';
                     }
                     if ($this->addEmbeddedImage(
-                        $basedir . $directory . $filename,
+                        $basedir.$directory.$filename,
                         $cid,
                         $filename,
                         'base64',
-                        self::_mime_types((string)self::mb_pathinfo($filename, PATHINFO_EXTENSION))
+                        self::_mime_types((string) self::mb_pathinfo($filename, PATHINFO_EXTENSION))
                     )
                     ) {
                         $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
                         );
                     }
@@ -3459,8 +3458,8 @@ 
         $this->Body = $this->normalizeBreaks($message);
         $this->AltBody = $this->normalizeBreaks($this->html2text($message, $advanced));
         if (!$this->alternativeExists()) {
-            $this->AltBody = 'To view this email message, open it in a program that understands HTML!' .
-                self::CRLF . self::CRLF;
+            $this->AltBody = 'To view this email message, open it in a program that understands HTML!'.
+                self::CRLF.self::CRLF;
         }
         return $this->Body;
     }
@@ -3697,7 +3696,7 @@ 
             $this->$name = $value;
             return true;
         } else {
-            $this->setError($this->lang('variable_set') . $name);
+            $this->setError($this->lang('variable_set').$name);
             return false;
         }
     }
@@ -3758,7 +3757,7 @@ 
             if (((0x21 <= $ord) && ($ord <= 0x3A)) || $ord == 0x3C || ((0x3E <= $ord) && ($ord <= 0x7E))) {
                 $line .= $txt[$i];
             } else {
-                $line .= '=' . sprintf('%02X', $ord);
+                $line .= '='.sprintf('%02X', $ord);
             }
         }
         return $line;
@@ -3775,7 +3774,7 @@ 
     {
         if (!defined('PKCS7_TEXT')) {
             if ($this->exceptions) {
-                throw new phpmailerException($this->lang('extension_missing') . 'openssl');
+                throw new phpmailerException($this->lang('extension_missing').'openssl');
             }
             return '';
         }
@@ -3798,9 +3797,9 @@ 
             $hash = hash('sha256', $signHeader);
             //'Magic' constant for SHA256 from RFC3447
             //@link https://tools.ietf.org/html/rfc3447#page-43
-            $t = '3031300d060960864801650304020105000420' . $hash;
+            $t = '3031300d060960864801650304020105000420'.$hash;
             $pslen = $pinfo['bits'] / 8 - (strlen($t) / 2 + 3);
-            $eb = pack('H*', '0001' . str_repeat('FF', $pslen) . '00' . $t);
+            $eb = pack('H*', '0001'.str_repeat('FF', $pslen).'00'.$t);
 
             if (openssl_private_encrypt($eb, $signature, $privKey, OPENSSL_NO_PADDING)) {
                 openssl_pkey_free($privKey);
@@ -3825,7 +3824,7 @@ 
             list($heading, $value) = explode(':', $line, 2);
             $heading = strtolower($heading);
             $value = preg_replace('/\s{2,}/', ' ', $value); // Compress useless spaces
-            $lines[$key] = $heading . ':' . trim($value); // Don't forget to remove WSP around the value
+            $lines[$key] = $heading.':'.trim($value); // Don't forget to remove WSP around the value
         }
         $signHeader = implode("\r\n", $lines);
         return $signHeader;
@@ -3904,32 +3903,32 @@ 
         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 $dkimhdrs . $signed . "\r\n";
+        return $dkimhdrs.$signed."\r\n";
     }
 
     /**
@@ -3941,7 +3940,7 @@ 
     public static function hasLineLongerThanMax($str)
     {
         //+2 to include CRLF line break for a 1000 total
-        return (boolean)preg_match('/^(.{'.(self::MAX_LINE_LENGTH + 2).',})/m', $str);
+        return (boolean) preg_match('/^(.{'.(self::MAX_LINE_LENGTH + 2).',})/m', $str);
     }
 
     /**
@@ -4030,7 +4029,7 @@ 
      */
     public function errorMessage()
     {
-        $errorMsg = '<strong>' . $this->getMessage() . "</strong><br />\n";
+        $errorMsg = '<strong>'.$this->getMessage()."</strong><br />\n";
         return $errorMsg;
     }
 }

includes/libraries/protect/AntiXSS/AntiXSS.php

Spacing +31 added lines, -32 removed lines

@@ -1869,7 +1869,7 @@ 
    */
   private function _compact_exploded_words_callback($matches)
   {
-    return preg_replace('/(?:\s+|"|\042|\'|\047|\+)*+/', '', $matches[1]) . $matches[2];
+    return preg_replace('/(?:\s+|"|\042|\'|\047|\+)*+/', '', $matches[1]).$matches[2];
   }
 
   /**
@@ -1887,14 +1887,14 @@ 
     $match = $match[0];
 
     // protect GET variables in URLs
-    $match = preg_replace('|\?([a-z\_0-9\-]+)\=([a-z\_0-9\-/]+)|i', $this->_xss_hash . '::GET_FIRST' . '\\1=\\2', $match);
-    $match = preg_replace('|\&([a-z\_0-9\-]+)\=([a-z\_0-9\-/]+)|i', $this->_xss_hash . '::GET_NEXT' . '\\1=\\2', $match);
+    $match = preg_replace('|\?([a-z\_0-9\-]+)\=([a-z\_0-9\-/]+)|i', $this->_xss_hash.'::GET_FIRST'.'\\1=\\2', $match);
+    $match = preg_replace('|\&([a-z\_0-9\-]+)\=([a-z\_0-9\-/]+)|i', $this->_xss_hash.'::GET_NEXT'.'\\1=\\2', $match);
 
     // un-protect URL GET vars
     return str_replace(
         array(
-            $this->_xss_hash . '::GET_FIRST',
-            $this->_xss_hash . '::GET_NEXT',
+            $this->_xss_hash.'::GET_FIRST',
+            $this->_xss_hash.'::GET_NEXT',
         ),
         array(
             '?',
@@ -1911,9 +1911,9 @@ 
    */
   private function _do($str)
   {
-    $str = (string)$str;
-    $strInt = (int)$str;
-    $strFloat = (float)$str;
+    $str = (string) $str;
+    $strInt = (int) $str;
+    $strFloat = (float) $str;
     if (
         !$str
         ||
@@ -2001,9 +2001,9 @@ 
     if (null === $NEVER_ALLOWED_CACHE['regex']) {
       $NEVER_ALLOWED_CACHE['regex'] = implode('|', self::$_never_allowed_regex);
     }
-    $str = preg_replace('#' . $NEVER_ALLOWED_CACHE['regex'] . '#is', $this->_replacement, $str);
+    $str = preg_replace('#'.$NEVER_ALLOWED_CACHE['regex'].'#is', $this->_replacement, $str);
 
-    return (string)$str;
+    return (string) $str;
   }
 
   /**
@@ -2030,9 +2030,9 @@ 
       $NEVER_ALLOWED_STR_AFTERWARDS_CACHE = implode('|', self::$_never_allowed_str_afterwards);
     }
 
-    $str = preg_replace('#' . $NEVER_ALLOWED_STR_AFTERWARDS_CACHE . '#isU', $this->_replacement, $str);
+    $str = preg_replace('#'.$NEVER_ALLOWED_STR_AFTERWARDS_CACHE.'#isU', $this->_replacement, $str);
 
-    return (string)$str;
+    return (string) $str;
   }
 
   /**
@@ -2050,8 +2050,7 @@ 
     /** @noinspection PhpUsageOfSilenceOperatorInspection */
     // HHVM dons't support "ENT_DISALLOWED" && "ENT_SUBSTITUTE"
     $flags = Bootup::is_php('5.4') ?
-        ENT_QUOTES | ENT_HTML5 | @ENT_DISALLOWED | @ENT_SUBSTITUTE :
-        ENT_QUOTES;
+        ENT_QUOTES | ENT_HTML5 | @ENT_DISALLOWED | @ENT_SUBSTITUTE : ENT_QUOTES;
 
     // decode
     if (strpos($str, $this->_xss_hash) !== false) {
@@ -2170,7 +2169,7 @@ 
         (
             $this->_replacement
             &&
-            preg_match_all('#\s*[a-zA-Z\-]+\s*=' . preg_quote($this->_replacement, '#') . '$#', $str, $matches)
+            preg_match_all('#\s*[a-zA-Z\-]+\s*='.preg_quote($this->_replacement, '#').'$#', $str, $matches)
         )
     ) {
       foreach ($matches[0] as $match) {
@@ -2247,14 +2246,14 @@ 
 
     // init
     $replacer = $this->_filter_attributes(str_replace(array('<', '>',), '', $match[1]));
-    $pattern = '#' . $search . '=.*(?:\(.+([^\)]*?)(?:\)|$)|javascript:|view-source:|livescript:|wscript:|vbscript:|mocha:|charset=|window\.|document\.|\.cookie|<script|d\s*a\s*t\s*a\s*:)#is';
+    $pattern = '#'.$search.'=.*(?:\(.+([^\)]*?)(?:\)|$)|javascript:|view-source:|livescript:|wscript:|vbscript:|mocha:|charset=|window\.|document\.|\.cookie|<script|d\s*a\s*t\s*a\s*:)#is';
 
     $matchInner = array();
     preg_match($pattern, $match[1], $matchInner);
     if (count($matchInner) > 0) {
-      $replacer = (string)preg_replace(
+      $replacer = (string) preg_replace(
           $pattern,
-          $search . '="' . $this->_replacement . '"',
+          $search.'="'.$this->_replacement.'"',
           $replacer
       );
     }
@@ -2295,7 +2294,7 @@ 
    */
   private function _sanitize_naughty_html_callback($matches)
   {
-    return '&lt;' . $matches[1] . $matches[2] . $matches[3] // encode opening brace
+    return '&lt;'.$matches[1].$matches[2].$matches[3] // encode opening brace
            // encode captured opening or closing brace to prevent recursive vectors:
            . str_replace(
                array(
@@ -2379,7 +2378,7 @@ 
       // We only want to do this when it is followed by a non-word character
       // That way valid stuff like "dealer to" does not become "dealerto".
       $str = preg_replace_callback(
-          '#(' . $word . ')(\W)#is',
+          '#('.$word.')(\W)#is',
           array(
               $this,
               '_compact_exploded_words_callback',
@@ -2388,7 +2387,7 @@ 
       );
     }
 
-    return (string)$str;
+    return (string) $str;
   }
 
   /**
@@ -2540,7 +2539,7 @@ 
       }
     } while ($original !== $str);
 
-    return (string)$str;
+    return (string) $str;
   }
 
   /**
@@ -2573,7 +2572,7 @@ 
       do {
         $count = $temp_count = 0;
 
-        $str = preg_replace('/(<[^>]+)(?<!\w)(style="(:?[^"]*?)"|style=\'(:?[^\']*?)\')/i', '$1' . $this->_replacement, $str, -1, $temp_count);
+        $str = preg_replace('/(<[^>]+)(?<!\w)(style="(:?[^"]*?)"|style=\'(:?[^\']*?)\')/i', '$1'.$this->_replacement, $str, -1, $temp_count);
         $count += $temp_count;
 
       } while ($count);
@@ -2583,12 +2582,12 @@ 
       $count = $temp_count = 0;
 
       // find occurrences of illegal attribute strings with and without quotes (042 ["] and 047 ['] are octal quotes)
-      $str = preg_replace('/(<[^>]+)(?<!\w)(' . $evil_attributes_string . ')\s*=\s*(?:(?:"|\042|\'|\047)(?:[^\\2]*?)(?:\\2)|[^\s>]*)/is', '$1' . $this->_replacement, $str, -1, $temp_count);
+      $str = preg_replace('/(<[^>]+)(?<!\w)('.$evil_attributes_string.')\s*=\s*(?:(?:"|\042|\'|\047)(?:[^\\2]*?)(?:\\2)|[^\s>]*)/is', '$1'.$this->_replacement, $str, -1, $temp_count);
       $count += $temp_count;
 
     } while ($count);
 
-    return (string)$str;
+    return (string) $str;
   }
 
   /**
@@ -2640,7 +2639,7 @@ 
    */
   private function _repack_utf7_callback_back($str)
   {
-    return $str[1] . '+' . rtrim(base64_encode($str[2]), '=') . '-';
+    return $str[1].'+'.rtrim(base64_encode($str[2]), '=').'-';
   }
 
   /**
@@ -2667,7 +2666,7 @@ 
   {
     $naughty = 'alert|prompt|confirm|applet|audio|basefont|base|behavior|bgsound|blink|body|embed|expression|form|frameset|frame|head|html|ilayer|iframe|input|button|select|isindex|layer|link|meta|keygen|object|plaintext|style|script|textarea|title|math|video|source|svg|xml|xss|eval';
     $str = preg_replace_callback(
-        '#<(/*\s*)(' . $naughty . ')([^><]*)([><]*)#i',
+        '#<(/*\s*)('.$naughty.')([^><]*)([><]*)#i',
         array(
             $this,
             '_sanitize_naughty_html_callback',
@@ -2675,7 +2674,7 @@ 
         $str
     );
 
-    return (string)$str;
+    return (string) $str;
   }
 
   /**
@@ -2709,7 +2708,7 @@ 
         $str
     );
 
-    return (string)$str;
+    return (string) $str;
   }
 
   /**
@@ -2721,7 +2720,7 @@ 
    */
   public function setReplacement($string)
   {
-    $this->_replacement = (string)$string;
+    $this->_replacement = (string) $string;
 
     $this->_initNeverAllowedStr();
 
@@ -2742,7 +2741,7 @@ 
    */
   public function setStripe4byteChars($bool)
   {
-    $this->_stripe_4byte_chars = (bool)$bool;
+    $this->_stripe_4byte_chars = (bool) $bool;
 
     return $this;
   }
@@ -2822,7 +2821,7 @@ 
       }
     }
 
-    return 'voku::anti-xss::' . $this->_xss_hash;
+    return 'voku::anti-xss::'.$this->_xss_hash;
   }
 
 }
\ No newline at end of file

Doc Comments +1 added lines, -1 removed lines

@@ -1912,7 +1912,7 @@
   /**
    * @param string $str
    *
-   * @return mixed
+   * @return string
    */
   private function _do($str)
   {

Indentation +2335 added lines, -2335 removed lines

@@ -23,1528 +23,1528 @@
 final class AntiXSS
 {
 
-  /**
-   * @var array
-   */
-  private static $entitiesFallback = array(
-      "\t" => '	',
-      "\n" => '
',
-      '!'  => '!',
-      '"'  => '"',
-      '#'  => '#',
-      '$'  => '$',
-      '%'  => '%',
-      '&'  => '&',
-      "'"  => ''',
-      '('  => '(',
-      ')'  => ')',
-      '*'  => '*',
-      '+'  => '+',
-      ','  => ',',
-      '.'  => '.',
-      '/'  => '/',
-      ':'  => ':',
-      ';'  => ';',
-      '<'  => '&lt;',
-      '<⃒' => '&nvlt;',
-      '='  => '&equals;',
-      '=⃥' => '&bne;',
-      '>'  => '&gt;',
-      '>⃒' => '&nvgt',
-      '?'  => '&quest;',
-      '@'  => '&commat;',
-      '['  => '&lbrack;',
-      ']'  => '&rsqb;',
-      '^'  => '&Hat;',
-      '_'  => '&lowbar;',
-      '`'  => '&grave;',
-      'fj' => '&fjlig;',
-      '{'  => '&lbrace;',
-      '|'  => '&vert;',
-      '}'  => '&rcub;',
-      ' '  => '&nbsp;',
-      '¡'  => '&iexcl;',
-      '¢'  => '&cent;',
-      '£'  => '&pound;',
-      '¤'  => '&curren;',
-      '¥'  => '&yen;',
-      '¦'  => '&brvbar;',
-      '§'  => '&sect;',
-      '¨'  => '&DoubleDot;',
-      '©'  => '&copy;',
-      'ª'  => '&ordf;',
-      '«'  => '&laquo;',
-      '¬'  => '&not;',
-      '­'  => '&shy;',
-      '®'  => '&reg;',
-      '¯'  => '&macr;',
-      '°'  => '&deg;',
-      '±'  => '&plusmn;',
-      '²'  => '&sup2;',
-      '³'  => '&sup3;',
-      '´'  => '&DiacriticalAcute;',
-      'µ'  => '&micro;',
-      '¶'  => '&para;',
-      '·'  => '&CenterDot;',
-      '¸'  => '&Cedilla;',
-      '¹'  => '&sup1;',
-      'º'  => '&ordm;',
-      '»'  => '&raquo;',
-      '¼'  => '&frac14;',
-      '½'  => '&half;',
-      '¾'  => '&frac34;',
-      '¿'  => '&iquest;',
-      'À'  => '&Agrave;',
-      'Á'  => '&Aacute;',
-      'Â'  => '&Acirc;',
-      'Ã'  => '&Atilde;',
-      'Ä'  => '&Auml;',
-      'Å'  => '&Aring;',
-      'Æ'  => '&AElig;',
-      'Ç'  => '&Ccedil;',
-      'È'  => '&Egrave;',
-      'É'  => '&Eacute;',
-      'Ê'  => '&Ecirc;',
-      'Ë'  => '&Euml;',
-      'Ì'  => '&Igrave;',
-      'Í'  => '&Iacute;',
-      'Î'  => '&Icirc;',
-      'Ï'  => '&Iuml;',
-      'Ð'  => '&ETH;',
-      'Ñ'  => '&Ntilde;',
-      'Ò'  => '&Ograve;',
-      'Ó'  => '&Oacute;',
-      'Ô'  => '&Ocirc;',
-      'Õ'  => '&Otilde;',
-      'Ö'  => '&Ouml;',
-      '×'  => '&times;',
-      'Ø'  => '&Oslash;',
-      'Ù'  => '&Ugrave;',
-      'Ú'  => '&Uacute;',
-      'Û'  => '&Ucirc;',
-      'Ü'  => '&Uuml;',
-      'Ý'  => '&Yacute;',
-      'Þ'  => '&THORN;',
-      'ß'  => '&szlig;',
-      'à'  => '&agrave;',
-      'á'  => '&aacute;',
-      'â'  => '&acirc;',
-      'ã'  => '&atilde;',
-      'ä'  => '&auml;',
-      'å'  => '&aring;',
-      'æ'  => '&aelig;',
-      'ç'  => '&ccedil;',
-      'è'  => '&egrave;',
-      'é'  => '&eacute;',
-      'ê'  => '&ecirc;',
-      'ë'  => '&euml;',
-      'ì'  => '&igrave;',
-      'í'  => '&iacute;',
-      'î'  => '&icirc;',
-      'ï'  => '&iuml;',
-      'ð'  => '&eth;',
-      'ñ'  => '&ntilde;',
-      'ò'  => '&ograve;',
-      'ó'  => '&oacute;',
-      'ô'  => '&ocirc;',
-      'õ'  => '&otilde;',
-      'ö'  => '&ouml;',
-      '÷'  => '&divide;',
-      'ø'  => '&oslash;',
-      'ù'  => '&ugrave;',
-      'ú'  => '&uacute;',
-      'û'  => '&ucirc;',
-      'ü'  => '&uuml;',
-      'ý'  => '&yacute;',
-      'þ'  => '&thorn;',
-      'ÿ'  => '&yuml;',
-      'Ā'  => '&Amacr;',
-      'ā'  => '&amacr;',
-      'Ă'  => '&Abreve;',
-      'ă'  => '&abreve;',
-      'Ą'  => '&Aogon;',
-      'ą'  => '&aogon;',
-      'Ć'  => '&Cacute;',
-      'ć'  => '&cacute;',
-      'Ĉ'  => '&Ccirc;',
-      'ĉ'  => '&ccirc;',
-      'Ċ'  => '&Cdot;',
-      'ċ'  => '&cdot;',
-      'Č'  => '&Ccaron;',
-      'č'  => '&ccaron;',
-      'Ď'  => '&Dcaron;',
-      'ď'  => '&dcaron;',
-      'Đ'  => '&Dstrok;',
-      'đ'  => '&dstrok;',
-      'Ē'  => '&Emacr;',
-      'ē'  => '&emacr;',
-      'Ė'  => '&Edot;',
-      'ė'  => '&edot;',
-      'Ę'  => '&Eogon;',
-      'ę'  => '&eogon;',
-      'Ě'  => '&Ecaron;',
-      'ě'  => '&ecaron;',
-      'Ĝ'  => '&Gcirc;',
-      'ĝ'  => '&gcirc;',
-      'Ğ'  => '&Gbreve;',
-      'ğ'  => '&gbreve;',
-      'Ġ'  => '&Gdot;',
-      'ġ'  => '&gdot;',
-      'Ģ'  => '&Gcedil;',
-      'Ĥ'  => '&Hcirc;',
-      'ĥ'  => '&hcirc;',
-      'Ħ'  => '&Hstrok;',
-      'ħ'  => '&hstrok;',
-      'Ĩ'  => '&Itilde;',
-      'ĩ'  => '&itilde;',
-      'Ī'  => '&Imacr;',
-      'ī'  => '&imacr;',
-      'Į'  => '&Iogon;',
-      'į'  => '&iogon;',
-      'İ'  => '&Idot;',
-      'ı'  => '&inodot;',
-      'IJ'  => '&IJlig;',
-      'ij'  => '&ijlig;',
-      'Ĵ'  => '&Jcirc;',
-      'ĵ'  => '&jcirc;',
-      'Ķ'  => '&Kcedil;',
-      'ķ'  => '&kcedil;',
-      'ĸ'  => '&kgreen;',
-      'Ĺ'  => '&Lacute;',
-      'ĺ'  => '&lacute;',
-      'Ļ'  => '&Lcedil;',
-      'ļ'  => '&lcedil;',
-      'Ľ'  => '&Lcaron;',
-      'ľ'  => '&lcaron;',
-      'Ŀ'  => '&Lmidot;',
-      'ŀ'  => '&lmidot;',
-      'Ł'  => '&Lstrok;',
-      'ł'  => '&lstrok;',
-      'Ń'  => '&Nacute;',
-      'ń'  => '&nacute;',
-      'Ņ'  => '&Ncedil;',
-      'ņ'  => '&ncedil;',
-      'Ň'  => '&Ncaron;',
-      'ň'  => '&ncaron;',
-      'ʼn'  => '&napos;',
-      'Ŋ'  => '&ENG;',
-      'ŋ'  => '&eng;',
-      'Ō'  => '&Omacr;',
-      'ō'  => '&omacr;',
-      'Ő'  => '&Odblac;',
-      'ő'  => '&odblac;',
-      'Œ'  => '&OElig;',
-      'œ'  => '&oelig;',
-      'Ŕ'  => '&Racute;',
-      'ŕ'  => '&racute;',
-      'Ŗ'  => '&Rcedil;',
-      'ŗ'  => '&rcedil;',
-      'Ř'  => '&Rcaron;',
-      'ř'  => '&rcaron;',
-      'Ś'  => '&Sacute;',
-      'ś'  => '&sacute;',
-      'Ŝ'  => '&Scirc;',
-      'ŝ'  => '&scirc;',
-      'Ş'  => '&Scedil;',
-      'ş'  => '&scedil;',
-      'Š'  => '&Scaron;',
-      'š'  => '&scaron;',
-      'Ţ'  => '&Tcedil;',
-      'ţ'  => '&tcedil;',
-      'Ť'  => '&Tcaron;',
-      'ť'  => '&tcaron;',
-      'Ŧ'  => '&Tstrok;',
-      'ŧ'  => '&tstrok;',
-      'Ũ'  => '&Utilde;',
-      'ũ'  => '&utilde;',
-      'Ū'  => '&Umacr;',
-      'ū'  => '&umacr;',
-      'Ŭ'  => '&Ubreve;',
-      'ŭ'  => '&ubreve;',
-      'Ů'  => '&Uring;',
-      'ů'  => '&uring;',
-      'Ű'  => '&Udblac;',
-      'ű'  => '&udblac;',
-      'Ų'  => '&Uogon;',
-      'ų'  => '&uogon;',
-      'Ŵ'  => '&Wcirc;',
-      'ŵ'  => '&wcirc;',
-      'Ŷ'  => '&Ycirc;',
-      'ŷ'  => '&ycirc;',
-      'Ÿ'  => '&Yuml;',
-      'Ź'  => '&Zacute;',
-      'ź'  => '&zacute;',
-      'Ż'  => '&Zdot;',
-      'ż'  => '&zdot;',
-      'Ž'  => '&Zcaron;',
-      'ž'  => '&zcaron;',
-      'ƒ'  => '&fnof;',
-      'Ƶ'  => '&imped;',
-      'ǵ'  => '&gacute;',
-      'ȷ'  => '&jmath;',
-      'ˆ'  => '&circ;',
-      'ˇ'  => '&Hacek;',
-      '˘'  => '&Breve;',
-      '˙'  => '&dot;',
-      '˚'  => '&ring;',
-      '˛'  => '&ogon;',
-      '˜'  => '&DiacriticalTilde;',
-      '˝'  => '&DiacriticalDoubleAcute;',
-      '̑'  => '&DownBreve;',
-      'Α'  => '&Alpha;',
-      'Β'  => '&Beta;',
-      'Γ'  => '&Gamma;',
-      'Δ'  => '&Delta;',
-      'Ε'  => '&Epsilon;',
-      'Ζ'  => '&Zeta;',
-      'Η'  => '&Eta;',
-      'Θ'  => '&Theta;',
-      'Ι'  => '&Iota;',
-      'Κ'  => '&Kappa;',
-      'Λ'  => '&Lambda;',
-      'Μ'  => '&Mu;',
-      'Ν'  => '&Nu;',
-      'Ξ'  => '&Xi;',
-      'Ο'  => '&Omicron;',
-      'Π'  => '&Pi;',
-      'Ρ'  => '&Rho;',
-      'Σ'  => '&Sigma;',
-      'Τ'  => '&Tau;',
-      'Υ'  => '&Upsilon;',
-      'Φ'  => '&Phi;',
-      'Χ'  => '&Chi;',
-      'Ψ'  => '&Psi;',
-      'Ω'  => '&Omega;',
-      'α'  => '&alpha;',
-      'β'  => '&beta;',
-      'γ'  => '&gamma;',
-      'δ'  => '&delta;',
-      'ε'  => '&epsi;',
-      'ζ'  => '&zeta;',
-      'η'  => '&eta;',
-      'θ'  => '&theta;',
-      'ι'  => '&iota;',
-      'κ'  => '&kappa;',
-      'λ'  => '&lambda;',
-      'μ'  => '&mu;',
-      'ν'  => '&nu;',
-      'ξ'  => '&xi;',
-      'ο'  => '&omicron;',
-      'π'  => '&pi;',
-      'ρ'  => '&rho;',
-      'ς'  => '&sigmav;',
-      'σ'  => '&sigma;',
-      'τ'  => '&tau;',
-      'υ'  => '&upsi;',
-      'φ'  => '&phi;',
-      'χ'  => '&chi;',
-      'ψ'  => '&psi;',
-      'ω'  => '&omega;',
-      'ϑ'  => '&thetasym;',
-      'ϒ'  => '&upsih;',
-      'ϕ'  => '&straightphi;',
-      'ϖ'  => '&piv;',
-      'Ϝ'  => '&Gammad;',
-      'ϝ'  => '&gammad;',
-      'ϰ'  => '&varkappa;',
-      'ϱ'  => '&rhov;',
-      'ϵ'  => '&straightepsilon;',
-      '϶'  => '&backepsilon;',
-      'Ё'  => '&IOcy;',
-      'Ђ'  => '&DJcy;',
-      'Ѓ'  => '&GJcy;',
-      'Є'  => '&Jukcy;',
-      'Ѕ'  => '&DScy;',
-      'І'  => '&Iukcy;',
-      'Ї'  => '&YIcy;',
-      'Ј'  => '&Jsercy;',
-      'Љ'  => '&LJcy;',
-      'Њ'  => '&NJcy;',
-      'Ћ'  => '&TSHcy;',
-      'Ќ'  => '&KJcy;',
-      'Ў'  => '&Ubrcy;',
-      'Џ'  => '&DZcy;',
-      'А'  => '&Acy;',
-      'Б'  => '&Bcy;',
-      'В'  => '&Vcy;',
-      'Г'  => '&Gcy;',
-      'Д'  => '&Dcy;',
-      'Е'  => '&IEcy;',
-      'Ж'  => '&ZHcy;',
-      'З'  => '&Zcy;',
-      'И'  => '&Icy;',
-      'Й'  => '&Jcy;',
-      'К'  => '&Kcy;',
-      'Л'  => '&Lcy;',
-      'М'  => '&Mcy;',
-      'Н'  => '&Ncy;',
-      'О'  => '&Ocy;',
-      'П'  => '&Pcy;',
-      'Р'  => '&Rcy;',
-      'С'  => '&Scy;',
-      'Т'  => '&Tcy;',
-      'У'  => '&Ucy;',
-      'Ф'  => '&Fcy;',
-      'Х'  => '&KHcy;',
-      'Ц'  => '&TScy;',
-      'Ч'  => '&CHcy;',
-      'Ш'  => '&SHcy;',
-      'Щ'  => '&SHCHcy;',
-      'Ъ'  => '&HARDcy;',
-      'Ы'  => '&Ycy;',
-      'Ь'  => '&SOFTcy;',
-      'Э'  => '&Ecy;',
-      'Ю'  => '&YUcy;',
-      'Я'  => '&YAcy;',
-      'а'  => '&acy;',
-      'б'  => '&bcy;',
-      'в'  => '&vcy;',
-      'г'  => '&gcy;',
-      'д'  => '&dcy;',
-      'е'  => '&iecy;',
-      'ж'  => '&zhcy;',
-      'з'  => '&zcy;',
-      'и'  => '&icy;',
-      'й'  => '&jcy;',
-      'к'  => '&kcy;',
-      'л'  => '&lcy;',
-      'м'  => '&mcy;',
-      'н'  => '&ncy;',
-      'о'  => '&ocy;',
-      'п'  => '&pcy;',
-      'р'  => '&rcy;',
-      'с'  => '&scy;',
-      'т'  => '&tcy;',
-      'у'  => '&ucy;',
-      'ф'  => '&fcy;',
-      'х'  => '&khcy;',
-      'ц'  => '&tscy;',
-      'ч'  => '&chcy;',
-      'ш'  => '&shcy;',
-      'щ'  => '&shchcy;',
-      'ъ'  => '&hardcy;',
-      'ы'  => '&ycy;',
-      'ь'  => '&softcy;',
-      'э'  => '&ecy;',
-      'ю'  => '&yucy;',
-      'я'  => '&yacy;',
-      'ё'  => '&iocy;',
-      'ђ'  => '&djcy;',
-      'ѓ'  => '&gjcy;',
-      'є'  => '&jukcy;',
-      'ѕ'  => '&dscy;',
-      'і'  => '&iukcy;',
-      'ї'  => '&yicy;',
-      'ј'  => '&jsercy;',
-      'љ'  => '&ljcy;',
-      'њ'  => '&njcy;',
-      'ћ'  => '&tshcy;',
-      'ќ'  => '&kjcy;',
-      'ў'  => '&ubrcy;',
-      'џ'  => '&dzcy;',
-      ' '  => '&ensp;',
-      ' '  => '&emsp;',
-      ' '  => '&emsp13;',
-      ' '  => '&emsp14;',
-      ' '  => '&numsp;',
-      ' '  => '&puncsp;',
-      ' '  => '&ThinSpace;',
-      ' '  => '&hairsp;',
-      '​'  => '&ZeroWidthSpace;',
-      '‌'  => '&zwnj;',
-      '‍'  => '&zwj;',
-      '‎'  => '&lrm;',
-      '‏'  => '&rlm;',
-      '‐'  => '&hyphen;',
-      '–'  => '&ndash;',
-      '—'  => '&mdash;',
-      '―'  => '&horbar;',
-      '‖'  => '&Verbar;',
-      '‘'  => '&OpenCurlyQuote;',
-      '’'  => '&rsquo;',
-      '‚'  => '&sbquo;',
-      '“'  => '&OpenCurlyDoubleQuote;',
-      '”'  => '&rdquo;',
-      '„'  => '&bdquo;',
-      '†'  => '&dagger;',
-      '‡'  => '&Dagger;',
-      '•'  => '&bull;',
-      '‥'  => '&nldr;',
-      '…'  => '&hellip;',
-      '‰'  => '&permil;',
-      '‱'  => '&pertenk;',
-      '′'  => '&prime;',
-      '″'  => '&Prime;',
-      '‴'  => '&tprime;',
-      '‵'  => '&backprime;',
-      '‹'  => '&lsaquo;',
-      '›'  => '&rsaquo;',
-      '‾'  => '&oline;',
-      '⁁'  => '&caret;',
-      '⁃'  => '&hybull;',
-      '⁄'  => '&frasl;',
-      '⁏'  => '&bsemi;',
-      '⁗'  => '&qprime;',
-      ' '  => '&MediumSpace;',
-      '  ' => '&ThickSpace;',
-      '⁠'  => '&NoBreak;',
-      '⁡'  => '&af;',
-      '⁢'  => '&InvisibleTimes;',
-      '⁣'  => '&ic;',
-      '€'  => '&euro;',
-      '⃛'  => '&TripleDot;',
-      '⃜'  => '&DotDot;',
-      'ℂ'  => '&complexes;',
-      '℅'  => '&incare;',
-      'ℊ'  => '&gscr;',
-      'ℋ'  => '&HilbertSpace;',
-      'ℌ'  => '&Hfr;',
-      'ℍ'  => '&Hopf;',
-      'ℎ'  => '&planckh;',
-      'ℏ'  => '&planck;',
-      'ℐ'  => '&imagline;',
-      'ℑ'  => '&Ifr;',
-      'ℒ'  => '&lagran;',
-      'ℓ'  => '&ell;',
-      'ℕ'  => '&naturals;',
-      '№'  => '&numero;',
-      '℗'  => '&copysr;',
-      '℘'  => '&wp;',
-      'ℙ'  => '&primes;',
-      'ℚ'  => '&rationals;',
-      'ℛ'  => '&realine;',
-      'ℜ'  => '&Rfr;',
-      'ℝ'  => '&Ropf;',
-      '℞'  => '&rx;',
-      '™'  => '&trade;',
-      'ℤ'  => '&Zopf;',
-      '℧'  => '&mho;',
-      'ℨ'  => '&Zfr;',
-      '℩'  => '&iiota;',
-      'ℬ'  => '&Bscr;',
-      'ℭ'  => '&Cfr;',
-      'ℯ'  => '&escr;',
-      'ℰ'  => '&expectation;',
-      'ℱ'  => '&Fouriertrf;',
-      'ℳ'  => '&Mellintrf;',
-      'ℴ'  => '&orderof;',
-      'ℵ'  => '&aleph;',
-      'ℶ'  => '&beth;',
-      'ℷ'  => '&gimel;',
-      'ℸ'  => '&daleth;',
-      'ⅅ'  => '&CapitalDifferentialD;',
-      'ⅆ'  => '&DifferentialD;',
-      'ⅇ'  => '&exponentiale;',
-      'ⅈ'  => '&ImaginaryI;',
-      '⅓'  => '&frac13;',
-      '⅔'  => '&frac23;',
-      '⅕'  => '&frac15;',
-      '⅖'  => '&frac25;',
-      '⅗'  => '&frac35;',
-      '⅘'  => '&frac45;',
-      '⅙'  => '&frac16;',
-      '⅚'  => '&frac56;',
-      '⅛'  => '&frac18;',
-      '⅜'  => '&frac38;',
-      '⅝'  => '&frac58;',
-      '⅞'  => '&frac78;',
-      '←'  => '&larr;',
-      '↑'  => '&uarr;',
-      '→'  => '&srarr;',
-      '↓'  => '&darr;',
-      '↔'  => '&harr;',
-      '↕'  => '&UpDownArrow;',
-      '↖'  => '&nwarrow;',
-      '↗'  => '&UpperRightArrow;',
-      '↘'  => '&LowerRightArrow;',
-      '↙'  => '&swarr;',
-      '↚'  => '&nleftarrow;',
-      '↛'  => '&nrarr;',
-      '↝'  => '&rarrw;',
-      '↝̸' => '&nrarrw;',
-      '↞'  => '&Larr;',
-      '↟'  => '&Uarr;',
-      '↠'  => '&twoheadrightarrow;',
-      '↡'  => '&Darr;',
-      '↢'  => '&larrtl;',
-      '↣'  => '&rarrtl;',
-      '↤'  => '&LeftTeeArrow;',
-      '↥'  => '&UpTeeArrow;',
-      '↦'  => '&map;',
-      '↧'  => '&DownTeeArrow;',
-      '↩'  => '&larrhk;',
-      '↪'  => '&rarrhk;',
-      '↫'  => '&larrlp;',
-      '↬'  => '&looparrowright;',
-      '↭'  => '&harrw;',
-      '↮'  => '&nleftrightarrow;',
-      '↰'  => '&Lsh;',
-      '↱'  => '&rsh;',
-      '↲'  => '&ldsh;',
-      '↳'  => '&rdsh;',
-      '↵'  => '&crarr;',
-      '↶'  => '&curvearrowleft;',
-      '↷'  => '&curarr;',
-      '↺'  => '&olarr;',
-      '↻'  => '&orarr;',
-      '↼'  => '&leftharpoonup;',
-      '↽'  => '&leftharpoondown;',
-      '↾'  => '&RightUpVector;',
-      '↿'  => '&uharl;',
-      '⇀'  => '&rharu;',
-      '⇁'  => '&rhard;',
-      '⇂'  => '&RightDownVector;',
-      '⇃'  => '&dharl;',
-      '⇄'  => '&rightleftarrows;',
-      '⇅'  => '&udarr;',
-      '⇆'  => '&lrarr;',
-      '⇇'  => '&llarr;',
-      '⇈'  => '&upuparrows;',
-      '⇉'  => '&rrarr;',
-      '⇊'  => '&downdownarrows;',
-      '⇋'  => '&leftrightharpoons;',
-      '⇌'  => '&rightleftharpoons;',
-      '⇍'  => '&nLeftarrow;',
-      '⇎'  => '&nhArr;',
-      '⇏'  => '&nrArr;',
-      '⇐'  => '&DoubleLeftArrow;',
-      '⇑'  => '&DoubleUpArrow;',
-      '⇒'  => '&Implies;',
-      '⇓'  => '&Downarrow;',
-      '⇔'  => '&hArr;',
-      '⇕'  => '&Updownarrow;',
-      '⇖'  => '&nwArr;',
-      '⇗'  => '&neArr;',
-      '⇘'  => '&seArr;',
-      '⇙'  => '&swArr;',
-      '⇚'  => '&lAarr;',
-      '⇛'  => '&rAarr;',
-      '⇝'  => '&zigrarr;',
-      '⇤'  => '&LeftArrowBar;',
-      '⇥'  => '&RightArrowBar;',
-      '⇵'  => '&DownArrowUpArrow;',
-      '⇽'  => '&loarr;',
-      '⇾'  => '&roarr;',
-      '⇿'  => '&hoarr;',
-      '∀'  => '&forall;',
-      '∁'  => '&comp;',
-      '∂'  => '&part;',
-      '∂̸' => '&npart;',
-      '∃'  => '&Exists;',
-      '∄'  => '&nexist;',
-      '∅'  => '&empty;',
-      '∇'  => '&nabla;',
-      '∈'  => '&isinv;',
-      '∉'  => '&notin;',
-      '∋'  => '&ReverseElement;',
-      '∌'  => '&notniva;',
-      '∏'  => '&prod;',
-      '∐'  => '&Coproduct;',
-      '∑'  => '&sum;',
-      '−'  => '&minus;',
-      '∓'  => '&MinusPlus;',
-      '∔'  => '&plusdo;',
-      '∖'  => '&ssetmn;',
-      '∗'  => '&lowast;',
-      '∘'  => '&compfn;',
-      '√'  => '&Sqrt;',
-      '∝'  => '&prop;',
-      '∞'  => '&infin;',
-      '∟'  => '&angrt;',
-      '∠'  => '&angle;',
-      '∠⃒' => '&nang;',
-      '∡'  => '&angmsd;',
-      '∢'  => '&angsph;',
-      '∣'  => '&mid;',
-      '∤'  => '&nshortmid;',
-      '∥'  => '&shortparallel;',
-      '∦'  => '&nparallel;',
-      '∧'  => '&and;',
-      '∨'  => '&or;',
-      '∩'  => '&cap;',
-      '∩︀' => '&caps;',
-      '∪'  => '&cup;',
-      '∪︀' => '&cups',
-      '∫'  => '&Integral;',
-      '∬'  => '&Int;',
-      '∭'  => '&tint;',
-      '∮'  => '&ContourIntegral;',
-      '∯'  => '&DoubleContourIntegral;',
-      '∰'  => '&Cconint;',
-      '∱'  => '&cwint;',
-      '∲'  => '&cwconint;',
-      '∳'  => '&awconint;',
-      '∴'  => '&there4;',
-      '∵'  => '&Because;',
-      '∶'  => '&ratio;',
-      '∷'  => '&Colon;',
-      '∸'  => '&minusd;',
-      '∺'  => '&mDDot;',
-      '∻'  => '&homtht;',
-      '∼'  => '&sim;',
-      '∼⃒' => '&nvsim;',
-      '∽'  => '&bsim;',
-      '∽̱' => '&race;',
-      '∾'  => '&ac;',
-      '∾̳' => '&acE;',
-      '∿'  => '&acd;',
-      '≀'  => '&wr;',
-      '≁'  => '&NotTilde;',
-      '≂'  => '&esim;',
-      '≂̸' => '&nesim;',
-      '≃'  => '&simeq;',
-      '≄'  => '&nsime;',
-      '≅'  => '&TildeFullEqual;',
-      '≆'  => '&simne;',
-      '≇'  => '&ncong;',
-      '≈'  => '&approx;',
-      '≉'  => '&napprox;',
-      '≊'  => '&ape;',
-      '≋'  => '&apid;',
-      '≋̸' => '&napid;',
-      '≌'  => '&bcong;',
-      '≍'  => '&CupCap;',
-      '≍⃒' => '&nvap;',
-      '≎'  => '&bump;',
-      '≎̸' => '&nbump;',
-      '≏'  => '&HumpEqual;',
-      '≏̸' => '&nbumpe;',
-      '≐'  => '&esdot;',
-      '≐̸' => '&nedot;',
-      '≑'  => '&doteqdot;',
-      '≒'  => '&fallingdotseq;',
-      '≓'  => '&risingdotseq;',
-      '≔'  => '&coloneq;',
-      '≕'  => '&eqcolon;',
-      '≖'  => '&ecir;',
-      '≗'  => '&circeq;',
-      '≙'  => '&wedgeq;',
-      '≚'  => '&veeeq;',
-      '≜'  => '&triangleq;',
-      '≟'  => '&equest;',
-      '≠'  => '&NotEqual;',
-      '≡'  => '&Congruent;',
-      '≡⃥' => '&bnequiv;',
-      '≢'  => '&NotCongruent;',
-      '≤'  => '&leq;',
-      '≤⃒' => '&nvle;',
-      '≥'  => '&ge;',
-      '≥⃒' => '&nvge;',
-      '≦'  => '&lE;',
-      '≦̸' => '&nlE;',
-      '≧'  => '&geqq;',
-      '≧̸' => '&NotGreaterFullEqual;',
-      '≨'  => '&lneqq;',
-      '≨︀' => '&lvertneqq;',
-      '≩'  => '&gneqq;',
-      '≩︀' => '&gvertneqq;',
-      '≪'  => '&ll;',
-      '≪̸' => '&nLtv;',
-      '≪⃒' => '&nLt;',
-      '≫'  => '&gg;',
-      '≫̸' => '&NotGreaterGreater;',
-      '≫⃒' => '&nGt;',
-      '≬'  => '&between;',
-      '≭'  => '&NotCupCap;',
-      '≮'  => '&NotLess;',
-      '≯'  => '&ngtr;',
-      '≰'  => '&NotLessEqual;',
-      '≱'  => '&ngeq;',
-      '≲'  => '&LessTilde;',
-      '≳'  => '&GreaterTilde;',
-      '≴'  => '&nlsim;',
-      '≵'  => '&ngsim;',
-      '≶'  => '&lessgtr;',
-      '≷'  => '&gl;',
-      '≸'  => '&ntlg;',
-      '≹'  => '&NotGreaterLess;',
-      '≺'  => '&prec;',
-      '≻'  => '&succ;',
-      '≼'  => '&PrecedesSlantEqual;',
-      '≽'  => '&succcurlyeq;',
-      '≾'  => '&precsim;',
-      '≿'  => '&SucceedsTilde;',
-      '≿̸' => '&NotSucceedsTilde;',
-      '⊀'  => '&npr;',
-      '⊁'  => '&NotSucceeds;',
-      '⊂'  => '&sub;',
-      '⊂⃒' => '&vnsub;',
-      '⊃'  => '&sup;',
-      '⊃⃒' => '&nsupset;',
-      '⊄'  => '&nsub;',
-      '⊅'  => '&nsup;',
-      '⊆'  => '&SubsetEqual;',
-      '⊇'  => '&supe;',
-      '⊈'  => '&NotSubsetEqual;',
-      '⊉'  => '&NotSupersetEqual;',
-      '⊊'  => '&subsetneq;',
-      '⊊︀' => '&vsubne;',
-      '⊋'  => '&supsetneq;',
-      '⊋︀' => '&vsupne;',
-      '⊍'  => '&cupdot;',
-      '⊎'  => '&UnionPlus;',
-      '⊏'  => '&sqsub;',
-      '⊏̸' => '&NotSquareSubset;',
-      '⊐'  => '&sqsupset;',
-      '⊐̸' => '&NotSquareSuperset;',
-      '⊑'  => '&SquareSubsetEqual;',
-      '⊒'  => '&SquareSupersetEqual;',
-      '⊓'  => '&sqcap;',
-      '⊓︀' => '&sqcaps;',
-      '⊔'  => '&sqcup;',
-      '⊔︀' => '&sqcups;',
-      '⊕'  => '&CirclePlus;',
-      '⊖'  => '&ominus;',
-      '⊗'  => '&CircleTimes;',
-      '⊘'  => '&osol;',
-      '⊙'  => '&CircleDot;',
-      '⊚'  => '&ocir;',
-      '⊛'  => '&oast;',
-      '⊝'  => '&odash;',
-      '⊞'  => '&boxplus;',
-      '⊟'  => '&boxminus;',
-      '⊠'  => '&timesb;',
-      '⊡'  => '&sdotb;',
-      '⊢'  => '&vdash;',
-      '⊣'  => '&dashv;',
-      '⊤'  => '&DownTee;',
-      '⊥'  => '&perp;',
-      '⊧'  => '&models;',
-      '⊨'  => '&DoubleRightTee;',
-      '⊩'  => '&Vdash;',
-      '⊪'  => '&Vvdash;',
-      '⊫'  => '&VDash;',
-      '⊬'  => '&nvdash;',
-      '⊭'  => '&nvDash;',
-      '⊮'  => '&nVdash;',
-      '⊯'  => '&nVDash;',
-      '⊰'  => '&prurel;',
-      '⊲'  => '&vartriangleleft;',
-      '⊳'  => '&vrtri;',
-      '⊴'  => '&LeftTriangleEqual;',
-      '⊴⃒' => '&nvltrie;',
-      '⊵'  => '&RightTriangleEqual;',
-      '⊵⃒' => '&nvrtrie;',
-      '⊶'  => '&origof;',
-      '⊷'  => '&imof;',
-      '⊸'  => '&mumap;',
-      '⊹'  => '&hercon;',
-      '⊺'  => '&intcal;',
-      '⊻'  => '&veebar;',
-      '⊽'  => '&barvee;',
-      '⊾'  => '&angrtvb;',
-      '⊿'  => '&lrtri;',
-      '⋀'  => '&xwedge;',
-      '⋁'  => '&xvee;',
-      '⋂'  => '&bigcap;',
-      '⋃'  => '&bigcup;',
-      '⋄'  => '&diamond;',
-      '⋅'  => '&sdot;',
-      '⋆'  => '&Star;',
-      '⋇'  => '&divonx;',
-      '⋈'  => '&bowtie;',
-      '⋉'  => '&ltimes;',
-      '⋊'  => '&rtimes;',
-      '⋋'  => '&lthree;',
-      '⋌'  => '&rthree;',
-      '⋍'  => '&backsimeq;',
-      '⋎'  => '&curlyvee;',
-      '⋏'  => '&curlywedge;',
-      '⋐'  => '&Sub;',
-      '⋑'  => '&Supset;',
-      '⋒'  => '&Cap;',
-      '⋓'  => '&Cup;',
-      '⋔'  => '&pitchfork;',
-      '⋕'  => '&epar;',
-      '⋖'  => '&lessdot;',
-      '⋗'  => '&gtrdot;',
-      '⋘'  => '&Ll;',
-      '⋘̸' => '&nLl;',
-      '⋙'  => '&Gg;',
-      '⋙̸' => '&nGg;',
-      '⋚'  => '&lesseqgtr;',
-      '⋚︀' => '&lesg;',
-      '⋛'  => '&gtreqless;',
-      '⋛︀' => '&gesl;',
-      '⋞'  => '&curlyeqprec;',
-      '⋟'  => '&cuesc;',
-      '⋠'  => '&NotPrecedesSlantEqual;',
-      '⋡'  => '&NotSucceedsSlantEqual;',
-      '⋢'  => '&NotSquareSubsetEqual;',
-      '⋣'  => '&NotSquareSupersetEqual;',
-      '⋦'  => '&lnsim;',
-      '⋧'  => '&gnsim;',
-      '⋨'  => '&precnsim;',
-      '⋩'  => '&scnsim;',
-      '⋪'  => '&nltri;',
-      '⋫'  => '&ntriangleright;',
-      '⋬'  => '&nltrie;',
-      '⋭'  => '&NotRightTriangleEqual;',
-      '⋮'  => '&vellip;',
-      '⋯'  => '&ctdot;',
-      '⋰'  => '&utdot;',
-      '⋱'  => '&dtdot;',
-      '⋲'  => '&disin;',
-      '⋳'  => '&isinsv;',
-      '⋴'  => '&isins;',
-      '⋵'  => '&isindot;',
-      '⋵̸' => '&notindot;',
-      '⋶'  => '&notinvc;',
-      '⋷'  => '&notinvb;',
-      '⋹'  => '&isinE;',
-      '⋹̸' => '&notinE;',
-      '⋺'  => '&nisd;',
-      '⋻'  => '&xnis;',
-      '⋼'  => '&nis;',
-      '⋽'  => '&notnivc;',
-      '⋾'  => '&notnivb;',
-      '⌅'  => '&barwed;',
-      '⌆'  => '&doublebarwedge;',
-      '⌈'  => '&lceil;',
-      '⌉'  => '&RightCeiling;',
-      '⌊'  => '&LeftFloor;',
-      '⌋'  => '&RightFloor;',
-      '⌌'  => '&drcrop;',
-      '⌍'  => '&dlcrop;',
-      '⌎'  => '&urcrop;',
-      '⌏'  => '&ulcrop;',
-      '⌐'  => '&bnot;',
-      '⌒'  => '&profline;',
-      '⌓'  => '&profsurf;',
-      '⌕'  => '&telrec;',
-      '⌖'  => '&target;',
-      '⌜'  => '&ulcorner;',
-      '⌝'  => '&urcorner;',
-      '⌞'  => '&llcorner;',
-      '⌟'  => '&drcorn;',
-      '⌢'  => '&frown;',
-      '⌣'  => '&smile;',
-      '⌭'  => '&cylcty;',
-      '⌮'  => '&profalar;',
-      '⌶'  => '&topbot;',
-      '⌽'  => '&ovbar;',
-      '⌿'  => '&solbar;',
-      '⍼'  => '&angzarr;',
-      '⎰'  => '&lmoust;',
-      '⎱'  => '&rmoust;',
-      '⎴'  => '&OverBracket;',
-      '⎵'  => '&bbrk;',
-      '⎶'  => '&bbrktbrk;',
-      '⏜'  => '&OverParenthesis;',
-      '⏝'  => '&UnderParenthesis;',
-      '⏞'  => '&OverBrace;',
-      '⏟'  => '&UnderBrace;',
-      '⏢'  => '&trpezium;',
-      '⏧'  => '&elinters;',
-      '␣'  => '&blank;',
-      'Ⓢ'  => '&oS;',
-      '─'  => '&HorizontalLine;',
-      '│'  => '&boxv;',
-      '┌'  => '&boxdr;',
-      '┐'  => '&boxdl;',
-      '└'  => '&boxur;',
-      '┘'  => '&boxul;',
-      '├'  => '&boxvr;',
-      '┤'  => '&boxvl;',
-      '┬'  => '&boxhd;',
-      '┴'  => '&boxhu;',
-      '┼'  => '&boxvh;',
-      '═'  => '&boxH;',
-      '║'  => '&boxV;',
-      '╒'  => '&boxdR;',
-      '╓'  => '&boxDr;',
-      '╔'  => '&boxDR;',
-      '╕'  => '&boxdL;',
-      '╖'  => '&boxDl;',
-      '╗'  => '&boxDL;',
-      '╘'  => '&boxuR;',
-      '╙'  => '&boxUr;',
-      '╚'  => '&boxUR;',
-      '╛'  => '&boxuL;',
-      '╜'  => '&boxUl;',
-      '╝'  => '&boxUL;',
-      '╞'  => '&boxvR;',
-      '╟'  => '&boxVr;',
-      '╠'  => '&boxVR;',
-      '╡'  => '&boxvL;',
-      '╢'  => '&boxVl;',
-      '╣'  => '&boxVL;',
-      '╤'  => '&boxHd;',
-      '╥'  => '&boxhD;',
-      '╦'  => '&boxHD;',
-      '╧'  => '&boxHu;',
-      '╨'  => '&boxhU;',
-      '╩'  => '&boxHU;',
-      '╪'  => '&boxvH;',
-      '╫'  => '&boxVh;',
-      '╬'  => '&boxVH;',
-      '▀'  => '&uhblk;',
-      '▄'  => '&lhblk;',
-      '█'  => '&block;',
-      '░'  => '&blk14;',
-      '▒'  => '&blk12;',
-      '▓'  => '&blk34;',
-      '□'  => '&Square;',
-      '▪'  => '&squarf;',
-      '▫'  => '&EmptyVerySmallSquare;',
-      '▭'  => '&rect;',
-      '▮'  => '&marker;',
-      '▱'  => '&fltns;',
-      '△'  => '&bigtriangleup;',
-      '▴'  => '&blacktriangle;',
-      '▵'  => '&triangle;',
-      '▸'  => '&blacktriangleright;',
-      '▹'  => '&rtri;',
-      '▽'  => '&bigtriangledown;',
-      '▾'  => '&blacktriangledown;',
-      '▿'  => '&triangledown;',
-      '◂'  => '&blacktriangleleft;',
-      '◃'  => '&ltri;',
-      '◊'  => '&lozenge;',
-      '○'  => '&cir;',
-      '◬'  => '&tridot;',
-      '◯'  => '&bigcirc;',
-      '◸'  => '&ultri;',
-      '◹'  => '&urtri;',
-      '◺'  => '&lltri;',
-      '◻'  => '&EmptySmallSquare;',
-      '◼'  => '&FilledSmallSquare;',
-      '★'  => '&starf;',
-      '☆'  => '&star;',
-      '☎'  => '&phone;',
-      '♀'  => '&female;',
-      '♂'  => '&male;',
-      '♠'  => '&spadesuit;',
-      '♣'  => '&clubs;',
-      '♥'  => '&hearts;',
-      '♦'  => '&diamondsuit;',
-      '♪'  => '&sung;',
-      '♭'  => '&flat;',
-      '♮'  => '&natur;',
-      '♯'  => '&sharp;',
-      '✓'  => '&check;',
-      '✗'  => '&cross;',
-      '✠'  => '&maltese;',
-      '✶'  => '&sext;',
-      '❘'  => '&VerticalSeparator;',
-      '❲'  => '&lbbrk;',
-      '❳'  => '&rbbrk;',
-      '⟈'  => '&bsolhsub;',
-      '⟉'  => '&suphsol;',
-      '⟦'  => '&LeftDoubleBracket;',
-      '⟧'  => '&RightDoubleBracket;',
-      '⟨'  => '&langle;',
-      '⟩'  => '&RightAngleBracket;',
-      '⟪'  => '&Lang;',
-      '⟫'  => '&Rang;',
-      '⟬'  => '&loang;',
-      '⟭'  => '&roang;',
-      '⟵'  => '&longleftarrow;',
-      '⟶'  => '&LongRightArrow;',
-      '⟷'  => '&LongLeftRightArrow;',
-      '⟸'  => '&xlArr;',
-      '⟹'  => '&DoubleLongRightArrow;',
-      '⟺'  => '&xhArr;',
-      '⟼'  => '&xmap;',
-      '⟿'  => '&dzigrarr;',
-      '⤂'  => '&nvlArr;',
-      '⤃'  => '&nvrArr;',
-      '⤄'  => '&nvHarr;',
-      '⤅'  => '&Map;',
-      '⤌'  => '&lbarr;',
-      '⤍'  => '&bkarow;',
-      '⤎'  => '&lBarr;',
-      '⤏'  => '&dbkarow;',
-      '⤐'  => '&drbkarow;',
-      '⤑'  => '&DDotrahd;',
-      '⤒'  => '&UpArrowBar;',
-      '⤓'  => '&DownArrowBar;',
-      '⤖'  => '&Rarrtl;',
-      '⤙'  => '&latail;',
-      '⤚'  => '&ratail;',
-      '⤛'  => '&lAtail;',
-      '⤜'  => '&rAtail;',
-      '⤝'  => '&larrfs;',
-      '⤞'  => '&rarrfs;',
-      '⤟'  => '&larrbfs;',
-      '⤠'  => '&rarrbfs;',
-      '⤣'  => '&nwarhk;',
-      '⤤'  => '&nearhk;',
-      '⤥'  => '&searhk;',
-      '⤦'  => '&swarhk;',
-      '⤧'  => '&nwnear;',
-      '⤨'  => '&toea;',
-      '⤩'  => '&seswar;',
-      '⤪'  => '&swnwar;',
-      '⤳'  => '&rarrc;',
-      '⤳̸' => '&nrarrc;',
-      '⤵'  => '&cudarrr;',
-      '⤶'  => '&ldca;',
-      '⤷'  => '&rdca;',
-      '⤸'  => '&cudarrl;',
-      '⤹'  => '&larrpl;',
-      '⤼'  => '&curarrm;',
-      '⤽'  => '&cularrp;',
-      '⥅'  => '&rarrpl;',
-      '⥈'  => '&harrcir;',
-      '⥉'  => '&Uarrocir;',
-      '⥊'  => '&lurdshar;',
-      '⥋'  => '&ldrushar;',
-      '⥎'  => '&LeftRightVector;',
-      '⥏'  => '&RightUpDownVector;',
-      '⥐'  => '&DownLeftRightVector;',
-      '⥑'  => '&LeftUpDownVector;',
-      '⥒'  => '&LeftVectorBar;',
-      '⥓'  => '&RightVectorBar;',
-      '⥔'  => '&RightUpVectorBar;',
-      '⥕'  => '&RightDownVectorBar;',
-      '⥖'  => '&DownLeftVectorBar;',
-      '⥗'  => '&DownRightVectorBar;',
-      '⥘'  => '&LeftUpVectorBar;',
-      '⥙'  => '&LeftDownVectorBar;',
-      '⥚'  => '&LeftTeeVector;',
-      '⥛'  => '&RightTeeVector;',
-      '⥜'  => '&RightUpTeeVector;',
-      '⥝'  => '&RightDownTeeVector;',
-      '⥞'  => '&DownLeftTeeVector;',
-      '⥟'  => '&DownRightTeeVector;',
-      '⥠'  => '&LeftUpTeeVector;',
-      '⥡'  => '&LeftDownTeeVector;',
-      '⥢'  => '&lHar;',
-      '⥣'  => '&uHar;',
-      '⥤'  => '&rHar;',
-      '⥥'  => '&dHar;',
-      '⥦'  => '&luruhar;',
-      '⥧'  => '&ldrdhar;',
-      '⥨'  => '&ruluhar;',
-      '⥩'  => '&rdldhar;',
-      '⥪'  => '&lharul;',
-      '⥫'  => '&llhard;',
-      '⥬'  => '&rharul;',
-      '⥭'  => '&lrhard;',
-      '⥮'  => '&udhar;',
-      '⥯'  => '&ReverseUpEquilibrium;',
-      '⥰'  => '&RoundImplies;',
-      '⥱'  => '&erarr;',
-      '⥲'  => '&simrarr;',
-      '⥳'  => '&larrsim;',
-      '⥴'  => '&rarrsim;',
-      '⥵'  => '&rarrap;',
-      '⥶'  => '&ltlarr;',
-      '⥸'  => '&gtrarr;',
-      '⥹'  => '&subrarr;',
-      '⥻'  => '&suplarr;',
-      '⥼'  => '&lfisht;',
-      '⥽'  => '&rfisht;',
-      '⥾'  => '&ufisht;',
-      '⥿'  => '&dfisht;',
-      '⦅'  => '&lopar;',
-      '⦆'  => '&ropar;',
-      '⦋'  => '&lbrke;',
-      '⦌'  => '&rbrke;',
-      '⦍'  => '&lbrkslu;',
-      '⦎'  => '&rbrksld;',
-      '⦏'  => '&lbrksld;',
-      '⦐'  => '&rbrkslu;',
-      '⦑'  => '&langd;',
-      '⦒'  => '&rangd;',
-      '⦓'  => '&lparlt;',
-      '⦔'  => '&rpargt;',
-      '⦕'  => '&gtlPar;',
-      '⦖'  => '&ltrPar;',
-      '⦚'  => '&vzigzag;',
-      '⦜'  => '&vangrt;',
-      '⦝'  => '&angrtvbd;',
-      '⦤'  => '&ange;',
-      '⦥'  => '&range;',
-      '⦦'  => '&dwangle;',
-      '⦧'  => '&uwangle;',
-      '⦨'  => '&angmsdaa;',
-      '⦩'  => '&angmsdab;',
-      '⦪'  => '&angmsdac;',
-      '⦫'  => '&angmsdad;',
-      '⦬'  => '&angmsdae;',
-      '⦭'  => '&angmsdaf;',
-      '⦮'  => '&angmsdag;',
-      '⦯'  => '&angmsdah;',
-      '⦰'  => '&bemptyv;',
-      '⦱'  => '&demptyv;',
-      '⦲'  => '&cemptyv;',
-      '⦳'  => '&raemptyv;',
-      '⦴'  => '&laemptyv;',
-      '⦵'  => '&ohbar;',
-      '⦶'  => '&omid;',
-      '⦷'  => '&opar;',
-      '⦹'  => '&operp;',
-      '⦻'  => '&olcross;',
-      '⦼'  => '&odsold;',
-      '⦾'  => '&olcir;',
-      '⦿'  => '&ofcir;',
-      '⧀'  => '&olt;',
-      '⧁'  => '&ogt;',
-      '⧂'  => '&cirscir;',
-      '⧃'  => '&cirE;',
-      '⧄'  => '&solb;',
-      '⧅'  => '&bsolb;',
-      '⧉'  => '&boxbox;',
-      '⧍'  => '&trisb;',
-      '⧎'  => '&rtriltri;',
-      '⧏'  => '&LeftTriangleBar;',
-      '⧏̸' => '&NotLeftTriangleBar;',
-      '⧐'  => '&RightTriangleBar;',
-      '⧐̸' => '&NotRightTriangleBar;',
-      '⧜'  => '&iinfin;',
-      '⧝'  => '&infintie;',
-      '⧞'  => '&nvinfin;',
-      '⧣'  => '&eparsl;',
-      '⧤'  => '&smeparsl;',
-      '⧥'  => '&eqvparsl;',
-      '⧫'  => '&lozf;',
-      '⧴'  => '&RuleDelayed;',
-      '⧶'  => '&dsol;',
-      '⨀'  => '&xodot;',
-      '⨁'  => '&bigoplus;',
-      '⨂'  => '&bigotimes;',
-      '⨄'  => '&biguplus;',
-      '⨆'  => '&bigsqcup;',
-      '⨌'  => '&iiiint;',
-      '⨍'  => '&fpartint;',
-      '⨐'  => '&cirfnint;',
-      '⨑'  => '&awint;',
-      '⨒'  => '&rppolint;',
-      '⨓'  => '&scpolint;',
-      '⨔'  => '&npolint;',
-      '⨕'  => '&pointint;',
-      '⨖'  => '&quatint;',
-      '⨗'  => '&intlarhk;',
-      '⨢'  => '&pluscir;',
-      '⨣'  => '&plusacir;',
-      '⨤'  => '&simplus;',
-      '⨥'  => '&plusdu;',
-      '⨦'  => '&plussim;',
-      '⨧'  => '&plustwo;',
-      '⨩'  => '&mcomma;',
-      '⨪'  => '&minusdu;',
-      '⨭'  => '&loplus;',
-      '⨮'  => '&roplus;',
-      '⨯'  => '&Cross;',
-      '⨰'  => '&timesd;',
-      '⨱'  => '&timesbar;',
-      '⨳'  => '&smashp;',
-      '⨴'  => '&lotimes;',
-      '⨵'  => '&rotimes;',
-      '⨶'  => '&otimesas;',
-      '⨷'  => '&Otimes;',
-      '⨸'  => '&odiv;',
-      '⨹'  => '&triplus;',
-      '⨺'  => '&triminus;',
-      '⨻'  => '&tritime;',
-      '⨼'  => '&iprod;',
-      '⨿'  => '&amalg;',
-      '⩀'  => '&capdot;',
-      '⩂'  => '&ncup;',
-      '⩃'  => '&ncap;',
-      '⩄'  => '&capand;',
-      '⩅'  => '&cupor;',
-      '⩆'  => '&cupcap;',
-      '⩇'  => '&capcup;',
-      '⩈'  => '&cupbrcap;',
-      '⩉'  => '&capbrcup;',
-      '⩊'  => '&cupcup;',
-      '⩋'  => '&capcap;',
-      '⩌'  => '&ccups;',
-      '⩍'  => '&ccaps;',
-      '⩐'  => '&ccupssm;',
-      '⩓'  => '&And;',
-      '⩔'  => '&Or;',
-      '⩕'  => '&andand;',
-      '⩖'  => '&oror;',
-      '⩗'  => '&orslope;',
-      '⩘'  => '&andslope;',
-      '⩚'  => '&andv;',
-      '⩛'  => '&orv;',
-      '⩜'  => '&andd;',
-      '⩝'  => '&ord;',
-      '⩟'  => '&wedbar;',
-      '⩦'  => '&sdote;',
-      '⩪'  => '&simdot;',
-      '⩭'  => '&congdot;',
-      '⩭̸' => '&ncongdot;',
-      '⩮'  => '&easter;',
-      '⩯'  => '&apacir;',
-      '⩰'  => '&apE;',
-      '⩰̸' => '&napE;',
-      '⩱'  => '&eplus;',
-      '⩲'  => '&pluse;',
-      '⩳'  => '&Esim;',
-      '⩴'  => '&Colone;',
-      '⩵'  => '&Equal;',
-      '⩷'  => '&ddotseq;',
-      '⩸'  => '&equivDD;',
-      '⩹'  => '&ltcir;',
-      '⩺'  => '&gtcir;',
-      '⩻'  => '&ltquest;',
-      '⩼'  => '&gtquest;',
-      '⩽'  => '&les;',
-      '⩽̸' => '&nles;',
-      '⩾'  => '&ges;',
-      '⩾̸' => '&nges;',
-      '⩿'  => '&lesdot;',
-      '⪀'  => '&gesdot;',
-      '⪁'  => '&lesdoto;',
-      '⪂'  => '&gesdoto;',
-      '⪃'  => '&lesdotor;',
-      '⪄'  => '&gesdotol;',
-      '⪅'  => '&lap;',
-      '⪆'  => '&gap;',
-      '⪇'  => '&lne;',
-      '⪈'  => '&gne;',
-      '⪉'  => '&lnap;',
-      '⪊'  => '&gnap;',
-      '⪋'  => '&lesseqqgtr;',
-      '⪌'  => '&gEl;',
-      '⪍'  => '&lsime;',
-      '⪎'  => '&gsime;',
-      '⪏'  => '&lsimg;',
-      '⪐'  => '&gsiml;',
-      '⪑'  => '&lgE;',
-      '⪒'  => '&glE;',
-      '⪓'  => '&lesges;',
-      '⪔'  => '&gesles;',
-      '⪕'  => '&els;',
-      '⪖'  => '&egs;',
-      '⪗'  => '&elsdot;',
-      '⪘'  => '&egsdot;',
-      '⪙'  => '&el;',
-      '⪚'  => '&eg;',
-      '⪝'  => '&siml;',
-      '⪞'  => '&simg;',
-      '⪟'  => '&simlE;',
-      '⪠'  => '&simgE;',
-      '⪡'  => '&LessLess;',
-      '⪡̸' => '&NotNestedLessLess;',
-      '⪢'  => '&GreaterGreater;',
-      '⪢̸' => '&NotNestedGreaterGreater;',
-      '⪤'  => '&glj;',
-      '⪥'  => '&gla;',
-      '⪦'  => '&ltcc;',
-      '⪧'  => '&gtcc;',
-      '⪨'  => '&lescc;',
-      '⪩'  => '&gescc;',
-      '⪪'  => '&smt;',
-      '⪫'  => '&lat;',
-      '⪬'  => '&smte;',
-      '⪬︀' => '&smtes;',
-      '⪭'  => '&late;',
-      '⪭︀' => '&lates;',
-      '⪮'  => '&bumpE;',
-      '⪯'  => '&preceq;',
-      '⪯̸' => '&NotPrecedesEqual;',
-      '⪰'  => '&SucceedsEqual;',
-      '⪰̸' => '&NotSucceedsEqual;',
-      '⪳'  => '&prE;',
-      '⪴'  => '&scE;',
-      '⪵'  => '&precneqq;',
-      '⪶'  => '&scnE;',
-      '⪷'  => '&precapprox;',
-      '⪸'  => '&succapprox;',
-      '⪹'  => '&precnapprox;',
-      '⪺'  => '&succnapprox;',
-      '⪻'  => '&Pr;',
-      '⪼'  => '&Sc;',
-      '⪽'  => '&subdot;',
-      '⪾'  => '&supdot;',
-      '⪿'  => '&subplus;',
-      '⫀'  => '&supplus;',
-      '⫁'  => '&submult;',
-      '⫂'  => '&supmult;',
-      '⫃'  => '&subedot;',
-      '⫄'  => '&supedot;',
-      '⫅'  => '&subE;',
-      '⫅̸' => '&nsubE;',
-      '⫆'  => '&supseteqq;',
-      '⫆̸' => '&nsupseteqq;',
-      '⫇'  => '&subsim;',
-      '⫈'  => '&supsim;',
-      '⫋'  => '&subsetneqq;',
-      '⫋︀' => '&vsubnE;',
-      '⫌'  => '&supnE;',
-      '⫌︀' => '&varsupsetneqq;',
-      '⫏'  => '&csub;',
-      '⫐'  => '&csup;',
-      '⫑'  => '&csube;',
-      '⫒'  => '&csupe;',
-      '⫓'  => '&subsup;',
-      '⫔'  => '&supsub;',
-      '⫕'  => '&subsub;',
-      '⫖'  => '&supsup;',
-      '⫗'  => '&suphsub;',
-      '⫘'  => '&supdsub;',
-      '⫙'  => '&forkv;',
-      '⫚'  => '&topfork;',
-      '⫛'  => '&mlcp;',
-      '⫤'  => '&Dashv;',
-      '⫦'  => '&Vdashl;',
-      '⫧'  => '&Barv;',
-      '⫨'  => '&vBar;',
-      '⫩'  => '&vBarv;',
-      '⫫'  => '&Vbar;',
-      '⫬'  => '&Not;',
-      '⫭'  => '&bNot;',
-      '⫮'  => '&rnmid;',
-      '⫯'  => '&cirmid;',
-      '⫰'  => '&midcir;',
-      '⫱'  => '&topcir;',
-      '⫲'  => '&nhpar;',
-      '⫳'  => '&parsim;',
-      '⫽'  => '&parsl;',
-      '⫽⃥' => '&nparsl;',
-      'ff'  => '&fflig;',
-      'fi'  => '&filig;',
-      'fl'  => '&fllig;',
-      'ffi'  => '&ffilig;',
-      'ffl'  => '&ffllig;',
-      '