Index: trunk/admin/editor/cmseditor/editor/filemanager/browser/default/browser.html
===================================================================
diff -u -N -r1455 -r4936
--- trunk/admin/editor/cmseditor/editor/filemanager/browser/default/browser.html	(.../browser.html)	(revision 1455)
+++ trunk/admin/editor/cmseditor/editor/filemanager/browser/default/browser.html	(.../browser.html)	(revision 4936)
@@ -66,7 +66,7 @@
 	if ( params ) sUrl += '&' + params ;
 
 	var oXML = new FCKXml() ;
-	
+	//alert(sUrl);
 	if ( callBackFunction )
 		oXML.LoadUrl( sUrl, callBackFunction ) ;	// Asynchronous load.
 	else
@@ -101,12 +101,12 @@
 			<frame name="frmFolders" src="frmfolders.html" scrolling="auto" frameborder="yes">
 		</frameset>
 		<frameset rows="50,*,50" framespacing="0">
-			<frame name="frmActualFolder" src="frmactualfolder.html" scrolling="no" frameborder="no">
-			<frame name="frmResourcesList" src="frmresourceslist.html" scrolling="auto" frameborder="yes">
+			<frame name="frmActualFolder" src="frmactualfolder.html" scrolling="no" frameborder="no" noresize>
+			<frame id="frmResourcesList" name="frmResourcesList" src="frmresourceslist.html" scrolling="no" frameborder="yes" noresize>
 			<frameset cols="150,*,0" framespacing="0" frameborder="no">
-				<frame name="frmCreateFolder" src="frmcreatefolder.html" scrolling="no" frameborder="no">
-				<frame name="frmUpload" src="frmupload.html" scrolling="no" frameborder="no">
-				<frame name="frmUploadWorker" src="" scrolling="no" frameborder="no">
+				<frame name="frmCreateFolder" src="frmcreatefolder.html" scrolling="no" frameborder="no" noresize>
+				<frame name="frmUpload" src="frmupload.html" scrolling="no" frameborder="no" noresize>
+				<frame name="frmUploadWorker" src="" scrolling="no" frameborder="no" noresize>
 			</frameset>
 		</frameset>
 	</frameset>
Index: trunk/admin/editor/cmseditor/editor/filemanager/browser/default/connectors/php/commands.php
===================================================================
diff -u -N -r4699 -r4936
--- trunk/admin/editor/cmseditor/editor/filemanager/browser/default/connectors/php/commands.php	(.../commands.php)	(revision 4699)
+++ trunk/admin/editor/cmseditor/editor/filemanager/browser/default/connectors/php/commands.php	(.../commands.php)	(revision 4936)
@@ -213,9 +213,21 @@
 											<serverpath><![CDATA['.BASE_PATH.'/index.php?t=.]]></serverpath>
 									</CmsPage>';
 */
-function GetFoldersAndFiles( $resourceType, $currentFolder )
+function GetConfigValue($var)
 {
+	$conn = GetADODbConnection();
+	$query = "SELECT `value` FROM config WHERE `name` = '".$var."'";
+	return $conn->GetOne($query);
+}
+
+function GetFoldersAndFiles( $resourceType, $currentFolder, $aParams = array('name','asc'))
+{
 	// Map the virtual path to the local server path.
+	if (isset($Config['K4Mode']))
+		$date_format = "m/d/Y h:i A";
+	else 
+		$date_format = GetConfigValue('date_format').' '.GetConfigValue('time_format');
+	
 	$sServerDir = ServerMapFolder( $resourceType, $currentFolder ) ;
 	// Initialize the output buffers for "Folders" and "Files".
 	$aFolders = array();
@@ -240,23 +252,55 @@
 					$aFileSizes[] = ($size < 1)? 1:$size;//  round( $iFileSize / 1024 ) ;
 				} else 
 					$aFileSizes[] = $iFileSize;
-				$aFiles[] = $sFile;
+					$aFiles[] = $sFile;
+					$aFileDate[] = filectime($sServerDir.$sFile);
 				//$sFiles	.= '<File name="' . ConvertToXmlAttribute( $sFile ) . '" size="' . $iFileSize . '" />' ;
 			}
 		}
 	}
 	if (count($aFolders) > 0) {
 		natcasesort($aFolders);
+		switch ($aParams[1])
+		{
+				case 'desc' :
+					$aFolders = array_reverse($aFolders, true);
+					break ;
+		}
 		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] . '" />' ;
