extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-22 23:00:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Nothing worth noting.

Browse Source
This commit is contained in:
skeeter 2001-06-16 19:10:26 +00:00
parent 0f055a3543
commit e1a68b0862
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
calendar/inc/class.calendar_sql.inc.php
View File

@ -343,9 +343,7 @@ class calendar_ extends calendar__
. $repeats_from . $repeats_from
. 'WHERE (phpgw_cal_user.cal_id = phpgw_cal.cal_id) ' . 'WHERE (phpgw_cal_user.cal_id = phpgw_cal.cal_id) '
. $repeats_where . $extra; . $repeats_where . $extra;
$this->stream->query($sql,__LINE__,__FILE__); $this->stream->query($sql,__LINE__,__FILE__);
if($this->stream->num_rows() == 0) if($this->stream->num_rows() == 0)
{ {
return False; return False;
@ -356,7 +354,6 @@ class calendar_ extends calendar__
{ {
$retval[] = intval($this->stream->f('cal_id')); $retval[] = intval($this->stream->f('cal_id'));
} }
return $retval; return $retval;
} }
@ -383,6 +380,7 @@ class calendar_ extends calendar__
$date = mktime($event->start->hour,$event->start->min,$event->start->sec,$event->start->month,$event->start->mday,$event->start->year) - $this->datetime->tz_offset; $date = mktime($event->start->hour,$event->start->min,$event->start->sec,$event->start->month,$event->start->mday,$event->start->year) - $this->datetime->tz_offset;
$enddate = mktime($event->end->hour,$event->end->min,$event->end->sec,$event->end->month,$event->end->mday,$event->end->year) - $this->datetime->tz_offset; $enddate = mktime($event->end->hour,$event->end->min,$event->end->sec,$event->end->month,$event->end->mday,$event->end->year) - $this->datetime->tz_offset;
$today = time() - $this->datetime->tz_offset; $today = time() - $this->datetime->tz_offset;
// $today = time();
if($event->recur_type != MCAL_RECUR_NONE) if($event->recur_type != MCAL_RECUR_NONE)
{ {
@ -435,7 +433,7 @@ class calendar_ extends calendar__
} }
else else
{ {
$end = '0'; $end = 0;
} }
$this->stream->query('SELECT count(cal_id) FROM phpgw_cal_repeats WHERE cal_id='.$event->id,__LINE__,__FILE__); $this->stream->query('SELECT count(cal_id) FROM phpgw_cal_repeats WHERE cal_id='.$event->id,__LINE__,__FILE__);