alxarafe / alixar

dolibarr/htdocs/core/filemanagerdol/browser/default/browser.php

Spacing +1 added lines, -1 removed lines

@@ -21,7 +21,7 @@
 
 //define('NOTOKENRENEWAL',1); // Disables token renewal
 //require '../../../../main.inc.php';
-require '../../connectors/php/config.php';      // This include the define('NOTOKENRENEWAL',1) and the require main.in.php
+require '../../connectors/php/config.php'; // This include the define('NOTOKENRENEWAL',1) and the require main.in.php
 
 global $Config;
 

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

Indentation +48 added lines, -48 removed lines

@@ -30,21 +30,21 @@ 
  */
 function SetXmlHeaders()
 {
-	ob_end_clean();
-
-	// Prevent the browser from caching the result.
-	// 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');
-	// HTTP/1.1
-	header('Cache-Control: no-store, no-cache, must-revalidate');
-	header('Cache-Control: post-check=0, pre-check=0', false);
-	// HTTP/1.0
-	header('Pragma: no-cache');
-
-	// Set the response format.
-	header('Content-Type: text/xml; charset=utf-8');
+    ob_end_clean();
+
+    // Prevent the browser from caching the result.
+    // 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');
+    // HTTP/1.1
+    header('Cache-Control: no-store, no-cache, must-revalidate');
+    header('Cache-Control: post-check=0, pre-check=0', false);
+    // HTTP/1.0
+    header('Pragma: no-cache');
+
+    // Set the response format.
+    header('Content-Type: text/xml; charset=utf-8');
 }
 
 /**
@@ -57,18 +57,18 @@ 
  */
 function CreateXmlHeader( $command, $resourceType, $currentFolder )
 {
-	SetXmlHeaders();
+    SetXmlHeaders();
 
-	// Create the XML document header.
-	echo '<?xml version="1.0" encoding="utf-8" ?>' ;
+    // Create the XML document header.
+    echo '<?xml version="1.0" encoding="utf-8" ?>' ;
 
-	// Create the main "Connector" node.
-	echo '<Connector command="' . $command . '" resourceType="' . $resourceType . '">' ;
+    // Create the main "Connector" node.
+    echo '<Connector command="' . $command . '" resourceType="' . $resourceType . '">' ;
 
-	// Add the current folder node.
-	echo '<CurrentFolder path="' . ConvertToXmlAttribute($currentFolder) . '" url="' . ConvertToXmlAttribute(GetUrlFromPath($resourceType, $currentFolder, $command)) . '" />' ;
+    // Add the current folder node.
+    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,30 +90,30 @@ 
  */
 function SendError($number, $text)
 {
-	if ( $_GET['Command'] == 'FileUpload' )
-		SendUploadResults($number, "", "", $text);
-
-	if ( isset( $GLOBALS['HeaderSent'] ) && $GLOBALS['HeaderSent'] )
-	{
-		SendErrorNode($number, $text);
-		CreateXmlFooter();
-	}
-	else
-	{
-		SetXmlHeaders();
-
-		dol_syslog('Error: '.$number.' '.$text, LOG_ERR);
+    if ( $_GET['Command'] == 'FileUpload' )
+        SendUploadResults($number, "", "", $text);
+
+    if ( isset( $GLOBALS['HeaderSent'] ) && $GLOBALS['HeaderSent'] )
+    {
+        SendErrorNode($number, $text);
+        CreateXmlFooter();
+    }
+    else
+    {
+        SetXmlHeaders();
+
+        dol_syslog('Error: '.$number.' '.$text, LOG_ERR);
 		
-		// Create the XML document header
-		echo '<?xml version="1.0" encoding="utf-8" ?>' ;
+        // Create the XML document header
+        echo '<?xml version="1.0" encoding="utf-8" ?>' ;
 
-		echo '<Connector>' ;
+        echo '<Connector>' ;
 
-		SendErrorNode($number, $text);
+        SendErrorNode($number, $text);
 
-		echo '</Connector>' ;
-	}
-	exit ;
+        echo '</Connector>' ;
+    }
+    exit ;
 }
 
 /**
@@ -125,8 +125,8 @@ 
  */
 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 . '" />' ;
 }

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 . '" />' ;
+	}
+	}

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

Indentation +37 added lines, -37 removed lines

@@ -31,7 +31,7 @@ 
 require 'commands.php';
 
 if ( !$Config['Enabled'] )
-	SendError(1, 'This connector is disabled. Please check the "editor/filemanager/connectors/php/config.php" file');
+    SendError(1, 'This connector is disabled. Please check the "editor/filemanager/connectors/php/config.php" file');
 
 DoResponse();
 
