alxarafe / alixar

dolibarr/htdocs/core/filemanagerdol/connectors/php/connector.php

Braces +8 added lines, -5 removed lines

@@ -30,8 +30,9 @@ 
 require 'basexml.php';
 require 'commands.php';
 
-if ( !$Config['Enabled'] )
+if ( !$Config['Enabled'] ) {
 	SendError(1, 'This connector is disabled. Please check the "editor/filemanager/connectors/php/config.php" file');
+}
 
 DoResponse();
 
@@ -45,8 +46,9 @@ 
     if (!isset($_GET)) {
         global $_GET;
     }
-	if ( !isset( $_GET['Command'] ) || !isset( $_GET['Type'] ) || !isset( $_GET['CurrentFolder'] ) )
-		return;
+	if ( !isset( $_GET['Command'] ) || !isset( $_GET['Type'] ) || !isset( $_GET['CurrentFolder'] ) ) {
+			return;
+	}
 
 	// Get the main request informaiton.
 	$sCommand		= $_GET['Command'] ;
@@ -59,8 +61,9 @@ 
 		SendError(1, 'The "' . $sCommand . '" command isn\'t allowed');
 	}
 	// Check if it is an allowed type.
-	if (! IsAllowedType($sResourceType))
-		SendError(1, 'Invalid type specified');
+	if (! IsAllowedType($sResourceType)) {
+			SendError(1, 'Invalid type specified');
+	}
 
 	// File Upload doesn't have to Return XML, so it must be intercepted before anything.
 	if ( $sCommand == 'FileUpload' )

dolibarr/htdocs/core/filemanagerdol/connectors/php/upload.php

Braces +6 added lines, -3 removed lines

@@ -41,8 +41,9 @@ 
 
 
 // Check if this uploader has been enabled.
-if ( !$Config['Enabled'] )
+if ( !$Config['Enabled'] ) {
 	SendUploadResults('1', '', '', 'This file uploader is disabled. Please check the "filemanagerdol/connectors/php/config.php" file');
+}
 
 $sCommand = 'QuickUpload' ;
 
@@ -52,12 +53,14 @@ 
 $sCurrentFolder	= "/" ;
 
 // Is enabled the upload?
-if (! IsAllowedCommand($sCommand))
+if (! IsAllowedCommand($sCommand)) {
 	SendUploadResults('1', '', '', 'The ""' . $sCommand . '"" command isn\'t allowed');
+}
 
 // Check if it is an allowed type.
-if (! IsAllowedType($sType))
+if (! IsAllowedType($sType)) {
     SendUploadResults(1, '', '', 'Invalid type specified');
+}
 
 
 // @CHANGE

dolibarr/htdocs/core/filemanagerdol/connectors/php/io.php

Braces +53 added lines, -40 removed lines

