Index: trunk/admin/editor/cmseditor/editor/filemanager/browser/default/connectors/php/commands.php
===================================================================
diff -u -N -r7928 -r7929
--- trunk/admin/editor/cmseditor/editor/filemanager/browser/default/connectors/php/commands.php	(.../commands.php)	(revision 7928)
+++ trunk/admin/editor/cmseditor/editor/filemanager/browser/default/connectors/php/commands.php	(.../commands.php)	(revision 7929)
@@ -1,23 +1,23 @@
 <?php
 /*
- * FCKeditor - The text editor for internet
- * Copyright (C) 2003-2004 Frederico Caldeira Knabben
- *
- * Licensed under the terms of the GNU Lesser General Public License:
- * 		http://www.opensource.org/licenses/lgpl-license.php
- *
- * For further information visit:
- * 		http://www.fckeditor.net/
- *
- * File Name: commands.php
- * 	This is the File Manager Connector for ASP.
- *
- * Version:  2.0 RC3
- * Modified: 2005-02-19 16:02:38
- *
- * File Authors:
- * 		Frederico Caldeira Knabben (fredck@fckeditor.net)
- */
+* FCKeditor - The text editor for internet
+* Copyright (C) 2003-2004 Frederico Caldeira Knabben
+*
+* Licensed under the terms of the GNU Lesser General Public License:
+* 		http://www.opensource.org/licenses/lgpl-license.php
+*
+* For further information visit:
+* 		http://www.fckeditor.net/
+*
+* File Name: commands.php
+* 	This is the File Manager Connector for ASP.
+*
+* Version:  2.0 RC3
+* Modified: 2005-02-19 16:02:38
+*
+* File Authors:
+* 		Frederico Caldeira Knabben (fredck@fckeditor.net)
+*/
 function GetFolders( $resourceType, $currentFolder )
 {
 	// Map the virtual path to the local server path.
@@ -29,8 +29,8 @@
 	while ( $sFile = readdir( $oCurrentFolder ) )
 	{
 		if ( $sFile != '.' && $sFile != '..' && $sFile != 'CVS' && is_dir( $sServerDir . $sFile ) )
-			$aFolders[] = $sFile;
-			//echo '<Folder name="' . ConvertToXmlAttribute( $sFile ) . '" />' ;
+		$aFolders[] = $sFile;
+		//echo '<Folder name="' . ConvertToXmlAttribute( $sFile ) . '" />' ;
 	}
 
 	if (count($aFolders) > 0) {
@@ -48,45 +48,48 @@
 
 function ValidateAdminSid()
 {
-		$conn = GetADODbConnection();
-		$session_time = GetConfigValue('ses_timeout')+0;
-			$sid = ($_COOKIE['admin_sid'])?$_COOKIE['admin_sid']:$_COOKIE['sid'];
-		$sql = "SELECT count( sd.sid )
+	$conn = GetADODbConnection();
+	$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
 						LEFT JOIN sessions AS s ON s.sid = sd.sid
 						WHERE sd.`name` = 'admin_mode'
 						AND sd.`value` = '1'
 						AND sd.sid = '".$sid."'
 						AND s.expire + '".$session_time."' > unix_timestamp()";
-		if ($conn->GetOne($sql) > 0) {
-			return true;
+	if ($conn->GetOne($sql) > 0) {
+		return true;
+	}
 }
 
 function ValidateUserSid()
 {
-			$conn = GetADODbConnection();
-			$session_time = GetConfigValue('ses_timeout')+0;
-			$sid = $_COOKIE['sid'];
-			$sql = "SELECT count( sd.sid )
+	$conn = GetADODbConnection();
+	$session_time = GetConfigValue('ses_timeout')+0;
+	$sid = $_COOKIE['sid'];
+	$sql = "SELECT count( sd.sid )
 							FROM sessions
 							sid = '".$sid."'
 							AND expire + '".$session_time."' > unix_timestamp()";
-		if ($conn->GetOne($sql) > 0)
-			return true;
+	if ($conn->GetOne($sql) > 0) {
+		return true;
+	}
 }
 
 function ValidateSID()
-{ global $Config;
-	if (isset($Config['K4Mode']))
+{
+	global $Config;
+	if (isset($Config['K4Mode'])) {
 		return true;
+	}
 	else {
 		if ($Config['validate_type'] == 'user')
-			return ValidateUserSid();
+		return ValidateUserSid();
 		elseif ($Config['validate_type'] == 'admin')
-			return ValidateAdminSid();
+		return ValidateAdminSid();
 		else
-			echo "SESSION Validation FALSE";
-
+		echo "SESSION Validation FALSE";
 	}
 	return false;
 }
@@ -105,6 +108,7 @@
 	$ret.= "</CmsPages>";
 	echo $ret;
 }
+
 function K4ReadCmsTree($cat_id, $level = 0)
 {
 	$application =& kApplication::Instance();
@@ -119,8 +123,8 @@
 		$page_ids = array_keys($pages);
 		$tpls = $application->Conn->GetCol('SELECT NamedParentPath, CategoryId FROM '.TABLE_PREFIX.'Category WHERE CategoryId IN ('.join(',', $page_ids).')', 'CategoryId');
 
-//		$query = 'SELECT CategoryId, NamedParentPath, l'.$lang.'_Name AS Title FROM '.TABLE_PREFIX.'Category ORDER By l'.$lang.'_Title';
-//		$pages = $application->Conn->Query($query);
+		//		$query = 'SELECT CategoryId, NamedParentPath, l'.$lang.'_Name AS Title FROM '.TABLE_PREFIX.'Category ORDER By l'.$lang.'_Title';
+		//		$pages = $application->Conn->Query($query);
 
 		$res = '';
 		foreach ($pages as $id => $title) {
@@ -168,14 +172,14 @@
 	{
 		$email_templates_folder_id = $rs->fields['value'];
 	}
-/*
+	/*
 	$query = "SELECT value FROM config WHERE name = 'custom_cms'";
 	$rs = $conn->Execute($query);
 	if ($rs && !$rs->EOF)
 	{
-		$custom_cms = $rs->fields['value'];
+	$custom_cms = $rs->fields['value'];
 	}
-*/
+	*/
 	if (GetConfigValue('custom_cms')) {
 		$filter = 'AND st.st_name NOT IN (' . GetConfigValue('custom_cms') . ')';
 	}
@@ -185,7 +189,7 @@
 	if ( $email_templates_folder_id == "" ) $email_templates_folder_id = 0;
 	$system_tpl_ids = GetConfigValue('system_tpl_ids');
 	if (!$system_tpl_ids)
-	    $system_tpl_ids = '0';
+	$system_tpl_ids = '0';
 	if ( $cms_mode == 1 ) {
 		//$lang_prefix = $this->Application->GetVar('lang_prefix');
 		$query = "
@@ -235,20 +239,20 @@
 			//$page_path = $page_path;
 			$prefix='';
 			for ($i = 0; $i < $level; $i++)
-				$prefix .= '--';
+			$prefix .= '--';
 			if ($level > 0)
-				$prefix=$prefix.'- ';
-/*
+			$prefix=$prefix.'- ';
+			/*
 			$page = ereg_replace("&","&amp;",$rs->fields['page_title']);
 			$page = ereg_replace("\"","&quot;",$page);
 			$page = ereg_replace("'","&#039;",$page);
 			$page = ereg_replace("<","&lt;",$page);
 			$page = ereg_replace(">","&gt;",$page);
-//			echo $page." <br>";
+			//			echo $page." <br>";
 			//$page = htmlentities($rs->fields['page_title'],ENT_QUOTES);
 			$page = $rs->fields['page_title'];
 			$page = ereg_replace("&atilde;","a",$page);
-*/
+			*/
 			$page = $rs->fields['page_title'];
 			$page = @html_entity_decode($page,ENT_NOQUOTES,'UTF-8');
 			$page = @htmlspecialchars($page);
@@ -263,12 +267,12 @@
 	}
 }
 /*
-				$res .= '<CmsPage>
-											<path><![CDATA['.$page_path.']]></path>
-											<title><![CDATA['.$prefix.$page.']]></title>
-											<st_id><![CDATA['.$rs->fields['st_id'].']]></st_id>
-											<serverpath><![CDATA['.BASE_PATH.'/index.php?t=.]]></serverpath>
-									</CmsPage>';
+$res .= '<CmsPage>
+<path><![CDATA['.$page_path.']]></path>
+<title><![CDATA['.$prefix.$page.']]></title>
+<st_id><![CDATA['.$rs->fields['st_id'].']]></st_id>
+<serverpath><![CDATA['.BASE_PATH.'/index.php?t=.]]></serverpath>
+</CmsPage>';
 */
 function GetConfigValue($var)
 {
@@ -282,9 +286,9 @@
 	global $Config ;
 	// Map the virtual path to the local server path.
 	if (isset($Config['K4Mode']))
-		$date_format = "m/d/Y h:i A";
+	$date_format = "m/d/Y h:i A";
 	else
-		$date_format = GetConfigValue('date_format').' '.GetConfigValue('time_format');
+	$date_format = GetConfigValue('date_format').' '.GetConfigValue('time_format');
 
 	$sServerDir = ServerMapFolder( $resourceType, $currentFolder ) ;
 	// Initialize the output buffers for "Folders" and "Files".
@@ -299,7 +303,7 @@
 		if ( $sFile != '.' && $sFile != '..'  && $sFile != 'CVS')
 		{
 			if ( is_dir( $sServerDir . $sFile ) )
-				 $aFolders[]=$sFile;
+			$aFolders[]=$sFile;
 			else
 			{
 				$iFileSize = filesize( $sServerDir . $sFile ) ;
@@ -309,9 +313,9 @@
 					$size = round( $iFileSize / 1024 );
 					$aFileSizes[] = ($size < 1)? 1:$size;//  round( $iFileSize / 1024 ) ;
 				} else
-					$aFileSizes[] = $iFileSize;
-					$aFiles[] = $sFile;
-					$aFileDate[] = filectime($sServerDir.$sFile);
+				$aFileSizes[] = $iFileSize;
+				$aFiles[] = $sFile;
+				$aFileDate[] = filectime($sServerDir.$sFile);
 				//$sFiles	.= '<File name="' . ConvertToXmlAttribute( $sFile ) . '" size="' . $iFileSize . '" />' ;
 			}
 		}
@@ -320,9 +324,9 @@
 		natcasesort($aFolders);
 		switch ($aParams[1])
 		{
-				case 'desc' :
-					$aFolders = array_reverse($aFolders, true);
-					break ;
+			case 'desc' :
+				$aFolders = array_reverse($aFolders, true);
+				break ;
 		}
 		foreach($aFolders AS $k=>$v) {
 			$sFolders .= '<Folder name="' . ConvertToXmlAttribute($v) . '" />' ;
@@ -359,24 +363,24 @@
 			}
 		}
 	}
-/*	while ( $sFile = readdir( $oCurrentFolder ) )
+	/*	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 . '" />' ;
-			}
-		}
-*/
+	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 . '" />' ;
+	}
+	}
+	*/
 
 	if ($aParams[1] == "desc")
 	{
@@ -419,16 +423,17 @@
 			}
 		}
 		else
