Index: trunk/admin/editor/cmseditor/editor/filemanager/browser/default/connectors/php/commands.php =================================================================== diff -u -N -r4992 -r4993 --- trunk/admin/editor/cmseditor/editor/filemanager/browser/default/connectors/php/commands.php (.../commands.php) (revision 4992) +++ trunk/admin/editor/cmseditor/editor/filemanager/browser/default/connectors/php/commands.php (.../commands.php) (revision 4993) @@ -53,14 +53,24 @@ else { $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 (!defined('SID_TYPE')) + { + $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()"; + } elseif (SID_TYPE == 'user') { + $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; } else {