alxarafe / alixar

dolibarr/htdocs/core/login/functions_dolibarr.php

Indentation +116 added lines, -116 removed lines

@@ -35,124 +35,124 @@
  */
 function check_user_password_dolibarr($usertotest,$passwordtotest,$entitytotest=1)
 {
-	global $db,$conf,$langs;
-
-	// Force master entity in transversal mode
-	$entity=$entitytotest;
-	if (! empty($conf->multicompany->enabled) && ! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) $entity=1;
-
-	$login='';
-
-	if (! empty($usertotest))
-	{
-		dol_syslog("functions_dolibarr::check_user_password_dolibarr usertotest=".$usertotest." passwordtotest=".preg_replace('/./','*',$passwordtotest)." entitytotest=".$entitytotest);
-
-		// If test username/password asked, we define $test=false if ko and $login var to login if ok, set also $_SESSION["dol_loginmesg"] if ko
-		$table = MAIN_DB_PREFIX."user";
-		$usernamecol1 = 'login';
-		$usernamecol2 = 'email';
-		$entitycol = 'entity';
-
-		$sql ='SELECT rowid, login, entity, pass, pass_crypted';
-		$sql.=' FROM '.$table;
-		$sql.=' WHERE ('.$usernamecol1." = '".$db->escape($usertotest)."'";
-		if (preg_match('/@/',$usertotest)) $sql.=' OR '.$usernamecol2." = '".$db->escape($usertotest)."'";
-		$sql.=') AND '.$entitycol." IN (0," . ($entity ? $entity : 1) . ")";
-		$sql.=' AND statut = 1';
-		// Required to first found the user into entity, then the superadmin.
-		// For the case (TODO and that we must avoid) a user has renamed its login with same value than a user in entity 0.
-		$sql.=' ORDER BY entity DESC';
-
-		$resql=$db->query($sql);
-		if ($resql)
-		{
-			$obj=$db->fetch_object($resql);
-			if ($obj)
-			{
-				$passclear=$obj->pass;
-				$passcrypted=$obj->pass_crypted;
-				$passtyped=$passwordtotest;
-
-				$passok=false;
-
-				// Check crypted password
-				$cryptType='';
-				if (! empty($conf->global->DATABASE_PWD_ENCRYPTED)) $cryptType=$conf->global->DATABASE_PWD_ENCRYPTED;
-
-				// By default, we used MD5
-				if (! in_array($cryptType,array('md5'))) $cryptType='md5';
-				// Check crypted password according to crypt algorithm
-				if ($cryptType == 'md5')
-				{
-					if (dol_verifyHash($passtyped, $passcrypted))
-					{
-						$passok=true;
-						dol_syslog("functions_dolibarr::check_user_password_dolibarr Authentification ok - ".$cryptType." of pass is ok");
-					}
-				}
-
-				// For compatibility with old versions
-				if (! $passok)
-				{
-					if ((! $passcrypted || $passtyped)
-						&& ($passclear && ($passtyped == $passclear)))
-					{
-						$passok=true;
-						dol_syslog("functions_dolibarr::check_user_password_dolibarr Authentification ok - found pass in database");
-					}
-				}
-
-				// Password ok ?
-				if ($passok)
-				{
-					$login=$obj->login;
-				}
-				else
-				{
-					dol_syslog("functions_dolibarr::check_user_password_dolibarr Authentification ko bad password for '".$usertotest."'");
-					sleep(2);      // Anti brut force protection
-
-					// Load translation files required by the page
+    global $db,$conf,$langs;
+
+    // Force master entity in transversal mode
+    $entity=$entitytotest;
+    if (! empty($conf->multicompany->enabled) && ! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) $entity=1;
+
+    $login='';
+
+    if (! empty($usertotest))
+    {
+        dol_syslog("functions_dolibarr::check_user_password_dolibarr usertotest=".$usertotest." passwordtotest=".preg_replace('/./','*',$passwordtotest)." entitytotest=".$entitytotest);
+
+        // If test username/password asked, we define $test=false if ko and $login var to login if ok, set also $_SESSION["dol_loginmesg"] if ko
+        $table = MAIN_DB_PREFIX."user";
+        $usernamecol1 = 'login';
+        $usernamecol2 = 'email';
+        $entitycol = 'entity';
+
+        $sql ='SELECT rowid, login, entity, pass, pass_crypted';
+        $sql.=' FROM '.$table;
+        $sql.=' WHERE ('.$usernamecol1." = '".$db->escape($usertotest)."'";
+        if (preg_match('/@/',$usertotest)) $sql.=' OR '.$usernamecol2." = '".$db->escape($usertotest)."'";
+        $sql.=') AND '.$entitycol." IN (0," . ($entity ? $entity : 1) . ")";
+        $sql.=' AND statut = 1';
+        // Required to first found the user into entity, then the superadmin.
+        // For the case (TODO and that we must avoid) a user has renamed its login with same value than a user in entity 0.
+        $sql.=' ORDER BY entity DESC';
+
+        $resql=$db->query($sql);
+        if ($resql)
+        {
+            $obj=$db->fetch_object($resql);
+            if ($obj)
+            {
+                $passclear=$obj->pass;
+                $passcrypted=$obj->pass_crypted;
+                $passtyped=$passwordtotest;
+
+                $passok=false;
+
+                // Check crypted password
+                $cryptType='';
+                if (! empty($conf->global->DATABASE_PWD_ENCRYPTED)) $cryptType=$conf->global->DATABASE_PWD_ENCRYPTED;
+
+                // By default, we used MD5
+                if (! in_array($cryptType,array('md5'))) $cryptType='md5';
+                // Check crypted password according to crypt algorithm
+                if ($cryptType == 'md5')
+                {
+                    if (dol_verifyHash($passtyped, $passcrypted))
+                    {
+                        $passok=true;
+                        dol_syslog("functions_dolibarr::check_user_password_dolibarr Authentification ok - ".$cryptType." of pass is ok");
+                    }
+                }
+
+                // For compatibility with old versions
+                if (! $passok)
+                {
+                    if ((! $passcrypted || $passtyped)
+                        && ($passclear && ($passtyped == $passclear)))
+                    {
+                        $passok=true;
+                        dol_syslog("functions_dolibarr::check_user_password_dolibarr Authentification ok - found pass in database");
+                    }
+                }
+
+                // Password ok ?
+                if ($passok)
+                {
+                    $login=$obj->login;
+                }
+                else
+                {
+                    dol_syslog("functions_dolibarr::check_user_password_dolibarr Authentification ko bad password for '".$usertotest."'");
+                    sleep(2);      // Anti brut force protection
+
+                    // Load translation files required by the page
                     $langs->loadLangs(array('main', 'errors'));
 
-					$_SESSION["dol_loginmesg"]=$langs->trans("ErrorBadLoginPassword");
-				}
-
-				// We must check entity
-				if ($passok && ! empty($conf->multicompany->enabled))	// We must check entity
-				{
-					global $mc;
-
-					if (! isset($mc)) $conf->multicompany->enabled = false; 	// Global not available, disable $conf->multicompany->enabled for safety
-					else
-					{
-						$ret = $mc->checkRight($obj->rowid, $entitytotest);
-						if ($ret < 0)
-						{
-							dol_syslog("functions_dolibarr::check_user_password_dolibarr Authentification ko entity '" . $entitytotest . "' not allowed for user '" . $obj->rowid . "'");
-							$login = ''; // force authentication failure
-						}
-					}
-				}
-			}
-			else
-			{
-				dol_syslog("functions_dolibarr::check_user_password_dolibarr Authentification ko user not found for '".$usertotest."'");
-				sleep(1);
-
-				// Load translation files required by the page
+                    $_SESSION["dol_loginmesg"]=$langs->trans("ErrorBadLoginPassword");
+                }
+
+                // We must check entity
+                if ($passok && ! empty($conf->multicompany->enabled))	// We must check entity
+                {
+                    global $mc;
+
+                    if (! isset($mc)) $conf->multicompany->enabled = false; 	// Global not available, disable $conf->multicompany->enabled for safety
+                    else
+                    {
+                        $ret = $mc->checkRight($obj->rowid, $entitytotest);
+                        if ($ret < 0)
+                        {
+                            dol_syslog("functions_dolibarr::check_user_password_dolibarr Authentification ko entity '" . $entitytotest . "' not allowed for user '" . $obj->rowid . "'");
+                            $login = ''; // force authentication failure
+                        }
+                    }
+                }
+            }
+            else
+            {
+                dol_syslog("functions_dolibarr::check_user_password_dolibarr Authentification ko user not found for '".$usertotest."'");
+                sleep(1);
+
+                // Load translation files required by the page
                 $langs->loadLangs(array('main', 'errors'));
 
-				$_SESSION["dol_loginmesg"]=$langs->trans("ErrorBadLoginPassword");
-			}
-		}
-		else
-		{
-			dol_syslog("functions_dolibarr::check_user_password_dolibarr Authentification ko db error for '".$usertotest."' error=".$db->lasterror());
-			sleep(1);
-			$_SESSION["dol_loginmesg"]=$db->lasterror();
-		}
-	}
-
-	return $login;
+                $_SESSION["dol_loginmesg"]=$langs->trans("ErrorBadLoginPassword");
+            }
+        }
+        else
+        {
+            dol_syslog("functions_dolibarr::check_user_password_dolibarr Authentification ko db error for '".$usertotest."' error=".$db->lasterror());
+            sleep(1);
+            $_SESSION["dol_loginmesg"]=$db->lasterror();
+        }
+    }
+
+    return $login;
 }

Spacing +35 added lines, -35 removed lines

@@ -33,19 +33,19 @@ 
  * @param   int		$entitytotest   Number of instance (always 1 if module multicompany not enabled)
  * @return	string					Login if OK, '' if KO
  */
