@@ -51,8 +51,7 @@ |
||
| 51 | 51 | if(!empty($matches[3][$idx])) |
| 52 | 52 | { |
| 53 | 53 | $this->addSingle($matches[3][$idx], $matchedText, $sourceCommand); |
| 54 | - } |
|
| 55 | - else |
|
| 54 | + } else |
|
| 56 | 55 | { |
| 57 | 56 | $this->addPathed($matches[1][$idx], $matches[2][$idx], $matchedText, $sourceCommand); |
| 58 | 57 | } |
@@ -40,8 +40,7 @@ discard block |
||
| 40 | 40 | try |
| 41 | 41 | { |
| 42 | 42 | $translated = translateMailcode($commandsText, $activeSyntax); |
| 43 | - } |
|
| 44 | - catch (Mailcode_Exception $e) |
|
| 43 | + } catch (Mailcode_Exception $e) |
|
| 45 | 44 | { |
| 46 | 45 | $translated = ''; |
| 47 | 46 | $error = $e->getMessage(); |
@@ -146,8 +145,7 @@ discard block |
||
| 146 | 145 | <?php pt('No commands specified.') ?> |
| 147 | 146 | </div> |
| 148 | 147 | <?php |
| 149 | - } |
|
| 150 | - else if($error) |
|
| 148 | + } else if($error) |
|
| 151 | 149 | { |
| 152 | 150 | ?> |
| 153 | 151 | <div class="alert alert-danger"> |
@@ -155,8 +153,7 @@ discard block |
||
| 155 | 153 | <?php echo $error ?> |
| 156 | 154 | </div> |
| 157 | 155 | <?php |
| 158 | - } |
|
| 159 | - else |
|
| 156 | + } else |
|
| 160 | 157 | { |
| 161 | 158 | ?> |
| 162 | 159 | <textarea class="form-control" rows="10"><?php echo htmlspecialchars($translated) ?></textarea> |
@@ -70,8 +70,7 @@ |
||
| 70 | 70 | if($this->isMailcodeEnabled()) |
| 71 | 71 | { |
| 72 | 72 | $collection = Mailcode::create()->parseString($this->getContent()); |
| 73 | - } |
|
| 74 | - else |
|
| 73 | + } else |
|
| 75 | 74 | { |
| 76 | 75 | $collection = new Mailcode_Collection(); |
| 77 | 76 | } |
@@ -129,8 +129,7 @@ |
||
| 129 | 129 | if(isset($params[$name])) |
| 130 | 130 | { |
| 131 | 131 | $params[$name]->setValue($value); |
| 132 | - } |
|
| 133 | - else |
|
| 132 | + } else |
|
| 134 | 133 | { |
| 135 | 134 | $this->addParam($name, $value); |
| 136 | 135 | } |
@@ -125,8 +125,7 @@ |
||
| 125 | 125 | if(is_numeric($breakAt)) |
| 126 | 126 | { |
| 127 | 127 | $token = $info->addNumber((string)(int)$breakAt); |
| 128 | - } |
|
| 129 | - else if($breakAt instanceof Mailcode_Variables_Variable) |
|
| 128 | + } else if($breakAt instanceof Mailcode_Variables_Variable) |
|
| 130 | 129 | { |
| 131 | 130 | $token = $info->addVariable($breakAt); |
| 132 | 131 | } |
@@ -36,8 +36,7 @@ discard block |
||
| 36 | 36 | $safeguard = $mailcode->createSafeguard($commandsText); |
| 37 | 37 | $safe = htmlspecialchars($safeguard->makeSafe(), ENT_QUOTES, 'UTF-8'); |
| 38 | 38 | $highlighted = $safeguard->makeHighlighted($safe); |
| 39 | - } |
|
| 40 | - catch (Mailcode_Exception $e) |
|
| 39 | + } catch (Mailcode_Exception $e) |
|
| 41 | 40 | { |
| 42 | 41 | $error = $e->getMessage(); |
| 43 | 42 | |
@@ -99,8 +98,7 @@ discard block |
||
| 99 | 98 | <?php pt('No commands specified.') ?> |
| 100 | 99 | </div> |
| 101 | 100 | <?php |
| 102 | - } |
|
| 103 | - else if($error) |
|
| 101 | + } else if($error) |
|
| 104 | 102 | { |
| 105 | 103 | ?> |
| 106 | 104 | <div class="alert alert-danger"> |
@@ -108,8 +106,7 @@ discard block |
||
| 108 | 106 | <?php echo $error ?> |
| 109 | 107 | </div> |
| 110 | 108 | <?php |
| 111 | - } |
|
| 112 | - else |
|
| 109 | + } else |
|
| 113 | 110 | { |
| 114 | 111 | ?> |
| 115 | 112 | <pre style="border: solid 1px #ccc;padding:12px;border-radius: 5px"><?php |
@@ -35,8 +35,7 @@ |
||
| 35 | 35 | '%s.replaceAll($esc.newline, "<br/>")', |
| 36 | 36 | $varName |
| 37 | 37 | ); |
| 38 | - } |
|
| 39 | - else |
|
| 38 | + } else |
|
| 40 | 39 | { |
| 41 | 40 | $statement = sprintf( |
| 42 | 41 | '%s', |
@@ -120,8 +120,7 @@ |
||
| 120 | 120 | if($this->isList()) |
| 121 | 121 | { |
| 122 | 122 | $command = $this->renderListCommand($searchTerm); |
| 123 | - } |
|
| 124 | - else |
|
| 123 | + } else |
|
| 125 | 124 | { |
| 126 | 125 | $command = $this->renderRegularCommand($searchTerm); |
| 127 | 126 | } |
@@ -40,8 +40,7 @@ |
||
| 40 | 40 | if($keyCommand instanceof Mailcode_Commands_IfBase) |
| 41 | 41 | { |
| 42 | 42 | $body .= ' '.$this->getSign($keyword).' '.$this->translateBody($keyCommand); |
| 43 | - } |
|
| 44 | - else |
|
| 43 | + } else |
|
| 45 | 44 | { |
| 46 | 45 | throw new Mailcode_Exception( |
| 47 | 46 | 'Keyword command type does not match expected base class.', |