lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

New: Support "fulday" event in calendar module

Browse Source
This commit is contained in:
Laurent Destailleur 2010-11-21 16:23:26 +00:00
parent e3f455899b
commit ff24fd67e2
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/comm/action/fiche.php
View File

@ -95,7 +95,7 @@ if ($_POST["action"] == 'add_action')
$datep2=dol_mktime( $datep2=dol_mktime(
$fulldayevent?'23':$_POST["p2hour"], $fulldayevent?'23':$_POST["p2hour"],
$fulldayevent?'59':$_POST["p2min"], $fulldayevent?'59':$_POST["p2min"],
0, $fulldayevent?'59':'0',
$_POST["p2month"], $_POST["p2month"],
$_POST["p2day"], $_POST["p2day"],
$_POST["p2year"]); $_POST["p2year"]);
@ -315,7 +315,7 @@ if (GETPOST("action") == 'update')
$datep2=dol_mktime( $datep2=dol_mktime(
$fulldayevent?'23':$_POST["p2hour"], $fulldayevent?'23':$_POST["p2hour"],
$fulldayevent?'59':$_POST["p2min"], $fulldayevent?'59':$_POST["p2min"],
0, $fulldayevent?'59':'0',
$_POST["p2month"], $_POST["p2month"],
$_POST["p2day"], $_POST["p2day"],
$_POST["p2year"]); $_POST["p2year"]);

3
htdocs/lib/xcal.lib.php
View File

@ -201,7 +201,8 @@ function build_calfile($format='vcal',$title,$desc,$events_array,$outputfile)
if ($fulldayevent) if ($fulldayevent)
{ {
$prefix=';VALUE=DATE'; $prefix=';VALUE=DATE';
$enddatef = dol_print_date($enddate+1,'dayxcard',false); // Local time $enddatef = dol_print_date($enddate+1,'dayxcard',false);
//$enddatef .= dol_print_date($enddate+1,'dayhourxcard',false); // Local time
} }
fwrite($calfileh,"DTEND".$prefix.":".$enddatef."\n"); fwrite($calfileh,"DTEND".$prefix.":".$enddatef."\n");
fwrite($calfileh,'STATUS:CONFIRMED'."\n"); fwrite($calfileh,'STATUS:CONFIRMED'."\n");