+	if (count($aFiles) > 0) {
+		if ($aParams[0] == 'name') 
+		{	
+			natcasesort($aFiles);
+			if ($aParams[1] == 'desc')
+			{
+				$aFiles = array_reverse($aFiles, true);
+			}
+			foreach($aFiles AS $fk=>$fv) {
+				$sFiles	.= '<File name="' . ConvertToXmlAttribute( $fv ) . '" size="' . $aFileSizes[$fk] . '" date="' . date($date_format,$aFileDate[$fk]) . '" />' ;
+			}
+		}elseif ($aParams[0] == 'size') {
+			natcasesort($aFileSizes);
+			if ($aParams[1] == 'desc')
+			{
+				$aFileSizes = array_reverse($aFileSizes, true);
+			}
+			foreach($aFileSizes AS $fk=>$fv) {
+				$sFiles	.= '<File name="' . ConvertToXmlAttribute( $aFiles[$fk] ) . '" size="' . $fv . '" date="' . date($date_format,$aFileDate[$fk]) . '" />' ;
+			}
+		} elseif ($aParams[0] == 'date') {
+			natcasesort($aFileDate);
+			if ($aParams[1] == 'desc')
+			{
+				$aFileDate = array_reverse($aFileDate, true);
+			}
+			foreach($aFileDate AS $fk=>$fv) {
+				$sFiles	.= '<File name="' . ConvertToXmlAttribute( $aFiles[$fk] ) . '" size="' . $aFileSizes[$fk] . '" date="' . date($date_format,$fv) . '" />' ;
+			}
 		}
-	}
+	}		
 /*	while ( $sFile = readdir( $oCurrentFolder ) )
 	{
 		if ( $sFile != '.' && $sFile != '..'  && $sFile != 'CVS')
@@ -276,13 +320,18 @@
 		}
 */		
 		
-	
-	echo $sFolders ;
-	// Close the "Folders" node.
-	echo '</Folders>' ;
-	echo $sFiles ;
-	// Close the "Files" node.
-	echo '</Files>' ;
+	if ($aParams[1] == "desc")
+	{
+		echo $sFiles ;
+		echo '</Files>' ;
+		echo $sFolders ;
+		echo '</Folders>' ;
+	} else {
+		echo $sFolders ;
+		echo '</Folders>' ;
+		echo $sFiles ;
+		echo '</Files>' ;
+	}
 }
 function CreateFolder( $resourceType, $currentFolder )
 {
@@ -319,6 +368,59 @@
 	// Create the "Error" node.
 	echo '<Error number="' . $sErrorNumber . '" originalDescription="' . ConvertToXmlAttribute( $sErrorMsg ) . '" />' ;
 }
