|
@@ -714,7 +714,7 @@ discard block |
|
|
block discarded – undo |
|
714
|
714
|
$separator = '-::~:~::~:~:~:~:~:~:~:~:~:~:~:~:~:~:~:~:~:~:~:~:~:~:~:~:~:~:~:~:~:~:~:~:~:~:~:~::~:~::-'; |
|
715
|
715
|
$value = (string) $this->vcomponent->{$davName}; |
|
716
|
716
|
if (false !== strpos($value, $separator)) { |
|
717
|
|
- [$html,$text] = explode($separator, $value, 2); |
|
|
717
|
+ [$html, $text] = explode($separator, $value, 2); |
|
718
|
718
|
$value = trim(strip_tags($html)) . "\n" . trim(str_replace($separator, '', $text)); |
|
719
|
719
|
} else { |
|
720
|
720
|
$value = trim(str_replace('\n', PHP_EOL, $value)); |
|
@@ -877,14 +877,14 @@ discard block |
|
|
block discarded – undo |
|
877
|
877
|
$currentUser = \App\User::getCurrentUserModel(); |
|
878
|
878
|
$userTimeZone = new \DateTimeZone($currentUser->getDetail('time_zone')); |
|
879
|
879
|
$sysTimeZone = new \DateTimeZone(\App\Fields\DateTime::getTimeZone()); |
|
880
|
|
- [$hour , $minute] = explode(':', $currentUser->getDetail('start_hour')); |
|
|
880
|
+ [$hour, $minute] = explode(':', $currentUser->getDetail('start_hour')); |
|
881
|
881
|
$date = new \DateTime('now', $userTimeZone); |
|
882
|
882
|
$date->setTime($hour, $minute); |
|
883
|
883
|
$date->setTimezone($sysTimeZone); |
|
884
|
884
|
$timeStart = $date->format('H:i:s'); |
|
885
|
885
|
|
|
886
|
886
|
$date->setTimezone($userTimeZone); |
|
887
|
|
- [$hour , $minute] = explode(':', $currentUser->getDetail('end_hour')); |
|
|
887
|
+ [$hour, $minute] = explode(':', $currentUser->getDetail('end_hour')); |
|
888
|
888
|
$date->setTime($hour, $minute); |
|
889
|
889
|
$date->setTimezone($sysTimeZone); |
|
890
|
890
|
$timeEnd = $date->format('H:i:s'); |