alxarafe / alixar

dolibarr/htdocs/core/actions_comments.inc.php

Indentation +35 added lines, -35 removed lines

@@ -35,42 +35,42 @@
 
 if ($action == 'addcomment')
 {
-	$description = GETPOST('comment_description', 'none');
-	if (!empty($description))
-	{
-		$comment->description = $description;
-		$comment->datec = time();
-		$comment->fk_element = GETPOST('id','int');
-		$comment->element_type = GETPOST('comment_element_type','alpha');
-		$comment->fk_user_author = $user->id;
-		$comment->entity = $conf->entity;
-		if ($comment->create($user) > 0)
-		{
-			setEventMessages($langs->trans("CommentAdded"), null, 'mesgs');
-			header('Location: '.$varpage.'?id='.$id.($withproject?'&withproject=1':''));
-			exit;
-		}
-		else
-		{
-			setEventMessages($comment->error, $comment->errors,'errors');
-			$action='';
-		}
-	}
+    $description = GETPOST('comment_description', 'none');
+    if (!empty($description))
+    {
+        $comment->description = $description;
+        $comment->datec = time();
+        $comment->fk_element = GETPOST('id','int');
+        $comment->element_type = GETPOST('comment_element_type','alpha');
+        $comment->fk_user_author = $user->id;
+        $comment->entity = $conf->entity;
+        if ($comment->create($user) > 0)
+        {
+            setEventMessages($langs->trans("CommentAdded"), null, 'mesgs');
+            header('Location: '.$varpage.'?id='.$id.($withproject?'&withproject=1':''));
+            exit;
+        }
+        else
+        {
+            setEventMessages($comment->error, $comment->errors,'errors');
+            $action='';
+        }
+    }
 }
 if ($action == 'deletecomment')
 {
-	if ($comment->fetch($idcomment) >= 0)
-	{
-		if ($comment->delete($user) > 0)
-		{
-			setEventMessages($langs->trans("CommentDeleted"), null, 'mesgs');
-			header('Location: '.$varpage.'?id='.$id.($withproject?'&withproject=1':''));
-			exit;
-		}
-		else
-		{
-			setEventMessages($comment->error, $comment->errors,'errors');
-			$action='';
-		}
-	}
+    if ($comment->fetch($idcomment) >= 0)
+    {
+        if ($comment->delete($user) > 0)
+        {
+            setEventMessages($langs->trans("CommentDeleted"), null, 'mesgs');
+            header('Location: '.$varpage.'?id='.$id.($withproject?'&withproject=1':''));
+            exit;
+        }
+        else
+        {
+            setEventMessages($comment->error, $comment->errors,'errors');
+            $action='';
+        }
+    }
 }
\ No newline at end of file

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

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

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

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>';
 }

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

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

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

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

Indentation +317 added lines, -317 removed lines

