alxarafe / alixar

dolibarr/htdocs/core/login/functions_openid.php

Braces +4 added lines, -8 removed lines

@@ -56,8 +56,7 @@ 
         {
             $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
+        } else
         {
             $error = $openid->GetError();
             return false;
@@ -89,21 +88,18 @@ 
                     $login=$obj->login;
                 }
             }
-        }
-        else if($openid->IsError() === true)
+        } else if($openid->IsError() === true)
         {
             // ON THE WAY, WE GOT SOME ERROR
             $error = $openid->GetError();
             return false;
-        }
-        else
+        } else
         {
             // Signature Verification Failed
             //echo "INVALID AUTHORIZATION";
             return false;
         }
-    }
-    else if ($_GET['openid_mode'] == 'cancel')
+    } else if ($_GET['openid_mode'] == 'cancel')
     {
         // User Canceled your Request
         //echo "USER CANCELED REQUEST";

dolibarr/htdocs/core/login/functions_forceuser.php

Braces +6 added lines, -2 removed lines

@@ -40,9 +40,13 @@
 	dol_syslog("functions_forceuser::check_user_password_forceuser");
 
 	$login=$dolibarr_auto_user;
-	if (empty($login)) $login='auto';
+	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

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_ldap.php

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/actions_changeselectedfields.inc.php

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

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

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/ajaxdirtree.php

Braces +110 added lines, -44 removed lines

@@ -26,15 +26,26 @@ 
 // This script is called with a POST method.
 // Directory to scan (full path) is inside POST['dir'] and encode by js escape() if ajax is used or encoded by urlencode if mode=noajax
 
-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('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 (! isset($mode) || $mode != 'noajax')    // For ajax call
+if (! isset($mode) || $mode != 'noajax') {
+    // For ajax call
 {
 	$res=@include '../../main.inc.php';
+}
 	include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 	include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 	include_once DOL_DOCUMENT_ROOT.'/core/lib/treeview.lib.php';
@@ -49,9 +60,11 @@ 
 
 	$preopened = GETPOST('preopened');
 
-	if ($selecteddir != '/') $selecteddir = preg_replace('/\/$/','',$selecteddir);    // We removed last '/' except if it is '/'
-}
-else    // For no ajax call
+	if ($selecteddir != '/') {
+	    $selecteddir = preg_replace('/\/$/','',$selecteddir);
+	}
+	// We removed last '/' except if it is '/'
+} else    // For no ajax call
 {
 	//if (GETPOST('preopened')) { $_GET['dir'] = $_POST['dir'] = GETPOST('preopened'); }
 
@@ -61,9 +74,14 @@ 
 
 	$preopened = GETPOST('preopened');
 
-	if ($selecteddir != '/') $selecteddir = preg_replace('/\/$/','',$selecteddir);    // We removed last '/' except if it is '/'
-	if (empty($url)) $url=DOL_URL_ROOT.'/ecm/index.php';
-}
+	if ($selecteddir != '/') {
+	    $selecteddir = preg_replace('/\/$/','',$selecteddir);
+	}
+	// We removed last '/' except if it is '/'
+	if (empty($url)) {
+	    $url=DOL_URL_ROOT.'/ecm/index.php';
+	}
+	}
 
 // Load translation files required by the page
 $langs->load("ecm");
@@ -74,8 +92,7 @@ 
 {
 	$fullpathselecteddir=$conf->ecm->dir_output.'/'.($selecteddir != '/' ? $selecteddir : '');
 	$fullpathpreopened=$conf->ecm->dir_output.'/'.($preopened != '/' ? $preopened : '');
-}
-elseif ($modulepart == 'medias')
+} elseif ($modulepart == 'medias')
 {
 	$fullpathselecteddir=$dolibarr_main_data_root.'/medias/'.($selecteddir != '/' ? $selecteddir : '');
 	$fullpathpreopened=$dolibarr_main_data_root.'/medias/'.($preopened != '/' ? $preopened : '');
@@ -95,9 +112,10 @@ 
 // Check permissions
 if ($modulepart == 'ecm')
 {
-	if (! $user->rights->ecm->read) accessforbidden();
-}
-elseif ($modulepart == 'medias')
+	if (! $user->rights->ecm->read) {
+	    accessforbidden();
+	}
+	} elseif ($modulepart == 'medias')
 {
 	// Always allowed
 }
