X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=mobile%2Ftimer.php;h=f210157508aee586428ac7641dc9abbaa5c70826;hb=6a4961011c5509a094f4ee897dc581638a7c062d;hp=99a8852624f611d93d9c57cc24f6d404306105bf;hpb=a7ba11adfecf6cb906749efe5abce688363aef07;p=timetracker.git diff --git a/mobile/timer.php b/mobile/timer.php index 99a88526..f2101575 100644 --- a/mobile/timer.php +++ b/mobile/timer.php @@ -195,15 +195,15 @@ if ($request->isPost()) { // Validate user input. if (in_array('cl', explode(',', $user->plugins)) && in_array('cm', explode(',', $user->plugins)) && !$cl_client) - $errors->add($i18n->getKey('error.client')); + $err->add($i18n->getKey('error.client')); if ($custom_fields) { - if (!ttValidString($cl_cf_1, !$custom_fields->fields[0]['required'])) $errors->add($i18n->getKey('error.field'), $custom_fields->fields[0]['label']); + if (!ttValidString($cl_cf_1, !$custom_fields->fields[0]['required'])) $err->add($i18n->getKey('error.field'), $custom_fields->fields[0]['label']); } if (MODE_PROJECTS == $user->tracking_mode || MODE_PROJECTS_AND_TASKS == $user->tracking_mode) { - if (!$cl_project) $errors->add($i18n->getKey('error.project')); + if (!$cl_project) $err->add($i18n->getKey('error.project')); } if (MODE_PROJECTS_AND_TASKS == $user->tracking_mode) { - if (!$cl_task) $errors->add($i18n->getKey('error.task')); + if (!$cl_task) $err->add($i18n->getKey('error.task')); } // Finished validating user input. @@ -211,25 +211,25 @@ if ($request->isPost()) { if (defined('FUTURE_ENTRIES') && !isTrue(FUTURE_ENTRIES)) { $browser_today = new DateAndTime(DB_DATEFORMAT, $request->getParameter('browser_today', null)); if ($selected_date->after($browser_today)) - $errors->add($i18n->getKey('error.future_date')); + $err->add($i18n->getKey('error.future_date')); } // Prohibit creating time entries in locked interval. if($lockdate && $selected_date->before($lockdate)) - $errors->add($i18n->getKey('error.period_locked')); + $err->add($i18n->getKey('error.period_locked')); // Prohibit creating another uncompleted record. - if ($errors->no() && $uncompleted) { - $errors->add($i18n->getKey('error.uncompleted_exists')." ".$i18n->getKey('error.goto_uncompleted').""); + if ($err->no() && $uncompleted) { + $err->add($i18n->getKey('error.uncompleted_exists')." ".$i18n->getKey('error.goto_uncompleted').""); } // Prohibit creating an overlapping record. - if ($errors->no()) { + if ($err->no()) { if (ttTimeHelper::overlaps($user->getActiveUser(), $cl_date, $cl_start, $cl_finish)) - $errors->add($i18n->getKey('error.overlap')); + $err->add($i18n->getKey('error.overlap')); } - if ($errors->no()) { + if ($err->no()) { $id = ttTimeHelper::insert(array( 'date' => $cl_date, 'user_id' => $user->getActiveUser(), @@ -255,7 +255,7 @@ if ($request->isPost()) { header('Location: timer.php'); exit(); } - $errors->add($i18n->getKey('error.db')); + $err->add($i18n->getKey('error.db')); } } if ($request->getParameter('btn_stop')) { @@ -280,14 +280,14 @@ if ($request->isPost()) { header('Location: timer.php'); exit(); } else - $errors->add($i18n->getKey('error.db')); + $err->add($i18n->getKey('error.db')); } else { // Cannot complete, redirect for manual edit. header('Location: time_edit.php?id='.$record['id']); exit(); } } -} // POST +} // isPost $week_total = ttTimeHelper::getTimeForWeek($user->getActiveUser(), $cl_date); $smarty->assign('week_total', $week_total);