Index: trunk/admin/editor/cmseditor/editor/filemanager/browser/default/connectors/php/commands.php
===================================================================
diff -u -r3322 -r3582
--- trunk/admin/editor/cmseditor/editor/filemanager/browser/default/connectors/php/commands.php	(.../commands.php)	(revision 3322)
+++ trunk/admin/editor/cmseditor/editor/filemanager/browser/default/connectors/php/commands.php	(.../commands.php)	(revision 3582)
@@ -23,13 +23,24 @@
 	// Map the virtual path to the local server path.
 	$sServerDir = ServerMapFolder( $resourceType, $currentFolder ) ;
 	// Open the "Folders" node.
+	$aFolders = array();
 	echo "<Folders>" ;
 	$oCurrentFolder = opendir( $sServerDir ) ;
 	while ( $sFile = readdir( $oCurrentFolder ) )
 	{
 		if ( $sFile != '.' && $sFile != '..' && $sFile != 'CVS' && is_dir( $sServerDir . $sFile ) )
-			echo '<Folder name="' . ConvertToXmlAttribute( $sFile ) . '" />' ;
+			$aFolders[] = $sFile;
+			//echo '<Folder name="' . ConvertToXmlAttribute( $sFile ) . '" />' ;
 	}
+	
+	if (count($aFolders) > 0) {
+		natcasesort($aFolders);
+		foreach($aFolders AS $k=>$v) {
+			echo '<Folder name="' . ConvertToXmlAttribute($v) . '" />' ;
+		}	
+	}
+	
+	
 	closedir( $oCurrentFolder ) ;
 	// Close the "Folders" node.
 	echo "</Folders>" ;
@@ -200,6 +211,9 @@
 	// Map the virtual path to the local server path.
 	$sServerDir = ServerMapFolder( $resourceType, $currentFolder ) ;
 	// Initialize the output buffers for "Folders" and "Files".
+	$aFolders = array();
+	$aFiles =  array();
+	$aFileSizes =  array();
 	$sFolders	= '<Folders>' ;
 	$sFiles		= '<Files>' ;
 	$oCurrentFolder = opendir( $sServerDir ) ;
@@ -208,19 +222,55 @@
 		if ( $sFile != '.' && $sFile != '..'  && $sFile != 'CVS')
 		{
 			if ( is_dir( $sServerDir . $sFile ) )
-				$sFolders .= '<Folder name="' . ConvertToXmlAttribute( $sFile ) . '" />' ;
+				 $aFolders[]=$sFile;
+			//$sFolders .= '<Folder name="' . ConvertToXmlAttribute( $sFile ) . '" />' ;
 			else
 			{
 				$iFileSize = filesize( $sServerDir . $sFile ) ;
+				//$iFileSize[] = filesize( $sServerDir . $sFile ) ;
 				if ( $iFileSize > 0 )
 				{
+					$size = round( $iFileSize / 1024 );
+					$aFileSizes[] = ($size < 1)? 1:$size;//  round( $iFileSize / 1024 ) ;
+				} else 
+					$aFileSizes[] = $iFileSize;
+				$aFiles[] = $sFile;
+				//$sFiles	.= '<File name="' . ConvertToXmlAttribute( $sFile ) . '" size="' . $iFileSize . '" />' ;
+			}
+		}
+	}
+	if (count($aFolders) > 0) {
+		natcasesort($aFolders);
+		foreach($aFolders AS $k=>$v) {
+			$sFolders .= '<Folder name="' . ConvertToXmlAttribute($v) . '" />' ;
+		}	
+	}
+	if (count($sFiles) > 0) {
+		natcasesort($aFiles);
+		foreach($aFiles AS $fk=>$fv) {
+			$sFiles	.= '<File name="' . ConvertToXmlAttribute( $fv ) . '" size="' . $aFileSizes[$fk] . '" />' ;
+		}
+	}
+/*	while ( $sFile = readdir( $oCurrentFolder ) )
+	{
+		if ( $sFile != '.' && $sFile != '..'  && $sFile != 'CVS')
+		{
+			if ( is_dir( $sServerDir . $sFile ) )
+			//$sFolders .= '<Folder name="' . ConvertToXmlAttribute( $sFile ) . '" />' ;
+			else
+			{
+				$iFileSize = filesize( $sServerDir . $sFile ) ;
+				if ( $iFileSize > 0 )
+				{
 					$iFileSize = round( $iFileSize / 1024 ) ;
 					if ( $iFileSize < 1 ) $iFileSize = 1 ;
 				}
 				$sFiles	.= '<File name="' . ConvertToXmlAttribute( $sFile ) . '" size="' . $iFileSize . '" />' ;
 			}
 		}
-	}
+*/		
+		
+	
 	echo $sFolders ;
 	// Close the "Folders" node.
 	echo '</Folders>' ;