@@ -1955,8 +1955,8 @@ |
||
1955 | 1955 | 'q', 'rt', 'ins', 'font', 'strong', |
1956 | 1956 | 's', 'tt', 'kbd', 'mark', |
1957 | 1957 | 'u', 'xm', 'sub', 'nobr', |
1958 | - 'sup', 'ruby', |
|
1959 | - 'var', 'span', |
|
1960 | - 'wbr', 'time', |
|
1958 | + 'sup', 'ruby', |
|
1959 | + 'var', 'span', |
|
1960 | + 'wbr', 'time', |
|
1961 | 1961 | ]; |
1962 | 1962 | } |
@@ -209,7 +209,7 @@ discard block |
||
209 | 209 | |
210 | 210 | if (isset($CurrentBlock['continuable'])) |
211 | 211 | { |
212 | - $methodName = 'block' . $CurrentBlock['type'] . 'Continue'; |
|
212 | + $methodName = 'block'.$CurrentBlock['type'].'Continue'; |
|
213 | 213 | $Block = $this->$methodName($Line, $CurrentBlock); |
214 | 214 | |
215 | 215 | if (isset($Block)) |
@@ -220,7 +220,7 @@ discard block |
||
220 | 220 | } else { |
221 | 221 | if ($this->isBlockCompletable($CurrentBlock['type'])) |
222 | 222 | { |
223 | - $methodName = 'block' . $CurrentBlock['type'] . 'Complete'; |
|
223 | + $methodName = 'block'.$CurrentBlock['type'].'Complete'; |
|
224 | 224 | $CurrentBlock = $this->$methodName($CurrentBlock); |
225 | 225 | } |
226 | 226 | } |
@@ -238,7 +238,7 @@ discard block |
||
238 | 238 | { |
239 | 239 | foreach ($this->BlockTypes[$marker] as $blockType) |
240 | 240 | { |
241 | - $blockTypes []= $blockType; |
|
241 | + $blockTypes [] = $blockType; |
|
242 | 242 | } |
243 | 243 | } |
244 | 244 | |
@@ -253,7 +253,7 @@ discard block |
||
253 | 253 | { |
254 | 254 | $Block['type'] = $blockType; |
255 | 255 | |
256 | - if ( ! isset($Block['identified'])) |
|
256 | + if (!isset($Block['identified'])) |
|
257 | 257 | { |
258 | 258 | if (isset($CurrentBlock)) |
259 | 259 | { |
@@ -300,7 +300,7 @@ discard block |
||
300 | 300 | |
301 | 301 | if (isset($CurrentBlock['continuable']) and $this->isBlockCompletable($CurrentBlock['type'])) |
302 | 302 | { |
303 | - $methodName = 'block' . $CurrentBlock['type'] . 'Complete'; |
|
303 | + $methodName = 'block'.$CurrentBlock['type'].'Complete'; |
|
304 | 304 | $CurrentBlock = $this->$methodName($CurrentBlock); |
305 | 305 | } |
306 | 306 | |
@@ -318,7 +318,7 @@ discard block |
||
318 | 318 | |
319 | 319 | protected function extractElement(array $Component) |
320 | 320 | { |
321 | - if ( ! isset($Component['element'])) |
|
321 | + if (!isset($Component['element'])) |
|
322 | 322 | { |
323 | 323 | if (isset($Component['markup'])) |
324 | 324 | { |
@@ -333,12 +333,12 @@ discard block |
||
333 | 333 | |
334 | 334 | protected function isBlockContinuable($Type) |
335 | 335 | { |
336 | - return method_exists($this, 'block' . $Type . 'Continue'); |
|
336 | + return method_exists($this, 'block'.$Type.'Continue'); |
|
337 | 337 | } |
338 | 338 | |
339 | 339 | protected function isBlockCompletable($Type) |
340 | 340 | { |
341 | - return method_exists($this, 'block' . $Type . 'Complete'); |
|
341 | + return method_exists($this, 'block'.$Type.'Complete'); |
|
342 | 342 | } |
343 | 343 | |
344 | 344 | # |
@@ -346,7 +346,7 @@ discard block |
||
346 | 346 | |
347 | 347 | protected function blockCode($Line, $Block = null) |
348 | 348 | { |
349 | - if (isset($Block) and $Block['type'] === 'Paragraph' and ! isset($Block['interrupted'])) |
|
349 | + if (isset($Block) and $Block['type'] === 'Paragraph' and !isset($Block['interrupted'])) |
|
350 | 350 | { |
351 | 351 | return; |
352 | 352 | } |
@@ -430,7 +430,7 @@ discard block |
||
430 | 430 | return; |
431 | 431 | } |
432 | 432 | |
433 | - $Block['element']['rawHtml'] .= "\n" . $Line['body']; |
|
433 | + $Block['element']['rawHtml'] .= "\n".$Line['body']; |
|
434 | 434 | |
435 | 435 | if (\strpos($Line['text'], '-->') !== false) |
436 | 436 | { |
@@ -521,7 +521,7 @@ discard block |
||
521 | 521 | return $Block; |
522 | 522 | } |
523 | 523 | |
524 | - $Block['element']['element']['text'] .= "\n" . $Line['body']; |
|
524 | + $Block['element']['element']['text'] .= "\n".$Line['body']; |
|
525 | 525 | |
526 | 526 | return $Block; |
527 | 527 | } |
@@ -554,7 +554,7 @@ discard block |
||
554 | 554 | |
555 | 555 | $Block = [ |
556 | 556 | 'element' => [ |
557 | - 'name' => 'h' . $level, |
|
557 | + 'name' => 'h'.$level, |
|
558 | 558 | 'handler' => [ |
559 | 559 | 'function' => 'lineElements', |
560 | 560 | 'argument' => $text, |
@@ -581,7 +581,7 @@ discard block |
||
581 | 581 | { |
582 | 582 | $contentIndent -= 1; |
583 | 583 | $matches[1] = \substr($matches[1], 0, -$contentIndent); |
584 | - $matches[3] = str_repeat(' ', $contentIndent) . $matches[3]; |
|
584 | + $matches[3] = str_repeat(' ', $contentIndent).$matches[3]; |
|
585 | 585 | } elseif ($contentIndent === 0) { |
586 | 586 | $matches[1] .= ' '; |
587 | 587 | } |
@@ -612,7 +612,7 @@ discard block |
||
612 | 612 | if ( |
613 | 613 | isset($CurrentBlock) |
614 | 614 | and $CurrentBlock['type'] === 'Paragraph' |
615 | - and ! isset($CurrentBlock['interrupted']) |
|
615 | + and !isset($CurrentBlock['interrupted']) |
|
616 | 616 | ) { |
617 | 617 | return; |
618 | 618 | } |
@@ -630,7 +630,7 @@ discard block |
||
630 | 630 | ] |
631 | 631 | ]; |
632 | 632 | |
633 | - $Block['element']['elements'] []= & $Block['li']; |
|
633 | + $Block['element']['elements'] [] = & $Block['li']; |
|
634 | 634 | |
635 | 635 | return $Block; |
636 | 636 | } |
@@ -657,7 +657,7 @@ discard block |
||
657 | 657 | ) |
658 | 658 | ) { |
659 | 659 | if (isset($Block['interrupted'])) { |
660 | - $Block['li']['handler']['argument'] []= ''; |
|
660 | + $Block['li']['handler']['argument'] [] = ''; |
|
661 | 661 | |
662 | 662 | $Block['loose'] = true; |
663 | 663 | |
@@ -679,7 +679,7 @@ discard block |
||
679 | 679 | ] |
680 | 680 | ]; |
681 | 681 | |
682 | - $Block['element']['elements'] []= & $Block['li']; |
|
682 | + $Block['element']['elements'] [] = & $Block['li']; |
|
683 | 683 | |
684 | 684 | return $Block; |
685 | 685 | } elseif ($Line['indent'] < $requiredIndent and $this->blockList($Line)) { |
@@ -693,7 +693,7 @@ discard block |
||
693 | 693 | if ($Line['indent'] >= $requiredIndent) { |
694 | 694 | if (isset($Block['interrupted'])) |
695 | 695 | { |
696 | - $Block['li']['handler']['argument'] []= ''; |
|
696 | + $Block['li']['handler']['argument'] [] = ''; |
|
697 | 697 | |
698 | 698 | $Block['loose'] = true; |
699 | 699 | |
@@ -702,15 +702,15 @@ discard block |
||
702 | 702 | |
703 | 703 | $text = \substr($Line['body'], $requiredIndent); |
704 | 704 | |
705 | - $Block['li']['handler']['argument'] []= $text; |
|
705 | + $Block['li']['handler']['argument'] [] = $text; |
|
706 | 706 | |
707 | 707 | return $Block; |
708 | 708 | } |
709 | 709 | |
710 | - if ( ! isset($Block['interrupted'])) { |
|
710 | + if (!isset($Block['interrupted'])) { |
|
711 | 711 | $text = \preg_replace('/^[ ]{0,'.$requiredIndent.'}+/', '', $Line['body']); |
712 | 712 | |
713 | - $Block['li']['handler']['argument'] []= $text; |
|
713 | + $Block['li']['handler']['argument'] [] = $text; |
|
714 | 714 | |
715 | 715 | return $Block; |
716 | 716 | } |
@@ -723,7 +723,7 @@ discard block |
||
723 | 723 | { |
724 | 724 | if (end($li['handler']['argument']) !== '') |
725 | 725 | { |
726 | - $li['handler']['argument'] []= ''; |
|
726 | + $li['handler']['argument'] [] = ''; |
|
727 | 727 | } |
728 | 728 | } |
729 | 729 | } |
@@ -759,13 +759,13 @@ discard block |
||
759 | 759 | } |
760 | 760 | |
761 | 761 | if ($Line['text'][0] === '>' and \preg_match('/^>[ ]?+(.*+)/', $Line['text'], $matches)) { |
762 | - $Block['element']['handler']['argument'] []= $matches[1]; |
|
762 | + $Block['element']['handler']['argument'] [] = $matches[1]; |
|
763 | 763 | |
764 | 764 | return $Block; |
765 | 765 | } |
766 | 766 | |
767 | - if ( ! isset($Block['interrupted'])) { |
|
768 | - $Block['element']['handler']['argument'] []= $Line['text']; |
|
767 | + if (!isset($Block['interrupted'])) { |
|
768 | + $Block['element']['handler']['argument'] [] = $Line['text']; |
|
769 | 769 | |
770 | 770 | return $Block; |
771 | 771 | } |
@@ -794,7 +794,7 @@ discard block |
||
794 | 794 | |
795 | 795 | protected function blockSetextHeader($Line, array $Block = null) |
796 | 796 | { |
797 | - if ( ! isset($Block) or $Block['type'] !== 'Paragraph' or isset($Block['interrupted'])) { |
|
797 | + if (!isset($Block) or $Block['type'] !== 'Paragraph' or isset($Block['interrupted'])) { |
|
798 | 798 | return; |
799 | 799 | } |
800 | 800 | |
@@ -839,7 +839,7 @@ discard block |
||
839 | 839 | return; |
840 | 840 | } |
841 | 841 | |
842 | - $Block['element']['rawHtml'] .= "\n" . $Line['body']; |
|
842 | + $Block['element']['rawHtml'] .= "\n".$Line['body']; |
|
843 | 843 | |
844 | 844 | return $Block; |
845 | 845 | } |
@@ -874,7 +874,7 @@ discard block |
||
874 | 874 | |
875 | 875 | protected function blockTable($Line, array $Block = null) |
876 | 876 | { |
877 | - if ( ! isset($Block) or $Block['type'] !== 'Paragraph' or isset($Block['interrupted'])) { |
|
877 | + if (!isset($Block) or $Block['type'] !== 'Paragraph' or isset($Block['interrupted'])) { |
|
878 | 878 | return; |
879 | 879 | } |
880 | 880 | |
@@ -917,7 +917,7 @@ discard block |
||
917 | 917 | $alignment = $alignment === 'left' ? 'center' : 'right'; |
918 | 918 | } |
919 | 919 | |
920 | - $alignments []= $alignment; |
|
920 | + $alignments [] = $alignment; |
|
921 | 921 | } |
922 | 922 | |
923 | 923 | # ~ |
@@ -955,7 +955,7 @@ discard block |
||
955 | 955 | ]; |
956 | 956 | } |
957 | 957 | |
958 | - $HeaderElements []= $HeaderElement; |
|
958 | + $HeaderElements [] = $HeaderElement; |
|
959 | 959 | } |
960 | 960 | |
961 | 961 | # ~ |
@@ -969,16 +969,16 @@ discard block |
||
969 | 969 | ], |
970 | 970 | ]; |
971 | 971 | |
972 | - $Block['element']['elements'] []= [ |
|
972 | + $Block['element']['elements'] [] = [ |
|
973 | 973 | 'name' => 'thead', |
974 | 974 | ]; |
975 | 975 | |
976 | - $Block['element']['elements'] []= [ |
|
976 | + $Block['element']['elements'] [] = [ |
|
977 | 977 | 'name' => 'tbody', |
978 | 978 | 'elements' => [], |
979 | 979 | ]; |
980 | 980 | |
981 | - $Block['element']['elements'][0]['elements'] []= [ |
|
981 | + $Block['element']['elements'][0]['elements'] [] = [ |
|
982 | 982 | 'name' => 'tr', |
983 | 983 | 'elements' => $HeaderElements, |
984 | 984 | ]; |
@@ -1021,11 +1021,11 @@ discard block |
||
1021 | 1021 | if (isset($Block['alignments'][$index])) |
1022 | 1022 | { |
1023 | 1023 | $Element['attributes'] = [ |
1024 | - 'style' => 'text-align: ' . $Block['alignments'][$index] . ';', |
|
1024 | + 'style' => 'text-align: '.$Block['alignments'][$index].';', |
|
1025 | 1025 | ]; |
1026 | 1026 | } |
1027 | 1027 | |
1028 | - $Elements []= $Element; |
|
1028 | + $Elements [] = $Element; |
|
1029 | 1029 | } |
1030 | 1030 | |
1031 | 1031 | $Element = [ |
@@ -1033,7 +1033,7 @@ discard block |
||
1033 | 1033 | 'elements' => $Elements, |
1034 | 1034 | ]; |
1035 | 1035 | |
1036 | - $Block['element']['elements'][1]['elements'] []= $Element; |
|
1036 | + $Block['element']['elements'][1]['elements'] [] = $Element; |
|
1037 | 1037 | |
1038 | 1038 | return $Block; |
1039 | 1039 | } |
@@ -1133,7 +1133,7 @@ discard block |
||
1133 | 1133 | |
1134 | 1134 | $Inline = $this->{"inline$inlineType"}($Excerpt); |
1135 | 1135 | |
1136 | - if ( ! isset($Inline)) |
|
1136 | + if (!isset($Inline)) |
|
1137 | 1137 | { |
1138 | 1138 | continue; |
1139 | 1139 | } |
@@ -1147,7 +1147,7 @@ discard block |
||
1147 | 1147 | |
1148 | 1148 | # sets a default inline position |
1149 | 1149 | |
1150 | - if ( ! isset($Inline['position'])) |
|
1150 | + if (!isset($Inline['position'])) |
|
1151 | 1151 | { |
1152 | 1152 | $Inline['position'] = $markerPosition; |
1153 | 1153 | } |
@@ -1191,7 +1191,7 @@ discard block |
||
1191 | 1191 | |
1192 | 1192 | foreach ($Elements as &$Element) |
1193 | 1193 | { |
1194 | - if ( ! isset($Element['autobreak'])) |
|
1194 | + if (!isset($Element['autobreak'])) |
|
1195 | 1195 | { |
1196 | 1196 | $Element['autobreak'] = false; |
1197 | 1197 | } |
@@ -1247,14 +1247,14 @@ discard block |
||
1247 | 1247 | $hostnameLabel = '[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?'; |
1248 | 1248 | |
1249 | 1249 | $commonMarkEmail = '[a-zA-Z0-9.!#$%&\'*+\/=?^_`{|}~-]++@' |
1250 | - . $hostnameLabel . '(?:\.' . $hostnameLabel . ')*'; |
|
1250 | + . $hostnameLabel.'(?:\.'.$hostnameLabel.')*'; |
|
1251 | 1251 | |
1252 | 1252 | if (\strpos($Excerpt['text'], '>') !== false |
1253 | 1253 | and \preg_match("/^<((mailto:)?$commonMarkEmail)>/i", $Excerpt['text'], $matches) |
1254 | - ){ |
|
1254 | + ) { |
|
1255 | 1255 | $url = $matches[1]; |
1256 | 1256 | |
1257 | - if ( ! isset($matches[2])) |
|
1257 | + if (!isset($matches[2])) |
|
1258 | 1258 | { |
1259 | 1259 | $url = "mailto:$url"; |
1260 | 1260 | } |
@@ -1274,7 +1274,7 @@ discard block |
||
1274 | 1274 | |
1275 | 1275 | protected function inlineEmphasis($Excerpt) |
1276 | 1276 | { |
1277 | - if ( ! isset($Excerpt['text'][1])) |
|
1277 | + if (!isset($Excerpt['text'][1])) |
|
1278 | 1278 | { |
1279 | 1279 | return; |
1280 | 1280 | } |
@@ -1320,12 +1320,12 @@ discard block |
||
1320 | 1320 | |
1321 | 1321 | protected function inlineImage($Excerpt) |
1322 | 1322 | { |
1323 | - if ( ! isset($Excerpt['text'][1]) or $Excerpt['text'][1] !== '[') |
|
1323 | + if (!isset($Excerpt['text'][1]) or $Excerpt['text'][1] !== '[') |
|
1324 | 1324 | { |
1325 | 1325 | return; |
1326 | 1326 | } |
1327 | 1327 | |
1328 | - $Excerpt['text']= \substr($Excerpt['text'], 1); |
|
1328 | + $Excerpt['text'] = \substr($Excerpt['text'], 1); |
|
1329 | 1329 | |
1330 | 1330 | $Link = $this->inlineLink($Excerpt); |
1331 | 1331 | |
@@ -1411,7 +1411,7 @@ discard block |
||
1411 | 1411 | $definition = strtolower($Element['handler']['argument']); |
1412 | 1412 | } |
1413 | 1413 | |
1414 | - if ( ! isset($this->DefinitionData['Reference'][$definition])) |
|
1414 | + if (!isset($this->DefinitionData['Reference'][$definition])) |
|
1415 | 1415 | { |
1416 | 1416 | return; |
1417 | 1417 | } |
@@ -1466,7 +1466,7 @@ discard block |
||
1466 | 1466 | and \preg_match('/^&(#?+[0-9a-zA-Z]++);/', $Excerpt['text'], $matches) |
1467 | 1467 | ) { |
1468 | 1468 | return [ |
1469 | - 'element' => ['rawHtml' => '&' . $matches[1] . ';'], |
|
1469 | + 'element' => ['rawHtml' => '&'.$matches[1].';'], |
|
1470 | 1470 | 'extent' => \strlen($matches[0]), |
1471 | 1471 | ]; |
1472 | 1472 | } |
@@ -1476,7 +1476,7 @@ discard block |
||
1476 | 1476 | |
1477 | 1477 | protected function inlineStrikethrough($Excerpt) |
1478 | 1478 | { |
1479 | - if ( ! isset($Excerpt['text'][1])) |
|
1479 | + if (!isset($Excerpt['text'][1])) |
|
1480 | 1480 | { |
1481 | 1481 | return; |
1482 | 1482 | } |
@@ -1499,7 +1499,7 @@ discard block |
||
1499 | 1499 | |
1500 | 1500 | protected function inlineUrl($Excerpt) |
1501 | 1501 | { |
1502 | - if ($this->urlsLinked !== true or ! isset($Excerpt['text'][2]) or $Excerpt['text'][2] !== '/') |
|
1502 | + if ($this->urlsLinked !== true or !isset($Excerpt['text'][2]) or $Excerpt['text'][2] !== '/') |
|
1503 | 1503 | { |
1504 | 1504 | return; |
1505 | 1505 | } |
@@ -1670,7 +1670,7 @@ discard block |
||
1670 | 1670 | |
1671 | 1671 | if ($hasName) |
1672 | 1672 | { |
1673 | - $markup .= '<' . $Element['name']; |
|
1673 | + $markup .= '<'.$Element['name']; |
|
1674 | 1674 | |
1675 | 1675 | if (isset($Element['attributes'])) |
1676 | 1676 | { |
@@ -1728,7 +1728,7 @@ discard block |
||
1728 | 1728 | } |
1729 | 1729 | } |
1730 | 1730 | |
1731 | - $markup .= $hasName ? '</' . $Element['name'] . '>' : ''; |
|
1731 | + $markup .= $hasName ? '</'.$Element['name'].'>' : ''; |
|
1732 | 1732 | } |
1733 | 1733 | elseif ($hasName) |
1734 | 1734 | { |
@@ -1757,7 +1757,7 @@ discard block |
||
1757 | 1757 | // (autobreak === false) covers both sides of an element |
1758 | 1758 | $autoBreak = !$autoBreak ? $autoBreak : $autoBreakNext; |
1759 | 1759 | |
1760 | - $markup .= ($autoBreak ? "\n" : '') . $this->element($Element); |
|
1760 | + $markup .= ($autoBreak ? "\n" : '').$this->element($Element); |
|
1761 | 1761 | $autoBreak = $autoBreakNext; |
1762 | 1762 | } |
1763 | 1763 | |
@@ -1772,7 +1772,7 @@ discard block |
||
1772 | 1772 | { |
1773 | 1773 | $Elements = $this->linesElements($lines); |
1774 | 1774 | |
1775 | - if ( ! \in_array('', $lines) |
|
1775 | + if (!\in_array('', $lines) |
|
1776 | 1776 | and isset($Elements[0]) and isset($Elements[0]['name']) |
1777 | 1777 | and $Elements[0]['name'] === 'p' |
1778 | 1778 | ) { |
@@ -1829,12 +1829,12 @@ discard block |
||
1829 | 1829 | protected function sanitiseElement(array $Element) |
1830 | 1830 | { |
1831 | 1831 | static $goodAttribute = '/^[a-zA-Z0-9][a-zA-Z0-9-_]*+$/'; |
1832 | - static $safeUrlNameToAtt = [ |
|
1832 | + static $safeUrlNameToAtt = [ |
|
1833 | 1833 | 'a' => 'href', |
1834 | 1834 | 'img' => 'src', |
1835 | 1835 | ]; |
1836 | 1836 | |
1837 | - if ( ! isset($Element['name'])) |
|
1837 | + if (!isset($Element['name'])) |
|
1838 | 1838 | { |
1839 | 1839 | unset($Element['attributes']); |
1840 | 1840 | return $Element; |
@@ -1845,12 +1845,12 @@ discard block |
||
1845 | 1845 | $Element = $this->filterUnsafeUrlInAttribute($Element, $safeUrlNameToAtt[$Element['name']]); |
1846 | 1846 | } |
1847 | 1847 | |
1848 | - if ( ! empty($Element['attributes'])) |
|
1848 | + if (!empty($Element['attributes'])) |
|
1849 | 1849 | { |
1850 | 1850 | foreach ($Element['attributes'] as $att => $val) |
1851 | 1851 | { |
1852 | 1852 | # filter out badly parsed attribute |
1853 | - if ( ! \preg_match($goodAttribute, $att)) |
|
1853 | + if (!\preg_match($goodAttribute, $att)) |
|
1854 | 1854 | { |
1855 | 1855 | unset($Element['attributes'][$att]); |
1856 | 1856 | } |
@@ -1951,8 +1951,8 @@ discard block |
||
1951 | 1951 | protected $textLevelElements = [ |
1952 | 1952 | 'a', 'br', 'bdo', 'abbr', 'blink', 'nextid', 'acronym', 'basefont', |
1953 | 1953 | 'b', 'em', 'big', 'cite', 'small', 'spacer', 'listing', |
1954 | - 'i', 'rp', 'del', 'code', 'strike', 'marquee', |
|
1955 | - 'q', 'rt', 'ins', 'font', 'strong', |
|
1954 | + 'i', 'rp', 'del', 'code', 'strike', 'marquee', |
|
1955 | + 'q', 'rt', 'ins', 'font', 'strong', |
|
1956 | 1956 | 's', 'tt', 'kbd', 'mark', |
1957 | 1957 | 'u', 'xm', 'sub', 'nobr', |
1958 | 1958 | 'sup', 'ruby', |
@@ -25,7 +25,7 @@ discard block |
||
25 | 25 | |
26 | 26 | //\defined('XOOPS_ROOT_PATH') || die('XOOPS root path not defined'); |
27 | 27 | |
28 | -require_once \dirname(__DIR__, 4) . '/mainfile.php'; |
|
28 | +require_once \dirname(__DIR__, 4).'/mainfile.php'; |
|
29 | 29 | $moduleDirName = \basename(\dirname(__DIR__, 2)); |
30 | 30 | $moduleDirNameUpper = \mb_strtoupper($moduleDirName); |
31 | 31 | \xoops_loadLanguage('filechecker', $moduleDirName); |
@@ -57,24 +57,24 @@ discard block |
||
57 | 57 | if (null === $original_file_path) { |
58 | 58 | if (self::fileExists($file_path)) { |
59 | 59 | $path_status = "<img src='$pathIcon16/1.png' >"; |
60 | - $path_status .= "$file_path (" . \constant('CO_' . $moduleDirNameUpper . '_' . 'FC_AVAILABLE') . ') '; |
|
60 | + $path_status .= "$file_path (".\constant('CO_'.$moduleDirNameUpper.'_'.'FC_AVAILABLE').') '; |
|
61 | 61 | } else { |
62 | 62 | $path_status = "<img src='$pathIcon16/0.png' >"; |
63 | - $path_status .= "$file_path (" . \constant('CO_' . $moduleDirNameUpper . '_' . 'FC_NOTAVAILABLE') . ') '; |
|
63 | + $path_status .= "$file_path (".\constant('CO_'.$moduleDirNameUpper.'_'.'FC_NOTAVAILABLE').') '; |
|
64 | 64 | } |
65 | 65 | } else { |
66 | 66 | if (self::compareFiles($file_path, $original_file_path)) { |
67 | 67 | $path_status = "<img src='$pathIcon16/1.png' >"; |
68 | - $path_status .= "$file_path (" . \constant('CO_' . $moduleDirNameUpper . '_' . 'FC_AVAILABLE') . ') '; |
|
68 | + $path_status .= "$file_path (".\constant('CO_'.$moduleDirNameUpper.'_'.'FC_AVAILABLE').') '; |
|
69 | 69 | } else { |
70 | 70 | $path_status = "<img src='$pathIcon16/0.png' >"; |
71 | - $path_status .= "$file_path (" . \constant('CO_' . $moduleDirNameUpper . '_' . 'FC_NOTAVAILABLE') . ') '; |
|
72 | - $path_status .= "<form action='" . $_SERVER['SCRIPT_NAME'] . "' method='post'>"; |
|
71 | + $path_status .= "$file_path (".\constant('CO_'.$moduleDirNameUpper.'_'.'FC_NOTAVAILABLE').') '; |
|
72 | + $path_status .= "<form action='".$_SERVER['SCRIPT_NAME']."' method='post'>"; |
|
73 | 73 | $path_status .= "<input type='hidden' name='op' value='copyfile'>"; |
74 | 74 | $path_status .= "<input type='hidden' name='file_path' value='$file_path'>"; |
75 | 75 | $path_status .= "<input type='hidden' name='original_file_path' value='$original_file_path'>"; |
76 | 76 | $path_status .= "<input type='hidden' name='redirect' value='$redirectFile'>"; |
77 | - $path_status .= "<button class='submit' onClick='this.form.submit();'>" . \constant('CO_' . $moduleDirNameUpper . '_' . 'FC_CREATETHEFILE') . '</button>'; |
|
77 | + $path_status .= "<button class='submit' onClick='this.form.submit();'>".\constant('CO_'.$moduleDirNameUpper.'_'.'FC_CREATETHEFILE').'</button>'; |
|
78 | 78 | $path_status .= '</form>'; |
79 | 79 | } |
80 | 80 | } |
@@ -139,7 +139,7 @@ discard block |
||
139 | 139 | { |
140 | 140 | $target = \str_replace('..', '', $target); |
141 | 141 | |
142 | - return @\chmod($target, (int)$mode); |
|
142 | + return @\chmod($target, (int) $mode); |
|
143 | 143 | } |
144 | 144 | } |
145 | 145 | |
@@ -155,7 +155,7 @@ discard block |
||
155 | 155 | if (\Xmf\Request::hasVar('redirect', 'POST')) { |
156 | 156 | $redirect = $_POST['redirect']; |
157 | 157 | } |
158 | - $msg = FileChecker::copyFile($original_file_path, $file_path) ? \constant('CO_' . $moduleDirNameUpper . '_' . 'FC_FILECOPIED') : \constant('CO_' . $moduleDirNameUpper . '_' . 'FC_FILENOTCOPIED'); |
|
159 | - \redirect_header($redirect, 2, $msg . ': ' . $file_path); |
|
158 | + $msg = FileChecker::copyFile($original_file_path, $file_path) ? \constant('CO_'.$moduleDirNameUpper.'_'.'FC_FILECOPIED') : \constant('CO_'.$moduleDirNameUpper.'_'.'FC_FILENOTCOPIED'); |
|
159 | + \redirect_header($redirect, 2, $msg.': '.$file_path); |
|
160 | 160 | break; |
161 | 161 | } |
@@ -24,7 +24,7 @@ discard block |
||
24 | 24 | use XoopsModules\Wggithub; |
25 | 25 | |
26 | 26 | |
27 | -require_once \dirname(__DIR__, 4) . '/mainfile.php'; |
|
27 | +require_once \dirname(__DIR__, 4).'/mainfile.php'; |
|
28 | 28 | $moduleDirName = \basename(\dirname(__DIR__, 2)); |
29 | 29 | $moduleDirNameUpper = \mb_strtoupper($moduleDirName); |
30 | 30 | \xoops_loadLanguage('directorychecker', $moduleDirName); |
@@ -56,38 +56,38 @@ discard block |
||
56 | 56 | $moduleDirNameUpper = \mb_strtoupper($moduleDirName); |
57 | 57 | if (!@\is_dir($path)) { |
58 | 58 | $path_status = "<img src='$pathIcon16/0.png' >"; |
59 | - $path_status .= "$path (" . \constant('CO_' . $moduleDirNameUpper . '_' . 'DC_NOTAVAILABLE') . ') '; |
|
60 | - $path_status .= "<form action='" . $_SERVER['SCRIPT_NAME'] . "' method='post'>"; |
|
59 | + $path_status .= "$path (".\constant('CO_'.$moduleDirNameUpper.'_'.'DC_NOTAVAILABLE').') '; |
|
60 | + $path_status .= "<form action='".$_SERVER['SCRIPT_NAME']."' method='post'>"; |
|
61 | 61 | $path_status .= "<input type='hidden' name='op' value='createdir'>"; |
62 | 62 | $path_status .= "<input type='hidden' name='path' value='$path'>"; |
63 | 63 | $path_status .= "<input type='hidden' name='redirect' value='$redirectFile'>"; |
64 | - $path_status .= "<button class='submit' onClick='this.form.submit();'>" . \constant('CO_' . $moduleDirNameUpper . '_' . 'DC_CREATETHEDIR') . '</button>'; |
|
64 | + $path_status .= "<button class='submit' onClick='this.form.submit();'>".\constant('CO_'.$moduleDirNameUpper.'_'.'DC_CREATETHEDIR').'</button>'; |
|
65 | 65 | $path_status .= '</form>'; |
66 | 66 | } elseif (@\is_writable($path)) { |
67 | 67 | $path_status = "<img src='$pathIcon16/1.png' >"; |
68 | - $path_status .= "$path (" . \constant('CO_' . $moduleDirNameUpper . '_' . 'DC_AVAILABLE') . ') '; |
|
68 | + $path_status .= "$path (".\constant('CO_'.$moduleDirNameUpper.'_'.'DC_AVAILABLE').') '; |
|
69 | 69 | $currentMode = \mb_substr(\decoct(\fileperms($path)), 2); |
70 | 70 | if ($currentMode != \decoct($mode)) { |
71 | 71 | $path_status = "<img src='$pathIcon16/0.png' >"; |
72 | - $path_status .= $path . \sprintf(\constant('CO_' . $moduleDirNameUpper . '_' . 'DC_NOTWRITABLE'), \decoct($mode), $currentMode); |
|
73 | - $path_status .= "<form action='" . $_SERVER['SCRIPT_NAME'] . "' method='post'>"; |
|
72 | + $path_status .= $path.\sprintf(\constant('CO_'.$moduleDirNameUpper.'_'.'DC_NOTWRITABLE'), \decoct($mode), $currentMode); |
|
73 | + $path_status .= "<form action='".$_SERVER['SCRIPT_NAME']."' method='post'>"; |
|
74 | 74 | $path_status .= "<input type='hidden' name='op' value='setdirperm'>"; |
75 | 75 | $path_status .= "<input type='hidden' name='mode' value='$mode'>"; |
76 | 76 | $path_status .= "<input type='hidden' name='path' value='$path'>"; |
77 | 77 | $path_status .= "<input type='hidden' name='redirect' value='$redirectFile'>"; |
78 | - $path_status .= "<button class='submit' onClick='this.form.submit();'>" . \constant('CO_' . $moduleDirNameUpper . '_' . 'DC_SETMPERM') . '</button>'; |
|
78 | + $path_status .= "<button class='submit' onClick='this.form.submit();'>".\constant('CO_'.$moduleDirNameUpper.'_'.'DC_SETMPERM').'</button>'; |
|
79 | 79 | $path_status .= '</form>'; |
80 | 80 | } |
81 | 81 | } else { |
82 | 82 | $currentMode = \mb_substr(\decoct(\fileperms($path)), 2); |
83 | 83 | $path_status = "<img src='$pathIcon16/0.png' >"; |
84 | - $path_status .= $path . \sprintf(\constant('CO_' . $moduleDirNameUpper . '_' . 'DC_NOTWRITABLE'), \decoct($mode), $currentMode); |
|
85 | - $path_status .= "<form action='" . $_SERVER['SCRIPT_NAME'] . "' method='post'>"; |
|
84 | + $path_status .= $path.\sprintf(\constant('CO_'.$moduleDirNameUpper.'_'.'DC_NOTWRITABLE'), \decoct($mode), $currentMode); |
|
85 | + $path_status .= "<form action='".$_SERVER['SCRIPT_NAME']."' method='post'>"; |
|
86 | 86 | $path_status .= "<input type='hidden' name='op' value='setdirperm'>"; |
87 | 87 | $path_status .= "<input type='hidden' name='mode' value='$mode'>"; |
88 | 88 | $path_status .= "<input type='hidden' name='path' value='$path'>"; |
89 | 89 | $path_status .= "<input type='hidden' name='redirect' value='$redirectFile'>"; |
90 | - $path_status .= "<button class='submit' onClick='this.form.submit();'>" . \constant('CO_' . $moduleDirNameUpper . '_' . 'DC_SETMPERM') . '</button>'; |
|
90 | + $path_status .= "<button class='submit' onClick='this.form.submit();'>".\constant('CO_'.$moduleDirNameUpper.'_'.'DC_SETMPERM').'</button>'; |
|
91 | 91 | $path_status .= '</form>'; |
92 | 92 | } |
93 | 93 | |
@@ -118,7 +118,7 @@ discard block |
||
118 | 118 | { |
119 | 119 | $target = \str_replace('..', '', $target); |
120 | 120 | |
121 | - return @\chmod($target, (int)$mode); |
|
121 | + return @\chmod($target, (int) $mode); |
|
122 | 122 | } |
123 | 123 | |
124 | 124 | /** |
@@ -141,8 +141,8 @@ discard block |
||
141 | 141 | if (\Xmf\Request::hasVar('redirect', 'POST')) { |
142 | 142 | $redirect = $_POST['redirect']; |
143 | 143 | } |
144 | - $msg = DirectoryChecker::createDirectory($path) ? \constant('CO_' . $moduleDirNameUpper . '_' . 'DC_DIRCREATED') : \constant('CO_' . $moduleDirNameUpper . '_' . 'DC_DIRNOTCREATED'); |
|
145 | - \redirect_header($redirect, 2, $msg . ': ' . $path); |
|
144 | + $msg = DirectoryChecker::createDirectory($path) ? \constant('CO_'.$moduleDirNameUpper.'_'.'DC_DIRCREATED') : \constant('CO_'.$moduleDirNameUpper.'_'.'DC_DIRNOTCREATED'); |
|
145 | + \redirect_header($redirect, 2, $msg.': '.$path); |
|
146 | 146 | break; |
147 | 147 | case 'setdirperm': |
148 | 148 | if (\Xmf\Request::hasVar('path', 'POST')) { |
@@ -154,7 +154,7 @@ discard block |
||
154 | 154 | if (\Xmf\Request::hasVar('mode', 'POST')) { |
155 | 155 | $mode = $_POST['mode']; |
156 | 156 | } |
157 | - $msg = DirectoryChecker::setDirectoryPermissions($path, $mode) ? \constant('CO_' . $moduleDirNameUpper . '_' . 'DC_PERMSET') : \constant('CO_' . $moduleDirNameUpper . '_' . 'DC_PERMNOTSET'); |
|
158 | - \redirect_header($redirect, 2, $msg . ': ' . $path); |
|
157 | + $msg = DirectoryChecker::setDirectoryPermissions($path, $mode) ? \constant('CO_'.$moduleDirNameUpper.'_'.'DC_PERMSET') : \constant('CO_'.$moduleDirNameUpper.'_'.'DC_PERMNOTSET'); |
|
158 | + \redirect_header($redirect, 2, $msg.': '.$path); |
|
159 | 159 | break; |
160 | 160 | } |
@@ -84,7 +84,7 @@ discard block |
||
84 | 84 | $line = \trim($value); |
85 | 85 | if ('CREATE TABLE' === \mb_strtoupper(\substr($line, 0, 12))) { |
86 | 86 | // start table definition |
87 | - $tableName = $this->getTableName ($line); |
|
87 | + $tableName = $this->getTableName($line); |
|
88 | 88 | $tables[$tableName] = []; |
89 | 89 | $tables[$tableName]['options'] = ''; |
90 | 90 | $tables[$tableName]['columns'] = []; |
@@ -121,22 +121,22 @@ discard block |
||
121 | 121 | $schema[] = "{$tkey}:\n"; |
122 | 122 | foreach ($table as $lkey => $line) { |
123 | 123 | if ('keys' == $lkey) { |
124 | - $schema[] = $level1 . "keys:\n"; |
|
124 | + $schema[] = $level1."keys:\n"; |
|
125 | 125 | foreach ($line as $kkey => $kvalue) { |
126 | 126 | foreach ($kvalue as $kkey2 => $kvalue2) { |
127 | - $schema[] = $level2 . $kkey2 . ":\n"; |
|
128 | - $schema[] = $level3 . 'columns: ' . $kvalue2['columns'] . "\n"; |
|
129 | - $schema[] = $level3 . 'unique: ' . $kvalue2['unique'] . "\n"; |
|
127 | + $schema[] = $level2.$kkey2.":\n"; |
|
128 | + $schema[] = $level3.'columns: '.$kvalue2['columns']."\n"; |
|
129 | + $schema[] = $level3.'unique: '.$kvalue2['unique']."\n"; |
|
130 | 130 | } |
131 | 131 | } |
132 | 132 | } elseif ('options' == $lkey) { |
133 | - $schema[] = $level1 . 'options: ' . $line . "\n"; |
|
133 | + $schema[] = $level1.'options: '.$line."\n"; |
|
134 | 134 | } else { |
135 | - $schema[] = $level1 . 'columns: ' . "\n"; |
|
135 | + $schema[] = $level1.'columns: '."\n"; |
|
136 | 136 | foreach ($line as $kkey => $kvalue) { |
137 | - $schema[] = $level2 . '-' . "\n"; |
|
137 | + $schema[] = $level2.'-'."\n"; |
|
138 | 138 | foreach ($kvalue as $kkey2 => $kvalue2) { |
139 | - $schema[] = $level3 . $kkey2 . ": " . $kvalue2 . "\n"; |
|
139 | + $schema[] = $level3.$kkey2.": ".$kvalue2."\n"; |
|
140 | 140 | } |
141 | 141 | } |
142 | 142 | } |
@@ -164,10 +164,10 @@ discard block |
||
164 | 164 | * @param string $line |
165 | 165 | * @return string|bool |
166 | 166 | */ |
167 | - private function getTableName (string $line) |
|
167 | + private function getTableName(string $line) |
|
168 | 168 | { |
169 | 169 | |
170 | - $arrLine = \explode( '`', $line); |
|
170 | + $arrLine = \explode('`', $line); |
|
171 | 171 | if (\count($arrLine) > 0) { |
172 | 172 | return $arrLine[1]; |
173 | 173 | } |
@@ -182,12 +182,12 @@ discard block |
||
182 | 182 | * @param string $line |
183 | 183 | * @return array|bool |
184 | 184 | */ |
185 | - private function getColumns (string $line) |
|
185 | + private function getColumns(string $line) |
|
186 | 186 | { |
187 | 187 | |
188 | 188 | $columns = []; |
189 | 189 | |
190 | - $arrCol = \explode( ' ', \trim($line)); |
|
190 | + $arrCol = \explode(' ', \trim($line)); |
|
191 | 191 | if (\count($arrCol) > 0) { |
192 | 192 | $name = \str_replace(['`'], '', $arrCol[0]); |
193 | 193 | } else { |
@@ -198,11 +198,11 @@ discard block |
||
198 | 198 | $columns['name'] = $name; |
199 | 199 | // update quotes |
200 | 200 | if (\strpos($attributes, "''") > 0) { |
201 | - $attributes = \trim(\str_replace("''", "''''''''" , $attributes)); |
|
201 | + $attributes = \trim(\str_replace("''", "''''''''", $attributes)); |
|
202 | 202 | } elseif (\strpos($attributes, "'") > 0) { |
203 | - $attributes = \trim(\str_replace("'", "''" , $attributes)); |
|
203 | + $attributes = \trim(\str_replace("'", "''", $attributes)); |
|
204 | 204 | } |
205 | - $columns['attributes'] = "' " . $attributes . " '"; |
|
205 | + $columns['attributes'] = "' ".$attributes." '"; |
|
206 | 206 | |
207 | 207 | return $columns; |
208 | 208 | |
@@ -214,12 +214,12 @@ discard block |
||
214 | 214 | * @param string $line |
215 | 215 | * @return string |
216 | 216 | */ |
217 | - private function getOptions (string $line): string |
|
217 | + private function getOptions(string $line): string |
|
218 | 218 | { |
219 | 219 | |
220 | 220 | $options = \str_replace([')', ';'], '', $line); |
221 | 221 | $options = \trim($options); |
222 | - $options = "'" . $options . "'"; |
|
222 | + $options = "'".$options."'"; |
|
223 | 223 | |
224 | 224 | return $options; |
225 | 225 | |
@@ -231,7 +231,7 @@ discard block |
||
231 | 231 | * @param string $line |
232 | 232 | * @return array|bool |
233 | 233 | */ |
234 | - private function getKey (string $line) |
|
234 | + private function getKey(string $line) |
|
235 | 235 | { |
236 | 236 | |
237 | 237 | $key = []; |
@@ -254,12 +254,12 @@ discard block |
||
254 | 254 | if ('' == $name) { |
255 | 255 | $name = $columns; |
256 | 256 | } |
257 | - if (\strpos($name,' ') > 0) { |
|
258 | - $name = "'" . $name . "'"; |
|
257 | + if (\strpos($name, ' ') > 0) { |
|
258 | + $name = "'".$name."'"; |
|
259 | 259 | } |
260 | 260 | $key[$name] = []; |
261 | - if (\strpos($columns,' ') > 0) { |
|
262 | - $columns = "'" . $columns . "'"; |
|
261 | + if (\strpos($columns, ' ') > 0) { |
|
262 | + $columns = "'".$columns."'"; |
|
263 | 263 | } |
264 | 264 | $key[$name]['columns'] = $columns; |
265 | 265 | $key[$name]['unique'] = $unique; |
@@ -39,10 +39,10 @@ discard block |
||
39 | 39 | 'license_url' => 'http://www.gnu.org/licenses/gpl-3.0.en.html', |
40 | 40 | 'help' => 'page=help', |
41 | 41 | 'release_info' => 'release_info', |
42 | - 'release_file' => \XOOPS_URL . '/modules/wggithub/docs/release_info file', |
|
42 | + 'release_file' => \XOOPS_URL.'/modules/wggithub/docs/release_info file', |
|
43 | 43 | 'release_date' => '2021/03/31', |
44 | 44 | 'manual' => 'link to manual file', |
45 | - 'manual_file' => \XOOPS_URL . '/modules/wggithub/docs/install.txt', |
|
45 | + 'manual_file' => \XOOPS_URL.'/modules/wggithub/docs/install.txt', |
|
46 | 46 | 'min_php' => '7.4', |
47 | 47 | 'min_xoops' => '2.5.11 Beta1', |
48 | 48 | 'min_admin' => '1.2', |
@@ -299,8 +299,8 @@ discard block |
||
299 | 299 | // Make Sample button visible? |
300 | 300 | $modversion['config'][] = [ |
301 | 301 | 'name' => 'displaySampleButton', |
302 | - 'title' => 'CO_' . $moduleDirNameUpper . '_' . 'SHOW_SAMPLE_BUTTON', |
|
303 | - 'description' => 'CO_' . $moduleDirNameUpper . '_' . 'SHOW_SAMPLE_BUTTON_DESC', |
|
302 | + 'title' => 'CO_'.$moduleDirNameUpper.'_'.'SHOW_SAMPLE_BUTTON', |
|
303 | + 'description' => 'CO_'.$moduleDirNameUpper.'_'.'SHOW_SAMPLE_BUTTON_DESC', |
|
304 | 304 | 'formtype' => 'yesno', |
305 | 305 | 'valuetype' => 'int', |
306 | 306 | 'default' => 1, |
@@ -33,7 +33,7 @@ discard block |
||
33 | 33 | $cat_sql .= current($cats); |
34 | 34 | array_shift($cats); |
35 | 35 | foreach ($cats as $cat) { |
36 | - $cat_sql .= ',' . $cat; |
|
36 | + $cat_sql .= ','.$cat; |
|
37 | 37 | } |
38 | 38 | } |
39 | 39 | $cat_sql .= ')'; |
@@ -72,9 +72,9 @@ discard block |
||
72 | 72 | { |
73 | 73 | global $xoopsTpl, $xoTheme; |
74 | 74 | $myts = MyTextSanitizer::getInstance(); |
75 | - $content= $myts->undoHtmlSpecialChars($myts->displayTarea($content)); |
|
76 | - if(isset($xoTheme) && \is_object($xoTheme)) { |
|
77 | - $xoTheme->addMeta( 'meta', 'keywords', \strip_tags($content)); |
|
75 | + $content = $myts->undoHtmlSpecialChars($myts->displayTarea($content)); |
|
76 | + if (isset($xoTheme) && \is_object($xoTheme)) { |
|
77 | + $xoTheme->addMeta('meta', 'keywords', \strip_tags($content)); |
|
78 | 78 | } else { // Compatibility for old Xoops versions |
79 | 79 | $xoopsTpl->assign('xoops_meta_keywords', \strip_tags($content)); |
80 | 80 | } |
@@ -91,8 +91,8 @@ discard block |
||
91 | 91 | global $xoopsTpl, $xoTheme; |
92 | 92 | $myts = MyTextSanitizer::getInstance(); |
93 | 93 | $content = $myts->undoHtmlSpecialChars($myts->displayTarea($content)); |
94 | - if(isset($xoTheme) && \is_object($xoTheme)) { |
|
95 | - $xoTheme->addMeta( 'meta', 'description', \strip_tags($content)); |
|
94 | + if (isset($xoTheme) && \is_object($xoTheme)) { |
|
95 | + $xoTheme->addMeta('meta', 'description', \strip_tags($content)); |
|
96 | 96 | } else { // Compatibility for old Xoops versions |
97 | 97 | $xoopsTpl->assign('xoops_meta_description', \strip_tags($content)); |
98 | 98 | } |
@@ -117,7 +117,7 @@ discard block |
||
117 | 117 | if (0 != $lenght_id) { |
118 | 118 | $id = $array['content_id']; |
119 | 119 | while (\strlen($id) < $lenght_id) { |
120 | - $id = '0' . $id; |
|
120 | + $id = '0'.$id; |
|
121 | 121 | } |
122 | 122 | } else { |
123 | 123 | $id = $array['content_id']; |
@@ -132,23 +132,23 @@ discard block |
||
132 | 132 | switch ($rewrite_url) { |
133 | 133 | |
134 | 134 | case 'none': |
135 | - if($topic_name) { |
|
136 | - $topic_name = 'topic=' . $topic_name . '&'; |
|
135 | + if ($topic_name) { |
|
136 | + $topic_name = 'topic='.$topic_name.'&'; |
|
137 | 137 | } |
138 | 138 | $rewrite_base = '/modules/'; |
139 | - $page = 'page=' . $array['content_alias']; |
|
140 | - return \XOOPS_URL . $rewrite_base . $module . '/' . $type . '.php?' . $topic_name . 'id=' . $id . '&' . $page . $comment; |
|
139 | + $page = 'page='.$array['content_alias']; |
|
140 | + return \XOOPS_URL.$rewrite_base.$module.'/'.$type.'.php?'.$topic_name.'id='.$id.'&'.$page.$comment; |
|
141 | 141 | break; |
142 | 142 | |
143 | 143 | case 'rewrite': |
144 | - if($topic_name) { |
|
144 | + if ($topic_name) { |
|
145 | 145 | $topic_name .= '/'; |
146 | 146 | } |
147 | 147 | $rewrite_base = xoops_getModuleOption('rewrite_mode', $module); |
148 | 148 | $rewrite_ext = xoops_getModuleOption('rewrite_ext', $module); |
149 | 149 | $module_name = ''; |
150 | - if(xoops_getModuleOption('rewrite_name', $module)) { |
|
151 | - $module_name = xoops_getModuleOption('rewrite_name', $module) . '/'; |
|
150 | + if (xoops_getModuleOption('rewrite_name', $module)) { |
|
151 | + $module_name = xoops_getModuleOption('rewrite_name', $module).'/'; |
|
152 | 152 | } |
153 | 153 | $page = $array['content_alias']; |
154 | 154 | $type .= '/'; |
@@ -157,21 +157,21 @@ discard block |
||
157 | 157 | $type = ''; |
158 | 158 | } |
159 | 159 | if ('comment-edit/' === $type || 'comment-reply/' === $type || 'comment-delete/' === $type) { |
160 | - return \XOOPS_URL . $rewrite_base . $module_name . $type . $id . '/'; |
|
160 | + return \XOOPS_URL.$rewrite_base.$module_name.$type.$id.'/'; |
|
161 | 161 | } |
162 | 162 | |
163 | - return \XOOPS_URL . $rewrite_base . $module_name . $type . $topic_name . $id . $page . $rewrite_ext; |
|
163 | + return \XOOPS_URL.$rewrite_base.$module_name.$type.$topic_name.$id.$page.$rewrite_ext; |
|
164 | 164 | break; |
165 | 165 | |
166 | 166 | case 'short': |
167 | - if($topic_name) { |
|
167 | + if ($topic_name) { |
|
168 | 168 | $topic_name .= '/'; |
169 | 169 | } |
170 | 170 | $rewrite_base = xoops_getModuleOption('rewrite_mode', $module); |
171 | 171 | $rewrite_ext = xoops_getModuleOption('rewrite_ext', $module); |
172 | 172 | $module_name = ''; |
173 | - if(xoops_getModuleOption('rewrite_name', $module)) { |
|
174 | - $module_name = xoops_getModuleOption('rewrite_name', $module) . '/'; |
|
173 | + if (xoops_getModuleOption('rewrite_name', $module)) { |
|
174 | + $module_name = xoops_getModuleOption('rewrite_name', $module).'/'; |
|
175 | 175 | } |
176 | 176 | $page = $array['content_alias']; |
177 | 177 | $type .= '/'; |
@@ -179,10 +179,10 @@ discard block |
||
179 | 179 | $type = ''; |
180 | 180 | } |
181 | 181 | if ('comment-edit/' === $type || 'comment-reply/' === $type || 'comment-delete/' === $type) { |
182 | - return \XOOPS_URL . $rewrite_base . $module_name . $type . $id . '/'; |
|
182 | + return \XOOPS_URL.$rewrite_base.$module_name.$type.$id.'/'; |
|
183 | 183 | } |
184 | 184 | |
185 | - return \XOOPS_URL . $rewrite_base . $module_name . $type . $topic_name . $page . $rewrite_ext; |
|
185 | + return \XOOPS_URL.$rewrite_base.$module_name.$type.$topic_name.$page.$rewrite_ext; |
|
186 | 186 | break; |
187 | 187 | } |
188 | 188 | return null; |
@@ -206,6 +206,6 @@ discard block |
||
206 | 206 | $url .= htmlentities($url, ENT_COMPAT, 'utf-8'); |
207 | 207 | $url .= \preg_replace('`&([a-z])(acute|uml|circ|grave|ring|cedil|slash|tilde|caron|lig);`i', "\1", $url); |
208 | 208 | $url .= \preg_replace([$regular_expression, '`[-]+`'], '-', $url); |
209 | - $url = ($url == '') ? $type : strtolower( rim($url, '-')); |
|
209 | + $url = ($url == '') ? $type : strtolower(rim($url, '-')); |
|
210 | 210 | return $url; |
211 | 211 | } |
212 | 212 | \ No newline at end of file |