From 70272dc970919c348288bd09ff835f05e7538949 Mon Sep 17 00:00:00 2001 From: Nik Okuntseff Date: Mon, 28 Mar 2016 14:48:59 +0000 Subject: [PATCH] Replacing else if with elseif --- .gitignore | 1 + WEB-INF/lib/ttChartHelper.class.php | 4 +- WEB-INF/lib/ttInvoiceHelper.class.php | 2 +- WEB-INF/lib/ttProjectHelper.class.php | 4 +- WEB-INF/lib/ttReportHelper.class.php | 88 +++++++++++++------------- WEB-INF/lib/ttTeamHelper.class.php | 6 +- WEB-INF/lib/ttTimeHelper.class.php | 4 +- WEB-INF/lib/ttUser.class.php | 8 +-- WEB-INF/lib/ttUserHelper.class.php | 4 +- WEB-INF/templates/cf_custom_fields.tpl | 2 +- WEB-INF/templates/footer.tpl | 2 +- charts.php | 2 +- expenses.php | 3 +- index.php | 3 +- invoice_delete.php | 2 +- invoice_view.php | 2 +- login.php | 6 +- mobile/index.php | 3 +- mobile/login.php | 10 +-- mobile/time.php | 6 +- mobile/time_edit.php | 8 +-- mobile/timer.php | 4 +- notification_delete.php | 2 +- password_change.php | 6 +- project_delete.php | 2 +- reports.php | 4 +- task_delete.php | 2 +- time.php | 11 ++-- time_edit.php | 10 +-- 29 files changed, 100 insertions(+), 111 deletions(-) diff --git a/.gitignore b/.gitignore index 59025834..883ae874 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ config.php WEB-INF/templates_c/*.php +WEB-INF/templates_c/*.png WEB-INF/lib/tcpdf/ nbproject/ \ No newline at end of file diff --git a/WEB-INF/lib/ttChartHelper.class.php b/WEB-INF/lib/ttChartHelper.class.php index 155349be..70bb534b 100644 --- a/WEB-INF/lib/ttChartHelper.class.php +++ b/WEB-INF/lib/ttChartHelper.class.php @@ -72,12 +72,12 @@ class ttChartHelper { $sql = "select p.name as name, sum(time_to_sec(l.duration)) as time from tt_log l inner join tt_projects p on (p.id = l.project_id) where l.status = 1 and l.duration > 0 and l.user_id = $user_id $q_period group by l.project_id"; - } else if (CHART_TASKS == $ch_type) { + } elseif (CHART_TASKS == $ch_type) { // Data for tasks. $sql = "select t.name as name, sum(time_to_sec(l.duration)) as time from tt_log l inner join tt_tasks t on (t.id = l.task_id) where l.status = 1 and l.duration > 0 and l.user_id = $user_id $q_period group by l.task_id"; - } else if (CHART_CLIENTS == $ch_type) { + } elseif (CHART_CLIENTS == $ch_type) { // Data for clients. $sql = "select coalesce(c.name, 'NULL') as name, sum(time_to_sec(l.duration)) as time from tt_log l left join tt_clients c on (c.id = l.client_id) diff --git a/WEB-INF/lib/ttInvoiceHelper.class.php b/WEB-INF/lib/ttInvoiceHelper.class.php index 2e1c6876..d6b214ef 100644 --- a/WEB-INF/lib/ttInvoiceHelper.class.php +++ b/WEB-INF/lib/ttInvoiceHelper.class.php @@ -417,7 +417,7 @@ class ttInvoiceHelper { $colspan = 4; if (MODE_PROJECTS == $user->tracking_mode) $colspan++; - else if (MODE_PROJECTS_AND_TASKS == $user->tracking_mode) + elseif (MODE_PROJECTS_AND_TASKS == $user->tracking_mode) $colspan += 2; $body .= ' '; if ($tax) { diff --git a/WEB-INF/lib/ttProjectHelper.class.php b/WEB-INF/lib/ttProjectHelper.class.php index 59f20223..19e01d35 100644 --- a/WEB-INF/lib/ttProjectHelper.class.php +++ b/WEB-INF/lib/ttProjectHelper.class.php @@ -255,9 +255,9 @@ class ttProjectHelper { if(!in_array($row['user_id'], $users_to_bind)) { // Delete tt_user_project_binds record (safely). ttUserHelper::deleteBind($row['user_id'], $project_id); - } else if (!$row['status']) { + } elseif (!$row['status']) { // If we are here, status of the bind is not active. Memorize such users to update their bind status. - $users_to_update[] = $row['user_id']; // Users we need to update in tt_user_project_binds. + $users_to_update[] = $row['user_id']; // Users we need to update in tt_user_project_binds. } $all_users[] = $row['user_id']; // All users from tt_user_project_binds for project. } diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php index 8d422e6a..2aac4684 100644 --- a/WEB-INF/lib/ttReportHelper.class.php +++ b/WEB-INF/lib/ttReportHelper.class.php @@ -40,11 +40,11 @@ class ttReportHelper { static function getWhere($bean) { global $user; - // Prepare dropdown parts. + // Prepare dropdown parts. $dropdown_parts = ''; if ($bean->getAttribute('client')) $dropdown_parts .= ' and l.client_id = '.$bean->getAttribute('client'); - else if ($user->isClient() && $user->client_id) + elseif ($user->isClient() && $user->client_id) $dropdown_parts .= ' and l.client_id = '.$user->client_id; if ($bean->getAttribute('option')) $dropdown_parts .= ' and l.id in(select log_id from tt_custom_field_log where status = 1 and option_id = '.$bean->getAttribute('option').')'; if ($bean->getAttribute('project')) $dropdown_parts .= ' and l.project_id = '.$bean->getAttribute('project'); @@ -53,7 +53,7 @@ class ttReportHelper { if ($bean->getAttribute('include_records')=='2') $dropdown_parts .= ' and l.billable = 0'; if ($bean->getAttribute('invoice')=='1') $dropdown_parts .= ' and l.invoice_id is not NULL'; if ($bean->getAttribute('invoice')=='2') $dropdown_parts .= ' and l.invoice_id is NULL'; - + // Prepare user list part. $userlist = -1; if (($user->canManageTeam() || $user->isClient()) && is_array($bean->getAttribute('users'))) @@ -64,7 +64,7 @@ class ttReportHelper { $user_list_part = " and l.user_id in ($userlist)"; else $user_list_part = " and l.user_id = ".$user->id; - + // Prepare sql query part for where. if ($bean->getAttribute('period')) $period = new Period($bean->getAttribute('period'), new DateAndTime($user->date_format)); @@ -78,16 +78,16 @@ class ttReportHelper { " $user_list_part $dropdown_parts"; return $where; } - + // getFavWhere prepares a WHERE clause for a favorite report query. static function getFavWhere($report) { global $user; - // Prepare dropdown parts. + // Prepare dropdown parts. $dropdown_parts = ''; if ($report['client_id']) $dropdown_parts .= ' and l.client_id = '.$report['client_id']; - else if ($user->isClient() && $user->client_id) + elseif ($user->isClient() && $user->client_id) $dropdown_parts .= ' and l.client_id = '.$user->client_id; if ($report['cf_1_option_id']) $dropdown_parts .= ' and l.id in(select log_id from tt_custom_field_log where status = 1 and option_id = '.$report['cf_1_option_id'].')'; if ($report['project_id']) $dropdown_parts .= ' and l.project_id = '.$report['project_id']; @@ -96,14 +96,14 @@ class ttReportHelper { if ($report['billable']=='2') $dropdown_parts .= ' and l.billable = 0'; if ($report['invoice']=='1') $dropdown_parts .= ' and l.invoice_id is not NULL'; if ($report['invoice']=='2') $dropdown_parts .= ' and l.invoice_id is NULL'; - + // Prepare user list part. $userlist = -1; if (($user->canManageTeam() || $user->isClient())) { if ($report['users']) $userlist = $report['users']; else { - $active_users = ttTeamHelper::getActiveUsers(); + $active_users = ttTeamHelper::getActiveUsers(); foreach ($active_users as $single_user) $users[] = $single_user['id']; $userlist = join(',', $users); @@ -115,7 +115,7 @@ class ttReportHelper { $user_list_part = " and l.user_id in ($userlist)"; else $user_list_part = " and l.user_id = ".$user->id; - + // Prepare sql query part for where. if ($report['period']) $period = new Period($report['period'], new DateAndTime($user->date_format)); @@ -129,21 +129,21 @@ class ttReportHelper { " $user_list_part $dropdown_parts"; return $where; } - + // getExpenseWhere prepares WHERE clause for expenses query in a report. static function getExpenseWhere($bean) { global $user; - // Prepare dropdown parts. + // Prepare dropdown parts. $dropdown_parts = ''; if ($bean->getAttribute('client')) $dropdown_parts .= ' and ei.client_id = '.$bean->getAttribute('client'); - else if ($user->isClient() && $user->client_id) + elseif ($user->isClient() && $user->client_id) $dropdown_parts .= ' and ei.client_id = '.$user->client_id; if ($bean->getAttribute('project')) $dropdown_parts .= ' and ei.project_id = '.$bean->getAttribute('project'); if ($bean->getAttribute('invoice')=='1') $dropdown_parts .= ' and ei.invoice_id is not NULL'; if ($bean->getAttribute('invoice')=='2') $dropdown_parts .= ' and ei.invoice_id is NULL'; - + // Prepare user list part. $userlist = -1; if (($user->canManageTeam() || $user->isClient()) && is_array($bean->getAttribute('users'))) @@ -154,7 +154,7 @@ class ttReportHelper { $user_list_part = " and ei.user_id in ($userlist)"; else $user_list_part = " and ei.user_id = ".$user->id; - + // Prepare sql query part for where. if ($bean->getAttribute('period')) $period = new Period($bean->getAttribute('period'), new DateAndTime($user->date_format)); @@ -173,16 +173,16 @@ class ttReportHelper { static function getFavExpenseWhere($report) { global $user; - // Prepare dropdown parts. + // Prepare dropdown parts. $dropdown_parts = ''; if ($report['client_id']) $dropdown_parts .= ' and ei.client_id = '.$report['client_id']; - else if ($user->isClient() && $user->client_id) + elseif ($user->isClient() && $user->client_id) $dropdown_parts .= ' and ei.client_id = '.$user->client_id; if ($report['project_id']) $dropdown_parts .= ' and ei.project_id = '.$report['project_id']; if ($report['invoice']=='1') $dropdown_parts .= ' and ei.invoice_id is not NULL'; if ($report['invoice']=='2') $dropdown_parts .= ' and ei.invoice_id is NULL'; - + // Prepare user list part. $userlist = -1; if (($user->canManageTeam() || $user->isClient())) { @@ -201,7 +201,7 @@ class ttReportHelper { $user_list_part = " and ei.user_id in ($userlist)"; else $user_list_part = " and ei.user_id = ".$user->id; - + // Prepare sql query part for where. if ($report['period']) $period = new Period($report['period'], new DateAndTime($user->date_format)); @@ -215,17 +215,17 @@ class ttReportHelper { " $user_list_part $dropdown_parts"; return $where; } - + // getItems retrieves all items associated with a report. // It combines tt_log and tt_expense_items in one array for presentation in one table using mysql union all. // Expense items use the "note" field for item name. static function getItems($bean) { global $user; $mdb2 = getConnection(); - + $group_by_option = $bean->getAttribute('group_by'); $convertTo12Hour = ('%I:%M %p' == $user->time_format) && ($bean->getAttribute('chstart') || $bean->getAttribute('chfinish')); - + // Prepare a query for time items in tt_log table. $fields = array(); // An array of fields for database query. array_push($fields, 'l.id as id'); @@ -248,9 +248,9 @@ class ttReportHelper { $custom_fields = new CustomFields($user->team_id); $cf_1_type = $custom_fields->fields[0]['type']; if ($cf_1_type == CustomFields::TYPE_TEXT) { - array_push($fields, 'cfl.value as cf_1'); - } else if ($cf_1_type == CustomFields::TYPE_DROPDOWN) { - array_push($fields, 'cfo.value as cf_1'); + array_push($fields, 'cfl.value as cf_1'); + } elseif ($cf_1_type == CustomFields::TYPE_DROPDOWN) { + array_push($fields, 'cfo.value as cf_1'); } } // Add start time. @@ -289,30 +289,30 @@ class ttReportHelper { if ($user->canManageTeam() || $user->isClient() || in_array('ex', explode(',', $user->plugins))) $left_joins .= " left join tt_users u on (u.id = l.user_id)"; if ($bean->getAttribute('chproject') || 'project' == $group_by_option) - $left_joins .= " left join tt_projects p on (p.id = l.project_id)"; + $left_joins .= " left join tt_projects p on (p.id = l.project_id)"; if ($bean->getAttribute('chtask') || 'task' == $group_by_option) - $left_joins .= " left join tt_tasks t on (t.id = l.task_id)"; + $left_joins .= " left join tt_tasks t on (t.id = l.task_id)"; if ($include_cf_1) { if ($cf_1_type == CustomFields::TYPE_TEXT) $left_joins .= " left join tt_custom_field_log cfl on (l.id = cfl.log_id and cfl.status = 1)"; - else if ($cf_1_type == CustomFields::TYPE_DROPDOWN) { + elseif ($cf_1_type == CustomFields::TYPE_DROPDOWN) { $left_joins .= " left join tt_custom_field_log cfl on (l.id = cfl.log_id and cfl.status = 1)". " left join tt_custom_field_options cfo on (cfl.option_id = cfo.id)"; } } if ($includeCost && MODE_TIME != $user->tracking_mode) $left_joins .= " left join tt_user_project_binds upb on (l.user_id = upb.user_id and l.project_id = upb.project_id)"; - + $where = ttReportHelper::getWhere($bean); - - // Construct sql query for tt_log items. + + // Construct sql query for tt_log items. $sql = "select ".join(', ', $fields)." from tt_log l $left_joins $where"; // If we don't have expense items (such as when the Expenses plugin is desabled), the above is all sql we need, // with an exception of sorting part, that is added in the end. // However, when we have expenses, we need to do a union with a separate query for expense items from tt_expense_items table. if ($bean->getAttribute('chcost') && in_array('ex', explode(',', $user->plugins))) { // if ex(penses) plugin is enabled - + $fields = array(); // An array of fields for database query. array_push($fields, 'ei.id'); array_push($fields, '2 as type'); // Type 2 is for tt_expense_items entries. @@ -345,7 +345,7 @@ class ttReportHelper { // Add invoice name if it is selected. if (($user->canManageTeam() || $user->isClient()) && $bean->getAttribute('chinvoice')) array_push($fields, 'i.name as invoice'); - + // Prepare sql query part for left joins. $left_joins = null; if ($user->canManageTeam() || $user->isClient()) @@ -353,19 +353,19 @@ class ttReportHelper { if ($bean->getAttribute('chclient') || 'client' == $group_by_option) $left_joins .= " left join tt_clients c on (c.id = ei.client_id)"; if ($bean->getAttribute('chproject') || 'project' == $group_by_option) - $left_joins .= " left join tt_projects p on (p.id = ei.project_id)"; + $left_joins .= " left join tt_projects p on (p.id = ei.project_id)"; if (($user->canManageTeam() || $user->isClient()) && $bean->getAttribute('chinvoice')) $left_joins .= " left join tt_invoices i on (i.id = ei.invoice_id and i.status = 1)"; $where = ttReportHelper::getExpenseWhere($bean); - + // Construct sql query for expense items. $sql_for_expense_items = "select ".join(', ', $fields)." from tt_expense_items ei $left_joins $where"; - + // Construct a union. $sql = "($sql) union all ($sql_for_expense_items)"; } - + // Determine sort part. $sort_part = ' order by '; if ('no_grouping' == $group_by_option || 'date' == $group_by_option) @@ -377,7 +377,7 @@ class ttReportHelper { if ($bean->getAttribute('chstart')) $sort_part .= ', unformatted_start'; $sort_part .= ', id'; - + $sql .= $sort_part; // By now we are ready with sql. @@ -455,9 +455,9 @@ class ttReportHelper { $custom_fields = new CustomFields($user->team_id); $cf_1_type = $custom_fields->fields[0]['type']; if ($cf_1_type == CustomFields::TYPE_TEXT) { - array_push($fields, 'cfl.value as cf_1'); - } else if ($cf_1_type == CustomFields::TYPE_DROPDOWN) { - array_push($fields, 'cfo.value as cf_1'); + array_push($fields, 'cfl.value as cf_1'); + } elseif ($cf_1_type == CustomFields::TYPE_DROPDOWN) { + array_push($fields, 'cfo.value as cf_1'); } } // Add start time. @@ -502,7 +502,7 @@ class ttReportHelper { if ($include_cf_1) { if ($cf_1_type == CustomFields::TYPE_TEXT) $left_joins .= " left join tt_custom_field_log cfl on (l.id = cfl.log_id and cfl.status = 1)"; - else if ($cf_1_type == CustomFields::TYPE_DROPDOWN) { + elseif ($cf_1_type == CustomFields::TYPE_DROPDOWN) { $left_joins .= " left join tt_custom_field_log cfl on (l.id = cfl.log_id and cfl.status = 1)". " left join tt_custom_field_options cfo on (cfl.option_id = cfo.id)"; } @@ -670,7 +670,7 @@ class ttReportHelper { $custom_fields = new CustomFields($user->team_id); if ($custom_fields->fields[0]['type'] == CustomFields::TYPE_TEXT) $group_join = 'left join tt_custom_field_log cfl on (l.id = cfl.log_id and cfl.status = 1) left join tt_custom_field_options cfo on (cfl.value = cfo.id) '; - else if ($custom_fields->fields[0]['type'] == CustomFields::TYPE_DROPDOWN) + elseif ($custom_fields->fields[0]['type'] == CustomFields::TYPE_DROPDOWN) $group_join = 'left join tt_custom_field_log cfl on (l.id = cfl.log_id and cfl.status = 1) left join tt_custom_field_options cfo on (cfl.option_id = cfo.id) '; break; } @@ -799,7 +799,7 @@ class ttReportHelper { $custom_fields = new CustomFields($user->team_id); if ($custom_fields->fields[0]['type'] == CustomFields::TYPE_TEXT) $group_join = 'left join tt_custom_field_log cfl on (l.id = cfl.log_id and cfl.status = 1) left join tt_custom_field_options cfo on (cfl.value = cfo.id) '; - else if ($custom_fields->fields[0]['type'] == CustomFields::TYPE_DROPDOWN) + elseif ($custom_fields->fields[0]['type'] == CustomFields::TYPE_DROPDOWN) $group_join = 'left join tt_custom_field_log cfl on (l.id = cfl.log_id and cfl.status = 1) left join tt_custom_field_options cfo on (cfl.option_id = cfo.id) '; break; } diff --git a/WEB-INF/lib/ttTeamHelper.class.php b/WEB-INF/lib/ttTeamHelper.class.php index 024ce0ba..d037f863 100644 --- a/WEB-INF/lib/ttTeamHelper.class.php +++ b/WEB-INF/lib/ttTeamHelper.class.php @@ -629,7 +629,7 @@ class ttTeamHelper { if ($date_format !== null) { $date_format_f = ', date_format'; $date_format_v = ', ' . $mdb2->quote($date_format); - } else if (defined('DATE_FORMAT_DEFAULT')) { + } elseif (defined('DATE_FORMAT_DEFAULT')) { $date_format_f = ', date_format'; $date_format_v = ', ' . $mdb2->quote(DATE_FORMAT_DEFAULT); } else { @@ -641,7 +641,7 @@ class ttTeamHelper { if ($time_format !== null) { $time_format_f = ', time_format'; $time_format_v = ', ' . $mdb2->quote($time_format); - } else if (defined('TIME_FORMAT_DEFAULT')) { + } elseif (defined('TIME_FORMAT_DEFAULT')) { $time_format_f = ', time_format'; $time_format_v = ', ' . $mdb2->quote(TIME_FORMAT_DEFAULT); } else { @@ -653,7 +653,7 @@ class ttTeamHelper { if ($week_start !== null) { $week_start_f = ', week_start'; $week_start_v = ', ' . (int)$week_start; - } else if (defined('WEEK_START_DEFAULT')) { + } elseif (defined('WEEK_START_DEFAULT')) { $week_start_f = ', week_start'; $week_start_v = ', ' . (int)WEEK_START_DEFAULT; } else { diff --git a/WEB-INF/lib/ttTimeHelper.class.php b/WEB-INF/lib/ttTimeHelper.class.php index e1b2470f..83f7968e 100644 --- a/WEB-INF/lib/ttTimeHelper.class.php +++ b/WEB-INF/lib/ttTimeHelper.class.php @@ -167,9 +167,9 @@ class ttTimeHelper { $time_a = explode(':', $value); if ($time_a[0] > 12) $res = (string)((int)$time_a[0] - 12).':'.$time_a[1].' PM'; - else if ($time_a[0] == 12) + elseif ($time_a[0] == 12) $res = $value.' PM'; - else if ($time_a[0] == 0) + elseif ($time_a[0] == 0) $res = '12:'.$time_a[1].' AM'; else $res = $value.' AM'; diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php index ad179eaa..959649e3 100644 --- a/WEB-INF/lib/ttUser.class.php +++ b/WEB-INF/lib/ttUser.class.php @@ -107,13 +107,13 @@ class ttUser { // Set user rights. if ($this->role == ROLE_USER) { $this->rights = right_data_entry|right_view_charts|right_view_reports; - } else if ($this->role == ROLE_CLIENT) { + } elseif ($this->role == ROLE_CLIENT) { $this->rights = right_view_reports|right_view_invoices; // TODO: how about right_view_charts, too? - } else if ($this->role == ROLE_COMANAGER) { + } elseif ($this->role == ROLE_COMANAGER) { $this->rights = right_data_entry|right_view_charts|right_view_reports|right_view_invoices|right_manage_team; - } else if ($this->role == ROLE_MANAGER) { + } 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; - } else if ($this->role == ROLE_SITE_ADMIN) { + } elseif ($this->role == ROLE_SITE_ADMIN) { $this->rights = right_administer_site; } } diff --git a/WEB-INF/lib/ttUserHelper.class.php b/WEB-INF/lib/ttUserHelper.class.php index 48c4b19d..cf6beaf1 100644 --- a/WEB-INF/lib/ttUserHelper.class.php +++ b/WEB-INF/lib/ttUserHelper.class.php @@ -273,7 +273,7 @@ class ttUserHelper { if (is_a($affected, 'PEAR_Error')) return false; - } else if ($user->isCoManager()) { + } elseif ($user->isCoManager()) { // Mark user binds as deleted. $sql = "update tt_user_project_binds set status = NULL where user_id = $user_id"; $affected = $mdb2->exec($sql); @@ -286,7 +286,7 @@ class ttUserHelper { if (is_a($affected, 'PEAR_Error')) return false; - } else if ($user->isManager()) { + } elseif ($user->isManager()) { $user_count = ttTeamHelper::getUserCount($user->team_id); // Marking deleted a manager with active users is not allowed. diff --git a/WEB-INF/templates/cf_custom_fields.tpl b/WEB-INF/templates/cf_custom_fields.tpl index 94be51f8..9b9266b4 100644 --- a/WEB-INF/templates/cf_custom_fields.tpl +++ b/WEB-INF/templates/cf_custom_fields.tpl @@ -18,7 +18,7 @@ {if CustomFields::TYPE_TEXT == $field['type']} {$i18n.label.type_text} - {else if CustomFields::TYPE_DROPDOWN == $field['type']} + {elseif CustomFields::TYPE_DROPDOWN == $field['type']} {$i18n.label.type_dropdown} {$i18n.label.configure} {/if} diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl index 800e48d6..90125da1 100644 --- a/WEB-INF/templates/footer.tpl +++ b/WEB-INF/templates/footer.tpl @@ -12,7 +12,7 @@
-
 Anuko Time Tracker 1.9.20.3444 | Copyright © Anuko | +  Anuko Time Tracker 1.9.20.3445 | Copyright © Anuko | {$i18n.footer.credits} | {$i18n.footer.license} | {$i18n.footer.improve} diff --git a/charts.php b/charts.php index f6391102..08834508 100644 --- a/charts.php +++ b/charts.php @@ -73,7 +73,7 @@ if (MODE_TIME == $user->tracking_mode) { if ($cl_type == CHART_CLIENTS) { if (!in_array('cl', explode(',', $user->plugins))) $cl_type = CHART_PROJECTS; - } else if ($cl_type == CHART_TASKS) { + } elseif ($cl_type == CHART_TASKS) { if (MODE_PROJECTS_AND_TASKS != $user->tracking_mode) $cl_type = CHART_PROJECTS; } diff --git a/expenses.php b/expenses.php index 52fa81da..307c9c01 100644 --- a/expenses.php +++ b/expenses.php @@ -174,8 +174,7 @@ if ($request->isPost()) { } else $err->add($i18n->getKey('error.db')); } - } - else if ($request->getParameter('onBehalfUser')) { + } elseif ($request->getParameter('onBehalfUser')) { if($user->canManageTeam()) { unset($_SESSION['behalf_id']); unset($_SESSION['behalf_name']); diff --git a/index.php b/index.php index 610794e0..51e1e016 100644 --- a/index.php +++ b/index.php @@ -33,8 +33,7 @@ if ($auth->isAuthenticated()) { if ($user->isAdmin()) { header('Location: admin_teams.php'); exit(); - } - else if ($user->isClient()) { + } elseif ($user->isClient()) { header('Location: reports.php'); exit(); } diff --git a/invoice_delete.php b/invoice_delete.php index 0d473595..7db539a5 100644 --- a/invoice_delete.php +++ b/invoice_delete.php @@ -59,7 +59,7 @@ if ($request->isPost()) { $err->add($i18n->getKey('error.db')); } else $err->add($i18n->getKey('error.db')); - } else if ($request->getParameter('btn_cancel')) { + } elseif ($request->getParameter('btn_cancel')) { header('Location: invoices.php'); exit(); } diff --git a/invoice_view.php b/invoice_view.php index 79efdd9b..a40d9b67 100644 --- a/invoice_view.php +++ b/invoice_view.php @@ -74,7 +74,7 @@ if ('.' != $user->decimal_mark) { $colspan = 4; if (MODE_PROJECTS == $user->tracking_mode) $colspan++; -else if (MODE_PROJECTS_AND_TASKS == $user->tracking_mode) +elseif (MODE_PROJECTS_AND_TASKS == $user->tracking_mode) $colspan += 2; $smarty->assign('invoice_id', $invoice_id); diff --git a/login.php b/login.php index 7f55853a..d578ae94 100644 --- a/login.php +++ b/login.php @@ -65,11 +65,9 @@ if ($request->isPost()) { // Redirect, depending on user role. if ($user->isAdmin()) { header('Location: admin_teams.php'); - } - else if ($user->isClient()) { + } elseif ($user->isClient()) { header('Location: reports.php'); - } - else { + } else { header('Location: time.php'); } exit(); diff --git a/mobile/index.php b/mobile/index.php index a2836654..1c7cf231 100644 --- a/mobile/index.php +++ b/mobile/index.php @@ -33,8 +33,7 @@ if ($auth->isAuthenticated()) { if ($user->isAdmin()) { header('Location: ../admin_teams.php'); exit(); - } - else if ($user->isClient()) { + } elseif ($user->isClient()) { header('Location: ../reports.php'); exit(); } diff --git a/mobile/login.php b/mobile/login.php index 91a5241e..a0747deb 100644 --- a/mobile/login.php +++ b/mobile/login.php @@ -69,16 +69,12 @@ if ($request->isPost()) { // Redirect, depending on user role. if ($user->isAdmin()) { header('Location: ../admin_teams.php'); - exit(); - } - else if ($user->isClient()) { + } elseif ($user->isClient()) { header('Location: ../reports.php'); - exit(); - } - else { + } else { header('Location: time.php'); - exit(); } + exit(); } else $err->add($i18n->getKey('error.auth')); } diff --git a/mobile/time.php b/mobile/time.php index 4eca3dee..268bf9ba 100644 --- a/mobile/time.php +++ b/mobile/time.php @@ -174,7 +174,7 @@ if ($custom_fields && $custom_fields->fields[0]) { // Only one custom field is supported at this time. if ($custom_fields->fields[0]['type'] == CustomFields::TYPE_TEXT) { $form->addInput(array('type'=>'text','name'=>'cf_1','value'=>$cl_cf_1)); - } else if ($custom_fields->fields[0]['type'] == CustomFields::TYPE_DROPDOWN) { + } elseif ($custom_fields->fields[0]['type'] == CustomFields::TYPE_DROPDOWN) { $form->addInput(array('type'=>'combobox','name'=>'cf_1', 'style'=>'width: 250px;', 'value'=>$cl_cf_1, @@ -210,7 +210,7 @@ if ($request->isPost()) { if (!$cl_duration) { if ('0' == $cl_duration) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.duration')); - else if ($cl_start || $cl_finish) { + elseif ($cl_start || $cl_finish) { if (!ttTimeHelper::isValidTime($cl_start)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.start')); if ($cl_finish) { @@ -275,7 +275,7 @@ if ($request->isPost()) { if ($id && $custom_fields && $cl_cf_1) { if ($custom_fields->fields[0]['type'] == CustomFields::TYPE_TEXT) $result = $custom_fields->insert($id, $custom_fields->fields[0]['id'], null, $cl_cf_1); - else if ($custom_fields->fields[0]['type'] == CustomFields::TYPE_DROPDOWN) + elseif ($custom_fields->fields[0]['type'] == CustomFields::TYPE_DROPDOWN) $result = $custom_fields->insert($id, $custom_fields->fields[0]['id'], $cl_cf_1, null); } diff --git a/mobile/time_edit.php b/mobile/time_edit.php index 8b172e84..dbba54af 100644 --- a/mobile/time_edit.php +++ b/mobile/time_edit.php @@ -88,7 +88,7 @@ if ($request->isPost()) { $fields = $custom_fields->get($time_rec['id']); if ($custom_fields->fields[0]['type'] == CustomFields::TYPE_TEXT) $cl_cf_1 = $fields[0]['value']; - else if ($custom_fields->fields[0]['type'] == CustomFields::TYPE_DROPDOWN) + elseif ($custom_fields->fields[0]['type'] == CustomFields::TYPE_DROPDOWN) $cl_cf_1 = $fields[0]['option_id']; } @@ -190,7 +190,7 @@ if ($custom_fields && $custom_fields->fields[0]) { // Only one custom field is supported at this time. if ($custom_fields->fields[0]['type'] == CustomFields::TYPE_TEXT) { $form->addInput(array('type'=>'text','name'=>'cf_1','value'=>$cl_cf_1)); - } else if ($custom_fields->fields[0]['type'] == CustomFields::TYPE_DROPDOWN) { + } elseif ($custom_fields->fields[0]['type'] == CustomFields::TYPE_DROPDOWN) { $form->addInput(array('type'=>'combobox', 'name'=>'cf_1', 'style'=>'width: 250px;', @@ -224,7 +224,7 @@ if ($request->isPost()) { if (!$cl_duration) { if ('0' == $cl_duration) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.duration')); - else if ($cl_start || $cl_finish) { + elseif ($cl_start || $cl_finish) { if (!ttTimeHelper::isValidTime($cl_start)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.start')); if ($cl_finish) { @@ -318,7 +318,7 @@ if ($request->isPost()) { if ($res && $custom_fields) { if ($custom_fields->fields[0]['type'] == CustomFields::TYPE_TEXT) $res = $custom_fields->update($cl_id, $custom_fields->fields[0]['id'], null, $cl_cf_1); - else if ($custom_fields->fields[0]['type'] == CustomFields::TYPE_DROPDOWN) + elseif ($custom_fields->fields[0]['type'] == CustomFields::TYPE_DROPDOWN) $res = $custom_fields->update($cl_id, $custom_fields->fields[0]['id'], $cl_cf_1, null); } if ($res) diff --git a/mobile/timer.php b/mobile/timer.php index f2101575..7dfdc99f 100644 --- a/mobile/timer.php +++ b/mobile/timer.php @@ -169,7 +169,7 @@ if ($custom_fields && $custom_fields->fields[0]) { // Only one custom field is supported at this time. if ($custom_fields->fields[0]['type'] == CustomFields::TYPE_TEXT) { $form->addInput(array('type'=>'text','name'=>'cf_1','value'=>$cl_cf_1)); - } else if ($custom_fields->fields[0]['type'] == CustomFields::TYPE_DROPDOWN) { + } elseif ($custom_fields->fields[0]['type'] == CustomFields::TYPE_DROPDOWN) { $form->addInput(array('type'=>'combobox','name'=>'cf_1', 'style'=>'width: 250px;', 'value'=>$cl_cf_1, @@ -247,7 +247,7 @@ if ($request->isPost()) { if ($id && $custom_fields && $cl_cf_1) { if ($custom_fields->fields[0]['type'] == CustomFields::TYPE_TEXT) $result = $custom_fields->insert($id, $custom_fields->fields[0]['id'], null, $cl_cf_1); - else if ($custom_fields->fields[0]['type'] == CustomFields::TYPE_DROPDOWN) + elseif ($custom_fields->fields[0]['type'] == CustomFields::TYPE_DROPDOWN) $result = $custom_fields->insert($id, $custom_fields->fields[0]['id'], $cl_cf_1, null); } diff --git a/notification_delete.php b/notification_delete.php index a8a2e498..50c33952 100644 --- a/notification_delete.php +++ b/notification_delete.php @@ -55,7 +55,7 @@ if ($request->isPost()) { $err->add($i18n->getKey('error.db')); } else $err->add($i18n->getKey('error.db')); - } else if ($request->getParameter('btn_cancel')) { + } elseif ($request->getParameter('btn_cancel')) { header('Location: notifications.php'); exit(); } diff --git a/password_change.php b/password_change.php index 62cc962d..b6fd4dd9 100644 --- a/password_change.php +++ b/password_change.php @@ -84,11 +84,9 @@ if ($request->isPost()) { // Redirect, depending on user role. if ($user->isAdmin()) { header('Location: admin_teams.php'); - } - else if ($user->isClient()) { + } elseif ($user->isClient()) { header('Location: reports.php'); - } - else { + } else { header('Location: time.php'); } exit(); diff --git a/project_delete.php b/project_delete.php index ac918a97..b6f46559 100644 --- a/project_delete.php +++ b/project_delete.php @@ -55,7 +55,7 @@ if ($request->isPost()) { $err->add($i18n->getKey('error.db')); } else $err->add($i18n->getKey('error.db')); - } else if ($request->getParameter('btn_cancel')) { + } elseif ($request->getParameter('btn_cancel')) { header('Location: projects.php'); exit(); } diff --git a/reports.php b/reports.php index 90b12b2b..c8b34cc3 100644 --- a/reports.php +++ b/reports.php @@ -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) { diff --git a/task_delete.php b/task_delete.php index 1c089197..3fd83501 100644 --- a/task_delete.php +++ b/task_delete.php @@ -55,7 +55,7 @@ if ($request->isPost()) { $err->add($i18n->getKey('error.db')); } else $err->add($i18n->getKey('error.db')); - } else if ($request->getParameter('btn_cancel')) { + } elseif ($request->getParameter('btn_cancel')) { header('Location: tasks.php'); exit(); } diff --git a/time.php b/time.php index 08a79ebd..ebe6356c 100644 --- a/time.php +++ b/time.php @@ -195,7 +195,7 @@ if ($custom_fields && $custom_fields->fields[0]) { // Only one custom field is supported at this time. if ($custom_fields->fields[0]['type'] == CustomFields::TYPE_TEXT) { $form->addInput(array('type'=>'text','name'=>'cf_1','value'=>$cl_cf_1)); - } else if ($custom_fields->fields[0]['type'] == CustomFields::TYPE_DROPDOWN) { + } elseif ($custom_fields->fields[0]['type'] == CustomFields::TYPE_DROPDOWN) { $form->addInput(array('type'=>'combobox','name'=>'cf_1', 'style'=>'width: 250px;', 'value'=>$cl_cf_1, @@ -231,7 +231,7 @@ if ($request->isPost()) { if (!$cl_duration) { if ('0' == $cl_duration) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.duration')); - else if ($cl_start || $cl_finish) { + elseif ($cl_start || $cl_finish) { if (!ttTimeHelper::isValidTime($cl_start)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.start')); if ($cl_finish) { @@ -297,7 +297,7 @@ if ($request->isPost()) { if ($id && $custom_fields && $cl_cf_1) { if ($custom_fields->fields[0]['type'] == CustomFields::TYPE_TEXT) $result = $custom_fields->insert($id, $custom_fields->fields[0]['id'], null, $cl_cf_1); - else if ($custom_fields->fields[0]['type'] == CustomFields::TYPE_DROPDOWN) + elseif ($custom_fields->fields[0]['type'] == CustomFields::TYPE_DROPDOWN) $result = $custom_fields->insert($id, $custom_fields->fields[0]['id'], $cl_cf_1, null); } if ($id && $result) { @@ -306,8 +306,7 @@ if ($request->isPost()) { } $err->add($i18n->getKey('error.db')); } - } - else if ($request->getParameter('btn_stop')) { + } elseif ($request->getParameter('btn_stop')) { // Stop button pressed to finish an uncompleted record. $record_id = $request->getParameter('record_id'); $record = ttTimeHelper::getRecord($record_id, $user->getActiveUser()); @@ -337,7 +336,7 @@ if ($request->isPost()) { exit(); } } - else if ($request->getParameter('onBehalfUser')) { + elseif ($request->getParameter('onBehalfUser')) { if($user->canManageTeam()) { unset($_SESSION['behalf_id']); unset($_SESSION['behalf_name']); diff --git a/time_edit.php b/time_edit.php index b3756b44..5dad555c 100644 --- a/time_edit.php +++ b/time_edit.php @@ -88,7 +88,7 @@ if ($request->isPost()) { $fields = $custom_fields->get($time_rec['id']); if ($custom_fields->fields[0]['type'] == CustomFields::TYPE_TEXT) $cl_cf_1 = $fields[0]['value']; - else if ($custom_fields->fields[0]['type'] == CustomFields::TYPE_DROPDOWN) + elseif ($custom_fields->fields[0]['type'] == CustomFields::TYPE_DROPDOWN) $cl_cf_1 = $fields[0]['option_id']; } @@ -190,7 +190,7 @@ if ($custom_fields && $custom_fields->fields[0]) { // Only one custom field is supported at this time. if ($custom_fields->fields[0]['type'] == CustomFields::TYPE_TEXT) { $form->addInput(array('type'=>'text','name'=>'cf_1','value'=>$cl_cf_1)); - } else if ($custom_fields->fields[0]['type'] == CustomFields::TYPE_DROPDOWN) { + } elseif ($custom_fields->fields[0]['type'] == CustomFields::TYPE_DROPDOWN) { $form->addInput(array('type'=>'combobox', 'name'=>'cf_1', 'style'=>'width: 250px;', @@ -225,7 +225,7 @@ if ($request->isPost()) { if (!$cl_duration) { if ('0' == $cl_duration) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.duration')); - else if ($cl_start || $cl_finish) { + elseif ($cl_start || $cl_finish) { if (!ttTimeHelper::isValidTime($cl_start)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.start')); if ($cl_finish) { @@ -319,7 +319,7 @@ if ($request->isPost()) { if ($res && $custom_fields) { if ($custom_fields->fields[0]['type'] == CustomFields::TYPE_TEXT) $res = $custom_fields->update($cl_id, $custom_fields->fields[0]['id'], null, $cl_cf_1); - else if ($custom_fields->fields[0]['type'] == CustomFields::TYPE_DROPDOWN) + elseif ($custom_fields->fields[0]['type'] == CustomFields::TYPE_DROPDOWN) $res = $custom_fields->update($cl_id, $custom_fields->fields[0]['id'], $cl_cf_1, null); } if ($res) @@ -378,7 +378,7 @@ if ($request->isPost()) { if ($id && $custom_fields && $cl_cf_1) { if ($custom_fields->fields[0]['type'] == CustomFields::TYPE_TEXT) $res = $custom_fields->insert($id, $custom_fields->fields[0]['id'], null, $cl_cf_1); - else if ($custom_fields->fields[0]['type'] == CustomFields::TYPE_DROPDOWN) + elseif ($custom_fields->fields[0]['type'] == CustomFields::TYPE_DROPDOWN) $res = $custom_fields->insert($id, $custom_fields->fields[0]['id'], $cl_cf_1, null); } if ($id && $res) { -- 2.20.1