From e8c266bc9e4bfb7aac37f084d219831c501b834d Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 12 Dec 2011 01:50:29 +0100 Subject: [PATCH 1/8] Fix: Removed warning --- htdocs/admin/system/dolibarr.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/admin/system/dolibarr.php b/htdocs/admin/system/dolibarr.php index 2da8ebf02bc..689dfdade68 100644 --- a/htdocs/admin/system/dolibarr.php +++ b/htdocs/admin/system/dolibarr.php @@ -198,7 +198,7 @@ if ($_SESSION['dol_dst']>0) print ($_SESSION['dol_dst']>0?'+':'').($_SESSION['dol_dst']).' ('.($_SESSION['dol_dst']>0?'+':'').($_SESSION['dol_dst']*60*60).')'; } else print yn(0); -if (isset($_SESSION['dol_dst_first'])) print '     ('.dol_print_date(dol_stringtotime($_SESSION['dol_dst_first']),'dayhour','gmt').' - '.dol_print_date(dol_stringtotime($_SESSION['dol_dst_second']),'dayhour','gmt').')'; +if (! empty($_SESSION['dol_dst_first'])) print '     ('.dol_print_date(dol_stringtotime($_SESSION['dol_dst_first']),'dayhour','gmt').' - '.dol_print_date(dol_stringtotime($_SESSION['dol_dst_second']),'dayhour','gmt').')'; print ''."\n"; $var=!$var; print '  => '.$langs->trans("ClientHour").''.dol_print_date(dol_now(),'dayhour','tzuser').''."\n"; From 1934acf10cf420d35bf2c8c7db151ea6c4ea6a50 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 12 Dec 2011 01:58:11 +0100 Subject: [PATCH 2/8] Fix: Saving daylight detection --- htdocs/theme/bureau2crea/tpl/login.tpl.php | 124 +++++++++++++++++++-- 1 file changed, 117 insertions(+), 7 deletions(-) diff --git a/htdocs/theme/bureau2crea/tpl/login.tpl.php b/htdocs/theme/bureau2crea/tpl/login.tpl.php index 63185dd8c26..3654e6520be 100644 --- a/htdocs/theme/bureau2crea/tpl/login.tpl.php +++ b/htdocs/theme/bureau2crea/tpl/login.tpl.php @@ -35,17 +35,120 @@ header("Content-type: text/html; charset=".$conf->file->character_set_client); <?php echo $langs->trans('Login'); ?> -global->MAIN_HTML_HEADER ?> -theme.'/img/favicon.ico'; -?> - + +global->MAIN_HTML_HEADER)) print $conf->global->MAIN_HTML_HEADER; ?> +