alxarafe / alixar

dolibarr/htdocs/core/search_page.php

Spacing +29 added lines, -29 removed lines

@@ -27,32 +27,32 @@ 
 //if (! defined('NOREQUIREDB'))   define('NOREQUIREDB','1');		// Not disabled cause need to load personalized language
 //if (! defined('NOREQUIRESOC'))    define('NOREQUIRESOC','1');
 //if (! defined('NOREQUIRETRAN')) define('NOREQUIRETRAN','1');		// Not disabled cause need to do translations
-if (! defined('NOCSRFCHECK'))     define('NOCSRFCHECK',1);
-if (! defined('NOTOKENRENEWAL'))  define('NOTOKENRENEWAL',1);
+if (!defined('NOCSRFCHECK'))     define('NOCSRFCHECK', 1);
+if (!defined('NOTOKENRENEWAL'))  define('NOTOKENRENEWAL', 1);
 //if (! defined('NOLOGIN')) define('NOLOGIN',1);					// Not disabled cause need to load personalized language
-if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU',1);
+if (!defined('NOREQUIREMENU'))  define('NOREQUIREMENU', 1);
 //if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML',1);
 
 require_once '../main.inc.php';
 
-if (GETPOST('lang', 'aZ09')) $langs->setDefaultLang(GETPOST('lang', 'aZ09'));	// If language was forced on URL by the main.inc.php
+if (GETPOST('lang', 'aZ09')) $langs->setDefaultLang(GETPOST('lang', 'aZ09')); // If language was forced on URL by the main.inc.php
 
 $langs->load("main");
 
-$right=($langs->trans("DIRECTION")=='rtl'?'left':'right');
-$left=($langs->trans("DIRECTION")=='rtl'?'right':'left');
+$right = ($langs->trans("DIRECTION") == 'rtl' ? 'left' : 'right');
+$left = ($langs->trans("DIRECTION") == 'rtl' ? 'right' : 'left');
 
 
 /*
  * View
  */
 
-$title=$langs->trans("Search");
+$title = $langs->trans("Search");
 
 // URL http://mydolibarr/core/search_page?dol_use_jmobile=1 can be used for tests
-$head='<!-- Quick access -->'."\n";
-$arrayofjs=array();
-$arrayofcss=array();
+$head = '<!-- Quick access -->'."\n";
+$arrayofjs = array();
+$arrayofcss = array();
 top_htmlhead($head, $title, 0, 0, $arrayofjs, $arrayofcss);
 
 
@@ -61,7 +61,7 @@ 
 print '<div>';
 //print '<br>';
 
-$nbofsearch=0;
+$nbofsearch = 0;
 
 // Instantiate hooks of thirdparty module
 $hookmanager->initHooks(array('searchform'));
@@ -71,41 +71,41 @@ 
 
 if ($conf->use_javascript_ajax && 1 == 2)   // select2 is ko with jmobile
 {
-    if (! is_object($form)) $form=new Form($db);
-    $selected=-1;
-    $searchform.='<br><br>'.$form->selectArrayAjax('searchselectcombo', DOL_URL_ROOT.'/core/ajax/selectsearchbox.php', $selected, '', '', 0, 1, 'minwidth300', 1, $langs->trans("Search"), 0);
+    if (!is_object($form)) $form = new Form($db);
+    $selected = -1;
+    $searchform .= '<br><br>'.$form->selectArrayAjax('searchselectcombo', DOL_URL_ROOT.'/core/ajax/selectsearchbox.php', $selected, '', '', 0, 1, 'minwidth300', 1, $langs->trans("Search"), 0);
 }
 else
 {
     $usedbyinclude = 1; // Used into next include
-	$showtitlebefore = GETPOST('showtitlebefore','int');
+	$showtitlebefore = GETPOST('showtitlebefore', 'int');
 	include DOL_DOCUMENT_ROOT.'/core/ajax/selectsearchbox.php';
 
-    $accesskeyalreadyassigned=array();
-    foreach($arrayresult as $key => $val)
+    $accesskeyalreadyassigned = array();
+    foreach ($arrayresult as $key => $val)
     {
-        $tmp=explode('?', $val['url']);
-        $urlaction=$tmp[0];
-        $keysearch='search_all';
+        $tmp = explode('?', $val['url']);
+        $urlaction = $tmp[0];
+        $keysearch = 'search_all';
 
-        $accesskey='';
-        if (! $accesskeyalreadyassigned[$val['label'][0]])
+        $accesskey = '';
+        if (!$accesskeyalreadyassigned[$val['label'][0]])
         {
-            $accesskey=$val['label'][0];
-            $accesskeyalreadyassigned[$accesskey]=$accesskey;
+            $accesskey = $val['label'][0];
+            $accesskeyalreadyassigned[$accesskey] = $accesskey;
         }
-        $searchform.=printSearchForm($urlaction, $urlaction, $val['label'], 'minwidth200', $keysearch, $accesskey, $key, img_picto('',$val['img'],'', 0, 1), $showtitlebefore);
+        $searchform .= printSearchForm($urlaction, $urlaction, $val['label'], 'minwidth200', $keysearch, $accesskey, $key, img_picto('', $val['img'], '', 0, 1), $showtitlebefore);
     }
 }
 
 // Execute hook printSearchForm
