geekwright / XoopsCore

htdocs/class/xml/rpc/xoopsapi.php

Spacing +12 added lines, -12 removed lines

@@ -61,7 +61,7 @@ 
                 if (count($missing) > 0) {
                     $msg = '';
                     foreach ($missing as $m) {
-                        $msg .= '<' . $m . '> ';
+                        $msg .= '<'.$m.'> ';
                     }
                     $this->response->add(new XoopsXmlRpcFault(109, $msg));
                 } else {
@@ -151,7 +151,7 @@ 
                 if (count($missing) > 0) {
                     $msg = '';
                     foreach ($missing as $m) {
-                        $msg .= '<' . $m . '> ';
+                        $msg .= '<'.$m.'> ';
                     }
                     $this->response->add(new XoopsXmlRpcFault(109, $msg));
                 } else {
@@ -249,7 +249,7 @@ 
                     $struct = new XoopsXmlRpcStruct();
                     $content = '';
                     foreach ($ret as $key => $value) {
-                        switch($key) {
+                        switch ($key) {
                             case 'uid':
                                 $struct->add('userid', new XoopsXmlRpcString($value));
                                 break;
@@ -258,14 +258,14 @@ 
                                 break;
                             case 'storyid':
                                 $struct->add('postid', new XoopsXmlRpcString($value));
-                                $struct->add('link', new XoopsXmlRpcString(\XoopsBaseConfig::get('url') . '/modules/news/article.php?item_id=' . $value));
-                                $struct->add('permaLink', new XoopsXmlRpcString(\XoopsBaseConfig::get('url') . '/modules/news/article.php?item_id=' . $value));
+                                $struct->add('link', new XoopsXmlRpcString(\XoopsBaseConfig::get('url').'/modules/news/article.php?item_id='.$value));
+                                $struct->add('permaLink', new XoopsXmlRpcString(\XoopsBaseConfig::get('url').'/modules/news/article.php?item_id='.$value));
                                 break;
                             case 'title':
                                 $struct->add('title', new XoopsXmlRpcString($value));
                                 break;
                             default :
-                                $content .= '<' . $key . '>' . trim($value) . '</' . $key . '>';
+                                $content .= '<'.$key.'>'.trim($value).'</'.$key.'>';
                                 break;
                         }
                     }
@@ -319,8 +319,8 @@ 
                     for ($i = 0; $i < $count; ++$i) {
                         $struct = new XoopsXmlRpcStruct();
                         $content = '';
-                        foreach($ret[$i] as $key => $value) {
-                            switch($key) {
+                        foreach ($ret[$i] as $key => $value) {
+                            switch ($key) {
                                 case 'uid':
                                     $struct->add('userid', new XoopsXmlRpcString($value));
                                     break;
@@ -329,14 +329,14 @@ 
                                     break;
                                 case 'storyid':
                                     $struct->add('postid', new XoopsXmlRpcString($value));
-                                    $struct->add('link', new XoopsXmlRpcString(\XoopsBaseConfig::get('url') . '/modules/news/article.php?item_id=' . $value));
-                                    $struct->add('permaLink', new XoopsXmlRpcString(\XoopsBaseConfig::get('url') . '/modules/news/article.php?item_id=' . $value));
+                                    $struct->add('link', new XoopsXmlRpcString(\XoopsBaseConfig::get('url').'/modules/news/article.php?item_id='.$value));
+                                    $struct->add('permaLink', new XoopsXmlRpcString(\XoopsBaseConfig::get('url').'/modules/news/article.php?item_id='.$value));
                                     break;
                                 case 'title':
                                     $struct->add('title', new XoopsXmlRpcString($value));
                                     break;
                                 default :
-                                    $content .= '<' . $key . '>' . trim($value) . '</' . $key . '>';
+                                    $content .= '<'.$key.'>'.trim($value).'</'.$key.'>';
                                     break;
                             }
                         }
@@ -351,7 +351,7 @@ 
         return null;
     }
 
-    function getCategories($respond=true)
+    function getCategories($respond = true)
     {
         global $xoopsDB;
         if (!$this->_checkUser($this->params[1], $this->params[2])) {

htdocs/class/xml/saxparser.php

Spacing +1 added lines, -1 removed lines

@@ -380,7 +380,7 @@
             $ret = '';
             if (count($this->errors) > 0) {
                 foreach ($this->errors as $error) {
-                    $ret .= $error . '<br />';
+                    $ret .= $error.'<br />';
                 }
             }
             return $ret;

htdocs/class/vendor/snoopy.php

Spacing +41 added lines, -41 removed lines

@@ -149,7 +149,7 @@ 
                         // using proxy, send entire URI
                         $this->_httprequest($URI, $fp, $URI, $this->_httpmethod);
                     } else {
-                        $path = $URI_PARTS["path"] . ($URI_PARTS["query"] ? "?" . $URI_PARTS["query"] : "");
+                        $path = $URI_PARTS["path"].($URI_PARTS["query"] ? "?".$URI_PARTS["query"] : "");
                         // no proxy, send only the path
                         $this->_httprequest($path, $fp, $URI, $this->_httpmethod);
                     }
@@ -160,7 +160,7 @@ 
                         /* url was redirected, check if we've hit the max depth */
                         if ($this->maxredirs > $this->_redirectdepth) {
                             // only follow redirect if it's on this site, or offsiteok is true
-                            if (preg_match("|^https?://" . preg_quote($this->host) . "|i", $this->_redirectaddr) || $this->offsiteok) {
+                            if (preg_match("|^https?://".preg_quote($this->host)."|i", $this->_redirectaddr) || $this->offsiteok) {
                                 /* follow the redirect */
                                 $this->_redirectdepth++;
                                 $this->lastredirectaddr = $this->_redirectaddr;
@@ -188,7 +188,7 @@ 
                 break;
             default:
                 // not a valid protocol
-                $this->error = 'Invalid protocol "' . $URI_PARTS["scheme"] . '"\n';
+                $this->error = 'Invalid protocol "'.$URI_PARTS["scheme"].'"\n';
                 return false;
                 break;
         }
@@ -239,7 +239,7 @@ 
                         // using proxy, send entire URI
                         $this->_httprequest($URI, $fp, $URI, $this->_submit_method, $this->_submit_type, $postdata);
                     } else {
-                        $path = $URI_PARTS["path"] . ($URI_PARTS["query"] ? "?" . $URI_PARTS["query"] : "");
+                        $path = $URI_PARTS["path"].($URI_PARTS["query"] ? "?".$URI_PARTS["query"] : "");
                         // no proxy, send only the path
                         $this->_httprequest($path, $fp, $URI, $this->_submit_method, $this->_submit_type, $postdata);
                     }
@@ -249,11 +249,11 @@ 
                     if ($this->_redirectaddr) {
                         /* url was redirected, check if we've hit the max depth */
                         if ($this->maxredirs > $this->_redirectdepth) {
-                            if (!preg_match("|^" . $URI_PARTS["scheme"] . "://|", $this->_redirectaddr))
-                                $this->_redirectaddr = $this->_expandlinks($this->_redirectaddr, $URI_PARTS["scheme"] . "://" . $URI_PARTS["host"]);
+                            if (!preg_match("|^".$URI_PARTS["scheme"]."://|", $this->_redirectaddr))
+                                $this->_redirectaddr = $this->_expandlinks($this->_redirectaddr, $URI_PARTS["scheme"]."://".$URI_PARTS["host"]);
 
                             // only follow redirect if it's on this site, or offsiteok is true
-                            if (preg_match("|^https?://" . preg_quote($this->host) . "|i", $this->_redirectaddr) || $this->offsiteok) {
+                            if (preg_match("|^https?://".preg_quote($this->host)."|i", $this->_redirectaddr) || $this->offsiteok) {
                                 /* follow the redirect */
                                 $this->_redirectdepth++;
                                 $this->lastredirectaddr = $this->_redirectaddr;
@@ -285,7 +285,7 @@ 
                 break;
             default:
                 // not a valid protocol
-                $this->error = 'Invalid protocol "' . $URI_PARTS["scheme"] . '"\n';
+                $this->error = 'Invalid protocol "'.$URI_PARTS["scheme"].'"\n';
                 return false;
                 break;
         }
@@ -585,9 +585,9 @@ 
         $match = preg_replace("|/$|", "", $match);
         $match_part = parse_url($match);
         $match_root =
-            $match_part["scheme"] . "://" . $match_part["host"];
+            $match_part["scheme"]."://".$match_part["host"];
 
-        $search = array("|^http://" . preg_quote($this->host) . "|i",
+        $search = array("|^http://".preg_quote($this->host)."|i",
             "|^(\/)|i",
             "|^(?!http://)(?!mailto:)|i",
             "|/\./|",
@@ -595,8 +595,8 @@ 
         );
 
         $replace = array("",
-            $match_root . "/",
-            $match . "/",
+            $match_root."/",
+            $match."/",
             "/",
             "/"
         );
@@ -625,17 +625,17 @@ 
         $URI_PARTS = parse_url($URI);
         if (empty($url))
             $url = "/";
-        $headers = $http_method . " " . $url . " " . $this->_httpversion . "\r\n";
+        $headers = $http_method." ".$url." ".$this->_httpversion."\r\n";
         if (!empty($this->host) && !isset($this->rawheaders['Host'])) {
-            $headers .= "Host: " . $this->host;
+            $headers .= "Host: ".$this->host;
             if (!empty($this->port) && $this->port != '80')
-                $headers .= ":" . $this->port;
+                $headers .= ":".$this->port;
             $headers .= "\r\n";
         }
         if (!empty($this->agent))
-            $headers .= "User-Agent: " . $this->agent . "\r\n";
+            $headers .= "User-Agent: ".$this->agent."\r\n";
         if (!empty($this->accept))
-            $headers .= "Accept: " . $this->accept . "\r\n";
+            $headers .= "Accept: ".$this->accept."\r\n";
         if ($this->use_gzip) {
             // make sure PHP was built with --with-zlib
             // and we can handle gzipp'ed data
@@ -643,13 +643,13 @@ 
                 $headers .= "Accept-encoding: gzip\r\n";
             } else {
                 trigger_error(
-                    "use_gzip is on, but PHP was built without zlib support." .
+                    "use_gzip is on, but PHP was built without zlib support.".
                     "  Requesting file(s) without gzip encoding.",
                     E_USER_NOTICE);
             }
         }
         if (!empty($this->referer))
-            $headers .= "Referer: " . $this->referer . "\r\n";
+            $headers .= "Referer: ".$this->referer."\r\n";
         if (!empty($this->cookies)) {
             if (!is_array($this->cookies))
                 $this->cookies = (array)$this->cookies;
@@ -658,31 +658,31 @@ 
             if (count($this->cookies) > 0) {
                 $cookie_headers .= 'Cookie: ';
                 foreach ($this->cookies as $cookieKey => $cookieVal) {
-                    $cookie_headers .= $cookieKey . "=" . urlencode($cookieVal) . "; ";
+                    $cookie_headers .= $cookieKey."=".urlencode($cookieVal)."; ";
                 }
-                $headers .= substr($cookie_headers, 0, -2) . "\r\n";
+                $headers .= substr($cookie_headers, 0, -2)."\r\n";
             }
         }
         if (!empty($this->rawheaders)) {
             if (!is_array($this->rawheaders))
                 $this->rawheaders = (array)$this->rawheaders;
             while (list($headerKey, $headerVal) = each($this->rawheaders))
-                $headers .= $headerKey . ": " . $headerVal . "\r\n";
+                $headers .= $headerKey.": ".$headerVal."\r\n";
         }
         if (!empty($content_type)) {
             $headers .= "Content-type: $content_type";
             if ($content_type == "multipart/form-data")
-                $headers .= "; boundary=" . $this->_mime_boundary;
+                $headers .= "; boundary=".$this->_mime_boundary;
             $headers .= "\r\n";
         }
         if (!empty($body))
-            $headers .= "Content-length: " . strlen($body) . "\r\n";
+            $headers .= "Content-length: ".strlen($body)."\r\n";
         if (!empty($this->user) || !empty($this->pass))
-            $headers .= "Authorization: Basic " . base64_encode($this->user . ":" . $this->pass) . "\r\n";
+            $headers .= "Authorization: Basic ".base64_encode($this->user.":".$this->pass)."\r\n";
 
         //add proxy auth headers
         if (!empty($this->proxy_user))
-            $headers .= 'Proxy-Authorization: ' . 'Basic ' . base64_encode($this->proxy_user . ':' . $this->proxy_pass) . "\r\n";
+            $headers .= 'Proxy-Authorization: '.'Basic '.base64_encode($this->proxy_user.':'.$this->proxy_pass)."\r\n";
 
 
         $headers .= "\r\n";
@@ -692,7 +692,7 @@ 
             socket_set_timeout($fp, $this->read_timeout);
         $this->timed_out = false;
 
-        fwrite($fp, $headers . $body, strlen($headers . $body));
+        fwrite($fp, $headers.$body, strlen($headers.$body));
 
         $this->_redirectaddr = false;
         unset($this->headers);
@@ -716,10 +716,10 @@ 
                 // look for :// in the Location header to see if hostname is included
                 if (!preg_match("|\:\/\/|", $matches[2])) {
                     // no host in the path, so prepend
-                    $this->_redirectaddr = $URI_PARTS["scheme"] . "://" . $this->host . ":" . $this->port;
+                    $this->_redirectaddr = $URI_PARTS["scheme"]."://".$this->host.":".$this->port;
                     // eliminate double slash
                     if (!preg_match("|^/|", $matches[2]))
-                        $this->_redirectaddr .= "/" . $matches[2];
+                        $this->_redirectaddr .= "/".$matches[2];
                     else
                         $this->_redirectaddr .= $matches[2];
                 } else
@@ -771,7 +771,7 @@ 
         if (($this->_framedepth < $this->maxframes) && preg_match_all("'<frame\s+.*src[\s]*=[\'\"]?([^\'\"\>]+)'i", $results, $match)) {
             $this->results[] = $results;
             for ($x = 0; $x < count($match[1]); $x++)
-                $this->_frameurls[] = $this->_expandlinks($match[1][$x], $URI_PARTS["scheme"] . "://" . $this->host);
+                $this->_frameurls[] = $this->_expandlinks($match[1][$x], $URI_PARTS["scheme"]."://".$this->host);
         } // have we already fetched framed content?
         elseif (is_array($this->results))
             $this->results[] = $results;
@@ -858,14 +858,14 @@ 
                     $context_opts['ssl']['capath'] = $this->capath;
             }
                     
-            $host = 'ssl://' . $host;
+            $host = 'ssl://'.$host;
         }
 
         $context = stream_context_create($context_opts);
 
         if (version_compare(PHP_VERSION, '5.0.0', '>')) {
-            if($this->scheme == 'http')
-                $host = "tcp://" . $host;
+            if ($this->scheme == 'http')
+                $host = "tcp://".$host;
             $fp = stream_socket_client(
                 "$host:$port",
                 $errno,
@@ -897,7 +897,7 @@ 
                 case -5:
                     $this->error = "connection refused or timed out (-5)";
                 default:
-                    $this->error = "connection failed (" . $errno . ")";
+                    $this->error = "connection failed (".$errno.")";
             }
             return false;
         }
@@ -938,26 +938,26 @@ 
                 while (list($key, $val) = each($formvars)) {
                     if (is_array($val) || is_object($val)) {
                         while (list($cur_key, $cur_val) = each($val)) {
-                            $postdata .= urlencode($key) . "[]=" . urlencode($cur_val) . "&";
+                            $postdata .= urlencode($key)."[]=".urlencode($cur_val)."&";
                         }
                     } else
-                        $postdata .= urlencode($key) . "=" . urlencode($val) . "&";
+                        $postdata .= urlencode($key)."=".urlencode($val)."&";
                 }
                 break;
 
             case "multipart/form-data":
-                $this->_mime_boundary = "Snoopy" . md5(uniqid(microtime()));
+                $this->_mime_boundary = "Snoopy".md5(uniqid(microtime()));
 
                 reset($formvars);
                 while (list($key, $val) = each($formvars)) {
                     if (is_array($val) || is_object($val)) {
                         while (list($cur_key, $cur_val) = each($val)) {
-                            $postdata .= "--" . $this->_mime_boundary . "\r\n";
+                            $postdata .= "--".$this->_mime_boundary."\r\n";
                             $postdata .= "Content-Disposition: form-data; name=\"$key\[\]\"\r\n\r\n";
                             $postdata .= "$cur_val\r\n";
                         }
                     } else {
-                        $postdata .= "--" . $this->_mime_boundary . "\r\n";
+                        $postdata .= "--".$this->_mime_boundary."\r\n";
                         $postdata .= "Content-Disposition: form-data; name=\"$key\"\r\n\r\n";
                         $postdata .= "$val\r\n";
                     }
@@ -974,12 +974,12 @@ 
                         fclose($fp);
                         $base_name = basename($file_name);
 
-                        $postdata .= "--" . $this->_mime_boundary . "\r\n";
+                        $postdata .= "--".$this->_mime_boundary."\r\n";
                         $postdata .= "Content-Disposition: form-data; name=\"$field_name\"; filename=\"$base_name\"\r\n\r\n";
                         $postdata .= "$file_content\r\n";
                     }
                 }
-                $postdata .= "--" . $this->_mime_boundary . "--\r\n";
+                $postdata .= "--".$this->_mime_boundary."--\r\n";
                 break;
         }
 

Braces +192 added lines, -127 removed lines

@@ -121,14 +121,18 @@ 
     {
 
         $URI_PARTS = parse_url($URI);
-        if (!empty($URI_PARTS["user"]))
-            $this->user = $URI_PARTS["user"];
-        if (!empty($URI_PARTS["pass"]))
-            $this->pass = $URI_PARTS["pass"];
-        if (empty($URI_PARTS["query"]))
-            $URI_PARTS["query"] = '';
-        if (empty($URI_PARTS["path"]))
-            $URI_PARTS["path"] = '';
+        if (!empty($URI_PARTS["user"])) {
+                    $this->user = $URI_PARTS["user"];
+        }
+        if (!empty($URI_PARTS["pass"])) {
+                    $this->pass = $URI_PARTS["pass"];
+        }
+        if (empty($URI_PARTS["query"])) {
+                    $URI_PARTS["query"] = '';
+        }
+        if (empty($URI_PARTS["path"])) {
+                    $URI_PARTS["path"] = '';
+        }
 
         $fp = null;
 
@@ -142,8 +146,9 @@ 
             case "http":
                 $this->scheme = strtolower($URI_PARTS["scheme"]);
                 $this->host = $URI_PARTS["host"];
-                if (!empty($URI_PARTS["port"]))
-                    $this->port = $URI_PARTS["port"];
+                if (!empty($URI_PARTS["port"])) {
+                                    $this->port = $URI_PARTS["port"];
+                }
                 if ($this->_connect($fp)) {
                     if ($this->_isproxy) {
                         // using proxy, send entire URI
@@ -177,8 +182,9 @@ 
                             if ($this->_framedepth < $this->maxframes) {
                                 $this->fetch($frameurl);
                                 $this->_framedepth++;
-                            } else
-                                break;
+                            } else {
+                                                            break;
+                            }
                         }
                     }
                 } else {
@@ -213,14 +219,18 @@ 
         $postdata = $this->_prepare_post_body($formvars, $formfiles);
 
         $URI_PARTS = parse_url($URI);
-        if (!empty($URI_PARTS["user"]))
-            $this->user = $URI_PARTS["user"];
-        if (!empty($URI_PARTS["pass"]))
-            $this->pass = $URI_PARTS["pass"];
-        if (empty($URI_PARTS["query"]))
-            $URI_PARTS["query"] = '';
-        if (empty($URI_PARTS["path"]))
-            $URI_PARTS["path"] = '';
+        if (!empty($URI_PARTS["user"])) {
+                    $this->user = $URI_PARTS["user"];
+        }
+        if (!empty($URI_PARTS["pass"])) {
+                    $this->pass = $URI_PARTS["pass"];
+        }
+        if (empty($URI_PARTS["query"])) {
+                    $URI_PARTS["query"] = '';
+        }
+        if (empty($URI_PARTS["path"])) {
+                    $URI_PARTS["path"] = '';
+        }
 
         switch (strtolower($URI_PARTS["scheme"])) {
             case "https":
@@ -232,8 +242,9 @@ 
             case "http":
                 $this->scheme = strtolower($URI_PARTS["scheme"]);
                 $this->host = $URI_PARTS["host"];
-                if (!empty($URI_PARTS["port"]))
-                    $this->port = $URI_PARTS["port"];
+                if (!empty($URI_PARTS["port"])) {
+                                    $this->port = $URI_PARTS["port"];
+                }
                 if ($this->_connect($fp)) {
                     if ($this->_isproxy) {
                         // using proxy, send entire URI
@@ -249,18 +260,22 @@ 
                     if ($this->_redirectaddr) {
                         /* url was redirected, check if we've hit the max depth */
                         if ($this->maxredirs > $this->_redirectdepth) {
-                            if (!preg_match("|^" . $URI_PARTS["scheme"] . "://|", $this->_redirectaddr))
-                                $this->_redirectaddr = $this->_expandlinks($this->_redirectaddr, $URI_PARTS["scheme"] . "://" . $URI_PARTS["host"]);
+                            if (!preg_match("|^" . $URI_PARTS["scheme"] . "://|", $this->_redirectaddr)) {
+                                                            $this->_redirectaddr = $this->_expandlinks($this->_redirectaddr, $URI_PARTS["scheme"] . "://" . $URI_PARTS["host"]);
+                            }
 
                             // only follow redirect if it's on this site, or offsiteok is true
                             if (preg_match("|^https?://" . preg_quote($this->host) . "|i", $this->_redirectaddr) || $this->offsiteok) {
                                 /* follow the redirect */
                                 $this->_redirectdepth++;
                                 $this->lastredirectaddr = $this->_redirectaddr;
-                                if (strpos($this->_redirectaddr, "?") > 0)
-                                    $this->fetch($this->_redirectaddr); // the redirect has changed the request method from post to get
-                                else
-                                    $this->submit($this->_redirectaddr, $formvars, $formfiles);
+                                if (strpos($this->_redirectaddr, "?") > 0) {
+                                                                    $this->fetch($this->_redirectaddr);
+                                }
+                                // the redirect has changed the request method from post to get
+                                else {
+                                                                    $this->submit($this->_redirectaddr, $formvars, $formfiles);
+                                }
                             }
                         }
                     }
@@ -273,8 +288,9 @@ 
                             if ($this->_framedepth < $this->maxframes) {
                                 $this->fetch($frameurl);
                                 $this->_framedepth++;
-                            } else
-                                break;
+                            } else {
+                                                            break;
+                            }
                         }
                     }
 
@@ -302,19 +318,24 @@ 
     function fetchlinks($URI)
     {
         if ($this->fetch($URI) !== false) {
-            if ($this->lastredirectaddr)
-                $URI = $this->lastredirectaddr;
+            if ($this->lastredirectaddr) {
+                            $URI = $this->lastredirectaddr;
+            }
             if (is_array($this->results)) {
-                for ($x = 0; $x < count($this->results); $x++)
-                    $this->results[$x] = $this->_striplinks($this->results[$x]);
-            } else
-                $this->results = $this->_striplinks($this->results);
+                for ($x = 0; $x < count($this->results); $x++) {
+                                    $this->results[$x] = $this->_striplinks($this->results[$x]);
+                }
+            } else {
+                            $this->results = $this->_striplinks($this->results);
+            }
 
-            if ($this->expandlinks)
-                $this->results = $this->_expandlinks($this->results, $URI);
+            if ($this->expandlinks) {
+                            $this->results = $this->_expandlinks($this->results, $URI);
+            }
             return $this;
-        } else
-            return false;
+        } else {
+                    return false;
+        }
     }
 
     /*======================================================================*\
@@ -330,14 +351,17 @@ 
         if ($this->fetch($URI) !== false) {
 
             if (is_array($this->results)) {
-                for ($x = 0; $x < count($this->results); $x++)
-                    $this->results[$x] = $this->_stripform($this->results[$x]);
-            } else
-                $this->results = $this->_stripform($this->results);
+                for ($x = 0; $x < count($this->results); $x++) {
+                                    $this->results[$x] = $this->_stripform($this->results[$x]);
+                }
+            } else {
+                            $this->results = $this->_stripform($this->results);
+            }
 
             return $this;
-        } else
-            return false;
+        } else {
+                    return false;
+        }
     }
 
 
@@ -352,13 +376,16 @@ 
     {
         if ($this->fetch($URI) !== false) {
             if (is_array($this->results)) {
-                for ($x = 0; $x < count($this->results); $x++)
-                    $this->results[$x] = $this->_striptext($this->results[$x]);
-            } else
-                $this->results = $this->_striptext($this->results);
+                for ($x = 0; $x < count($this->results); $x++) {
+                                    $this->results[$x] = $this->_striptext($this->results[$x]);
+                }
+            } else {
+                            $this->results = $this->_striptext($this->results);
+            }
             return $this;
-        } else
-            return false;
+        } else {
+                    return false;
+        }
     }
 
     /*======================================================================*\
@@ -371,22 +398,26 @@ 
     function submitlinks($URI, $formvars = "", $formfiles = "")
     {
         if ($this->submit($URI, $formvars, $formfiles) !== false) {
-            if ($this->lastredirectaddr)
-                $URI = $this->lastredirectaddr;
+            if ($this->lastredirectaddr) {
+                            $URI = $this->lastredirectaddr;
+            }
             if (is_array($this->results)) {
                 for ($x = 0; $x < count($this->results); $x++) {
                     $this->results[$x] = $this->_striplinks($this->results[$x]);
-                    if ($this->expandlinks)
-                        $this->results[$x] = $this->_expandlinks($this->results[$x], $URI);
+                    if ($this->expandlinks) {
+                                            $this->results[$x] = $this->_expandlinks($this->results[$x], $URI);
+                    }
                 }
             } else {
                 $this->results = $this->_striplinks($this->results);
-                if ($this->expandlinks)
-                    $this->results = $this->_expandlinks($this->results, $URI);
+                if ($this->expandlinks) {
+                                    $this->results = $this->_expandlinks($this->results, $URI);
+                }
             }
             return $this;
-        } else
-            return false;
+        } else {
+                    return false;
+        }
     }
 
     /*======================================================================*\
@@ -399,22 +430,26 @@ 
     function submittext($URI, $formvars = "", $formfiles = "")
     {
         if ($this->submit($URI, $formvars, $formfiles) !== false) {
-            if ($this->lastredirectaddr)
-                $URI = $this->lastredirectaddr;
+            if ($this->lastredirectaddr) {
+                            $URI = $this->lastredirectaddr;
+            }
             if (is_array($this->results)) {
                 for ($x = 0; $x < count($this->results); $x++) {
                     $this->results[$x] = $this->_striptext($this->results[$x]);
-                    if ($this->expandlinks)
-                        $this->results[$x] = $this->_expandlinks($this->results[$x], $URI);
+                    if ($this->expandlinks) {
+                                            $this->results[$x] = $this->_expandlinks($this->results[$x], $URI);
+                    }
                 }
             } else {
                 $this->results = $this->_striptext($this->results);
-                if ($this->expandlinks)
-                    $this->results = $this->_expandlinks($this->results, $URI);
+                if ($this->expandlinks) {
+                                    $this->results = $this->_expandlinks($this->results, $URI);
+                }
             }
             return $this;
-        } else
-            return false;
+        } else {
+                    return false;
+        }
     }
 
 
@@ -468,13 +503,15 @@ 
         // catenate the non-empty matches from the conditional subpattern
 
         while (list($key, $val) = each($links[2])) {
-            if (!empty($val))
-                $match[] = $val;
+            if (!empty($val)) {
+                            $match[] = $val;
+            }
         }
 
         while (list($key, $val) = each($links[3])) {
-            if (!empty($val))
-                $match[] = $val;
+            if (!empty($val)) {
+                            $match[] = $val;
+            }
         }
 
         // return the links
@@ -619,23 +656,28 @@ 
     function _httprequest($url, $fp, $URI, $http_method, $content_type = "", $body = "")
     {
         $cookie_headers = '';
-        if ($this->passcookies && $this->_redirectaddr)
-            $this->setcookies();
+        if ($this->passcookies && $this->_redirectaddr) {
+                    $this->setcookies();
+        }
 
         $URI_PARTS = parse_url($URI);
-        if (empty($url))
-            $url = "/";
+        if (empty($url)) {
+                    $url = "/";
+        }
         $headers = $http_method . " " . $url . " " . $this->_httpversion . "\r\n";
         if (!empty($this->host) && !isset($this->rawheaders['Host'])) {
             $headers .= "Host: " . $this->host;
-            if (!empty($this->port) && $this->port != '80')
-                $headers .= ":" . $this->port;
+            if (!empty($this->port) && $this->port != '80') {
+                            $headers .= ":" . $this->port;
+            }
             $headers .= "\r\n";
         }
-        if (!empty($this->agent))
-            $headers .= "User-Agent: " . $this->agent . "\r\n";
-        if (!empty($this->accept))
-            $headers .= "Accept: " . $this->accept . "\r\n";
+        if (!empty($this->agent)) {
+                    $headers .= "User-Agent: " . $this->agent . "\r\n";
+        }
+        if (!empty($this->accept)) {
+                    $headers .= "Accept: " . $this->accept . "\r\n";
+        }
         if ($this->use_gzip) {
             // make sure PHP was built with --with-zlib
             // and we can handle gzipp'ed data
@@ -648,11 +690,13 @@ 
                     E_USER_NOTICE);
             }
         }
-        if (!empty($this->referer))
-            $headers .= "Referer: " . $this->referer . "\r\n";
+        if (!empty($this->referer)) {
+                    $headers .= "Referer: " . $this->referer . "\r\n";
+        }
         if (!empty($this->cookies)) {
-            if (!is_array($this->cookies))
-                $this->cookies = (array)$this->cookies;
+            if (!is_array($this->cookies)) {
+                            $this->cookies = (array)$this->cookies;
+            }
 
             reset($this->cookies);
             if (count($this->cookies) > 0) {
@@ -664,32 +708,39 @@ 
             }
         }
         if (!empty($this->rawheaders)) {
-            if (!is_array($this->rawheaders))
-                $this->rawheaders = (array)$this->rawheaders;
-            while (list($headerKey, $headerVal) = each($this->rawheaders))
-                $headers .= $headerKey . ": " . $headerVal . "\r\n";
+            if (!is_array($this->rawheaders)) {
+                            $this->rawheaders = (array)$this->rawheaders;
+            }
+            while (list($headerKey, $headerVal) = each($this->rawheaders)) {
+                            $headers .= $headerKey . ": " . $headerVal . "\r\n";
+            }
         }
         if (!empty($content_type)) {
             $headers .= "Content-type: $content_type";
-            if ($content_type == "multipart/form-data")
-                $headers .= "; boundary=" . $this->_mime_boundary;
+            if ($content_type == "multipart/form-data") {
+                            $headers .= "; boundary=" . $this->_mime_boundary;
+            }
             $headers .= "\r\n";
         }
-        if (!empty($body))
-            $headers .= "Content-length: " . strlen($body) . "\r\n";
-        if (!empty($this->user) || !empty($this->pass))
-            $headers .= "Authorization: Basic " . base64_encode($this->user . ":" . $this->pass) . "\r\n";
+        if (!empty($body)) {
+                    $headers .= "Content-length: " . strlen($body) . "\r\n";
+        }
+        if (!empty($this->user) || !empty($this->pass)) {
+                    $headers .= "Authorization: Basic " . base64_encode($this->user . ":" . $this->pass) . "\r\n";
+        }
 
         //add proxy auth headers
-        if (!empty($this->proxy_user))
-            $headers .= 'Proxy-Authorization: ' . 'Basic ' . base64_encode($this->proxy_user . ':' . $this->proxy_pass) . "\r\n";
+        if (!empty($this->proxy_user)) {
+                    $headers .= 'Proxy-Authorization: ' . 'Basic ' . base64_encode($this->proxy_user . ':' . $this->proxy_pass) . "\r\n";
+        }
 
 
         $headers .= "\r\n";
 
         // set the read timeout if needed
-        if ($this->read_timeout > 0)
-            socket_set_timeout($fp, $this->read_timeout);
+        if ($this->read_timeout > 0) {
+                    socket_set_timeout($fp, $this->read_timeout);
+        }
         $this->timed_out = false;
 
         fwrite($fp, $headers . $body, strlen($headers . $body));
@@ -706,8 +757,9 @@ 
                 return false;
             }
 
-            if ($currentHeader == "\r\n")
-                break;
+            if ($currentHeader == "\r\n") {
+                            break;
+            }
 
             // if a header begins with Location: or URI:, set the redirect
             if (preg_match("/^(Location:|URI:)/i", $currentHeader)) {
@@ -718,12 +770,14 @@ 
                     // no host in the path, so prepend
                     $this->_redirectaddr = $URI_PARTS["scheme"] . "://" . $this->host . ":" . $this->port;
                     // eliminate double slash
-                    if (!preg_match("|^/|", $matches[2]))
-                        $this->_redirectaddr .= "/" . $matches[2];
-                    else
-                        $this->_redirectaddr .= $matches[2];
-                } else
-                    $this->_redirectaddr = $matches[2];
+                    if (!preg_match("|^/|", $matches[2])) {
+                                            $this->_redirectaddr .= "/" . $matches[2];
+                    } else {
+                                            $this->_redirectaddr .= $matches[2];
+                    }
+                } else {
+                                    $this->_redirectaddr = $matches[2];
+                }
             }
 
             if (preg_match("|^HTTP/|", $currentHeader)) {
@@ -770,14 +824,17 @@ 
         // have we hit our frame depth and is there frame src to fetch?
         if (($this->_framedepth < $this->maxframes) && preg_match_all("'<frame\s+.*src[\s]*=[\'\"]?([^\'\"\>]+)'i", $results, $match)) {
             $this->results[] = $results;
-            for ($x = 0; $x < count($match[1]); $x++)
-                $this->_frameurls[] = $this->_expandlinks($match[1][$x], $URI_PARTS["scheme"] . "://" . $this->host);
+            for ($x = 0; $x < count($match[1]); $x++) {
+                            $this->_frameurls[] = $this->_expandlinks($match[1][$x], $URI_PARTS["scheme"] . "://" . $this->host);
+            }
         } // have we already fetched framed content?
-        elseif (is_array($this->results))
-            $this->results[] = $results;
+        elseif (is_array($this->results)) {
+                    $this->results[] = $results;
+        }
         // no framed content
-        else
-            $this->results = $results;
+        else {
+                    $this->results = $results;
+        }
 
         return $this;
     }
@@ -790,8 +847,9 @@ 
     function setcookies()
     {
         for ($x = 0; $x < count($this->headers); $x++) {
-            if (preg_match('/^set-cookie:[\s]+([^=]+)=([^;]+)/i', $this->headers[$x], $match))
-                $this->cookies[$match[1]] = urldecode($match[2]);
+            if (preg_match('/^set-cookie:[\s]+([^=]+)=([^;]+)/i', $this->headers[$x], $match)) {
+                            $this->cookies[$match[1]] = urldecode($match[2]);
+            }
         }
         return $this;
     }
@@ -852,10 +910,12 @@ 
                     'disable_compression' => true,
                 );
 
-                if (isset($this->cafile))
-                    $context_opts['ssl']['cafile'] = $this->cafile;
-                if (isset($this->capath))
-                    $context_opts['ssl']['capath'] = $this->capath;
+                if (isset($this->cafile)) {
+                                    $context_opts['ssl']['cafile'] = $this->cafile;
+                }
+                if (isset($this->capath)) {
+                                    $context_opts['ssl']['capath'] = $this->capath;
+                }
             }
                     
             $host = 'ssl://' . $host;
@@ -864,8 +924,9 @@ 
         $context = stream_context_create($context_opts);
 
         if (version_compare(PHP_VERSION, '5.0.0', '>')) {
-            if($this->scheme == 'http')
-                $host = "tcp://" . $host;
+            if($this->scheme == 'http') {
+                            $host = "tcp://" . $host;
+            }
             $fp = stream_socket_client(
                 "$host:$port",
                 $errno,
@@ -929,8 +990,9 @@ 
         settype($formfiles, "array");
         $postdata = '';
 
-        if (count($formvars) == 0 && count($formfiles) == 0)
-            return;
+        if (count($formvars) == 0 && count($formfiles) == 0) {
+                    return;
+        }
 
         switch ($this->_submit_type) {
             case "application/x-www-form-urlencoded":
@@ -940,8 +1002,9 @@ 
                         while (list($cur_key, $cur_val) = each($val)) {
                             $postdata .= urlencode($key) . "[]=" . urlencode($cur_val) . "&";
                         }
-                    } else
-                        $postdata .= urlencode($key) . "=" . urlencode($val) . "&";
+                    } else {
+                                            $postdata .= urlencode($key) . "=" . urlencode($val) . "&";
+                    }
                 }
                 break;
 
@@ -967,7 +1030,9 @@ 
                 while (list($field_name, $file_names) = each($formfiles)) {
                     settype($file_names, "array");
                     while (list(, $file_name) = each($file_names)) {
-                        if (!is_readable($file_name)) continue;
+                        if (!is_readable($file_name)) {
+                            continue;
+                        }
 
                         $fp = fopen($file_name, "r");
                         $file_content = fread($fp, filesize($file_name));

htdocs/class/vendor/htmLawed.php

Indentation +353 added lines, -353 removed lines

@@ -15,28 +15,28 @@ 
 public static function hl($t, $C=1, $S=array()){
 $C = is_array($C) ? $C : array();
 if(!empty($C['valid_xhtml'])){
- $C['elements'] = empty($C['elements']) ? '*-acronym-big-center-dir-font-isindex-s-strike-tt' : $C['elements'];
- $C['make_tag_strict'] = isset($C['make_tag_strict']) ? $C['make_tag_strict'] : 2;
- $C['xml:lang'] = isset($C['xml:lang']) ? $C['xml:lang'] : 2;
+    $C['elements'] = empty($C['elements']) ? '*-acronym-big-center-dir-font-isindex-s-strike-tt' : $C['elements'];
+    $C['make_tag_strict'] = isset($C['make_tag_strict']) ? $C['make_tag_strict'] : 2;
+    $C['xml:lang'] = isset($C['xml:lang']) ? $C['xml:lang'] : 2;
 }
 // config eles
 $e = array('a'=>1, 'abbr'=>1, 'acronym'=>1, 'address'=>1, 'applet'=>1, 'area'=>1, 'article'=>1, 'aside'=>1, 'audio'=>1, 'b'=>1, 'bdi'=>1, 'bdo'=>1, 'big'=>1, 'blockquote'=>1, 'br'=>1, 'button'=>1, 'canvas'=>1, 'caption'=>1, 'center'=>1, 'cite'=>1, 'code'=>1, 'col'=>1, 'colgroup'=>1, 'command'=>1, 'data'=>1, 'datalist'=>1, 'dd'=>1, 'del'=>1, 'details'=>1, 'dfn'=>1, 'dir'=>1, 'div'=>1, 'dl'=>1, 'dt'=>1, 'em'=>1, 'embed'=>1, 'fieldset'=>1, 'figcaption'=>1, 'figure'=>1, 'font'=>1, 'footer'=>1, 'form'=>1, 'h1'=>1, 'h2'=>1, 'h3'=>1, 'h4'=>1, 'h5'=>1, 'h6'=>1, 'header'=>1, 'hgroup'=>1, 'hr'=>1, 'i'=>1, 'iframe'=>1, 'img'=>1, 'input'=>1, 'ins'=>1, 'isindex'=>1, 'kbd'=>1, 'keygen'=>1, 'label'=>1, 'legend'=>1, 'li'=>1, 'link'=>1, 'main'=>1, 'map'=>1, 'mark'=>1, 'menu'=>1, 'meta'=>1, 'meter'=>1, 'nav'=>1, 'noscript'=>1, 'object'=>1, 'ol'=>1, 'optgroup'=>1, 'option'=>1, 'output'=>1, 'p'=>1, 'param'=>1, 'pre'=>1, 'progress'=>1, 'q'=>1, 'rb'=>1, 'rbc'=>1, 'rp'=>1, 'rt'=>1, 'rtc'=>1, 'ruby'=>1, 's'=>1, 'samp'=>1, 'script'=>1, 'section'=>1, 'select'=>1, 'small'=>1, 'source'=>1, 'span'=>1, 'strike'=>1, 'strong'=>1, 'style'=>1, 'sub'=>1, 'summary'=>1, 'sup'=>1, 'table'=>1, 'tbody'=>1, 'td'=>1, 'textarea'=>1, 'tfoot'=>1, 'th'=>1, 'thead'=>1, 'time'=>1, 'tr'=>1, 'track'=>1, 'tt'=>1, 'u'=>1, 'ul'=>1, 'var'=>1, 'video'=>1, 'wbr'=>1); // 118 incl. deprecated & some Ruby
 
 if(!empty($C['safe'])){
- unset($e['applet'], $e['audio'], $e['canvas'], $e['embed'], $e['iframe'], $e['object'], $e['script'], $e['video']);
+    unset($e['applet'], $e['audio'], $e['canvas'], $e['embed'], $e['iframe'], $e['object'], $e['script'], $e['video']);
 }
 $x = !empty($C['elements']) ? str_replace(array("\n", "\r", "\t", ' '), '', $C['elements']) : '*';
 if($x == '-*'){$e = array();}
 elseif(strpos($x, '*') === false){$e = array_flip(explode(',', $x));}
 else{
- if(isset($x[1])){
-  preg_match_all('`(?:^|-|\+)[^\-+]+?(?=-|\+|$)`', $x, $m, PREG_SET_ORDER);
-  for($i=count($m); --$i>=0;){$m[$i] = $m[$i][0];}
-  foreach($m as $v){
-   if($v[0] == '+'){$e[substr($v, 1)] = 1;}
-   if($v[0] == '-' && isset($e[($v = substr($v, 1))]) && !in_array('+'. $v, $m)){unset($e[$v]);}
-  }
- }
+    if(isset($x[1])){
+    preg_match_all('`(?:^|-|\+)[^\-+]+?(?=-|\+|$)`', $x, $m, PREG_SET_ORDER);
+    for($i=count($m); --$i>=0;){$m[$i] = $m[$i][0];}
+    foreach($m as $v){
+    if($v[0] == '+'){$e[substr($v, 1)] = 1;}
+    if($v[0] == '-' && isset($e[($v = substr($v, 1))]) && !in_array('+'. $v, $m)){unset($e[$v]);}
+    }
+    }
 }
 $C['elements'] =& $e;
 // config attrs
@@ -47,17 +47,17 @@ 
 $x = (isset($C['schemes'][2]) && strpos($C['schemes'], ':')) ? strtolower($C['schemes']) : 'href: aim, feed, file, ftp, gopher, http, https, irc, mailto, news, nntp, sftp, ssh, tel, telnet'. (empty($C['safe']) ? ', app, javascript; *: data, javascript, ' : '; *:'). 'file, http, https';
 $C['schemes'] = array();
 foreach(explode(';', str_replace(array(' ', "\t", "\r", "\n"), '', $x)) as $v){
- $x = $x2 = null; list($x, $x2) = explode(':', $v, 2);
- if($x2){$C['schemes'][$x] = array_flip(explode(',', $x2));}
+    $x = $x2 = null; list($x, $x2) = explode(':', $v, 2);
+    if($x2){$C['schemes'][$x] = array_flip(explode(',', $x2));}
 }
 if(!isset($C['schemes']['*'])){
- $C['schemes']['*'] = array('file'=>1, 'http'=>1, 'https'=>1);
- if(empty($C['safe'])){$C['schemes']['*'] += array('data'=>1, 'javascript'=>1);}
+    $C['schemes']['*'] = array('file'=>1, 'http'=>1, 'https'=>1);
+    if(empty($C['safe'])){$C['schemes']['*'] += array('data'=>1, 'javascript'=>1);}
 }
 if(!empty($C['safe']) && empty($C['schemes']['style'])){$C['schemes']['style'] = array('!'=>1);}
 $C['abs_url'] = isset($C['abs_url']) ? $C['abs_url'] : 0;
 if(!isset($C['base_url']) or !preg_match('`^[a-zA-Z\d.+\-]+://[^/]+/(.+?/)?$`', $C['base_url'])){
- $C['base_url'] = $C['abs_url'] = 0;
+    $C['base_url'] = $C['abs_url'] = 0;
 }
 // config rest
 $C['and_mark'] = empty($C['and_mark']) ? 0 : 1;
@@ -92,16 +92,16 @@ 
 
 $t = preg_replace('`[\x00-\x08\x0b-\x0c\x0e-\x1f]`', '', $t);
 if($C['clean_ms_char']){
- $x = array("\x7f"=>'', "\x80"=>'€', "\x81"=>'', "\x83"=>'ƒ', "\x85"=>'…', "\x86"=>'†', "\x87"=>'‡', "\x88"=>'ˆ', "\x89"=>'‰', "\x8a"=>'Š', "\x8b"=>'‹', "\x8c"=>'Œ', "\x8d"=>'', "\x8e"=>'Ž', "\x8f"=>'', "\x90"=>'', "\x95"=>'•', "\x96"=>'–', "\x97"=>'—', "\x98"=>'˜', "\x99"=>'™', "\x9a"=>'š', "\x9b"=>'›', "\x9c"=>'œ', "\x9d"=>'', "\x9e"=>'ž', "\x9f"=>'Ÿ');
- $x = $x + ($C['clean_ms_char'] == 1 ? array("\x82"=>'‚', "\x84"=>'„', "\x91"=>'‘', "\x92"=>'’', "\x93"=>'“', "\x94"=>'”') : array("\x82"=>'\'', "\x84"=>'"', "\x91"=>'\'', "\x92"=>'\'', "\x93"=>'"', "\x94"=>'"'));
- $t = strtr($t, $x);
+    $x = array("\x7f"=>'', "\x80"=>'€', "\x81"=>'', "\x83"=>'ƒ', "\x85"=>'…', "\x86"=>'†', "\x87"=>'‡', "\x88"=>'ˆ', "\x89"=>'‰', "\x8a"=>'Š', "\x8b"=>'‹', "\x8c"=>'Œ', "\x8d"=>'', "\x8e"=>'Ž', "\x8f"=>'', "\x90"=>'', "\x95"=>'•', "\x96"=>'–', "\x97"=>'—', "\x98"=>'˜', "\x99"=>'™', "\x9a"=>'š', "\x9b"=>'›', "\x9c"=>'œ', "\x9d"=>'', "\x9e"=>'ž', "\x9f"=>'Ÿ');
+    $x = $x + ($C['clean_ms_char'] == 1 ? array("\x82"=>'‚', "\x84"=>'„', "\x91"=>'‘', "\x92"=>'’', "\x93"=>'“', "\x94"=>'”') : array("\x82"=>'\'', "\x84"=>'"', "\x91"=>'\'', "\x92"=>'\'', "\x93"=>'"', "\x94"=>'"'));
+    $t = strtr($t, $x);
 }
 if($C['cdata'] or $C['comment']){$t = preg_replace_callback('`<!(?:(?:--.*?--)|(?:\[CDATA\[.*?\]\]))>`sm', 'htmLawed::hl_cmtcd', $t);}
 $t = preg_replace_callback('`&amp;([a-zA-Z][a-zA-Z0-9]{1,30}|#(?:[0-9]{1,8}|[Xx][0-9A-Fa-f]{1,7}));`', 'htmLawed::hl_ent', str_replace('&', '&amp;', $t));
 if($C['unique_ids'] && !isset($GLOBALS['hl_Ids'])){$GLOBALS['hl_Ids'] = array();}
 if($C['hook']){$t = $C['hook']($t, $C, $S);}
 if($C['show_setting'] && preg_match('`^[a-z][a-z0-9_]*$`i', $C['show_setting'])){
- $GLOBALS[$C['show_setting']] = array('config'=>$C, 'spec'=>$S, 'time'=>microtime());
+    $GLOBALS[$C['show_setting']] = array('config'=>$C, 'spec'=>$S, 'time'=>microtime());
 }
 // main
 $t = preg_replace_callback('`<(?:(?:\s|$)|(?:[^>]*(?:>|$)))|>`m', 'htmLawed::hl_tag', $t);
@@ -121,30 +121,30 @@ 
 $r = array();
 $t = !empty($s) ? explode($s, $t) : array($t);
 foreach($t as $tk=>$tv){
- $o = 1; $tv = trim($tv); $l = strlen($tv);
- foreach($p as $k=>$v){
-  if(!$l){continue;}
-  switch($k){
-   case 'maxlen': if($l > $v){$o = 0;}
-   break; case 'minlen': if($l < $v){$o = 0;}
-   break; case 'maxval': if((float)($tv) > $v){$o = 0;}
-   break; case 'minval': if((float)($tv) < $v){$o = 0;}
-   break; case 'match': if(!preg_match($v, $tv)){$o = 0;}
-   break; case 'nomatch': if(preg_match($v, $tv)){$o = 0;}
-   break; case 'oneof':
+    $o = 1; $tv = trim($tv); $l = strlen($tv);
+    foreach($p as $k=>$v){
+    if(!$l){continue;}
+    switch($k){
+    case 'maxlen': if($l > $v){$o = 0;}
+    break; case 'minlen': if($l < $v){$o = 0;}
+    break; case 'maxval': if((float)($tv) > $v){$o = 0;}
+    break; case 'minval': if((float)($tv) < $v){$o = 0;}
+    break; case 'match': if(!preg_match($v, $tv)){$o = 0;}
+    break; case 'nomatch': if(preg_match($v, $tv)){$o = 0;}
+    break; case 'oneof':
     $m = 0;
     foreach(explode('|', $v) as $n){if($tv == $n){$m = 1; break;}}
     $o = $m;
-   break; case 'noneof':
+    break; case 'noneof':
     $m = 1;
     foreach(explode('|', $v) as $n){if($tv == $n){$m = 0; break;}}
     $o = $m;
-   break; default:
+    break; default:
    break;
-  }
-  if(!$o){break;}
- }
- if($o){$r[] = $tv;}
+    }
+    if(!$o){break;}
+    }
+    if($o){$r[] = $tv;}
 }
 if($s == ','){$s = ', ';} 
 $r = implode($s, $r);
@@ -174,7 +174,7 @@ 
 // $in sets allowed child
 $in = ((isset($eF[$in]) && $in != '#pcdata') or isset($eO[$in])) ? $in : 'div';
 if(isset($cE[$in])){
- return (!$do ? '' : str_replace(array('<', '>'), array('&lt;', '&gt;'), $t));
+    return (!$do ? '' : str_replace(array('<', '>'), array('&lt;', '&gt;'), $t));
 }
 if(isset($cS[$in])){$inOk = $cS[$in];}
 elseif(isset($cI[$in])){$inOk = $eI; $cI['del'] = 1; $cI['ins'] = 1;}
@@ -188,116 +188,116 @@ 
 ob_start();
 
 for($i=-1, $ci=count($t); ++$i<$ci;){
- // allowed $ok in parent $p
- if($ql = count($q)){
-  $p = array_pop($q);
-  $q[] = $p;
-  if(isset($cS[$p])){$ok = $cS[$p];}
-  elseif(isset($cI[$p])){$ok = $eI; $cI['del'] = 1; $cI['ins'] = 1;}
-  elseif(isset($cF[$p])){$ok = $eF; unset($cI['del'], $cI['ins']);}
-  elseif(isset($cB[$p])){$ok = $eB; unset($cI['del'], $cI['ins']);}
-  if(isset($cO[$p])){$ok = $ok + $cO[$p];}
-  if(isset($cN[$p])){$ok = array_diff_assoc($ok, $cN[$p]);}
- }else{$ok = $inOk; unset($cI['del'], $cI['ins']);}
- // bad tags, & ele content
- if(isset($e) && ($do == 1 or (isset($ok['#pcdata']) && ($do == 3 or $do == 5)))){
-  echo '&lt;', $s, $e, $a, '&gt;';
- }
- if(isset($x[0])){
-  if(strlen(trim($x)) && (($ql && isset($cB[$p])) or (isset($cB[$in]) && !$ql))){
-   echo '<div>', $x, '</div>';
-  }
-  elseif($do < 3 or isset($ok['#pcdata'])){echo $x;}
-  elseif(strpos($x, "\x02\x04")){
-   foreach(preg_split('`(\x01\x02[^\x01\x02]+\x02\x01)`', $x, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY) as $v){
+    // allowed $ok in parent $p
+    if($ql = count($q)){
+    $p = array_pop($q);
+    $q[] = $p;
+    if(isset($cS[$p])){$ok = $cS[$p];}
+    elseif(isset($cI[$p])){$ok = $eI; $cI['del'] = 1; $cI['ins'] = 1;}
+    elseif(isset($cF[$p])){$ok = $eF; unset($cI['del'], $cI['ins']);}
+    elseif(isset($cB[$p])){$ok = $eB; unset($cI['del'], $cI['ins']);}
+    if(isset($cO[$p])){$ok = $ok + $cO[$p];}
+    if(isset($cN[$p])){$ok = array_diff_assoc($ok, $cN[$p]);}
+    }else{$ok = $inOk; unset($cI['del'], $cI['ins']);}
+    // bad tags, & ele content
+    if(isset($e) && ($do == 1 or (isset($ok['#pcdata']) && ($do == 3 or $do == 5)))){
+    echo '&lt;', $s, $e, $a, '&gt;';
+    }
+    if(isset($x[0])){
+    if(strlen(trim($x)) && (($ql && isset($cB[$p])) or (isset($cB[$in]) && !$ql))){
+    echo '<div>', $x, '</div>';
+    }
+    elseif($do < 3 or isset($ok['#pcdata'])){echo $x;}
+    elseif(strpos($x, "\x02\x04")){
+    foreach(preg_split('`(\x01\x02[^\x01\x02]+\x02\x01)`', $x, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY) as $v){
     echo (substr($v, 0, 2) == "\x01\x02" ? $v : ($do > 4 ? preg_replace('`\S`', '', $v) : ''));
-   }
-  }elseif($do > 4){echo preg_replace('`\S`', '', $x);}
- }
- // get markup
- if(!preg_match('`^(/?)([a-z1-6]+)([^>]*)>(.*)`sm', $t[$i], $r)){$x = $t[$i]; continue;}
- $s = null; $e = null; $a = null; $x = null; list($all, $s, $e, $a, $x) = $r;
- // close tag
- if($s){
-  if(isset($cE[$e]) or !in_array($e, $q)){continue;} // Empty/unopen
-  if($p == $e){array_pop($q); echo '</', $e, '>'; unset($e); continue;} // Last open
-  $add = ''; // Nesting - close open tags that need to be
-  for($j=-1, $cj=count($q); ++$j<$cj;){  
-   if(($d = array_pop($q)) == $e){break;}
-   else{$add .= "</{$d}>";}
-  }
-  echo $add, '</', $e, '>'; unset($e); continue;
- }
- // open tag
- // $cB ele needs $eB ele as child
- if(isset($cB[$e]) && strlen(trim($x))){
-  $t[$i] = "{$e}{$a}>";
-  array_splice($t, $i+1, 0, 'div>'. $x); unset($e, $x); ++$ci; --$i; continue;
- }
- if((($ql && isset($cB[$p])) or (isset($cB[$in]) && !$ql)) && !isset($eB[$e]) && !isset($ok[$e])){
-  array_splice($t, $i, 0, 'div>'); unset($e, $x); ++$ci; --$i; continue;
- }
- // if no open ele, $in = parent; mostly immediate parent-child relation should hold
- if(!$ql or !isset($eN[$e]) or !array_intersect($q, $cN2)){
-  if(!isset($ok[$e])){
-   if($ql && isset($cT[$p])){echo '</', array_pop($q), '>'; unset($e, $x); --$i;}
-   continue;
-  }
-  if(!isset($cE[$e])){$q[] = $e;}
-  echo '<', $e, $a, '>'; unset($e); continue;
- }
- // specific parent-child
- if(isset($cS[$p][$e])){
-  if(!isset($cE[$e])){$q[] = $e;}
-  echo '<', $e, $a, '>'; unset($e); continue;
- }
- // nesting
- $add = '';
- $q2 = array();
- for($k=-1, $kc=count($q); ++$k<$kc;){
-  $d = $q[$k];
-  $ok2 = array();
-  if(isset($cS[$d])){$q2[] = $d; continue;}
-  $ok2 = isset($cI[$d]) ? $eI : $eF;
-  if(isset($cO[$d])){$ok2 = $ok2 + $cO[$d];}
-  if(isset($cN[$d])){$ok2 = array_diff_assoc($ok2, $cN[$d]);}
-  if(!isset($ok2[$e])){
-   if(!$k && !isset($inOk[$e])){continue 2;}
-   $add = "</{$d}>";
-   for(;++$k<$kc;){$add = "</{$q[$k]}>{$add}";}
-   break;
-  }
-  else{$q2[] = $d;}
- }
- $q = $q2;
- if(!isset($cE[$e])){$q[] = $e;}
- echo $add, '<', $e, $a, '>'; unset($e); continue;
+    }
+    }elseif($do > 4){echo preg_replace('`\S`', '', $x);}
+    }
+    // get markup
+    if(!preg_match('`^(/?)([a-z1-6]+)([^>]*)>(.*)`sm', $t[$i], $r)){$x = $t[$i]; continue;}
+    $s = null; $e = null; $a = null; $x = null; list($all, $s, $e, $a, $x) = $r;
+    // close tag
+    if($s){
+    if(isset($cE[$e]) or !in_array($e, $q)){continue;} // Empty/unopen
+    if($p == $e){array_pop($q); echo '</', $e, '>'; unset($e); continue;} // Last open
+    $add = ''; // Nesting - close open tags that need to be
+    for($j=-1, $cj=count($q); ++$j<$cj;){  
+    if(($d = array_pop($q)) == $e){break;}
+    else{$add .= "</{$d}>";}
+    }
+    echo $add, '</', $e, '>'; unset($e); continue;
+    }
+    // open tag
+    // $cB ele needs $eB ele as child
+    if(isset($cB[$e]) && strlen(trim($x))){
+    $t[$i] = "{$e}{$a}>";
+    array_splice($t, $i+1, 0, 'div>'. $x); unset($e, $x); ++$ci; --$i; continue;
+    }
+    if((($ql && isset($cB[$p])) or (isset($cB[$in]) && !$ql)) && !isset($eB[$e]) && !isset($ok[$e])){
+    array_splice($t, $i, 0, 'div>'); unset($e, $x); ++$ci; --$i; continue;
+    }
+    // if no open ele, $in = parent; mostly immediate parent-child relation should hold
+    if(!$ql or !isset($eN[$e]) or !array_intersect($q, $cN2)){
+    if(!isset($ok[$e])){
+    if($ql && isset($cT[$p])){echo '</', array_pop($q), '>'; unset($e, $x); --$i;}
+    continue;
+    }
+    if(!isset($cE[$e])){$q[] = $e;}
+    echo '<', $e, $a, '>'; unset($e); continue;
+    }
+    // specific parent-child
+    if(isset($cS[$p][$e])){
+    if(!isset($cE[$e])){$q[] = $e;}
+    echo '<', $e, $a, '>'; unset($e); continue;
+    }
+    // nesting
+    $add = '';
+    $q2 = array();
+    for($k=-1, $kc=count($q); ++$k<$kc;){
+    $d = $q[$k];
+    $ok2 = array();
+    if(isset($cS[$d])){$q2[] = $d; continue;}
+    $ok2 = isset($cI[$d]) ? $eI : $eF;
+    if(isset($cO[$d])){$ok2 = $ok2 + $cO[$d];}
+    if(isset($cN[$d])){$ok2 = array_diff_assoc($ok2, $cN[$d]);}
+    if(!isset($ok2[$e])){
+    if(!$k && !isset($inOk[$e])){continue 2;}
+    $add = "</{$d}>";
+    for(;++$k<$kc;){$add = "</{$q[$k]}>{$add}";}
+    break;
+    }
+    else{$q2[] = $d;}
+    }
+    $q = $q2;
+    if(!isset($cE[$e])){$q[] = $e;}
+    echo $add, '<', $e, $a, '>'; unset($e); continue;
 }
 
 // end
 if($ql = count($q)){
- $p = array_pop($q);
- $q[] = $p;
- if(isset($cS[$p])){$ok = $cS[$p];}
- elseif(isset($cI[$p])){$ok = $eI; $cI['del'] = 1; $cI['ins'] = 1;}
- elseif(isset($cF[$p])){$ok = $eF; unset($cI['del'], $cI['ins']);}
- elseif(isset($cB[$p])){$ok = $eB; unset($cI['del'], $cI['ins']);}
- if(isset($cO[$p])){$ok = $ok + $cO[$p];}
- if(isset($cN[$p])){$ok = array_diff_assoc($ok, $cN[$p]);}
+    $p = array_pop($q);
+    $q[] = $p;
+    if(isset($cS[$p])){$ok = $cS[$p];}
+    elseif(isset($cI[$p])){$ok = $eI; $cI['del'] = 1; $cI['ins'] = 1;}
+    elseif(isset($cF[$p])){$ok = $eF; unset($cI['del'], $cI['ins']);}
+    elseif(isset($cB[$p])){$ok = $eB; unset($cI['del'], $cI['ins']);}
+    if(isset($cO[$p])){$ok = $ok + $cO[$p];}
+    if(isset($cN[$p])){$ok = array_diff_assoc($ok, $cN[$p]);}
 }else{$ok = $inOk; unset($cI['del'], $cI['ins']);}
 if(isset($e) && ($do == 1 or (isset($ok['#pcdata']) && ($do == 3 or $do == 5)))){
- echo '&lt;', $s, $e, $a, '&gt;';
+    echo '&lt;', $s, $e, $a, '&gt;';
 }
 if(isset($x[0])){
- if(strlen(trim($x)) && (($ql && isset($cB[$p])) or (isset($cB[$in]) && !$ql))){
-  echo '<div>', $x, '</div>';
- }
- elseif($do < 3 or isset($ok['#pcdata'])){echo $x;}
- elseif(strpos($x, "\x02\x04")){
-  foreach(preg_split('`(\x01\x02[^\x01\x02]+\x02\x01)`', $x, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY) as $v){
-   echo (substr($v, 0, 2) == "\x01\x02" ? $v : ($do > 4 ? preg_replace('`\S`', '', $v) : ''));
-  }
- }elseif($do > 4){echo preg_replace('`\S`', '', $x);}
+    if(strlen(trim($x)) && (($ql && isset($cB[$p])) or (isset($cB[$in]) && !$ql))){
+    echo '<div>', $x, '</div>';
+    }
+    elseif($do < 3 or isset($ok['#pcdata'])){echo $x;}
+    elseif(strpos($x, "\x02\x04")){
+    foreach(preg_split('`(\x01\x02[^\x01\x02]+\x02\x01)`', $x, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY) as $v){
+    echo (substr($v, 0, 2) == "\x01\x02" ? $v : ($do > 4 ? preg_replace('`\S`', '', $v) : ''));
+    }
+    }elseif($do > 4){echo preg_replace('`\S`', '', $x);}
 }
 while(!empty($q) && ($e = array_pop($q))){echo '</', $e, '>';}
 $o = ob_get_contents();
@@ -312,7 +312,7 @@ 
 if(!($v = $C[$n = $t[3] == '-' ? 'comment' : 'cdata'])){return $t;}
 if($v == 1){return '';}
 if($n == 'comment' && $v < 4){
- if(substr(($t = preg_replace('`--+`', '-', substr($t, 4, -3))), -1) != ' '){$t .= ' ';}
+    if(substr(($t = preg_replace('`--+`', '-', substr($t, 4, -3))), -1) != ' '){$t .= ' ';}
 }
 else{$t = substr($t, 1, -1);}
 $t = $v == 2 ? str_replace(array('&', '<', '>'), array('&amp;', '&lt;', '&gt;'), $t) : $t;
@@ -326,10 +326,10 @@ 
 static $U = array('quot'=>1,'amp'=>1,'lt'=>1,'gt'=>1);
 static $N = array('fnof'=>'402', 'Alpha'=>'913', 'Beta'=>'914', 'Gamma'=>'915', 'Delta'=>'916', 'Epsilon'=>'917', 'Zeta'=>'918', 'Eta'=>'919', 'Theta'=>'920', 'Iota'=>'921', 'Kappa'=>'922', 'Lambda'=>'923', 'Mu'=>'924', 'Nu'=>'925', 'Xi'=>'926', 'Omicron'=>'927', 'Pi'=>'928', 'Rho'=>'929', 'Sigma'=>'931', 'Tau'=>'932', 'Upsilon'=>'933', 'Phi'=>'934', 'Chi'=>'935', 'Psi'=>'936', 'Omega'=>'937', 'alpha'=>'945', 'beta'=>'946', 'gamma'=>'947', 'delta'=>'948', 'epsilon'=>'949', 'zeta'=>'950', 'eta'=>'951', 'theta'=>'952', 'iota'=>'953', 'kappa'=>'954', 'lambda'=>'955', 'mu'=>'956', 'nu'=>'957', 'xi'=>'958', 'omicron'=>'959', 'pi'=>'960', 'rho'=>'961', 'sigmaf'=>'962', 'sigma'=>'963', 'tau'=>'964', 'upsilon'=>'965', 'phi'=>'966', 'chi'=>'967', 'psi'=>'968', 'omega'=>'969', 'thetasym'=>'977', 'upsih'=>'978', 'piv'=>'982', 'bull'=>'8226', 'hellip'=>'8230', 'prime'=>'8242', 'Prime'=>'8243', 'oline'=>'8254', 'frasl'=>'8260', 'weierp'=>'8472', 'image'=>'8465', 'real'=>'8476', 'trade'=>'8482', 'alefsym'=>'8501', 'larr'=>'8592', 'uarr'=>'8593', 'rarr'=>'8594', 'darr'=>'8595', 'harr'=>'8596', 'crarr'=>'8629', 'lArr'=>'8656', 'uArr'=>'8657', 'rArr'=>'8658', 'dArr'=>'8659', 'hArr'=>'8660', 'forall'=>'8704', 'part'=>'8706', 'exist'=>'8707', 'empty'=>'8709', 'nabla'=>'8711', 'isin'=>'8712', 'notin'=>'8713', 'ni'=>'8715', 'prod'=>'8719', 'sum'=>'8721', 'minus'=>'8722', 'lowast'=>'8727', 'radic'=>'8730', 'prop'=>'8733', 'infin'=>'8734', 'ang'=>'8736', 'and'=>'8743', 'or'=>'8744', 'cap'=>'8745', 'cup'=>'8746', 'int'=>'8747', 'there4'=>'8756', 'sim'=>'8764', 'cong'=>'8773', 'asymp'=>'8776', 'ne'=>'8800', 'equiv'=>'8801', 'le'=>'8804', 'ge'=>'8805', 'sub'=>'8834', 'sup'=>'8835', 'nsub'=>'8836', 'sube'=>'8838', 'supe'=>'8839', 'oplus'=>'8853', 'otimes'=>'8855', 'perp'=>'8869', 'sdot'=>'8901', 'lceil'=>'8968', 'rceil'=>'8969', 'lfloor'=>'8970', 'rfloor'=>'8971', 'lang'=>'9001', 'rang'=>'9002', 'loz'=>'9674', 'spades'=>'9824', 'clubs'=>'9827', 'hearts'=>'9829', 'diams'=>'9830', 'apos'=>'39',  'OElig'=>'338', 'oelig'=>'339', 'Scaron'=>'352', 'scaron'=>'353', 'Yuml'=>'376', 'circ'=>'710', 'tilde'=>'732', 'ensp'=>'8194', 'emsp'=>'8195', 'thinsp'=>'8201', 'zwnj'=>'8204', 'zwj'=>'8205', 'lrm'=>'8206', 'rlm'=>'8207', 'ndash'=>'8211', 'mdash'=>'8212', 'lsquo'=>'8216', 'rsquo'=>'8217', 'sbquo'=>'8218', 'ldquo'=>'8220', 'rdquo'=>'8221', 'bdquo'=>'8222', 'dagger'=>'8224', 'Dagger'=>'8225', 'permil'=>'8240', 'lsaquo'=>'8249', 'rsaquo'=>'8250', 'euro'=>'8364', 'nbsp'=>'160', 'iexcl'=>'161', 'cent'=>'162', 'pound'=>'163', 'curren'=>'164', 'yen'=>'165', 'brvbar'=>'166', 'sect'=>'167', 'uml'=>'168', 'copy'=>'169', 'ordf'=>'170', 'laquo'=>'171', 'not'=>'172', 'shy'=>'173', 'reg'=>'174', 'macr'=>'175', 'deg'=>'176', 'plusmn'=>'177', 'sup2'=>'178', 'sup3'=>'179', 'acute'=>'180', 'micro'=>'181', 'para'=>'182', 'middot'=>'183', 'cedil'=>'184', 'sup1'=>'185', 'ordm'=>'186', 'raquo'=>'187', 'frac14'=>'188', 'frac12'=>'189', 'frac34'=>'190', 'iquest'=>'191', 'Agrave'=>'192', 'Aacute'=>'193', 'Acirc'=>'194', 'Atilde'=>'195', 'Auml'=>'196', 'Aring'=>'197', 'AElig'=>'198', 'Ccedil'=>'199', 'Egrave'=>'200', 'Eacute'=>'201', 'Ecirc'=>'202', 'Euml'=>'203', 'Igrave'=>'204', 'Iacute'=>'205', 'Icirc'=>'206', 'Iuml'=>'207', 'ETH'=>'208', 'Ntilde'=>'209', 'Ograve'=>'210', 'Oacute'=>'211', 'Ocirc'=>'212', 'Otilde'=>'213', 'Ouml'=>'214', 'times'=>'215', 'Oslash'=>'216', 'Ugrave'=>'217', 'Uacute'=>'218', 'Ucirc'=>'219', 'Uuml'=>'220', 'Yacute'=>'221', 'THORN'=>'222', 'szlig'=>'223', 'agrave'=>'224', 'aacute'=>'225', 'acirc'=>'226', 'atilde'=>'227', 'auml'=>'228', 'aring'=>'229', 'aelig'=>'230', 'ccedil'=>'231', 'egrave'=>'232', 'eacute'=>'233', 'ecirc'=>'234', 'euml'=>'235', 'igrave'=>'236', 'iacute'=>'237', 'icirc'=>'238', 'iuml'=>'239', 'eth'=>'240', 'ntilde'=>'241', 'ograve'=>'242', 'oacute'=>'243', 'ocirc'=>'244', 'otilde'=>'245', 'ouml'=>'246', 'divide'=>'247', 'oslash'=>'248', 'ugrave'=>'249', 'uacute'=>'250', 'ucirc'=>'251', 'uuml'=>'252', 'yacute'=>'253', 'thorn'=>'254', 'yuml'=>'255');
 if($t[0] != '#'){
- return ($C['and_mark'] ? "\x06" : '&'). (isset($U[$t]) ? $t : (isset($N[$t]) ? (!$C['named_entity'] ? '#'. ($C['hexdec_entity'] > 1 ? 'x'. dechex($N[$t]) : $N[$t]) : $t) : 'amp;'. $t)). ';';
+    return ($C['and_mark'] ? "\x06" : '&'). (isset($U[$t]) ? $t : (isset($N[$t]) ? (!$C['named_entity'] ? '#'. ($C['hexdec_entity'] > 1 ? 'x'. dechex($N[$t]) : $N[$t]) : $t) : 'amp;'. $t)). ';';
 }
 if(($n = ctype_digit($t = substr($t, 1)) ? intval($t) : hexdec(substr($t, 1))) < 9 or ($n > 13 && $n < 32) or $n == 11 or $n == 12 or ($n > 126 && $n < 160 && $n != 133) or ($n > 55295 && ($n < 57344 or ($n > 64975 && $n < 64992) or $n == 65534 or $n == 65535 or $n > 1114111))){
- return ($C['and_mark'] ? "\x06" : '&'). "amp;#{$t};";
+    return ($C['and_mark'] ? "\x06" : '&'). "amp;#{$t};";
 }
 return ($C['and_mark'] ? "\x06" : '&'). '#'. (((ctype_digit($t) && $C['hexdec_entity'] < 2) or !$C['hexdec_entity']) ? $n : 'x'. dechex($n)). ';';
 }
@@ -344,24 +344,24 @@ 
 if(isset($c['!']) && substr($p, 0, 7) != $d){$p = "$d$p";}
 if(isset($c['*']) or !strcspn($p, '#?;') or (substr($p, 0, 7) == $d)){return "{$b}{$p}{$a}";} // All ok, frag, query, param
 if(preg_match('`^([^:?[@!$()*,=/\'\]]+?)(:|&#(58|x3a);|%3a|\\\\0{0,4}3a).`i', $p, $m) && !isset($c[strtolower($m[1])])){ // Denied prot
- return "{$b}{$d}{$p}{$a}";
+    return "{$b}{$d}{$p}{$a}";
 }
 if($C['abs_url']){
- if($C['abs_url'] == -1 && strpos($p, $C['base_url']) === 0){ // Make url rel
-  $p = substr($p, strlen($C['base_url']));
- }elseif(empty($m[1])){ // Make URL abs
-  if(substr($p, 0, 2) == '//'){$p = substr($C['base_url'], 0, strpos($C['base_url'], ':')+1). $p;}
-  elseif($p[0] == '/'){$p = preg_replace('`(^.+?://[^/]+)(.*)`', '$1', $C['base_url']). $p;}
-  elseif(strcspn($p, './')){$p = $C['base_url']. $p;}
-  else{
-   preg_match('`^([a-zA-Z\d\-+.]+://[^/]+)(.*)`', $C['base_url'], $m);
-   $p = preg_replace('`(?<=/)\./`', '', $m[2]. $p);
-   while(preg_match('`(?<=/)([^/]{3,}|[^/.]+?|\.[^/.]|[^/.]\.)/\.\./`', $p)){
+    if($C['abs_url'] == -1 && strpos($p, $C['base_url']) === 0){ // Make url rel
+    $p = substr($p, strlen($C['base_url']));
+    }elseif(empty($m[1])){ // Make URL abs
+    if(substr($p, 0, 2) == '//'){$p = substr($C['base_url'], 0, strpos($C['base_url'], ':')+1). $p;}
+    elseif($p[0] == '/'){$p = preg_replace('`(^.+?://[^/]+)(.*)`', '$1', $C['base_url']). $p;}
+    elseif(strcspn($p, './')){$p = $C['base_url']. $p;}
+    else{
+    preg_match('`^([a-zA-Z\d\-+.]+://[^/]+)(.*)`', $C['base_url'], $m);
+    $p = preg_replace('`(?<=/)\./`', '', $m[2]. $p);
+    while(preg_match('`(?<=/)([^/]{3,}|[^/.]+?|\.[^/.]|[^/.]\.)/\.\./`', $p)){
     $p = preg_replace('`(?<=/)([^/]{3,}|[^/.]+?|\.[^/.]|[^/.]\.)/\.\./`', '', $p);
-   }
-   $p = $m[1]. $p;
-  }
- }
+    }
+    $p = $m[1]. $p;
+    }
+    }
 }
 return "{$b}{$p}{$a}";
 }
@@ -371,17 +371,17 @@ 
 if(empty($p)){return 0;}
 if($v = function_exists('error_clear_last') && function_exists('error_get_last')){error_clear_last();}
 else{
- if($t = ini_get('track_errors')){$o = isset($php_errormsg) ? $php_errormsg : null;}
- else{ini_set('track_errors', 1);}
- unset($php_errormsg);
+    if($t = ini_get('track_errors')){$o = isset($php_errormsg) ? $php_errormsg : null;}
+    else{ini_set('track_errors', 1);}
+    unset($php_errormsg);
 }
 if(($d = ini_get('display_errors'))){ini_set('display_errors', 0);}
 preg_match($p, '');
 if($v){$r = error_get_last() == null ? 1 : 0; }
 else{
- $r = isset($php_errormsg) ? 0 : 1;
- if($t){$php_errormsg = isset($o) ? $o : null;}
- else{ini_set('track_errors', 0);}
+    $r = isset($php_errormsg) ? 0 : 1;
+    if($t){$php_errormsg = isset($o) ? $o : null;}
+    else{ini_set('track_errors', 0);}
 }
 if($d){ini_set('display_errors', 1);}
 return $r;
@@ -391,31 +391,31 @@ 
 // final $spec
 $s = array();
 if(!function_exists('hl_aux1')){function hl_aux1($m){
- return substr(str_replace(array(";", "|", "~", " ", ",", "/", "(", ")", '`"'), array("\x01", "\x02", "\x03", "\x04", "\x05", "\x06", "\x07", "\x08", '"'), $m[0]), 1, -1);
+    return substr(str_replace(array(";", "|", "~", " ", ",", "/", "(", ")", '`"'), array("\x01", "\x02", "\x03", "\x04", "\x05", "\x06", "\x07", "\x08", '"'), $m[0]), 1, -1);
 }}
 $t = str_replace(array("\t", "\r", "\n", ' '), '', preg_replace_callback('/"(?>(`.|[^"])*)"/sm', 'hl_aux1', trim($t))); 
 for($i = count(($t = explode(';', $t))); --$i>=0;){
- $w = $t[$i];
- if(empty($w) or ($e = strpos($w, '=')) === false or !strlen(($a =  substr($w, $e+1)))){continue;}
- $y = $n = array();
- foreach(explode(',', $a) as $v){
-  if(!preg_match('`^([a-z:\-\*]+)(?:\((.*?)\))?`i', $v, $m)){continue;}
-  if(($x = strtolower($m[1])) == '-*'){$n['*'] = 1; continue;}
-  if($x[0] == '-'){$n[substr($x, 1)] = 1; continue;}
-  if(!isset($m[2])){$y[$x] = 1; continue;}
-  foreach(explode('/', $m[2]) as $m){
-   if(empty($m) or ($p = strpos($m, '=')) == 0 or $p < 5){$y[$x] = 1; continue;}
-   $y[$x][strtolower(substr($m, 0, $p))] = str_replace(array("\x01", "\x02", "\x03", "\x04", "\x05", "\x06", "\x07", "\x08"), array(";", "|", "~", " ", ",", "/", "(", ")"), substr($m, $p+1));
-  }
-  if(isset($y[$x]['match']) && !htmLawed::hl_regex($y[$x]['match'])){unset($y[$x]['match']);}
-  if(isset($y[$x]['nomatch']) && !htmLawed::hl_regex($y[$x]['nomatch'])){unset($y[$x]['nomatch']);}
- }
- if(!count($y) && !count($n)){continue;}
- foreach(explode(',', substr($w, 0, $e)) as $v){
-  if(!strlen(($v = strtolower($v)))){continue;}
-  if(count($y)){if(!isset($s[$v])){$s[$v] = $y;} else{$s[$v] = array_merge($s[$v], $y);}}
-  if(count($n)){if(!isset($s[$v]['n'])){$s[$v]['n'] = $n;} else{$s[$v]['n'] = array_merge($s[$v]['n'], $n);}}
- }
+    $w = $t[$i];
+    if(empty($w) or ($e = strpos($w, '=')) === false or !strlen(($a =  substr($w, $e+1)))){continue;}
+    $y = $n = array();
+    foreach(explode(',', $a) as $v){
+    if(!preg_match('`^([a-z:\-\*]+)(?:\((.*?)\))?`i', $v, $m)){continue;}
+    if(($x = strtolower($m[1])) == '-*'){$n['*'] = 1; continue;}
+    if($x[0] == '-'){$n[substr($x, 1)] = 1; continue;}
+    if(!isset($m[2])){$y[$x] = 1; continue;}
+    foreach(explode('/', $m[2]) as $m){
+    if(empty($m) or ($p = strpos($m, '=')) == 0 or $p < 5){$y[$x] = 1; continue;}
+    $y[$x][strtolower(substr($m, 0, $p))] = str_replace(array("\x01", "\x02", "\x03", "\x04", "\x05", "\x06", "\x07", "\x08"), array(";", "|", "~", " ", ",", "/", "(", ")"), substr($m, $p+1));
+    }
+    if(isset($y[$x]['match']) && !htmLawed::hl_regex($y[$x]['match'])){unset($y[$x]['match']);}
+    if(isset($y[$x]['nomatch']) && !htmLawed::hl_regex($y[$x]['nomatch'])){unset($y[$x]['nomatch']);}
+    }
+    if(!count($y) && !count($n)){continue;}
+    foreach(explode(',', substr($w, 0, $e)) as $v){
+    if(!strlen(($v = strtolower($v)))){continue;}
+    if(count($y)){if(!isset($s[$v])){$s[$v] = $y;} else{$s[$v] = array_merge($s[$v], $y);}}
+    if(count($n)){if(!isset($s[$v]['n'])){$s[$v]['n'] = $n;} else{$s[$v]['n'] = array_merge($s[$v]['n'], $n);}}
+    }
 }
 return $s;
 }
@@ -428,22 +428,22 @@ 
 if($t == '< '){return '&lt; ';}
 if($t == '>'){return '&gt;';}
 if(!preg_match('`^<(/?)([a-zA-Z][a-zA-Z1-6]*)([^>]*?)\s?>$`m', $t, $m)){
- return str_replace(array('<', '>'), array('&lt;', '&gt;'), $t);
+    return str_replace(array('<', '>'), array('&lt;', '&gt;'), $t);
 }elseif(!isset($C['elements'][($e = strtolower($m[2]))])){
- return (($C['keep_bad']%2) ? str_replace(array('<', '>'), array('&lt;', '&gt;'), $t) : '');
+    return (($C['keep_bad']%2) ? str_replace(array('<', '>'), array('&lt;', '&gt;'), $t) : '');
 }
 // attr string
 $a = str_replace(array("\n", "\r", "\t"), ' ', trim($m[3]));
 // tag transform
 static $eD = array('acronym'=>1, 'applet'=>1, 'big'=>1, 'center'=>1, 'dir'=>1, 'font'=>1, 'isindex'=>1, 's'=>1, 'strike'=>1, 'tt'=>1); // Deprecated
 if($C['make_tag_strict'] && isset($eD[$e])){
- $trt = htmLawed::hl_tag2($e, $a, $C['make_tag_strict']);
- if(!$e){return (($C['keep_bad']%2) ? str_replace(array('<', '>'), array('&lt;', '&gt;'), $t) : '');}
+    $trt = htmLawed::hl_tag2($e, $a, $C['make_tag_strict']);
+    if(!$e){return (($C['keep_bad']%2) ? str_replace(array('<', '>'), array('&lt;', '&gt;'), $t) : '');}
 }
 // close tag
 static $eE = array('area'=>1, 'br'=>1, 'col'=>1, 'command'=>1, 'embed'=>1, 'hr'=>1, 'img'=>1, 'input'=>1, 'isindex'=>1, 'keygen'=>1, 'link'=>1, 'meta'=>1, 'param'=>1, 'source'=>1, 'track'=>1, 'wbr'=>1); // Empty ele
 if(!empty($m[1])){
- return (!isset($eE[$e]) ? (empty($C['hook_tag']) ? "</$e>" : $C['hook_tag']($e)) : (($C['keep_bad'])%2 ? str_replace(array('<', '>'), array('&lt;', '&gt;'), $t) : ''));
+    return (!isset($eE[$e]) ? (empty($C['hook_tag']) ? "</$e>" : $C['hook_tag']($e)) : (($C['keep_bad'])%2 ? str_replace(array('<', '>'), array('&lt;', '&gt;'), $t) : ''));
 }
 
 // open tag & attr
@@ -455,49 +455,49 @@ 
 static $aNU = array('accesskey'=>1, 'class'=>1, 'contenteditable'=>1, 'contextmenu'=>1, 'dir'=>1, 'draggable'=>1, 'dropzone'=>1, 'hidden'=>1, 'id'=>1, 'inert'=>1, 'itemid'=>1, 'itemprop'=>1, 'itemref'=>1, 'itemscope'=>1, 'itemtype'=>1, 'lang'=>1, 'role'=>1, 'spellcheck'=>1, 'style'=>1, 'tabindex'=>1, 'title'=>1, 'translate'=>1, 'xmlns'=>1, 'xml:base'=>1, 'xml:lang'=>1, 'xml:space'=>1); // Univ; excludes on*, aria*
 
 if($C['lc_std_val']){
- // predef attr vals for $eAL & $aNE ele
- static $aNL = array('all'=>1, 'auto'=>1, 'baseline'=>1, 'bottom'=>1, 'button'=>1, 'captions'=>1, 'center'=>1, 'chapters'=>1, 'char'=>1, 'checkbox'=>1, 'circle'=>1, 'col'=>1, 'colgroup'=>1, 'color'=>1, 'cols'=>1, 'data'=>1, 'date'=>1, 'datetime'=>1, 'datetime-local'=>1, 'default'=>1, 'descriptions'=>1, 'email'=>1, 'file'=>1, 'get'=>1, 'groups'=>1, 'hidden'=>1, 'image'=>1, 'justify'=>1, 'left'=>1, 'ltr'=>1, 'metadata'=>1, 'middle'=>1, 'month'=>1, 'none'=>1, 'number'=>1, 'object'=>1, 'password'=>1, 'poly'=>1, 'post'=>1, 'preserve'=>1, 'radio'=>1, 'range'=>1, 'rect'=>1, 'ref'=>1, 'reset'=>1, 'right'=>1, 'row'=>1, 'rowgroup'=>1, 'rows'=>1, 'rtl'=>1, 'search'=>1, 'submit'=>1, 'subtitles'=>1, 'tel'=>1, 'text'=>1, 'time'=>1, 'top'=>1, 'url'=>1, 'week'=>1);
- static $eAL = array('a'=>1, 'area'=>1, 'bdo'=>1, 'button'=>1, 'col'=>1, 'fieldset'=>1, 'form'=>1, 'img'=>1, 'input'=>1, 'object'=>1, 'ol'=>1, 'optgroup'=>1, 'option'=>1, 'param'=>1, 'script'=>1, 'select'=>1, 'table'=>1, 'td'=>1, 'textarea'=>1, 'tfoot'=>1, 'th'=>1, 'thead'=>1, 'tr'=>1, 'track'=>1, 'xml:space'=>1);
- $lcase = isset($eAL[$e]) ? 1 : 0;
+    // predef attr vals for $eAL & $aNE ele
+    static $aNL = array('all'=>1, 'auto'=>1, 'baseline'=>1, 'bottom'=>1, 'button'=>1, 'captions'=>1, 'center'=>1, 'chapters'=>1, 'char'=>1, 'checkbox'=>1, 'circle'=>1, 'col'=>1, 'colgroup'=>1, 'color'=>1, 'cols'=>1, 'data'=>1, 'date'=>1, 'datetime'=>1, 'datetime-local'=>1, 'default'=>1, 'descriptions'=>1, 'email'=>1, 'file'=>1, 'get'=>1, 'groups'=>1, 'hidden'=>1, 'image'=>1, 'justify'=>1, 'left'=>1, 'ltr'=>1, 'metadata'=>1, 'middle'=>1, 'month'=>1, 'none'=>1, 'number'=>1, 'object'=>1, 'password'=>1, 'poly'=>1, 'post'=>1, 'preserve'=>1, 'radio'=>1, 'range'=>1, 'rect'=>1, 'ref'=>1, 'reset'=>1, 'right'=>1, 'row'=>1, 'rowgroup'=>1, 'rows'=>1, 'rtl'=>1, 'search'=>1, 'submit'=>1, 'subtitles'=>1, 'tel'=>1, 'text'=>1, 'time'=>1, 'top'=>1, 'url'=>1, 'week'=>1);
+    static $eAL = array('a'=>1, 'area'=>1, 'bdo'=>1, 'button'=>1, 'col'=>1, 'fieldset'=>1, 'form'=>1, 'img'=>1, 'input'=>1, 'object'=>1, 'ol'=>1, 'optgroup'=>1, 'option'=>1, 'param'=>1, 'script'=>1, 'select'=>1, 'table'=>1, 'td'=>1, 'textarea'=>1, 'tfoot'=>1, 'th'=>1, 'thead'=>1, 'tr'=>1, 'track'=>1, 'xml:space'=>1);
+    $lcase = isset($eAL[$e]) ? 1 : 0;
 }
 
 $depTr = 0;
 if($C['no_deprecated_attr']){
- // depr attr:applicable ele
- static $aND = array('align'=>array('caption'=>1, 'div'=>1, 'h1'=>1, 'h2'=>1, 'h3'=>1, 'h4'=>1, 'h5'=>1, 'h6'=>1, 'hr'=>1, 'img'=>1, 'input'=>1, 'legend'=>1, 'object'=>1, 'p'=>1, 'table'=>1), 'bgcolor'=>array('table'=>1, 'td'=>1, 'th'=>1, 'tr'=>1), 'border'=>array('object'=>1), 'bordercolor'=>array('table'=>1, 'td'=>1, 'tr'=>1), 'cellspacing'=>array('table'=>1), 'clear'=>array('br'=>1), 'compact'=>array('dl'=>1, 'ol'=>1, 'ul'=>1), 'height'=>array('td'=>1, 'th'=>1), 'hspace'=>array('img'=>1, 'object'=>1), 'language'=>array('script'=>1), 'name'=>array('a'=>1, 'form'=>1, 'iframe'=>1, 'img'=>1, 'map'=>1), 'noshade'=>array('hr'=>1), 'nowrap'=>array('td'=>1, 'th'=>1), 'size'=>array('hr'=>1), 'vspace'=>array('img'=>1, 'object'=>1), 'width'=>array('hr'=>1, 'pre'=>1, 'table'=>1, 'td'=>1, 'th'=>1));
- static $eAD = array('a'=>1, 'br'=>1, 'caption'=>1, 'div'=>1, 'dl'=>1, 'form'=>1, 'h1'=>1, 'h2'=>1, 'h3'=>1, 'h4'=>1, 'h5'=>1, 'h6'=>1, 'hr'=>1, 'iframe'=>1, 'img'=>1, 'input'=>1, 'legend'=>1, 'map'=>1, 'object'=>1, 'ol'=>1, 'p'=>1, 'pre'=>1, 'script'=>1, 'table'=>1, 'td'=>1, 'th'=>1, 'tr'=>1, 'ul'=>1);
- $depTr = isset($eAD[$e]) ? 1 : 0;
+    // depr attr:applicable ele
+    static $aND = array('align'=>array('caption'=>1, 'div'=>1, 'h1'=>1, 'h2'=>1, 'h3'=>1, 'h4'=>1, 'h5'=>1, 'h6'=>1, 'hr'=>1, 'img'=>1, 'input'=>1, 'legend'=>1, 'object'=>1, 'p'=>1, 'table'=>1), 'bgcolor'=>array('table'=>1, 'td'=>1, 'th'=>1, 'tr'=>1), 'border'=>array('object'=>1), 'bordercolor'=>array('table'=>1, 'td'=>1, 'tr'=>1), 'cellspacing'=>array('table'=>1), 'clear'=>array('br'=>1), 'compact'=>array('dl'=>1, 'ol'=>1, 'ul'=>1), 'height'=>array('td'=>1, 'th'=>1), 'hspace'=>array('img'=>1, 'object'=>1), 'language'=>array('script'=>1), 'name'=>array('a'=>1, 'form'=>1, 'iframe'=>1, 'img'=>1, 'map'=>1), 'noshade'=>array('hr'=>1), 'nowrap'=>array('td'=>1, 'th'=>1), 'size'=>array('hr'=>1), 'vspace'=>array('img'=>1, 'object'=>1), 'width'=>array('hr'=>1, 'pre'=>1, 'table'=>1, 'td'=>1, 'th'=>1));
+    static $eAD = array('a'=>1, 'br'=>1, 'caption'=>1, 'div'=>1, 'dl'=>1, 'form'=>1, 'h1'=>1, 'h2'=>1, 'h3'=>1, 'h4'=>1, 'h5'=>1, 'h6'=>1, 'hr'=>1, 'iframe'=>1, 'img'=>1, 'input'=>1, 'legend'=>1, 'map'=>1, 'object'=>1, 'ol'=>1, 'p'=>1, 'pre'=>1, 'script'=>1, 'table'=>1, 'td'=>1, 'th'=>1, 'tr'=>1, 'ul'=>1);
+    $depTr = isset($eAD[$e]) ? 1 : 0;
 }
 
 // attr name-vals
 if(strpos($a, "\x01") !== false){$a = preg_replace('`\x01[^\x01]*\x01`', '', $a);} // No comment/CDATA sec
 $mode = 0; $a = trim($a, ' /'); $aA = array();
 while(strlen($a)){
- $w = 0;
- switch($mode){
-  case 0: // Name
+    $w = 0;
+    switch($mode){
+    case 0: // Name
    if(preg_match('`^[a-zA-Z][^\s=/]+`', $a, $m)){
     $nm = strtolower($m[0]);
     $w = $mode = 1; $a = ltrim(substr_replace($a, '', 0, strlen($m[0])));
-   }
-  break; case 1:
+    }
+    break; case 1:
    if($a[0] == '='){ // =
     $w = 1; $mode = 2; $a = ltrim($a, '= ');
-   }else{ // No val
+    }else{ // No val
     $w = 1; $mode = 0; $a = ltrim($a);
     $aA[$nm] = '';
-   }
-  break; case 2: // Val
+    }
+    break; case 2: // Val
    if(preg_match('`^((?:"[^"]*")|(?:\'[^\']*\')|(?:\s*[^\s"\']+))(.*)`', $a, $m)){
     $a = ltrim($m[2]); $m = $m[1]; $w = 1; $mode = 0;
     $aA[$nm] = trim(str_replace('<', '&lt;', ($m[0] == '"' or $m[0] == '\'') ? substr($m, 1, -1) : $m));
-   }
-  break;
- }
- if($w == 0){ // Parse errs, deal with space, " & '
-  $a = preg_replace('`^(?:"[^"]*("|$)|\'[^\']*(\'|$)|\S)*\s*`', '', $a);
-  $mode = 0;
- }
+    }
+    break;
+    }
+    if($w == 0){ // Parse errs, deal with space, " & '
+    $a = preg_replace('`^(?:"[^"]*("|$)|\'[^\']*(\'|$)|\S)*\s*`', '', $a);
+    $mode = 0;
+    }
 }
 if($mode == 1){$aA[$nm] = '';}
 
@@ -506,140 +506,140 @@ 
 $rl = isset($S[$e]) ? $S[$e] : array();
 $a = array(); $nfr = 0; $d = $C['deny_attribute'];
 foreach($aA as $k=>$v){
- if(((isset($d['*']) ? isset($d[$k]) : !isset($d[$k])) && (isset($aN[$k][$e]) or isset($aNU[$k]) or (isset($aNO[$k]) && !isset($d['on*'])) or (isset($aNA[$k]) && !isset($d['aria*'])) or (!isset($d['data*']) && preg_match('`data-((?!xml)[^:]+$)`', $k))) && !isset($rl['n'][$k]) && !isset($rl['n']['*'])) or isset($rl[$k])){
-  if(isset($aNE[$k])){$v = $k;}
-  elseif(!empty($lcase) && (($e != 'button' or $e != 'input') or $k == 'type')){ // Rather loose but ?not cause issues
-   $v = (isset($aNL[($v2 = strtolower($v))])) ? $v2 : $v;
-  }
-  if($k == 'style' && !$C['style_pass']){
-   if(false !== strpos($v, '&#')){
+    if(((isset($d['*']) ? isset($d[$k]) : !isset($d[$k])) && (isset($aN[$k][$e]) or isset($aNU[$k]) or (isset($aNO[$k]) && !isset($d['on*'])) or (isset($aNA[$k]) && !isset($d['aria*'])) or (!isset($d['data*']) && preg_match('`data-((?!xml)[^:]+$)`', $k))) && !isset($rl['n'][$k]) && !isset($rl['n']['*'])) or isset($rl[$k])){
+    if(isset($aNE[$k])){$v = $k;}
+    elseif(!empty($lcase) && (($e != 'button' or $e != 'input') or $k == 'type')){ // Rather loose but ?not cause issues
+    $v = (isset($aNL[($v2 = strtolower($v))])) ? $v2 : $v;
+    }
+    if($k == 'style' && !$C['style_pass']){
+    if(false !== strpos($v, '&#')){
     static $sC = array('&#x20;'=>' ', '&#32;'=>' ', '&#x45;'=>'e', '&#69;'=>'e', '&#x65;'=>'e', '&#101;'=>'e', '&#x58;'=>'x', '&#88;'=>'x', '&#x78;'=>'x', '&#120;'=>'x', '&#x50;'=>'p', '&#80;'=>'p', '&#x70;'=>'p', '&#112;'=>'p', '&#x53;'=>'s', '&#83;'=>'s', '&#x73;'=>'s', '&#115;'=>'s', '&#x49;'=>'i', '&#73;'=>'i', '&#x69;'=>'i', '&#105;'=>'i', '&#x4f;'=>'o', '&#79;'=>'o', '&#x6f;'=>'o', '&#111;'=>'o', '&#x4e;'=>'n', '&#78;'=>'n', '&#x6e;'=>'n', '&#110;'=>'n', '&#x55;'=>'u', '&#85;'=>'u', '&#x75;'=>'u', '&#117;'=>'u', '&#x52;'=>'r', '&#82;'=>'r', '&#x72;'=>'r', '&#114;'=>'r', '&#x4c;'=>'l', '&#76;'=>'l', '&#x6c;'=>'l', '&#108;'=>'l', '&#x28;'=>'(', '&#40;'=>'(', '&#x29;'=>')', '&#41;'=>')', '&#x20;'=>':', '&#32;'=>':', '&#x22;'=>'"', '&#34;'=>'"', '&#x27;'=>"'", '&#39;'=>"'", '&#x2f;'=>'/', '&#47;'=>'/', '&#x2a;'=>'*', '&#42;'=>'*', '&#x5c;'=>'\\', '&#92;'=>'\\');
     $v = strtr($v, $sC);
-   }
-   $v = preg_replace_callback('`(url(?:\()(?: )*(?:\'|"|&(?:quot|apos);)?)(.+?)((?:\'|"|&(?:quot|apos);)?(?: )*(?:\)))`iS', 'htmLawed::hl_prot', $v);
-   $v = !$C['css_expression'] ? preg_replace('`expression`i', ' ', preg_replace('`\\\\\S|(/|(%2f))(\*|(%2a))`i', ' ', $v)) : $v;
-  }elseif(isset($aNP[$k]) or isset($aNO[$k])){
-   $v = str_replace("­", ' ', (strpos($v, '&') !== false ? str_replace(array('&#xad;', '&#173;', '&shy;'), ' ', $v) : $v)); # double-quoted char: soft-hyphen; appears here as "­" or hyphen or something else depending on viewing software
-   if($k == 'srcset'){
+    }
+    $v = preg_replace_callback('`(url(?:\()(?: )*(?:\'|"|&(?:quot|apos);)?)(.+?)((?:\'|"|&(?:quot|apos);)?(?: )*(?:\)))`iS', 'htmLawed::hl_prot', $v);
+    $v = !$C['css_expression'] ? preg_replace('`expression`i', ' ', preg_replace('`\\\\\S|(/|(%2f))(\*|(%2a))`i', ' ', $v)) : $v;
+    }elseif(isset($aNP[$k]) or isset($aNO[$k])){
+    $v = str_replace("­", ' ', (strpos($v, '&') !== false ? str_replace(array('&#xad;', '&#173;', '&shy;'), ' ', $v) : $v)); # double-quoted char: soft-hyphen; appears here as "­" or hyphen or something else depending on viewing software
+    if($k == 'srcset'){
     $v2 = '';
     foreach(explode(',', $v) as $k1=>$v1){
-     $v1 = explode(' ', ltrim($v1), 2);
-     $k1 = isset($v1[1]) ? trim($v1[1]) : '';
-     $v1 = trim($v1[0]);
-     if(isset($v1[0])){$v2 .= htmLawed::hl_prot($v1, $k). (empty($k1) ? '' : ' '. $k1). ', ';}
+        $v1 = explode(' ', ltrim($v1), 2);
+        $k1 = isset($v1[1]) ? trim($v1[1]) : '';
+        $v1 = trim($v1[0]);
+        if(isset($v1[0])){$v2 .= htmLawed::hl_prot($v1, $k). (empty($k1) ? '' : ' '. $k1). ', ';}
     }
     $v = trim($v2, ', ');
-   }
-   if($k == 'itemtype'){
+    }
+    if($k == 'itemtype'){
     $v2 = '';
     foreach(explode(' ', $v) as $v1){
-     if(isset($v1[0])){$v2 .= htmLawed::hl_prot($v1, $k). ' ';}
+        if(isset($v1[0])){$v2 .= htmLawed::hl_prot($v1, $k). ' ';}
     }
     $v = trim($v2, ' ');
-   }
-   else{$v = htmLawed::hl_prot($v, $k);}
-   if($k == 'href'){ // X-spam
+    }
+    else{$v = htmLawed::hl_prot($v, $k);}
+    if($k == 'href'){ // X-spam
     if($C['anti_mail_spam'] && strpos($v, 'mailto:') === 0){
-     $v = str_replace('@', htmlspecialchars($C['anti_mail_spam']), $v);
+        $v = str_replace('@', htmlspecialchars($C['anti_mail_spam']), $v);
     }elseif($C['anti_link_spam']){
-     $r1 = $C['anti_link_spam'][1];
-     if(!empty($r1) && preg_match($r1, $v)){continue;}
-     $r0 = $C['anti_link_spam'][0];
-     if(!empty($r0) && preg_match($r0, $v)){
-      if(isset($a['rel'])){
-       if(!preg_match('`\bnofollow\b`i', $a['rel'])){$a['rel'] .= ' nofollow';}
-      }elseif(isset($aA['rel'])){
-       if(!preg_match('`\bnofollow\b`i', $aA['rel'])){$nfr = 1;}
-      }else{$a['rel'] = 'nofollow';}
-     }
-    }
-   }
-  }
-  if(isset($rl[$k]) && is_array($rl[$k]) && ($v = htmLawed::hl_attrval($k, $v, $rl[$k])) === 0){continue;}
-  $a[$k] = str_replace('"', '&quot;', $v);
- }
+        $r1 = $C['anti_link_spam'][1];
+        if(!empty($r1) && preg_match($r1, $v)){continue;}
+        $r0 = $C['anti_link_spam'][0];
+        if(!empty($r0) && preg_match($r0, $v)){
+        if(isset($a['rel'])){
+        if(!preg_match('`\bnofollow\b`i', $a['rel'])){$a['rel'] .= ' nofollow';}
+        }elseif(isset($aA['rel'])){
+        if(!preg_match('`\bnofollow\b`i', $aA['rel'])){$nfr = 1;}
+        }else{$a['rel'] = 'nofollow';}
+        }
+    }
+    }
+    }
+    if(isset($rl[$k]) && is_array($rl[$k]) && ($v = htmLawed::hl_attrval($k, $v, $rl[$k])) === 0){continue;}
+    $a[$k] = str_replace('"', '&quot;', $v);
+    }
 }
 if($nfr){$a['rel'] = isset($a['rel']) ? $a['rel']. ' nofollow' : 'nofollow';}
 
 // rqd attr
 static $eAR = array('area'=>array('alt'=>'area'), 'bdo'=>array('dir'=>'ltr'), 'command'=>array('label'=>''), 'form'=>array('action'=>''), 'img'=>array('src'=>'', 'alt'=>'image'), 'map'=>array('name'=>''), 'optgroup'=>array('label'=>''), 'param'=>array('name'=>''), 'style'=>array('scoped'=>''), 'textarea'=>array('rows'=>'10', 'cols'=>'50'));
 if(isset($eAR[$e])){
- foreach($eAR[$e] as $k=>$v){
-  if(!isset($a[$k])){$a[$k] = isset($v[0]) ? $v : $k;}
- }
+    foreach($eAR[$e] as $k=>$v){
+    if(!isset($a[$k])){$a[$k] = isset($v[0]) ? $v : $k;}
+    }
 }
 
 // depr attr
 if($depTr){
- $c = array();
- foreach($a as $k=>$v){
-  if($k == 'style' or !isset($aND[$k][$e])){continue;}
-  $v = str_replace(array('\\', ':', ';', '&#'), '', $v);
-  if($k == 'align'){
-   unset($a['align']);
-   if($e == 'img' && ($v == 'left' or $v == 'right')){$c[] = 'float: '. $v;}
-   elseif(($e == 'div' or $e == 'table') && $v == 'center'){$c[] = 'margin: auto';}
-   else{$c[] = 'text-align: '. $v;}
-  }elseif($k == 'bgcolor'){
-   unset($a['bgcolor']);
-   $c[] = 'background-color: '. $v;
-  }elseif($k == 'border'){
-   unset($a['border']); $c[] = "border: {$v}px";
-  }elseif($k == 'bordercolor'){
-   unset($a['bordercolor']); $c[] = 'border-color: '. $v;
-  }elseif($k == 'cellspacing'){
-   unset($a['cellspacing']); $c[] = "border-spacing: {$v}px";
-  }elseif($k == 'clear'){
-   unset($a['clear']); $c[] = 'clear: '. ($v != 'all' ? $v : 'both');
-  }elseif($k == 'compact'){
-   unset($a['compact']); $c[] = 'font-size: 85%';
-  }elseif($k == 'height' or $k == 'width'){
-   unset($a[$k]); $c[] = $k. ': '. ($v[0] != '*' ? $v. (ctype_digit($v) ? 'px' : '') : 'auto');
-  }elseif($k == 'hspace'){
-   unset($a['hspace']); $c[] = "margin-left: {$v}px; margin-right: {$v}px";
-  }elseif($k == 'language' && !isset($a['type'])){
-   unset($a['language']);
-   $a['type'] = 'text/'. strtolower($v);
-  }elseif($k == 'name'){
-   if($C['no_deprecated_attr'] == 2 or ($e != 'a' && $e != 'map')){unset($a['name']);}
-   if(!isset($a['id']) && !preg_match('`\W`', $v)){$a['id'] = $v;}
-  }elseif($k == 'noshade'){
-   unset($a['noshade']); $c[] = 'border-style: none; border: 0; background-color: gray; color: gray';
-  }elseif($k == 'nowrap'){
-   unset($a['nowrap']); $c[] = 'white-space: nowrap';
-  }elseif($k == 'size'){
-   unset($a['size']); $c[] = 'size: '. $v. 'px';
-  }elseif($k == 'vspace'){
-   unset($a['vspace']); $c[] = "margin-top: {$v}px; margin-bottom: {$v}px";
-  }
- }
- if(count($c)){
-  $c = implode('; ', $c);
-  $a['style'] = isset($a['style']) ? rtrim($a['style'], ' ;'). '; '. $c. ';': $c. ';';
- }
+    $c = array();
+    foreach($a as $k=>$v){
+    if($k == 'style' or !isset($aND[$k][$e])){continue;}
+    $v = str_replace(array('\\', ':', ';', '&#'), '', $v);
+    if($k == 'align'){
+    unset($a['align']);
+    if($e == 'img' && ($v == 'left' or $v == 'right')){$c[] = 'float: '. $v;}
+    elseif(($e == 'div' or $e == 'table') && $v == 'center'){$c[] = 'margin: auto';}
+    else{$c[] = 'text-align: '. $v;}
+    }elseif($k == 'bgcolor'){
+    unset($a['bgcolor']);
+    $c[] = 'background-color: '. $v;
+    }elseif($k == 'border'){
+    unset($a['border']); $c[] = "border: {$v}px";
+    }elseif($k == 'bordercolor'){
+    unset($a['bordercolor']); $c[] = 'border-color: '. $v;
+    }elseif($k == 'cellspacing'){
+    unset($a['cellspacing']); $c[] = "border-spacing: {$v}px";
+    }elseif($k == 'clear'){
+    unset($a['clear']); $c[] = 'clear: '. ($v != 'all' ? $v : 'both');
+    }elseif($k == 'compact'){
+    unset($a['compact']); $c[] = 'font-size: 85%';
+    }elseif($k == 'height' or $k == 'width'){
+    unset($a[$k]); $c[] = $k. ': '. ($v[0] != '*' ? $v. (ctype_digit($v) ? 'px' : '') : 'auto');
+    }elseif($k == 'hspace'){
+    unset($a['hspace']); $c[] = "margin-left: {$v}px; margin-right: {$v}px";
+    }elseif($k == 'language' && !isset($a['type'])){
+    unset($a['language']);
+    $a['type'] = 'text/'. strtolower($v);
+    }elseif($k == 'name'){
+    if($C['no_deprecated_attr'] == 2 or ($e != 'a' && $e != 'map')){unset($a['name']);}
+    if(!isset($a['id']) && !preg_match('`\W`', $v)){$a['id'] = $v;}
+    }elseif($k == 'noshade'){
+    unset($a['noshade']); $c[] = 'border-style: none; border: 0; background-color: gray; color: gray';
+    }elseif($k == 'nowrap'){
+    unset($a['nowrap']); $c[] = 'white-space: nowrap';
+    }elseif($k == 'size'){
+    unset($a['size']); $c[] = 'size: '. $v. 'px';
+    }elseif($k == 'vspace'){
+    unset($a['vspace']); $c[] = "margin-top: {$v}px; margin-bottom: {$v}px";
+    }
+    }
+    if(count($c)){
+    $c = implode('; ', $c);
+    $a['style'] = isset($a['style']) ? rtrim($a['style'], ' ;'). '; '. $c. ';': $c. ';';
+    }
 }
 // unique ID
 if($C['unique_ids'] && isset($a['id'])){
- if(preg_match('`\s`', ($id = $a['id'])) or (isset($GLOBALS['hl_Ids'][$id]) && $C['unique_ids'] == 1)){unset($a['id']);
- }else{
-  while(isset($GLOBALS['hl_Ids'][$id])){$id = $C['unique_ids']. $id;}
-  $GLOBALS['hl_Ids'][($a['id'] = $id)] = 1;
- }
+    if(preg_match('`\s`', ($id = $a['id'])) or (isset($GLOBALS['hl_Ids'][$id]) && $C['unique_ids'] == 1)){unset($a['id']);
+    }else{
+    while(isset($GLOBALS['hl_Ids'][$id])){$id = $C['unique_ids']. $id;}
+    $GLOBALS['hl_Ids'][($a['id'] = $id)] = 1;
+    }
 }
 // xml:lang
 if($C['xml:lang'] && isset($a['lang'])){
- $a['xml:lang'] = isset($a['xml:lang']) ? $a['xml:lang'] : $a['lang'];
- if($C['xml:lang'] == 2){unset($a['lang']);}
+    $a['xml:lang'] = isset($a['xml:lang']) ? $a['xml:lang'] : $a['lang'];
+    if($C['xml:lang'] == 2){unset($a['lang']);}
 }
 // for transformed tag
 if(!empty($trt)){
- $a['style'] = isset($a['style']) ? rtrim($a['style'], ' ;'). '; '. $trt : $trt;
+    $a['style'] = isset($a['style']) ? rtrim($a['style'], ' ;'). '; '. $trt : $trt;
 }
 // return with empty ele /
 if(empty($C['hook_tag'])){
- $aA = '';
- foreach($a as $k=>$v){$aA .= " {$k}=\"{$v}\"";}
- return "<{$e}{$aA}". (isset($eE[$e]) ? ' /' : ''). '>';
+    $aA = '';
+    foreach($a as $k=>$v){$aA .= " {$k}=\"{$v}\"";}
+    return "<{$e}{$aA}". (isset($eE[$e]) ? ' /' : ''). '>';
 }
 else{return $C['hook_tag']($e, $a);}
 }
@@ -652,16 +652,16 @@ 
 if($e == 'center'){$e = 'div'; return 'text-align: center;';}
 static $fs = array('0'=>'xx-small', '1'=>'xx-small', '2'=>'small', '3'=>'medium', '4'=>'large', '5'=>'x-large', '6'=>'xx-large', '7'=>'300%', '-1'=>'smaller', '-2'=>'60%', '+1'=>'larger', '+2'=>'150%', '+3'=>'200%', '+4'=>'300%');
 if($e == 'font'){
- $a2 = '';
- while(preg_match('`(^|\s)(color|size)\s*=\s*(\'|")?(.+?)(\\3|\s|$)`i', $a, $m)){
-  $a = str_replace($m[0], ' ', $a);
-  $a2 .= strtolower($m[2]) == 'color' ? (' color: '. str_replace('"', '\'', trim($m[4])). ';') : (isset($fs[($m = trim($m[4]))]) ? ($a2 .= ' font-size: '. str_replace('"', '\'', $fs[$m]). ';') : '');
- }
- while(preg_match('`(^|\s)face\s*=\s*(\'|")?([^=]+?)\\2`i', $a, $m) or preg_match('`(^|\s)face\s*=(\s*)(\S+)`i', $a, $m)){
-  $a = str_replace($m[0], ' ', $a);
-  $a2 .= ' font-family: '. str_replace('"', '\'', trim($m[3])). ';';
- }
- $e = 'span'; return ltrim(str_replace('<', '', $a2));
+    $a2 = '';
+    while(preg_match('`(^|\s)(color|size)\s*=\s*(\'|")?(.+?)(\\3|\s|$)`i', $a, $m)){
+    $a = str_replace($m[0], ' ', $a);
+    $a2 .= strtolower($m[2]) == 'color' ? (' color: '. str_replace('"', '\'', trim($m[4])). ';') : (isset($fs[($m = trim($m[4]))]) ? ($a2 .= ' font-size: '. str_replace('"', '\'', $fs[$m]). ';') : '');
+    }
+    while(preg_match('`(^|\s)face\s*=\s*(\'|")?([^=]+?)\\2`i', $a, $m) or preg_match('`(^|\s)face\s*=(\s*)(\S+)`i', $a, $m)){
+    $a = str_replace($m[0], ' ', $a);
+    $a2 .= ' font-family: '. str_replace('"', '\'', trim($m[3])). ';';
+    }
+    $e = 'span'; return ltrim(str_replace('<', '', $a2));
 }
 if($e == 'acronym'){$e = 'abbr'; return '';}
 if($e == 'dir'){$e = 'ul'; return '';}
@@ -673,11 +673,11 @@ 
 // tidy/compact HTM
 if(strpos(' pre,script,textarea', "$p,")){return $t;}
 if(!function_exists('hl_aux2')){function hl_aux2($m){
- return $m[1]. str_replace(array("<", ">", "\n", "\r", "\t", ' '), array("\x01", "\x02", "\x03", "\x04", "\x05", "\x07"), $m[3]). $m[4];
+    return $m[1]. str_replace(array("<", ">", "\n", "\r", "\t", ' '), array("\x01", "\x02", "\x03", "\x04", "\x05", "\x07"), $m[3]). $m[4];
 }}
 $t = preg_replace(array('`(<\w[^>]*(?<!/)>)\s+`', '`\s+`', '`(<\w[^>]*(?<!/)>) `'), array(' $1', ' ', '$1'), preg_replace_callback(array('`(<(!\[CDATA\[))(.+?)(\]\]>)`sm', '`(<(!--))(.+?)(-->)`sm', '`(<(pre|script|textarea)[^>]*?>)(.+?)(</\2>)`sm'), 'hl_aux2', $t));
 if(($w = strtolower($w)) == -1){
- return str_replace(array("\x01", "\x02", "\x03", "\x04", "\x05", "\x07"), array('<', '>', "\n", "\r", "\t", ' '), $t);
+    return str_replace(array("\x01", "\x02", "\x03", "\x04", "\x05", "\x07"), array('<', '>', "\n", "\r", "\t", ' '), $t);
 }
 $s = strpos(" $w", 't') ? "\t" : ' ';
 $s = preg_match('`\d`', $w, $m) ? str_repeat($s, $m[0]) : str_repeat($s, ($s == "\t" ? 1 : 2));
@@ -689,39 +689,39 @@ 
 $T = explode('<', $t);
 $X = 1;
 while($X){
- $n = $N;
- $t = $T;
- ob_start();
- if(isset($d[$p])){echo str_repeat($s, ++$n);}
- echo ltrim(array_shift($t));
- for($i=-1, $j=count($t); ++$i<$j;){
-  $r = ''; list($e, $r) = explode('>', $t[$i]);
-  $x = $e[0] == '/' ? 0 : (substr($e, -1) == '/' ? 1 : ($e[0] != '!' ? 2 : -1));
-  $y = !$x ? ltrim($e, '/') : ($x > 0 ? substr($e, 0, strcspn($e, ' ')) : 0);
-  $e = "<$e>"; 
-  if(isset($d[$y])){
-   if(!$x){
+    $n = $N;
+    $t = $T;
+    ob_start();
+    if(isset($d[$p])){echo str_repeat($s, ++$n);}
+    echo ltrim(array_shift($t));
+    for($i=-1, $j=count($t); ++$i<$j;){
+    $r = ''; list($e, $r) = explode('>', $t[$i]);
+    $x = $e[0] == '/' ? 0 : (substr($e, -1) == '/' ? 1 : ($e[0] != '!' ? 2 : -1));
+    $y = !$x ? ltrim($e, '/') : ($x > 0 ? substr($e, 0, strcspn($e, ' ')) : 0);
+    $e = "<$e>"; 
+    if(isset($d[$y])){
+    if(!$x){
     if($n){echo "\n", str_repeat($s, --$n), "$e\n", str_repeat($s, $n);}
     else{++$N; ob_end_clean(); continue 2;}
-   }
-   else{echo "\n", str_repeat($s, $n), "$e\n", str_repeat($s, ($x != 1 ? ++$n : $n));}
-   echo $r; continue;
-  }
-  $f = "\n". str_repeat($s, $n);
-  if(isset($c[$y])){
-   if(!$x){echo $e, $f, $r;}
-   else{echo $f, $e, $r;}
-  }elseif(isset($b[$y])){echo $f, $e, $r;
-  }elseif(isset($a[$y])){echo $e, $f, $r;
-  }elseif(!$y){echo $f, $e, $f, $r;
-  }else{echo $e, $r;}
- }
- $X = 0;
+    }
+    else{echo "\n", str_repeat($s, $n), "$e\n", str_repeat($s, ($x != 1 ? ++$n : $n));}
+    echo $r; continue;
+    }
+    $f = "\n". str_repeat($s, $n);
+    if(isset($c[$y])){
+    if(!$x){echo $e, $f, $r;}
+    else{echo $f, $e, $r;}
+    }elseif(isset($b[$y])){echo $f, $e, $r;
+    }elseif(isset($a[$y])){echo $e, $f, $r;
+    }elseif(!$y){echo $f, $e, $f, $r;
+    }else{echo $e, $r;}
+    }
+    $X = 0;
 }
 $t = str_replace(array("\n ", " \n"), "\n", preg_replace('`[\n]\s*?[\n]+`', "\n", ob_get_contents()));
 ob_end_clean();
 if(($l = strpos(" $w", 'r') ? (strpos(" $w", 'n') ? "\r\n" : "\r") : 0)){
- $t = str_replace("\n", $l, $t);
+    $t = str_replace("\n", $l, $t);
 }
 return str_replace(array("\x01", "\x02", "\x03", "\x04", "\x05", "\x07"), array('<', '>', "\n", "\r", "\t", ' '), $t);
 }

Spacing +304 added lines, -304 removed lines

@@ -10,11 +10,11 @@ 
 See htmLawed_README.txt/htm
 */
 
-class htmLawed{
+class htmLawed {
 // begin class
-public static function hl($t, $C=1, $S=array()){
+public static function hl($t, $C = 1, $S = array()) {
 $C = is_array($C) ? $C : array();
-if(!empty($C['valid_xhtml'])){
+if (!empty($C['valid_xhtml'])) {
  $C['elements'] = empty($C['elements']) ? '*-acronym-big-center-dir-font-isindex-s-strike-tt' : $C['elements'];
  $C['make_tag_strict'] = isset($C['make_tag_strict']) ? $C['make_tag_strict'] : 2;
  $C['xml:lang'] = isset($C['xml:lang']) ? $C['xml:lang'] : 2;
@@ -22,41 +22,41 @@ 
 // config eles
 $e = array('a'=>1, 'abbr'=>1, 'acronym'=>1, 'address'=>1, 'applet'=>1, 'area'=>1, 'article'=>1, 'aside'=>1, 'audio'=>1, 'b'=>1, 'bdi'=>1, 'bdo'=>1, 'big'=>1, 'blockquote'=>1, 'br'=>1, 'button'=>1, 'canvas'=>1, 'caption'=>1, 'center'=>1, 'cite'=>1, 'code'=>1, 'col'=>1, 'colgroup'=>1, 'command'=>1, 'data'=>1, 'datalist'=>1, 'dd'=>1, 'del'=>1, 'details'=>1, 'dfn'=>1, 'dir'=>1, 'div'=>1, 'dl'=>1, 'dt'=>1, 'em'=>1, 'embed'=>1, 'fieldset'=>1, 'figcaption'=>1, 'figure'=>1, 'font'=>1, 'footer'=>1, 'form'=>1, 'h1'=>1, 'h2'=>1, 'h3'=>1, 'h4'=>1, 'h5'=>1, 'h6'=>1, 'header'=>1, 'hgroup'=>1, 'hr'=>1, 'i'=>1, 'iframe'=>1, 'img'=>1, 'input'=>1, 'ins'=>1, 'isindex'=>1, 'kbd'=>1, 'keygen'=>1, 'label'=>1, 'legend'=>1, 'li'=>1, 'link'=>1, 'main'=>1, 'map'=>1, 'mark'=>1, 'menu'=>1, 'meta'=>1, 'meter'=>1, 'nav'=>1, 'noscript'=>1, 'object'=>1, 'ol'=>1, 'optgroup'=>1, 'option'=>1, 'output'=>1, 'p'=>1, 'param'=>1, 'pre'=>1, 'progress'=>1, 'q'=>1, 'rb'=>1, 'rbc'=>1, 'rp'=>1, 'rt'=>1, 'rtc'=>1, 'ruby'=>1, 's'=>1, 'samp'=>1, 'script'=>1, 'section'=>1, 'select'=>1, 'small'=>1, 'source'=>1, 'span'=>1, 'strike'=>1, 'strong'=>1, 'style'=>1, 'sub'=>1, 'summary'=>1, 'sup'=>1, 'table'=>1, 'tbody'=>1, 'td'=>1, 'textarea'=>1, 'tfoot'=>1, 'th'=>1, 'thead'=>1, 'time'=>1, 'tr'=>1, 'track'=>1, 'tt'=>1, 'u'=>1, 'ul'=>1, 'var'=>1, 'video'=>1, 'wbr'=>1); // 118 incl. deprecated & some Ruby
 
-if(!empty($C['safe'])){
+if (!empty($C['safe'])) {
  unset($e['applet'], $e['audio'], $e['canvas'], $e['embed'], $e['iframe'], $e['object'], $e['script'], $e['video']);
 }
 $x = !empty($C['elements']) ? str_replace(array("\n", "\r", "\t", ' '), '', $C['elements']) : '*';
-if($x == '-*'){$e = array();}
-elseif(strpos($x, '*') === false){$e = array_flip(explode(',', $x));}
-else{
- if(isset($x[1])){
+if ($x == '-*') {$e = array(); }
+elseif (strpos($x, '*') === false) {$e = array_flip(explode(',', $x)); }
+else {
+ if (isset($x[1])) {
   preg_match_all('`(?:^|-|\+)[^\-+]+?(?=-|\+|$)`', $x, $m, PREG_SET_ORDER);
-  for($i=count($m); --$i>=0;){$m[$i] = $m[$i][0];}
-  foreach($m as $v){
-   if($v[0] == '+'){$e[substr($v, 1)] = 1;}
-   if($v[0] == '-' && isset($e[($v = substr($v, 1))]) && !in_array('+'. $v, $m)){unset($e[$v]);}
+  for ($i = count($m); --$i >= 0;) {$m[$i] = $m[$i][0]; }
+  foreach ($m as $v) {
+   if ($v[0] == '+') {$e[substr($v, 1)] = 1; }
+   if ($v[0] == '-' && isset($e[($v = substr($v, 1))]) && !in_array('+'.$v, $m)) {unset($e[$v]); }
   }
  }
 }
-$C['elements'] =& $e;
+$C['elements'] = & $e;
 // config attrs
 $x = !empty($C['deny_attribute']) ? strtolower(str_replace(array("\n", "\r", "\t", ' '), '', $C['deny_attribute'])) : '';
-$x = array_flip((isset($x[0]) && $x[0] == '*') ? str_replace('/', 'data-', explode('-', str_replace('data-', '/', $x))) : explode(',', $x. (!empty($C['safe']) ? ',on*' : '')));
+$x = array_flip((isset($x[0]) && $x[0] == '*') ? str_replace('/', 'data-', explode('-', str_replace('data-', '/', $x))) : explode(',', $x.(!empty($C['safe']) ? ',on*' : '')));
 $C['deny_attribute'] = $x;
 // config URLs
-$x = (isset($C['schemes'][2]) && strpos($C['schemes'], ':')) ? strtolower($C['schemes']) : 'href: aim, feed, file, ftp, gopher, http, https, irc, mailto, news, nntp, sftp, ssh, tel, telnet'. (empty($C['safe']) ? ', app, javascript; *: data, javascript, ' : '; *:'). 'file, http, https';
+$x = (isset($C['schemes'][2]) && strpos($C['schemes'], ':')) ? strtolower($C['schemes']) : 'href: aim, feed, file, ftp, gopher, http, https, irc, mailto, news, nntp, sftp, ssh, tel, telnet'.(empty($C['safe']) ? ', app, javascript; *: data, javascript, ' : '; *:').'file, http, https';
 $C['schemes'] = array();
-foreach(explode(';', str_replace(array(' ', "\t", "\r", "\n"), '', $x)) as $v){
+foreach (explode(';', str_replace(array(' ', "\t", "\r", "\n"), '', $x)) as $v) {
  $x = $x2 = null; list($x, $x2) = explode(':', $v, 2);
- if($x2){$C['schemes'][$x] = array_flip(explode(',', $x2));}
+ if ($x2) {$C['schemes'][$x] = array_flip(explode(',', $x2)); }
 }
-if(!isset($C['schemes']['*'])){
+if (!isset($C['schemes']['*'])) {
  $C['schemes']['*'] = array('file'=>1, 'http'=>1, 'https'=>1);
- if(empty($C['safe'])){$C['schemes']['*'] += array('data'=>1, 'javascript'=>1);}
+ if (empty($C['safe'])) {$C['schemes']['*'] += array('data'=>1, 'javascript'=>1); }
 }
-if(!empty($C['safe']) && empty($C['schemes']['style'])){$C['schemes']['style'] = array('!'=>1);}
+if (!empty($C['safe']) && empty($C['schemes']['style'])) {$C['schemes']['style'] = array('!'=>1); }
 $C['abs_url'] = isset($C['abs_url']) ? $C['abs_url'] : 0;
-if(!isset($C['base_url']) or !preg_match('`^[a-zA-Z\d.+\-]+://[^/]+/(.+?/)?$`', $C['base_url'])){
+if (!isset($C['base_url']) or !preg_match('`^[a-zA-Z\d.+\-]+://[^/]+/(.+?/)?$`', $C['base_url'])) {
  $C['base_url'] = $C['abs_url'] = 0;
 }
 // config rest
@@ -84,23 +84,23 @@ 
 $C['unique_ids'] = isset($C['unique_ids']) && (!preg_match('`\W`', $C['unique_ids'])) ? $C['unique_ids'] : 1;
 $C['xml:lang'] = isset($C['xml:lang']) ? $C['xml:lang'] : 0;
 
-if(isset($GLOBALS['C'])){$reC = $GLOBALS['C'];}
+if (isset($GLOBALS['C'])) {$reC = $GLOBALS['C']; }
 $GLOBALS['C'] = $C;
 $S = is_array($S) ? $S : htmLawed::hl_spec($S);
-if(isset($GLOBALS['S'])){$reS = $GLOBALS['S'];}
+if (isset($GLOBALS['S'])) {$reS = $GLOBALS['S']; }
 $GLOBALS['S'] = $S;
 
 $t = preg_replace('`[\x00-\x08\x0b-\x0c\x0e-\x1f]`', '', $t);
-if($C['clean_ms_char']){
+if ($C['clean_ms_char']) {
  $x = array("\x7f"=>'', "\x80"=>'€', "\x81"=>'', "\x83"=>'ƒ', "\x85"=>'…', "\x86"=>'†', "\x87"=>'‡', "\x88"=>'ˆ', "\x89"=>'‰', "\x8a"=>'Š', "\x8b"=>'‹', "\x8c"=>'Œ', "\x8d"=>'', "\x8e"=>'Ž', "\x8f"=>'', "\x90"=>'', "\x95"=>'•', "\x96"=>'–', "\x97"=>'—', "\x98"=>'˜', "\x99"=>'™', "\x9a"=>'š', "\x9b"=>'›', "\x9c"=>'œ', "\x9d"=>'', "\x9e"=>'ž', "\x9f"=>'Ÿ');
  $x = $x + ($C['clean_ms_char'] == 1 ? array("\x82"=>'‚', "\x84"=>'„', "\x91"=>'‘', "\x92"=>'’', "\x93"=>'“', "\x94"=>'”') : array("\x82"=>'\'', "\x84"=>'"', "\x91"=>'\'', "\x92"=>'\'', "\x93"=>'"', "\x94"=>'"'));
  $t = strtr($t, $x);
 }
-if($C['cdata'] or $C['comment']){$t = preg_replace_callback('`<!(?:(?:--.*?--)|(?:\[CDATA\[.*?\]\]))>`sm', 'htmLawed::hl_cmtcd', $t);}
+if ($C['cdata'] or $C['comment']) {$t = preg_replace_callback('`<!(?:(?:--.*?--)|(?:\[CDATA\[.*?\]\]))>`sm', 'htmLawed::hl_cmtcd', $t); }
 $t = preg_replace_callback('`&amp;([a-zA-Z][a-zA-Z0-9]{1,30}|#(?:[0-9]{1,8}|[Xx][0-9A-Fa-f]{1,7}));`', 'htmLawed::hl_ent', str_replace('&', '&amp;', $t));
-if($C['unique_ids'] && !isset($GLOBALS['hl_Ids'])){$GLOBALS['hl_Ids'] = array();}
-if($C['hook']){$t = $C['hook']($t, $C, $S);}
-if($C['show_setting'] && preg_match('`^[a-z][a-z0-9_]*$`i', $C['show_setting'])){
+if ($C['unique_ids'] && !isset($GLOBALS['hl_Ids'])) {$GLOBALS['hl_Ids'] = array(); }
+if ($C['hook']) {$t = $C['hook']($t, $C, $S); }
+if ($C['show_setting'] && preg_match('`^[a-z][a-z0-9_]*$`i', $C['show_setting'])) {
  $GLOBALS[$C['show_setting']] = array('config'=>$C, 'spec'=>$S, 'time'=>microtime());
 }
 // main
@@ -109,60 +109,60 @@ 
 $t = (($C['cdata'] or $C['comment']) && strpos($t, "\x01") !== false) ? str_replace(array("\x01", "\x02", "\x03", "\x04", "\x05"), array('', '', '&', '<', '>'), $t) : $t;
 $t = $C['tidy'] ? htmLawed::hl_tidy($t, $C['tidy'], $C['parent']) : $t;
 unset($C, $e);
-if(isset($reC)){$GLOBALS['C'] = $reC;}
-if(isset($reS)){$GLOBALS['S'] = $reS;}
+if (isset($reC)) {$GLOBALS['C'] = $reC; }
+if (isset($reS)) {$GLOBALS['S'] = $reS; }
 return $t;
 }
 
-public static function hl_attrval($a, $t, $p){
+public static function hl_attrval($a, $t, $p) {
 // check attr val against $S
 static $ma = array('accesskey', 'class', 'itemtype', 'rel');
-$s = in_array($a, $ma) ? ' ' : ($a == 'srcset' ? ',': '');
+$s = in_array($a, $ma) ? ' ' : ($a == 'srcset' ? ',' : '');
 $r = array();
 $t = !empty($s) ? explode($s, $t) : array($t);
-foreach($t as $tk=>$tv){
+foreach ($t as $tk=>$tv) {
  $o = 1; $tv = trim($tv); $l = strlen($tv);
- foreach($p as $k=>$v){
-  if(!$l){continue;}
-  switch($k){
-   case 'maxlen': if($l > $v){$o = 0;}
-   break; case 'minlen': if($l < $v){$o = 0;}
-   break; case 'maxval': if((float)($tv) > $v){$o = 0;}
-   break; case 'minval': if((float)($tv) < $v){$o = 0;}
-   break; case 'match': if(!preg_match($v, $tv)){$o = 0;}
-   break; case 'nomatch': if(preg_match($v, $tv)){$o = 0;}
+ foreach ($p as $k=>$v) {
+  if (!$l) {continue; }
+  switch ($k) {
+   case 'maxlen': if ($l > $v) {$o = 0; }
+   break; case 'minlen': if ($l < $v) {$o = 0; }
+   break; case 'maxval': if ((float)($tv) > $v) {$o = 0; }
+   break; case 'minval': if ((float)($tv) < $v) {$o = 0; }
+   break; case 'match': if (!preg_match($v, $tv)) {$o = 0; }
+   break; case 'nomatch': if (preg_match($v, $tv)) {$o = 0; }
    break; case 'oneof':
     $m = 0;
-    foreach(explode('|', $v) as $n){if($tv == $n){$m = 1; break;}}
+    foreach (explode('|', $v) as $n) {if ($tv == $n) {$m = 1; break; }}
     $o = $m;
    break; case 'noneof':
     $m = 1;
-    foreach(explode('|', $v) as $n){if($tv == $n){$m = 0; break;}}
+    foreach (explode('|', $v) as $n) {if ($tv == $n) {$m = 0; break; }}
     $o = $m;
    break; default:
    break;
   }
-  if(!$o){break;}
+  if (!$o) {break; }
  }
- if($o){$r[] = $tv;}
+ if ($o) {$r[] = $tv; }
 }
-if($s == ','){$s = ', ';} 
+if ($s == ',') {$s = ', '; } 
 $r = implode($s, $r);
 return (isset($r[0]) ? $r : (isset($p['default']) ? $p['default'] : 0));
 }
 
-public static function hl_bal($t, $do=1, $in='div'){
+public static function hl_bal($t, $do = 1, $in = 'div') {
 // balance tags
 // by content
 $cB = array('blockquote'=>1, 'form'=>1, 'map'=>1, 'noscript'=>1); // Block
 $cE = array('area'=>1, 'br'=>1, 'col'=>1, 'command'=>1, 'embed'=>1, 'hr'=>1, 'img'=>1, 'input'=>1, 'isindex'=>1, 'keygen'=>1, 'link'=>1, 'meta'=>1, 'param'=>1, 'source'=>1, 'track'=>1, 'wbr'=>1); // Empty
 $cF = array('a'=>1, 'article'=>1, 'aside'=>1, 'audio'=>1, 'button'=>1, 'canvas'=>1, 'del'=>1, 'details'=>1, 'div'=>1, 'dd'=>1, 'fieldset'=>1, 'figure'=>1, 'footer'=>1, 'header'=>1, 'iframe'=>1, 'ins'=>1, 'li'=>1, 'main'=>1, 'menu'=>1, 'nav'=>1, 'noscript'=>1, 'object'=>1, 'section'=>1, 'style'=>1, 'td'=>1, 'th'=>1, 'video'=>1); // Flow; later context-wise dynamic move of ins & del to $cI
 $cI = array('abbr'=>1, 'acronym'=>1, 'address'=>1, 'b'=>1, 'bdi'=>1, 'bdo'=>1, 'big'=>1, 'caption'=>1, 'cite'=>1, 'code'=>1, 'data'=>1, 'datalist'=>1, 'dfn'=>1, 'dt'=>1, 'em'=>1, 'figcaption'=>1, 'font'=>1, 'h1'=>1, 'h2'=>1, 'h3'=>1, 'h4'=>1, 'h5'=>1, 'h6'=>1, 'hgroup'=>1, 'i'=>1, 'kbd'=>1, 'label'=>1, 'legend'=>1, 'mark'=>1, 'meter'=>1, 'output'=>1, 'p'=>1, 'pre'=>1, 'progress'=>1, 'q'=>1, 'rb'=>1, 'rt'=>1, 's'=>1, 'samp'=>1, 'small'=>1, 'span'=>1, 'strike'=>1, 'strong'=>1, 'sub'=>1, 'summary'=>1, 'sup'=>1, 'time'=>1, 'tt'=>1, 'u'=>1, 'var'=>1); // Inline
-$cN = array('a'=>array('a'=>1, 'address'=>1, 'button'=>1, 'details'=>1, 'embed'=>1, 'keygen'=>1, 'label'=>1, 'select'=>1, 'textarea'=>1), 'address'=>array('address'=>1, 'article'=>1, 'aside'=>1, 'header'=>1, 'keygen'=>1, 'footer'=>1, 'nav'=>1, 'section'=>1), 'button'=>array('a'=>1, 'address'=>1, 'button'=>1, 'details'=>1, 'embed'=>1, 'fieldset'=>1, 'form'=>1, 'iframe'=>1, 'input'=>1, 'keygen'=>1, 'label'=>1, 'select'=>1, 'textarea'=>1), 'fieldset'=>array('fieldset'=>1), 'footer'=>array('header'=>1, 'footer'=>1), 'form'=>array('form'=>1), 'header'=>array('header'=>1, 'footer'=>1), 'label'=>array('label'=>1), 'main'=>array('main'=>1), 'meter'=>array('meter'=>1), 'noscript'=>array('script'=>1), 'pre'=>array('big'=>1, 'font'=>1, 'img'=>1, 'object'=>1, 'script'=>1, 'small'=>1, 'sub'=>1, 'sup'=>1), 'progress'=>array('progress'=>1), 'rb'=>array('ruby'=>1), 'rt'=>array('ruby'=>1), 'time'=>array('time'=>1), ); // Illegal
+$cN = array('a'=>array('a'=>1, 'address'=>1, 'button'=>1, 'details'=>1, 'embed'=>1, 'keygen'=>1, 'label'=>1, 'select'=>1, 'textarea'=>1), 'address'=>array('address'=>1, 'article'=>1, 'aside'=>1, 'header'=>1, 'keygen'=>1, 'footer'=>1, 'nav'=>1, 'section'=>1), 'button'=>array('a'=>1, 'address'=>1, 'button'=>1, 'details'=>1, 'embed'=>1, 'fieldset'=>1, 'form'=>1, 'iframe'=>1, 'input'=>1, 'keygen'=>1, 'label'=>1, 'select'=>1, 'textarea'=>1), 'fieldset'=>array('fieldset'=>1), 'footer'=>array('header'=>1, 'footer'=>1), 'form'=>array('form'=>1), 'header'=>array('header'=>1, 'footer'=>1), 'label'=>array('label'=>1), 'main'=>array('main'=>1), 'meter'=>array('meter'=>1), 'noscript'=>array('script'=>1), 'pre'=>array('big'=>1, 'font'=>1, 'img'=>1, 'object'=>1, 'script'=>1, 'small'=>1, 'sub'=>1, 'sup'=>1), 'progress'=>array('progress'=>1), 'rb'=>array('ruby'=>1), 'rt'=>array('ruby'=>1), 'time'=>array('time'=>1),); // Illegal
 $cN2 = array_keys($cN);
 $cS = array('colgroup'=>array('col'=>1), 'datalist'=>array('option'=>1), 'dir'=>array('li'=>1), 'dl'=>array('dd'=>1, 'dt'=>1), 'hgroup'=>array('h1'=>1, 'h2'=>1, 'h3'=>1, 'h4'=>1, 'h5'=>1, 'h6'=>1), 'menu'=>array('li'=>1), 'ol'=>array('li'=>1), 'optgroup'=>array('option'=>1), 'option'=>array('#pcdata'=>1), 'rbc'=>array('rb'=>1), 'rp'=>array('#pcdata'=>1), 'rtc'=>array('rt'=>1), 'ruby'=>array('rb'=>1, 'rbc'=>1, 'rp'=>1, 'rt'=>1, 'rtc'=>1), 'select'=>array('optgroup'=>1, 'option'=>1), 'script'=>array('#pcdata'=>1), 'table'=>array('caption'=>1, 'col'=>1, 'colgroup'=>1, 'tfoot'=>1, 'tbody'=>1, 'tr'=>1, 'thead'=>1), 'tbody'=>array('tr'=>1), 'tfoot'=>array('tr'=>1), 'textarea'=>array('#pcdata'=>1), 'thead'=>array('tr'=>1), 'tr'=>array('td'=>1, 'th'=>1), 'ul'=>array('li'=>1)); // Specific - immediate parent-child
-if($GLOBALS['C']['direct_list_nest']){$cS['ol'] = $cS['ul'] = $cS['menu'] += array('menu'=>1, 'ol'=>1, 'ul'=>1);}
-$cO = array('address'=>array('p'=>1), 'applet'=>array('param'=>1), 'audio'=>array('source'=>1, 'track'=>1), 'blockquote'=>array('script'=>1), 'details'=>array('summary'=>1), 'fieldset'=>array('legend'=>1, '#pcdata'=>1),  'figure'=>array('figcaption'=>1),'form'=>array('script'=>1), 'map'=>array('area'=>1), 'object'=>array('param'=>1, 'embed'=>1), 'video'=>array('source'=>1, 'track'=>1)); // Other
+if ($GLOBALS['C']['direct_list_nest']) {$cS['ol'] = $cS['ul'] = $cS['menu'] += array('menu'=>1, 'ol'=>1, 'ul'=>1); }
+$cO = array('address'=>array('p'=>1), 'applet'=>array('param'=>1), 'audio'=>array('source'=>1, 'track'=>1), 'blockquote'=>array('script'=>1), 'details'=>array('summary'=>1), 'fieldset'=>array('legend'=>1, '#pcdata'=>1), 'figure'=>array('figcaption'=>1), 'form'=>array('script'=>1), 'map'=>array('area'=>1), 'object'=>array('param'=>1, 'embed'=>1), 'video'=>array('source'=>1, 'track'=>1)); // Other
 $cT = array('colgroup'=>1, 'dd'=>1, 'dt'=>1, 'li'=>1, 'option'=>1, 'p'=>1, 'td'=>1, 'tfoot'=>1, 'th'=>1, 'thead'=>1, 'tr'=>1); // Omitable closing
 // block/inline type; a/ins/del both type; #pcdata: text
 $eB = array('a'=>1, 'address'=>1, 'article'=>1, 'aside'=>1, 'blockquote'=>1, 'center'=>1, 'del'=>1, 'details'=>1, 'dir'=>1, 'dl'=>1, 'div'=>1, 'fieldset'=>1, 'figure'=>1, 'footer'=>1, 'form'=>1, 'ins'=>1, 'h1'=>1, 'h2'=>1, 'h3'=>1, 'h4'=>1, 'h5'=>1, 'h6'=>1, 'header'=>1, 'hr'=>1, 'isindex'=>1, 'main'=>1, 'menu'=>1, 'nav'=>1, 'noscript'=>1, 'ol'=>1, 'p'=>1, 'pre'=>1, 'section'=>1, 'style'=>1, 'table'=>1, 'ul'=>1);
@@ -173,277 +173,277 @@ 
 
 // $in sets allowed child
 $in = ((isset($eF[$in]) && $in != '#pcdata') or isset($eO[$in])) ? $in : 'div';
-if(isset($cE[$in])){
+if (isset($cE[$in])) {
  return (!$do ? '' : str_replace(array('<', '>'), array('&lt;', '&gt;'), $t));
 }
-if(isset($cS[$in])){$inOk = $cS[$in];}
-elseif(isset($cI[$in])){$inOk = $eI; $cI['del'] = 1; $cI['ins'] = 1;}
-elseif(isset($cF[$in])){$inOk = $eF; unset($cI['del'], $cI['ins']);}
-elseif(isset($cB[$in])){$inOk = $eB; unset($cI['del'], $cI['ins']);}
-if(isset($cO[$in])){$inOk = $inOk + $cO[$in];}
-if(isset($cN[$in])){$inOk = array_diff_assoc($inOk, $cN[$in]);}
+if (isset($cS[$in])) {$inOk = $cS[$in]; }
+elseif (isset($cI[$in])) {$inOk = $eI; $cI['del'] = 1; $cI['ins'] = 1; }
+elseif (isset($cF[$in])) {$inOk = $eF; unset($cI['del'], $cI['ins']); }
+elseif (isset($cB[$in])) {$inOk = $eB; unset($cI['del'], $cI['ins']); }
+if (isset($cO[$in])) {$inOk = $inOk + $cO[$in]; }
+if (isset($cN[$in])) {$inOk = array_diff_assoc($inOk, $cN[$in]); }
 
 $t = explode('<', $t);
 $ok = $q = array(); // $q seq list of open non-empty ele
 ob_start();
 
-for($i=-1, $ci=count($t); ++$i<$ci;){
+for ($i = -1, $ci = count($t); ++$i < $ci;) {
  // allowed $ok in parent $p
- if($ql = count($q)){
+ if ($ql = count($q)) {
   $p = array_pop($q);
   $q[] = $p;
-  if(isset($cS[$p])){$ok = $cS[$p];}
-  elseif(isset($cI[$p])){$ok = $eI; $cI['del'] = 1; $cI['ins'] = 1;}
-  elseif(isset($cF[$p])){$ok = $eF; unset($cI['del'], $cI['ins']);}
-  elseif(isset($cB[$p])){$ok = $eB; unset($cI['del'], $cI['ins']);}
-  if(isset($cO[$p])){$ok = $ok + $cO[$p];}
-  if(isset($cN[$p])){$ok = array_diff_assoc($ok, $cN[$p]);}
- }else{$ok = $inOk; unset($cI['del'], $cI['ins']);}
+  if (isset($cS[$p])) {$ok = $cS[$p]; }
+  elseif (isset($cI[$p])) {$ok = $eI; $cI['del'] = 1; $cI['ins'] = 1; }
+  elseif (isset($cF[$p])) {$ok = $eF; unset($cI['del'], $cI['ins']); }
+  elseif (isset($cB[$p])) {$ok = $eB; unset($cI['del'], $cI['ins']); }
+  if (isset($cO[$p])) {$ok = $ok + $cO[$p]; }
+  if (isset($cN[$p])) {$ok = array_diff_assoc($ok, $cN[$p]); }
+ } else {$ok = $inOk; unset($cI['del'], $cI['ins']); }
  // bad tags, & ele content
- if(isset($e) && ($do == 1 or (isset($ok['#pcdata']) && ($do == 3 or $do == 5)))){
+ if (isset($e) && ($do == 1 or (isset($ok['#pcdata']) && ($do == 3 or $do == 5)))) {
   echo '&lt;', $s, $e, $a, '&gt;';
  }
- if(isset($x[0])){
-  if(strlen(trim($x)) && (($ql && isset($cB[$p])) or (isset($cB[$in]) && !$ql))){
+ if (isset($x[0])) {
+  if (strlen(trim($x)) && (($ql && isset($cB[$p])) or (isset($cB[$in]) && !$ql))) {
    echo '<div>', $x, '</div>';
   }
-  elseif($do < 3 or isset($ok['#pcdata'])){echo $x;}
-  elseif(strpos($x, "\x02\x04")){
-   foreach(preg_split('`(\x01\x02[^\x01\x02]+\x02\x01)`', $x, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY) as $v){
+  elseif ($do < 3 or isset($ok['#pcdata'])) {echo $x; }
+  elseif (strpos($x, "\x02\x04")) {
+   foreach (preg_split('`(\x01\x02[^\x01\x02]+\x02\x01)`', $x, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY) as $v) {
     echo (substr($v, 0, 2) == "\x01\x02" ? $v : ($do > 4 ? preg_replace('`\S`', '', $v) : ''));
    }
-  }elseif($do > 4){echo preg_replace('`\S`', '', $x);}
+  }elseif ($do > 4) {echo preg_replace('`\S`', '', $x); }
  }
  // get markup
- if(!preg_match('`^(/?)([a-z1-6]+)([^>]*)>(.*)`sm', $t[$i], $r)){$x = $t[$i]; continue;}
+ if (!preg_match('`^(/?)([a-z1-6]+)([^>]*)>(.*)`sm', $t[$i], $r)) {$x = $t[$i]; continue; }
  $s = null; $e = null; $a = null; $x = null; list($all, $s, $e, $a, $x) = $r;
  // close tag
- if($s){
-  if(isset($cE[$e]) or !in_array($e, $q)){continue;} // Empty/unopen
-  if($p == $e){array_pop($q); echo '</', $e, '>'; unset($e); continue;} // Last open
+ if ($s) {
+  if (isset($cE[$e]) or !in_array($e, $q)) {continue; } // Empty/unopen
+  if ($p == $e) {array_pop($q); echo '</', $e, '>'; unset($e); continue; } // Last open
   $add = ''; // Nesting - close open tags that need to be
-  for($j=-1, $cj=count($q); ++$j<$cj;){  
-   if(($d = array_pop($q)) == $e){break;}
-   else{$add .= "</{$d}>";}
+  for ($j = -1, $cj = count($q); ++$j < $cj;) {  
+   if (($d = array_pop($q)) == $e) {break; }
+   else {$add .= "</{$d}>"; }
   }
   echo $add, '</', $e, '>'; unset($e); continue;
  }
  // open tag
  // $cB ele needs $eB ele as child
- if(isset($cB[$e]) && strlen(trim($x))){
+ if (isset($cB[$e]) && strlen(trim($x))) {
   $t[$i] = "{$e}{$a}>";
-  array_splice($t, $i+1, 0, 'div>'. $x); unset($e, $x); ++$ci; --$i; continue;
+  array_splice($t, $i + 1, 0, 'div>'.$x); unset($e, $x); ++$ci; --$i; continue;
  }
- if((($ql && isset($cB[$p])) or (isset($cB[$in]) && !$ql)) && !isset($eB[$e]) && !isset($ok[$e])){
+ if ((($ql && isset($cB[$p])) or (isset($cB[$in]) && !$ql)) && !isset($eB[$e]) && !isset($ok[$e])) {
   array_splice($t, $i, 0, 'div>'); unset($e, $x); ++$ci; --$i; continue;
  }
  // if no open ele, $in = parent; mostly immediate parent-child relation should hold
- if(!$ql or !isset($eN[$e]) or !array_intersect($q, $cN2)){
-  if(!isset($ok[$e])){
-   if($ql && isset($cT[$p])){echo '</', array_pop($q), '>'; unset($e, $x); --$i;}
+ if (!$ql or !isset($eN[$e]) or !array_intersect($q, $cN2)) {
+  if (!isset($ok[$e])) {
+   if ($ql && isset($cT[$p])) {echo '</', array_pop($q), '>'; unset($e, $x); --$i; }
    continue;
   }
-  if(!isset($cE[$e])){$q[] = $e;}
+  if (!isset($cE[$e])) {$q[] = $e; }
   echo '<', $e, $a, '>'; unset($e); continue;
  }
  // specific parent-child
- if(isset($cS[$p][$e])){
-  if(!isset($cE[$e])){$q[] = $e;}
+ if (isset($cS[$p][$e])) {
+  if (!isset($cE[$e])) {$q[] = $e; }
   echo '<', $e, $a, '>'; unset($e); continue;
  }
  // nesting
  $add = '';
  $q2 = array();
- for($k=-1, $kc=count($q); ++$k<$kc;){
+ for ($k = -1, $kc = count($q); ++$k < $kc;) {
   $d = $q[$k];
   $ok2 = array();
-  if(isset($cS[$d])){$q2[] = $d; continue;}
+  if (isset($cS[$d])) {$q2[] = $d; continue; }
   $ok2 = isset($cI[$d]) ? $eI : $eF;
-  if(isset($cO[$d])){$ok2 = $ok2 + $cO[$d];}
-  if(isset($cN[$d])){$ok2 = array_diff_assoc($ok2, $cN[$d]);}
-  if(!isset($ok2[$e])){
-   if(!$k && !isset($inOk[$e])){continue 2;}
+  if (isset($cO[$d])) {$ok2 = $ok2 + $cO[$d]; }
+  if (isset($cN[$d])) {$ok2 = array_diff_assoc($ok2, $cN[$d]); }
+  if (!isset($ok2[$e])) {
+   if (!$k && !isset($inOk[$e])) {continue 2; }
    $add = "</{$d}>";
-   for(;++$k<$kc;){$add = "</{$q[$k]}>{$add}";}
+   for (;++$k < $kc;) {$add = "</{$q[$k]}>{$add}"; }
    break;
   }
-  else{$q2[] = $d;}
+  else {$q2[] = $d; }
  }
  $q = $q2;
- if(!isset($cE[$e])){$q[] = $e;}
+ if (!isset($cE[$e])) {$q[] = $e; }
  echo $add, '<', $e, $a, '>'; unset($e); continue;
 }
 
 // end
-if($ql = count($q)){
+if ($ql = count($q)) {
  $p = array_pop($q);
  $q[] = $p;
- if(isset($cS[$p])){$ok = $cS[$p];}
- elseif(isset($cI[$p])){$ok = $eI; $cI['del'] = 1; $cI['ins'] = 1;}
- elseif(isset($cF[$p])){$ok = $eF; unset($cI['del'], $cI['ins']);}
- elseif(isset($cB[$p])){$ok = $eB; unset($cI['del'], $cI['ins']);}
- if(isset($cO[$p])){$ok = $ok + $cO[$p];}
- if(isset($cN[$p])){$ok = array_diff_assoc($ok, $cN[$p]);}
-}else{$ok = $inOk; unset($cI['del'], $cI['ins']);}
-if(isset($e) && ($do == 1 or (isset($ok['#pcdata']) && ($do == 3 or $do == 5)))){
+ if (isset($cS[$p])) {$ok = $cS[$p]; }
+ elseif (isset($cI[$p])) {$ok = $eI; $cI['del'] = 1; $cI['ins'] = 1; }
+ elseif (isset($cF[$p])) {$ok = $eF; unset($cI['del'], $cI['ins']); }
+ elseif (isset($cB[$p])) {$ok = $eB; unset($cI['del'], $cI['ins']); }
+ if (isset($cO[$p])) {$ok = $ok + $cO[$p]; }
+ if (isset($cN[$p])) {$ok = array_diff_assoc($ok, $cN[$p]); }
+} else {$ok = $inOk; unset($cI['del'], $cI['ins']); }
+if (isset($e) && ($do == 1 or (isset($ok['#pcdata']) && ($do == 3 or $do == 5)))) {
  echo '&lt;', $s, $e, $a, '&gt;';
 }
-if(isset($x[0])){
- if(strlen(trim($x)) && (($ql && isset($cB[$p])) or (isset($cB[$in]) && !$ql))){
+if (isset($x[0])) {
+ if (strlen(trim($x)) && (($ql && isset($cB[$p])) or (isset($cB[$in]) && !$ql))) {
   echo '<div>', $x, '</div>';
  }
- elseif($do < 3 or isset($ok['#pcdata'])){echo $x;}
- elseif(strpos($x, "\x02\x04")){
-  foreach(preg_split('`(\x01\x02[^\x01\x02]+\x02\x01)`', $x, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY) as $v){
+ elseif ($do < 3 or isset($ok['#pcdata'])) {echo $x; }
+ elseif (strpos($x, "\x02\x04")) {
+  foreach (preg_split('`(\x01\x02[^\x01\x02]+\x02\x01)`', $x, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY) as $v) {
    echo (substr($v, 0, 2) == "\x01\x02" ? $v : ($do > 4 ? preg_replace('`\S`', '', $v) : ''));
   }
- }elseif($do > 4){echo preg_replace('`\S`', '', $x);}
+ }elseif ($do > 4) {echo preg_replace('`\S`', '', $x); }
 }
-while(!empty($q) && ($e = array_pop($q))){echo '</', $e, '>';}
+while (!empty($q) && ($e = array_pop($q))) {echo '</', $e, '>'; }
 $o = ob_get_contents();
 ob_end_clean();
 return $o;
 }
 
-public static function hl_cmtcd($t){
+public static function hl_cmtcd($t) {
 // comment/CDATA sec handler
 $t = $t[0];
 global $C;
-if(!($v = $C[$n = $t[3] == '-' ? 'comment' : 'cdata'])){return $t;}
-if($v == 1){return '';}
-if($n == 'comment' && $v < 4){
- if(substr(($t = preg_replace('`--+`', '-', substr($t, 4, -3))), -1) != ' '){$t .= ' ';}
+if (!($v = $C[$n = $t[3] == '-' ? 'comment' : 'cdata'])) {return $t; }
+if ($v == 1) {return ''; }
+if ($n == 'comment' && $v < 4) {
+ if (substr(($t = preg_replace('`--+`', '-', substr($t, 4, -3))), -1) != ' ') {$t .= ' '; }
 }
-else{$t = substr($t, 1, -1);}
+else {$t = substr($t, 1, -1); }
 $t = $v == 2 ? str_replace(array('&', '<', '>'), array('&amp;', '&lt;', '&gt;'), $t) : $t;
 return str_replace(array('&', '<', '>'), array("\x03", "\x04", "\x05"), ($n == 'comment' ? "\x01\x02\x04!--$t--\x05\x02\x01" : "\x01\x01\x04$t\x05\x01\x01"));
 }
 
-public static function hl_ent($t){
+public static function hl_ent($t) {
 // entitity handler
 global $C;
 $t = $t[1];
-static $U = array('quot'=>1,'amp'=>1,'lt'=>1,'gt'=>1);
-static $N = array('fnof'=>'402', 'Alpha'=>'913', 'Beta'=>'914', 'Gamma'=>'915', 'Delta'=>'916', 'Epsilon'=>'917', 'Zeta'=>'918', 'Eta'=>'919', 'Theta'=>'920', 'Iota'=>'921', 'Kappa'=>'922', 'Lambda'=>'923', 'Mu'=>'924', 'Nu'=>'925', 'Xi'=>'926', 'Omicron'=>'927', 'Pi'=>'928', 'Rho'=>'929', 'Sigma'=>'931', 'Tau'=>'932', 'Upsilon'=>'933', 'Phi'=>'934', 'Chi'=>'935', 'Psi'=>'936', 'Omega'=>'937', 'alpha'=>'945', 'beta'=>'946', 'gamma'=>'947', 'delta'=>'948', 'epsilon'=>'949', 'zeta'=>'950', 'eta'=>'951', 'theta'=>'952', 'iota'=>'953', 'kappa'=>'954', 'lambda'=>'955', 'mu'=>'956', 'nu'=>'957', 'xi'=>'958', 'omicron'=>'959', 'pi'=>'960', 'rho'=>'961', 'sigmaf'=>'962', 'sigma'=>'963', 'tau'=>'964', 'upsilon'=>'965', 'phi'=>'966', 'chi'=>'967', 'psi'=>'968', 'omega'=>'969', 'thetasym'=>'977', 'upsih'=>'978', 'piv'=>'982', 'bull'=>'8226', 'hellip'=>'8230', 'prime'=>'8242', 'Prime'=>'8243', 'oline'=>'8254', 'frasl'=>'8260', 'weierp'=>'8472', 'image'=>'8465', 'real'=>'8476', 'trade'=>'8482', 'alefsym'=>'8501', 'larr'=>'8592', 'uarr'=>'8593', 'rarr'=>'8594', 'darr'=>'8595', 'harr'=>'8596', 'crarr'=>'8629', 'lArr'=>'8656', 'uArr'=>'8657', 'rArr'=>'8658', 'dArr'=>'8659', 'hArr'=>'8660', 'forall'=>'8704', 'part'=>'8706', 'exist'=>'8707', 'empty'=>'8709', 'nabla'=>'8711', 'isin'=>'8712', 'notin'=>'8713', 'ni'=>'8715', 'prod'=>'8719', 'sum'=>'8721', 'minus'=>'8722', 'lowast'=>'8727', 'radic'=>'8730', 'prop'=>'8733', 'infin'=>'8734', 'ang'=>'8736', 'and'=>'8743', 'or'=>'8744', 'cap'=>'8745', 'cup'=>'8746', 'int'=>'8747', 'there4'=>'8756', 'sim'=>'8764', 'cong'=>'8773', 'asymp'=>'8776', 'ne'=>'8800', 'equiv'=>'8801', 'le'=>'8804', 'ge'=>'8805', 'sub'=>'8834', 'sup'=>'8835', 'nsub'=>'8836', 'sube'=>'8838', 'supe'=>'8839', 'oplus'=>'8853', 'otimes'=>'8855', 'perp'=>'8869', 'sdot'=>'8901', 'lceil'=>'8968', 'rceil'=>'8969', 'lfloor'=>'8970', 'rfloor'=>'8971', 'lang'=>'9001', 'rang'=>'9002', 'loz'=>'9674', 'spades'=>'9824', 'clubs'=>'9827', 'hearts'=>'9829', 'diams'=>'9830', 'apos'=>'39',  'OElig'=>'338', 'oelig'=>'339', 'Scaron'=>'352', 'scaron'=>'353', 'Yuml'=>'376', 'circ'=>'710', 'tilde'=>'732', 'ensp'=>'8194', 'emsp'=>'8195', 'thinsp'=>'8201', 'zwnj'=>'8204', 'zwj'=>'8205', 'lrm'=>'8206', 'rlm'=>'8207', 'ndash'=>'8211', 'mdash'=>'8212', 'lsquo'=>'8216', 'rsquo'=>'8217', 'sbquo'=>'8218', 'ldquo'=>'8220', 'rdquo'=>'8221', 'bdquo'=>'8222', 'dagger'=>'8224', 'Dagger'=>'8225', 'permil'=>'8240', 'lsaquo'=>'8249', 'rsaquo'=>'8250', 'euro'=>'8364', 'nbsp'=>'160', 'iexcl'=>'161', 'cent'=>'162', 'pound'=>'163', 'curren'=>'164', 'yen'=>'165', 'brvbar'=>'166', 'sect'=>'167', 'uml'=>'168', 'copy'=>'169', 'ordf'=>'170', 'laquo'=>'171', 'not'=>'172', 'shy'=>'173', 'reg'=>'174', 'macr'=>'175', 'deg'=>'176', 'plusmn'=>'177', 'sup2'=>'178', 'sup3'=>'179', 'acute'=>'180', 'micro'=>'181', 'para'=>'182', 'middot'=>'183', 'cedil'=>'184', 'sup1'=>'185', 'ordm'=>'186', 'raquo'=>'187', 'frac14'=>'188', 'frac12'=>'189', 'frac34'=>'190', 'iquest'=>'191', 'Agrave'=>'192', 'Aacute'=>'193', 'Acirc'=>'194', 'Atilde'=>'195', 'Auml'=>'196', 'Aring'=>'197', 'AElig'=>'198', 'Ccedil'=>'199', 'Egrave'=>'200', 'Eacute'=>'201', 'Ecirc'=>'202', 'Euml'=>'203', 'Igrave'=>'204', 'Iacute'=>'205', 'Icirc'=>'206', 'Iuml'=>'207', 'ETH'=>'208', 'Ntilde'=>'209', 'Ograve'=>'210', 'Oacute'=>'211', 'Ocirc'=>'212', 'Otilde'=>'213', 'Ouml'=>'214', 'times'=>'215', 'Oslash'=>'216', 'Ugrave'=>'217', 'Uacute'=>'218', 'Ucirc'=>'219', 'Uuml'=>'220', 'Yacute'=>'221', 'THORN'=>'222', 'szlig'=>'223', 'agrave'=>'224', 'aacute'=>'225', 'acirc'=>'226', 'atilde'=>'227', 'auml'=>'228', 'aring'=>'229', 'aelig'=>'230', 'ccedil'=>'231', 'egrave'=>'232', 'eacute'=>'233', 'ecirc'=>'234', 'euml'=>'235', 'igrave'=>'236', 'iacute'=>'237', 'icirc'=>'238', 'iuml'=>'239', 'eth'=>'240', 'ntilde'=>'241', 'ograve'=>'242', 'oacute'=>'243', 'ocirc'=>'244', 'otilde'=>'245', 'ouml'=>'246', 'divide'=>'247', 'oslash'=>'248', 'ugrave'=>'249', 'uacute'=>'250', 'ucirc'=>'251', 'uuml'=>'252', 'yacute'=>'253', 'thorn'=>'254', 'yuml'=>'255');
-if($t[0] != '#'){
- return ($C['and_mark'] ? "\x06" : '&'). (isset($U[$t]) ? $t : (isset($N[$t]) ? (!$C['named_entity'] ? '#'. ($C['hexdec_entity'] > 1 ? 'x'. dechex($N[$t]) : $N[$t]) : $t) : 'amp;'. $t)). ';';
+static $U = array('quot'=>1, 'amp'=>1, 'lt'=>1, 'gt'=>1);
+static $N = array('fnof'=>'402', 'Alpha'=>'913', 'Beta'=>'914', 'Gamma'=>'915', 'Delta'=>'916', 'Epsilon'=>'917', 'Zeta'=>'918', 'Eta'=>'919', 'Theta'=>'920', 'Iota'=>'921', 'Kappa'=>'922', 'Lambda'=>'923', 'Mu'=>'924', 'Nu'=>'925', 'Xi'=>'926', 'Omicron'=>'927', 'Pi'=>'928', 'Rho'=>'929', 'Sigma'=>'931', 'Tau'=>'932', 'Upsilon'=>'933', 'Phi'=>'934', 'Chi'=>'935', 'Psi'=>'936', 'Omega'=>'937', 'alpha'=>'945', 'beta'=>'946', 'gamma'=>'947', 'delta'=>'948', 'epsilon'=>'949', 'zeta'=>'950', 'eta'=>'951', 'theta'=>'952', 'iota'=>'953', 'kappa'=>'954', 'lambda'=>'955', 'mu'=>'956', 'nu'=>'957', 'xi'=>'958', 'omicron'=>'959', 'pi'=>'960', 'rho'=>'961', 'sigmaf'=>'962', 'sigma'=>'963', 'tau'=>'964', 'upsilon'=>'965', 'phi'=>'966', 'chi'=>'967', 'psi'=>'968', 'omega'=>'969', 'thetasym'=>'977', 'upsih'=>'978', 'piv'=>'982', 'bull'=>'8226', 'hellip'=>'8230', 'prime'=>'8242', 'Prime'=>'8243', 'oline'=>'8254', 'frasl'=>'8260', 'weierp'=>'8472', 'image'=>'8465', 'real'=>'8476', 'trade'=>'8482', 'alefsym'=>'8501', 'larr'=>'8592', 'uarr'=>'8593', 'rarr'=>'8594', 'darr'=>'8595', 'harr'=>'8596', 'crarr'=>'8629', 'lArr'=>'8656', 'uArr'=>'8657', 'rArr'=>'8658', 'dArr'=>'8659', 'hArr'=>'8660', 'forall'=>'8704', 'part'=>'8706', 'exist'=>'8707', 'empty'=>'8709', 'nabla'=>'8711', 'isin'=>'8712', 'notin'=>'8713', 'ni'=>'8715', 'prod'=>'8719', 'sum'=>'8721', 'minus'=>'8722', 'lowast'=>'8727', 'radic'=>'8730', 'prop'=>'8733', 'infin'=>'8734', 'ang'=>'8736', 'and'=>'8743', 'or'=>'8744', 'cap'=>'8745', 'cup'=>'8746', 'int'=>'8747', 'there4'=>'8756', 'sim'=>'8764', 'cong'=>'8773', 'asymp'=>'8776', 'ne'=>'8800', 'equiv'=>'8801', 'le'=>'8804', 'ge'=>'8805', 'sub'=>'8834', 'sup'=>'8835', 'nsub'=>'8836', 'sube'=>'8838', 'supe'=>'8839', 'oplus'=>'8853', 'otimes'=>'8855', 'perp'=>'8869', 'sdot'=>'8901', 'lceil'=>'8968', 'rceil'=>'8969', 'lfloor'=>'8970', 'rfloor'=>'8971', 'lang'=>'9001', 'rang'=>'9002', 'loz'=>'9674', 'spades'=>'9824', 'clubs'=>'9827', 'hearts'=>'9829', 'diams'=>'9830', 'apos'=>'39', 'OElig'=>'338', 'oelig'=>'339', 'Scaron'=>'352', 'scaron'=>'353', 'Yuml'=>'376', 'circ'=>'710', 'tilde'=>'732', 'ensp'=>'8194', 'emsp'=>'8195', 'thinsp'=>'8201', 'zwnj'=>'8204', 'zwj'=>'8205', 'lrm'=>'8206', 'rlm'=>'8207', 'ndash'=>'8211', 'mdash'=>'8212', 'lsquo'=>'8216', 'rsquo'=>'8217', 'sbquo'=>'8218', 'ldquo'=>'8220', 'rdquo'=>'8221', 'bdquo'=>'8222', 'dagger'=>'8224', 'Dagger'=>'8225', 'permil'=>'8240', 'lsaquo'=>'8249', 'rsaquo'=>'8250', 'euro'=>'8364', 'nbsp'=>'160', 'iexcl'=>'161', 'cent'=>'162', 'pound'=>'163', 'curren'=>'164', 'yen'=>'165', 'brvbar'=>'166', 'sect'=>'167', 'uml'=>'168', 'copy'=>'169', 'ordf'=>'170', 'laquo'=>'171', 'not'=>'172', 'shy'=>'173', 'reg'=>'174', 'macr'=>'175', 'deg'=>'176', 'plusmn'=>'177', 'sup2'=>'178', 'sup3'=>'179', 'acute'=>'180', 'micro'=>'181', 'para'=>'182', 'middot'=>'183', 'cedil'=>'184', 'sup1'=>'185', 'ordm'=>'186', 'raquo'=>'187', 'frac14'=>'188', 'frac12'=>'189', 'frac34'=>'190', 'iquest'=>'191', 'Agrave'=>'192', 'Aacute'=>'193', 'Acirc'=>'194', 'Atilde'=>'195', 'Auml'=>'196', 'Aring'=>'197', 'AElig'=>'198', 'Ccedil'=>'199', 'Egrave'=>'200', 'Eacute'=>'201', 'Ecirc'=>'202', 'Euml'=>'203', 'Igrave'=>'204', 'Iacute'=>'205', 'Icirc'=>'206', 'Iuml'=>'207', 'ETH'=>'208', 'Ntilde'=>'209', 'Ograve'=>'210', 'Oacute'=>'211', 'Ocirc'=>'212', 'Otilde'=>'213', 'Ouml'=>'214', 'times'=>'215', 'Oslash'=>'216', 'Ugrave'=>'217', 'Uacute'=>'218', 'Ucirc'=>'219', 'Uuml'=>'220', 'Yacute'=>'221', 'THORN'=>'222', 'szlig'=>'223', 'agrave'=>'224', 'aacute'=>'225', 'acirc'=>'226', 'atilde'=>'227', 'auml'=>'228', 'aring'=>'229', 'aelig'=>'230', 'ccedil'=>'231', 'egrave'=>'232', 'eacute'=>'233', 'ecirc'=>'234', 'euml'=>'235', 'igrave'=>'236', 'iacute'=>'237', 'icirc'=>'238', 'iuml'=>'239', 'eth'=>'240', 'ntilde'=>'241', 'ograve'=>'242', 'oacute'=>'243', 'ocirc'=>'244', 'otilde'=>'245', 'ouml'=>'246', 'divide'=>'247', 'oslash'=>'248', 'ugrave'=>'249', 'uacute'=>'250', 'ucirc'=>'251', 'uuml'=>'252', 'yacute'=>'253', 'thorn'=>'254', 'yuml'=>'255');
+if ($t[0] != '#') {
+ return ($C['and_mark'] ? "\x06" : '&').(isset($U[$t]) ? $t : (isset($N[$t]) ? (!$C['named_entity'] ? '#'.($C['hexdec_entity'] > 1 ? 'x'.dechex($N[$t]) : $N[$t]) : $t) : 'amp;'.$t)).';';
 }
-if(($n = ctype_digit($t = substr($t, 1)) ? intval($t) : hexdec(substr($t, 1))) < 9 or ($n > 13 && $n < 32) or $n == 11 or $n == 12 or ($n > 126 && $n < 160 && $n != 133) or ($n > 55295 && ($n < 57344 or ($n > 64975 && $n < 64992) or $n == 65534 or $n == 65535 or $n > 1114111))){
- return ($C['and_mark'] ? "\x06" : '&'). "amp;#{$t};";
+if (($n = ctype_digit($t = substr($t, 1)) ? intval($t) : hexdec(substr($t, 1))) < 9 or ($n > 13 && $n < 32) or $n == 11 or $n == 12 or ($n > 126 && $n < 160 && $n != 133) or ($n > 55295 && ($n < 57344 or ($n > 64975 && $n < 64992) or $n == 65534 or $n == 65535 or $n > 1114111))) {
+ return ($C['and_mark'] ? "\x06" : '&')."amp;#{$t};";
 }
-return ($C['and_mark'] ? "\x06" : '&'). '#'. (((ctype_digit($t) && $C['hexdec_entity'] < 2) or !$C['hexdec_entity']) ? $n : 'x'. dechex($n)). ';';
+return ($C['and_mark'] ? "\x06" : '&').'#'.(((ctype_digit($t) && $C['hexdec_entity'] < 2) or !$C['hexdec_entity']) ? $n : 'x'.dechex($n)).';';
 }
 
-public static function hl_prot($p, $c=null){
+public static function hl_prot($p, $c = null) {
 // check URL scheme
 global $C;
 $b = $a = '';
-if($c == null){$c = 'style'; $b = $p[1]; $a = $p[3]; $p = trim($p[2]);}
+if ($c == null) {$c = 'style'; $b = $p[1]; $a = $p[3]; $p = trim($p[2]); }
 $c = isset($C['schemes'][$c]) ? $C['schemes'][$c] : $C['schemes']['*'];
 static $d = 'denied:';
-if(isset($c['!']) && substr($p, 0, 7) != $d){$p = "$d$p";}
-if(isset($c['*']) or !strcspn($p, '#?;') or (substr($p, 0, 7) == $d)){return "{$b}{$p}{$a}";} // All ok, frag, query, param
-if(preg_match('`^([^:?[@!$()*,=/\'\]]+?)(:|&#(58|x3a);|%3a|\\\\0{0,4}3a).`i', $p, $m) && !isset($c[strtolower($m[1])])){ // Denied prot
+if (isset($c['!']) && substr($p, 0, 7) != $d) {$p = "$d$p"; }
+if (isset($c['*']) or !strcspn($p, '#?;') or (substr($p, 0, 7) == $d)) {return "{$b}{$p}{$a}"; } // All ok, frag, query, param
+if (preg_match('`^([^:?[@!$()*,=/\'\]]+?)(:|&#(58|x3a);|%3a|\\\\0{0,4}3a).`i', $p, $m) && !isset($c[strtolower($m[1])])) { // Denied prot
  return "{$b}{$d}{$p}{$a}";
 }
-if($C['abs_url']){
- if($C['abs_url'] == -1 && strpos($p, $C['base_url']) === 0){ // Make url rel
+if ($C['abs_url']) {
+ if ($C['abs_url'] == -1 && strpos($p, $C['base_url']) === 0) { // Make url rel
   $p = substr($p, strlen($C['base_url']));
- }elseif(empty($m[1])){ // Make URL abs
-  if(substr($p, 0, 2) == '//'){$p = substr($C['base_url'], 0, strpos($C['base_url'], ':')+1). $p;}
-  elseif($p[0] == '/'){$p = preg_replace('`(^.+?://[^/]+)(.*)`', '$1', $C['base_url']). $p;}
-  elseif(strcspn($p, './')){$p = $C['base_url']. $p;}
-  else{
+ }elseif (empty($m[1])) { // Make URL abs
+  if (substr($p, 0, 2) == '//') {$p = substr($C['base_url'], 0, strpos($C['base_url'], ':') + 1).$p; }
+  elseif ($p[0] == '/') {$p = preg_replace('`(^.+?://[^/]+)(.*)`', '$1', $C['base_url']).$p; }
+  elseif (strcspn($p, './')) {$p = $C['base_url'].$p; }
+  else {
    preg_match('`^([a-zA-Z\d\-+.]+://[^/]+)(.*)`', $C['base_url'], $m);
-   $p = preg_replace('`(?<=/)\./`', '', $m[2]. $p);
-   while(preg_match('`(?<=/)([^/]{3,}|[^/.]+?|\.[^/.]|[^/.]\.)/\.\./`', $p)){
+   $p = preg_replace('`(?<=/)\./`', '', $m[2].$p);
+   while (preg_match('`(?<=/)([^/]{3,}|[^/.]+?|\.[^/.]|[^/.]\.)/\.\./`', $p)) {
     $p = preg_replace('`(?<=/)([^/]{3,}|[^/.]+?|\.[^/.]|[^/.]\.)/\.\./`', '', $p);
    }
-   $p = $m[1]. $p;
+   $p = $m[1].$p;
   }
  }
 }
 return "{$b}{$p}{$a}";
 }
 
-public static function hl_regex($p){
+public static function hl_regex($p) {
 // check regex
-if(empty($p)){return 0;}
-if($v = function_exists('error_clear_last') && function_exists('error_get_last')){error_clear_last();}
-else{
- if($t = ini_get('track_errors')){$o = isset($php_errormsg) ? $php_errormsg : null;}
- else{ini_set('track_errors', 1);}
+if (empty($p)) {return 0; }
+if ($v = function_exists('error_clear_last') && function_exists('error_get_last')) {error_clear_last(); }
+else {
+ if ($t = ini_get('track_errors')) {$o = isset($php_errormsg) ? $php_errormsg : null; }
+ else {ini_set('track_errors', 1); }
  unset($php_errormsg);
 }
-if(($d = ini_get('display_errors'))){ini_set('display_errors', 0);}
+if (($d = ini_get('display_errors'))) {ini_set('display_errors', 0); }
 preg_match($p, '');
-if($v){$r = error_get_last() == null ? 1 : 0; }
-else{
+if ($v) {$r = error_get_last() == null ? 1 : 0; }
+else {
  $r = isset($php_errormsg) ? 0 : 1;
- if($t){$php_errormsg = isset($o) ? $o : null;}
- else{ini_set('track_errors', 0);}
+ if ($t) {$php_errormsg = isset($o) ? $o : null; }
+ else {ini_set('track_errors', 0); }
 }
-if($d){ini_set('display_errors', 1);}
+if ($d) {ini_set('display_errors', 1); }
 return $r;
 }
 
-public static function hl_spec($t){
+public static function hl_spec($t) {
 // final $spec
 $s = array();
-if(!function_exists('hl_aux1')){function hl_aux1($m){
+if (!function_exists('hl_aux1')) {function hl_aux1($m) {
  return substr(str_replace(array(";", "|", "~", " ", ",", "/", "(", ")", '`"'), array("\x01", "\x02", "\x03", "\x04", "\x05", "\x06", "\x07", "\x08", '"'), $m[0]), 1, -1);
 }}
 $t = str_replace(array("\t", "\r", "\n", ' '), '', preg_replace_callback('/"(?>(`.|[^"])*)"/sm', 'hl_aux1', trim($t))); 
-for($i = count(($t = explode(';', $t))); --$i>=0;){
+for ($i = count(($t = explode(';', $t))); --$i >= 0;) {
  $w = $t[$i];
- if(empty($w) or ($e = strpos($w, '=')) === false or !strlen(($a =  substr($w, $e+1)))){continue;}
+ if (empty($w) or ($e = strpos($w, '=')) === false or !strlen(($a = substr($w, $e + 1)))) {continue; }
  $y = $n = array();
- foreach(explode(',', $a) as $v){
-  if(!preg_match('`^([a-z:\-\*]+)(?:\((.*?)\))?`i', $v, $m)){continue;}
-  if(($x = strtolower($m[1])) == '-*'){$n['*'] = 1; continue;}
-  if($x[0] == '-'){$n[substr($x, 1)] = 1; continue;}
-  if(!isset($m[2])){$y[$x] = 1; continue;}
-  foreach(explode('/', $m[2]) as $m){
-   if(empty($m) or ($p = strpos($m, '=')) == 0 or $p < 5){$y[$x] = 1; continue;}
-   $y[$x][strtolower(substr($m, 0, $p))] = str_replace(array("\x01", "\x02", "\x03", "\x04", "\x05", "\x06", "\x07", "\x08"), array(";", "|", "~", " ", ",", "/", "(", ")"), substr($m, $p+1));
+ foreach (explode(',', $a) as $v) {
+  if (!preg_match('`^([a-z:\-\*]+)(?:\((.*?)\))?`i', $v, $m)) {continue; }
+  if (($x = strtolower($m[1])) == '-*') {$n['*'] = 1; continue; }
+  if ($x[0] == '-') {$n[substr($x, 1)] = 1; continue; }
+  if (!isset($m[2])) {$y[$x] = 1; continue; }
+  foreach (explode('/', $m[2]) as $m) {
+   if (empty($m) or ($p = strpos($m, '=')) == 0 or $p < 5) {$y[$x] = 1; continue; }
+   $y[$x][strtolower(substr($m, 0, $p))] = str_replace(array("\x01", "\x02", "\x03", "\x04", "\x05", "\x06", "\x07", "\x08"), array(";", "|", "~", " ", ",", "/", "(", ")"), substr($m, $p + 1));
   }
-  if(isset($y[$x]['match']) && !htmLawed::hl_regex($y[$x]['match'])){unset($y[$x]['match']);}
-  if(isset($y[$x]['nomatch']) && !htmLawed::hl_regex($y[$x]['nomatch'])){unset($y[$x]['nomatch']);}
+  if (isset($y[$x]['match']) && !htmLawed::hl_regex($y[$x]['match'])) {unset($y[$x]['match']); }
+  if (isset($y[$x]['nomatch']) && !htmLawed::hl_regex($y[$x]['nomatch'])) {unset($y[$x]['nomatch']); }
  }
- if(!count($y) && !count($n)){continue;}
- foreach(explode(',', substr($w, 0, $e)) as $v){
-  if(!strlen(($v = strtolower($v)))){continue;}
-  if(count($y)){if(!isset($s[$v])){$s[$v] = $y;} else{$s[$v] = array_merge($s[$v], $y);}}
-  if(count($n)){if(!isset($s[$v]['n'])){$s[$v]['n'] = $n;} else{$s[$v]['n'] = array_merge($s[$v]['n'], $n);}}
+ if (!count($y) && !count($n)) {continue; }
+ foreach (explode(',', substr($w, 0, $e)) as $v) {
+  if (!strlen(($v = strtolower($v)))) {continue; }
+  if (count($y)) {if (!isset($s[$v])) {$s[$v] = $y; } else {$s[$v] = array_merge($s[$v], $y); }}
+  if (count($n)) {if (!isset($s[$v]['n'])) {$s[$v]['n'] = $n; } else {$s[$v]['n'] = array_merge($s[$v]['n'], $n); }}
  }
 }
 return $s;
 }
 
-public static function hl_tag($t){
+public static function hl_tag($t) {
 // tag/attribute handler
 global $C;
 $t = $t[0];
 // invalid < >
-if($t == '< '){return '&lt; ';}
-if($t == '>'){return '&gt;';}
-if(!preg_match('`^<(/?)([a-zA-Z][a-zA-Z1-6]*)([^>]*?)\s?>$`m', $t, $m)){
+if ($t == '< ') {return '&lt; '; }
+if ($t == '>') {return '&gt;'; }
+if (!preg_match('`^<(/?)([a-zA-Z][a-zA-Z1-6]*)([^>]*?)\s?>$`m', $t, $m)) {
  return str_replace(array('<', '>'), array('&lt;', '&gt;'), $t);
-}elseif(!isset($C['elements'][($e = strtolower($m[2]))])){
- return (($C['keep_bad']%2) ? str_replace(array('<', '>'), array('&lt;', '&gt;'), $t) : '');
+}elseif (!isset($C['elements'][($e = strtolower($m[2]))])) {
+ return (($C['keep_bad'] % 2) ? str_replace(array('<', '>'), array('&lt;', '&gt;'), $t) : '');
 }
 // attr string
 $a = str_replace(array("\n", "\r", "\t"), ' ', trim($m[3]));
 // tag transform
 static $eD = array('acronym'=>1, 'applet'=>1, 'big'=>1, 'center'=>1, 'dir'=>1, 'font'=>1, 'isindex'=>1, 's'=>1, 'strike'=>1, 'tt'=>1); // Deprecated
-if($C['make_tag_strict'] && isset($eD[$e])){
+if ($C['make_tag_strict'] && isset($eD[$e])) {
  $trt = htmLawed::hl_tag2($e, $a, $C['make_tag_strict']);
- if(!$e){return (($C['keep_bad']%2) ? str_replace(array('<', '>'), array('&lt;', '&gt;'), $t) : '');}
+ if (!$e) {return (($C['keep_bad'] % 2) ? str_replace(array('<', '>'), array('&lt;', '&gt;'), $t) : ''); }
 }
 // close tag
 static $eE = array('area'=>1, 'br'=>1, 'col'=>1, 'command'=>1, 'embed'=>1, 'hr'=>1, 'img'=>1, 'input'=>1, 'isindex'=>1, 'keygen'=>1, 'link'=>1, 'meta'=>1, 'param'=>1, 'source'=>1, 'track'=>1, 'wbr'=>1); // Empty ele
-if(!empty($m[1])){
- return (!isset($eE[$e]) ? (empty($C['hook_tag']) ? "</$e>" : $C['hook_tag']($e)) : (($C['keep_bad'])%2 ? str_replace(array('<', '>'), array('&lt;', '&gt;'), $t) : ''));
+if (!empty($m[1])) {
+ return (!isset($eE[$e]) ? (empty($C['hook_tag']) ? "</$e>" : $C['hook_tag']($e)) : (($C['keep_bad']) % 2 ? str_replace(array('<', '>'), array('&lt;', '&gt;'), $t) : ''));
 }
 
 // open tag & attr
@@ -454,7 +454,7 @@ 
 static $aNP = array('action'=>1, 'cite'=>1, 'classid'=>1, 'codebase'=>1, 'data'=>1, 'href'=>1, 'itemtype'=>1, 'longdesc'=>1, 'model'=>1, 'pluginspage'=>1, 'pluginurl'=>1, 'src'=>1, 'srcset'=>1, 'usemap'=>1); // Need scheme check; excludes style, on*
 static $aNU = array('accesskey'=>1, 'class'=>1, 'contenteditable'=>1, 'contextmenu'=>1, 'dir'=>1, 'draggable'=>1, 'dropzone'=>1, 'hidden'=>1, 'id'=>1, 'inert'=>1, 'itemid'=>1, 'itemprop'=>1, 'itemref'=>1, 'itemscope'=>1, 'itemtype'=>1, 'lang'=>1, 'role'=>1, 'spellcheck'=>1, 'style'=>1, 'tabindex'=>1, 'title'=>1, 'translate'=>1, 'xmlns'=>1, 'xml:base'=>1, 'xml:lang'=>1, 'xml:space'=>1); // Univ; excludes on*, aria*
 
-if($C['lc_std_val']){
+if ($C['lc_std_val']) {
  // predef attr vals for $eAL & $aNE ele
  static $aNL = array('all'=>1, 'auto'=>1, 'baseline'=>1, 'bottom'=>1, 'button'=>1, 'captions'=>1, 'center'=>1, 'chapters'=>1, 'char'=>1, 'checkbox'=>1, 'circle'=>1, 'col'=>1, 'colgroup'=>1, 'color'=>1, 'cols'=>1, 'data'=>1, 'date'=>1, 'datetime'=>1, 'datetime-local'=>1, 'default'=>1, 'descriptions'=>1, 'email'=>1, 'file'=>1, 'get'=>1, 'groups'=>1, 'hidden'=>1, 'image'=>1, 'justify'=>1, 'left'=>1, 'ltr'=>1, 'metadata'=>1, 'middle'=>1, 'month'=>1, 'none'=>1, 'number'=>1, 'object'=>1, 'password'=>1, 'poly'=>1, 'post'=>1, 'preserve'=>1, 'radio'=>1, 'range'=>1, 'rect'=>1, 'ref'=>1, 'reset'=>1, 'right'=>1, 'row'=>1, 'rowgroup'=>1, 'rows'=>1, 'rtl'=>1, 'search'=>1, 'submit'=>1, 'subtitles'=>1, 'tel'=>1, 'text'=>1, 'time'=>1, 'top'=>1, 'url'=>1, 'week'=>1);
  static $eAL = array('a'=>1, 'area'=>1, 'bdo'=>1, 'button'=>1, 'col'=>1, 'fieldset'=>1, 'form'=>1, 'img'=>1, 'input'=>1, 'object'=>1, 'ol'=>1, 'optgroup'=>1, 'option'=>1, 'param'=>1, 'script'=>1, 'select'=>1, 'table'=>1, 'td'=>1, 'textarea'=>1, 'tfoot'=>1, 'th'=>1, 'thead'=>1, 'tr'=>1, 'track'=>1, 'xml:space'=>1);
@@ -462,7 +462,7 @@ 
 }
 
 $depTr = 0;
-if($C['no_deprecated_attr']){
+if ($C['no_deprecated_attr']) {
  // depr attr:applicable ele
  static $aND = array('align'=>array('caption'=>1, 'div'=>1, 'h1'=>1, 'h2'=>1, 'h3'=>1, 'h4'=>1, 'h5'=>1, 'h6'=>1, 'hr'=>1, 'img'=>1, 'input'=>1, 'legend'=>1, 'object'=>1, 'p'=>1, 'table'=>1), 'bgcolor'=>array('table'=>1, 'td'=>1, 'th'=>1, 'tr'=>1), 'border'=>array('object'=>1), 'bordercolor'=>array('table'=>1, 'td'=>1, 'tr'=>1), 'cellspacing'=>array('table'=>1), 'clear'=>array('br'=>1), 'compact'=>array('dl'=>1, 'ol'=>1, 'ul'=>1), 'height'=>array('td'=>1, 'th'=>1), 'hspace'=>array('img'=>1, 'object'=>1), 'language'=>array('script'=>1), 'name'=>array('a'=>1, 'form'=>1, 'iframe'=>1, 'img'=>1, 'map'=>1), 'noshade'=>array('hr'=>1), 'nowrap'=>array('td'=>1, 'th'=>1), 'size'=>array('hr'=>1), 'vspace'=>array('img'=>1, 'object'=>1), 'width'=>array('hr'=>1, 'pre'=>1, 'table'=>1, 'td'=>1, 'th'=>1));
  static $eAD = array('a'=>1, 'br'=>1, 'caption'=>1, 'div'=>1, 'dl'=>1, 'form'=>1, 'h1'=>1, 'h2'=>1, 'h3'=>1, 'h4'=>1, 'h5'=>1, 'h6'=>1, 'hr'=>1, 'iframe'=>1, 'img'=>1, 'input'=>1, 'legend'=>1, 'map'=>1, 'object'=>1, 'ol'=>1, 'p'=>1, 'pre'=>1, 'script'=>1, 'table'=>1, 'td'=>1, 'th'=>1, 'tr'=>1, 'ul'=>1);
@@ -470,213 +470,213 @@ 
 }
 
 // attr name-vals
-if(strpos($a, "\x01") !== false){$a = preg_replace('`\x01[^\x01]*\x01`', '', $a);} // No comment/CDATA sec
+if (strpos($a, "\x01") !== false) {$a = preg_replace('`\x01[^\x01]*\x01`', '', $a); } // No comment/CDATA sec
 $mode = 0; $a = trim($a, ' /'); $aA = array();
-while(strlen($a)){
+while (strlen($a)) {
  $w = 0;
- switch($mode){
+ switch ($mode) {
   case 0: // Name
-   if(preg_match('`^[a-zA-Z][^\s=/]+`', $a, $m)){
+   if (preg_match('`^[a-zA-Z][^\s=/]+`', $a, $m)) {
     $nm = strtolower($m[0]);
     $w = $mode = 1; $a = ltrim(substr_replace($a, '', 0, strlen($m[0])));
    }
   break; case 1:
-   if($a[0] == '='){ // =
+   if ($a[0] == '=') { // =
     $w = 1; $mode = 2; $a = ltrim($a, '= ');
-   }else{ // No val
+   } else { // No val
     $w = 1; $mode = 0; $a = ltrim($a);
     $aA[$nm] = '';
    }
   break; case 2: // Val
-   if(preg_match('`^((?:"[^"]*")|(?:\'[^\']*\')|(?:\s*[^\s"\']+))(.*)`', $a, $m)){
+   if (preg_match('`^((?:"[^"]*")|(?:\'[^\']*\')|(?:\s*[^\s"\']+))(.*)`', $a, $m)) {
     $a = ltrim($m[2]); $m = $m[1]; $w = 1; $mode = 0;
     $aA[$nm] = trim(str_replace('<', '&lt;', ($m[0] == '"' or $m[0] == '\'') ? substr($m, 1, -1) : $m));
    }
   break;
  }
- if($w == 0){ // Parse errs, deal with space, " & '
+ if ($w == 0) { // Parse errs, deal with space, " & '
   $a = preg_replace('`^(?:"[^"]*("|$)|\'[^\']*(\'|$)|\S)*\s*`', '', $a);
   $mode = 0;
  }
 }
-if($mode == 1){$aA[$nm] = '';}
+if ($mode == 1) {$aA[$nm] = ''; }
 
 // clean attrs
 global $S;
 $rl = isset($S[$e]) ? $S[$e] : array();
 $a = array(); $nfr = 0; $d = $C['deny_attribute'];
-foreach($aA as $k=>$v){
- if(((isset($d['*']) ? isset($d[$k]) : !isset($d[$k])) && (isset($aN[$k][$e]) or isset($aNU[$k]) or (isset($aNO[$k]) && !isset($d['on*'])) or (isset($aNA[$k]) && !isset($d['aria*'])) or (!isset($d['data*']) && preg_match('`data-((?!xml)[^:]+$)`', $k))) && !isset($rl['n'][$k]) && !isset($rl['n']['*'])) or isset($rl[$k])){
-  if(isset($aNE[$k])){$v = $k;}
-  elseif(!empty($lcase) && (($e != 'button' or $e != 'input') or $k == 'type')){ // Rather loose but ?not cause issues
+foreach ($aA as $k=>$v) {
+ if (((isset($d['*']) ? isset($d[$k]) : !isset($d[$k])) && (isset($aN[$k][$e]) or isset($aNU[$k]) or (isset($aNO[$k]) && !isset($d['on*'])) or (isset($aNA[$k]) && !isset($d['aria*'])) or (!isset($d['data*']) && preg_match('`data-((?!xml)[^:]+$)`', $k))) && !isset($rl['n'][$k]) && !isset($rl['n']['*'])) or isset($rl[$k])) {
+  if (isset($aNE[$k])) {$v = $k; }
+  elseif (!empty($lcase) && (($e != 'button' or $e != 'input') or $k == 'type')) { // Rather loose but ?not cause issues
    $v = (isset($aNL[($v2 = strtolower($v))])) ? $v2 : $v;
   }
-  if($k == 'style' && !$C['style_pass']){
-   if(false !== strpos($v, '&#')){
+  if ($k == 'style' && !$C['style_pass']) {
+   if (false !== strpos($v, '&#')) {
     static $sC = array('&#x20;'=>' ', '&#32;'=>' ', '&#x45;'=>'e', '&#69;'=>'e', '&#x65;'=>'e', '&#101;'=>'e', '&#x58;'=>'x', '&#88;'=>'x', '&#x78;'=>'x', '&#120;'=>'x', '&#x50;'=>'p', '&#80;'=>'p', '&#x70;'=>'p', '&#112;'=>'p', '&#x53;'=>'s', '&#83;'=>'s', '&#x73;'=>'s', '&#115;'=>'s', '&#x49;'=>'i', '&#73;'=>'i', '&#x69;'=>'i', '&#105;'=>'i', '&#x4f;'=>'o', '&#79;'=>'o', '&#x6f;'=>'o', '&#111;'=>'o', '&#x4e;'=>'n', '&#78;'=>'n', '&#x6e;'=>'n', '&#110;'=>'n', '&#x55;'=>'u', '&#85;'=>'u', '&#x75;'=>'u', '&#117;'=>'u', '&#x52;'=>'r', '&#82;'=>'r', '&#x72;'=>'r', '&#114;'=>'r', '&#x4c;'=>'l', '&#76;'=>'l', '&#x6c;'=>'l', '&#108;'=>'l', '&#x28;'=>'(', '&#40;'=>'(', '&#x29;'=>')', '&#41;'=>')', '&#x20;'=>':', '&#32;'=>':', '&#x22;'=>'"', '&#34;'=>'"', '&#x27;'=>"'", '&#39;'=>"'", '&#x2f;'=>'/', '&#47;'=>'/', '&#x2a;'=>'*', '&#42;'=>'*', '&#x5c;'=>'\\', '&#92;'=>'\\');
     $v = strtr($v, $sC);
    }
    $v = preg_replace_callback('`(url(?:\()(?: )*(?:\'|"|&(?:quot|apos);)?)(.+?)((?:\'|"|&(?:quot|apos);)?(?: )*(?:\)))`iS', 'htmLawed::hl_prot', $v);
    $v = !$C['css_expression'] ? preg_replace('`expression`i', ' ', preg_replace('`\\\\\S|(/|(%2f))(\*|(%2a))`i', ' ', $v)) : $v;
-  }elseif(isset($aNP[$k]) or isset($aNO[$k])){
+  }elseif (isset($aNP[$k]) or isset($aNO[$k])) {
    $v = str_replace("­", ' ', (strpos($v, '&') !== false ? str_replace(array('&#xad;', '&#173;', '&shy;'), ' ', $v) : $v)); # double-quoted char: soft-hyphen; appears here as "­" or hyphen or something else depending on viewing software
-   if($k == 'srcset'){
+   if ($k == 'srcset') {
     $v2 = '';
-    foreach(explode(',', $v) as $k1=>$v1){
+    foreach (explode(',', $v) as $k1=>$v1) {
      $v1 = explode(' ', ltrim($v1), 2);
      $k1 = isset($v1[1]) ? trim($v1[1]) : '';
      $v1 = trim($v1[0]);
-     if(isset($v1[0])){$v2 .= htmLawed::hl_prot($v1, $k). (empty($k1) ? '' : ' '. $k1). ', ';}
+     if (isset($v1[0])) {$v2 .= htmLawed::hl_prot($v1, $k).(empty($k1) ? '' : ' '.$k1).', '; }
     }
     $v = trim($v2, ', ');
    }
-   if($k == 'itemtype'){
+   if ($k == 'itemtype') {
     $v2 = '';
-    foreach(explode(' ', $v) as $v1){
-     if(isset($v1[0])){$v2 .= htmLawed::hl_prot($v1, $k). ' ';}
+    foreach (explode(' ', $v) as $v1) {
+     if (isset($v1[0])) {$v2 .= htmLawed::hl_prot($v1, $k).' '; }
     }
     $v = trim($v2, ' ');
    }
-   else{$v = htmLawed::hl_prot($v, $k);}
-   if($k == 'href'){ // X-spam
-    if($C['anti_mail_spam'] && strpos($v, 'mailto:') === 0){
+   else {$v = htmLawed::hl_prot($v, $k); }
+   if ($k == 'href') { // X-spam
+    if ($C['anti_mail_spam'] && strpos($v, 'mailto:') === 0) {
      $v = str_replace('@', htmlspecialchars($C['anti_mail_spam']), $v);
-    }elseif($C['anti_link_spam']){
+    }elseif ($C['anti_link_spam']) {
      $r1 = $C['anti_link_spam'][1];
-     if(!empty($r1) && preg_match($r1, $v)){continue;}
+     if (!empty($r1) && preg_match($r1, $v)) {continue; }
      $r0 = $C['anti_link_spam'][0];
-     if(!empty($r0) && preg_match($r0, $v)){
-      if(isset($a['rel'])){
-       if(!preg_match('`\bnofollow\b`i', $a['rel'])){$a['rel'] .= ' nofollow';}
-      }elseif(isset($aA['rel'])){
-       if(!preg_match('`\bnofollow\b`i', $aA['rel'])){$nfr = 1;}
-      }else{$a['rel'] = 'nofollow';}
+     if (!empty($r0) && preg_match($r0, $v)) {
+      if (isset($a['rel'])) {
+       if (!preg_match('`\bnofollow\b`i', $a['rel'])) {$a['rel'] .= ' nofollow'; }
+      }elseif (isset($aA['rel'])) {
+       if (!preg_match('`\bnofollow\b`i', $aA['rel'])) {$nfr = 1; }
+      } else {$a['rel'] = 'nofollow'; }
      }
     }
    }
   }
-  if(isset($rl[$k]) && is_array($rl[$k]) && ($v = htmLawed::hl_attrval($k, $v, $rl[$k])) === 0){continue;}
+  if (isset($rl[$k]) && is_array($rl[$k]) && ($v = htmLawed::hl_attrval($k, $v, $rl[$k])) === 0) {continue; }
   $a[$k] = str_replace('"', '&quot;', $v);
  }
 }
-if($nfr){$a['rel'] = isset($a['rel']) ? $a['rel']. ' nofollow' : 'nofollow';}
+if ($nfr) {$a['rel'] = isset($a['rel']) ? $a['rel'].' nofollow' : 'nofollow'; }
 
 // rqd attr
 static $eAR = array('area'=>array('alt'=>'area'), 'bdo'=>array('dir'=>'ltr'), 'command'=>array('label'=>''), 'form'=>array('action'=>''), 'img'=>array('src'=>'', 'alt'=>'image'), 'map'=>array('name'=>''), 'optgroup'=>array('label'=>''), 'param'=>array('name'=>''), 'style'=>array('scoped'=>''), 'textarea'=>array('rows'=>'10', 'cols'=>'50'));
-if(isset($eAR[$e])){
- foreach($eAR[$e] as $k=>$v){
-  if(!isset($a[$k])){$a[$k] = isset($v[0]) ? $v : $k;}
+if (isset($eAR[$e])) {
+ foreach ($eAR[$e] as $k=>$v) {
+  if (!isset($a[$k])) {$a[$k] = isset($v[0]) ? $v : $k; }
  }
 }
 
 // depr attr
-if($depTr){
+if ($depTr) {
  $c = array();
- foreach($a as $k=>$v){
-  if($k == 'style' or !isset($aND[$k][$e])){continue;}
+ foreach ($a as $k=>$v) {
+  if ($k == 'style' or !isset($aND[$k][$e])) {continue; }
   $v = str_replace(array('\\', ':', ';', '&#'), '', $v);
-  if($k == 'align'){
+  if ($k == 'align') {
    unset($a['align']);
-   if($e == 'img' && ($v == 'left' or $v == 'right')){$c[] = 'float: '. $v;}
-   elseif(($e == 'div' or $e == 'table') && $v == 'center'){$c[] = 'margin: auto';}
-   else{$c[] = 'text-align: '. $v;}
-  }elseif($k == 'bgcolor'){
+   if ($e == 'img' && ($v == 'left' or $v == 'right')) {$c[] = 'float: '.$v; }
+   elseif (($e == 'div' or $e == 'table') && $v == 'center') {$c[] = 'margin: auto'; }
+   else {$c[] = 'text-align: '.$v; }
+  }elseif ($k == 'bgcolor') {
    unset($a['bgcolor']);
-   $c[] = 'background-color: '. $v;
-  }elseif($k == 'border'){
+   $c[] = 'background-color: '.$v;
+  }elseif ($k == 'border') {
    unset($a['border']); $c[] = "border: {$v}px";
-  }elseif($k == 'bordercolor'){
-   unset($a['bordercolor']); $c[] = 'border-color: '. $v;
-  }elseif($k == 'cellspacing'){
+  }elseif ($k == 'bordercolor') {
+   unset($a['bordercolor']); $c[] = 'border-color: '.$v;
+  }elseif ($k == 'cellspacing') {
    unset($a['cellspacing']); $c[] = "border-spacing: {$v}px";
-  }elseif($k == 'clear'){
-   unset($a['clear']); $c[] = 'clear: '. ($v != 'all' ? $v : 'both');
-  }elseif($k == 'compact'){
+  }elseif ($k == 'clear') {
+   unset($a['clear']); $c[] = 'clear: '.($v != 'all' ? $v : 'both');
+  }elseif ($k == 'compact') {
    unset($a['compact']); $c[] = 'font-size: 85%';
-  }elseif($k == 'height' or $k == 'width'){
-   unset($a[$k]); $c[] = $k. ': '. ($v[0] != '*' ? $v. (ctype_digit($v) ? 'px' : '') : 'auto');
-  }elseif($k == 'hspace'){
+  }elseif ($k == 'height' or $k == 'width') {
+   unset($a[$k]); $c[] = $k.': '.($v[0] != '*' ? $v.(ctype_digit($v) ? 'px' : '') : 'auto');
+  }elseif ($k == 'hspace') {
    unset($a['hspace']); $c[] = "margin-left: {$v}px; margin-right: {$v}px";
-  }elseif($k == 'language' && !isset($a['type'])){
+  }elseif ($k == 'language' && !isset($a['type'])) {
    unset($a['language']);
-   $a['type'] = 'text/'. strtolower($v);
-  }elseif($k == 'name'){
-   if($C['no_deprecated_attr'] == 2 or ($e != 'a' && $e != 'map')){unset($a['name']);}
-   if(!isset($a['id']) && !preg_match('`\W`', $v)){$a['id'] = $v;}
-  }elseif($k == 'noshade'){
+   $a['type'] = 'text/'.strtolower($v);
+  }elseif ($k == 'name') {
+   if ($C['no_deprecated_attr'] == 2 or ($e != 'a' && $e != 'map')) {unset($a['name']); }
+   if (!isset($a['id']) && !preg_match('`\W`', $v)) {$a['id'] = $v; }
+  }elseif ($k == 'noshade') {
    unset($a['noshade']); $c[] = 'border-style: none; border: 0; background-color: gray; color: gray';
-  }elseif($k == 'nowrap'){
+  }elseif ($k == 'nowrap') {
    unset($a['nowrap']); $c[] = 'white-space: nowrap';
-  }elseif($k == 'size'){
-   unset($a['size']); $c[] = 'size: '. $v. 'px';
-  }elseif($k == 'vspace'){
+  }elseif ($k == 'size') {
+   unset($a['size']); $c[] = 'size: '.$v.'px';
+  }elseif ($k == 'vspace') {
    unset($a['vspace']); $c[] = "margin-top: {$v}px; margin-bottom: {$v}px";
   }
  }
- if(count($c)){
+ if (count($c)) {
   $c = implode('; ', $c);
-  $a['style'] = isset($a['style']) ? rtrim($a['style'], ' ;'). '; '. $c. ';': $c. ';';
+  $a['style'] = isset($a['style']) ? rtrim($a['style'], ' ;').'; '.$c.';' : $c.';';
  }
 }
 // unique ID
-if($C['unique_ids'] && isset($a['id'])){
- if(preg_match('`\s`', ($id = $a['id'])) or (isset($GLOBALS['hl_Ids'][$id]) && $C['unique_ids'] == 1)){unset($a['id']);
- }else{
-  while(isset($GLOBALS['hl_Ids'][$id])){$id = $C['unique_ids']. $id;}
+if ($C['unique_ids'] && isset($a['id'])) {
+ if (preg_match('`\s`', ($id = $a['id'])) or (isset($GLOBALS['hl_Ids'][$id]) && $C['unique_ids'] == 1)) {unset($a['id']);
+ } else {
+  while (isset($GLOBALS['hl_Ids'][$id])) {$id = $C['unique_ids'].$id; }
   $GLOBALS['hl_Ids'][($a['id'] = $id)] = 1;
  }
 }
 // xml:lang
-if($C['xml:lang'] && isset($a['lang'])){
+if ($C['xml:lang'] && isset($a['lang'])) {
  $a['xml:lang'] = isset($a['xml:lang']) ? $a['xml:lang'] : $a['lang'];
- if($C['xml:lang'] == 2){unset($a['lang']);}
+ if ($C['xml:lang'] == 2) {unset($a['lang']); }
 }
 // for transformed tag
-if(!empty($trt)){
- $a['style'] = isset($a['style']) ? rtrim($a['style'], ' ;'). '; '. $trt : $trt;
+if (!empty($trt)) {
+ $a['style'] = isset($a['style']) ? rtrim($a['style'], ' ;').'; '.$trt : $trt;
 }
 // return with empty ele /
-if(empty($C['hook_tag'])){
+if (empty($C['hook_tag'])) {
  $aA = '';
- foreach($a as $k=>$v){$aA .= " {$k}=\"{$v}\"";}
- return "<{$e}{$aA}". (isset($eE[$e]) ? ' /' : ''). '>';
+ foreach ($a as $k=>$v) {$aA .= " {$k}=\"{$v}\""; }
+ return "<{$e}{$aA}".(isset($eE[$e]) ? ' /' : '').'>';
 }
-else{return $C['hook_tag']($e, $a);}
+else {return $C['hook_tag']($e, $a); }
 }
 
-public static function hl_tag2(&$e, &$a, $t=1){
+public static function hl_tag2(&$e, &$a, $t = 1) {
 // transform tag
-if($e == 'big'){$e = 'span'; return 'font-size: larger;';}
-if($e == 's' or $e == 'strike'){$e = 'span'; return 'text-decoration: line-through;';}
-if($e == 'tt'){$e = 'code'; return '';}
-if($e == 'center'){$e = 'div'; return 'text-align: center;';}
+if ($e == 'big') {$e = 'span'; return 'font-size: larger;'; }
+if ($e == 's' or $e == 'strike') {$e = 'span'; return 'text-decoration: line-through;'; }
+if ($e == 'tt') {$e = 'code'; return ''; }
+if ($e == 'center') {$e = 'div'; return 'text-align: center;'; }
 static $fs = array('0'=>'xx-small', '1'=>'xx-small', '2'=>'small', '3'=>'medium', '4'=>'large', '5'=>'x-large', '6'=>'xx-large', '7'=>'300%', '-1'=>'smaller', '-2'=>'60%', '+1'=>'larger', '+2'=>'150%', '+3'=>'200%', '+4'=>'300%');
-if($e == 'font'){
+if ($e == 'font') {
  $a2 = '';
- while(preg_match('`(^|\s)(color|size)\s*=\s*(\'|")?(.+?)(\\3|\s|$)`i', $a, $m)){
+ while (preg_match('`(^|\s)(color|size)\s*=\s*(\'|")?(.+?)(\\3|\s|$)`i', $a, $m)) {
   $a = str_replace($m[0], ' ', $a);
-  $a2 .= strtolower($m[2]) == 'color' ? (' color: '. str_replace('"', '\'', trim($m[4])). ';') : (isset($fs[($m = trim($m[4]))]) ? ($a2 .= ' font-size: '. str_replace('"', '\'', $fs[$m]). ';') : '');
+  $a2 .= strtolower($m[2]) == 'color' ? (' color: '.str_replace('"', '\'', trim($m[4])).';') : (isset($fs[($m = trim($m[4]))]) ? ($a2 .= ' font-size: '.str_replace('"', '\'', $fs[$m]).';') : '');
  }
- while(preg_match('`(^|\s)face\s*=\s*(\'|")?([^=]+?)\\2`i', $a, $m) or preg_match('`(^|\s)face\s*=(\s*)(\S+)`i', $a, $m)){
+ while (preg_match('`(^|\s)face\s*=\s*(\'|")?([^=]+?)\\2`i', $a, $m) or preg_match('`(^|\s)face\s*=(\s*)(\S+)`i', $a, $m)) {
   $a = str_replace($m[0], ' ', $a);
-  $a2 .= ' font-family: '. str_replace('"', '\'', trim($m[3])). ';';
+  $a2 .= ' font-family: '.str_replace('"', '\'', trim($m[3])).';';
  }
  $e = 'span'; return ltrim(str_replace('<', '', $a2));
 }
-if($e == 'acronym'){$e = 'abbr'; return '';}
-if($e == 'dir'){$e = 'ul'; return '';}
-if($t == 2){$e = 0; return 0;}
+if ($e == 'acronym') {$e = 'abbr'; return ''; }
+if ($e == 'dir') {$e = 'ul'; return ''; }
+if ($t == 2) {$e = 0; return 0; }
 return '';
 }
 
-public static function hl_tidy($t, $w, $p){
+public static function hl_tidy($t, $w, $p) {
 // tidy/compact HTM
-if(strpos(' pre,script,textarea', "$p,")){return $t;}
-if(!function_exists('hl_aux2')){function hl_aux2($m){
- return $m[1]. str_replace(array("<", ">", "\n", "\r", "\t", ' '), array("\x01", "\x02", "\x03", "\x04", "\x05", "\x07"), $m[3]). $m[4];
+if (strpos(' pre,script,textarea', "$p,")) {return $t; }
+if (!function_exists('hl_aux2')) {function hl_aux2($m) {
+ return $m[1].str_replace(array("<", ">", "\n", "\r", "\t", ' '), array("\x01", "\x02", "\x03", "\x04", "\x05", "\x07"), $m[3]).$m[4];
 }}
 $t = preg_replace(array('`(<\w[^>]*(?<!/)>)\s+`', '`\s+`', '`(<\w[^>]*(?<!/)>) `'), array(' $1', ' ', '$1'), preg_replace_callback(array('`(<(!\[CDATA\[))(.+?)(\]\]>)`sm', '`(<(!--))(.+?)(-->)`sm', '`(<(pre|script|textarea)[^>]*?>)(.+?)(</\2>)`sm'), 'hl_aux2', $t));
-if(($w = strtolower($w)) == -1){
+if (($w = strtolower($w)) == -1) {
  return str_replace(array("\x01", "\x02", "\x03", "\x04", "\x05", "\x07"), array('<', '>', "\n", "\r", "\t", ' '), $t);
 }
 $s = strpos(" $w", 't') ? "\t" : ' ';
@@ -688,45 +688,45 @@ 
 $d = array('address'=>1, 'article'=>1, 'aside'=>1, 'blockquote'=>1, 'center'=>1, 'colgroup'=>1, 'datalist'=>1, 'details'=>1, 'dir'=>1, 'div'=>1, 'dl'=>1, 'fieldset'=>1, 'figure'=>1, 'footer'=>1, 'form'=>1, 'header'=>1, 'hgroup'=>1, 'hr'=>1, 'iframe'=>1, 'main'=>1, 'map'=>1, 'menu'=>1, 'nav'=>1, 'noscript'=>1, 'ol'=>1, 'optgroup'=>1, 'rbc'=>1, 'rtc'=>1, 'ruby'=>1, 'script'=>1, 'section'=>1, 'select'=>1, 'table'=>1, 'tbody'=>1, 'tfoot'=>1, 'thead'=>1, 'tr'=>1, 'ul'=>1);
 $T = explode('<', $t);
 $X = 1;
-while($X){
+while ($X) {
  $n = $N;
  $t = $T;
  ob_start();
- if(isset($d[$p])){echo str_repeat($s, ++$n);}
+ if (isset($d[$p])) {echo str_repeat($s, ++$n); }
  echo ltrim(array_shift($t));
- for($i=-1, $j=count($t); ++$i<$j;){
+ for ($i = -1, $j = count($t); ++$i < $j;) {
   $r = ''; list($e, $r) = explode('>', $t[$i]);
   $x = $e[0] == '/' ? 0 : (substr($e, -1) == '/' ? 1 : ($e[0] != '!' ? 2 : -1));
   $y = !$x ? ltrim($e, '/') : ($x > 0 ? substr($e, 0, strcspn($e, ' ')) : 0);
   $e = "<$e>"; 
-  if(isset($d[$y])){
-   if(!$x){
-    if($n){echo "\n", str_repeat($s, --$n), "$e\n", str_repeat($s, $n);}
-    else{++$N; ob_end_clean(); continue 2;}
+  if (isset($d[$y])) {
+   if (!$x) {
+    if ($n) {echo "\n", str_repeat($s, --$n), "$e\n", str_repeat($s, $n); }
+    else {++$N; ob_end_clean(); continue 2; }
    }
-   else{echo "\n", str_repeat($s, $n), "$e\n", str_repeat($s, ($x != 1 ? ++$n : $n));}
+   else {echo "\n", str_repeat($s, $n), "$e\n", str_repeat($s, ($x != 1 ? ++$n : $n)); }
    echo $r; continue;
   }
-  $f = "\n". str_repeat($s, $n);
-  if(isset($c[$y])){
-   if(!$x){echo $e, $f, $r;}
-   else{echo $f, $e, $r;}
-  }elseif(isset($b[$y])){echo $f, $e, $r;
-  }elseif(isset($a[$y])){echo $e, $f, $r;
-  }elseif(!$y){echo $f, $e, $f, $r;
-  }else{echo $e, $r;}
+  $f = "\n".str_repeat($s, $n);
+  if (isset($c[$y])) {
+   if (!$x) {echo $e, $f, $r; }
+   else {echo $f, $e, $r; }
+  }elseif (isset($b[$y])) {echo $f, $e, $r;
+  }elseif (isset($a[$y])) {echo $e, $f, $r;
+  }elseif (!$y) {echo $f, $e, $f, $r;
+  } else {echo $e, $r; }
  }
  $X = 0;
 }
 $t = str_replace(array("\n ", " \n"), "\n", preg_replace('`[\n]\s*?[\n]+`', "\n", ob_get_contents()));
 ob_end_clean();
-if(($l = strpos(" $w", 'r') ? (strpos(" $w", 'n') ? "\r\n" : "\r") : 0)){
+if (($l = strpos(" $w", 'r') ? (strpos(" $w", 'n') ? "\r\n" : "\r") : 0)) {
  $t = str_replace("\n", $l, $t);
 }
 return str_replace(array("\x01", "\x02", "\x03", "\x04", "\x05", "\x07"), array('<', '>', "\n", "\r", "\t", ' '), $t);
 }
 
-public static function hl_version(){
+public static function hl_version() {
 // version
 return '1.2.4.1';
 }

Braces +51 added lines, -84 removed lines

@@ -26,9 +26,7 @@ 
  unset($e['applet'], $e['audio'], $e['canvas'], $e['embed'], $e['iframe'], $e['object'], $e['script'], $e['video']);
 }
 $x = !empty($C['elements']) ? str_replace(array("\n", "\r", "\t", ' '), '', $C['elements']) : '*';
-if($x == '-*'){$e = array();}
-elseif(strpos($x, '*') === false){$e = array_flip(explode(',', $x));}
-else{
+if($x == '-*'){$e = array();} elseif(strpos($x, '*') === false){$e = array_flip(explode(',', $x));} else{
  if(isset($x[1])){
   preg_match_all('`(?:^|-|\+)[^\-+]+?(?=-|\+|$)`', $x, $m, PREG_SET_ORDER);
   for($i=count($m); --$i>=0;){$m[$i] = $m[$i][0];}
@@ -176,10 +174,7 @@ 
 if(isset($cE[$in])){
  return (!$do ? '' : str_replace(array('<', '>'), array('&lt;', '&gt;'), $t));
 }
-if(isset($cS[$in])){$inOk = $cS[$in];}
-elseif(isset($cI[$in])){$inOk = $eI; $cI['del'] = 1; $cI['ins'] = 1;}
-elseif(isset($cF[$in])){$inOk = $eF; unset($cI['del'], $cI['ins']);}
-elseif(isset($cB[$in])){$inOk = $eB; unset($cI['del'], $cI['ins']);}
+if(isset($cS[$in])){$inOk = $cS[$in];} elseif(isset($cI[$in])){$inOk = $eI; $cI['del'] = 1; $cI['ins'] = 1;} elseif(isset($cF[$in])){$inOk = $eF; unset($cI['del'], $cI['ins']);} elseif(isset($cB[$in])){$inOk = $eB; unset($cI['del'], $cI['ins']);}
 if(isset($cO[$in])){$inOk = $inOk + $cO[$in];}
 if(isset($cN[$in])){$inOk = array_diff_assoc($inOk, $cN[$in]);}
 
@@ -192,13 +187,10 @@ 
  if($ql = count($q)){
   $p = array_pop($q);
   $q[] = $p;
-  if(isset($cS[$p])){$ok = $cS[$p];}
-  elseif(isset($cI[$p])){$ok = $eI; $cI['del'] = 1; $cI['ins'] = 1;}
-  elseif(isset($cF[$p])){$ok = $eF; unset($cI['del'], $cI['ins']);}
-  elseif(isset($cB[$p])){$ok = $eB; unset($cI['del'], $cI['ins']);}
+  if(isset($cS[$p])){$ok = $cS[$p];} elseif(isset($cI[$p])){$ok = $eI; $cI['del'] = 1; $cI['ins'] = 1;} elseif(isset($cF[$p])){$ok = $eF; unset($cI['del'], $cI['ins']);} elseif(isset($cB[$p])){$ok = $eB; unset($cI['del'], $cI['ins']);}
   if(isset($cO[$p])){$ok = $ok + $cO[$p];}
   if(isset($cN[$p])){$ok = array_diff_assoc($ok, $cN[$p]);}
- }else{$ok = $inOk; unset($cI['del'], $cI['ins']);}
+ } else{$ok = $inOk; unset($cI['del'], $cI['ins']);}
  // bad tags, & ele content
  if(isset($e) && ($do == 1 or (isset($ok['#pcdata']) && ($do == 3 or $do == 5)))){
   echo '&lt;', $s, $e, $a, '&gt;';
@@ -206,13 +198,11 @@ 
  if(isset($x[0])){
   if(strlen(trim($x)) && (($ql && isset($cB[$p])) or (isset($cB[$in]) && !$ql))){
    echo '<div>', $x, '</div>';
-  }
-  elseif($do < 3 or isset($ok['#pcdata'])){echo $x;}
-  elseif(strpos($x, "\x02\x04")){
+  } elseif($do < 3 or isset($ok['#pcdata'])){echo $x;} elseif(strpos($x, "\x02\x04")){
    foreach(preg_split('`(\x01\x02[^\x01\x02]+\x02\x01)`', $x, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY) as $v){
     echo (substr($v, 0, 2) == "\x01\x02" ? $v : ($do > 4 ? preg_replace('`\S`', '', $v) : ''));
    }
-  }elseif($do > 4){echo preg_replace('`\S`', '', $x);}
+  } elseif($do > 4){echo preg_replace('`\S`', '', $x);}
  }
  // get markup
  if(!preg_match('`^(/?)([a-z1-6]+)([^>]*)>(.*)`sm', $t[$i], $r)){$x = $t[$i]; continue;}
@@ -223,8 +213,7 @@ 
   if($p == $e){array_pop($q); echo '</', $e, '>'; unset($e); continue;} // Last open
   $add = ''; // Nesting - close open tags that need to be
   for($j=-1, $cj=count($q); ++$j<$cj;){  
-   if(($d = array_pop($q)) == $e){break;}
-   else{$add .= "</{$d}>";}
+   if(($d = array_pop($q)) == $e){break;} else{$add .= "</{$d}>";}
   }
   echo $add, '</', $e, '>'; unset($e); continue;
  }
@@ -266,8 +255,7 @@ 
    $add = "</{$d}>";
    for(;++$k<$kc;){$add = "</{$q[$k]}>{$add}";}
    break;
-  }
-  else{$q2[] = $d;}
+  } else{$q2[] = $d;}
  }
  $q = $q2;
  if(!isset($cE[$e])){$q[] = $e;}
@@ -278,26 +266,21 @@ 
 if($ql = count($q)){
  $p = array_pop($q);
  $q[] = $p;
- if(isset($cS[$p])){$ok = $cS[$p];}
- elseif(isset($cI[$p])){$ok = $eI; $cI['del'] = 1; $cI['ins'] = 1;}
- elseif(isset($cF[$p])){$ok = $eF; unset($cI['del'], $cI['ins']);}
- elseif(isset($cB[$p])){$ok = $eB; unset($cI['del'], $cI['ins']);}
+ if(isset($cS[$p])){$ok = $cS[$p];} elseif(isset($cI[$p])){$ok = $eI; $cI['del'] = 1; $cI['ins'] = 1;} elseif(isset($cF[$p])){$ok = $eF; unset($cI['del'], $cI['ins']);} elseif(isset($cB[$p])){$ok = $eB; unset($cI['del'], $cI['ins']);}
  if(isset($cO[$p])){$ok = $ok + $cO[$p];}
  if(isset($cN[$p])){$ok = array_diff_assoc($ok, $cN[$p]);}
-}else{$ok = $inOk; unset($cI['del'], $cI['ins']);}
+} else{$ok = $inOk; unset($cI['del'], $cI['ins']);}
 if(isset($e) && ($do == 1 or (isset($ok['#pcdata']) && ($do == 3 or $do == 5)))){
  echo '&lt;', $s, $e, $a, '&gt;';
 }
 if(isset($x[0])){
  if(strlen(trim($x)) && (($ql && isset($cB[$p])) or (isset($cB[$in]) && !$ql))){
   echo '<div>', $x, '</div>';
- }
- elseif($do < 3 or isset($ok['#pcdata'])){echo $x;}
- elseif(strpos($x, "\x02\x04")){
+ } elseif($do < 3 or isset($ok['#pcdata'])){echo $x;} elseif(strpos($x, "\x02\x04")){
   foreach(preg_split('`(\x01\x02[^\x01\x02]+\x02\x01)`', $x, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY) as $v){
    echo (substr($v, 0, 2) == "\x01\x02" ? $v : ($do > 4 ? preg_replace('`\S`', '', $v) : ''));
   }
- }elseif($do > 4){echo preg_replace('`\S`', '', $x);}
+ } elseif($do > 4){echo preg_replace('`\S`', '', $x);}
 }
 while(!empty($q) && ($e = array_pop($q))){echo '</', $e, '>';}
 $o = ob_get_contents();
@@ -313,8 +296,7 @@ 
 if($v == 1){return '';}
 if($n == 'comment' && $v < 4){
  if(substr(($t = preg_replace('`--+`', '-', substr($t, 4, -3))), -1) != ' '){$t .= ' ';}
-}
-else{$t = substr($t, 1, -1);}
+} else{$t = substr($t, 1, -1);}
 $t = $v == 2 ? str_replace(array('&', '<', '>'), array('&amp;', '&lt;', '&gt;'), $t) : $t;
 return str_replace(array('&', '<', '>'), array("\x03", "\x04", "\x05"), ($n == 'comment' ? "\x01\x02\x04!--$t--\x05\x02\x01" : "\x01\x01\x04$t\x05\x01\x01"));
 }
@@ -349,11 +331,8 @@ 
 if($C['abs_url']){
  if($C['abs_url'] == -1 && strpos($p, $C['base_url']) === 0){ // Make url rel
   $p = substr($p, strlen($C['base_url']));
- }elseif(empty($m[1])){ // Make URL abs
-  if(substr($p, 0, 2) == '//'){$p = substr($C['base_url'], 0, strpos($C['base_url'], ':')+1). $p;}
-  elseif($p[0] == '/'){$p = preg_replace('`(^.+?://[^/]+)(.*)`', '$1', $C['base_url']). $p;}
-  elseif(strcspn($p, './')){$p = $C['base_url']. $p;}
-  else{
+ } elseif(empty($m[1])){ // Make URL abs
+  if(substr($p, 0, 2) == '//'){$p = substr($C['base_url'], 0, strpos($C['base_url'], ':')+1). $p;} elseif($p[0] == '/'){$p = preg_replace('`(^.+?://[^/]+)(.*)`', '$1', $C['base_url']). $p;} elseif(strcspn($p, './')){$p = $C['base_url']. $p;} else{
    preg_match('`^([a-zA-Z\d\-+.]+://[^/]+)(.*)`', $C['base_url'], $m);
    $p = preg_replace('`(?<=/)\./`', '', $m[2]. $p);
    while(preg_match('`(?<=/)([^/]{3,}|[^/.]+?|\.[^/.]|[^/.]\.)/\.\./`', $p)){
@@ -369,19 +348,15 @@ 
 public static function hl_regex($p){
 // check regex
 if(empty($p)){return 0;}
-if($v = function_exists('error_clear_last') && function_exists('error_get_last')){error_clear_last();}
-else{
- if($t = ini_get('track_errors')){$o = isset($php_errormsg) ? $php_errormsg : null;}
- else{ini_set('track_errors', 1);}
+if($v = function_exists('error_clear_last') && function_exists('error_get_last')){error_clear_last();} else{
+ if($t = ini_get('track_errors')){$o = isset($php_errormsg) ? $php_errormsg : null;} else{ini_set('track_errors', 1);}
  unset($php_errormsg);
 }
 if(($d = ini_get('display_errors'))){ini_set('display_errors', 0);}
 preg_match($p, '');
-if($v){$r = error_get_last() == null ? 1 : 0; }
-else{
+if($v){$r = error_get_last() == null ? 1 : 0; } else{
  $r = isset($php_errormsg) ? 0 : 1;
- if($t){$php_errormsg = isset($o) ? $o : null;}
- else{ini_set('track_errors', 0);}
+ if($t){$php_errormsg = isset($o) ? $o : null;} else{ini_set('track_errors', 0);}
 }
 if($d){ini_set('display_errors', 1);}
 return $r;
@@ -429,7 +404,7 @@ 
 if($t == '>'){return '&gt;';}
 if(!preg_match('`^<(/?)([a-zA-Z][a-zA-Z1-6]*)([^>]*?)\s?>$`m', $t, $m)){
  return str_replace(array('<', '>'), array('&lt;', '&gt;'), $t);
-}elseif(!isset($C['elements'][($e = strtolower($m[2]))])){
+} elseif(!isset($C['elements'][($e = strtolower($m[2]))])){
  return (($C['keep_bad']%2) ? str_replace(array('<', '>'), array('&lt;', '&gt;'), $t) : '');
 }
 // attr string
@@ -483,7 +458,7 @@ 
   break; case 1:
    if($a[0] == '='){ // =
     $w = 1; $mode = 2; $a = ltrim($a, '= ');
-   }else{ // No val
+   } else{ // No val
     $w = 1; $mode = 0; $a = ltrim($a);
     $aA[$nm] = '';
    }
@@ -507,8 +482,7 @@ 
 $a = array(); $nfr = 0; $d = $C['deny_attribute'];
 foreach($aA as $k=>$v){
  if(((isset($d['*']) ? isset($d[$k]) : !isset($d[$k])) && (isset($aN[$k][$e]) or isset($aNU[$k]) or (isset($aNO[$k]) && !isset($d['on*'])) or (isset($aNA[$k]) && !isset($d['aria*'])) or (!isset($d['data*']) && preg_match('`data-((?!xml)[^:]+$)`', $k))) && !isset($rl['n'][$k]) && !isset($rl['n']['*'])) or isset($rl[$k])){
-  if(isset($aNE[$k])){$v = $k;}
-  elseif(!empty($lcase) && (($e != 'button' or $e != 'input') or $k == 'type')){ // Rather loose but ?not cause issues
+  if(isset($aNE[$k])){$v = $k;} elseif(!empty($lcase) && (($e != 'button' or $e != 'input') or $k == 'type')){ // Rather loose but ?not cause issues
    $v = (isset($aNL[($v2 = strtolower($v))])) ? $v2 : $v;
   }
   if($k == 'style' && !$C['style_pass']){
@@ -518,7 +492,7 @@ 
    }
    $v = preg_replace_callback('`(url(?:\()(?: )*(?:\'|"|&(?:quot|apos);)?)(.+?)((?:\'|"|&(?:quot|apos);)?(?: )*(?:\)))`iS', 'htmLawed::hl_prot', $v);
    $v = !$C['css_expression'] ? preg_replace('`expression`i', ' ', preg_replace('`\\\\\S|(/|(%2f))(\*|(%2a))`i', ' ', $v)) : $v;
-  }elseif(isset($aNP[$k]) or isset($aNO[$k])){
+  } elseif(isset($aNP[$k]) or isset($aNO[$k])){
    $v = str_replace("­", ' ', (strpos($v, '&') !== false ? str_replace(array('&#xad;', '&#173;', '&shy;'), ' ', $v) : $v)); # double-quoted char: soft-hyphen; appears here as "­" or hyphen or something else depending on viewing software
    if($k == 'srcset'){
     $v2 = '';
@@ -536,21 +510,20 @@ 
      if(isset($v1[0])){$v2 .= htmLawed::hl_prot($v1, $k). ' ';}
     }
     $v = trim($v2, ' ');
-   }
-   else{$v = htmLawed::hl_prot($v, $k);}
+   } else{$v = htmLawed::hl_prot($v, $k);}
    if($k == 'href'){ // X-spam
     if($C['anti_mail_spam'] && strpos($v, 'mailto:') === 0){
      $v = str_replace('@', htmlspecialchars($C['anti_mail_spam']), $v);
-    }elseif($C['anti_link_spam']){
+    } elseif($C['anti_link_spam']){
      $r1 = $C['anti_link_spam'][1];
      if(!empty($r1) && preg_match($r1, $v)){continue;}
      $r0 = $C['anti_link_spam'][0];
      if(!empty($r0) && preg_match($r0, $v)){
       if(isset($a['rel'])){
        if(!preg_match('`\bnofollow\b`i', $a['rel'])){$a['rel'] .= ' nofollow';}
-      }elseif(isset($aA['rel'])){
+      } elseif(isset($aA['rel'])){
        if(!preg_match('`\bnofollow\b`i', $aA['rel'])){$nfr = 1;}
-      }else{$a['rel'] = 'nofollow';}
+      } else{$a['rel'] = 'nofollow';}
      }
     }
    }
@@ -577,39 +550,37 @@ 
   $v = str_replace(array('\\', ':', ';', '&#'), '', $v);
   if($k == 'align'){
    unset($a['align']);
-   if($e == 'img' && ($v == 'left' or $v == 'right')){$c[] = 'float: '. $v;}
-   elseif(($e == 'div' or $e == 'table') && $v == 'center'){$c[] = 'margin: auto';}
-   else{$c[] = 'text-align: '. $v;}
-  }elseif($k == 'bgcolor'){
+   if($e == 'img' && ($v == 'left' or $v == 'right')){$c[] = 'float: '. $v;} elseif(($e == 'div' or $e == 'table') && $v == 'center'){$c[] = 'margin: auto';} else{$c[] = 'text-align: '. $v;}
+  } elseif($k == 'bgcolor'){
    unset($a['bgcolor']);
    $c[] = 'background-color: '. $v;
-  }elseif($k == 'border'){
+  } elseif($k == 'border'){
    unset($a['border']); $c[] = "border: {$v}px";
-  }elseif($k == 'bordercolor'){
+  } elseif($k == 'bordercolor'){
    unset($a['bordercolor']); $c[] = 'border-color: '. $v;
-  }elseif($k == 'cellspacing'){
+  } elseif($k == 'cellspacing'){
    unset($a['cellspacing']); $c[] = "border-spacing: {$v}px";
-  }elseif($k == 'clear'){
+  } elseif($k == 'clear'){
    unset($a['clear']); $c[] = 'clear: '. ($v != 'all' ? $v : 'both');
-  }elseif($k == 'compact'){
+  } elseif($k == 'compact'){
    unset($a['compact']); $c[] = 'font-size: 85%';
-  }elseif($k == 'height' or $k == 'width'){
+  } elseif($k == 'height' or $k == 'width'){
    unset($a[$k]); $c[] = $k. ': '. ($v[0] != '*' ? $v. (ctype_digit($v) ? 'px' : '') : 'auto');
-  }elseif($k == 'hspace'){
+  } elseif($k == 'hspace'){
    unset($a['hspace']); $c[] = "margin-left: {$v}px; margin-right: {$v}px";
-  }elseif($k == 'language' && !isset($a['type'])){
+  } elseif($k == 'language' && !isset($a['type'])){
    unset($a['language']);
    $a['type'] = 'text/'. strtolower($v);
-  }elseif($k == 'name'){
+  } elseif($k == 'name'){
    if($C['no_deprecated_attr'] == 2 or ($e != 'a' && $e != 'map')){unset($a['name']);}
    if(!isset($a['id']) && !preg_match('`\W`', $v)){$a['id'] = $v;}
-  }elseif($k == 'noshade'){
+  } elseif($k == 'noshade'){
    unset($a['noshade']); $c[] = 'border-style: none; border: 0; background-color: gray; color: gray';
-  }elseif($k == 'nowrap'){
+  } elseif($k == 'nowrap'){
    unset($a['nowrap']); $c[] = 'white-space: nowrap';
-  }elseif($k == 'size'){
+  } elseif($k == 'size'){
    unset($a['size']); $c[] = 'size: '. $v. 'px';
-  }elseif($k == 'vspace'){
+  } elseif($k == 'vspace'){
    unset($a['vspace']); $c[] = "margin-top: {$v}px; margin-bottom: {$v}px";
   }
  }
@@ -621,7 +592,7 @@ 
 // unique ID
 if($C['unique_ids'] && isset($a['id'])){
  if(preg_match('`\s`', ($id = $a['id'])) or (isset($GLOBALS['hl_Ids'][$id]) && $C['unique_ids'] == 1)){unset($a['id']);
- }else{
+ } else{
   while(isset($GLOBALS['hl_Ids'][$id])){$id = $C['unique_ids']. $id;}
   $GLOBALS['hl_Ids'][($a['id'] = $id)] = 1;
  }
@@ -640,8 +611,7 @@ 
  $aA = '';
  foreach($a as $k=>$v){$aA .= " {$k}=\"{$v}\"";}
  return "<{$e}{$aA}". (isset($eE[$e]) ? ' /' : ''). '>';
-}
-else{return $C['hook_tag']($e, $a);}
+} else{return $C['hook_tag']($e, $a);}
 }
 
 public static function hl_tag2(&$e, &$a, $t=1){
@@ -701,20 +671,17 @@ 
   $e = "<$e>"; 
   if(isset($d[$y])){
    if(!$x){
-    if($n){echo "\n", str_repeat($s, --$n), "$e\n", str_repeat($s, $n);}
-    else{++$N; ob_end_clean(); continue 2;}
-   }
-   else{echo "\n", str_repeat($s, $n), "$e\n", str_repeat($s, ($x != 1 ? ++$n : $n));}
+    if($n){echo "\n", str_repeat($s, --$n), "$e\n", str_repeat($s, $n);} else{++$N; ob_end_clean(); continue 2;}
+   } else{echo "\n", str_repeat($s, $n), "$e\n", str_repeat($s, ($x != 1 ? ++$n : $n));}
    echo $r; continue;
   }
   $f = "\n". str_repeat($s, $n);
   if(isset($c[$y])){
-   if(!$x){echo $e, $f, $r;}
-   else{echo $f, $e, $r;}
-  }elseif(isset($b[$y])){echo $f, $e, $r;
-  }elseif(isset($a[$y])){echo $e, $f, $r;
-  }elseif(!$y){echo $f, $e, $f, $r;
-  }else{echo $e, $r;}
+   if(!$x){echo $e, $f, $r;} else{echo $f, $e, $r;}
+  } elseif(isset($b[$y])){echo $f, $e, $r;
+  } elseif(isset($a[$y])){echo $e, $f, $r;
+  } elseif(!$y){echo $f, $e, $f, $r;
+  } else{echo $e, $r;}
  }
  $X = 0;
 }

htdocs/class/database/database.php

Spacing +1 added lines, -1 removed lines

@@ -77,7 +77,7 @@
     {
 
         if ($tablename != '') {
-            return $this->prefix . '_' . $tablename;
+            return $this->prefix.'_'.$tablename;
         } else {
             return $this->prefix;
         }

htdocs/class/database/manager.php

Indentation +1 added lines, -1 removed lines

@@ -330,7 +330,7 @@
      * Checks to see if table exists
      *
      * @param string $table name of database table looking for
-      *
+     *
      * @return bool true if exists or false if doesnt
      */
     public function tableExists($table)

Spacing +11 added lines, -11 removed lines

@@ -104,7 +104,7 @@ 
     {
         $this->db->connect(false);
 
-        $result = $this->db->query("CREATE DATABASE " . \XoopsBaseConfig::get('db-name'));
+        $result = $this->db->query("CREATE DATABASE ".\XoopsBaseConfig::get('db-name'));
 
         return ($result != false) ? true : false;
     }
@@ -171,7 +171,7 @@ 
                             }
                         } else {
                             if ($prefixed_query[1] === 'DROP TABLE') {
-                                if ($this->db->$queryFunc('DROP TABLE ' . $table) != false) {
+                                if ($this->db->$queryFunc('DROP TABLE '.$table) != false) {
                                     if (!isset($this->s_tables['drop'][$table])) {
                                         $this->s_tables['drop'][$table] = 1;
                                     }
@@ -275,7 +275,7 @@ 
     {
         $this->db->connect();
         $table = $this->db->prefix($table);
-        $query = 'INSERT INTO ' . $table . ' ' . $query;
+        $query = 'INSERT INTO '.$table.' '.$query;
         if (!$this->db->queryF($query)) {
             if (!isset($this->f_tables['insert'][$table])) {
                 $this->f_tables['insert'][$table] = 1;
@@ -319,7 +319,7 @@ 
         $this->db->connect();
         foreach ($tables as $key => $val) {
             //was: if (!$this->db->query("DROP TABLE " . $this->db->prefix($key))) {
-            if (!$this->db->query("DROP TABLE " . $this->db->prefix($val))) {
+            if (!$this->db->query("DROP TABLE ".$this->db->prefix($val))) {
                 $deleted[] = $val;
             }
         }
@@ -339,7 +339,7 @@ 
         $ret = false;
         if ($table != '') {
             $this->db->connect();
-            $sql = 'SELECT COUNT(*) FROM ' . $this->db->prefix($table);
+            $sql = 'SELECT COUNT(*) FROM '.$this->db->prefix($table);
             $ret = (false != $this->db->query($sql)) ? true : false;
         }
         return $ret;
@@ -362,22 +362,22 @@ 
         $nTableName,
         $dropTable = false
     ) {
-        $sql = "SHOW COLUMNS FROM " . $this->db->prefix($oTableName);
+        $sql = "SHOW COLUMNS FROM ".$this->db->prefix($oTableName);
         $result = $this->db->queryF($sql);
         if (($rows = $this->db->getRowsNum($result)) == count($fieldsMap)) {
-            $sql = "SELECT * FROM " . $this->db->prefix($oTableName);
+            $sql = "SELECT * FROM ".$this->db->prefix($oTableName);
             $result = $this->db->queryF($sql);
             while (false !== ($myrow = $this->db->fetchArray($result))) {
                 ksort($fieldsMap);
                 ksort($myrow);
-                $sql = "INSERT INTO `" . $this->db->prefix($nTableName)
-                    . "` " . "(`" . implode("`,`", $fieldsMap) . "`)" .
-                    " VALUES ('" . implode("','", $myrow) . "')";
+                $sql = "INSERT INTO `".$this->db->prefix($nTableName)
+                    . "` "."(`".implode("`,`", $fieldsMap)."`)".
+                    " VALUES ('".implode("','", $myrow)."')";
 
                 $this->db->queryF($sql);
             }
             if ($dropTable) {
-                $sql = "DROP TABLE " . $this->db->prefix($oTableName);
+                $sql = "DROP TABLE ".$this->db->prefix($oTableName);
                 $this->db->queryF($sql);
             }
         }

htdocs/class/database/mysqldatabase.php

Spacing +16 added lines, -16 removed lines

@@ -70,7 +70,7 @@ 
             $frame = $stack[1];
             Xoops::getInstance()->deprecated(
                 'Legacy XoopsDB is deprecated since 2.6.0; all calls should be using Doctrine through $xoops->db(). '
-                . 'Called from ' . $frame['function'] . '() in ' . $frame['file'] . ' line '. $frame['line']
+                . 'Called from '.$frame['function'].'() in '.$frame['file'].' line '.$frame['line']
             );
         }
     }
@@ -342,14 +342,14 @@ 
             if (empty($start)) {
                 $start = 0;
             }
-            $sql = $sql . ' LIMIT ' . (int) $start . ', ' . (int) $limit;
+            $sql = $sql.' LIMIT '.(int)$start.', '.(int)$limit;
         }
         $events = \Xoops::getInstance()->events();
         $events->triggerEvent('core.database.query.start');
         try {
             $result = $this->conn->query($sql);
         } catch (Exception $e) {
-            $result=false;
+            $result = false;
         }
         $this->lastResult = $result;
         $events->triggerEvent('core.database.query.end');
@@ -451,19 +451,19 @@ 
             $t = $temp['native_type'];
 
             $temp = (string)(
-                ((($t === 'STRING') || ($t === 'VAR_STRING') ) ? 'string' : '' ) .
-                ( (in_array($t, array('TINY', 'SHORT', 'LONG', 'LONGLONG', 'INT24'))) ? 'int' : '' ) .
-                ( (in_array($t, array('FLOAT', 'DOUBLE', 'DECIMAL', 'NEWDECIMAL'))) ? 'real' : '' ) .
-                ( ($t === 'TIMESTAMP') ? 'timestamp' : '' ) .
-                ( ($t === 'YEAR') ? 'year' : '') .
-                ( (($t === 'DATE') || ($t === 'NEWDATE') ) ? 'date' : '' ) .
-                ( ($t === 'TIME') ? 'time' : '' ) .
-                ( ($t === 'SET') ? 'set' : '' ) .
-                ( ($t === 'ENUM') ? 'enum' : '' ) .
-                ( ($t === 'GEOMETRY') ? 'geometry' : '' ) .
-                ( ($t === 'DATETIME') ? 'datetime' : '' ) .
-                ( (in_array($t, array('TINY_BLOB', 'BLOB', 'MEDIUM_BLOB', 'LONG_BLOB' ))) ? 'blob' : '' ) .
-                ( ($t === 'NULL') ? 'null' : '' )
+                ((($t === 'STRING') || ($t === 'VAR_STRING')) ? 'string' : '').
+                ((in_array($t, array('TINY', 'SHORT', 'LONG', 'LONGLONG', 'INT24'))) ? 'int' : '').
+                ((in_array($t, array('FLOAT', 'DOUBLE', 'DECIMAL', 'NEWDECIMAL'))) ? 'real' : '').
+                (($t === 'TIMESTAMP') ? 'timestamp' : '').
+                (($t === 'YEAR') ? 'year' : '').
+                ((($t === 'DATE') || ($t === 'NEWDATE')) ? 'date' : '').
+                (($t === 'TIME') ? 'time' : '').
+                (($t === 'SET') ? 'set' : '').
+                (($t === 'ENUM') ? 'enum' : '').
+                (($t === 'GEOMETRY') ? 'geometry' : '').
+                (($t === 'DATETIME') ? 'datetime' : '').
+                ((in_array($t, array('TINY_BLOB', 'BLOB', 'MEDIUM_BLOB', 'LONG_BLOB'))) ? 'blob' : '').
+                (($t === 'NULL') ? 'null' : '')
             );
             return $temp;
         } catch (PDOException $e) {

htdocs/class/database/databasefactory.php

Spacing +1 added lines, -1 removed lines

@@ -46,7 +46,7 @@
     {
         static $legacy;
 
-        $file = \XoopsBaseConfig::get('root-path') . '/class/database/mysqldatabase.php';
+        $file = \XoopsBaseConfig::get('root-path').'/class/database/mysqldatabase.php';
         if (!isset($legacy) && file_exists($file)) {
             require_once $file;
             if (!defined('XOOPS_DB_PROXY')) {

htdocs/class/database/sqlutility.php

Spacing +5 added lines, -5 removed lines

@@ -92,14 +92,14 @@ 
                         $in_string = true;
                         $string_start = $char;
                     } else {
-                        if ($char === '#' || ($char === ' ' && $i > 1 && $sql[$i - 2] . $sql[$i - 1] == '--')) {
+                        if ($char === '#' || ($char === ' ' && $i > 1 && $sql[$i - 2].$sql[$i - 1] == '--')) {
                             $start_of_comment = (($sql[$i] === '#') ? $i : $i - 2);
-                            $end_of_comment = (strpos(' ' . $sql, "\012", $i + 2)) ? strpos(' ' . $sql, "\012", $i + 2)
-                                : strpos(' ' . $sql, "\015", $i + 2);
+                            $end_of_comment = (strpos(' '.$sql, "\012", $i + 2)) ? strpos(' '.$sql, "\012", $i + 2)
+                                : strpos(' '.$sql, "\015", $i + 2);
                             if (!$end_of_comment) {
                                 return true;
                             } else {
-                                $sql = substr($sql, 0, $start_of_comment) . ltrim(substr($sql, $end_of_comment));
+                                $sql = substr($sql, 0, $start_of_comment).ltrim(substr($sql, $end_of_comment));
                                 $sql_len = strlen($sql);
                                 $i--;
                             }
@@ -130,7 +130,7 @@ 
         if (preg_match($pattern, $query, $matches)
             || preg_match($pattern2, $query, $matches)
         ) {
-            $replace = "\\1 " . $prefix . "_\\4\\5";
+            $replace = "\\1 ".$prefix."_\\4\\5";
             $matches[0] = preg_replace($pattern, $replace, $query);
             return $matches;
         }