@@ -49,157 +49,157 @@ 
  */
 function print_actions_filter($form, $canedit, $status, $year, $month, $day, $showbirthday, $filtera, $filtert, $filterd, $pid, $socid, $action, $showextcals=array(), $actioncode='', $usergroupid='', $excludetype='', $resourceid=0)
 {
-	global $conf, $user, $langs, $db, $hookmanager;
-	global $begin_h, $end_h, $begin_d, $end_d;
-
-	$langs->load("companies");
-
-	include_once DOL_DOCUMENT_ROOT . '/core/class/html.formactions.class.php';
-	$formactions=new FormActions($db);
-
-	// Filters
-	//print '<form name="listactionsfilter" class="listactionsfilter" action="' . $_SERVER["PHP_SELF"] . '" method="get">';
-	print '<input type="hidden" name="token" value="' . $_SESSION ['newtoken'] . '">';
-	print '<input type="hidden" name="year" value="' . $year . '">';
-	print '<input type="hidden" name="month" value="' . $month . '">';
-	print '<input type="hidden" name="day" value="' . $day . '">';
-	print '<input type="hidden" name="action" value="' . $action . '">';
-	print '<input type="hidden" name="search_showbirthday" value="' . $showbirthday . '">';
-
-	print '<div class="fichecenter">';
-
-	if ($conf->browser->layout == 'phone') print '<div class="fichehalfleft">';
-	else print '<table class="nobordernopadding" width="100%"><tr><td class="borderright">';
-
-	print '<table class="nobordernopadding centpercent">';
-
-	if ($canedit)
-	{
-		print '<tr>';
-		print '<td class="nowrap" style="padding-bottom: 2px; padding-right: 4px;">';
-		print $langs->trans("ActionsToDoBy").' &nbsp; ';
-		print '</td><td style="padding-bottom: 2px; padding-right: 4px;">';
-		print $form->select_dolusers($filtert, 'search_filtert', 1, '', ! $canedit, '', '', 0, 0, 0, '', 0, '', 'maxwidth300');
-		if (empty($conf->dol_optimize_smallscreen)) print ' &nbsp; '.$langs->trans("or") . ' '.$langs->trans("ToUserOfGroup").' &nbsp; ';
-		print $form->select_dolgroups($usergroupid, 'usergroup', 1, '', ! $canedit);
-		print '</td></tr>';
-
-		if ($conf->resource->enabled)
-		{
-		    include_once DOL_DOCUMENT_ROOT . '/resource/class/html.formresource.class.php';
-		    $formresource=new FormResource($db);
-
-    		// Resource
-    		print '<tr>';
-    		print '<td class="nowrap" style="padding-bottom: 2px; padding-right: 4px;">';
-    		print $langs->trans("Resource");
-    		print ' &nbsp;</td><td class="nowrap maxwidthonsmartphone" style="padding-bottom: 2px; padding-right: 4px;">';
+    global $conf, $user, $langs, $db, $hookmanager;
+    global $begin_h, $end_h, $begin_d, $end_d;
+
+    $langs->load("companies");
+
+    include_once DOL_DOCUMENT_ROOT . '/core/class/html.formactions.class.php';
+    $formactions=new FormActions($db);
+
+    // Filters
+    //print '<form name="listactionsfilter" class="listactionsfilter" action="' . $_SERVER["PHP_SELF"] . '" method="get">';
+    print '<input type="hidden" name="token" value="' . $_SESSION ['newtoken'] . '">';
+    print '<input type="hidden" name="year" value="' . $year . '">';
+    print '<input type="hidden" name="month" value="' . $month . '">';
+    print '<input type="hidden" name="day" value="' . $day . '">';
+    print '<input type="hidden" name="action" value="' . $action . '">';
+    print '<input type="hidden" name="search_showbirthday" value="' . $showbirthday . '">';
+
+    print '<div class="fichecenter">';
+
+    if ($conf->browser->layout == 'phone') print '<div class="fichehalfleft">';
+    else print '<table class="nobordernopadding" width="100%"><tr><td class="borderright">';
+
+    print '<table class="nobordernopadding centpercent">';
+
+    if ($canedit)
+    {
+        print '<tr>';
+        print '<td class="nowrap" style="padding-bottom: 2px; padding-right: 4px;">';
+        print $langs->trans("ActionsToDoBy").' &nbsp; ';
+        print '</td><td style="padding-bottom: 2px; padding-right: 4px;">';
+        print $form->select_dolusers($filtert, 'search_filtert', 1, '', ! $canedit, '', '', 0, 0, 0, '', 0, '', 'maxwidth300');
+        if (empty($conf->dol_optimize_smallscreen)) print ' &nbsp; '.$langs->trans("or") . ' '.$langs->trans("ToUserOfGroup").' &nbsp; ';
+        print $form->select_dolgroups($usergroupid, 'usergroup', 1, '', ! $canedit);
+        print '</td></tr>';
+
+        if ($conf->resource->enabled)
+        {
+            include_once DOL_DOCUMENT_ROOT . '/resource/class/html.formresource.class.php';
+            $formresource=new FormResource($db);
+
+            // Resource
+            print '<tr>';
+            print '<td class="nowrap" style="padding-bottom: 2px; padding-right: 4px;">';
+            print $langs->trans("Resource");
+            print ' &nbsp;</td><td class="nowrap maxwidthonsmartphone" style="padding-bottom: 2px; padding-right: 4px;">';
             print $formresource->select_resource_list($resourceid, "search_resourceid", '', 1, 0, 0, null, '', 2);
-    		print '</td></tr>';
-		}
-
-		// Type
-		print '<tr>';
-		print '<td class="nowrap" style="padding-bottom: 2px; padding-right: 4px;">';
-		print $langs->trans("Type");
-		print ' &nbsp;</td><td class="nowrap" style="padding-bottom: 2px; padding-right: 4px;">';
-		$multiselect=0;
-		if (! empty($conf->global->MAIN_ENABLE_MULTISELECT_TYPE))     // We use an option here because it adds bugs when used on agenda page "peruser" and "list"
-		{
+            print '</td></tr>';
+        }
+
+        // Type
+        print '<tr>';
+        print '<td class="nowrap" style="padding-bottom: 2px; padding-right: 4px;">';
+        print $langs->trans("Type");
+        print ' &nbsp;</td><td class="nowrap" style="padding-bottom: 2px; padding-right: 4px;">';
+        $multiselect=0;
+        if (! empty($conf->global->MAIN_ENABLE_MULTISELECT_TYPE))     // We use an option here because it adds bugs when used on agenda page "peruser" and "list"
+        {
             $multiselect=(!empty($conf->global->AGENDA_USE_EVENT_TYPE));
-		}
+        }
         print $formactions->select_type_actions($actioncode, "search_actioncode", $excludetype, (empty($conf->global->AGENDA_USE_EVENT_TYPE)?1:-1), 0, $multiselect);
-		print '</td></tr>';
-	}
-
-	if (! empty($conf->societe->enabled) && $user->rights->societe->lire)
-	{
-		print '<tr>';
-		print '<td class="nowrap" style="padding-bottom: 2px; padding-right: 4px;">';
-		print $langs->trans("ThirdParty").' &nbsp; ';
-		print '</td><td class="nowrap" style="padding-bottom: 2px;">';
-		print $form->select_company($socid, 'search_socid', '', 'SelectThirdParty', 0, 0, null, 0);
-		print '</td></tr>';
-	}
-
-	if (! empty($conf->projet->enabled) && $user->rights->projet->lire)
-	{
-		require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
-		$formproject=new FormProjets($db);
-
-		print '<tr>';
-		print '<td class="nowrap" style="padding-bottom: 2px;">';
-		print $langs->trans("Project").' &nbsp; ';
-		print '</td><td class="nowrap" style="padding-bottom: 2px;">';
-		print $formproject->select_projects($socid?$socid:-1, $pid, 'search_projectid', 0, 0, 1, 0, 0, 0, 0, '', 1, 0, 'maxwidth500');
-		print '</td></tr>';
-	}
-
-	if ($canedit && ! preg_match('/list/', $_SERVER["PHP_SELF"]))
-	{
-		// Status
-		print '<tr>';
-		print '<td class="nowrap" style="padding-bottom: 2px; padding-right: 4px;">';
-		print $langs->trans("Status");
-		print ' &nbsp;</td><td class="nowrap" style="padding-bottom: 2px; padding-right: 4px;">';
-		$formactions->form_select_status_action('formaction', $status, 1, 'search_status', 1, 2, 'minwidth100');
-		print '</td></tr>';
-	}
-
-	if ($canedit && $action == 'show_peruser')
-	{
-		// Filter on hours
-		print '<tr>';
-		print '<td class="nowrap" style="padding-bottom: 2px; padding-right: 4px;">'.$langs->trans("VisibleTimeRange").'</td>';
-		print "<td class='nowrap'>";
-		print '<div class="ui-grid-a"><div class="ui-block-a">';
-		print '<input type="number" class="short" name="begin_h" value="'.$begin_h.'" min="0" max="23">';
-		if (empty($conf->dol_use_jmobile)) print ' - ';
-		else print '</div><div class="ui-block-b">';
-		print '<input type="number" class="short" name="end_h" value="'.$end_h.'" min="1" max="24">';
-		if (empty($conf->dol_use_jmobile)) print ' '.$langs->trans("H");
-		print '</div></div>';
-		print '</td></tr>';
-
-		// Filter on days
-		print '<tr>';
-		print '<td class="nowrap">'.$langs->trans("VisibleDaysRange").'</td>';
-		print "<td class='nowrap'>";
-		print '<div class="ui-grid-a"><div class="ui-block-a">';
-		print '<input type="number" class="short" name="begin_d" value="'.$begin_d.'" min="1" max="7">';
-		if (empty($conf->dol_use_jmobile)) print ' - ';
-		else print '</div><div class="ui-block-b">';
-		print '<input type="number" class="short" name="end_d" value="'.$end_d.'" min="1" max="7">';
-		print '</div></div>';
-		print '</td></tr>';
-	}
-
-	// Hooks
-	$parameters = array('canedit'=>$canedit, 'pid'=>$pid, 'socid'=>$socid);
-	$reshook = $hookmanager->executeHooks('searchAgendaFrom', $parameters, $object, $action); // Note that $action and $object may have been
-
-	print '</table>';
-
-	if ($conf->browser->layout == 'phone') print '</div>';
-	else print '</td>';
-
-	if ($conf->browser->layout == 'phone') print '<div class="fichehalfright">';
-	else print '<td align="center" valign="middle" class="nowrap">';
-
-	print '<table class="centpercent"><tr><td align="center">';
-	print '<div class="formleftzone">';
-	print '<input type="submit" class="button" style="min-width:120px" name="refresh" value="' . $langs->trans("Refresh") . '">';
-	print '</div>';
-	print '</td></tr>';
-	print '</table>';
-
-	if ($conf->browser->layout == 'phone') print '</div>';
-	else print '</td></tr></table>';
-
-	print '</div>';	// Close fichecenter
-	print '<div style="clear:both"></div>';
-
-	//print '</form>';
+        print '</td></tr>';
+    }
+
+    if (! empty($conf->societe->enabled) && $user->rights->societe->lire)
+    {
+        print '<tr>';
+        print '<td class="nowrap" style="padding-bottom: 2px; padding-right: 4px;">';
+        print $langs->trans("ThirdParty").' &nbsp; ';
+        print '</td><td class="nowrap" style="padding-bottom: 2px;">';
+        print $form->select_company($socid, 'search_socid', '', 'SelectThirdParty', 0, 0, null, 0);
+        print '</td></tr>';
+    }
+
+    if (! empty($conf->projet->enabled) && $user->rights->projet->lire)
+    {
+        require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
+        $formproject=new FormProjets($db);
+
+        print '<tr>';
+        print '<td class="nowrap" style="padding-bottom: 2px;">';
+        print $langs->trans("Project").' &nbsp; ';
+        print '</td><td class="nowrap" style="padding-bottom: 2px;">';
+        print $formproject->select_projects($socid?$socid:-1, $pid, 'search_projectid', 0, 0, 1, 0, 0, 0, 0, '', 1, 0, 'maxwidth500');
+        print '</td></tr>';
+    }
+
+    if ($canedit && ! preg_match('/list/', $_SERVER["PHP_SELF"]))
+    {
+        // Status
+        print '<tr>';
+        print '<td class="nowrap" style="padding-bottom: 2px; padding-right: 4px;">';
+        print $langs->trans("Status");
+        print ' &nbsp;</td><td class="nowrap" style="padding-bottom: 2px; padding-right: 4px;">';
+        $formactions->form_select_status_action('formaction', $status, 1, 'search_status', 1, 2, 'minwidth100');
+        print '</td></tr>';
+    }
+
+    if ($canedit && $action == 'show_peruser')
+    {
+        // Filter on hours
+        print '<tr>';
+        print '<td class="nowrap" style="padding-bottom: 2px; padding-right: 4px;">'.$langs->trans("VisibleTimeRange").'</td>';
+        print "<td class='nowrap'>";
+        print '<div class="ui-grid-a"><div class="ui-block-a">';
+        print '<input type="number" class="short" name="begin_h" value="'.$begin_h.'" min="0" max="23">';
+        if (empty($conf->dol_use_jmobile)) print ' - ';
+        else print '</div><div class="ui-block-b">';
+        print '<input type="number" class="short" name="end_h" value="'.$end_h.'" min="1" max="24">';
+        if (empty($conf->dol_use_jmobile)) print ' '.$langs->trans("H");
+        print '</div></div>';
+        print '</td></tr>';
+
+        // Filter on days
+        print '<tr>';
+        print '<td class="nowrap">'.$langs->trans("VisibleDaysRange").'</td>';
+        print "<td class='nowrap'>";
+        print '<div class="ui-grid-a"><div class="ui-block-a">';
+        print '<input type="number" class="short" name="begin_d" value="'.$begin_d.'" min="1" max="7">';
+        if (empty($conf->dol_use_jmobile)) print ' - ';
+        else print '</div><div class="ui-block-b">';
+        print '<input type="number" class="short" name="end_d" value="'.$end_d.'" min="1" max="7">';
+        print '</div></div>';
+        print '</td></tr>';
+    }
+
+    // Hooks
+    $parameters = array('canedit'=>$canedit, 'pid'=>$pid, 'socid'=>$socid);
+    $reshook = $hookmanager->executeHooks('searchAgendaFrom', $parameters, $object, $action); // Note that $action and $object may have been
+
+    print '</table>';
+
+    if ($conf->browser->layout == 'phone') print '</div>';
+    else print '</td>';
+
+    if ($conf->browser->layout == 'phone') print '<div class="fichehalfright">';
+    else print '<td align="center" valign="middle" class="nowrap">';
+
+    print '<table class="centpercent"><tr><td align="center">';
+    print '<div class="formleftzone">';
+    print '<input type="submit" class="button" style="min-width:120px" name="refresh" value="' . $langs->trans("Refresh") . '">';
+    print '</div>';
+    print '</td></tr>';
+    print '</table>';
+
+    if ($conf->browser->layout == 'phone') print '</div>';
+    else print '</td></tr></table>';
+
+    print '</div>';	// Close fichecenter
+    print '<div style="clear:both"></div>';
+
+    //print '</form>';
 }
 
 