+
+function UpdateCmsBlocksK3($resourceType,$currentFolder,$file_from,$file_to)
+{ global $Config ;
+	$Config['UserFilesPathNoBase'];
+	$original_str = $Config['UserFilesPathNoBase'].$resourceType.$currentFolder.addslashes($file_from);
+	$new_str = $Config['UserFilesPathNoBase'].$resourceType.$currentFolder.addslashes($file_to);
+	$conn = GetADODbConnection();
+	if ( GetConfigValue('multilingual_mode') == 1) {
+		$query="SELECT lang_prefix FROM lang ORDER BY lang_id";
+		$rs = $conn->Execute($query);
+		while ($rs && !$rs->EOF) {
+			$sql = "UPDATE live_blocks SET ".$rs->fields['lang_prefix']."_content = replace(".$rs->fields['lang_prefix']."_content,'".$original_str."','".$new_str."')";
+			$conn->Execute($sql);
+			$rs->MoveNext();
+		}
+	} else {
+		$lang_prefix = GetConfigValue('default_lang_prefix');
+		$sql = "UPDATE live_blocks SET ".$lang_prefix."_content = replace(".$lang_prefix."_content,'".$original_str."','".$new_str."')";
+		$conn->Execute($sql);
+	}
+	
+}
+
+function RenameFile( $resourceType, $currentFolder , $aFilenames = array())
+{ global $Config ;
+	if (count($aFilenames) == 2)
+	{
+		$sServerDir = ServerMapFolder( $resourceType, $currentFolder ) ;
+		$sExtension = substr( $aFilenames[1], ( strrpos($aFilenames[1], '.') + 1 ) ) ;
+		$arAllowed	= $Config['AllowedExtensions'][$resourceType] ;
+		$arDenied	= $Config['DeniedExtensions'][$resourceType] ;
+		if (file_exists($sServerDir.$aFilenames[1]) && is_file($sServerDir.$aFilenames[1]))
+		{
+			$sErrorNumber = '204' ;
+		} else {
+			if ( ( count($arAllowed) == 0 || in_array( $sExtension, $arAllowed ) ) && ( count($arDenied) == 0 || !in_array( $sExtension, $arDenied ) ) )
+			{
+				if (rename($sServerDir.$aFilenames[0],$sServerDir.$aFilenames[1])) {
+					if (isset($Config['K4Mode'])) {
+							// Update CMS Blocks
+					} else
+						UpdateCmsBlocksK3($resourceType,$currentFolder,$aFilenames[0],$aFilenames[1]);
+					$sErrorNumber = "0";
+				} else 
+					$sErrorNumber = '205' ;
+			} else
+				$sErrorNumber = '203' ;
+		}
+		$sErrorMsg = '';
+		echo '<Error number="' . $sErrorNumber . '" originalDescription="' . ConvertToXmlAttribute( $sErrorMsg ) . '" />' ;
+	}
+}
+
 function FileUpload( $resourceType, $currentFolder )
 {
 	$sErrorNumber = '0' ;
@@ -353,7 +455,7 @@
 					if ( is_file( $sFilePath ) )
 					{
 						$oldumask = umask(0) ;
-						chmod( $sFilePath, 0777 ) ;
+						chmod( $sFilePath, 0666 ) ;
 						umask( $oldumask ) ;
 					}
 					break ;
Index: trunk/admin/editor/cmseditor/editor/filemanager/browser/default/frmupload.html
===================================================================
diff -u -N -r4863 -r4936
--- trunk/admin/editor/cmseditor/editor/filemanager/browser/default/frmupload.html	(.../frmupload.html)	(revision 4863)
+++ trunk/admin/editor/cmseditor/editor/filemanager/browser/default/frmupload.html	(.../frmupload.html)	(revision 4936)
@@ -48,21 +48,7 @@
 	return true ;
 }
 
-function OnUploadCompleted( errorNumber, fileName )
-{
-	// Reset the Upload Worker Frame.
-	window.parent.frames['frmUploadWorker'].location = 'about:blank' ;
-	
-	// Reset the upload form (On IE we must do a little trick to avout problems).
-	if ( document.all )
-		document.getElementById('NewFile').outerHTML = '<input id="NewFile" name="NewFile" style="WIDTH: 100%" type="file">' ;
-	else
-		document.getElementById('frmUpload').reset() ;
-	
-	// Reset the interface elements.
-	document.getElementById('eUploadMessage').innerHTML = 'Upload a new file in this folder' ;
-	document.getElementById('btnUpload').disabled = false ;
-	
+function outputErrorMsg(errorNumber, fileName) {
 	switch ( errorNumber )
 	{
 		case 0 :
@@ -75,12 +61,35 @@
 		case 202 :
 			alert( 'Invalid file' ) ;
 			break ;
+		case 203 :
+			alert( 'Invalid file type for this foder' ) ;
+			break ;
+		case 204 :
+			alert( 'A file with the same name is already available' ) ;
+			break ;
 		default :
 			alert( 'Error on file upload. Error number: ' + errorNumber ) ;
 			break ;
 	}
 }
 
+function OnUploadCompleted( errorNumber, fileName )
+{
+	// Reset the Upload Worker Frame.
+	window.parent.frames['frmUploadWorker'].location = 'about:blank' ;
+	
+	// Reset the upload form (On IE we must do a little trick to avout problems).
+	if ( document.all )
+		document.getElementById('NewFile').outerHTML = '<input id="NewFile" name="NewFile" style="WIDTH: 100%" type="file">' ;
+	else
+		document.getElementById('frmUpload').reset() ;
+	
+	// Reset the interface elements.
+	document.getElementById('eUploadMessage').innerHTML = 'Upload a new file in this folder' ;
+	document.getElementById('btnUpload').disabled = false ;
+	outputErrorMsg(errorNumber);
+}
+
 window.onload = function()
 {
 	window.top.IsLoadedUpload = true ;
@@ -101,7 +110,14 @@
 	}
 }
 
