Completed
Pull Request — master (#622)
by Richard
29:20 queued 24s
created
xoops_lib/Xoops/Core/Text/Sanitizer/Extensions/UnorderedList.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -42,16 +42,16 @@
 block discarded – undo
42 42
 
43 43
         $shortcodes->addShortcode(
44 44
             'ul',
45
-            function ($attributes, $content, $tagName) use ($shortcodes) {
46
-                $newcontent = '<ul>' . $shortcodes->process($content) . '</ul>';
45
+            function($attributes, $content, $tagName) use ($shortcodes) {
46
+                $newcontent = '<ul>'.$shortcodes->process($content).'</ul>';
47 47
                 return $newcontent;
48 48
             }
49 49
         );
50 50
 
51 51
         $shortcodes->addShortcode(
52 52
             'li',
53
-            function ($attributes, $content, $tagName) use ($shortcodes) {
54
-                $newcontent = '<li>' . $shortcodes->process($content) . '</li>';
53
+            function($attributes, $content, $tagName) use ($shortcodes) {
54
+                $newcontent = '<li>'.$shortcodes->process($content).'</li>';
55 55
                 return $newcontent;
56 56
             }
57 57
         );
Please login to merge, or discard this patch.
xoops_lib/Xoops/Core/Text/Sanitizer/Extensions/Clickable.php 1 patch
Spacing   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -53,41 +53,41 @@  discard block
 block discarded – undo
53 53
         $pattern     = "/(^|[^]_a-z0-9-=\"'\/])([a-z]+?):\/\/([{$valid_chars}]+[{$end_chars}])/i";
54 54
         $text = preg_replace_callback(
55 55
             $pattern,
56
-            function ($match) {
57
-                return $match[1] . "<a href=\"$match[2]://$match[3]\" title=\"$match[2]://$match[3]\""
56
+            function($match) {
57
+                return $match[1]."<a href=\"$match[2]://$match[3]\" title=\"$match[2]://$match[3]\""
58 58
                 . "rel=\"external\">$match[2]://".$this->truncate($match[3]).'</a>';
59 59
             },
60 60
             $text
61 61
         );
62 62
 
63
-        $pattern     = "/(^|[^]_a-z0-9-=\"'\/:\.])www\.((([a-zA-Z0-9\-]*\.){1,}){1}([a-zA-Z]{2,6}){1})((\/([a-zA-Z0-9\-\._\?\,\'\/\\+&%\$#\=~])*)*)/i";
63
+        $pattern = "/(^|[^]_a-z0-9-=\"'\/:\.])www\.((([a-zA-Z0-9\-]*\.){1,}){1}([a-zA-Z]{2,6}){1})((\/([a-zA-Z0-9\-\._\?\,\'\/\\+&%\$#\=~])*)*)/i";
64 64
         $text = preg_replace_callback(
65 65
             $pattern,
66
-            function ($match) {
67
-                return $match[1] ."<a href=\"http://www.$match[2]$match[6]\" "
68
-                . "title=\"www.$match[2]$match[6]\" rel=\"external\">" .
69
-                $this->truncate('www.'.$match[2].$match[6]) .'</a>';
66
+            function($match) {
67
+                return $match[1]."<a href=\"http://www.$match[2]$match[6]\" "
68
+                . "title=\"www.$match[2]$match[6]\" rel=\"external\">".
69
+                $this->truncate('www.'.$match[2].$match[6]).'</a>';
70 70
             },
71 71
             $text
72 72
         );
73 73
 
74
-        $pattern     = "/(^|[^]_a-z0-9-=\"'\/])ftp\.([a-z0-9\-]+)\.([{$valid_chars}]+[{$end_chars}])/i";
74
+        $pattern = "/(^|[^]_a-z0-9-=\"'\/])ftp\.([a-z0-9\-]+)\.([{$valid_chars}]+[{$end_chars}])/i";
75 75
         $text = preg_replace_callback(
76 76
             $pattern,
77
-            function ($match) {
77
+            function($match) {
78 78
                 return $match[1]."<a href=\"ftp://ftp.$match[2].$match[3]\" "
79 79
                 . "title=\"ftp.$match[2].$match[3]\" rel=\"external\">"
80
-                . $this->truncate('ftp.'.$match[2].$match[3]) .'</a>';
80
+                . $this->truncate('ftp.'.$match[2].$match[3]).'</a>';
81 81
             },
82 82
             $text
83 83
         );
84 84
 
85
-        $pattern     = "/(^|[^]_a-z0-9-=\"'\/:\.])([-_a-z0-9\'+*$^&%=~!?{}]++(?:\.[-_a-z0-9\'+*$^&%=~!?{}]+)*+)@((?:(?![-.])[-a-z0-9.]+(?<![-.])\.[a-z]{2,6}|\d{1,3}(?:\.\d{1,3}){3})(?::\d++)?)/i";
85
+        $pattern = "/(^|[^]_a-z0-9-=\"'\/:\.])([-_a-z0-9\'+*$^&%=~!?{}]++(?:\.[-_a-z0-9\'+*$^&%=~!?{}]+)*+)@((?:(?![-.])[-a-z0-9.]+(?<![-.])\.[a-z]{2,6}|\d{1,3}(?:\.\d{1,3}){3})(?::\d++)?)/i";
86 86
         $text = preg_replace_callback(
87 87
             $pattern,
88
-            function ($match) {
89
-                return $match[1]. "<a href=\"mailto:$match[2]@$match[3]\" title=\"$match[2]@$match[3]\">"
90
-                . $this->truncate($match[2] . "@" . $match[3]) . '</a>';
88
+            function($match) {
89
+                return $match[1]."<a href=\"mailto:$match[2]@$match[3]\" title=\"$match[2]@$match[3]\">"
90
+                . $this->truncate($match[2]."@".$match[3]).'</a>';
91 91
             },
92 92
             $text
93 93
         );
@@ -111,7 +111,7 @@  discard block
 block discarded – undo
111 111
         }
112 112
         $len = (((mb_strlen($text) - $config['truncate_length']) - 5) / 2);
113 113
         if ($len < 5) {
114
-            $ret = mb_substr($text, 0, $len) . ' ... ' . mb_substr($text, -$len);
114
+            $ret = mb_substr($text, 0, $len).' ... '.mb_substr($text, -$len);
115 115
         } else {
116 116
             $ret = mb_substr($text, 0, $config['truncate_length']);
117 117
         }
Please login to merge, or discard this patch.
xoops_lib/Xoops/Core/Text/Sanitizer/Extensions/Embed.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -75,7 +75,7 @@  discard block
 block discarded – undo
75 75
         //$xoops->cache()->delete($key);
76 76
         $decorated = $xoops->cache()->cacheRead(
77 77
             $key,
78
-            function ($url) {
78
+            function($url) {
79 79
                 $return = null;
80 80
                 try {
81 81
                     $info = \Embed\Embed::create($url);
@@ -90,8 +90,8 @@  discard block
 block discarded – undo
90 90
                     $height = $info->getHeight();
91 91
                     $width = $info->getWidth();
92 92
                     if ($this->enableResponsive($return) && !empty($height) && !empty($width)) {
93
-                        $ratio = (1.5 > ($width/$height)) ? '4by3' : '16by9';
94
-                        $return = '<div class="embed-responsive embed-responsive-' . $ratio . '">' . $return . '</div>';
93
+                        $ratio = (1.5 > ($width / $height)) ? '4by3' : '16by9';
94
+                        $return = '<div class="embed-responsive embed-responsive-'.$ratio.'">'.$return.'</div>';
95 95
                     }
96 96
                 }
97 97
                 if (empty($return)) {
@@ -119,7 +119,7 @@  discard block
 block discarded – undo
119 119
 </div>
120 120
 EOT;
121 121
 
122
-        if(empty($imageSrc)) {
122
+        if (empty($imageSrc)) {
123 123
             $imageSrc = \Xoops::getInstance()->url('media/xoops/images/icons/link-ext.svg');
124 124
         }
125 125
         $box = sprintf($htmlTemplate, $link, $imageSrc, $title, $description);
Please login to merge, or discard this patch.
xoops_lib/Xoops/Core/Text/Sanitizer/Extensions/Iframe.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -43,9 +43,9 @@
 block discarded – undo
43 43
     {
44 44
         $this->shortcodes->addShortcode(
45 45
             'iframe',
46
-            function ($attributes, $content, $tagName) {
47
-                $height = (int) ltrim($attributes[0], '=');
48
-                $height = $height <10 ? 200 : $height;
46
+            function($attributes, $content, $tagName) {
47
+                $height = (int)ltrim($attributes[0], '=');
48
+                $height = $height < 10 ? 200 : $height;
49 49
                 $url = trim($content);
50 50
                 $template = $this->config['template'];
51 51
                 $newContent = sprintf($template, $url, $height);
Please login to merge, or discard this patch.
xoops_lib/Xoops/Core/Text/Sanitizer/Extensions/SoundCloud.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -93,7 +93,7 @@
 block discarded – undo
93 93
         $shortcodes = $this->shortcodes;
94 94
         $shortcodes->addShortcode(
95 95
             'soundcloud',
96
-            function ($attributes, $content, $tagName) use ($shortcodes) {
96
+            function($attributes, $content, $tagName) use ($shortcodes) {
97 97
                 $defaults = [
98 98
                     'url'    => trim($content),
99 99
                     'params' => $this->config['params'],
Please login to merge, or discard this patch.
xoops_lib/Xoops/Core/Text/Sanitizer/Extensions/Mp3.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -82,7 +82,7 @@
 block discarded – undo
82 82
     {
83 83
         $this->shortcodes->addShortcode(
84 84
             'mp3',
85
-            function ($attributes, $content, $tagName) {
85
+            function($attributes, $content, $tagName) {
86 86
                 $defaults = [
87 87
                     'url'    => trim($content),
88 88
                 ];
Please login to merge, or discard this patch.
xoops_lib/Xoops/Core/Text/Sanitizer/DefaultConfiguration.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -57,10 +57,10 @@  discard block
 block discarded – undo
57 57
     public function buildDefaultConfiguration()
58 58
     {
59 59
         $this->registerComponent(\Xoops\Core\Text\Sanitizer::getDefaultConfig());
60
-        $extensions = File::getList(__DIR__ . '/Extensions');
60
+        $extensions = File::getList(__DIR__.'/Extensions');
61 61
         foreach ($extensions as $extensionFile) {
62 62
             if (substr($extensionFile, -4) === '.php') {
63
-                $class =  __NAMESPACE__ . '\Extensions\\' . substr($extensionFile, 0, -4);
63
+                $class = __NAMESPACE__.'\Extensions\\'.substr($extensionFile, 0, -4);
64 64
                 if (is_a($class, 'Xoops\Core\Text\Sanitizer\SanitizerConfigurable', true)) {
65 65
                     $this->registerComponent($class::getDefaultConfig());
66 66
                 }
@@ -82,7 +82,7 @@  discard block
 block discarded – undo
82 82
          */
83 83
         \Xoops::getInstance()->events()->triggerEvent('core.sanitizer.configuration.defaults', $this);
84 84
 
85
-        return (array) $this;
85
+        return (array)$this;
86 86
     }
87 87
 
88 88
     /**
Please login to merge, or discard this patch.
xoops_lib/Xoops/Core/Text/Sanitizer/ConfigurationAbstract.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -43,7 +43,7 @@  discard block
 block discarded – undo
43 43
      */
44 44
     public function getNames()
45 45
     {
46
-        return array_keys((array) $this);
46
+        return array_keys((array)$this);
47 47
     }
48 48
 
49 49
     /**
@@ -119,8 +119,8 @@  discard block
 block discarded – undo
119 119
 
120 120
         $likeSet = array();
121 121
         foreach ($this as $k => $v) {
122
-            if (mb_substr($k, 0, mb_strlen($nameLike))==$nameLike) {
123
-                $likeSet[$k]=$v;
122
+            if (mb_substr($k, 0, mb_strlen($nameLike)) == $nameLike) {
123
+                $likeSet[$k] = $v;
124 124
             }
125 125
         }
126 126
         return $likeSet;
Please login to merge, or discard this patch.
xoops_lib/Xoops/Core/Text/Sanitizer.php 1 patch
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -273,11 +273,11 @@  discard block
 block discarded – undo
273 273
     {
274 274
         $config = $this->getConfig();
275 275
 
276
-        foreach ((array) $config['prefilters'] as $filter) {
276
+        foreach ((array)$config['prefilters'] as $filter) {
277 277
             $text = $this->executeFilter($filter, $text);
278 278
         }
279 279
 
280
-        if (!(bool) $html) {
280
+        if (!(bool)$html) {
281 281
             // html not allowed, so escape any special chars
282 282
             // don't mess with quotes or shortcodes will fail
283 283
             $text = htmlspecialchars($text, ENT_NOQUOTES | ENT_SUBSTITUTE, 'UTF-8', false);
@@ -285,20 +285,20 @@  discard block
 block discarded – undo
285 285
 
286 286
         if ($xcode) {
287 287
             $text = $this->prefilterCodeBlocks($text);
288
-            $text = $this->xoopsCodeDecode($text, (bool) $image);
288
+            $text = $this->xoopsCodeDecode($text, (bool)$image);
289 289
         }
290
-        if ((bool) $smiley) {
290
+        if ((bool)$smiley) {
291 291
             // process smiley
292 292
             $text = $this->smiley($text);
293 293
         }
294
-        if ((bool) $br) {
294
+        if ((bool)$br) {
295 295
             $text = $this->nl2Br($text);
296 296
         }
297 297
         if ($xcode) {
298 298
             $text = $this->postfilterCodeBlocks($text);
299 299
         }
300 300
 
301
-        foreach ((array) $config['postfilters'] as $filter) {
301
+        foreach ((array)$config['postfilters'] as $filter) {
302 302
             $text = $this->executeFilter($filter, $text);
303 303
         }
304 304
 
@@ -367,8 +367,8 @@  discard block
 block discarded – undo
367 367
         $patterns = "/\[code([^\]]*?)\](.*)\[\/code\]/sU";
368 368
         $text = preg_replace_callback(
369 369
             $patterns,
370
-            function ($matches) {
371
-                return '[code' . $matches[1] . ']' . base64_encode($matches[2]). '[/code]';
370
+            function($matches) {
371
+                return '[code'.$matches[1].']'.base64_encode($matches[2]).'[/code]';
372 372
             },
373 373
             $text
374 374
         );
@@ -388,13 +388,13 @@  discard block
 block discarded – undo
388 388
         $patterns = "/\[code([^\]]*?)\](.*)\[\/code\]/sU";
389 389
         $text = preg_replace_callback(
390 390
             $patterns,
391
-            function ($matches) {
392
-                return '<div class=\"xoopsCode\">' .
391
+            function($matches) {
392
+                return '<div class=\"xoopsCode\">'.
393 393
                 $this->executeFilter(
394 394
                     'syntaxhighlight',
395 395
                     str_replace('\\\"', '\"', base64_decode($matches[2])),
396 396
                     $matches[1]
397
-                ) . '</div>';
397
+                ).'</div>';
398 398
             },
399 399
             $text
400 400
         );
@@ -411,7 +411,7 @@  discard block
 block discarded – undo
411 411
     {
412 412
         $list = [];
413 413
         foreach ($this->config as $name => $configs) {
414
-            if (((bool) $configs['enabled']) && $configs['type'] === 'extension') {
414
+            if (((bool)$configs['enabled']) && $configs['type'] === 'extension') {
415 415
                 $list[] = $name;
416 416
             }
417 417
         }
@@ -624,7 +624,7 @@  discard block
 block discarded – undo
624 624
     {
625 625
         if ($this->config->has($name)) {
626 626
             $this->config[$name]['enabled'] = true;
627
-            if($this->extensionsLoaded) {
627
+            if ($this->extensionsLoaded) {
628 628
                 $this->extensionsLoaded = false;
629 629
             }
630 630
             $this->registerExtensions();
Please login to merge, or discard this patch.