@@ -297,14 +297,16 @@ |
||
| 297 | 297 | $str = ''; |
| 298 | 298 | foreach ($trace as $caller) { |
| 299 | 299 | $str .= " -- Called by {$caller['function']}"; |
| 300 | - if (isset($caller['class'])) |
|
| 301 | - $str .= " From Class {$caller['class']}"; |
|
| 300 | + if (isset($caller['class'])) { |
|
| 301 | + $str .= " From Class {$caller['class']}"; |
|
| 302 | + } |
|
| 302 | 303 | } |
| 303 | 304 | } else { |
| 304 | 305 | $caller = $trace[2]; |
| 305 | 306 | $str = "Called by {$caller['function']}"; |
| 306 | - if (isset($caller['class'])) |
|
| 307 | - $str .= " From Class {$caller['class']}"; |
|
| 307 | + if (isset($caller['class'])) { |
|
| 308 | + $str .= " From Class {$caller['class']}"; |
|
| 309 | + } |
|
| 308 | 310 | } |
| 309 | 311 | return $str; |
| 310 | 312 | } |
@@ -64,7 +64,9 @@ |
||
| 64 | 64 | //return call_user_func($callback, true); |
| 65 | 65 | } |
| 66 | 66 | if (!isset($_POST['g-recaptcha-response'])) { |
| 67 | - if (ob_get_level()) ob_end_clean(); |
|
| 67 | + if (ob_get_level()) { |
|
| 68 | + ob_end_clean(); |
|
| 69 | + } |
|
| 68 | 70 | \JSON\json::json(['error' => true, 'message' => 'Recaptcha token required']); |
| 69 | 71 | exit; |
| 70 | 72 | } |
@@ -31,8 +31,7 @@ discard block |
||
| 31 | 31 | if (isset($array['allDay'])) { |
| 32 | 32 | // allDay has been explicitly specified |
| 33 | 33 | $this->allDay = (bool)$array['allDay']; |
| 34 | - } |
|
| 35 | - else { |
|
| 34 | + } else { |
|
| 36 | 35 | // Guess allDay based off of ISO8601 date strings |
| 37 | 36 | $this->allDay = preg_match(self::ALL_DAY_REGEX, $array['start']) && |
| 38 | 37 | (!isset($array['end']) || preg_match(self::ALL_DAY_REGEX, $array['end'])); |
@@ -65,8 +64,7 @@ discard block |
||
| 65 | 64 | |
| 66 | 65 | if (isset($this->end)) { |
| 67 | 66 | $eventEnd = stripTime($this->end); // normalize |
| 68 | - } |
|
| 69 | - else { |
|
| 67 | + } else { |
|
| 70 | 68 | $eventEnd = $eventStart; // consider this a zero-duration event |
| 71 | 69 | } |
| 72 | 70 | |
@@ -86,8 +84,7 @@ discard block |
||
| 86 | 84 | // Figure out the date format. This essentially encodes allDay into the date string. |
| 87 | 85 | if ($this->allDay) { |
| 88 | 86 | $format = 'Y-m-d'; // output like "2013-12-29" |
| 89 | - } |
|
| 90 | - else { |
|
| 87 | + } else { |
|
| 91 | 88 | $format = 'c'; // full ISO8601 output, like "2013-12-29T09:00:00+08:00" |
| 92 | 89 | } |
| 93 | 90 | |
@@ -31,8 +31,7 @@ discard block |
||
| 31 | 31 | if (isset($array['allDay'])) { |
| 32 | 32 | // allDay has been explicitly specified |
| 33 | 33 | $this->allDay = (bool)$array['allDay']; |
| 34 | - } |
|
| 35 | - else { |
|
| 34 | + } else { |
|
| 36 | 35 | // Guess allDay based off of ISO8601 date strings |
| 37 | 36 | $this->allDay = preg_match(self::ALL_DAY_REGEX, $array['start']) && |
| 38 | 37 | (!isset($array['end']) || preg_match(self::ALL_DAY_REGEX, $array['end'])); |
@@ -65,8 +64,7 @@ discard block |
||
| 65 | 64 | |
| 66 | 65 | if (isset($this->end)) { |
| 67 | 66 | $eventEnd = stripTime($this->end); // normalize |
| 68 | - } |
|
| 69 | - else { |
|
| 67 | + } else { |
|
| 70 | 68 | $eventEnd = $eventStart; // consider this a zero-duration event |
| 71 | 69 | } |
| 72 | 70 | |
@@ -86,8 +84,7 @@ discard block |
||
| 86 | 84 | // Figure out the date format. This essentially encodes allDay into the date string. |
| 87 | 85 | if ($this->allDay) { |
| 88 | 86 | $format = 'Y-m-d'; // output like "2013-12-29" |
| 89 | - } |
|
| 90 | - else { |
|
| 87 | + } else { |
|
| 91 | 88 | $format = 'c'; // full ISO8601 output, like "2013-12-29T09:00:00+08:00" |
| 92 | 89 | } |
| 93 | 90 | |
@@ -31,8 +31,7 @@ discard block |
||
| 31 | 31 | if (isset($array['allDay'])) { |
| 32 | 32 | // allDay has been explicitly specified |
| 33 | 33 | $this->allDay = (bool)$array['allDay']; |
| 34 | - } |
|
| 35 | - else { |
|
| 34 | + } else { |
|
| 36 | 35 | // Guess allDay based off of ISO8601 date strings |
| 37 | 36 | $this->allDay = preg_match(self::ALL_DAY_REGEX, $array['start']) && |
| 38 | 37 | (!isset($array['end']) || preg_match(self::ALL_DAY_REGEX, $array['end'])); |
@@ -65,8 +64,7 @@ discard block |
||
| 65 | 64 | |
| 66 | 65 | if (isset($this->end)) { |
| 67 | 66 | $eventEnd = stripTime($this->end); // normalize |
| 68 | - } |
|
| 69 | - else { |
|
| 67 | + } else { |
|
| 70 | 68 | $eventEnd = $eventStart; // consider this a zero-duration event |
| 71 | 69 | } |
| 72 | 70 | |
@@ -86,8 +84,7 @@ discard block |
||
| 86 | 84 | // Figure out the date format. This essentially encodes allDay into the date string. |
| 87 | 85 | if ($this->allDay) { |
| 88 | 86 | $format = 'Y-m-d'; // output like "2013-12-29" |
| 89 | - } |
|
| 90 | - else { |
|
| 87 | + } else { |
|
| 91 | 88 | $format = 'c'; // full ISO8601 output, like "2013-12-29T09:00:00+08:00" |
| 92 | 89 | } |
| 93 | 90 | |