@@ -1991,8 +1991,8 @@  | 
                                                    ||
| 1991 | 1991 | 'q', 'rt', 'ins', 'font', 'strong',  | 
                                                        
| 1992 | 1992 | 's', 'tt', 'kbd', 'mark',  | 
                                                        
| 1993 | 1993 | 'u', 'xm', 'sub', 'nobr',  | 
                                                        
| 1994 | - 'sup', 'ruby',  | 
                                                        |
| 1995 | - 'var', 'span',  | 
                                                        |
| 1996 | - 'wbr', 'time',  | 
                                                        |
| 1994 | + 'sup', 'ruby',  | 
                                                        |
| 1995 | + 'var', 'span',  | 
                                                        |
| 1996 | + 'wbr', 'time',  | 
                                                        |
| 1997 | 1997 | );  | 
                                                        
| 1998 | 1998 | }  | 
                                                        
@@ -1284,12 +1284,10 @@ discard block  | 
                                                    ||
| 1284 | 1284 | if ($Excerpt['text'][1] === $marker and preg_match($this->StrongRegex[$marker], $Excerpt['text'], $matches))  | 
                                                        
| 1285 | 1285 |          { | 
                                                        
| 1286 | 1286 | $emphasis = 'strong';  | 
                                                        
| 1287 | - }  | 
                                                        |
| 1288 | - elseif (preg_match($this->EmRegex[$marker], $Excerpt['text'], $matches))  | 
                                                        |
| 1287 | + } elseif (preg_match($this->EmRegex[$marker], $Excerpt['text'], $matches))  | 
                                                        |
| 1289 | 1288 |          { | 
                                                        
| 1290 | 1289 | $emphasis = 'em';  | 
                                                        
| 1291 | - }  | 
                                                        |
| 1292 | - else  | 
                                                        |
| 1290 | + } else  | 
                                                        |
| 1293 | 1291 |          { | 
                                                        
| 1294 | 1292 | return;  | 
                                                        
| 1295 | 1293 | }  | 
                                                        
@@ -1380,8 +1378,7 @@ discard block  | 
                                                    ||
| 1380 | 1378 | $extent += strlen($matches[0]);  | 
                                                        
| 1381 | 1379 | |
| 1382 | 1380 | $remainder = substr($remainder, $extent);  | 
                                                        
| 1383 | - }  | 
                                                        |
| 1384 | - else  | 
                                                        |
| 1381 | + } else  | 
                                                        |
| 1385 | 1382 |          { | 
                                                        
| 1386 | 1383 | return;  | 
                                                        
| 1387 | 1384 | }  | 
                                                        
@@ -1396,8 +1393,7 @@ discard block  | 
                                                    ||
| 1396 | 1393 | }  | 
                                                        
| 1397 | 1394 | |
| 1398 | 1395 | $extent += strlen($matches[0]);  | 
                                                        
| 1399 | - }  | 
                                                        |
| 1400 | - else  | 
                                                        |
| 1396 | + } else  | 
                                                        |
| 1401 | 1397 |          { | 
                                                        
| 1402 | 1398 |              if (preg_match('/^\s*\[(.*?)\]/', $remainder, $matches)) | 
                                                        
| 1403 | 1399 |              { | 
                                                        
@@ -1405,8 +1401,7 @@ discard block  | 
                                                    ||
| 1405 | 1401 | $definition = strtolower($definition);  | 
                                                        
| 1406 | 1402 | |
| 1407 | 1403 | $extent += strlen($matches[0]);  | 
                                                        
| 1408 | - }  | 
                                                        |
| 1409 | - else  | 
                                                        |
| 1404 | + } else  | 
                                                        |
| 1410 | 1405 |              { | 
                                                        
| 1411 | 1406 | $definition = strtolower($Element['handler']['argument']);  | 
                                                        
| 1412 | 1407 | }  | 
                                                        
@@ -1571,8 +1566,7 @@ discard block  | 
                                                    ||
| 1571 | 1566 | $argument = $Element['text'];  | 
                                                        
| 1572 | 1567 | unset($Element['text']);  | 
                                                        
| 1573 | 1568 | $destination = 'rawHtml';  | 
                                                        
| 1574 | - }  | 
                                                        |
| 1575 | - else  | 
                                                        |
| 1569 | + } else  | 
                                                        |
| 1576 | 1570 |              { | 
                                                        
| 1577 | 1571 | $function = $Element['handler']['function'];  | 
                                                        
| 1578 | 1572 | $argument = $Element['handler']['argument'];  | 
                                                        
@@ -1609,8 +1603,7 @@ discard block  | 
                                                    ||
| 1609 | 1603 | if (isset($Element['elements']))  | 
                                                        
| 1610 | 1604 |          { | 
                                                        
| 1611 | 1605 | $Element['elements'] = $this->elementsApplyRecursive($closure, $Element['elements']);  | 
                                                        
| 1612 | - }  | 
                                                        |
| 1613 | - elseif (isset($Element['element']))  | 
                                                        |
| 1606 | + } elseif (isset($Element['element']))  | 
                                                        |