-function check_user_password_dolibarr($usertotest,$passwordtotest,$entitytotest=1)
+function check_user_password_dolibarr($usertotest, $passwordtotest, $entitytotest = 1)
 {
-	global $db,$conf,$langs;
+	global $db, $conf, $langs;
 
 	// Force master entity in transversal mode
-	$entity=$entitytotest;
-	if (! empty($conf->multicompany->enabled) && ! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) $entity=1;
+	$entity = $entitytotest;
+	if (!empty($conf->multicompany->enabled) && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) $entity = 1;
 
-	$login='';
+	$login = '';
 
-	if (! empty($usertotest))
+	if (!empty($usertotest))
 	{
-		dol_syslog("functions_dolibarr::check_user_password_dolibarr usertotest=".$usertotest." passwordtotest=".preg_replace('/./','*',$passwordtotest)." entitytotest=".$entitytotest);
+		dol_syslog("functions_dolibarr::check_user_password_dolibarr usertotest=".$usertotest." passwordtotest=".preg_replace('/./', '*', $passwordtotest)." entitytotest=".$entitytotest);
 
 		// If test username/password asked, we define $test=false if ko and $login var to login if ok, set also $_SESSION["dol_loginmesg"] if ko
 		$table = MAIN_DB_PREFIX."user";
@@ -53,51 +53,51 @@ 
 		$usernamecol2 = 'email';
 		$entitycol = 'entity';
 
-		$sql ='SELECT rowid, login, entity, pass, pass_crypted';
-		$sql.=' FROM '.$table;
-		$sql.=' WHERE ('.$usernamecol1." = '".$db->escape($usertotest)."'";
-		if (preg_match('/@/',$usertotest)) $sql.=' OR '.$usernamecol2." = '".$db->escape($usertotest)."'";
-		$sql.=') AND '.$entitycol." IN (0," . ($entity ? $entity : 1) . ")";
-		$sql.=' AND statut = 1';
+		$sql = 'SELECT rowid, login, entity, pass, pass_crypted';
+		$sql .= ' FROM '.$table;
+		$sql .= ' WHERE ('.$usernamecol1." = '".$db->escape($usertotest)."'";
+		if (preg_match('/@/', $usertotest)) $sql .= ' OR '.$usernamecol2." = '".$db->escape($usertotest)."'";
+		$sql .= ') AND '.$entitycol." IN (0,".($entity ? $entity : 1).")";
+		$sql .= ' AND statut = 1';
 		// Required to first found the user into entity, then the superadmin.
 		// For the case (TODO and that we must avoid) a user has renamed its login with same value than a user in entity 0.
-		$sql.=' ORDER BY entity DESC';
+		$sql .= ' ORDER BY entity DESC';
 
-		$resql=$db->query($sql);
+		$resql = $db->query($sql);
 		if ($resql)
 		{
-			$obj=$db->fetch_object($resql);
+			$obj = $db->fetch_object($resql);
 			if ($obj)
 			{
-				$passclear=$obj->pass;
-				$passcrypted=$obj->pass_crypted;
-				$passtyped=$passwordtotest;
+				$passclear = $obj->pass;
+				$passcrypted = $obj->pass_crypted;
+				$passtyped = $passwordtotest;
 
-				$passok=false;
+				$passok = false;
 
 				// Check crypted password
-				$cryptType='';
-				if (! empty($conf->global->DATABASE_PWD_ENCRYPTED)) $cryptType=$conf->global->DATABASE_PWD_ENCRYPTED;
+				$cryptType = '';
+				if (!empty($conf->global->DATABASE_PWD_ENCRYPTED)) $cryptType = $conf->global->DATABASE_PWD_ENCRYPTED;
 
 				// By default, we used MD5
-				if (! in_array($cryptType,array('md5'))) $cryptType='md5';
+				if (!in_array($cryptType, array('md5'))) $cryptType = 'md5';
 				// Check crypted password according to crypt algorithm
 				if ($cryptType == 'md5')
 				{
 					if (dol_verifyHash($passtyped, $passcrypted))
 					{
-						$passok=true;
+						$passok = true;
 						dol_syslog("functions_dolibarr::check_user_password_dolibarr Authentification ok - ".$cryptType." of pass is ok");
 					}
 				}
 
 				// For compatibility with old versions
-				if (! $passok)
+				if (!$passok)
 				{
-					if ((! $passcrypted || $passtyped)
+					if ((!$passcrypted || $passtyped)
 						&& ($passclear && ($passtyped == $passclear)))
 					{
-						$passok=true;
+						$passok = true;
 						dol_syslog("functions_dolibarr::check_user_password_dolibarr Authentification ok - found pass in database");
 					}
 				}
@@ -105,31 +105,31 @@ 
 				// Password ok ?
 				if ($passok)
 				{
-					$login=$obj->login;
+					$login = $obj->login;
 				}
 				else
 				{
 					dol_syslog("functions_dolibarr::check_user_password_dolibarr Authentification ko bad password for '".$usertotest."'");
-					sleep(2);      // Anti brut force protection
+					sleep(2); // Anti brut force protection
 
 					// Load translation files required by the page
                     $langs->loadLangs(array('main', 'errors'));
 
-					$_SESSION["dol_loginmesg"]=$langs->trans("ErrorBadLoginPassword");
+					$_SESSION["dol_loginmesg"] = $langs->trans("ErrorBadLoginPassword");
 				}
 
 				// We must check entity
-				if ($passok && ! empty($conf->multicompany->enabled))	// We must check entity
+				if ($passok && !empty($conf->multicompany->enabled))	// We must check entity
 				{
 					global $mc;
 
-					if (! isset($mc)) $conf->multicompany->enabled = false; 	// Global not available, disable $conf->multicompany->enabled for safety
+					if (!isset($mc)) $conf->multicompany->enabled = false; // Global not available, disable $conf->multicompany->enabled for safety
 					else
 					{
 						$ret = $mc->checkRight($obj->rowid, $entitytotest);
 						if ($ret < 0)
 						{
-							dol_syslog("functions_dolibarr::check_user_password_dolibarr Authentification ko entity '" . $entitytotest . "' not allowed for user '" . $obj->rowid . "'");
+							dol_syslog("functions_dolibarr::check_user_password_dolibarr Authentification ko entity '".$entitytotest."' not allowed for user '".$obj->rowid."'");
 							$login = ''; // force authentication failure
 						}
 					}
@@ -143,14 +143,14 @@ 
 				// Load translation files required by the page
                 $langs->loadLangs(array('main', 'errors'));
 
-				$_SESSION["dol_loginmesg"]=$langs->trans("ErrorBadLoginPassword");
+				$_SESSION["dol_loginmesg"] = $langs->trans("ErrorBadLoginPassword");
 			}
 		}
 		else
 		{
 			dol_syslog("functions_dolibarr::check_user_password_dolibarr Authentification ko db error for '".$usertotest."' error=".$db->lasterror());
 			sleep(1);
-			$_SESSION["dol_loginmesg"]=$db->lasterror();
+			$_SESSION["dol_loginmesg"] = $db->lasterror();
 		}
 	}
 

Braces +22 added lines, -12 removed lines

@@ -39,7 +39,9 @@ 
 
 	// Force master entity in transversal mode
 	$entity=$entitytotest;
-	if (! empty($conf->multicompany->enabled) && ! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) $entity=1;
+	if (! empty($conf->multicompany->enabled) && ! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
+	    $entity=1;
+	}
 
 	$login='';
 
@@ -56,7 +58,9 @@ 
 		$sql ='SELECT rowid, login, entity, pass, pass_crypted';
 		$sql.=' FROM '.$table;
 		$sql.=' WHERE ('.$usernamecol1." = '".$db->escape($usertotest)."'";
-		if (preg_match('/@/',$usertotest)) $sql.=' OR '.$usernamecol2." = '".$db->escape($usertotest)."'";
+		if (preg_match('/@/',$usertotest)) {
+		    $sql.=' OR '.$usernamecol2." = '".$db->escape($usertotest)."'";
+		}
 		$sql.=') AND '.$entitycol." IN (0," . ($entity ? $entity : 1) . ")";
 		$sql.=' AND statut = 1';
 		// Required to first found the user into entity, then the superadmin.
@@ -77,10 +81,14 @@ 
 
 				// Check crypted password
 				$cryptType='';
-				if (! empty($conf->global->DATABASE_PWD_ENCRYPTED)) $cryptType=$conf->global->DATABASE_PWD_ENCRYPTED;
+				if (! empty($conf->global->DATABASE_PWD_ENCRYPTED)) {
+				    $cryptType=$conf->global->DATABASE_PWD_ENCRYPTED;
+				}
 
 				// By default, we used MD5
-				if (! in_array($cryptType,array('md5'))) $cryptType='md5';
+				if (! in_array($cryptType,array('md5'))) {
+				    $cryptType='md5';
+				}
 				// Check crypted password according to crypt algorithm
 				if ($cryptType == 'md5')
 				{
@@ -106,8 +114,7 @@ 
 				if ($passok)
 				{
 					$login=$obj->login;
-				}
-				else
+				} else
 				{
 					dol_syslog("functions_dolibarr::check_user_password_dolibarr Authentification ko bad password for '".$usertotest."'");
 					sleep(2);      // Anti brut force protection
@@ -119,11 +126,16 @@ 
 				}
 
 				// We must check entity
-				if ($passok && ! empty($conf->multicompany->enabled))	// We must check entity
+				if ($passok && ! empty($conf->multicompany->enabled)) {
+				    // We must check entity
 				{
 					global $mc;
+				}
 
-					if (! isset($mc)) $conf->multicompany->enabled = false; 	// Global not available, disable $conf->multicompany->enabled for safety
+					if (! isset($mc)) {
+					    $conf->multicompany->enabled = false;
+					}
+					// Global not available, disable $conf->multicompany->enabled for safety
 					else
 					{
 						$ret = $mc->checkRight($obj->rowid, $entitytotest);
@@ -134,8 +146,7 @@ 
 						}
 					}
 				}
-			}
-			else
+			} else
 			{
 				dol_syslog("functions_dolibarr::check_user_password_dolibarr Authentification ko user not found for '".$usertotest."'");
 				sleep(1);
@@ -145,8 +156,7 @@ 
 
 				$_SESSION["dol_loginmesg"]=$langs->trans("ErrorBadLoginPassword");
 			}