-			$sErrorNumber = '103' ;
+		$sErrorNumber = '103' ;
 	}
 	else
-		$sErrorNumber = '102' ;
+	$sErrorNumber = '102' ;
 	// Create the "Error" node.
 	echo '<Error number="' . $sErrorNumber . '" originalDescription="' . ConvertToXmlAttribute( $sErrorMsg ) . '" />' ;
 }
 
 function UpdateCmsBlocksK3($resourceType,$currentFolder,$file_from,$file_to)
-{ global $Config ;
+{
+	global $Config ;
 	$Config['UserFilesPathNoBase'];
 	$original_str = $Config['UserFilesPathNoBase'].$resourceType.$currentFolder.addslashes($file_from);
 	$new_str = $Config['UserFilesPathNoBase'].$resourceType.$currentFolder.addslashes($file_to);
@@ -446,11 +451,11 @@
 		$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 ;
+{
+	global $Config ;
 	if (count($aFilenames) == 2)
 	{
 		$sServerDir = ServerMapFolder( $resourceType, $currentFolder ) ;
@@ -465,14 +470,14 @@
 			{
 				if (rename($sServerDir.$aFilenames[0],$sServerDir.$aFilenames[1])) {
 					if (isset($Config['K4Mode'])) {
-							// Update CMS Blocks
+						// Update CMS Blocks
 					} else
-						UpdateCmsBlocksK3($resourceType,$currentFolder,$aFilenames[0],$aFilenames[1]);
+					UpdateCmsBlocksK3($resourceType,$currentFolder,$aFilenames[0],$aFilenames[1]);
 					$sErrorNumber = "0";
 				} else
-					$sErrorNumber = '205' ;
+				$sErrorNumber = '205' ;
 			} else
-				$sErrorNumber = '203' ;
+			$sErrorNumber = '203' ;
 		}
 		$sErrorMsg = '';
 		echo '<Error number="' . $sErrorNumber . '" originalDescription="' . ConvertToXmlAttribute( $sErrorMsg ) . '" />' ;
@@ -521,10 +526,10 @@
 			}
 		}
 		else
-			$sErrorNumber = '202' ;
+		$sErrorNumber = '202' ;
 	}
 	else
