Dolibarr / dolibarr

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

Indentation +26 added lines, -26 removed lines

@@ -131,8 +131,8 @@ 
  */
 function GetParentFolder($folderPath)
 {
-    $sPattern = "-[/\\\\][^/\\\\]+[/\\\\]?$-" ;
-    return preg_replace($sPattern, '', $folderPath);
+	$sPattern = "-[/\\\\][^/\\\\]+[/\\\\]?$-" ;
+	return preg_replace($sPattern, '', $folderPath);
 }
 
 /**
@@ -214,41 +214,41 @@ 
  */
 function GetRootPath()
 {
-    if (!isset($_SERVER)) {
-        global $_SERVER;
-    }
-    $sRealPath = realpath('./');
-    // #2124 ensure that no slash is at the end
-    $sRealPath = rtrim($sRealPath,"\\/");
+	if (!isset($_SERVER)) {
+		global $_SERVER;
+	}
+	$sRealPath = realpath('./');
+	// #2124 ensure that no slash is at the end
+	$sRealPath = rtrim($sRealPath,"\\/");
 
-    $sSelfPath = $_SERVER['PHP_SELF'] ;
-    $sSelfPath = substr($sSelfPath, 0, strrpos($sSelfPath, '/'));
+	$sSelfPath = $_SERVER['PHP_SELF'] ;
+	$sSelfPath = substr($sSelfPath, 0, strrpos($sSelfPath, '/'));
 
-    $sSelfPath = str_replace('/', DIRECTORY_SEPARATOR, $sSelfPath);
+	$sSelfPath = str_replace('/', DIRECTORY_SEPARATOR, $sSelfPath);
 
-    $position = strpos($sRealPath, $sSelfPath);
+	$position = strpos($sRealPath, $sSelfPath);
 
-    // 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".');
+	// 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".');
 
-    return substr($sRealPath, 0, $position);
+	return substr($sRealPath, 0, $position);
 }
 
 // Emulate the asp Server.mapPath function.
 // given an url path return the physical directory that it corresponds to
 function Server_MapPath( $path )
 {
-    // This function is available only for Apache
-    if (function_exists('apache_lookup_uri')) {
-        $info = apache_lookup_uri($path);
-        return $info->filename . $info->path_info ;
-    }
-
-    // This isn't correct but for the moment there's no other solution
-    // If this script is under a virtual directory or symlink it will detect the problem and stop
-    return GetRootPath() . $path ;
+	// This function is available only for Apache
+	if (function_exists('apache_lookup_uri')) {
+		$info = apache_lookup_uri($path);
+		return $info->filename . $info->path_info ;
+	}
+
+	// This isn't correct but for the moment there's no other solution
+	// If this script is under a virtual directory or symlink it will detect the problem and stop
+	return GetRootPath() . $path ;
 }
 
 /**

Spacing +70 added lines, -70 removed lines

@@ -29,9 +29,9 @@ 
  * @param   string $sFolder       sFolder
  * @return  string                Combined path
  */
