holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix for free/busy view

Browse Source
This commit is contained in:
skeeter 2000-12-29 18:06:01 +00:00
parent 19a79c9735
commit 4066c6eb80
3 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
calendar/inc/functions.inc.php
View File

@ -253,7 +253,7 @@
} }
function date_to_epoch($d) { 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) { function overlap($starttime,$endtime,$participants,$groups,$owner=0,$id=0) {

15
calendar/matrixselect.php
View File

@ -56,23 +56,20 @@
$phpgw->template->set_var("field",lang("Date")); $phpgw->template->set_var("field",lang("Date"));
$day_html = "<select name=\"day\">"; $day_html = "<select name=\"day\">";
for ($i = 1; $i <= 31; $i++) for($i=1;$i<=31;$i++)
$day_html .= "<option value=\"$i\"" . ($i == $thisday ? " selected" : "") . ">$i" $day_html .= "<option value=\"$i\"".($i==$thisday?" selected":"").">$i</option>\n";
. "</option>\n";
$day_html .= "</select>"; $day_html .= "</select>";
$month_html = "<select name=\"month\">"; $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))); $m = lang(date("F", mktime(0,0,0,$i,1,$thisyear)));
$month_html .= "<option value=\"$i\"" . ($i == $thismonth ? " selected" : "") . ">$m" $month_html .= "<option value=\"$i\"".($i==$thismonth?" selected":"").">$m</option>\n";
. "</option>\n";
} }
$month_html .= "</select>"; $month_html .= "</select>";
$year_html = "<select name=\"year\">"; $year_html = "<select name=\"year\">";
for ($i = ($thisyear - 1); $i < ($thisyear + 5); $i++) { for($i=($thisyear - 1);$i<($thisyear + 5);$i++) {
$year_html .= "<option value=\"$i\"" . ($i == $thisyear ? " selected" : "") . ">$i" $year_html .= "<option value=\"$i\"".($i==$thisyear?" selected":"").">$i</option>\n";
. "</option>\n";
} }
$year_html .= "</select>"; $year_html .= "</select>";

6
calendar/viewmatrix.php
View File

@ -36,9 +36,13 @@
$thisyear = $phpgw->calendar->today["year"]; $thisyear = $phpgw->calendar->today["year"];
else else
$thisyear = $year; $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) { if(isset($groups) && $groups) {
for($i=0;$i<count($groups);$i++) { for($i=0;$i<count($groups);$i++) {