[geeklog-cvs] Geeklog-1.x/plugins/calendar functions.inc, 1.82, 1.83

[Michael Jervis]

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

Modified Files:
	functions.inc 
Log Message:
Calendar block shows the current days ongoing (all day or in progress) events.

Index: functions.inc
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/plugins/calendar/functions.inc,v
retrieving revision 1.82
retrieving revision 1.83
diff -C2 -d -r1.82 -r1.83
*** functions.inc	12 Apr 2008 20:34:18 -0000	1.82
--- functions.inc	17 Apr 2008 18:33:27 -0000	1.83
***************
*** 130,138 ****
          . "WHERE dateend >= NOW() AND (TO_DAYS(datestart) - TO_DAYS(NOW()) < $range) "
          . 'ORDER BY datestart,timestart';
! 
          if(( $_CA_CONF['personalcalendars'] == 1 ) && !empty( $_USER['uid'] )) {
              $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';
          }
--- 130,138 ----
          . "WHERE dateend >= NOW() AND (TO_DAYS(datestart) - TO_DAYS(NOW()) < $range) "
          . 'ORDER BY datestart,timestart';
!         
          if(( $_CA_CONF['personalcalendars'] == 1 ) && !empty( $_USER['uid'] )) {
              $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';
          }