From 72304505cb8f55355d79b2037765dfd7a6d88982 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Thu, 12 Jan 2012 04:11:20 +0800
Subject: [PATCH 1/2] Fix: add htmlname parameter

---
 htdocs/core/lib/security.lib.php  | 2 +-
 htdocs/user/passwordforgotten.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/lib/security.lib.php b/htdocs/core/lib/security.lib.php
index d6a8281ce72..34a6ab9b200 100644
--- a/htdocs/core/lib/security.lib.php
+++ b/htdocs/core/lib/security.lib.php
@@ -269,7 +269,7 @@ function dol_loginfunction($langs,$conf,$mysoc)
 	if (! empty($conf->multicompany->enabled) && empty($conf->global->MULTICOMPANY_HIDE_LOGIN_COMBOBOX))
 	{
 		$rowspan++;
-		$select_entity = $mc->select_entities($lastentity, 'tabindex="3"', 1);
+		$select_entity = $mc->select_entities($lastentity, 'entity', ' tabindex="3"', 1);
 	}
 
 	// Security graphical code
diff --git a/htdocs/user/passwordforgotten.php b/htdocs/user/passwordforgotten.php
index 8a355b4b5b5..783a2d24923 100644
--- a/htdocs/user/passwordforgotten.php
+++ b/htdocs/user/passwordforgotten.php
@@ -228,7 +228,7 @@ if (! empty($conf->multicompany->enabled)  && empty($conf->global->MULTICOMPANY_
         }
     }
 
-    $select_entity = $mc->select_entities($lastentity,'tabindex="2"');
+    $select_entity = $mc->select_entities($lastentity, 'entity', ' tabindex="2"');
 }
 
 // Security graphical code

From 303521d14c57b066445e4e43dbcfa1e500de3488 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Thu, 12 Jan 2012 04:12:15 +0800
Subject: [PATCH 2/2] New: add possibility to disable or show/hide another
 elements

---
 htdocs/core/lib/ajax.lib.php | 44 ++++++++++++++++++++++--------------
 1 file changed, 27 insertions(+), 17 deletions(-)

diff --git a/htdocs/core/lib/ajax.lib.php b/htdocs/core/lib/ajax.lib.php
index e01ae8ef04e..c38b957a813 100644
--- a/htdocs/core/lib/ajax.lib.php
+++ b/htdocs/core/lib/ajax.lib.php
@@ -221,60 +221,70 @@ function ajax_combobox($htmlname)
  * 	@param	string	$code		Name of constant
  * 	@param	array	$input		Input element
  * 	@param	int		$entity		Entity to set
- * 	TODO add different method for other input (show/hide, disable, ..)
+ * 	@return	void
  */
 function ajax_constantonoff($code,$input=array(),$entity=false)
 {
 	global $conf, $langs;
-	
+
 	$entity = ((! empty($entity) && is_numeric($entity) && $entity > 0) || $entity == 0 ? $entity : $conf->entity);
 
 	$out= '<script type="text/javascript">
 		$(function() {
-			var input='.json_encode($input).';
+			var input = '.json_encode($input).';
 
 			// Set constant
-			$( "#set_'.$code.'" ).click(function() {
+			$("#set_'.$code.'").click(function() {
 				$.get( "'.DOL_URL_ROOT.'/core/ajax/constantonoff.php", {
 					action: \'set\',
 					name: \''.$code.'\',
 					entity: \''.$entity.'\'
 				},
 				function() {
-					$("#set_'.$code.'" ).hide();
-					$("#del_'.$code.'" ).show();
-					// Enable another object
-					if (input.length > 0) {
-						$.each(input, function(key,value) {
+					$("#set_'.$code.'").hide();
+					$("#del_'.$code.'").show();
+					// Enable another element
+					if (input.disabled && input.disabled.length > 0) {
+						$.each(input.disabled, function(key,value) {
 							$("#" + value).removeAttr("disabled");
-							if ( $( "#" + value).hasClass("butActionRefused") == true ) {
+							if ($("#" + value).hasClass("butActionRefused") == true) {
 								$("#" + value).removeClass("butActionRefused");
 								$("#" + value).addClass("butAction");
 							}
 						});
+					// Show another element
+					} else if (input.showhide && input.showhide.length > 0) {
+						$.each(input.showhide, function(key,value) {
+							$("#" + value).show();
+						});
 					}
 				});
 			});
 
 			// Del constant
-			$( "#del_'.$code.'" ).click(function() {
+			$("#del_'.$code.'").click(function() {
 				$.get( "'.DOL_URL_ROOT.'/core/ajax/constantonoff.php", {
 					action: \'del\',
 					name: \''.$code.'\',
 					entity: \''.$entity.'\'
 				},
 				function() {
-					$("#del_'.$code.'" ).hide();
-					$("#set_'.$code.'" ).show();
-					// Disable another object
-					if (input.length > 0) {
-						$.each(input, function(key,value) {
+					$("#del_'.$code.'").hide();
+					$("#set_'.$code.'").show();
+					// Disable another element
+					if (input.disabled && input.disabled.length > 0) {
+						$.each(input.disabled, function(key,value) {
 							$("#" + value).attr("disabled", true);
-							if ( $( "#" + value).hasClass("butAction") == true ) {
+							if ($("#" + value).hasClass("butAction") == true) {
 								$("#" + value).removeClass("butAction");
 								$("#" + value).addClass("butActionRefused");
 							}
 						});
+					// Hide another element
+					} else if (input.showhide && input.showhide.length > 0) {
+						$.each(input.showhide, function(key,value) {
+							$("#" + value).hide();
+						});
 					}
 				});
 			});