[geeklog-cvs] Geeklog-1.x/plugins/calendar functions.inc, 1.89, 1.90

[Michael Jervis]

Update of /cvsroot/geeklog/Geeklog-1.x/plugins/calendar
In directory qs1489.pair.com:/tmp/cvs-serv35284/plugins/calendar

Modified Files:
	functions.inc 
Log Message:
- Calendar block now includes events from the current day (in progress or all
  day events, bug 0000604, patch from forums) - Really this time.

Index: functions.inc
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/plugins/calendar/functions.inc,v
retrieving revision 1.89
retrieving revision 1.90
diff -C2 -d -r1.89 -r1.90
*** functions.inc	10 Jun 2008 17:26:49 -0000	1.89
--- functions.inc	26 Jun 2008 21:07:20 -0000	1.90
***************
*** 120,124 ****
          $eventSql = 'SELECT eid,title,url,datestart,dateend,group_id,owner_id,perm_owner,perm_group,perm_members,perm_anon '
          . "FROM {$_TABLES['events']} "
!         . "WHERE dateend >= NOW() AND (TO_DAYS(datestart) - TO_DAYS(NOW()) < $range) "
          . 'ORDER BY datestart,timestart';
          
--- 120,124 ----
          $eventSql = 'SELECT eid,title,url,datestart,dateend,group_id,owner_id,perm_owner,perm_group,perm_members,perm_anon '
          . "FROM {$_TABLES['events']} "
!         . "WHERE dateend >= (NOW() - INTERVAL 24 HOUR) AND (TO_DAYS(datestart) - TO_DAYS(NOW()) < $range) "
          . 'ORDER BY datestart,timestart';
          
***************
*** 126,130 ****
              $personaleventsql = 'SELECT eid,title,url,datestart,dateend,group_id,owner_id,perm_owner,perm_group,perm_members,perm_anon '
              . "FROM {$_TABLES['personal_events']} "
!             . "WHERE uid = {$_USER['uid']} AND dateend >= NOW()  AND (TO_DAYS(datestart) - TO_DAYS(NOW()) < $range) "
              . 'ORDER BY datestart, dateend';
          }
--- 126,130 ----
              $personaleventsql = 'SELECT eid,title,url,datestart,dateend,group_id,owner_id,perm_owner,perm_group,perm_members,perm_anon '
              . "FROM {$_TABLES['personal_events']} "
!             . "WHERE uid = {$_USER['uid']} AND dateend >= (NOW() - INTERVAL 24 HOUR)  AND (TO_DAYS(datestart) - TO_DAYS(NOW()) < $range) "
              . 'ORDER BY datestart, dateend';
          }