-
+function RenameFile()
+{
+	filename = window.parent.frames['frmResourcesList'].GetCheckedFileName('first');
+	f=prompt('Rename file "'+filename+'"?',filename);
+	if (f) {
+		 window.parent.frames['frmResourcesList'].RenameFile(filename,f);
+	}
+}
 		</script>
 	</head>
 	<body bottomMargin="0" topMargin="0">
@@ -120,7 +136,7 @@
 						</div>
 						<div id="del_rename" style="display : none">
 							<img src="images/s.gif" width="1" height="10" /><br />	
-							<button id="rename" style="font-size: 11px; font-family: 'Microsoft Sans Serif' , Arial, Helvetica, Verdana">Rename</button>
+							<button type="button" id="rename" style="font-size: 11px; font-family: 'Microsoft Sans Serif' , Arial, Helvetica, Verdana" onClick="RenameFile();">Rename</button>
 							<button id="delete" style="font-size: 11px; font-family: 'Microsoft Sans Serif' , Arial, Helvetica, Verdana">Delete</button>
 						</div>
 					</td>
Index: trunk/admin/editor/cmseditor/editor/filemanager/browser/default/connectors/php/connector.php
===================================================================
diff -u -N -r4818 -r4936
--- trunk/admin/editor/cmseditor/editor/filemanager/browser/default/connectors/php/connector.php	(.../connector.php)	(revision 4818)
+++ trunk/admin/editor/cmseditor/editor/filemanager/browser/default/connectors/php/connector.php	(.../connector.php)	(revision 4936)
@@ -69,8 +69,17 @@
 		FileUpload( $sResourceType, $sCurrentFolder ) ;
 		return ;
 	}
+	if (ereg("^RenameFile_",$sCommand)) {
+		$aFilenames = explode("|",ereg_replace("^RenameFile_","",$sCommand));
+		$sCommand = 'RenameFile';
+	}
+	if (ereg("^GetFoldersAndFiles_",$sCommand)) {
+		$aParams = split("_",ereg_replace("GetFoldersAndFiles_","",$sCommand));
+		$sCommand = 'GetFoldersAndFiles';
+	}
 	// 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') ;
@@ -83,6 +92,7 @@
 	header( 'Content-Type:text/xml; charset=utf-8' ) ;
 	CreateXmlHeader( $sCommand, $sResourceType, $sCurrentFolder ) ;
 	// Execute the required command.
+
 	switch ( $sCommand )
 	{
 		case 'GetCmsTree' :
@@ -92,11 +102,14 @@
 			GetFolders( $sResourceType, $sCurrentFolder ) ;
 			break ;
 		case 'GetFoldersAndFiles' :
-			GetFoldersAndFiles( $sResourceType, $sCurrentFolder ) ;
+			GetFoldersAndFiles( $sResourceType, $sCurrentFolder, $aParams) ;
 			break ;
 		case 'CreateFolder' :
 			CreateFolder( $sResourceType, $sCurrentFolder ) ;
 			break ;
+		case 'RenameFile':
+			RenameFile( $sResourceType, $sCurrentFolder, $aFilenames) ;
+			break;
 	}
 	CreateXmlFooter() ;
 	exit;
Index: trunk/admin/editor/cmseditor/editor/filemanager/browser/default/frmresourceslist.html
===================================================================
diff -u -N -r4862 -r4936
--- trunk/admin/editor/cmseditor/editor/filemanager/browser/default/frmresourceslist.html	(.../frmresourceslist.html)	(revision 4862)
+++ trunk/admin/editor/cmseditor/editor/filemanager/browser/default/frmresourceslist.html	(.../frmresourceslist.html)	(revision 4936)
@@ -26,7 +26,8 @@
 		<script language="javascript">
 
 var oListManager = new Object() ;
-
+var current_sort_order = '_asc';
+var current_sort_by = 'name';
 oListManager.Init = function()
 {
 	this.Table = document.getElementById('tableFiles') ;
@@ -39,6 +40,16 @@
 		this.Table.deleteRow(0) ;
 }
 
