From 981334434655f18933b3a0232e78cd8475349780 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Sun, 2 Sep 2012 08:50:42 +0200
Subject: [PATCH 1/3] Fix: broken features and uniformize code

---
 htdocs/theme/bureau2crea/tpl/login.tpl.php | 155 +++------------------
 1 file changed, 18 insertions(+), 137 deletions(-)

diff --git a/htdocs/theme/bureau2crea/tpl/login.tpl.php b/htdocs/theme/bureau2crea/tpl/login.tpl.php
index 8d79accc79d..2fd9af9b9d7 100644
--- a/htdocs/theme/bureau2crea/tpl/login.tpl.php
+++ b/htdocs/theme/bureau2crea/tpl/login.tpl.php
@@ -34,10 +34,13 @@ print '<!-- Includes for JQuery (Ajax library) -->'."\n";
 if (constant('JS_JQUERY_UI')) print '<link rel="stylesheet" type="text/css" href="'.JS_JQUERY_UI.'css/'.$jquerytheme.'/jquery-ui.min.css" />'."\n";  // JQuery
 else print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/css/'.$jquerytheme.'/jquery-ui-latest.custom.css" />'."\n";    // JQuery
 // JQuery. Must be before other includes
+$ext='.js';
+if (isset($conf->global->MAIN_OPTIMIZE_SPEED) && ($conf->global->MAIN_OPTIMIZE_SPEED & 0x01)) $ext='.jgz';
 print '<!-- Includes JS for JQuery -->'."\n";
 if (constant('JS_JQUERY')) print '<script type="text/javascript" src="'.JS_JQUERY.'jquery.min.js"></script>'."\n";
 else print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/js/jquery-latest.min'.$ext.'"></script>'."\n";
-print '<link rel="stylesheet" type="text/css" href="'.$conf_css.'" />
+print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/core/js/dst.js"></script>'."\n";
+print '<link rel="stylesheet" type="text/css" href="'.dol_escape_htmltag($conf_css).'" />
 <style type="text/css">
 <!--
 #login {
@@ -61,140 +64,9 @@ print '<!-- HTTP_USER_AGENT = '.$_SERVER['HTTP_USER_AGENT'].' -->
 
 <!-- Javascript code on logon page only to detect user tz, dst_observed, dst_first, dst_second -->
 <script type="text/javascript">
