Changeset 4550 for branches/2.2.0.1/calendar/inc/class.uicalendar.inc.php
- Timestamp:
- 05/31/11 13:52:33 (13 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2.2.0.1/calendar/inc/class.uicalendar.inc.php
r4549 r4550 5163 5163 ) 5164 5164 ); 5165 5165 $this->bo->read_holidays($params['year']); 5166 5166 $next = $GLOBALS['phpgw']->datetime->makegmttime(0,0,0,$this->bo->month,$this->bo->day + 7,$this->bo->year); 5167 5167 $prev = $GLOBALS['phpgw']->datetime->makegmttime(0,0,0,$this->bo->month,$this->bo->day - 7,$this->bo->year); … … 5186 5186 'new_week' => $tpl, 5187 5187 ); 5188 5188 $feriados_do_ano = Array(); 5189 foreach ($this->bo->cached_holidays as $key => $value) 5190 { 5191 $feriados_do_ano[$key] = utf8_encode($this->bo->cached_holidays[$key][0]['name']); 5192 } 5189 5193 $p->set_file($templates); 5190 5194 $p->set_block('new_week','day','day'); … … 5200 5204 $p->set_var('user',$GLOBALS['phpgw']->common->grab_owner_name($this->bo->owner)); 5201 5205 $p->set_var('events_json',json_encode($result_events_json['events_to_show_json'])?json_encode($result_events_json['events_to_show_json']):'null'); 5206 $p->set_var('holidays_json',json_encode($feriados_do_ano)?json_encode($feriados_do_ano):null); 5202 5207 return $p->fp('out','day'); 5203 5208 … … 5208 5213 $p = CreateObject('phpgwapi.Template',$this->template_dir); 5209 5214 $p->set_unknowns('keep'); 5210 5211 5215 $tpl = 'new_month.tpl'; 5212 5216 … … 5255 5259 ) 5256 5260 ); 5257 5261 $this->bo->read_holidays($params['year']); 5258 5262 $print = '<a href="javascript:void(0)" id="printFriendly">['.lang('Printer Friendly').']</a>'; 5259 5263 … … 5275 5279 } 5276 5280 5281 $feriados_do_ano = Array(); 5282 foreach ($this->bo->cached_holidays as $key => $value) 5283 { 5284 $feriados_do_ano[$key] = utf8_encode($this->bo->cached_holidays[$key][0]['name']); 5285 } 5277 5286 $m = mktime(0,0,0,$this->bo->month,1,$this->bo->year); 5278 5287 $p->set_file($templates); … … 5291 5300 $p->set_var('user',$GLOBALS['phpgw']->common->grab_owner_name($this->bo->owner)); 5292 5301 $p->set_var('events_json',json_encode($result_events_json['events_to_show_json'])?json_encode($result_events_json['events_to_show_json']):'null'); 5302 $p->set_var('holidays_json',json_encode($feriados_do_ano)?json_encode($feriados_do_ano):null); 5293 5303 return $p->fp('out','day'); 5294 5304 }
Note: See TracChangeset
for help on using the changeset viewer.