@@ -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... |
@@ -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 | } |