-		$sErrorNumber = '202' ;
+	$sErrorNumber = '202' ;
 	echo '<script type="text/javascript">' ;
 	echo 'window.parent.frames["frmUpload"].OnUploadCompleted(' . $sErrorNumber . ',"' . str_replace( '"', '\\"', $sFileName ) . '") ;' ;
 	echo '</script>' ;
@@ -533,21 +538,20 @@
 
 function DeleteConfirmedFiles($resourceType, $currentFolder, $aFiles)
 { global $Config;
-		$sServerDir = ServerMapFolder( $resourceType, $currentFolder ) ;
-		foreach ($aFiles AS $k=>$v) {
-			@unlink($sServerDir.$v);
-		}
+$sServerDir = ServerMapFolder( $resourceType, $currentFolder ) ;
+foreach ($aFiles AS $k=>$v) {
+	@unlink($sServerDir.$v);
+}
 
 }
 
 function DeleteFiles($resourceType, $currentFolder, $files = '', $confirm=0)
-{ global $Config ;
-	if ($files == '')
-		return;
+{
+	global $Config ;
+	if ($files == '') return;
 	//$files = rtrim("|",$files);
 	$aFiles=explode("|",$files);
-	if (count($aFiles) == 0)
-		return;
+	if (count($aFiles) == 0) return;
 	$conn = GetADODbConnection();
 	$aLangs = array();
 	$multilang = GetConfigValue('multilingual_mode');
@@ -560,8 +564,10 @@
 			$aLangs[] = $rs->fields['lang_prefix'];
 			$rs->MoveNext();
 		}
-	} else
-			$aLangs[] = $def_lang_prefix;
+	}
+	else {
+		$aLangs[] = $def_lang_prefix;
+	}
 	$sErrorNumber = 230;
 	if ($confirm == 1) {
 		DeleteConfirmedFiles($resourceType, $currentFolder, $aFiles);
@@ -571,36 +577,36 @@
 		foreach ($aFiles AS $k=>$v) {
 			$add_sql = '';
 			if ($v == '')
-				continue;
+			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";
+			$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
 								WHERE".$add_sql;
-					$rs = $conn->Execute($sql);
-					while ($rs && !$rs->EOF) {
-						$used = 1;
-						$page = $rs->fields[$def_lang_prefix.'_content'];
-						$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 = $conn->Execute($sql);
+				while ($rs && !$rs->EOF) {
+					$used = 1;
+					$page = $rs->fields[$def_lang_prefix.'_content'];
+					$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();
+				}
 			}
 		}
 		if ($ret_xml && !$confirm)
-			echo $ret_xml;
+		echo $ret_xml;
 		if (!$ret_xml && !$confirm) {
 			DeleteConfirmedFiles($resourceType, $currentFolder, $aFiles);
 			echo '<Error number="100" originalDescription="" />' ;
 		}
 	}
+}
 
-
 function GetLangFromSid() {
 	$sid = $_COOKIE['admin_sid'];
 	$conn = GetADODbConnection();
@@ -609,4 +615,4 @@
 	return $translation_language;
 }
 
-?>
+?>
\ No newline at end of file