@@ -107,10 +125,12 @@ 
  * View
  */
 
-if (! isset($mode) || $mode != 'noajax')	// if ajax mode
+if (! isset($mode) || $mode != 'noajax') {
+    // if ajax mode
 {
 	top_httphead();
 }
+}
 
 //print '<!-- selecteddir (relative dir we click on) = '.$selecteddir.', openeddir = '.$openeddir.', modulepart='.$modulepart.', preopened='.$preopened.' -->'."\n";
 $userstatic=new User($db);
@@ -118,7 +138,9 @@ 
 $ecmdirstatic = new EcmDirectory($db);
 
 // Load full tree of ECM module from database. We will use it to define nbofsubdir and nboffilesinsubdir
-if (empty($sqltree)) $sqltree=$ecmdirstatic->get_full_arbo(0);
+if (empty($sqltree)) {
+    $sqltree=$ecmdirstatic->get_full_arbo(0);
+}
 
 // Try to find selected dir id into $sqltree and save it into $current_ecmdir_id
 $current_ecmdir_id=-1;
@@ -164,7 +186,10 @@ 
 	print '<ul class="ecmjqft">';
 
 	// Load full tree from database. We will use it to define nbofsubdir and nboffilesinsubdir
-	if (empty($sqltree)) $sqltree=$ecmdirstatic->get_full_arbo(0);    // Slow
+	if (empty($sqltree)) {
+	    $sqltree=$ecmdirstatic->get_full_arbo(0);
+	}
+	// Slow
 
 	// ----- This section will show a tree from a fulltree array -----
 	// $section must also be defined
@@ -185,7 +210,9 @@ 
 
 	// Update expandedsectionarray in session
 	$expandedsectionarray=array();
-	if (isset($_SESSION['dol_ecmexpandedsectionarray'])) $expandedsectionarray=explode(',',$_SESSION['dol_ecmexpandedsectionarray']);
+	if (isset($_SESSION['dol_ecmexpandedsectionarray'])) {
+	    $expandedsectionarray=explode(',',$_SESSION['dol_ecmexpandedsectionarray']);
+	}
 
 	if ($section && GETPOST('sectionexpand') == 'true')
 	{
@@ -193,10 +220,12 @@ 
 		$pathtosection=explode('_',$fullpathselected);
 		foreach($pathtosection as $idcursor)
 		{
-			if ($idcursor && ! in_array($idcursor,$expandedsectionarray))	// Not already in array
+			if ($idcursor && ! in_array($idcursor,$expandedsectionarray)) {
+			    // Not already in array
 			{
 				$expandedsectionarray[]=$idcursor;
 			}
+			}
 		}
 		$_SESSION['dol_ecmexpandedsectionarray']=join(',',$expandedsectionarray);
 	}
@@ -238,18 +267,29 @@ 
 		$showline=0;
 
 		// If directory is son of expanded directory, we show line
-		if (in_array($val['id_mere'],$expandedsectionarray)) $showline=4;
+		if (in_array($val['id_mere'],$expandedsectionarray)) {
+		    $showline=4;
+		}
 		// If directory is brother of selected directory, we show line
-		elseif ($val['id'] != $section && $val['id_mere'] == $ecmdirstatic->motherof[$section]) $showline=3;
+		elseif ($val['id'] != $section && $val['id_mere'] == $ecmdirstatic->motherof[$section]) {
+		    $showline=3;
+		}
 		// If directory is parent of selected directory or is selected directory, we show line
-		elseif (preg_match('/'.$val['fullpath'].'_/i',$fullpathselected.'_')) $showline=2;
+		elseif (preg_match('/'.$val['fullpath'].'_/i',$fullpathselected.'_')) {
+		    $showline=2;
+		}
 		// If we are level one we show line