+function is_msie()
+{
+	var browser = "";
+	browser = navigator.appName;	
+	if (browser == 'Microsoft Internet Explorer')
+		return 1;
+	else
+		return 0;	
+}
+
 oListManager.AddFolder = function( folderName, folderPath )
 {
 	// Create the new row.
@@ -58,11 +69,11 @@
 	// Add the folder name cell.
 	oCell = oRow.insertCell(-1) ;
 	oCell.noWrap = true ;
-	oCell.colSpan = 2 ;
+	oCell.colSpan = 3 ;
 	oCell.innerHTML = '&nbsp;' + sLink + folderName + '</a>' ;
 }
 
-oListManager.AddFile = function( fileName, fileUrl, fileSize )
+oListManager.AddFile = function( fileName, fileUrl, fileSize, fileDate )
 {
 	// Create the new row.
 	var oRow = this.Table.insertRow(-1) ;
@@ -76,8 +87,8 @@
 
 	// Add the checkbox cell
 	var oCell = oRow.insertCell(-1);
-	oCell.width = 16;
-	oCell.innerHTML = '<input type="checkbox" name="file_checkbox" onclick="HandleCheckboxes()"/>';
+	oCell.width = 25;
+	oCell.innerHTML = '<input type="checkbox" name="file_checkbox" value='+fileName+' onclick="HandleCheckboxes()"/>';
 	
 	// Add the file icon cell.
 	var oCell = oRow.insertCell(-1) ;
@@ -97,16 +108,26 @@
 	
 	//Add the file date cell.
 	oCell = oRow.insertCell(-1) ;
-	oCell.width = 75;
+	oCell.width = 120;
 	oCell.noWrap = true ;
-	oCell.align = 'right' ;
-	oCell.innerHTML = '07-06-2006' ;
+	oCell.align = 'center' ;
+	oCell.innerHTML = fileDate ;
 	
-	oCell = oRow.insertCell(-1);
-	oCell.width = 10;
-	
 }
 
+function GetCheckedFileName(method)
+{
+	checkboxes = document.getElementsByName('file_checkbox');
+	for (i in checkboxes) {
+		if (checkboxes[i].checked) {
+			if (method == 'first')
+				return checkboxes[i].value;
+			files = files+checkboxes[i].value+'|'; 
+		}
+	}
+	return files;
+}
+
 function HandleCheckboxes(e) {
 	var checked_num = 0, i;
 	checkboxes = document.getElementsByName('file_checkbox');
@@ -145,12 +166,39 @@
 	window.top.opener.focus() ;
 }
 
+function RenameFile(old_name,new_name)
+{
+	oConnector.SendCommand( 'RenameFile_'+old_name+'|'+new_name, null, RenameCallBack );
+}
+
+function RenameCallBack(fckXml)
+{
+	var oNode = fckXml.SelectSingleNode( 'Connector/Error' ) ;
+	var iErrorNumber = parseInt( oNode.attributes.getNamedItem('number').value ) ;
+	switch ( iErrorNumber )
+	{
+		case 0 :
+			window.parent.frames['frmResourcesList'].Refresh() ;
+			break ;
+		case 203 :
+			alert( 'Invalid file type for this foder' ) ;
+			break ;
+		case 204 :
+			alert( 'A file with the same name is already available' ) ;
+			break ;
+		default :
+			alert( 'Error on file upload. Error number: ' + errorNumber ) ;
+			break ;
+	}
+
+}
+
 function LoadResources( resourceType, folderPath )
 {
 	oListManager.Clear() ;
 	oConnector.ResourceType = resourceType ;
 	oConnector.CurrentFolder = folderPath
-	oConnector.SendCommand( 'GetFoldersAndFiles', null, GetFoldersAndFilesCallBack ) ;
+	oConnector.SendCommand( 'GetFoldersAndFiles_'+current_sort_by+current_sort_order, null, GetFoldersAndFilesCallBack ) ;
 }
 
 function Refresh()
@@ -165,21 +213,62 @@
 	var sCurrentFolderPath	= oNode.attributes.getNamedItem('path').value ;
 	var sCurrentFolderUrl	= oNode.attributes.getNamedItem('url').value ;
 
