mikopbx / Core

etc/rc/vendor/php-school/cli-menu/src/Util/StringUtil.php

Spacing +6 added lines, -6 removed lines

@@ -21,7 +21,7 @@ 
     {
         return implode(
             $break,
-            array_map(function (string $line) use ($width, $break) {
+            array_map(function(string $line) use ($width, $break) {
                 $line = rtrim($line);
                 if (mb_strlen($line) <= $width) {
                     return $line;
@@ -31,16 +31,16 @@ 
                 $line   = '';
                 $actual = '';
                 foreach ($words as $word) {
-                    if (mb_strlen($actual . $word) <= $width) {
-                        $actual .= $word . ' ';
+                    if (mb_strlen($actual.$word) <= $width) {
+                        $actual .= $word.' ';
                     } else {
                         if ($actual !== '') {
-                            $line .= rtrim($actual) . $break;
+                            $line .= rtrim($actual).$break;
                         }
-                        $actual = $word . ' ';
+                        $actual = $word.' ';
                     }
                 }
-                return $line . trim($actual);
+                return $line.trim($actual);
             }, explode("\n", $string))
         );
     }

Braces +2 added lines, -1 removed lines

@@ -21,7 +21,8 @@
     {
         return implode(
             $break,
-            array_map(function (string $line) use ($width, $break) {
+            array_map(function (string $line) use ($width, $break)
+            {
                 $line = rtrim($line);
                 if (mb_strlen($line) <= $width) {
                     return $line;

etc/rc/vendor/composer/autoload_real.php

Spacing +6 added lines, -6 removed lines

@@ -15,7 +15,7 @@ 
     public static function loadClassLoader($class)
     {
         if ('Composer\Autoload\ClassLoader' === $class) {
-            require __DIR__ . '/ClassLoader.php';
+            require __DIR__.'/ClassLoader.php';
         }
     }
 
@@ -31,21 +31,21 @@ 
 
         $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
         if ($useStaticLoader) {
-            require_once __DIR__ . '/autoload_static.php';
+            require_once __DIR__.'/autoload_static.php';
 
             call_user_func(\Composer\Autoload\ComposerStaticInit6670dab4b71421eb4b91561314912df5::getInitializer($loader));
         } else {
-            $map = require __DIR__ . '/autoload_namespaces.php';
+            $map = require __DIR__.'/autoload_namespaces.php';
             foreach ($map as $namespace => $path) {
                 $loader->set($namespace, $path);
             }
 
-            $map = require __DIR__ . '/autoload_psr4.php';
+            $map = require __DIR__.'/autoload_psr4.php';
             foreach ($map as $namespace => $path) {
                 $loader->setPsr4($namespace, $path);
             }
 
-            $classMap = require __DIR__ . '/autoload_classmap.php';
+            $classMap = require __DIR__.'/autoload_classmap.php';
             if ($classMap) {
                 $loader->addClassMap($classMap);
             }
@@ -56,7 +56,7 @@ 
         if ($useStaticLoader) {
             $includeFiles = Composer\Autoload\ComposerStaticInit6670dab4b71421eb4b91561314912df5::$files;
         } else {
-            $includeFiles = require __DIR__ . '/autoload_files.php';
+            $includeFiles = require __DIR__.'/autoload_files.php';
         }
         foreach ($includeFiles as $fileIdentifier => $file) {
             composerRequire6670dab4b71421eb4b91561314912df5($fileIdentifier, $file);

etc/rc/vendor/composer/autoload_psr4.php

Spacing +3 added lines, -3 removed lines

@@ -12,7 +12,7 @@
 $baseDir = dirname($vendorDir);
 
 return array(
-    'PhpSchool\\Terminal\\' => array($vendorDir . '/php-school/terminal/src'),
-    'PhpSchool\\CliMenu\\' => array($vendorDir . '/php-school/cli-menu/src'),
-    'Assert\\' => array($vendorDir . '/beberlei/assert/lib/Assert'),
+    'PhpSchool\\Terminal\\' => array($vendorDir.'/php-school/terminal/src'),
+    'PhpSchool\\CliMenu\\' => array($vendorDir.'/php-school/cli-menu/src'),
+    'Assert\\' => array($vendorDir.'/beberlei/assert/lib/Assert'),
 );

etc/rc/vendor/composer/autoload_static.php

Spacing +13 added lines, -13 removed lines

@@ -12,40 +12,40 @@
 
 class ComposerStaticInit6670dab4b71421eb4b91561314912df5
 {
-    public static $files = array (
-        'a4ecaeafb8cfb009ad0e052c90355e98' => __DIR__ . '/..' . '/beberlei/assert/lib/Assert/functions.php',
+    public static $files = array(
+        'a4ecaeafb8cfb009ad0e052c90355e98' => __DIR__.'/..'.'/beberlei/assert/lib/Assert/functions.php',
     );
 
-    public static $prefixLengthsPsr4 = array (
+    public static $prefixLengthsPsr4 = array(
         'P' => 
-        array (
+        array(
             'PhpSchool\\Terminal\\' => 19,
             'PhpSchool\\CliMenu\\' => 18,
         ),
         'A' => 
-        array (
+        array(
             'Assert\\' => 7,
         ),
     );
 
-    public static $prefixDirsPsr4 = array (
+    public static $prefixDirsPsr4 = array(
         'PhpSchool\\Terminal\\' => 
-        array (
-            0 => __DIR__ . '/..' . '/php-school/terminal/src',
+        array(
+            0 => __DIR__.'/..'.'/php-school/terminal/src',
         ),
         'PhpSchool\\CliMenu\\' => 
-        array (
-            0 => __DIR__ . '/..' . '/php-school/cli-menu/src',
+        array(
+            0 => __DIR__.'/..'.'/php-school/cli-menu/src',
         ),
         'Assert\\' => 
-        array (
-            0 => __DIR__ . '/..' . '/beberlei/assert/lib/Assert',
+        array(
+            0 => __DIR__.'/..'.'/beberlei/assert/lib/Assert',
         ),
     );
 
     public static function getInitializer(ClassLoader $loader)
     {
-        return \Closure::bind(function () use ($loader) {
+        return \Closure::bind(function() use ($loader) {
             $loader->prefixLengthsPsr4 = ComposerStaticInit6670dab4b71421eb4b91561314912df5::$prefixLengthsPsr4;
             $loader->prefixDirsPsr4 = ComposerStaticInit6670dab4b71421eb4b91561314912df5::$prefixDirsPsr4;
 

Braces +2 added lines, -1 removed lines

@@ -45,7 +45,8 @@
 
     public static function getInitializer(ClassLoader $loader)
     {
-        return \Closure::bind(function () use ($loader) {
+        return \Closure::bind(function () use ($loader)
+        {
             $loader->prefixLengthsPsr4 = ComposerStaticInit6670dab4b71421eb4b91561314912df5::$prefixLengthsPsr4;
             $loader->prefixDirsPsr4 = ComposerStaticInit6670dab4b71421eb4b91561314912df5::$prefixDirsPsr4;
 

etc/rc/vendor/composer/autoload_files.php

Spacing +1 added lines, -1 removed lines

@@ -12,5 +12,5 @@
 $baseDir = dirname($vendorDir);
 
 return array(
-    'a4ecaeafb8cfb009ad0e052c90355e98' => $vendorDir . '/beberlei/assert/lib/Assert/functions.php',
+    'a4ecaeafb8cfb009ad0e052c90355e98' => $vendorDir.'/beberlei/assert/lib/Assert/functions.php',
 );

etc/rc/vendor/composer/ClassLoader.php

Spacing +8 added lines, -8 removed lines

@@ -367,18 +367,18 @@ 
     private function findFileWithExtension($class, $ext)
     {
         // PSR-4 lookup
-        $logicalPathPsr4 = strtr($class, '\\', DIRECTORY_SEPARATOR) . $ext;
+        $logicalPathPsr4 = strtr($class, '\\', DIRECTORY_SEPARATOR).$ext;
 
         $first = $class[0];
         if (isset($this->prefixLengthsPsr4[$first])) {
             $subPath = $class;
             while (false !== $lastPos = strrpos($subPath, '\\')) {
                 $subPath = substr($subPath, 0, $lastPos);
-                $search = $subPath . '\\';
+                $search = $subPath.'\\';
                 if (isset($this->prefixDirsPsr4[$search])) {
-                    $pathEnd = DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $lastPos + 1);
+                    $pathEnd = DIRECTORY_SEPARATOR.substr($logicalPathPsr4, $lastPos + 1);
                     foreach ($this->prefixDirsPsr4[$search] as $dir) {
-                        if (file_exists($file = $dir . $pathEnd)) {
+                        if (file_exists($file = $dir.$pathEnd)) {
                             return $file;
                         }
                     }
@@ -388,7 +388,7 @@ 
 
         // PSR-4 fallback dirs
         foreach ($this->fallbackDirsPsr4 as $dir) {
-            if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr4)) {
+            if (file_exists($file = $dir.DIRECTORY_SEPARATOR.$logicalPathPsr4)) {
                 return $file;
             }
         }
@@ -400,14 +400,14 @@ 
                 . strtr(substr($logicalPathPsr4, $pos + 1), '_', DIRECTORY_SEPARATOR);
         } else {
             // PEAR-like class name
-            $logicalPathPsr0 = strtr($class, '_', DIRECTORY_SEPARATOR) . $ext;
+            $logicalPathPsr0 = strtr($class, '_', DIRECTORY_SEPARATOR).$ext;
         }
 
         if (isset($this->prefixesPsr0[$first])) {
             foreach ($this->prefixesPsr0[$first] as $prefix => $dirs) {
                 if (0 === strpos($class, $prefix)) {
                     foreach ($dirs as $dir) {
-                        if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
+                        if (file_exists($file = $dir.DIRECTORY_SEPARATOR.$logicalPathPsr0)) {
                             return $file;
                         }
                     }
@@ -417,7 +417,7 @@ 
 
         // PSR-0 fallback dirs
         foreach ($this->fallbackDirsPsr0 as $dir) {
-            if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
+            if (file_exists($file = $dir.DIRECTORY_SEPARATOR.$logicalPathPsr0)) {
                 return $file;
             }
         }

etc/rc/vendor/beberlei/assert/lib/Assert/Assertion.php

Spacing +3 added lines, -3 removed lines

@@ -519,7 +519,7 @@ 
      */
     public static function digit($value, $message = null, string $propertyPath = null): bool
     {
-        if (!\ctype_digit((string)$value)) {
+        if (!\ctype_digit((string) $value)) {
             $message = \sprintf(
                 static::generateMessage($message ?: 'Value "%s" is not a digit.'),
                 static::stringify($value)
@@ -2772,7 +2772,7 @@ 
         if (\is_bool($value)) {
             $result = $value ? '<TRUE>' : '<FALSE>';
         } elseif (\is_scalar($value)) {
-            $val = (string)$value;
+            $val = (string) $value;
 
             if (\mb_strlen($val) > 100) {
                 $val = \mb_substr($val, 0, 97).'...';
@@ -2826,6 +2826,6 @@ 
             } // @codeCoverageIgnoreEnd
         }
 
-        return (string)$message;
+        return (string) $message;
     }
 }

etc/inc/simple_html_dom.php

Indentation +7 added lines, -7 removed lines

@@ -776,11 +776,11 @@ 
     }
 
     /**
-    * Returns true if $string is valid UTF-8 and false otherwise.
-    *
-    * @param mixed $str String to be tested
-    * @return boolean
-    */
+     * Returns true if $string is valid UTF-8 and false otherwise.
+     *
+     * @param mixed $str String to be tested
+     * @return boolean
+     */
     static function is_utf8($str)
     {
         $c=0; $b=0;
@@ -856,7 +856,7 @@ 
             $attributes = array();
             preg_match_all("/([\w-]+)\s*:\s*([^;]+)\s*;?/", $this->attr['style'], $matches, PREG_SET_ORDER);
             foreach ($matches as $match) {
-              $attributes[$match[1]] = $match[2];
+                $attributes[$match[1]] = $match[2];
             }
 
             // If there is a width in the style attributes:
@@ -977,7 +977,7 @@ 
         'p'=>array('p'=>1),
         'nobr'=>array('nobr'=>1),
         'b'=>array('b'=>1),
-		'option'=>array('option'=>1),
+        'option'=>array('option'=>1),
     );
 
     function __construct($str=null, $lowercase=true, $forceTagsClosed=true, $target_charset=DEFAULT_TARGET_CHARSET, $stripRN=true, $defaultBRText=DEFAULT_BR_TEXT, $defaultSpanText=DEFAULT_SPAN_TEXT)

Spacing +238 added lines, -238 removed lines

@@ -12,21 +12,21 @@ 
  */
 define('HDOM_TYPE_ELEMENT', 1);
 define('HDOM_TYPE_COMMENT', 2);
-define('HDOM_TYPE_TEXT',    3);
-define('HDOM_TYPE_ENDTAG',  4);
-define('HDOM_TYPE_ROOT',    5);
+define('HDOM_TYPE_TEXT', 3);
+define('HDOM_TYPE_ENDTAG', 4);
+define('HDOM_TYPE_ROOT', 5);
 define('HDOM_TYPE_UNKNOWN', 6);
 define('HDOM_QUOTE_DOUBLE', 0);
 define('HDOM_QUOTE_SINGLE', 1);
-define('HDOM_QUOTE_NO',     3);
-define('HDOM_INFO_BEGIN',   0);
-define('HDOM_INFO_END',     1);
-define('HDOM_INFO_QUOTE',   2);
-define('HDOM_INFO_SPACE',   3);
-define('HDOM_INFO_TEXT',    4);
-define('HDOM_INFO_INNER',   5);
-define('HDOM_INFO_OUTER',   6);
-define('HDOM_INFO_ENDSPACE',7);
+define('HDOM_QUOTE_NO', 3);
+define('HDOM_INFO_BEGIN', 0);
+define('HDOM_INFO_END', 1);
+define('HDOM_INFO_QUOTE', 2);
+define('HDOM_INFO_SPACE', 3);
+define('HDOM_INFO_TEXT', 4);
+define('HDOM_INFO_INNER', 5);
+define('HDOM_INFO_OUTER', 6);
+define('HDOM_INFO_ENDSPACE', 7);
 define('DEFAULT_TARGET_CHARSET', 'UTF-8');
 define('DEFAULT_BR_TEXT', "\r\n");
 define('DEFAULT_SPAN_TEXT', " ");
@@ -35,7 +35,7 @@ 
 // -----------------------------------------------------------------------------
 // get html dom from file
 // $maxlen is defined in the code as PHP_STREAM_COPY_ALL which is defined as -1.
-function file_get_html($url, $use_include_path = false, $context=null, $offset = -1, $maxLen=-1, $lowercase = true, $forceTagsClosed=true, $target_charset = DEFAULT_TARGET_CHARSET, $stripRN=true, $defaultBRText=DEFAULT_BR_TEXT, $defaultSpanText=DEFAULT_SPAN_TEXT)
+function file_get_html($url, $use_include_path = false, $context = null, $offset = -1, $maxLen = -1, $lowercase = true, $forceTagsClosed = true, $target_charset = DEFAULT_TARGET_CHARSET, $stripRN = true, $defaultBRText = DEFAULT_BR_TEXT, $defaultSpanText = DEFAULT_SPAN_TEXT)
 {
     // We DO force the tags to be terminated.
     $dom = new simple_html_dom(null, $lowercase, $forceTagsClosed, $target_charset, $stripRN, $defaultBRText, $defaultSpanText);
@@ -53,7 +53,7 @@ 
 }
 
 // get html dom from string
-function str_get_html($str, $lowercase=true, $forceTagsClosed=true, $target_charset = DEFAULT_TARGET_CHARSET, $stripRN=true, $defaultBRText=DEFAULT_BR_TEXT, $defaultSpanText=DEFAULT_SPAN_TEXT)
+function str_get_html($str, $lowercase = true, $forceTagsClosed = true, $target_charset = DEFAULT_TARGET_CHARSET, $stripRN = true, $defaultBRText = DEFAULT_BR_TEXT, $defaultSpanText = DEFAULT_SPAN_TEXT)
 {
     $dom = new simple_html_dom(null, $lowercase, $forceTagsClosed, $target_charset, $stripRN, $defaultBRText, $defaultSpanText);
     if (empty($str) || strlen($str) > MAX_FILE_SIZE)
@@ -66,7 +66,7 @@ 
 }
 
 // dump html dom tree
-function dump_html_tree($node, $show_attr=true, $deep=0)
+function dump_html_tree($node, $show_attr = true, $deep = 0)
 {
     $node->dump($node);
 }
@@ -118,12 +118,12 @@ 
     }
 
     // dump node's tree
-    function dump($show_attr=true, $deep=0)
+    function dump($show_attr = true, $deep = 0)
     {
         $lead = str_repeat('    ', $deep);
 
         echo $lead.$this->tag;
-        if ($show_attr && count($this->attr)>0)
+        if ($show_attr && count($this->attr) > 0)
         {
             echo '(';
             foreach ($this->attr as $k=>$v)
@@ -136,18 +136,18 @@ 
         {
             foreach ($this->nodes as $c)
             {
-                $c->dump($show_attr, $deep+1);
+                $c->dump($show_attr, $deep + 1);
             }
         }
     }
 
 
     // Debugging function to dump a single dom node with a bunch of information about it.
-    function dump_node($echo=true)
+    function dump_node($echo = true)
     {
 
         $string = $this->tag;
-        if (count($this->attr)>0)
+        if (count($this->attr) > 0)
         {
             $string .= '(';
             foreach ($this->attr as $k=>$v)
@@ -156,7 +156,7 @@ 
             }
             $string .= ')';
         }
-        if (count($this->_)>0)
+        if (count($this->_) > 0)
         {
             $string .= ' $_ (';
             foreach ($this->_ as $k=>$v)
@@ -178,22 +178,22 @@ 
 
         if (isset($this->text))
         {
-            $string .= " text: (" . $this->text . ")";
+            $string .= " text: (".$this->text.")";
         }
 
         $string .= " HDOM_INNER_INFO: '";
         if (isset($node->_[HDOM_INFO_INNER]))
         {
-            $string .= $node->_[HDOM_INFO_INNER] . "'";
+            $string .= $node->_[HDOM_INFO_INNER]."'";
         }
         else
         {
             $string .= ' NULL ';
         }
 
-        $string .= " children: " . count($this->children);
-        $string .= " nodes: " . count($this->nodes);
-        $string .= " tag_start: " . $this->tag_start;
+        $string .= " children: ".count($this->children);
+        $string .= " nodes: ".count($this->nodes);
+        $string .= " tag_start: ".$this->tag_start;
         $string .= "\n";
 
         if ($echo)
@@ -209,7 +209,7 @@ 
 
     // returns the parent of node
     // If a node is passed in, it will reset the parent of the current node to that one.
-    function parent($parent=null)
+    function parent($parent = null)
     {
         // I am SURE that this doesn't work properly.
         // It fails to unset the current node from it's current parents nodes or children list first.
@@ -230,9 +230,9 @@ 
     }
 
     // returns children of node
-    function children($idx=-1)
+    function children($idx = -1)
     {
-        if ($idx===-1)
+        if ($idx === -1)
         {
             return $this->children;
         }
@@ -243,7 +243,7 @@ 
     // returns the first child of node
     function first_child()
     {
-        if (count($this->children)>0)
+        if (count($this->children) > 0)
         {
             return $this->children[0];
         }
@@ -253,9 +253,9 @@ 
     // returns the last child of node
     function last_child()
     {
-        if (($count=count($this->children))>0)
+        if (($count = count($this->children)) > 0)
         {
-            return $this->children[$count-1];
+            return $this->children[$count - 1];
         }
         return null;
     }
@@ -263,18 +263,18 @@ 
     // returns the next sibling of node
     function next_sibling()
     {
-        if ($this->parent===null)
+        if ($this->parent === null)
         {
             return null;
         }
 
         $idx = 0;
         $count = count($this->parent->children);
-        while ($idx<$count && $this!==$this->parent->children[$idx])
+        while ($idx < $count && $this !== $this->parent->children[$idx])
         {
             ++$idx;
         }
-        if (++$idx>=$count)
+        if (++$idx >= $count)
         {
             return null;
         }
@@ -284,12 +284,12 @@ 
     // returns the previous sibling of node
     function prev_sibling()
     {
-        if ($this->parent===null) return null;
+        if ($this->parent === null) return null;
         $idx = 0;
         $count = count($this->parent->children);
-        while ($idx<$count && $this!==$this->parent->children[$idx])
+        while ($idx < $count && $this !== $this->parent->children[$idx])
             ++$idx;
-        if (--$idx<0) return null;
+        if (--$idx < 0) return null;
         return $this->parent->children[$idx];
     }
 
@@ -304,7 +304,7 @@ 
 
         while (!is_null($returnDom))
         {
-            if (is_object($debugObject)) { $debugObject->debugLog(2, "Current tag is: " . $returnDom->tag); }
+            if (is_object($debugObject)) { $debugObject->debugLog(2, "Current tag is: ".$returnDom->tag); }
 
             if ($returnDom->tag == $tag)
             {
@@ -338,16 +338,16 @@ 
             {
                 if (!empty($this->text))
                 {
-                    $text = " with text: " . $this->text;
+                    $text = " with text: ".$this->text;
                 }
             }
-            $debugObject->debugLog(1, 'Innertext of tag: ' . $this->tag . $text);
+            $debugObject->debugLog(1, 'Innertext of tag: '.$this->tag.$text);
         }
 
-        if ($this->tag==='root') return $this->innertext();
+        if ($this->tag === 'root') return $this->innertext();
 
         // trigger callback
-        if ($this->dom && $this->dom->callback!==null)
+        if ($this->dom && $this->dom->callback !== null)
         {
             call_user_func_array($this->dom->callback, array($this));
         }
@@ -382,7 +382,7 @@ 
         }
 
         // render end tag
-        if (isset($this->_[HDOM_INFO_END]) && $this->_[HDOM_INFO_END]!=0)
+        if (isset($this->_[HDOM_INFO_END]) && $this->_[HDOM_INFO_END] != 0)
             $ret .= '</'.$this->tag.'>';
         return $ret;
     }
@@ -397,8 +397,8 @@ 
             case HDOM_TYPE_COMMENT: return '';
             case HDOM_TYPE_UNKNOWN: return '';
         }
-        if (strcasecmp($this->tag, 'script')===0) return '';
-        if (strcasecmp($this->tag, 'style')===0) return '';
+        if (strcasecmp($this->tag, 'script') === 0) return '';
+        if (strcasecmp($this->tag, 'style') === 0) return '';
 
         $ret = '';
         // In rare cases, (always node type 1 or HDOM_TYPE_ELEMENT - observed for some span tags, and some p tags) $this->nodes is set to NULL.
@@ -444,12 +444,12 @@ 
             ++$i;
 
             // skip removed attribute
-            if ($val===null || $val===false)
+            if ($val === null || $val === false)
                 continue;
 
             $ret .= $this->_[HDOM_INFO_SPACE][$i][0];
             //no value attr: nowrap, checked selected...
-            if ($val===true)
+            if ($val === true)
                 $ret .= $key;
             else {
                 switch ($this->_[HDOM_INFO_QUOTE][$i])
@@ -462,34 +462,34 @@ 
             }
         }
         $ret = $this->dom->restore_noise($ret);
-        return $ret . $this->_[HDOM_INFO_ENDSPACE] . '>';
+        return $ret.$this->_[HDOM_INFO_ENDSPACE].'>';
     }
 
     // find elements by css selector
     //PaperG - added ability for find to lowercase the value of the selector.
-    function find($selector, $idx=null, $lowercase=false)
+    function find($selector, $idx = null, $lowercase = false)
     {
         $selectors = $this->parse_selector($selector);
-        if (($count=count($selectors))===0) return array();
+        if (($count = count($selectors)) === 0) return array();
         $found_keys = array();
 
         // find each selector
-        for ($c=0; $c<$count; ++$c)
+        for ($c = 0; $c < $count; ++$c)
         {
             // The change on the below line was documented on the sourceforge code tracker id 2788009
             // used to be: if (($levle=count($selectors[0]))===0) return array();
-            if (($levle=count($selectors[$c]))===0) return array();
+            if (($levle = count($selectors[$c])) === 0) return array();
             if (!isset($this->_[HDOM_INFO_BEGIN])) return array();
 
             $head = array($this->_[HDOM_INFO_BEGIN]=>1);
 
             // handle descendant selectors, no recursive!
-            for ($l=0; $l<$levle; ++$l)
+            for ($l = 0; $l < $levle; ++$l)
             {
                 $ret = array();
                 foreach ($head as $k=>$v)
                 {
-                    $n = ($k===-1) ? $this->dom->root : $this->dom->nodes[$k];
+                    $n = ($k === -1) ? $this->dom->root : $this->dom->nodes[$k];
                     //PaperG - Pass this optional parameter on to the seek function.
                     $n->seek($selectors[$c][$l], $ret, $lowercase);
                 }
@@ -512,13 +512,13 @@ 
 
         // return nth-element or array
         if (is_null($idx)) return $found;
-        else if ($idx<0) $idx = count($found) + $idx;
+        else if ($idx < 0) $idx = count($found) + $idx;
         return (isset($found[$idx])) ? $found[$idx] : null;
     }
 
     // seek for given conditions
     // PaperG - added parameter to allow for case insensitive testing of the value of a selector.
-    protected function seek($selector, &$ret, $lowercase=false)
+    protected function seek($selector, &$ret, $lowercase = false)
     {
         global $debugObject;
         if (is_object($debugObject)) { $debugObject->debugLogEntry(1); }
@@ -531,8 +531,8 @@ 
             $count = 0;
             foreach ($this->children as $c)
             {
-                if ($tag==='*' || $tag===$c->tag) {
-                    if (++$count==$key) {
+                if ($tag === '*' || $tag === $c->tag) {
+                    if (++$count == $key) {
                         $ret[$c->_[HDOM_INFO_BEGIN]] = 1;
                         return;
                     }
@@ -542,38 +542,38 @@ 
         }
 
         $end = (!empty($this->_[HDOM_INFO_END])) ? $this->_[HDOM_INFO_END] : 0;
-        if ($end==0) {
+        if ($end == 0) {
             $parent = $this->parent;
-            while (!isset($parent->_[HDOM_INFO_END]) && $parent!==null) {
+            while (!isset($parent->_[HDOM_INFO_END]) && $parent !== null) {
                 $end -= 1;
                 $parent = $parent->parent;
             }
             $end += $parent->_[HDOM_INFO_END];
         }
 
-        for ($i=$this->_[HDOM_INFO_BEGIN]+1; $i<$end; ++$i) {
+        for ($i = $this->_[HDOM_INFO_BEGIN] + 1; $i < $end; ++$i) {
             $node = $this->dom->nodes[$i];
 
             $pass = true;
 
-            if ($tag==='*' && !$key) {
+            if ($tag === '*' && !$key) {
                 if (in_array($node, $this->children, true))
                     $ret[$i] = 1;
                 continue;
             }
 
             // compare tag
-            if ($tag && $tag!=$node->tag && $tag!=='*') {$pass=false;}
+            if ($tag && $tag != $node->tag && $tag !== '*') {$pass = false; }
             // compare key
             if ($pass && $key) {
                 if ($no_key) {
-                    if (isset($node->attr[$key])) $pass=false;
+                    if (isset($node->attr[$key])) $pass = false;
                 } else {
-                    if (($key != "plaintext") && !isset($node->attr[$key])) $pass=false;
+                    if (($key != "plaintext") && !isset($node->attr[$key])) $pass = false;
                 }
             }
             // compare value
-            if ($pass && $key && $val  && $val!=='*') {
+            if ($pass && $key && $val && $val !== '*') {
                 // If they have told us that this is a "plaintext" search then we want the plaintext of the node - right?
                 if ($key == "plaintext") {
                     // $node->plaintext actually returns $node->text();
@@ -582,7 +582,7 @@ 
                     // this is a normal search, we want the value of that attribute of the tag.
                     $nodeKeyValue = $node->attr[$key];
                 }
-                if (is_object($debugObject)) {$debugObject->debugLog(2, "testing node: " . $node->tag . " for attribute: " . $key . $exp . $val . " where nodes value is: " . $nodeKeyValue);}
+                if (is_object($debugObject)) {$debugObject->debugLog(2, "testing node: ".$node->tag." for attribute: ".$key.$exp.$val." where nodes value is: ".$nodeKeyValue); }
 
                 //PaperG - If lowercase is set, do a case insensitive test of the value of the selector.
                 if ($lowercase) {
@@ -590,11 +590,11 @@ 
                 } else {
                     $check = $this->match($exp, $val, $nodeKeyValue);
                 }
-                if (is_object($debugObject)) {$debugObject->debugLog(2, "after match: " . ($check ? "true" : "false"));}
+                if (is_object($debugObject)) {$debugObject->debugLog(2, "after match: ".($check ? "true" : "false")); }
 
                 // handle multiple class
-                if (!$check && strcasecmp($key, 'class')===0) {
-                    foreach (explode(' ',$node->attr[$key]) as $k) {
+                if (!$check && strcasecmp($key, 'class') === 0) {
+                    foreach (explode(' ', $node->attr[$key]) as $k) {
                         // Without this, there were cases where leading, trailing, or double spaces lead to our comparing blanks - bad form.
                         if (!empty($k)) {
                             if ($lowercase) {
@@ -612,24 +612,24 @@ 
             unset($node);
         }
         // It's passed by reference so this is actually what this function returns.
-        if (is_object($debugObject)) {$debugObject->debugLog(1, "EXIT - ret: ", $ret);}
+        if (is_object($debugObject)) {$debugObject->debugLog(1, "EXIT - ret: ", $ret); }
     }
 
     protected function match($exp, $pattern, $value) {
         global $debugObject;
-        if (is_object($debugObject)) {$debugObject->debugLogEntry(1);}
+        if (is_object($debugObject)) {$debugObject->debugLogEntry(1); }
 
         switch ($exp) {
             case '=':
-                return ($value===$pattern);
+                return ($value === $pattern);
             case '!=':
-                return ($value!==$pattern);
+                return ($value !== $pattern);
             case '^=':
-                return preg_match("/^".preg_quote($pattern,'/')."/", $value);
+                return preg_match("/^".preg_quote($pattern, '/')."/", $value);
             case '$=':
-                return preg_match("/".preg_quote($pattern,'/')."$/", $value);
+                return preg_match("/".preg_quote($pattern, '/')."$/", $value);
             case '*=':
-                if ($pattern[0]=='/') {
+                if ($pattern[0] == '/') {
                     return preg_match($pattern, $value);
                 }
                 return preg_match("/".$pattern."/i", $value);
@@ -639,7 +639,7 @@ 
 
     protected function parse_selector($selector_string) {
         global $debugObject;
-        if (is_object($debugObject)) {$debugObject->debugLogEntry(1);}
+        if (is_object($debugObject)) {$debugObject->debugLogEntry(1); }
 
         // pattern of CSS selectors, modified from mootools
         // Paperg: Add the colon to the attrbute, so that it properly finds <tag attr:ibute="something" > like google does.
@@ -650,7 +650,7 @@ 
 //        $pattern = "/([\w-:\*]*)(?:\#([\w-]+)|\.([\w-]+))?(?:\[@?(!?[\w-]+)(?:([!*^$]?=)[\"']?(.*?)[\"']?)?\])?([\/, ]+)/is";
         $pattern = "/([\w-:\*]*)(?:\#([\w-]+)|\.([\w-]+))?(?:\[@?(!?[\w-:]+)(?:([!*^$]?=)[\"']?(.*?)[\"']?)?\])?([\/, ]+)/is";
         preg_match_all($pattern, trim($selector_string).' ', $matches, PREG_SET_ORDER);
-        if (is_object($debugObject)) {$debugObject->debugLog(2, "Matches Array: ", $matches);}
+        if (is_object($debugObject)) {$debugObject->debugLog(2, "Matches Array: ", $matches); }
 
         $selectors = array();
         $result = array();
@@ -658,29 +658,29 @@ 
 
         foreach ($matches as $m) {
             $m[0] = trim($m[0]);
-            if ($m[0]==='' || $m[0]==='/' || $m[0]==='//') continue;
+            if ($m[0] === '' || $m[0] === '/' || $m[0] === '//') continue;
             // for browser generated xpath
-            if ($m[1]==='tbody') continue;
+            if ($m[1] === 'tbody') continue;
 
             list($tag, $key, $val, $exp, $no_key) = array($m[1], null, null, '=', false);
-            if (!empty($m[2])) {$key='id'; $val=$m[2];}
-            if (!empty($m[3])) {$key='class'; $val=$m[3];}
-            if (!empty($m[4])) {$key=$m[4];}
-            if (!empty($m[5])) {$exp=$m[5];}
-            if (!empty($m[6])) {$val=$m[6];}
+            if (!empty($m[2])) {$key = 'id'; $val = $m[2]; }
+            if (!empty($m[3])) {$key = 'class'; $val = $m[3]; }
+            if (!empty($m[4])) {$key = $m[4]; }
+            if (!empty($m[5])) {$exp = $m[5]; }
+            if (!empty($m[6])) {$val = $m[6]; }
 
             // convert to lowercase
-            if ($this->dom->lowercase) {$tag=strtolower($tag); $key=strtolower($key);}
+            if ($this->dom->lowercase) {$tag = strtolower($tag); $key = strtolower($key); }
             //elements that do NOT have the specified attribute
-            if (isset($key[0]) && $key[0]==='!') {$key=substr($key, 1); $no_key=true;}
+            if (isset($key[0]) && $key[0] === '!') {$key = substr($key, 1); $no_key = true; }
 
             $result[] = array($tag, $key, $val, $exp, $no_key);
-            if (trim($m[7])===',') {
+            if (trim($m[7]) === ',') {
                 $selectors[] = $result;
                 $result = array();
             }
         }
-        if (count($result)>0)
+        if (count($result) > 0)
             $selectors[] = $result;
         return $selectors;
     }
@@ -732,7 +732,7 @@ 
     function convert_text($text)
     {
         global $debugObject;
-        if (is_object($debugObject)) {$debugObject->debugLogEntry(1);}
+        if (is_object($debugObject)) {$debugObject->debugLogEntry(1); }
 
         $converted_text = $text;
 
@@ -744,7 +744,7 @@ 
             $sourceCharset = strtoupper($this->dom->_charset);
             $targetCharset = strtoupper($this->dom->_target_charset);
         }
-        if (is_object($debugObject)) {$debugObject->debugLog(3, "source charset: " . $sourceCharset . " target charaset: " . $targetCharset);}
+        if (is_object($debugObject)) {$debugObject->debugLog(3, "source charset: ".$sourceCharset." target charaset: ".$targetCharset); }
 
         if (!empty($sourceCharset) && !empty($targetCharset) && (strcasecmp($sourceCharset, $targetCharset) != 0))
         {
@@ -783,27 +783,27 @@ 
     */
     static function is_utf8($str)
     {
-        $c=0; $b=0;
-        $bits=0;
-        $len=strlen($str);
-        for($i=0; $i<$len; $i++)
+        $c = 0; $b = 0;
+        $bits = 0;
+        $len = strlen($str);
+        for ($i = 0; $i < $len; $i++)
         {
-            $c=ord($str[$i]);
-            if($c > 128)
+            $c = ord($str[$i]);
+            if ($c > 128)
             {
-                if(($c >= 254)) return false;
-                elseif($c >= 252) $bits=6;
-                elseif($c >= 248) $bits=5;
-                elseif($c >= 240) $bits=4;
-                elseif($c >= 224) $bits=3;
-                elseif($c >= 192) $bits=2;
+                if (($c >= 254)) return false;
+                elseif ($c >= 252) $bits = 6;
+                elseif ($c >= 248) $bits = 5;
+                elseif ($c >= 240) $bits = 4;
+                elseif ($c >= 224) $bits = 3;
+                elseif ($c >= 192) $bits = 2;
                 else return false;
-                if(($i+$bits) > $len) return false;
-                while($bits > 1)
+                if (($i + $bits) > $len) return false;
+                while ($bits > 1)
                 {
                     $i++;
-                    $b=ord($str[$i]);
-                    if($b < 128 || $b > 191) return false;
+                    $b = ord($str[$i]);
+                    if ($b < 128 || $b > 191) return false;
                     $bits--;
                 }
             }
@@ -907,24 +907,24 @@ 
     }
 
     // camel naming conventions
-    function getAllAttributes() {return $this->attr;}
-    function getAttribute($name) {return $this->__get($name);}
-    function setAttribute($name, $value) {$this->__set($name, $value);}
-    function hasAttribute($name) {return $this->__isset($name);}
-    function removeAttribute($name) {$this->__set($name, null);}
-    function getElementById($id) {return $this->find("#$id", 0);}
-    function getElementsById($id, $idx=null) {return $this->find("#$id", $idx);}
-    function getElementByTagName($name) {return $this->find($name, 0);}
-    function getElementsByTagName($name, $idx=null) {return $this->find($name, $idx);}
-    function parentNode() {return $this->parent();}
-    function childNodes($idx=-1) {return $this->children($idx);}
-    function firstChild() {return $this->first_child();}
-    function lastChild() {return $this->last_child();}
-    function nextSibling() {return $this->next_sibling();}
-    function previousSibling() {return $this->prev_sibling();}
-    function hasChildNodes() {return $this->has_child();}
-    function nodeName() {return $this->tag;}
-    function appendChild($node) {$node->parent($this); return $node;}
+    function getAllAttributes() {return $this->attr; }
+    function getAttribute($name) {return $this->__get($name); }
+    function setAttribute($name, $value) {$this->__set($name, $value); }
+    function hasAttribute($name) {return $this->__isset($name); }
+    function removeAttribute($name) {$this->__set($name, null); }
+    function getElementById($id) {return $this->find("#$id", 0); }
+    function getElementsById($id, $idx = null) {return $this->find("#$id", $idx); }
+    function getElementByTagName($name) {return $this->find($name, 0); }
+    function getElementsByTagName($name, $idx = null) {return $this->find($name, $idx); }
+    function parentNode() {return $this->parent(); }
+    function childNodes($idx = -1) {return $this->children($idx); }
+    function firstChild() {return $this->first_child(); }
+    function lastChild() {return $this->last_child(); }
+    function nextSibling() {return $this->next_sibling(); }
+    function previousSibling() {return $this->prev_sibling(); }
+    function hasChildNodes() {return $this->has_child(); }
+    function nodeName() {return $this->tag; }
+    function appendChild($node) {$node->parent($this); return $node; }
 
 }
 
@@ -980,11 +980,11 @@ 
 		'option'=>array('option'=>1),
     );
 
-    function __construct($str=null, $lowercase=true, $forceTagsClosed=true, $target_charset=DEFAULT_TARGET_CHARSET, $stripRN=true, $defaultBRText=DEFAULT_BR_TEXT, $defaultSpanText=DEFAULT_SPAN_TEXT)
+    function __construct($str = null, $lowercase = true, $forceTagsClosed = true, $target_charset = DEFAULT_TARGET_CHARSET, $stripRN = true, $defaultBRText = DEFAULT_BR_TEXT, $defaultSpanText = DEFAULT_SPAN_TEXT)
     {
         if ($str)
         {
-            if (preg_match("/^http:\/\//i",$str) || is_file($str))
+            if (preg_match("/^http:\/\//i", $str) || is_file($str))
             {
                 $this->load_file($str);
             }
@@ -995,7 +995,7 @@ 
         }
         // Forcing tags to be closed implies that we don't trust the html, but it can lead to parsing errors if we SHOULD trust the html.
         if (!$forceTagsClosed) {
-            $this->optional_closing_array=array();
+            $this->optional_closing_array = array();
         }
         $this->_target_charset = $target_charset;
     }
@@ -1006,7 +1006,7 @@ 
     }
 
     // load html from string
-    function load($str, $lowercase=true, $stripRN=true, $defaultBRText=DEFAULT_BR_TEXT, $defaultSpanText=DEFAULT_SPAN_TEXT)
+    function load($str, $lowercase = true, $stripRN = true, $defaultBRText = DEFAULT_BR_TEXT, $defaultSpanText = DEFAULT_SPAN_TEXT)
     {
         global $debugObject;
 
@@ -1048,7 +1048,7 @@ 
         $args = func_get_args();
         $this->load(call_user_func_array('file_get_contents', $args), true);
         // Throw an error if we can't properly load the dom.
-        if (($error=error_get_last())!==null) {
+        if (($error = error_get_last()) !== null) {
             $this->clear();
             return false;
         }
@@ -1067,16 +1067,16 @@ 
     }
 
     // save dom as string
-    function save($filepath='')
+    function save($filepath = '')
     {
         $ret = $this->root->innertext();
-        if ($filepath!=='') file_put_contents($filepath, $ret, LOCK_EX);
+        if ($filepath !== '') file_put_contents($filepath, $ret, LOCK_EX);
         return $ret;
     }
 
     // find dom node by css selector
     // Paperg - allow us to specify that we want case insensitive testing of the value of the selector.
-    function find($selector, $idx=null, $lowercase=false)
+    function find($selector, $idx = null, $lowercase = false)
     {
         return $this->root->find($selector, $idx, $lowercase);
     }
@@ -1084,22 +1084,22 @@ 
     // clean up memory due to php5 circular references memory leak...
     function clear()
     {
-        foreach ($this->nodes as $n) {$n->clear(); $n = null;}
+        foreach ($this->nodes as $n) {$n->clear(); $n = null; }
         // This add next line is documented in the sourceforge repository. 2977248 as a fix for ongoing memory leaks that occur even with the use of clear.
-        if (isset($this->children)) foreach ($this->children as $n) {$n->clear(); $n = null;}
-        if (isset($this->parent)) {$this->parent->clear(); unset($this->parent);}
-        if (isset($this->root)) {$this->root->clear(); unset($this->root);}
+        if (isset($this->children)) foreach ($this->children as $n) {$n->clear(); $n = null; }
+        if (isset($this->parent)) {$this->parent->clear(); unset($this->parent); }
+        if (isset($this->root)) {$this->root->clear(); unset($this->root); }
         unset($this->doc);
         unset($this->noise);
     }
 
-    function dump($show_attr=true)
+    function dump($show_attr = true)
     {
         $this->root->dump($show_attr);
     }
 
     // prepare HTML data and init everything
-    protected function prepare($str, $lowercase=true, $stripRN=true, $defaultBRText=DEFAULT_BR_TEXT, $defaultSpanText=DEFAULT_SPAN_TEXT)
+    protected function prepare($str, $lowercase = true, $stripRN = true, $defaultBRText = DEFAULT_BR_TEXT, $defaultSpanText = DEFAULT_SPAN_TEXT)
     {
         $this->clear();
 
@@ -1130,13 +1130,13 @@ 
         $this->root->_[HDOM_INFO_BEGIN] = -1;
         $this->root->nodetype = HDOM_TYPE_ROOT;
         $this->parent = $this->root;
-        if ($this->size>0) $this->char = $this->doc[0];
+        if ($this->size > 0) $this->char = $this->doc[0];
     }
 
     // parse html content
     protected function parse()
     {
-        if (($s = $this->copy_until_char('<'))==='')
+        if (($s = $this->copy_until_char('<')) === '')
         {
             return $this->read_tag();
         }
@@ -1166,18 +1166,18 @@ 
             if ($success)
             {
                 $charset = $matches[1];
-                if (is_object($debugObject)) {$debugObject->debugLog(2, 'header content-type found charset of: ' . $charset);}
+                if (is_object($debugObject)) {$debugObject->debugLog(2, 'header content-type found charset of: '.$charset); }
             }
 
         }
 
         if (empty($charset))
         {
-            $el = $this->root->find('meta[http-equiv=Content-Type]',0);
+            $el = $this->root->find('meta[http-equiv=Content-Type]', 0);
             if (!empty($el))
             {
                 $fullvalue = $el->content;
-                if (is_object($debugObject)) {$debugObject->debugLog(2, 'meta content-type tag found' . $fullvalue);}
+                if (is_object($debugObject)) {$debugObject->debugLog(2, 'meta content-type tag found'.$fullvalue); }
 
                 if (!empty($fullvalue))
                 {
@@ -1189,7 +1189,7 @@ 
                     else
                     {
                         // If there is a meta tag, and they don't specify the character set, research says that it's typically ISO-8859-1
-                        if (is_object($debugObject)) {$debugObject->debugLog(2, 'meta content-type tag couldn\'t be parsed. using iso-8859 default.');}
+                        if (is_object($debugObject)) {$debugObject->debugLog(2, 'meta content-type tag couldn\'t be parsed. using iso-8859 default.'); }
                         $charset = 'ISO-8859-1';
                     }
                 }
@@ -1200,13 +1200,13 @@ 
         if (empty($charset))
         {
             // Have php try to detect the encoding from the text given to us.
-            $charset = mb_detect_encoding($this->root->plaintext . "ascii", $encoding_list = array( "UTF-8", "CP1252" ) );
-            if (is_object($debugObject)) {$debugObject->debugLog(2, 'mb_detect found: ' . $charset);}
+            $charset = mb_detect_encoding($this->root->plaintext."ascii", $encoding_list = array("UTF-8", "CP1252"));
+            if (is_object($debugObject)) {$debugObject->debugLog(2, 'mb_detect found: '.$charset); }
 
             // and if this doesn't work...  then we need to just wrongheadedly assume it's UTF-8 so that we can move on - cause this will usually give us most of what we need...
             if ($charset === false)
             {
-                if (is_object($debugObject)) {$debugObject->debugLog(2, 'since mb_detect failed - using default of utf-8');}
+                if (is_object($debugObject)) {$debugObject->debugLog(2, 'since mb_detect failed - using default of utf-8'); }
                 $charset = 'UTF-8';
             }
         }
@@ -1214,11 +1214,11 @@ 
         // Since CP1252 is a superset, if we get one of it's subsets, we want it instead.
         if ((strtolower($charset) == strtolower('ISO-8859-1')) || (strtolower($charset) == strtolower('Latin1')) || (strtolower($charset) == strtolower('Latin-1')))
         {
-            if (is_object($debugObject)) {$debugObject->debugLog(2, 'replacing ' . $charset . ' with CP1252 as its a superset');}
+            if (is_object($debugObject)) {$debugObject->debugLog(2, 'replacing '.$charset.' with CP1252 as its a superset'); }
             $charset = 'CP1252';
         }
 
-        if (is_object($debugObject)) {$debugObject->debugLog(1, 'EXIT - ' . $charset);}
+        if (is_object($debugObject)) {$debugObject->debugLog(1, 'EXIT - '.$charset); }
 
         return $this->_charset = $charset;
     }
@@ -1226,41 +1226,41 @@ 
     // read tag info
     protected function read_tag()
     {
-        if ($this->char!=='<')
+        if ($this->char !== '<')
         {
             $this->root->_[HDOM_INFO_END] = $this->cursor;
             return false;
         }
         $begin_tag_pos = $this->pos;
-        $this->char = (++$this->pos<$this->size) ? $this->doc[$this->pos] : null; // next
+        $this->char = (++$this->pos < $this->size) ? $this->doc[$this->pos] : null; // next
 
         // end tag
-        if ($this->char==='/')
+        if ($this->char === '/')
         {
-            $this->char = (++$this->pos<$this->size) ? $this->doc[$this->pos] : null; // next
+            $this->char = (++$this->pos < $this->size) ? $this->doc[$this->pos] : null; // next
             // This represents the change in the simple_html_dom trunk from revision 180 to 181.
             // $this->skip($this->token_blank_t);
             $this->skip($this->token_blank);
             $tag = $this->copy_until_char('>');
 
             // skip attributes in end tag
-            if (($pos = strpos($tag, ' '))!==false)
+            if (($pos = strpos($tag, ' ')) !== false)
                 $tag = substr($tag, 0, $pos);
 
             $parent_lower = strtolower($this->parent->tag);
             $tag_lower = strtolower($tag);
 
-            if ($parent_lower!==$tag_lower)
+            if ($parent_lower !== $tag_lower)
             {
                 if (isset($this->optional_closing_tags[$parent_lower]) && isset($this->block_tags[$tag_lower]))
                 {
                     $this->parent->_[HDOM_INFO_END] = 0;
                     $org_parent = $this->parent;
 
-                    while (($this->parent->parent) && strtolower($this->parent->tag)!==$tag_lower)
+                    while (($this->parent->parent) && strtolower($this->parent->tag) !== $tag_lower)
                         $this->parent = $this->parent->parent;
 
-                    if (strtolower($this->parent->tag)!==$tag_lower) {
+                    if (strtolower($this->parent->tag) !== $tag_lower) {
                         $this->parent = $org_parent; // restore origonal parent
                         if ($this->parent->parent) $this->parent = $this->parent->parent;
                         $this->parent->_[HDOM_INFO_END] = $this->cursor;
@@ -1272,17 +1272,17 @@ 
                     $this->parent->_[HDOM_INFO_END] = 0;
                     $org_parent = $this->parent;
 
-                    while (($this->parent->parent) && strtolower($this->parent->tag)!==$tag_lower)
+                    while (($this->parent->parent) && strtolower($this->parent->tag) !== $tag_lower)
                         $this->parent = $this->parent->parent;
 
-                    if (strtolower($this->parent->tag)!==$tag_lower)
+                    if (strtolower($this->parent->tag) !== $tag_lower)
                     {
                         $this->parent = $org_parent; // restore origonal parent
                         $this->parent->_[HDOM_INFO_END] = $this->cursor;
                         return $this->as_text_node($tag);
                     }
                 }
-                else if (($this->parent->parent) && strtolower($this->parent->parent->tag)===$tag_lower)
+                else if (($this->parent->parent) && strtolower($this->parent->parent->tag) === $tag_lower)
                 {
                     $this->parent->_[HDOM_INFO_END] = 0;
                     $this->parent = $this->parent->parent;
@@ -1294,7 +1294,7 @@ 
             $this->parent->_[HDOM_INFO_END] = $this->cursor;
             if ($this->parent->parent) $this->parent = $this->parent->parent;
 
-            $this->char = (++$this->pos<$this->size) ? $this->doc[$this->pos] : null; // next
+            $this->char = (++$this->pos < $this->size) ? $this->doc[$this->pos] : null; // next
             return true;
         }
 
@@ -1305,25 +1305,25 @@ 
         $node->tag_start = $begin_tag_pos;
 
         // doctype, cdata & comments...
-        if (isset($tag[0]) && $tag[0]==='!') {
-            $node->_[HDOM_INFO_TEXT] = '<' . $tag . $this->copy_until_char('>');
+        if (isset($tag[0]) && $tag[0] === '!') {
+            $node->_[HDOM_INFO_TEXT] = '<'.$tag.$this->copy_until_char('>');
 
-            if (isset($tag[2]) && $tag[1]==='-' && $tag[2]==='-') {
+            if (isset($tag[2]) && $tag[1] === '-' && $tag[2] === '-') {
                 $node->nodetype = HDOM_TYPE_COMMENT;
                 $node->tag = 'comment';
             } else {
                 $node->nodetype = HDOM_TYPE_UNKNOWN;
                 $node->tag = 'unknown';
             }
-            if ($this->char==='>') $node->_[HDOM_INFO_TEXT].='>';
+            if ($this->char === '>') $node->_[HDOM_INFO_TEXT] .= '>';
             $this->link_nodes($node, true);
-            $this->char = (++$this->pos<$this->size) ? $this->doc[$this->pos] : null; // next
+            $this->char = (++$this->pos < $this->size) ? $this->doc[$this->pos] : null; // next
             return true;
         }
 
         // text
-        if ($pos=strpos($tag, '<')!==false) {
-            $tag = '<' . substr($tag, 0, -1);
+        if ($pos = strpos($tag, '<') !== false) {
+            $tag = '<'.substr($tag, 0, -1);
             $node->_[HDOM_INFO_TEXT] = $tag;
             $this->link_nodes($node, false);
             $this->char = $this->doc[--$this->pos]; // prev
@@ -1331,15 +1331,15 @@ 
         }
 
         if (!preg_match("/^[\w-:]+$/", $tag)) {
-            $node->_[HDOM_INFO_TEXT] = '<' . $tag . $this->copy_until('<>');
-            if ($this->char==='<') {
+            $node->_[HDOM_INFO_TEXT] = '<'.$tag.$this->copy_until('<>');
+            if ($this->char === '<') {
                 $this->link_nodes($node, false);
                 return true;
             }
 
-            if ($this->char==='>') $node->_[HDOM_INFO_TEXT].='>';
+            if ($this->char === '>') $node->_[HDOM_INFO_TEXT] .= '>';
             $this->link_nodes($node, false);
-            $this->char = (++$this->pos<$this->size) ? $this->doc[$this->pos] : null; // next
+            $this->char = (++$this->pos < $this->size) ? $this->doc[$this->pos] : null; // next
             return true;
         }
 
@@ -1349,7 +1349,7 @@ 
         $node->tag = ($this->lowercase) ? $tag_lower : $tag;
 
         // handle optional closing tags
-        if (isset($this->optional_closing_tags[$tag_lower]) )
+        if (isset($this->optional_closing_tags[$tag_lower]))
         {
             while (isset($this->optional_closing_tags[$tag_lower][strtolower($this->parent->tag)]))
             {
@@ -1365,67 +1365,67 @@ 
         // attributes
         do
         {
-            if ($this->char!==null && $space[0]==='')
+            if ($this->char !== null && $space[0] === '')
             {
                 break;
             }
             $name = $this->copy_until($this->token_equal);
-            if ($guard===$this->pos)
+            if ($guard === $this->pos)
             {
-                $this->char = (++$this->pos<$this->size) ? $this->doc[$this->pos] : null; // next
+                $this->char = (++$this->pos < $this->size) ? $this->doc[$this->pos] : null; // next
                 continue;
             }
             $guard = $this->pos;
 
             // handle endless '<'
-            if ($this->pos>=$this->size-1 && $this->char!=='>') {
+            if ($this->pos >= $this->size - 1 && $this->char !== '>') {
                 $node->nodetype = HDOM_TYPE_TEXT;
                 $node->_[HDOM_INFO_END] = 0;
-                $node->_[HDOM_INFO_TEXT] = '<'.$tag . $space[0] . $name;
+                $node->_[HDOM_INFO_TEXT] = '<'.$tag.$space[0].$name;
                 $node->tag = 'text';
                 $this->link_nodes($node, false);
                 return true;
             }
 
             // handle mismatch '<'
-            if ($this->doc[$this->pos-1]=='<') {
+            if ($this->doc[$this->pos - 1] == '<') {
                 $node->nodetype = HDOM_TYPE_TEXT;
                 $node->tag = 'text';
                 $node->attr = array();
                 $node->_[HDOM_INFO_END] = 0;
-                $node->_[HDOM_INFO_TEXT] = substr($this->doc, $begin_tag_pos, $this->pos-$begin_tag_pos-1);
+                $node->_[HDOM_INFO_TEXT] = substr($this->doc, $begin_tag_pos, $this->pos - $begin_tag_pos - 1);
                 $this->pos -= 2;
-                $this->char = (++$this->pos<$this->size) ? $this->doc[$this->pos] : null; // next
+                $this->char = (++$this->pos < $this->size) ? $this->doc[$this->pos] : null; // next
                 $this->link_nodes($node, false);
                 return true;
             }
 
-            if ($name!=='/' && $name!=='') {
+            if ($name !== '/' && $name !== '') {
                 $space[1] = $this->copy_skip($this->token_blank);
                 $name = $this->restore_noise($name);
                 if ($this->lowercase) $name = strtolower($name);
-                if ($this->char==='=') {
-                    $this->char = (++$this->pos<$this->size) ? $this->doc[$this->pos] : null; // next
+                if ($this->char === '=') {
+                    $this->char = (++$this->pos < $this->size) ? $this->doc[$this->pos] : null; // next
                     $this->parse_attr($node, $name, $space);
                 }
                 else {
                     //no value attr: nowrap, checked selected...
                     $node->_[HDOM_INFO_QUOTE][] = HDOM_QUOTE_NO;
                     $node->attr[$name] = true;
-                    if ($this->char!='>') $this->char = $this->doc[--$this->pos]; // prev
+                    if ($this->char != '>') $this->char = $this->doc[--$this->pos]; // prev
                 }
                 $node->_[HDOM_INFO_SPACE][] = $space;
                 $space = array($this->copy_skip($this->token_blank), '', '');
             }
             else
                 break;
-        } while ($this->char!=='>' && $this->char!=='/');
+        } while ($this->char !== '>' && $this->char !== '/');
 
         $this->link_nodes($node, true);
         $node->_[HDOM_INFO_ENDSPACE] = $space[0];
 
         // check self closing
-        if ($this->copy_until_char_escape('>')==='/')
+        if ($this->copy_until_char_escape('>') === '/')
         {
             $node->_[HDOM_INFO_ENDSPACE] .= '/';
             $node->_[HDOM_INFO_END] = 0;
@@ -1435,7 +1435,7 @@ 
             // reset parent
             if (!isset($this->self_closing_tags[strtolower($node->tag)])) $this->parent = $node;
         }
-        $this->char = (++$this->pos<$this->size) ? $this->doc[$this->pos] : null; // next
+        $this->char = (++$this->pos < $this->size) ? $this->doc[$this->pos] : null; // next
 
         // If it's a BR tag, we need to set it's text to the default text.
         // This way when we see it in plaintext, we can generate formatting that the user wants.
@@ -1462,15 +1462,15 @@ 
         switch ($this->char) {
             case '"':
                 $node->_[HDOM_INFO_QUOTE][] = HDOM_QUOTE_DOUBLE;
-                $this->char = (++$this->pos<$this->size) ? $this->doc[$this->pos] : null; // next
+                $this->char = (++$this->pos < $this->size) ? $this->doc[$this->pos] : null; // next
                 $node->attr[$name] = $this->restore_noise($this->copy_until_char_escape('"'));
-                $this->char = (++$this->pos<$this->size) ? $this->doc[$this->pos] : null; // next
+                $this->char = (++$this->pos < $this->size) ? $this->doc[$this->pos] : null; // next
                 break;
             case '\'':
                 $node->_[HDOM_INFO_QUOTE][] = HDOM_QUOTE_SINGLE;
-                $this->char = (++$this->pos<$this->size) ? $this->doc[$this->pos] : null; // next
+                $this->char = (++$this->pos < $this->size) ? $this->doc[$this->pos] : null; // next
                 $node->attr[$name] = $this->restore_noise($this->copy_until_char_escape('\''));
-                $this->char = (++$this->pos<$this->size) ? $this->doc[$this->pos] : null; // next
+                $this->char = (++$this->pos < $this->size) ? $this->doc[$this->pos] : null; // next
                 break;
             default:
                 $node->_[HDOM_INFO_QUOTE][] = HDOM_QUOTE_NO;
@@ -1501,16 +1501,16 @@ 
     {
         $node = new simple_html_dom_node($this);
         ++$this->cursor;
-        $node->_[HDOM_INFO_TEXT] = '</' . $tag . '>';
+        $node->_[HDOM_INFO_TEXT] = '</'.$tag.'>';
         $this->link_nodes($node, false);
-        $this->char = (++$this->pos<$this->size) ? $this->doc[$this->pos] : null; // next
+        $this->char = (++$this->pos < $this->size) ? $this->doc[$this->pos] : null; // next
         return true;
     }
 
     protected function skip($chars)
     {
         $this->pos += strspn($this->doc, $chars, $this->pos);
-        $this->char = ($this->pos<$this->size) ? $this->doc[$this->pos] : null; // next
+        $this->char = ($this->pos < $this->size) ? $this->doc[$this->pos] : null; // next
     }
 
     protected function copy_skip($chars)
@@ -1518,8 +1518,8 @@ 
         $pos = $this->pos;
         $len = strspn($this->doc, $chars, $pos);
         $this->pos += $len;
-        $this->char = ($this->pos<$this->size) ? $this->doc[$this->pos] : null; // next
-        if ($len===0) return '';
+        $this->char = ($this->pos < $this->size) ? $this->doc[$this->pos] : null; // next
+        if ($len === 0) return '';
         return substr($this->doc, $pos, $len);
     }
 
@@ -1528,70 +1528,70 @@ 
         $pos = $this->pos;
         $len = strcspn($this->doc, $chars, $pos);
         $this->pos += $len;
-        $this->char = ($this->pos<$this->size) ? $this->doc[$this->pos] : null; // next
+        $this->char = ($this->pos < $this->size) ? $this->doc[$this->pos] : null; // next
         return substr($this->doc, $pos, $len);
     }
 
     protected function copy_until_char($char)
     {
-        if ($this->char===null) return '';
+        if ($this->char === null) return '';
 
-        if (($pos = strpos($this->doc, $char, $this->pos))===false) {
-            $ret = substr($this->doc, $this->pos, $this->size-$this->pos);
+        if (($pos = strpos($this->doc, $char, $this->pos)) === false) {
+            $ret = substr($this->doc, $this->pos, $this->size - $this->pos);
             $this->char = null;
             $this->pos = $this->size;
             return $ret;
         }
 
-        if ($pos===$this->pos) return '';
+        if ($pos === $this->pos) return '';
         $pos_old = $this->pos;
         $this->char = $this->doc[$pos];
         $this->pos = $pos;
-        return substr($this->doc, $pos_old, $pos-$pos_old);
+        return substr($this->doc, $pos_old, $pos - $pos_old);
     }
 
     protected function copy_until_char_escape($char)
     {
-        if ($this->char===null) return '';
+        if ($this->char === null) return '';
 
         $start = $this->pos;
         while (1)
         {
-            if (($pos = strpos($this->doc, $char, $start))===false)
+            if (($pos = strpos($this->doc, $char, $start)) === false)
             {
-                $ret = substr($this->doc, $this->pos, $this->size-$this->pos);
+                $ret = substr($this->doc, $this->pos, $this->size - $this->pos);
                 $this->char = null;
                 $this->pos = $this->size;
                 return $ret;
             }
 
-            if ($pos===$this->pos) return '';
+            if ($pos === $this->pos) return '';
 
-            if ($this->doc[$pos-1]==='\\') {
-                $start = $pos+1;
+            if ($this->doc[$pos - 1] === '\\') {
+                $start = $pos + 1;
                 continue;
             }
 
             $pos_old = $this->pos;
             $this->char = $this->doc[$pos];
             $this->pos = $pos;
-            return substr($this->doc, $pos_old, $pos-$pos_old);
+            return substr($this->doc, $pos_old, $pos - $pos_old);
         }
     }
 
     // remove noise from html content
     // save the noise in the $this->noise array.
-    protected function remove_noise($pattern, $remove_tag=false)
+    protected function remove_noise($pattern, $remove_tag = false)
     {
         global $debugObject;
         if (is_object($debugObject)) { $debugObject->debugLogEntry(1); }
 
-        $count = preg_match_all($pattern, $this->doc, $matches, PREG_SET_ORDER|PREG_OFFSET_CAPTURE);
+        $count = preg_match_all($pattern, $this->doc, $matches, PREG_SET_ORDER | PREG_OFFSET_CAPTURE);
 
-        for ($i=$count-1; $i>-1; --$i)
+        for ($i = $count - 1; $i > -1; --$i)
         {
-            $key = '___noise___'.sprintf('% 5d', count($this->noise)+1000);
-            if (is_object($debugObject)) { $debugObject->debugLog(2, 'key is: ' . $key); }
+            $key = '___noise___'.sprintf('% 5d', count($this->noise) + 1000);
+            if (is_object($debugObject)) { $debugObject->debugLog(2, 'key is: '.$key); }
             $idx = ($remove_tag) ? 0 : 1;
             $this->noise[$key] = $matches[$i][$idx][0];
             $this->doc = substr_replace($this->doc, $key, $matches[$i][$idx][1], strlen($matches[$i][$idx][0]));
@@ -1599,7 +1599,7 @@ 
 
         // reset the length of content
         $this->size = strlen($this->doc);
-        if ($this->size>0)
+        if ($this->size > 0)
         {
             $this->char = $this->doc[0];
         }
@@ -1611,28 +1611,28 @@ 
         global $debugObject;
         if (is_object($debugObject)) { $debugObject->debugLogEntry(1); }
 
-        while (($pos=strpos($text, '___noise___'))!==false)
+        while (($pos = strpos($text, '___noise___')) !== false)
         {
             // Sometimes there is a broken piece of markup, and we don't GET the pos+11 etc... token which indicates a problem outside of us...
-            if (strlen($text) > $pos+15)
+            if (strlen($text) > $pos + 15)
             {
-                $key = '___noise___'.$text[$pos+11].$text[$pos+12].$text[$pos+13].$text[$pos+14].$text[$pos+15];
-                if (is_object($debugObject)) { $debugObject->debugLog(2, 'located key of: ' . $key); }
+                $key = '___noise___'.$text[$pos + 11].$text[$pos + 12].$text[$pos + 13].$text[$pos + 14].$text[$pos + 15];
+                if (is_object($debugObject)) { $debugObject->debugLog(2, 'located key of: '.$key); }
 
                 if (isset($this->noise[$key]))
                 {
-                    $text = substr($text, 0, $pos).$this->noise[$key].substr($text, $pos+16);
+                    $text = substr($text, 0, $pos).$this->noise[$key].substr($text, $pos + 16);
                 }
                 else
                 {
                     // do this to prevent an infinite loop.
-                    $text = substr($text, 0, $pos).'UNDEFINED NOISE FOR KEY: '.$key . substr($text, $pos+16);
+                    $text = substr($text, 0, $pos).'UNDEFINED NOISE FOR KEY: '.$key.substr($text, $pos + 16);
                 }
             }
             else
             {
                 // There is no valid key being given back to us... We must get rid of the ___noise___ or we will have a problem.
-                $text = substr($text, 0, $pos).'NO NUMERIC NOISE KEY' . substr($text, $pos+11);
+                $text = substr($text, 0, $pos).'NO NUMERIC NOISE KEY'.substr($text, $pos + 11);
             }
         }
         return $text;
@@ -1644,9 +1644,9 @@ 
         global $debugObject;
         if (is_object($debugObject)) { $debugObject->debugLogEntry(1); }
 
-        foreach($this->noise as $noiseElement)
+        foreach ($this->noise as $noiseElement)
         {
-            if (strpos($noiseElement, $text)!==false)
+            if (strpos($noiseElement, $text) !== false)
             {
                 return $noiseElement;
             }
@@ -1675,16 +1675,16 @@ 
     }
 
     // camel naming conventions
-    function childNodes($idx=-1) {return $this->root->childNodes($idx);}
-    function firstChild() {return $this->root->first_child();}
-    function lastChild() {return $this->root->last_child();}
-    function createElement($name, $value=null) {return @str_get_html("<$name>$value</$name>")->first_child();}
-    function createTextNode($value) {return @end(str_get_html($value)->nodes);}
-    function getElementById($id) {return $this->find("#$id", 0);}
-    function getElementsById($id, $idx=null) {return $this->find("#$id", $idx);}
-    function getElementByTagName($name) {return $this->find($name, 0);}
-    function getElementsByTagName($name, $idx=-1) {return $this->find($name, $idx);}
-    function loadFile() {$args = func_get_args();$this->load_file($args);}
+    function childNodes($idx = -1) {return $this->root->childNodes($idx); }
+    function firstChild() {return $this->root->first_child(); }
+    function lastChild() {return $this->root->last_child(); }
+    function createElement($name, $value = null) {return @str_get_html("<$name>$value</$name>")->first_child(); }
+    function createTextNode($value) {return @end(str_get_html($value)->nodes); }
+    function getElementById($id) {return $this->find("#$id", 0); }
+    function getElementsById($id, $idx = null) {return $this->find("#$id", $idx); }
+    function getElementByTagName($name) {return $this->find($name, 0); }
+    function getElementsByTagName($name, $idx = -1) {return $this->find($name, $idx); }
+    function loadFile() {$args = func_get_args(); $this->load_file($args); }
 }
 
 ?>
\ No newline at end of file

Braces +295 added lines, -138 removed lines

@@ -126,8 +126,9 @@ 
         if ($show_attr && count($this->attr)>0)
         {
             echo '(';
-            foreach ($this->attr as $k=>$v)
-                echo "[$k]=>\"".$this->$k.'", ';
+            foreach ($this->attr as $k=>$v) {
+                            echo "[$k]=>\"".$this->$k.'", ';
+            }
             echo ')';
         }
         echo "\n";
@@ -185,8 +186,7 @@ 
         if (isset($node->_[HDOM_INFO_INNER]))
         {
             $string .= $node->_[HDOM_INFO_INNER] . "'";
-        }
-        else
+        } else
         {
             $string .= ' NULL ';
         }
@@ -200,8 +200,7 @@ 
         {
             echo $string;
             return;
-        }
-        else
+        } else
         {
             return $string;
         }
@@ -236,7 +235,9 @@ 
         {
             return $this->children;
         }
-        if (isset($this->children[$idx])) return $this->children[$idx];
+        if (isset($this->children[$idx])) {
+            return $this->children[$idx];
+        }
         return null;
     }
 
@@ -284,12 +285,17 @@ 
     // returns the previous sibling of node
     function prev_sibling()
     {
-        if ($this->parent===null) return null;
+        if ($this->parent===null) {
+            return null;
+        }
         $idx = 0;
         $count = count($this->parent->children);
-        while ($idx<$count && $this!==$this->parent->children[$idx])
-            ++$idx;
-        if (--$idx<0) return null;
+        while ($idx<$count && $this!==$this->parent->children[$idx]) {
+                    ++$idx;
+        }
+        if (--$idx<0) {
+            return null;
+        }
         return $this->parent->children[$idx];
     }
 
@@ -318,12 +324,17 @@ 
     // get dom node's inner html
     function innertext()
     {
-        if (isset($this->_[HDOM_INFO_INNER])) return $this->_[HDOM_INFO_INNER];
-        if (isset($this->_[HDOM_INFO_TEXT])) return $this->dom->restore_noise($this->_[HDOM_INFO_TEXT]);
+        if (isset($this->_[HDOM_INFO_INNER])) {
+            return $this->_[HDOM_INFO_INNER];
+        }
+        if (isset($this->_[HDOM_INFO_TEXT])) {
+            return $this->dom->restore_noise($this->_[HDOM_INFO_TEXT]);
+        }
 
         $ret = '';
-        foreach ($this->nodes as $n)
-            $ret .= $n->outertext();
+        foreach ($this->nodes as $n) {
+                    $ret .= $n->outertext();
+        }
         return $ret;
     }
 
@@ -344,7 +355,9 @@ 
             $debugObject->debugLog(1, 'Innertext of tag: ' . $this->tag . $text);
         }
 
-        if ($this->tag==='root') return $this->innertext();
+        if ($this->tag==='root') {
+            return $this->innertext();
+        }
 
         // trigger callback
         if ($this->dom && $this->dom->callback!==null)
@@ -352,8 +365,12 @@ 
             call_user_func_array($this->dom->callback, array($this));
         }
 
-        if (isset($this->_[HDOM_INFO_OUTER])) return $this->_[HDOM_INFO_OUTER];
-        if (isset($this->_[HDOM_INFO_TEXT])) return $this->dom->restore_noise($this->_[HDOM_INFO_TEXT]);
+        if (isset($this->_[HDOM_INFO_OUTER])) {
+            return $this->_[HDOM_INFO_OUTER];
+        }
+        if (isset($this->_[HDOM_INFO_TEXT])) {
+            return $this->dom->restore_noise($this->_[HDOM_INFO_TEXT]);
+        }
 
         // render begin tag
         if ($this->dom && $this->dom->nodes[$this->_[HDOM_INFO_BEGIN]])
@@ -382,23 +399,30 @@ 
         }
 
         // render end tag
-        if (isset($this->_[HDOM_INFO_END]) && $this->_[HDOM_INFO_END]!=0)
-            $ret .= '</'.$this->tag.'>';
+        if (isset($this->_[HDOM_INFO_END]) && $this->_[HDOM_INFO_END]!=0) {
+                    $ret .= '</'.$this->tag.'>';
+        }
         return $ret;
     }
 
     // get dom node's plain text
     function text()
     {
-        if (isset($this->_[HDOM_INFO_INNER])) return $this->_[HDOM_INFO_INNER];
+        if (isset($this->_[HDOM_INFO_INNER])) {
+            return $this->_[HDOM_INFO_INNER];
+        }
         switch ($this->nodetype)
         {
             case HDOM_TYPE_TEXT: return $this->dom->restore_noise($this->_[HDOM_INFO_TEXT]);
             case HDOM_TYPE_COMMENT: return '';
             case HDOM_TYPE_UNKNOWN: return '';
         }
-        if (strcasecmp($this->tag, 'script')===0) return '';
-        if (strcasecmp($this->tag, 'style')===0) return '';
+        if (strcasecmp($this->tag, 'script')===0) {
+            return '';
+        }
+        if (strcasecmp($this->tag, 'style')===0) {
+            return '';
+        }
 
         $ret = '';
         // In rare cases, (always node type 1 or HDOM_TYPE_ELEMENT - observed for some span tags, and some p tags) $this->nodes is set to NULL.
@@ -434,7 +458,9 @@ 
     function makeup()
     {
         // text, comment, unknown
-        if (isset($this->_[HDOM_INFO_TEXT])) return $this->dom->restore_noise($this->_[HDOM_INFO_TEXT]);
+        if (isset($this->_[HDOM_INFO_TEXT])) {
+            return $this->dom->restore_noise($this->_[HDOM_INFO_TEXT]);
+        }
 
         $ret = '<'.$this->tag;
         $i = -1;
@@ -444,14 +470,15 @@ 
             ++$i;
 
             // skip removed attribute
-            if ($val===null || $val===false)
-                continue;
+            if ($val===null || $val===false) {
+                            continue;
+            }
 
             $ret .= $this->_[HDOM_INFO_SPACE][$i][0];
             //no value attr: nowrap, checked selected...
-            if ($val===true)
-                $ret .= $key;
-            else {
+            if ($val===true) {
+                            $ret .= $key;
+            } else {
                 switch ($this->_[HDOM_INFO_QUOTE][$i])
                 {
                     case HDOM_QUOTE_DOUBLE: $quote = '"'; break;
@@ -470,7 +497,9 @@ 
     function find($selector, $idx=null, $lowercase=false)
     {
         $selectors = $this->parse_selector($selector);
-        if (($count=count($selectors))===0) return array();
+        if (($count=count($selectors))===0) {
+            return array();
+        }
         $found_keys = array();
 
         // find each selector
@@ -478,8 +507,12 @@ 
         {
             // The change on the below line was documented on the sourceforge code tracker id 2788009
             // used to be: if (($levle=count($selectors[0]))===0) return array();
-            if (($levle=count($selectors[$c]))===0) return array();
-            if (!isset($this->_[HDOM_INFO_BEGIN])) return array();
+            if (($levle=count($selectors[$c]))===0) {
+                return array();
+            }
+            if (!isset($this->_[HDOM_INFO_BEGIN])) {
+                return array();
+            }
 
             $head = array($this->_[HDOM_INFO_BEGIN]=>1);
 
@@ -498,8 +531,9 @@ 
 
             foreach ($head as $k=>$v)
             {
-                if (!isset($found_keys[$k]))
-                    $found_keys[$k] = 1;
+                if (!isset($found_keys[$k])) {
+                                    $found_keys[$k] = 1;
+                }
             }
         }
 
@@ -507,12 +541,16 @@ 
         ksort($found_keys);
 
         $found = array();
-        foreach ($found_keys as $k=>$v)
-            $found[] = $this->dom->nodes[$k];
+        foreach ($found_keys as $k=>$v) {
+                    $found[] = $this->dom->nodes[$k];
+        }
 
         // return nth-element or array
-        if (is_null($idx)) return $found;
-        else if ($idx<0) $idx = count($found) + $idx;
+        if (is_null($idx)) {
+            return $found;
+        } else if ($idx<0) {
+            $idx = count($found) + $idx;
+        }
         return (isset($found[$idx])) ? $found[$idx] : null;
     }
 
@@ -557,8 +595,9 @@ 
             $pass = true;
 
             if ($tag==='*' && !$key) {
-                if (in_array($node, $this->children, true))
-                    $ret[$i] = 1;
+                if (in_array($node, $this->children, true)) {
+                                    $ret[$i] = 1;
+                }
                 continue;
             }
 
@@ -567,9 +606,13 @@ 
             // compare key
             if ($pass && $key) {
                 if ($no_key) {
-                    if (isset($node->attr[$key])) $pass=false;
+                    if (isset($node->attr[$key])) {
+                        $pass=false;
+                    }
                 } else {
-                    if (($key != "plaintext") && !isset($node->attr[$key])) $pass=false;
+                    if (($key != "plaintext") && !isset($node->attr[$key])) {
+                        $pass=false;
+                    }
                 }
             }
             // compare value
@@ -602,20 +645,27 @@ 
                             } else {
                                 $check = $this->match($exp, $val, $k);
                             }
-                            if ($check) break;
+                            if ($check) {
+                                break;
+                            }
                         }
                     }
                 }
-                if (!$check) $pass = false;
+                if (!$check) {
+                    $pass = false;
+                }
+            }
+            if ($pass) {
+                $ret[$i] = 1;
             }
-            if ($pass) $ret[$i] = 1;
             unset($node);
         }
         // It's passed by reference so this is actually what this function returns.
         if (is_object($debugObject)) {$debugObject->debugLog(1, "EXIT - ret: ", $ret);}
     }
 
-    protected function match($exp, $pattern, $value) {
+    protected function match($exp, $pattern, $value)
+    {
         global $debugObject;
         if (is_object($debugObject)) {$debugObject->debugLogEntry(1);}
 
@@ -637,7 +687,8 @@ 
         return false;
     }
 
-    protected function parse_selector($selector_string) {
+    protected function parse_selector($selector_string)
+    {
         global $debugObject;
         if (is_object($debugObject)) {$debugObject->debugLogEntry(1);}
 
@@ -658,9 +709,13 @@ 
 
         foreach ($matches as $m) {
             $m[0] = trim($m[0]);
-            if ($m[0]==='' || $m[0]==='/' || $m[0]==='//') continue;
+            if ($m[0]==='' || $m[0]==='/' || $m[0]==='//') {
+                continue;
+            }
             // for browser generated xpath
-            if ($m[1]==='tbody') continue;
+            if ($m[1]==='tbody') {
+                continue;
+            }
 
             list($tag, $key, $val, $exp, $no_key) = array($m[1], null, null, '=', false);
             if (!empty($m[2])) {$key='id'; $val=$m[2];}
@@ -680,12 +735,14 @@ 
                 $result = array();
             }
         }
-        if (count($result)>0)
-            $selectors[] = $result;
+        if (count($result)>0) {
+                    $selectors[] = $result;
+        }
         return $selectors;
     }
 
-    function __get($name) {
+    function __get($name)
+    {
         if (isset($this->attr[$name]))
         {
             return $this->convert_text($this->attr[$name]);
@@ -699,11 +756,14 @@ 
         }
     }
 
-    function __set($name, $value) {
+    function __set($name, $value)
+    {
         switch ($name) {
             case 'outertext': return $this->_[HDOM_INFO_OUTER] = $value;
             case 'innertext':
-                if (isset($this->_[HDOM_INFO_TEXT])) return $this->_[HDOM_INFO_TEXT] = $value;
+                if (isset($this->_[HDOM_INFO_TEXT])) {
+                    return $this->_[HDOM_INFO_TEXT] = $value;
+                }
                 return $this->_[HDOM_INFO_INNER] = $value;
         }
         if (!isset($this->attr[$name])) {
@@ -713,7 +773,8 @@ 
         $this->attr[$name] = $value;
     }
 
-    function __isset($name) {
+    function __isset($name)
+    {
         switch ($name) {
             case 'outertext': return true;
             case 'innertext': return true;
@@ -723,9 +784,11 @@ 
         return (array_key_exists($name, $this->attr)) ? true : isset($this->attr[$name]);
     }
 
-    function __unset($name) {
-        if (isset($this->attr[$name]))
-            unset($this->attr[$name]);
+    function __unset($name)
+    {
+        if (isset($this->attr[$name])) {
+                    unset($this->attr[$name]);
+        }
     }
 
     // PaperG - Function to convert the text from one character set to another if the two sets are not the same.
@@ -752,8 +815,7 @@ 
             if ((strcasecmp($targetCharset, 'UTF-8') == 0) && ($this->is_utf8($text)))
             {
                 $converted_text = $text;
-            }
-            else
+            } else
             {
                 $converted_text = iconv($sourceCharset, $targetCharset, $text);
             }
@@ -791,19 +853,31 @@ 
             $c=ord($str[$i]);
             if($c > 128)
             {
-                if(($c >= 254)) return false;
-                elseif($c >= 252) $bits=6;
-                elseif($c >= 248) $bits=5;
-                elseif($c >= 240) $bits=4;
-                elseif($c >= 224) $bits=3;
-                elseif($c >= 192) $bits=2;
-                else return false;
-                if(($i+$bits) > $len) return false;
+                if(($c >= 254)) {
+                    return false;
+                } elseif($c >= 252) {
+                    $bits=6;
+                } elseif($c >= 248) {
+                    $bits=5;
+                } elseif($c >= 240) {
+                    $bits=4;
+                } elseif($c >= 224) {
+                    $bits=3;
+                } elseif($c >= 192) {
+                    $bits=2;
+                } else {
+                    return false;
+                }
+                if(($i+$bits) > $len) {
+                    return false;
+                }
                 while($bits > 1)
                 {
                     $i++;
                     $b=ord($str[$i]);
-                    if($b < 128 || $b > 191) return false;
+                    if($b < 128 || $b > 191) {
+                        return false;
+                    }
                     $bits--;
                 }
             }
@@ -907,24 +981,60 @@ 
     }
 
     // camel naming conventions
-    function getAllAttributes() {return $this->attr;}
-    function getAttribute($name) {return $this->__get($name);}
-    function setAttribute($name, $value) {$this->__set($name, $value);}
-    function hasAttribute($name) {return $this->__isset($name);}
-    function removeAttribute($name) {$this->__set($name, null);}
-    function getElementById($id) {return $this->find("#$id", 0);}
-    function getElementsById($id, $idx=null) {return $this->find("#$id", $idx);}
-    function getElementByTagName($name) {return $this->find($name, 0);}
-    function getElementsByTagName($name, $idx=null) {return $this->find($name, $idx);}
-    function parentNode() {return $this->parent();}
-    function childNodes($idx=-1) {return $this->children($idx);}
-    function firstChild() {return $this->first_child();}
-    function lastChild() {return $this->last_child();}
-    function nextSibling() {return $this->next_sibling();}
-    function previousSibling() {return $this->prev_sibling();}
-    function hasChildNodes() {return $this->has_child();}
-    function nodeName() {return $this->tag;}
-    function appendChild($node) {$node->parent($this); return $node;}
+    function getAllAttributes()
+    {
+return $this->attr;}
+    function getAttribute($name)
+    {
+return $this->__get($name);}
+    function setAttribute($name, $value)
+    {
+$this->__set($name, $value);}
+    function hasAttribute($name)
+    {
+return $this->__isset($name);}
+    function removeAttribute($name)
+    {
+$this->__set($name, null);}
+    function getElementById($id)
+    {
+return $this->find("#$id", 0);}
+    function getElementsById($id, $idx=null)
+    {
+return $this->find("#$id", $idx);}
+    function getElementByTagName($name)
+    {
+return $this->find($name, 0);}
+    function getElementsByTagName($name, $idx=null)
+    {
+return $this->find($name, $idx);}
+    function parentNode()
+    {
+return $this->parent();}
+    function childNodes($idx=-1)
+    {
+return $this->children($idx);}
+    function firstChild()
+    {
+return $this->first_child();}
+    function lastChild()
+    {
+return $this->last_child();}
+    function nextSibling()
+    {
+return $this->next_sibling();}
+    function previousSibling()
+    {
+return $this->prev_sibling();}
+    function hasChildNodes()
+    {
+return $this->has_child();}
+    function nodeName()
+    {
+return $this->tag;}
+    function appendChild($node)
+    {
+$node->parent($this); return $node;}
 
 }
 
@@ -987,8 +1097,7 @@ 
             if (preg_match("/^http:\/\//i",$str) || is_file($str))
             {
                 $this->load_file($str);
-            }
-            else
+            } else
             {
                 $this->load($str, $lowercase, $stripRN, $defaultBRText, $defaultSpanText);
             }
@@ -1070,7 +1179,9 @@ 
     function save($filepath='')
     {
         $ret = $this->root->innertext();
-        if ($filepath!=='') file_put_contents($filepath, $ret, LOCK_EX);
+        if ($filepath!=='') {
+            file_put_contents($filepath, $ret, LOCK_EX);
+        }
         return $ret;
     }
 
@@ -1086,7 +1197,10 @@ 
     {
         foreach ($this->nodes as $n) {$n->clear(); $n = null;}
         // This add next line is documented in the sourceforge repository. 2977248 as a fix for ongoing memory leaks that occur even with the use of clear.
-        if (isset($this->children)) foreach ($this->children as $n) {$n->clear(); $n = null;}
+        if (isset($this->children)) {
+            foreach ($this->children as $n) {$n->clear();
+        }
+        $n = null;}
         if (isset($this->parent)) {$this->parent->clear(); unset($this->parent);}
         if (isset($this->root)) {$this->root->clear(); unset($this->root);}
         unset($this->doc);
@@ -1130,7 +1244,9 @@ 
         $this->root->_[HDOM_INFO_BEGIN] = -1;
         $this->root->nodetype = HDOM_TYPE_ROOT;
         $this->parent = $this->root;
-        if ($this->size>0) $this->char = $this->doc[0];
+        if ($this->size>0) {
+            $this->char = $this->doc[0];
+        }
     }
 
     // parse html content
@@ -1185,8 +1301,7 @@ 
                     if ($success)
                     {
                         $charset = $matches[1];
-                    }
-                    else
+                    } else
                     {
                         // If there is a meta tag, and they don't specify the character set, research says that it's typically ISO-8859-1
                         if (is_object($debugObject)) {$debugObject->debugLog(2, 'meta content-type tag couldn\'t be parsed. using iso-8859 default.');}
@@ -1244,8 +1359,9 @@ 
             $tag = $this->copy_until_char('>');
 
             // skip attributes in end tag
-            if (($pos = strpos($tag, ' '))!==false)
-                $tag = substr($tag, 0, $pos);
+            if (($pos = strpos($tag, ' '))!==false) {
+                            $tag = substr($tag, 0, $pos);
+            }
 
             $parent_lower = strtolower($this->parent->tag);
             $tag_lower = strtolower($tag);
@@ -1257,23 +1373,26 @@ 
                     $this->parent->_[HDOM_INFO_END] = 0;
                     $org_parent = $this->parent;
 
-                    while (($this->parent->parent) && strtolower($this->parent->tag)!==$tag_lower)
-                        $this->parent = $this->parent->parent;
+                    while (($this->parent->parent) && strtolower($this->parent->tag)!==$tag_lower) {
+                                            $this->parent = $this->parent->parent;
+                    }
 
                     if (strtolower($this->parent->tag)!==$tag_lower) {
                         $this->parent = $org_parent; // restore origonal parent
-                        if ($this->parent->parent) $this->parent = $this->parent->parent;
+                        if ($this->parent->parent) {
+                            $this->parent = $this->parent->parent;
+                        }
                         $this->parent->_[HDOM_INFO_END] = $this->cursor;
                         return $this->as_text_node($tag);
                     }
-                }
-                else if (($this->parent->parent) && isset($this->block_tags[$tag_lower]))
+                } else if (($this->parent->parent) && isset($this->block_tags[$tag_lower]))
                 {
                     $this->parent->_[HDOM_INFO_END] = 0;
                     $org_parent = $this->parent;
 
-                    while (($this->parent->parent) && strtolower($this->parent->tag)!==$tag_lower)
-                        $this->parent = $this->parent->parent;
+                    while (($this->parent->parent) && strtolower($this->parent->tag)!==$tag_lower) {
+                                            $this->parent = $this->parent->parent;
+                    }
 
                     if (strtolower($this->parent->tag)!==$tag_lower)
                     {
@@ -1281,18 +1400,19 @@ 
                         $this->parent->_[HDOM_INFO_END] = $this->cursor;
                         return $this->as_text_node($tag);
                     }
-                }
-                else if (($this->parent->parent) && strtolower($this->parent->parent->tag)===$tag_lower)
+                } else if (($this->parent->parent) && strtolower($this->parent->parent->tag)===$tag_lower)
                 {
                     $this->parent->_[HDOM_INFO_END] = 0;
                     $this->parent = $this->parent->parent;
+                } else {
+                                    return $this->as_text_node($tag);
                 }
-                else
-                    return $this->as_text_node($tag);
             }
 
             $this->parent->_[HDOM_INFO_END] = $this->cursor;
-            if ($this->parent->parent) $this->parent = $this->parent->parent;
+            if ($this->parent->parent) {
+                $this->parent = $this->parent->parent;
+            }
 
             $this->char = (++$this->pos<$this->size) ? $this->doc[$this->pos] : null; // next
             return true;
@@ -1315,7 +1435,9 @@ 
                 $node->nodetype = HDOM_TYPE_UNKNOWN;
                 $node->tag = 'unknown';
             }
-            if ($this->char==='>') $node->_[HDOM_INFO_TEXT].='>';
+            if ($this->char==='>') {
+                $node->_[HDOM_INFO_TEXT].='>';
+            }
             $this->link_nodes($node, true);
             $this->char = (++$this->pos<$this->size) ? $this->doc[$this->pos] : null; // next
             return true;
@@ -1337,7 +1459,9 @@ 
                 return true;
             }
 
-            if ($this->char==='>') $node->_[HDOM_INFO_TEXT].='>';
+            if ($this->char==='>') {
+                $node->_[HDOM_INFO_TEXT].='>';
+            }
             $this->link_nodes($node, false);
             $this->char = (++$this->pos<$this->size) ? $this->doc[$this->pos] : null; // next
             return true;
@@ -1403,22 +1527,26 @@ 
             if ($name!=='/' && $name!=='') {
                 $space[1] = $this->copy_skip($this->token_blank);
                 $name = $this->restore_noise($name);
-                if ($this->lowercase) $name = strtolower($name);
+                if ($this->lowercase) {
+                    $name = strtolower($name);
+                }
                 if ($this->char==='=') {
                     $this->char = (++$this->pos<$this->size) ? $this->doc[$this->pos] : null; // next
                     $this->parse_attr($node, $name, $space);
-                }
-                else {
+                } else {
                     //no value attr: nowrap, checked selected...
                     $node->_[HDOM_INFO_QUOTE][] = HDOM_QUOTE_NO;
                     $node->attr[$name] = true;
-                    if ($this->char!='>') $this->char = $this->doc[--$this->pos]; // prev
+                    if ($this->char!='>') {
+                        $this->char = $this->doc[--$this->pos];
+                    }
+                    // prev
                 }
                 $node->_[HDOM_INFO_SPACE][] = $space;
                 $space = array($this->copy_skip($this->token_blank), '', '');
+            } else {
+                            break;
             }
-            else
-                break;
         } while ($this->char!=='>' && $this->char!=='/');
 
         $this->link_nodes($node, true);
@@ -1429,11 +1557,12 @@ 
         {
             $node->_[HDOM_INFO_ENDSPACE] .= '/';
             $node->_[HDOM_INFO_END] = 0;
-        }
-        else
+        } else
         {
             // reset parent
-            if (!isset($this->self_closing_tags[strtolower($node->tag)])) $this->parent = $node;
+            if (!isset($this->self_closing_tags[strtolower($node->tag)])) {
+                $this->parent = $node;
+            }
         }
         $this->char = (++$this->pos<$this->size) ? $this->doc[$this->pos] : null; // next
 
@@ -1519,7 +1648,9 @@ 
         $len = strspn($this->doc, $chars, $pos);
         $this->pos += $len;
         $this->char = ($this->pos<$this->size) ? $this->doc[$this->pos] : null; // next
-        if ($len===0) return '';
+        if ($len===0) {
+            return '';
+        }
         return substr($this->doc, $pos, $len);
     }
 
@@ -1534,7 +1665,9 @@ 
 
     protected function copy_until_char($char)
     {
-        if ($this->char===null) return '';
+        if ($this->char===null) {
+            return '';
+        }
 
         if (($pos = strpos($this->doc, $char, $this->pos))===false) {
             $ret = substr($this->doc, $this->pos, $this->size-$this->pos);
@@ -1543,7 +1676,9 @@ 
             return $ret;
         }
 
-        if ($pos===$this->pos) return '';
+        if ($pos===$this->pos) {
+            return '';
+        }
         $pos_old = $this->pos;
         $this->char = $this->doc[$pos];
         $this->pos = $pos;
@@ -1552,7 +1687,9 @@ 
 
     protected function copy_until_char_escape($char)
     {
-        if ($this->char===null) return '';
+        if ($this->char===null) {
+            return '';
+        }
 
         $start = $this->pos;
         while (1)
@@ -1565,7 +1702,9 @@ 
                 return $ret;
             }
 
-            if ($pos===$this->pos) return '';
+            if ($pos===$this->pos) {
+                return '';
+            }
 
             if ($this->doc[$pos-1]==='\\') {
                 $start = $pos+1;
@@ -1622,14 +1761,12 @@ 
                 if (isset($this->noise[$key]))
                 {
                     $text = substr($text, 0, $pos).$this->noise[$key].substr($text, $pos+16);
-                }
-                else
+                } else
                 {
                     // do this to prevent an infinite loop.
                     $text = substr($text, 0, $pos).'UNDEFINED NOISE FOR KEY: '.$key . substr($text, $pos+16);
                 }
-            }
-            else
+            } else
             {
                 // There is no valid key being given back to us... We must get rid of the ___noise___ or we will have a problem.
                 $text = substr($text, 0, $pos).'NO NUMERIC NOISE KEY' . substr($text, $pos+11);
@@ -1675,16 +1812,36 @@ 
     }
 
     // camel naming conventions
-    function childNodes($idx=-1) {return $this->root->childNodes($idx);}
-    function firstChild() {return $this->root->first_child();}
-    function lastChild() {return $this->root->last_child();}
-    function createElement($name, $value=null) {return @str_get_html("<$name>$value</$name>")->first_child();}
-    function createTextNode($value) {return @end(str_get_html($value)->nodes);}
-    function getElementById($id) {return $this->find("#$id", 0);}
-    function getElementsById($id, $idx=null) {return $this->find("#$id", $idx);}
-    function getElementByTagName($name) {return $this->find($name, 0);}
-    function getElementsByTagName($name, $idx=-1) {return $this->find($name, $idx);}
-    function loadFile() {$args = func_get_args();$this->load_file($args);}
+    function childNodes($idx=-1)
+    {
+return $this->root->childNodes($idx);}
+    function firstChild()
+    {
+return $this->root->first_child();}
+    function lastChild()
+    {
+return $this->root->last_child();}
+    function createElement($name, $value=null)
+    {
+return @str_get_html("<$name>$value</$name>")->first_child();}
+    function createTextNode($value)
+    {
+return @end(str_get_html($value)->nodes);}
+    function getElementById($id)
+    {
+return $this->find("#$id", 0);}
+    function getElementsById($id, $idx=null)
+    {
+return $this->find("#$id", $idx);}
+    function getElementByTagName($name)
+    {
+return $this->find($name, 0);}
+    function getElementsByTagName($name, $idx=-1)
+    {
+return $this->find($name, $idx);}
+    function loadFile()
+    {
+$args = func_get_args();$this->load_file($args);}
 }
 
 ?>
\ No newline at end of file

etc/inc/PHPMailer/PHPMailer.php

Spacing +133 added lines, -134 removed lines

@@ -1064,10 +1064,10 @@ 
             $list = imap_rfc822_parse_adrlist($addrstr, '');
             foreach ($list as $address) {
                 if ('.SYNTAX-ERROR.' != $address->host) {
-                    if (static::validateAddress($address->mailbox . '@' . $address->host)) {
+                    if (static::validateAddress($address->mailbox.'@'.$address->host)) {
                         $addresses[] = [
                             'name' => (property_exists($address, 'personal') ? $address->personal : ''),
-                            'address' => $address->mailbox . '@' . $address->host,
+                            'address' => $address->mailbox.'@'.$address->host,
                         ];
                     }
                 }
@@ -1213,14 +1213,14 @@ 
                  * Feel free to use and redistribute this code. But please keep this copyright notice.
                  */
                 return (bool) preg_match(
-                    '/^(?!(?>(?1)"?(?>\\\[ -~]|[^"])"?(?1)){255,})(?!(?>(?1)"?(?>\\\[ -~]|[^"])"?(?1)){65,}@)' .
-                    '((?>(?>(?>((?>(?>(?>\x0D\x0A)?[\t ])+|(?>[\t ]*\x0D\x0A)?[\t ]+)?)(\((?>(?2)' .
-                    '(?>[\x01-\x08\x0B\x0C\x0E-\'*-\[\]-\x7F]|\\\[\x00-\x7F]|(?3)))*(?2)\)))+(?2))|(?2))?)' .
-                    '([!#-\'*+\/-9=?^-~-]+|"(?>(?2)(?>[\x01-\x08\x0B\x0C\x0E-!#-\[\]-\x7F]|\\\[\x00-\x7F]))*' .
-                    '(?2)")(?>(?1)\.(?1)(?4))*(?1)@(?!(?1)[a-z0-9-]{64,})(?1)(?>([a-z0-9](?>[a-z0-9-]*[a-z0-9])?)' .
-                    '(?>(?1)\.(?!(?1)[a-z0-9-]{64,})(?1)(?5)){0,126}|\[(?:(?>IPv6:(?>([a-f0-9]{1,4})(?>:(?6)){7}' .
-                    '|(?!(?:.*[a-f0-9][:\]]){8,})((?6)(?>:(?6)){0,6})?::(?7)?))|(?>(?>IPv6:(?>(?6)(?>:(?6)){5}:' .
-                    '|(?!(?:.*[a-f0-9]:){6,})(?8)?::(?>((?6)(?>:(?6)){0,4}):)?))?(25[0-5]|2[0-4][0-9]|1[0-9]{2}' .
+                    '/^(?!(?>(?1)"?(?>\\\[ -~]|[^"])"?(?1)){255,})(?!(?>(?1)"?(?>\\\[ -~]|[^"])"?(?1)){65,}@)'.
+                    '((?>(?>(?>((?>(?>(?>\x0D\x0A)?[\t ])+|(?>[\t ]*\x0D\x0A)?[\t ]+)?)(\((?>(?2)'.
+                    '(?>[\x01-\x08\x0B\x0C\x0E-\'*-\[\]-\x7F]|\\\[\x00-\x7F]|(?3)))*(?2)\)))+(?2))|(?2))?)'.
+                    '([!#-\'*+\/-9=?^-~-]+|"(?>(?2)(?>[\x01-\x08\x0B\x0C\x0E-!#-\[\]-\x7F]|\\\[\x00-\x7F]))*'.
+                    '(?2)")(?>(?1)\.(?1)(?4))*(?1)@(?!(?1)[a-z0-9-]{64,})(?1)(?>([a-z0-9](?>[a-z0-9-]*[a-z0-9])?)'.
+                    '(?>(?1)\.(?!(?1)[a-z0-9-]{64,})(?1)(?5)){0,126}|\[(?:(?>IPv6:(?>([a-f0-9]{1,4})(?>:(?6)){7}'.
+                    '|(?!(?:.*[a-f0-9][:\]]){8,})((?6)(?>:(?6)){0,6})?::(?7)?))|(?>(?>IPv6:(?>(?6)(?>:(?6)){5}:'.
+                    '|(?!(?:.*[a-f0-9]:){6,})(?8)?::(?>((?6)(?>:(?6)){0,4}):)?))?(25[0-5]|2[0-4][0-9]|1[0-9]{2}'.
                     '|[1-9]?[0-9])(?>\.(?9)){3}))\])(?1)$/isD',
                     $address
                 );
@@ -1231,7 +1231,7 @@ 
                  * @see http://www.whatwg.org/specs/web-apps/current-work/#e-mail-state-(type=email)
                  */
                 return (bool) preg_match(
-                    '/^[a-zA-Z0-9.!#$%&\'*+\/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}' .
+                    '/^[a-zA-Z0-9.!#$%&\'*+\/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}'.
                     '[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$/sD',
                     $address
                 );
@@ -1282,7 +1282,7 @@ 
                 $errorcode = 0;
                 $punycode = idn_to_ascii($domain, $errorcode, INTL_IDNA_VARIANT_UTS46);
                 if (false !== $punycode) {
-                    return substr($address, 0, $pos) . $punycode;
+                    return substr($address, 0, $pos).$punycode;
                 }
             }
         }
@@ -1346,8 +1346,8 @@ 
                     and version_compare(PHP_VERSION, '7.1.3', '<')))
         ) {
             trigger_error(
-                'Your version of PHP is affected by a bug that may result in corrupted messages.' .
-                ' To fix it, switch to sending using SMTP, disable the mail.add_x_header option in' .
+                'Your version of PHP is affected by a bug that may result in corrupted messages.'.
+                ' To fix it, switch to sending using SMTP, disable the mail.add_x_header option in'.
                 ' your php.ini, switch to MacOS or Linux, or upgrade your PHP to version 7.0.17+ or 7.1.3+.',
                 E_USER_WARNING
             );
@@ -1431,12 +1431,12 @@ 
                 )
             ) {
                 $header_dkim = $this->DKIM_Add(
-                    $this->MIMEHeader . $this->mailHeader,
+                    $this->MIMEHeader.$this->mailHeader,
                     $this->encodeHeader($this->secureHeader($this->Subject)),
                     $this->MIMEBody
                 );
-                $this->MIMEHeader = rtrim($this->MIMEHeader, "\r\n ") . static::$LE .
-                    static::normalizeBreaks($header_dkim) . static::$LE;
+                $this->MIMEHeader = rtrim($this->MIMEHeader, "\r\n ").static::$LE.
+                    static::normalizeBreaks($header_dkim).static::$LE;
             }
 
             return true;
@@ -1470,7 +1470,7 @@ 
                 case 'mail':
                     return $this->mailSend($this->MIMEHeader, $this->MIMEBody);
                 default:
-                    $sendMethod = $this->Mailer . 'Send';
+                    $sendMethod = $this->Mailer.'Send';
                     if (method_exists($this, $sendMethod)) {
                         return $this->$sendMethod($this->MIMEHeader, $this->MIMEBody);
                     }
@@ -1523,9 +1523,9 @@ 
             foreach ($this->SingleToArray as $toAddr) {
                 $mail = @popen($sendmail, 'w');
                 if (!$mail) {
-                    throw new Exception($this->lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
+                    throw new Exception($this->lang('execute').$this->Sendmail, self::STOP_CRITICAL);
                 }
-                fwrite($mail, 'To: ' . $toAddr . "\n");
+                fwrite($mail, 'To: '.$toAddr."\n");
                 fwrite($mail, $header);
                 fwrite($mail, $body);
                 $result = pclose($mail);
@@ -1540,13 +1540,13 @@ 
                     []
                 );
                 if (0 !== $result) {
-                    throw new Exception($this->lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
+                    throw new Exception($this->lang('execute').$this->Sendmail, self::STOP_CRITICAL);
                 }
             }
         } else {
             $mail = @popen($sendmail, 'w');
             if (!$mail) {
-                throw new Exception($this->lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
+                throw new Exception($this->lang('execute').$this->Sendmail, self::STOP_CRITICAL);
             }
             fwrite($mail, $header);
             fwrite($mail, $body);
@@ -1562,7 +1562,7 @@ 
                 []
             );
             if (0 !== $result) {
-                throw new Exception($this->lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
+                throw new Exception($this->lang('execute').$this->Sendmail, self::STOP_CRITICAL);
             }
         }
 
@@ -1720,7 +1720,7 @@ 
             $smtp_from = $this->Sender;
         }
         if (!$this->smtp->mail($smtp_from)) {
-            $this->setError($this->lang('from_failed') . $smtp_from . ' : ' . implode(',', $this->smtp->getError()));
+            $this->setError($this->lang('from_failed').$smtp_from.' : '.implode(',', $this->smtp->getError()));
             throw new Exception($this->ErrorInfo, self::STOP_CRITICAL);
         }
 
@@ -1741,7 +1741,7 @@ 
         }
 
         // Only send the DATA command if we have viable recipients
-        if ((count($this->all_recipients) > count($bad_rcpt)) and !$this->smtp->data($header . $body)) {
+        if ((count($this->all_recipients) > count($bad_rcpt)) and !$this->smtp->data($header.$body)) {
             throw new Exception($this->lang('data_not_accepted'), self::STOP_CRITICAL);
         }
 
@@ -1771,10 +1771,10 @@ 
         if (count($bad_rcpt) > 0) {
             $errstr = '';
             foreach ($bad_rcpt as $bad) {
-                $errstr .= $bad['to'] . ': ' . $bad['error'];
+                $errstr .= $bad['to'].': '.$bad['error'];
             }
             throw new Exception(
-                $this->lang('recipients_failed') . $errstr,
+                $this->lang('recipients_failed').$errstr,
                 self::STOP_CONTINUE
             );
         }
@@ -1824,7 +1824,7 @@ 
                 trim($hostentry),
                 $hostinfo
             )) {
-                static::edebug($this->lang('connect_host') . ' ' . $hostentry);
+                static::edebug($this->lang('connect_host').' '.$hostentry);
                 // Not a valid host entry
                 continue;
             }
@@ -1836,7 +1836,7 @@ 
 
             //Check the host name is a valid name or IP address before trying to use it
             if (!static::isValidHost($hostinfo[3])) {
-                static::edebug($this->lang('connect_host') . ' ' . $hostentry);
+                static::edebug($this->lang('connect_host').' '.$hostentry);
                 continue;
             }
             $prefix = '';
@@ -1856,7 +1856,7 @@ 
             if ('tls' === $secure or 'ssl' === $secure) {
                 //Check for an OpenSSL constant rather than using extension_loaded, which is sometimes disabled
                 if (!$sslext) {
-                    throw new Exception($this->lang('extension_missing') . 'openssl', self::STOP_CRITICAL);
+                    throw new Exception($this->lang('extension_missing').'openssl', self::STOP_CRITICAL);
                 }
             }
             $host = $hostinfo[3];
@@ -1865,7 +1865,7 @@ 
             if ($tport > 0 and $tport < 65536) {
                 $port = $tport;
             }
-            if ($this->smtp->connect($prefix . $host, $port, $this->Timeout, $options)) {
+            if ($this->smtp->connect($prefix.$host, $port, $this->Timeout, $options)) {
                 try {
                     if ($this->Helo) {
                         $hello = $this->Helo;
@@ -1982,14 +1982,14 @@ 
         ];
         if (empty($lang_path)) {
             // Calculate an absolute path so it can work if CWD is not here
-            $lang_path = __DIR__ . DIRECTORY_SEPARATOR . 'language' . DIRECTORY_SEPARATOR;
+            $lang_path = __DIR__.DIRECTORY_SEPARATOR.'language'.DIRECTORY_SEPARATOR;
         }
         //Validate $langcode
         if (!preg_match('/^[a-z]{2}(?:_[a-zA-Z]{2})?$/', $langcode)) {
             $langcode = 'en';
         }
         $foundlang = true;
-        $lang_file = $lang_path . 'phpmailer.lang-' . $langcode . '.php';
+        $lang_file = $lang_path.'phpmailer.lang-'.$langcode.'.php';
         // There is no English translation file
         if ('en' != $langcode) {
             // Make sure language file path is readable
@@ -2034,7 +2034,7 @@ 
             $addresses[] = $this->addrFormat($address);
         }
 
-        return $type . ': ' . implode(', ', $addresses) . static::$LE;
+        return $type.': '.implode(', ', $addresses).static::$LE;
     }
 
     /**
@@ -2051,9 +2051,9 @@ 
             return $this->secureHeader($addr[0]);
         }
 
-        return $this->encodeHeader($this->secureHeader($addr[1]), 'phrase') . ' <' . $this->secureHeader(
+        return $this->encodeHeader($this->secureHeader($addr[1]), 'phrase').' <'.$this->secureHeader(
                 $addr[0]
-            ) . '>';
+            ).'>';
     }
 
     /**
@@ -2110,10 +2110,10 @@ 
                             }
                             $part = substr($word, 0, $len);
                             $word = substr($word, $len);
-                            $buf .= ' ' . $part;
-                            $message .= $buf . sprintf('=%s', static::$LE);
+                            $buf .= ' '.$part;
+                            $message .= $buf.sprintf('=%s', static::$LE);
                         } else {
-                            $message .= $buf . $soft_break;
+                            $message .= $buf.$soft_break;
                         }
                         $buf = '';
                     }
@@ -2133,7 +2133,7 @@ 
                         $word = substr($word, $len);
 
                         if (strlen($word) > 0) {
-                            $message .= $part . sprintf('=%s', static::$LE);
+                            $message .= $part.sprintf('=%s', static::$LE);
                         } else {
                             $buf = $part;
                         }
@@ -2146,13 +2146,13 @@ 
                     $buf .= $word;
 
                     if (strlen($buf) > $length and '' != $buf_o) {
-                        $message .= $buf_o . $soft_break;
+                        $message .= $buf_o.$soft_break;
                         $buf = $word;
                     }
                 }
                 $firstword = false;
             }
-            $message .= $buf . static::$LE;
+            $message .= $buf.static::$LE;
         }
 
         return $message;
@@ -2298,7 +2298,7 @@ 
         if ('' == $this->XMailer) {
             $result .= $this->headerLine(
                 'X-Mailer',
-                'PHPMailer ' . self::VERSION . ' (https://github.com/PHPMailer/PHPMailer)'
+                'PHPMailer '.self::VERSION.' (https://github.com/PHPMailer/PHPMailer)'
             );
         } else {
             $myXmailer = trim($this->XMailer);
@@ -2308,7 +2308,7 @@ 
         }
 
         if ('' != $this->ConfirmReadingTo) {
-            $result .= $this->headerLine('Disposition-Notification-To', '<' . $this->ConfirmReadingTo . '>');
+            $result .= $this->headerLine('Disposition-Notification-To', '<'.$this->ConfirmReadingTo.'>');
         }
 
         // Add custom headers
@@ -2338,23 +2338,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;
         }
@@ -2389,7 +2389,7 @@ 
      */
     public function getSentMIMEMessage()
     {
-        return rtrim($this->MIMEHeader . $this->mailHeader, "\n\r") . static::$LE . static::$LE . $this->MIMEBody;
+        return rtrim($this->MIMEHeader.$this->mailHeader, "\n\r").static::$LE.static::$LE.$this->MIMEBody;
     }
 
     /**
@@ -2426,12 +2426,12 @@ 
         $body = '';
         //Create unique IDs and preset boundaries
         $this->uniqueid = $this->generateId();
-        $this->boundary[1] = 'b1_' . $this->uniqueid;
-        $this->boundary[2] = 'b2_' . $this->uniqueid;
-        $this->boundary[3] = 'b3_' . $this->uniqueid;
+        $this->boundary[1] = 'b1_'.$this->uniqueid;
+        $this->boundary[2] = 'b2_'.$this->uniqueid;
+        $this->boundary[3] = 'b3_'.$this->uniqueid;
 
         if ($this->sign_key_file) {
-            $body .= $this->getMailMIME() . static::$LE;
+            $body .= $this->getMailMIME().static::$LE;
         }
 
         $this->setWordWrap();
@@ -2464,7 +2464,7 @@ 
             $altBodyEncoding = 'quoted-printable';
         }
         //Use this as a preamble in all multipart message types
-        $mimepre = 'This is a multi-part message in MIME format.' . static::$LE;
+        $mimepre = 'This is a multi-part message in MIME format.'.static::$LE;
         switch ($this->message_type) {
             case 'inline':
                 $body .= $mimepre;
@@ -2482,9 +2482,9 @@ 
                 break;
             case 'inline_attach':
                 $body .= $mimepre;
-                $body .= $this->textLine('--' . $this->boundary[1]);
+                $body .= $this->textLine('--'.$this->boundary[1]);
                 $body .= $this->headerLine('Content-Type', 'multipart/related;');
-                $body .= $this->textLine("\tboundary=\"" . $this->boundary[2] . '"');
+                $body .= $this->textLine("\tboundary=\"".$this->boundary[2].'"');
                 $body .= static::$LE;
                 $body .= $this->getBoundary($this->boundary[2], $bodyCharSet, '', $bodyEncoding);
                 $body .= $this->encodeString($this->Body, $bodyEncoding);
@@ -2513,9 +2513,9 @@ 
                 $body .= $this->getBoundary($this->boundary[1], $altBodyCharSet, 'text/plain', $altBodyEncoding);
                 $body .= $this->encodeString($this->AltBody, $altBodyEncoding);
                 $body .= static::$LE;
-                $body .= $this->textLine('--' . $this->boundary[1]);
+                $body .= $this->textLine('--'.$this->boundary[1]);
                 $body .= $this->headerLine('Content-Type', 'multipart/related;');
-                $body .= $this->textLine("\tboundary=\"" . $this->boundary[2] . '"');
+                $body .= $this->textLine("\tboundary=\"".$this->boundary[2].'"');
                 $body .= static::$LE;
                 $body .= $this->getBoundary($this->boundary[2], $bodyCharSet, 'text/html', $bodyEncoding);
                 $body .= $this->encodeString($this->Body, $bodyEncoding);
@@ -2526,9 +2526,9 @@ 
                 break;
             case 'alt_attach':
                 $body .= $mimepre;
-                $body .= $this->textLine('--' . $this->boundary[1]);
+                $body .= $this->textLine('--'.$this->boundary[1]);
                 $body .= $this->headerLine('Content-Type', 'multipart/alternative;');
-                $body .= $this->textLine("\tboundary=\"" . $this->boundary[2] . '"');
+                $body .= $this->textLine("\tboundary=\"".$this->boundary[2].'"');
                 $body .= static::$LE;
                 $body .= $this->getBoundary($this->boundary[2], $altBodyCharSet, 'text/plain', $altBodyEncoding);
                 $body .= $this->encodeString($this->AltBody, $altBodyEncoding);
@@ -2546,16 +2546,16 @@ 
                 break;
             case 'alt_inline_attach':
                 $body .= $mimepre;
-                $body .= $this->textLine('--' . $this->boundary[1]);
+                $body .= $this->textLine('--'.$this->boundary[1]);
                 $body .= $this->headerLine('Content-Type', 'multipart/alternative;');
-                $body .= $this->textLine("\tboundary=\"" . $this->boundary[2] . '"');
+                $body .= $this->textLine("\tboundary=\"".$this->boundary[2].'"');
                 $body .= static::$LE;
                 $body .= $this->getBoundary($this->boundary[2], $altBodyCharSet, 'text/plain', $altBodyEncoding);
                 $body .= $this->encodeString($this->AltBody, $altBodyEncoding);
                 $body .= static::$LE;
-                $body .= $this->textLine('--' . $this->boundary[2]);
+                $body .= $this->textLine('--'.$this->boundary[2]);
                 $body .= $this->headerLine('Content-Type', 'multipart/related;');
-                $body .= $this->textLine("\tboundary=\"" . $this->boundary[3] . '"');
+                $body .= $this->textLine("\tboundary=\"".$this->boundary[3].'"');
                 $body .= static::$LE;
                 $body .= $this->getBoundary($this->boundary[3], $bodyCharSet, 'text/html', $bodyEncoding);
                 $body .= $this->encodeString($this->Body, $bodyEncoding);
@@ -2582,12 +2582,12 @@ 
         } elseif ($this->sign_key_file) {
             try {
                 if (!defined('PKCS7_TEXT')) {
-                    throw new Exception($this->lang('extension_missing') . 'openssl');
+                    throw new Exception($this->lang('extension_missing').'openssl');
                 }
                 // @TODO would be nice to use php://temp streams here
                 $file = tempnam(sys_get_temp_dir(), 'mail');
                 if (false === file_put_contents($file, $body)) {
-                    throw new Exception($this->lang('signing') . ' Could not write temp file');
+                    throw new Exception($this->lang('signing').' Could not write temp file');
                 }
                 $signed = tempnam(sys_get_temp_dir(), 'signed');
                 //Workaround for PHP bug https://bugs.php.net/bug.php?id=69197
@@ -2595,16 +2595,16 @@ 
                     $sign = @openssl_pkcs7_sign(
                         $file,
                         $signed,
-                        'file://' . realpath($this->sign_cert_file),
-                        ['file://' . realpath($this->sign_key_file), $this->sign_key_pass],
+                        'file://'.realpath($this->sign_cert_file),
+                        ['file://'.realpath($this->sign_key_file), $this->sign_key_pass],
                         []
                     );
                 } else {
                     $sign = @openssl_pkcs7_sign(
                         $file,
                         $signed,
-                        'file://' . realpath($this->sign_cert_file),
-                        ['file://' . realpath($this->sign_key_file), $this->sign_key_pass],
+                        'file://'.realpath($this->sign_cert_file),
+                        ['file://'.realpath($this->sign_key_file), $this->sign_key_pass],
                         [],
                         PKCS7_DETACHED,
                         $this->sign_extracerts_file
@@ -2616,11 +2616,11 @@ 
                     @unlink($signed);
                     //The message returned by openssl contains both headers and body, so need to split them up
                     $parts = explode("\n\n", $body, 2);
-                    $this->MIMEHeader .= $parts[0] . static::$LE . static::$LE;
+                    $this->MIMEHeader .= $parts[0].static::$LE.static::$LE;
                     $body = $parts[1];
                 } else {
                     @unlink($signed);
-                    throw new Exception($this->lang('signing') . openssl_error_string());
+                    throw new Exception($this->lang('signing').openssl_error_string());
                 }
             } catch (Exception $exc) {
                 $body = '';
@@ -2655,7 +2655,7 @@ 
         if ('' == $encoding) {
             $encoding = $this->Encoding;
         }
-        $result .= $this->textLine('--' . $boundary);
+        $result .= $this->textLine('--'.$boundary);
         $result .= sprintf('Content-Type: %s; charset=%s', $contentType, $charSet);
         $result .= static::$LE;
         // RFC1341 part 5 says 7bit is assumed if not specified
@@ -2676,7 +2676,7 @@ 
      */
     protected function endBoundary($boundary)
     {
-        return static::$LE . '--' . $boundary . '--' . static::$LE;
+        return static::$LE.'--'.$boundary.'--'.static::$LE;
     }
 
     /**
@@ -2712,7 +2712,7 @@ 
      */
     public function headerLine($name, $value)
     {
-        return $name . ': ' . $value . static::$LE;
+        return $name.': '.$value.static::$LE;
     }
 
     /**
@@ -2724,7 +2724,7 @@ 
      */
     public function textLine($value)
     {
-        return $value . static::$LE;
+        return $value.static::$LE;
     }
 
     /**
@@ -2746,7 +2746,7 @@ 
     {
         try {
             if (!@is_file($path)) {
-                throw new Exception($this->lang('file_access') . $path, self::STOP_CONTINUE);
+                throw new Exception($this->lang('file_access').$path, self::STOP_CONTINUE);
             }
 
             // If a MIME type is not specified, try to work it out from the file name
@@ -2873,7 +2873,7 @@ 
                             'Content-Disposition: %s; filename="%s"%s',
                             $disposition,
                             $encoded_name,
-                            static::$LE . static::$LE
+                            static::$LE.static::$LE
                         );
                     } else {
                         if (!empty($encoded_name)) {
@@ -2881,13 +2881,13 @@ 
                                 'Content-Disposition: %s; filename=%s%s',
                                 $disposition,
                                 $encoded_name,
-                                static::$LE . static::$LE
+                                static::$LE.static::$LE
                             );
                         } else {
                             $mime[] = sprintf(
                                 'Content-Disposition: %s%s',
                                 $disposition,
-                                static::$LE . static::$LE
+                                static::$LE.static::$LE
                             );
                         }
                     }
@@ -2928,11 +2928,11 @@ 
     {
         try {
             if (!file_exists($path)) {
-                throw new Exception($this->lang('file_open') . $path, self::STOP_CONTINUE);
+                throw new Exception($this->lang('file_open').$path, self::STOP_CONTINUE);
             }
             $file_buffer = file_get_contents($path);
             if (false === $file_buffer) {
-                throw new Exception($this->lang('file_open') . $path, self::STOP_CONTINUE);
+                throw new Exception($this->lang('file_open').$path, self::STOP_CONTINUE);
             }
             $file_buffer = $this->encodeString($file_buffer, $encoding);
 
@@ -2979,7 +2979,7 @@ 
                 $encoded = $this->encodeQP($str);
                 break;
             default:
-                $this->setError($this->lang('encoding') . $encoding);
+                $this->setError($this->lang('encoding').$encoding);
                 break;
         }
 
@@ -3045,7 +3045,7 @@ 
                 $maxlen -= $maxlen % 4;
                 $encoded = trim(chunk_split($encoded, $maxlen, "\n"));
             }
-            $encoded = preg_replace('/^(.*)$/m', ' =?' . $this->CharSet . "?$encoding?\\1?=", $encoded);
+            $encoded = preg_replace('/^(.*)$/m', ' =?'.$this->CharSet."?$encoding?\\1?=", $encoded);
         } elseif ($matchcount > 0) {
             //1 or more chars need encoding, use Q-encode
             $encoding = 'Q';
@@ -3053,8 +3053,8 @@ 
             $maxlen = static::STD_LINE_LENGTH - $lengthsub - 8 - strlen($this->CharSet);
             $encoded = $this->encodeQ($str, $position);
             $encoded = $this->wrapText($encoded, $maxlen, true);
-            $encoded = str_replace('=' . static::$LE, "\n", trim($encoded));
-            $encoded = preg_replace('/^(.*)$/m', ' =?' . $this->CharSet . "?$encoding?\\1?=", $encoded);
+            $encoded = str_replace('='.static::$LE, "\n", trim($encoded));
+            $encoded = preg_replace('/^(.*)$/m', ' =?'.$this->CharSet."?$encoding?\\1?=", $encoded);
         } elseif (strlen($str) > $maxlen) {
             //No chars need encoding, but line is too long, so fold it
             $encoded = trim($this->wrapText($str, $maxlen, false));
@@ -3115,7 +3115,7 @@ 
      */
     public function base64EncodeWrapMB($str, $linebreak = null)
     {
-        $start = '=?' . $this->CharSet . '?B?';
+        $start = '=?'.$this->CharSet.'?B?';
         $end = '?=';
         $encoded = '';
         if (null === $linebreak) {
@@ -3138,7 +3138,7 @@ 
                 $chunk = base64_encode($chunk);
                 ++$lookBack;
             } while (strlen($chunk) > $length);
-            $encoded .= $chunk . $linebreak;
+            $encoded .= $chunk.$linebreak;
         }
 
         // Chomp the last linefeed
@@ -3191,7 +3191,7 @@ 
                 // RFC 2047 section 5.1
                 // Replace every high ascii, control, =, ? and _ characters
                 /** @noinspection SuspiciousAssignmentsInspection */
-                $pattern = '\000-\011\013\014\016-\037\075\077\137\177-\377' . $pattern;
+                $pattern = '\000-\011\013\014\016-\037\075\077\137\177-\377'.$pattern;
                 break;
         }
         $matches = [];
@@ -3204,7 +3204,7 @@ 
                 array_unshift($matches[0], '=');
             }
             foreach (array_unique($matches[0]) as $char) {
-                $encoded = str_replace($char, '=' . sprintf('%02X', ord($char)), $encoded);
+                $encoded = str_replace($char, '='.sprintf('%02X', ord($char)), $encoded);
             }
         }
         // Replace spaces with _ (more readable than =20)
@@ -3269,7 +3269,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;
         }
@@ -3413,7 +3413,7 @@ 
     {
         $this->RecipientsQueue = array_filter(
             $this->RecipientsQueue,
-            function ($params) use ($kind) {
+            function($params) use ($kind) {
                 return $params[0] != $kind;
             }
         );
@@ -3503,15 +3503,15 @@ 
         if ('smtp' == $this->Mailer and null !== $this->smtp) {
             $lasterror = $this->smtp->getError();
             if (!empty($lasterror['error'])) {
-                $msg .= $this->lang('smtp_error') . $lasterror['error'];
+                $msg .= $this->lang('smtp_error').$lasterror['error'];
                 if (!empty($lasterror['detail'])) {
-                    $msg .= ' Detail: ' . $lasterror['detail'];
+                    $msg .= ' Detail: '.$lasterror['detail'];
                 }
                 if (!empty($lasterror['smtp_code'])) {
-                    $msg .= ' SMTP code: ' . $lasterror['smtp_code'];
+                    $msg .= ' SMTP code: '.$lasterror['smtp_code'];
                 }
                 if (!empty($lasterror['smtp_code_ex'])) {
-                    $msg .= ' Additional SMTP info: ' . $lasterror['smtp_code_ex'];
+                    $msg .= ' Additional SMTP info: '.$lasterror['smtp_code_ex'];
                 }
             }
         }
@@ -3584,7 +3584,7 @@ 
             //Is it a valid IPv4 address?
             return (bool) filter_var($host, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4);
         }
-        if (filter_var('http://' . $host, FILTER_VALIDATE_URL, FILTER_FLAG_HOST_REQUIRED)) {
+        if (filter_var('http://'.$host, FILTER_VALIDATE_URL, FILTER_FLAG_HOST_REQUIRED)) {
             //Is it a syntactically valid hostname?
             return true;
         }
@@ -3610,7 +3610,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];
@@ -3698,14 +3698,14 @@ 
                     }
                     //Hash the decoded data, not the URL so that the same data-URI image used in multiple places
                     //will only be embedded once, even if it used a different encoding
-                    $cid = hash('sha256', $data) . '@phpmailer.0'; // RFC2392 S 2
+                    $cid = hash('sha256', $data).'@phpmailer.0'; // RFC2392 S 2
 
                     if (!$this->cidExists($cid)) {
-                        $this->addStringEmbeddedImage($data, $cid, 'embed' . $imgindex, 'base64', $match[1]);
+                        $this->addStringEmbeddedImage($data, $cid, 'embed'.$imgindex, 'base64', $match[1]);
                     }
                     $message = str_replace(
                         $images[0][$imgindex],
-                        $images[1][$imgindex] . '="cid:' . $cid . '"',
+                        $images[1][$imgindex].'="cid:'.$cid.'"',
                         $message
                     );
                     continue;
@@ -3724,7 +3724,7 @@ 
                     if ('.' == $directory) {
                         $directory = '';
                     }
-                    $cid = hash('sha256', $url) . '@phpmailer.0'; // RFC2392 S 2
+                    $cid = hash('sha256', $url).'@phpmailer.0'; // RFC2392 S 2
                     if (strlen($basedir) > 1 and '/' != substr($basedir, -1)) {
                         $basedir .= '/';
                     }
@@ -3732,7 +3732,7 @@ 
                         $directory .= '/';
                     }
                     if ($this->addEmbeddedImage(
-                        $basedir . $directory . $filename,
+                        $basedir.$directory.$filename,
                         $cid,
                         $filename,
                         'base64',
@@ -3740,8 +3740,8 @@ 
                     )
                     ) {
                         $message = preg_replace(
-                            '/' . $images[1][$imgindex] . '=["\']' . preg_quote($url, '/') . '["\']/Ui',
-                            $images[1][$imgindex] . '="cid:' . $cid . '"',
+                            '/'.$images[1][$imgindex].'=["\']'.preg_quote($url, '/').'["\']/Ui',
+                            $images[1][$imgindex].'="cid:'.$cid.'"',
                             $message
                         );
                     }
@@ -4002,7 +4002,7 @@ 
 
             return true;
         }
-        $this->setError($this->lang('variable_set') . $name);
+        $this->setError($this->lang('variable_set').$name);
 
         return false;
     }
@@ -4096,7 +4096,7 @@ 
             if (((0x21 <= $ord) and ($ord <= 0x3A)) or $ord == 0x3C or ((0x3E <= $ord) and ($ord <= 0x7E))) {
                 $line .= $txt[$i];
             } else {
-                $line .= '=' . sprintf('%02X', $ord);
+                $line .= '='.sprintf('%02X', $ord);
             }
         }
 
@@ -4116,14 +4116,13 @@ 
     {
         if (!defined('PKCS7_TEXT')) {
             if ($this->exceptions) {
-                throw new Exception($this->lang('extension_missing') . 'openssl');
+                throw new Exception($this->lang('extension_missing').'openssl');
             }
 
             return '';
         }
         $privKeyStr = !empty($this->DKIM_private_string) ?
-            $this->DKIM_private_string :
-            file_get_contents($this->DKIM_private);
+            $this->DKIM_private_string : file_get_contents($this->DKIM_private);
         if ('' != $this->DKIM_passphrase) {
             $privKey = openssl_pkey_get_private($privKeyStr, $this->DKIM_passphrase);
         } else {
@@ -4175,7 +4174,7 @@ 
             //But then says to delete space before and after the colon.
             //Net result is the same as trimming both ends of the value.
             //by elimination, the same applies to the field name
-            $lines[$key] = trim($heading, " \t") . ':' . trim($value, " \t");
+            $lines[$key] = trim($heading, " \t").':'.trim($value, " \t");
         }
 
         return implode("\r\n", $lines);
@@ -4201,7 +4200,7 @@ 
         $body = static::normalizeBreaks($body, "\r\n");
 
         //Reduce multiple trailing line breaks to a single one
-        return rtrim($body, "\r\n") . "\r\n";
+        return rtrim($body, "\r\n")."\r\n";
     }
 
     /**
@@ -4257,33 +4256,33 @@ 
         if ('' == $this->DKIM_identity) {
             $ident = '';
         } else {
-            $ident = ' i=' . $this->DKIM_identity . ';';
-        }
-        $dkimhdrs = 'DKIM-Signature: v=1; a=' .
-            $DKIMsignatureType . '; q=' .
-            $DKIMquery . '; l=' .
-            $DKIMlen . '; s=' .
-            $this->DKIM_selector .
-            ";\r\n" .
-            "\tt=" . $DKIMtime . '; c=' . $DKIMcanonicalization . ";\r\n" .
-            "\th=From:To:Date:Subject;\r\n" .
-            "\td=" . $this->DKIM_domain . ';' . $ident . "\r\n" .
-            "\tz=$from\r\n" .
-            "\t|$to\r\n" .
-            "\t|$date\r\n" .
-            "\t|$subject;\r\n" .
-            "\tbh=" . $DKIMb64 . ";\r\n" .
+            $ident = ' i='.$this->DKIM_identity.';';
+        }
+        $dkimhdrs = 'DKIM-Signature: v=1; a='.
+            $DKIMsignatureType.'; q='.
+            $DKIMquery.'; l='.
+            $DKIMlen.'; s='.
+            $this->DKIM_selector.
+            ";\r\n".
+            "\tt=".$DKIMtime.'; c='.$DKIMcanonicalization.";\r\n".
+            "\th=From:To:Date:Subject;\r\n".
+            "\td=".$this->DKIM_domain.';'.$ident."\r\n".
+            "\tz=$from\r\n".
+            "\t|$to\r\n".
+            "\t|$date\r\n".
+            "\t|$subject;\r\n".
+            "\tbh=".$DKIMb64.";\r\n".
             "\tb=";
         $toSign = $this->DKIM_HeaderC(
-            $from_header . "\r\n" .
-            $to_header . "\r\n" .
-            $date_header . "\r\n" .
-            $subject_header . "\r\n" .
+            $from_header."\r\n".
+            $to_header."\r\n".
+            $date_header."\r\n".
+            $subject_header."\r\n".
             $dkimhdrs
         );
         $signed = $this->DKIM_Sign($toSign);
 
-        return static::normalizeBreaks($dkimhdrs . $signed) . static::$LE;
+        return static::normalizeBreaks($dkimhdrs.$signed).static::$LE;
     }
 
     /**
@@ -4296,7 +4295,7 @@ 
      */
     public static function hasLineLongerThanMax($str)
     {
-        return (bool) preg_match('/^(.{' . (self::MAX_LINE_LENGTH + strlen(static::$LE)) . ',})/m', $str);
+        return (bool) preg_match('/^(.{'.(self::MAX_LINE_LENGTH + strlen(static::$LE)).',})/m', $str);
     }
 
     /**

Braces +2 added lines, -1 removed lines

@@ -3413,7 +3413,8 @@
     {
         $this->RecipientsQueue = array_filter(
             $this->RecipientsQueue,
-            function ($params) use ($kind) {
+            function ($params) use ($kind)
+            {
                 return $params[0] != $kind;
             }
         );