-		elseif ($val['level'] < 2) $showline=1;
+		elseif ($val['level'] < 2) {
+		    $showline=1;
+		}
 
 		if ($showline)
 		{
-			if (in_array($val['id'],$expandedsectionarray)) $option='indexexpanded';
-			else $option='indexnotexpanded';
+			if (in_array($val['id'],$expandedsectionarray)) {
+			    $option='indexexpanded';
+			} else {
+			    $option='indexnotexpanded';
+			}
 			//print $option;
 
 			print '<li class="directory collapsed">';
@@ -276,7 +316,9 @@ 
 			print $val['cachenbofdoc'];
 			print '</td>';
 			print '<td align="left">';
-			if ($nbofsubdir && $nboffilesinsubdir) print '<font color="#AAAAAA">+'.$nboffilesinsubdir.'</font> ';
+			if ($nbofsubdir && $nboffilesinsubdir) {
+			    print '<font color="#AAAAAA">+'.$nboffilesinsubdir.'</font> ';
+			}
 			print '</td>';
 
 			// Info
@@ -289,8 +331,11 @@ 
 			$htmltooltip.='<b>'.$langs->trans("ECMCreationDate").'</b>: '.dol_print_date($val['date_c'],"dayhour").'<br>';
 			$htmltooltip.='<b>'.$langs->trans("Description").'</b>: '.$val['description'].'<br>';
 			$htmltooltip.='<b>'.$langs->trans("ECMNbOfFilesInDir").'</b>: '.$val['cachenbofdoc'].'<br>';
-			if ($nbofsubdir) $htmltooltip.='<b>'.$langs->trans("ECMNbOfFilesInSubDir").'</b>: '.$nboffilesinsubdir;
-			else $htmltooltip.='<b>'.$langs->trans("ECMNbOfSubDir").'</b>: '.$nbofsubdir.'<br>';
+			if ($nbofsubdir) {
+			    $htmltooltip.='<b>'.$langs->trans("ECMNbOfFilesInSubDir").'</b>: '.$nboffilesinsubdir;
+			} else {
+			    $htmltooltip.='<b>'.$langs->trans("ECMNbOfSubDir").'</b>: '.$nbofsubdir.'<br>';
+			}
 			print $form->textwithpicto('', $htmltooltip, 1, 'info');
 			print "</td>";
 
@@ -320,7 +365,9 @@ 
 
 
 // Close db if mode is not noajax
-if ((! isset($mode) || $mode != 'noajax') && is_object($db)) $db->close();
+if ((! isset($mode) || $mode != 'noajax') && is_object($db)) {
+    $db->close();
+}
 
 
 
@@ -353,14 +400,18 @@ 
 		if (! empty($files))
 		{
 			natcasesort($files);
-			if (count($files) > 2)    /* The 2 accounts for . and .. */
+			if (count($files) > 2) {
+			    /* The 2 accounts for . and .. */
 			{
 				echo '<ul class="ecmjqft" style="display: none;">'."\n";
+			}
 
 				// All dirs
-				foreach ($files as $file)    // $file can be '.', '..', or 'My dir' or 'My file'
+				foreach ($files as $file) {
+				    // $file can be '.', '..', or 'My dir' or 'My file'
 				{
 					if ($file == 'temp') continue;
+				}
 
 					$nbofsubdir=0;
 					$nboffilesinsubdir=0;
@@ -371,15 +422,19 @@ 
 					foreach($sqltree as $key => $tmpval)
 					{
 						//print "-- key=".$key." - ".$tmpval['fullrelativename']." vs ".(($selecteddir != '/'?$selecteddir.'/':'').$file)."<br>\n";
-						if ($tmpval['fullrelativename'] == (($selecteddir != '/'?$selecteddir.'/':'').$file))		// We found equivalent record into database
+						if ($tmpval['fullrelativename'] == (($selecteddir != '/'?$selecteddir.'/':'').$file)) {
+						    // We found equivalent record into database
 						{
 							$val=$tmpval;
+						}
 							$resarray=tree_showpad($sqltree,$key,1);
 
 							// Refresh cache for this subdir
-							if (isset($val['cachenbofdoc']) && $val['cachenbofdoc'] < 0)	// Cache is not up to date, so we update it for this directory t
+							if (isset($val['cachenbofdoc']) && $val['cachenbofdoc'] < 0) {
+							    // Cache is not up to date, so we update it for this directory t
 							{
 								$result=$ecmdirstatic->fetch($val['id']);
+							}
 								$ecmdirstatic->ref=$ecmdirstatic->label;
 
 								$result=$ecmdirstatic->refreshcachenboffile(0);
@@ -396,9 +451,11 @@ 
 					//print 'modulepart='.$modulepart.' fullpathselecteddir='.$fullpathselecteddir.' - val[fullrelativename] (in database)='.$val['fullrelativename'].' - val[id]='.$val['id'].' - is_dir='.dol_is_dir($fullpathselecteddir . $file).' - file='.$file."\n";
 					if ($file != '.' && $file != '..' && ((! empty($val['fullrelativename']) && $val['id'] >= 0) || dol_is_dir($fullpathselecteddir . (preg_match('/\/$/',$fullpathselecteddir)?'':'/') . $file)))
 					{
-						if (empty($val['fullrelativename']))	// If we did not find entry into database, but found a directory (dol_is_dir was ok at previous test)
+						if (empty($val['fullrelativename'])) {
+						    // If we did not find entry into database, but found a directory (dol_is_dir was ok at previous test)
 						{
 							$val['fullrelativename']=(($selecteddir && $selecteddir != '/')?$selecteddir.'/':'').$file;
+						}
 							$val['id']=0;
 							$val['label']=$file;
 							$val['description']='';
@@ -406,7 +463,9 @@ 
 						}
 
 						$collapsedorexpanded='collapsed';
-						if (preg_match('/^'.preg_quote($val['fullrelativename'].'/', '/').'/', $preopened)) $collapsedorexpanded='expanded';
+						if (preg_match('/^'.preg_quote($val['fullrelativename'].'/', '/').'/', $preopened)) {
+						    $collapsedorexpanded='expanded';
+						}
 						print '<li class="directory '.$collapsedorexpanded.'">';	// collapsed is opposite if expanded
 
 						print "<a class=\"fmdirlia jqft ecmjqft\" href=\"";
@@ -430,7 +489,9 @@ 
 						print (isset($val['cachenbofdoc']) && $val['cachenbofdoc']  >= 0)?$val['cachenbofdoc']:'&nbsp;';
 						print '</td>';
 						print '<td align="left">';
-						if ($nbofsubdir > 0  && $nboffilesinsubdir > 0) print '<font color="#AAAAAA">+'.$nboffilesinsubdir.'</font> ';
+						if ($nbofsubdir > 0  && $nboffilesinsubdir > 0) {
+						    print '<font color="#AAAAAA">+'.$nboffilesinsubdir.'</font> ';
+						}
 						print '</td>';
 
 						// Edit link
@@ -455,8 +516,11 @@ 
 							$htmltooltip.='<b>'.$langs->trans("ECMCreationDate").'</b>: '.(isset($val['date_c'])?dol_print_date($val['date_c'],"dayhour"):$langs->trans("NeedRefresh")).'<br>';
 							$htmltooltip.='<b>'.$langs->trans("Description").'</b>: '.$val['description'].'<br>';
 							$htmltooltip.='<b>'.$langs->trans("ECMNbOfFilesInDir").'</b>: '.((isset($val['cachenbofdoc']) && $val['cachenbofdoc'] >= 0)?$val['cachenbofdoc']:$langs->trans("NeedRefresh")).'<br>';
-							if ($nboffilesinsubdir > 0) $htmltooltip.='<b>'.$langs->trans("ECMNbOfFilesInSubDir").'</b>: '.$nboffilesinsubdir;
-							else $htmltooltip.='<b>'.$langs->trans("ECMNbOfSubDir").'</b>: '.($nbofsubdir >= 0 ? $nbofsubdir : $langs->trans("NeedRefresh")).'<br>';
+							if ($nboffilesinsubdir > 0) {
+							    $htmltooltip.='<b>'.$langs->trans("ECMNbOfFilesInSubDir").'</b>: '.$nboffilesinsubdir;
+							} else {
+							    $htmltooltip.='<b>'.$langs->trans("ECMNbOfSubDir").'</b>: '.($nbofsubdir >= 0 ? $nbofsubdir : $langs->trans("NeedRefresh")).'<br>';
+							}
 							print $form->textwithpicto('',$htmltooltip,1,"info");
 							print "</td>";
 						}
@@ -473,13 +537,14 @@ 
 							if ($modulepart == 'ecm')
 							{
 								$newfullpathselecteddir=$conf->ecm->dir_output.'/'.($val['fullrelativename'] != '/' ? $val['fullrelativename'] : '');
-							}
-							elseif ($modulepart == 'medias')
+							} elseif ($modulepart == 'medias')
 							{
 								$newfullpathselecteddir=$dolibarr_main_data_root.'/medias/'.($val['fullrelativename'] != '/' ? $val['fullrelativename'] : '');
 							}
 
-							if ($newfullpathselecteddir) treeOutputForAbsoluteDir($sqltree, $newselecteddir, $newfullpathselecteddir, $modulepart, $websitekey, $pageid, $preopened, $fullpathpreopened, $depth+1);
+							if ($newfullpathselecteddir) {
+							    treeOutputForAbsoluteDir($sqltree, $newselecteddir, $newfullpathselecteddir, $modulepart, $websitekey, $pageid, $preopened, $fullpathpreopened, $depth+1);
+							}
 						}
 
 						print "</li>\n";
@@ -488,8 +553,9 @@ 
 
 				echo "</ul>\n";
 			}
+		} else {
+		    print "PermissionDenied";
 		}
-		else print "PermissionDenied";
 	}
 }
 

dolibarr/htdocs/core/ajax/ajaxdirpreview.php

Braces +145 added lines, -60 removed lines

@@ -27,14 +27,25 @@ 
  * 				ajaxdirpreview.php?mode=nojs&action=preview&module=ecm&section=0&file=xxx
  */
 
-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('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 (! isset($mode) || $mode != 'noajax')    // For ajax call
+if (! isset($mode) || $mode != 'noajax') {
+    // For ajax call
 {
     require_once '../../main.inc.php';
+}
     require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
     require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
     require_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmdirectory.class.php';
@@ -53,8 +64,12 @@ 
     $offset = $conf->liste_limit * $page;
     $pageprev = $page - 1;
     $pagenext = $page + 1;
-    if (! $sortorder) $sortorder="ASC";
-    if (! $sortfield) $sortfield="name";
+    if (! $sortorder) {
+        $sortorder="ASC";
+    }
+    if (! $sortfield) {
+        $sortfield="name";
+    }
 
 	$rootdirfordoc = $conf->ecm->dir_output;
 
@@ -67,8 +82,7 @@ 
         //dol_print_error($db,$ecmdir->error);
         //exit;
     }
-}
-else    // For no ajax call
+} else    // For no ajax call
 {
 	$rootdirfordoc = $conf->ecm->dir_output;
 
@@ -84,8 +98,7 @@ 
         }
 
         $relativepath=$ecmdir->getRelativePath();	// Example   'mydir/'