| 1614 | 1607 |          { | 
                                                        
| 1615 | 1608 | $Element['element'] = $this->elementApplyRecursive($closure, $Element['element']);  | 
                                                        
| 1616 | 1609 | }  | 
                                                        
@@ -1623,8 +1616,7 @@ discard block  | 
                                                    ||
| 1623 | 1616 | if (isset($Element['elements']))  | 
                                                        
| 1624 | 1617 |          { | 
                                                        
| 1625 | 1618 | $Element['elements'] = $this->elementsApplyRecursiveDepthFirst($closure, $Element['elements']);  | 
                                                        
| 1626 | - }  | 
                                                        |
| 1627 | - elseif (isset($Element['element']))  | 
                                                        |
| 1619 | + } elseif (isset($Element['element']))  | 
                                                        |
| 1628 | 1620 |          { | 
                                                        
| 1629 | 1621 | $Element['element'] = $this->elementsApplyRecursiveDepthFirst($closure, $Element['element']);  | 
                                                        
| 1630 | 1622 | }  | 
                                                        
@@ -1711,26 +1703,22 @@ discard block  | 
                                                    ||
| 1711 | 1703 | if (isset($Element['elements']))  | 
                                                        
| 1712 | 1704 |              { | 
                                                        
| 1713 | 1705 | $markup .= $this->elements($Element['elements']);  | 
                                                        
| 1714 | - }  | 
                                                        |
| 1715 | - elseif (isset($Element['element']))  | 
                                                        |
| 1706 | + } elseif (isset($Element['element']))  | 
                                                        |
| 1716 | 1707 |              { | 
                                                        
| 1717 | 1708 | $markup .= $this->element($Element['element']);  | 
                                                        
| 1718 | - }  | 
                                                        |
| 1719 | - else  | 
                                                        |
| 1709 | + } else  | 
                                                        |
| 1720 | 1710 |              { | 
                                                        
| 1721 | 1711 | if (!$permitRawHtml)  | 
                                                        
| 1722 | 1712 |                  { | 
                                                        
| 1723 | 1713 | $markup .= self::escape($text, true);  | 
                                                        
| 1724 | - }  | 
                                                        |
| 1725 | - else  | 
                                                        |
| 1714 | + } else  | 
                                                        |
| 1726 | 1715 |                  { | 
                                                        
| 1727 | 1716 | $markup .= $text;  | 
                                                        
| 1728 | 1717 | }  | 
                                                        
| 1729 | 1718 | }  | 
                                                        
| 1730 | 1719 | |
| 1731 | 1720 | $markup .= $hasName ? '</' . $Element['name'] . '>' : '';  | 
                                                        
| 1732 | - }  | 
                                                        |
| 1733 | - elseif ($hasName)  | 
                                                        |
| 1721 | + } elseif ($hasName)  | 
                                                        |
| 1734 | 1722 |          { | 
                                                        
| 1735 | 1723 | $markup .= ' />';  | 
                                                        
| 1736 | 1724 | }  | 
                                                        
@@ -1896,8 +1884,7 @@ discard block  | 
                                                    ||
| 1896 | 1884 | if ($len > strlen($string))  | 
                                                        
| 1897 | 1885 |          { | 
                                                        
| 1898 | 1886 | return false;  | 
                                                        
| 1899 | - }  | 
                                                        |
| 1900 | - else  | 
                                                        |
| 1887 | + } else  | 
                                                        |
| 1901 | 1888 |          { | 
                                                        
| 1902 | 1889 | return strtolower(substr($string, 0, $len)) === strtolower($needle);  | 
                                                        
| 1903 | 1890 | }  | 
                                                        
@@ -191,14 +191,14 @@  | 
                                                    ||
