Refactoring - mostly white space.

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index a364819..90d5eb5 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.28.3519 | 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.28.3520 | 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>

diff --git a/plugins/MonthlyQuota.class.php b/plugins/MonthlyQuota.class.php
index 06b2092..4e5b8dc 100644 (file)
--- a/plugins/MonthlyQuota.class.php
+++ b/plugins/MonthlyQuota.class.php
@@ -26,103 +26,101 @@
 // | https://www.anuko.com/time_tracker/credits.htm
 // +----------------------------------------------------------------------+
 
+// MontlyQuota class implements handling of work hour quotas.
 class MonthlyQuota {
-    
-    var $db;       // Database connection.
-    var $holidays; // Array of holidays from localization file.
-    var $team_id;  // Team id.
-
-    // Old style constructors are DEPRECATED in PHP 7.0, and will be removed in a future version. You should always use __construct() in new code.
-    function __construct() {
-        $this->db = getConnection();
-        $i18n = $GLOBALS['I18N'];
-        $this->holidays = $i18n->holidays;
-        global $user;
-        $this->team_id = $user->team_id;
+
+  var $db;       // Database connection.
+  var $team_id;  // Team id.
+
+  // Old style constructors are DEPRECATED in PHP 7.0, and will be removed in a future version. You should always use __construct() in new code.
+  function __construct() {
+    $this->db = getConnection();
+    global $user;
+    $this->team_id = $user->team_id;
+  }
+
+  // update - deletes a quota, then inserts a new one.
+  public function update($year, $month, $quota) {
+    $teamId = $this->team_id;
+    $deleteSql = "DELETE FROM tt_monthly_quotas WHERE year = $year AND month = $month AND team_id = $teamId";
+    $this->db->exec($deleteSql);
+    if ($quota){
+      $insertSql = "INSERT INTO tt_monthly_quotas (team_id, year, month, quota) values ($teamId, $year, $month, $quota)";
+      $affected = $this->db->exec($insertSql);
+      return (!is_a($affected, 'PEAR_Error'));
     }
+    return true;
+  }
 
-    // update - deletes a quota, then inserts a new one.
-    public function update($year, $month, $quota) {
-        $teamId = $this->team_id;
-        $deleteSql = "DELETE FROM tt_monthly_quotas WHERE year = $year AND month = $month AND team_id = $teamId";
-        $this->db->exec($deleteSql);
-        if ($quota){
-            $insertSql = "INSERT INTO tt_monthly_quotas (team_id, year, month, quota) values ($teamId, $year, $month, $quota)";
-            $affected = $this->db->exec($insertSql);
-            return (!is_a($affected, 'PEAR_Error'));
-        }
-        return true;
+  // get - obtains either a single month quota or an array of quotas for an entire year.
+  public function get($year, $month) {
+    if (is_null($month)){
+      return $this->getMany($year);
     }
+    return $this->getSingle($year, $month);
+  }
 
-    // get - obains either a single month quota or an array of quotas for an entire year.
-    public function get($year, $month) {
-        if (is_null($month)){
-            return $this->getMany($year);
-        }
-        return $this->getSingle($year, $month);
+  // getWorkdayHours - obtains workday_hours value for a team from the database.
+  public function getWorkdayHours(){
+    $teamId = $this->team_id;
+    $sql = "SELECT workday_hours FROM tt_teams where id = $teamId";
+    $reader = $this->db->query($sql);
+    if (is_a($reader, 'PEAR_Error')) {
+      return false;
     }
 
-    // getWorkdayHours - obtains workday_hours value for a team from the database.
-    public function getWorkdayHours(){
-        $teamId = $this->team_id;
-        $sql = "SELECT workday_hours FROM tt_teams where id = $teamId";
-        $reader = $this->db->query($sql);
-        if (is_a($reader, 'PEAR_Error')) {
-            return false;
-        }
-
-        $row = $reader->fetchRow();
-        return $row['workday_hours'];
+    $row = $reader->fetchRow();
+    return $row['workday_hours'];
+  }
+
+  // getSingle - obtains a quota for a single month.
+  private function getSingle($year, $month) {
+    $teamId = $this->team_id;
+    $sql = "SELECT quota FROM tt_monthly_quotas WHERE year = $year AND month = $month AND team_id = $teamId";
+    $reader = $this->db->query($sql);
+    if (is_a($reader, 'PEAR_Error')) {
+      return false;
     }
 
-    // getSingle - obtains a quota for a single month.
-    private function getSingle($year, $month) {
-        $teamId = $this->team_id;
-        $sql = "SELECT quota FROM tt_monthly_quotas WHERE year = $year AND month = $month AND team_id = $teamId";
-        $reader = $this->db->query($sql);
-        if (is_a($reader, 'PEAR_Error')) {
-            return false;
-        }
-        
-        $row = $reader->fetchRow();
-        if ($row)
-          return $row['quota'];
-        
-        // If we did not find a record, return a calculated monthly quota.
-        $numWorkdays = $this->getNumWorkdays($month, $year);
-        return $numWorkdays * $this->getWorkdayHours();
+    $row = $reader->fetchRow();
+    if ($row)
+      return $row['quota'];
+
+    // If we did not find a record, return a calculated monthly quota.
+    $numWorkdays = $this->getNumWorkdays($month, $year);
+    return $numWorkdays * $this->getWorkdayHours();
+  }
+
+  // getMany - returns an array of quotas for a given year for team.
+  private function getMany($year){
+    $teamId = $this->team_id;
+    $sql = "SELECT month, quota FROM tt_monthly_quotas WHERE year = $year AND team_id = $teamId";
+    $result = array();
+    $res = $this->db->query($sql);
+    if (is_a($res, 'PEAR_Error')) {
+      return false;
     }
 
-    // getMany - returns an array of quotas for a given year for team.
-    private function getMany($year){
-        $teamId = $this->team_id;
-        $sql = "SELECT month, quota FROM tt_monthly_quotas WHERE year = $year AND team_id = $teamId";
-        $result = array();
-        $res = $this->db->query($sql);
-        if (is_a($res, 'PEAR_Error')) {
-            return false;
-        }
-        
-        while ($val = $res->fetchRow()) {
-            $result[$val['month']] = $val['quota'];
-        }        
-        
-        return $result;
+    while ($val = $res->fetchRow()) {
+      $result[$val['month']] = $val['quota'];
     }
-    
-    // getNumWorkdays returns a number of work days in a given month.
-    private function getNumWorkdays($month, $year) {
-
-      $daysInMonth = cal_days_in_month(CAL_GREGORIAN, $month, $year); // Number of calendar days in month.
-
-      $workdaysInMonth = 0;
-      // Iterate through all.
-      for ($i = 1; $i <= $daysInMonth; $i++) {
-        $date = "$year-$month-$i";
-        if (!ttTimeHelper::isWeekend($date) && !ttTimeHelper::isHoliday($date)) {
-          $workdaysInMonth++;
-        }
+
+    return $result;
+  }
+
+  // getNumWorkdays returns a number of work days in a given month.
+  private function getNumWorkdays($month, $year) {
+
+    $daysInMonth = cal_days_in_month(CAL_GREGORIAN, $month, $year); // Number of calendar days in month.
+
+    $workdaysInMonth = 0;
+    // Iterate through the entire month.
+    for ($i = 1; $i <= $daysInMonth; $i++) {
+      $date = "$year-$month-$i";
+      if (!ttTimeHelper::isWeekend($date) && !ttTimeHelper::isHoliday($date)) {
+        $workdaysInMonth++;
       }
-      return $workdaysInMonth;
     }
+    return $workdaysInMonth;
+  }
 }