X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=inline;f=WEB-INF%2Flib%2FttReportHelper.class.php;h=56a4aa805ad379edadbf3e22fd6cbbc6e9a4b288;hb=9caad65374f4a83042c7df04d463448affa3443b;hp=f5f4cc8c5da4141ab9b41a09251d76fe912d8e36;hpb=6cae57e56590e859655bde42058a8bddac7b594e;p=timetracker.git diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php index f5f4cc8c..56a4aa80 100644 --- a/WEB-INF/lib/ttReportHelper.class.php +++ b/WEB-INF/lib/ttReportHelper.class.php @@ -286,7 +286,7 @@ class ttReportHelper { $left_joins .= " left join tt_clients c on (c.id = l.client_id)"; if (($user->canManageTeam() || $user->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 ($user->canManageTeam() || $user->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,7 +311,7 @@ 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'); @@ -492,7 +492,7 @@ class ttReportHelper { $left_joins .= " left join tt_clients c on (c.id = l.client_id)"; if (($user->canManageTeam() || $user->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 ($user->canManageTeam() || $user->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,7 +517,7 @@ 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'); @@ -697,7 +697,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 +825,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; @@ -912,7 +912,7 @@ class ttReportHelper { $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. @@ -982,7 +982,7 @@ class ttReportHelper { $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. @@ -1027,21 +1027,19 @@ class ttReportHelper { // 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()); + } } // prepareReportBody - prepares an email body for report. @@ -1055,9 +1053,9 @@ class ttReportHelper { 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. @@ -1071,21 +1069,21 @@ class ttReportHelper { $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']); @@ -1093,7 +1091,7 @@ class ttReportHelper { $key = 'label.'.$group_by; $group_by_header = $i18n->getKey($key); } - + $body .= ''.$group_by_header.' | '; @@ -1117,27 +1115,27 @@ class ttReportHelper { } $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 .= ' | '.htmlspecialchars($user->currency).' '; $body .= ($user->canManageTeam() || $user->isClient()) ? $totals['cost'] : $totals['expenses']; - $body .= ' | '; + $body .= ''; } $body .= '
'.$i18n->getKey('label.invoice').' | '; $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 .= ($user->canManageTeam() || $user->isClient()) ? $subtotals[$prev_grouped_by]['cost'] : $subtotals[$prev_grouped_by]['expenses']; + $body .= ' | '; } if ($bean->getAttribute('chinvoice')) $body .= ''; $body .= ''; @@ -1209,7 +1207,7 @@ class ttReportHelper { } $first_pass = false; } - + // Print a regular row. if ($cur_date != $prev_date) $row_style = ($row_style == $rowItem) ? $rowItemAlt : $rowItem; @@ -1238,13 +1236,13 @@ class ttReportHelper { if ($bean->getAttribute('chinvoice')) $body .= ' | '.htmlspecialchars($record['invoice']).' | '; $body .= ''; - + $prev_date = $record['date']; if ($print_subtotals) $prev_grouped_by = $record['grouped_by']; } } - + // Print a terminating subtotal. if ($print_subtotals) { $body .= '
'; $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 .= ($user->canManageTeam() || $user->isClient()) ? $totals['cost'] : $totals['expenses']; + $body .= ' | '; } if ($bean->getAttribute('chinvoice')) $body .= ''; $body .= ' |
'.$i18n->getKey('form.mail.footer').'
'; @@ -1301,21 +1299,21 @@ class ttReportHelper { return $body; } - -// prepareFavReportBody - prepares an email body for a favorite report. + + // 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; + + $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. @@ -1329,12 +1327,12 @@ class ttReportHelper { $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'].'
'; @@ -1343,7 +1341,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']); @@ -1351,7 +1349,7 @@ class ttReportHelper { $key = 'label.'.$group_by; $group_by_header = $i18n->getKey($key); } - + $body .= ''.$group_by_header.' | '; @@ -1375,27 +1373,27 @@ class ttReportHelper { } $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 .= ' | '.htmlspecialchars($user->currency).' '; $body .= ($user->canManageTeam() || $user->isClient()) ? $totals['cost'] : $totals['expenses']; - $body .= ' | '; + $body .= ''; } $body .= '
'.$i18n->getKey('label.invoice').' | '; $body .= ''; $body .= ''; - $body .= ' | |||
'.htmlspecialchars($record['invoice']).' | '; $body .= ''; - + $prev_date = $record['date']; if ($print_subtotals) $prev_grouped_by = $record['grouped_by']; } } - + // Print a terminating subtotal. if ($print_subtotals) { $body .= '||||
'; $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 .= ($user->canManageTeam() || $user->isClient()) ? $totals['cost'] : $totals['expenses']; + $body .= ' | '; } if ($report['show_invoice']) $body .= ''; $body .= ' |
'.$i18n->getKey('form.mail.footer').'
'; @@ -1559,27 +1557,27 @@ class ttReportHelper { return $body; } - + // sendFavReport - sends a favorite report to a specified email, called from cron.php static function sendFavReport($report, $email) { // 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. 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); $mailer->setReceiver($email); - $mailer->setSendType(MAIL_MODE); + $mailer->setMailMode(MAIL_MODE); if (!$mailer->send($report['name'], $body)) return false; - + return true; } }