diff --git a/sbin/fileImport.pl b/sbin/fileImport.pl
index b097f6682..44d017c35 100644
--- a/sbin/fileImport.pl
+++ b/sbin/fileImport.pl
@@ -178,18 +178,21 @@ if (!($^O =~ /^Win/i) && $> != 0 && !$override) {
 
 my %ListAssetExists;
 my %filelisthash;
+
 print "Starting..." unless ($quiet);
 my $session = WebGUI::Session->open($webguiRoot,$configFile);
 $session->user({userId=>3});
 print "OK\n" unless ($quiet);
+
 my $parent = WebGUI::Asset::File->newByDynamicClass($session, $parentAssetId);
 if (defined $parent) {
-  &buildListAssetExists($parent);
+	&buildListAssetExists($parent);
 } else {
-  print "Warning: Parent asset '".$parentAssetId."' does not exist. Cannot import files.\n";
-  exit 5;
+	print "Warning: Parent asset '".$parentAssetId."' does not exist. Cannot import files.\n";
+	exit 5;
 }
 print "End of the childs detection\n" unless ($quiet);
+
 # TB : wrap buildFileList in buildFileListWrap function for recursive search.
 &addFiles(&buildFileListWrap($pathToFiles));
 &setPrivileges();
@@ -197,6 +200,7 @@ print "End of the childs detection\n" unless ($quiet);
 print "Cleaning up..." unless ($quiet);
 $session->var->end();
 $session->close();
+
 print "OK\n" unless ($quiet);
 exit 0;
 
@@ -204,138 +208,160 @@ exit 0;
 # addFiles(dbHandler, filelistHashRef, webguiSettingsHashRef, pathToCopyFrom)
 #-----------------------------------------
 sub addFiles {
-  my $filelist = shift;
-  print "Adding files...\n" unless ($quiet);
-  foreach my $file (@{$filelist}) {
-    my $class = 'WebGUI::Asset::File';
-    # TB : add the path relative to $pathToFile in the message.
-    print "\tAdding ".$file->{relpath}.$slash.$file->{filename}." to the database.\n" unless ($quiet);
-    my $templateId = 'PBtmpl0000000000000024';
-    if (isIn(lc($file->{ext}),@nailable)) {
-      $class = 'WebGUI::Asset::File::Image';
-      $templateId = 'PBtmpl0000000000000088'
-    }
-    my $url = $parent->getUrl.'/'.$file->{filename};
+	my $filelist = shift;
+	print "Adding files...\n" unless ($quiet);
+	foreach my $file (@{$filelist}) {
+		my $class = 'WebGUI::Asset::File';
+		
+		# TB : add the path relative to $pathToFile in the message.
+		print "\tAdding ".$file->{relpath}.$slash.$file->{filename}." to the database.\n" unless ($quiet);
+		
+		my $templateId = 'PBtmpl0000000000000024';
+		if (isIn(lc($file->{ext}),@nailable)) {
+			$class = 'WebGUI::Asset::File::Image';
+			$templateId = 'PBtmpl0000000000000088'
+		}
+		my $url = $parent->getUrl.'/'.$file->{filename};
 
-    # TB : Possibly detect if the Asset exists already.
-    my ($replaceAsset, $replaceAssetId, $child) = (0,"","");
-    ($replaceAsset, $replaceAssetId, $child) = &checkAssetExists($url) if ($overwrite);
+		# TB : Possibly detect if the Asset exists already.
+		my ($replaceAsset, $replaceAssetId, $child) = (0,"","");
+		($replaceAsset, $replaceAssetId, $child) = &checkAssetExists($url) if ($overwrite);
 
-    if ($replaceAsset == 1) {
-      # TB : If the Asset exists, just copy the file.
-      # To be check.
-      my $storage = WebGUI::Storage->get($session, $replaceAssetId);
-      print "\t\tAsset exists already. Replace the file.\n" unless ($quiet);
-      my $filename = $storage->addFileFromFilesystem("$pathToFiles$slash$file->{relpath}$slash$file->{filename}");
-      $child->generateThumbnail if ($class eq 'WebGUI::Asset::File::Image');
-      $child->setSize($storage->getFileSize($filename));
-    } else {
-      print "\t\tCreate the new asset.\n" unless ($quiet);
-      my $storage = WebGUI::Storage->create($session);
-      my $filename = $storage->addFileFromFilesystem("$pathToFiles$slash$file->{relpath}$slash$file->{filename}");
-      # TB : possibly remove the extension if the ignoreExtInName feature enabled.
-      my $filenameTitle = $filename;
-      $filenameTitle =~ s/\.$file->{ext}// if ($ignoreExtInName);
-      my $newAsset = $parent->addChild({
-					className=>$class,
-					title=>$filenameTitle,
-					menuTitle=>$filenameTitle,
-					filename=>$filename,
-					storageId=>$storage->getId,
-					isHidden=>1,
-					url=>$url,
-					groupIdView=>$groupToView,
-					groupIdEdit=>$groupToEdit,
-					templateId=>$templateId,
-					endDate=>32472169200,
-					ownerUserId=>$owner
-				       });
-      $newAsset->generateThumbnail if ($class eq 'WebGUI::Asset::File::Image');
-      $newAsset->setSize($storage->getFileSize($filename));
-    }
-  }
-  print "Finished adding.\n" unless ($quiet);
+		if ($replaceAsset == 1) {
+			# TB : If the Asset exists, just copy the file.
+			# To be check.
+			my $storage = WebGUI::Storage->get($session, $replaceAssetId);
+			print "\t\tAsset exists already. Replace the file.\n" unless ($quiet);
+			my $filename = $storage->addFileFromFilesystem("$pathToFiles$slash$file->{relpath}$slash$file->{filename}");
+			$child->generateThumbnail if ($class eq 'WebGUI::Asset::File::Image');
+			$child->setSize($storage->getFileSize($filename));
+		}
+		else {
+			print "\t\tCreate the new asset.\n" unless ($quiet);
+			my $storage = WebGUI::Storage->create($session);
+			my $filename = $storage->addFileFromFilesystem("$pathToFiles$slash$file->{relpath}$slash$file->{filename}");
+
+			# TB : possibly remove the extension if the ignoreExtInName feature enabled.
+			my $filenameTitle = $filename;
+			$filenameTitle =~ s/\.$file->{ext}// if ($ignoreExtInName);
+			
+			my $newAsset = $parent->addChild({
+				className    => $class,
+				title        => $filenameTitle,
+				menuTitle    => $filenameTitle,
+				filename     => $filename,
+				storageId    => $storage->getId,
+				isHidden     => 1,
+				url          => $url,
+				groupIdView  => $groupToView,
+				groupIdEdit  => $groupToEdit,
+				templateId   => $templateId,
+				endDate      => 32472169200,
+				ownerUserId  => $owner,
+			});
+
+			$newAsset->generateThumbnail if ($class eq 'WebGUI::Asset::File::Image');
+			$newAsset->setSize($storage->getFileSize($filename));
+		}
+	}
+
+	print "Finished adding.\n" unless ($quiet);
 }
 
 #-----------------------------------------
 # setPrivileges()
 #-----------------------------------------
 sub setPrivileges {
-  print "Setting filesystem privileges.\n" unless ($quiet);
-  if ($session->os->get("type") eq "Linuxish") {
-    unless (system("chown -R ".$webUser." ".$session->config->get("uploadsPath"))) {
-      print "Privileges set.\n" unless ($quiet);
-    } else {
-      print "Could not set privileges.\n";
-    }
-  } else {
-    print "Cannot set privileges on this platform.\n" unless ($quiet)
-  }
+	print "Setting filesystem privileges.\n" unless ($quiet);
+	
+	if ($session->os->get("type") eq "Linuxish") {
+		unless (system("chown -R ".$webUser." ".$session->config->get("uploadsPath"))) {
+			print "Privileges set.\n" unless ($quiet);
+		}
+		else {
+			print "Could not set privileges.\n";
+		}
+	}
+	else {
+		print "Cannot set privileges on this platform.\n" unless ($quiet)
+	}
 }
 
 #-----------------------------------------
 # buildFileListWrap(pathToImportFiles)
 #-----------------------------------------
 sub buildFileListWrap {
-  my ($path) = @_;
-  my (@filelist);
-  print "Building file list.\n" unless ($quiet);
-  @filelist = &buildFileList($now,$path);
-  # &filelistCheck(@filelist);
-  print "File list complete.\n" unless ($quiet);
-  return \@filelist;
+	my ($path) = @_;
+	my (@filelist);
+
+	print "Building file list.\n" unless ($quiet);
+	@filelist = &buildFileList($now,$path);
+	# &filelistCheck(@filelist);
+	print "File list complete.\n" unless ($quiet);
+
+	return \@filelist;
 }
 
 #-----------------------------------------
 # buildFileList(time,pathToImportFiles)
 #-----------------------------------------
 sub buildFileList {
-  my ($now,$path) = @_;
-  my (@filelist, @files, $file, $filename, $ext);
-  if (opendir(FILES,$path)) {
-    @files = readdir(FILES);
-    foreach $file (@files) {
-      next if ($file eq "." || $file eq "..");
-      my $fullpathfile = "$path$slash$file";
-      if (-f "$fullpathfile") {
-	$file =~ /(.*?)\.(.*?)$/;
-	$filename = $1;
-	$ext = $2;
-	# TB : filter process : skip files due to options : skipOlderThan and findByExt
-	next if (&skipFilter($fullpathfile,$ext,$now));
-	# TB : due to recursive search. Not really nice.
-	my $relpath = &trailFile("$path");
-	# TB : check is the filelist doesn't contains two times the same file (file with the same name)
-	# due to recursive call, this can happen.
-	if (exists $filelisthash{$file}) {
-	  print "Error: file \"$file\" exists at several locations.
-       Both \"$filelisthash{$file}\" and \"$relpath\" contains it.
-       Exit at the first error of this type.\n" unless ($quiet);
-	  exit 2;
+	my ($now,$path) = @_;
+	my (@filelist, @files, $file, $filename, $ext);
+
+	if (opendir(FILES,$path)) {
+		@files = readdir(FILES);
+
+		foreach $file (@files) {
+			next if ($file eq "." || $file eq "..");
+			my $fullpathfile = "$path$slash$file";
+			if (-f "$fullpathfile") {
+				$file =~ /(.*?)\.(.*?)$/;
+				$filename = $1;
+				$ext = $2;
+				
+				# TB : filter process : skip files due to options : skipOlderThan and findByExt
+				next if (&skipFilter($fullpathfile,$ext,$now));
+				
+				# TB : due to recursive search. Not really nice.
+				my $relpath = &trailFile("$path");
+				
+				# TB : check is the filelist doesn't contains two times the same file (file with the same name)
+				# due to recursive call, this can happen.
+				if (exists $filelisthash{$file}) {
+				
+					print "Error: file \"$file\" exists at several locations.
+					Both \"$filelisthash{$file}\" and \"$relpath\" contains it.
+					Exit at the first error of this type.\n" unless ($quiet);
+					exit 2;
+				}
+
+				push(@filelist,{ext=>$ext, filename=>$file, relpath=>$relpath});
+				$filelisthash{$file} = $relpath;
+				print "Found file $file.\n" unless ($quiet);
+			}
+			# TB : the recursive call
+			push(@filelist,&buildFileList($now,"$fullpathfile")) if ((-d "$fullpathfile") && $recursive);
+		}
+
+		closedir(FILES);
+		return @filelist;
+	}
+	else {
+		print "Error: Could not open folder $path.\n" unless ($quiet);
+		exit 2;
 	}
-	push(@filelist,{ext=>$ext, filename=>$file, relpath=>$relpath});
-	$filelisthash{$file} = $relpath;
-	print "Found file $file.\n" unless ($quiet);
-      }
-      # TB : the recursive call
-      push(@filelist,&buildFileList($now,"$fullpathfile")) if ((-d "$fullpathfile") && $recursive);
-    }
-    closedir(FILES);
-    return @filelist;
-  } else {
-    print "Error: Could not open folder $path.\n" unless ($quiet);
-    exit 2;
-  }
 }
 
 #-----------------------------------------
 # getType(filename)
 #-----------------------------------------
 sub getType {
-  my ($extension);
-  $extension = $_[0];
-  $extension =~ s/.*\.(.*?)$/$1/;
-  return $extension;
+	my ($extension);
+	$extension = $_[0];
+	$extension =~ s/.*\.(.*?)$/$1/;
+
+	return $extension;
 }
 
 
@@ -343,22 +369,26 @@ sub getType {
 # skipFilter(file,ext,time)
 #-----------------------------------------
 sub skipFilter {
-  my ($file,$ext,$now) = @_;
-  # TB : stat in Windows has a strange behaviour relativelly to Unix
-  # the output of stat si an array of array.
-  # to be check on Unix if this work correctly.
-  my @dev = stat "$file";
-  # TB : option skipOlderThan
-  if ($now - $dev[0][9] > $skipOlderThan) {
-    print "Found file $file.\n\tBut older than $skipOlderThan. Skip it.\n" unless ($quiet);
-    return 1;
-  }
-  # TB : option findByExt
-  if (($findByExt ne "") && ($findByExt !~ /(^|,)$ext(,|$)/)) {
-    print "Found file in $file.\n\tBut Extension doesn't match findByExt tag. Skip it.\n" unless ($quiet);
-    return 1;
-  }
-  return 0;
+	my ($file,$ext,$now) = @_;
+
+	# TB : stat in Windows has a strange behaviour relativelly to Unix
+	# the output of stat si an array of array.
+	# to be check on Unix if this work correctly.
+	my @dev = stat "$file";
+
+	# TB : option skipOlderThan
+	if ($now - $dev[0][9] > $skipOlderThan) {
+		print "Found file $file.\n\tBut older than $skipOlderThan. Skip it.\n" unless ($quiet);
+		return 1;
+	}
+
+	# TB : option findByExt
+	if (($findByExt ne "") && ($findByExt !~ /(^|,)$ext(,|$)/)) {
+		print "Found file in $file.\n\tBut Extension doesn't match findByExt tag. Skip it.\n" unless ($quiet);
+		return 1;
+	}
+
+	return 0;
 }
 
 
@@ -366,19 +396,23 @@ sub skipFilter {
 # trailFile(path)
 #-----------------------------------------
 sub trailFile {
-  # TB : this is ugly, but unable to find a better way to do it.
-  # this is supposed to find the relative path to pathToFiles
-  my ($path) = @_;
-  my $pathToFiles_temp = $pathToFiles;
-  if ($^O =~ /Win/) { 
-    $pathToFiles_temp =~ s/\\/\\\\/g; 
-  } else {
-    $pathToFiles_temp =~ s/\//\\\//g;
-  }
-  $path =~ s/$pathToFiles_temp//;
-  $path =~ s/.//;
-  $path = "." if ($path eq "");
-  return $path;
+	# TB : this is ugly, but unable to find a better way to do it.
+	# this is supposed to find the relative path to pathToFiles
+	my ($path) = @_;
+	my $pathToFiles_temp = $pathToFiles;
+
+	if ($^O =~ /Win/) { 
+		$pathToFiles_temp =~ s/\\/\\\\/g; 
+	}
+	else {
+		$pathToFiles_temp =~ s/\//\\\//g;
+	}
+
+	$path =~ s/$pathToFiles_temp//;
+	$path =~ s/.//;
+	$path = "." if ($path eq "");
+
+	return $path;
 }
 
 
@@ -386,16 +420,18 @@ sub trailFile {
 # checkAssetExists(self,url)
 #-----------------------------------------
 sub checkAssetExists {
-  my ($url) = @_;
-  my $replaceAsset = 0;
-  my $replaceAssetId = "";
-  my $child;
-  if (exists $ListAssetExists{$url}) {
-    $child = $ListAssetExists{$url};
-    $replaceAsset = 1;
-    $replaceAssetId = $child->getId;
-  }
-  return($replaceAsset, $replaceAssetId, $child);
+	my ($url) = @_;
+	my $replaceAsset = 0;
+	my $replaceAssetId = "";
+	my $child;
+
+	if (exists $ListAssetExists{$url}) {
+		$child = $ListAssetExists{$url};
+		$replaceAsset = 1;
+		$replaceAssetId = $child->getId;
+	}
+
+	return($replaceAsset, $replaceAssetId, $child);
 }
 
 
@@ -403,13 +439,14 @@ sub checkAssetExists {
 # buildListAssetExists(self,url)
 #-----------------------------------------
 sub buildListAssetExists {
-  my ($parent) = @_;
-  my @allelement = $parent->getLineage();
-  foreach my $elem ( @{$allelement[0]} ) {
-    my $child = WebGUI::Asset::File->newByDynamicClass($session,$elem);
-    if (defined $child) {
-      $ListAssetExists{$child->getUrl} = $child;
-    }
-  }
+	my ($parent) = @_;
+	my @allelement = $parent->getLineage();
+
+	foreach my $elem ( @{$allelement[0]} ) {
+		my $child = WebGUI::Asset::File->newByDynamicClass($session,$elem);
+		if (defined $child) {
+			$ListAssetExists{$child->getUrl} = $child;
+		}
+	}
 }