From 727bb43d644d1bffe3e0d072e3d66c962ad9532b Mon Sep 17 00:00:00 2001 From: Ivan Tcholakov Date: Fri, 26 Jun 2009 22:47:28 +0200 Subject: [PATCH] [svn r21637] FS#2867 - The FCKEditor, the simple file manager: Making the file .../fckeditor/editor/filemanager/connectors/php/connector.php to be identical to the original source. --- .../filemanager/connectors/php/connector.php | 42 +------------------ 1 file changed, 2 insertions(+), 40 deletions(-) diff --git a/main/inc/lib/fckeditor/editor/filemanager/connectors/php/connector.php b/main/inc/lib/fckeditor/editor/filemanager/connectors/php/connector.php index 7e69fa36bc..5a2a008dcc 100644 --- a/main/inc/lib/fckeditor/editor/filemanager/connectors/php/connector.php +++ b/main/inc/lib/fckeditor/editor/filemanager/connectors/php/connector.php @@ -29,47 +29,11 @@ require('./util.php') ; require('./io.php') ; require('./basexml.php') ; require('./commands.php') ; -//require('./phpcompat.php') ; +require('./phpcompat.php') ; if ( !$Config['Enabled'] ) SendError( 1, 'This connector is disabled. Please check the "editor/filemanager/connectors/php/config.php" file' ) ; -// Get the "UserFiles" path. -$GLOBALS["UserFilesPath"] = '' ; - -if ( isset( $Config['UserFilesPath'] ) ) -{ - $GLOBALS["UserFilesPath"] = $Config['UserFilesPath'] ; -} -else if ( isset( $_GET['ServerPath'] ) ) -{ - $GLOBALS["UserFilesPath"] = $_GET['ServerPath'] ; -} -else -{ - $GLOBALS["UserFilesPath"] = '/UserFiles/' ; -} - -if ( ! ereg( '/$', $GLOBALS["UserFilesPath"] ) ) -{ - $GLOBALS["UserFilesPath"] .= '/' ; -} - -if ( strlen( $Config['UserFilesAbsolutePath'] ) > 0 ) -{ - $GLOBALS["UserFilesDirectory"] = $Config['UserFilesAbsolutePath'] ; - - if ( ! ereg( '/$', $GLOBALS["UserFilesDirectory"] ) ) - { - $GLOBALS["UserFilesDirectory"] .= '/' ; - } -} -else -{ - // Map the "UserFiles" path to a local directory. - $GLOBALS["UserFilesDirectory"] = GetRootPath() . $GLOBALS["UserFilesPath"] ; -} - DoResponse() ; function DoResponse() @@ -83,9 +47,7 @@ function DoResponse() // Get the main request informaiton. $sCommand = $_GET['Command'] ; $sResourceType = $_GET['Type'] ; - - //$sCurrentFolder = GetCurrentFolder() ; - $sCurrentFolder = $_GET['CurrentFolder'] ; + $sCurrentFolder = GetCurrentFolder() ; // Check if it is an allowed command if ( ! IsAllowedCommand( $sCommand ) )