@@ -44,8 +44,14 @@ |
||
44 | 44 | return parent::getSubject(); |
45 | 45 | } |
46 | 46 | |
47 | + /** |
|
48 | + * @return string |
|
49 | + */ |
|
47 | 50 | public abstract function getSubstituteVars(); |
48 | 51 | |
52 | + /** |
|
53 | + * @param boolean $html |
|
54 | + */ |
|
49 | 55 | protected function getRawBodyText($html) |
50 | 56 | { |
51 | 57 | if(isset($this->dbData['body'])) |
@@ -21,7 +21,7 @@ discard block |
||
21 | 21 | { |
22 | 22 | if(isset($this->dbData['from'])) |
23 | 23 | { |
24 | - return $this->dbData['from'];; |
|
24 | + return $this->dbData['from']; ; |
|
25 | 25 | } |
26 | 26 | return parent::getFromAddress(); |
27 | 27 | } |
@@ -30,7 +30,7 @@ discard block |
||
30 | 30 | { |
31 | 31 | if(isset($this->dbData['replyTo'])) |
32 | 32 | { |
33 | - return $this->dbData['replyTo'];; |
|
33 | + return $this->dbData['replyTo']; ; |
|
34 | 34 | } |
35 | 35 | return parent::getReplyTo(); |
36 | 36 | } |
@@ -59,7 +59,7 @@ discard block |
||
59 | 59 | return $this->textBody; |
60 | 60 | } |
61 | 61 | |
62 | - protected function getBodyFromDB($html=true) |
|
62 | + protected function getBodyFromDB($html = true) |
|
63 | 63 | { |
64 | 64 | $vars = $this->getSubstituteVars(); |
65 | 65 | $rawText = $this->getRawBodyText($html); |
@@ -74,7 +74,7 @@ discard block |
||
74 | 74 | $end = strpos($rawText, "</script>"); |
75 | 75 | if($index === 0) |
76 | 76 | { |
77 | - $rawText = substr($rawText, $end+9); |
|
77 | + $rawText = substr($rawText, $end + 9); |
|
78 | 78 | } |
79 | 79 | } |
80 | 80 | return strtr(strip_tags($rawText), $vars); |