$custom_field_1 = null;
if ($user->isPluginEnabled('cf')) {
- $custom_fields = new CustomFields($user->team_id);
+ $custom_fields = new CustomFields();
$cf_1_type = $custom_fields->fields[0]['type'];
if ($cf_1_type == CustomFields::TYPE_TEXT) {
$custom_field_1 = ', cfl.value as cf_1_value';
$dataArray = array();
// Construct the first row for a brand new entry.
- $dataArray[] = array('row_id' => null,'label' => $i18n->getKey('form.week.new_entry').':'); // Insert row.
+ $dataArray[] = array('row_id' => null,'label' => $i18n->get('form.week.new_entry').':'); // Insert row.
// Insert empty cells with proper control ids.
for ($i = 0; $i < 7; $i++) {
$control_id = '0_'. $dayHeaders[$i];
}
if ($user->isPluginEnabled('wvns')) {
// Construct the second row for daily comments for a brand new entry.
- $dataArray[] = array('row_id' => null,'label' => $i18n->getKey('label.notes').':'); // Insert row.
+ $dataArray[] = array('row_id' => null,'label' => $i18n->get('label.notes').':'); // Insert row.
// Insert empty cells with proper control ids.
for ($i = 0; $i < 7; $i++) {
$control_id = '1_'. $dayHeaders[$i];
}
// Insert row for comments.
if ($user->isPluginEnabled('wvns')) {
- $dataArray[] = array('row_id' => $row_id.'_notes','label' => $i18n->getKey('label.notes').':');
+ $dataArray[] = array('row_id' => $row_id.'_notes','label' => $i18n->get('label.notes').':');
$pos++;
// Insert empty cells with proper control ids.
for ($i = 0; $i < 7; $i++) {
unset($objDate);
// Obtain past week(s) records.
- $records = ttWeekViewHelper::getRecordsForInterval($user->getActiveUser(), $pastWeekStartDate, $pastWeekEndDate);
+ $records = ttWeekViewHelper::getRecordsForInterval($user->getUser(), $pastWeekStartDate, $pastWeekEndDate);
// Handle potential situation of no records by re-trying for up to 4 more previous weeks (after a long vacation, etc.).
if (!$records) {
for ($i = 0; $i < 4; $i++) {
$pastWeekEndDate = $objDate->toString(DB_DATEFORMAT);
unset($objDate);
- $records = ttWeekViewHelper::getRecordsForInterval($user->getActiveUser(), $pastWeekStartDate, $pastWeekEndDate);
+ $records = ttWeekViewHelper::getRecordsForInterval($user->getUser(), $pastWeekStartDate, $pastWeekEndDate);
// Break out of the loop if we found something.
if ($records) break;
}
}
// Construct the first row for a brand new entry.
- $dataArray[] = array('row_id' => null,'label' => $i18n->getKey('form.week.new_entry').':'); // Insert row.
+ $dataArray[] = array('row_id' => null,'label' => $i18n->get('form.week.new_entry').':'); // Insert row.
// Insert empty cells with proper control ids.
for ($i = 0; $i < 7; $i++) {
$control_id = '0_'. $dayHeaders[$i];
$dataArray[0][$dayHeaders[$i]] = array('control_id' => $control_id, 'tt_log_id' => null,'duration' => null);
}
// Construct the second row for daily comments for a brand new entry.
- $dataArray[] = array('row_id' => null,'label' => $i18n->getKey('label.notes').':'); // Insert row.
+ $dataArray[] = array('row_id' => null,'label' => $i18n->get('label.notes').':'); // Insert row.
// Insert empty cells with proper control ids.
for ($i = 0; $i < 7; $i++) {
$control_id = '1_'. $dayHeaders[$i];
$dataArray[$pos][$dayHeaders[$i]] = array('control_id' => $control_id, 'tt_log_id' => null,'duration' => null);
}
// Insert row for comments.
- $dataArray[] = array('row_id' => $row_id.'_notes','label' => $i18n->getKey('label.notes').':');
+ $dataArray[] = array('row_id' => $row_id.'_notes','label' => $i18n->get('label.notes').':');
$pos++;
// Insert empty cells with proper control ids.
for ($i = 0; $i < 7; $i++) {
// Insert label.
global $i18n;
- $dayTotals['label'] = $i18n->getKey('label.day_total').':';
+ $dayTotals['label'] = $i18n->get('label.day_total').':';
foreach ($dataArray as $row) {
foreach($dayHeaders as $dayHeader) {
if (!$user->future_entries && $fields['browser_today']) {
$objBrowserToday = new DateAndTime(DB_DATEFORMAT, $fields['browser_today']);
if ($objEntryDate->after($objBrowserToday)) {
- $err->add($i18n->getKey('error.future_date'));
+ $err->add($i18n->get('error.future_date'));
return false;
}
}
// Prepare an array of fields for regular insert function.
$fields4insert = array();
- $fields4insert['user_id'] = $user->getActiveUser();
+ $fields4insert['user_id'] = $user->getUser();
+ $fields4insert['group_id'] = $user->getGroup();
+ $fields4insert['org_id'] = $user->org_id;
$fields4insert['date'] = $entry_date;
$fields4insert['duration'] = $fields['duration'];
$fields4insert['client'] = ttWeekViewHelper::parseFromWeekViewRow($fields['row_id'], 'cl');
$mdb2 = getConnection();
$duration = $fields['duration'];
$tt_log_id = $fields['tt_log_id'];
- $user_id = $user->getActiveUser();
+ $user_id = $user->getUser();
$sql = "update tt_log set duration = '$duration' where id = $tt_log_id and user_id = $user_id";
$affected = $mdb2->exec($sql);
if (is_a($affected, 'PEAR_Error'))
$res = $mdb2->query($sql);
if (!is_a($res, 'PEAR_Error')) {
if (!$res->numRows()) {
- $err->add($i18n->getKey('error.db')); // This is not expected.
+ $err->add($i18n->get('error.db')); // This is not expected.
return false;
}
$val = $res->fetchRow();
$newEndMinutes = $startMinutes + $newMinutes;
if ($newEndMinutes > 1440) {
// Invalid duration, as new duration puts the record beyond current day.
- $err->add($i18n->getKey('error.field'), $i18n->getKey('label.duration'));
+ $err->add($i18n->get('error.field'), $i18n->get('label.duration'));
return false;
}
$start = ttTimeHelper::toAbsDuration($startMinutes);
$finish = ttTimeHelper::toAbsDuration($newEndMinutes);
if (ttTimeHelper::overlaps($user_id, $date, $start, $finish, $tt_log_id)) {
- $err->add($i18n->getKey('error.overlap'));
+ $err->add($i18n->get('error.overlap'));
return false;
}
$mdb2 = getConnection();
$tt_log_id = $fields['tt_log_id'];
$comment = $fields['comment'];
- $user_id = $user->getActiveUser();
+ $user_id = $user->getUser();
$sql = "update tt_log set comment = ".$mdb2->quote($fields['comment'])." where id = $tt_log_id and user_id = $user_id";
$affected = $mdb2->exec($sql);
if (is_a($affected, 'PEAR_Error'))