extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-26 15:59:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix for 12am times

Browse Source
This commit is contained in:
skeeter 2001-01-21 16:10:43 +00:00
parent 29ab476381
commit 24b1576f26
1 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
calendar/edit_entry_handler.php
View File

@ -28,11 +28,13 @@
$error = 41;
} elseif (($cal_info->minute < 0 || $cal_info->minute > 59) || ($cal_info->end_minute < 0 || $cal_info->minute > 59)) {
$error = 41;
} elseif(!checkdate($cal_info->month,$cal_info->day,$cal_info->year) || !checkdate($cal_info->end_month,$cal_info->end_day,$cal_info->end_year)) {
$error = 42;
} elseif (($cal_info->year == $cal_info->end_year) && ($cal_info->month == $cal_info->end_month) && ($cal_info->day == $cal_info->end_day)) {
if ($cal_info->hour > $cal_info->end_hour) {
$error = 42;
$error = 42;
} elseif (($cal_info->hour == $cal_info->end_hour) && ($cal_info->minute > $cal_info->end_minute)) {
$error = 42;
$error = 42;
}
} elseif (($cal_info->year == $cal_info->end_year) && ($cal_info->month == $cal_info->end_month) && ($cal_info->day > $cal_info->end_day)) {
$error = 42;
@ -58,11 +60,23 @@
$cal_info->owner = $cal_info->participants[0];
}
if ($phpgw_info["user"]["preferences"]["common"]["timeformat"] == "12") {
if ($cal_info->ampm == "pm" && $cal_info->hour <> 12) {
$cal_info->hour += 12;
if ($cal_info->ampm == "pm") {
if ($cal_info->hour <> 12) {
$cal_info->hour += 12;
}
} elseif ($cal_info->ampm == "am") {
if ($cal_info->hour == 12) {
$cal_info->hour -= 12;
}
}
if ($cal_info->end_ampm == "pm" && $cal_info->end_hour <> 12) {
$cal_info->end_hour += 12;
if ($cal_info->end_ampm == "pm") {
if ($cal_info->end_hour <> 12) {
$cal_info->end_hour += 12;
}
} elseif ($cal_info->end_ampm == "am") {
if ($cal_info->end_hour == 12) {
$cal_info->end_hour -= 12;
}
}
}
$cal_info->datetime = mktime($cal_info->hour,$cal_info->minute,0,$cal_info->month,$cal_info->day,$cal_info->year) - ((60 * 60) * $phpgw_info["user"]["preferences"]["common"]["tz_offset"]);