X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=reports.php;h=c8b34cc359128f7913a3adc78fb7133dfc9a67e1;hb=abe3a7f279615f45b4bf0072a1b041ff651eeebc;hp=e2b149f74a7358ed87f778e1b1745cb743908c9d;hpb=a7ba11adfecf6cb906749efe5abce688363aef07;p=timetracker.git diff --git a/reports.php b/reports.php index e2b149f7..c8b34cc3 100644 --- a/reports.php +++ b/reports.php @@ -91,7 +91,7 @@ if ($custom_fields && $custom_fields->fields[0] && $custom_fields->fields[0]['ty // Add controls for projects and tasks. if ($user->canManageTeam()) { $project_list = ttProjectHelper::getProjects(); // Manager and co-managers can run reports on all active and inactive projects. -} else if ($user->isClient()) { +} elseif ($user->isClient()) { $project_list = ttProjectHelper::getProjectsForClient(); } else { $project_list = ttProjectHelper::getAssignedProjects($user->id); @@ -136,7 +136,7 @@ if ($user->canManageTeam() || $user->isClient()) { // Prepare user and assigned projects arrays. if ($user->canManageTeam()) $users = ttTeamHelper::getUsers(); // Active and inactive users for managers. - else if ($user->isClient()) + elseif ($user->isClient()) $users = ttTeamHelper::getUsersForClient(); // Active and inactive users for clients. foreach ($users as $single_user) { @@ -262,13 +262,13 @@ if ($request->isPost()) { } } elseif ($bean->getAttribute('btn_save')) { // User clicked the Save button. We need to save form options as new favorite report. - if (!ttValidString($bean->getAttribute('new_fav_report'))) $errors->add($i18n->getKey('error.field'), $i18n->getKey('form.reports.save_as_favorite')); + if (!ttValidString($bean->getAttribute('new_fav_report'))) $err->add($i18n->getKey('error.field'), $i18n->getKey('form.reports.save_as_favorite')); - if ($errors->no()) { + if ($err->no()) { $id = ttFavReportHelper::saveReport($user->id, $bean); if (!$id) - $errors->add($i18n->getKey('error.db')); - if ($errors->no()) { + $err->add($i18n->getKey('error.db')); + if ($err->no()) { $bean->setAttribute('favorite_report', $id); $bean->saveBean(); header('Location: reports.php'); @@ -294,25 +294,25 @@ if ($request->isPost()) { $start_date = new DateAndTime($user->date_format, $bean->getAttribute('start_date')); if ($start_date->isError() || !$bean->getAttribute('start_date')) - $errors->add($i18n->getKey('error.field'), $i18n->getKey('label.start_date')); + $err->add($i18n->getKey('error.field'), $i18n->getKey('label.start_date')); $end_date = new DateAndTime($user->date_format, $bean->getAttribute('end_date')); if ($end_date->isError() || !$bean->getAttribute('end_date')) - $errors->add($i18n->getKey('error.field'), $i18n->getKey('label.end_date')); + $err->add($i18n->getKey('error.field'), $i18n->getKey('label.end_date')); if ($start_date->compare($end_date) > 0) - $errors->add($i18n->getKey('error.interval'), $i18n->getKey('label.end_date'), $i18n->getKey('label.start_date')); + $err->add($i18n->getKey('error.interval'), $i18n->getKey('label.end_date'), $i18n->getKey('label.start_date')); } $bean->saveBean(); - if ($errors->no()) { + if ($err->no()) { // Now we can go ahead and create a report. header('Location: report.php'); exit(); } } -} // POST +} // isPost $smarty->assign('project_list', $project_list); $smarty->assign('task_list', $task_list);