diff --git a/htdocs/admin/agenda_xcal.php b/htdocs/admin/agenda_xcal.php index 4a7135f2ec2..63708af2dd1 100644 --- a/htdocs/admin/agenda_xcal.php +++ b/htdocs/admin/agenda_xcal.php @@ -140,13 +140,13 @@ print ""; print ''; print "".$langs->trans("PastDelayVCalExport").""; -print ' '.$langs->trans("days").""; +print ' '.$langs->trans("days").""; print " "; print ""; print ''; print "".$langs->trans("UseACacheDelay").""; -print ''; +print ' '.$langs->trans("seconds").''; print " "; print ""; @@ -241,7 +241,7 @@ $message .= $langs->trans("AgendaUrlOptionsType", 'systemauto|system').'
'; $message .= $langs->trans("AgendaUrlOptionsCode", 'AC_COMPANY_CREATE,AC_PROPAL_VALIDATE,AC_CODE...').'
'; $message .= $langs->trans("AgendaUrlOptionsIncludeHolidays", '1', '1').'
'; //$defaultnotolderthan = getDolGlobalString('MAIN_AGENDA_EXPORT_PAST_DELAY', 100); -//$message .= $langs->trans("AgendaUrlOptionsLimitDays", $defaultnotolderthan, $defaultnotolderthan, $defaultnotolderthan).'
'; +//$message .= $langs->trans("AgendaUrlOptionsLimitDays", 'X', 'X', $defaultnotolderthan).'
'; // This option is hidden because already set and defined into previous options $message .= $langs->trans("AgendaUrlOptionsLimit", '1000').'
'; print info_admin($message); diff --git a/htdocs/core/lib/xcal.lib.php b/htdocs/core/lib/xcal.lib.php index 1d50d526477..a3c01f3479e 100644 --- a/htdocs/core/lib/xcal.lib.php +++ b/htdocs/core/lib/xcal.lib.php @@ -73,9 +73,9 @@ function build_calfile($format, $title, $desc, $events_array, $outputfile) //fwrite($calfileh,"X-WR-TIMEZONE:Europe/Paris\n"); if (getDolGlobalString('MAIN_AGENDA_EXPORT_CACHE') && getDolGlobalInt('MAIN_AGENDA_EXPORT_CACHE') > 60) { - $hh = convertSecondToTime($conf->global->MAIN_AGENDA_EXPORT_CACHE, "hour"); - $mm = convertSecondToTime($conf->global->MAIN_AGENDA_EXPORT_CACHE, "min"); - $ss = convertSecondToTime($conf->global->MAIN_AGENDA_EXPORT_CACHE, "sec"); + $hh = convertSecondToTime(getDolGlobalInt('MAIN_AGENDA_EXPORT_CACHE'), "hour"); + $mm = convertSecondToTime(getDolGlobalInt('MAIN_AGENDA_EXPORT_CACHE'), "min"); + $ss = convertSecondToTime(getDolGlobalInt('MAIN_AGENDA_EXPORT_CACHE'), "sec"); fwrite($calfileh, "X-PUBLISHED-TTL: P".$hh."H".$mm."M".$ss."S\n"); }