@@ -211,42 +211,42 @@ 
  */
 function show_array_actions_to_do($max=5)
 {
-	global $langs, $conf, $user, $db, $bc, $socid;
+    global $langs, $conf, $user, $db, $bc, $socid;
 
-	$now=dol_now();
+    $now=dol_now();
 
-	include_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
-	include_once DOL_DOCUMENT_ROOT.'/societe/class/client.class.php';
+    include_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
+    include_once DOL_DOCUMENT_ROOT.'/societe/class/client.class.php';
 
-	$sql = "SELECT a.id, a.label, a.datep as dp, a.datep2 as dp2, a.fk_user_author, a.percent,";
-	$sql.= " c.code, c.libelle as type_label,";
-	$sql.= " s.nom as sname, s.rowid, s.client";
-	$sql.= " FROM ".MAIN_DB_PREFIX."actioncomm as a LEFT JOIN ";
-	$sql.= " ".MAIN_DB_PREFIX."c_actioncomm as c ON c.id = a.fk_action";
+    $sql = "SELECT a.id, a.label, a.datep as dp, a.datep2 as dp2, a.fk_user_author, a.percent,";
+    $sql.= " c.code, c.libelle as type_label,";
+    $sql.= " s.nom as sname, s.rowid, s.client";
+    $sql.= " FROM ".MAIN_DB_PREFIX."actioncomm as a LEFT JOIN ";
+    $sql.= " ".MAIN_DB_PREFIX."c_actioncomm as c ON c.id = a.fk_action";
     $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON a.fk_soc = s.rowid";
-	if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-	$sql.= " WHERE a.entity = ".$conf->entity;
+    if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+    $sql.= " WHERE a.entity = ".$conf->entity;
     $sql.= " AND ((a.percent >= 0 AND a.percent < 100) OR (a.percent = -1 AND a.datep2 > '".$db->idate($now)."'))";
-	if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-	if ($socid) $sql.= " AND s.rowid = ".$socid;
-	$sql.= " ORDER BY a.datep DESC, a.id DESC";
-	$sql.= $db->plimit($max, 0);
+    if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+    if ($socid) $sql.= " AND s.rowid = ".$socid;
+    $sql.= " ORDER BY a.datep DESC, a.id DESC";
+    $sql.= $db->plimit($max, 0);
 
-	$resql=$db->query($sql);
-	if ($resql)
-	{
-	    $num = $db->num_rows($resql);
+    $resql=$db->query($sql);
+    if ($resql)
+    {
+        $num = $db->num_rows($resql);
 
-	    print '<table class="noborder" width="100%">';
-	    print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("LastActionsToDo",$max).'</th>';
-		print '<th colspan="2" align="right"><a class="commonlink" href="'.DOL_URL_ROOT.'/comm/action/list.php?status=todo">'.$langs->trans("FullList").'</a></th>';
-		print '</tr>';
+        print '<table class="noborder" width="100%">';
+        print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("LastActionsToDo",$max).'</th>';
+        print '<th colspan="2" align="right"><a class="commonlink" href="'.DOL_URL_ROOT.'/comm/action/list.php?status=todo">'.$langs->trans("FullList").'</a></th>';
+        print '</tr>';
 
-		$var = true;
-	    $i = 0;
+        $var = true;
+        $i = 0;
 
-		$staticaction=new ActionComm($db);
-	    $customerstatic=new Client($db);
+        $staticaction=new ActionComm($db);
+        $customerstatic=new Client($db);
 
         while ($i < $num)
         {
@@ -260,15 +260,15 @@ 
             $staticaction->id=$obj->id;
             print '<td>'.$staticaction->getNomUrl(1,34).'</td>';
 
-           // print '<td>'.dol_trunc($obj->label,22).'</td>';
+            // print '<td>'.dol_trunc($obj->label,22).'</td>';
 
             print '<td>';
             if ($obj->rowid > 0)
             {
-            	$customerstatic->id=$obj->rowid;
-            	$customerstatic->name=$obj->sname;
-            	$customerstatic->client=$obj->client;
-            	print $customerstatic->getNomUrl(1,'',16);
+                $customerstatic->id=$obj->rowid;
+                $customerstatic->name=$obj->sname;
+                $customerstatic->client=$obj->client;
+                print $customerstatic->getNomUrl(1,'',16);
             }
             print '</td>';
 
@@ -276,30 +276,30 @@ 
             $datep2=$db->jdate($obj->dp2);
 
             // Date
-			print '<td width="100" align="right">'.dol_print_date($datep,'day').'&nbsp;';
-			$late=0;
-			if ($obj->percent == 0 && $datep && $datep < time()) $late=1;
-			if ($obj->percent == 0 && ! $datep && $datep2 && $datep2 < time()) $late=1;
-			if ($obj->percent > 0 && $obj->percent < 100 && $datep2 && $datep2 < time()) $late=1;
-			if ($obj->percent > 0 && $obj->percent < 100 && ! $datep2 && $datep && $datep < time()) $late=1;
-			if ($late) print img_warning($langs->trans("Late"));
-			print "</td>";
+            print '<td width="100" align="right">'.dol_print_date($datep,'day').'&nbsp;';
+            $late=0;
+            if ($obj->percent == 0 && $datep && $datep < time()) $late=1;
+            if ($obj->percent == 0 && ! $datep && $datep2 && $datep2 < time()) $late=1;
+            if ($obj->percent > 0 && $obj->percent < 100 && $datep2 && $datep2 < time()) $late=1;
+            if ($obj->percent > 0 && $obj->percent < 100 && ! $datep2 && $datep && $datep < time()) $late=1;
+            if ($late) print img_warning($langs->trans("Late"));
+            print "</td>";
 
-			// Statut
-			print "<td align=\"right\" width=\"14\">".$staticaction->LibStatut($obj->percent,3)."</td>\n";
+            // Statut
+            print "<td align=\"right\" width=\"14\">".$staticaction->LibStatut($obj->percent,3)."</td>\n";
 
-			print "</tr>\n";
+            print "</tr>\n";
 
             $i++;
         }
-	    print "</table><br>";
-
-	    $db->free($resql);
-	}
-	else
-	{
-	    dol_print_error($db);
-	}
+        print "</table><br>";
+
+        $db->free($resql);
+    }
+    else
+    {
+        dol_print_error($db);
+    }
 }
 
 