-function DisplayDstSwitchDates(firstsecond)
-{
-    var year = new Date().getYear();
-    if (year < 1000) year += 1900;
-
-    var firstSwitch = 0;
-    var secondSwitch = 0;
-    var lastOffset = 99;
-
-    // Loop through every month of the current year
-    for (i = 0; i < 12; i++)
-    {
-        // Fetch the timezone value for the month
-        var newDate = new Date(Date.UTC(year, i, 0, 0, 0, 0, 0));
-        var tz = -1 * newDate.getTimezoneOffset() / 60;
-
-        // Capture when a timzezone change occurs
-        if (tz > lastOffset)
-            firstSwitch = i-1;
-        else if (tz < lastOffset)
-            secondSwitch = i-1;
-
-        lastOffset = tz;
-    }
-
-    // Go figure out date/time occurences a minute before
-    // a DST adjustment occurs
-    var secondDstDate = FindDstSwitchDate(year, secondSwitch);
-    var firstDstDate = FindDstSwitchDate(year, firstSwitch);
-
-	if (firstsecond == 'first') return firstDstDate;
-	if (firstsecond == 'second') return secondDstDate;
-
-    if (firstDstDate == null && secondDstDate == null)
-        return 'Daylight Savings is not observed in your timezone.';
-    else
-        return 'Last minute before DST change occurs in ' +
-           year + ': ' + firstDstDate + ' and ' + secondDstDate;
-}
-
-function FindDstSwitchDate(year, month)
-{
-    // Set the starting date
-    var baseDate = new Date(Date.UTC(year, month, 0, 0, 0, 0, 0));
-    var changeDay = 0;
-    var changeMinute = -1;
-    var baseOffset = -1 * baseDate.getTimezoneOffset() / 60;
-    var dstDate;
-
-    // Loop to find the exact day a timezone adjust occurs
-    for (day = 0; day < 50; day++)
-    {
-        var tmpDate = new Date(Date.UTC(year, month, day, 0, 0, 0, 0));
-        var tmpOffset = -1 * tmpDate.getTimezoneOffset() / 60;
-
-        // Check if the timezone changed from one day to the next
-        if (tmpOffset != baseOffset)
-        {
-            var minutes = 0;
-            changeDay = day;
-
-            // Back-up one day and grap the offset
-            tmpDate = new Date(Date.UTC(year, month, day-1, 0, 0, 0, 0));
-            tmpOffset = -1 * tmpDate.getTimezoneOffset() / 60;
-
-            // Count the minutes until a timezone chnage occurs
-            while (changeMinute == -1)
-            {
-                tmpDate = new Date(Date.UTC(year, month, day-1, 0, minutes, 0, 0));
-                tmpOffset = -1 * tmpDate.getTimezoneOffset() / 60;
-
-                // Determine the exact minute a timezone change
-                // occurs
-                if (tmpOffset != baseOffset)
-                {
-                    // Back-up a minute to get the date/time just
-                    // before a timezone change occurs
-                    tmpOffset = new Date(Date.UTC(year, month,
-                                         day-1, 0, minutes-1, 0, 0));
-                    changeMinute = minutes;
-                    break;
-                }
-                else
-                    minutes++;
-            }
-
-            // Add a month (for display) since JavaScript counts
-            // months from 0 to 11
-            dstDate = tmpOffset.getMonth() + 1;
-
-            // Pad the month as needed
-            if (dstDate < 10) dstDate = "0" + dstDate;
-
-            // Add the day and year
-            dstDate = year + '-' + dstDate + '-' + tmpOffset.getDate() + 'T';
-
-            // Capture the time stamp
-            tmpDate = new Date(Date.UTC(year, month,
-                               day-1, 0, minutes-1, 0, 0));
-            dstDate += tmpDate.toTimeString().split(' ')[0] + 'Z';
-            return dstDate;
-        }
-    }
-}
-
-jQuery(document).ready(function () {
+$(document).ready(function () {
 	// Set focus on correct field
-	<?php if ($focus_element) { ?>jQuery('#<?php echo $focus_element; ?>').focus(); <?php } ?>		// Warning to use this only on visible element
-	// Detect and save TZ and DST
-	var rightNow = new Date();
-	var jan1 = new Date(rightNow.getFullYear(), 0, 1, 0, 0, 0, 0);
-	var temp = jan1.toGMTString();
-	var jan2 = new Date(temp.substring(0, temp.lastIndexOf(" ")-1));
-	var std_time_offset = (jan1 - jan2) / (1000 * 60 * 60);
-	var june1 = new Date(rightNow.getFullYear(), 6, 1, 0, 0, 0, 0);
-	temp = june1.toGMTString();
-	var june2 = new Date(temp.substring(0, temp.lastIndexOf(" ")-1));
-	var daylight_time_offset = (june1 - june2) / (1000 * 60 * 60);
-	var dst;
-	if (std_time_offset == daylight_time_offset) {
-	    dst = "0"; // daylight savings time is NOT observed
-	} else {
-	    dst = "1"; // daylight savings time is observed
-	}
-	var dst_first=DisplayDstSwitchDates('first');
-	var dst_second=DisplayDstSwitchDates('second');
-	//alert(dst);
-	jQuery('#tz').val(std_time_offset);   				  // returns TZ
-	jQuery('#dst_observed').val(dst);   				  // returns if DST is observed on summer
-	jQuery('#dst_first').val(dst_first);   				  // returns DST first switch in year
-	jQuery('#dst_second').val(dst_second);   			  // returns DST second switch in year
-	// Detect and save screen resolution
-	jQuery('#screenwidth').val(jQuery(window).width());   // returns width of browser viewport
-	jQuery('#screenheight').val(jQuery(window).height());   // returns width of browser viewport
+	<?php if ($focus_element) { ?>$('#<?php echo $focus_element; ?>').focus(); <?php } ?>		// Warning to use this only on visible element
 });
 </script>
 
@@ -203,11 +75,14 @@ jQuery(document).ready(function () {
 <input type="hidden" name="loginfunction" value="loginfunction" />
 <!-- Add fields to send local user information -->
 <input type="hidden" name="tz" id="tz" value="" />
+<input type="hidden" name="tz_string" id="tz_string" value="" />
 <input type="hidden" name="dst_observed" id="dst_observed" value="" />
 <input type="hidden" name="dst_first" id="dst_first" value="" />
 <input type="hidden" name="dst_second" id="dst_second" value="" />
 <input type="hidden" name="screenwidth" id="screenwidth" value="" />
 <input type="hidden" name="screenheight" id="screenheight" value="" />
+<input type="hidden" name="dol_hide_topmenu" id="dol_hide_topmenu" value="" />
+<input type="hidden" name="dol_hide_leftmenu" id="dol_hide_leftmenu" value="" />
 
 <div id="infoVersion"><?php echo $title; ?></div>
 
@@ -220,9 +95,15 @@ jQuery(document).ready(function () {
 <div id="logBox"><strong><label for="username"><?php echo $langs->trans('Login'); ?></label></strong><input type="text" id="username" name="username" class="flat" size="15" maxlength="40" value="<?php echo GETPOST('username')?GETPOST('username'):$login; ?>" tabindex="1" /></div>
 <div id="passBox"><strong><label for="password"><?php echo $langs->trans('Password'); ?></label></strong><input id="password" name="password" class="flat" type="password" size="15" maxlength="30" value="<?php echo $password; ?>" tabindex="2" /></div>
 
-	<?php if ($select_entity) { ?>
-		<div><strong><?php echo $langs->trans('Entity'); ?></strong><?php echo $select_entity; ?></div>
-	<?php } ?>
+	<?php
+	if (! empty($hookmanager->resArray['options'])) {
+		foreach ($hookmanager->resArray['options'] as $option)
+		{
+			echo '<!-- Option by hook -->';
+			echo $option;
+		}
+	}
+	?>
 
 	<?php if ($captcha) { ?>
 		<div class="captchaBox">

From 63564f8d5008822a897207b5a1cbd18c5ac81dcb Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Sun, 2 Sep 2012 09:27:06 +0200
Subject: [PATCH 2/3] Fix: broken features

---
 htdocs/core/tpl/passwordforgotten.tpl.php     | 19 ++++---
 .../bureau2crea/tpl/passwordforgotten.tpl.php | 18 ++++---
 htdocs/user/passwordforgotten.php             | 49 +++++++------------
 3 files changed, 43 insertions(+), 43 deletions(-)

diff --git a/htdocs/core/tpl/passwordforgotten.tpl.php b/htdocs/core/tpl/passwordforgotten.tpl.php
index c9ea31a7117..d1a8ae622f1 100644
--- a/htdocs/core/tpl/passwordforgotten.tpl.php
+++ b/htdocs/core/tpl/passwordforgotten.tpl.php
@@ -35,10 +35,12 @@ print '<!-- Includes for JQuery (Ajax library) -->'."\n";
 if (constant('JS_JQUERY_UI')) print '<link rel="stylesheet" type="text/css" href="'.JS_JQUERY_UI.'css/'.$jquerytheme.'/jquery-ui.min.css" />'."\n";  // JQuery
 else print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/css/'.$jquerytheme.'/jquery-ui-latest.custom.css" />'."\n";    // JQuery
 // JQuery. Must be before other includes
+$ext='.js';
+if (isset($conf->global->MAIN_OPTIMIZE_SPEED) && ($conf->global->MAIN_OPTIMIZE_SPEED & 0x01)) $ext='.jgz';
 print '<!-- Includes JS for JQuery -->'."\n";
 if (constant('JS_JQUERY')) print '<script type="text/javascript" src="'.JS_JQUERY.'jquery.min.js"></script>'."\n";
 else print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/js/jquery-latest.min'.$ext.'"></script>'."\n";
-print '<link rel="stylesheet" type="text/css" href="'.$conf_css.'" />'."\n";
+print '<link rel="stylesheet" type="text/css" href="'.dol_escape_htmltag($conf_css).'" />'."\n";
 if (! empty($conf->global->MAIN_HTML_HEADER)) print $conf->global->MAIN_HTML_HEADER;
 print '<!-- HTTP_USER_AGENT = '.$_SERVER['HTTP_USER_AGENT'].' -->
 </head>';
@@ -68,12 +70,15 @@ print '<!-- HTTP_USER_AGENT = '.$_SERVER['HTTP_USER_AGENT'].' -->
 <input type="text" <?php echo $disabled; ?> id="username" name="username" class="flat" size="15" maxlength="25" value="<?php echo $login; ?>" tabindex="1" /></td>
 </tr>
 
-<?php if ($select_entity) { ?>
-	<tr><td valign="top" nowrap="nowrap"> &nbsp; <b><?php echo $langs->trans('Entity'); ?></b> &nbsp; </td>
-	<td valign="top" nowrap="nowrap">
-<?php echo $select_entity; ?>
-	</td></tr>
-<?php } ?>
+<?php
+if (! empty($hookmanager->resArray['options'])) {
+	foreach ($hookmanager->resArray['options'] as $option)
+	{
+		echo '<!-- Option by hook -->';
+		echo $option;
+	}
+}
+?>
 
 <?php if ($captcha) { ?>
 	<tr><td valign="middle" nowrap="nowrap"> &nbsp; <b><?php echo $langs->trans('SecurityCode'); ?></b></td>
diff --git a/htdocs/theme/bureau2crea/tpl/passwordforgotten.tpl.php b/htdocs/theme/bureau2crea/tpl/passwordforgotten.tpl.php
index 283959138c0..956263634e4 100644
--- a/htdocs/theme/bureau2crea/tpl/passwordforgotten.tpl.php
+++ b/htdocs/theme/bureau2crea/tpl/passwordforgotten.tpl.php
@@ -35,10 +35,12 @@ print '<!-- Includes for JQuery (Ajax library) -->'."\n";
 if (constant('JS_JQUERY_UI')) print '<link rel="stylesheet" type="text/css" href="'.JS_JQUERY_UI.'css/'.$jquerytheme.'/jquery-ui.min.css" />'."\n";  // JQuery
 else print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/css/'.$jquerytheme.'/jquery-ui-latest.custom.css" />'."\n";    // JQuery
 // JQuery. Must be before other includes
+$ext='.js';
+if (isset($conf->global->MAIN_OPTIMIZE_SPEED) && ($conf->global->MAIN_OPTIMIZE_SPEED & 0x01)) $ext='.jgz';
 print '<!-- Includes JS for JQuery -->'."\n";
 if (constant('JS_JQUERY')) print '<script type="text/javascript" src="'.JS_JQUERY.'jquery.min.js"></script>'."\n";
 else print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/js/jquery-latest.min'.$ext.'"></script>'."\n";
-print '<link rel="stylesheet" type="text/css" href="'.$conf_css.'" />'."\n";
+print '<link rel="stylesheet" type="text/css" href="'.dol_escape_htmltag($conf_css).'" />'."\n";
 if (! empty($conf->global->MAIN_HTML_HEADER)) print $conf->global->MAIN_HTML_HEADER;
 print '<!-- HTTP_USER_AGENT = '.$_SERVER['HTTP_USER_AGENT'].' -->
 </head>';
@@ -59,11 +61,15 @@ print '<!-- HTTP_USER_AGENT = '.$_SERVER['HTTP_USER_AGENT'].' -->
 <div id="parameterBox">
 	<div id="logBox"><strong><label for="username"><?php echo $langs->trans('Login'); ?></label></strong><input type="text" <?php echo $disabled; ?> id="username" name="username" class="flat" size="15" maxlength="25" value="<?php echo $login; ?>" tabindex="1" /></div>
 
-	<?php if ($select_entity) { ?>
-        <div><?php echo $langs->trans('Entity'); ?> &nbsp;
-        <?php echo $select_entity; ?>
-        </div>
-    <?php } ?>
+	<?php
+	if (! empty($hookmanager->resArray['options'])) {
+		foreach ($hookmanager->resArray['options'] as $option)
+		{
+			echo '<!-- Option by hook -->';
+			echo $option;
+		}
+	}
+	?>
 
     <?php if ($captcha) { ?>
         <div class="captchaBox">
diff --git a/htdocs/user/passwordforgotten.php b/htdocs/user/passwordforgotten.php
index 2b7cc2c66b1..b1de66d6a96 100644
--- a/htdocs/user/passwordforgotten.php
+++ b/htdocs/user/passwordforgotten.php
@@ -1,7 +1,7 @@
 <?php
-/* Copyright (C) 2007-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2008-2011 Regis Houssin        <regis@dolibarr.fr>
- * Copyright (C) 2008-2011 Juanjo Menent        <jmenent@2byte.es>
+/* Copyright (C) 2007-2011	Laurent Destailleur	<eldy@users.sourceforge.net>
+ * Copyright (C) 2008-2012	Regis Houssin		<regis@dolibarr.fr>
+ * Copyright (C) 2008-2011	Juanjo Menent		<jmenent@2byte.es>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -27,7 +27,8 @@ define("NOLOGIN",1);	// This means this output page does not require to be logge
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/usergroups.lib.php';
-if ($conf->ldap->enabled) require_once DOL_DOCUMENT_ROOT.'/core/class/ldap.class.php';
+if (! empty($conf->ldap->enabled))
+	require_once DOL_DOCUMENT_ROOT.'/core/class/ldap.class.php';
 
 $langs->load("errors");
 $langs->load("users");
@@ -42,7 +43,7 @@ if ($conf->global->MAIN_SECURITY_DISABLEFORGETPASSLINK)
     exit;
 }
 
-$action=GETPOST('action');
+$action=GETPOST('action', 'alpha');
 $mode=$dolibarr_main_authentication;
 if (! $mode) $mode='http';
 
@@ -50,6 +51,14 @@ $username 		= GETPOST('username');
 $passwordmd5	= GETPOST('passwordmd5');
 $conf->entity 	= (GETPOST('entity') ? GETPOST('entity') : 1);
 
+// Instantiate hooks of thirdparty module only if not already define
+if (! is_object($hookmanager))
+{
+	include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
+	$hookmanager=new HookManager($db);
+}
+$hookmanager->initHooks(array('passwordforgottenpage'));
+
 
 /**
  * Actions
@@ -204,31 +213,6 @@ elseif (! empty($mysoc->logo_small) && is_readable($conf->mycompany->dir_output.
     $urllogo=DOL_URL_ROOT.'/theme/dolibarr_logo.png';
 }
 
-// Entity combobox
-$select_entity='';
-if (! empty($conf->multicompany->enabled)  && empty($conf->global->MULTICOMPANY_HIDE_LOGIN_COMBOBOX) && ! $disabled)
-{
-    $rowspan++;
-    $lastuser='';
-    $lastentity = GETPOST('entity');
-
-    if (! empty($conf->global->MULTICOMPANY_COOKIE_ENABLED))
-    {
-        $prefix=dol_getprefix();
-        $entityCookieName = 'DOLENTITYID_'.$prefix;
-        if (isset($_COOKIE[$entityCookieName]))
-        {
-            include_once DOL_DOCUMENT_ROOT . '/core/class/cookie.class.php';
-            $lastuser = '';	$lastentity = '';
-            $entityCookie = new DolCookie($conf->file->cookie_cryptkey);
-            $cookieValue = $entityCookie->_getCookie($entityCookieName);
-            list($lastuser, $lastentity) = explode('|', $cookieValue);
-        }
-    }
-
-    $select_entity = $mc->select_entities($lastentity, 'entity', ' tabindex="2"');
-}
-
 // Security graphical code
 if (function_exists("imagecreatefrompng") && ! $disabled)
 {
@@ -236,6 +220,11 @@ if (function_exists("imagecreatefrompng") && ! $disabled)
     $captcha_refresh = img_picto($langs->trans("Refresh"),'refresh','id="captcha_refresh_img"');
 }
 
+// Execute hook getPasswordForgottenPageOptions
+// Should be an array with differents options in $hookmanager->resArray
+$parameters=array('entity' => GETPOST('entity','int'));
+$hookmanager->executeHooks('getPasswordForgottenPageOptions',$parameters);    // Note that $action and $object may have been modified by some hooks
+
 include $template_dir.'passwordforgotten.tpl.php';	// To use native PHP
 
 ?>
\ No newline at end of file

From ac5e201829a3fcdfa116cf4ed4740d2980b8e177 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Sun, 2 Sep 2012 11:36:42 +0200
Subject: [PATCH 3/3] Fix: compatibility between bureau2crea theme and
 multicompany module

---
 htdocs/core/tpl/login.tpl.php                 | 25 ++++++++++++++--
 htdocs/core/tpl/passwordforgotten.tpl.php     | 25 ++++++++++++++--
 htdocs/theme/bureau2crea/style.css.php        |  1 +
 htdocs/theme/bureau2crea/tpl/login.tpl.php    | 27 ++++++++++++++---
 .../bureau2crea/tpl/passwordforgotten.tpl.php | 30 ++++++++++++++++---
 htdocs/user/passwordforgotten.php             | 27 ++++++++++-------
 6 files changed, 110 insertions(+), 25 deletions(-)

diff --git a/htdocs/core/tpl/login.tpl.php b/htdocs/core/tpl/login.tpl.php
index 61d398b1b48..a8455abcb31 100644
--- a/htdocs/core/tpl/login.tpl.php
+++ b/htdocs/core/tpl/login.tpl.php
@@ -34,6 +34,23 @@ print '<head>
 print '<!-- Includes for JQuery (Ajax library) -->'."\n";
 if (constant('JS_JQUERY_UI')) print '<link rel="stylesheet" type="text/css" href="'.JS_JQUERY_UI.'css/'.$jquerytheme.'/jquery-ui.min.css" />'."\n";  // JQuery
 else print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/css/'.$jquerytheme.'/jquery-ui-latest.custom.css" />'."\n";    // JQuery
+// CSS forced by modules (relative url starting with /)
+if (isset($conf->modules_parts['css']))
+{
+	$arraycss=(array) $conf->modules_parts['css'];
+	foreach($arraycss as $modcss => $filescss)
+	{
+		$filescss=(array) $filescss;	// To be sure filecss is an array
+		foreach($filescss as $cssfile)
+		{
+			// cssfile is a relative path
+			print '<link rel="stylesheet" type="text/css" title="default" href="'.dol_buildpath($cssfile,1);
+			// We add params only if page is not static, because some web server setup does not return content type text/css if url has parameters, so browser cache is not used.
+			if (!preg_match('/\.css$/i',$cssfile)) print $themeparam;
+			print '"><!-- Added by module '.$modcss. '-->'."\n";
+		}
+	}
+}
 // JQuery. Must be before other includes
 $ext='.js';
 if (isset($conf->global->MAIN_OPTIMIZE_SPEED) && ($conf->global->MAIN_OPTIMIZE_SPEED & 0x01)) $ext='.jgz';
@@ -98,10 +115,12 @@ $(document).ready(function () {
 
 <?php
 if (! empty($hookmanager->resArray['options'])) {
-	foreach ($hookmanager->resArray['options'] as $option)
+	foreach ($hookmanager->resArray['options'] as $format => $option)
 	{
-		echo '<!-- Option by hook -->';
-		echo $option;
+		if ($format == 'table') {
+			echo '<!-- Option by hook -->';
+			echo $option;
+		}
 	}
 }
 ?>
diff --git a/htdocs/core/tpl/passwordforgotten.tpl.php b/htdocs/core/tpl/passwordforgotten.tpl.php
index d1a8ae622f1..e786e4ce69a 100644
--- a/htdocs/core/tpl/passwordforgotten.tpl.php
+++ b/htdocs/core/tpl/passwordforgotten.tpl.php
@@ -34,6 +34,23 @@ print '<head>
 print '<!-- Includes for JQuery (Ajax library) -->'."\n";
 if (constant('JS_JQUERY_UI')) print '<link rel="stylesheet" type="text/css" href="'.JS_JQUERY_UI.'css/'.$jquerytheme.'/jquery-ui.min.css" />'."\n";  // JQuery
 else print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/css/'.$jquerytheme.'/jquery-ui-latest.custom.css" />'."\n";    // JQuery
+// CSS forced by modules (relative url starting with /)
+if (isset($conf->modules_parts['css']))
+{
+	$arraycss=(array) $conf->modules_parts['css'];
+	foreach($arraycss as $modcss => $filescss)
+	{
+		$filescss=(array) $filescss;	// To be sure filecss is an array
+		foreach($filescss as $cssfile)
+		{
+			// cssfile is a relative path
+			print '<link rel="stylesheet" type="text/css" title="default" href="'.dol_buildpath($cssfile,1);
+			// We add params only if page is not static, because some web server setup does not return content type text/css if url has parameters, so browser cache is not used.
+			if (!preg_match('/\.css$/i',$cssfile)) print $themeparam;
+			print '"><!-- Added by module '.$modcss. '-->'."\n";
+		}
+	}
+}
 // JQuery. Must be before other includes
 $ext='.js';
 if (isset($conf->global->MAIN_OPTIMIZE_SPEED) && ($conf->global->MAIN_OPTIMIZE_SPEED & 0x01)) $ext='.jgz';
@@ -72,10 +89,12 @@ print '<!-- HTTP_USER_AGENT = '.$_SERVER['HTTP_USER_AGENT'].' -->
 
 <?php
 if (! empty($hookmanager->resArray['options'])) {
-	foreach ($hookmanager->resArray['options'] as $option)
+	foreach ($hookmanager->resArray['options'] as $format => $option)
 	{
-		echo '<!-- Option by hook -->';
-		echo $option;
+		if ($format == 'table') {
+			echo '<!-- Option by hook -->';
+			echo $option;
+		}
 	}
 }
 ?>
diff --git a/htdocs/theme/bureau2crea/style.css.php b/htdocs/theme/bureau2crea/style.css.php
index bba333bf69e..475428486d2 100644
--- a/htdocs/theme/bureau2crea/style.css.php
+++ b/htdocs/theme/bureau2crea/style.css.php
@@ -35,6 +35,7 @@ if (! defined('NOREQUIREMENU'))   define('NOREQUIREMENU',1);
 if (! defined('NOREQUIREHTML'))   define('NOREQUIREHTML',1);
 if (! defined('NOREQUIREAJAX'))   define('NOREQUIREAJAX','1');
 
+session_cache_limiter(FALSE);
 
 require_once '../../main.inc.php';
 
diff --git a/htdocs/theme/bureau2crea/tpl/login.tpl.php b/htdocs/theme/bureau2crea/tpl/login.tpl.php
index 2fd9af9b9d7..67c96b12da7 100644
--- a/htdocs/theme/bureau2crea/tpl/login.tpl.php
+++ b/htdocs/theme/bureau2crea/tpl/login.tpl.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2009-2010 Regis Houssin <regis@dolibarr.fr>
+/* Copyright (C) 2009-2012 Regis Houssin <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -33,6 +33,23 @@ print '<head>
 print '<!-- Includes for JQuery (Ajax library) -->'."\n";
 if (constant('JS_JQUERY_UI')) print '<link rel="stylesheet" type="text/css" href="'.JS_JQUERY_UI.'css/'.$jquerytheme.'/jquery-ui.min.css" />'."\n";  // JQuery
 else print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/css/'.$jquerytheme.'/jquery-ui-latest.custom.css" />'."\n";    // JQuery
+// CSS forced by modules (relative url starting with /)
+if (isset($conf->modules_parts['css']))
+{
+	$arraycss=(array) $conf->modules_parts['css'];
+	foreach($arraycss as $modcss => $filescss)
+	{
+		$filescss=(array) $filescss;	// To be sure filecss is an array
+		foreach($filescss as $cssfile)
+		{
+			// cssfile is a relative path
+			print '<link rel="stylesheet" type="text/css" title="default" href="'.dol_buildpath($cssfile,1);
+			// We add params only if page is not static, because some web server setup does not return content type text/css if url has parameters, so browser cache is not used.
+			if (!preg_match('/\.css$/i',$cssfile)) print $themeparam;
+			print '"><!-- Added by module '.$modcss. '-->'."\n";
+		}
+	}
+}
 // JQuery. Must be before other includes
 $ext='.js';
 if (isset($conf->global->MAIN_OPTIMIZE_SPEED) && ($conf->global->MAIN_OPTIMIZE_SPEED & 0x01)) $ext='.jgz';
@@ -97,10 +114,12 @@ $(document).ready(function () {
 
 	<?php
 	if (! empty($hookmanager->resArray['options'])) {
-		foreach ($hookmanager->resArray['options'] as $option)
+		foreach ($hookmanager->resArray['options'] as $format => $option)
 		{
-			echo '<!-- Option by hook -->';
-			echo $option;
+			if ($format == 'div') {
+				echo '<!-- Option by hook -->';
+				echo $option;
+			}
 		}
 	}
 	?>
diff --git a/htdocs/theme/bureau2crea/tpl/passwordforgotten.tpl.php b/htdocs/theme/bureau2crea/tpl/passwordforgotten.tpl.php
index 956263634e4..f4aae42360a 100644
--- a/htdocs/theme/bureau2crea/tpl/passwordforgotten.tpl.php
+++ b/htdocs/theme/bureau2crea/tpl/passwordforgotten.tpl.php
@@ -34,6 +34,23 @@ print '<head>
 print '<!-- Includes for JQuery (Ajax library) -->'."\n";
 if (constant('JS_JQUERY_UI')) print '<link rel="stylesheet" type="text/css" href="'.JS_JQUERY_UI.'css/'.$jquerytheme.'/jquery-ui.min.css" />'."\n";  // JQuery
 else print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/css/'.$jquerytheme.'/jquery-ui-latest.custom.css" />'."\n";    // JQuery
+// CSS forced by modules (relative url starting with /)
+if (isset($conf->modules_parts['css']))
+{
+	$arraycss=(array) $conf->modules_parts['css'];
+	foreach($arraycss as $modcss => $filescss)
+	{
+		$filescss=(array) $filescss;	// To be sure filecss is an array
+		foreach($filescss as $cssfile)
+		{
+			// cssfile is a relative path
+			print '<link rel="stylesheet" type="text/css" title="default" href="'.dol_buildpath($cssfile,1);
+			// We add params only if page is not static, because some web server setup does not return content type text/css if url has parameters, so browser cache is not used.
+			if (!preg_match('/\.css$/i',$cssfile)) print $themeparam;
+			print '"><!-- Added by module '.$modcss. '-->'."\n";
+		}
+	}
+}
 // JQuery. Must be before other includes
 $ext='.js';
 if (isset($conf->global->MAIN_OPTIMIZE_SPEED) && ($conf->global->MAIN_OPTIMIZE_SPEED & 0x01)) $ext='.jgz';
@@ -59,14 +76,19 @@ print '<!-- HTTP_USER_AGENT = '.$_SERVER['HTTP_USER_AGENT'].' -->
 </div>
 
 <div id="parameterBox">
-	<div id="logBox"><strong><label for="username"><?php echo $langs->trans('Login'); ?></label></strong><input type="text" <?php echo $disabled; ?> id="username" name="username" class="flat" size="15" maxlength="25" value="<?php echo $login; ?>" tabindex="1" /></div>
+	<div id="logBox">
+		<strong><label for="username"><?php echo $langs->trans('Login'); ?></label></strong>
+		<input type="text" <?php echo $disabled; ?> id="username" name="username" class="flat" size="15" maxlength="25" value="<?php echo $login; ?>" tabindex="1" />
+	</div>
 
 	<?php
 	if (! empty($hookmanager->resArray['options'])) {
-		foreach ($hookmanager->resArray['options'] as $option)
+		foreach ($hookmanager->resArray['options'] as $format => $option)
 		{
-			echo '<!-- Option by hook -->';
-			echo $option;
+			if ($format == 'div') {
+				echo '<!-- Option by hook -->';
+				echo $option;
+			}
 		}
 	}
 	?>
diff --git a/htdocs/user/passwordforgotten.php b/htdocs/user/passwordforgotten.php
index b1de66d6a96..4c4f2a225b8 100644
--- a/htdocs/user/passwordforgotten.php
+++ b/htdocs/user/passwordforgotten.php
@@ -176,6 +176,9 @@ else
 $conf->css  = "/theme/".$conf->theme."/style.css.php?lang=".$langs->defaultlang;
 $conf_css = DOL_URL_ROOT.$conf->css;
 
+$jquerytheme = 'smoothness';
+if (! empty($conf->global->MAIN_USE_JQUERY_THEME)) $jquerytheme = $conf->global->MAIN_USE_JQUERY_THEME;
+
 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';
@@ -199,25 +202,27 @@ $rowspan=2;
 $urllogo=DOL_URL_ROOT.'/theme/login_logo.png';
 if (! empty($mysoc->logo_small) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_small))
 {
-    $urllogo=DOL_URL_ROOT.'/viewimage.php?cache=1&amp;modulepart=companylogo&amp;file='.urlencode('thumbs/'.$mysoc->logo_small);
+	$urllogo=DOL_URL_ROOT.'/viewimage.php?cache=1&amp;modulepart=companylogo&amp;file='.urlencode('thumbs/'.$mysoc->logo_small);
 }
 elseif (! empty($mysoc->logo_small) && is_readable($conf->mycompany->dir_output.'/logos/'.$mysoc->logo))
 {
-    $urllogo=DOL_URL_ROOT.'/viewimage.php?cache=1&amp;modulepart=companylogo&amp;file='.urlencode($mysoc->logo);
-    $width=128;
-}elseif (is_readable(DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/img/dolibarr_logo.png'))
-	{
-		$urllogo=DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/dolibarr_logo.png';
-}elseif (is_readable(DOL_DOCUMENT_ROOT.'/theme/dolibarr_logo.png'))
-	{
-    $urllogo=DOL_URL_ROOT.'/theme/dolibarr_logo.png';
+	$urllogo=DOL_URL_ROOT.'/viewimage.php?cache=1&amp;modulepart=companylogo&amp;file='.urlencode($mysoc->logo);
+	$width=128;
+}
+elseif (is_readable(DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/img/dolibarr_logo.png'))
+{
+	$urllogo=DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/dolibarr_logo.png';
+}
+elseif (is_readable(DOL_DOCUMENT_ROOT.'/theme/dolibarr_logo.png'))
+{
+	$urllogo=DOL_URL_ROOT.'/theme/dolibarr_logo.png';
 }
 
 // Security graphical code
 if (function_exists("imagecreatefrompng") && ! $disabled)
 {
-    $captcha = 1;
-    $captcha_refresh = img_picto($langs->trans("Refresh"),'refresh','id="captcha_refresh_img"');
+	$captcha = 1;
+	$captcha_refresh = img_picto($langs->trans("Refresh"),'refresh','id="captcha_refresh_img"');
 }
 
 // Execute hook getPasswordForgottenPageOptions