From 862774685f3a45de5b783627a66fc8b65839d7c7 Mon Sep 17 00:00:00 2001 From: Nik Okuntseff Date: Wed, 30 Mar 2016 19:21:19 +0000 Subject: [PATCH] Refactoring - cleaned up white space. --- WEB-INF/lib/ttExpenseHelper.class.php | 58 +++++++++------------------ WEB-INF/lib/ttUser.class.php | 49 +++++++++++----------- WEB-INF/templates/footer.tpl | 2 +- 3 files changed, 45 insertions(+), 64 deletions(-) diff --git a/WEB-INF/lib/ttExpenseHelper.class.php b/WEB-INF/lib/ttExpenseHelper.class.php index 23ea3908..c41a1416 100644 --- a/WEB-INF/lib/ttExpenseHelper.class.php +++ b/WEB-INF/lib/ttExpenseHelper.class.php @@ -41,18 +41,18 @@ class ttExpenseHelper { $cost = str_replace(',', '.', $fields['cost']); $invoice_id = $fields['invoice_id']; $status = $fields['status']; - + $sql = "insert into tt_expense_items (date, user_id, client_id, project_id, name, cost, invoice_id, status) ". "values (".$mdb2->quote($date).", $user_id, ".$mdb2->quote($client_id).", ".$mdb2->quote($project_id). ", ".$mdb2->quote($name).", ".$mdb2->quote($cost).", ".$mdb2->quote($invoice_id).", ".$mdb2->quote($status).")"; $affected = $mdb2->exec($sql); if (is_a($affected, 'PEAR_Error')) return false; - + $id = $mdb2->lastInsertID('tt_expense_items', 'id'); return $id; } - + // update - updates a record in tt_expense_items table. static function update($fields) { @@ -66,19 +66,19 @@ class ttExpenseHelper { $name = $fields['name']; $cost = str_replace(',', '.', $fields['cost']); $invoice_id = $fields['invoice_id']; - + $sql = "UPDATE tt_expense_items set date = ".$mdb2->quote($date).", user_id = $user_id, client_id = ".$mdb2->quote($client_id). ", project_id = ".$mdb2->quote($project_id).", name = ".$mdb2->quote($name). ", cost = ".$mdb2->quote($cost).", invoice_id = ".$mdb2->quote($invoice_id). " WHERE id = $id"; - + $affected = $mdb2->exec($sql); if (is_a($affected, 'PEAR_Error')) return false; - + return true; } - + // markDeleted - marks an item as deleted in tt_expense_items table. static function markDeleted($id, $user_id) { $mdb2 = getConnection(); @@ -87,14 +87,14 @@ class ttExpenseHelper { $affected = $mdb2->exec($sql); if (is_a($affected, 'PEAR_Error')) return false; - + return true; } - + // getTotalForDay - gets total expenses for a user for a specific date. static function getTotalForDay($user_id, $date) { - global $user; - + global $user; + $mdb2 = getConnection(); $sql = "select sum(cost) as sm from tt_expense_items where user_id = $user_id and date = ".$mdb2->quote($date)." and status = 1"; @@ -106,22 +106,22 @@ class ttExpenseHelper { } return false; } - + // getItem - retrieves an entry from tt_expense_items table. static function getItem($id, $user_id) { global $user; - + $mdb2 = getConnection(); - + $client_field = null; if ($user->isPluginEnabled('cl')) $client_field = ", c.name as client_name"; - + $left_joins = ""; $left_joins = " left join tt_projects p on (ei.project_id = p.id)"; if ($user->isPluginEnabled('cl')) $left_joins .= " left join tt_clients c on (ei.client_id = c.id)"; - + $sql = "select ei.id, ei.date, ei.client_id, ei.project_id, ei.name, ei.cost, ei.invoice_id $client_field, p.name as project_name from tt_expense_items ei $left_joins @@ -132,42 +132,24 @@ class ttExpenseHelper { return false; } if ($val = $res->fetchRow()) { - $val['cost'] = str_replace('.', $user->decimal_mark, $val['cost']); + $val['cost'] = str_replace('.', $user->decimal_mark, $val['cost']); return $val; } } return false; } - - /* - // getAllItems - returns all expense items for a certain user. - static function getAllItems($user_id) { - $result = array(); - - $mdb2 = getConnection(); - - $sql = "select * from tt_expense_items where user_id = $user_id order by id"; - $res = $mdb2->query($sql); - if (!is_a($res, 'PEAR_Error')) { - while ($val = $res->fetchRow()) { - $result[] = $val; - } - } else return false; - - return $result; - }*/ // getItems - returns expense items for a user for a given date. static function getItems($user_id, $date) { global $user; - + $result = array(); $mdb2 = getConnection(); $client_field = null; if ($user->isPluginEnabled('cl')) $client_field = ", c.name as client"; - + $left_joins = ""; $left_joins = " left join tt_projects p on (ei.project_id = p.id)"; if ($user->isPluginEnabled('cl')) @@ -178,7 +160,7 @@ class ttExpenseHelper { $left_joins where ei.date = ".$mdb2->quote($date)." and ei.user_id = $user_id and ei.status = 1 order by ei.id"; - + $res = $mdb2->query($sql); if (!is_a($res, 'PEAR_Error')) { while ($val = $res->fetchRow()) { diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php index 84b229fc..78fee50d 100644 --- a/WEB-INF/lib/ttUser.class.php +++ b/WEB-INF/lib/ttUser.class.php @@ -50,29 +50,28 @@ class ttUser { var $address = null; // Address for invoices. var $lock_interval = 0; // Lock interval in days for time records. var $rights = 0; // A mask of user rights. - + // Constructor. function ttUser($login, $id = null) { - if (!$login && !$id) { + if (!$login && !$id) { // nothing to initialize - return; - } - + return; + } + $mdb2 = getConnection(); - + $sql = "SELECT u.id, u.login, u.name, u.team_id, u.role, u.client_id, u.email, t.name as team_name, t.address, t.currency, t.locktime, t.lang, t.decimal_mark, t.date_format, t.time_format, t.week_start, t.tracking_mode, t.record_type, t.plugins, t.custom_logo FROM tt_users u LEFT JOIN tt_teams t ON (u.team_id = t.id) WHERE "; - if ($id) - $sql .= "u.id = $id"; + if ($id) + $sql .= "u.id = $id"; else - $sql .= "u.login = ".$mdb2->quote($login); - $sql .= " AND u.status = 1"; - + $sql .= "u.login = ".$mdb2->quote($login); + $sql .= " AND u.status = 1"; + $res = $mdb2->query($sql); if (is_a($res, 'PEAR_Error')) { return; - //die($res->getMessage()); } $val = $res->fetchRow(); @@ -97,33 +96,33 @@ class ttUser { $this->plugins = $val['plugins']; $this->custom_logo = $val['custom_logo']; $this->lock_interval = $val['locktime']; - + // Set "on behalf" id and name. if (isset($_SESSION['behalf_id'])) { $this->behalf_id = $_SESSION['behalf_id']; $this->behalf_name = $_SESSION['behalf_name']; } - + // Set user rights. if ($this->role == ROLE_USER) { - $this->rights = right_data_entry|right_view_charts|right_view_reports; + $this->rights = right_data_entry|right_view_charts|right_view_reports; } elseif ($this->role == ROLE_CLIENT) { - $this->rights = right_view_reports|right_view_invoices; // TODO: how about right_view_charts, too? + $this->rights = right_view_reports|right_view_invoices; // TODO: how about right_view_charts, too? } elseif ($this->role == ROLE_COMANAGER) { - $this->rights = right_data_entry|right_view_charts|right_view_reports|right_view_invoices|right_manage_team; + $this->rights = right_data_entry|right_view_charts|right_view_reports|right_view_invoices|right_manage_team; } elseif ($this->role == ROLE_MANAGER) { - $this->rights = right_data_entry|right_view_charts|right_view_reports|right_view_invoices|right_manage_team|right_assign_roles|right_export_team; + $this->rights = right_data_entry|right_view_charts|right_view_reports|right_view_invoices|right_manage_team|right_assign_roles|right_export_team; } elseif ($this->role == ROLE_SITE_ADMIN) { - $this->rights = right_administer_site; + $this->rights = right_administer_site; } } } - + // The getActiveUser returns user id on behalf of whom current user is operating. function getActiveUser() { return ($this->behalf_id ? $this->behalf_id : $this->id); } - + // isAdmin - determines whether current user is admin (has right_administer_site). function isAdmin() { return (right_administer_site & $this->role); @@ -138,17 +137,17 @@ class ttUser { function isCoManager() { return (ROLE_COMANAGER == $this->role); } - + // isClient - determines whether current user is a client. function isClient() { return (ROLE_CLIENT == $this->role); } - + // canManageTeam - determines whether current user is manager or co-manager. function canManageTeam() { return (right_manage_team & $this->role); } - + // isPluginEnabled checks whether a plugin is enabled for user. function isPluginEnabled($plugin) { @@ -160,7 +159,7 @@ class ttUser { { $result = array(); $mdb2 = getConnection(); - + // Do a query with inner join to get assigned projects. $sql = "select p.id, p.name, p.description, p.tasks, upb.rate from tt_projects p inner join tt_user_project_binds upb on (upb.user_id = ".$this->getActiveUser()." and upb.project_id = p.id and upb.status = 1) diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl index 0c671c4e..646f68d8 100644 --- a/WEB-INF/templates/footer.tpl +++ b/WEB-INF/templates/footer.tpl @@ -12,7 +12,7 @@
-
 Anuko Time Tracker 1.9.20.3462 | Copyright © Anuko | +  Anuko Time Tracker 1.9.20.3463 | Copyright © Anuko | {$i18n.footer.credits} | {$i18n.footer.license} | {$i18n.footer.improve} -- 2.20.1