From: Nik Okuntseff Date: Sat, 2 Apr 2016 15:48:09 +0000 (+0000) Subject: Cleanup - whitespace. X-Git-Tag: timetracker_1.19-1~1743 X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=4c41dc3fad985fa9b71a81222b6402ebd5041c42;p=timetracker.git Cleanup - whitespace. --- diff --git a/WEB-INF/lib/ttExportHelper.class.php b/WEB-INF/lib/ttExportHelper.class.php index 634987a4..4a607fbf 100644 --- a/WEB-INF/lib/ttExportHelper.class.php +++ b/WEB-INF/lib/ttExportHelper.class.php @@ -32,7 +32,7 @@ import('ttTimeHelper'); // ttExportHelper - this class is used to export team data to a file. class ttExportHelper { var $fileName = null; // Name of the file with data. - + // The following arrays are maps between entity ids in the file versus the database. // We write to the file sequentially (1,2,3...) while in the database the entities have different ids. var $userMap = array(); // User ids. @@ -43,7 +43,7 @@ class ttExportHelper { var $customFieldMap = array(); // Custom field ids. var $customFieldOptionMap = array(); // Custop field option ids. var $logMap = array(); // Time log ids. - + // createDataFile creates a file with all data for a given team. function createDataFile($compress = false) { global $user; @@ -55,23 +55,23 @@ class ttExportHelper { // Open the file for writing. $file = fopen($tmp_file, 'wb'); if (!$file) return false; - + // Write XML to the file. fwrite($file, "\n"); fwrite($file, "\n"); - + // Write team info. fwrite($file, "currency."\" lock_spec=\"".$user->lock_spec."\" lock_interval=\"".$user->lock_interval."\" lang=\"".$user->lang."\" decimal_mark=\"".$user->decimal_mark."\" date_format=\"".$user->date_format."\" time_format=\"".$user->time_format."\" week_start=\"".$user->week_start. "\" plugins=\"".$user->plugins."\" tracking_mode=\"".$user->tracking_mode."\" record_type=\"".$user->record_type."\">\n"); fwrite($file, " team."]]>\n"); fwrite($file, "
address."]]>
\n"); fwrite($file, "\n"); - + // Prepare user map. $users = ttTeamHelper::getAllUsers($user->team_id, true); foreach ($users as $key=>$user_item) $this->userMap[$user_item['id']] = $key + 1; - + // Prepare project map. $projects = ttTeamHelper::getAllProjects($user->team_id, true); foreach ($projects as $key=>$project_item) @@ -81,27 +81,27 @@ class ttExportHelper { $tasks = ttTeamHelper::getAllTasks($user->team_id, true); foreach ($tasks as $key=>$task_item) $this->taskMap[$task_item['id']] = $key + 1; - + // Prepare client map. $clients = ttTeamHelper::getAllClients($user->team_id, true); foreach ($clients as $key=>$client_item) - $this->clientMap[$client_item['id']] = $key + 1; + $this->clientMap[$client_item['id']] = $key + 1; // Prepare invoice map. $invoices = ttTeamHelper::getAllInvoices(); foreach ($invoices as $key=>$invoice_item) - $this->invoiceMap[$invoice_item['id']] = $key + 1; + $this->invoiceMap[$invoice_item['id']] = $key + 1; // Prepare custom fields map. $custom_fields = ttTeamHelper::getAllCustomFields($user->team_id); foreach ($custom_fields as $key=>$custom_field) - $this->customFieldMap[$custom_field['id']] = $key + 1; + $this->customFieldMap[$custom_field['id']] = $key + 1; // Prepare custom field options map. $custom_field_options = ttTeamHelper::getAllCustomFieldOptions($user->team_id); foreach ($custom_field_options as $key=>$option) - $this->customFieldOptionMap[$option['id']] = $key + 1; - + $this->customFieldOptionMap[$option['id']] = $key + 1; + // Write users. fwrite($file, "\n"); foreach ($users as $user_item) { @@ -150,7 +150,7 @@ class ttExportHelper { } fwrite($file, "\n"); unset($user_binds); - + // Write clients. fwrite($file, "\n"); foreach ($clients as $client_item) { @@ -198,15 +198,15 @@ class ttExportHelper { } fwrite($file, "\n"); unset($custom_field_options); - + // Write time log entries. fwrite($file, "\n"); $key = 0; foreach ($users as $user_item) { $records = ttTimeHelper::getAllRecords($user_item['id']); foreach ($records as $record) { - $key++; - $this->logMap[$record['id']] = $key; + $key++; + $this->logMap[$record['id']] = $key; fwrite($file, " userMap[$record['user_id']]."\" date=\"".$record['date']."\" start=\"".$record['start']."\" finish=\"".$record['finish']."\" duration=\"".($record['start']?"":$record['duration'])."\" client_id=\"".$this->clientMap[$record['client_id']]."\" project_id=\"".$this->projectMap[$record['project_id']]."\" task_id=\"".$this->taskMap[$record['task_id']]."\" invoice_id=\"".$this->invoiceMap[$record['invoice_id']]."\" billable=\"".$record['billable']."\" status=\"".$record['status']."\">\n"); fwrite($file, " \n"); fwrite($file, " \n"); @@ -214,7 +214,7 @@ class ttExportHelper { } fwrite($file, "\n"); unset($records); - + // Write custom field log. $custom_field_log = ttTeamHelper::getCustomFieldLog($user->team_id); fwrite($file, "\n"); @@ -225,7 +225,7 @@ class ttExportHelper { } fwrite($file, "\n"); unset($custom_field_log); - + // Write expense items. $expense_items = ttTeamHelper::getExpenseItems($user->team_id); fwrite($file, "\n"); @@ -236,7 +236,7 @@ class ttExportHelper { } fwrite($file, "\n"); unset($expense_items); - + // Write fav reports. fwrite($file, "\n"); $fav_reports = ttTeamHelper::getFavReports($user->team_id); @@ -271,8 +271,6 @@ class ttExportHelper { " show_custom_field_1=\"".$fav_report['show_custom_field_1']."\"". " group_by=\"".$fav_report['group_by']."\"". " show_totals_only=\"".$fav_report['show_totals_only']."\">\n"); - //" sort_by=\"".$fav_report['sort_by']."\"". - //" show_empty_days=\"".$fav_report['show_empty_days']."\">\n"); fwrite($file, "\t\t\n"); fwrite($file, "\t\n"); } @@ -284,20 +282,20 @@ class ttExportHelper { $this->userMap = array(); $this->projectMap = array(); $this->taskMap = array(); - + fwrite($file, "\n"); fclose($file); - + if ($compress) { $this->fileName = tempnam($dirName, 'tt'); $this->compress($tmp_file, $this->fileName); unlink($tmp_file); } else $this->fileName = $tmp_file; - - return true; + + return true; } - + // getFileName - returns file name. function getFileName() { return $this->fileName; @@ -305,7 +303,7 @@ class ttExportHelper { // compress - compresses the content of the $in file into $out file. function compress($in, $out) { - // Initial checks of file names and permissions. + // Initial checks of file names and permissions. if (!file_exists($in) || !is_readable ($in)) return false; if ((!file_exists($out) && !is_writable(dirname($out))) || (file_exists($out) && !is_writable($out))) diff --git a/WEB-INF/lib/ttTeamHelper.class.php b/WEB-INF/lib/ttTeamHelper.class.php index 5b25174b..6633795c 100644 --- a/WEB-INF/lib/ttTeamHelper.class.php +++ b/WEB-INF/lib/ttTeamHelper.class.php @@ -31,11 +31,11 @@ import('DateAndTime'); // Class ttTeamHelper - contains helper functions that operate with teams. class ttTeamHelper { - + // The getUserCount function returns number of people in team. static function getUserCount($team_id) { - $mdb2 = getConnection(); - + $mdb2 = getConnection(); + $sql = "select count(id) as cnt from tt_users where team_id = $team_id and status = 1"; $res = $mdb2->query($sql); @@ -45,12 +45,12 @@ class ttTeamHelper { } return false; } - + // The getUsersForClient obtains all active and inactive users in a team that are relevant to a client. static function getUsersForClient() { global $user; $mdb2 = getConnection(); - + $sql = "select u.id, u.name from tt_user_project_binds upb inner join tt_client_project_binds cpb on (upb.project_id = cpb.project_id and cpb.client_id = $user->client_id) inner join tt_users u on (u.id = upb.user_id) @@ -65,13 +65,13 @@ class ttTeamHelper { $user_list[] = $val; } return $user_list; - } + } // The getActiveUsers obtains all active users in a given team. static function getActiveUsers($options = null) { - global $user; + global $user; $mdb2 = getConnection(); - + if (isset($options['getAllFields'])) $sql = "select * from tt_users where team_id = $user->team_id and status = 1 order by name"; else @@ -94,16 +94,15 @@ class ttTeamHelper { array_splice($user_list, $i+1, 1); // Remove duplicate. } } - } + } return $user_list; } - - + // The getUsers obtains all active and inactive (but not deleted) users in a given team. static function getUsers() { - global $user; + global $user; $mdb2 = getConnection(); - + $sql = "select id, name from tt_users where team_id = $user->team_id and (status = 1 or status = 0) order by name"; $res = $mdb2->query($sql); $user_list = array(); @@ -115,12 +114,11 @@ class ttTeamHelper { return $user_list; } - // The getInactiveUsers obtains all inactive users in a given team. static function getInactiveUsers($team_id, $all_fields = false) { $mdb2 = getConnection(); - + if ($all_fields) $sql = "select * from tt_users where team_id = $team_id and status = 0 order by name"; else @@ -135,11 +133,11 @@ class ttTeamHelper { } return false; } - + // The getAllUsers obtains all users in a given team. static function getAllUsers($team_id, $all_fields = false) { $mdb2 = getConnection(); - + if ($all_fields) $sql = "select * from tt_users where team_id = $team_id order by name"; else @@ -154,15 +152,15 @@ class ttTeamHelper { } return false; } - + // getActiveProjects - returns an array of active projects for team. static function getActiveProjects($team_id) { - $result = array(); + $result = array(); $mdb2 = getConnection(); $sql = "select id, name, description, tasks from tt_projects - where team_id = $team_id and status = 1 order by name"; + where team_id = $team_id and status = 1 order by name"; $res = $mdb2->query($sql); $result = array(); if (!is_a($res, 'PEAR_Error')) { @@ -172,15 +170,15 @@ class ttTeamHelper { } return $result; } - + // getInactiveProjects - returns an array of inactive projects for team. static function getInactiveProjects($team_id) { - $result = array(); + $result = array(); $mdb2 = getConnection(); - + $sql = "select id, name, description, tasks from tt_projects - where team_id = $team_id and status = 0 order by name"; + where team_id = $team_id and status = 0 order by name"; $res = $mdb2->query($sql); $result = array(); if (!is_a($res, 'PEAR_Error')) { @@ -190,11 +188,11 @@ class ttTeamHelper { } return $result; } - + // The getAllProjects obtains all projects in a given team. static function getAllProjects($team_id, $all_fields = false) { $mdb2 = getConnection(); - + if ($all_fields) $sql = "select * from tt_projects where team_id = $team_id order by status, name"; else @@ -213,10 +211,10 @@ class ttTeamHelper { // getActiveTasks - returns an array of active tasks for team. static function getActiveTasks($team_id) { - $result = array(); + $result = array(); $mdb2 = getConnection(); - $sql = "select id, name, description from tt_tasks where team_id = $team_id and status = 1 order by name"; + $sql = "select id, name, description from tt_tasks where team_id = $team_id and status = 1 order by name"; $res = $mdb2->query($sql); $result = array(); if (!is_a($res, 'PEAR_Error')) { @@ -226,15 +224,15 @@ class ttTeamHelper { } return $result; } - + // getInactiveTasks - returns an array of inactive tasks for team. static function getInactiveTasks($team_id) { - $result = array(); + $result = array(); $mdb2 = getConnection(); - + $sql = "select id, name, description from tt_tasks - where team_id = $team_id and status = 0 order by name"; + where team_id = $team_id and status = 0 order by name"; $res = $mdb2->query($sql); $result = array(); if (!is_a($res, 'PEAR_Error')) { @@ -244,11 +242,11 @@ class ttTeamHelper { } return $result; } - + // The getAllTasks obtains all tasks in a given team. static function getAllTasks($team_id, $all_fields = false) { $mdb2 = getConnection(); - + if ($all_fields) $sql = "select * from tt_tasks where team_id = $team_id order by status, name"; else @@ -263,55 +261,58 @@ class ttTeamHelper { } return false; } - + // The getActiveClients returns an array of active clients for team. static function getActiveClients($team_id, $all_fields = false) { $result = array(); - $mdb2 = getConnection(); - - if ($all_fields) + $mdb2 = getConnection(); + + if ($all_fields) $sql = "select * from tt_clients where team_id = $team_id and status = 1 order by name"; else $sql = "select id, name from tt_clients where team_id = $team_id and status = 1 order by name"; - $res = $mdb2->query($sql); - $result = array(); - if (!is_a($res, 'PEAR_Error')) { + + $res = $mdb2->query($sql); + $result = array(); + if (!is_a($res, 'PEAR_Error')) { while ($val = $res->fetchRow()) { - $result[] = $val; + $result[] = $val; } } return $result; } - + // The getInactiveClients returns an array of inactive clients for team. static function getInactiveClients($team_id, $all_fields = false) { $result = array(); - $mdb2 = getConnection(); - - if ($all_fields) + $mdb2 = getConnection(); + + if ($all_fields) $sql = "select * from tt_clients where team_id = $team_id and status = 0 order by name"; else $sql = "select id, name from tt_clients where team_id = $team_id and status = 0 order by name"; - $res = $mdb2->query($sql); + + $res = $mdb2->query($sql); $result = array(); - if (!is_a($res, 'PEAR_Error')) { + if (!is_a($res, 'PEAR_Error')) { while ($val = $res->fetchRow()) { $result[] = $val; } } return $result; } - + // The getAllClients obtains all clients in a given team. static function getAllClients($team_id, $all_fields = false) { $mdb2 = getConnection(); - + if ($all_fields) $sql = "select * from tt_clients where team_id = $team_id order by status, name"; else $sql = "select id, name from tt_clients where team_id = $team_id order by status, name"; + $res = $mdb2->query($sql); $result = array(); if (!is_a($res, 'PEAR_Error')) { @@ -326,79 +327,79 @@ class ttTeamHelper { // The getActiveInvoices returns an array of active invoices for team. static function getActiveInvoices($localizeDates = true) { - global $user; - + global $user; + $result = array(); - $mdb2 = getConnection(); - - if (ROLE_CLIENT == $user->role && $user->client_id) - $client_part = " and i.client_id = $user->client_id"; - - $sql = "select i.id, i.name, i.date, i.client_id, i.status, c.name as client_name from tt_invoices i - left join tt_clients c on (c.id = i.client_id) - where i.status = 1 and i.team_id = $user->team_id $client_part order by i.name"; + $mdb2 = getConnection(); + + if (ROLE_CLIENT == $user->role && $user->client_id) + $client_part = " and i.client_id = $user->client_id"; + + $sql = "select i.id, i.name, i.date, i.client_id, i.status, c.name as client_name from tt_invoices i + left join tt_clients c on (c.id = i.client_id) + where i.status = 1 and i.team_id = $user->team_id $client_part order by i.name"; $res = $mdb2->query($sql); $result = array(); if (!is_a($res, 'PEAR_Error')) { $dt = new DateAndTime(DB_DATEFORMAT); while ($val = $res->fetchRow()) { - if ($localizeDates) { - $dt->parseVal($val['date']); + if ($localizeDates) { + $dt->parseVal($val['date']); $val['date'] = $dt->toString($user->date_format); - } - $result[] = $val; + } + $result[] = $val; } } return $result; } - + // The getAllInvoices returns an array of all invoices for team. static function getAllInvoices() { - global $user; - + global $user; + $result = array(); - $mdb2 = getConnection(); - - $sql = "select * from tt_invoices where team_id = $user->team_id"; + $mdb2 = getConnection(); + + $sql = "select * from tt_invoices where team_id = $user->team_id"; $res = $mdb2->query($sql); $result = array(); if (!is_a($res, 'PEAR_Error')) { $dt = new DateAndTime(DB_DATEFORMAT); while ($val = $res->fetchRow()) { - $result[] = $val; + $result[] = $val; } } return $result; } - + // The getRecentInvoices returns an array of recent invoices (max 3) for a client. static function getRecentInvoices($team_id, $client_id) { - global $user; - + global $user; + $result = array(); - $mdb2 = getConnection(); - - $sql = "select i.id, i.name from tt_invoices i - left join tt_clients c on (c.id = i.client_id) - where i.team_id = $team_id and i.status = 1 and c.id = $client_id - order by i.id desc limit 3"; + $mdb2 = getConnection(); + + $sql = "select i.id, i.name from tt_invoices i + left join tt_clients c on (c.id = i.client_id) + where i.team_id = $team_id and i.status = 1 and c.id = $client_id + order by i.id desc limit 3"; $res = $mdb2->query($sql); $result = array(); if (!is_a($res, 'PEAR_Error')) { $dt = new DateAndTime(DB_DATEFORMAT); while ($val = $res->fetchRow()) { - $result[] = $val; + $result[] = $val; } } return $result; } - + // getUserToProjectBinds - obtains all user to project binds for a team. static function getUserToProjectBinds($team_id) { $mdb2 = getConnection(); - + $result = array(); $sql = "select * from tt_user_project_binds where user_id in (select id from tt_users where team_id = $team_id) order by user_id, status, project_id"; $res = $mdb2->query($sql); @@ -411,7 +412,7 @@ class ttTeamHelper { } return false; } - + // The getAllCustomFields obtains all custom fields in a given team. static function getAllCustomFields($team_id) { $mdb2 = getConnection(); @@ -445,7 +446,7 @@ class ttTeamHelper { } return false; } - + // The getCustomFieldLog obtains all custom field log entries for a given team. static function getCustomFieldLog($team_id) { $mdb2 = getConnection(); @@ -462,7 +463,7 @@ class ttTeamHelper { } return false; } - + // getFavReports - obtains all favorite reports for all users in team. static function getFavReports($team_id) { $mdb2 = getConnection(); @@ -479,7 +480,7 @@ class ttTeamHelper { } return false; } - + // getExpenseItems - obtains all expense items for all users in team. static function getExpenseItems($team_id) { $mdb2 = getConnection(); @@ -496,7 +497,7 @@ class ttTeamHelper { } return false; } - + // getNotifications - obtains notification descriptions for team. static function getNotifications($team_id) { $mdb2 = getConnection(); @@ -504,7 +505,7 @@ class ttTeamHelper { $result = array(); $sql = "select c.id, c.cron_spec, c.email, fr.name from tt_cron c left join tt_fav_reports fr on (fr.id = c.report_id) - where c.team_id = $team_id and c.status is not null"; + where c.team_id = $team_id and c.status is not null"; $res = $mdb2->query($sql); $result = array(); if (!is_a($res, 'PEAR_Error')) { @@ -520,7 +521,7 @@ class ttTeamHelper { static function getTeams() { $result = array(); $mdb2 = getConnection(); - + $sql = "select id, name, lang, timestamp from tt_teams where status = 1 order by id desc"; $res = $mdb2->query($sql); $result = array(); @@ -533,61 +534,55 @@ class ttTeamHelper { } return false; } - + // The markDeleted function marks the team and everything in it as deleted. static function markDeleted($team_id) { - - // Iterate through team users and mark them as deleted. - $users = ttTeamHelper::getAllUsers($team_id); - foreach ($users as $one_user) { - if (!ttUserHelper::markDeleted($one_user['id'])) - return false; - } - + + // Iterate through team users and mark them as deleted. + $users = ttTeamHelper::getAllUsers($team_id); + foreach ($users as $one_user) { + if (!ttUserHelper::markDeleted($one_user['id'])) return false; + } + // Mark tasks deleted. - if (!ttTeamHelper::markTasksDeleted($team_id)) - return false; - - $mdb2 = getConnection(); - - // Mark projects deleted. + if (!ttTeamHelper::markTasksDeleted($team_id)) return false; + + $mdb2 = getConnection(); + + // Mark projects deleted. $sql = "update tt_projects set status = NULL where team_id = $team_id"; $affected = $mdb2->exec($sql); - if (is_a($affected, 'PEAR_Error')) - return false; - - // Mark clients deleted. + if (is_a($affected, 'PEAR_Error')) return false; + + // Mark clients deleted. $sql = "update tt_clients set status = NULL where team_id = $team_id"; - $affected = $mdb2->exec($sql); - if (is_a($affected, 'PEAR_Error')) - return false; + $affected = $mdb2->exec($sql); + if (is_a($affected, 'PEAR_Error')) return false; - // Mark custom fields deleted. + // Mark custom fields deleted. $sql = "update tt_custom_fields set status = NULL where team_id = $team_id"; - $affected = $mdb2->exec($sql); - if (is_a($affected, 'PEAR_Error')) - return false; - - // Mark team deleted. - $sql = "update tt_teams set status = NULL where id = $team_id"; - $affected = $mdb2->exec($sql); - if (is_a($affected, 'PEAR_Error')) - return false; + $affected = $mdb2->exec($sql); + if (is_a($affected, 'PEAR_Error')) return false; - return true; + // Mark team deleted. + $sql = "update tt_teams set status = NULL where id = $team_id"; + $affected = $mdb2->exec($sql); + if (is_a($affected, 'PEAR_Error')) return false; + + return true; } // The getTeamDetails function returns team details. static function getTeamDetails($team_id) { $result = array(); $mdb2 = getConnection(); - + $role_manager = ROLE_MANAGER; $sql = "select t.name as team_name, u.id as manager_id, u.name as manager_name, u.login as manager_login, u.email as manager_email from tt_teams t inner join tt_users u on (u.team_id = t.id and u.role = $role_manager) - where t.id = $team_id"; - + where t.id = $team_id"; + $res = $mdb2->query($sql); if (!is_a($res, 'PEAR_Error')) { $val = $res->fetchRow(); @@ -596,12 +591,12 @@ class ttTeamHelper { return false; } - - // The insert function creates a new team. + + // The insert function creates a new team. static function insert($fields) { $mdb2 = getConnection(); - + $lock_spec = $fields['lock_spec']; if ($lock_spec !== null) { $lockspec_f = ', lock_spec'; @@ -618,7 +613,7 @@ class ttTeamHelper { $locktime_f = ''; $locktime_v = ''; } - + $lang = $fields['lang']; if (!$lang) { global $i18n; @@ -631,19 +626,19 @@ class ttTeamHelper { $decimal_mark_v = ', ' . $mdb2->quote($decimal_mark); } else { $decimal_mark_f = ''; - $decimal_mark_v = ''; + $decimal_mark_v = ''; } $date_format = $fields['date_format']; if ($date_format !== null) { $date_format_f = ', date_format'; - $date_format_v = ', ' . $mdb2->quote($date_format); + $date_format_v = ', ' . $mdb2->quote($date_format); } elseif (defined('DATE_FORMAT_DEFAULT')) { $date_format_f = ', date_format'; $date_format_v = ', ' . $mdb2->quote(DATE_FORMAT_DEFAULT); } else { $date_format_f = ''; - $date_format_v = ''; + $date_format_v = ''; } $time_format = $fields['time_format']; @@ -655,28 +650,28 @@ class ttTeamHelper { $time_format_v = ', ' . $mdb2->quote(TIME_FORMAT_DEFAULT); } else { $time_format_f = ''; - $time_format_v = ''; + $time_format_v = ''; } - + $week_start = $fields['week_start']; if ($week_start !== null) { $week_start_f = ', week_start'; $week_start_v = ', ' . (int)$week_start; } elseif (defined('WEEK_START_DEFAULT')) { $week_start_f = ', week_start'; - $week_start_v = ', ' . (int)WEEK_START_DEFAULT; + $week_start_v = ', ' . (int)WEEK_START_DEFAULT; } else { $week_start_f = ''; - $week_start_v = ''; + $week_start_v = ''; } - + $plugins = $fields['plugins']; if ($plugins !== null) { $plugins_f = ', plugins'; $plugins_v = ', ' . $mdb2->quote($plugins); } else { $plugins_f = ''; - $plugins_v = ''; + $plugins_v = ''; } $tracking_mode = $fields['tracking_mode']; @@ -685,21 +680,20 @@ class ttTeamHelper { $tracking_mode_v = ', ' . (int)$tracking_mode; } else { $tracking_mode_f = ''; - $tracking_mode_v = ''; + $tracking_mode_v = ''; } - + $record_type = $fields['record_type']; if ($record_type !== null) { $record_type_f = ', record_type'; $record_type_v = ', ' . (int)$record_type; } else { $record_type_f = ''; - $record_type_v = ''; + $record_type_v = ''; } - + $sql = "insert into tt_teams (name, address, currency $lockspec_f $locktime_f, lang $decimal_mark_f $date_format_f $time_format_f $week_start_f $plugins_f $tracking_mode_f $record_type_f) - values(". - $mdb2->quote(trim($fields['name'])). + values(".$mdb2->quote(trim($fields['name'])). ", ".$mdb2->quote(trim($fields['address'])). ", ".$mdb2->quote(trim($fields['currency']))." $lockspec_v $locktime_v, ".$mdb2->quote($lang). "$decimal_mark_v $date_format_v $time_format_v $week_start_v $plugins_v $tracking_mode_v $record_type_v)"; @@ -714,7 +708,7 @@ class ttTeamHelper { } // The update function updates team information. - static function update($team_id, $fields) + static function update($team_id, $fields) { // We'll require team name to be always set. if (!isset($fields['name'])) return false; @@ -733,7 +727,7 @@ class ttTeamHelper { $record_type_part = ''; $plugins_part = ''; $lock_spec_part = ''; - + if (isset($fields['address'])) $addr_part = ', address = '.$mdb2->quote($fields['address']); if (isset($fields['currency'])) $currency_part = ', currency = '.$mdb2->quote($fields['currency']); if (isset($fields['locktime'])) $locktime_part = ', locktime = '.intval($fields['locktime']); @@ -751,15 +745,12 @@ class ttTeamHelper { $date_format_part $time_format_part $week_start_part $tracking_mode_part $record_type_part $plugins_part $lock_spec_part where id = $team_id"; $affected = $mdb2->exec($sql); - - if (is_a($affected, 'PEAR_Error')) { - return false; - } - + if (is_a($affected, 'PEAR_Error')) return false; + return true; } - - // The getInactiveTeams is a maintenance function that returns an array of inactive team ids (max 100). + + // The getInactiveTeams is a maintenance function that returns an array of inactive team ids (max 25). static function getInactiveTeams() { $inactive_teams = array(); $mdb2 = getConnection(); @@ -772,19 +763,19 @@ class ttTeamHelper { $count = 0; if (!is_a($res, 'PEAR_Error')) { while ($val = $res->fetchRow()) { - $team_id = $val['id']; - if (ttTeamHelper::isTeamActive($team_id) == false) { - $count ++; - $inactive_teams[] = $team_id; - // Limit the array size for perfomance by allowing this operation on small chunks only. - if ($count >= 25) break; - } + $team_id = $val['id']; + if (ttTeamHelper::isTeamActive($team_id) == false) { + $count++; + $inactive_teams[] = $team_id; + // Limit the array size for perfomance by allowing this operation on small chunks only. + if ($count >= 25) break; + } } return $inactive_teams; } return false; } - + // The isTeamActive determines if a team is using Time Tracker or abandoned it. static function isTeamActive($team_id) { $users = array(); diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl index 8bd3924a..b9de17f4 100644 --- a/WEB-INF/templates/footer.tpl +++ b/WEB-INF/templates/footer.tpl @@ -12,7 +12,7 @@
-
 Anuko Time Tracker 1.9.22.3476 | Copyright © Anuko | +  Anuko Time Tracker 1.9.22.3477 | Copyright © Anuko | {$i18n.footer.credits} | {$i18n.footer.license} | {$i18n.footer.improve}