@@ -311,83 +311,83 @@ 
  */
 function show_array_last_actions_done($max=5)
 {
-	global $langs, $conf, $user, $db, $bc, $socid;
+    global $langs, $conf, $user, $db, $bc, $socid;
 
-	$now=dol_now();
+    $now=dol_now();
 
-	$sql = "SELECT a.id, a.percent, a.datep as da, a.datep2 as da2, a.fk_user_author, a.label,";
-	$sql.= " c.code, c.libelle,";
-	$sql.= " s.rowid, s.nom as sname, s.client";
-	$sql.= " FROM ".MAIN_DB_PREFIX."actioncomm as a LEFT JOIN ";
-	$sql.= " ".MAIN_DB_PREFIX."c_actioncomm as c ON c.id = a.fk_action ";
+    $sql = "SELECT a.id, a.percent, a.datep as da, a.datep2 as da2, a.fk_user_author, a.label,";
+    $sql.= " c.code, c.libelle,";
+    $sql.= " s.rowid, s.nom as sname, s.client";
+    $sql.= " FROM ".MAIN_DB_PREFIX."actioncomm as a LEFT JOIN ";
+    $sql.= " ".MAIN_DB_PREFIX."c_actioncomm as c ON c.id = a.fk_action ";
     $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON a.fk_soc = s.rowid";
-	if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-	$sql.= " WHERE a.entity = ".$conf->entity;
+    if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+    $sql.= " WHERE a.entity = ".$conf->entity;
     $sql.= " AND (a.percent >= 100 OR (a.percent = -1 AND a.datep2 <= '".$db->idate($now)."'))";
-	if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+    if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
     if ($socid) $sql.= " AND s.rowid = ".$socid;
-	$sql .= " ORDER BY a.datep2 DESC";
-	$sql .= $db->plimit($max, 0);
+    $sql .= " ORDER BY a.datep2 DESC";
+    $sql .= $db->plimit($max, 0);
 
-	$resql=$db->query($sql);
-	if ($resql)
-	{
-		$num = $db->num_rows($resql);
+    $resql=$db->query($sql);
+    if ($resql)
+    {
+        $num = $db->num_rows($resql);
 
-		print '<table class="noborder" width="100%">';
-		print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("LastDoneTasks",$max).'</th>';
-		print '<th colspan="2" align="right"><a class="commonlink" href="'.DOL_URL_ROOT.'/comm/action/list.php?status=done">'.$langs->trans("FullList").'</a></th>';
-		print '</tr>';
-		$var = true;
-		$i = 0;
+        print '<table class="noborder" width="100%">';
+        print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("LastDoneTasks",$max).'</th>';
+        print '<th colspan="2" align="right"><a class="commonlink" href="'.DOL_URL_ROOT.'/comm/action/list.php?status=done">'.$langs->trans("FullList").'</a></th>';
+        print '</tr>';
+        $var = true;
+        $i = 0;
 
-	    $staticaction=new ActionComm($db);
-	    $customerstatic=new Societe($db);
+        $staticaction=new ActionComm($db);
+        $customerstatic=new Societe($db);
 
-		while ($i < $num)
-		{
-			$obj = $db->fetch_object($resql);
+        while ($i < $num)
+        {
+            $obj = $db->fetch_object($resql);
 
 
-			print '<tr class="oddeven">';
+            print '<tr class="oddeven">';
 
-			$staticaction->type_code=$obj->code;
-			$staticaction->libelle=$obj->label;
-			$staticaction->id=$obj->id;
-			print '<td>'.$staticaction->getNomUrl(1,34).'</td>';
+            $staticaction->type_code=$obj->code;
+            $staticaction->libelle=$obj->label;
+            $staticaction->id=$obj->id;
+            print '<td>'.$staticaction->getNomUrl(1,34).'</td>';
 
             //print '<td>'.dol_trunc($obj->label,24).'</td>';
 
-			print '<td>';
-			if ($obj->rowid > 0)
-			{
+            print '<td>';
+            if ($obj->rowid > 0)
+            {
                 $customerstatic->id=$obj->rowid;
                 $customerstatic->name=$obj->sname;
                 $customerstatic->client=$obj->client;
-			    print $customerstatic->getNomUrl(1,'',24);
-			}
-			print '</td>';
-
-			// Date
-			print '<td width="100" align="right">'.dol_print_date($db->jdate($obj->da2),'day');
-			print "</td>";
-
-			// Statut
-			print "<td align=\"right\" width=\"14\">".$staticaction->LibStatut($obj->percent,3)."</td>\n";
-
-			print "</tr>\n";
-			$i++;
-		}
-		// TODO Ajouter rappel pour "il y a des contrats a mettre en service"
-		// TODO Ajouter rappel pour "il y a des contrats qui arrivent a expiration"
-		print "</table><br>";
-
-		$db->free($resql);
-	}
-	else
-	{
-		dol_print_error($db);
-	}
+                print $customerstatic->getNomUrl(1,'',24);
+            }
+            print '</td>';
+
+            // Date
+            print '<td width="100" align="right">'.dol_print_date($db->jdate($obj->da2),'day');
+            print "</td>";
+
+            // Statut
+            print "<td align=\"right\" width=\"14\">".$staticaction->LibStatut($obj->percent,3)."</td>\n";
+
+            print "</tr>\n";
+            $i++;
+        }
+        // TODO Ajouter rappel pour "il y a des contrats a mettre en service"
+        // TODO Ajouter rappel pour "il y a des contrats qui arrivent a expiration"
+        print "</table><br>";
+
+        $db->free($resql);
+    }
+    else
+    {
+        dol_print_error($db);
+    }
 }
 
 