@@ -45,47 +45,47 @@ 
     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'] ;
-	$sResourceType	= $_GET['Type'] ;
-	$sCurrentFolder	= GetCurrentFolder();
+    // Get the main request informaiton.
+    $sCommand		= $_GET['Command'] ;
+    $sResourceType	= $_GET['Type'] ;
+    $sCurrentFolder	= GetCurrentFolder();
 
-	// Check if it is an allowed command
-	if (! IsAllowedCommand($sCommand))
-	{
-		SendError(1, 'The "' . $sCommand . '" command isn\'t allowed');
-	}
-	// Check if it is an allowed type.
-	if (! IsAllowedType($sResourceType))
-		SendError(1, 'Invalid type specified');
+    // Check if it is an allowed command
+    if (! IsAllowedCommand($sCommand))
+    {
+        SendError(1, 'The "' . $sCommand . '" command isn\'t allowed');
+    }
+    // Check if it is an allowed type.
+    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' )
-	{
-		FileUpload($sResourceType, $sCurrentFolder, $sCommand);
-		return;
-	}
+    // File Upload doesn't have to Return XML, so it must be intercepted before anything.
+    if ( $sCommand == 'FileUpload' )
+    {
+        FileUpload($sResourceType, $sCurrentFolder, $sCommand);
+        return;
+    }
 
-	CreateXmlHeader($sCommand, $sResourceType, $sCurrentFolder);
+    CreateXmlHeader($sCommand, $sResourceType, $sCurrentFolder);
 
-	// Execute the required command.
-	switch ( $sCommand )
-	{
-		case 'GetFolders' :
-			GetFolders($sResourceType, $sCurrentFolder);
-			break;
-		case 'GetFoldersAndFiles' :
-			GetFoldersAndFiles($sResourceType, $sCurrentFolder);
-			break;
-		case 'CreateFolder' :
-			CreateFolder($sResourceType, $sCurrentFolder);
-			break;
-	}
+    // Execute the required command.
+    switch ( $sCommand )
+    {
+        case 'GetFolders' :
+            GetFolders($sResourceType, $sCurrentFolder);
+            break;
+        case 'GetFoldersAndFiles' :
+            GetFoldersAndFiles($sResourceType, $sCurrentFolder);
+            break;
+        case 'CreateFolder' :
+            CreateFolder($sResourceType, $sCurrentFolder);
+            break;
+    }
 
-	CreateXmlFooter();
+    CreateXmlFooter();
 
-	exit;
+    exit;
 }

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

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

Indentation +3 added lines, -3 removed lines

@@ -36,13 +36,13 @@ 
  */
 function SendError($number, $text)
 {
-	SendUploadResults($number, '', '', $text);
+    SendUploadResults($number, '', '', $text);
 }
 
 
 // Check if this uploader has been enabled.
 if ( !$Config['Enabled'] )
-	SendUploadResults('1', '', '', 'This file uploader is disabled. Please check the "filemanagerdol/connectors/php/config.php" file');
+    SendUploadResults('1', '', '', 'This file uploader is disabled. Please check the "filemanagerdol/connectors/php/config.php" file');
 
 $sCommand = 'QuickUpload' ;
 
@@ -53,7 +53,7 @@ 
 
 // Is enabled the upload?
 if (! IsAllowedCommand($sCommand))
-	SendUploadResults('1', '', '', 'The ""' . $sCommand . '"" command isn\'t allowed');
+    SendUploadResults('1', '', '', 'The ""' . $sCommand . '"" command isn\'t allowed');
 
 // Check if it is an allowed type.
 if (! IsAllowedType($sType))

Spacing +7 added lines, -7 removed lines

@@ -41,22 +41,22 @@
 
 
 // Check if this uploader has been enabled.
-if ( !$Config['Enabled'] )
+if (!$Config['Enabled'])
 	SendUploadResults('1', '', '', 'This file uploader is disabled. Please check the "filemanagerdol/connectors/php/config.php" file');
 
-$sCommand = 'QuickUpload' ;
+$sCommand = 'QuickUpload';
 
 // The file type (from the QueryString, by default 'File').
-$sType = isset( $_GET['Type'] ) ? $_GET['Type'] : 'File' ;
+$sType = isset($_GET['Type']) ? $_GET['Type'] : 'File';
 
-$sCurrentFolder	= "/" ;
+$sCurrentFolder = "/";
 
 // Is enabled the upload?
