Dolibarr / dolibarr

htdocs/core/lib/website2.lib.php

Spacing +2 added lines, -2 removed lines

@@ -148,7 +148,7 @@ 
 	if (dol_is_file($filetpl)) {
 		if ($backupold) {
 			$result = manageFileBackups($filetpl);
-			if (! $result) {
+			if (!$result) {
 				return false;
 			}
 		} else {
@@ -343,7 +343,7 @@ 
 						$indexcontent .= "	require_once DOL_DOCUMENT_ROOT.'/core/website.inc.php';\n";
 						$indexcontent .= '	redirectToContainer($_GET[\'pageref\'], $_GET[\'pagealiasalt\'], $_GET[\'pageid\']);'."\n";
 						$indexcontent .= "}\n";
-						$indexcontent .= "include_once '".$relpath."/".basename($filetpl)."'\n";	// use .. instead of .
+						$indexcontent .= "include_once '".$relpath."/".basename($filetpl)."'\n"; // use .. instead of .
 						$indexcontent .= '// END PHP ?>'."\n";
 						$result = file_put_contents($fileindexsub, $indexcontent);
 						if ($result === false) {

htdocs/core/lib/files.lib.php

Spacing +17 added lines, -17 removed lines

@@ -115,7 +115,7 @@ 
 			'types' => $types,
 			'recursive' => $recursive,
 			'filter' => $filter,
-			'excludefilter' => $exclude_array,  // Already converted to array.
+			'excludefilter' => $exclude_array, // Already converted to array.
 			'sortcriteria' => $sortcriteria,
 			'sortorder' => $sortorder,
 			'loaddate' => $loaddate,
@@ -149,7 +149,7 @@ 
 
 				$qualified = 1;
 
-				$utf8_fullpathfile = "$utf8_path/$utf8_file";  // Temp variable for speed
+				$utf8_fullpathfile = "$utf8_path/$utf8_file"; // Temp variable for speed
 
 				// Check if file is qualified
 				foreach ($excludefilterarray as $filt) {
@@ -1122,7 +1122,7 @@ 
 				}
 
 				if ($resultecm > 0) {
-					$result = true;  // @phan-suppress-current-line PhanPluginRedundantAssignment
+					$result = true; // @phan-suppress-current-line PhanPluginRedundantAssignment
 				} else {
 					$result = false;
 				}
@@ -1197,7 +1197,7 @@ 
 							}
 						}
 					}
-					$result = true;  // @phan-suppress-current-line PhanPluginRedundantAssignment
+					$result = true; // @phan-suppress-current-line PhanPluginRedundantAssignment
 				}
 			}
 		}
