EGroupware /
egroupware
| @@ 816-816 (lines=1) @@ | ||
| 813 | $do_time = ($timestamp->format('Hi') != '0000'); |
|
| 814 | } |
|
| 815 | $format = $GLOBALS['egw_info']['user']['preferences']['common']['dateformat']; |
|
| 816 | if ($do_time) $format .= ' '.($GLOBALS['egw_info']['user']['preferences']['common']['timeformat'] != 12 ? 'H:i' : 'h:i a'); |
|
| 817 | ||
| 818 | return $timestamp->format($format); |
|
| 819 | } |
|
| @@ 1327-1330 (lines=4) @@ | ||
| 1324 | $body = $event['description']; |
|
| 1325 | } |
|
| 1326 | // respect user preference about html mail |
|
| 1327 | if ($GLOBALS['egw_info']['user']['preferences']['mail']['composeOptions'] != 'text') |
|
| 1328 | { |
|
| 1329 | $body = '<pre>'.$body.'</pre>'; |
|
| 1330 | } |
|
| 1331 | //error_log(__METHOD__.print_r($event,true)); |
|
| 1332 | $boical = new calendar_ical(); |
|
| 1333 | // we need to pass $event[id] so iCal class reads event again, |
|
