X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=WEB-INF%2Flib%2FttReportHelper.class.php;h=1f797ace4580068bd21bbaede3dd291f12c64650;hb=09a0f5eb840d00b4dca766ed24c42f50546c0e39;hp=2fdaea4f1665910eb58f889f15fea7f1238ce5d5;hpb=8e1e5862042f445b3fc7dbe9aed8fcef14af4239;p=timetracker.git diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php index 2fdaea4f..1f797ace 100644 --- a/WEB-INF/lib/ttReportHelper.class.php +++ b/WEB-INF/lib/ttReportHelper.class.php @@ -53,14 +53,16 @@ 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'; + if ($bean->getAttribute('paid_status')=='1') $dropdown_parts .= ' and l.paid = 1'; + if ($bean->getAttribute('paid_status')=='2') $dropdown_parts .= ' and l.paid = 0'; // Prepare user list part. $userlist = -1; - if (($user->canManageTeam() || $user->isClient()) && is_array($bean->getAttribute('users'))) + if (($user->can('view_reports') || $user->isClient()) && is_array($bean->getAttribute('users'))) $userlist = join(',', $bean->getAttribute('users')); // Prepare sql query part for user list. $user_list_part = null; - if ($user->canManageTeam() || $user->isClient()) + if ($user->can('view_reports') || $user->isClient()) $user_list_part = " and l.user_id in ($userlist)"; else $user_list_part = " and l.user_id = ".$user->id; @@ -74,7 +76,7 @@ class ttReportHelper { new DateAndTime($user->date_format, $bean->getAttribute('start_date')), new DateAndTime($user->date_format, $bean->getAttribute('end_date'))); } - $where = " where l.status = 1 and l.date >= '".$period->getBeginDate(DB_DATEFORMAT)."' and l.date <= '".$period->getEndDate(DB_DATEFORMAT)."'". + $where = " where l.status = 1 and l.date >= '".$period->getStartDate(DB_DATEFORMAT)."' and l.date <= '".$period->getEndDate(DB_DATEFORMAT)."'". " $user_list_part $dropdown_parts"; return $where; } @@ -96,10 +98,12 @@ 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'; + if ($report['paid_status']=='1') $dropdown_parts .= ' and l.paid = 1'; + if ($report['paid_status']=='2') $dropdown_parts .= ' and l.paid = 0'; // Prepare user list part. $userlist = -1; - if (($user->canManageTeam() || $user->isClient())) { + if (($user->can('view_reports') || $user->isClient())) { if ($report['users']) $userlist = $report['users']; else { @@ -111,7 +115,7 @@ class ttReportHelper { } // Prepare sql query part for user list. $user_list_part = null; - if ($user->canManageTeam() || $user->isClient()) + if ($user->can('view_reports') || $user->isClient()) $user_list_part = " and l.user_id in ($userlist)"; else $user_list_part = " and l.user_id = ".$user->id; @@ -125,7 +129,7 @@ class ttReportHelper { new DateAndTime($user->date_format, $report['period_start']), new DateAndTime($user->date_format, $report['period_end'])); } - $where = " where l.status = 1 and l.date >= '".$period->getBeginDate(DB_DATEFORMAT)."' and l.date <= '".$period->getEndDate(DB_DATEFORMAT)."'". + $where = " where l.status = 1 and l.date >= '".$period->getStartDate(DB_DATEFORMAT)."' and l.date <= '".$period->getEndDate(DB_DATEFORMAT)."'". " $user_list_part $dropdown_parts"; return $where; } @@ -143,14 +147,16 @@ class ttReportHelper { 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'; + if ($bean->getAttribute('paid_status')=='1') $dropdown_parts .= ' and ei.paid = 1'; + if ($bean->getAttribute('paid_status')=='2') $dropdown_parts .= ' and ei.paid = 0'; // Prepare user list part. $userlist = -1; - if (($user->canManageTeam() || $user->isClient()) && is_array($bean->getAttribute('users'))) + if (($user->can('view_reports') || $user->isClient()) && is_array($bean->getAttribute('users'))) $userlist = join(',', $bean->getAttribute('users')); // Prepare sql query part for user list. $user_list_part = null; - if ($user->canManageTeam() || $user->isClient()) + if ($user->can('view_reports') || $user->isClient()) $user_list_part = " and ei.user_id in ($userlist)"; else $user_list_part = " and ei.user_id = ".$user->id; @@ -164,7 +170,7 @@ class ttReportHelper { new DateAndTime($user->date_format, $bean->getAttribute('start_date')), new DateAndTime($user->date_format, $bean->getAttribute('end_date'))); } - $where = " where ei.status = 1 and ei.date >= '".$period->getBeginDate(DB_DATEFORMAT)."' and ei.date <= '".$period->getEndDate(DB_DATEFORMAT)."'". + $where = " where ei.status = 1 and ei.date >= '".$period->getStartDate(DB_DATEFORMAT)."' and ei.date <= '".$period->getEndDate(DB_DATEFORMAT)."'". " $user_list_part $dropdown_parts"; return $where; } @@ -182,10 +188,12 @@ class ttReportHelper { 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'; + if ($report['paid_status']=='1') $dropdown_parts .= ' and ei.paid = 1'; + if ($report['paid_status']=='2') $dropdown_parts .= ' and ei.paid = 0'; // Prepare user list part. $userlist = -1; - if (($user->canManageTeam() || $user->isClient())) { + if (($user->can('view_reports') || $user->isClient())) { if ($report['users']) $userlist = $report['users']; else { @@ -197,7 +205,7 @@ class ttReportHelper { } // Prepare sql query part for user list. $user_list_part = null; - if ($user->canManageTeam() || $user->isClient()) + if ($user->can('view_reports') || $user->isClient()) $user_list_part = " and ei.user_id in ($userlist)"; else $user_list_part = " and ei.user_id = ".$user->id; @@ -211,7 +219,7 @@ class ttReportHelper { new DateAndTime($user->date_format, $report['period_start']), new DateAndTime($user->date_format, $report['period_end'])); } - $where = " where ei.status = 1 and ei.date >= '".$period->getBeginDate(DB_DATEFORMAT)."' and ei.date <= '".$period->getEndDate(DB_DATEFORMAT)."'". + $where = " where ei.status = 1 and ei.date >= '".$period->getStartDate(DB_DATEFORMAT)."' and ei.date <= '".$period->getEndDate(DB_DATEFORMAT)."'". " $user_list_part $dropdown_parts"; return $where; } @@ -223,6 +231,10 @@ class ttReportHelper { global $user; $mdb2 = getConnection(); + // Determine these once as they are used in multiple places in this function. + $canViewReports = $user->can('view_reports'); + $isClient = $user->isClient(); + $group_by_option = $bean->getAttribute('group_by'); $convertTo12Hour = ('%I:%M %p' == $user->time_format) && ($bean->getAttribute('chstart') || $bean->getAttribute('chfinish')); @@ -231,7 +243,7 @@ class ttReportHelper { array_push($fields, 'l.id as id'); array_push($fields, '1 as type'); // Type 1 is for tt_log entries. array_push($fields, 'l.date as date'); - if($user->canManageTeam() || $user->isClient()) + if($canViewReports || $isClient) array_push($fields, 'u.name as user'); // Add client name if it is selected. if ($bean->getAttribute('chclient') || 'client' == $group_by_option) @@ -276,17 +288,28 @@ class ttReportHelper { array_push($fields, "cast(l.billable * coalesce(upb.rate, 0) * time_to_sec(l.duration)/3600 as decimal(10,2)) as cost"); // Use project rate for user. array_push($fields, "null as expense"); } + // Add paid status. + if ($canViewReports && $bean->getAttribute('chpaid')) + array_push($fields, 'l.paid as paid'); + // Add IP address. + if ($canViewReports && $bean->getAttribute('chip')) { + array_push($fields, 'l.created as created'); + array_push($fields, 'l.created_ip as created_ip'); + array_push($fields, 'l.modified as modified'); + array_push($fields, 'l.modified_ip as modified_ip'); + } + // Add invoice name if it is selected. - if (($user->canManageTeam() || $user->isClient()) && $bean->getAttribute('chinvoice')) + if (($canViewReports || $isClient) && $bean->getAttribute('chinvoice')) array_push($fields, 'i.name as invoice'); // Prepare sql query part for left joins. $left_joins = null; if ($bean->getAttribute('chclient') || 'client' == $group_by_option) $left_joins .= " left join tt_clients c on (c.id = l.client_id)"; - if (($user->canManageTeam() || $user->isClient()) && $bean->getAttribute('chinvoice')) + if (($canViewReports || $isClient) && $bean->getAttribute('chinvoice')) $left_joins .= " left join tt_invoices i on (i.id = l.invoice_id and i.status = 1)"; - if ($user->canManageTeam() || $user->isClient() || in_array('ex', explode(',', $user->plugins))) + if ($canViewReports || $isClient || $user->isPluginEnabled('ex')) $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)"; @@ -311,13 +334,13 @@ class ttReportHelper { // 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 + if ($bean->getAttribute('chcost') && $user->isPluginEnabled('ex')) { // 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. array_push($fields, 'ei.date'); - if($user->canManageTeam() || $user->isClient()) + if($canViewReports || $isClient) array_push($fields, 'u.name as user'); // Add client name if it is selected. if ($bean->getAttribute('chclient') || 'client' == $group_by_option) @@ -342,19 +365,30 @@ class ttReportHelper { array_push($fields, 'ei.name as note'); array_push($fields, 'ei.cost as cost'); array_push($fields, 'ei.cost as expense'); + // Add paid status. + if ($canViewReports && $bean->getAttribute('chpaid')) + array_push($fields, 'ei.paid as paid'); + // Add IP address. + if ($canViewReports && $bean->getAttribute('chip')) { + array_push($fields, 'ei.created as created'); + array_push($fields, 'ei.created_ip as created_ip'); + array_push($fields, 'ei.modified as modified'); + array_push($fields, 'ei.modified_ip as modified_ip'); + } + // Add invoice name if it is selected. - if (($user->canManageTeam() || $user->isClient()) && $bean->getAttribute('chinvoice')) + if (($canViewReports || $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()) + if ($canViewReports || $isClient) $left_joins .= " left join tt_users u on (u.id = ei.user_id)"; 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)"; - if (($user->canManageTeam() || $user->isClient()) && $bean->getAttribute('chinvoice')) + if (($canViewReports || $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); @@ -372,7 +406,7 @@ class ttReportHelper { $sort_part .= 'date'; else $sort_part .= $group_by_option.', date'; - if (($user->canManageTeam() || $user->isClient()) && is_array($bean->getAttribute('users')) && 'user' != $group_by_option) + if (($canViewReports || $isClient) && is_array($bean->getAttribute('users')) && 'user' != $group_by_option) $sort_part .= ', user, type'; if ($bean->getAttribute('chstart')) $sort_part .= ', unformatted_start'; @@ -422,6 +456,39 @@ class ttReportHelper { return $report_items; } + // putInSession stores tt_log and tt_expense_items ids from a report in user session + // as 2 comma-separated lists. + static function putInSession($report_items) { + unset($_SESSION['report_item_ids']); + unset($_SESSION['report_item_expense_ids']); + + // Iterate through records and build 2 comma-separated lists. + foreach($report_items as $item) { + if ($item['type'] == 1) + $report_item_ids .= ','.$item['id']; + else if ($item['type'] == 2) + $report_item_expense_ids .= ','.$item['id']; + } + $report_item_ids = trim($report_item_ids, ','); + $report_item_expense_ids = trim($report_item_expense_ids, ','); + + // The lists are reqdy. Put them in session. + if ($report_item_ids) $_SESSION['report_item_ids'] = $report_item_ids; + if ($report_item_expense_ids) $_SESSION['report_item_expense_ids'] = $report_item_expense_ids; + } + + // getFromSession obtains tt_log and tt_expense_items ids stored in user session. + static function getFromSession() { + $items = array(); + $report_item_ids = $_SESSION['report_item_ids']; + if ($report_item_ids) + $items['report_item_ids'] = explode(',', $report_item_ids); + $report_item_expense_ids = $_SESSION['report_item_expense_ids']; + if ($report_item_expense_ids) + $items['report_item_expense_ids'] = explode(',', $report_item_expense_ids); + return $items; + } + // getFavItems retrieves all items associated with a favorite 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. @@ -429,6 +496,10 @@ class ttReportHelper { global $user; $mdb2 = getConnection(); + // Determine these once as they are used in multiple places in this function. + $canViewReports = $user->can('view_reports'); + $isClient = $user->isClient(); + $group_by_option = $report['group_by']; $convertTo12Hour = ('%I:%M %p' == $user->time_format) && ($report['show_start'] || $report['show_end']); @@ -437,7 +508,7 @@ class ttReportHelper { array_push($fields, 'l.id as id'); array_push($fields, '1 as type'); // Type 1 is for tt_log entries. array_push($fields, 'l.date as date'); - if($user->canManageTeam() || $user->isClient()) + if($canViewReports || $isClient) array_push($fields, 'u.name as user'); // Add client name if it is selected. if ($report['show_client'] || 'client' == $group_by_option) @@ -482,17 +553,27 @@ class ttReportHelper { array_push($fields, "cast(l.billable * coalesce(upb.rate, 0) * time_to_sec(l.duration)/3600 as decimal(10,2)) as cost"); // Use project rate for user. array_push($fields, "null as expense"); } + // Add paid status. + if ($canViewReports && $report['show_paid']) + array_push($fields, 'l.paid as paid'); + // Add IP address. + if ($canViewReports && $report['show_ip']) { + array_push($fields, 'l.created as created'); + array_push($fields, 'l.created_ip as created_ip'); + array_push($fields, 'l.modified as modified'); + array_push($fields, 'l.modified_ip as modified_ip'); + } // Add invoice name if it is selected. - if (($user->canManageTeam() || $user->isClient()) && $report['show_invoice']) + if (($canViewReports || $isClient) && $report['show_invoice']) array_push($fields, 'i.name as invoice'); // Prepare sql query part for left joins. $left_joins = null; if ($report['show_client'] || 'client' == $group_by_option) $left_joins .= " left join tt_clients c on (c.id = l.client_id)"; - if (($user->canManageTeam() || $user->isClient()) && $report['show_invoice']) + if (($canViewReports || $isClient) && $report['show_invoice']) $left_joins .= " left join tt_invoices i on (i.id = l.invoice_id and i.status = 1)"; - if ($user->canManageTeam() || $user->isClient() || in_array('ex', explode(',', $user->plugins))) + if ($canViewReports || $isClient || $user->isPluginEnabled('ex')) $left_joins .= " left join tt_users u on (u.id = l.user_id)"; if ($report['show_project'] || 'project' == $group_by_option) $left_joins .= " left join tt_projects p on (p.id = l.project_id)"; @@ -517,13 +598,13 @@ class ttReportHelper { // 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 ($report['show_cost'] && in_array('ex', explode(',', $user->plugins))) { // if ex(penses) plugin is enabled + if ($report['show_cost'] && $user->isPluginEnabled('ex')) { // 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. array_push($fields, 'ei.date'); - if($user->canManageTeam() || $user->isClient()) + if($canViewReports || $isClient) array_push($fields, 'u.name as user'); // Add client name if it is selected. if ($report['show_client'] || 'client' == $group_by_option) @@ -548,19 +629,29 @@ class ttReportHelper { array_push($fields, 'ei.name as note'); array_push($fields, 'ei.cost as cost'); array_push($fields, 'ei.cost as expense'); + // Add paid status. + if ($canViewReports && $report['show_paid']) + array_push($fields, 'ei.paid as paid'); + // Add IP address. + if ($canViewReports && $report['show_ip']) { + array_push($fields, 'ei.created as created'); + array_push($fields, 'ei.created_ip as created_ip'); + array_push($fields, 'ei.modified as modified'); + array_push($fields, 'ei.modified_ip as modified_ip'); + } // Add invoice name if it is selected. - if (($user->canManageTeam() || $user->isClient()) && $report['show_invoice']) + if (($canViewReports || $isClient) && $report['show_invoice']) array_push($fields, 'i.name as invoice'); // Prepare sql query part for left joins. $left_joins = null; - if ($user->canManageTeam() || $user->isClient()) + if ($canViewReports || $isClient) $left_joins .= " left join tt_users u on (u.id = ei.user_id)"; if ($report['show_client'] || 'client' == $group_by_option) $left_joins .= " left join tt_clients c on (c.id = ei.client_id)"; if ($report['show_project'] || 'project' == $group_by_option) $left_joins .= " left join tt_projects p on (p.id = ei.project_id)"; - if (($user->canManageTeam() || $user->isClient()) && $report['show_invoice']) + if (($canViewReports || $isClient) && $report['show_invoice']) $left_joins .= " left join tt_invoices i on (i.id = ei.invoice_id and i.status = 1)"; $where = ttReportHelper::getFavExpenseWhere($report); @@ -578,7 +669,7 @@ class ttReportHelper { $sort_part .= 'date'; else $sort_part .= $group_by_option.', date'; - if (($user->canManageTeam() || $user->isClient()) /*&& is_array($bean->getAttribute('users'))*/ && 'user' != $group_by_option) + if (($canViewReports || $isClient) /*&& is_array($bean->getAttribute('users'))*/ && 'user' != $group_by_option) $sort_part .= ', user, type'; if ($report['show_start']) $sort_part .= ', unformatted_start'; @@ -697,7 +788,7 @@ class ttReportHelper { // By now we have sql for time items. // 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 + if ($bean->getAttribute('chcost') && $user->isPluginEnabled('ex')) { // if ex(penses) plugin is enabled // Determine group by field and a required join. $group_join = null; @@ -825,7 +916,7 @@ class ttReportHelper { // By now we have sql for time items. // However, when we have expenses, we need to do a union with a separate query for expense items from tt_expense_items table. - if ($report['show_cost'] && in_array('ex', explode(',', $user->plugins))) { // if ex(penses) plugin is enabled + if ($report['show_cost'] && $user->isPluginEnabled('ex')) { // if ex(penses) plugin is enabled // Determine group by field and a required join. $group_join = null; @@ -888,11 +979,11 @@ class ttReportHelper { static function getTotals($bean) { global $user; - + $mdb2 = getConnection(); - + $where = ttReportHelper::getWhere($bean); - + // Start with a query for time items. if ($bean->getAttribute('chcost')) { if (MODE_TIME == $user->tracking_mode) { @@ -906,38 +997,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 ($bean->getAttribute('chcost') && in_array('ex', explode(',', $user->plugins))) { + if ($bean->getAttribute('chcost') && $user->isPluginEnabled('ex')) { $where = ttReportHelper::getExpenseWhere($bean); $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 ($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)); else { @@ -947,24 +1036,24 @@ class ttReportHelper { new DateAndTime($user->date_format, $bean->getAttribute('end_date'))); } - $totals['start_date'] = $period->getBeginDate(); - $totals['end_date'] = $period->getEndDate(); - $totals['time'] = $total_time; - $totals['cost'] = $total_cost; - $totals['expenses'] = $total_expenses; + $totals['start_date'] = $period->getStartDate(); + $totals['end_date'] = $period->getEndDate(); + $totals['time'] = $total_time; + $totals['cost'] = $total_cost; + $totals['expenses'] = $total_expenses; return $totals; } - + // getFavTotals calculates total hours and cost for all favorite report items. 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) { @@ -978,38 +1067,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))) { + if ($report['show_cost'] && $user->isPluginEnabled('ex')) { $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,33 +1106,48 @@ class ttReportHelper { new DateAndTime($user->date_format, $report['period_end'])); } - $totals['start_date'] = $period->getBeginDate(); - $totals['end_date'] = $period->getEndDate(); - $totals['time'] = $total_time; - $totals['cost'] = $total_cost; - $totals['expenses'] = $total_expenses; + $totals['start_date'] = $period->getStartDate(); + $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) { - $mdb2 = getConnection(); - if ($time_log_ids) { + $mdb2 = getConnection(); + if ($time_log_ids) { $sql = "update tt_log set invoice_id = ".$mdb2->quote($invoice_id). " where id in(".join(', ', $time_log_ids).")"; $affected = $mdb2->exec($sql); - if (is_a($affected, 'PEAR_Error')) - die($affected->getMessage()); - } + if (is_a($affected, 'PEAR_Error')) die($affected->getMessage()); + } if ($expense_item_ids) { $sql = "update tt_expense_items set invoice_id = ".$mdb2->quote($invoice_id). " where id in(".join(', ', $expense_item_ids).")"; $affected = $mdb2->exec($sql); - if (is_a($affected, 'PEAR_Error')) - die($affected->getMessage()); - } + if (is_a($affected, 'PEAR_Error')) die($affected->getMessage()); + } + } + + // The markPaid marks a set of records as either paid or unpaid. + static function markPaid($time_log_ids, $expense_item_ids, $paid = true) + { + $mdb2 = getConnection(); + $paid_val = (int) $paid; + if ($time_log_ids) { + $sql = "update tt_log set paid = $paid_val where id in(".join(', ', $time_log_ids).")"; + $affected = $mdb2->exec($sql); + if (is_a($affected, 'PEAR_Error')) die($affected->getMessage()); + } + if ($expense_item_ids) { + $sql = "update tt_expense_items set paid = $paid_val where id in(".join(', ', $expense_item_ids).")"; + $affected = $mdb2->exec($sql); + if (is_a($affected, 'PEAR_Error')) die($affected->getMessage()); + } } // prepareReportBody - prepares an email body for report. @@ -1054,42 +1156,46 @@ class ttReportHelper { global $user; global $i18n; + // Determine these once as they are used in multiple places in this function. + $canViewReports = $user->can('view_reports'); + $isClient = $user->isClient(); + $items = ttReportHelper::getItems($bean); $group_by = $bean->getAttribute('group_by'); if ($group_by && 'no_grouping' != $group_by) $subtotals = ttReportHelper::getSubtotals($bean); $totals = ttReportHelper::getTotals($bean); - + // Use custom fields plugin if it is enabled. - if (in_array('cf', explode(',', $user->plugins))) + if ($user->isPluginEnabled('cf')) $custom_fields = new CustomFields($user->team_id); // Define some styles to use in email. $style_title = 'text-align: center; font-size: 15pt; font-family: Arial, Helvetica, sans-serif;'; $tableHeader = 'font-weight: bold; background-color: #a6ccf7; text-align: left;'; $tableHeaderCentered = 'font-weight: bold; background-color: #a6ccf7; text-align: center;'; - $rowItem = 'background-color: #ccccce;'; + $rowItem = 'background-color: #ffffff;'; $rowItemAlt = 'background-color: #f5f5f5;'; $rowSubtotal = 'background-color: #e0e0e0;'; $cellLeftAligned = 'text-align: left; vertical-align: top;'; $cellRightAligned = 'text-align: right; vertical-align: top;'; $cellLeftAlignedSubtotal = 'font-weight: bold; text-align: left; vertical-align: top;'; $cellRightAlignedSubtotal = 'font-weight: bold; text-align: right; vertical-align: top;'; - + // Start creating email body. $body = ''; $body .= '
'; $body .= ''; - + // Output title. $body .= ''.$i18n->getKey('form.mail.report_subject').': '.$totals['start_date'].' - '.$totals['end_date'].'
'; - + // Output comment. if ($comment) $body .= ''.htmlspecialchars($comment).'
'; if ($bean->getAttribute('chtotalsonly')) { // Totals only report. Output subtotals. - + // Determine group_by header. if ('cf_1' == $group_by) $group_by_header = htmlspecialchars($custom_fields->fields[0]['label']); @@ -1097,7 +1203,7 @@ class ttReportHelper { $key = 'label.'.$group_by; $group_by_header = $i18n->getKey($key); } - + $body .= ''.$group_by_header.' | '; @@ -1116,37 +1222,37 @@ class ttReportHelper { } if ($bean->getAttribute('chcost')) { $body .= ''; - $body .= ($user->canManageTeam() || $user->isClient()) ? $subtotal['cost'] : $subtotal['expenses']; + $body .= ($canViewReports || $isClient) ? $subtotal['cost'] : $subtotal['expenses']; $body .= ' | '; } $body .= '|||
'.$i18n->getKey('label.total').' | '; if ($bean->getAttribute('chduration')) { - $body .= ''; - if ($totals['time'] <> '0:00') $body .= $totals['time']; - $body .= ' | '; + $body .= ''; + if ($totals['time'] <> '0:00') $body .= $totals['time']; + $body .= ' | '; } if ($bean->getAttribute('chcost')) { - $body .= ''.htmlspecialchars($user->currency).' '; - $body .= ($user->canManageTeam() || $user->isClient()) ? $totals['cost'] : $totals['expenses']; - $body .= ' | '; + $body .= ''.htmlspecialchars($user->currency).' '; + $body .= ($canViewReports || $isClient) ? $totals['cost'] : $totals['expenses']; + $body .= ' | '; } $body .= '
'.$i18n->getKey('label.date').' | '; - if ($user->canManageTeam() || $user->isClient()) + if ($canViewReports || $isClient) $body .= ''.$i18n->getKey('label.user').' | '; if ($bean->getAttribute('chclient')) $body .= ''.$i18n->getKey('label.client').' | '; @@ -1166,10 +1272,14 @@ class ttReportHelper { $body .= ''.$i18n->getKey('label.note').' | '; if ($bean->getAttribute('chcost')) $body .= ''.$i18n->getKey('label.cost').' | '; + if ($bean->getAttribute('chpaid')) + $body .= ''.$i18n->getKey('label.paid').' | '; + if ($bean->getAttribute('chip')) + $body .= ''.$i18n->getKey('label.ip').' | '; if ($bean->getAttribute('chinvoice')) $body .= ''.$i18n->getKey('label.invoice').' | '; $body .= '|||||
'.$i18n->getKey('label.subtotal').' | '; $subtotal_name = htmlspecialchars($subtotals[$prev_grouped_by]['name']); - if ($user->canManageTeam() || $user->isClient()) $body .= ''.($group_by == 'user' ? $subtotal_name : '').' | '; + if ($canViewReports || $isClient) $body .= ''.($group_by == 'user' ? $subtotal_name : '').' | '; if ($bean->getAttribute('chclient')) $body .= ''.($group_by == 'client' ? $subtotal_name : '').' | '; if ($bean->getAttribute('chproject')) $body .= ''.($group_by == 'project' ? $subtotal_name : '').' | '; if ($bean->getAttribute('chtask')) $body .= ''.($group_by == 'task' ? $subtotal_name : '').' | '; @@ -1203,23 +1313,25 @@ class ttReportHelper { if ($bean->getAttribute('chduration')) $body .= ''.$subtotals[$prev_grouped_by]['time'].' | '; if ($bean->getAttribute('chnote')) $body .= ''; if ($bean->getAttribute('chcost')) { - $body .= ' | '; - $body .= ($user->canManageTeam() || $user->isClient()) ? $subtotals[$prev_grouped_by]['cost'] : $subtotals[$prev_grouped_by]['expenses']; - $body .= ' | '; + $body .= ''; + $body .= ($canViewReports || $isClient) ? $subtotals[$prev_grouped_by]['cost'] : $subtotals[$prev_grouped_by]['expenses']; + $body .= ' | '; } + if ($bean->getAttribute('chpaid')) $body .= ''; + if ($bean->getAttribute('chip')) $body .= ' | '; if ($bean->getAttribute('chinvoice')) $body .= ' | '; $body .= ' |
'.$record['date'].' | '; - if ($user->canManageTeam() || $user->isClient()) + if ($canViewReports || $isClient) $body .= ''.htmlspecialchars($record['user']).' | '; if ($bean->getAttribute('chclient')) $body .= ''.htmlspecialchars($record['client']).' | '; @@ -1239,22 +1351,32 @@ class ttReportHelper { $body .= ''.htmlspecialchars($record['note']).' | '; if ($bean->getAttribute('chcost')) $body .= ''.$record['cost'].' | '; + if ($bean->getAttribute('chpaid')) { + $body .= ''; + $body .= $record['paid'] == 1 ? $i18n->getKey('label.yes') : $i18n->getKey('label.no'); + $body .= ' | '; + } + if ($bean->getAttribute('chip')) { + $body .= ''; + $body .= $record['modified'] ? $record['modified_ip'].' '.$record['modified'] : $record['created_ip'].' '.$record['created']; + $body .= ' | '; + } if ($bean->getAttribute('chinvoice')) $body .= ''.htmlspecialchars($record['invoice']).' | '; $body .= '|||||
'.$i18n->getKey('label.subtotal').' | '; $subtotal_name = htmlspecialchars($subtotals[$cur_grouped_by]['name']); - if ($user->canManageTeam() || $user->isClient()) $body .= ''.($group_by == 'user' ? $subtotal_name : '').' | '; + if ($canViewReports || $isClient) $body .= ''.($group_by == 'user' ? $subtotal_name : '').' | '; if ($bean->getAttribute('chclient')) $body .= ''.($group_by == 'client' ? $subtotal_name : '').' | '; if ($bean->getAttribute('chproject')) $body .= ''.($group_by == 'project' ? $subtotal_name : '').' | '; if ($bean->getAttribute('chtask')) $body .= ''.($group_by == 'task' ? $subtotal_name : '').' | '; @@ -1265,18 +1387,20 @@ class ttReportHelper { if ($bean->getAttribute('chnote')) $body .= ''; if ($bean->getAttribute('chcost')) { $body .= ' | '; - $body .= ($user->canManageTeam() || $user->isClient()) ? $subtotals[$cur_grouped_by]['cost'] : $subtotals[$cur_grouped_by]['expenses']; + $body .= ($canViewReports || $isClient) ? $subtotals[$cur_grouped_by]['cost'] : $subtotals[$cur_grouped_by]['expenses']; $body .= ' | '; } + if ($bean->getAttribute('chpaid')) $body .= ''; + if ($bean->getAttribute('chip')) $body .= ' | '; if ($bean->getAttribute('chinvoice')) $body .= ' | '; $body .= ' | ||
'.$i18n->getKey('label.total').' | '; - if ($user->canManageTeam() || $user->isClient()) $body .= ''; + if ($canViewReports || $isClient) $body .= ' | '; if ($bean->getAttribute('chclient')) $body .= ' | '; if ($bean->getAttribute('chproject')) $body .= ' | '; if ($bean->getAttribute('chtask')) $body .= ' | '; @@ -1286,16 +1410,18 @@ class ttReportHelper { if ($bean->getAttribute('chduration')) $body .= ' | '.$totals['time'].' | '; if ($bean->getAttribute('chnote')) $body .= ''; if ($bean->getAttribute('chcost')) { - $body .= ' | '.htmlspecialchars($user->currency).' '; - $body .= ($user->canManageTeam() || $user->isClient()) ? $totals['cost'] : $totals['expenses']; - $body .= ' | '; + $body .= ''.htmlspecialchars($user->currency).' '; + $body .= ($canViewReports || $isClient) ? $totals['cost'] : $totals['expenses']; + $body .= ' | '; } + if ($bean->getAttribute('chpaid')) $body .= ''; + if ($bean->getAttribute('chip')) $body .= ' | '; if ($bean->getAttribute('chinvoice')) $body .= ' | '; $body .= ' |
'.$i18n->getKey('form.mail.footer').'
'; @@ -1305,40 +1431,58 @@ class ttReportHelper { return $body; } - -// prepareFavReportBody - prepares an email body for a favorite report. + + // checkFavReportCondition - checks whether it is okay to send fav report. + static function checkFavReportCondition($report, $condition) + { + $items = ttReportHelper::getFavItems($report); + + $condition = str_replace('count', '', $condition); + $count_required = (int) trim(str_replace('>', '', $condition)); + + if (count($items) > $count_required) + return true; // Condition ok. + + return false; + } + + // prepareFavReportBody - prepares an email body for a favorite report. static function prepareFavReportBody($report) { - global $user; - global $i18n; - - $items = ttReportHelper::getFavItems($report); + global $user; + global $i18n; + + // Determine these once as they are used in multiple places in this function. + $canViewReports = $user->can('view_reports'); + $isClient = $user->isClient(); + + $items = ttReportHelper::getFavItems($report); $group_by = $report['group_by']; - if ($group_by && 'no_grouping' != $group_by) - $subtotals = ttReportHelper::getFavSubtotals($report); - $totals = ttReportHelper::getFavTotals($report); - + if ($group_by && 'no_grouping' != $group_by) + $subtotals = ttReportHelper::getFavSubtotals($report); + $totals = ttReportHelper::getFavTotals($report); + // Use custom fields plugin if it is enabled. - if (in_array('cf', explode(',', $user->plugins))) + if ($user->isPluginEnabled('cf')) $custom_fields = new CustomFields($user->team_id); // Define some styles to use in email. $style_title = 'text-align: center; font-size: 15pt; font-family: Arial, Helvetica, sans-serif;'; $tableHeader = 'font-weight: bold; background-color: #a6ccf7; text-align: left;'; $tableHeaderCentered = 'font-weight: bold; background-color: #a6ccf7; text-align: center;'; - $rowItem = 'background-color: #ccccce;'; + $rowItem = 'background-color: #ffffff;'; $rowItemAlt = 'background-color: #f5f5f5;'; $rowSubtotal = 'background-color: #e0e0e0;'; $cellLeftAligned = 'text-align: left; vertical-align: top;'; $cellRightAligned = 'text-align: right; vertical-align: top;'; $cellLeftAlignedSubtotal = 'font-weight: bold; text-align: left; vertical-align: top;'; $cellRightAlignedSubtotal = 'font-weight: bold; text-align: right; vertical-align: top;'; - + // Start creating email body. $body = ''; $body .= ''; $body .= ''; - + // Output title. $body .= ''.$i18n->getKey('form.mail.report_subject').': '.$totals['start_date'].' - '.$totals['end_date'].'
'; @@ -1347,7 +1491,7 @@ class ttReportHelper { if ($report['show_totals_only']) { // Totals only report. Output subtotals. - + // Determine group_by header. if ('cf_1' == $group_by) $group_by_header = htmlspecialchars($custom_fields->fields[0]['label']); @@ -1355,7 +1499,7 @@ class ttReportHelper { $key = 'label.'.$group_by; $group_by_header = $i18n->getKey($key); } - + $body .= ''.$group_by_header.' | '; @@ -1374,37 +1518,37 @@ class ttReportHelper { } if ($report['show_cost']) { $body .= ''; - $body .= ($user->canManageTeam() || $user->isClient()) ? $subtotal['cost'] : $subtotal['expenses']; + $body .= ($canViewReports || $isClient) ? $subtotal['cost'] : $subtotal['expenses']; $body .= ' | '; } $body .= '|||
'.$i18n->getKey('label.total').' | '; if ($report['show_duration']) { - $body .= ''; - if ($totals['time'] <> '0:00') $body .= $totals['time']; - $body .= ' | '; + $body .= ''; + if ($totals['time'] <> '0:00') $body .= $totals['time']; + $body .= ' | '; } if ($report['show_cost']) { - $body .= ''.htmlspecialchars($user->currency).' '; - $body .= ($user->canManageTeam() || $user->isClient()) ? $totals['cost'] : $totals['expenses']; - $body .= ' | '; + $body .= ''.htmlspecialchars($user->currency).' '; + $body .= ($canViewReports || $isClient) ? $totals['cost'] : $totals['expenses']; + $body .= ' | '; } $body .= '
'.$i18n->getKey('label.date').' | '; - if ($user->canManageTeam() || $user->isClient()) + if ($canViewReports || $isClient) $body .= ''.$i18n->getKey('label.user').' | '; if ($report['show_client']) $body .= ''.$i18n->getKey('label.client').' | '; @@ -1424,10 +1568,14 @@ class ttReportHelper { $body .= ''.$i18n->getKey('label.note').' | '; if ($report['show_cost']) $body .= ''.$i18n->getKey('label.cost').' | '; + if ($report['show_paid']) + $body .= ''.$i18n->getKey('label.paid').' | '; + if ($report['show_ip']) + $body .= ''.$i18n->getKey('label.ip').' | '; if ($report['show_invoice']) $body .= ''.$i18n->getKey('label.invoice').' | '; $body .= '|||||
'.$i18n->getKey('label.subtotal').' | '; $subtotal_name = htmlspecialchars($subtotals[$prev_grouped_by]['name']); - if ($user->canManageTeam() || $user->isClient()) $body .= ''.($group_by == 'user' ? $subtotal_name : '').' | '; + if ($canViewReports || $isClient) $body .= ''.($group_by == 'user' ? $subtotal_name : '').' | '; if ($report['show_client']) $body .= ''.($group_by == 'client' ? $subtotal_name : '').' | '; if ($report['show_project']) $body .= ''.($group_by == 'project' ? $subtotal_name : '').' | '; if ($report['show_task']) $body .= ''.($group_by == 'task' ? $subtotal_name : '').' | '; @@ -1462,22 +1610,24 @@ class ttReportHelper { if ($report['show_note']) $body .= ''; if ($report['show_cost']) { $body .= ' | '; - $body .= ($user->canManageTeam() || $user->isClient()) ? $subtotals[$prev_grouped_by]['cost'] : $subtotals[$prev_grouped_by]['expenses']; + $body .= ($canViewReports || $isClient) ? $subtotals[$prev_grouped_by]['cost'] : $subtotals[$prev_grouped_by]['expenses']; $body .= ' | '; } + if ($report['show_paid']) $body .= ''; + if ($report['show_ip']) $body .= ' | '; if ($report['show_invoice']) $body .= ' | '; $body .= ' | ||
'.$record['date'].' | '; - if ($user->canManageTeam() || $user->isClient()) + if ($canViewReports || $isClient) $body .= ''.htmlspecialchars($record['user']).' | '; if ($report['show_client']) $body .= ''.htmlspecialchars($record['client']).' | '; @@ -1497,22 +1647,32 @@ class ttReportHelper { $body .= ''.htmlspecialchars($record['note']).' | '; if ($report['show_cost']) $body .= ''.$record['cost'].' | '; + if ($report['show_paid']) { + $body .= ''; + $body .= $record['paid'] == 1 ? $i18n->getKey('label.yes') : $i18n->getKey('label.no'); + $body .= ' | '; + } + if ($report['show_ip']) { + $body .= ''; + $body .= $record['modified'] ? $record['modified_ip'].' '.$record['modified'] : $record['created_ip'].' '.$record['created']; + $body .= ' | '; + } if ($report['show_invoice']) $body .= ''.htmlspecialchars($record['invoice']).' | '; $body .= '|||||
'.$i18n->getKey('label.subtotal').' | '; $subtotal_name = htmlspecialchars($subtotals[$cur_grouped_by]['name']); - if ($user->canManageTeam() || $user->isClient()) $body .= ''.($group_by == 'user' ? $subtotal_name : '').' | '; + if ($canViewReports || $isClient) $body .= ''.($group_by == 'user' ? $subtotal_name : '').' | '; if ($report['show_client']) $body .= ''.($group_by == 'client' ? $subtotal_name : '').' | '; if ($report['show_project']) $body .= ''.($group_by == 'project' ? $subtotal_name : '').' | '; if ($report['show_task']) $body .= ''.($group_by == 'task' ? $subtotal_name : '').' | '; @@ -1523,18 +1683,20 @@ class ttReportHelper { if ($report['show_note']) $body .= ''; if ($report['show_cost']) { $body .= ' | '; - $body .= ($user->canManageTeam() || $user->isClient()) ? $subtotals[$cur_grouped_by]['cost'] : $subtotals[$cur_grouped_by]['expenses']; + $body .= ($canViewReports || $isClient) ? $subtotals[$cur_grouped_by]['cost'] : $subtotals[$cur_grouped_by]['expenses']; $body .= ' | '; } + if ($report['show_paid']) $body .= ''; + if ($report['show_ip']) $body .= ' | '; if ($report['show_invoice']) $body .= ' | '; $body .= ' | ||
'.$i18n->getKey('label.total').' | '; - if ($user->canManageTeam() || $user->isClient()) $body .= ''; + if ($canViewReports || $isClient) $body .= ' | '; if ($report['show_client']) $body .= ' | '; if ($report['show_project']) $body .= ' | '; if ($report['show_task']) $body .= ' | '; @@ -1544,16 +1706,18 @@ class ttReportHelper { if ($report['show_duration']) $body .= ' | '.$totals['time'].' | '; if ($report['show_note']) $body .= ''; if ($report['show_cost']) { - $body .= ' | '.htmlspecialchars($user->currency).' '; - $body .= ($user->canManageTeam() || $user->isClient()) ? $totals['cost'] : $totals['expenses']; - $body .= ' | '; + $body .= ''.htmlspecialchars($user->currency).' '; + $body .= ($canViewReports || $isClient) ? $totals['cost'] : $totals['expenses']; + $body .= ' | '; } + if ($report['show_paid']) $body .= ''; + if ($report['show_ip']) $body .= ' | '; if ($report['show_invoice']) $body .= ' | '; $body .= ' |
'.$i18n->getKey('form.mail.footer').'
'; @@ -1563,27 +1727,32 @@ class ttReportHelper { return $body; } - + // sendFavReport - sends a favorite report to a specified email, called from cron.php - static function sendFavReport($report, $email) { + static function sendFavReport($report, $subject, $email, $cc) { // We are called from cron.php, we have no $bean in session. - // cron.php set global $user and $i18n objects to match our favorite report user. + // cron.php sets global $user and $i18n objects to match our favorite report user. global $user; global $i18n; - + // Prepare report body. $body = ttReportHelper::prepareFavReportBody($report); - + import('mail.Mailer'); $mailer = new Mailer(); $mailer->setCharSet(CHARSET); $mailer->setContentType('text/html'); $mailer->setSender(SENDER); + if (!empty($cc)) + $mailer->setReceiverCC($cc); + if (!empty($user->bcc_email)) + $mailer->setReceiverBCC($user->bcc_email); $mailer->setReceiver($email); - $mailer->setSendType(MAIL_MODE); - if (!$mailer->send($report['name'], $body)) + $mailer->setMailMode(MAIL_MODE); + if (empty($subject)) $subject = $report['name']; + if (!$mailer->send($subject, $body)) return false; - + return true; } }