-    }
-	elseif (GETPOST('section_dir'))
+    } elseif (GETPOST('section_dir'))
 	{
 		$relativepath=GETPOST('section_dir');
 	}
@@ -96,15 +109,20 @@ 
 
 if (empty($url))
 {
-	if (GETPOSTISSET('website')) $url=DOL_URL_ROOT.'/website/index.php';
-	else $url=DOL_URL_ROOT.'/ecm/index.php';
-}
+	if (GETPOSTISSET('website')) {
+	    $url=DOL_URL_ROOT.'/website/index.php';
+	} else {
+	    $url=DOL_URL_ROOT.'/ecm/index.php';
+	}
+	}
 
 // Load translation files required by the page
 $langs->loadLangs(array("ecm","companies","other"));
 
 // Security check
-if ($user->societe_id > 0) $socid = $user->societe_id;
+if ($user->societe_id > 0) {
+    $socid = $user->societe_id;
+}
 
 //print 'xxx'.$upload_dir;
 
@@ -121,8 +139,10 @@ 
 // Check permissions
 if ($modulepart == 'ecm')
 {
-	if (! $user->rights->ecm->read) accessforbidden();
-}
+	if (! $user->rights->ecm->read) {
+	    accessforbidden();
+	}
+	}
 if ($modulepart == 'medias')
 {
 	// Always allowed
@@ -165,8 +185,12 @@ 
 //print '<!-- Page called with mode='.dol_escape_htmltag(isset($mode)?$mode:'').' type='.dol_escape_htmltag($type).' module='.dol_escape_htmltag($module).' url='.dol_escape_htmltag($url).' '.dol_escape_htmltag($_SERVER["PHP_SELF"]).'?'.dol_escape_htmltag($_SERVER["QUERY_STRING"]).' -->'."\n";
 
 $param=($sortfield?'&sortfield='.$sortfield:'').($sortorder?'&sortorder='.$sortorder:'');
-if (! empty($websitekey)) $param.='&website='.$websitekey;
-if (! empty($pageid))     $param.='&pageid='.$pageid;
+if (! empty($websitekey)) {
+    $param.='&website='.$websitekey;
+}
+if (! empty($pageid)) {
+    $param.='&pageid='.$pageid;
+}
 
 
 // Dir scan
@@ -183,45 +207,80 @@ 
 
     // TODO change for multicompany sharing
     // Auto area for suppliers invoices
-    if ($module == 'company') $upload_dir = $conf->societe->dir_output;
+    if ($module == 'company') {
+        $upload_dir = $conf->societe->dir_output;
+    }
     // Auto area for suppliers invoices
-    else if ($module == 'invoice') $upload_dir = $conf->facture->dir_output;
+    else if ($module == 'invoice') {
+        $upload_dir = $conf->facture->dir_output;
+    }
     // Auto area for suppliers invoices
-    else if ($module == 'invoice_supplier') $upload_dir = $conf->fournisseur->facture->dir_output;
+    else if ($module == 'invoice_supplier') {
+        $upload_dir = $conf->fournisseur->facture->dir_output;
+    }
     // Auto area for customers proposal
-    else if ($module == 'propal') $upload_dir = $conf->propal->dir_output;
+    else if ($module == 'propal') {
+        $upload_dir = $conf->propal->dir_output;
+    }
     // Auto area for suppliers proposal
-    else if ($module == 'supplier_proposal') $upload_dir = $conf->supplier_proposal->dir_output;
+    else if ($module == 'supplier_proposal') {
+        $upload_dir = $conf->supplier_proposal->dir_output;
+    }
     // Auto area for customers orders
-    else if ($module == 'order') $upload_dir = $conf->commande->dir_output;
+    else if ($module == 'order') {
+        $upload_dir = $conf->commande->dir_output;
+    }
     // Auto area for suppliers orders
-    else if ($module == 'order_supplier') $upload_dir = $conf->fournisseur->commande->dir_output;
+    else if ($module == 'order_supplier') {
+        $upload_dir = $conf->fournisseur->commande->dir_output;
+    }
     // Auto area for suppliers invoices
-    else if ($module == 'contract') $upload_dir = $conf->contrat->dir_output;
+    else if ($module == 'contract') {
+        $upload_dir = $conf->contrat->dir_output;
+    }
     // Auto area for products
-    else if ($module == 'product') $upload_dir = $conf->product->dir_output;
+    else if ($module == 'product') {
+        $upload_dir = $conf->product->dir_output;
+    }
     // Auto area for suppliers invoices
-    else if ($module == 'tax') $upload_dir = $conf->tax->dir_output;
+    else if ($module == 'tax') {
+        $upload_dir = $conf->tax->dir_output;
+    }
     // Auto area for projects
-    else if ($module == 'project') $upload_dir = $conf->projet->dir_output;
+    else if ($module == 'project') {
+        $upload_dir = $conf->projet->dir_output;
+    }
     // Auto area for interventions
-    else if ($module == 'fichinter') $upload_dir = $conf->ficheinter->dir_output;
+    else if ($module == 'fichinter') {
+        $upload_dir = $conf->ficheinter->dir_output;
+    }
     // Auto area for users
-    else if ($module == 'user') $upload_dir = $conf->user->dir_output;
+    else if ($module == 'user') {
+        $upload_dir = $conf->user->dir_output;
+    }
     // Auto area for expense report
-    else if ($module == 'expensereport') $upload_dir = $conf->expensereport->dir_output;
+    else if ($module == 'expensereport') {
+        $upload_dir = $conf->expensereport->dir_output;
+    }
 	// Auto area for holiday
-    else if ($module == 'holiday') $upload_dir = $conf->holiday->dir_output;
+    else if ($module == 'holiday') {
+        $upload_dir = $conf->holiday->dir_output;
+    }
 
     // Automatic list
     if (in_array($module, $automodules))
     {
         $param.='&module='.$module;
-        if (isset($search_doc_ref) && $search_doc_ref != '') $param.='&search_doc_ref='.$search_doc_ref;
+        if (isset($search_doc_ref) && $search_doc_ref != '') {
+            $param.='&search_doc_ref='.$search_doc_ref;
+        }
 
         $textifempty=($section?$langs->trans("NoFileFound"):($showonrightsize=='featurenotyetavailable'?$langs->trans("FeatureNotYetAvailable"):$langs->trans("NoFileFound")));
 
-        if ($module == 'company') $excludefiles[]='^contact$';   // The subdir 'contact' contains files of contacts with no id of thirdparty.
+        if ($module == 'company') {
+            $excludefiles[]='^contact$';
+        }
+        // The subdir 'contact' contains files of contacts with no id of thirdparty.
 
         $filter=preg_quote($search_doc_ref, '/');
         $filearray=dol_dir_list($upload_dir, "files", 1, $filter, $excludefiles, $sortfield, $sorting,1);
@@ -247,17 +306,22 @@ 
 			  'sendit' => string 'Envoyer fichier' (length=15)
     		 */
     		$relativepath=GETPOST('file','alpha')?GETPOST('file','alpha'):GETPOST('section_dir','alpha');
-    		if ($relativepath && $relativepath!= '/') $relativepath.='/';
+    		if ($relativepath && $relativepath!= '/') {
+    		    $relativepath.='/';
+    		}
     		$upload_dir = $dolibarr_main_data_root.'/'.$module.'/'.$relativepath;
     		if (GETPOSTISSET('website') || GETPOSTISSET('file_manager'))
 	    	{
 	    		$param.='&file_manager=1';
-	    		if (!preg_match('/website=/',$param)) $param.='&website='.urlencode(GETPOST('website','alpha'));
-	    		if (!preg_match('/pageid=/',$param)) $param.='&pageid='.urlencode(GETPOST('pageid','int'));
+	    		if (!preg_match('/website=/',$param)) {
+	    		    $param.='&website='.urlencode(GETPOST('website','alpha'));
+	    		}
+	    		if (!preg_match('/pageid=/',$param)) {
+	    		    $param.='&pageid='.urlencode(GETPOST('pageid','int'));
+	    		}
 	    		//if (!preg_match('/backtopage=/',$param)) $param.='&backtopage='.urlencode($_SERVER["PHP_SELF"].'?file_manager=1&website='.$websitekey.'&pageid='.$pageid);
 	    	}
-    	}
-    	else
+    	} else
     	{
         	$relativepath=$ecmdir->getRelativePath();
         	$upload_dir = $conf->ecm->dir_output.'/'.$relativepath;
@@ -267,8 +331,7 @@ 
 		if (($section === '0' || empty($section)) && ($module != 'medias'))
         {
             $filearray=array();
-        }
-        else
+        } else
         {
         	$filearray=dol_dir_list($upload_dir,"files",0,'',array('^\.','(\.meta|_preview.*\.png)$','^temp$','^CVS$'),$sortfield, $sorting,1);
         }
