extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-10-05 09:42:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix for adding/editing entries displaying improper hour format

Browse Source
This commit is contained in:
skeeter 2000-12-05 01:14:18 +00:00
parent d9d46e04f6
commit 888b35ddef
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
calendar/edit_entry.php
View File

@ -20,6 +20,12 @@
$cal_info = new calendar_item;
if ($phpgw_info["user"]["preferences"]["common"]["timeformat"] == "12") {
$hourformat .= "h";
} else {
$hourformat .= "H";
}
if ($id > 0) {
$cal = $phpgw->calendar->getevent(intval($id));
$cal_info = $cal[0];
@ -135,7 +141,7 @@
$amsel = "checked"; $pmsel = "";
}
}
$str = "<input name=\"hour\" size=\"2\" VALUE=\"".$phpgw->common->show_date($cal_info->datetime,"H")."\" maxlength=\"2\">:<input name=\"minute\" size=\"2\" value=\"".$phpgw->common->show_date($cal_info->datetime,"i")."\" maxlength=\"2\">";
$str = "<input name=\"hour\" size=\"2\" VALUE=\"".$phpgw->common->show_date($cal_info->datetime,$hourformat)."\" maxlength=\"2\">:<input name=\"minute\" size=\"2\" value=\"".$phpgw->common->show_date($cal_info->datetime,"i")."\" maxlength=\"2\">";
if ($phpgw_info["user"]["preferences"]["common"]["timeformat"] == "12") {
$str .= "<input type=\"radio\" name=\"ampm\" value=\"am\" $amsel>am";
$str .= "<input type=\"radio\" name=\"ampm\" value=\"pm\" $pmsel>pm";
@ -179,7 +185,7 @@
$amsel = "checked"; $pmsel = "";
}
}
$str = "<input name=\"end_hour\" size=\"2\" VALUE=\"".$phpgw->common->show_date($cal_info->edatetime,"H")."\" maxlength=\"2\">:<input name=\"end_minute\" size=\"2\" value=\"".$phpgw->common->show_date($cal_info->edatetime,"i")."\" maxlength=\"2\">";
$str = "<input name=\"end_hour\" size=\"2\" VALUE=\"".$phpgw->common->show_date($cal_info->edatetime,$hourformat)."\" maxlength=\"2\">:<input name=\"end_minute\" size=\"2\" value=\"".$phpgw->common->show_date($cal_info->edatetime,"i")."\" maxlength=\"2\">";
if ($phpgw_info["user"]["preferences"]["common"]["timeformat"] == "12") {
$str .= "<input type=\"radio\" name=\"end_ampm\" value=\"am\" $amsel>am";
$str .= "<input type=\"radio\" name=\"end_ampm\" value=\"pm\" $pmsel>pm";