| 191 | 191 | $donationform = [  | 
                                                        
| 192 | 192 | 0 => '<form name="donation" id="donation" action="http://www.txmodxoops.org/modules/xdonations/" method="post" onsubmit="return xoopsFormValidate_donation();">',  | 
                                                        
| 193 | 193 | 1 => '<table class="outer" cellspacing="1" width="100%"><tbody><tr><th colspan="2">'  | 
                                                        
| 194 | - . _AM_WGGITHUB_ABOUT_MAKE_DONATION  | 
                                                        |
| 195 | - . '</th></tr><tr align="left" valign="top"><td class="head"><div class="xoops-form-element-caption-required"><span class="caption-text">'  | 
                                                        |
| 196 | - . _AM_WGGITHUB_DONATION_AMOUNT  | 
                                                        |
| 197 | - . '</span><span class="caption-marker">*</span></div></td><td class="even"><select size="1" name="item[A][amount]" id="item[A][amount]" title="Donation Amount"><option value="5">5.00 EUR</option><option value="10">10.00 EUR</option><option value="20">20.00 EUR</option><option value="40">40.00 EUR</option><option value="60">60.00 EUR</option><option value="80">80.00 EUR</option><option value="90">90.00 EUR</option><option value="100">100.00 EUR</option><option value="200">200.00 EUR</option></select></td></tr><tr align="left" valign="top"><td class="head"></td><td class="even"><input class="formButton" name="submit" id="submit" value="'  | 
                                                        |
| 198 | - . _SUBMIT  | 
                                                        |
| 199 | - . '" title="'  | 
                                                        |
| 200 | - . _SUBMIT  | 
                                                        |
| 201 | - . '" type="submit"></td></tr></tbody></table>',  | 
                                                        |
| 194 | + . _AM_WGGITHUB_ABOUT_MAKE_DONATION  | 
                                                        |
| 195 | + . '</th></tr><tr align="left" valign="top"><td class="head"><div class="xoops-form-element-caption-required"><span class="caption-text">'  | 
                                                        |
| 196 | + . _AM_WGGITHUB_DONATION_AMOUNT  | 
                                                        |
| 197 | + . '</span><span class="caption-marker">*</span></div></td><td class="even"><select size="1" name="item[A][amount]" id="item[A][amount]" title="Donation Amount"><option value="5">5.00 EUR</option><option value="10">10.00 EUR</option><option value="20">20.00 EUR</option><option value="40">40.00 EUR</option><option value="60">60.00 EUR</option><option value="80">80.00 EUR</option><option value="90">90.00 EUR</option><option value="100">100.00 EUR</option><option value="200">200.00 EUR</option></select></td></tr><tr align="left" valign="top"><td class="head"></td><td class="even"><input class="formButton" name="submit" id="submit" value="'  | 
                                                        |
| 198 | + . _SUBMIT  | 
                                                        |
| 199 | + . '" title="'  | 
                                                        |
| 200 | + . _SUBMIT  | 
                                                        |
| 201 | + . '" type="submit"></td></tr></tbody></table>',  | 
                                                        |
| 202 | 202 | 2 => '<input name="op" id="op" value="createinvoice" type="hidden"><input name="plugin" id="plugin" value="donations" type="hidden"><input name="donation" id="donation" value="1" type="hidden"><input name="drawfor" id="drawfor" value="Chronolabs Co-Operative" type="hidden"><input name="drawto" id="drawto" value="%s" type="hidden"><input name="drawto_email" id="drawto_email" value="%s" type="hidden"><input name="key" id="key" value="%s" type="hidden"><input name="currency" id="currency" value="EUR" type="hidden"><input name="weight_unit" id="weight_unit" value="kgs" type="hidden"><input name="item[A][cat]" id="item[A][cat]" value="XDN%s" type="hidden"><input name="item[A][name]" id="item[A][name]" value="Donation for %s" type="hidden"><input name="item[A][quantity]" id="item[A][quantity]" value="1" type="hidden"><input name="item[A][shipping]" id="item[A][shipping]" value="0" type="hidden"><input name="item[A][handling]" id="item[A][handling]" value="0" type="hidden"><input name="item[A][weight]" id="item[A][weight]" value="0" type="hidden"><input name="item[A][tax]" id="item[A][tax]" value="0" type="hidden"><input name="return" id="return" value="http://www.txmodxoops.org/modules/xdonations/success.php" type="hidden"><input name="cancel" id="cancel" value="http://www.txmodxoops.org/modules/xdonations/success.php" type="hidden"></form>',  | 
                                                        
| 203 | 203 | 'D' => '',  | 
                                                        
| 204 | 204 | 3 => '',  | 
                                                        
@@ -133,7 +133,7 @@ discard block  | 
                                                    ||
| 133 | 133 | |
| 134 | 134 | case 'none':  | 
                                                        
| 135 | 135 |              if($topic_name) { | 
                                                        
| 136 | - $topic_name = 'topic=' . $topic_name . '&';  | 
                                                        |
| 136 | + $topic_name = 'topic=' . $topic_name . '&';  | 
                                                        |
| 137 | 137 | }  | 
                                                        
| 138 | 138 | $rewrite_base = '/modules/';  | 
                                                        
| 139 | 139 | $page = 'page=' . $array['content_alias'];  | 
                                                        
@@ -163,7 +163,7 @@ discard block  | 
                                                    ||
| 163 | 163 | return XOOPS_URL . $rewrite_base . $module_name . $type . $topic_name . $id . $page . $rewrite_ext;  | 
                                                        
| 164 | 164 | break;  | 
                                                        
| 165 | 165 | |
| 166 | - case 'short':  | 
                                                        |
| 166 | + case 'short':  | 
                                                        |
| 167 | 167 |              if($topic_name) { | 
                                                        
| 168 | 168 | $topic_name .= '/';  | 
                                                        
| 169 | 169 | }  |