-	// Add the Folders.	
-	var oNodes = fckXml.SelectNodes( 'Connector/Folders/Folder' ) ;
-	for ( var i = 0 ; i < oNodes.length ; i++ )
-	{
-		var sFolderName = oNodes[i].attributes.getNamedItem('name').value ;
-		oListManager.AddFolder( sFolderName, sCurrentFolderPath + sFolderName + "/" ) ;
+	if (current_sort_order == '_asc') { 
+		// Add the Folders.	
+		var oNodes = fckXml.SelectNodes( 'Connector/Folders/Folder' ) ;
+		for ( var i = 0 ; i < oNodes.length ; i++ )
+		{
+			var sFolderName = oNodes[i].attributes.getNamedItem('name').value ;
+			oListManager.AddFolder( sFolderName, sCurrentFolderPath + sFolderName + "/" ) ;
+		}
+		// Add the Files.	
+		var oNodes = fckXml.SelectNodes( 'Connector/Files/File' ) ;
+		for ( var i = 0 ; i < oNodes.length ; i++ )
+		{
+			var sFileName = oNodes[i].attributes.getNamedItem('name').value ;
+			var sFileSize = oNodes[i].attributes.getNamedItem('size').value ;
+			var sFileDate = oNodes[i].attributes.getNamedItem('date').value;
+			oListManager.AddFile( sFileName, sCurrentFolderUrl + sFileName, sFileSize, sFileDate) ;
+		}
+		
+	} else {
+		// Add the Files.	
+		var oNodes = fckXml.SelectNodes( 'Connector/Files/File' ) ;
+		for ( var i = 0 ; i < oNodes.length ; i++ )
+		{
+			var sFileName = oNodes[i].attributes.getNamedItem('name').value ;
+			var sFileSize = oNodes[i].attributes.getNamedItem('size').value ;
+			var sFileDate = oNodes[i].attributes.getNamedItem('date').value;
+			oListManager.AddFile( sFileName, sCurrentFolderUrl + sFileName, sFileSize, sFileDate) ;
+		}
+		// Add the Folders.	
+		var oNodes = fckXml.SelectNodes( 'Connector/Folders/Folder' ) ;
+		for ( var i = 0 ; i < oNodes.length ; i++ )
+		{
+			var sFolderName = oNodes[i].attributes.getNamedItem('name').value ;
+			oListManager.AddFolder( sFolderName, sCurrentFolderPath + sFolderName + "/" ) ;
+		}
+		
 	}
-	
-	// Add the Files.	
-	var oNodes = fckXml.SelectNodes( 'Connector/Files/File' ) ;
-	for ( var i = 0 ; i < oNodes.length ; i++ )
-	{
-		var sFileName = oNodes[i].attributes.getNamedItem('name').value ;
-		var sFileSize = oNodes[i].attributes.getNamedItem('size').value ;
-		oListManager.AddFile( sFileName, sCurrentFolderUrl + sFileName, sFileSize ) ;
+	UpdateDivSize();
+}
+
+function UpdateDivSize()
+{
+	table_height = document.getElementById('tableFiles').clientHeight;
+	if(is_msie())
+		window_height = document.body.outerHeight;
+	else
+		window_height = window.outerHeight - 165;
+	document.getElementById('data_div').style.height = window_height;
+	//alert(document.getElementById('tableFiles').clientWidth);
+
+	if (window_height < table_height) {
+		document.getElementById('data_div').scroll = 'yes';
+		document.getElementById('sortFiles').style.width = document.getElementById('tableFiles').clientWidth;
+	} else {
+		document.getElementById('data_div').scroll = 'yes';
+		document.getElementById('sortFiles').style.width = document.getElementById('tableFiles').clientWidth;
 	}
 }
 
@@ -188,10 +277,68 @@
 	oListManager.Init() ;
 	window.top.IsLoadedResourcesList = true ;
 }
-		</script>
+
+function sortBy(sort_by)
+{
+	if (sort_by == current_sort_by)
+		current_sort_order = (current_sort_order == '_asc')?'_desc':'_asc';
+	else { 
+		document.getElementById('sort_'+current_sort_by).src = document.getElementById('_no').src;
+		current_sort_by = sort_by;
+		current_sort_order = '_asc';
+	}
+	document.getElementById('sort_'+current_sort_by).src = document.getElementById(current_sort_order).src;
+	//alert('GetFoldersAndFiles_'+current_sort_by+current_sort_order);
+	LoadResources( oConnector.ResourceType, oConnector.CurrentFolder ) ;
+}
+
+window.onresize = UpdateDivSize;
+
+</script>
 	</head>