@@ -1409,7 +1409,7 @@ 
 		$return = move_uploaded_file($src_file_osencoded, $file_name_osencoded);
 		if ($return) {
 			dolChmod($file_name_osencoded);
-			dol_syslog("Files.lib::dol_move_uploaded_file Success to move ".$src_file." to ".$file_name." - Umask=" . getDolGlobalString('MAIN_UMASK'), LOG_DEBUG);
+			dol_syslog("Files.lib::dol_move_uploaded_file Success to move ".$src_file." to ".$file_name." - Umask=".getDolGlobalString('MAIN_UMASK'), LOG_DEBUG);
 			return $successcode; // Success
 		} else {
 			dol_syslog("Files.lib::dol_move_uploaded_file Failed to move ".$src_file." to ".$file_name, LOG_ERR);
@@ -1922,7 +1922,7 @@ 
 					$maxwidthmini = $tmparraysize['maxwidthmini'];
 					$maxheightmini = $tmparraysize['maxheightmini'];
 					//$quality = $tmparraysize['quality'];
-					$quality = 50;	// For thumbs, we force quality to 50
+					$quality = 50; // For thumbs, we force quality to 50
 
 					// Generate thumbs.
 					if ($generatethumbs) {
@@ -2106,7 +2106,7 @@ 
 			if (isset($object->table_element)) {
 				$ecmfile->src_object_type = $object->table_element;
 			} else {
-				dol_syslog('Error: object ' . get_class($object) . ' has no table_element attribute.');
+				dol_syslog('Error: object '.get_class($object).' has no table_element attribute.');
 				return -1;
 			}
 			if (isset($object->src_object_description)) {
@@ -2350,9 +2350,9 @@ 
 					// Skip directories (they would be added automatically)
 					if (!$file->isDir()) {
 						// Get real and relative path for current file
-						$filePath = $file->getPath();				// the full path with filename using the $inputdir root.
+						$filePath = $file->getPath(); // the full path with filename using the $inputdir root.
 						$fileName = $file->getFilename();
-						$fileFullRealPath = $file->getRealPath();	// the full path with name and transformed to use real path directory.
+						$fileFullRealPath = $file->getRealPath(); // the full path with name and transformed to use real path directory.
 
 						//$relativePath = substr($fileFullRealPath, strlen($rootPath) + 1);
 						$relativePath = substr(($filePath ? $filePath.'/' : '').$fileName, strlen($rootPath) + 1);
@@ -2576,9 +2576,9 @@ 
 
 	try {
 		if ($mode == 'gz') {
-			$foundhandler = 0;  // @phan-suppress-current-line PhanPluginRedundantAssignment
+			$foundhandler = 0; // @phan-suppress-current-line PhanPluginRedundantAssignment
 		} elseif ($mode == 'bz') {
-			$foundhandler = 0;  // @phan-suppress-current-line PhanPluginRedundantAssignment
+			$foundhandler = 0; // @phan-suppress-current-line PhanPluginRedundantAssignment
 		} elseif ($mode == 'zip') {
 			/*if (defined('ODTPHP_PATHTOPCLZIP'))
 			 {
@@ -2619,9 +2619,9 @@ 
 					// Skip directories (they would be added automatically)
 					if (!$file->isDir()) {
 						// Get real and relative path for current file
-						$filePath = $file->getPath();				// the full path with filename using the $inputdir root.
+						$filePath = $file->getPath(); // the full path with filename using the $inputdir root.
 						$fileName = $file->getFilename();
-						$fileFullRealPath = $file->getRealPath();	// the full path with name and transformed to use real path directory.
+						$fileFullRealPath = $file->getRealPath(); // the full path with name and transformed to use real path directory.
 
 						//$relativePath = ($rootdirinzip ? $rootdirinzip.'/' : '').substr($fileFullRealPath, strlen($inputdir) + 1);
 						$relativePath = ($rootdirinzip ? $rootdirinzip.'/' : '').substr(($filePath ? $filePath.'/' : '').$fileName, strlen($inputdir) + 1);
@@ -2794,7 +2794,7 @@ 
 		$original_file = $conf->mycompany->dir_output.'/'.$original_file;
 	} elseif ($modulepart == 'userphoto' && !empty($conf->user->dir_output)) {
 		// Wrapping for users photos (user photos are allowed to any connected users)
-		$accessallowed = 0;  // @phan-suppress-current-line PhanPluginRedundantAssignment
+		$accessallowed = 0; // @phan-suppress-current-line PhanPluginRedundantAssignment
 		if (preg_match('/^\d+\/photos\//', $original_file)) {
 			$accessallowed = 1;
 		}
@@ -2830,7 +2830,7 @@ 
 		$original_file = $conf->mycompany->dir_output.'/logos/'.$original_file;
 	} elseif ($modulepart == 'memberphoto' && !empty($conf->member->dir_output)) {
 		// Wrapping for members photos
-		$accessallowed = 0;  // @phan-suppress-current-line PhanPluginRedundantAssignment
+		$accessallowed = 0; // @phan-suppress-current-line PhanPluginRedundantAssignment
 		if (preg_match('/^\d+\/photos\//', $original_file)) {
 			$accessallowed = 1;
 		}
@@ -3699,7 +3699,7 @@ 
 function manageFileBackups($filetpl, $max_versions = 5, $archivedir = '', $suffix = "v", $moveorcopy = 'move')
 {
 	$base_file_pattern = ($archivedir ? $archivedir : dirname($filetpl)).'/'.basename($filetpl).".".$suffix;
-	$files_in_directory = glob($base_file_pattern . "*");
+	$files_in_directory = glob($base_file_pattern."*");
 
 	// Extract the modification timestamps for each file
 	$files_with_timestamps = [];
@@ -3740,7 +3740,7 @@ 
 	}
 
 	$timestamp = dol_now('gmt');
-	$new_backup = $filetpl . ".v" . $timestamp;
+	$new_backup = $filetpl.".v".$timestamp;
 
 	// Move or copy the original file to the new backup with the timestamp
 	if ($moveorcopy == 'move') {