X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=WEB-INF%2Flib%2FttTimeHelper.class.php;h=29b74145f04361e7382c9490993f9c7b90e85a4c;hb=92e0c8f474689764e8c10958d48bc4d33bc46c08;hp=e1b2470fbb83cc7125f413247afb13efc187ac7e;hpb=2ae2b6401a0758b21e016148851eadea7dd3f619;p=timetracker.git diff --git a/WEB-INF/lib/ttTimeHelper.class.php b/WEB-INF/lib/ttTimeHelper.class.php index e1b2470f..29b74145 100644 --- a/WEB-INF/lib/ttTimeHelper.class.php +++ b/WEB-INF/lib/ttTimeHelper.class.php @@ -167,9 +167,9 @@ class ttTimeHelper { $time_a = explode(':', $value); if ($time_a[0] > 12) $res = (string)((int)$time_a[0] - 12).':'.$time_a[1].' PM'; - else if ($time_a[0] == 12) + elseif ($time_a[0] == 12) $res = $value.' PM'; - else if ($time_a[0] == 0) + elseif ($time_a[0] == 0) $res = '12:'.$time_a[1].' AM'; else $res = $value.' AM'; @@ -615,12 +615,12 @@ class ttTimeHelper { $mdb2 = getConnection(); $client_field = null; - if (in_array('cl', explode(',', $user->plugins))) + if ($user->isPluginEnabled('cl')) $client_field = ", c.name as client"; $left_joins = " left join tt_projects p on (l.project_id = p.id)". " left join tt_tasks t on (l.task_id = t.id)"; - if (in_array('cl', explode(',', $user->plugins))) + if ($user->isPluginEnabled('cl')) $left_joins .= " left join tt_clients c on (l.client_id = c.id)"; $sql = "select l.id as id, TIME_FORMAT(l.start, $sql_time_format) as start,