// 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;
// 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 {
}
// 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;
// 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;
// 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 {
}
// 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;
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'));
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)
array_push($fields, "null as expense");
}
// Add paid status.
- if ($user->canManageTeam() && $bean->getAttribute('chpaid'))
+ 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() || $user->isPluginEnabled('ex'))
+ 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)";
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)
array_push($fields, 'ei.cost as cost');
array_push($fields, 'ei.cost as expense');
// Add paid status.
- if ($user->canManageTeam() && $bean->getAttribute('chpaid'))
+ 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);
$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';
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']);
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)
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() || $user->isPluginEnabled('ex'))
+ 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)";
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)
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);
$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';
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)
$body .= '<body>';
// Output title.
- $body .= '<p style="'.$style_title.'">'.$i18n->getKey('form.mail.report_subject').': '.$totals['start_date'].' - '.$totals['end_date'].'</p>';
+ $body .= '<p style="'.$style_title.'">'.$i18n->get('form.mail.report_subject').': '.$totals['start_date'].' - '.$totals['end_date'].'</p>';
// Output comment.
if ($comment) $body .= '<p>'.htmlspecialchars($comment).'</p>';
$group_by_header = htmlspecialchars($custom_fields->fields[0]['label']);
else {
$key = 'label.'.$group_by;
- $group_by_header = $i18n->getKey($key);
+ $group_by_header = $i18n->get($key);
}
$body .= '<table border="0" cellpadding="4" cellspacing="0" width="100%">';
$body .= '<tr>';
$body .= '<td style="'.$tableHeader.'">'.$group_by_header.'</td>';
if ($bean->getAttribute('chduration'))
- $body .= '<td style="'.$tableHeaderCentered.'" width="5%">'.$i18n->getKey('label.duration').'</td>';
+ $body .= '<td style="'.$tableHeaderCentered.'" width="5%">'.$i18n->get('label.duration').'</td>';
if ($bean->getAttribute('chcost'))
- $body .= '<td style="'.$tableHeaderCentered.'" width="5%">'.$i18n->getKey('label.cost').'</td>';
+ $body .= '<td style="'.$tableHeaderCentered.'" width="5%">'.$i18n->get('label.cost').'</td>';
$body .= '</tr>';
foreach($subtotals as $subtotal) {
$body .= '<tr style="'.$rowSubtotal.'">';
}
if ($bean->getAttribute('chcost')) {
$body .= '<td style="'.$cellRightAlignedSubtotal.'">';
- $body .= ($user->canManageTeam() || $user->isClient()) ? $subtotal['cost'] : $subtotal['expenses'];
+ $body .= ($canViewReports || $isClient) ? $subtotal['cost'] : $subtotal['expenses'];
$body .= '</td>';
}
$body .= '</tr>';
// Print totals.
$body .= '<tr><td> </td></tr>';
$body .= '<tr style="'.$rowSubtotal.'">';
- $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.$i18n->getKey('label.total').'</td>';
+ $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.$i18n->get('label.total').'</td>';
if ($bean->getAttribute('chduration')) {
$body .= '<td style="'.$cellRightAlignedSubtotal.'">';
if ($totals['time'] <> '0:00') $body .= $totals['time'];
}
if ($bean->getAttribute('chcost')) {
$body .= '<td nowrap style="'.$cellRightAlignedSubtotal.'">'.htmlspecialchars($user->currency).' ';
- $body .= ($user->canManageTeam() || $user->isClient()) ? $totals['cost'] : $totals['expenses'];
+ $body .= ($canViewReports || $isClient) ? $totals['cost'] : $totals['expenses'];
$body .= '</td>';
}
$body .= '</tr>';
// Print table header.
$body .= '<table border="0" cellpadding="4" cellspacing="0" width="100%">';
$body .= '<tr>';
- $body .= '<td style="'.$tableHeader.'">'.$i18n->getKey('label.date').'</td>';
- if ($user->canManageTeam() || $user->isClient())
- $body .= '<td style="'.$tableHeader.'">'.$i18n->getKey('label.user').'</td>';
+ $body .= '<td style="'.$tableHeader.'">'.$i18n->get('label.date').'</td>';
+ if ($canViewReports || $isClient)
+ $body .= '<td style="'.$tableHeader.'">'.$i18n->get('label.user').'</td>';
if ($bean->getAttribute('chclient'))
- $body .= '<td style="'.$tableHeader.'">'.$i18n->getKey('label.client').'</td>';
+ $body .= '<td style="'.$tableHeader.'">'.$i18n->get('label.client').'</td>';
if ($bean->getAttribute('chproject'))
- $body .= '<td style="'.$tableHeader.'">'.$i18n->getKey('label.project').'</td>';
+ $body .= '<td style="'.$tableHeader.'">'.$i18n->get('label.project').'</td>';
if ($bean->getAttribute('chtask'))
- $body .= '<td style="'.$tableHeader.'">'.$i18n->getKey('label.task').'</td>';
+ $body .= '<td style="'.$tableHeader.'">'.$i18n->get('label.task').'</td>';
if ($bean->getAttribute('chcf_1'))
$body .= '<td style="'.$tableHeader.'">'.htmlspecialchars($custom_fields->fields[0]['label']).'</td>';
if ($bean->getAttribute('chstart'))
- $body .= '<td style="'.$tableHeaderCentered.'" width="5%">'.$i18n->getKey('label.start').'</td>';
+ $body .= '<td style="'.$tableHeaderCentered.'" width="5%">'.$i18n->get('label.start').'</td>';
if ($bean->getAttribute('chfinish'))
- $body .= '<td style="'.$tableHeaderCentered.'" width="5%">'.$i18n->getKey('label.finish').'</td>';
+ $body .= '<td style="'.$tableHeaderCentered.'" width="5%">'.$i18n->get('label.finish').'</td>';
if ($bean->getAttribute('chduration'))
- $body .= '<td style="'.$tableHeaderCentered.'" width="5%">'.$i18n->getKey('label.duration').'</td>';
+ $body .= '<td style="'.$tableHeaderCentered.'" width="5%">'.$i18n->get('label.duration').'</td>';
if ($bean->getAttribute('chnote'))
- $body .= '<td style="'.$tableHeader.'">'.$i18n->getKey('label.note').'</td>';
+ $body .= '<td style="'.$tableHeader.'">'.$i18n->get('label.note').'</td>';
if ($bean->getAttribute('chcost'))
- $body .= '<td style="'.$tableHeaderCentered.'" width="5%">'.$i18n->getKey('label.cost').'</td>';
+ $body .= '<td style="'.$tableHeaderCentered.'" width="5%">'.$i18n->get('label.cost').'</td>';
if ($bean->getAttribute('chpaid'))
- $body .= '<td style="'.$tableHeaderCentered.'" width="5%">'.$i18n->getKey('label.paid').'</td>';
+ $body .= '<td style="'.$tableHeaderCentered.'" width="5%">'.$i18n->get('label.paid').'</td>';
+ if ($bean->getAttribute('chip'))
+ $body .= '<td style="'.$tableHeaderCentered.'" width="5%">'.$i18n->get('label.ip').'</td>';
if ($bean->getAttribute('chinvoice'))
- $body .= '<td style="'.$tableHeader.'">'.$i18n->getKey('label.invoice').'</td>';
+ $body .= '<td style="'.$tableHeader.'">'.$i18n->get('label.invoice').'</td>';
$body .= '</tr>';
// Initialize variables to print subtotals.
$cur_grouped_by = $record['grouped_by'];
if ($cur_grouped_by != $prev_grouped_by && !$first_pass) {
$body .= '<tr style="'.$rowSubtotal.'">';
- $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.$i18n->getKey('label.subtotal').'</td>';
+ $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.$i18n->get('label.subtotal').'</td>';
$subtotal_name = htmlspecialchars($subtotals[$prev_grouped_by]['name']);
- if ($user->canManageTeam() || $user->isClient()) $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.($group_by == 'user' ? $subtotal_name : '').'</td>';
+ if ($canViewReports || $isClient) $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.($group_by == 'user' ? $subtotal_name : '').'</td>';
if ($bean->getAttribute('chclient')) $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.($group_by == 'client' ? $subtotal_name : '').'</td>';
if ($bean->getAttribute('chproject')) $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.($group_by == 'project' ? $subtotal_name : '').'</td>';
if ($bean->getAttribute('chtask')) $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.($group_by == 'task' ? $subtotal_name : '').'</td>';
if ($bean->getAttribute('chnote')) $body .= '<td></td>';
if ($bean->getAttribute('chcost')) {
$body .= '<td style="'.$cellRightAlignedSubtotal.'">';
- $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 .= '</td>';
}
if ($bean->getAttribute('chpaid')) $body .= '<td></td>';
+ if ($bean->getAttribute('chip')) $body .= '<td></td>';
if ($bean->getAttribute('chinvoice')) $body .= '<td></td>';
$body .= '</tr>';
$body .= '<tr><td> </td></tr>';
$row_style = ($row_style == $rowItem) ? $rowItemAlt : $rowItem;
$body .= '<tr style="'.$row_style.'">';
$body .= '<td style="'.$cellLeftAligned.'">'.$record['date'].'</td>';
- if ($user->canManageTeam() || $user->isClient())
+ if ($canViewReports || $isClient)
$body .= '<td style="'.$cellLeftAligned.'">'.htmlspecialchars($record['user']).'</td>';
if ($bean->getAttribute('chclient'))
$body .= '<td style="'.$cellLeftAligned.'">'.htmlspecialchars($record['client']).'</td>';
$body .= '<td style="'.$cellRightAligned.'">'.$record['cost'].'</td>';
if ($bean->getAttribute('chpaid')) {
$body .= '<td style="'.$cellRightAligned.'">';
- $body .= $record['paid'] == 1 ? $i18n->getKey('label.yes') : $i18n->getKey('label.no');
+ $body .= $record['paid'] == 1 ? $i18n->get('label.yes') : $i18n->get('label.no');
+ $body .= '</td>';
+ }
+ if ($bean->getAttribute('chip')) {
+ $body .= '<td style="'.$cellRightAligned.'">';
+ $body .= $record['modified'] ? $record['modified_ip'].' '.$record['modified'] : $record['created_ip'].' '.$record['created'];
$body .= '</td>';
}
if ($bean->getAttribute('chinvoice'))
// Print a terminating subtotal.
if ($print_subtotals) {
$body .= '<tr style="'.$rowSubtotal.'">';
- $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.$i18n->getKey('label.subtotal').'</td>';
+ $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.$i18n->get('label.subtotal').'</td>';
$subtotal_name = htmlspecialchars($subtotals[$cur_grouped_by]['name']);
- if ($user->canManageTeam() || $user->isClient()) $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.($group_by == 'user' ? $subtotal_name : '').'</td>';
+ if ($canViewReports || $isClient) $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.($group_by == 'user' ? $subtotal_name : '').'</td>';
if ($bean->getAttribute('chclient')) $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.($group_by == 'client' ? $subtotal_name : '').'</td>';
if ($bean->getAttribute('chproject')) $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.($group_by == 'project' ? $subtotal_name : '').'</td>';
if ($bean->getAttribute('chtask')) $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.($group_by == 'task' ? $subtotal_name : '').'</td>';
if ($bean->getAttribute('chnote')) $body .= '<td></td>';
if ($bean->getAttribute('chcost')) {
$body .= '<td style="'.$cellRightAlignedSubtotal.'">';
- $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 .= '</td>';
}
if ($bean->getAttribute('chpaid')) $body .= '<td></td>';
+ if ($bean->getAttribute('chip')) $body .= '<td></td>';
if ($bean->getAttribute('chinvoice')) $body .= '<td></td>';
$body .= '</tr>';
}
// Print totals.
$body .= '<tr><td> </td></tr>';
$body .= '<tr style="'.$rowSubtotal.'">';
- $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.$i18n->getKey('label.total').'</td>';
- if ($user->canManageTeam() || $user->isClient()) $body .= '<td></td>';
+ $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.$i18n->get('label.total').'</td>';
+ if ($canViewReports || $isClient) $body .= '<td></td>';
if ($bean->getAttribute('chclient')) $body .= '<td></td>';
if ($bean->getAttribute('chproject')) $body .= '<td></td>';
if ($bean->getAttribute('chtask')) $body .= '<td></td>';
if ($bean->getAttribute('chnote')) $body .= '<td></td>';
if ($bean->getAttribute('chcost')) {
$body .= '<td nowrap style="'.$cellRightAlignedSubtotal.'">'.htmlspecialchars($user->currency).' ';
- $body .= ($user->canManageTeam() || $user->isClient()) ? $totals['cost'] : $totals['expenses'];
+ $body .= ($canViewReports || $isClient) ? $totals['cost'] : $totals['expenses'];
$body .= '</td>';
}
if ($bean->getAttribute('chpaid')) $body .= '<td></td>';
+ if ($bean->getAttribute('chip')) $body .= '<td></td>';
if ($bean->getAttribute('chinvoice')) $body .= '<td></td>';
$body .= '</tr>';
// Output footer.
if (!defined('REPORT_FOOTER') || !(REPORT_FOOTER == false))
- $body .= '<p style="text-align: center;">'.$i18n->getKey('form.mail.footer').'</p>';
+ $body .= '<p style="text-align: center;">'.$i18n->get('form.mail.footer').'</p>';
// Finish creating email body.
$body .= '</body></html>';
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)
$body .= '<body>';
// Output title.
- $body .= '<p style="'.$style_title.'">'.$i18n->getKey('form.mail.report_subject').': '.$totals['start_date'].' - '.$totals['end_date'].'</p>';
+ $body .= '<p style="'.$style_title.'">'.$i18n->get('form.mail.report_subject').': '.$totals['start_date'].' - '.$totals['end_date'].'</p>';
// Output comment.
// if ($comment) $body .= '<p>'.htmlspecialchars($comment).'</p>'; // No comment for fav. reports.
$group_by_header = htmlspecialchars($custom_fields->fields[0]['label']);
else {
$key = 'label.'.$group_by;
- $group_by_header = $i18n->getKey($key);
+ $group_by_header = $i18n->get($key);
}
$body .= '<table border="0" cellpadding="4" cellspacing="0" width="100%">';
$body .= '<tr>';
$body .= '<td style="'.$tableHeader.'">'.$group_by_header.'</td>';
if ($report['show_duration'])
- $body .= '<td style="'.$tableHeaderCentered.'" width="5%">'.$i18n->getKey('label.duration').'</td>';
+ $body .= '<td style="'.$tableHeaderCentered.'" width="5%">'.$i18n->get('label.duration').'</td>';
if ($report['show_cost'])
- $body .= '<td style="'.$tableHeaderCentered.'" width="5%">'.$i18n->getKey('label.cost').'</td>';
+ $body .= '<td style="'.$tableHeaderCentered.'" width="5%">'.$i18n->get('label.cost').'</td>';
$body .= '</tr>';
foreach($subtotals as $subtotal) {
$body .= '<tr style="'.$rowSubtotal.'">';
}
if ($report['show_cost']) {
$body .= '<td style="'.$cellRightAlignedSubtotal.'">';
- $body .= ($user->canManageTeam() || $user->isClient()) ? $subtotal['cost'] : $subtotal['expenses'];
+ $body .= ($canViewReports || $isClient) ? $subtotal['cost'] : $subtotal['expenses'];
$body .= '</td>';
}
$body .= '</tr>';
// Print totals.
$body .= '<tr><td> </td></tr>';
$body .= '<tr style="'.$rowSubtotal.'">';
- $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.$i18n->getKey('label.total').'</td>';
+ $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.$i18n->get('label.total').'</td>';
if ($report['show_duration']) {
$body .= '<td style="'.$cellRightAlignedSubtotal.'">';
if ($totals['time'] <> '0:00') $body .= $totals['time'];
}
if ($report['show_cost']) {
$body .= '<td nowrap style="'.$cellRightAlignedSubtotal.'">'.htmlspecialchars($user->currency).' ';
- $body .= ($user->canManageTeam() || $user->isClient()) ? $totals['cost'] : $totals['expenses'];
+ $body .= ($canViewReports || $isClient) ? $totals['cost'] : $totals['expenses'];
$body .= '</td>';
}
$body .= '</tr>';
// Print table header.
$body .= '<table border="0" cellpadding="4" cellspacing="0" width="100%">';
$body .= '<tr>';
- $body .= '<td style="'.$tableHeader.'">'.$i18n->getKey('label.date').'</td>';
- if ($user->canManageTeam() || $user->isClient())
- $body .= '<td style="'.$tableHeader.'">'.$i18n->getKey('label.user').'</td>';
+ $body .= '<td style="'.$tableHeader.'">'.$i18n->get('label.date').'</td>';
+ if ($canViewReports || $isClient)
+ $body .= '<td style="'.$tableHeader.'">'.$i18n->get('label.user').'</td>';
if ($report['show_client'])
- $body .= '<td style="'.$tableHeader.'">'.$i18n->getKey('label.client').'</td>';
+ $body .= '<td style="'.$tableHeader.'">'.$i18n->get('label.client').'</td>';
if ($report['show_project'])
- $body .= '<td style="'.$tableHeader.'">'.$i18n->getKey('label.project').'</td>';
+ $body .= '<td style="'.$tableHeader.'">'.$i18n->get('label.project').'</td>';
if ($report['show_task'])
- $body .= '<td style="'.$tableHeader.'">'.$i18n->getKey('label.task').'</td>';
+ $body .= '<td style="'.$tableHeader.'">'.$i18n->get('label.task').'</td>';
if ($report['show_custom_field_1'])
$body .= '<td style="'.$tableHeader.'">'.htmlspecialchars($custom_fields->fields[0]['label']).'</td>';
if ($report['show_start'])
- $body .= '<td style="'.$tableHeaderCentered.'" width="5%">'.$i18n->getKey('label.start').'</td>';
+ $body .= '<td style="'.$tableHeaderCentered.'" width="5%">'.$i18n->get('label.start').'</td>';
if ($report['show_end'])
- $body .= '<td style="'.$tableHeaderCentered.'" width="5%">'.$i18n->getKey('label.finish').'</td>';
+ $body .= '<td style="'.$tableHeaderCentered.'" width="5%">'.$i18n->get('label.finish').'</td>';
if ($report['show_duration'])
- $body .= '<td style="'.$tableHeaderCentered.'" width="5%">'.$i18n->getKey('label.duration').'</td>';
+ $body .= '<td style="'.$tableHeaderCentered.'" width="5%">'.$i18n->get('label.duration').'</td>';
if ($report['show_note'])
- $body .= '<td style="'.$tableHeader.'">'.$i18n->getKey('label.note').'</td>';
+ $body .= '<td style="'.$tableHeader.'">'.$i18n->get('label.note').'</td>';
if ($report['show_cost'])
- $body .= '<td style="'.$tableHeaderCentered.'" width="5%">'.$i18n->getKey('label.cost').'</td>';
+ $body .= '<td style="'.$tableHeaderCentered.'" width="5%">'.$i18n->get('label.cost').'</td>';
if ($report['show_paid'])
- $body .= '<td style="'.$tableHeaderCentered.'" width="5%">'.$i18n->getKey('label.paid').'</td>';
+ $body .= '<td style="'.$tableHeaderCentered.'" width="5%">'.$i18n->get('label.paid').'</td>';
+ if ($report['show_ip'])
+ $body .= '<td style="'.$tableHeaderCentered.'" width="5%">'.$i18n->get('label.ip').'</td>';
if ($report['show_invoice'])
- $body .= '<td style="'.$tableHeader.'">'.$i18n->getKey('label.invoice').'</td>';
+ $body .= '<td style="'.$tableHeader.'">'.$i18n->get('label.invoice').'</td>';
$body .= '</tr>';
// Initialize variables to print subtotals.
$cur_grouped_by = $record['grouped_by'];
if ($cur_grouped_by != $prev_grouped_by && !$first_pass) {
$body .= '<tr style="'.$rowSubtotal.'">';
- $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.$i18n->getKey('label.subtotal').'</td>';
+ $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.$i18n->get('label.subtotal').'</td>';
$subtotal_name = htmlspecialchars($subtotals[$prev_grouped_by]['name']);
- if ($user->canManageTeam() || $user->isClient()) $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.($group_by == 'user' ? $subtotal_name : '').'</td>';
+ if ($canViewReports || $isClient) $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.($group_by == 'user' ? $subtotal_name : '').'</td>';
if ($report['show_client']) $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.($group_by == 'client' ? $subtotal_name : '').'</td>';
if ($report['show_project']) $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.($group_by == 'project' ? $subtotal_name : '').'</td>';
if ($report['show_task']) $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.($group_by == 'task' ? $subtotal_name : '').'</td>';
if ($report['show_note']) $body .= '<td></td>';
if ($report['show_cost']) {
$body .= '<td style="'.$cellRightAlignedSubtotal.'">';
- $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 .= '</td>';
}
if ($report['show_paid']) $body .= '<td></td>';
+ if ($report['show_ip']) $body .= '<td></td>';
if ($report['show_invoice']) $body .= '<td></td>';
$body .= '</tr>';
$body .= '<tr><td> </td></tr>';
$row_style = ($row_style == $rowItem) ? $rowItemAlt : $rowItem;
$body .= '<tr style="'.$row_style.'">';
$body .= '<td style="'.$cellLeftAligned.'">'.$record['date'].'</td>';
- if ($user->canManageTeam() || $user->isClient())
+ if ($canViewReports || $isClient)
$body .= '<td style="'.$cellLeftAligned.'">'.htmlspecialchars($record['user']).'</td>';
if ($report['show_client'])
$body .= '<td style="'.$cellLeftAligned.'">'.htmlspecialchars($record['client']).'</td>';
$body .= '<td style="'.$cellRightAligned.'">'.$record['cost'].'</td>';
if ($report['show_paid']) {
$body .= '<td style="'.$cellRightAligned.'">';
- $body .= $record['paid'] == 1 ? $i18n->getKey('label.yes') : $i18n->getKey('label.no');
+ $body .= $record['paid'] == 1 ? $i18n->get('label.yes') : $i18n->get('label.no');
+ $body .= '</td>';
+ }
+ if ($report['show_ip']) {
+ $body .= '<td style="'.$cellRightAligned.'">';
+ $body .= $record['modified'] ? $record['modified_ip'].' '.$record['modified'] : $record['created_ip'].' '.$record['created'];
$body .= '</td>';
}
if ($report['show_invoice'])
// Print a terminating subtotal.
if ($print_subtotals) {
$body .= '<tr style="'.$rowSubtotal.'">';
- $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.$i18n->getKey('label.subtotal').'</td>';
+ $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.$i18n->get('label.subtotal').'</td>';
$subtotal_name = htmlspecialchars($subtotals[$cur_grouped_by]['name']);
- if ($user->canManageTeam() || $user->isClient()) $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.($group_by == 'user' ? $subtotal_name : '').'</td>';
+ if ($canViewReports || $isClient) $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.($group_by == 'user' ? $subtotal_name : '').'</td>';
if ($report['show_client']) $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.($group_by == 'client' ? $subtotal_name : '').'</td>';
if ($report['show_project']) $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.($group_by == 'project' ? $subtotal_name : '').'</td>';
if ($report['show_task']) $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.($group_by == 'task' ? $subtotal_name : '').'</td>';
if ($report['show_note']) $body .= '<td></td>';
if ($report['show_cost']) {
$body .= '<td style="'.$cellRightAlignedSubtotal.'">';
- $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 .= '</td>';
}
if ($report['show_paid']) $body .= '<td></td>';
+ if ($report['show_ip']) $body .= '<td></td>';
if ($report['show_invoice']) $body .= '<td></td>';
$body .= '</tr>';
}
// Print totals.
$body .= '<tr><td> </td></tr>';
$body .= '<tr style="'.$rowSubtotal.'">';
- $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.$i18n->getKey('label.total').'</td>';
- if ($user->canManageTeam() || $user->isClient()) $body .= '<td></td>';
+ $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.$i18n->get('label.total').'</td>';
+ if ($canViewReports || $isClient) $body .= '<td></td>';
if ($report['show_client']) $body .= '<td></td>';
if ($report['show_project']) $body .= '<td></td>';
if ($report['show_task']) $body .= '<td></td>';
if ($report['show_note']) $body .= '<td></td>';
if ($report['show_cost']) {
$body .= '<td nowrap style="'.$cellRightAlignedSubtotal.'">'.htmlspecialchars($user->currency).' ';
- $body .= ($user->canManageTeam() || $user->isClient()) ? $totals['cost'] : $totals['expenses'];
+ $body .= ($canViewReports || $isClient) ? $totals['cost'] : $totals['expenses'];
$body .= '</td>';
}
if ($report['show_paid']) $body .= '<td></td>';
+ if ($report['show_ip']) $body .= '<td></td>';
if ($report['show_invoice']) $body .= '<td></td>';
$body .= '</tr>';
// Output footer.
if (!defined('REPORT_FOOTER') || !(REPORT_FOOTER == false))
- $body .= '<p style="text-align: center;">'.$i18n->getKey('form.mail.footer').'</p>';
+ $body .= '<p style="text-align: center;">'.$i18n->get('form.mail.footer').'</p>';
// Finish creating email body.
$body .= '</body></html>';