diff --git a/htdocs/lib/security.lib.php b/htdocs/lib/security.lib.php index f01922f9f2739c8ef64d6aee3ef5a822b6cd7d08..a36dd0e8e8fe9cdd1ceeb27182e96eb79ef9a926 100644 --- a/htdocs/lib/security.lib.php +++ b/htdocs/lib/security.lib.php @@ -74,12 +74,11 @@ function dol_loginfunction($langs,$conf,$mysoc) { $template_dir = DOL_DOCUMENT_ROOT."/core/tpl/"; } - - $conf->css = "/theme/".$conf->theme."/".$conf->theme.".css.php?lang=".$langs->defaultlang; - - $conf_css = DOL_URL_ROOT.$conf->css; } + $conf->css = "/theme/".$conf->theme."/".$conf->theme.".css.php?lang=".$langs->defaultlang; + $conf_css = DOL_URL_ROOT.$conf->css; + // Set cookie for timeout management $sessiontimeout='DOLSESSTIMEOUT_'.md5($_SERVER["SERVER_NAME"].$_SERVER["DOCUMENT_ROOT"]); if (! empty($conf->global->MAIN_SESSION_TIMEOUT)) setcookie($sessiontimeout, $conf->global->MAIN_SESSION_TIMEOUT, 0, "/", '', 0); @@ -204,7 +203,7 @@ function dol_loginfunction($langs,$conf,$mysoc) } } $main_home=nl2br($conf->global->MAIN_HOME); - + // Google AD $main_google_ad_client = ((! empty($conf->global->MAIN_GOOGLE_AD_CLIENT) && ! empty($conf->global->MAIN_GOOGLE_AD_SLOT))?1:0); diff --git a/htdocs/user/passwordforgotten.php b/htdocs/user/passwordforgotten.php index adb5c948089dccf254c5ef6a117f1c5db48d9ff3..0f3b223d8a54537edce178cfb299d8059ed9104d 100644 --- a/htdocs/user/passwordforgotten.php +++ b/htdocs/user/passwordforgotten.php @@ -165,12 +165,11 @@ else { $template_dir = DOL_DOCUMENT_ROOT."/core/tpl/"; } - - $conf->css = "/theme/".$conf->theme."/".$conf->theme.".css.php?lang=".$langs->defaultlang; - - $conf_css = DOL_URL_ROOT.$conf->css; } +$conf->css = "/theme/".$conf->theme."/".$conf->theme.".css.php?lang=".$langs->defaultlang; +$conf_css = DOL_URL_ROOT.$conf->css; + if (file_exists(DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/img/login_background.png')) { $login_background = DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/login_background.png';