Some refactoring

[timetracker.git] / reports.php

diff --git a/reports.php b/reports.php
index 004ae6a6edf521664e909a59d5db44731b8976fc..90b12b2bd09e8a0f73015b239aaa0d639af9f194 100644 (file)
--- a/reports.php
+++ b/reports.php
@@ -244,7 +244,7 @@ $form->setValueByElement('fav_report_changed','');
 if (!$bean->getAttribute('favorite_report') || ($bean->getAttribute('favorite_report') == -1))
   $form->getElement('btn_delete')->setEnable(false);
 
 if (!$bean->getAttribute('favorite_report') || ($bean->getAttribute('favorite_report') == -1))
   $form->getElement('btn_delete')->setEnable(false);
 

-if ($request->getMethod() == 'POST') {
+if ($request->isPost()) {

   if((!$bean->getAttribute('btn_generate') && ($request->getParameter('fav_report_changed')))) {
     // User changed favorite report. We need to load new values into the form.
     if ($bean->getAttribute('favorite_report')) {
   if((!$bean->getAttribute('btn_generate') && ($request->getParameter('fav_report_changed')))) {
     // User changed favorite report. We need to load new values into the form.
     if ($bean->getAttribute('favorite_report')) {


@@ -262,13 +262,13 @@ if ($request->getMethod() == 'POST') {
     }
   } elseif ($bean->getAttribute('btn_save')) {
     // User clicked the Save button. We need to save form options as new favorite report.
     }
   } 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)
       $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');
         $bean->setAttribute('favorite_report', $id);
         $bean->saveBean();
         header('Location: reports.php');


@@ -294,25 +294,25 @@ if ($request->getMethod() == 'POST') {
       $start_date = new DateAndTime($user->date_format, $bean->getAttribute('start_date'));
 
       if ($start_date->isError() || !$bean->getAttribute('start_date'))
       $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'))
 
       $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)
 
       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();
 
     }
 
     $bean->saveBean();
 

-    if ($errors->no()) {
+    if ($err->no()) {

       // Now we can go ahead and create a report.
       header('Location: report.php');
       exit();
     }
   }
       // 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);
 
 $smarty->assign('project_list', $project_list);
 $smarty->assign('task_list', $task_list);