@@ -44,11 +44,12 @@ 
 {
 	global $Config ;
 
-	if ($sCommand == "QuickUpload")
-		return $Config['QuickUploadPath'][$resourceType] ;
-	else
-		return $Config['FileTypesPath'][$resourceType] ;
-}
+	if ($sCommand == "QuickUpload") {
+			return $Config['QuickUploadPath'][$resourceType] ;
+	} else {
+			return $Config['FileTypesPath'][$resourceType] ;
+	}
+	}
 
 /**
  * GetResourceTypeDirectory
@@ -62,16 +63,17 @@ 
 	global $Config ;
 	if ($sCommand == "QuickUpload")
 	{
-		if ( strlen($Config['QuickUploadAbsolutePath'][$resourceType]) > 0)
-			return $Config['QuickUploadAbsolutePath'][$resourceType] ;
+		if ( strlen($Config['QuickUploadAbsolutePath'][$resourceType]) > 0) {
+					return $Config['QuickUploadAbsolutePath'][$resourceType] ;
+		}
 
 		// Map the "UserFiles" path to a local directory.
 		return Server_MapPath($Config['QuickUploadPath'][$resourceType]);
-	}
-	else
+	} else
 	{
-		if ( strlen($Config['FileTypesAbsolutePath'][$resourceType]) > 0)
-			return $Config['FileTypesAbsolutePath'][$resourceType] ;
+		if ( strlen($Config['FileTypesAbsolutePath'][$resourceType]) > 0) {
+					return $Config['FileTypesAbsolutePath'][$resourceType] ;
+		}
 
 		// Map the "UserFiles" path to a local directory.
 		return Server_MapPath($Config['FileTypesPath'][$resourceType]);
@@ -116,8 +118,9 @@ 
 
 	// Ensure that the directory exists.
 	$sErrorMsg = CreateServerFolder($sResourceTypePath);
-	if ( $sErrorMsg != '' )
-		SendError(1, "Error creating folder \"{$sResourceTypePath}\" ({$sErrorMsg})");
+	if ( $sErrorMsg != '' ) {
+			SendError(1, "Error creating folder \"{$sResourceTypePath}\" ({$sErrorMsg})");
+	}
 
 	// Return the resource type directory combined with the required path.
 	return CombinePaths($sResourceTypePath, $folderPath);
@@ -162,8 +165,9 @@ 
 		}
 
 		$sErrorMsg = CreateServerFolder($sParent, $folderPath);
-		if ( $sErrorMsg != '' )
-			return $sErrorMsg ;
+		if ( $sErrorMsg != '' ) {
+					return $sErrorMsg ;
+		}
 	}
 
 	if ( !file_exists($folderPath))
@@ -178,8 +182,7 @@ 
 		if ( isset( $Config['ChmodOnFolderCreate'] ) && !$Config['ChmodOnFolderCreate'] )
 		{
 			mkdir($folderPath);
-		}
-		else
+		} else
 		{
 			$permissions = '0777';
 			if ( isset( $Config['ChmodOnFolderCreate'] ) && $Config['ChmodOnFolderCreate'])
@@ -202,10 +205,10 @@ 
 		ini_restore('error_reporting');
 
 		return $sErrorMsg ;
+	} else {
+			return '' ;
+	}
 	}
-	else
-		return '' ;
-}
 
 /**
  * Get Root Path
@@ -230,8 +233,9 @@ 
 
     // This can check only that this script isn't run from a virtual dir
     // But it avoids the problems that arise if it isn't checked
-    if ( $position === false || $position <> strlen($sRealPath) - strlen($sSelfPath) )
-        SendError(1, 'Sorry, can\'t map "UserFilesPath" to a physical path. You must set the "UserFilesAbsolutePath" value in "editor/filemanager/connectors/php/config.php".');
+    if ( $position === false || $position <> strlen($sRealPath) - strlen($sSelfPath) ) {
+            SendError(1, 'Sorry, can\'t map "UserFilesPath" to a physical path. You must set the "UserFilesAbsolutePath" value in "editor/filemanager/connectors/php/config.php".');
+    }
 
     return substr($sRealPath, 0, $position);
 }
@@ -265,11 +269,13 @@ 
 	$arAllowed	= $Config['AllowedExtensions'][$resourceType] ;
 	$arDenied	= $Config['DeniedExtensions'][$resourceType] ;
 
-	if ( count($arAllowed) > 0 && !in_array($sExtension, $arAllowed))
-		return false ;
+	if ( count($arAllowed) > 0 && !in_array($sExtension, $arAllowed)) {
+			return false ;
+	}
 
-	if ( count($arDenied) > 0 && in_array($sExtension, $arDenied))
-		return false ;
+	if ( count($arDenied) > 0 && in_array($sExtension, $arDenied)) {
+			return false ;
+	}
 
 	return true ;
 }
@@ -283,8 +289,9 @@ 
 function IsAllowedType($resourceType)
 {
 	global $Config ;
-	if ( !in_array($resourceType, $Config['ConfigAllowedTypes']))
-		return false ;
+	if ( !in_array($resourceType, $Config['ConfigAllowedTypes'])) {
+			return false ;
+	}
 
 	return true ;
 }
@@ -299,8 +306,9 @@ 
 {
 	global $Config ;
 
-	if (! in_array($sCommand, $Config['ConfigAllowedCommands']))
-		return false ;
+	if (! in_array($sCommand, $Config['ConfigAllowedCommands'])) {
+			return false ;
+	}
 
 	return true ;
 }
@@ -318,10 +326,12 @@ 
 	$sCurrentFolder	= isset( $_GET['CurrentFolder'] ) ? GETPOST('CurrentFolder', '', 1) : '/' ;
 
 	// Check the current folder syntax (must begin and start with a slash).
-	if (!preg_match('|/$|', $sCurrentFolder))
-		$sCurrentFolder .= '/' ;
-	if (strpos($sCurrentFolder, '/') !== 0)
-		$sCurrentFolder = '/' . $sCurrentFolder ;
+	if (!preg_match('|/$|', $sCurrentFolder)) {
+			$sCurrentFolder .= '/' ;
+	}
+	if (strpos($sCurrentFolder, '/') !== 0) {
+			$sCurrentFolder = '/' . $sCurrentFolder ;
+	}
 
 	// Ensure the folder path has no double-slashes
 	while ( strpos($sCurrentFolder, '//') !== false ) {
@@ -329,11 +339,13 @@ 
 	}
 
 	// Check for invalid folder paths (..)
-	if ( strpos($sCurrentFolder, '..') || strpos($sCurrentFolder, "\\"))
-		SendError(102, '');
+	if ( strpos($sCurrentFolder, '..') || strpos($sCurrentFolder, "\\")) {
+			SendError(102, '');
+	}
 
-	if ( preg_match(",(/\.)|[[:cntrl:]]|(//)|(\\\\)|([\:\*\?\"\<\>\|]),", $sCurrentFolder))
-		SendError(102, '');
+	if ( preg_match(",(/\.)|[[:cntrl:]]|(//)|(\\\\)|([\:\*\?\"\<\>\|]),", $sCurrentFolder)) {
+			SendError(102, '');
+	}
 
 	return $sCurrentFolder ;
 }
@@ -357,8 +369,9 @@ 
 	$sNewFileName = stripslashes($sNewFileName);
 
 	// Replace dots in the name with underscores (only one dot can be there... security issue).
-	if ( $Config['ForceSingleExtension'] )
-		$sNewFileName = preg_replace('/\\.(?![^.]*$)/', '_', $sNewFileName);
+	if ( $Config['ForceSingleExtension'] ) {
+			$sNewFileName = preg_replace('/\\.(?![^.]*$)/', '_', $sNewFileName);
+	}
 
 	// Remove \ / | : ? * " < >
 	$sNewFileName = preg_replace('/\\\\|\\/|\\||\\:|\\?|\\*|"|<|>|[[:cntrl:]]/', '_', $sNewFileName);

dolibarr/htdocs/core/filemanagerdol/connectors/php/commands.php

Braces +32 added lines, -28 removed lines

@@ -43,8 +43,9 @@ 
 	{
 		while ( $sFile = readdir($oCurrentFolder) )
 		{
-			if ( $sFile != '.' && $sFile != '..' && is_dir($sServerDir . $sFile) )
-				$aFolders[] = '<Folder name="' . ConvertToXmlAttribute($sFile) . '" />' ;
+			if ( $sFile != '.' && $sFile != '..' && is_dir($sServerDir . $sFile) ) {
+							$aFolders[] = '<Folder name="' . ConvertToXmlAttribute($sFile) . '" />' ;
+			}
 		}
 		closedir($oCurrentFolder);
 	}
@@ -53,8 +54,9 @@ 
 	echo "<Folders>" ;
 
 	natcasesort($aFolders);
-	foreach ( $aFolders as $sFolder )
-		echo $sFolder ;
+	foreach ( $aFolders as $sFolder ) {
+			echo $sFolder ;
+	}
 
 	// Close the "Folders" node.
 	echo "</Folders>" ;
@@ -84,9 +86,9 @@ 
 		{
 			if ( $sFile != '.' && $sFile != '..' )
 			{
-				if ( is_dir($sServerDir . $sFile) )
-					$aFolders[] = '<Folder name="' . ConvertToXmlAttribute($sFile) . '" />' ;
-				else
+				if ( is_dir($sServerDir . $sFile) ) {
+									$aFolders[] = '<Folder name="' . ConvertToXmlAttribute($sFile) . '" />' ;
+				} else
 				{
 					$iFileSize = @filesize($sServerDir . $sFile);
 					if ( !$iFileSize ) {
@@ -95,8 +97,9 @@ 
 					if ( $iFileSize > 0 )
 					{
 						$iFileSize = round($iFileSize / 1024);
-						if ( $iFileSize < 1 )
-							$iFileSize = 1 ;
+						if ( $iFileSize < 1 ) {
+													$iFileSize = 1 ;
+						}
 					}
 
 					$aFiles[] = '<File name="' . ConvertToXmlAttribute($sFile) . '" size="' . $iFileSize . '" />' ;
@@ -110,8 +113,9 @@ 
 	natcasesort($aFolders);
 	echo '<Folders>' ;
 
-	foreach ( $aFolders as $sFolder )
-		echo $sFolder ;
+	foreach ( $aFolders as $sFolder ) {
+			echo $sFolder ;
+	}
 
 	echo '</Folders>' ;
 
@@ -119,8 +123,9 @@ 
 	natcasesort($aFiles);
 	echo '<Files>' ;
 
-	foreach ( $aFiles as $sFiles )
-		echo $sFiles ;
+	foreach ( $aFiles as $sFiles ) {
+			echo $sFiles ;
+	}
 
 	echo '</Files>' ;
 }
@@ -145,8 +150,10 @@ 
 		$sNewFolderName = $_GET['NewFolderName'] ;
 		$sNewFolderName = SanitizeFolderName($sNewFolderName);
 
-		if (strpos($sNewFolderName, '..') !== false)
-			$sErrorNumber = '102' ;		// Invalid folder name.
+		if (strpos($sNewFolderName, '..') !== false) {
+					$sErrorNumber = '102' ;
+		}
+		// Invalid folder name.
 		else
 		{
 			// Map the virtual path to the local server path of the current folder.
@@ -171,13 +178,13 @@ 
 						$sErrorNumber = '110' ;
 						break ;
 				}
+			} else {
+							$sErrorNumber = '103' ;
 			}
-			else
-				$sErrorNumber = '103' ;
 		}
+	} else {
+			$sErrorNumber = '102' ;
 	}
-	else
-		$sErrorNumber = '102' ;
 
 	// Create the "Error" node.
 	echo '<Error number="' . $sErrorNumber . '" />' ;
@@ -254,8 +261,7 @@ 
 					$iCounter++ ;
 					$sFileName = RemoveExtension($sOriginalFileName) . '(' . $iCounter . ').' . $sExtension ;
 					$sErrorNumber = '201' ;
-				}
-				else
+				} else
 				{
 					move_uploaded_file($oFile['tmp_name'], $sFilePath);
 
@@ -289,19 +295,18 @@ 
 				{
 					@unlink($sFilePath);
 					$sErrorNumber = '202' ;
-				}
-				else if ( isset( $detectHtml ) && $detectHtml === -1 && DetectHtml($sFilePath) === true )
+				} else if ( isset( $detectHtml ) && $detectHtml === -1 && DetectHtml($sFilePath) === true )
 				{
 					@unlink($sFilePath);
 					$sErrorNumber = '202' ;
 				}
 			}
+		} else {
+					$sErrorNumber = '202' ;
 		}
-		else
+	} else {
 			$sErrorNumber = '202' ;
 	}
-	else
-		$sErrorNumber = '202' ;
 
 
 	$sFileUrl = CombinePaths(GetResourceTypePath($resourceType, $sCommand), $currentFolder);
@@ -314,8 +319,7 @@ 
     {
         // this line already exists so wrap the if block around it
         SendUploadResults($sErrorNumber, $sFileUrl, $sFileName);
-    }
-    else
+    } else
 	{
 	    //issue the CKEditor Callback
 		SendCKEditorResults(

dolibarr/htdocs/core/filemanagerdol/connectors/php/config.php

Braces +10 added lines, -3 removed lines

@@ -34,7 +34,10 @@ 
 require_once '../../../../main.inc.php';
 $uri=preg_replace('/^http(s?):\/\//i','',$dolibarr_main_url_root);
 $pos = strstr($uri, '/');       // $pos contient alors url sans nom domaine
-if ($pos == '/') $pos = '';     // si $pos vaut /, on le met a ''
+if ($pos == '/') {
+    $pos = '';
+}
+// si $pos vaut /, on le met a ''
 define('DOL_URL_ROOT', $pos);
 $entity = ((!empty($_SESSION['dol_entity']) && $_SESSION['dol_entity'] > 1) ? $_SESSION['dol_entity'] : null);
 
@@ -81,14 +84,18 @@ 
 // Set to 0 to disable this feature.
 // Note: not needed on Windows-based servers.
 $newmask = '0644';
-if (! empty($conf->global->MAIN_UMASK)) $newmask=$conf->global->MAIN_UMASK;
+if (! empty($conf->global->MAIN_UMASK)) {
+    $newmask=$conf->global->MAIN_UMASK;
+}
 $Config['ChmodOnUpload'] = $newmask;
 
 // See comments above.
 // Used when creating folders that does not exist.
 $newmask = '0755';
 $dirmaskdec=octdec($newmask);
-if (! empty($conf->global->MAIN_UMASK)) $dirmaskdec=octdec($conf->global->MAIN_UMASK);
+if (! empty($conf->global->MAIN_UMASK)) {
+    $dirmaskdec=octdec($conf->global->MAIN_UMASK);
+}
 $dirmaskdec |= octdec('0200');  // Set w bit required to be able to create content for recursive subdirs files
 $newmask = decoct($dirmaskdec);
 

dolibarr/htdocs/core/filemanagerdol/connectors/php/util.php

Braces +2 added lines, -4 removed lines

@@ -87,8 +87,7 @@ 
 	if ( defined('PHP_OS') )
 	{
 		$os = PHP_OS ;
-	}
-	else
+	} else
 	{
 		$os = php_uname();
 	}
@@ -96,8 +95,7 @@ 
 	if (strtoupper(substr($os, 0, 3)) === 'WIN' || FindBadUtf8($value))
 	{
 		return (utf8_encode(htmlspecialchars($value)));
-	}
-	else
+	} else
 	{
 		return (htmlspecialchars($value));
 	}

dolibarr/htdocs/core/lib/import.lib.php

Braces +3 added lines, -1 removed lines

@@ -36,7 +36,9 @@
 {
 	global $langs;
 
-	if (empty($maxstep)) $maxstep=6;
+	if (empty($maxstep)) {
+	    $maxstep=6;
+	}
 
 	$h=0;
 	$head = array();

dolibarr/htdocs/core/lib/agenda.lib.php

Braces +80 added lines, -32 removed lines

@@ -68,8 +68,11 @@ 
 
 	print '<div class="fichecenter">';
 
-	if ($conf->browser->layout == 'phone') print '<div class="fichehalfleft">';
-	else print '<table class="nobordernopadding" width="100%"><tr><td class="borderright">';
+	if ($conf->browser->layout == 'phone') {
+	    print '<div class="fichehalfleft">';
+	} else {
+	    print '<table class="nobordernopadding" width="100%"><tr><td class="borderright">';
+	}
 
 	print '<table class="nobordernopadding centpercent">';
 
@@ -80,7 +83,9 @@ 
 		print $langs->trans("ActionsToDoBy").' &nbsp; ';
 		print '</td><td style="padding-bottom: 2px; padding-right: 4px;">';
 		print $form->select_dolusers($filtert, 'search_filtert', 1, '', ! $canedit, '', '', 0, 0, 0, '', 0, '', 'maxwidth300');
-		if (empty($conf->dol_optimize_smallscreen)) print ' &nbsp; '.$langs->trans("or") . ' '.$langs->trans("ToUserOfGroup").' &nbsp; ';
+		if (empty($conf->dol_optimize_smallscreen)) {
+		    print ' &nbsp; '.$langs->trans("or") . ' '.$langs->trans("ToUserOfGroup").' &nbsp; ';
+		}
 		print $form->select_dolgroups($usergroupid, 'usergroup', 1, '', ! $canedit);
 		print '</td></tr>';
 
@@ -104,10 +109,12 @@ 
 		print $langs->trans("Type");
 		print ' &nbsp;</td><td class="nowrap" style="padding-bottom: 2px; padding-right: 4px;">';
 		$multiselect=0;
-		if (! empty($conf->global->MAIN_ENABLE_MULTISELECT_TYPE))     // We use an option here because it adds bugs when used on agenda page "peruser" and "list"
+		if (! empty($conf->global->MAIN_ENABLE_MULTISELECT_TYPE)) {
+		    // We use an option here because it adds bugs when used on agenda page "peruser" and "list"
 		{
             $multiselect=(!empty($conf->global->AGENDA_USE_EVENT_TYPE));
 		}
+		}
         print $formactions->select_type_actions($actioncode, "search_actioncode", $excludetype, (empty($conf->global->AGENDA_USE_EVENT_TYPE)?1:-1), 0, $multiselect);
 		print '</td></tr>';
 	}
@@ -154,10 +161,15 @@ 
 		print "<td class='nowrap'>";
 		print '<div class="ui-grid-a"><div class="ui-block-a">';
 		print '<input type="number" class="short" name="begin_h" value="'.$begin_h.'" min="0" max="23">';
-		if (empty($conf->dol_use_jmobile)) print ' - ';
-		else print '</div><div class="ui-block-b">';
+		if (empty($conf->dol_use_jmobile)) {
+		    print ' - ';
+		} else {
+		    print '</div><div class="ui-block-b">';
+		}
 		print '<input type="number" class="short" name="end_h" value="'.$end_h.'" min="1" max="24">';
-		if (empty($conf->dol_use_jmobile)) print ' '.$langs->trans("H");
+		if (empty($conf->dol_use_jmobile)) {
+		    print ' '.$langs->trans("H");
+		}
 		print '</div></div>';
 		print '</td></tr>';
 
@@ -167,8 +179,11 @@ 
 		print "<td class='nowrap'>";
 		print '<div class="ui-grid-a"><div class="ui-block-a">';
 		print '<input type="number" class="short" name="begin_d" value="'.$begin_d.'" min="1" max="7">';
-		if (empty($conf->dol_use_jmobile)) print ' - ';
-		else print '</div><div class="ui-block-b">';
+		if (empty($conf->dol_use_jmobile)) {
+		    print ' - ';
+		} else {
+		    print '</div><div class="ui-block-b">';
+		}
 		print '<input type="number" class="short" name="end_d" value="'.$end_d.'" min="1" max="7">';
 		print '</div></div>';
 		print '</td></tr>';
@@ -180,11 +195,17 @@ 
 
 	print '</table>';
 
-	if ($conf->browser->layout == 'phone') print '</div>';
-	else print '</td>';
+	if ($conf->browser->layout == 'phone') {
+	    print '</div>';
+	} else {
+	    print '</td>';
+	}
 
-	if ($conf->browser->layout == 'phone') print '<div class="fichehalfright">';
-	else print '<td align="center" valign="middle" class="nowrap">';
+	if ($conf->browser->layout == 'phone') {
+	    print '<div class="fichehalfright">';
+	} else {
+	    print '<td align="center" valign="middle" class="nowrap">';
+	}
 
 	print '<table class="centpercent"><tr><td align="center">';
 	print '<div class="formleftzone">';
@@ -193,8 +214,11 @@ 
 	print '</td></tr>';
 	print '</table>';
 
-	if ($conf->browser->layout == 'phone') print '</div>';
-	else print '</td></tr></table>';
+	if ($conf->browser->layout == 'phone') {
+	    print '</div>';
+	} else {
+	    print '</td></tr></table>';
+	}
 
 	print '</div>';	// Close fichecenter
 	print '<div style="clear:both"></div>';
@@ -224,11 +248,17 @@ 
 	$sql.= " FROM ".MAIN_DB_PREFIX."actioncomm as a LEFT JOIN ";
 	$sql.= " ".MAIN_DB_PREFIX."c_actioncomm as c ON c.id = a.fk_action";
     $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON a.fk_soc = s.rowid";
-	if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+	if (!$user->rights->societe->client->voir && !$socid) {
+	    $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+	}
 	$sql.= " WHERE a.entity = ".$conf->entity;
     $sql.= " AND ((a.percent >= 0 AND a.percent < 100) OR (a.percent = -1 AND a.datep2 > '".$db->idate($now)."'))";
-	if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-	if ($socid) $sql.= " AND s.rowid = ".$socid;
+	if (!$user->rights->societe->client->voir && !$socid) {
+	    $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+	}
+	if ($socid) {
+	    $sql.= " AND s.rowid = ".$socid;
+	}
 	$sql.= " ORDER BY a.datep DESC, a.id DESC";
 	$sql.= $db->plimit($max, 0);
 
@@ -278,11 +308,21 @@ 
             // Date
 			print '<td width="100" align="right">'.dol_print_date($datep,'day').'&nbsp;';
 			$late=0;
-			if ($obj->percent == 0 && $datep && $datep < time()) $late=1;
-			if ($obj->percent == 0 && ! $datep && $datep2 && $datep2 < time()) $late=1;
-			if ($obj->percent > 0 && $obj->percent < 100 && $datep2 && $datep2 < time()) $late=1;
-			if ($obj->percent > 0 && $obj->percent < 100 && ! $datep2 && $datep && $datep < time()) $late=1;
-			if ($late) print img_warning($langs->trans("Late"));
+			if ($obj->percent == 0 && $datep && $datep < time()) {
+			    $late=1;
+			}
+			if ($obj->percent == 0 && ! $datep && $datep2 && $datep2 < time()) {
+			    $late=1;
+			}
+			if ($obj->percent > 0 && $obj->percent < 100 && $datep2 && $datep2 < time()) {
+			    $late=1;
+			}
+			if ($obj->percent > 0 && $obj->percent < 100 && ! $datep2 && $datep && $datep < time()) {
+			    $late=1;
+			}
+			if ($late) {
+			    print img_warning($langs->trans("Late"));
+			}
 			print "</td>";
 
 			// Statut
@@ -295,8 +335,7 @@ 
 	    print "</table><br>";
 
 	    $db->free($resql);
-	}
-	else
+	} else
 	{
 	    dol_print_error($db);
 	}
@@ -321,11 +360,17 @@ 
 	$sql.= " FROM ".MAIN_DB_PREFIX."actioncomm as a LEFT JOIN ";
 	$sql.= " ".MAIN_DB_PREFIX."c_actioncomm as c ON c.id = a.fk_action ";
     $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON a.fk_soc = s.rowid";
-	if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+	if (!$user->rights->societe->client->voir && !$socid) {
+	    $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+	}
 	$sql.= " WHERE a.entity = ".$conf->entity;
     $sql.= " AND (a.percent >= 100 OR (a.percent = -1 AND a.datep2 <= '".$db->idate($now)."'))";
-	if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-    if ($socid) $sql.= " AND s.rowid = ".$socid;
+	if (!$user->rights->societe->client->voir && !$socid) {
+	    $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+	}
+    if ($socid) {
+        $sql.= " AND s.rowid = ".$socid;
+    }
 	$sql .= " ORDER BY a.datep2 DESC";
 	$sql .= $db->plimit($max, 0);
 
@@ -383,8 +428,7 @@ 
 		print "</table><br>";
 
 		$db->free($resql);
-	}
-	else
+	} else
 	{
 		dol_print_error($db);
 	}
@@ -471,7 +515,9 @@ 
         $listofresourcelinked = $resource->getElementResources($object->element, $object->id);
         $nbResources=count($listofresourcelinked);
 		$head[$h][1] = $langs->trans("Resources");
-		if ($nbResources > 0) $head[$h][1].= ' <span class="badge">'.($nbResources).'</span>';
+		if ($nbResources > 0) {
+		    $head[$h][1].= ' <span class="badge">'.($nbResources).'</span>';
+		}
 		$head[$h][2] = 'resources';
 		$h++;
 	}
@@ -484,7 +530,9 @@ 
     $nbLinks=Link::count($db, $object->element, $object->id);
     $head[$h][0] = DOL_URL_ROOT.'/comm/action/document.php?id='.$object->id;
     $head[$h][1] = $langs->trans("Documents");
-	if (($nbFiles+$nbLinks) > 0) $head[$h][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>';
+	if (($nbFiles+$nbLinks) > 0) {
+	    $head[$h][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>';
+	}
     $head[$h][2] = 'documents';
     $h++;
 

dolibarr/htdocs/core/lib/invoice.lib.php

Braces +23 added lines, -8 removed lines

@@ -50,7 +50,9 @@ 
 	    $nbContact = count($object->liste_contact(-1,'internal')) + count($object->liste_contact(-1,'external'));
 	    $head[$h][0] = DOL_URL_ROOT.'/compta/facture/contact.php?facid='.$object->id;
 		$head[$h][1] = $langs->trans('ContactsAddresses');
-		if ($nbContact > 0) $head[$h][1].= ' <span class="badge">'.$nbContact.'</span>';
+		if ($nbContact > 0) {
+		    $head[$h][1].= ' <span class="badge">'.$nbContact.'</span>';
+		}
 		$head[$h][2] = 'contact';
 		$h++;
 	}
@@ -66,12 +68,17 @@ 
         if ($resql)
         {
             $obj=$db->fetch_object($resql);
-            if ($obj) $nbStandingOrders = $obj->nb;
+            if ($obj) {
+                $nbStandingOrders = $obj->nb;
+            }
+        } else {
+            dol_print_error($db);
         }
-        else dol_print_error($db);
 		$head[$h][0] = DOL_URL_ROOT.'/compta/facture/prelevement.php?facid='.$object->id;
 		$head[$h][1] = $langs->trans('StandingOrders');
-		if ($nbStandingOrders > 0) $head[$h][1].= ' <span class="badge">'.$nbStandingOrders.'</span>';
+		if ($nbStandingOrders > 0) {
+		    $head[$h][1].= ' <span class="badge">'.$nbStandingOrders.'</span>';
+		}
 		$head[$h][2] = 'standingorders';
 		$h++;
 	}
@@ -85,11 +92,17 @@ 
     if (empty($conf->global->MAIN_DISABLE_NOTES_TAB))
     {
     	$nbNote = 0;
-        if(!empty($object->note_private)) $nbNote++;
-		if(!empty($object->note_public)) $nbNote++;
+        if(!empty($object->note_private)) {
+            $nbNote++;
+        }
+		if(!empty($object->note_public)) {
+		    $nbNote++;
+		}
     	$head[$h][0] = DOL_URL_ROOT.'/compta/facture/note.php?facid='.$object->id;
     	$head[$h][1] = $langs->trans('Notes');
-		if ($nbNote > 0) $head[$h][1].= ' <span class="badge">'.$nbNote.'</span>';
+		if ($nbNote > 0) {
+		    $head[$h][1].= ' <span class="badge">'.$nbNote.'</span>';
+		}
     	$head[$h][2] = 'note';
     	$h++;
     }
@@ -101,7 +114,9 @@ 
     $nbLinks=Link::count($db, $object->element, $object->id);
 	$head[$h][0] = DOL_URL_ROOT.'/compta/facture/document.php?facid='.$object->id;
 	$head[$h][1] = $langs->trans('Documents');
-	if (($nbFiles+$nbLinks) > 0) $head[$h][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>';
+	if (($nbFiles+$nbLinks) > 0) {
+	    $head[$h][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>';
+	}
 	$head[$h][2] = 'documents';
 	$h++;