Project

General

Profile

« Previous | Next » 

Revision 1038

Added by Matthias almost 15 years ago

Updated FCKEditor to Version 2.6.4.1 (ticket #738) (Thanks to doc)

View differences:

commands.php
30 30
	// Array that will hold the folders names.
31 31
	$aFolders	= array() ;
32 32

  
33
	$oCurrentFolder = opendir( $sServerDir ) ;
33
	$oCurrentFolder = @opendir( $sServerDir ) ;
34 34

  
35
	while ( $sFile = readdir( $oCurrentFolder ) )
35
	if ($oCurrentFolder !== false)
36 36
	{
37
		if ( $sFile != '.' && $sFile != '..' && is_dir( $sServerDir . $sFile ) )
38
			$aFolders[] = '<Folder name="' . ConvertToXmlAttribute( $sFile ) . '" />' ;
37
		while ( $sFile = readdir( $oCurrentFolder ) )
38
		{
39
			if ( $sFile != '.' && $sFile != '..' && is_dir( $sServerDir . $sFile ) )
40
				$aFolders[] = '<Folder name="' . ConvertToXmlAttribute( $sFile ) . '" />' ;
41
		}
42
		closedir( $oCurrentFolder ) ;
39 43
	}
40 44

  
41
	closedir( $oCurrentFolder ) ;
42

  
43 45
	// Open the "Folders" node.
44 46
	echo "<Folders>" ;
45 47

  
......
60 62
	$aFolders	= array() ;
61 63
	$aFiles		= array() ;
62 64

  
63
	$oCurrentFolder = opendir( $sServerDir ) ;
65
	$oCurrentFolder = @opendir( $sServerDir ) ;
64 66

  
65
	while ( $sFile = readdir( $oCurrentFolder ) )
67
	if ($oCurrentFolder !== false)
66 68
	{
67
		if ( $sFile != '.' && $sFile != '..' )
69
		while ( $sFile = readdir( $oCurrentFolder ) )
68 70
		{
69
			if ( is_dir( $sServerDir . $sFile ) )
70
				$aFolders[] = '<Folder name="' . ConvertToXmlAttribute( $sFile ) . '" />' ;
71
			else
71
			if ( $sFile != '.' && $sFile != '..' )
72 72
			{
73
				$iFileSize = @filesize( $sServerDir . $sFile ) ;
74
				if ( !$iFileSize ) {
75
					$iFileSize = 0 ;
76
				}
77
				if ( $iFileSize > 0 )
73
				if ( is_dir( $sServerDir . $sFile ) )
74
					$aFolders[] = '<Folder name="' . ConvertToXmlAttribute( $sFile ) . '" />' ;
75
				else
78 76
				{
79
					$iFileSize = round( $iFileSize / 1024 ) ;
80
					if ( $iFileSize < 1 ) $iFileSize = 1 ;
77
					$iFileSize = @filesize( $sServerDir . $sFile ) ;
78
					if ( !$iFileSize ) {
79
						$iFileSize = 0 ;
80
					}
81
					if ( $iFileSize > 0 )
82
					{
83
						$iFileSize = round( $iFileSize / 1024 ) ;
84
						if ( $iFileSize < 1 )
85
							$iFileSize = 1 ;
86
					}
87

  
88
					$aFiles[] = '<File name="' . ConvertToXmlAttribute( $sFile ) . '" size="' . $iFileSize . '" />' ;
81 89
				}
82

  
83
				$aFiles[] = '<File name="' . ConvertToXmlAttribute( $sFile ) . '" size="' . $iFileSize . '" />' ;
84 90
			}
85 91
		}
92
		closedir( $oCurrentFolder ) ;
86 93
	}
87 94

  
88 95
	// Send the folders
......
152 159
		$sErrorNumber = '102' ;
153 160

  
154 161
	// Create the "Error" node.
155
	echo '<Error number="' . $sErrorNumber . '" originalDescription="' . ConvertToXmlAttribute( $sErrorMsg ) . '" />' ;
162
	echo '<Error number="' . $sErrorNumber . '" />' ;
156 163
}
157 164

  
158 165
function FileUpload( $resourceType, $currentFolder, $sCommand )

Also available in: Unified diff