-$parameters=array('searchform'=>$searchform);
-$reshook=$hookmanager->executeHooks('printSearchForm',$parameters);    // Note that $action and $object may have been modified by some hooks
+$parameters = array('searchform'=>$searchform);
+$reshook = $hookmanager->executeHooks('printSearchForm', $parameters); // Note that $action and $object may have been modified by some hooks
 if (empty($reshook))
 {
-	$searchform.=$hookmanager->resPrint;
+	$searchform .= $hookmanager->resPrint;
 }
-else $searchform=$hookmanager->resPrint;
+else $searchform = $hookmanager->resPrint;
 
 
 print "\n";

dolibarr/htdocs/core/actions_extrafields.inc.php

Spacing +103 added lines, -103 removed lines

@@ -23,18 +23,18 @@ 
  *  \brief			Code for actions on extrafields admin pages
  */
 
-$maxsizestring=255;
-$maxsizeint=10;
-$mesg=array();
+$maxsizestring = 255;
+$maxsizeint = 10;
+$mesg = array();
 
-$extrasize=GETPOST('size','int');
-$type=GETPOST('type','alpha');
-$param=GETPOST('param','alpha');
+$extrasize = GETPOST('size', 'int');
+$type = GETPOST('type', 'alpha');
+$param = GETPOST('param', 'alpha');
 
-if ($type=='double' && strpos($extrasize,',')===false) $extrasize='24,8';
-if ($type=='date')     $extrasize='';
-if ($type=='datetime') $extrasize='';
-if ($type=='select')   $extrasize='';
+if ($type == 'double' && strpos($extrasize, ',') === false) $extrasize = '24,8';
+if ($type == 'date')     $extrasize = '';
+if ($type == 'datetime') $extrasize = '';
+if ($type == 'select')   $extrasize = '';
 
 
 // Add attribute