@@ -276,16 +339,21 @@ 
         if ($section)
         {
             $param.='&section='.$section;
-        	if (isset($search_doc_ref) && $search_doc_ref != '') $param.='&search_doc_ref='.$search_doc_ref;
+        	if (isset($search_doc_ref) && $search_doc_ref != '') {
+        	    $param.='&search_doc_ref='.$search_doc_ref;
+        	}
 
             $textifempty = $langs->trans('NoFileFound');
-        }
-        else if ($section === '0')
+        } else if ($section === '0')
         {
-        	if ($module == 'ecm') $textifempty='<br><div align="center"><font class="warning">'.$langs->trans("DirNotSynchronizedSyncFirst").'</font></div><br>';
-        	else $textifempty = $langs->trans('NoFileFound');
+        	if ($module == 'ecm') {
+        	    $textifempty='<br><div align="center"><font class="warning">'.$langs->trans("DirNotSynchronizedSyncFirst").'</font></div><br>';
+        	} else {
+        	    $textifempty = $langs->trans('NoFileFound');
+        	}
+        } else {
+            $textifempty=($showonrightsize=='featurenotyetavailable'?$langs->trans("FeatureNotYetAvailable"):$langs->trans("ECMSelectASection"));
         }
-        else $textifempty=($showonrightsize=='featurenotyetavailable'?$langs->trans("FeatureNotYetAvailable"):$langs->trans("ECMSelectASection"));
 
     	if ($module == 'medias')
     	{
@@ -293,8 +361,7 @@ 
     		$modulepart='medias';
         	$perm=($user->rights->website->write || $user->rights->emailing->creer);
         	$title='none';
-    	}
-    	else
+    	} else
     	{
     		$useinecm = 1;
     		$modulepart='ecm';
@@ -313,18 +380,28 @@ 
 
 // Bottom of page
 $useajax=1;
-if (! empty($conf->dol_use_jmobile)) $useajax=0;
-if (empty($conf->use_javascript_ajax)) $useajax=0;
-if (! empty($conf->global->MAIN_ECM_DISABLE_JS)) $useajax=0;
+if (! empty($conf->dol_use_jmobile)) {
+    $useajax=0;
+}
+if (empty($conf->use_javascript_ajax)) {
+    $useajax=0;
+}
+if (! empty($conf->global->MAIN_ECM_DISABLE_JS)) {
+    $useajax=0;
+}
 
 //$param.=($param?'?':'').(preg_replace('/^&/','',$param));
 
 if ($useajax || $action == 'delete')
 {
 	$urlfile='';
-	if ($action == 'delete') $urlfile=GETPOST('urlfile','alpha');
+	if ($action == 'delete') {
+	    $urlfile=GETPOST('urlfile','alpha');
+	}
 
-	if (empty($section_dir)) $section_dir=GETPOST("file","alpha");
+	if (empty($section_dir)) {
+	    $section_dir=GETPOST("file","alpha");
+	}
 	$section_id=$section;
 
 	require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
@@ -334,9 +411,15 @@ 
 	$formquestion['section']=array('type'=>'hidden','value'=>$section,'name'=>'section');				// We must always put field, even if empty because it is fille by javascript later
 	$formquestion['section_id']=array('type'=>'hidden','value'=>$section_id,'name'=>'section_id');		// We must always put field, even if empty because it is fille by javascript later
 	$formquestion['section_dir']=array('type'=>'hidden','value'=>$section_dir,'name'=>'section_dir');	// We must always put field, even if empty because it is fille by javascript later
-	if (! empty($action) && $action == 'file_manager')	$formquestion['file_manager']=array('type'=>'hidden','value'=>1,'name'=>'file_manager');
-	if (! empty($websitekey))							$formquestion['website']=array('type'=>'hidden','value'=>$websitekey,'name'=>'website');
-	if (! empty($pageid) && $pageid > 0)				$formquestion['pageid']=array('type'=>'hidden','value'=>$pageid,'name'=>'pageid');
+	if (! empty($action) && $action == 'file_manager') {
+	    $formquestion['file_manager']=array('type'=>'hidden','value'=>1,'name'=>'file_manager');
+	}
+	if (! empty($websitekey)) {
+	    $formquestion['website']=array('type'=>'hidden','value'=>$websitekey,'name'=>'website');
+	}
+	if (! empty($pageid) && $pageid > 0) {
+	    $formquestion['pageid']=array('type'=>'hidden','value'=>$pageid,'name'=>'pageid');
+	}
 
 	print $form->formconfirm($url,$langs->trans("DeleteFile"),$langs->trans("ConfirmDeleteFile"),'confirm_deletefile',$formquestion,"no",($useajax?'deletefile':0));
 }
@@ -376,4 +459,6 @@ 
 }
 
 // Close db if mode is not noajax
-if ((! isset($mode) || $mode != 'noajax') && is_object($db)) $db->close();
+if ((! isset($mode) || $mode != 'noajax') && is_object($db)) {
+    $db->close();
+}