X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/timetracker.git/blobdiff_plain/a7ba11adfecf6cb906749efe5abce688363aef07..20f38d9496f586d33febaa84db236db935e457eb:/mobile/time.php diff --git a/mobile/time.php b/mobile/time.php index bc031842..268bf9ba 100644 --- a/mobile/time.php +++ b/mobile/time.php @@ -174,7 +174,7 @@ if ($custom_fields && $custom_fields->fields[0]) { // Only one custom field is supported at this time. if ($custom_fields->fields[0]['type'] == CustomFields::TYPE_TEXT) { $form->addInput(array('type'=>'text','name'=>'cf_1','value'=>$cl_cf_1)); - } else if ($custom_fields->fields[0]['type'] == CustomFields::TYPE_DROPDOWN) { + } elseif ($custom_fields->fields[0]['type'] == CustomFields::TYPE_DROPDOWN) { $form->addInput(array('type'=>'combobox','name'=>'cf_1', 'style'=>'width: 250px;', 'value'=>$cl_cf_1, @@ -197,67 +197,67 @@ 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')); } if (!$cl_duration) { if ('0' == $cl_duration) - $errors->add($i18n->getKey('error.field'), $i18n->getKey('label.duration')); - else if ($cl_start || $cl_finish) { + $err->add($i18n->getKey('error.field'), $i18n->getKey('label.duration')); + elseif ($cl_start || $cl_finish) { if (!ttTimeHelper::isValidTime($cl_start)) - $errors->add($i18n->getKey('error.field'), $i18n->getKey('label.start')); + $err->add($i18n->getKey('error.field'), $i18n->getKey('label.start')); if ($cl_finish) { if (!ttTimeHelper::isValidTime($cl_finish)) - $errors->add($i18n->getKey('error.field'), $i18n->getKey('label.finish')); + $err->add($i18n->getKey('error.field'), $i18n->getKey('label.finish')); if (!ttTimeHelper::isValidInterval($cl_start, $cl_finish)) - $errors->add($i18n->getKey('error.interval'), $i18n->getKey('label.finish'), $i18n->getKey('label.start')); + $err->add($i18n->getKey('error.interval'), $i18n->getKey('label.finish'), $i18n->getKey('label.start')); } } else { if ((TYPE_START_FINISH == $user->record_type) || (TYPE_ALL == $user->record_type)) { - $errors->add($i18n->getKey('error.empty'), $i18n->getKey('label.start')); - $errors->add($i18n->getKey('error.empty'), $i18n->getKey('label.finish')); + $err->add($i18n->getKey('error.empty'), $i18n->getKey('label.start')); + $err->add($i18n->getKey('error.empty'), $i18n->getKey('label.finish')); } if ((TYPE_DURATION == $user->record_type) || (TYPE_ALL == $user->record_type)) - $errors->add($i18n->getKey('error.empty'), $i18n->getKey('label.duration')); + $err->add($i18n->getKey('error.empty'), $i18n->getKey('label.duration')); } } else { if (!ttTimeHelper::isValidDuration($cl_duration)) - $errors->add($i18n->getKey('error.field'), $i18n->getKey('label.duration')); + $err->add($i18n->getKey('error.field'), $i18n->getKey('label.duration')); } - if (!ttValidString($cl_note, true)) $errors->add($i18n->getKey('error.field'), $i18n->getKey('label.note')); + if (!ttValidString($cl_note, true)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.note')); // Finished validating user input. // Prohibit creating entries in future. 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()) { + if ($err->no()) { if (($not_completed_rec = ttTimeHelper::getUncompleted($user->getActiveUser())) && (($cl_finish == '') && ($cl_duration == ''))) - $errors->add($i18n->getKey('error.uncompleted_exists')." ".$i18n->getKey('error.goto_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(), @@ -275,7 +275,7 @@ if ($request->isPost()) { if ($id && $custom_fields && $cl_cf_1) { if ($custom_fields->fields[0]['type'] == CustomFields::TYPE_TEXT) $result = $custom_fields->insert($id, $custom_fields->fields[0]['id'], null, $cl_cf_1); - else if ($custom_fields->fields[0]['type'] == CustomFields::TYPE_DROPDOWN) + elseif ($custom_fields->fields[0]['type'] == CustomFields::TYPE_DROPDOWN) $result = $custom_fields->insert($id, $custom_fields->fields[0]['id'], $cl_cf_1, null); } @@ -283,10 +283,10 @@ if ($request->isPost()) { header('Location: time.php'); exit(); } - $errors->add($i18n->getKey('error.db')); + $err->add($i18n->getKey('error.db')); } } -} // POST +} // isPost $smarty->assign('next_date', $next_date); $smarty->assign('prev_date', $prev_date);