-function CombinePaths( $sBasePath, $sFolder )
+function CombinePaths($sBasePath, $sFolder)
 {
-	return RemoveFromEnd($sBasePath, '/') . '/' . RemoveFromStart($sFolder, '/');
+	return RemoveFromEnd($sBasePath, '/').'/'.RemoveFromStart($sFolder, '/');
 }
 /**
  * GetResourceTypePath
@@ -42,12 +42,12 @@ 
  */
 function GetResourceTypePath($resourceType, $sCommand)
 {
-	global $Config ;
+	global $Config;
 
 	if ($sCommand == "QuickUpload")
-		return $Config['QuickUploadPath'][$resourceType] ;
+		return $Config['QuickUploadPath'][$resourceType];
 	else
-		return $Config['FileTypesPath'][$resourceType] ;
+		return $Config['FileTypesPath'][$resourceType];
 }
 
 /**
@@ -59,19 +59,19 @@ 
  */
 function GetResourceTypeDirectory($resourceType, $sCommand)
 {
-	global $Config ;
+	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
 	{
-		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,7 +116,7 @@ 
 
 	// Ensure that the directory exists.
 	$sErrorMsg = CreateServerFolder($sResourceTypePath);
-	if ( $sErrorMsg != '' )
+	if ($sErrorMsg != '')
 		SendError(1, "Error creating folder \"{$sResourceTypePath}\" ({$sErrorMsg})");
 
 	// Return the resource type directory combined with the required path.
@@ -131,7 +131,7 @@ 
  */
 function GetParentFolder($folderPath)
 {
-    $sPattern = "-[/\\\\][^/\\\\]+[/\\\\]?$-" ;
+    $sPattern = "-[/\\\\][^/\\\\]+[/\\\\]?$-";
     return preg_replace($sPattern, '', $folderPath);
 }
 
@@ -144,50 +144,50 @@ 
  */
 function CreateServerFolder($folderPath, $lastFolder = null)
 {
-	global $Config ;
+	global $Config;
 	$sParent = GetParentFolder($folderPath);
 
 	// Ensure the folder path has no double-slashes, or mkdir may fail on certain platforms
-	while ( strpos($folderPath, '//') !== false )
+	while (strpos($folderPath, '//') !== false)
 	{
 		$folderPath = str_replace('//', '/', $folderPath);
 	}
 
 	// Check if the parent exists, or create it.
-	if ( !empty($sParent) && !file_exists($sParent))
+	if (!empty($sParent) && !file_exists($sParent))
 	{
 		//prevents agains infinite loop when we can't create root folder
-		if ( !is_null($lastFolder) && $lastFolder === $sParent) {
-			return "Can't create $folderPath directory" ;
+		if (!is_null($lastFolder) && $lastFolder === $sParent) {
+			return "Can't create $folderPath directory";
 		}
 
 		$sErrorMsg = CreateServerFolder($sParent, $folderPath);
-		if ( $sErrorMsg != '' )
-			return $sErrorMsg ;
+		if ($sErrorMsg != '')
+			return $sErrorMsg;
 	}
 
-	if ( !file_exists($folderPath))
+	if (!file_exists($folderPath))
 	{
 		// Turn off all error reporting.
 		error_reporting(0);
 
-		$php_errormsg = '' ;
+		$php_errormsg = '';
 		// Enable error tracking to catch the error.
 		ini_set('track_errors', '1');
 
-		if ( isset( $Config['ChmodOnFolderCreate'] ) && !$Config['ChmodOnFolderCreate'] )
+		if (isset($Config['ChmodOnFolderCreate']) && !$Config['ChmodOnFolderCreate'])
 		{
 			mkdir($folderPath);
 		}
 		else
 		{
 			$permissions = '0777';
-			if ( isset( $Config['ChmodOnFolderCreate'] ) && $Config['ChmodOnFolderCreate'])
+			if (isset($Config['ChmodOnFolderCreate']) && $Config['ChmodOnFolderCreate'])
 			{
 				$permissions = (string) $Config['ChmodOnFolderCreate'];
 			}
 			$permissionsdec = octdec($permissions);
-			$permissionsdec |= octdec('0111');  // Set x bit required for directories
+			$permissionsdec |= octdec('0111'); // Set x bit required for directories
 			dol_syslog("io.php permission = ".$permissions." ".$permissionsdec." ".decoct($permissionsdec));
 			// To create the folder with 0777 permissions, we need to set umask to zero.
 			$oldumask = umask(0);
@@ -195,16 +195,16 @@ 
 			umask($oldumask);
 		}
 
-		$sErrorMsg = $php_errormsg ;
+		$sErrorMsg = $php_errormsg;
 
 		// Restore the configurations.
 		ini_restore('track_errors');
 		ini_restore('error_reporting');
 
-		return $sErrorMsg ;
+		return $sErrorMsg;
 	}
 	else
-		return '' ;
+		return '';
 }
 
 /**
@@ -219,9 +219,9 @@ 
     }
     $sRealPath = realpath('./');
     // #2124 ensure that no slash is at the end
-    $sRealPath = rtrim($sRealPath,"\\/");
+    $sRealPath = rtrim($sRealPath, "\\/");
 
-    $sSelfPath = $_SERVER['PHP_SELF'] ;
+    $sSelfPath = $_SERVER['PHP_SELF'];
     $sSelfPath = substr($sSelfPath, 0, strrpos($sSelfPath, '/'));
 
     $sSelfPath = str_replace('/', DIRECTORY_SEPARATOR, $sSelfPath);
@@ -230,7 +230,7 @@ 
 
     // 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) )
+    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);
@@ -238,17 +238,17 @@ 
 
 // Emulate the asp Server.mapPath function.
 // given an url path return the physical directory that it corresponds to
-function Server_MapPath( $path )
+function Server_MapPath($path)
 {
     // This function is available only for Apache
     if (function_exists('apache_lookup_uri')) {
         $info = apache_lookup_uri($path);
-        return $info->filename . $info->path_info ;
+        return $info->filename.$info->path_info;
     }
 
     // This isn't correct but for the moment there's no other solution
     // If this script is under a virtual directory or symlink it will detect the problem and stop
-    return GetRootPath() . $path ;
+    return GetRootPath().$path;
 }
 
 /**
@@ -260,18 +260,18 @@ 
  */
 function IsAllowedExt($sExtension, $resourceType)
 {
-	global $Config ;
+	global $Config;
 	// Get the allowed and denied extensions arrays.
-	$arAllowed	= $Config['AllowedExtensions'][$resourceType] ;
-	$arDenied	= $Config['DeniedExtensions'][$resourceType] ;
+	$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 ;
+	return true;
 }
 
 /**
@@ -282,11 +282,11 @@ 
  */
 function IsAllowedType($resourceType)
 {
-	global $Config ;
-	if ( !in_array($resourceType, $Config['ConfigAllowedTypes']))
-		return false ;
+	global $Config;
+	if (!in_array($resourceType, $Config['ConfigAllowedTypes']))
+		return false;
 
-	return true ;
+	return true;
 }
 
 /**
@@ -297,12 +297,12 @@ 
  */
 function IsAllowedCommand($sCommand)
 {
-	global $Config ;
+	global $Config;
 
-	if (! in_array($sCommand, $Config['ConfigAllowedCommands']))
-		return false ;
+	if (!in_array($sCommand, $Config['ConfigAllowedCommands']))
+		return false;
 
-	return true ;
+	return true;
 }
 
 /**
@@ -315,59 +315,59 @@ 
 	if (!isset($_GET)) {
 		global $_GET;
 	}
-	$sCurrentFolder	= isset( $_GET['CurrentFolder'] ) ? GETPOST('CurrentFolder', '', 1) : '/' ;
+	$sCurrentFolder = isset($_GET['CurrentFolder']) ? GETPOST('CurrentFolder', '', 1) : '/';
 
 	// Check the current folder syntax (must begin and start with a slash).
 	if (!preg_match('|/$|', $sCurrentFolder))
-		$sCurrentFolder .= '/' ;
+		$sCurrentFolder .= '/';
 	if (strpos($sCurrentFolder, '/') !== 0)
-		$sCurrentFolder = '/' . $sCurrentFolder ;
+		$sCurrentFolder = '/'.$sCurrentFolder;
 
 	// Ensure the folder path has no double-slashes
-	while ( strpos($sCurrentFolder, '//') !== false ) {
+	while (strpos($sCurrentFolder, '//') !== false) {
 		$sCurrentFolder = str_replace('//', '/', $sCurrentFolder);
 	}
 
 	// Check for invalid folder paths (..)
-	if ( strpos($sCurrentFolder, '..') || strpos($sCurrentFolder, "\\"))
+	if (strpos($sCurrentFolder, '..') || strpos($sCurrentFolder, "\\"))
 		SendError(102, '');
 
-	if ( preg_match(",(/\.)|[[:cntrl:]]|(//)|(\\\\)|([\:\*\?\"\<\>\|]),", $sCurrentFolder))
+	if (preg_match(",(/\.)|[[:cntrl:]]|(//)|(\\\\)|([\:\*\?\"\<\>\|]),", $sCurrentFolder))
 		SendError(102, '');
 
-	return $sCurrentFolder ;
+	return $sCurrentFolder;
 }
 
 // Do a cleanup of the folder name to avoid possible problems
-function SanitizeFolderName( $sNewFolderName )
+function SanitizeFolderName($sNewFolderName)
 {
 	$sNewFolderName = stripslashes($sNewFolderName);
 
 	// Remove . \ / | : ? * " < >
 	$sNewFolderName = preg_replace('/\\.|\\\\|\\/|\\||\\:|\\?|\\*|"|<|>|[[:cntrl:]]/', '_', $sNewFolderName);
 
-	return $sNewFolderName ;
+	return $sNewFolderName;
 }
 
 // Do a cleanup of the file name to avoid possible problems
-function SanitizeFileName( $sNewFileName )
+function SanitizeFileName($sNewFileName)
 {
-	global $Config ;
+	global $Config;
 
 	$sNewFileName = stripslashes($sNewFileName);
 
 	// Replace dots in the name with underscores (only one dot can be there... security issue).
-	if ( $Config['ForceSingleExtension'] )
+	if ($Config['ForceSingleExtension'])
 		$sNewFileName = preg_replace('/\\.(?![^.]*$)/', '_', $sNewFileName);
 
 	// Remove \ / | : ? * " < >
 	$sNewFileName = preg_replace('/\\\\|\\/|\\||\\:|\\?|\\*|"|<|>|[[:cntrl:]]/', '_', $sNewFileName);
 
-	return $sNewFileName ;
+	return $sNewFileName;
 }
 
 // This is the function that sends the results of the uploading process.
-function SendUploadResults( $errorNumber, $fileUrl = '', $fileName = '', $customMsg = '' )
+function SendUploadResults($errorNumber, $fileUrl = '', $fileName = '', $customMsg = '')
 {
 	// Minified version of the document.domain automatic fix script (#1919).
 	// The original script can be found at _dev/domain_fix_template.js
@@ -381,10 +381,10 @@ 
 		$fileName = "";
 	}
 
-	$rpl = array( '\\' => '\\\\', '"' => '\\"' );
-	echo 'window.parent.OnUploadCompleted(' . $errorNumber . ',"' . strtr($fileUrl, $rpl) . '","' . strtr($fileName, $rpl) . '", "' . strtr($customMsg, $rpl) . '");' ;
-	echo '</script>' ;
-	exit ;
+	$rpl = array('\\' => '\\\\', '"' => '\\"');
+	echo 'window.parent.OnUploadCompleted('.$errorNumber.',"'.strtr($fileUrl, $rpl).'","'.strtr($fileName, $rpl).'", "'.strtr($customMsg, $rpl).'");';
+	echo '</script>';
+	exit;
 }
 
 
@@ -399,13 +399,13 @@ 
  * @param   string  $customMsg      customMsg
  * @return  void
  */
-function SendCKEditorResults ($callback, $sFileUrl, $customMsg = '')
+function SendCKEditorResults($callback, $sFileUrl, $customMsg = '')
 {
   echo '<script type="text/javascript">';
 
-  $rpl = array( '\\' => '\\\\', '"' => '\\"' );
+  $rpl = array('\\' => '\\\\', '"' => '\\"');
 
-  echo 'window.parent.CKEDITOR.tools.callFunction("'. $callback. '","'. strtr($sFileUrl, $rpl). '", "'. strtr($customMsg, $rpl). '");' ;
+  echo 'window.parent.CKEDITOR.tools.callFunction("'.$callback.'","'.strtr($sFileUrl, $rpl).'", "'.strtr($customMsg, $rpl).'");';
 
   echo '</script>';
 }

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

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -374,7 +374,7 @@
 	echo <<<EOF
 <script type="text/javascript">
 (function(){var d=document.domain;while (true){try{var A=window.parent.document.domain;break;}catch(e) {};d=d.replace(/.*?(?:\.|$)/,'');if (d.length==0) break;try{document.domain=d;}catch (e){break;}}})();
-EOF;
+eof;
 
 	if ($errorNumber && $errorNumber != 201) {
 		$fileUrl = "";

htdocs/core/filemanagerdol/connectors/php/basexml.php

Spacing +15 added lines, -15 removed lines

@@ -36,7 +36,7 @@ 
 	// Date in the past
 	header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
 	// always modified
-	header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
+	header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT');
 	// HTTP/1.1
 	header('Cache-Control: no-store, no-cache, must-revalidate');
 	header('Cache-Control: post-check=0, pre-check=0', false);
@@ -55,20 +55,20 @@ 
  * @param string	$currentFolder	Current folder
  * @return void
  */
-function CreateXmlHeader( $command, $resourceType, $currentFolder )
+function CreateXmlHeader($command, $resourceType, $currentFolder)
 {
 	SetXmlHeaders();
 
 	// Create the XML document header.
-	echo '<?xml version="1.0" encoding="utf-8" ?>' ;
+	echo '<?xml version="1.0" encoding="utf-8" ?>';
 
 	// Create the main "Connector" node.
-	echo '<Connector command="' . $command . '" resourceType="' . $resourceType . '">' ;
+	echo '<Connector command="'.$command.'" resourceType="'.$resourceType.'">';
 
 	// Add the current folder node.
-	echo '<CurrentFolder path="' . ConvertToXmlAttribute($currentFolder) . '" url="' . ConvertToXmlAttribute(GetUrlFromPath($resourceType, $currentFolder, $command)) . '" />' ;
+	echo '<CurrentFolder path="'.ConvertToXmlAttribute($currentFolder).'" url="'.ConvertToXmlAttribute(GetUrlFromPath($resourceType, $currentFolder, $command)).'" />';
 
-	$GLOBALS['HeaderSent'] = true ;
+	$GLOBALS['HeaderSent'] = true;
 }
 
 /**
@@ -78,7 +78,7 @@ 
  */
 function CreateXmlFooter()
 {
-	echo '</Connector>' ;
+	echo '</Connector>';
 }
 
 /**
@@ -90,10 +90,10 @@ 
  */
 function SendError($number, $text)
 {
-	if ( $_GET['Command'] == 'FileUpload' )
+	if ($_GET['Command'] == 'FileUpload')
 		SendUploadResults($number, "", "", $text);
 
-	if ( isset( $GLOBALS['HeaderSent'] ) && $GLOBALS['HeaderSent'] )
+	if (isset($GLOBALS['HeaderSent']) && $GLOBALS['HeaderSent'])
 	{
 		SendErrorNode($number, $text);
 		CreateXmlFooter();
@@ -105,15 +105,15 @@ 
 		dol_syslog('Error: '.$number.' '.$text, LOG_ERR);
 		
 		// Create the XML document header
-		echo '<?xml version="1.0" encoding="utf-8" ?>' ;
+		echo '<?xml version="1.0" encoding="utf-8" ?>';
 
-		echo '<Connector>' ;
+		echo '<Connector>';
 
 		SendErrorNode($number, $text);
 
-		echo '</Connector>' ;
+		echo '</Connector>';
 	}
-	exit ;
+	exit;
 }
 
 /**
@@ -126,7 +126,7 @@ 
 function SendErrorNode($number, $text)
 {
 	if ($text)
-		echo '<Error number="' . $number . '" text="' . htmlspecialchars($text) . '" />' ;
+		echo '<Error number="'.$number.'" text="'.htmlspecialchars($text).'" />';
 	else
-		echo '<Error number="' . $number . '" />' ;
+		echo '<Error number="'.$number.'" />';
 }

Braces +10 added lines, -9 removed lines

@@ -90,15 +90,15 @@ 
  */
 function SendError($number, $text)
 {
-	if ( $_GET['Command'] == 'FileUpload' )
-		SendUploadResults($number, "", "", $text);
+	if ( $_GET['Command'] == 'FileUpload' ) {
+			SendUploadResults($number, "", "", $text);
+	}
 
 	if ( isset( $GLOBALS['HeaderSent'] ) && $GLOBALS['HeaderSent'] )
 	{
 		SendErrorNode($number, $text);
 		CreateXmlFooter();
-	}
-	else
+	} else
 	{
 		SetXmlHeaders();
 
@@ -125,8 +125,9 @@ 
  */
 function SendErrorNode($number, $text)
 {
-	if ($text)
-		echo '<Error number="' . $number . '" text="' . htmlspecialchars($text) . '" />' ;
-	else
-		echo '<Error number="' . $number . '" />' ;
-}
+	if ($text) {
+			echo '<Error number="' . $number . '" text="' . htmlspecialchars($text) . '" />' ;
+	} else {
+			echo '<Error number="' . $number . '" />' ;
+	}
+	}

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(

Indentation +9 added lines, -9 removed lines

@@ -203,8 +203,8 @@ 
 	$sFileName = '' ;
 
 	if ( isset( $_FILES['NewFile'] ) && !is_null($_FILES['NewFile']['tmp_name'])
-       // This is for the QuickUpload tab box
-        or (isset($_FILES['upload']) && !is_null($_FILES['upload']['tmp_name'])))
+	   // This is for the QuickUpload tab box
+		or (isset($_FILES['upload']) && !is_null($_FILES['upload']['tmp_name'])))
 	{
 		global $Config ;
 
@@ -311,18 +311,18 @@ 
 	// @CHANGE
 	//SendUploadResults( $sErrorNumber, $sFileUrl, $sFileName );
 	if($CKEcallback == '')
-    {
-        // this line already exists so wrap the if block around it
-        SendUploadResults($sErrorNumber, $sFileUrl, $sFileName);
-    }
-    else
 	{
-	    //issue the CKEditor Callback
+		// this line already exists so wrap the if block around it
+		SendUploadResults($sErrorNumber, $sFileUrl, $sFileName);
+	}
+	else
+	{
+		//issue the CKEditor Callback
 		SendCKEditorResults(
 			$CKEcallback,
 			$sFileUrl,
 			($sErrorNumber != 0 ? 'Error '. $sErrorNumber. ' upload failed.' : 'Upload Successful')
-    	);
+		);
 	}
 
 	exit;

Spacing +81 added lines, -81 removed lines

@@ -35,29 +35,29 @@ 
 	$sServerDir = ServerMapFolder($resourceType, $currentFolder, 'GetFolders');
 
 	// Array that will hold the folders names.
-	$aFolders	= array();
+	$aFolders = array();
 
 	$oCurrentFolder = @opendir($sServerDir);
 
 	if ($oCurrentFolder !== false)
 	{
-		while ( $sFile = readdir($oCurrentFolder) )
+		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);
 	}
 
 	// Open the "Folders" node.
-	echo "<Folders>" ;
+	echo "<Folders>";
 
 	natcasesort($aFolders);
-	foreach ( $aFolders as $sFolder )
-		echo $sFolder ;
+	foreach ($aFolders as $sFolder)
+		echo $sFolder;
 
 	// Close the "Folders" node.
-	echo "</Folders>" ;
+	echo "</Folders>";
 }
 
 /**
@@ -67,39 +67,39 @@ 
  * @param	string	$currentFolder	Current folder
  * @return void
  */
-function GetFoldersAndFiles( $resourceType, $currentFolder )
+function GetFoldersAndFiles($resourceType, $currentFolder)
 {
 	// Map the virtual path to the local server path.
 	$sServerDir = ServerMapFolder($resourceType, $currentFolder, 'GetFoldersAndFiles');
 
 	// Arrays that will hold the folders and files names.
-	$aFolders	= array();
-	$aFiles		= array();
+	$aFolders = array();
+	$aFiles = array();
 
 	$oCurrentFolder = @opendir($sServerDir);
 
 	if ($oCurrentFolder !== false)
 	{
-		while ( $sFile = readdir($oCurrentFolder) )
+		while ($sFile = readdir($oCurrentFolder))
 		{
-			if ( $sFile != '.' && $sFile != '..' )
+			if ($sFile != '.' && $sFile != '..')
 			{
-				if ( is_dir($sServerDir . $sFile) )
-					$aFolders[] = '<Folder name="' . ConvertToXmlAttribute($sFile) . '" />' ;
+				if (is_dir($sServerDir.$sFile))
+					$aFolders[] = '<Folder name="'.ConvertToXmlAttribute($sFile).'" />';
 				else
 				{
-					$iFileSize = @filesize($sServerDir . $sFile);
-					if ( !$iFileSize ) {
-						$iFileSize = 0 ;
+					$iFileSize = @filesize($sServerDir.$sFile);
+					if (!$iFileSize) {
+						$iFileSize = 0;
 					}
-					if ( $iFileSize > 0 )
+					if ($iFileSize > 0)
 					{
 						$iFileSize = round($iFileSize / 1024);
-						if ( $iFileSize < 1 )
-							$iFileSize = 1 ;
+						if ($iFileSize < 1)
+							$iFileSize = 1;
 					}
 
-					$aFiles[] = '<File name="' . ConvertToXmlAttribute($sFile) . '" size="' . $iFileSize . '" />' ;
+					$aFiles[] = '<File name="'.ConvertToXmlAttribute($sFile).'" size="'.$iFileSize.'" />';
 				}
 			}
 		}
@@ -108,21 +108,21 @@ 
 
 	// Send the folders
 	natcasesort($aFolders);
-	echo '<Folders>' ;
+	echo '<Folders>';
 
-	foreach ( $aFolders as $sFolder )
-		echo $sFolder ;
+	foreach ($aFolders as $sFolder)
+		echo $sFolder;
 
-	echo '</Folders>' ;
+	echo '</Folders>';
 
 	// Send the files
 	natcasesort($aFiles);
-	echo '<Files>' ;
+	echo '<Files>';
 
-	foreach ( $aFiles as $sFiles )
-		echo $sFiles ;
+	foreach ($aFiles as $sFiles)
+		echo $sFiles;
 
-	echo '</Files>' ;
+	echo '</Files>';
 }
 
 /**
@@ -132,55 +132,55 @@ 
  * @param   string $currentFolder   Current folder
  * @return void
  */
-function CreateFolder( $resourceType, $currentFolder )
+function CreateFolder($resourceType, $currentFolder)
 {
 	if (!isset($_GET)) {
 		global $_GET;
 	}
-	$sErrorNumber	= '0' ;
-	$sErrorMsg		= '' ;
+	$sErrorNumber = '0';
+	$sErrorMsg = '';
 
-	if ( isset( $_GET['NewFolderName'] ) )
+	if (isset($_GET['NewFolderName']))
 	{
-		$sNewFolderName = $_GET['NewFolderName'] ;
+		$sNewFolderName = $_GET['NewFolderName'];
 		$sNewFolderName = SanitizeFolderName($sNewFolderName);
 
 		if (strpos($sNewFolderName, '..') !== FALSE)
-			$sErrorNumber = '102' ;		// Invalid folder name.
+			$sErrorNumber = '102'; // Invalid folder name.
 		else
 		{
 			// Map the virtual path to the local server path of the current folder.
 			$sServerDir = ServerMapFolder($resourceType, $currentFolder, 'CreateFolder');
 
-			if ( is_writable($sServerDir) )
+			if (is_writable($sServerDir))
 			{
-				$sServerDir .= $sNewFolderName ;
+				$sServerDir .= $sNewFolderName;
 
 				$sErrorMsg = CreateServerFolder($sServerDir);
 
-				switch ( $sErrorMsg )
+				switch ($sErrorMsg)
 				{
 					case '':
-						$sErrorNumber = '0' ;
+						$sErrorNumber = '0';
 						break;
 					case 'Invalid argument' :
 					case 'No such file or directory' :
-						$sErrorNumber = '102' ;		// Path too long.
-						break ;
+						$sErrorNumber = '102'; // Path too long.
+						break;
 					default:
-						$sErrorNumber = '110' ;
-						break ;
+						$sErrorNumber = '110';
+						break;
 				}
 			}
 			else
-				$sErrorNumber = '103' ;
+				$sErrorNumber = '103';
 		}
 	}
 	else
-		$sErrorNumber = '102' ;
+		$sErrorNumber = '102';
 
 	// Create the "Error" node.
-	echo '<Error number="' . $sErrorNumber . '" />' ;
+	echo '<Error number="'.$sErrorNumber.'" />';
 }
 
 // @CHANGE
@@ -199,14 +199,14 @@ 
 	if (!isset($_FILES)) {
 		global $_FILES;
 	}
-	$sErrorNumber = '0' ;
-	$sFileName = '' ;
+	$sErrorNumber = '0';
+	$sFileName = '';
 
-	if ( isset( $_FILES['NewFile'] ) && !is_null($_FILES['NewFile']['tmp_name'])
+	if (isset($_FILES['NewFile']) && !is_null($_FILES['NewFile']['tmp_name'])
        // This is for the QuickUpload tab box
         or (isset($_FILES['upload']) && !is_null($_FILES['upload']['tmp_name'])))
 	{
-		global $Config ;
+		global $Config;
 
 		$oFile = isset($_FILES['NewFile']) ? $_FILES['NewFile'] : $_FILES['upload'];
 
@@ -214,62 +214,62 @@ 
 		$sServerDir = ServerMapFolder($resourceType, $currentFolder, $sCommand);
 
 		// Get the uploaded file name.
-		$sFileName = $oFile['name'] ;
+		$sFileName = $oFile['name'];
 		$sFileName = SanitizeFileName($sFileName);
 
-		$sOriginalFileName = $sFileName ;
+		$sOriginalFileName = $sFileName;
 
 		// Get the extension.
 		$sExtension = substr($sFileName, (strrpos($sFileName, '.') + 1));
 		$sExtension = strtolower($sExtension);
 
-		if ( isset( $Config['SecureImageUploads'] ) )
+		if (isset($Config['SecureImageUploads']))
 		{
-			if ( ( $isImageValid = IsImageValid($oFile['tmp_name'], $sExtension) ) === false )
+			if (($isImageValid = IsImageValid($oFile['tmp_name'], $sExtension)) === false)
 			{
-				$sErrorNumber = '202' ;
+				$sErrorNumber = '202';
 			}
 		}
 
-		if ( isset( $Config['HtmlExtensions'] ) )
+		if (isset($Config['HtmlExtensions']))
 		{
 			if (!IsHtmlExtension($sExtension, $Config['HtmlExtensions']) &&
 				($detectHtml = DetectHtml($oFile['tmp_name'])) === true)
 			{
-				$sErrorNumber = '202' ;
+				$sErrorNumber = '202';
 			}
 		}
 
 		// Check if it is an allowed extension.
-		if ( !$sErrorNumber && IsAllowedExt($sExtension, $resourceType) )
+		if (!$sErrorNumber && IsAllowedExt($sExtension, $resourceType))
 		{
-			$iCounter = 0 ;
+			$iCounter = 0;
 
-			while ( true )
+			while (true)
 			{
-				$sFilePath = $sServerDir . $sFileName ;
+				$sFilePath = $sServerDir.$sFileName;
 
-				if ( is_file($sFilePath) )
+				if (is_file($sFilePath))
 				{
-					$iCounter++ ;
-					$sFileName = RemoveExtension($sOriginalFileName) . '(' . $iCounter . ').' . $sExtension ;
-					$sErrorNumber = '201' ;
+					$iCounter++;
+					$sFileName = RemoveExtension($sOriginalFileName).'('.$iCounter.').'.$sExtension;
+					$sErrorNumber = '201';
 				}
 				else
 				{
 					move_uploaded_file($oFile['tmp_name'], $sFilePath);
 
-					if ( is_file($sFilePath) )
+					if (is_file($sFilePath))
 					{
-						if ( isset( $Config['ChmodOnUpload'] ) && !$Config['ChmodOnUpload'] )
+						if (isset($Config['ChmodOnUpload']) && !$Config['ChmodOnUpload'])
 						{
-							break ;
+							break;
 						}
 
 						$permissions = '0777';
-						if ( isset( $Config['ChmodOnUpload'] ) && $Config['ChmodOnUpload'] )
+						if (isset($Config['ChmodOnUpload']) && $Config['ChmodOnUpload'])
 						{
-							$permissions = (string) $Config['ChmodOnUpload'] ;
+							$permissions = (string) $Config['ChmodOnUpload'];
 						}
 						$permissionsdec = octdec($permissions);
 						dol_syslog("commands.php permission = ".$permissions." ".$permissionsdec." ".decoct($permissionsdec));
@@ -278,30 +278,30 @@ 
 						umask($oldumask);
 					}
 
-					break ;
+					break;
 				}
 			}
 
-			if ( file_exists($sFilePath) )
+			if (file_exists($sFilePath))
 			{
 				//previous checks failed, try once again
-				if ( isset( $isImageValid ) && $isImageValid === -1 && IsImageValid($sFilePath, $sExtension) === false )
+				if (isset($isImageValid) && $isImageValid === -1 && IsImageValid($sFilePath, $sExtension) === false)
 				{
 					@unlink($sFilePath);
-					$sErrorNumber = '202' ;
+					$sErrorNumber = '202';
 				}
-				else if ( isset( $detectHtml ) && $detectHtml === -1 && DetectHtml($sFilePath) === true )
+				else if (isset($detectHtml) && $detectHtml === -1 && DetectHtml($sFilePath) === true)
 				{
 					@unlink($sFilePath);
-					$sErrorNumber = '202' ;
+					$sErrorNumber = '202';
 				}
 			}
 		}
 		else
-			$sErrorNumber = '202' ;
+			$sErrorNumber = '202';
 	}
 	else
-		$sErrorNumber = '202' ;
+		$sErrorNumber = '202';
 
 
 	$sFileUrl = CombinePaths(GetResourceTypePath($resourceType, $sCommand), $currentFolder);
@@ -310,7 +310,7 @@ 
 
 	// @CHANGE
 	//SendUploadResults( $sErrorNumber, $sFileUrl, $sFileName );
-	if($CKEcallback == '')
+	if ($CKEcallback == '')
     {
         // this line already exists so wrap the if block around it
         SendUploadResults($sErrorNumber, $sFileUrl, $sFileName);
@@ -321,7 +321,7 @@ 
 		SendCKEditorResults(
 			$CKEcallback,
 			$sFileUrl,
-			($sErrorNumber != 0 ? 'Error '. $sErrorNumber. ' upload failed.' : 'Upload Successful')
+			($sErrorNumber != 0 ? 'Error '.$sErrorNumber.' upload failed.' : 'Upload Successful')
     	);
 	}
 

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

Indentation +3 added lines, -3 removed lines

@@ -42,9 +42,9 @@
  */
 function DoResponse()
 {
-    if (!isset($_GET)) {
-        global $_GET;
-    }
+	if (!isset($_GET)) {
+		global $_GET;
+	}
 	if ( !isset( $_GET['Command'] ) || !isset( $_GET['Type'] ) || !isset( $_GET['CurrentFolder'] ) )
 		return;
 

Spacing +10 added lines, -10 removed lines

@@ -30,7 +30,7 @@ 
 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,25 +45,25 @@ 
     if (!isset($_GET)) {
         global $_GET;
     }
-	if ( !isset( $_GET['Command'] ) || !isset( $_GET['Type'] ) || !isset( $_GET['CurrentFolder'] ) )
+	if (!isset($_GET['Command']) || !isset($_GET['Type']) || !isset($_GET['CurrentFolder']))
 		return;
 
 	// Get the main request informaiton.
-	$sCommand		= $_GET['Command'] ;
-	$sResourceType	= $_GET['Type'] ;
-	$sCurrentFolder	= GetCurrentFolder();
+	$sCommand = $_GET['Command'];
+	$sResourceType = $_GET['Type'];
+	$sCurrentFolder = GetCurrentFolder();
 
 	// Check if it is an allowed command
-	if (! IsAllowedCommand($sCommand))
+	if (!IsAllowedCommand($sCommand))
 	{
-		SendError(1, 'The "' . $sCommand . '" command isn\'t allowed');
+		SendError(1, 'The "'.$sCommand.'" command isn\'t allowed');
 	}
 	// Check if it is an allowed type.
-	if (! IsAllowedType($sResourceType))
+	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' )
+	if ($sCommand == 'FileUpload')
 	{
 		FileUpload($sResourceType, $sCurrentFolder, $sCommand);
 		return;
@@ -72,7 +72,7 @@ 
 	CreateXmlHeader($sCommand, $sResourceType, $sCurrentFolder);
 
 	// Execute the required command.
-	switch ( $sCommand )
+	switch ($sCommand)
 	{
 		case 'GetFolders' :
 			GetFolders($sResourceType, $sCurrentFolder);

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' )

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

Spacing +34 added lines, -34 removed lines

@@ -22,44 +22,44 @@ 
  * Configuration file for the File Manager Connector for PHP.
  */
 
-global $Config ;
+global $Config;
 global $website;
 
-define('NOTOKENRENEWAL',1); // Disables token renewal
+define('NOTOKENRENEWAL', 1); // Disables token renewal
 
 // We must include the main because this page is
 // a web page that require security controls and
 // is a security hole if anybody can access without
 // being an authenticated user.
 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 ''
+$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 ''
 define('DOL_URL_ROOT', $pos);
 $entity = ((!empty($_SESSION['dol_entity']) && $_SESSION['dol_entity'] > 1) ? $_SESSION['dol_entity'] : null);
 
 // SECURITY: You must explicitly enable this "connector". (Set it to "true").
 // WARNING: don't just set "$Config['Enabled'] = true ;", you must be sure that only
 //		authenticated users can access this file or use some kind of session checking.
-$Config['Enabled'] = true ;
+$Config['Enabled'] = true;
 
 
 // Path to user files relative to the document root.
-$extEntity=(empty($entity) ? 1 : $entity); // For multicompany with external access
+$extEntity = (empty($entity) ? 1 : $entity); // For multicompany with external access
 
-$Config['UserFilesPath'] = DOL_URL_ROOT.'/viewimage.php?modulepart=medias'.(empty($website)?'':'_'.$website).'&entity='.$extEntity.'&file=' ;
-$Config['UserFilesAbsolutePathRelative'] = (empty($website) ? ((!empty($entity) ? '/' . $entity : '') . '/medias/') : ('/websites/'.$website));
+$Config['UserFilesPath'] = DOL_URL_ROOT.'/viewimage.php?modulepart=medias'.(empty($website) ? '' : '_'.$website).'&entity='.$extEntity.'&file=';
+$Config['UserFilesAbsolutePathRelative'] = (empty($website) ? ((!empty($entity) ? '/'.$entity : '').'/medias/') : ('/websites/'.$website));
 
 
 // Fill the following value it you prefer to specify the absolute path for the
 // user files directory. Useful if you are using a virtual directory, symbolic
 // link or alias. Examples: 'C:\\MySite\\userfiles\\' or '/root/mysite/userfiles/'.
 // Attention: The above 'UserFilesPath' must point to the same directory.
-$Config['UserFilesAbsolutePath'] = $dolibarr_main_data_root . $Config['UserFilesAbsolutePathRelative'];
+$Config['UserFilesAbsolutePath'] = $dolibarr_main_data_root.$Config['UserFilesAbsolutePathRelative'];
 
 // Due to security issues with Apache modules, it is recommended to leave the
 // following setting enabled.
-$Config['ForceSingleExtension'] = true ;
+$Config['ForceSingleExtension'] = true;
 
 // Perform additional checks for image files.
 // If set to true, validate image size (using getimagesize).
@@ -81,15 +81,15 @@ 
 // 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);
-$dirmaskdec |= octdec('0200');  // Set w bit required to be able to create content for recursive subdirs files
+$dirmaskdec = octdec($newmask);
+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);
 
 $Config['ChmodOnFolderCreate'] = $newmask;
@@ -148,29 +148,29 @@ 
 
 $Config['AllowedExtensions']['File']	= array('7z', 'aiff', 'asf', 'avi', 'bmp', 'csv', 'doc', 'fla', 'flv', 'gif', 'gz', 'gzip', 'jpeg', 'jpg', 'mid', 'mov', 'mp3', 'mp4', 'mpc', 'mpeg', 'mpg', 'ods', 'odt', 'pdf', 'png', 'ppt', 'pxd', 'qt', 'ram', 'rar', 'rm', 'rmi', 'rmvb', 'rtf', 'sdc', 'sitd', 'swf', 'sxc', 'sxw', 'tar', 'tgz', 'tif', 'tiff', 'txt', 'vsd', 'wav', 'wma', 'wmv', 'xls', 'xml', 'zip');
 $Config['DeniedExtensions']['File']		= array();
-$Config['FileTypesPath']['File']		= $Config['UserFilesPath'] . 'file/' ;
-$Config['FileTypesAbsolutePath']['File']= ($Config['UserFilesAbsolutePath'] == '') ? '' : $Config['UserFilesAbsolutePath'].'file/' ;
-$Config['QuickUploadPath']['File']		= $Config['UserFilesPath'] ;
-$Config['QuickUploadAbsolutePath']['File']= $Config['UserFilesAbsolutePath'] ;
+$Config['FileTypesPath']['File'] = $Config['UserFilesPath'].'file/';
+$Config['FileTypesAbsolutePath']['File'] = ($Config['UserFilesAbsolutePath'] == '') ? '' : $Config['UserFilesAbsolutePath'].'file/';
+$Config['QuickUploadPath']['File'] = $Config['UserFilesPath'];
+$Config['QuickUploadAbsolutePath']['File'] = $Config['UserFilesAbsolutePath'];
 
-$Config['AllowedExtensions']['Image']	= array('bmp','gif','jpeg','jpg','png');
+$Config['AllowedExtensions']['Image'] = array('bmp', 'gif', 'jpeg', 'jpg', 'png');
 $Config['DeniedExtensions']['Image']	= array();
-$Config['FileTypesPath']['Image']		= $Config['UserFilesPath'] . 'image/' ;
-$Config['FileTypesAbsolutePath']['Image']= ($Config['UserFilesAbsolutePath'] == '') ? '' : $Config['UserFilesAbsolutePath'].'image/' ;
-$Config['QuickUploadPath']['Image']		= $Config['UserFilesPath'] ;
-$Config['QuickUploadAbsolutePath']['Image']= $Config['UserFilesAbsolutePath'] ;
+$Config['FileTypesPath']['Image'] = $Config['UserFilesPath'].'image/';
+$Config['FileTypesAbsolutePath']['Image'] = ($Config['UserFilesAbsolutePath'] == '') ? '' : $Config['UserFilesAbsolutePath'].'image/';
+$Config['QuickUploadPath']['Image']		= $Config['UserFilesPath'];
+$Config['QuickUploadAbsolutePath']['Image'] = $Config['UserFilesAbsolutePath'];
 
-$Config['AllowedExtensions']['Flash']	= array('swf','flv');
+$Config['AllowedExtensions']['Flash'] = array('swf', 'flv');
 $Config['DeniedExtensions']['Flash']	= array();
-$Config['FileTypesPath']['Flash']		= $Config['UserFilesPath'] . 'flash/' ;
-$Config['FileTypesAbsolutePath']['Flash']= ($Config['UserFilesAbsolutePath'] == '') ? '' : $Config['UserFilesAbsolutePath'].'flash/' ;
-$Config['QuickUploadPath']['Flash']		= $Config['UserFilesPath'] ;
-$Config['QuickUploadAbsolutePath']['Flash']= $Config['UserFilesAbsolutePath'] ;
+$Config['FileTypesPath']['Flash'] = $Config['UserFilesPath'].'flash/';
+$Config['FileTypesAbsolutePath']['Flash'] = ($Config['UserFilesAbsolutePath'] == '') ? '' : $Config['UserFilesAbsolutePath'].'flash/';
+$Config['QuickUploadPath']['Flash']		= $Config['UserFilesPath'];
+$Config['QuickUploadAbsolutePath']['Flash'] = $Config['UserFilesAbsolutePath'];
 
-$Config['AllowedExtensions']['Media']	= array('aiff', 'asf', 'avi', 'bmp', 'fla', 'flv', 'gif', 'jpeg', 'jpg', 'mid', 'mov', 'mp3', 'mp4', 'mpc', 'mpeg', 'mpg', 'png', 'qt', 'ram', 'rm', 'rmi', 'rmvb', 'swf', 'tif', 'tiff', 'wav', 'wma', 'wmv');
+$Config['AllowedExtensions']['Media'] = array('aiff', 'asf', 'avi', 'bmp', 'fla', 'flv', 'gif', 'jpeg', 'jpg', 'mid', 'mov', 'mp3', 'mp4', 'mpc', 'mpeg', 'mpg', 'png', 'qt', 'ram', 'rm', 'rmi', 'rmvb', 'swf', 'tif', 'tiff', 'wav', 'wma', 'wmv');
 $Config['DeniedExtensions']['Media']	= array();
-$Config['FileTypesPath']['Media']		= $Config['UserFilesPath'] . 'media/' ;
-$Config['FileTypesAbsolutePath']['Media']= ($Config['UserFilesAbsolutePath'] == '') ? '' : $Config['UserFilesAbsolutePath'].'media/' ;
-$Config['QuickUploadPath']['Media']		= $Config['UserFilesPath'] ;
-$Config['QuickUploadAbsolutePath']['Media']= $Config['UserFilesAbsolutePath'] ;
+$Config['FileTypesPath']['Media'] = $Config['UserFilesPath'].'media/';
+$Config['FileTypesAbsolutePath']['Media'] = ($Config['UserFilesAbsolutePath'] == '') ? '' : $Config['UserFilesAbsolutePath'].'media/';
+$Config['QuickUploadPath']['Media']		= $Config['UserFilesPath'];
+$Config['QuickUploadAbsolutePath']['Media'] = $Config['UserFilesAbsolutePath'];
 

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

htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php

Indentation +2 added lines, -2 removed lines

@@ -46,7 +46,7 @@ 
 	 */
 	public function runTrigger($action, $object, User $user, Translate $langs, Conf $conf)
 	{
-        if (empty($conf->blockedlog->enabled)) return 0;     // Module not active, we do nothing
+		if (empty($conf->blockedlog->enabled)) return 0;     // Module not active, we do nothing
 
 		if($action==='BILL_VALIDATE' || $action === 'BILL_PAYED' || $action==='BILL_UNPAYED'
 				|| $action === 'BILL_SENTBYMAIL' || $action === 'DOC_DOWNLOAD' || $action === 'DOC_PREVIEW') {
@@ -87,6 +87,6 @@ 
 		}
 
 
-    }
+	}
 
 }

Spacing +13 added lines, -13 removed lines

@@ -46,38 +46,38 @@
 	 */
 	public function runTrigger($action, $object, User $user, Translate $langs, Conf $conf)
 	{
-        if (empty($conf->blockedlog->enabled)) return 0;     // Module not active, we do nothing
+        if (empty($conf->blockedlog->enabled)) return 0; // Module not active, we do nothing
 
-		if($action==='BILL_VALIDATE' || $action === 'BILL_PAYED' || $action==='BILL_UNPAYED'
+		if ($action === 'BILL_VALIDATE' || $action === 'BILL_PAYED' || $action === 'BILL_UNPAYED'
 				|| $action === 'BILL_SENTBYMAIL' || $action === 'DOC_DOWNLOAD' || $action === 'DOC_PREVIEW') {
-			$amounts=  (double) $object->total_ttc;
+			$amounts = (double) $object->total_ttc;
 		}
-		else if($action === 'PAYMENT_CUSTOMER_CREATE' || $action === 'PAYMENT_ADD_TO_BANK') {
+		else if ($action === 'PAYMENT_CUSTOMER_CREATE' || $action === 'PAYMENT_ADD_TO_BANK') {
 			$amounts = 0;
-			if(!empty($object->amounts)) {
-				foreach($object->amounts as $amount) {
-					$amounts+= price2num($amount);
+			if (!empty($object->amounts)) {
+				foreach ($object->amounts as $amount) {
+					$amounts += price2num($amount);
 				}
 			}
 
 
 		}
-		else if(strpos($action,'PAYMENT')!==false) {
-			$amounts= (double) $object->amount;
+		else if (strpos($action, 'PAYMENT') !== false) {
+			$amounts = (double) $object->amount;
 		}
 		else {
 			return 0; // not implemented action log
 		}
 
-		$b=new BlockedLog($this->db);
+		$b = new BlockedLog($this->db);
 		$b->action = $action;
-		$b->amounts= $amounts;
+		$b->amounts = $amounts;
 		$b->setObjectData($object);
 
 		$res = $b->create($user);
 
-		if($res<0) {
-			setEventMessage($b->error,'errors');
+		if ($res < 0) {
+			setEventMessage($b->error, 'errors');
 
 			return -1;
 		}

Braces +8 added lines, -9 removed lines

@@ -46,13 +46,15 @@ 
 	 */
 	public function runTrigger($action, $object, User $user, Translate $langs, Conf $conf)
 	{
-        if (empty($conf->blockedlog->enabled)) return 0;     // Module not active, we do nothing
+        if (empty($conf->blockedlog->enabled)) {
+        	return 0;
+        }
+        // Module not active, we do nothing
 
 		if($action==='BILL_VALIDATE' || $action === 'BILL_PAYED' || $action==='BILL_UNPAYED'
 				|| $action === 'BILL_SENTBYMAIL' || $action === 'DOC_DOWNLOAD' || $action === 'DOC_PREVIEW') {
 			$amounts=  (double) $object->total_ttc;
-		}
-		else if($action === 'PAYMENT_CUSTOMER_CREATE' || $action === 'PAYMENT_ADD_TO_BANK') {
+		} else if($action === 'PAYMENT_CUSTOMER_CREATE' || $action === 'PAYMENT_ADD_TO_BANK') {
 			$amounts = 0;
 			if(!empty($object->amounts)) {
 				foreach($object->amounts as $amount) {
@@ -61,11 +63,9 @@ 
 			}
 
 
-		}
-		else if(strpos($action,'PAYMENT')!==false) {
+		} else if(strpos($action,'PAYMENT')!==false) {
 			$amounts= (double) $object->amount;
-		}
-		else {
+		} else {
 			return 0; // not implemented action log
 		}
 
@@ -80,8 +80,7 @@ 
 			setEventMessage($b->error,'errors');
 
 			return -1;
-		}
-		else {
+		} else {
 
 			return 1;
 		}

htdocs/core/triggers/interface_20_all_Logevents.class.php

Indentation +113 added lines, -113 removed lines

@@ -48,78 +48,78 @@ 
 	 * @return int         				<0 if KO, 0 if no triggered ran, >0 if OK
 	 */
 	public function runTrigger($action, $object, User $user, Translate $langs, Conf $conf)
-    {
-    	if (! empty($conf->global->MAIN_LOGEVENTS_DISABLE_ALL)) return 0;	// Log events is disabled (hidden features)
+	{
+		if (! empty($conf->global->MAIN_LOGEVENTS_DISABLE_ALL)) return 0;	// Log events is disabled (hidden features)
 
-    	$key='MAIN_LOGEVENTS_'.$action;
-    	//dol_syslog("xxxxxxxxxxx".$key);
-    	if (empty($conf->global->$key)) return 0;				// Log events not enabled for this action
+		$key='MAIN_LOGEVENTS_'.$action;
+		//dol_syslog("xxxxxxxxxxx".$key);
+		if (empty($conf->global->$key)) return 0;				// Log events not enabled for this action
 
-    	if (empty($conf->entity)) $conf->entity = $entity;  // forcing of the entity if it's not defined (ex: in login form)
+		if (empty($conf->entity)) $conf->entity = $entity;  // forcing of the entity if it's not defined (ex: in login form)
 
-        $date = dol_now();
+		$date = dol_now();
 
-        // Actions
-        if ($action == 'USER_LOGIN')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
+		// Actions
+		if ($action == 'USER_LOGIN')
+		{
+			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
             
-            $langs->load("users");
-            // Initialisation donnees (date,duree,texte,desc)
-            $text="(UserLogged,".$object->login.")";
-            $text.=(empty($object->trigger_mesg)?'':' - '.$object->trigger_mesg);
-            $desc="(UserLogged,".$object->login.")";
-            $desc.=(empty($object->trigger_mesg)?'':' - '.$object->trigger_mesg);
-        }
-        if ($action == 'USER_LOGIN_FAILED')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-
-            // Initialisation donnees (date,duree,texte,desc)
-            $text=$object->trigger_mesg;	// Message direct
-            $desc=$object->trigger_mesg;	// Message direct
-        }
-        if ($action == 'USER_LOGOUT')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-
-            $langs->load("users");
-            // Initialisation donnees (date,duree,texte,desc)
-            $text="(UserLogoff,".$object->login.")";
-            $desc="(UserLogoff,".$object->login.")";
-        }
-        if ($action == 'USER_CREATE')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-            $langs->load("users");
-
-            // Initialisation donnees (date,duree,texte,desc)
-            $text=$langs->transnoentities("NewUserCreated",$object->login);
-            $desc=$langs->transnoentities("NewUserCreated",$object->login);
+			$langs->load("users");
+			// Initialisation donnees (date,duree,texte,desc)
+			$text="(UserLogged,".$object->login.")";
+			$text.=(empty($object->trigger_mesg)?'':' - '.$object->trigger_mesg);
+			$desc="(UserLogged,".$object->login.")";
+			$desc.=(empty($object->trigger_mesg)?'':' - '.$object->trigger_mesg);
 		}
-        elseif ($action == 'USER_MODIFY')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-            $langs->load("users");
-
-            // Initialisation donnees (date,duree,texte,desc)
-            $text=$langs->transnoentities("EventUserModified",$object->login);
-            $desc=$langs->transnoentities("EventUserModified",$object->login);
-        }
-        elseif ($action == 'USER_NEW_PASSWORD')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-            $langs->load("users");
+		if ($action == 'USER_LOGIN_FAILED')
+		{
+			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 
-            // Initialisation donnees (date,duree,texte,desc)
-            $text=$langs->transnoentities("NewUserPassword",$object->login);
-            $desc=$langs->transnoentities("NewUserPassword",$object->login);
-        }
-        elseif ($action == 'USER_ENABLEDISABLE')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-            $langs->load("users");
-            // Initialisation donnees (date,duree,texte,desc)
+			// Initialisation donnees (date,duree,texte,desc)
+			$text=$object->trigger_mesg;	// Message direct
+			$desc=$object->trigger_mesg;	// Message direct
+		}
+		if ($action == 'USER_LOGOUT')
+		{
+			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
+
+			$langs->load("users");
+			// Initialisation donnees (date,duree,texte,desc)
+			$text="(UserLogoff,".$object->login.")";
+			$desc="(UserLogoff,".$object->login.")";
+		}
+		if ($action == 'USER_CREATE')
+		{
+			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
+			$langs->load("users");
+
+			// Initialisation donnees (date,duree,texte,desc)
+			$text=$langs->transnoentities("NewUserCreated",$object->login);
+			$desc=$langs->transnoentities("NewUserCreated",$object->login);
+		}
+		elseif ($action == 'USER_MODIFY')
+		{
+			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
+			$langs->load("users");
+
+			// Initialisation donnees (date,duree,texte,desc)
+			$text=$langs->transnoentities("EventUserModified",$object->login);
+			$desc=$langs->transnoentities("EventUserModified",$object->login);
+		}
+		elseif ($action == 'USER_NEW_PASSWORD')
+		{
+			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
+			$langs->load("users");
+
+			// Initialisation donnees (date,duree,texte,desc)
+			$text=$langs->transnoentities("NewUserPassword",$object->login);
+			$desc=$langs->transnoentities("NewUserPassword",$object->login);
+		}
+		elseif ($action == 'USER_ENABLEDISABLE')
+		{
+			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
+			$langs->load("users");
+			// Initialisation donnees (date,duree,texte,desc)
 			if ($object->statut == 0)
 			{
 				$text=$langs->transnoentities("UserEnabled",$object->login);
@@ -130,40 +130,40 @@ 
 				$text=$langs->transnoentities("UserDisabled",$object->login);
 				$desc=$langs->transnoentities("UserDisabled",$object->login);
 			}
-        }
-        elseif ($action == 'USER_DELETE')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-            $langs->load("users");
-            // Initialisation donnees (date,duree,texte,desc)
-            $text=$langs->transnoentities("UserDeleted",$object->login);
-            $desc=$langs->transnoentities("UserDeleted",$object->login);
-        }
+		}
+		elseif ($action == 'USER_DELETE')
+		{
+			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
+			$langs->load("users");
+			// Initialisation donnees (date,duree,texte,desc)
+			$text=$langs->transnoentities("UserDeleted",$object->login);
+			$desc=$langs->transnoentities("UserDeleted",$object->login);
+		}
 
 		// Groupes
-        elseif ($action == 'GROUP_CREATE')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-            $langs->load("users");
-            // Initialisation donnees (date,duree,texte,desc)
-            $text=$langs->transnoentities("NewGroupCreated",$object->name);
-            $desc=$langs->transnoentities("NewGroupCreated",$object->name);
+		elseif ($action == 'GROUP_CREATE')
+		{
+			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
+			$langs->load("users");
+			// Initialisation donnees (date,duree,texte,desc)
+			$text=$langs->transnoentities("NewGroupCreated",$object->name);
+			$desc=$langs->transnoentities("NewGroupCreated",$object->name);
 		}
-        elseif ($action == 'GROUP_MODIFY')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-            $langs->load("users");
-            // Initialisation donnees (date,duree,texte,desc)
-            $text=$langs->transnoentities("GroupModified",$object->name);
-            $desc=$langs->transnoentities("GroupModified",$object->name);
+		elseif ($action == 'GROUP_MODIFY')
+		{
+			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
+			$langs->load("users");
+			// Initialisation donnees (date,duree,texte,desc)
+			$text=$langs->transnoentities("GroupModified",$object->name);
+			$desc=$langs->transnoentities("GroupModified",$object->name);
 		}
-        elseif ($action == 'GROUP_DELETE')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-            $langs->load("users");
-            // Initialisation donnees (date,duree,texte,desc)
-            $text=$langs->transnoentities("GroupDeleted",$object->name);
-            $desc=$langs->transnoentities("GroupDeleted",$object->name);
+		elseif ($action == 'GROUP_DELETE')
+		{
+			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
+			$langs->load("users");
+			// Initialisation donnees (date,duree,texte,desc)
+			$text=$langs->transnoentities("GroupDeleted",$object->name);
+			$desc=$langs->transnoentities("GroupDeleted",$object->name);
 		}
 
 		// If not found
@@ -178,29 +178,29 @@ 
 		// Add more information into desc from the context property
 		if (! empty($desc) && ! empty($object->context['audit'])) $desc.=' - '.$object->context['audit'];
 		
-        // Add entry in event table
+		// Add entry in event table
 		include_once DOL_DOCUMENT_ROOT.'/core/class/events.class.php';
 
 		$event=new Events($this->db);
-        $event->type=$action;
-        $event->dateevent=$date;
-        $event->label=$text;
-        $event->description=$desc;
+		$event->type=$action;
+		$event->dateevent=$date;
+		$event->label=$text;
+		$event->description=$desc;
 		$event->user_agent=$_SERVER["HTTP_USER_AGENT"];
 
-        $result=$event->create($user);
-        if ($result > 0)
-        {
-            return 1;
-        }
-        else
-        {
-            $error ="Failed to insert security event: ".$event->error;
-            $this->error=$error;
+		$result=$event->create($user);
+		if ($result > 0)
+		{
+			return 1;
+		}
+		else
+		{
+			$error ="Failed to insert security event: ".$event->error;
+			$this->error=$error;
 
-            dol_syslog(get_class($this).": ".$this->error, LOG_ERR);
-            return -1;
-        }
-    }
+			dol_syslog(get_class($this).": ".$this->error, LOG_ERR);
+			return -1;
+		}
+	}
 
 }

Spacing +40 added lines, -40 removed lines

@@ -49,13 +49,13 @@ 
 	 */
 	public function runTrigger($action, $object, User $user, Translate $langs, Conf $conf)
     {
-    	if (! empty($conf->global->MAIN_LOGEVENTS_DISABLE_ALL)) return 0;	// Log events is disabled (hidden features)
+    	if (!empty($conf->global->MAIN_LOGEVENTS_DISABLE_ALL)) return 0; // Log events is disabled (hidden features)
 
-    	$key='MAIN_LOGEVENTS_'.$action;
+    	$key = 'MAIN_LOGEVENTS_'.$action;
     	//dol_syslog("xxxxxxxxxxx".$key);
-    	if (empty($conf->global->$key)) return 0;				// Log events not enabled for this action
+    	if (empty($conf->global->$key)) return 0; // Log events not enabled for this action
 
-    	if (empty($conf->entity)) $conf->entity = $entity;  // forcing of the entity if it's not defined (ex: in login form)
+    	if (empty($conf->entity)) $conf->entity = $entity; // forcing of the entity if it's not defined (ex: in login form)
 
         $date = dol_now();
 
@@ -66,18 +66,18 @@ 
             
             $langs->load("users");
             // Initialisation donnees (date,duree,texte,desc)
-            $text="(UserLogged,".$object->login.")";
-            $text.=(empty($object->trigger_mesg)?'':' - '.$object->trigger_mesg);
-            $desc="(UserLogged,".$object->login.")";
-            $desc.=(empty($object->trigger_mesg)?'':' - '.$object->trigger_mesg);
+            $text = "(UserLogged,".$object->login.")";
+            $text .= (empty($object->trigger_mesg) ? '' : ' - '.$object->trigger_mesg);
+            $desc = "(UserLogged,".$object->login.")";
+            $desc .= (empty($object->trigger_mesg) ? '' : ' - '.$object->trigger_mesg);
         }
         if ($action == 'USER_LOGIN_FAILED')
         {
             dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 
             // Initialisation donnees (date,duree,texte,desc)
-            $text=$object->trigger_mesg;	// Message direct
-            $desc=$object->trigger_mesg;	// Message direct
+            $text = $object->trigger_mesg; // Message direct
+            $desc = $object->trigger_mesg; // Message direct
         }
         if ($action == 'USER_LOGOUT')
         {
@@ -85,8 +85,8 @@ 
 
             $langs->load("users");
             // Initialisation donnees (date,duree,texte,desc)
-            $text="(UserLogoff,".$object->login.")";
-            $desc="(UserLogoff,".$object->login.")";
+            $text = "(UserLogoff,".$object->login.")";
+            $desc = "(UserLogoff,".$object->login.")";
         }
         if ($action == 'USER_CREATE')
         {
@@ -94,8 +94,8 @@ 
             $langs->load("users");
 
             // Initialisation donnees (date,duree,texte,desc)
-            $text=$langs->transnoentities("NewUserCreated",$object->login);
-            $desc=$langs->transnoentities("NewUserCreated",$object->login);
+            $text = $langs->transnoentities("NewUserCreated", $object->login);
+            $desc = $langs->transnoentities("NewUserCreated", $object->login);
 		}
         elseif ($action == 'USER_MODIFY')
         {
@@ -103,8 +103,8 @@ 
             $langs->load("users");
 
             // Initialisation donnees (date,duree,texte,desc)
-            $text=$langs->transnoentities("EventUserModified",$object->login);
-            $desc=$langs->transnoentities("EventUserModified",$object->login);
+            $text = $langs->transnoentities("EventUserModified", $object->login);
+            $desc = $langs->transnoentities("EventUserModified", $object->login);
         }
         elseif ($action == 'USER_NEW_PASSWORD')
         {
@@ -112,8 +112,8 @@ 
             $langs->load("users");
 
             // Initialisation donnees (date,duree,texte,desc)
-            $text=$langs->transnoentities("NewUserPassword",$object->login);
-            $desc=$langs->transnoentities("NewUserPassword",$object->login);
+            $text = $langs->transnoentities("NewUserPassword", $object->login);
+            $desc = $langs->transnoentities("NewUserPassword", $object->login);
         }
         elseif ($action == 'USER_ENABLEDISABLE')
         {
@@ -122,13 +122,13 @@ 
             // Initialisation donnees (date,duree,texte,desc)
 			if ($object->statut == 0)
 			{
-				$text=$langs->transnoentities("UserEnabled",$object->login);
-				$desc=$langs->transnoentities("UserEnabled",$object->login);
+				$text = $langs->transnoentities("UserEnabled", $object->login);
+				$desc = $langs->transnoentities("UserEnabled", $object->login);
 			}
 			if ($object->statut == 1)
 			{
-				$text=$langs->transnoentities("UserDisabled",$object->login);
-				$desc=$langs->transnoentities("UserDisabled",$object->login);
+				$text = $langs->transnoentities("UserDisabled", $object->login);
+				$desc = $langs->transnoentities("UserDisabled", $object->login);
 			}
         }
         elseif ($action == 'USER_DELETE')
@@ -136,8 +136,8 @@ 
             dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
             $langs->load("users");
             // Initialisation donnees (date,duree,texte,desc)
-            $text=$langs->transnoentities("UserDeleted",$object->login);
-            $desc=$langs->transnoentities("UserDeleted",$object->login);
+            $text = $langs->transnoentities("UserDeleted", $object->login);
+            $desc = $langs->transnoentities("UserDeleted", $object->login);
         }
 
 		// Groupes
@@ -146,24 +146,24 @@ 
             dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
             $langs->load("users");
             // Initialisation donnees (date,duree,texte,desc)
-            $text=$langs->transnoentities("NewGroupCreated",$object->name);
-            $desc=$langs->transnoentities("NewGroupCreated",$object->name);
+            $text = $langs->transnoentities("NewGroupCreated", $object->name);
+            $desc = $langs->transnoentities("NewGroupCreated", $object->name);
 		}
         elseif ($action == 'GROUP_MODIFY')
         {
             dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
             $langs->load("users");
             // Initialisation donnees (date,duree,texte,desc)
-            $text=$langs->transnoentities("GroupModified",$object->name);
-            $desc=$langs->transnoentities("GroupModified",$object->name);
+            $text = $langs->transnoentities("GroupModified", $object->name);
+            $desc = $langs->transnoentities("GroupModified", $object->name);
 		}
         elseif ($action == 'GROUP_DELETE')
         {
             dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
             $langs->load("users");
             // Initialisation donnees (date,duree,texte,desc)
-            $text=$langs->transnoentities("GroupDeleted",$object->name);
-            $desc=$langs->transnoentities("GroupDeleted",$object->name);
+            $text = $langs->transnoentities("GroupDeleted", $object->name);
+            $desc = $langs->transnoentities("GroupDeleted", $object->name);
 		}
 
 		// If not found
@@ -176,27 +176,27 @@ 
 */
 
 		// Add more information into desc from the context property
-		if (! empty($desc) && ! empty($object->context['audit'])) $desc.=' - '.$object->context['audit'];
+		if (!empty($desc) && !empty($object->context['audit'])) $desc .= ' - '.$object->context['audit'];
 		
         // Add entry in event table
 		include_once DOL_DOCUMENT_ROOT.'/core/class/events.class.php';
 
-		$event=new Events($this->db);
-        $event->type=$action;
-        $event->dateevent=$date;
-        $event->label=$text;
-        $event->description=$desc;
-		$event->user_agent=$_SERVER["HTTP_USER_AGENT"];
+		$event = new Events($this->db);
+        $event->type = $action;
+        $event->dateevent = $date;
+        $event->label = $text;
+        $event->description = $desc;
+		$event->user_agent = $_SERVER["HTTP_USER_AGENT"];
 
-        $result=$event->create($user);
+        $result = $event->create($user);
         if ($result > 0)
         {
             return 1;
         }
         else
         {
-            $error ="Failed to insert security event: ".$event->error;
-            $this->error=$error;
+            $error = "Failed to insert security event: ".$event->error;
+            $this->error = $error;
 
             dol_syslog(get_class($this).": ".$this->error, LOG_ERR);
             return -1;

Braces +22 added lines, -18 removed lines

@@ -49,13 +49,22 @@ 
 	 */
 	public function runTrigger($action, $object, User $user, Translate $langs, Conf $conf)
     {
-    	if (! empty($conf->global->MAIN_LOGEVENTS_DISABLE_ALL)) return 0;	// Log events is disabled (hidden features)
+    	if (! empty($conf->global->MAIN_LOGEVENTS_DISABLE_ALL)) {
+    		return 0;
+    	}
+    	// Log events is disabled (hidden features)
 
     	$key='MAIN_LOGEVENTS_'.$action;
     	//dol_syslog("xxxxxxxxxxx".$key);
-    	if (empty($conf->global->$key)) return 0;				// Log events not enabled for this action
+    	if (empty($conf->global->$key)) {
+    		return 0;
+    	}
+    	// Log events not enabled for this action
 
-    	if (empty($conf->entity)) $conf->entity = $entity;  // forcing of the entity if it's not defined (ex: in login form)
+    	if (empty($conf->entity)) {
+    		$conf->entity = $entity;
+    	}
+    	// forcing of the entity if it's not defined (ex: in login form)
 
         $date = dol_now();
 
@@ -96,8 +105,7 @@ 
             // Initialisation donnees (date,duree,texte,desc)
             $text=$langs->transnoentities("NewUserCreated",$object->login);
             $desc=$langs->transnoentities("NewUserCreated",$object->login);
-		}
-        elseif ($action == 'USER_MODIFY')
+		} elseif ($action == 'USER_MODIFY')
         {
             dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
             $langs->load("users");
@@ -105,8 +113,7 @@ 
             // Initialisation donnees (date,duree,texte,desc)
             $text=$langs->transnoentities("EventUserModified",$object->login);
             $desc=$langs->transnoentities("EventUserModified",$object->login);
-        }
-        elseif ($action == 'USER_NEW_PASSWORD')
+        } elseif ($action == 'USER_NEW_PASSWORD')
         {
             dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
             $langs->load("users");
@@ -114,8 +121,7 @@ 
             // Initialisation donnees (date,duree,texte,desc)
             $text=$langs->transnoentities("NewUserPassword",$object->login);
             $desc=$langs->transnoentities("NewUserPassword",$object->login);
-        }
-        elseif ($action == 'USER_ENABLEDISABLE')
+        } elseif ($action == 'USER_ENABLEDISABLE')
         {
             dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
             $langs->load("users");
@@ -130,8 +136,7 @@ 
 				$text=$langs->transnoentities("UserDisabled",$object->login);
 				$desc=$langs->transnoentities("UserDisabled",$object->login);
 			}
-        }
-        elseif ($action == 'USER_DELETE')
+        } elseif ($action == 'USER_DELETE')
         {
             dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
             $langs->load("users");
@@ -148,16 +153,14 @@ 
             // Initialisation donnees (date,duree,texte,desc)
             $text=$langs->transnoentities("NewGroupCreated",$object->name);
             $desc=$langs->transnoentities("NewGroupCreated",$object->name);
-		}
-        elseif ($action == 'GROUP_MODIFY')
+		} elseif ($action == 'GROUP_MODIFY')
         {
             dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
             $langs->load("users");
             // Initialisation donnees (date,duree,texte,desc)
             $text=$langs->transnoentities("GroupModified",$object->name);
             $desc=$langs->transnoentities("GroupModified",$object->name);
-		}
-        elseif ($action == 'GROUP_DELETE')
+		} elseif ($action == 'GROUP_DELETE')
         {
             dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
             $langs->load("users");
@@ -176,7 +179,9 @@ 
 */
 
 		// Add more information into desc from the context property
-		if (! empty($desc) && ! empty($object->context['audit'])) $desc.=' - '.$object->context['audit'];
+		if (! empty($desc) && ! empty($object->context['audit'])) {
+			$desc.=' - '.$object->context['audit'];
+		}
 		
         // Add entry in event table
 		include_once DOL_DOCUMENT_ROOT.'/core/class/events.class.php';
@@ -192,8 +197,7 @@ 
         if ($result > 0)
         {
             return 1;
-        }
-        else
+        } else
         {
             $error ="Failed to insert security event: ".$event->error;
             $this->error=$error;

htdocs/core/triggers/interface_50_modNotification_Notification.class.php

Indentation +68 added lines, -68 removed lines

@@ -35,17 +35,17 @@ 
 	public $version = self::VERSION_DOLIBARR;
 	public $picto = 'email';
 
-    var $listofmanagedevents=array(
-        'BILL_VALIDATE',
-        'BILL_PAYED',
-    	'ORDER_VALIDATE',
-    	'PROPAL_VALIDATE',
-        'FICHINTER_VALIDATE',
-        'FICHINTER_ADD_CONTACT',
-    	'ORDER_SUPPLIER_VALIDATE',
-    	'ORDER_SUPPLIER_APPROVE',
-    	'ORDER_SUPPLIER_REFUSE',
-        'SHIPPING_VALIDATE'
+	var $listofmanagedevents=array(
+		'BILL_VALIDATE',
+		'BILL_PAYED',
+		'ORDER_VALIDATE',
+		'PROPAL_VALIDATE',
+		'FICHINTER_VALIDATE',
+		'FICHINTER_ADD_CONTACT',
+		'ORDER_SUPPLIER_VALIDATE',
+		'ORDER_SUPPLIER_APPROVE',
+		'ORDER_SUPPLIER_REFUSE',
+		'SHIPPING_VALIDATE'
    	);
 
 	/**
@@ -73,62 +73,62 @@ 
 		$notify->send($action, $object);
 
 		return 1;
-    }
-
-
-    /**
-     * Return list of events managed by notification module
-     *
-     * @return      array       Array of events managed by notification module
-     */
-    function getListOfManagedEvents()
-    {
-        global $conf;
-
-        $ret=array();
-
-        $sql = "SELECT rowid, code, label, description, elementtype";
-        $sql.= " FROM ".MAIN_DB_PREFIX."c_action_trigger";
-        $sql.= $this->db->order("rang, elementtype, code");
-        dol_syslog("getListOfManagedEvents Get list of notifications", LOG_DEBUG);
-        $resql=$this->db->query($sql);
-        if ($resql)
-        {
-            $num=$this->db->num_rows($resql);
-            $i=0;
-            while ($i < $num)
-            {
-                $obj=$this->db->fetch_object($resql);
-
-                $qualified=0;
-                // Check is this event is supported by notification module
-                if (in_array($obj->code,$this->listofmanagedevents)) $qualified=1;
-                // Check if module for this event is active
-                if ($qualified)
-                {
-                    //print 'xx'.$obj->code;
-                    $element=$obj->elementtype;
-
-                    // Exclude events if related module is disabled
-                    if ($element == 'order_supplier' && empty($conf->fournisseur->enabled)) $qualified=0;
-                    elseif ($element == 'invoice_supplier' && empty($conf->fournisseur->enabled)) $qualified=0;
-                    elseif ($element == 'withdraw' && empty($conf->prelevement->enabled)) $qualified=0;
-                    elseif ($element == 'shipping' && empty($conf->expedition->enabled)) $qualified=0;
-                    elseif ($element == 'member' && empty($conf->adherent->enabled)) $qualified=0;
-                    elseif (! in_array($element,array('order_supplier','invoice_supplier','withdraw','shipping','member')) && empty($conf->$element->enabled)) $qualified=0;
-                }
-
-                if ($qualified)
-                {
-                    $ret[]=array('rowid'=>$obj->rowid,'code'=>$obj->code,'label'=>$obj->label,'description'=>$obj->description,'elementtype'=>$obj->elementtype);
-                }
-
-                $i++;
-            }
-        }
-        else dol_print_error($this->db);
-
-        return $ret;
-    }
+	}
+
+
+	/**
+	 * Return list of events managed by notification module
+	 *
+	 * @return      array       Array of events managed by notification module
+	 */
+	function getListOfManagedEvents()
+	{
+		global $conf;
+
+		$ret=array();
+
+		$sql = "SELECT rowid, code, label, description, elementtype";
+		$sql.= " FROM ".MAIN_DB_PREFIX."c_action_trigger";
+		$sql.= $this->db->order("rang, elementtype, code");
+		dol_syslog("getListOfManagedEvents Get list of notifications", LOG_DEBUG);
+		$resql=$this->db->query($sql);
+		if ($resql)
+		{
+			$num=$this->db->num_rows($resql);
+			$i=0;
+			while ($i < $num)
+			{
+				$obj=$this->db->fetch_object($resql);
+
+				$qualified=0;
+				// Check is this event is supported by notification module
+				if (in_array($obj->code,$this->listofmanagedevents)) $qualified=1;
+				// Check if module for this event is active
+				if ($qualified)
+				{
+					//print 'xx'.$obj->code;
+					$element=$obj->elementtype;
+
+					// Exclude events if related module is disabled
+					if ($element == 'order_supplier' && empty($conf->fournisseur->enabled)) $qualified=0;
+					elseif ($element == 'invoice_supplier' && empty($conf->fournisseur->enabled)) $qualified=0;
+					elseif ($element == 'withdraw' && empty($conf->prelevement->enabled)) $qualified=0;
+					elseif ($element == 'shipping' && empty($conf->expedition->enabled)) $qualified=0;
+					elseif ($element == 'member' && empty($conf->adherent->enabled)) $qualified=0;
+					elseif (! in_array($element,array('order_supplier','invoice_supplier','withdraw','shipping','member')) && empty($conf->$element->enabled)) $qualified=0;
+				}
+
+				if ($qualified)
+				{
+					$ret[]=array('rowid'=>$obj->rowid,'code'=>$obj->code,'label'=>$obj->label,'description'=>$obj->description,'elementtype'=>$obj->elementtype);
+				}
+
+				$i++;
+			}
+		}
+		else dol_print_error($this->db);
+
+		return $ret;
+	}
 
 }

