mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-12-27 17:18:54 +01:00
Fix for bug #417117
This commit is contained in:
parent
479c0f0721
commit
8ab6337b5a
@ -62,7 +62,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
$now = $phpgw->calendar->makegmttime(0, 0, 0, $thismonth, $thisday, $thisyear);
|
$now = $phpgw->calendar->makegmttime(0, 0, 0, $thismonth, $thisday, $thisyear);
|
||||||
|
$now['raw'] += $phpgw->calendar->tz_offset;
|
||||||
$m = mktime(0,0,0,$thismonth,1,$thisyear);
|
$m = mktime(0,0,0,$thismonth,1,$thisyear);
|
||||||
|
|
||||||
$var = Array(
|
$var = Array(
|
||||||
|
@ -881,7 +881,7 @@ class calendar extends calendar_
|
|||||||
$lr_events = CreateObject('calendar.calendar_item');
|
$lr_events = CreateObject('calendar.calendar_item');
|
||||||
|
|
||||||
$p = CreateObject('phpgwapi.Template',$this->template_dir);
|
$p = CreateObject('phpgwapi.Template',$this->template_dir);
|
||||||
$p->set_unknowns('remove');
|
$p->set_unknowns('keep');
|
||||||
|
|
||||||
$templates = Array (
|
$templates = Array (
|
||||||
'month_header' => 'month_header.tpl',
|
'month_header' => 'month_header.tpl',
|
||||||
@ -1078,7 +1078,7 @@ class calendar extends calendar_
|
|||||||
global $phpgw, $phpgw_info;
|
global $phpgw, $phpgw_info;
|
||||||
|
|
||||||
$p = CreateObject('phpgwapi.Template',$this->template_dir);
|
$p = CreateObject('phpgwapi.Template',$this->template_dir);
|
||||||
$p->set_unknowns('remove');
|
$p->set_unknowns('keep');
|
||||||
|
|
||||||
$templates = Array(
|
$templates = Array(
|
||||||
'month' => 'month.tpl',
|
'month' => 'month.tpl',
|
||||||
@ -1144,7 +1144,7 @@ class calendar extends calendar_
|
|||||||
$this->read_repeated_events($owner);
|
$this->read_repeated_events($owner);
|
||||||
|
|
||||||
$p = CreateObject('phpgwapi.Template',$this->template_dir);
|
$p = CreateObject('phpgwapi.Template',$this->template_dir);
|
||||||
$p->set_unknowns('remove');
|
$p->set_unknowns('keep');
|
||||||
|
|
||||||
$templates = Array(
|
$templates = Array(
|
||||||
'month' => 'month.tpl',
|
'month' => 'month.tpl',
|
||||||
@ -1270,7 +1270,7 @@ class calendar extends calendar_
|
|||||||
$this->read_repeated_events($this->owner);
|
$this->read_repeated_events($this->owner);
|
||||||
|
|
||||||
$p = CreateObject('phpgwapi.Template',$this->template_dir);
|
$p = CreateObject('phpgwapi.Template',$this->template_dir);
|
||||||
$p->set_unknowns('remove');
|
$p->set_unknowns('keep');
|
||||||
|
|
||||||
$templates = Array(
|
$templates = Array(
|
||||||
'day_cal' => 'day_cal.tpl',
|
'day_cal' => 'day_cal.tpl',
|
||||||
@ -1528,6 +1528,7 @@ class calendar extends calendar_
|
|||||||
|
|
||||||
$p = CreateObject('phpgwapi.Template',$phpgw->calendar->template_dir);
|
$p = CreateObject('phpgwapi.Template',$phpgw->calendar->template_dir);
|
||||||
|
|
||||||
|
$p->set_unknowns('keep');
|
||||||
$templates = Array(
|
$templates = Array(
|
||||||
'view_begin' => 'view.tpl',
|
'view_begin' => 'view.tpl',
|
||||||
'list' => 'list.tpl',
|
'list' => 'list.tpl',
|
||||||
|
@ -874,8 +874,8 @@ class calendar_ extends calendar__
|
|||||||
. 'cal_priority='.$event->priority.', '
|
. 'cal_priority='.$event->priority.', '
|
||||||
. "cal_type='".$type."', "
|
. "cal_type='".$type."', "
|
||||||
. "cal_access='".$event->access."', "
|
. "cal_access='".$event->access."', "
|
||||||
. "cal_name='".$event->name."', "
|
. "cal_name='".addslashes($event->name)."', "
|
||||||
. "cal_description='".$event->description."' "
|
. "cal_description='".addslashes($event->description)."' "
|
||||||
. 'WHERE cal_id='.$event->id;
|
. 'WHERE cal_id='.$event->id;
|
||||||
|
|
||||||
$this->stream->query($sql,__LINE__,__FILE__);
|
$this->stream->query($sql,__LINE__,__FILE__);
|
||||||
|
@ -13,8 +13,6 @@
|
|||||||
|
|
||||||
<!-- BEGIN view_end -->
|
<!-- BEGIN view_end -->
|
||||||
</table>
|
</table>
|
||||||
<p>
|
|
||||||
{edit_button} {delete_button}
|
|
||||||
</center>
|
</center>
|
||||||
<!-- END view_end -->
|
<!-- END view_end -->
|
||||||
|
|
||||||
|
@ -13,8 +13,6 @@
|
|||||||
|
|
||||||
<!-- BEGIN view_end -->
|
<!-- BEGIN view_end -->
|
||||||
</table>
|
</table>
|
||||||
<p>
|
|
||||||
{edit_button} {delete_button}
|
|
||||||
</center>
|
</center>
|
||||||
<!-- END view_end -->
|
<!-- END view_end -->
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user