@@ -398,49 +398,49 @@ 
  */
 function agenda_prepare_head()
 {
-	global $langs, $conf, $user;
-	$h = 0;
-	$head = array();
+    global $langs, $conf, $user;
+    $h = 0;
+    $head = array();
 
-	$head[$h][0] = DOL_URL_ROOT."/admin/agenda_other.php";
-	$head[$h][1] = $langs->trans("Miscellaneous");
-	$head[$h][2] = 'other';
-	$h++;
+    $head[$h][0] = DOL_URL_ROOT."/admin/agenda_other.php";
+    $head[$h][1] = $langs->trans("Miscellaneous");
+    $head[$h][2] = 'other';
+    $h++;
 
-	$head[$h][0] = DOL_URL_ROOT."/admin/agenda.php";
-	$head[$h][1] = $langs->trans("AutoActions");
-	$head[$h][2] = 'autoactions';
-	$h++;
+    $head[$h][0] = DOL_URL_ROOT."/admin/agenda.php";
+    $head[$h][1] = $langs->trans("AutoActions");
+    $head[$h][2] = 'autoactions';
+    $h++;
 
-	if ($conf->global->MAIN_FEATURES_LEVEL > 0)
-	{
-	$head[$h][0] = DOL_URL_ROOT."/admin/agenda_reminder.php";
-	$head[$h][1] = $langs->trans("Reminders");
-	$head[$h][2] = 'reminders';
-	$h++;
-	}
+    if ($conf->global->MAIN_FEATURES_LEVEL > 0)
+    {
+    $head[$h][0] = DOL_URL_ROOT."/admin/agenda_reminder.php";
+    $head[$h][1] = $langs->trans("Reminders");
+    $head[$h][2] = 'reminders';
+    $h++;
+    }
 
-	$head[$h][0] = DOL_URL_ROOT."/admin/agenda_xcal.php";
-	$head[$h][1] = $langs->trans("ExportCal");
-	$head[$h][2] = 'xcal';
-	$h++;
+    $head[$h][0] = DOL_URL_ROOT."/admin/agenda_xcal.php";
+    $head[$h][1] = $langs->trans("ExportCal");
+    $head[$h][2] = 'xcal';
+    $h++;
 
-	$head[$h][0] = DOL_URL_ROOT."/admin/agenda_extsites.php";
-	$head[$h][1] = $langs->trans("ExtSites");
-	$head[$h][2] = 'extsites';
-	$h++;
+    $head[$h][0] = DOL_URL_ROOT."/admin/agenda_extsites.php";
+    $head[$h][1] = $langs->trans("ExtSites");
+    $head[$h][2] = 'extsites';
+    $h++;
 
-	complete_head_from_modules($conf,$langs,null,$head,$h,'agenda_admin');
+    complete_head_from_modules($conf,$langs,null,$head,$h,'agenda_admin');
 
-	$head[$h][0] = DOL_URL_ROOT."/admin/agenda_extrafields.php";
-	$head[$h][1] = $langs->trans("ExtraFields");
-	$head[$h][2] = 'attributes';
-	$h++;
+    $head[$h][0] = DOL_URL_ROOT."/admin/agenda_extrafields.php";
+    $head[$h][1] = $langs->trans("ExtraFields");
+    $head[$h][2] = 'attributes';
+    $h++;
 
-	complete_head_from_modules($conf,$langs,null,$head,$h,'agenda_admin','remove');
+    complete_head_from_modules($conf,$langs,null,$head,$h,'agenda_admin','remove');
 
 
-	return $head;
+    return $head;
 }
 
 /**
@@ -451,30 +451,30 @@ 
  */
 function actions_prepare_head($object)
 {
-	global $db, $langs, $conf, $user;
+    global $db, $langs, $conf, $user;
 
-	$h = 0;
-	$head = array();
+    $h = 0;
+    $head = array();
 
-	$head[$h][0] = DOL_URL_ROOT.'/comm/action/card.php?id='.$object->id;
-	$head[$h][1] = $langs->trans("CardAction");
-	$head[$h][2] = 'card';
-	$h++;
+    $head[$h][0] = DOL_URL_ROOT.'/comm/action/card.php?id='.$object->id;
+    $head[$h][1] = $langs->trans("CardAction");
+    $head[$h][2] = 'card';
+    $h++;
 
     // Tab to link resources
-	if ($conf->resource->enabled)
-	{
-	    include_once DOL_DOCUMENT_ROOT.'/resource/class/dolresource.class.php';
-	    $resource=new DolResource($db);
+    if ($conf->resource->enabled)
+    {
+        include_once DOL_DOCUMENT_ROOT.'/resource/class/dolresource.class.php';
+        $resource=new DolResource($db);
 
-		$head[$h][0] = DOL_URL_ROOT.'/resource/element_resource.php?element=action&element_id='.$object->id;
+        $head[$h][0] = DOL_URL_ROOT.'/resource/element_resource.php?element=action&element_id='.$object->id;
         $listofresourcelinked = $resource->getElementResources($object->element, $object->id);
         $nbResources=count($listofresourcelinked);
-		$head[$h][1] = $langs->trans("Resources");
-		if ($nbResources > 0) $head[$h][1].= ' <span class="badge">'.($nbResources).'</span>';
-		$head[$h][2] = 'resources';
-		$h++;
-	}
+        $head[$h][1] = $langs->trans("Resources");
+        if ($nbResources > 0) $head[$h][1].= ' <span class="badge">'.($nbResources).'</span>';
+        $head[$h][2] = 'resources';
+        $h++;
+    }
 
     // Attached files
     require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
@@ -484,20 +484,20 @@ 
     $nbLinks=Link::count($db, $object->element, $object->id);
     $head[$h][0] = DOL_URL_ROOT.'/comm/action/document.php?id='.$object->id;
     $head[$h][1] = $langs->trans("Documents");
-	if (($nbFiles+$nbLinks) > 0) $head[$h][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>';
+    if (($nbFiles+$nbLinks) > 0) $head[$h][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>';
     $head[$h][2] = 'documents';
     $h++;
 
-	$head[$h][0] = DOL_URL_ROOT.'/comm/action/info.php?id='.$object->id;
-	$head[$h][1] = $langs->trans('Info');
-	$head[$h][2] = 'info';
-	$h++;
+    $head[$h][0] = DOL_URL_ROOT.'/comm/action/info.php?id='.$object->id;
+    $head[$h][1] = $langs->trans('Info');
+    $head[$h][2] = 'info';
+    $h++;
 
-	complete_head_from_modules($conf,$langs,$object,$head,$h,'action');
+    complete_head_from_modules($conf,$langs,$object,$head,$h,'action');
 
-	complete_head_from_modules($conf,$langs,$object,$head,$h,'action','remove');
+    complete_head_from_modules($conf,$langs,$object,$head,$h,'action','remove');
 
-	return $head;
+    return $head;
 }
 
 
@@ -549,7 +549,7 @@ 
     $h++;
 
 
-	$object=new stdClass();
+    $object=new stdClass();
 
     // Show more tabs from modules
     // Entries must be declared in modules descriptor with line