terrylinooo / shieldon

src/Shieldon/Shieldon.php

Spacing +22 added lines, -22 removed lines

@@ -388,7 +388,7 @@ 
      * 
      * @return void
      */
-    public function __construct(array $properties = [],  string $sessionId = '')
+    public function __construct(array $properties = [], string $sessionId = '')
     {
         // Set to container.
         Container::set('shieldon', $this);
@@ -400,7 +400,7 @@ 
         // At least load a captcha instance. Foundation is the base one.
         $this->setCaptcha(new \Shieldon\Captcha\Foundation());
 
-        if (! empty($properties)) {
+        if (!empty($properties)) {
             $this->setProperties($properties);
         }
 
@@ -449,7 +449,7 @@ 
 
         $logData['first_time_flag'] = $ipDetail['first_time_flag'];
 
-        if (! empty($ipDetail['ip'])) {
+        if (!empty($ipDetail['ip'])) {
             $logData['ip']        = $this->ip;
             $logData['session']   = $this->sessionId;
             $logData['hostname']  = $this->ipResolvedHostname;
@@ -509,7 +509,7 @@ 
             if ($this->enableCookieCheck) {
 
                 // Get values from data table. We will count it and save it back to data table.
-                $logData['flag_js_cookie']   = $ipDetail['flag_js_cookie']   ?? 0;
+                $logData['flag_js_cookie']   = $ipDetail['flag_js_cookie'] ?? 0;
                 $logData['pageviews_cookie'] = $ipDetail['pageviews_cookie'] ?? 0;
 
                 $c = $this->properties['cookie_name'];
@@ -517,7 +517,7 @@ 
                 $jsCookie = $_COOKIE[$c] ?? 0;
 
                 // Checking if a cookie is created by JavaScript.
-                if (! empty($jsCookie)) {
+                if (!empty($jsCookie)) {
 
                     if ($jsCookie == '1') {
                         $logData['pageviews_cookie']++;
@@ -559,9 +559,9 @@ 
 
                 foreach (array_keys($this->properties['time_unit_quota']) as $timeUnit) {
                     switch ($timeUnit) {
-                        case 's': $timeSecond = 1;     break;
-                        case 'm': $timeSecond = 60;    break;
-                        case 'h': $timeSecond = 3600;  break;
+                        case 's': $timeSecond = 1; break;
+                        case 'm': $timeSecond = 60; break;
+                        case 'h': $timeSecond = 3600; break;
                         case 'd': $timeSecond = 86400; break;
                     }
                     if (($now - $ipDetail["first_time_{$timeUnit}"]) >= ($timeSecond + 1)) {
@@ -601,11 +601,11 @@ 
 
             // Is fagged as unusual beavior? Count the first time.
             if ($isFlaggedAsUnusualBehavior) {
-                $logData['first_time_flag'] = (! empty($logData['first_time_flag'])) ? $logData['first_time_flag'] : $now;
+                $logData['first_time_flag'] = (!empty($logData['first_time_flag'])) ? $logData['first_time_flag'] : $now;
             }
 
             // Reset the flagged factor check.
-            if (! empty($ipDetail['first_time_flag'])) {
+            if (!empty($ipDetail['first_time_flag'])) {
                 if ($now - $ipDetail['first_time_flag'] >= $this->properties['time_reset_limit']) {
                     $logData['flag_multi_session'] = 0;
                     $logData['flag_empty_referer'] = 0;
@@ -736,7 +736,7 @@ 
             $currentSessionOrder = 0;
 
             //die('<pre>' . var_dump($onlineSessions) . '</pre>');
-            if (! empty($onlineSessions)) {
+            if (!empty($onlineSessions)) {
                 foreach ($onlineSessions as $k => $v) {
                     $sessionPools[] = $v['id'];
                     $lasttime = (int) $v['time'];
@@ -764,7 +764,7 @@ 
             $this->currentSessionOrder = $currentSessionOrder;
             $this->currentWaitNumber = $currentSessionOrder - $limit;
 
-            if (! in_array($this->sessionId, $sessionPools)) {
+            if (!in_array($this->sessionId, $sessionPools)) {
                 $this->sessionCount++;
 
                 // New session, record this data.
@@ -807,7 +807,7 @@ 
                     if (session_status() === PHP_SESSION_NONE) {
                         session_start();
                     }
-                    if (! $this->sessionId) {
+                    if (!$this->sessionId) {
                         $this->sessionId = session_id();
                     }
                 }
@@ -908,7 +908,7 @@ 
      */
     public function setChannel(string $channel): self
     {
-        if (! $this->driver instanceof DriverProvider) {
+        if (!$this->driver instanceof DriverProvider) {
             throw new LogicException('setChannel method requires setDriver set first.');
         } else {
             $this->driver->setChannel($channel);
@@ -945,12 +945,12 @@ 
     public function captchaResponse(): bool
     {
         foreach ($this->captcha as $captcha) {
-            if (! $captcha->response()) {
+            if (!$captcha->response()) {
                 return false;
             }
         }
 
-        if (! empty($this->isLimitSession)) {
+        if (!empty($this->isLimitSession)) {
             $this->result = $this->sessionHandler(self::RESPONSE_ALLOW);
         }
 
@@ -973,7 +973,7 @@ 
 
             
             $class = substr($class, strrpos($class, '\\') + 1);
-            $this->component[$class] =& $instance;
+            $this->component[$class] = & $instance;
   
         }
 
@@ -1175,7 +1175,7 @@ 
 
             if (file_exists($viewPath)) {
 
-                if (! defined('SHIELDON_VIEW')) {
+                if (!defined('SHIELDON_VIEW')) {
                     define('SHIELDON_VIEW', true);
                 }
 
@@ -1251,7 +1251,7 @@ 
     public function run(): int
     {
         // Ignore the excluded urls.
-        if (! empty($this->excludedUrls)) {
+        if (!empty($this->excludedUrls)) {
             foreach ($this->excludedUrls as $url) {
                 if (0 === strpos($this->currentUrl, $url)) {
                     return $this->result = self::RESPONSE_ALLOW;
@@ -1342,7 +1342,7 @@ 
 
         $ipRule = $this->driver->get($this->ip, 'rule');
 
-        if (! empty($ipRule)) {
+        if (!empty($ipRule)) {
 
             $ruleType = (int) $ipRule['type'];
 
@@ -1563,7 +1563,7 @@ 
 
                 $result = $this->getComponent('Ip')->check();
 
-                if (! empty($result)) {
+                if (!empty($result)) {
     
                     switch ($result['status']) {
     
@@ -1701,7 +1701,7 @@ 
      */
     public function getSessionId(): string
     {
-        if (! empty($this->sessionId)) {
+        if (!empty($this->sessionId)) {
             return $this->sessionId;
         }
 

Braces +12 added lines, -4 removed lines

@@ -577,10 +577,18 @@
                         // He or she will get banned.
                         if ($logData["pageviews_{$timeUnit}"] > $this->properties['time_unit_quota'][$timeUnit]) {
 
-                            if ($timeUnit === 's') $this->action(self::ACTION_TEMPORARILY_DENY, self::REASON_REACHED_LIMIT_SECOND);
-                            if ($timeUnit === 'm') $this->action(self::ACTION_TEMPORARILY_DENY, self::REASON_REACHED_LIMIT_MINUTE);
-                            if ($timeUnit === 'h') $this->action(self::ACTION_TEMPORARILY_DENY, self::REASON_REACHED_LIMIT_HOUR);
-                            if ($timeUnit === 'd') $this->action(self::ACTION_TEMPORARILY_DENY, self::REASON_REACHED_LIMIT_DAY);
+                            if ($timeUnit === 's') {
+                                $this->action(self::ACTION_TEMPORARILY_DENY, self::REASON_REACHED_LIMIT_SECOND);
+                            }
+                            if ($timeUnit === 'm') {
+                                $this->action(self::ACTION_TEMPORARILY_DENY, self::REASON_REACHED_LIMIT_MINUTE);
+                            }
+                            if ($timeUnit === 'h') {
+                                $this->action(self::ACTION_TEMPORARILY_DENY, self::REASON_REACHED_LIMIT_HOUR);
+                            }
+                            if ($timeUnit === 'd') {
+                                $this->action(self::ACTION_TEMPORARILY_DENY, self::REASON_REACHED_LIMIT_DAY);
+                            }
                             
                             return self::RESPONSE_TEMPORARILY_DENY;
                         }

src/Shieldon/Mock/Messenger.php

Spacing +2 added lines, -2 removed lines

@@ -33,8 +33,8 @@
      */
     public function send(string $message): bool
     {
-        if (! empty($message)) {
-            echo "\n" . $this->provider() . "\n";;
+        if (!empty($message)) {
+            echo "\n" . $this->provider() . "\n"; ;
             echo "\n--- BEGIN - Mock of sending message ---\n\n";
             echo $message;
             echo "\n--- END - Mock of sending message ---\n";

src/Shieldon/helpers.php

Spacing +4 added lines, -4 removed lines

@@ -74,7 +74,7 @@ 
     // If we don't get the string from the localization file, use placeholder instead.
     $resultString = $placeholder;
 
-    if (! empty($i18n[$filename][$langcode])) {
+    if (!empty($i18n[$filename][$langcode])) {
         $resultString = $i18n[$filename][$langcode];
     }
 
@@ -127,7 +127,7 @@ 
         $masked = implode('.', $tmp);
 
     } else {
-        $masked =  str_repeat('*', strlen($str) - 6) . substr(str, -6);
+        $masked = str_repeat('*', strlen($str) - 6) . substr(str, -6);
     }
 
     return $masked;
@@ -154,7 +154,7 @@ 
     $cpuLoads = @sys_getloadavg();
     $cpuCores = trim(@shell_exec("grep -P '^processor' /proc/cpuinfo|wc -l"));
 
-    if (! empty($cpuCores) && ! empty($cpuLoads)) {
+    if (!empty($cpuCores) && !empty($cpuLoads)) {
         $return = round($cpuLoads[1] / ($cpuCores + 1) * 100, 0) . '%';
     }
     return $return;
@@ -179,7 +179,7 @@ 
 
     $freeResult = explode("\n", trim(@shell_exec('free')));
 
-    if (! empty($freeResult)) {
+    if (!empty($freeResult)) {
         $parsed = preg_split("/[\s]+/", $freeResult[1]);
         $return = round($parsed[2] / $parsed[1] * 100, 0) . '%';
     }

src/Shieldon/Log/ActionLogParsedCache.php

Spacing +1 added lines, -1 removed lines

@@ -119,7 +119,7 @@
                 $keepCache = false;
             }
 
-            if (! $keepCache) {
+            if (!$keepCache) {
                 $data = [];
             }
             // @codeCoverageIgnoreEnd

src/Shieldon/Log/ActionLogger.php

Spacing +14 added lines, -14 removed lines

@@ -94,14 +94,14 @@ 
      */
     public function add(array $record): void
     {
-        if (! empty($record['session_id'])) {
+        if (!empty($record['session_id'])) {
             $record['session_id'] = substr($record['session_id'], 0, 4);
         }
 
-        $data[0] = $record['ip']          ?? 'null';
-        $data[1] = $record['session_id']  ?? 'null';
+        $data[0] = $record['ip'] ?? 'null';
+        $data[1] = $record['session_id'] ?? 'null';
         $data[2] = $record['action_code'] ?? 'null';
-        $data[3] = $record['timesamp']    ?? 'null';
+        $data[3] = $record['timesamp'] ?? 'null';
 
         file_put_contents($this->filePath, implode(',', $data) . "\n", FILE_APPEND | LOCK_EX);
     }
@@ -131,14 +131,14 @@ 
 
                 $logFile = fopen($this->filePath, 'r');
 
-                while (! feof($logFile)) {
+                while (!feof($logFile)) {
                     $line = fgets($logFile);
 
-                    if (! empty($line)) {
+                    if (!empty($line)) {
                         $data = explode(',', trim($line));
                     }
         
-                    if (! empty($data[0])) {
+                    if (!empty($data[0])) {
                         $results[] = [
                             'ip'          => $data[0],
                             'session_id'  => $data[1],
@@ -173,14 +173,14 @@ 
 
                     $logFile = fopen($thisDayLogFile, 'r');
 
-                    while (! feof($logFile)) {
+                    while (!feof($logFile)) {
                         $line = fgets($logFile);
 
-                        if (! empty($line)) {
+                        if (!empty($line)) {
                             $data = explode(',', trim($line));
                         }
 
-                        if (! empty($data[0])) {
+                        if (!empty($data[0])) {
                             $results[] = [
                                 'ip'          => $data[0],
                                 'session_id'  => $data[1],
@@ -207,14 +207,14 @@ 
     {
         $result = true;
 
-        if (! is_dir($this->directory)) {
+        if (!is_dir($this->directory)) {
             $originalUmask = umask(0);
             $result = @mkdir($this->directory, 0777, true);
             umask($originalUmask);
         }
 
         // @codeCoverageIgnoreStart
-        if (! is_writable($this->directory)) {
+        if (!is_writable($this->directory)) {
             throw new RuntimeException('The directory usded by ActionLogger must be writable. (' . $this->directory . ')');
         }
         // @codeCoverageIgnoreEnd
@@ -245,7 +245,7 @@ 
             $it = new RecursiveDirectoryIterator($this->directory, RecursiveDirectoryIterator::SKIP_DOTS);
             $files = new RecursiveIteratorIterator($it, RecursiveIteratorIterator::CHILD_FIRST);
 
-            foreach($files as $file) {
+            foreach ($files as $file) {
                 if ($file->isDir()) {
                     // @codeCoverageIgnoreStart
                     rmdir($file->getRealPath());
@@ -275,7 +275,7 @@ 
             $it = new RecursiveDirectoryIterator($this->directory, RecursiveDirectoryIterator::SKIP_DOTS);
             $files = new RecursiveIteratorIterator($it, RecursiveIteratorIterator::CHILD_FIRST);
 
-            foreach($files as $file) {
+            foreach ($files as $file) {
                 if ($file->isFile()) {
                     $key = $file->getBasename('.log');
                     $size = $file->getSize();

src/Shieldon/Log/ActionLogParser.php

Spacing +36 added lines, -36 removed lines

@@ -87,7 +87,7 @@ 
      */
     public function __construct(string $directory = '') 
     {
-        if (! isset($this->logger)) {
+        if (!isset($this->logger)) {
             $this->logger = new Logger($directory);
         }
 
@@ -206,7 +206,7 @@ 
             default:
 
                 // We also accept querying N days data from logs. For example: `past_365_days`.
-                if (preg_match('/past_([0-9]+)_days/', $this->type, $matches) ) {
+                if (preg_match('/past_([0-9]+)_days/', $this->type, $matches)) {
 
                     $dayCount = $matches[1];
                     $startDate = date('Ymd', strtotime('-' . $dayCount . ' days'));
@@ -231,7 +231,7 @@ 
         // Fetch data from log files.
         $logs = $this->logger->get($startDate, $endDate);
 
-        foreach($logs as $log) {
+        foreach ($logs as $log) {
 
             $logTimesamp = (int) $log['timesamp'];
             $logIp = $log['ip'];
@@ -252,12 +252,12 @@ 
 
                     // Initialize all the counters.
                     foreach ($this->fields as $field) {
-                        if (! isset($this->periodDetail[$t][$k][$field])) {
+                        if (!isset($this->periodDetail[$t][$k][$field])) {
                             $this->periodDetail[$t][$k][$field] = 0;
                         }
 
                         if ($logTimesamp >= $detailTimesampBegin && $logTimesamp < $detailTimesampEnd) {
-                            if (! isset($this->ipDetail[$t][$logIp][$field])) {
+                            if (!isset($this->ipDetail[$t][$logIp][$field])) {
                                 $this->ipDetail[$t][$logIp][$field] = 0;
                             }
                         }
@@ -297,7 +297,7 @@ 
      */
     public function getPeriodData()
     {
-        if (! empty($this->periodDetail[$this->type])) {
+        if (!empty($this->periodDetail[$this->type])) {
             return $this->periodDetail[$this->type];
         }
         return [];
@@ -310,7 +310,7 @@ 
      */
     public function getIpData()
     {
-        if (! empty($this->ipDetail[$this->type])) {
+        if (!empty($this->ipDetail[$this->type])) {
             return $this->ipDetail[$this->type];
         }
         return [];
@@ -329,25 +329,25 @@ 
             return [];
         }
 
-        $results['captcha_chart_string']  = '';     // string
-        $results['pageview_chart_string'] = '';     // string
-        $results['captcha_success_count'] = 0;      // integer
-        $results['captcha_failure_count'] = 0;      // integer
-        $results['captcha_count'] = 0;              // integer
-        $results['pageview_count'] = 0;             // integer
-        $results['captcha_percentageage'] = 0;      // integer
+        $results['captcha_chart_string']  = ''; // string
+        $results['pageview_chart_string'] = ''; // string
+        $results['captcha_success_count'] = 0; // integer
+        $results['captcha_failure_count'] = 0; // integer
+        $results['captcha_count'] = 0; // integer
+        $results['pageview_count'] = 0; // integer
+        $results['captcha_percentageage'] = 0; // integer
         $results['captcha_failure_percentage'] = 0; // integer
         $results['captcha_success_percentage'] = 0; // integer
 
-        $results['action_ban_count'] = 0;           // integer
-        $results['action_temp_ban_count'] = 0;      // integer
-        $results['action_unban_count'] = 0;         // integer
-        $results['blacklist_count'] = 0;            // integer
-        $results['session_limit_count'] = 0;        // integer
+        $results['action_ban_count'] = 0; // integer
+        $results['action_temp_ban_count'] = 0; // integer
+        $results['action_unban_count'] = 0; // integer
+        $results['blacklist_count'] = 0; // integer
+        $results['session_limit_count'] = 0; // integer
 
         $ipdData = $this->getIpData();
 
-        if (! empty($ipdData)) {
+        if (!empty($ipdData)) {
 
             foreach ($ipdData as $ipKey => $ipInfo) {
 
@@ -384,24 +384,24 @@ 
     {
         $periodData = $this->getPeriodData();
 
-        $results['captcha_chart_string']  = '';     // string
-        $results['pageview_chart_string'] = '';     // string
-        $results['label_chart_string'] = '';        // string
-        $results['captcha_success_count'] = 0;      // integer
-        $results['captcha_failure_count'] = 0;      // integer
-        $results['captcha_count'] = 0;              // integer
-        $results['pageview_count'] = 0;             // integer
-        $results['captcha_percentageage'] = 0;      // integer
+        $results['captcha_chart_string']  = ''; // string
+        $results['pageview_chart_string'] = ''; // string
+        $results['label_chart_string'] = ''; // string
+        $results['captcha_success_count'] = 0; // integer
+        $results['captcha_failure_count'] = 0; // integer
+        $results['captcha_count'] = 0; // integer
+        $results['pageview_count'] = 0; // integer
+        $results['captcha_percentageage'] = 0; // integer
         $results['captcha_failure_percentage'] = 0; // integer
         $results['captcha_success_percentage'] = 0; // integer
 
-        $results['action_ban_count'] = 0;           // integer
-        $results['action_temp_ban_count'] = 0;      // integer
-        $results['action_unban_count'] = 0;         // integer
-        $results['blacklist_count'] = 0;            // integer
-        $results['session_limit_count'] = 0;        // integer
+        $results['action_ban_count'] = 0; // integer
+        $results['action_temp_ban_count'] = 0; // integer
+        $results['action_unban_count'] = 0; // integer
+        $results['blacklist_count'] = 0; // integer
+        $results['session_limit_count'] = 0; // integer
 
-        if (! empty($periodData)) {
+        if (!empty($periodData)) {
 
             $chartCaptcha = [];
             $chartPageview = [];
@@ -429,7 +429,7 @@ 
             }
 
             $results['captcha_chart_string'] = implode(',', $chartCaptcha);
-            $results['pageview_chart_string']= implode(',', $chartPageview);
+            $results['pageview_chart_string'] = implode(',', $chartPageview);
             $results['captcha_success_chart_string'] = implode(',', $chartCaptchaSuccess);
             $results['captcha_failure_chart_string'] = implode(',', $chartCaptchaFailure);
             $results['label_chart_string'] = "'" . implode("','", $labels) . "'";
@@ -459,7 +459,7 @@ 
         $ip = $log['ip'];
         $sessionId = $log['session_id'];
 
-        $this->ipDetail[$t][$ip]['session_id'][$sessionId ] = 1;
+        $this->ipDetail[$t][$ip]['session_id'][$sessionId] = 1;
 
         if ($logActionCode === self::LOG_TEMPORARILY_BAN) {
             $this->periodDetail[$t][$k]['action_temp_ban_count']++;

src/Shieldon/Security/httpAuthentication.php

Indentation +5 added lines, -5 removed lines

@@ -10,11 +10,11 @@
 
 namespace Shieldon\Security;
 
- /**
-  * WWW-Authenticate
-  *
-  * @since 3.0.0
-  */
+    /**
+     * WWW-Authenticate
+     *
+     * @since 3.0.0
+     */
 class httpAuthentication
 {
     /**

Spacing +2 added lines, -2 removed lines

@@ -74,7 +74,7 @@ 
      */
     public function set(array $protectedUrlList = []): void
     {
-        if (! empty($protectedUrlList)) {
+        if (!empty($protectedUrlList)) {
             $this->protectedUrlList = $protectedUrlList;
         }
     }
@@ -95,7 +95,7 @@ 
             if (0 === strpos($this->currentUrl, $urlInfo['url'])) {
 
                 // Prompt a window to ask for username and password.
-                if (! isset($_SERVER['PHP_AUTH_USER']) || ! isset($_SERVER['PHP_AUTH_PW'])) {
+                if (!isset($_SERVER['PHP_AUTH_USER']) || !isset($_SERVER['PHP_AUTH_PW'])) {
                     header('WWW-Authenticate: Basic realm="' . $this->realm . '"');
                     header('HTTP/1.0 401 Unauthorized');
                     die('Permission required.');

src/Shieldon/Security/Xss.php

Indentation +39 added lines, -39 removed lines

@@ -36,9 +36,9 @@ 
 use function time;
 use function version_compare;
 
- /**
-  * Cross-Site Scripting protection.
-  */
+    /**
+     * Cross-Site Scripting protection.
+     */
 class Xss
 {
     /**
@@ -285,7 +285,7 @@ 
         unset($original);
 
         // Remove evil attributes such as style, onclick and xmlns
-		$str = $this->removeEvilAttributes($str, $isImage);
+        $str = $this->removeEvilAttributes($str, $isImage);
 
         /*
          * Sanitize naughty HTML elements
@@ -449,62 +449,62 @@ 
 	 * @param boolean $is_image TRUE if this is an image
 	 * @return string The string with the evil attributes removed
 	 */
-	protected function removeEvilAttributes($str, $is_image)
-	{
-		// All javascript event handlers (e.g. onload, onclick, onmouseover), style, and xmlns
-		$evilAttributes = array('on\w*', 'style', 'xmlns', 'formaction', 'form', 'xlink:href');
+    protected function removeEvilAttributes($str, $is_image)
+    {
+        // All javascript event handlers (e.g. onload, onclick, onmouseover), style, and xmlns
+        $evilAttributes = array('on\w*', 'style', 'xmlns', 'formaction', 'form', 'xlink:href');
 
-		if ($is_image) {
-			/*
+        if ($is_image) {
+            /*
 			 * Adobe Photoshop puts XML metadata into JFIF images,
 			 * including namespacing, so we have to allow this for images.
 			 */
-			unset($evilAttributes[array_search('xmlns', $evilAttributes)]);
-		}
+            unset($evilAttributes[array_search('xmlns', $evilAttributes)]);
+        }
 
-		do {
-			$count = 0;
-			$attribs = array();
+        do {
+            $count = 0;
+            $attribs = array();
 
-			// find occurrences of illegal attribute strings with quotes (042 and 047 are octal quotes)
-			preg_match_all(
+            // find occurrences of illegal attribute strings with quotes (042 and 047 are octal quotes)
+            preg_match_all(
                 '/(?<!\w)(' . implode('|', $evilAttributes) . ')\s*=\s*(\042|\047)([^\\2]*?)(\\2)/is',
                 $str,
                 $matches,
                 PREG_SET_ORDER
             );
 
-			foreach ($matches as $attr) {
-				$attribs[] = preg_quote($attr[0], '/');
-			}
+            foreach ($matches as $attr) {
+                $attribs[] = preg_quote($attr[0], '/');
+            }
 
-			// find occurrences of illegal attribute strings without quotes
-			preg_match_all(
+            // find occurrences of illegal attribute strings without quotes
+            preg_match_all(
                 '/(?<!\w)(' . implode('|', $evilAttributes) . ')\s*=\s*([^\s>]*)/is',
                 $str,
                 $matches,
                 PREG_SET_ORDER
             );
 
-			foreach ($matches as $attr) {
-				$attribs[] = preg_quote($attr[0], '/');
-			}
+            foreach ($matches as $attr) {
+                $attribs[] = preg_quote($attr[0], '/');
+            }
 
-			// replace illegal attribute strings that are inside an html tag
-			if (count($attribs) > 0) {
-				$str = preg_replace(
+            // replace illegal attribute strings that are inside an html tag
+            if (count($attribs) > 0) {
+                $str = preg_replace(
                     '/(<?)(\/?[^><]+?)([^A-Za-z<>\-])(.*?)(' . implode('|', $attribs) . ')(.*?)([\s><]?)([><]*)/i',
                     '$1$2 $4$6$7$8',
                     $str,
                     -1,
                     $count
                 );
-			}
+            }
 
-		} while ($count);
+        } while ($count);
 
-		return $str;
-	}
+        return $str;
+    }
 
     /**
      * Random Hash for protecting URLs
@@ -895,16 +895,16 @@ 
      * @return bool
      */
     protected function isPHP($version): bool
-	{
+    {
         static $_isPHP;
 
-		$version = (string) $version;
+        $version = (string) $version;
 
-		if (! isset($_isPHP[$version])) {
-			$_isPHP[$version] = version_compare(PHP_VERSION, $version, '>=');
-		}
+        if (! isset($_isPHP[$version])) {
+            $_isPHP[$version] = version_compare(PHP_VERSION, $version, '>=');
+        }
 
-		return $_isPHP[$version];
-	}
+        return $_isPHP[$version];
+    }
 }
 

Spacing +35 added lines, -35 removed lines

@@ -90,13 +90,13 @@ 
 
         $this->deniedRegexList = [
             'javascript\s*:',
-            '\bon\w+=\S+(?=.*>)',       // Inline JavaScript.
+            '\bon\w+=\S+(?=.*>)', // Inline JavaScript.
             '(document|(document\.)?window)\.(location|on\w*)',
             'expression\s*(\(|&\#40;)', // CSS and IE
-            'vbscript\s*:',             // IE, surprise!
-            'wscript\s*:',              // IE
-            'jscript\s*:',              // IE
-            'vbs\s*:',                  // IE
+            'vbscript\s*:', // IE, surprise!
+            'wscript\s*:', // IE
+            'jscript\s*:', // IE
+            'vbs\s*:', // IE
             'Redirect\s+30\d:',
             "([\"'])?data\s*:[^\\1]*?base64[^\\1]*?,[^\\1]*?\\1?",
         ];
@@ -223,9 +223,9 @@ 
          */
         $words = [
             'javascript', 'expression', 'vbscript', 'jscript', 'wscript',
-            'vbs',        'script',     'base64',   'applet',  'alert', 
-            'document',   'write',      'cookie',   'window',  'confirm',
-            'prompt',     'eval',
+            'vbs', 'script', 'base64', 'applet', 'alert', 
+            'document', 'write', 'cookie', 'window', 'confirm',
+            'prompt', 'eval',
         ];
 
         foreach ($words as $word) {
@@ -280,7 +280,7 @@ 
                 );
             }
 
-        } while($original !== $str);
+        } while ($original !== $str);
 
         unset($original);
 
@@ -393,7 +393,7 @@ 
         $originExif = @exif_read_data($imageAbsPath);
         $filteredExif = [];
 
-        if (! empty($originExif)) {
+        if (!empty($originExif)) {
             $filteredExif = $this->clean($originExif, true);
         }
 
@@ -620,21 +620,21 @@ 
             "'", '"', '&', '$', '#',
             '{', '}', '[', ']', '=',
             ';', '?', '%20', '%22',
-            '%3c',		// <
-            '%253c',	// <
-            '%3e',		// >
-            '%0e',		// >
-            '%28',		// (
-            '%29',		// )
-            '%2528',	// (
-            '%26',		// &
-            '%24',		// $
-            '%3f',		// ?
-            '%3b',		// ;
+            '%3c', // <
+            '%253c', // <
+            '%3e', // >
+            '%0e', // >
+            '%28', // (
+            '%29', // )
+            '%2528', // (
+            '%26', // &
+            '%24', // $
+            '%3f', // ?
+            '%3b', // ;
             '%3d'		// =
         ];
 
-        if (! $relativePath) {
+        if (!$relativePath) {
             $bad[] = './';
             $bad[] = '/';
         }
@@ -676,19 +676,19 @@ 
     protected function sanitizeNaughtyHtml(array $matches): string
     {
         static $naughtyTags = [
-            'alert',    'prompt', 'confirm',    'applet',  'audio',
-            'basefont', 'base',   'behavior',   'bgsound', 'blink', 
-            'body',     'embed',  'expression', 'form',    'frameset', 
-            'frame',    'head',   'html',       'ilayer',  'iframe', 
-            'input',    'button', 'select',     'isindex', 'layer', 
-            'link',     'meta',   'keygen',     'object',  'plaintext',
-            'style',    'script', 'textarea',   'title',   'math',
-            'video',    'svg',    'xml',        'xss',
+            'alert', 'prompt', 'confirm', 'applet', 'audio',
+            'basefont', 'base', 'behavior', 'bgsound', 'blink', 
+            'body', 'embed', 'expression', 'form', 'frameset', 
+            'frame', 'head', 'html', 'ilayer', 'iframe', 
+            'input', 'button', 'select', 'isindex', 'layer', 
+            'link', 'meta', 'keygen', 'object', 'plaintext',
+            'style', 'script', 'textarea', 'title', 'math',
+            'video', 'svg', 'xml', 'xss',
         ];
 
         static $evilAttributes = [
-            'on\w+', 'style',      'xmlns',     'seekSegmentTime', 
-            'form',  'xlink:href', 'FSCommand', 'formaction',
+            'on\w+', 'style', 'xmlns', 'seekSegmentTime', 
+            'form', 'xlink:href', 'FSCommand', 'formaction',
         ];
 
         // First, escape unclosed tags
@@ -721,7 +721,7 @@ 
                 // of numerous XSS issues we've had.
                 $matches['attributes'] = preg_replace('#^[^a-z]+#i', '', $matches['attributes']);
 
-                if (! preg_match($attributesPattern, $matches['attributes'], $attribute, PREG_OFFSET_CAPTURE)) {
+                if (!preg_match($attributesPattern, $matches['attributes'], $attribute, PREG_OFFSET_CAPTURE)) {
                     // No (valid) attribute found? Discard everything else inside the tag
                     break;
                 }
@@ -745,7 +745,7 @@ 
 
             $attributes = empty($attributes)
                 ? ''
-                : ' '.implode(' ', $attributes);
+                : ' ' . implode(' ', $attributes);
             return '<' . $matches['slash'] . $matches['tagName'] . $attributes . '>';
         }
 
@@ -900,7 +900,7 @@ 
 
 		$version = (string) $version;
 
-		if (! isset($_isPHP[$version])) {
+		if (!isset($_isPHP[$version])) {
 			$_isPHP[$version] = version_compare(PHP_VERSION, $version, '>=');
 		}
 

src/Shieldon/Security/Csrf.php

Indentation +3 added lines, -3 removed lines

@@ -19,9 +19,9 @@
 use function time;
 use function uniqid;
 
- /**
-  * Cross Site Request Forgery protection.
-  */
+    /**
+     * Cross Site Request Forgery protection.
+     */
 class Csrf
 {
     /**

Spacing +2 added lines, -2 removed lines

@@ -29,7 +29,7 @@ 
      *
      * @var string
      */
-    protected $hash	= '';
+    protected $hash = '';
 
     /**
      * Token name.
@@ -79,7 +79,7 @@ 
         // Let's start checking process.
 
         // Do the tokens exist in both the _POST and _SESSION?
-        if (! isset($_POST[$this->name], $_SESSION[$this->name])) {
+        if (!isset($_POST[$this->name], $_SESSION[$this->name])) {
             return false;
         }