Index: trunk/admin/editor/cmseditor/editor/filemanager/browser/default/connectors/php/commands.php
===================================================================
diff -u -N -r5182 -r5219
--- trunk/admin/editor/cmseditor/editor/filemanager/browser/default/connectors/php/commands.php	(.../commands.php)	(revision 5182)
+++ trunk/admin/editor/cmseditor/editor/filemanager/browser/default/connectors/php/commands.php	(.../commands.php)	(revision 5219)
@@ -32,15 +32,15 @@
 			$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>" ;
@@ -49,7 +49,7 @@
 function ValidateAdminSid()
 {
 		$conn = GetADODbConnection();
-		$session_time = GetConfigValue('ses_timeout')+0;	
+		$session_time = GetConfigValue('ses_timeout')+0;
 			$sid = ($_COOKIE['admin_sid'])?$_COOKIE['admin_sid']:$_COOKIE['sid'];
 			$sql = "SELECT count( sd.sid )
 							FROM session_data AS sd
@@ -59,7 +59,7 @@
 							AND sd.sid = '".$sid."'
 							AND s.expire + '".$session_time."' > unix_timestamp()";
 		if ($conn->GetOne($sql) > 0) {
-			return true; 
+			return true;
 }
 
 function ValidateUserSid()
@@ -68,12 +68,12 @@
 			$session_time = GetConfigValue('ses_timeout')+0;
 			$sid = $_COOKIE['sid'];
 			$sql = "SELECT count( sd.sid )
-							FROM sessions 
+							FROM sessions
 							sid = '".$sid."'
 							AND expire + '".$session_time."' > unix_timestamp()";
 		}
 		if ($conn->GetOne($sql) > 0)
-			return true; 
+			return true;
 }
 
 function ValidateSID()
@@ -87,10 +87,10 @@
 			return ValidateAdminSid();
 		else
 			echo "SESSION Validation FALSE";
-		
+
 	}
 	return false;
-}	
+}
 
 function GetCmsTree()
 {
@@ -209,7 +209,7 @@
 				$prefix .= '--';
 			if ($level > 0)
 				$prefix=$prefix.'- ';
-/*				
+/*
 			$page = ereg_replace("&","&amp;",$rs->fields['page_title']);
 			$page = ereg_replace("\"","&quot;",$page);
 			$page = ereg_replace("'","&#039;",$page);
@@ -250,12 +250,13 @@
 
 function GetFoldersAndFiles( $resourceType, $currentFolder, $aParams = array('name','asc'))
 {
+	global $Config ;
 	// Map the virtual path to the local server path.
 	if (isset($Config['K4Mode']))
 		$date_format = "m/d/Y h:i A";
-	else 
+	else
 		$date_format = GetConfigValue('date_format').' '.GetConfigValue('time_format');
-	
+
 	$sServerDir = ServerMapFolder( $resourceType, $currentFolder ) ;
 	// Initialize the output buffers for "Folders" and "Files".
 	$aFolders = array();
@@ -278,7 +279,7 @@
 				{
 					$size = round( $iFileSize / 1024 );
 					$aFileSizes[] = ($size < 1)? 1:$size;//  round( $iFileSize / 1024 ) ;
-				} else 
+				} else
 					$aFileSizes[] = $iFileSize;
 					$aFiles[] = $sFile;
 					$aFileDate[] = filectime($sServerDir.$sFile);
@@ -296,11 +297,11 @@
 		}
 		foreach($aFolders AS $k=>$v) {
 			$sFolders .= '<Folder name="' . ConvertToXmlAttribute($v) . '" />' ;
-		}	
+		}
 	}
 	if (count($aFiles) > 0) {
-		if ($aParams[0] == 'name') 
-		{	
+		if ($aParams[0] == 'name')
+		{
 			natcasesort($aFiles);
 			if ($aParams[1] == 'desc')
 			{
@@ -328,7 +329,7 @@
 				$sFiles	.= '<File name="' . ConvertToXmlAttribute( $aFiles[$fk] ) . '" size="' . $aFileSizes[$fk] . '" date="' . date($date_format,$fv) . '" />' ;
 			}
 		}
-	}		
+	}
 /*	while ( $sFile = readdir( $oCurrentFolder ) )
 	{
 		if ( $sFile != '.' && $sFile != '..'  && $sFile != 'CVS')
@@ -346,8 +347,8 @@
 				$sFiles	.= '<File name="' . ConvertToXmlAttribute( $sFile ) . '" size="' . $iFileSize . '" />' ;
 			}
 		}
-*/		
-		
+*/
+
 	if ($aParams[1] == "desc")
 	{
 		echo $sFiles ;
@@ -416,7 +417,7 @@
 		$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())
@@ -439,7 +440,7 @@
 					} else
 						UpdateCmsBlocksK3($resourceType,$currentFolder,$aFilenames[0],$aFilenames[1]);
 					$sErrorNumber = "0";
-				} else 
+				} else
 					$sErrorNumber = '205' ;
 			} else
 				$sErrorNumber = '203' ;
@@ -520,19 +521,19 @@
 		return;
 	$conn = GetADODbConnection();
 	$aLangs = array();
-	$multilang = GetConfigValue('multilingual_mode'); 
+	$multilang = GetConfigValue('multilingual_mode');
 	$def_lang_prefix = GetConfigValue('default_lang_prefix');
-	if ($multilang) 
+	if ($multilang)
 	{
 		$query="SELECT lang_prefix FROM lang ORDER BY lang_id";
 		$rs = $conn->Execute($query);
 		while ($rs && !$rs->EOF) {
 			$aLangs[] = $rs->fields['lang_prefix'];
 			$rs->MoveNext();
-		} 
-	} else 
+		}
+	} else
 			$aLangs[] = $def_lang_prefix;
-	$sErrorNumber = 230;		
+	$sErrorNumber = 230;
 	if ($confirm == 1) {
 		DeleteConfirmedFiles($resourceType, $currentFolder, $aFiles);
 		echo '<Error number="100" originalDescription="" />' ;
@@ -544,9 +545,9 @@
 				continue;
 			$deleted_file = $Config['UserFilesPathNoBase'].$resourceType.$currentFolder.addslashes($v);
 			for($i=0; $i<count($aLangs); $i++)
-				$add_sql.= " lb1.".$aLangs[$i]."_content LIKE '%".$deleted_file."%' OR"; 
-	
-			if (strlen($add_sql) > 0) { 
+				$add_sql.= " lb1.".$aLangs[$i]."_content LIKE '%".$deleted_file."%' OR";
+
+			if (strlen($add_sql) > 0) {
 				$add_sql = rtrim($add_sql," OR");
 				$sql = "SELECT lb1.template_id, lb2.".$def_lang_prefix."_content FROM live_blocks AS lb1
 								LEFT JOIN live_blocks AS lb2 ON lb2.template_id = lb1.template_id AND lb2.block_num = 20
@@ -558,7 +559,7 @@
 						$page = @html_entity_decode($page,ENT_NOQUOTES,'UTF-8');
 						$page = @htmlspecialchars($page);
 						$ret_xml.= '<Error number="' . $sErrorNumber . '" originalDescription="' . ConvertToXmlAttribute("File '".$v."'; Template: '".$page."'") . '" />' ;
-						$rs->MoveNext();	
+						$rs->MoveNext();
 					}
 			}
 		}