-if (! IsAllowedCommand($sCommand))
-	SendUploadResults('1', '', '', 'The ""' . $sCommand . '"" command isn\'t allowed');
+if (!IsAllowedCommand($sCommand))
+	SendUploadResults('1', '', '', 'The ""'.$sCommand.'"" command isn\'t allowed');
 
 // Check if it is an allowed type.
-if (! IsAllowedType($sType))
+if (!IsAllowedType($sType))
     SendUploadResults(1, '', '', 'Invalid type specified');
 
 

Braces +6 added lines, -3 removed lines

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

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

Indentation +162 added lines, -162 removed lines

@@ -31,7 +31,7 @@ 
  */
 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] ;
-	else
-		return $Config['FileTypesPath'][$resourceType] ;
+    if ($sCommand == "QuickUpload")
+        return $Config['QuickUploadPath'][$resourceType] ;
+    else
+        return $Config['FileTypesPath'][$resourceType] ;
 }
 
 /**
@@ -59,23 +59,23 @@ 
  */
 function GetResourceTypeDirectory($resourceType, $sCommand)
 {
-	global $Config ;
-	if ($sCommand == "QuickUpload")
-	{
-		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] ;
-
-		// Map the "UserFiles" path to a local directory.
-		return Server_MapPath($Config['FileTypesPath'][$resourceType]);
-	}
+    global $Config ;
+    if ($sCommand == "QuickUpload")
+    {
+        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] ;
+
+        // Map the "UserFiles" path to a local directory.
+        return Server_MapPath($Config['FileTypesPath'][$resourceType]);
+    }
 }
 
 /**
@@ -88,7 +88,7 @@ 
  */
 function GetUrlFromPath($resourceType, $folderPath, $sCommand)
 {
-	return CombinePaths(GetResourceTypePath($resourceType, $sCommand), $folderPath);
+    return CombinePaths(GetResourceTypePath($resourceType, $sCommand), $folderPath);
 }
 
 /**
@@ -99,7 +99,7 @@ 
  */
 function RemoveExtension($fileName)
 {
-	return substr($fileName, 0, strrpos($fileName, '.'));
+    return substr($fileName, 0, strrpos($fileName, '.'));
 }
 /**
  * ServerMapFolder
@@ -111,16 +111,16 @@ 
  */
 function ServerMapFolder($resourceType, $folderPath, $sCommand)
 {
-	// Get the resource type directory.
-	$sResourceTypePath = GetResourceTypeDirectory($resourceType, $sCommand);
+    // Get the resource type directory.
+    $sResourceTypePath = GetResourceTypeDirectory($resourceType, $sCommand);
 
-	// Ensure that the directory exists.
-	$sErrorMsg = CreateServerFolder($sResourceTypePath);
-	if ( $sErrorMsg != '' )
-		SendError(1, "Error creating folder \"{$sResourceTypePath}\" ({$sErrorMsg})");
+    // Ensure that the directory exists.
+    $sErrorMsg = CreateServerFolder($sResourceTypePath);
+    if ( $sErrorMsg != '' )
+        SendError(1, "Error creating folder \"{$sResourceTypePath}\" ({$sErrorMsg})");
 
-	// Return the resource type directory combined with the required path.
-	return CombinePaths($sResourceTypePath, $folderPath);
+    // Return the resource type directory combined with the required path.
+    return CombinePaths($sResourceTypePath, $folderPath);
 }
 
 /**
@@ -144,67 +144,67 @@ 
  */
 function CreateServerFolder($folderPath, $lastFolder = null)
 {
-	global $Config ;
-	$sParent = GetParentFolder($folderPath);
-
-	// Ensure the folder path has no double-slashes, or mkdir may fail on certain platforms
-	while ( strpos($folderPath, '//') !== false )
-	{
-		$folderPath = str_replace('//', '/', $folderPath);
-	}
-
-	// Check if the parent exists, or create it.
-	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" ;
-		}
-
-		$sErrorMsg = CreateServerFolder($sParent, $folderPath);
-		if ( $sErrorMsg != '' )
-			return $sErrorMsg ;
-	}
-
-	if ( !file_exists($folderPath))
-	{
-		// Turn off all error reporting.
-		error_reporting(0);
-
-		$php_errormsg = '' ;
-		// Enable error tracking to catch the error.
-		ini_set('track_errors', '1');
-
-		if ( isset( $Config['ChmodOnFolderCreate'] ) && !$Config['ChmodOnFolderCreate'] )
-		{
-			mkdir($folderPath);
-		}
-		else
-		{
-			$permissions = '0777';
-			if ( isset( $Config['ChmodOnFolderCreate'] ) && $Config['ChmodOnFolderCreate'])
-			{
-				$permissions = (string) $Config['ChmodOnFolderCreate'];
-			}
-			$permissionsdec = octdec($permissions);
-			$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);
-			mkdir($folderPath, $permissionsdec);
-			umask($oldumask);
-		}
-
-		$sErrorMsg = $php_errormsg ;
-
-		// Restore the configurations.
-		ini_restore('track_errors');
-		ini_restore('error_reporting');
-
-		return $sErrorMsg ;
-	}
-	else
-		return '' ;
+    global $Config ;
+    $sParent = GetParentFolder($folderPath);
+
+    // Ensure the folder path has no double-slashes, or mkdir may fail on certain platforms
+    while ( strpos($folderPath, '//') !== false )
+    {
+        $folderPath = str_replace('//', '/', $folderPath);
+    }
+
+    // Check if the parent exists, or create it.
+    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" ;
+        }
+
+        $sErrorMsg = CreateServerFolder($sParent, $folderPath);
+        if ( $sErrorMsg != '' )
+            return $sErrorMsg ;
+    }
+
+    if ( !file_exists($folderPath))
+    {
+        // Turn off all error reporting.
+        error_reporting(0);
+
+        $php_errormsg = '' ;
+        // Enable error tracking to catch the error.
+        ini_set('track_errors', '1');
+
+        if ( isset( $Config['ChmodOnFolderCreate'] ) && !$Config['ChmodOnFolderCreate'] )
+        {
+            mkdir($folderPath);
+        }
+        else
+        {
+            $permissions = '0777';
+            if ( isset( $Config['ChmodOnFolderCreate'] ) && $Config['ChmodOnFolderCreate'])
+            {
+                $permissions = (string) $Config['ChmodOnFolderCreate'];
+            }
+            $permissionsdec = octdec($permissions);
+            $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);
+            mkdir($folderPath, $permissionsdec);
+            umask($oldumask);
+        }
+
+        $sErrorMsg = $php_errormsg ;
+
+        // Restore the configurations.
+        ini_restore('track_errors');
+        ini_restore('error_reporting');
+
+        return $sErrorMsg ;
+    }
+    else
+        return '' ;
 }
 
 /**
@@ -260,18 +260,18 @@ 
  */
 function IsAllowedExt($sExtension, $resourceType)
 {
-	global $Config ;
-	// Get the allowed and denied extensions arrays.
-	$arAllowed	= $Config['AllowedExtensions'][$resourceType] ;
-	$arDenied	= $Config['DeniedExtensions'][$resourceType] ;
+    global $Config ;
+    // Get the allowed and denied extensions arrays.
+    $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 ;
 }
 
 /**
@@ -312,79 +312,79 @@ 
  */
 function GetCurrentFolder()
 {
-	if (!isset($_GET)) {
-		global $_GET;
-	}
-	$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 ;
-
-	// Ensure the folder path has no double-slashes
-	while ( strpos($sCurrentFolder, '//') !== false ) {
-		$sCurrentFolder = str_replace('//', '/', $sCurrentFolder);
-	}
-
-	// Check for invalid folder paths (..)
-	if ( strpos($sCurrentFolder, '..') || strpos($sCurrentFolder, "\\"))
-		SendError(102, '');
-
-	if ( preg_match(",(/\.)|[[:cntrl:]]|(//)|(\\\\)|([\:\*\?\"\<\>\|]),", $sCurrentFolder))
-		SendError(102, '');
-
-	return $sCurrentFolder ;
+    if (!isset($_GET)) {
+        global $_GET;
+    }
+    $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 ;
+
+    // Ensure the folder path has no double-slashes
+    while ( strpos($sCurrentFolder, '//') !== false ) {
+        $sCurrentFolder = str_replace('//', '/', $sCurrentFolder);
+    }
+
+    // Check for invalid folder paths (..)
+    if ( strpos($sCurrentFolder, '..') || strpos($sCurrentFolder, "\\"))
+        SendError(102, '');
+
+    if ( preg_match(",(/\.)|[[:cntrl:]]|(//)|(\\\\)|([\:\*\?\"\<\>\|]),", $sCurrentFolder))
+        SendError(102, '');
+
+    return $sCurrentFolder ;
 }
 
 // Do a cleanup of the folder name to avoid possible problems
 function SanitizeFolderName( $sNewFolderName )
 {
-	$sNewFolderName = stripslashes($sNewFolderName);
+    $sNewFolderName = stripslashes($sNewFolderName);
 
-	// Remove . \ / | : ? * " < >
-	$sNewFolderName = preg_replace('/\\.|\\\\|\\/|\\||\\:|\\?|\\*|"|<|>|[[:cntrl:]]/', '_', $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 )
 {
-	global $Config ;
+    global $Config ;
 
-	$sNewFileName = stripslashes($sNewFileName);
+    $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);
+    // Replace dots in the name with underscores (only one dot can be there... security issue).
+    if ( $Config['ForceSingleExtension'] )
+        $sNewFileName = preg_replace('/\\.(?![^.]*$)/', '_', $sNewFileName);
 
-	// Remove \ / | : ? * " < >
-	$sNewFileName = preg_replace('/\\\\|\\/|\\||\\:|\\?|\\*|"|<|>|[[:cntrl:]]/', '_', $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 = '' )
 {
-	// Minified version of the document.domain automatic fix script (#1919).
-	// The original script can be found at _dev/domain_fix_template.js
-	echo <<<EOF
+    // Minified version of the document.domain automatic fix script (#1919).
+    // The original script can be found at _dev/domain_fix_template.js
+    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;
 
-	if ($errorNumber && $errorNumber != 201) {
-		$fileUrl = "";
-		$fileName = "";
-	}
+    if ($errorNumber && $errorNumber != 201) {
+        $fileUrl = "";
+        $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 ;
 }
 
 
@@ -401,11 +401,11 @@ 
  */
 function SendCKEditorResults($callback, $sFileUrl, $customMsg = '')
 {
-  echo '<script type="text/javascript">';
+    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>';
+    echo '</script>';
 }

Spacing +69 added lines, -69 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;
 }
 
 
@@ -403,9 +403,9 @@ 
 {
   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);

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

Indentation +246 added lines, -246 removed lines

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

Braces +32 added lines, -28 removed lines

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

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

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/') : ('/website/'.$website));
+$Config['UserFilesPath'] = DOL_URL_ROOT.'/viewimage.php?modulepart=medias'.(empty($website) ? '' : '_'.$website).'&entity='.$extEntity.'&file=';
+$Config['UserFilesAbsolutePathRelative'] = (empty($website) ? ((!empty($entity) ? '/'.$entity : '').'/medias/') : ('/website/'.$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);
 

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

Indentation +117 added lines, -117 removed lines

@@ -31,8 +31,8 @@ 
  */
 function RemoveFromStart($sourceString, $charToRemove)
 {
-	$sPattern = '|^' . $charToRemove . '+|' ;
-	return preg_replace($sPattern, '', $sourceString);
+    $sPattern = '|^' . $charToRemove . '+|' ;
+    return preg_replace($sPattern, '', $sourceString);
 }
 
 /**
@@ -44,8 +44,8 @@ 
  */
 function RemoveFromEnd($sourceString, $charToRemove)
 {
-	$sPattern = '|' . $charToRemove . '+$|' ;
-	return preg_replace($sPattern, '', $sourceString);
+    $sPattern = '|' . $charToRemove . '+$|' ;
+    return preg_replace($sPattern, '', $sourceString);
 }
 
 /**
@@ -56,24 +56,24 @@ 
  */
 function FindBadUtf8($string)
 {
-	$regex = '([\x00-\x7F]'.
-	'|[\xC2-\xDF][\x80-\xBF]'.
-	'|\xE0[\xA0-\xBF][\x80-\xBF]'.
-	'|[\xE1-\xEC\xEE\xEF][\x80-\xBF]{2}'.
-	'|\xED[\x80-\x9F][\x80-\xBF]'.
-	'|\xF0[\x90-\xBF][\x80-\xBF]{2}'.
-	'|[\xF1-\xF3][\x80-\xBF]{3}'.
-	'|\xF4[\x80-\x8F][\x80-\xBF]{2}'.
-	'|(.{1}))';
-
-	while (preg_match('/'.$regex.'/S', $string, $matches)) {
-		if ( isset($matches[2])) {
-			return true;
-		}
-		$string = substr($string, strlen($matches[0]));
-	}
-
-	return false;
+    $regex = '([\x00-\x7F]'.
+    '|[\xC2-\xDF][\x80-\xBF]'.
+    '|\xE0[\xA0-\xBF][\x80-\xBF]'.
+    '|[\xE1-\xEC\xEE\xEF][\x80-\xBF]{2}'.
+    '|\xED[\x80-\x9F][\x80-\xBF]'.
+    '|\xF0[\x90-\xBF][\x80-\xBF]{2}'.
+    '|[\xF1-\xF3][\x80-\xBF]{3}'.
+    '|\xF4[\x80-\x8F][\x80-\xBF]{2}'.
+    '|(.{1}))';
+
+    while (preg_match('/'.$regex.'/S', $string, $matches)) {
+        if ( isset($matches[2])) {
+            return true;
+        }
+        $string = substr($string, strlen($matches[0]));
+    }
+
+    return false;
 }
 
 /**
@@ -84,23 +84,23 @@ 
  */
 function ConvertToXmlAttribute( $value )
 {
-	if ( defined('PHP_OS') )
-	{
-		$os = PHP_OS ;
-	}
-	else
-	{
-		$os = php_uname();
-	}
-
-	if (strtoupper(substr($os, 0, 3)) === 'WIN' || FindBadUtf8($value))
-	{
-		return (utf8_encode(htmlspecialchars($value)));
-	}
-	else
-	{
-		return (htmlspecialchars($value));
-	}
+    if ( defined('PHP_OS') )
+    {
+        $os = PHP_OS ;
+    }
+    else
+    {
+        $os = php_uname();
+    }
+
+    if (strtoupper(substr($os, 0, 3)) === 'WIN' || FindBadUtf8($value))
+    {
+        return (utf8_encode(htmlspecialchars($value)));
+    }
+    else
+    {
+        return (htmlspecialchars($value));
+    }
 }
 
 /**
@@ -112,16 +112,16 @@ 
  */
 function IsHtmlExtension( $ext, $formExtensions )
 {
-	if (!$formExtensions || !is_array($formExtensions) )
-	{
-		return false ;
-	}
-	$lcaseHtmlExtensions = array();
-	foreach ( $formExtensions as $key => $val )
-	{
-		$lcaseHtmlExtensions[$key] = strtolower($val);
-	}
-	return in_array($ext, $lcaseHtmlExtensions);
+    if (!$formExtensions || !is_array($formExtensions) )
+    {
+        return false ;
+    }
+    $lcaseHtmlExtensions = array();
+    foreach ( $formExtensions as $key => $val )
+    {
+        $lcaseHtmlExtensions[$key] = strtolower($val);
+    }
+    return in_array($ext, $lcaseHtmlExtensions);
 }
 
 /**
@@ -134,63 +134,63 @@ 
  */
 function DetectHtml( $filePath )
 {
-	$fp = @fopen($filePath, 'rb');
-
-	//open_basedir restriction, see #1906
-	if ( $fp === false || !flock($fp, LOCK_SH) )
-	{
-		return -1 ;
-	}
-
-	$chunk = fread($fp, 1024);
-	flock($fp, LOCK_UN);
-	fclose($fp);
-
-	$chunk = strtolower($chunk);
-
-	if (!$chunk)
-	{
-		return false ;
-	}
-
-	$chunk = trim($chunk);
-
-	if ( preg_match("/<!DOCTYPE\W*X?HTML/sim", $chunk) )
-	{
-		return true;
-	}
-
-	$tags = array( '<body', '<head', '<html', '<img', '<pre', '<script', '<table', '<title' );
-
-	foreach( $tags as $tag )
-	{
-		if( false !== strpos($chunk, $tag) )
-		{
-			return true ;
-		}
-	}
-
-	//type = javascript
-	if ( preg_match('!type\s*=\s*[\'"]?\s*(?:\w*/)?(?:ecma|java)!sim', $chunk) )
-	{
-		return true ;
-	}
-
-	//href = javascript
-	//src = javascript
-	//data = javascript
-	if ( preg_match('!(?:href|src|data)\s*=\s*[\'"]?\s*(?:ecma|java)script:!sim', $chunk) )
-	{
-		return true ;
-	}
-
-	//url(javascript
-	if ( preg_match('!url\s*\(\s*[\'"]?\s*(?:ecma|java)script:!sim', $chunk) )
-	{
-		return true ;
-	}
-
-	return false ;
+    $fp = @fopen($filePath, 'rb');
+
+    //open_basedir restriction, see #1906
+    if ( $fp === false || !flock($fp, LOCK_SH) )
+    {
+        return -1 ;
+    }
+
+    $chunk = fread($fp, 1024);
+    flock($fp, LOCK_UN);
+    fclose($fp);
+
+    $chunk = strtolower($chunk);
+
+    if (!$chunk)
+    {
+        return false ;
+    }
+
+    $chunk = trim($chunk);
+
+    if ( preg_match("/<!DOCTYPE\W*X?HTML/sim", $chunk) )
+    {
+        return true;
+    }
+
+    $tags = array( '<body', '<head', '<html', '<img', '<pre', '<script', '<table', '<title' );
+
+    foreach( $tags as $tag )
+    {
+        if( false !== strpos($chunk, $tag) )
+        {
+            return true ;
+        }
+    }
+
+    //type = javascript
+    if ( preg_match('!type\s*=\s*[\'"]?\s*(?:\w*/)?(?:ecma|java)!sim', $chunk) )
+    {
+        return true ;
+    }
+
+    //href = javascript
+    //src = javascript
+    //data = javascript
+    if ( preg_match('!(?:href|src|data)\s*=\s*[\'"]?\s*(?:ecma|java)script:!sim', $chunk) )
+    {
+        return true ;
+    }
+
+    //url(javascript
+    if ( preg_match('!url\s*\(\s*[\'"]?\s*(?:ecma|java)script:!sim', $chunk) )
+    {
+        return true ;
+    }
+
+    return false ;
 }
 
 /**
@@ -204,11 +204,11 @@ 
  */
 function IsImageValid( $filePath, $extension )
 {
-	if (!@is_readable($filePath)) {
-		return -1;
-	}
+    if (!@is_readable($filePath)) {
+        return -1;
+    }
 
-	$imageCheckExtensions = array(
+    $imageCheckExtensions = array(
         'gif',
         'jpeg',
         'jpg',
@@ -228,14 +228,14 @@ 
         'wbmp'
     );
 
-	if (!in_array($extension, $imageCheckExtensions) ) {
-		return true;
-	}
+    if (!in_array($extension, $imageCheckExtensions) ) {
+        return true;
+    }
 
-	if (@getimagesize($filePath) === false) {
-		return false ;
-	}
+    if (@getimagesize($filePath) === false) {
+        return false ;
+    }
 
-	return true;
+    return true;
 }
 

Spacing +29 added lines, -29 removed lines

@@ -31,7 +31,7 @@ 
  */
 function RemoveFromStart($sourceString, $charToRemove)
 {
-	$sPattern = '|^' . $charToRemove . '+|' ;
+	$sPattern = '|^'.$charToRemove.'+|';
 	return preg_replace($sPattern, '', $sourceString);
 }
 
@@ -44,7 +44,7 @@ 
  */
 function RemoveFromEnd($sourceString, $charToRemove)
 {
-	$sPattern = '|' . $charToRemove . '+$|' ;
+	$sPattern = '|'.$charToRemove.'+$|';
 	return preg_replace($sPattern, '', $sourceString);
 }
 
@@ -67,7 +67,7 @@ 
 	'|(.{1}))';
 
 	while (preg_match('/'.$regex.'/S', $string, $matches)) {
-		if ( isset($matches[2])) {
+		if (isset($matches[2])) {
 			return true;
 		}
 		$string = substr($string, strlen($matches[0]));
@@ -82,11 +82,11 @@ 
  * @param 	string		$value		Value
  * @return	string
  */
-function ConvertToXmlAttribute( $value )
+function ConvertToXmlAttribute($value)
 {
-	if ( defined('PHP_OS') )
+	if (defined('PHP_OS'))
 	{
-		$os = PHP_OS ;
+		$os = PHP_OS;
 	}
 	else
 	{
@@ -110,14 +110,14 @@ 
  * @param 	array 		$formExtensions		Array of extensions
  * @return 	boolean
  */
-function IsHtmlExtension( $ext, $formExtensions )
+function IsHtmlExtension($ext, $formExtensions)
 {
-	if (!$formExtensions || !is_array($formExtensions) )
+	if (!$formExtensions || !is_array($formExtensions))
 	{
-		return false ;
+		return false;
 	}
 	$lcaseHtmlExtensions = array();
-	foreach ( $formExtensions as $key => $val )
+	foreach ($formExtensions as $key => $val)
 	{
 		$lcaseHtmlExtensions[$key] = strtolower($val);
 	}
@@ -132,14 +132,14 @@ 
  * @param string $filePath absolute path to file
  * @return boolean
  */
-function DetectHtml( $filePath )
+function DetectHtml($filePath)
 {
 	$fp = @fopen($filePath, 'rb');
 
 	//open_basedir restriction, see #1906
-	if ( $fp === false || !flock($fp, LOCK_SH) )
+	if ($fp === false || !flock($fp, LOCK_SH))
 	{
-		return -1 ;
+		return -1;
 	}
 
 	$chunk = fread($fp, 1024);
@@ -150,47 +150,47 @@ 
 
 	if (!$chunk)
 	{
-		return false ;
+		return false;
 	}
 
 	$chunk = trim($chunk);
 
-	if ( preg_match("/<!DOCTYPE\W*X?HTML/sim", $chunk) )
+	if (preg_match("/<!DOCTYPE\W*X?HTML/sim", $chunk))
 	{
 		return true;
 	}
 
-	$tags = array( '<body', '<head', '<html', '<img', '<pre', '<script', '<table', '<title' );
+	$tags = array('<body', '<head', '<html', '<img', '<pre', '<script', '<table', '<title');
 
-	foreach( $tags as $tag )
+	foreach ($tags as $tag)
 	{
-		if( false !== strpos($chunk, $tag) )
+		if (false !== strpos($chunk, $tag))
 		{
-			return true ;
+			return true;
 		}
 	}
 
 	//type = javascript
-	if ( preg_match('!type\s*=\s*[\'"]?\s*(?:\w*/)?(?:ecma|java)!sim', $chunk) )
+	if (preg_match('!type\s*=\s*[\'"]?\s*(?:\w*/)?(?:ecma|java)!sim', $chunk))
 	{
-		return true ;
+		return true;
 	}
 
 	//href = javascript
 	//src = javascript
 	//data = javascript
-	if ( preg_match('!(?:href|src|data)\s*=\s*[\'"]?\s*(?:ecma|java)script:!sim', $chunk) )
+	if (preg_match('!(?:href|src|data)\s*=\s*[\'"]?\s*(?:ecma|java)script:!sim', $chunk))
 	{
-		return true ;
+		return true;
 	}
 
 	//url(javascript
-	if ( preg_match('!url\s*\(\s*[\'"]?\s*(?:ecma|java)script:!sim', $chunk) )
+	if (preg_match('!url\s*\(\s*[\'"]?\s*(?:ecma|java)script:!sim', $chunk))
 	{
-		return true ;
+		return true;
 	}
 
-	return false ;
+	return false;
 }
 
 /**
@@ -202,7 +202,7 @@ 
  * @param 	string 	$extension 		File extension
  * @return 	boolean					True or false
  */
-function IsImageValid( $filePath, $extension )
+function IsImageValid($filePath, $extension)
 {
 	if (!@is_readable($filePath)) {
 		return -1;
@@ -228,12 +228,12 @@ 
         'wbmp'
     );
 
-	if (!in_array($extension, $imageCheckExtensions) ) {
+	if (!in_array($extension, $imageCheckExtensions)) {
 		return true;
 	}
 
 	if (@getimagesize($filePath) === false) {
-		return false ;
+		return false;
 	}
 
 	return true;

Braces +2 added lines, -4 removed lines

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

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

Indentation +14 added lines, -14 removed lines

@@ -34,22 +34,22 @@
  */
 function import_prepare_head($param, $maxstep=0)
 {
-	global $langs;
+    global $langs;
 
-	if (empty($maxstep)) $maxstep=6;
+    if (empty($maxstep)) $maxstep=6;
 
-	$h=0;
-	$head = array();
-	$i=1;
-	while($i <= $maxstep)
-	{
-    	$head[$h][0] = DOL_URL_ROOT.'/imports/import.php?step='.$i.$param;
-    	$head[$h][1] = $langs->trans("Step")." ".$i;
-    	$head[$h][2] = 'step'.$i;
-    	$h++;
-    	$i++;
-	}
+    $h=0;
+    $head = array();
+    $i=1;
+    while($i <= $maxstep)
+    {
+        $head[$h][0] = DOL_URL_ROOT.'/imports/import.php?step='.$i.$param;
+        $head[$h][1] = $langs->trans("Step")." ".$i;
+        $head[$h][2] = 'step'.$i;
+        $h++;
+        $i++;
+    }
 
-	return $head;
+    return $head;
 }
 

Spacing +5 added lines, -5 removed lines

@@ -32,16 +32,16 @@
  * @param	int			$maxstep	Limit steps to maxstep or no limit if 0
  * @return	array					Array of tabs
  */
-function import_prepare_head($param, $maxstep=0)
+function import_prepare_head($param, $maxstep = 0)
 {
 	global $langs;
 
-	if (empty($maxstep)) $maxstep=6;
+	if (empty($maxstep)) $maxstep = 6;
 
-	$h=0;
+	$h = 0;
 	$head = array();
-	$i=1;
-	while($i <= $maxstep)
+	$i = 1;
+	while ($i <= $maxstep)
 	{
     	$head[$h][0] = DOL_URL_ROOT.'/imports/import.php?step='.$i.$param;
     	$head[$h][1] = $langs->trans("Step")." ".$i;

Braces +3 added lines, -1 removed lines

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