From 5b13b2a7dbf6d1657a82b0a70e4349152f34919d Mon Sep 17 00:00:00 2001 From: Kazuki Przyborowski Date: Thu, 10 Sep 2015 21:47:25 -0500 Subject: [PATCH] Another small bug fix. --- inc/calendars.php | 11 +++++++---- inc/versioninfo.php | 4 ++-- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/inc/calendars.php b/inc/calendars.php index b08adb3..f0521c5 100644 --- a/inc/calendars.php +++ b/inc/calendars.php @@ -11,7 +11,7 @@ Copyright 2004-2015 iDB Support - http://idb.berlios.de/ Copyright 2004-2015 Game Maker 2k - http://gamemaker2k.org/ - $FileInfo: calendars.php - Last Update: 09/10/2015 SVN 801 - Author: cooldude2k $ + $FileInfo: calendars.php - Last Update: 09/10/2015 SVN 803 - Author: cooldude2k $ */ $File3Name = basename($_SERVER['SCRIPT_NAME']); if ($File3Name=="calendars.php"||$File3Name=="/calendars.php") { @@ -105,6 +105,9 @@ $MyMonthName = $calcurtime->format("F"); $MyMonthNum1 = $calcurtime->format("m"); $MyMonthNum2 = $calcurtime->format("n"); $FirstDayThisMonth = date("w", mktime(0, 0, 0, $MyMonth, 1, $MyYear)); +$MyCurDay = $usercurtime->format("j"); +$MyCurYear = $usercurtime->format("Y"); +$MyCurMonth = $usercurtime->format("m"); $EventsName = array(); $query = sql_pre_query("SELECT * FROM \"".$Settings['sqltable']."events\" WHERE (\"EventMonth\">=%i AND \"EventYear\"<%i AND \"EventYearEnd\">=%i) OR (\"EventMonth\"<=%i AND \"EventMonthEnd\">=%i AND \"EventYearEnd\">=%i) OR (\"EventMonth\"<=%i AND \"EventMonthEnd\"<=%i AND \"EventYear\"<=%i AND \"EventYearEnd\">%i)", array($MyMonth,$MyYear,$MyYear,$MyMonth,$MyMonth,$MyYear,$MyMonth,$MyMonth,$MyYear,$MyYear)); $result=sql_query($query,$SQLStat); @@ -197,16 +200,16 @@ for ($i; $i <= ($CountDays + $FirstDayThisMonth) ;$i++) { if ($ii == 8) { $WeekDays .= ""."\r\n"; $ii = 1; } - if ($MyDay == $Day_i && $MyMonthNum1 == $MyRealMonthNum1 && $MyYear == $MyRealYear) { + if ($MyCurDay == $Day_i && $MyCurMonth == $MyRealMonthNum1 && $MyCurYear == $MyRealYear) { $Extra = 'CalTableColumn3Current'; } else { $Extra = 'CalTableColumn3'; } if ($Day_i != $_GET['HighligtDay']) { if(!isset($EventsName[$Day_i])) { $EventsName[$Day_i] = null; } if($EventsName[$Day_i]!=null) { $EventsName[$Day_i] = " ( ".$EventsName[$Day_i]." )"; } -if ($Day_i != $MyDay) { +if ($Day_i != $MyCurDay) { $WeekDays .= '
' . $Day_i . '
' . $EventsName[$Day_i] . ''."\r\n"; } } -if ($Day_i == $MyDay) { +if ($Day_i == $MyCurDay) { $WeekDays .= '
' . $Day_i . '
' . $EventsName[$Day_i] . ''."\r\n"; } $Day_i++; $ii++; diff --git a/inc/versioninfo.php b/inc/versioninfo.php index cb8df6a..ac3d279 100644 --- a/inc/versioninfo.php +++ b/inc/versioninfo.php @@ -11,7 +11,7 @@ Copyright 2004-2015 iDB Support - http://idb.berlios.de/ Copyright 2004-2015 Game Maker 2k - http://gamemaker2k.org/ - $FileInfo: versioninfo.php - Last Update: 09/10/2015 SVN 801 - Author: cooldude2k $ + $FileInfo: versioninfo.php - Last Update: 09/10/2015 SVN 803 - Author: cooldude2k $ */ $File3Name = basename($_SERVER['SCRIPT_NAME']); if ($File3Name=="versioninfo.php"||$File3Name=="/versioninfo.php") { @@ -27,7 +27,7 @@ function version_info($proname,$subver,$ver,$supver,$reltype,$svnver,$showsvn) { return $return_var; } // Version number and date stuff. :P $VER1[0] = 0; $VER1[1] = 4; $VER1[2] = 8; $VERFull[1] = $VER1[0].".".$VER1[1].".".$VER1[2]; -$VER2[0] = "Alpha"; $VER2[1] = "Al"; $VER2[2] = "SVN"; $SubVerN = 802; +$VER2[0] = "Alpha"; $VER2[1] = "Al"; $VER2[2] = "SVN"; $SubVerN = 803; $SVNDay[0] = 9; $SVNDay[1] = 10; $SVNDay[2] = 2015; $SVNDay[3] = $SVNDay[0]."/".$SVNDay[1]."/".$SVNDay[2]; $AltName = "DF2k"; $AltName2 = "DF2k"; $RName = "iDB"; $SFName = "IntDB"; $RFullName = "Internet Discussion Boards"; $AltFullName = "Discussion Forums 2k"; $AltGM2k = "DF2k Team"; -- 2.11.0