Spacing +21 added lines, -21 removed lines

@@ -35,7 +35,7 @@ 
 	public $version = self::VERSION_DOLIBARR;
 	public $picto = 'email';
 
-    var $listofmanagedevents=array(
+    var $listofmanagedevents = array(
         'BILL_VALIDATE',
         'BILL_PAYED',
     	'ORDER_VALIDATE',
@@ -61,12 +61,12 @@ 
 	 */
 	public function runTrigger($action, $object, User $user, Translate $langs, Conf $conf)
 	{
-		if (empty($conf->notification->enabled)) return 0;     // Module not active, we do nothing
+		if (empty($conf->notification->enabled)) return 0; // Module not active, we do nothing
 
-		require_once DOL_DOCUMENT_ROOT .'/core/class/notify.class.php';
+		require_once DOL_DOCUMENT_ROOT.'/core/class/notify.class.php';
 		$notify = new Notify($this->db);
 
-		if (! in_array($action, $notify->arrayofnotifsupported)) return 0;
+		if (!in_array($action, $notify->arrayofnotifsupported)) return 0;
 
 		dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 
@@ -85,42 +85,42 @@ 
     {
         global $conf;
 
-        $ret=array();
+        $ret = array();
 
         $sql = "SELECT rowid, code, label, description, elementtype";
-        $sql.= " FROM ".MAIN_DB_PREFIX."c_action_trigger";
-        $sql.= $this->db->order("rang, elementtype, code");
+        $sql .= " FROM ".MAIN_DB_PREFIX."c_action_trigger";
+        $sql .= $this->db->order("rang, elementtype, code");
         dol_syslog("getListOfManagedEvents Get list of notifications", LOG_DEBUG);
-        $resql=$this->db->query($sql);
+        $resql = $this->db->query($sql);
         if ($resql)
         {
-            $num=$this->db->num_rows($resql);
-            $i=0;
+            $num = $this->db->num_rows($resql);
+            $i = 0;
             while ($i < $num)
             {
-                $obj=$this->db->fetch_object($resql);
+                $obj = $this->db->fetch_object($resql);
 
-                $qualified=0;
+                $qualified = 0;
                 // Check is this event is supported by notification module
-                if (in_array($obj->code,$this->listofmanagedevents)) $qualified=1;
+                if (in_array($obj->code, $this->listofmanagedevents)) $qualified = 1;
                 // Check if module for this event is active
                 if ($qualified)
                 {
                     //print 'xx'.$obj->code;
-                    $element=$obj->elementtype;
+                    $element = $obj->elementtype;
 
                     // Exclude events if related module is disabled
-                    if ($element == 'order_supplier' && empty($conf->fournisseur->enabled)) $qualified=0;
-                    elseif ($element == 'invoice_supplier' && empty($conf->fournisseur->enabled)) $qualified=0;
-                    elseif ($element == 'withdraw' && empty($conf->prelevement->enabled)) $qualified=0;
-                    elseif ($element == 'shipping' && empty($conf->expedition->enabled)) $qualified=0;
-                    elseif ($element == 'member' && empty($conf->adherent->enabled)) $qualified=0;
-                    elseif (! in_array($element,array('order_supplier','invoice_supplier','withdraw','shipping','member')) && empty($conf->$element->enabled)) $qualified=0;
+                    if ($element == 'order_supplier' && empty($conf->fournisseur->enabled)) $qualified = 0;
+                    elseif ($element == 'invoice_supplier' && empty($conf->fournisseur->enabled)) $qualified = 0;
+                    elseif ($element == 'withdraw' && empty($conf->prelevement->enabled)) $qualified = 0;
+                    elseif ($element == 'shipping' && empty($conf->expedition->enabled)) $qualified = 0;
+                    elseif ($element == 'member' && empty($conf->adherent->enabled)) $qualified = 0;
+                    elseif (!in_array($element, array('order_supplier', 'invoice_supplier', 'withdraw', 'shipping', 'member')) && empty($conf->$element->enabled)) $qualified = 0;
                 }
 
                 if ($qualified)
                 {
-                    $ret[]=array('rowid'=>$obj->rowid,'code'=>$obj->code,'label'=>$obj->label,'description'=>$obj->description,'elementtype'=>$obj->elementtype);
+                    $ret[] = array('rowid'=>$obj->rowid, 'code'=>$obj->code, 'label'=>$obj->label, 'description'=>$obj->description, 'elementtype'=>$obj->elementtype);
                 }
 
                 $i++;

Braces +25 added lines, -10 removed lines

@@ -61,12 +61,17 @@ 
 	 */
 	public function runTrigger($action, $object, User $user, Translate $langs, Conf $conf)
 	{
-		if (empty($conf->notification->enabled)) return 0;     // Module not active, we do nothing
+		if (empty($conf->notification->enabled)) {
+			return 0;
+		}
+		// Module not active, we do nothing
 
 		require_once DOL_DOCUMENT_ROOT .'/core/class/notify.class.php';
 		$notify = new Notify($this->db);
 
-		if (! in_array($action, $notify->arrayofnotifsupported)) return 0;
+		if (! in_array($action, $notify->arrayofnotifsupported)) {
+			return 0;
+		}
 
 		dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 
@@ -102,7 +107,9 @@ 
 
                 $qualified=0;
                 // Check is this event is supported by notification module
-                if (in_array($obj->code,$this->listofmanagedevents)) $qualified=1;
+                if (in_array($obj->code,$this->listofmanagedevents)) {
+                	$qualified=1;
+                }
                 // Check if module for this event is active
                 if ($qualified)
                 {
@@ -110,12 +117,19 @@ 
                     $element=$obj->elementtype;
 
                     // Exclude events if related module is disabled
-                    if ($element == 'order_supplier' && empty($conf->fournisseur->enabled)) $qualified=0;
-                    elseif ($element == 'invoice_supplier' && empty($conf->fournisseur->enabled)) $qualified=0;
-                    elseif ($element == 'withdraw' && empty($conf->prelevement->enabled)) $qualified=0;
-                    elseif ($element == 'shipping' && empty($conf->expedition->enabled)) $qualified=0;
-                    elseif ($element == 'member' && empty($conf->adherent->enabled)) $qualified=0;
-                    elseif (! in_array($element,array('order_supplier','invoice_supplier','withdraw','shipping','member')) && empty($conf->$element->enabled)) $qualified=0;
+                    if ($element == 'order_supplier' && empty($conf->fournisseur->enabled)) {
+                    	$qualified=0;
+                    } elseif ($element == 'invoice_supplier' && empty($conf->fournisseur->enabled)) {
+                    	$qualified=0;
+                    } elseif ($element == 'withdraw' && empty($conf->prelevement->enabled)) {
+                    	$qualified=0;
+                    } elseif ($element == 'shipping' && empty($conf->expedition->enabled)) {
+                    	$qualified=0;
+                    } elseif ($element == 'member' && empty($conf->adherent->enabled)) {
+                    	$qualified=0;
+                    } elseif (! in_array($element,array('order_supplier','invoice_supplier','withdraw','shipping','member')) && empty($conf->$element->enabled)) {
+                    	$qualified=0;
+                    }
                 }
 
                 if ($qualified)
@@ -125,8 +139,9 @@ 
 
                 $i++;
             }
+        } else {
+        	dol_print_error($this->db);
         }
-        else dol_print_error($this->db);
 
         return $ret;
     }

htdocs/core/triggers/interface_50_modMailmanspip_Mailmanspipsynchro.class.php

Indentation +57 added lines, -57 removed lines

@@ -49,52 +49,52 @@ 
 	 */
 	public function runTrigger($action, $object, User $user, Translate $langs, Conf $conf)
 	{
-        if (empty($conf->mailmanspip->enabled)) return 0;     // Module not active, we do nothing
-
-        if ($action == 'CATEGORY_LINK')
-        {
-        	dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-
-        	// We add subscription if we change category (new category may means more mailing-list to subscribe)
-    		if (is_object($object->linkto) && method_exists($object->linkto, 'add_to_abo') && $object->linkto->add_to_abo() < 0)
-    		{
-    			$this->error=$object->linkto->error;
-    			$this->errors=$object->linkto->errors;
-    			$return=-1;
-    		}
+		if (empty($conf->mailmanspip->enabled)) return 0;     // Module not active, we do nothing
+
+		if ($action == 'CATEGORY_LINK')
+		{
+			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
+
+			// We add subscription if we change category (new category may means more mailing-list to subscribe)
+			if (is_object($object->linkto) && method_exists($object->linkto, 'add_to_abo') && $object->linkto->add_to_abo() < 0)
+			{
+				$this->error=$object->linkto->error;
+				$this->errors=$object->linkto->errors;
+				$return=-1;
+			}
+			else
+			{
+				$return=1;
+			}
+
+			return $return;
+		}
+		elseif ($action == 'CATEGORY_UNLINK')
+		{
+			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
+
+			// We remove subscription if we change category (lessw category may means less mailing-list to subscribe)
+			if (is_object($object->unlinkoff) && method_exists($object->unlinkoff, 'del_to_abo') && $object->unlinkoff->del_to_abo() < 0)
+			{
+				$this->error=$object->unlinkoff->error;
+				$this->errors=$object->unlinkoff->errors;
+				$return=-1;
+			}
 			else
 			{
 				$return=1;
 			}
 
-        	return $return;
-        }
-        elseif ($action == 'CATEGORY_UNLINK')
-        {
-        	dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-
-        	// We remove subscription if we change category (lessw category may means less mailing-list to subscribe)
-        	if (is_object($object->unlinkoff) && method_exists($object->unlinkoff, 'del_to_abo') && $object->unlinkoff->del_to_abo() < 0)
-        	{
-    			$this->error=$object->unlinkoff->error;
-        		$this->errors=$object->unlinkoff->errors;
-        		$return=-1;
-        	}
-        	else
-        	{
-        		$return=1;
-        	}
-
-        	return $return;
-        }
-
-        // Members
-        elseif ($action == 'MEMBER_VALIDATE' || $action == 'MEMBER_MODIFY')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
+			return $return;
+		}
+
+		// Members
+		elseif ($action == 'MEMBER_VALIDATE' || $action == 'MEMBER_MODIFY')
+		{
+			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 
 			$return=0;
-            // Add user into some linked tools (mailman, spip, etc...)
+			// Add user into some linked tools (mailman, spip, etc...)
 			if (($object->oldcopy->email != $object->email) || ($object->oldcopy->typeid != $object->typeid))	// TODO Do del/add also if type change
 			{
 				if (is_object($object->oldcopy) && ($object->oldcopy->email != $object->email))    // If email has changed we delete mailman subscription for old email
@@ -110,13 +110,13 @@ 
 						$return=1;
 					}
 				}
-    			// We add subscription if new email or new type (new type may means more mailing-list to subscribe)
-    			if ($object->add_to_abo() < 0)
-    			{
-    				 if (! empty($object->error)) $this->error=$object->error;
-    				 $this->errors=$object->errors;
-    				 $return=-1;
-    			}
+				// We add subscription if new email or new type (new type may means more mailing-list to subscribe)
+				if ($object->add_to_abo() < 0)
+				{
+					 if (! empty($object->error)) $this->error=$object->error;
+					 $this->errors=$object->errors;
+					 $return=-1;
+				}
 				else
 				{
 					$return=1;
@@ -124,14 +124,14 @@ 
 			}
 
 			return $return;
-        }
-        elseif ($action == 'MEMBER_RESILIATE' || $action == 'MEMBER_DELETE')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-
-            $return=0;
-            // Remove from external tools (mailman, spip, etc...)
-        	if ($object->del_to_abo() < 0)
+		}
+		elseif ($action == 'MEMBER_RESILIATE' || $action == 'MEMBER_DELETE')
+		{
+			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
+
+			$return=0;
+			// Remove from external tools (mailman, spip, etc...)
+			if ($object->del_to_abo() < 0)
 			{
 				if (! empty($object->error)) $this->error=$object->error;
 				$this->errors=$object->errors;
@@ -142,10 +142,10 @@ 
 				$return=1;
 			}
 
-	        return $return;
-        }
+			return $return;
+		}
 
 		return 0;
-    }
+	}
 
 }

