@@ -34,6 +34,9 @@ discard block |
||
34 | 34 | $this->setExcludeExpression($exclude); |
35 | 35 | } |
36 | 36 | |
37 | + /** |
|
38 | + * @param boolean $enabled |
|
39 | + */ |
|
37 | 40 | public function setEnabled($enabled) |
38 | 41 | { |
39 | 42 | $this->enabled = (boolean) $enabled; |
@@ -44,6 +47,9 @@ discard block |
||
44 | 47 | return $enabled; |
45 | 48 | } |
46 | 49 | |
50 | + /** |
|
51 | + * @param string|null $regex |
|
52 | + */ |
|
47 | 53 | public function setIncludeExpression($regex) |
48 | 54 | { |
49 | 55 | $this->include = (string) $regex; |
@@ -57,6 +63,9 @@ discard block |
||
57 | 63 | return $this->include; |
58 | 64 | } |
59 | 65 | |
66 | + /** |
|
67 | + * @param string|null $regex |
|
68 | + */ |
|
60 | 69 | public function setExcludeExpression($regex) |
61 | 70 | { |
62 | 71 | $this->exclude = (string) $regex; |
@@ -76,17 +76,17 @@ |
||
76 | 76 | // include this event if filtering is off... |
77 | 77 | $this->isEnabled() == false || |
78 | 78 | ( |
79 | - ( |
|
80 | - ( // if filtering is on, and there's an include pattern test that pattern... |
|
81 | - $this->getIncludeExpression() && |
|
79 | + ( |
|
80 | + ( // if filtering is on, and there's an include pattern test that pattern... |
|
81 | + $this->getIncludeExpression() && |
|
82 | 82 | preg_match('%' . $this->getIncludeExpression() . '%', $event->getProperty('SUMMARY')) |
83 | - ) |
|
84 | - ) && |
|
83 | + ) |
|
84 | + ) && |
|
85 | 85 | !( // if there is an exclude pattern, make sure that this event is NOT excluded |
86 | - $this->getExcludeExpression() && |
|
86 | + $this->getExcludeExpression() && |
|
87 | 87 | preg_match('%' . $this->getExcludeExpression() . '%', $event->getProperty('SUMMARY')) |
88 | - ) |
|
89 | - ) |
|
88 | + ) |
|
89 | + ) |
|
90 | 90 | ); |
91 | 91 | } |
92 | 92 | } |
@@ -53,7 +53,6 @@ |
||
53 | 53 | /** |
54 | 54 | * Update the MySQL connection |
55 | 55 | * |
56 | - * @param PDO $db |
|
57 | 56 | * @throws Exception If `$db` is null |
58 | 57 | */ |
59 | 58 | public static function setDatabase(PDO $database) |
@@ -323,6 +323,9 @@ |
||
323 | 323 | $this->log(static::getTimestamp() . ' sync finished', $log); |
324 | 324 | } |
325 | 325 | |
326 | + /** |
|
327 | + * @param string $message |
|
328 | + */ |
|
326 | 329 | private function log($message, Log $log, $flag = PEAR_LOG_INFO) |
327 | 330 | { |
328 | 331 | if ($log) { |
@@ -204,6 +204,9 @@ |
||
204 | 204 | } |
205 | 205 | } |
206 | 206 | |
207 | + /** |
|
208 | + * @param Calendar $calendar |
|
209 | + */ |
|
207 | 210 | public static function purgeUnmatched($timestamp, $calendar) |
208 | 211 | { |
209 | 212 | $db = static::getDatabase(); |
@@ -73,9 +73,9 @@ |
||
73 | 73 | function filterEvent($event, $calendarCache) |
74 | 74 | { |
75 | 75 | |
76 | - return ( |
|
77 | - // include this event if filtering is off... |
|
78 | - $calendarCache['enable_regexp_filter'] == false || |
|
76 | + return ( |
|
77 | + // include this event if filtering is off... |
|
78 | + $calendarCache['enable_regexp_filter'] == false || |
|
79 | 79 | ( |
80 | 80 | ( |
81 | 81 | ( // if filtering is on, and there's an include pattern test that pattern... |