$this->highlight = $highlight;
}
- function localize($i18n) {
+ function localize() {
global $user;
+ global $i18n;
$this->mMonthNames = $i18n->monthNames;
$this->mWeekDayShortNames = $i18n->weekdayShortNames;
$stl_cell = ' class="CalendarDay"';
}
- // holidays
- if ($this->showHolidays) {
- foreach ($this->holidays as $day) {
- if($day == $date) {
- $stl_cell = ' class="CalendarDayHoliday"';
- $stl_link = ' class="CalendarLinkHoliday"';
- }
- }
+ // Handle holidays.
+ // Prepare a date to check in DB_DATEFORMAT.
+ $date_to_check = "$thisyear-";
+ if (strlen($thismonth) == 1) $date_to_check .= '0';
+ $date_to_check .= "$thismonth-";
+ if (strlen($start_date+$j) == 1) $date_to_check .= '0';
+ $date_to_check .= $start_date+$j;
+
+ // Check if it falls on a holiday.
+ if (ttTimeHelper::isHoliday2($date_to_check)) {
+ $stl_cell = ' class="CalendarDayHoliday"';
+ $stl_link = ' class="CalendarLinkHoliday"';
}
// selected day
$str .= "</TR>\n";
}
- $str .= "<tr><td colspan=\"7\" align=\"center\"><a id=\"today_link\" href=\"?".$this->controlName."=".strftime(DB_DATEFORMAT)."\" tabindex=\"-1\">".$i18n->getKey('label.today')."</a></td></tr>\n";
+ $str .= "<tr><td colspan=\"7\" align=\"center\"><a id=\"today_link\" href=\"?".$this->controlName."=".strftime(DB_DATEFORMAT)."\" tabindex=\"-1\">".$i18n->get('label.today')."</a></td></tr>\n";
$str .= "</table>\n";
$str .= "<input type=\"hidden\" name=\"$this->controlName\" value=\"$indate\">\n";
function _getActiveDates($start, $end) {
global $user;
- $user_id = $user->getActiveUser();
+ $user_id = $user->getUser();
$table = ($this->highlight == 'expenses') ? 'tt_expense_items' : 'tt_log';