[geeklog-cvs] geeklog-1.3/public_html calendar.php,1.27,1.28

[dhaun at geeklog.net]

Update of /usr/cvs/geeklog/geeklog-1.3/public_html
In directory internal.geeklog.net:/tmp/cvs-serv7535

Modified Files:
	calendar.php 
Log Message:
Fixed display of events spanning several days in the personal calendar (bug #676604).


Index: calendar.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/calendar.php,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** calendar.php	6 Jan 2003 18:20:24 -0000	1.27
--- calendar.php	29 Mar 2003 19:12:28 -0000	1.28
***************
*** 5,17 ****
  // | Geeklog 1.3                                                               |
  // +---------------------------------------------------------------------------+
! // | lib-common.php                                                            |
! // | Geeklog common library.                                                   |
  // |                                                                           |
  // +---------------------------------------------------------------------------+
! // | Copyright (C) 2000,2001 by the following authors:                         |
  // |                                                                           |
! // | Authors: Tony Bibbs       - tony at tonybibbs.com                            |
! // |          Mark Limburg     - mlimburg at users.sourceforge.net                |
! // |          Jason Wittenburg - jwhitten at securitygeeks.com                    |
  // +---------------------------------------------------------------------------+
  // |                                                                           |
--- 5,17 ----
  // | Geeklog 1.3                                                               |
  // +---------------------------------------------------------------------------+
! // | calendar.php                                                              |
  // |                                                                           |
+ // | Geeklog calendar.                                                         |
  // +---------------------------------------------------------------------------+
! // | Copyright (C) 2000-2003 by the following authors:                         |
  // |                                                                           |
! // | Authors: Tony Bibbs        - tony at tonybibbs.com                           |
! // |          Mark Limburg      - mlimburg at users.sourceforge.net               |
! // |          Jason Whittenburg - jwhitten at securitygeeks.com                   |
  // +---------------------------------------------------------------------------+
  // |                                                                           |
***************
*** 161,166 ****
      }
  
!     $retval .= '<font size=-2>' . LB . '<table>' . LB 
!         . '<tr><td align=center colspan=7><a href="' . $_CONF['site_url'] . '/calendar.php?month=' . $m . '&year=' . $y . $mode . '">' 
          . $mycal->getMonthName($m) . '</a></td></tr>'
          . makeDaysHeadline() . LB;
--- 161,166 ----
      }
  
!     $retval .= '<font size="-2">' . LB . '<table>' . LB 
!         . '<tr><td align="center" colspan="7"><a href="' . $_CONF['site_url'] . '/calendar.php?month=' . $m . '&year=' . $y . $mode . '">' 
          . $mycal->getMonthName($m) . '</a></td></tr>'
          . makeDaysHeadline() . LB;
***************
*** 688,694 ****
                  . '&year=' . $year . '" class="cal_date">' . $curday->daynumber. '</a><hr>');
  
-             // NEED TO CHANGE TO GET ENTRIES
              if ($mode == 'personal') {
!                 //$calsql = "SELECT {$_TABLES["events"]}.* FROM {$_TABLES["events"]}, {$_TABLES["userevent"]} WHERE ({$_TABLES["events"]}.eid = {$_TABLES["userevent"]}.eid) AND ({$_TABLES["userevent"]}.uid = {$_USER["uid"]}) AND ((datestart >= \"$year-$month-$curday->daynumber 00:00:00\" AND datestart <= \"$year-$month-$curday->daynumber 23:59:59\") OR (dateend >= \"$year-$month-$curday->daynumber 00:00:00\" AND dateend <= \"$year-$month-$curday->daynumber 23:59:59\") OR (\"$year-$month-$curday->daynumber\" between datestart and dateend)) ORDER BY datestart,timestart";
                  $calsql = "SELECT * FROM {$_TABLES["personal_events"]} WHERE (uid = {$_USER["uid"]}) AND ((datestart >= \"$year-$month-$curday->daynumber 00:00:00\" AND datestart <= \"$year-$month-$curday->daynumber 23:59:59\") OR (dateend >= \"$year-$month-$curday->daynumber 00:00:00\" AND dateend <= \"$year-$month-$curday->daynumber 23:59:59\") OR (\"$year-$month-$curday->daynumber\" between datestart and dateend)) ORDER BY datestart,timestart";
              } else {
--- 688,695 ----
                  . '&year=' . $year . '" class="cal_date">' . $curday->daynumber. '</a><hr>');
  
              if ($mode == 'personal') {
!                 if (strlen($month) == 1) {
!                     $month = '0' . $month;
!                 }
                  $calsql = "SELECT * FROM {$_TABLES["personal_events"]} WHERE (uid = {$_USER["uid"]}) AND ((datestart >= \"$year-$month-$curday->daynumber 00:00:00\" AND datestart <= \"$year-$month-$curday->daynumber 23:59:59\") OR (dateend >= \"$year-$month-$curday->daynumber 00:00:00\" AND dateend <= \"$year-$month-$curday->daynumber 23:59:59\") OR (\"$year-$month-$curday->daynumber\" between datestart and dateend)) ORDER BY datestart,timestart";
              } else {