@@ -43,83 +43,83 @@ 
 	if ($_POST["button"] != $langs->trans("Cancel"))
 	{
 	    // Check values
-		if (! $type)
+		if (!$type)
 		{
 			$error++;
 			$langs->load("errors");
-			$mesg[]=$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Type"));
+			$mesg[] = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Type"));
 			$action = 'create';
 		}
-		if ($type=='varchar' && $extrasize <= 0)
+		if ($type == 'varchar' && $extrasize <= 0)
 		{
 		    $error++;
 		    $langs->load("errors");
-		    $mesg[]=$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Size"));
+		    $mesg[] = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Size"));
 		    $action = 'edit';
 		}
-        if ($type=='varchar' && $extrasize > $maxsizestring)
+        if ($type == 'varchar' && $extrasize > $maxsizestring)
         {
             $error++;
             $langs->load("errors");
-            $mesg[]=$langs->trans("ErrorSizeTooLongForVarcharType",$maxsizestring);
+            $mesg[] = $langs->trans("ErrorSizeTooLongForVarcharType", $maxsizestring);
             $action = 'create';
         }
-        if ($type=='int' && $extrasize > $maxsizeint)
+        if ($type == 'int' && $extrasize > $maxsizeint)
         {
             $error++;
             $langs->load("errors");
-            $mesg[]=$langs->trans("ErrorSizeTooLongForIntType",$maxsizeint);
+            $mesg[] = $langs->trans("ErrorSizeTooLongForIntType", $maxsizeint);
             $action = 'create';
         }
-        if ($type=='select' && !$param)
+        if ($type == 'select' && !$param)
         {
         	$error++;
         	$langs->load("errors");
-        	$mesg[]=$langs->trans("ErrorNoValueForSelectType");
+        	$mesg[] = $langs->trans("ErrorNoValueForSelectType");
         	$action = 'create';
         }
-        if ($type=='sellist' && !$param)
+        if ($type == 'sellist' && !$param)
         {
         	$error++;
         	$langs->load("errors");
-        	$mesg[]=$langs->trans("ErrorNoValueForSelectListType");
+        	$mesg[] = $langs->trans("ErrorNoValueForSelectListType");
         	$action = 'create';
         }
-        if ($type=='checkbox' && !$param)
+        if ($type == 'checkbox' && !$param)
         {
         	$error++;
         	$langs->load("errors");
-        	$mesg[]=$langs->trans("ErrorNoValueForCheckBoxType");
+        	$mesg[] = $langs->trans("ErrorNoValueForCheckBoxType");
         	$action = 'create';
         }
-        if ($type=='link' && !$param)
+        if ($type == 'link' && !$param)
         {
         	$error++;
         	$langs->load("errors");
-        	$mesg[]=$langs->trans("ErrorNoValueForLinkType");
+        	$mesg[] = $langs->trans("ErrorNoValueForLinkType");
         	$action = 'create';
         }
-        if ($type=='radio' && !$param)
+        if ($type == 'radio' && !$param)
         {
         	$error++;
         	$langs->load("errors");
-        	$mesg[]=$langs->trans("ErrorNoValueForRadioType");
+        	$mesg[] = $langs->trans("ErrorNoValueForRadioType");
         	$action = 'create';
         }
-        if  ((($type=='radio') || ($type=='checkbox')) && $param)
+        if ((($type == 'radio') || ($type == 'checkbox')) && $param)
         {
         	// Construct array for parameter (value of select list)
     		$parameters = $param;
-    		$parameters_array = explode("\r\n",$parameters);
-    		foreach($parameters_array as $param_ligne)
+    		$parameters_array = explode("\r\n", $parameters);
+    		foreach ($parameters_array as $param_ligne)
     		{
     			if (!empty($param_ligne)) {
-	    			if (preg_match_all('/,/',$param_ligne,$matches))
+	    			if (preg_match_all('/,/', $param_ligne, $matches))
 	    			{
-	    				if (count($matches[0])>1) {
+	    				if (count($matches[0]) > 1) {
 	    					$error++;
 	    					$langs->load("errors");
-	    					$mesg[]=$langs->trans("ErrorBadFormatValueList",$param_ligne);
+	    					$mesg[] = $langs->trans("ErrorBadFormatValueList", $param_ligne);
 	    					$action = 'create';
 	    				}
 	    			}
@@ -127,25 +127,25 @@ 
 	    			{
 	    				$error++;
 	    				$langs->load("errors");
-	    				$mesg[]=$langs->trans("ErrorBadFormatValueList",$param_ligne);
+	    				$mesg[] = $langs->trans("ErrorBadFormatValueList", $param_ligne);
 	    				$action = 'create';
 	    			}
     			}
     		}
         }
 
-	    if (! $error)
+	    if (!$error)
 	    {
     		// attrname must be alphabetical and lower case only
-    		if (isset($_POST["attrname"]) && preg_match("/^[a-z0-9-_]+$/",$_POST['attrname']) && !is_numeric($_POST["attrname"]))
+    		if (isset($_POST["attrname"]) && preg_match("/^[a-z0-9-_]+$/", $_POST['attrname']) && !is_numeric($_POST["attrname"]))
     		{
     			// Construct array for parameter (value of select list)
-        		$default_value = GETPOST('default_value','alpha');
+        		$default_value = GETPOST('default_value', 'alpha');
     			$parameters = $param;
-    			$parameters_array = explode("\r\n",$parameters);
+    			$parameters_array = explode("\r\n", $parameters);
     			//In sellist we have only one line and it can have come to do SQL expression
-    			if ($type=='sellist') {
-    				foreach($parameters_array as $param_ligne)
+    			if ($type == 'sellist') {
+    				foreach ($parameters_array as $param_ligne)
     				{
     					$params['options'] = array($parameters=>null);
     				}
@@ -153,37 +153,37 @@ 
     			else
     			{
     				//Esle it's separated key/value and coma list
-    				foreach($parameters_array as $param_ligne)
+    				foreach ($parameters_array as $param_ligne)
     				{
-    					list($key,$value) = explode(',',$param_ligne);
+    					list($key, $value) = explode(',', $param_ligne);
     					$params['options'][$key] = $value;
     				}
     			}
 
     			// Visibility: -1=not visible by default in list, 1=visible, 0=hidden
     			$visibility = GETPOST('list', 'alpha');
-				if ($type == 'separate') $visibility=3;
+				if ($type == 'separate') $visibility = 3;
 
-                $result=$extrafields->addExtraField(
+                $result = $extrafields->addExtraField(
                 	GETPOST('attrname', 'alpha'),
                 	GETPOST('label', 'alpha'),
                 	$type,
                 	GETPOST('pos', 'int'),
                 	$extrasize,
                 	$elementtype,
-                	(GETPOST('unique', 'alpha')?1:0),
-                	(GETPOST('required', 'alpha')?1:0),
+                	(GETPOST('unique', 'alpha') ? 1 : 0),
+                	(GETPOST('required', 'alpha') ? 1 : 0),
                 	$default_value,
                 	$params,
-                	(GETPOST('alwayseditable', 'alpha')?1:0),
-                	(GETPOST('perms', 'alpha')?GETPOST('perms', 'alpha'):''),
+                	(GETPOST('alwayseditable', 'alpha') ? 1 : 0),
+                	(GETPOST('perms', 'alpha') ?GETPOST('perms', 'alpha') : ''),
                 	$visibility,
-					GETPOST('help','alpha'),
-                    GETPOST('computed_value','alpha'),
-                	(GETPOST('entitycurrentorall', 'alpha')?0:''),
+					GETPOST('help', 'alpha'),
+                    GETPOST('computed_value', 'alpha'),
+                	(GETPOST('entitycurrentorall', 'alpha') ? 0 : ''),
                     GETPOST('langfile', 'alpha'),
                     1,
-                    (GETPOST('totalizable', 'alpha')?1:0)
+                    (GETPOST('totalizable', 'alpha') ? 1 : 0)
                 );
     			if ($result > 0)
     			{
@@ -194,7 +194,7 @@ 
     			else
     			{
                     $error++;
-    			    $mesg=$extrafields->error;
+    			    $mesg = $extrafields->error;
                     setEventMessages($mesg, null, 'errors');
     			}
     		}
@@ -202,7 +202,7 @@ 
     		{
                 $error++;
     		    $langs->load("errors");
-    			$mesg=$langs->trans("ErrorFieldCanNotContainSpecialNorUpperCharacters",$langs->transnoentities("AttributeCode"));
+    			$mesg = $langs->trans("ErrorFieldCanNotContainSpecialNorUpperCharacters", $langs->transnoentities("AttributeCode"));
     			setEventMessages($mesg, null, 'errors');
     			$action = 'create';
     		}
@@ -220,76 +220,76 @@ 
 	if ($_POST["button"] != $langs->trans("Cancel"))
 	{
         // Check values
-		if (! $type)
+		if (!$type)
 		{
 			$error++;
 			$langs->load("errors");
-			$mesg[]=$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Type"));
+			$mesg[] = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Type"));
 			$action = 'edit';
 		}
-		if ($type=='varchar' && $extrasize <= 0)
+		if ($type == 'varchar' && $extrasize <= 0)
 		{
 		    $error++;
 		    $langs->load("errors");
-		    $mesg[]=$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Size"));
+		    $mesg[] = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Size"));
 		    $action = 'edit';
 		}
-		if ($type=='varchar' && $extrasize > $maxsizestring)
+		if ($type == 'varchar' && $extrasize > $maxsizestring)
         {
             $error++;
             $langs->load("errors");
-            $mesg[]=$langs->trans("ErrorSizeTooLongForVarcharType",$maxsizestring);
+            $mesg[] = $langs->trans("ErrorSizeTooLongForVarcharType", $maxsizestring);
             $action = 'edit';
         }
-        if ($type=='int' && $extrasize > $maxsizeint)
+        if ($type == 'int' && $extrasize > $maxsizeint)
         {
             $error++;
             $langs->load("errors");
-            $mesg[]=$langs->trans("ErrorSizeTooLongForIntType",$maxsizeint);
+            $mesg[] = $langs->trans("ErrorSizeTooLongForIntType", $maxsizeint);
             $action = 'edit';
         }
-        if ($type=='select' && !$param)
+        if ($type == 'select' && !$param)
         {
         	$error++;
         	$langs->load("errors");
-        	$mesg[]=$langs->trans("ErrorNoValueForSelectType");
+        	$mesg[] = $langs->trans("ErrorNoValueForSelectType");
         	$action = 'edit';
         }
-        if ($type=='sellist' && !$param)
+        if ($type == 'sellist' && !$param)
         {
         	$error++;
         	$langs->load("errors");
-        	$mesg[]=$langs->trans("ErrorNoValueForSelectListType");
+        	$mesg[] = $langs->trans("ErrorNoValueForSelectListType");
         	$action = 'edit';
         }
-        if ($type=='checkbox' && !$param)
+        if ($type == 'checkbox' && !$param)
         {
         	$error++;
         	$langs->load("errors");
-        	$mesg[]=$langs->trans("ErrorNoValueForCheckBoxType");
+        	$mesg[] = $langs->trans("ErrorNoValueForCheckBoxType");
         	$action = 'edit';
         }
-        if ($type=='radio' && !$param)
+        if ($type == 'radio' && !$param)
         {
         	$error++;
         	$langs->load("errors");
-        	$mesg[]=$langs->trans("ErrorNoValueForRadioType");
+        	$mesg[] = $langs->trans("ErrorNoValueForRadioType");
         	$action = 'edit';
         }
-        if  ((($type=='radio') || ($type=='checkbox')) && $param)
+        if ((($type == 'radio') || ($type == 'checkbox')) && $param)
         {
         	// Construct array for parameter (value of select list)
         	$parameters = $param;
-        	$parameters_array = explode("\r\n",$parameters);
-        	foreach($parameters_array as $param_ligne)
+        	$parameters_array = explode("\r\n", $parameters);
+        	foreach ($parameters_array as $param_ligne)
         	{
         		if (!empty($param_ligne)) {
-	        		if (preg_match_all('/,/',$param_ligne,$matches))
+	        		if (preg_match_all('/,/', $param_ligne, $matches))
 	        		{
-	        			if (count($matches[0])>1) {
+	        			if (count($matches[0]) > 1) {
 	        				$error++;
 	        				$langs->load("errors");
-	        				$mesg[]=$langs->trans("ErrorBadFormatValueList",$param_ligne);
+	        				$mesg[] = $langs->trans("ErrorBadFormatValueList", $param_ligne);
 	        				$action = 'edit';
 	        			}
 	        		}
@@ -297,24 +297,24 @@ 
 	        		{
 	        			$error++;
 	        			$langs->load("errors");
-	        			$mesg[]=$langs->trans("ErrorBadFormatValueList",$param_ligne);
+	        			$mesg[] = $langs->trans("ErrorBadFormatValueList", $param_ligne);
 	        			$action = 'edit';
 	        		}
         		}
         	}
         }
 
-	    if (! $error)
+	    if (!$error)
 	    {
-            if (isset($_POST["attrname"]) && preg_match("/^\w[a-zA-Z0-9-_]*$/",$_POST['attrname']))
+            if (isset($_POST["attrname"]) && preg_match("/^\w[a-zA-Z0-9-_]*$/", $_POST['attrname']))
     		{
-    			$pos = GETPOST('pos','int');
+    			$pos = GETPOST('pos', 'int');
     			// Construct array for parameter (value of select list)
     			$parameters = $param;
-    			$parameters_array = explode("\r\n",$parameters);
+    			$parameters_array = explode("\r\n", $parameters);
     			//In sellist we have only one line and it can have come to do SQL expression
-    			if ($type=='sellist') {
-    				foreach($parameters_array as $param_ligne)
+    			if ($type == 'sellist') {
+    				foreach ($parameters_array as $param_ligne)
     				{
     					$params['options'] = array($parameters=>null);
     				}
@@ -322,37 +322,37 @@ 
     			else
     			{
     				//Esle it's separated key/value and coma list
-    				foreach($parameters_array as $param_ligne)
+    				foreach ($parameters_array as $param_ligne)
     				{
-    					list($key,$value) = explode(',',$param_ligne);
+    					list($key, $value) = explode(',', $param_ligne);
     					$params['options'][$key] = $value;
     				}
     			}
 
     			// Visibility: -1=not visible by default in list, 1=visible, 0=hidden
     			$visibility = GETPOST('list', 'alpha');
-    			if ($type == 'separate') $visibility=3;
+    			if ($type == 'separate') $visibility = 3;
 
-                $result=$extrafields->update(
+                $result = $extrafields->update(
     				GETPOST('attrname', 'alpha'),
     				GETPOST('label', 'alpha'),
     				$type,
     				$extrasize,
     				$elementtype,
-    				(GETPOST('unique', 'alpha')?1:0),
-    				(GETPOST('required', 'alpha')?1:0),
+    				(GETPOST('unique', 'alpha') ? 1 : 0),
+    				(GETPOST('required', 'alpha') ? 1 : 0),
     				$pos,
     				$params,
-    				(GETPOST('alwayseditable', 'alpha')?1:0),
-    				(GETPOST('perms', 'alpha')?GETPOST('perms', 'alpha'):''),
+    				(GETPOST('alwayseditable', 'alpha') ? 1 : 0),
+    				(GETPOST('perms', 'alpha') ?GETPOST('perms', 'alpha') : ''),
                 	$visibility,
-					GETPOST('help','alpha'),
-    			    GETPOST('default_value','alpha'),
-    				GETPOST('computed_value','alpha'),
-    				(GETPOST('entitycurrentorall', 'alpha')?0:''),
+					GETPOST('help', 'alpha'),
+    			    GETPOST('default_value', 'alpha'),
+    				GETPOST('computed_value', 'alpha'),
+    				(GETPOST('entitycurrentorall', 'alpha') ? 0 : ''),
                     GETPOST('langfile'),
                     1,
-                    (GETPOST('totalizable', 'alpha')?1:0)
+                    (GETPOST('totalizable', 'alpha') ? 1 : 0)
     			);
     			if ($result > 0)
     			{
@@ -363,7 +363,7 @@ 
     			else
     			{
                     $error++;
-    			    $mesg=$extrafields->error;
+    			    $mesg = $extrafields->error;
     			    setEventMessages($mesg, null, 'errors');
     			}
     		}
@@ -371,7 +371,7 @@ 
     		{
     		    $error++;
     			$langs->load("errors");
-    			$mesg=$langs->trans("ErrorFieldCanNotContainSpecialCharacters",$langs->transnoentities("AttributeCode"));
+    			$mesg = $langs->trans("ErrorFieldCanNotContainSpecialCharacters", $langs->transnoentities("AttributeCode"));
     			setEventMessages($mesg, null, 'errors');
     		}
 	    }
@@ -385,21 +385,21 @@ 
 // Delete attribute
 if ($action == 'delete')
 {
-	if(isset($_GET["attrname"]) && preg_match("/^\w[a-zA-Z0-9-_]*$/",$_GET["attrname"]))
+	if (isset($_GET["attrname"]) && preg_match("/^\w[a-zA-Z0-9-_]*$/", $_GET["attrname"]))
 	{
-        $result=$extrafields->delete($_GET["attrname"],$elementtype);
+        $result = $extrafields->delete($_GET["attrname"], $elementtype);
         if ($result >= 0)
         {
             header("Location: ".$_SERVER["PHP_SELF"]);
             exit;
         }
-        else $mesg=$extrafields->error;
+        else $mesg = $extrafields->error;
 	}
 	else
 	{
 	    $error++;
 		$langs->load("errors");
-		$mesg=$langs->trans("ErrorFieldCanNotContainSpecialCharacters",$langs->transnoentities("AttributeCode"));
+		$mesg = $langs->trans("ErrorFieldCanNotContainSpecialCharacters", $langs->transnoentities("AttributeCode"));
 	}
 }
 

dolibarr/htdocs/core/login/functions_openid.php

Spacing +16 added lines, -16 removed lines

@@ -34,13 +34,13 @@ 
  * @param   int		$entitytotest   Number of instance (always 1 if module multicompany not enabled)
  * @return	string					Login if OK, '' if KO
  */
-function check_user_password_openid($usertotest,$passwordtotest,$entitytotest)
+function check_user_password_openid($usertotest, $passwordtotest, $entitytotest)
 {
-    global $_POST,$db,$conf,$langs;
+    global $_POST, $db, $conf, $langs;
 
     dol_syslog("functions_openid::check_user_password_openid usertotest=".$usertotest);
 
-    $login='';
+    $login = '';
 
     // Get identity from user and redirect browser to OpenID Server
     if (isset($_POST['username']))
@@ -48,14 +48,14 @@ 
         $openid = new SimpleOpenID();
         $openid->SetIdentity($_POST['username']);
         $protocol = ($conf->file->main_force_https ? 'https://' : 'http://');
-        $openid->SetTrustRoot($protocol . $_SERVER["HTTP_HOST"]);
-        $openid->SetRequiredFields(array('email','fullname'));
+        $openid->SetTrustRoot($protocol.$_SERVER["HTTP_HOST"]);
+        $openid->SetRequiredFields(array('email', 'fullname'));
         $_SESSION['dol_entity'] = $_POST["entity"];
         //$openid->SetOptionalFields(array('dob','gender','postcode','country','language','timezone'));
         if ($openid->sendDiscoveryRequestToGetXRDS())
         {
-            $openid->SetApprovedURL($protocol . $_SERVER["HTTP_HOST"] . $_SERVER["SCRIPT_NAME"]);      // Send Response from OpenID server to this script
-            $openid->Redirect();     // This will redirect user to OpenID Server
+            $openid->SetApprovedURL($protocol.$_SERVER["HTTP_HOST"].$_SERVER["SCRIPT_NAME"]); // Send Response from OpenID server to this script
+            $openid->Redirect(); // This will redirect user to OpenID Server
         }
         else
         {
@@ -65,7 +65,7 @@ 
         return false;
     }
     // Perform HTTP Request to OpenID server to validate key
-    elseif($_GET['openid_mode'] == 'id_res')
+    elseif ($_GET['openid_mode'] == 'id_res')
     {
         $openid = new SimpleOpenID();
         $openid->SetIdentity($_GET['openid_identity']);
@@ -74,23 +74,23 @@ 
         {
             // OK HERE KEY IS VALID
 
-            $sql ="SELECT login";
-            $sql.=" FROM ".MAIN_DB_PREFIX."user";
-            $sql.=" WHERE openid = '".$db->escape($_GET['openid_identity'])."'";
-            $sql.=" AND entity IN (0," . ($_SESSION["dol_entity"] ? $_SESSION["dol_entity"] : 1) . ")";
+            $sql = "SELECT login";
+            $sql .= " FROM ".MAIN_DB_PREFIX."user";
+            $sql .= " WHERE openid = '".$db->escape($_GET['openid_identity'])."'";
+            $sql .= " AND entity IN (0,".($_SESSION["dol_entity"] ? $_SESSION["dol_entity"] : 1).")";
 
             dol_syslog("functions_openid::check_user_password_openid", LOG_DEBUG);
-            $resql=$db->query($sql);
+            $resql = $db->query($sql);
             if ($resql)
             {
-                $obj=$db->fetch_object($resql);
+                $obj = $db->fetch_object($resql);
                 if ($obj)
                 {
-                    $login=$obj->login;
+                    $login = $obj->login;
                 }
             }
         }
-        else if($openid->IsError() === true)
+        else if ($openid->IsError() === true)
         {
             // ON THE WAY, WE GOT SOME ERROR
             $error = $openid->GetError();

dolibarr/htdocs/core/login/functions_forceuser.php

Spacing +4 added lines, -4 removed lines

@@ -32,17 +32,17 @@
  * @param   int		$entitytotest   Number of instance (always 1 if module multicompany not enabled)
  * @return	string					Login if OK, '' if KO
  */
-function check_user_password_forceuser($usertotest,$passwordtotest,$entitytotest)
+function check_user_password_forceuser($usertotest, $passwordtotest, $entitytotest)
 {
 	// Variable dolibarr_auto_user must be defined in conf.php file
 	global $dolibarr_auto_user;
 
 	dol_syslog("functions_forceuser::check_user_password_forceuser");
 
-	$login=$dolibarr_auto_user;
-	if (empty($login)) $login='auto';
+	$login = $dolibarr_auto_user;
+	if (empty($login)) $login = 'auto';
 
-	if ($_SESSION["dol_loginmesg"]) $login='';
+	if ($_SESSION["dol_loginmesg"]) $login = '';
 
 	dol_syslog("functions_forceuser::check_user_password_forceuser ok. forced user = ".$login);
 	return $login;

dolibarr/htdocs/core/login/functions_dolibarr.php

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();
 		}
 	}
 

dolibarr/htdocs/core/login/functions_http.php

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

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();

dolibarr/htdocs/core/login/functions_empty.php

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;