Refactoring a bit.

diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index 5351db8..f5f4cc8 100644 (file)
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -921,21 +921,20 @@ class ttReportHelper {
 
     // Execute query.
     $res = $mdb2->query($sql);
-    if (!is_a($res, 'PEAR_Error')) {
-      $val = $res->fetchRow();
-      $total_time = $val['time'] ? sec_to_time_fmt_hm($val['time']) : null;
-      if ($bean->getAttribute('chcost')) {
-        $total_cost = $val['cost'];
-        if (!$total_cost) $total_cost = '0.00';
-        if ('.' != $user->decimal_mark)
-          $total_cost = str_replace('.', $user->decimal_mark, $total_cost);
-        $total_expenses = $val['expenses'];
-        if (!$total_expenses) $total_expenses = '0.00';
-        if ('.' != $user->decimal_mark)
-          $total_expenses = str_replace('.', $user->decimal_mark, $total_expenses);
-      }
-    } else
-      die($res->getMessage());
+    if (is_a($res, 'PEAR_Error')) die($res->getMessage());
+
+    $val = $res->fetchRow();
+    $total_time = $val['time'] ? sec_to_time_fmt_hm($val['time']) : null;
+    if ($bean->getAttribute('chcost')) {
+      $total_cost = $val['cost'];
+      if (!$total_cost) $total_cost = '0.00';
+      if ('.' != $user->decimal_mark)
+        $total_cost = str_replace('.', $user->decimal_mark, $total_cost);
+      $total_expenses = $val['expenses'];
+      if (!$total_expenses) $total_expenses = '0.00';
+      if ('.' != $user->decimal_mark)
+        $total_expenses = str_replace('.', $user->decimal_mark, $total_expenses);
+    }
 
     if ($bean->getAttribute('period'))
       $period = new Period($bean->getAttribute('period'), new DateAndTime($user->date_format));
@@ -959,11 +958,11 @@ class ttReportHelper {
   static function getFavTotals($report)
   {
     global $user;
-    
+
     $mdb2 = getConnection();
-    
+
     $where = ttReportHelper::getFavWhere($report);
-       
+
     // Start with a query for time items.
     if ($report['show_cost']) {
       if (MODE_TIME == $user->tracking_mode) {
@@ -977,38 +976,36 @@ class ttReportHelper {
           sum(cast(l.billable * coalesce(upb.rate, 0) * time_to_sec(l.duration)/3600 as decimal(10,2))) as cost,
           null as expenses
           from tt_log l
-          left join tt_user_project_binds upb on (l.user_id = upb.user_id and l.project_id = upb.project_id) $where";          
+          left join tt_user_project_binds upb on (l.user_id = upb.user_id and l.project_id = upb.project_id) $where";
       }
     } else
       $sql = "select sum(time_to_sec(l.duration)) as time, null as cost, null as expenses from tt_log l $where";
-      
+
     // If we have expenses, query becomes a bit more complex.
     if ($report['show_cost'] && in_array('ex', explode(',', $user->plugins))) {
       $where = ttReportHelper::getFavExpenseWhere($report);
       $sql_for_expenses = "select null as time, sum(cost) as cost, sum(cost) as expenses from tt_expense_items ei $where";
       // Create a combined query.
       $sql = "select sum(time) as time, sum(cost) as cost, sum(expenses) as expenses from (($sql) union all ($sql_for_expenses)) t";
-       }
+    }
 
-       // Execute query.
+    // Execute query.
     $res = $mdb2->query($sql);
-    if (!is_a($res, 'PEAR_Error')) {
-      $val = $res->fetchRow();
-      $total_time = $val['time'] ? sec_to_time_fmt_hm($val['time']) : null;
-      if ($report['show_cost']) {
-       $total_cost = $val['cost'];
-       if (!$total_cost) $total_cost = '0.00';
-       if ('.' != $user->decimal_mark)
-             $total_cost = str_replace('.', $user->decimal_mark, $total_cost);
-             
-           $total_expenses = $val['expenses'];
-       if (!$total_expenses) $total_expenses = '0.00';
-       if ('.' != $user->decimal_mark)
-             $total_expenses = str_replace('.', $user->decimal_mark, $total_expenses);
-      }
-    } else
-      die($res->getMessage());
-      
+    if (is_a($res, 'PEAR_Error')) die($res->getMessage());
+
+    $val = $res->fetchRow();
+    $total_time = $val['time'] ? sec_to_time_fmt_hm($val['time']) : null;
+    if ($report['show_cost']) {
+      $total_cost = $val['cost'];
+      if (!$total_cost) $total_cost = '0.00';
+      if ('.' != $user->decimal_mark)
+        $total_cost = str_replace('.', $user->decimal_mark, $total_cost);
+      $total_expenses = $val['expenses'];
+      if (!$total_expenses) $total_expenses = '0.00';
+      if ('.' != $user->decimal_mark)
+        $total_expenses = str_replace('.', $user->decimal_mark, $total_expenses);
+    }
+
     if ($report['period'])
       $period = new Period($report['period'], new DateAndTime($user->date_format));
     else {
@@ -1019,14 +1016,14 @@ class ttReportHelper {
     }
 
     $totals['start_date'] = $period->getBeginDate();
-       $totals['end_date'] = $period->getEndDate();
-       $totals['time'] = $total_time;
-       $totals['cost'] = $total_cost;
-       $totals['expenses'] = $total_expenses;
+    $totals['end_date'] = $period->getEndDate();
+    $totals['time'] = $total_time;
+    $totals['cost'] = $total_cost;
+    $totals['expenses'] = $total_expenses;
 
     return $totals;
   }
-  
+
   // The assignToInvoice assigns a set of records to a specific invoice.
   static function assignToInvoice($invoice_id, $time_log_ids, $expense_item_ids)
   {

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index e50e6e3..ce8a0e5 100644 (file)
--- a/WEB-INF/templates/footer.tpl
+++ b/WEB-INF/templates/footer.tpl
@@ -12,7 +12,7 @@
       <br>
       <table cellspacing="0" cellpadding="4" width="100%" border="0">
         <tr>
-          <td align="center">&nbsp;Anuko Time Tracker 1.9.20.3450 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.9.20.3451 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
             <a href="https://www.anuko.com/lp/tt_4.htm" target="_blank">{$i18n.footer.credits}</a> |
             <a href="https://www.anuko.com/lp/tt_5.htm" target="_blank">{$i18n.footer.license}</a> |
             <a href="https://www.anuko.com/lp/tt_7.htm" target="_blank">{$i18n.footer.improve}</a>