Spacing +23 added lines, -23 removed lines

@@ -49,7 +49,7 @@ 
 	 */
 	public function runTrigger($action, $object, User $user, Translate $langs, Conf $conf)
 	{
-        if (empty($conf->mailmanspip->enabled)) return 0;     // Module not active, we do nothing
+        if (empty($conf->mailmanspip->enabled)) return 0; // Module not active, we do nothing
 
         if ($action == 'CATEGORY_LINK')
         {
@@ -58,13 +58,13 @@ 
         	// We add subscription if we change category (new category may means more mailing-list to subscribe)
     		if (is_object($object->linkto) && method_exists($object->linkto, 'add_to_abo') && $object->linkto->add_to_abo() < 0)
     		{
-    			$this->error=$object->linkto->error;
-    			$this->errors=$object->linkto->errors;
-    			$return=-1;
+    			$this->error = $object->linkto->error;
+    			$this->errors = $object->linkto->errors;
+    			$return = -1;
     		}
 			else
 			{
-				$return=1;
+				$return = 1;
 			}
 
         	return $return;
@@ -76,13 +76,13 @@ 
         	// We remove subscription if we change category (lessw category may means less mailing-list to subscribe)
         	if (is_object($object->unlinkoff) && method_exists($object->unlinkoff, 'del_to_abo') && $object->unlinkoff->del_to_abo() < 0)
         	{
-    			$this->error=$object->unlinkoff->error;
-        		$this->errors=$object->unlinkoff->errors;
-        		$return=-1;
+    			$this->error = $object->unlinkoff->error;
+        		$this->errors = $object->unlinkoff->errors;
+        		$return = -1;
         	}
         	else
         	{
-        		$return=1;
+        		$return = 1;
         	}
 
         	return $return;
@@ -93,7 +93,7 @@ 
         {
             dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 
-			$return=0;
+			$return = 0;
             // Add user into some linked tools (mailman, spip, etc...)
 			if (($object->oldcopy->email != $object->email) || ($object->oldcopy->typeid != $object->typeid))	// TODO Do del/add also if type change
 			{
@@ -101,25 +101,25 @@ 
 				{
 					if ($object->oldcopy->del_to_abo() < 0)
 					{
-						if (! empty($object->oldcopy->error)) $this->error=$object->oldcopy->error;
-						$this->errors=$object->oldcopy->errors;
-						$return=-1;
+						if (!empty($object->oldcopy->error)) $this->error = $object->oldcopy->error;
+						$this->errors = $object->oldcopy->errors;
+						$return = -1;
 					}
 					else
 					{
-						$return=1;
+						$return = 1;
 					}
 				}
     			// We add subscription if new email or new type (new type may means more mailing-list to subscribe)
     			if ($object->add_to_abo() < 0)
     			{
-    				 if (! empty($object->error)) $this->error=$object->error;
-    				 $this->errors=$object->errors;
-    				 $return=-1;
+    				 if (!empty($object->error)) $this->error = $object->error;
+    				 $this->errors = $object->errors;
+    				 $return = -1;
     			}
 				else
 				{
-					$return=1;
+					$return = 1;
 				}
 			}
 
@@ -129,17 +129,17 @@ 
         {
             dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 
-            $return=0;
+            $return = 0;
             // Remove from external tools (mailman, spip, etc...)
         	if ($object->del_to_abo() < 0)
 			{
-				if (! empty($object->error)) $this->error=$object->error;
-				$this->errors=$object->errors;
-				$return=-1;
+				if (!empty($object->error)) $this->error = $object->error;
+				$this->errors = $object->errors;
+				$return = -1;
 			}
 			else
 			{
-				$return=1;
+				$return = 1;
 			}
 
 	        return $return;

Braces +20 added lines, -18 removed lines

@@ -49,7 +49,10 @@ 
 	 */
 	public function runTrigger($action, $object, User $user, Translate $langs, Conf $conf)
 	{
-        if (empty($conf->mailmanspip->enabled)) return 0;     // Module not active, we do nothing
+        if (empty($conf->mailmanspip->enabled)) {
+        	return 0;
+        }
+        // Module not active, we do nothing
 
         if ($action == 'CATEGORY_LINK')
         {
@@ -61,15 +64,13 @@ 
     			$this->error=$object->linkto->error;
     			$this->errors=$object->linkto->errors;
     			$return=-1;
-    		}
-			else
+    		} else
 			{
 				$return=1;
 			}
 
         	return $return;
-        }
-        elseif ($action == 'CATEGORY_UNLINK')
+        } elseif ($action == 'CATEGORY_UNLINK')
         {
         	dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 
@@ -79,8 +80,7 @@ 
     			$this->error=$object->unlinkoff->error;
         		$this->errors=$object->unlinkoff->errors;
         		$return=-1;
-        	}
-        	else
+        	} else
         	{
         		$return=1;
         	}
@@ -95,17 +95,18 @@ 
 
 			$return=0;
             // Add user into some linked tools (mailman, spip, etc...)
-			if (($object->oldcopy->email != $object->email) || ($object->oldcopy->typeid != $object->typeid))	// TODO Do del/add also if type change
+			if (($object->oldcopy->email != $object->email) || ($object->oldcopy->typeid != $object->typeid)) {
+				// TODO Do del/add also if type change
 			{
 				if (is_object($object->oldcopy) && ($object->oldcopy->email != $object->email))    // If email has changed we delete mailman subscription for old email
 				{
 					if ($object->oldcopy->del_to_abo() < 0)
 					{
 						if (! empty($object->oldcopy->error)) $this->error=$object->oldcopy->error;
+			}
 						$this->errors=$object->oldcopy->errors;
 						$return=-1;
-					}
-					else
+					} else
 					{
 						$return=1;
 					}
@@ -113,19 +114,19 @@ 
     			// We add subscription if new email or new type (new type may means more mailing-list to subscribe)
     			if ($object->add_to_abo() < 0)
     			{
-    				 if (! empty($object->error)) $this->error=$object->error;
+    				 if (! empty($object->error)) {
+    				 	$this->error=$object->error;
+    				 }
     				 $this->errors=$object->errors;
     				 $return=-1;
-    			}
-				else
+    			} else
 				{
 					$return=1;
 				}
 			}
 
 			return $return;
-        }
-        elseif ($action == 'MEMBER_RESILIATE' || $action == 'MEMBER_DELETE')
+        } elseif ($action == 'MEMBER_RESILIATE' || $action == 'MEMBER_DELETE')
         {
             dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 
@@ -133,11 +134,12 @@ 
             // Remove from external tools (mailman, spip, etc...)
         	if ($object->del_to_abo() < 0)
 			{
-				if (! empty($object->error)) $this->error=$object->error;
+				if (! empty($object->error)) {
+					$this->error=$object->error;
+				}
 				$this->errors=$object->errors;
 				$return=-1;
-			}
-			else
+			} else
 			{
 				$return=1;
 			}