Index: trunk/admin/editor/cmseditor/editor/filemanager/browser/default/connectors/php/commands.php
===================================================================
diff -u -N -r4993 -r4994
--- trunk/admin/editor/cmseditor/editor/filemanager/browser/default/connectors/php/commands.php	(.../commands.php)	(revision 4993)
+++ trunk/admin/editor/cmseditor/editor/filemanager/browser/default/connectors/php/commands.php	(.../commands.php)	(revision 4994)
@@ -46,16 +46,10 @@
 	echo "</Folders>" ;
 }
 
-function ValidateSID()
+function ValidateAdminSid()
 {
-	if (isset($Config['K4Mode']))
-		return true;
-	else {
 		$conn = GetADODbConnection();
-		$session_time = GetConfigValue('ses_timeout')+0;
-		
-		if (!defined('SID_TYPE')) 
-		{
+		$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
@@ -64,7 +58,14 @@
 							AND sd.`value` = '1'
 							AND sd.sid = '".$sid."'
 							AND s.expire + '".$session_time."' > unix_timestamp()";
-		} elseif (SID_TYPE == 'user') {
+		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 )
 							FROM sessions 
@@ -73,9 +74,20 @@
 		}
 		if ($conn->GetOne($sql) > 0) {
 			return true; 
-		} else {
+}
+
+function ValidateSID()
+{ global $Config;
+	if (isset($Config['K4Mode']))
+		return true;
+	else {
+		if ($Config['validate_type'] == 'user')
+			return ValidateUserSid();
+		elseif ($Config['validate_type'] == 'admin')
+			ValidateAdminSid();
+		else
 			echo "SESSION Validation FALSE";
-		}
+		
 	}
 	return false;
 }