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

[Michael Jervis]

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

Modified Files:
	functions.inc 
Log Message:
MSSQL issues resolved in calendar plugin and in CSRF tokens.

Index: functions.inc
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/plugins/calendar/functions.inc,v
retrieving revision 1.90
retrieving revision 1.91
diff -C2 -d -r1.90 -r1.91
*** functions.inc	26 Jun 2008 21:07:20 -0000	1.90
--- functions.inc	29 Jun 2008 19:02:49 -0000	1.91
***************
*** 99,103 ****
  function phpblock_calendar( $help='', $title='' )
  {
!     global $_CONF, $_TABLES, $_USER, $_CA_CONF, $LANG_CAL_1;
  
      $retval = '';
--- 99,103 ----
  function phpblock_calendar( $help='', $title='' )
  {
!     global $_CONF, $_TABLES, $_USER, $_CA_CONF, $LANG_CAL_1, $_DB_dbms;
  
      $retval = '';
***************
*** 119,131 ****
  
          $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';
          
          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() - INTERVAL 24 HOUR)  AND (TO_DAYS(datestart) - TO_DAYS(NOW()) < $range) "
!             . 'ORDER BY datestart, dateend';
          }
  
--- 119,139 ----
  
          $eventSql = 'SELECT eid,title,url,datestart,dateend,group_id,owner_id,perm_owner,perm_group,perm_members,perm_anon '
!         . "FROM {$_TABLES['events']} ";
!         if($_DB_dbms == 'mssql') {
!             $eventSql .= "WHERE dateend >= DATEADD(hh, 24, NOW()) AND (TO_DAYS(datestart) - TO_DAYS(NOW()) < $range) ";
!         } else {
!             $eventSql .= "WHERE dateend >= (getUTCDate() - INTERVAL 24 HOUR) AND (TO_DAYS(datestart) - TO_DAYS(NOW()) < $range) ";            
!         }
!         $eventSql .= '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']} ";
!             if($_DB_dbms == 'mssql') {
!                 $personaleventsql .= "WHERE uid = {$_USER['uid']} AND dateend >= DATEADD(hh, 24, getUTCDate())  AND (TO_DAYS(datestart) - TO_DAYS(NOW()) < $range) ";
!             } else {
!                 $personaleventsql .= "WHERE uid = {$_USER['uid']} AND dateend >= (NOW() - INTERVAL 24 HOUR)  AND (TO_DAYS(datestart) - TO_DAYS(NOW()) < $range) ";
!             }
!             $personaleventsql .= 'ORDER BY datestart, dateend';
          }