From 4066c6eb80ec019c4c2572037b1475152ef53a52 Mon Sep 17 00:00:00 2001
From: skeeter <skeeter@alumni.egroupware.org>
Date: Fri, 29 Dec 2000 18:06:01 +0000
Subject: [PATCH] fix for free/busy view

---
 calendar/inc/functions.inc.php |  2 +-
 calendar/matrixselect.php      | 15 ++++++---------
 calendar/viewmatrix.php        |  6 +++++-
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/calendar/inc/functions.inc.php b/calendar/inc/functions.inc.php
index 934071def1..a5ca8d1e51 100755
--- a/calendar/inc/functions.inc.php
+++ b/calendar/inc/functions.inc.php
@@ -253,7 +253,7 @@
     }
 
     function date_to_epoch($d) {
-      return $this->splitdate(mktime(2,0,0,intval(substr($d,4,2)),intval(substr($d,6,2)),intval(substr($d,0,4))));
+      return $this->splitdate(mktime(0,0,0,intval(substr($d,4,2)),intval(substr($d,6,2)),intval(substr($d,0,4))));
     }
 
     function overlap($starttime,$endtime,$participants,$groups,$owner=0,$id=0) {
diff --git a/calendar/matrixselect.php b/calendar/matrixselect.php
index d95ee48188..1add115d02 100755
--- a/calendar/matrixselect.php
+++ b/calendar/matrixselect.php
@@ -56,23 +56,20 @@
   $phpgw->template->set_var("field",lang("Date"));
 
   $day_html = "<select name=\"day\">";
-  for ($i = 1; $i <= 31; $i++)
-    $day_html .= "<option value=\"$i\"" . ($i == $thisday ? " selected" : "") . ">$i"
-	       . "</option>\n";
+  for($i=1;$i<=31;$i++)
+    $day_html .= "<option value=\"$i\"".($i==$thisday?" selected":"").">$i</option>\n";
   $day_html .= "</select>";
 
   $month_html = "<select name=\"month\">";
-  for ($i = 1; $i <= 12; $i++) {
+  for($i=1;$i<=12;$i++) {
     $m = lang(date("F", mktime(0,0,0,$i,1,$thisyear)));
-    $month_html .= "<option value=\"$i\"" . ($i == $thismonth ? " selected" : "") . ">$m"
-		 . "</option>\n";
+    $month_html .= "<option value=\"$i\"".($i==$thismonth?" selected":"").">$m</option>\n";
   }
   $month_html .= "</select>";
 
   $year_html = "<select name=\"year\">";
-  for ($i = ($thisyear - 1); $i < ($thisyear + 5); $i++) {
-    $year_html .= "<option value=\"$i\"" . ($i == $thisyear ? " selected" : "") . ">$i"
-	 	. "</option>\n";
+  for($i=($thisyear - 1);$i<($thisyear + 5);$i++) {
+    $year_html .= "<option value=\"$i\"".($i==$thisyear?" selected":"").">$i</option>\n";
   }
   $year_html .= "</select>";
 
diff --git a/calendar/viewmatrix.php b/calendar/viewmatrix.php
index f282aff578..806937a80b 100755
--- a/calendar/viewmatrix.php
+++ b/calendar/viewmatrix.php
@@ -36,9 +36,13 @@
       $thisyear = $phpgw->calendar->today["year"];
     else
       $thisyear = $year;
+    $date = $thisyear;
+    $date .= ($thismonth<=9?"0":"").$thismonth;
+    $date .= ($thisday<=9?"0":"").$thisday;
+
   }
 
-  $date = $thisyear.$thismonth.$thisday;
+//  $date = $thisyear.$thismonth.$thisday;
 
   if(isset($groups) && $groups) {
     for($i=0;$i<count($groups);$i++) {