-	<body class="FileArea" bottomMargin="10" leftMargin="10" topMargin="10" rightMargin="10">
-		<table id="tableFiles" cellSpacing="1" cellPadding="0" width="100%" border="0">
+	<body class="FileArea" bottomMargin="10" leftMargin="10" topMargin="3" rightMargin="10">
+	<div id="sort_div" style="padding: 0; border: none; overflow: hidden; width: 100%; position: relative;">
+		<table id="sortFiles" border="0" cellSpacing="1" cellPadding="0" width="100%" border="0" style="border-bottom:1px solid #000000; margin-bottom:0px; padding-bottom:0px;">
+			<tr>
+				<td width="25"> </td>
+				<td width="5"> </td>
+				<td>
+					<table border="0" cellSpacing="0" cellPadding="0"border="0">
+						<tr>
+							<td><a href="javascript:sortBy('name');"><img id="sort_name" src="images/sort_asc.gif" alt="" border="0"></a></td>
+							<td><a href="javascript:sortBy('name');" class='order-link'>&nbsp;File Name</a></td>
+						</tr>
+					</table>
+				</td>
+				<td width="50" align="center">
+					<table border="0" cellSpacing="0" cellPadding="0"border="0">
+						<tr>
+							<td><a href="javascript:sortBy('size');"><img id="sort_size" src="images/sort_no.gif" alt="" border="0"></a></td>
+							<td><a href="javascript:sortBy('size');" class='order-link'>&nbsp;Size</a></td>
+						</tr>
+					</table>
+				</td>
+				<td width="120" align="center">
+					<table border="0" cellSpacing="0" cellPadding="0"border="0">
+						<tr>
+							<td><a href="javascript:sortBy('date');"><img  id="sort_date" src="images/sort_no.gif" alt="" border="0"></a></td>
+							<td><a href="javascript:sortBy('date');" class='order-link'>&nbsp;Date</a></td>
+						</tr>
+					</table>
+				</td>
+			</tr>
 		</table>
+	</div>
+	<div id="data_div" style="padding: 0; border: none; overflow: auto; width: 100%; position: relative;">
+		<img src="images/s.gif" width="1" height="3"><br />
+		<table id="tableFiles" border="0" cellSpacing="1" cellPadding="0" width="100%" border="0" style="padding-top:0px;">
+		</table>
+	</div>
+	<div style="display:none">
+	<img id='_desc' src="images/sort_desc.gif" alt="" border="0">
+	<img id='_asc' src="images/sort_asc.gif" alt="" border="0">
+	<img id='_no' src="images/sort_no.gif" alt="" border="0">
+
+	</div>
 	</body>
 </html>
Index: trunk/admin/editor/cmseditor/editor/filemanager/browser/default/connectors/php/config.php
===================================================================
diff -u -N -r4820 -r4936
--- trunk/admin/editor/cmseditor/editor/filemanager/browser/default/connectors/php/config.php	(.../config.php)	(revision 4820)
+++ trunk/admin/editor/cmseditor/editor/filemanager/browser/default/connectors/php/config.php	(.../config.php)	(revision 4936)
@@ -29,6 +29,7 @@
 	define('FULL_PATH', K3_FULL_PATH);
 	define('BASE_PATH', K3_BASE_PATH);
 	include_once($kernel3_config);
+	$Config['UserFilesPathNoBase'] = '/templates/UserFiles/' ;
 	$Config['UserFilesPath'] = BASE_PATH.'/templates/UserFiles/' ;
 }
 else {
Index: trunk/admin/editor/cmseditor/editor/filemanager/browser/default/Browser.css
===================================================================
diff -u -N -r1415 -r4936
--- trunk/admin/editor/cmseditor/editor/filemanager/browser/default/Browser.css	(.../Browser.css)	(revision 1415)
+++ trunk/admin/editor/cmseditor/editor/filemanager/browser/default/Browser.css	(.../Browser.css)	(revision 4936)
@@ -82,4 +82,19 @@
 .FolderListFolder img
 {
 	background-image: url(images/Folder.gif);
-}
\ No newline at end of file
+}
+
+.order-link
+{
+ 	text-decoration: none;
+	font-size: 11px;
+	font-family: 'Microsoft Sans Serif' , Arial, Helvetica, Verdana;
+	color: #000000;
+}
+.order-link:hover
+{
+ 	text-decoration: none;
+	font-size: 11px;
+	font-family: 'Microsoft Sans Serif' , Arial, Helvetica, Verdana;
+	color: #000000;
+}