X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=report.php;h=c59f6b5e3ec78d0ded043163cb00d89ff0a11b74;hb=f39d6bdcde7c4de3f38dc63e500824d28aa1939c;hp=6cec03794f50dcb45f3cfa312255288b04db5c38;hpb=30e08b05e01bb089836582b5b467727dba822a13;p=timetracker.git

diff --git a/report.php b/report.php
index 6cec0379..c59f6b5e 100644
--- a/report.php
+++ b/report.php
@@ -33,7 +33,7 @@ import('ttReportHelper');
 import('ttTeamHelper');
 
 // Access check.
-if (!ttAccessCheck(right_view_reports)) {
+if (!(ttAccessAllowed('view_own_reports') || ttAccessAllowed('view_reports'))) {
   header('Location: access_denied.php');
   exit();
 }
@@ -62,6 +62,9 @@ $form = new Form('reportForm');
 
 // Report settings are stored in session bean before we get here from reports.php.
 $bean = new ActionForm('reportBean', $form, $request);
+// If we are in post, load the bean from session, as the constructor does it only in get.
+if ($request->isPost()) $bean->loadBean();
+
 $client_id = $bean->getAttribute('client');
 
 // Do we need to show checkboxes?
@@ -72,17 +75,17 @@ if ($bean->getAttribute('chpaid') ||
 
 // Controls for "Mark paid" block.
 if ($bean->getAttribute('chpaid')) {
-  $mark_paid_select_options = array('1'=>$i18n->getKey('dropdown.all'),'2'=>$i18n->getKey('dropdown.select'));
+  $mark_paid_select_options = array('1'=>$i18n->get('dropdown.all'),'2'=>$i18n->get('dropdown.select'));
   $form->addInput(array('type'=>'combobox',
     'name'=>'mark_paid_select_options',
     'data'=>$mark_paid_select_options,
     'value'=>$cl_mark_paid_select_option));
-  $mark_paid_action_options = array('1'=>$i18n->getKey('dropdown.paid'),'2'=>$i18n->getKey('dropdown.not_paid'));
+  $mark_paid_action_options = array('1'=>$i18n->get('dropdown.paid'),'2'=>$i18n->get('dropdown.not_paid'));
   $form->addInput(array('type'=>'combobox',
     'name'=>'mark_paid_action_options',
     'data'=>$mark_paid_action_options,
     'value'=>$cl_mark_paid_action_option));
-  $form->addInput(array('type'=>'submit','name'=>'btn_mark_paid','value'=>$i18n->getKey('button.submit')));
+  $form->addInput(array('type'=>'submit','name'=>'btn_mark_paid','value'=>$i18n->get('button.submit')));
   $smarty->assign('use_mark_paid', true);
 }
 
@@ -91,7 +94,7 @@ if ($client_id && $bean->getAttribute('chinvoice') && ('no_grouping' == $bean->g
   // Client is selected and we are displaying the invoice column.
   $recent_invoices = ttTeamHelper::getRecentInvoices($user->team_id, $client_id);
   if ($recent_invoices) {
-    $assign_invoice_select_options = array('1'=>$i18n->getKey('dropdown.all'),'2'=>$i18n->getKey('dropdown.select'));
+    $assign_invoice_select_options = array('1'=>$i18n->get('dropdown.all'),'2'=>$i18n->get('dropdown.select'));
     $form->addInput(array('type'=>'combobox',
       'name'=>'assign_invoice_select_options',
       'data'=>$assign_invoice_select_options,
@@ -101,72 +104,67 @@ if ($client_id && $bean->getAttribute('chinvoice') && ('no_grouping' == $bean->g
       'data'=>$recent_invoices,
       'datakeys'=>array('id','name'),
       'value'=>$cl_recent_invoice_option,
-      'empty'=>array(''=>$i18n->getKey('dropdown.select_invoice'))));
-    $form->addInput(array('type'=>'submit','name'=>'btn_assign','value'=>$i18n->getKey('button.submit')));
+      'empty'=>array(''=>$i18n->get('dropdown.select_invoice'))));
+    $form->addInput(array('type'=>'submit','name'=>'btn_assign','value'=>$i18n->get('button.submit')));
     $smarty->assign('use_assign_to_invoice', true);
   }
 }
 
 if ($request->isPost()) {
-  if ($request->getParameter('btn_mark_paid')) {
-    // User clicked the "Mark paid" button to mark some or all items either paid or not paid.
-
-    // Determine user action.
-    $mark_paid = $request->getParameter('mark_paid_action_options') == 1 ? true : false;
-
-    // Obtain 2 arrays or record ids, one for log, another for expense items.
-    if (1 == $request->getParameter('mark_paid_select_options')) {
-      // We are marking all report items. Get the arrays from session.
-      $item_ids = ttReportHelper::getFromSession();
-      $time_log_ids = $item_ids['report_item_ids'];
-      $expense_item_ids = $item_ids['report_item_expense_ids'];
-    } else if (2 == $request->getParameter('mark_paid_select_options')) {
-      // We are marking only selected items. Get the arrays from $_POST.
-      foreach($_POST as $key => $val) {
-        if ('log_id_' == substr($key, 0, 7))
-          $time_log_ids[] = substr($key, 7);
-        if ('item_id_' == substr($key, 0, 8))
-          $expense_item_ids[] = substr($key, 8);
-      }
-    }
-    // Mark as requested.
-    if ($time_log_ids || $expense_item_ids) {
-      ttReportHelper::markPaid($time_log_ids, $expense_item_ids, $mark_paid);
-    }
 
-    // Re-display this form.
-    header('Location: report.php');
-    exit();
+  // Validate parameters and at the same time build arrays of record ids.
+  if (($request->getParameter('btn_mark_paid') && 2 == $request->getParameter('mark_paid_select_options'))
+       || ($request->getParameter('btn_assign') && 2 == $request->getParameter('assign_invoice_select_options'))) {
+    // We act on selected records. Are there any?
+    foreach($_POST as $key => $val) {
+      if ('log_id_' == substr($key, 0, 7))
+        $time_log_ids[] = substr($key, 7);
+      if ('item_id_' == substr($key, 0, 8))
+        $expense_item_ids[] = substr($key, 8);
+    }
+    if (!$time_log_ids && !$expense_item_ids) $err->Add($i18n->get('error.record')); // There are no selected records.
+    // Validation of parameteres ended here.
+  } else {
+    // We are assigning all report items. Get the arrays from session.
+    // Note: getting from session assures we act only on previously displayed records.
+    // Rebuilding from $bean may get us a different set.
+    $item_ids = ttReportHelper::getFromSession();
+    $time_log_ids = $item_ids['report_item_ids'];
+    $expense_item_ids = $item_ids['report_item_expense_ids'];
+    // The above code is here beacues the arrays are used in both "Mark paid" and "Assign to invoice" handlers below.
   }
 
-  if ($request->getParameter('btn_assign')) {
-    // User clicked the Submit button to assign all or some items to a recent invoice.
-
-    // Determine invoice id.
-    $invoice_id = $request->getParameter('recent_invoice');
-
-    // Obtain 2 arrays or record ids, one for log, another for expense items.
-    if (1 == $request->getParameter('assign_invoice_select_options')) {
-      // We are assigning all report items. Get the arrays from session.
-      $item_ids = ttReportHelper::getFromSession();
-      $time_log_ids = $item_ids['report_item_ids'];
-      $expense_item_ids = $item_ids['report_item_expense_ids'];
-    } else if (2 == $request->getParameter('assign_invoice_select_options')) {
-      // We are marking only selected items. Get the arrays from $_POST.
-      foreach($_POST as $key => $val) {
-        if ('log_id_' == substr($key, 0, 7))
-          $time_log_ids[] = substr($key, 7);
-        if ('item_id_' == substr($key, 0, 8))
-          $expense_item_ids[] = substr($key, 8);
+  if ($err->no()) {
+    if ($request->getParameter('btn_mark_paid')) {
+      // User clicked the "Mark paid" button to mark some or all items either paid or not paid.
+
+      // Determine user action.
+      $mark_paid = $request->getParameter('mark_paid_action_options') == 1 ? true : false;
+
+      // Mark as requested.
+      if ($time_log_ids || $expense_item_ids) {
+        ttReportHelper::markPaid($time_log_ids, $expense_item_ids, $mark_paid);
       }
+
+      // Re-display this form.
+      header('Location: report.php');
+      exit();
     }
-    // Assign as requested.
-    if ($time_log_ids || $expense_item_ids) {
-      ttReportHelper::assignToInvoice($invoice_id, $time_log_ids, $expense_item_ids);
+
+    if ($request->getParameter('btn_assign')) {
+      // User clicked the Submit button to assign all or some items to a recent invoice.
+
+      // Determine invoice id.
+      $invoice_id = $request->getParameter('recent_invoice');
+
+      // Assign as requested.
+      if ($time_log_ids || $expense_item_ids) {
+        ttReportHelper::assignToInvoice($invoice_id, $time_log_ids, $expense_item_ids);
+      }
+      // Re-display this form.
+      header('Location: report.php');
+      exit();
     }
-    // Re-display this form.
-    header('Location: report.php');
-    exit();
   }
 } // isPost
 
@@ -195,7 +193,7 @@ if ('no_grouping' != $group_by) {
     $smarty->assign('group_by_header', $custom_fields->fields[0]['label']);
   else {
     $key = 'label.'.$group_by;
-    $smarty->assign('group_by_header', $i18n->getKey($key));
+    $smarty->assign('group_by_header', $i18n->get($key));
   }
 }
 // Assign variables that are used to alternate color of rows for different dates.
@@ -209,6 +207,6 @@ $smarty->assign('report_items', $report_items);
 $smarty->assign('subtotals', $subtotals);
 $smarty->assign('totals', $totals);
 $smarty->assign('bean', $bean);
-$smarty->assign('title', $i18n->getKey('title.report').": ".$totals['start_date']." - ".$totals['end_date']);
+$smarty->assign('title', $i18n->get('title.report').": ".$totals['start_date']." - ".$totals['end_date']);
 $smarty->assign('content_page_name', 'report.tpl');
 $smarty->display('index.tpl');