@@ -129,8 +129,7 @@ |
||
129 | 129 | // $migrate->saveCurrentSchema(); |
130 | 130 | // |
131 | 131 | // \redirect_header('../admin/index.php', 1, \constant('CO_' . $moduleDirNameUpper . '_' . 'EXPORT_SCHEMA_SUCCESS')); |
132 | - } |
|
133 | - catch (\Exception $e) { |
|
132 | + } catch (\Exception $e) { |
|
134 | 133 | exit(\constant('CO_' . $moduleDirNameUpper . '_' . 'EXPORT_SCHEMA_ERROR')); |
135 | 134 | } |
136 | 135 |
@@ -217,8 +217,7 @@ discard block |
||
217 | 217 | $CurrentBlock = $Block; |
218 | 218 | |
219 | 219 | continue; |
220 | - } |
|
221 | - else |
|
220 | + } else |
|
222 | 221 | { |
223 | 222 | if ($this->isBlockCompletable($CurrentBlock['type'])) |
224 | 223 | { |
@@ -286,8 +285,7 @@ discard block |
||
286 | 285 | if (isset($Block)) |
287 | 286 | { |
288 | 287 | $CurrentBlock = $Block; |
289 | - } |
|
290 | - else |
|
288 | + } else |
|
291 | 289 | { |
292 | 290 | if (isset($CurrentBlock)) |
293 | 291 | { |
@@ -327,8 +325,7 @@ discard block |
||
327 | 325 | if (isset($Component['markup'])) |
328 | 326 | { |
329 | 327 | $Component['element'] = array('rawHtml' => $Component['markup']); |
330 | - } |
|
331 | - elseif (isset($Component['hidden'])) |
|
328 | + } elseif (isset($Component['hidden'])) |
|
332 | 329 | { |
333 | 330 | $Component['element'] = array(); |
334 | 331 | } |
@@ -588,8 +585,7 @@ discard block |
||
588 | 585 | $contentIndent -= 1; |
589 | 586 | $matches[1] = substr($matches[1], 0, -$contentIndent); |
590 | 587 | $matches[3] = str_repeat(' ', $contentIndent) . $matches[3]; |
591 | - } |
|
592 | - elseif ($contentIndent === 0) |
|
588 | + } elseif ($contentIndent === 0) |
|
593 | 589 | { |
594 | 590 | $matches[1] .= ' '; |
595 | 591 | } |
@@ -691,8 +687,7 @@ discard block |
||
691 | 687 | $Block['element']['elements'] []= & $Block['li']; |
692 | 688 | |
693 | 689 | return $Block; |
694 | - } |
|
695 | - elseif ($Line['indent'] < $requiredIndent and $this->blockList($Line)) |
|
690 | + } elseif ($Line['indent'] < $requiredIndent and $this->blockList($Line)) |
|
696 | 691 | { |
697 | 692 | return null; |
698 | 693 | } |
@@ -1320,12 +1315,10 @@ discard block |
||
1320 | 1315 | if ($Excerpt['text'][1] === $marker and preg_match($this->StrongRegex[$marker], $Excerpt['text'], $matches)) |
1321 | 1316 | { |
1322 | 1317 | $emphasis = 'strong'; |
1323 | - } |
|
1324 | - elseif (preg_match($this->EmRegex[$marker], $Excerpt['text'], $matches)) |
|
1318 | + } elseif (preg_match($this->EmRegex[$marker], $Excerpt['text'], $matches)) |
|
1325 | 1319 | { |
1326 | 1320 | $emphasis = 'em'; |
1327 | - } |
|
1328 | - else |
|
1321 | + } else |
|
1329 | 1322 | { |
1330 | 1323 | return; |
1331 | 1324 | } |
@@ -1416,8 +1409,7 @@ discard block |
||
1416 | 1409 | $extent += strlen($matches[0]); |
1417 | 1410 | |
1418 | 1411 | $remainder = substr($remainder, $extent); |
1419 | - } |
|
1420 | - else |
|
1412 | + } else |
|
1421 | 1413 | { |
1422 | 1414 | return; |
1423 | 1415 | } |
@@ -1432,8 +1424,7 @@ discard block |
||
1432 | 1424 | } |
1433 | 1425 | |
1434 | 1426 | $extent += strlen($matches[0]); |
1435 | - } |
|
1436 | - else |
|
1427 | + } else |
|
1437 | 1428 | { |
1438 | 1429 | if (preg_match('/^\s*\[(.*?)\]/', $remainder, $matches)) |
1439 | 1430 | { |
@@ -1441,8 +1432,7 @@ discard block |
||
1441 | 1432 | $definition = strtolower($definition); |
1442 | 1433 | |
1443 | 1434 | $extent += strlen($matches[0]); |
1444 | - } |
|
1445 | - else |
|
1435 | + } else |
|
1446 | 1436 | { |
1447 | 1437 | $definition = strtolower($Element['handler']['argument']); |
1448 | 1438 | } |
@@ -1607,8 +1597,7 @@ discard block |
||
1607 | 1597 | $argument = $Element['text']; |
1608 | 1598 | unset($Element['text']); |
1609 | 1599 | $destination = 'rawHtml'; |
1610 | - } |
|
1611 | - else |
|
1600 | + } else |
|
1612 | 1601 | { |
1613 | 1602 | $function = $Element['handler']['function']; |
1614 | 1603 | $argument = $Element['handler']['argument']; |
@@ -1645,8 +1634,7 @@ discard block |
||
1645 | 1634 | if (isset($Element['elements'])) |
1646 | 1635 | { |
1647 | 1636 | $Element['elements'] = $this->elementsApplyRecursive($closure, $Element['elements']); |
1648 | - } |
|
1649 | - elseif (isset($Element['element'])) |
|
1637 | + } elseif (isset($Element['element'])) |
|
1650 | 1638 | { |
1651 | 1639 | $Element['element'] = $this->elementApplyRecursive($closure, $Element['element']); |
1652 | 1640 | } |
@@ -1659,8 +1647,7 @@ discard block |
||
1659 | 1647 | if (isset($Element['elements'])) |
1660 | 1648 | { |
1661 | 1649 | $Element['elements'] = $this->elementsApplyRecursiveDepthFirst($closure, $Element['elements']); |
1662 | - } |
|
1663 | - elseif (isset($Element['element'])) |
|
1650 | + } elseif (isset($Element['element'])) |
|
1664 | 1651 | { |
1665 | 1652 | $Element['element'] = $this->elementsApplyRecursiveDepthFirst($closure, $Element['element']); |
1666 | 1653 | } |
@@ -1747,26 +1734,22 @@ discard block |
||
1747 | 1734 | if (isset($Element['elements'])) |
1748 | 1735 | { |
1749 | 1736 | $markup .= $this->elements($Element['elements']); |
1750 | - } |
|
1751 | - elseif (isset($Element['element'])) |
|
1737 | + } elseif (isset($Element['element'])) |
|
1752 | 1738 | { |
1753 | 1739 | $markup .= $this->element($Element['element']); |
1754 | - } |
|
1755 | - else |
|
1740 | + } else |
|
1756 | 1741 | { |
1757 | 1742 | if (!$permitRawHtml) |
1758 | 1743 | { |
1759 | 1744 | $markup .= self::escape($text, true); |
1760 | - } |
|
1761 | - else |
|
1745 | + } else |
|
1762 | 1746 | { |
1763 | 1747 | $markup .= $text; |
1764 | 1748 | } |
1765 | 1749 | } |
1766 | 1750 | |
1767 | 1751 | $markup .= $hasName ? '</' . $Element['name'] . '>' : ''; |
1768 | - } |
|
1769 | - elseif ($hasName) |
|
1752 | + } elseif ($hasName) |
|
1770 | 1753 | { |
1771 | 1754 | $markup .= ' />'; |
1772 | 1755 | } |
@@ -1932,8 +1915,7 @@ discard block |
||
1932 | 1915 | if ($len > strlen($string)) |
1933 | 1916 | { |
1934 | 1917 | return false; |
1935 | - } |
|
1936 | - else |
|
1918 | + } else |
|
1937 | 1919 | { |
1938 | 1920 | return strtolower(substr($string, 0, $len)) === strtolower($needle); |
1939 | 1921 | } |