-		}
-		else
+		} else
 		{
 			dol_syslog("functions_dolibarr::check_user_password_dolibarr Authentification ko db error for '".$usertotest."' error=".$db->lasterror());
 			sleep(1);

dolibarr/htdocs/core/login/functions_http.php

Indentation +7 added lines, -7 removed lines

@@ -33,13 +33,13 @@
 */
 function check_user_password_http($usertotest,$passwordtotest,$entitytotest)
 {
-	dol_syslog("functions_http::check_user_password_http _SERVER[REMOTE_USER]=".(empty($_SERVER["REMOTE_USER"])?'':$_SERVER["REMOTE_USER"]));
+    dol_syslog("functions_http::check_user_password_http _SERVER[REMOTE_USER]=".(empty($_SERVER["REMOTE_USER"])?'':$_SERVER["REMOTE_USER"]));
 
-	$login='';
-	if (! empty($_SERVER["REMOTE_USER"]))
-	{
-		$login=$_SERVER["REMOTE_USER"];
-	}
+    $login='';
+    if (! empty($_SERVER["REMOTE_USER"]))
+    {
+        $login=$_SERVER["REMOTE_USER"];
+    }
 
-	return $login;
+    return $login;
 }

Spacing +5 added lines, -5 removed lines

@@ -31,14 +31,14 @@
  * @param   int		$entitytotest   Number of instance (always 1 if module multicompany not enabled)
  * @return	string					Login if OK, '' if KO
 */
-function check_user_password_http($usertotest,$passwordtotest,$entitytotest)
+function check_user_password_http($usertotest, $passwordtotest, $entitytotest)
 {
-	dol_syslog("functions_http::check_user_password_http _SERVER[REMOTE_USER]=".(empty($_SERVER["REMOTE_USER"])?'':$_SERVER["REMOTE_USER"]));
+	dol_syslog("functions_http::check_user_password_http _SERVER[REMOTE_USER]=".(empty($_SERVER["REMOTE_USER"]) ? '' : $_SERVER["REMOTE_USER"]));
 
-	$login='';
-	if (! empty($_SERVER["REMOTE_USER"]))
+	$login = '';
+	if (!empty($_SERVER["REMOTE_USER"]))
 	{
-		$login=$_SERVER["REMOTE_USER"];
+		$login = $_SERVER["REMOTE_USER"];
 	}
 
 	return $login;

dolibarr/htdocs/core/login/functions_ldap.php

Indentation +195 added lines, -195 removed lines

@@ -34,190 +34,190 @@ 
  */
 function check_user_password_ldap($usertotest,$passwordtotest,$entitytotest)
 {
-	global $db,$conf,$langs;
-	global $_POST;
-	global $dolibarr_main_auth_ldap_host,$dolibarr_main_auth_ldap_port;
-	global $dolibarr_main_auth_ldap_version,$dolibarr_main_auth_ldap_servertype;
-	global $dolibarr_main_auth_ldap_login_attribute,$dolibarr_main_auth_ldap_dn;
-	global $dolibarr_main_auth_ldap_admin_login,$dolibarr_main_auth_ldap_admin_pass;
-	global $dolibarr_main_auth_ldap_filter;
-	global $dolibarr_main_auth_ldap_debug;
-
-	// Force master entity in transversal mode
-	$entity=$entitytotest;
-	if (! empty($conf->multicompany->enabled) && ! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) $entity=1;
-
-	$login='';
-	$resultFetchUser='';
-
-	if (! function_exists("ldap_connect"))
-	{
-		dol_syslog("functions_ldap::check_user_password_ldap Authentification ko failed to connect to LDAP. LDAP functions are disabled on this PHP");
-		sleep(1);
-
-		// Load translation files required by the page
+    global $db,$conf,$langs;
+    global $_POST;
+    global $dolibarr_main_auth_ldap_host,$dolibarr_main_auth_ldap_port;
+    global $dolibarr_main_auth_ldap_version,$dolibarr_main_auth_ldap_servertype;
+    global $dolibarr_main_auth_ldap_login_attribute,$dolibarr_main_auth_ldap_dn;
+    global $dolibarr_main_auth_ldap_admin_login,$dolibarr_main_auth_ldap_admin_pass;
+    global $dolibarr_main_auth_ldap_filter;
+    global $dolibarr_main_auth_ldap_debug;
+
+    // Force master entity in transversal mode
+    $entity=$entitytotest;
+    if (! empty($conf->multicompany->enabled) && ! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) $entity=1;
+
+    $login='';
+    $resultFetchUser='';
+
+    if (! function_exists("ldap_connect"))
+    {
+        dol_syslog("functions_ldap::check_user_password_ldap Authentification ko failed to connect to LDAP. LDAP functions are disabled on this PHP");
+        sleep(1);
+
+        // Load translation files required by the page
         $langs->loadLangs(array('main', 'other'));
 
-		$_SESSION["dol_loginmesg"]=$langs->trans("ErrorLDAPFunctionsAreDisabledOnThisPHP").' '.$langs->trans("TryAnotherConnectionMode");
-		return;
-	}
-
-	if ($usertotest)
-	{
-		dol_syslog("functions_ldap::check_user_password_ldap usertotest=".$usertotest." passwordtotest=".preg_replace('/./','*',$passwordtotest)." entitytotest=".$entitytotest);
-
-		// If test username/password asked, we define $test=false and $login var if ok, set $_SESSION["dol_loginmesg"] if ko
-		$ldaphost=$dolibarr_main_auth_ldap_host;
-		$ldapport=$dolibarr_main_auth_ldap_port;
-		$ldapversion=$dolibarr_main_auth_ldap_version;
-		$ldapservertype=(empty($dolibarr_main_auth_ldap_servertype) ? 'openldap' : $dolibarr_main_auth_ldap_servertype);
-
-		$ldapuserattr=$dolibarr_main_auth_ldap_login_attribute;
-		$ldapdn=$dolibarr_main_auth_ldap_dn;
-		$ldapadminlogin=$dolibarr_main_auth_ldap_admin_login;
-		$ldapadminpass=$dolibarr_main_auth_ldap_admin_pass;
-		$ldapdebug=(empty($dolibarr_main_auth_ldap_debug) || $dolibarr_main_auth_ldap_debug=="false" ? false : true);
-
-		if ($ldapdebug) print "DEBUG: Logging LDAP steps<br>\n";
-
-		require_once DOL_DOCUMENT_ROOT.'/core/class/ldap.class.php';
-		$ldap=new Ldap();
-		$ldap->server=explode(',',$ldaphost);
-		$ldap->serverPort=$ldapport;
-		$ldap->ldapProtocolVersion=$ldapversion;
-		$ldap->serverType=$ldapservertype;
-		$ldap->searchUser=$ldapadminlogin;
-		$ldap->searchPassword=$ldapadminpass;
-
-		if ($ldapdebug)
-		{
-			dol_syslog("functions_ldap::check_user_password_ldap Server:".join(',',$ldap->server).", Port:".$ldap->serverPort.", Protocol:".$ldap->ldapProtocolVersion.", Type:".$ldap->serverType);
-			dol_syslog("functions_ldap::check_user_password_ldap uid/samacountname=".$ldapuserattr.", dn=".$ldapdn.", Admin:".$ldap->searchUser.", Pass:".$ldap->searchPassword);
-			print "DEBUG: Server:".join(',',$ldap->server).", Port:".$ldap->serverPort.", Protocol:".$ldap->ldapProtocolVersion.", Type:".$ldap->serverType."<br>\n";
-			print "DEBUG: uid/samacountname=".$ldapuserattr.", dn=".$ldapdn.", Admin:".$ldap->searchUser.", Pass:".$ldap->searchPassword."<br>\n";
-		}
-
-		$resultFetchLdapUser=0;
-
-		// Define $userSearchFilter
-		$userSearchFilter = "";
-		if (empty($dolibarr_main_auth_ldap_filter)) {
-			$userSearchFilter = "(" . $ldapuserattr . "=" . $usertotest . ")";
-		} else {
-			$userSearchFilter = str_replace('%1%', $usertotest, $dolibarr_main_auth_ldap_filter);
-		}
-
-		// If admin login provided
-		// Code to get user in LDAP from an admin connection (may differ from user connection, done later)
-		if ($ldapadminlogin)
-		{
-			$result=$ldap->connect_bind();
-			if ($result > 0)
-			{
-				$resultFetchLdapUser = $ldap->fetch($usertotest,$userSearchFilter);
-				//dol_syslog('functions_ldap::check_user_password_ldap resultFetchLdapUser='.$resultFetchLdapUser);
-				if ($resultFetchLdapUser > 0 && $ldap->pwdlastset == 0) // If ok but password need to be reset
-				{
-					dol_syslog('functions_ldap::check_user_password_ldap '.$usertotest.' must change password next logon');
-					if ($ldapdebug) print "DEBUG: User ".$usertotest." must change password<br>\n";
-					$ldap->close();
-					sleep(1);
-					$langs->load('ldap');
-					$_SESSION["dol_loginmesg"]=$langs->trans("YouMustChangePassNextLogon",$usertotest,$ldap->domainFQDN);
-					return '';
-				}
-			}
-			else
-			{
-				 if ($ldapdebug) print "DEBUG: ".$ldap->error."<br>\n";
-			}
-			$ldap->close();
-		}
-
-		// Forge LDAP user and password to test with them
-		// If LDAP need a dn with login like "uid=jbloggs,ou=People,dc=foo,dc=com", default dn may work even if previous code with
-		// admin login no exectued.
-		$ldap->searchUser=$ldapuserattr."=".$usertotest.",".$ldapdn;  // Default dn (will work if LDAP accept a dn with login value inside)
-		// But if LDAP need a dn with name like "cn=Jhon Bloggs,ou=People,dc=foo,dc=com", previous part must have been executed to have
-		// dn detected into ldapUserDN.
-		if ($resultFetchLdapUser && !empty($ldap->ldapUserDN)) $ldap->searchUser = $ldap->ldapUserDN;
-		$ldap->searchPassword=$passwordtotest;
-
-		// Test with this->seachUser and this->searchPassword
-		//print $resultFetchLdapUser."-".$ldap->ldapUserDN."-".$ldap->searchUser.'-'.$ldap->searchPassword;exit;
-		$result=$ldap->connect_bind();
-		if ($result > 0)
-		{
-			if ($result == 2)	// Connection is ok for user/pass into LDAP
-			{
-				dol_syslog("functions_ldap::check_user_password_ldap Authentification ok");
-				$login=$usertotest;
-
-				// ldap2dolibarr synchronisation
-				if ($login && ! empty($conf->ldap->enabled) && $conf->global->LDAP_SYNCHRO_ACTIVE == 'ldap2dolibarr')	// ldap2dolibarr synchronisation
-				{
-						dol_syslog("functions_ldap::check_user_password_ldap Sync ldap2dolibarr");
-
-						// On charge les attributs du user ldap
-						if ($ldapdebug) print "DEBUG: login ldap = ".$login."<br>\n";
-						$resultFetchLdapUser = $ldap->fetch($login,$userSearchFilter);
-
-						if ($ldapdebug) print "DEBUG: UACF = ".join(',',$ldap->uacf)."<br>\n";
-						if ($ldapdebug) print "DEBUG: pwdLastSet = ".dol_print_date($ldap->pwdlastset,'day')."<br>\n";
-						if ($ldapdebug) print "DEBUG: badPasswordTime = ".dol_print_date($ldap->badpwdtime,'day')."<br>\n";
-
-						// On recherche le user dolibarr en fonction de son SID ldap
-						$sid = $ldap->getObjectSid($login);
-						if ($ldapdebug) print "DEBUG: sid = ".$sid."<br>\n";
-
-						$usertmp=new User($db);
-						$resultFetchUser=$usertmp->fetch('',$login,$sid);
-						if ($resultFetchUser > 0)
-						{
-							dol_syslog("functions_ldap::check_user_password_ldap Sync user found user id=".$usertmp->id);
-							// On verifie si le login a change et on met a jour les attributs dolibarr
-
-							if ($usertmp->login != $ldap->login && $ldap->login)
-							{
-								$usertmp->login = $ldap->login;
-								$usertmp->update($usertmp);
-								// TODO Que faire si update echoue car on update avec un login deja existant.
-							}
-
-							//$resultUpdate = $usertmp->update_ldap2dolibarr($ldap);
-						}
-						unset($usertmp);
-				}
-
-				if (! empty($conf->multicompany->enabled))	// We must check entity (even if sync is not active)
-				{
-					global $mc;
-
-					$usertmp=new User($db);
-					$usertmp->fetch('',$login);
-					$ret=$mc->checkRight($usertmp->id, $entitytotest);
-					if ($ret < 0)
-					{
-						dol_syslog("functions_ldap::check_user_password_ldap Authentification ko entity '".$entitytotest."' not allowed for user '".$usertmp->id."'");
-						$login=''; // force authentication failure
-					}
-					unset($usertmp);
-				}
-			}
-			if ($result == 1)
-			{
-				dol_syslog("functions_ldap::check_user_password_ldap Authentification ko bad user/password for '".$usertotest."'");
-				sleep(1);
-
-				// Load translation files required by the page
+        $_SESSION["dol_loginmesg"]=$langs->trans("ErrorLDAPFunctionsAreDisabledOnThisPHP").' '.$langs->trans("TryAnotherConnectionMode");
+        return;
+    }
+
+    if ($usertotest)
+    {
+        dol_syslog("functions_ldap::check_user_password_ldap usertotest=".$usertotest." passwordtotest=".preg_replace('/./','*',$passwordtotest)." entitytotest=".$entitytotest);
+
+        // If test username/password asked, we define $test=false and $login var if ok, set $_SESSION["dol_loginmesg"] if ko
+        $ldaphost=$dolibarr_main_auth_ldap_host;
+        $ldapport=$dolibarr_main_auth_ldap_port;
+        $ldapversion=$dolibarr_main_auth_ldap_version;
+        $ldapservertype=(empty($dolibarr_main_auth_ldap_servertype) ? 'openldap' : $dolibarr_main_auth_ldap_servertype);
+
+        $ldapuserattr=$dolibarr_main_auth_ldap_login_attribute;
+        $ldapdn=$dolibarr_main_auth_ldap_dn;
+        $ldapadminlogin=$dolibarr_main_auth_ldap_admin_login;
+        $ldapadminpass=$dolibarr_main_auth_ldap_admin_pass;
+        $ldapdebug=(empty($dolibarr_main_auth_ldap_debug) || $dolibarr_main_auth_ldap_debug=="false" ? false : true);
+
+        if ($ldapdebug) print "DEBUG: Logging LDAP steps<br>\n";
+
+        require_once DOL_DOCUMENT_ROOT.'/core/class/ldap.class.php';
+        $ldap=new Ldap();
+        $ldap->server=explode(',',$ldaphost);
+        $ldap->serverPort=$ldapport;
+        $ldap->ldapProtocolVersion=$ldapversion;
+        $ldap->serverType=$ldapservertype;
+        $ldap->searchUser=$ldapadminlogin;
+        $ldap->searchPassword=$ldapadminpass;
+
+        if ($ldapdebug)
+        {
+            dol_syslog("functions_ldap::check_user_password_ldap Server:".join(',',$ldap->server).", Port:".$ldap->serverPort.", Protocol:".$ldap->ldapProtocolVersion.", Type:".$ldap->serverType);
+            dol_syslog("functions_ldap::check_user_password_ldap uid/samacountname=".$ldapuserattr.", dn=".$ldapdn.", Admin:".$ldap->searchUser.", Pass:".$ldap->searchPassword);
+            print "DEBUG: Server:".join(',',$ldap->server).", Port:".$ldap->serverPort.", Protocol:".$ldap->ldapProtocolVersion.", Type:".$ldap->serverType."<br>\n";
+            print "DEBUG: uid/samacountname=".$ldapuserattr.", dn=".$ldapdn.", Admin:".$ldap->searchUser.", Pass:".$ldap->searchPassword."<br>\n";
+        }
+
+        $resultFetchLdapUser=0;
+
+        // Define $userSearchFilter
+        $userSearchFilter = "";
+        if (empty($dolibarr_main_auth_ldap_filter)) {
+            $userSearchFilter = "(" . $ldapuserattr . "=" . $usertotest . ")";
+        } else {
+            $userSearchFilter = str_replace('%1%', $usertotest, $dolibarr_main_auth_ldap_filter);
+        }
+
+        // If admin login provided
+        // Code to get user in LDAP from an admin connection (may differ from user connection, done later)
+        if ($ldapadminlogin)
+        {
+            $result=$ldap->connect_bind();
+            if ($result > 0)
+            {
+                $resultFetchLdapUser = $ldap->fetch($usertotest,$userSearchFilter);
+                //dol_syslog('functions_ldap::check_user_password_ldap resultFetchLdapUser='.$resultFetchLdapUser);
+                if ($resultFetchLdapUser > 0 && $ldap->pwdlastset == 0) // If ok but password need to be reset
+                {
+                    dol_syslog('functions_ldap::check_user_password_ldap '.$usertotest.' must change password next logon');
+                    if ($ldapdebug) print "DEBUG: User ".$usertotest." must change password<br>\n";
+                    $ldap->close();
+                    sleep(1);
+                    $langs->load('ldap');
+                    $_SESSION["dol_loginmesg"]=$langs->trans("YouMustChangePassNextLogon",$usertotest,$ldap->domainFQDN);
+                    return '';
+                }
+            }
+            else
+            {
+                    if ($ldapdebug) print "DEBUG: ".$ldap->error."<br>\n";
+            }
+            $ldap->close();
+        }
+
+        // Forge LDAP user and password to test with them
+        // If LDAP need a dn with login like "uid=jbloggs,ou=People,dc=foo,dc=com", default dn may work even if previous code with
+        // admin login no exectued.
+        $ldap->searchUser=$ldapuserattr."=".$usertotest.",".$ldapdn;  // Default dn (will work if LDAP accept a dn with login value inside)
+        // But if LDAP need a dn with name like "cn=Jhon Bloggs,ou=People,dc=foo,dc=com", previous part must have been executed to have
+        // dn detected into ldapUserDN.
+        if ($resultFetchLdapUser && !empty($ldap->ldapUserDN)) $ldap->searchUser = $ldap->ldapUserDN;
+        $ldap->searchPassword=$passwordtotest;
+
+        // Test with this->seachUser and this->searchPassword
+        //print $resultFetchLdapUser."-".$ldap->ldapUserDN."-".$ldap->searchUser.'-'.$ldap->searchPassword;exit;
+        $result=$ldap->connect_bind();
+        if ($result > 0)
+        {
+            if ($result == 2)	// Connection is ok for user/pass into LDAP
+            {
+                dol_syslog("functions_ldap::check_user_password_ldap Authentification ok");
+                $login=$usertotest;
+
+                // ldap2dolibarr synchronisation
+                if ($login && ! empty($conf->ldap->enabled) && $conf->global->LDAP_SYNCHRO_ACTIVE == 'ldap2dolibarr')	// ldap2dolibarr synchronisation
+                {
+                        dol_syslog("functions_ldap::check_user_password_ldap Sync ldap2dolibarr");
+
+                        // On charge les attributs du user ldap
+                        if ($ldapdebug) print "DEBUG: login ldap = ".$login."<br>\n";
+                        $resultFetchLdapUser = $ldap->fetch($login,$userSearchFilter);
+
+                        if ($ldapdebug) print "DEBUG: UACF = ".join(',',$ldap->uacf)."<br>\n";
+                        if ($ldapdebug) print "DEBUG: pwdLastSet = ".dol_print_date($ldap->pwdlastset,'day')."<br>\n";
+                        if ($ldapdebug) print "DEBUG: badPasswordTime = ".dol_print_date($ldap->badpwdtime,'day')."<br>\n";
+
+                        // On recherche le user dolibarr en fonction de son SID ldap
+                        $sid = $ldap->getObjectSid($login);
+                        if ($ldapdebug) print "DEBUG: sid = ".$sid."<br>\n";
+
+                        $usertmp=new User($db);
+                        $resultFetchUser=$usertmp->fetch('',$login,$sid);
+                        if ($resultFetchUser > 0)
+                        {
+                            dol_syslog("functions_ldap::check_user_password_ldap Sync user found user id=".$usertmp->id);
+                            // On verifie si le login a change et on met a jour les attributs dolibarr
+
+                            if ($usertmp->login != $ldap->login && $ldap->login)
+                            {
+                                $usertmp->login = $ldap->login;
+                                $usertmp->update($usertmp);
+                                // TODO Que faire si update echoue car on update avec un login deja existant.
+                            }
+
+                            //$resultUpdate = $usertmp->update_ldap2dolibarr($ldap);
+                        }
+                        unset($usertmp);
+                }
+
+                if (! empty($conf->multicompany->enabled))	// We must check entity (even if sync is not active)
+                {
+                    global $mc;
+
+                    $usertmp=new User($db);
+                    $usertmp->fetch('',$login);
+                    $ret=$mc->checkRight($usertmp->id, $entitytotest);
+                    if ($ret < 0)
+                    {
+                        dol_syslog("functions_ldap::check_user_password_ldap Authentification ko entity '".$entitytotest."' not allowed for user '".$usertmp->id."'");
+                        $login=''; // force authentication failure
+                    }
+                    unset($usertmp);
+                }
+            }
+            if ($result == 1)
+            {
+                dol_syslog("functions_ldap::check_user_password_ldap Authentification ko bad user/password for '".$usertotest."'");
+                sleep(1);
+
+                // Load translation files required by the page
                 $langs->loadLangs(array('main', 'other'));
 
-				$_SESSION["dol_loginmesg"]=$langs->trans("ErrorBadLoginPassword");
-			}
-		}
-		else
-		{
-			/* Login failed. Return false, together with the error code and text from
+                $_SESSION["dol_loginmesg"]=$langs->trans("ErrorBadLoginPassword");
+            }
+        }
+        else
+        {
+            /* Login failed. Return false, together with the error code and text from
              ** the LDAP server. The common error codes and reasons are listed below :
              ** (for iPlanet, other servers may differ)
              ** 19 - Account locked out (too many invalid login attempts)
@@ -225,24 +225,24 @@ 
              ** 49 - Wrong password
              ** 53 - Account inactive (manually locked out by administrator)
              */
-			dol_syslog("functions_ldap::check_user_password_ldap Authentification ko failed to connect to LDAP for '".$usertotest."'");
-			if (is_resource($ldap->connection))    // If connection ok but bind ko
-			{
-				$ldap->ldapErrorCode = ldap_errno($ldap->connection);
-				$ldap->ldapErrorText = ldap_error($ldap->connection);
-				dol_syslog("functions_ldap::check_user_password_ldap ".$ldap->ldapErrorCode." ".$ldap->ldapErrorText);
-			}
-			sleep(2);      // Anti brut force protection
-
-			// Load translation files required by the page
+            dol_syslog("functions_ldap::check_user_password_ldap Authentification ko failed to connect to LDAP for '".$usertotest."'");
+            if (is_resource($ldap->connection))    // If connection ok but bind ko
+            {
+                $ldap->ldapErrorCode = ldap_errno($ldap->connection);
+                $ldap->ldapErrorText = ldap_error($ldap->connection);
+                dol_syslog("functions_ldap::check_user_password_ldap ".$ldap->ldapErrorCode." ".$ldap->ldapErrorText);
+            }
+            sleep(2);      // Anti brut force protection
+
+            // Load translation files required by the page
             $langs->loadLangs(array('main', 'other', 'errors'));
 ;
-			$_SESSION["dol_loginmesg"]=($ldap->error?$ldap->error:$langs->trans("ErrorBadLoginPassword"));
-		}
+            $_SESSION["dol_loginmesg"]=($ldap->error?$ldap->error:$langs->trans("ErrorBadLoginPassword"));
+        }
 
-		$ldap->close();
-	}
+        $ldap->close();
+    }
 
-	return $login;
+    return $login;
 }
 

Spacing +55 added lines, -55 removed lines

@@ -32,25 +32,25 @@ 
  * @param   int		$entitytotest   Number of instance (always 1 if module multicompany not enabled)
  * @return	string					Login if OK, '' if KO
  */
-function check_user_password_ldap($usertotest,$passwordtotest,$entitytotest)
+function check_user_password_ldap($usertotest, $passwordtotest, $entitytotest)
 {
-	global $db,$conf,$langs;
+	global $db, $conf, $langs;
 	global $_POST;
-	global $dolibarr_main_auth_ldap_host,$dolibarr_main_auth_ldap_port;
-	global $dolibarr_main_auth_ldap_version,$dolibarr_main_auth_ldap_servertype;
-	global $dolibarr_main_auth_ldap_login_attribute,$dolibarr_main_auth_ldap_dn;
-	global $dolibarr_main_auth_ldap_admin_login,$dolibarr_main_auth_ldap_admin_pass;
+	global $dolibarr_main_auth_ldap_host, $dolibarr_main_auth_ldap_port;
+	global $dolibarr_main_auth_ldap_version, $dolibarr_main_auth_ldap_servertype;
+	global $dolibarr_main_auth_ldap_login_attribute, $dolibarr_main_auth_ldap_dn;
+	global $dolibarr_main_auth_ldap_admin_login, $dolibarr_main_auth_ldap_admin_pass;
 	global $dolibarr_main_auth_ldap_filter;
 	global $dolibarr_main_auth_ldap_debug;
 
 	// Force master entity in transversal mode
-	$entity=$entitytotest;
-	if (! empty($conf->multicompany->enabled) && ! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) $entity=1;
+	$entity = $entitytotest;
+	if (!empty($conf->multicompany->enabled) && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) $entity = 1;
 
-	$login='';
-	$resultFetchUser='';
+	$login = '';
+	$resultFetchUser = '';
 
-	if (! function_exists("ldap_connect"))
+	if (!function_exists("ldap_connect"))
 	{
 		dol_syslog("functions_ldap::check_user_password_ldap Authentification ko failed to connect to LDAP. LDAP functions are disabled on this PHP");
 		sleep(1);
@@ -58,51 +58,51 @@ 
 		// Load translation files required by the page
         $langs->loadLangs(array('main', 'other'));
 
-		$_SESSION["dol_loginmesg"]=$langs->trans("ErrorLDAPFunctionsAreDisabledOnThisPHP").' '.$langs->trans("TryAnotherConnectionMode");
+		$_SESSION["dol_loginmesg"] = $langs->trans("ErrorLDAPFunctionsAreDisabledOnThisPHP").' '.$langs->trans("TryAnotherConnectionMode");
 		return;
 	}
 
 	if ($usertotest)
 	{
-		dol_syslog("functions_ldap::check_user_password_ldap usertotest=".$usertotest." passwordtotest=".preg_replace('/./','*',$passwordtotest)." entitytotest=".$entitytotest);
+		dol_syslog("functions_ldap::check_user_password_ldap usertotest=".$usertotest." passwordtotest=".preg_replace('/./', '*', $passwordtotest)." entitytotest=".$entitytotest);
 
 		// If test username/password asked, we define $test=false and $login var if ok, set $_SESSION["dol_loginmesg"] if ko
-		$ldaphost=$dolibarr_main_auth_ldap_host;
-		$ldapport=$dolibarr_main_auth_ldap_port;
-		$ldapversion=$dolibarr_main_auth_ldap_version;
-		$ldapservertype=(empty($dolibarr_main_auth_ldap_servertype) ? 'openldap' : $dolibarr_main_auth_ldap_servertype);
+		$ldaphost = $dolibarr_main_auth_ldap_host;
+		$ldapport = $dolibarr_main_auth_ldap_port;
+		$ldapversion = $dolibarr_main_auth_ldap_version;
+		$ldapservertype = (empty($dolibarr_main_auth_ldap_servertype) ? 'openldap' : $dolibarr_main_auth_ldap_servertype);
 
-		$ldapuserattr=$dolibarr_main_auth_ldap_login_attribute;
-		$ldapdn=$dolibarr_main_auth_ldap_dn;
-		$ldapadminlogin=$dolibarr_main_auth_ldap_admin_login;
-		$ldapadminpass=$dolibarr_main_auth_ldap_admin_pass;
-		$ldapdebug=(empty($dolibarr_main_auth_ldap_debug) || $dolibarr_main_auth_ldap_debug=="false" ? false : true);
+		$ldapuserattr = $dolibarr_main_auth_ldap_login_attribute;
+		$ldapdn = $dolibarr_main_auth_ldap_dn;
+		$ldapadminlogin = $dolibarr_main_auth_ldap_admin_login;
+		$ldapadminpass = $dolibarr_main_auth_ldap_admin_pass;
+		$ldapdebug = (empty($dolibarr_main_auth_ldap_debug) || $dolibarr_main_auth_ldap_debug == "false" ? false : true);
 
 		if ($ldapdebug) print "DEBUG: Logging LDAP steps<br>\n";
 
 		require_once DOL_DOCUMENT_ROOT.'/core/class/ldap.class.php';
-		$ldap=new Ldap();
-		$ldap->server=explode(',',$ldaphost);
-		$ldap->serverPort=$ldapport;
-		$ldap->ldapProtocolVersion=$ldapversion;
-		$ldap->serverType=$ldapservertype;
-		$ldap->searchUser=$ldapadminlogin;
-		$ldap->searchPassword=$ldapadminpass;
+		$ldap = new Ldap();
+		$ldap->server = explode(',', $ldaphost);
+		$ldap->serverPort = $ldapport;
+		$ldap->ldapProtocolVersion = $ldapversion;
+		$ldap->serverType = $ldapservertype;
+		$ldap->searchUser = $ldapadminlogin;
+		$ldap->searchPassword = $ldapadminpass;
 
 		if ($ldapdebug)
 		{
-			dol_syslog("functions_ldap::check_user_password_ldap Server:".join(',',$ldap->server).", Port:".$ldap->serverPort.", Protocol:".$ldap->ldapProtocolVersion.", Type:".$ldap->serverType);
+			dol_syslog("functions_ldap::check_user_password_ldap Server:".join(',', $ldap->server).", Port:".$ldap->serverPort.", Protocol:".$ldap->ldapProtocolVersion.", Type:".$ldap->serverType);
 			dol_syslog("functions_ldap::check_user_password_ldap uid/samacountname=".$ldapuserattr.", dn=".$ldapdn.", Admin:".$ldap->searchUser.", Pass:".$ldap->searchPassword);
-			print "DEBUG: Server:".join(',',$ldap->server).", Port:".$ldap->serverPort.", Protocol:".$ldap->ldapProtocolVersion.", Type:".$ldap->serverType."<br>\n";
+			print "DEBUG: Server:".join(',', $ldap->server).", Port:".$ldap->serverPort.", Protocol:".$ldap->ldapProtocolVersion.", Type:".$ldap->serverType."<br>\n";
 			print "DEBUG: uid/samacountname=".$ldapuserattr.", dn=".$ldapdn.", Admin:".$ldap->searchUser.", Pass:".$ldap->searchPassword."<br>\n";
 		}
 
-		$resultFetchLdapUser=0;
+		$resultFetchLdapUser = 0;
 
 		// Define $userSearchFilter
 		$userSearchFilter = "";
 		if (empty($dolibarr_main_auth_ldap_filter)) {
-			$userSearchFilter = "(" . $ldapuserattr . "=" . $usertotest . ")";
+			$userSearchFilter = "(".$ldapuserattr."=".$usertotest.")";
 		} else {
 			$userSearchFilter = str_replace('%1%', $usertotest, $dolibarr_main_auth_ldap_filter);
 		}
@@ -111,10 +111,10 @@ 
 		// Code to get user in LDAP from an admin connection (may differ from user connection, done later)
 		if ($ldapadminlogin)
 		{
-			$result=$ldap->connect_bind();
+			$result = $ldap->connect_bind();
 			if ($result > 0)
 			{
-				$resultFetchLdapUser = $ldap->fetch($usertotest,$userSearchFilter);
+				$resultFetchLdapUser = $ldap->fetch($usertotest, $userSearchFilter);
 				//dol_syslog('functions_ldap::check_user_password_ldap resultFetchLdapUser='.$resultFetchLdapUser);
 				if ($resultFetchLdapUser > 0 && $ldap->pwdlastset == 0) // If ok but password need to be reset
 				{
@@ -123,7 +123,7 @@ 
 					$ldap->close();
 					sleep(1);
 					$langs->load('ldap');
-					$_SESSION["dol_loginmesg"]=$langs->trans("YouMustChangePassNextLogon",$usertotest,$ldap->domainFQDN);
+					$_SESSION["dol_loginmesg"] = $langs->trans("YouMustChangePassNextLogon", $usertotest, $ldap->domainFQDN);
 					return '';
 				}
 			}
@@ -137,41 +137,41 @@ 
 		// Forge LDAP user and password to test with them
 		// If LDAP need a dn with login like "uid=jbloggs,ou=People,dc=foo,dc=com", default dn may work even if previous code with
 		// admin login no exectued.
-		$ldap->searchUser=$ldapuserattr."=".$usertotest.",".$ldapdn;  // Default dn (will work if LDAP accept a dn with login value inside)
+		$ldap->searchUser = $ldapuserattr."=".$usertotest.",".$ldapdn; // Default dn (will work if LDAP accept a dn with login value inside)
 		// But if LDAP need a dn with name like "cn=Jhon Bloggs,ou=People,dc=foo,dc=com", previous part must have been executed to have
 		// dn detected into ldapUserDN.
 		if ($resultFetchLdapUser && !empty($ldap->ldapUserDN)) $ldap->searchUser = $ldap->ldapUserDN;
-		$ldap->searchPassword=$passwordtotest;
+		$ldap->searchPassword = $passwordtotest;
 
 		// Test with this->seachUser and this->searchPassword
 		//print $resultFetchLdapUser."-".$ldap->ldapUserDN."-".$ldap->searchUser.'-'.$ldap->searchPassword;exit;
-		$result=$ldap->connect_bind();
+		$result = $ldap->connect_bind();
 		if ($result > 0)
 		{
 			if ($result == 2)	// Connection is ok for user/pass into LDAP
 			{
 				dol_syslog("functions_ldap::check_user_password_ldap Authentification ok");
-				$login=$usertotest;
+				$login = $usertotest;
 
 				// ldap2dolibarr synchronisation
-				if ($login && ! empty($conf->ldap->enabled) && $conf->global->LDAP_SYNCHRO_ACTIVE == 'ldap2dolibarr')	// ldap2dolibarr synchronisation
+				if ($login && !empty($conf->ldap->enabled) && $conf->global->LDAP_SYNCHRO_ACTIVE == 'ldap2dolibarr')	// ldap2dolibarr synchronisation
 				{
 						dol_syslog("functions_ldap::check_user_password_ldap Sync ldap2dolibarr");
 
 						// On charge les attributs du user ldap
 						if ($ldapdebug) print "DEBUG: login ldap = ".$login."<br>\n";
-						$resultFetchLdapUser = $ldap->fetch($login,$userSearchFilter);
+						$resultFetchLdapUser = $ldap->fetch($login, $userSearchFilter);
 
-						if ($ldapdebug) print "DEBUG: UACF = ".join(',',$ldap->uacf)."<br>\n";
-						if ($ldapdebug) print "DEBUG: pwdLastSet = ".dol_print_date($ldap->pwdlastset,'day')."<br>\n";
-						if ($ldapdebug) print "DEBUG: badPasswordTime = ".dol_print_date($ldap->badpwdtime,'day')."<br>\n";
+						if ($ldapdebug) print "DEBUG: UACF = ".join(',', $ldap->uacf)."<br>\n";
+						if ($ldapdebug) print "DEBUG: pwdLastSet = ".dol_print_date($ldap->pwdlastset, 'day')."<br>\n";
+						if ($ldapdebug) print "DEBUG: badPasswordTime = ".dol_print_date($ldap->badpwdtime, 'day')."<br>\n";
 
 						// On recherche le user dolibarr en fonction de son SID ldap
 						$sid = $ldap->getObjectSid($login);
 						if ($ldapdebug) print "DEBUG: sid = ".$sid."<br>\n";
 
-						$usertmp=new User($db);
-						$resultFetchUser=$usertmp->fetch('',$login,$sid);
+						$usertmp = new User($db);
+						$resultFetchUser = $usertmp->fetch('', $login, $sid);
 						if ($resultFetchUser > 0)
 						{
 							dol_syslog("functions_ldap::check_user_password_ldap Sync user found user id=".$usertmp->id);
@@ -189,17 +189,17 @@ 
 						unset($usertmp);
 				}
 
-				if (! empty($conf->multicompany->enabled))	// We must check entity (even if sync is not active)
+				if (!empty($conf->multicompany->enabled))	// We must check entity (even if sync is not active)
 				{
 					global $mc;
 
-					$usertmp=new User($db);
-					$usertmp->fetch('',$login);
-					$ret=$mc->checkRight($usertmp->id, $entitytotest);
+					$usertmp = new User($db);
+					$usertmp->fetch('', $login);
+					$ret = $mc->checkRight($usertmp->id, $entitytotest);
 					if ($ret < 0)
 					{
 						dol_syslog("functions_ldap::check_user_password_ldap Authentification ko entity '".$entitytotest."' not allowed for user '".$usertmp->id."'");
-						$login=''; // force authentication failure
+						$login = ''; // force authentication failure
 					}
 					unset($usertmp);
 				}
@@ -212,7 +212,7 @@ 
 				// Load translation files required by the page
                 $langs->loadLangs(array('main', 'other'));
 
-				$_SESSION["dol_loginmesg"]=$langs->trans("ErrorBadLoginPassword");
+				$_SESSION["dol_loginmesg"] = $langs->trans("ErrorBadLoginPassword");
 			}
 		}
 		else
@@ -232,12 +232,12 @@ 
 				$ldap->ldapErrorText = ldap_error($ldap->connection);
 				dol_syslog("functions_ldap::check_user_password_ldap ".$ldap->ldapErrorCode." ".$ldap->ldapErrorText);
 			}
-			sleep(2);      // Anti brut force protection
+			sleep(2); // Anti brut force protection
 
 			// Load translation files required by the page
             $langs->loadLangs(array('main', 'other', 'errors'));
 ;
-			$_SESSION["dol_loginmesg"]=($ldap->error?$ldap->error:$langs->trans("ErrorBadLoginPassword"));
+			$_SESSION["dol_loginmesg"] = ($ldap->error ? $ldap->error : $langs->trans("ErrorBadLoginPassword"));
 		}
 
 		$ldap->close();

Braces +47 added lines, -19 removed lines

@@ -45,7 +45,9 @@ 
 
 	// Force master entity in transversal mode
 	$entity=$entitytotest;
-	if (! empty($conf->multicompany->enabled) && ! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) $entity=1;
+	if (! empty($conf->multicompany->enabled) && ! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
+	    $entity=1;
+	}
 
 	$login='';
 	$resultFetchUser='';
@@ -78,7 +80,9 @@ 
 		$ldapadminpass=$dolibarr_main_auth_ldap_admin_pass;
 		$ldapdebug=(empty($dolibarr_main_auth_ldap_debug) || $dolibarr_main_auth_ldap_debug=="false" ? false : true);
 
-		if ($ldapdebug) print "DEBUG: Logging LDAP steps<br>\n";
+		if ($ldapdebug) {
+		    print "DEBUG: Logging LDAP steps<br>\n";
+		}
 
 		require_once DOL_DOCUMENT_ROOT.'/core/class/ldap.class.php';
 		$ldap=new Ldap();
@@ -116,20 +120,25 @@ 
 			{
 				$resultFetchLdapUser = $ldap->fetch($usertotest,$userSearchFilter);
 				//dol_syslog('functions_ldap::check_user_password_ldap resultFetchLdapUser='.$resultFetchLdapUser);
-				if ($resultFetchLdapUser > 0 && $ldap->pwdlastset == 0) // If ok but password need to be reset
+				if ($resultFetchLdapUser > 0 && $ldap->pwdlastset == 0) {
+				    // If ok but password need to be reset
 				{
 					dol_syslog('functions_ldap::check_user_password_ldap '.$usertotest.' must change password next logon');
-					if ($ldapdebug) print "DEBUG: User ".$usertotest." must change password<br>\n";
+				}
+					if ($ldapdebug) {
+					    print "DEBUG: User ".$usertotest." must change password<br>\n";
+					}
 					$ldap->close();
 					sleep(1);
 					$langs->load('ldap');
 					$_SESSION["dol_loginmesg"]=$langs->trans("YouMustChangePassNextLogon",$usertotest,$ldap->domainFQDN);
 					return '';
 				}
-			}
-			else
+			} else
 			{
-				 if ($ldapdebug) print "DEBUG: ".$ldap->error."<br>\n";
+				 if ($ldapdebug) {
+				     print "DEBUG: ".$ldap->error."<br>\n";
+				 }
 			}
 			$ldap->close();
 		}
@@ -140,7 +149,9 @@ 
 		$ldap->searchUser=$ldapuserattr."=".$usertotest.",".$ldapdn;  // Default dn (will work if LDAP accept a dn with login value inside)
 		// But if LDAP need a dn with name like "cn=Jhon Bloggs,ou=People,dc=foo,dc=com", previous part must have been executed to have
 		// dn detected into ldapUserDN.
-		if ($resultFetchLdapUser && !empty($ldap->ldapUserDN)) $ldap->searchUser = $ldap->ldapUserDN;
+		if ($resultFetchLdapUser && !empty($ldap->ldapUserDN)) {
+		    $ldap->searchUser = $ldap->ldapUserDN;
+		}
 		$ldap->searchPassword=$passwordtotest;
 
 		// Test with this->seachUser and this->searchPassword
@@ -148,27 +159,41 @@ 
 		$result=$ldap->connect_bind();
 		if ($result > 0)
 		{
-			if ($result == 2)	// Connection is ok for user/pass into LDAP
+			if ($result == 2) {
+			    // Connection is ok for user/pass into LDAP
 			{
 				dol_syslog("functions_ldap::check_user_password_ldap Authentification ok");
+			}
 				$login=$usertotest;
 
 				// ldap2dolibarr synchronisation
-				if ($login && ! empty($conf->ldap->enabled) && $conf->global->LDAP_SYNCHRO_ACTIVE == 'ldap2dolibarr')	// ldap2dolibarr synchronisation
+				if ($login && ! empty($conf->ldap->enabled) && $conf->global->LDAP_SYNCHRO_ACTIVE == 'ldap2dolibarr') {
+				    // ldap2dolibarr synchronisation
 				{
 						dol_syslog("functions_ldap::check_user_password_ldap Sync ldap2dolibarr");
+				}
 
 						// On charge les attributs du user ldap
-						if ($ldapdebug) print "DEBUG: login ldap = ".$login."<br>\n";
+						if ($ldapdebug) {
+						    print "DEBUG: login ldap = ".$login."<br>\n";
+						}
 						$resultFetchLdapUser = $ldap->fetch($login,$userSearchFilter);
 
-						if ($ldapdebug) print "DEBUG: UACF = ".join(',',$ldap->uacf)."<br>\n";
-						if ($ldapdebug) print "DEBUG: pwdLastSet = ".dol_print_date($ldap->pwdlastset,'day')."<br>\n";
-						if ($ldapdebug) print "DEBUG: badPasswordTime = ".dol_print_date($ldap->badpwdtime,'day')."<br>\n";
+						if ($ldapdebug) {
+						    print "DEBUG: UACF = ".join(',',$ldap->uacf)."<br>\n";
+						}
+						if ($ldapdebug) {
+						    print "DEBUG: pwdLastSet = ".dol_print_date($ldap->pwdlastset,'day')."<br>\n";
+						}
+						if ($ldapdebug) {
+						    print "DEBUG: badPasswordTime = ".dol_print_date($ldap->badpwdtime,'day')."<br>\n";
+						}
 
 						// On recherche le user dolibarr en fonction de son SID ldap
 						$sid = $ldap->getObjectSid($login);
-						if ($ldapdebug) print "DEBUG: sid = ".$sid."<br>\n";
+						if ($ldapdebug) {
+						    print "DEBUG: sid = ".$sid."<br>\n";
+						}
 
 						$usertmp=new User($db);
 						$resultFetchUser=$usertmp->fetch('',$login,$sid);
@@ -189,9 +214,11 @@ 
 						unset($usertmp);
 				}
 
-				if (! empty($conf->multicompany->enabled))	// We must check entity (even if sync is not active)
+				if (! empty($conf->multicompany->enabled)) {
+				    // We must check entity (even if sync is not active)
 				{
 					global $mc;
+				}
 
 					$usertmp=new User($db);
 					$usertmp->fetch('',$login);
@@ -214,8 +241,7 @@ 
 
 				$_SESSION["dol_loginmesg"]=$langs->trans("ErrorBadLoginPassword");
 			}
-		}
-		else
+		} else
 		{
 			/* Login failed. Return false, together with the error code and text from
              ** the LDAP server. The common error codes and reasons are listed below :
@@ -226,9 +252,11 @@ 
              ** 53 - Account inactive (manually locked out by administrator)
              */
 			dol_syslog("functions_ldap::check_user_password_ldap Authentification ko failed to connect to LDAP for '".$usertotest."'");
-			if (is_resource($ldap->connection))    // If connection ok but bind ko
+			if (is_resource($ldap->connection)) {
+			    // If connection ok but bind ko
 			{
 				$ldap->ldapErrorCode = ldap_errno($ldap->connection);
+			}
 				$ldap->ldapErrorText = ldap_error($ldap->connection);
 				dol_syslog("functions_ldap::check_user_password_ldap ".$ldap->ldapErrorCode." ".$ldap->ldapErrorText);
 			}

dolibarr/htdocs/core/login/functions_empty.php

Indentation +5 added lines, -5 removed lines

@@ -33,12 +33,12 @@
  */
 function check_user_password_empty($usertotest,$passwordtotest,$entitytotest)
 {
-	global $langs;
+    global $langs;
 
-	dol_syslog("functions_empty::check_user_password_empty usertotest=".$usertotest);
+    dol_syslog("functions_empty::check_user_password_empty usertotest=".$usertotest);
 
-	$login='';
-	$_SESSION["dol_loginmesg"]=$langs->trans("FailedToLogin");
+    $login='';
+    $_SESSION["dol_loginmesg"]=$langs->trans("FailedToLogin");
 
-	return $login;
+    return $login;
 }

Spacing +3 added lines, -3 removed lines

@@ -31,14 +31,14 @@
  * @param   int		$entitytotest   Number of instance (always 1 if module multicompany not enabled)
  * @return	string					Login if OK, '' if KO
  */
-function check_user_password_empty($usertotest,$passwordtotest,$entitytotest)
+function check_user_password_empty($usertotest, $passwordtotest, $entitytotest)
 {
 	global $langs;
 
 	dol_syslog("functions_empty::check_user_password_empty usertotest=".$usertotest);
 
-	$login='';
-	$_SESSION["dol_loginmesg"]=$langs->trans("FailedToLogin");
+	$login = '';
+	$_SESSION["dol_loginmesg"] = $langs->trans("FailedToLogin");
 
 	return $login;
 }

dolibarr/htdocs/core/actions_changeselectedfields.inc.php

Spacing +5 added lines, -5 removed lines

@@ -30,16 +30,16 @@
 // Save selection
 if (GETPOST('formfilteraction') == 'listafterchangingselectedfields')
 {
-    $tabparam=array();
+    $tabparam = array();
 
-    $varpage=empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage;
+    $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
 
-    if (GETPOST("selectedfields")) $tabparam["MAIN_SELECTEDFIELDS_".$varpage]=GETPOST("selectedfields");
-    else $tabparam["MAIN_SELECTEDFIELDS_".$varpage]='';
+    if (GETPOST("selectedfields")) $tabparam["MAIN_SELECTEDFIELDS_".$varpage] = GETPOST("selectedfields");
+    else $tabparam["MAIN_SELECTEDFIELDS_".$varpage] = '';
 
     include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
-    $result=dol_set_user_param($db, $conf, $user, $tabparam);
+    $result = dol_set_user_param($db, $conf, $user, $tabparam);
 
     //$action='list';
     //var_dump($tabparam);exit;

Braces +5 added lines, -2 removed lines

@@ -34,8 +34,11 @@
 
     $varpage=empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage;
 
-    if (GETPOST("selectedfields")) $tabparam["MAIN_SELECTEDFIELDS_".$varpage]=GETPOST("selectedfields");
-    else $tabparam["MAIN_SELECTEDFIELDS_".$varpage]='';
+    if (GETPOST("selectedfields")) {
+        $tabparam["MAIN_SELECTEDFIELDS_".$varpage]=GETPOST("selectedfields");
+    } else {
+        $tabparam["MAIN_SELECTEDFIELDS_".$varpage]='';
+    }
 
     include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 

dolibarr/htdocs/core/actions_dellink.inc.php

Indentation +2 added lines, -2 removed lines

@@ -40,7 +40,7 @@
 // Delete link
 if ($action == 'dellink' && ! empty($permissiondellink) && ! GETPOST('cancel','alpha') && $dellinkid > 0)
 {
-	$result=$object->deleteObjectLinked(0, '', 0, '', $dellinkid);
-	if ($result < 0) setEventMessages($object->error,$object->errors,'errors');
+    $result=$object->deleteObjectLinked(0, '', 0, '', $dellinkid);
+    if ($result < 0) setEventMessages($object->error,$object->errors,'errors');
 }
 

Spacing +7 added lines, -7 removed lines

@@ -26,21 +26,21 @@
 // $object must be defined
 // $permissiondellink must be defined
 
-$dellinkid = GETPOST('dellinkid','int');
-$addlinkid = GETPOST('idtolinkto','int');
+$dellinkid = GETPOST('dellinkid', 'int');
+$addlinkid = GETPOST('idtolinkto', 'int');
 
 // Link invoice to order
-if ($action == 'addlink' && ! empty($permissiondellink) && ! GETPOST('cancel','alpha') && $id > 0 && $addlinkid > 0)
+if ($action == 'addlink' && !empty($permissiondellink) && !GETPOST('cancel', 'alpha') && $id > 0 && $addlinkid > 0)
 {
     $object->fetch($id);
     $object->fetch_thirdparty();
-    $result = $object->add_object_linked(GETPOST('addlink','alpha'), $addlinkid);
+    $result = $object->add_object_linked(GETPOST('addlink', 'alpha'), $addlinkid);
 }
 
 // Delete link
-if ($action == 'dellink' && ! empty($permissiondellink) && ! GETPOST('cancel','alpha') && $dellinkid > 0)
+if ($action == 'dellink' && !empty($permissiondellink) && !GETPOST('cancel', 'alpha') && $dellinkid > 0)
 {
-	$result=$object->deleteObjectLinked(0, '', 0, '', $dellinkid);
-	if ($result < 0) setEventMessages($object->error,$object->errors,'errors');
+	$result = $object->deleteObjectLinked(0, '', 0, '', $dellinkid);
+	if ($result < 0) setEventMessages($object->error, $object->errors, 'errors');
 }
 

Braces +4 added lines, -2 removed lines

@@ -41,6 +41,8 @@
 if ($action == 'dellink' && ! empty($permissiondellink) && ! GETPOST('cancel','alpha') && $dellinkid > 0)
 {
 	$result=$object->deleteObjectLinked(0, '', 0, '', $dellinkid);
-	if ($result < 0) setEventMessages($object->error,$object->errors,'errors');
-}
+	if ($result < 0) {
+	    setEventMessages($object->error,$object->errors,'errors');
+	}
+	}
 

dolibarr/htdocs/core/actions_fetchobject.inc.php

Indentation +21 added lines, -21 removed lines

@@ -30,25 +30,25 @@
 
 if (($id > 0 || (! empty($ref) && ! in_array($action, array('create', 'createtask', 'add')))) && (empty($cancel) || $id > 0))
 {
-	if (($id > 0 && is_numeric($id)) || ! empty($ref))	// To discard case when id is list of ids like '1,2,3...'
-	{
-	    $ret = $object->fetch($id, $ref);
-	    if ($ret > 0)
-	    {
-	        $object->fetch_thirdparty();
-	        $id = $object->id;
-	    }
-	    else
-	    {
-	    	if (empty($object->error) && ! count($object->errors))
-	    	{
-	    		if ($ret < 0)	// if $ret == 0, it means not found.
-	    		{
-	    			setEventMessages('Fetch on object (type '.get_class($object).') return an error without filling $object->error nor $object->errors', null, 'errors');
-	    		}
-	    	}
-	        else setEventMessages($object->error, $object->errors, 'errors');
-	        $action='';
-	    }
-	}
+    if (($id > 0 && is_numeric($id)) || ! empty($ref))	// To discard case when id is list of ids like '1,2,3...'
+    {
+        $ret = $object->fetch($id, $ref);
+        if ($ret > 0)
+        {
+            $object->fetch_thirdparty();
+            $id = $object->id;
+        }
+        else
+        {
+            if (empty($object->error) && ! count($object->errors))
+            {
+                if ($ret < 0)	// if $ret == 0, it means not found.
+                {
+                    setEventMessages('Fetch on object (type '.get_class($object).') return an error without filling $object->error nor $object->errors', null, 'errors');
+                }
+            }
+            else setEventMessages($object->error, $object->errors, 'errors');
+            $action='';
+        }
+    }
 }

Spacing +4 added lines, -4 removed lines

@@ -28,9 +28,9 @@ 
 // $cancel must be defined
 // $id or $ref must be defined (object is loaded in this file with fetch)
 
-if (($id > 0 || (! empty($ref) && ! in_array($action, array('create', 'createtask', 'add')))) && (empty($cancel) || $id > 0))
+if (($id > 0 || (!empty($ref) && !in_array($action, array('create', 'createtask', 'add')))) && (empty($cancel) || $id > 0))
 {
-	if (($id > 0 && is_numeric($id)) || ! empty($ref))	// To discard case when id is list of ids like '1,2,3...'
+	if (($id > 0 && is_numeric($id)) || !empty($ref))	// To discard case when id is list of ids like '1,2,3...'
 	{
 	    $ret = $object->fetch($id, $ref);
 	    if ($ret > 0)
@@ -40,7 +40,7 @@ 
 	    }
 	    else
 	    {
-	    	if (empty($object->error) && ! count($object->errors))
+	    	if (empty($object->error) && !count($object->errors))
 	    	{
 	    		if ($ret < 0)	// if $ret == 0, it means not found.
 	    		{
@@ -48,7 +48,7 @@ 
 	    		}
 	    	}
 	        else setEventMessages($object->error, $object->errors, 'errors');
-	        $action='';
+	        $action = '';
 	    }
 	}
 }

Braces +10 added lines, -6 removed lines

@@ -30,24 +30,28 @@
 
 if (($id > 0 || (! empty($ref) && ! in_array($action, array('create', 'createtask', 'add')))) && (empty($cancel) || $id > 0))
 {
-	if (($id > 0 && is_numeric($id)) || ! empty($ref))	// To discard case when id is list of ids like '1,2,3...'
+	if (($id > 0 && is_numeric($id)) || ! empty($ref)) {
+	    // To discard case when id is list of ids like '1,2,3...'
 	{
 	    $ret = $object->fetch($id, $ref);
+	}
 	    if ($ret > 0)
 	    {
 	        $object->fetch_thirdparty();
 	        $id = $object->id;
-	    }
-	    else
+	    } else
 	    {
 	    	if (empty($object->error) && ! count($object->errors))
 	    	{
-	    		if ($ret < 0)	// if $ret == 0, it means not found.
+	    		if ($ret < 0) {
+	    		    // if $ret == 0, it means not found.
 	    		{
 	    			setEventMessages('Fetch on object (type '.get_class($object).') return an error without filling $object->error nor $object->errors', null, 'errors');
 	    		}
-	    	}
-	        else setEventMessages($object->error, $object->errors, 'errors');
+	    		}
+	    	} else {
+	            setEventMessages($object->error, $object->errors, 'errors');
+	        }
 	        $action='';
 	    }
 	}

dolibarr/htdocs/core/ajax/selectobject.php

Indentation +7 added lines, -7 removed lines

@@ -62,16 +62,16 @@
 $classpath=$InfoFieldList[1];
 if (! empty($classpath))
 {
-	dol_include_once($classpath);
-	if ($classname && class_exists($classname))
-	{
-		$objecttmp = new $classname($db);
-	}
+    dol_include_once($classpath);
+    if ($classname && class_exists($classname))
+    {
+        $objecttmp = new $classname($db);
+    }
 }
 if (! is_object($objecttmp))
 {
-	dol_syslog('Error bad param objectdesc', LOG_WARNING);
-	print 'Error bad param objectdesc';
+    dol_syslog('Error bad param objectdesc', LOG_WARNING);
+    print 'Error bad param objectdesc';
 }
 
 // When used from jQuery, the search term is added as GET param "term".

Braces +25 added lines, -8 removed lines

@@ -20,12 +20,25 @@ 
  *       \brief      File to return Ajax response on a selection list request
  */
 
-if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL',1); // Disables token renewal
-if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU','1');
-if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML','1');
-if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');
-if (! defined('NOREQUIRESOC'))   define('NOREQUIRESOC','1');
-if (! defined('NOCSRFCHECK'))    define('NOCSRFCHECK','1');
+if (! defined('NOTOKENRENEWAL')) {
+    define('NOTOKENRENEWAL',1);
+}
+// Disables token renewal
+if (! defined('NOREQUIREMENU')) {
+    define('NOREQUIREMENU','1');
+}
+if (! defined('NOREQUIREHTML')) {
+    define('NOREQUIREHTML','1');
+}
+if (! defined('NOREQUIREAJAX')) {
+    define('NOREQUIREAJAX','1');
+}
+if (! defined('NOREQUIRESOC')) {
+    define('NOREQUIRESOC','1');
+}
+if (! defined('NOCSRFCHECK')) {
+    define('NOCSRFCHECK','1');
+}
 
 
 // Copyright (C) 2018 Alxarafe/Alixar  <info@alxarafe.com>
@@ -57,7 +70,9 @@ 
 
 top_httphead();
 
-if (empty($htmlname)) return;
+if (empty($htmlname)) {
+    return;
+}
 
 
 $InfoFieldList = explode(":", $objectdesc);
@@ -86,4 +101,6 @@ 
 
 $db->close();
 
-if ($outjson) print json_encode($arrayresult);
+if ($outjson) {
+    print json_encode($arrayresult);
+}

Spacing +19 added lines, -19 removed lines

@@ -20,24 +20,24 @@ 
  *       \brief      File to return Ajax response on a selection list request
  */
 
-if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL',1); // Disables token renewal
-if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU','1');
-if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML','1');
-if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');
-if (! defined('NOREQUIRESOC'))   define('NOREQUIRESOC','1');
-if (! defined('NOCSRFCHECK'))    define('NOCSRFCHECK','1');
+if (!defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', 1); // Disables token renewal
+if (!defined('NOREQUIREMENU'))  define('NOREQUIREMENU', '1');
+if (!defined('NOREQUIREHTML'))  define('NOREQUIREHTML', '1');
+if (!defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX', '1');
+if (!defined('NOREQUIRESOC'))   define('NOREQUIRESOC', '1');
+if (!defined('NOCSRFCHECK'))    define('NOCSRFCHECK', '1');
 
 
 // Copyright (C) 2018 Alxarafe/Alixar  <info@alxarafe.com>
 defined('BASE_PATH') or die('Single entry point through the index.php of the main folder');
-require DOL_BASE_PATH . '/main.inc.php';
+require DOL_BASE_PATH.'/main.inc.php';
 
-$objectdesc=GETPOST('objectdesc', 'alpha');
-$htmlname=GETPOST('htmlname', 'aZ09');
-$sqlfilter=GETPOST('sqlfilter', 'alpha');
-$outjson=(GETPOST('outjson', 'int') ? GETPOST('outjson', 'int') : 0);
-$action=GETPOST('action', 'alpha');
-$id=GETPOST('id', 'int');
+$objectdesc = GETPOST('objectdesc', 'alpha');
+$htmlname = GETPOST('htmlname', 'aZ09');
+$sqlfilter = GETPOST('sqlfilter', 'alpha');
+$outjson = (GETPOST('outjson', 'int') ? GETPOST('outjson', 'int') : 0);
+$action = GETPOST('action', 'alpha');
+$id = GETPOST('id', 'int');
 
 
 /*
@@ -61,9 +61,9 @@ 
 
 
 $InfoFieldList = explode(":", $objectdesc);
-$classname=$InfoFieldList[0];
-$classpath=$InfoFieldList[1];
-if (! empty($classpath))
+$classname = $InfoFieldList[0];
+$classpath = $InfoFieldList[1];
+if (!empty($classpath))
 {
 	dol_include_once($classpath);
 	if ($classname && class_exists($classname))
@@ -71,18 +71,18 @@ 
 		$objecttmp = new $classname($db);
 	}
 }
-if (! is_object($objecttmp))
+if (!is_object($objecttmp))
 {
 	dol_syslog('Error bad param objectdesc', LOG_WARNING);
 	print 'Error bad param objectdesc';
 }
 
 // When used from jQuery, the search term is added as GET param "term".
-$searchkey=(($id && GETPOST($id, 'alpha'))?GETPOST($id, 'alpha'):(($htmlname && GETPOST($htmlname, 'alpha'))?GETPOST($htmlname, 'alpha'):''));
+$searchkey = (($id && GETPOST($id, 'alpha')) ?GETPOST($id, 'alpha') : (($htmlname && GETPOST($htmlname, 'alpha')) ?GETPOST($htmlname, 'alpha') : ''));
 
 // TODO Add a security test to avoid to get content of all tables
 
-$arrayresult=$form->selectForFormsList($objecttmp, $htmlname, '', 0, $searchkey, '', '', '', 0, 1);
+$arrayresult = $form->selectForFormsList($objecttmp, $htmlname, '', 0, $searchkey, '', '', '', 0, 1);
 
 $db->close();
 

dolibarr/htdocs/core/ajax/loadinplace.php

Indentation +62 added lines, -62 removed lines

@@ -44,72 +44,72 @@
 // Load original field value
 if (! empty($field) && ! empty($element) && ! empty($table_element) && ! empty($fk_element))
 {
-	$ext_element	= GETPOST('ext_element','alpha');
-	$field			= substr($field, 8); // remove prefix val_
-	$type			= GETPOST('type','alpha');
-	$loadmethod		= (GETPOST('loadmethod','alpha') ? GETPOST('loadmethod','alpha') : 'getValueFrom');
+    $ext_element	= GETPOST('ext_element','alpha');
+    $field			= substr($field, 8); // remove prefix val_
+    $type			= GETPOST('type','alpha');
+    $loadmethod		= (GETPOST('loadmethod','alpha') ? GETPOST('loadmethod','alpha') : 'getValueFrom');
 
-	if ($element != 'order_supplier' && $element != 'invoice_supplier' && preg_match('/^([^_]+)_([^_]+)/i',$element,$regs))
-	{
-		$element = $regs[1];
-		$subelement = $regs[2];
-	}
+    if ($element != 'order_supplier' && $element != 'invoice_supplier' && preg_match('/^([^_]+)_([^_]+)/i',$element,$regs))
+    {
+        $element = $regs[1];
+        $subelement = $regs[2];
+    }
 
-	if ($element == 'propal') $element = 'propale';
-	else if ($element == 'fichinter') $element = 'ficheinter';
-	else if ($element == 'product') $element = 'produit';
-	else if ($element == 'member') $element = 'adherent';
-	else if ($element == 'order_supplier') {
-		$element = 'fournisseur';
-		$subelement = 'commande';
-	}
-	else if ($element == 'invoice_supplier') {
-		$element = 'fournisseur';
-		$subelement = 'facture';
-	}
+    if ($element == 'propal') $element = 'propale';
+    else if ($element == 'fichinter') $element = 'ficheinter';
+    else if ($element == 'product') $element = 'produit';
+    else if ($element == 'member') $element = 'adherent';
+    else if ($element == 'order_supplier') {
+        $element = 'fournisseur';
+        $subelement = 'commande';
+    }
+    else if ($element == 'invoice_supplier') {
+        $element = 'fournisseur';
+        $subelement = 'facture';
+    }
 
-	if ($user->rights->$element->lire || $user->rights->$element->read
-	|| (isset($subelement) && ($user->rights->$element->$subelement->lire || $user->rights->$element->$subelement->read))
-	|| ($element == 'payment' && $user->rights->facture->lire)
-	|| ($element == 'payment_supplier' && $user->rights->fournisseur->facture->lire))
-	{
-		if ($type == 'select')
-		{
-			$methodname	= 'load_cache_'.$loadmethod;
-			$cachename = 'cache_'.GETPOST('loadmethod','alpha');
+    if ($user->rights->$element->lire || $user->rights->$element->read
+    || (isset($subelement) && ($user->rights->$element->$subelement->lire || $user->rights->$element->$subelement->read))
+    || ($element == 'payment' && $user->rights->facture->lire)
+    || ($element == 'payment_supplier' && $user->rights->fournisseur->facture->lire))
+    {
+        if ($type == 'select')
+        {
+            $methodname	= 'load_cache_'.$loadmethod;
+            $cachename = 'cache_'.GETPOST('loadmethod','alpha');
 
-			$form = new Form($db);
-			if (method_exists($form, $methodname))
-			{
-				$ret = $form->$methodname();
-				if ($ret > 0) echo json_encode($form->$cachename);
-			}
-			else if (! empty($ext_element))
-			{
-				$module = $subelement = $ext_element;
-				if (preg_match('/^([^_]+)_([^_]+)/i',$ext_element,$regs))
-				{
-					$module = $regs[1];
-					$subelement = $regs[2];
-				}
+            $form = new Form($db);
+            if (method_exists($form, $methodname))
+            {
+                $ret = $form->$methodname();
+                if ($ret > 0) echo json_encode($form->$cachename);
+            }
+            else if (! empty($ext_element))
+            {
+                $module = $subelement = $ext_element;
+                if (preg_match('/^([^_]+)_([^_]+)/i',$ext_element,$regs))
+                {
+                    $module = $regs[1];
+                    $subelement = $regs[2];
+                }
 
-				dol_include_once('/'.$module.'/class/actions_'.$subelement.'.class.php');
-				$classname = 'Actions'.ucfirst($subelement);
-				$object = new $classname($db);
-				$ret = $object->$methodname($fk_element);
-				if ($ret > 0) echo json_encode($object->$cachename);
-			}
-		}
-		else
-		{
-			$object = new GenericObject($db);
-			$value=$object->$loadmethod($table_element, $fk_element, $field);
-			echo $value;
-		}
-	}
-	else
-	{
-		echo $langs->transnoentities('NotEnoughPermissions');
-	}
+                dol_include_once('/'.$module.'/class/actions_'.$subelement.'.class.php');
+                $classname = 'Actions'.ucfirst($subelement);
+                $object = new $classname($db);
+                $ret = $object->$methodname($fk_element);
+                if ($ret > 0) echo json_encode($object->$cachename);
+            }
+        }
+        else
+        {
+            $object = new GenericObject($db);
+            $value=$object->$loadmethod($table_element, $fk_element, $field);
+            echo $value;
+        }
+    }
+    else
+    {
+        echo $langs->transnoentities('NotEnoughPermissions');
+    }
 }
 

Braces +32 added lines, -19 removed lines

@@ -20,10 +20,19 @@ 
  *       \brief      File to load field value
  */
 
-if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1'); // Disables token renewal
-if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU','1');
-if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');
-if (! defined('NOREQUIRESOC'))   define('NOREQUIRESOC','1');
+if (! defined('NOTOKENRENEWAL')) {
+    define('NOTOKENRENEWAL','1');
+}
+// Disables token renewal
+if (! defined('NOREQUIREMENU')) {
+    define('NOREQUIREMENU','1');
+}
+if (! defined('NOREQUIREAJAX')) {
+    define('NOREQUIREAJAX','1');
+}
+if (! defined('NOREQUIRESOC')) {
+    define('NOREQUIRESOC','1');
+}
 
 
 // Copyright (C) 2018 Alxarafe/Alixar  <info@alxarafe.com>
@@ -58,15 +67,18 @@ 
 		$subelement = $regs[2];
 	}
 
-	if ($element == 'propal') $element = 'propale';
-	else if ($element == 'fichinter') $element = 'ficheinter';
-	else if ($element == 'product') $element = 'produit';
-	else if ($element == 'member') $element = 'adherent';
-	else if ($element == 'order_supplier') {
+	if ($element == 'propal') {
+	    $element = 'propale';
+	} else if ($element == 'fichinter') {
+	    $element = 'ficheinter';
+	} else if ($element == 'product') {
+	    $element = 'produit';
+	} else if ($element == 'member') {
+	    $element = 'adherent';
+	} else if ($element == 'order_supplier') {
 		$element = 'fournisseur';
 		$subelement = 'commande';
-	}
-	else if ($element == 'invoice_supplier') {
+	} else if ($element == 'invoice_supplier') {
 		$element = 'fournisseur';
 		$subelement = 'facture';
 	}
@@ -85,9 +97,10 @@ 
 			if (method_exists($form, $methodname))
 			{
 				$ret = $form->$methodname();
-				if ($ret > 0) echo json_encode($form->$cachename);
-			}
-			else if (! empty($ext_element))
+				if ($ret > 0) {
+				    echo json_encode($form->$cachename);
+				}
+			} else if (! empty($ext_element))
 			{
 				$module = $subelement = $ext_element;
 				if (preg_match('/^([^_]+)_([^_]+)/i',$ext_element,$regs))
@@ -100,17 +113,17 @@ 
 				$classname = 'Actions'.ucfirst($subelement);
 				$object = new $classname($db);
 				$ret = $object->$methodname($fk_element);
-				if ($ret > 0) echo json_encode($object->$cachename);
+				if ($ret > 0) {
+				    echo json_encode($object->$cachename);
+				}
 			}
-		}
-		else
+		} else
 		{
 			$object = new GenericObject($db);
 			$value=$object->$loadmethod($table_element, $fk_element, $field);
 			echo $value;
 		}
-	}
-	else
+	} else
 	{
 		echo $langs->transnoentities('NotEnoughPermissions');
 	}

