X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=mobile%2Ftime.php;h=b0c5de11a60902bf758386f4bbab1542930d4704;hb=b0e8ffd3af439b5dc6dd5044a46a906d9833932b;hp=b7a26b6467628fcdca6f5011b08517c22df79190;hpb=0dfc4dda20c54e173938eaf196f8e071ce790830;p=timetracker.git diff --git a/mobile/time.php b/mobile/time.php index b7a26b64..b0c5de11 100644 --- a/mobile/time.php +++ b/mobile/time.php @@ -54,7 +54,7 @@ $prev_date = date('Y-m-d', strtotime('-1 day', strtotime($cl_date))); $next_date = date('Y-m-d', strtotime('+1 day', strtotime($cl_date))); // Use custom fields plugin if it is enabled. -if (in_array('cf', explode(',', $user->plugins))) { +if ($user->isPluginEnabled('cf')) { require_once('../plugins/CustomFields.class.php'); $custom_fields = new CustomFields($user->team_id); $smarty->assign('custom_fields', $custom_fields); @@ -183,14 +183,6 @@ if ($custom_fields && $custom_fields->fields[0]) { } } -// Determine lock date. Time entries earlier than lock date cannot be created or modified. -$lock_interval = $user->lock_interval; -$lockdate = 0; -if ($lock_interval > 0) { - $lockdate = new DateAndTime(); - $lockdate->decDay($lock_interval); -} - // Submit. if ($request->isPost()) { if ($request->getParameter('btn_submit')) { @@ -204,13 +196,8 @@ if ($request->isPost()) { if (MODE_PROJECTS == $user->tracking_mode || MODE_PROJECTS_AND_TASKS == $user->tracking_mode) { if (!$cl_project) $err->add($i18n->getKey('error.project')); } - if (MODE_PROJECTS_AND_TASKS == $user->tracking_mode) { - if (!$cl_task) $err->add($i18n->getKey('error.task')); - } - if (!$cl_duration) { - if ('0' == $cl_duration) - $err->add($i18n->getKey('error.field'), $i18n->getKey('label.duration')); - elseif ($cl_start || $cl_finish) { + if (strlen($cl_duration) == 0) { + if ($cl_start || $cl_finish) { if (!ttTimeHelper::isValidTime($cl_start)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.start')); if ($cl_finish) { @@ -241,9 +228,9 @@ if ($request->isPost()) { $err->add($i18n->getKey('error.future_date')); } - // Prohibit creating time entries in locked interval. - if($lockdate && $selected_date->before($lockdate)) - $err->add($i18n->getKey('error.period_locked')); + // Prohibit creating entries in locked range. + if ($user->isDateLocked($selected_date)) + $err->add($i18n->getKey('error.range_locked')); // Prohibit creating another uncompleted record. if ($err->no()) {