Fixed calendar bug. ^_^

git-svn-id: svn://svn.code.sf.net/p/intdb/svn/trunk@145 2b68903e-0b30-0410-9a39-a2e4f3c5be39

diff --git a/inc/calendars.php b/inc/calendars.php
index 2bc6f51..3ffc3e8 100644 (file)
--- a/inc/calendars.php
+++ b/inc/calendars.php
@@ -33,7 +33,7 @@ $MyTimeStamp2 = mktime(23,59,59,$MyMonth,$CountDays,$MyYear);
 $MyMonthName = GMTimeGet("F",$_SESSION['UserTimeZone'],0,$_SESSION['UserDST']);
 $FirstDayThisMonth = date("w", mktime(0, 0, 0, $MyMonth, 1, $MyYear));
 $EventsName = array();
-$query = query("SELECT * FROM `".$Settings['sqltable']."events` WHERE (`EventMonth`>=%i) OR (`EventMonth`<=%i AND `EventMonthEnd`>=%i)", array($MyMonth,$MyMonth,$MyMonth));
+$query = query("SELECT * FROM `".$Settings['sqltable']."events` WHERE (`EventMonth`>=%i AND `EventYear`<%i AND `EventYearEnd`>=%i) OR (`EventMonth`<=%i AND `EventMonthEnd`>=%i AND `EventYearEnd`>=%i)", array($MyMonth,$MyYear,$MyYear,$MyMonth,$MyMonth,$MyYear));
 $result=mysql_query($query);
 $num=mysql_num_rows($result);
 $is=0;

diff --git a/inc/versioninfo.php b/inc/versioninfo.php
index 1e5ae32..73fb02a 100644 (file)
--- a/inc/versioninfo.php
+++ b/inc/versioninfo.php
@@ -11,7 +11,7 @@
     Copyright 2004-2008 Cool Dude 2k - http://idb.berlios.de/
     Copyright 2004-2008 Game Maker 2k - http://intdb.sourceforge.net/
 
-    $FileInfo: versioninfo.php - Last Update: 01/01/2008 SVN 144 - Author: cooldude2k $
+    $FileInfo: versioninfo.php - Last Update: 01/16/2008 SVN 145 - Author: cooldude2k $
 */
 $File3Name = basename($_SERVER['SCRIPT_NAME']);
 if ($File3Name=="versioninfo.php"||$File3Name=="/versioninfo.php") {
@@ -27,8 +27,8 @@ function version_info($proname,$subver,$ver,$supver,$reltype,$svnver,$showsvn) {
        return $return_var; }
 // Version number and date stuff. :P
 $VER1[0] = 0; $VER1[1] = 2; $VER1[2] = 1; $VERFull[1] = $VER1[0].".".$VER1[1].".".$VER1[2];
-$VER2[0] = "Pre-Alpha"; $VER2[1] = "PA"; $VER2[2] = "SVN"; $SubVerN = 144; $RName = "iDB"; $SFName = "IntDB";
-$SVNDay[0] = 01; $SVNDay[1] = 01; $SVNDay[2] = 2007; $SVNDay[3] = $SVNDay[0]."/".$SVNDay[1]."/".$SVNDay[2];
+$VER2[0] = "Pre-Alpha"; $VER2[1] = "PA"; $VER2[2] = "SVN"; $SubVerN = 145; $RName = "iDB"; $SFName = "IntDB";
+$SVNDay[0] = 01; $SVNDay[1] = 16; $SVNDay[2] = 2007; $SVNDay[3] = $SVNDay[0]."/".$SVNDay[1]."/".$SVNDay[2];
 $VerInfo['iDB_Ver'] = version_info($RName,$VER1[0],$VER1[1],$VER1[2],$VER2[1],$SubVerN,false);
 $VerInfo['iDB_Ver_SVN'] = version_info($RName,$VER1[0],$VER1[1],$VER1[2],$VER2[1],$SubVerN,true);
 $VerInfo['iDB_Full_Ver'] = version_info($RName,$VER1[0],$VER1[1],$VER1[2],$VER2[0],$SubVerN,false);