Simplified templates by using the default Smarty escape calls.

[timetracker.git] / reports.php

diff --git a/reports.php b/reports.php
index e2b149f..add2b43 100644 (file)
--- a/reports.php
+++ b/reports.php
@@ -43,7 +43,7 @@ if (!ttAccessCheck(right_view_reports)) {
 }
 
 // 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);
@@ -66,7 +66,7 @@ $form->addInput(array('type'=>'submit','name'=>'btn_generate','value'=>$i18n->ge
 $form->addInput(array('type'=>'submit','name'=>'btn_delete','value'=>$i18n->getKey('label.delete'),'onclick'=>"return confirm('".$i18n->getKey('form.reports.confirm_delete')."')"));
 
 // Dropdown for clients if the clients plugin is enabled.
-if (in_array('cl', explode(',', $user->plugins)) && !($user->isClient() && $user->client_id)) {
+if ($user->isPluginEnabled('cl') && !($user->isClient() && $user->client_id)) {
   if ($user->canManageTeam() || ($user->isClient() && !$user->client_id))
     $client_list = ttClientHelper::getClients($user->team_id);
   else
@@ -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) {
@@ -171,9 +171,9 @@ $form->addInput(array('type'=>'datefield','maxlength'=>'20','name'=>'start_date'
 $form->addInput(array('type'=>'datefield','maxlength'=>'20','name'=>'end_date'));
 
 // Add checkboxes for fields.
-if (in_array('cl', explode(',', $user->plugins)))
+if ($user->isPluginEnabled('cl'))
   $form->addInput(array('type'=>'checkbox','name'=>'chclient','data'=>1));
-if (($user->canManageTeam() || $user->isClient()) && in_array('iv', explode(',', $user->plugins)))
+if (($user->canManageTeam() || $user->isClient()) && $user->isPluginEnabled('iv'))
   $form->addInput(array('type'=>'checkbox','name'=>'chinvoice','data'=>1));
 if (MODE_PROJECTS == $user->tracking_mode || MODE_PROJECTS_AND_TASKS == $user->tracking_mode)
   $form->addInput(array('type'=>'checkbox','name'=>'chproject','data'=>1));
@@ -196,7 +196,7 @@ $group_by_options['no_grouping'] = $i18n->getKey('form.reports.group_by_no');
 $group_by_options['date'] = $i18n->getKey('form.reports.group_by_date');
 if ($user->canManageTeam() || $user->isClient())
   $group_by_options['user'] = $i18n->getKey('form.reports.group_by_user');
-if (in_array('cl', explode(',', $user->plugins)) && !($user->isClient() && $user->client_id))
+if ($user->isPluginEnabled('cl') && !($user->isClient() && $user->client_id))
   $group_by_options['client'] = $i18n->getKey('form.reports.group_by_client');
 if (MODE_PROJECTS == $user->tracking_mode || MODE_PROJECTS_AND_TASKS == $user->tracking_mode)
   $group_by_options['project'] = $i18n->getKey('form.reports.group_by_project');
@@ -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);