Spacing +20 added lines, -20 removed lines

@@ -20,21 +20,21 @@ 
  *       \brief      File to load field value
  */
 
-if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1'); // Disables token renewal
-if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU','1');
-if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');
-if (! defined('NOREQUIRESOC'))   define('NOREQUIRESOC','1');
+if (!defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', '1'); // Disables token renewal
+if (!defined('NOREQUIREMENU'))  define('NOREQUIREMENU', '1');
+if (!defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX', '1');
+if (!defined('NOREQUIRESOC'))   define('NOREQUIRESOC', '1');
 
 
 // Copyright (C) 2018 Alxarafe/Alixar  <info@alxarafe.com>
 defined('BASE_PATH') or die('Single entry point through the index.php of the main folder');
-require DOL_BASE_PATH . '/main.inc.php';
+require DOL_BASE_PATH.'/main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/genericobject.class.php';
 
-$field			= GETPOST('field','alpha');
-$element		= GETPOST('element','alpha');
-$table_element	= GETPOST('table_element','alpha');
-$fk_element		= GETPOST('fk_element','alpha');
+$field = GETPOST('field', 'alpha');
+$element = GETPOST('element', 'alpha');
+$table_element = GETPOST('table_element', 'alpha');
+$fk_element = GETPOST('fk_element', 'alpha');
 
 /*
  * View
@@ -45,14 +45,14 @@ 
 //print '<!-- Ajax page called with url '.dol_escape_htmltag($_SERVER["PHP_SELF"]).'?'.dol_escape_htmltag($_SERVER["QUERY_STRING"]).' -->'."\n";
 
 // Load original field value
-if (! empty($field) && ! empty($element) && ! empty($table_element) && ! empty($fk_element))
+if (!empty($field) && !empty($element) && !empty($table_element) && !empty($fk_element))
 {
-	$ext_element	= GETPOST('ext_element','alpha');
-	$field			= substr($field, 8); // remove prefix val_
-	$type			= GETPOST('type','alpha');
-	$loadmethod		= (GETPOST('loadmethod','alpha') ? GETPOST('loadmethod','alpha') : 'getValueFrom');
+	$ext_element	= GETPOST('ext_element', 'alpha');
+	$field = substr($field, 8); // remove prefix val_
+	$type = GETPOST('type', 'alpha');
+	$loadmethod		= (GETPOST('loadmethod', 'alpha') ? GETPOST('loadmethod', 'alpha') : 'getValueFrom');
 
-	if ($element != 'order_supplier' && $element != 'invoice_supplier' && preg_match('/^([^_]+)_([^_]+)/i',$element,$regs))
+	if ($element != 'order_supplier' && $element != 'invoice_supplier' && preg_match('/^([^_]+)_([^_]+)/i', $element, $regs))
 	{
 		$element = $regs[1];
 		$subelement = $regs[2];
@@ -78,8 +78,8 @@ 
 	{
 		if ($type == 'select')
 		{
-			$methodname	= 'load_cache_'.$loadmethod;
-			$cachename = 'cache_'.GETPOST('loadmethod','alpha');
+			$methodname = 'load_cache_'.$loadmethod;
+			$cachename = 'cache_'.GETPOST('loadmethod', 'alpha');
 
 			$form = new Form($db);
 			if (method_exists($form, $methodname))
@@ -87,10 +87,10 @@ 
 				$ret = $form->$methodname();
 				if ($ret > 0) echo json_encode($form->$cachename);
 			}
-			else if (! empty($ext_element))
+			else if (!empty($ext_element))
 			{
 				$module = $subelement = $ext_element;
-				if (preg_match('/^([^_]+)_([^_]+)/i',$ext_element,$regs))
+				if (preg_match('/^([^_]+)_([^_]+)/i', $ext_element, $regs))
 				{
 					$module = $regs[1];
 					$subelement = $regs[2];
@@ -106,7 +106,7 @@ 
 		else
 		{
 			$object = new GenericObject($db);
-			$value=$object->$loadmethod($table_element, $fk_element, $field);
+			$value = $object->$loadmethod($table_element, $fk_element, $field);
 			echo $value;
 		}
 	}