Ticket #2873: 2873.patch

_source/core/config.js

@@ -147 +147 @@
          * config.plugins = 'basicstyles,button,htmldataprocessor,toolbar,wysiwygarea';
          */
 
-        plugins : 'basicstyles,button,elementspath,horizontalrule,htmldataprocessor,keystrokes,newpage,pagebreak,preview,removeformat,smiley,indent,link,list,sourcearea,table,specialchar,tab,toolbar,wysiwygarea',
+        plugins : 'basicstyles,button,elementspath,filebrowser,horizontalrule,htmldataprocessor,keystrokes,newpage,pagebreak,preview,removeformat,smiley,indent,link,list,sourcearea,table,specialchar,tab,toolbar,wysiwygarea',
 
         /**
          * The theme to be used to build the UI.

_source/core/loader.js

@@ -44 +44 @@
                         'core/dom/text'                 : [ 'core/dom/node', 'core/dom/domobject' ],
                         'core/dom/window'               : [ 'core/dom/domobject' ],
                         'core/dtd'                              : [ 'core/tools' ],
-                        'core/editor'                   : [ 'core/command', 'core/config', 'core/editor_basic', 'core/focusmanager', 'core/lang', 'core/plugins', 'core/skins', 'core/themes', 'core/tools', 'core/ui' ],
+                        'core/editor'                   : [ 'core/ajax', 'core/command', 'core/config', 'core/editor_basic', 'core/focusmanager', 'core/lang', 'core/plugins', 'core/skins', 'core/themes', 'core/tools', 'core/ui' ],
                         'core/editor_basic'             : [ 'core/event' ],
                         'core/env'                              : [],
                         'core/event'                    : [],

_source/lang/en.js

@@ -365 +365 @@
                 vSpace  : 'VSpace'
         },
 
+        filebrowser :
+        {
+                errors : 
+                {
+                        10 : 'Invalid command.',
+                        11 : 'The resource type was not specified in the request.',
+                        12 : 'The requested resource type is not valid.',
+                        102 : 'Invalid file or folder name.',
+                        103 : 'It was not possible to complete the request due to authorization restrictions.',
+                        104 : 'It was not possible to complete the request due to file system permission restrictions.',
+                        105 : 'Invalid file extension.',
+                        109 : 'Invalid request.',
+                        110 : 'Unknown error.',
+                        115 : 'A file or folder with the same name already exists.',
+                        116 : 'Folder not found. Please refresh and try again.',
+                        117 : 'File not found. Please refresh the files list and try again.',
+                        201 : 'A file with the same name is already available. The uploaded file has been renamed to "%1"',
+                        202 : 'Invalid file',
+                        203 : 'Invalid file. The file size is too big.',
+                        204 : 'The uploaded file is corrupt.',
+                        205 : 'No temporary folder is available for upload in the server.',
+                        206 : 'Upload cancelled for security reasons. The file contains HTML like data.',
+                        500 : 'The file browser is disabled for security reasons. Please contact your system administrator and check the CKFinder configuration file.',
+                        501 : 'The thumbnails support is disabled.'
+                },
+                errorUnknown : 'It was not possible to complete the request. (Error %1)',
+                fileNotSelected : 'Please select a file from your computer',
+                fileInvalidChar : 'The file name cannot contain any of the following characters: \n\\ / : * ? " < > |',
+                folderCreate : 'Create Folder',
+                folderCreateTip : 'Create folder in working directory',
+                folderEmpty : 'The folder name cannot be empty',
+                folderInvalidChar : 'The folder name cannot contain any of the following characters: \n\\ / : * ? " < > |',
+                folderNew : 'Please type the new folder name: ',
+                resourceType : 'Resource Type',
+                title : 'File Browser',
+                uploadProgressLbl : '(Upload in progress, please wait...)',
+                uploadTip : 'Upload a new file in this folder',
+        },
+
         smiley :
         {
                 toolbar : 'Smiley',

_source/plugins/dialog/plugin.js

@@ -709 +709 @@
                 },
 
                 /**
+                 * Gets the name of the dialog.
+                 * @returns {String} The name of this dialog.
+                 * @example
+                 * var dialogName = dialogObj.getName();
+                 */
+                getName : function()
+                {
+                        return this._.name;
+                },
+
+                /**
                  * Gets a dialog UI element object from a dialog page.
                  * @param {String} pageId id of dialog page.
                  * @param {String} elementId id of UI element.
@@ -1986 +1997 @@
                  */
                 selectParentTab : function()
                 {
+                        tabId = this.getParentTab();
+
+                        this._.dialog.selectPage( tabId );
+                        return this;
+                },
+
+                /**
+                 * Gets the name of the parent tab of this element.
+                 * @returns {String} The name of selected tab.
+                 * @example
+                 * focus : function()
+                 * {
+                 *              this.getParentTab();
+                 *              // do something else.
+                 * }
+                 */
+                getParentTab : function()
+                {
                         var element = this.getInputElement(),
                                 cursor = element,
                                 tabId;
@@ -1994 +2023 @@
 
                         tabId = cursor.getAttribute( 'name' );
 
-                        this._.dialog.selectPage( tabId );
-                        return this;
+                        return tabId;
                 },
 
                 /**

_source/plugins/dialogui/plugin.js

@@ -656 +656 @@
                                         this.validate = elementDefinition.validate;
 
                                 var myDefinition = CKEDITOR.tools.extend( {}, elementDefinition );
+                                var onClick = myDefinition.onClick; 
                                 myDefinition.className = ( myDefinition.className ? myDefinition.className + ' ' : '' ) + 'cke_dialog_ui_button';
                                 myDefinition.onClick = function( evt )
                                 {
                                         var target = elementDefinition[ 'for' ];                // [ pageId, elementId ]
-                                        dialog.getContentElement( target[0], target[1] ).submit();
-                                        this.disable();
+                                        if ( !onClick || onClick.call( this, evt ) !== false )
+                                        {
+                                                dialog.getContentElement( target[0], target[1] ).submit();
+                                                this.disable();
+                                        }
                                 };
 
                                 dialog.on( 'load', function()
@@ -1158 +1162 @@
                                 },
 
                                 /**
+                                 * Sets the action to given value.
+                                 * @param {String} value The new action.
+                                 * @returns {CKEDITOR.ui.dialog.file} This object.
+                                 * @example
+                                 */
+                                setAction : function( action )
+                                {
+                                        this.getInputElement().getParent().$.action = action;
+                                        return this;
+                                },
+
+                                /**
+                                 * Get the action assigned to the form.
+                                 * @returns {String} The value of the action.
+                                 * @example
+                                 */
+                                getAction : function( action )
+                                {
+                                        return this.getInputElement().getParent().$.action;
+                                },
+
+                                /**
                                  * Redraws the file input and resets the file path in the file input.
                                  * The redraw logic is necessary because non-IE browsers tend to clear
                                  * the <iframe> containing the file input after closing the dialog.
                                  * @example
                                  */
-                                reset : function()
+                                reset : function( action )
                                 {
                                         var frameElement = CKEDITOR.document.getById( this._.frameId ),
                                                 frameDocument = frameElement.$.contentWindow.document,
@@ -1172 +1198 @@
                                         frameDocument.open();
                                         frameDocument.write( [ '<html><head><title></title></head><body style="margin: 0; overflow: hidden; background: transparent;">',
                                                         '<form enctype="multipart/form-data" method="POST" action="',
-                                                        CKEDITOR.tools.htmlEncode( elementDefinition.action ),
+                                                        CKEDITOR.tools.htmlEncode( action || elementDefinition.action ),
                                                         '">',
                                                         '<input type="file" name="',
                                                         CKEDITOR.tools.htmlEncode( elementDefinition.id || 'cke_upload' ),

_source/plugins/filebrowser/_dev/test.html

@@ +1 @@
+<!--
+/*
+ * Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved.
+ * For licensing, see LICENSE.html or http://ckeditor.com/license
+ */
+-->
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+        <title>CKEditor File Manager - Connector Tests</title>
+        <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+        <script type="text/javascript">
+
+function BuildBaseUrl( command )
+{
+        var sUrl =
+                document.getElementById('cmbConnector').value +
+                '?command=' + command ;
+
+        if ( command != 'Init' )
+        {
+                sUrl +=
+                        '&type=' + document.getElementById('cmbType').value +
+                        '&currentFolder=' + encodeURIComponent( document.getElementById('txtFolder').value ) ;
+        }
+
+        return sUrl ;
+}
+
+function SetFrameUrl( url )
+{
+        if ( document.all )
+                eRunningFrame.document.location = url ;
+        else
+                document.getElementById('eRunningFrame').src = url ;
+
+        document.getElementById('eUrl').value = url ;
+}
+
+function CallUrlField()
+{
+        SetFrameUrl( document.getElementById('eUrl').value ) ;
+        return false ;
+}
+
+function Init()
+{
+        SetFrameUrl( BuildBaseUrl( 'Init' ) ) ;
+        return false ;
+}
+
+function GetFolders()
+{
+        SetFrameUrl( BuildBaseUrl( 'GetFolders' ) ) ;
+        return false ;
+}
+
+function GetFoldersAndFiles()
+{
+        SetFrameUrl( BuildBaseUrl( 'GetFoldersAndFiles' ) ) ;
+        return false ;
+}
+
+function OnUploadCompleted( errorNumber, fileUrl, fileName )
+{
+        // QuickUpload uses 3 parameters and the order is different than the FileUpload
+        if ( !fileName )
+                fileName = fileUrl ;
+
+        switch ( errorNumber )
+        {
+                case 0 :
+                        alert( 'File uploaded with no errors' ) ;
+                        break ;
+                case 201 :
+                        alert( 'A file with the same name is already available. The uploaded file has been renamed to "' + fileName + '"' ) ;
+                        break ;
+                case 202 :
+                        alert( 'Invalid file' ) ;
+                        break ;
+                case 500 :
+                        alert( 'The connector is disabled' ) ;
+                        break ;
+                default :
+                        alert( 'Error on file upload. Error number: ' + errorNumber ) ;
+                        break ;
+        }
+}
+
+this.frames.frmUpload = this ;
+
+function SetCreateFolderAction()
+{
+        var sUrl = BuildBaseUrl( 'CreateFolder' ) ;
+        document.getElementById('eUrl').value = sUrl ;
+        document.getElementById('frmCreateFolder').action = sUrl ;    
+}
+
+function SetAction()
+{
+        var sUrl = BuildBaseUrl( 'FileUpload' ) ;
+        document.getElementById('eUrl').value = sUrl ;
+        document.getElementById('frmUpload').action = sUrl ;
+}
+
+function SetQuickAction()
+{
+        var sUrl = BuildBaseUrl( 'QuickUpload' ) ;
+        document.getElementById('eUrl').value = sUrl ;
+        document.getElementById('frmQuickUpload').action = sUrl ;
+}
+        </script>
+</head>
+<body>
+        <table cellspacing="0" cellpadding="0" width="100%" border="0" style="height: 100%">
+                <tr>
+                        <td>
+                                <table cellspacing="0" cellpadding="0" border="0">
+                                        <tr>
+                                                <td>
+                                                        Connector:<br />
+                                                        <select id="cmbConnector" name="cmbConnector">
+                                                                <option value="../core/connector/asp/connector.asp">ASP</option>
+                                                                <option value="../core/connector/aspx/connector.aspx">ASP.NET</option>
+                                                                <option value="../core/connector/cfm/connector.cfm">CFM</option>
+                                                                <option value="../core/connector/php/connector.php" selected="selected">PHP</option>
+                                                        </select>
+                                                </td>
+                                                <td>
+                                                        &nbsp;&nbsp;&nbsp;</td>
+                                                <td>
+                                                        Current Folder<br />
+                                                        <input id="txtFolder" type="text" value="/" name="txtFolder" /></td>
+                                                <td>
+                                                        &nbsp;&nbsp;&nbsp;</td>
+                                                <td>
+                                                        Resource Type<br />
+                                                        <select id="cmbType" name="cmbType">
+                                                                <option value="Files" selected="selected">File</option>
+                                                                <option value="Images">Image</option>
+                                                                <option value="Flash">Flash</option>
+                                                                <option value="Invalid">Invalid Type (for testing)</option>
+                                                        </select>
+                                                </td>
+                                        </tr>
+                                </table>
+                                <br />
+                                <table cellspacing="0" cellpadding="0" border="0">
+                                        <tr>
+                                                <td valign="top">
+                                                        <a href="#" onclick="Init();">Init</a>
+                                                </td>
+                                                <td>&nbsp;&nbsp;&nbsp;</td>
+                                                <td valign="top">
+                                                        <a href="#" onclick="GetFolders();">Get Folders</a>
+                                                </td>
+                                                <td>&nbsp;&nbsp;&nbsp;</td>
+                                                <td valign="top">
+                                                        <a href="#" onclick="GetFoldersAndFiles();">Get Folders And Files</a>
+                                                </td>
+                                                <td>&nbsp;&nbsp;&nbsp;</td>
+                                                <td valign="top">
+                                                        <form id="frmCreateFolder" action="" target="eRunningFrame" method="post" enctype="multipart/form-data">
+                                                                Create Folder
+                                                                <input id="txtFolderName" type="text" name="newFolderName" />
+                                                                <input type="submit" value="Create" onclick="SetCreateFolderAction();" />
+                                                        </form>
+                                                </td>
+                                                <td>&nbsp;&nbsp;&nbsp;</td>
+                                                <td valign="top">
+                                                        <form id="frmUpload" action="" target="eRunningFrame" method="post" enctype="multipart/form-data">
+                                                                Upload
+                                                                <input id="txtFileUpload" type="file" name="NewFile" />
+                                                                <input type="submit" value="Upload" onclick="SetAction();" />
+                                                        </form>
+
+                                                        <form id="frmQuickUpload" action="" target="eRunningFrame" method="post" enctype="multipart/form-data">
+                                                                Quick
+                                                                <input id="txtQuickUpload" type="file" name="NewFile" />
+                                                                <input type="submit" value="Upload" onclick="SetQuickAction();" />
+                                                        </form>
+                                                </td>
+                                        </tr>
+                                </table>
+                                <table width="100%">
+                                        <tr>
+                                                <td style="white-space: nowrap">
+                                                        URL:&nbsp;</td>
+                                                <td style="width: 100%">
+                                                        <input id="eUrl" style="width: 100%" /></td>
+                                                <td>
+                                                        <input id="xBtnUrl" type="button" value="Call URL" onclick="CallUrlField();" /></td>
+                                        </tr>
+                                </table>
+                        </td>
+                </tr>
+                <tr>
+                        <td valign="top" style="height: 100%">
+                                <iframe id="eRunningFrame" name="eRunningFrame" width="100%" height="100%" src="javascript:''"></iframe>
+                        </td>
+                </tr>
+        </table>
+</body>
+</html>

_source/plugins/filebrowser/config.php

@@ +1 @@
+<?php
+/*
+Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+/**
+ * This function must check the user session to be sure that he/she is
+ * authorized to upload and access files in the File Browser.
+ *
+ * @return boolean
+ */
+function CheckAuthentication()
+{
+    // WARNING : DO NOT simply return "true". By doing so, you are allowing
+    // "anyone" to upload and list the files in your server. You must implement
+    // some kind of session validation here. Even something very simple as...
+    //
+    // return isset($_SESSION['IsAuthorized']) && $_SESSION['IsAuthorized'];
+    //
+    // ... where $_SESSION['IsAuthorized'] is set to "true" as soon as the
+    // user logs in your system.
+
+    // %REMOVE_START%
+    // Attention: In the development version (SVN) the PHP connector is enabled by default.
+    return true;
+    // %REMOVE_END%
+    return false;
+}
+
+// To make it easy to configure CKEditor file manager, the $baseUrl and $baseDir can be used.
+// Those are helper variables used later in this config file.
+
+// $baseUrl : the base path used to build the final URL for the resources handled
+// in CKEditor. If empty, the default value (/userfiles/) is used.
+//
+// Examples:
+//  $baseUrl = 'http://example.com/userfiles/';
+//  $baseUrl = '/userfiles/';
+//
+// ATTENTION: The trailing slash is required.
+$baseUrl = '/userfiles/';
+
+// $baseDir : the path to the local directory (in the server) which points to the
+// above $baseUrl URL. This is the path used by CKEditor to handle the files in
+// the server. Full write permissions must be granted to this directory.
+//
+// Examples:
+// You may point it to a directory directly:
+//
+//  $baseDir = '/home/login/public_html/userfiles/';
+//  $baseDir = 'C:/SiteDir/userfiles/';
+//
+// Or you may let CKEditor discover the path, based on $baseUrl:
+//
+//  $baseDir = resolveUrl($baseUrl);
+//
+// ATTENTION: The trailing slash is required.
+$baseDir = resolveUrl($baseUrl);
+$baseDir = 'D:/xampp/htdocs/userfiles/'; //%REMOVE_LINE%
+
+// ResourceType : defines the "resource types" handled in CKEditor. A resource
+// type is nothing more than a way to group files under different paths, each one
+// having different configuration settings.
+$config['ResourceType'][] = Array(
+    'name' => 'Files', // Single quotes not allowed
+    'url' => $baseUrl . 'files',
+    'directory' => $baseDir . 'files',
+    'allowedExtensions' => '7z,aiff,asf,avi,bmp,csv,doc,fla,flv,gif,gz,gzip,jpeg,jpg,mid,mov,mp3,mp4,mpc,mpeg,mpg,ods,odt,pdf,png,ppt,pxd,qt,ram,rar,rm,rmi,rmvb,rtf,sdc,sitd,swf,sxc,sxw,tar,tgz,tif,tiff,txt,vsd,wav,wma,wmv,xls,zip',
+    'deniedExtensions' => ''
+);
+
+$config['ResourceType'][] = Array(
+    'name' => 'Images',
+    'url' => $baseUrl . 'images',
+    'directory' => $baseDir . 'images',
+    'allowedExtensions' => 'bmp,gif,jpeg,jpg,png',
+    'deniedExtensions' => ''
+);
+
+$config['ResourceType'][] = Array(
+    'name' => 'Flash',
+    'url' => $baseUrl . 'flash',
+    'directory' => $baseDir . 'flash',
+    'allowedExtensions' => 'swf,flv',
+    'deniedExtensions' => ''
+);
+
+// Due to security issues with Apache modules, it is recommended to leave the
+// following setting enabled.
+$config['ForceSingleExtension'] = true ;
+
+// Perform additional checks for image files.
+// If set to true, validate image size (using getimagesize).
+$config['SecureImageUploads'] = true;
+
+// For security, HTML is allowed in the first Kb of data for files having the
+// following extensions only.
+$config['HtmlExtensions'] = array("html", "htm", "xml", "xsd", "txt", "js") ;
+
+// After file is uploaded, sometimes it is required to change its permissions
+// so that it was possible to access it at the later time.
+// If possible, it is recommended to set more restrictive permissions, like 0755.
+// Set to 0 to disable this feature.
+// Note: not needed on Windows-based servers.
+$config['ChmodFiles'] = 0777 ;
+
+// See comments above.
+// Used when creating folders that does not exist.
+$config['ChmodFolders'] = 0755 ;
+
+// If you have iconv enabled (visit http://php.net/iconv for more information),
+// you can use this directive to specify the encoding of file names in your
+// operating system. Acceptable values can be found at:
+//  http://www.gnu.org/software/libiconv/
+//
+// Examples:
+//  $config['FilesystemEncoding'] = 'CP1250';
+//  $config['FilesystemEncoding'] = 'ISO-8859-2';
+$config['FilesystemEncoding'] = 'UTF-8';
+$config['FilesystemEncoding'] = 'CP1250'; //%REMOVE_LINE%
+ No newline at end of file

_source/plugins/filebrowser/core/connector/php/connector.php

@@ +1 @@
+<?php
+/*
+* Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved.
+* For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+/**
+ * define required constants
+ */
+require_once "./constants.php";
+
+/**
+ * we need this class in each call
+ */
+require_once CKEDITOR_CONNECTOR_LIB_DIR . "/CommandHandler/CommandHandlerBase.php";
+/**
+ * singleton factory
+ */
+require_once CKEDITOR_CONNECTOR_LIB_DIR . "/Core/Factory.php";
+/**
+ * utils class
+ */
+require_once CKEDITOR_CONNECTOR_LIB_DIR . "/Utils/Misc.php";
+
+/**
+ * Simple function required by config.php - discover the server side path
+ * to the directory relative to the "$baseUrl" attribute
+ *
+ * @package CKEditor
+ * @subpackage Connector
+ * @param string $baseUrl
+ * @return string
+ */
+function resolveUrl($baseUrl) {
+    $fileSystem =& CKEditor_Connector_Core_Factory::getInstance("Utils_FileSystem");
+    return $fileSystem->getDocumentRootPath() . $baseUrl;
+}
+
+$utilsSecurity =& CKEditor_Connector_Core_Factory::getInstance("Utils_Security");
+$utilsSecurity->getRidOfMagicQuotes();
+
+/**
+ * $config must be initialised
+ */
+$config = array();
+/**
+ * read config file
+ */
+require_once CKEDITOR_CONNECTOR_CONFIG_FILE_PATH;
+
+CKEditor_Connector_Core_Factory::initFactory();
+$connector =& CKEditor_Connector_Core_Factory::getInstance("Core_Connector");
+
+if (isset($_GET['command'])) {
+    $connector->executeCommand($_GET['command']);
+}
+else {
+    $connector->handleInvalidCommand();
+}

_source/plugins/filebrowser/core/connector/php/constants.php

@@ +1 @@
+<?php
+/*
+* Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved.
+* For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+/**
+ * No errors
+ */
+define('CKEDITOR_CONNECTOR_ERROR_NONE',0);
+define('CKEDITOR_CONNECTOR_ERROR_CUSTOM_ERROR',1);
+define('CKEDITOR_CONNECTOR_ERROR_INVALID_COMMAND',10);
+define('CKEDITOR_CONNECTOR_ERROR_TYPE_NOT_SPECIFIED',11);
+define('CKEDITOR_CONNECTOR_ERROR_INVALID_TYPE',12);
+define('CKEDITOR_CONNECTOR_ERROR_INVALID_NAME',102);
+define('CKEDITOR_CONNECTOR_ERROR_UNAUTHORIZED',103);
+define('CKEDITOR_CONNECTOR_ERROR_ACCESS_DENIED',104);
+define('CKEDITOR_CONNECTOR_ERROR_INVALID_EXTENSION',105);
+define('CKEDITOR_CONNECTOR_ERROR_INVALID_REQUEST',109);
+define('CKEDITOR_CONNECTOR_ERROR_UNKNOWN',110);
+define('CKEDITOR_CONNECTOR_ERROR_ALREADY_EXIST',115);
+define('CKEDITOR_CONNECTOR_ERROR_FOLDER_NOT_FOUND',116);
+define('CKEDITOR_CONNECTOR_ERROR_FILE_NOT_FOUND',117);
+define('CKEDITOR_CONNECTOR_ERROR_UPLOADED_FILE_RENAMED',201);
+define('CKEDITOR_CONNECTOR_ERROR_UPLOADED_INVALID',202);
+define('CKEDITOR_CONNECTOR_ERROR_UPLOADED_TOO_BIG',203);
+define('CKEDITOR_CONNECTOR_ERROR_UPLOADED_CORRUPT',204);
+define('CKEDITOR_CONNECTOR_ERROR_UPLOADED_NO_TMP_DIR',205);
+define('CKEDITOR_CONNECTOR_ERROR_UPLOADED_WRONG_HTML_FILE',206);
+define('CKEDITOR_CONNECTOR_ERROR_CONNECTOR_DISABLED',500);
+
+define('CKEDITOR_CONNECTOR_DEFAULT_USER_FILES_PATH', "/userfiles/");
+define('CKEDITOR_CONNECTOR_CONFIG_FILE_PATH', "./../../../config.php");
+
+if (version_compare(phpversion(), '6', '>=')) {
+    define('CKEDITOR_CONNECTOR_PHP_MODE', 6);
+}
+else if (version_compare(phpversion(), '5', '>=')) {
+    define('CKEDITOR_CONNECTOR_PHP_MODE', 5);
+}
+else {
+    define('CKEDITOR_CONNECTOR_PHP_MODE', 4);
+}
+
+if (CKEDITOR_CONNECTOR_PHP_MODE == 4) {
+    define('CKEDITOR_CONNECTOR_LIB_DIR', "./php4");
+} else {
+    define('CKEDITOR_CONNECTOR_LIB_DIR', "./php5");
+}
+
+define('CKEDITOR_REGEX_IMAGES_EXT', '/\.(jpg|gif|png|bmp|jpeg)$/i');

_source/plugins/filebrowser/core/connector/php/php4/CommandHandler/CommandHandlerBase.php

@@ +1 @@
+<?php
+/*
+* Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved.
+* For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+/**
+ * @package CKEditor
+ * @subpackage CommandHandlers
+ */
+
+/**
+ * Base commands handler
+ *
+ * @package CKEditor
+ * @subpackage CommandHandlers
+ * @abstract
+ */
+class CKEditor_Connector_CommandHandler_CommandHandlerBase
+{
+    /**
+     * CKEditor_Connector_Core_Connector object
+     *
+     * @access protected
+     * @var CKEditor_Connector_Core_Connector
+     */
+    var $_connector;
+    /**
+     * CKEditor_Connector_Core_FolderHandler object
+     *
+     * @access protected
+     * @var CKEditor_Connector_Core_FolderHandler
+     */
+    var $_currentFolder;
+    /**
+     * Error handler object
+     *
+     * @access protected
+     * @var CKEditor_Connector_ErrorHandler_Base|CKEditor_Connector_ErrorHandler_FileUpload|CKEditor_Connector_ErrorHandler_Http
+     */
+    var $_errorHandler;
+
+    function CKEditor_Connector_CommandHandler_CommandHandlerBase()
+    {
+        $this->_currentFolder =& CKEditor_Connector_Core_Factory::getInstance("Core_FolderHandler");
+        $this->_connector =& CKEditor_Connector_Core_Factory::getInstance("Core_Connector");
+        $this->_errorHandler =& $this->_connector->getErrorHandler();
+    }
+
+    /**
+     * Get Folder Handler
+     *
+     * @access public
+     * @return CKEditor_Connector_Core_FolderHandler
+     */
+    function getFolderHandler()
+    {
+        if (is_null($this->_currentFolder)) {
+            $this->_currentFolder =& CKEditor_Connector_Core_Factory::getInstance("Core_FolderHandler");
+        }
+
+        return $this->_currentFolder;
+    }
+
+    /**
+     * Check whether Connector is enabled
+     * @access protected
+     *
+     */
+    function checkConnector()
+    {
+        $_config =& CKEditor_Connector_Core_Factory::getInstance("Core_Config");
+        if (!$_config->getIsEnabled()) {
+            $this->_errorHandler->throwError(CKEDITOR_CONNECTOR_ERROR_CONNECTOR_DISABLED);
+        }
+    }
+
+    /**
+     * Check request
+     * @access protected
+     *
+     */
+    function checkRequest()
+    {
+        if (preg_match(",(/\.)|[[:cntrl:]]|(//)|(\\\\)|([\:\*\?\"\<\>\|]),", $this->_currentFolder->getClientPath())) {
+            $this->_errorHandler->throwError(CKEDITOR_CONNECTOR_ERROR_INVALID_NAME);
+        }
+
+        $_resourceTypeConfig = $this->_currentFolder->getResourceTypeConfig();
+
+        if (is_null($_resourceTypeConfig)) {
+            $this->_errorHandler->throwError(CKEDITOR_CONNECTOR_ERROR_INVALID_TYPE);
+        }
+
+        $_clientPath = $this->_currentFolder->getClientPath();
+
+        if (!is_dir($this->_currentFolder->getServerPath())) {
+            if ($_clientPath == "/") {
+                if (!CKEditor_Connector_Utils_FileSystem::createDirectoryRecursively($this->_currentFolder->getServerPath())) {
+                    /**
+                     * @todo handle error
+                     */
+                }
+            }
+            else {
+                $this->_errorHandler->throwError(CKEDITOR_CONNECTOR_ERROR_FOLDER_NOT_FOUND);
+            }
+        }
+    }
+}
+ No newline at end of file

_source/plugins/filebrowser/core/connector/php/php4/CommandHandler/CreateFolder.php

@@ +1 @@
+<?php
+/*
+* Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved.
+* For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+/**
+ * @package CKEditor
+ * @subpackage CommandHandlers
+ */
+
+/**
+ * Include base XML command handler
+ */
+require_once CKEDITOR_CONNECTOR_LIB_DIR . "/CommandHandler/XmlCommandHandlerBase.php";
+
+/**
+ * Handle CreateFolder command
+ *
+ * @package CKEditor
+ * @subpackage CommandHandlers
+ */
+class CKEditor_Connector_CommandHandler_CreateFolder extends CKEditor_Connector_CommandHandler_XmlCommandHandlerBase
+{
+    /**
+     * Command name
+     *
+     * @access private
+     * @var string
+     */
+    var $command = "CreateFolder";
+
+    /**
+     * handle request and build XML
+     * @access protected
+     *
+     */
+    function buildXml()
+    {
+        $_config =& CKEditor_Connector_Core_Factory::getInstance("Core_Config");
+
+        $_resourceTypeConfig = $this->_currentFolder->getResourceTypeConfig();
+        $sNewFolderName = isset($_POST["newFolderName"]) ? $_POST["newFolderName"] : "";
+        $sNewFolderName = CKEditor_Connector_Utils_FileSystem::convertToFilesystemEncoding($sNewFolderName);
+
+        if (!CKEditor_Connector_Utils_FileSystem::checkFileName($sNewFolderName)) {
+            $this->_errorHandler->throwError(CKEDITOR_CONNECTOR_ERROR_INVALID_NAME);
+        }
+
+        $sServerDir = CKEditor_Connector_Utils_FileSystem::combinePaths($this->_currentFolder->getServerPath(), $sNewFolderName);
+        if (!is_writeable($this->_currentFolder->getServerPath())) {
+            $this->_errorHandler->throwError(CKEDITOR_CONNECTOR_ERROR_ACCESS_DENIED);
+        }
+
+        $bCreated = false;
+
+        if (file_exists($sServerDir)) {
+            $this->_errorHandler->throwError(CKEDITOR_CONNECTOR_ERROR_ALREADY_EXIST);
+        }
+
+        if ($perms = $_config->getChmodFolders()) {
+            $oldUmask = umask(0);
+            $bCreated = @mkdir($sServerDir, $perms);
+            umask($oldUmask);
+        }
+        else {
+            $bCreated = @mkdir($sServerDir);
+        }
+
+        if (!$bCreated) {
+            $this->_errorHandler->throwError(CKEDITOR_CONNECTOR_ERROR_ACCESS_DENIED);
+        } else {
+            $oNewFolderNode = new CKEditor_Connector_Utils_XmlNode("NewFolder");
+            $this->_connectorNode->addChild($oNewFolderNode);
+            $oNewFolderNode->addAttribute("name", CKEditor_Connector_Utils_FileSystem::convertToConnectorEncoding($sNewFolderName));
+        }
+    }
+}
+ No newline at end of file

_source/plugins/filebrowser/core/connector/php/php4/CommandHandler/FileUpload.php

@@ +1 @@
+<?php
+/*
+* Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved.
+* For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+/**
+ * @package CKEditor
+ * @subpackage CommandHandlers
+ */
+
+/**
+ * Handle FileUpload command
+ *
+ * @package CKEditor
+ * @subpackage CommandHandlers
+ */
+class CKEditor_Connector_CommandHandler_FileUpload extends CKEditor_Connector_CommandHandler_CommandHandlerBase
+{
+    /**
+     * Command name
+     *
+     * @access protected
+     * @var string
+     */
+    var $command = "FileUpload";
+
+    /**
+     * send response (save uploaded file)
+     * @access public
+     *
+     */
+    function sendResponse()
+    {
+        $iErrorNumber = CKEDITOR_CONNECTOR_ERROR_NONE;
+
+        $oRegistry =& CKEditor_Connector_Core_Factory::getInstance("Core_Registry");
+        $oRegistry->set("FileUpload_fileName", "unknown file");
+
+        $uploadedFile = array_shift($_FILES);
+
+        if (!isset($uploadedFile['name'])) {
+            $this->_errorHandler->throwError(CKEDITOR_CONNECTOR_ERROR_UPLOADED_INVALID);
+        }
+
+        $sFileName = CKEditor_Connector_Utils_FileSystem::convertToFilesystemEncoding(basename($uploadedFile['name']));
+        $oRegistry->set("FileUpload_fileName", $sFileName);
+
+        $this->checkConnector();
+        $this->checkRequest();
+
+        if (!CKEditor_Connector_Utils_FileSystem::checkFileName($sFileName)) {
+            $this->_errorHandler->throwError(CKEDITOR_CONNECTOR_ERROR_INVALID_NAME);
+        }
+
+        $_config =& CKEditor_Connector_Core_Factory::getInstance("Core_Config");
+        $_resourceTypeConfig = $this->_currentFolder->getResourceTypeConfig();
+
+        $resourceTypeInfo = $this->_currentFolder->getResourceTypeConfig();
+        if (!$resourceTypeInfo->checkExtension($sFileName)) {
+            $this->_errorHandler->throwError(CKEDITOR_CONNECTOR_ERROR_INVALID_EXTENSION);
+        }
+
+        $sFileNameOrginal = $sFileName;
+        $oRegistry->set("FileUpload_fileName", $sFileName);
+
+        $htmlExtensions = $_config->getHtmlExtensions();
+        $sExtension = CKEditor_Connector_Utils_FileSystem::getExtension($sFileNameOrginal);
+
+        if ($htmlExtensions
+        && !CKEditor_Connector_Utils_Misc::inArrayCaseInsensitive($sExtension, $htmlExtensions)
+        && ($detectHtml = CKEditor_Connector_Utils_FileSystem::detectHtml($uploadedFile['tmp_name'])) === true ) {
+            $this->_errorHandler->throwError(CKEDITOR_CONNECTOR_ERROR_UPLOADED_WRONG_HTML_FILE);
+        }
+
+        $sExtension = CKEditor_Connector_Utils_FileSystem::getExtension($sFileNameOrginal);
+        $secureImageUploads = $_config->getSecureImageUploads();
+        if ($secureImageUploads
+        && ($isImageValid = CKEditor_Connector_Utils_FileSystem::isImageValid($uploadedFile['tmp_name'], $sExtension)) === false ) {
+            $this->_errorHandler->throwError(CKEDITOR_CONNECTOR_ERROR_UPLOADED_CORRUPT);
+        }
+
+        switch ($uploadedFile['error']) {
+            case UPLOAD_ERR_OK:
+                break;
+
+            case UPLOAD_ERR_INI_SIZE:
+            case UPLOAD_ERR_FORM_SIZE:
+                $this->_errorHandler->throwError(CKEDITOR_CONNECTOR_ERROR_UPLOADED_TOO_BIG);
+                break;
+
+            case UPLOAD_ERR_PARTIAL:
+            case UPLOAD_ERR_NO_FILE:
+                $this->_errorHandler->throwError(CKEDITOR_CONNECTOR_ERROR_UPLOADED_CORRUPT);
+                break;
+
+            case UPLOAD_ERR_NO_TMP_DIR:
+                $this->_errorHandler->throwError(CKEDITOR_CONNECTOR_ERROR_UPLOADED_NO_TMP_DIR);
+                break;
+
+            case UPLOAD_ERR_CANT_WRITE:
+                $this->_errorHandler->throwError(CKEDITOR_CONNECTOR_ERROR_ACCESS_DENIED);
+                break;
+
+            case UPLOAD_ERR_EXTENSION:
+                $this->_errorHandler->throwError(CKEDITOR_CONNECTOR_ERROR_ACCESS_DENIED);
+                break;
+        }
+
+        $sServerDir = $this->_currentFolder->getServerPath();
+        $iCounter = 0;
+
+        while (true)
+        {
+            $sFilePath = CKEditor_Connector_Utils_FileSystem::combinePaths($sServerDir, $sFileName);
+
+            if (file_exists($sFilePath)) {
+                $iCounter++;
+                $sFileName =
+                CKEditor_Connector_Utils_FileSystem::getFileNameWithoutExtension($sFileNameOrginal) .
+                "(" . $iCounter . ")" . "." .
+                CKEditor_Connector_Utils_FileSystem::getExtension($sFileNameOrginal);
+                $oRegistry->set("FileUpload_fileName", $sFileName);
+
+                $iErrorNumber = CKEDITOR_CONNECTOR_ERROR_UPLOADED_FILE_RENAMED;
+            } else {
+                if (false === move_uploaded_file($uploadedFile['tmp_name'], $sFilePath)) {
+                    $iErrorNumber = CKEDITOR_CONNECTOR_ERROR_ACCESS_DENIED;
+                }
+                else {
+                    if (isset($detectHtml) && $detectHtml === -1 && CKEditor_Connector_Utils_FileSystem::detectHtml($sFilePath) === true) {
+                        @unlink($sFilePath);
+                        $this->_errorHandler->throwError(CKEDITOR_CONNECTOR_ERROR_UPLOADED_WRONG_HTML_FILE);
+                    }
+                    else if (isset($isImageValid) && $isImageValid === -1 && CKEditor_Connector_Utils_FileSystem::isImageValid($sFilePath, $sExtension) === false) {
+                        @unlink($sFilePath);
+                        $this->_errorHandler->throwError(CKEDITOR_CONNECTOR_ERROR_UPLOADED_CORRUPT);
+                    }
+                }
+                if (is_file($sFilePath) && ($perms = $_config->getChmodFiles())) {
+                    $oldumask = umask(0);
+                    chmod($sFilePath, $perms);
+                    umask($oldumask);
+                }
+                break;
+            }
+        }
+
+        $this->_errorHandler->throwError($iErrorNumber, $sFileName, false);
+    }
+}

_source/plugins/filebrowser/core/connector/php/php4/CommandHandler/GetFolders.php

@@ +1 @@
+<?php
+/*
+* Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved.
+* For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+/**
+ * @package CKEditor
+ * @subpackage CommandHandlers
+ */
+
+/**
+ * Include base XML command handler
+ */
+require_once CKEDITOR_CONNECTOR_LIB_DIR . "/CommandHandler/XmlCommandHandlerBase.php";
+
+/**
+ * Handle GetFolders command
+ *
+ * @package CKEditor
+ * @subpackage CommandHandlers
+ */
+class CKEditor_Connector_CommandHandler_GetFolders extends CKEditor_Connector_CommandHandler_XmlCommandHandlerBase
+{
+    /**
+     * Command name
+     *
+     * @access private
+     * @var string
+     */
+    var $command = "GetFolders";
+
+    /**
+     * handle request and build XML
+     * @access protected
+     *
+     */
+    function buildXml()
+    {
+        $_config =& CKEditor_Connector_Core_Factory::getInstance("Core_Config");
+
+        // Map the virtual path to the local server path.
+        $_sServerDir = $this->_currentFolder->getServerPath();
+
+        if (!is_dir($_sServerDir)) {
+            $this->_errorHandler->throwError(CKEDITOR_CONNECTOR_ERROR_FOLDER_NOT_FOUND);
+        }
+
+        // Create the "Folders" node.
+        $oFoldersNode = new CKEditor_Connector_Utils_XmlNode("Folders");
+        $this->_connectorNode->addChild($oFoldersNode);
+
+        $files = array();
+        if ($dh = @opendir($_sServerDir)) {
+            while (($file = readdir($dh)) !== false) {
+                if ($file != "." && $file != ".." && is_dir($_sServerDir . $file)) {
+                    $files[] = $file;
+                }
+            }
+            closedir($dh);
+        } else {
+            $this->_errorHandler->throwError(CKEDITOR_CONNECTOR_ERROR_ACCESS_DENIED);
+        }
+
+        $resourceTypeInfo = $this->_currentFolder->getResourceTypeConfig();
+
+        if (sizeof($files)>0) {
+            natcasesort($files);
+            $i=0;
+            foreach ($files as $file) {
+                // Create the "Folder" node.
+                $oFolderNode[$i] = new CKEditor_Connector_Utils_XmlNode("Folder");
+                $oFoldersNode->addChild($oFolderNode[$i]);
+                $oFolderNode[$i]->addAttribute("name", CKEditor_Connector_Utils_FileSystem::convertToConnectorEncoding($file));
+
+                $i++;
+            }
+        }
+    }
+}

_source/plugins/filebrowser/core/connector/php/php4/CommandHandler/GetFoldersAndFiles.php

@@ +1 @@
+<?php
+/*
+* Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved.
+* For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+/**
+ * @package CKEditor
+ * @subpackage CommandHandlers
+ */
+
+/**
+ * Include base XML command handler
+ */
+require_once CKEDITOR_CONNECTOR_LIB_DIR . "/CommandHandler/XmlCommandHandlerBase.php";
+
+/**
+ * Handle GetFiles command
+ *
+ * @package CKEditor
+ * @subpackage CommandHandlers
+ */
+class CKEditor_Connector_CommandHandler_GetFoldersAndFiles extends CKEditor_Connector_CommandHandler_XmlCommandHandlerBase
+{
+    /**
+     * Command name
+     *
+     * @access private
+     * @var string
+     */
+    var $command = "GetFiles";
+
+    /**
+     * handle request and build XML
+     * @access protected
+     *
+     */
+    function buildXml()
+    {
+        $_config =& CKEditor_Connector_Core_Factory::getInstance("Core_Config");
+
+        // Map the virtual path to the local server path.
+        $_sServerDir = $this->_currentFolder->getServerPath();
+
+        $files = array();
+        $folders = array();
+        if ($dh = @opendir($_sServerDir)) {
+            while (($file = readdir($dh)) !== false) {
+                if ($file == "." || $file == "..") {
+                    continue;
+                }
+                else if (!is_dir($_sServerDir . $file)) {
+                    $files[] = $file;
+                }
+                else {
+                    $folders[] = $file;
+                }
+            }
+            closedir($dh);
+        }
+        else {
+            $this->_errorHandler->throwError(CKEDITOR_CONNECTOR_ERROR_ACCESS_DENIED);
+        }
+
+        // Create the "Folders" node.
+        $oFoldersNode = new CKEditor_Connector_Utils_XmlNode("Folders");
+        $this->_connectorNode->addChild($oFoldersNode);
+
+
+        $resourceTypeInfo = $this->_currentFolder->getResourceTypeConfig();
+
+        if (sizeof($folders)>0) {
+            natcasesort($folders);
+            $i=0;
+            foreach ($folders as $file) {
+                // Create the "Folder" node.
+                $oFolderNode[$i] = new CKEditor_Connector_Utils_XmlNode("Folder");
+                $oFoldersNode->addChild($oFolderNode[$i]);
+                $oFolderNode[$i]->addAttribute("name", CKEditor_Connector_Utils_FileSystem::convertToConnectorEncoding($file));
+
+                $i++;
+            }
+        }
+
+        // Create the "Files" node.
+        $oFilesNode = new CKEditor_Connector_Utils_XmlNode("Files");
+        $this->_connectorNode->addChild($oFilesNode);
+
+        if (!is_dir($_sServerDir)) {
+            $this->_errorHandler->throwError(CKEDITOR_CONNECTOR_ERROR_FOLDER_NOT_FOUND);
+        }
+
+        if (sizeof($files)>0) {
+            natcasesort($files);
+            $i=0;
+            foreach ($files as $file) {
+                $filemtime = @filemtime($_sServerDir . $file);
+
+                //otherwise file doesn't exist or we can't get it's filename properly
+                if ($filemtime !== false) {
+                    $filename = basename($file);
+                    if (!$resourceTypeInfo->checkExtension($filename, false)) {
+                        continue;
+                    }
+                    $oFileNode[$i] = new CKEditor_Connector_Utils_XmlNode("File");
+                    $oFilesNode->addChild($oFileNode[$i]);
+                    $oFileNode[$i]->addAttribute("name", CKEditor_Connector_Utils_FileSystem::convertToConnectorEncoding(basename($file)));
+                    $oFileNode[$i]->addAttribute("date", @date("YmdHi", $filemtime));
+                    $size = filesize($_sServerDir . $file);
+                    if ($size && $size<1024) {
+                        $size = 1;
+                    }
+                    else {
+                        $size = (int)round($size / 1024);
+                    }
+                    $oFileNode[$i]->addAttribute("size", $size);
+                    $i++;
+                }
+            }
+        }
+    }
+}

_source/plugins/filebrowser/core/connector/php/php4/CommandHandler/Init.php

@@ +1 @@
+<?php
+/*
+* Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved.
+* For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+/**
+ * @package CKEditor
+ * @subpackage CommandHandlers
+ */
+
+/**
+ * Include base XML command handler
+ */
+require_once CKEDITOR_CONNECTOR_LIB_DIR . "/CommandHandler/XmlCommandHandlerBase.php";
+
+/**
+ * Handle Init command
+ *
+ * @package CKEditor
+ * @subpackage CommandHandlers
+ */
+class CKEditor_Connector_CommandHandler_Init extends CKEditor_Connector_CommandHandler_XmlCommandHandlerBase
+{
+    /**
+     * Command name
+     *
+     * @access private
+     * @var string
+     */
+    var $command = "Init";
+
+    function mustCheckRequest()
+    {
+        return false;
+    }
+
+    /**
+     * Must add CurrentFolder node?
+     *
+     * @return boolean
+     * @access protected
+     */
+    function mustAddCurrentFolderNode()
+    {
+        return false;
+    }
+
+    /**
+     * handle request and build XML
+     * @access protected
+     *
+     */
+    function buildXml()
+    {
+        $_config =& CKEditor_Connector_Core_Factory::getInstance("Core_Config");
+
+        // Create the "ConnectorInfo" node.
+        $_oConnInfo = new CKEditor_Connector_Utils_XmlNode("ConnectorInfo");
+        $this->_connectorNode->addChild($_oConnInfo);
+        $_oConnInfo->addAttribute("enabled", $_config->getIsEnabled() ? "true" : "false");
+
+        if (!$_config->getIsEnabled()) {
+            $this->_errorHandler->throwError(CKEDITOR_CONNECTOR_ERROR_CONNECTOR_DISABLED);
+        }
+
+        // Create the "ResourceTypes" node.
+        $_oResourceTypes = new CKEditor_Connector_Utils_XmlNode("ResourceTypes");
+        $this->_connectorNode->addChild($_oResourceTypes);
+
+        // Load the resource types in an array.
+        $_aTypes = $_config->getDefaultResourceTypes();
+
+        if (!sizeof($_aTypes)) {
+            $_aTypes = $_config->getResourceTypeNames();
+        }
+
+        $_aTypesSize = sizeof($_aTypes);
+        if ($_aTypesSize) {
+            for ($i = 0; $i < $_aTypesSize; $i++)
+            {
+                $_resourceTypeName = $_aTypes[$i];
+
+                if (!isset($_GET['type']) || $_GET['type'] === $_resourceTypeName) {
+                    $_oTypeInfo = $_config->getResourceTypeConfig($_resourceTypeName);
+                    $_oResourceType[$i] = new CKEditor_Connector_Utils_XmlNode("ResourceType");
+                    $_oResourceTypes->addChild($_oResourceType[$i]);
+
+                    $_oResourceType[$i]->addAttribute("name", $_resourceTypeName);
+                    $_oResourceType[$i]->addAttribute("url", $_oTypeInfo->getUrl());
+                    $_oResourceType[$i]->addAttribute("allowedExtensions", implode(",", $_oTypeInfo->getAllowedExtensions()));
+                    $_oResourceType[$i]->addAttribute("deniedExtensions", implode(",", $_oTypeInfo->getDeniedExtensions()));
+                }
+            }
+        }
+    }
+}

_source/plugins/filebrowser/core/connector/php/php4/CommandHandler/QuickUpload.php

@@ +1 @@
+<?php
+/*
+* Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved.
+* For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+/**
+ * @package CKEditor
+ * @subpackage CommandHandlers
+ */
+
+/**
+ * Include file upload command handler
+ */
+require_once CKEDITOR_CONNECTOR_LIB_DIR . "/CommandHandler/FileUpload.php";
+
+/**
+ * Handle QuickUpload command
+ *
+ * @package CKEditor
+ * @subpackage CommandHandlers
+ */
+class CKEditor_Connector_CommandHandler_QuickUpload extends CKEditor_Connector_CommandHandler_FileUpload
+{
+    /**
+     * Command name
+     *
+     * @access protected
+     * @var string
+     */
+    var $command = "QuickUpload";
+
+    function sendResponse()
+    {
+        $oRegistry =& CKEditor_Connector_Core_Factory::getInstance("Core_Registry");
+        $oRegistry->set("FileUpload_url", $this->_currentFolder->getUrl());
+
+        return parent::sendResponse();
+    }
+}

_source/plugins/filebrowser/core/connector/php/php4/CommandHandler/XmlCommandHandlerBase.php

@@ +1 @@
+<?php
+/*
+* Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved.
+* For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+/**
+ * @package CKEditor
+ * @subpackage CommandHandlers
+ */
+
+/**
+ * Include base command handler
+ */
+require_once CKEDITOR_CONNECTOR_LIB_DIR . "/CommandHandler/CommandHandlerBase.php";
+/**
+ * Include xml utils
+ */
+require_once CKEDITOR_CONNECTOR_LIB_DIR . "/Core/Xml.php";
+
+/**
+ * Base XML commands handler
+ *
+ * @package CKEditor
+ * @subpackage CommandHandlers
+ * @abstract
+ */
+abstract class CKEditor_Connector_CommandHandler_XmlCommandHandlerBase extends CKEditor_Connector_CommandHandler_CommandHandlerBase
+{
+    /**
+     * Connector node - CKEditor_Connector_Utils_XmlNode object
+     *
+     * @var CKEditor_Connector_Utils_XmlNode
+     * @access protected
+     */
+    var $_connectorNode;
+
+    /**
+     * send response
+     * @access public
+     *
+     */
+    function sendResponse()
+    {
+        $xml =& CKEditor_Connector_Core_Factory::getInstance("Core_Xml");
+        $this->_connectorNode =& $xml->getConnectorNode();
+
+        $this->checkConnector();
+        if ($this->mustCheckRequest()) {
+            $this->checkRequest();
+        }
+
+        $resourceTypeName = $this->_currentFolder->getResourceTypeName();
+        if (!empty($resourceTypeName)) {
+            $this->_connectorNode->addAttribute("resourceType", $this->_currentFolder->getResourceTypeName());
+        }
+
+        if ($this->mustAddCurrentFolderNode()) {
+            $_currentFolder = new CKEditor_Connector_Utils_XmlNode("CurrentFolder");
+            $this->_connectorNode->addChild($_currentFolder);
+            $_currentFolder->addAttribute("path", CKEditor_Connector_Utils_FileSystem::convertToConnectorEncoding($this->_currentFolder->getClientPath()));
+
+            $this->_errorHandler->setCatchAllErros(true);
+            $_url = $this->_currentFolder->getUrl();
+            $_currentFolder->addAttribute("url", is_null($_url) ? "" : CKEditor_Connector_Utils_FileSystem::convertToConnectorEncoding($_url));
+            $this->_errorHandler->setCatchAllErros(false);
+        }
+
+        $this->buildXml();
+
+        $_oErrorNode =& $xml->getErrorNode();
+        $_oErrorNode->addAttribute("number", "0");
+
+        echo $this->_connectorNode->asXML();
+        exit;
+    }
+
+    /**
+     * Must check request?
+     *
+     * @return boolean
+     * @access protected
+     */
+    function mustCheckRequest()
+    {
+        return true;
+    }
+
+    /**
+     * Must add CurrentFolder node?
+     *
+     * @return boolean
+     * @access protected
+     */
+    function mustAddCurrentFolderNode()
+    {
+        return true;
+    }
+
+    /**
+     * @access protected
+     * @abstract
+     * @return void
+     */
+    abstract function buildXml();
+}

_source/plugins/filebrowser/core/connector/php/php4/Core/Config.php

@@ +1 @@
+<?php
+/*
+* Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved.
+* For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+/**
+ * @package CKEditor
+ * @subpackage Config
+ */
+
+/**
+ * Include resource type config class
+ */
+require_once CKEDITOR_CONNECTOR_LIB_DIR . "/Core/ResourceTypeConfig.php";
+
+/**
+ * Main config parser
+ *
+ *
+ * @package CKEditor
+ * @subpackage Config
+
+ * @global string $GLOBALS['config']
+ */
+class CKEditor_Connector_Core_Config
+{
+    /**
+     * Is CKEditor enabled
+     *
+     * @var boolean
+     * @access private
+     */
+    var $_isEnabled = false;
+    /**
+     * ResourceType config cache
+     *
+     * @var array
+     * @access private
+     */
+    var $_resourceTypeConfigCache = array();
+    /**
+     * Array with default resource types names
+     *
+     * @access private
+     * @var array
+     */
+    var $_defaultResourceTypes = array();
+    /**
+     * Filesystem encoding
+     *
+     * @var string
+     * @access private
+     */
+    var $_filesystemEncoding;
+    /**
+     * Check double extension
+     *
+     * @var boolean
+     * @access private
+     */
+    var $_checkDoubleExtension = true;
+    /**
+     * If set to true, validate image size
+     *
+     * @var boolean
+     * @access private
+     */
+    var $_secureImageUploads = true;
+    /**
+     * For security, HTML is allowed in the first Kb of data for files having the following extensions only
+     *
+     * @var array
+     * @access private
+     */
+    var $_htmlExtensions = array('html', 'htm', 'xml', 'xsd', 'txt', 'js');
+    /**
+     * Chmod files after upload to the following permission
+     *
+     * @var integer
+     * @access private
+     */
+    var $_chmodFiles = 0777;
+    /**
+     * Chmod directories after creation
+     *
+     * @var integer
+     * @access private
+     */
+    var $_chmodFolders = 0755;
+
+    function CKEditor_Connector_Core_Config()
+    {
+        $this->loadValues();
+    }
+
+    /**
+         * Get file system encoding, returns null if encoding is not set
+         *
+         * @access public
+         * @return string
+         */
+    function getFilesystemEncoding()
+    {
+        return $this->_filesystemEncoding;
+    }
+
+    /**
+         * Get "secureImageUploads" value
+         *
+         * @access public
+         * @return boolean
+         */
+    function getSecureImageUploads()
+    {
+        return $this->_secureImageUploads;
+    }
+
+    /**
+         * Get "htmlExtensions" value
+         *
+         * @access public
+         * @return array
+         */
+    function getHtmlExtensions()
+    {
+        return $this->_htmlExtensions;
+    }
+
+    /**
+         * Get "Check double extension" value
+         *
+         * @access public
+         * @return boolean
+         */
+    function getCheckDoubleExtension()
+    {
+        return $this->_checkDoubleExtension;
+    }
+
+    /**
+         * Get default resource types
+         *
+         * @access public
+         * @return array()
+         */
+    function getDefaultResourceTypes()
+    {
+        return $this->_defaultResourceTypes;
+    }
+
+    /**
+         * Is CKEditor enabled
+         *
+         * @access public
+         * @return boolean
+         */
+    function getIsEnabled()
+    {
+        return $this->_isEnabled;
+    }
+
+    /**
+        * Get chmod settings for uploaded files
+        *
+        * @access public
+        * @return integer
+        */
+    function getChmodFiles()
+    {
+        return $this->_chmodFiles;
+    }
+
+    /**
+        * Get chmod settings for created directories
+        *
+        * @access public
+        * @return integer
+        */
+    function getChmodFolders()
+    {
+        return $this->_chmodFolders;
+    }
+
+    /**
+         * Get resourceTypeName config
+         *
+         * @param string $resourceTypeName
+         * @return CKEditor_Connector_Core_ResourceTypeConfig|null
+         * @access public
+         */
+    function &getResourceTypeConfig($resourceTypeName)
+    {
+        $_null = null;
+
+        if (isset($this->_resourceTypeConfigCache[$resourceTypeName])) {
+            return $this->_resourceTypeConfigCache[$resourceTypeName];
+        }
+
+        if (!isset($GLOBALS['config']['ResourceType']) || !is_array($GLOBALS['config']['ResourceType'])) {
+            return $_null;
+        }
+
+        reset($GLOBALS['config']['ResourceType']);
+        while (list($_key,$_resourceTypeNode) = each($GLOBALS['config']['ResourceType'])) {
+            if ($_resourceTypeNode['name'] === $resourceTypeName) {
+                $this->_resourceTypeConfigCache[$resourceTypeName] = new CKEditor_Connector_Core_ResourceTypeConfig($_resourceTypeNode);
+
+                return $this->_resourceTypeConfigCache[$resourceTypeName];
+            }
+        }
+
+        return $_null;
+    }
+
+    /**
+     * Load values from config
+     *
+     * @access private
+     */
+    function loadValues()
+    {
+        if (function_exists('CheckAuthentication')) {
+            $this->_isEnabled = CheckAuthentication();
+        }
+        if (isset($GLOBALS['config']['FilesystemEncoding'])) {
+            $this->_filesystemEncoding = (string)$GLOBALS['config']['FilesystemEncoding'];
+        }
+        if (isset($GLOBALS['config']['CheckDoubleExtension'])) {
+            $this->_checkDoubleExtension = CKEditor_Connector_Utils_Misc::booleanValue($GLOBALS['config']['CheckDoubleExtension']);
+        }
+        if (isset($GLOBALS['config']['SecureImageUploads'])) {
+            $this->_secureImageUploads = CKEditor_Connector_Utils_Misc::booleanValue($GLOBALS['config']['SecureImageUploads']);
+        }
+        if (isset($GLOBALS['config']['HtmlExtensions'])) {
+            $this->_htmlExtensions = (array)$GLOBALS['config']['HtmlExtensions'];
+        }
+        if (isset($GLOBALS['config']['ChmodFiles'])) {
+            $this->_chmodFiles = $GLOBALS['config']['ChmodFiles'];
+        }
+        if (isset($GLOBALS['config']['ChmodFolders'])) {
+            $this->_chmodFolders = $GLOBALS['config']['ChmodFolders'];
+        }
+        if (isset($GLOBALS['config']['DefaultResourceTypes'])) {
+            $_defaultResourceTypes = (string)$GLOBALS['config']['DefaultResourceTypes'];
+            if (strlen($_defaultResourceTypes)) {
+                $this->_defaultResourceTypes = explode(",", $_defaultResourceTypes);
+            }
+        }
+    }
+
+    /**
+     * Get all resource type names defined in config
+     *
+     * @return array
+     * @access public
+     */
+    function getResourceTypeNames()
+    {
+        if (!isset($GLOBALS['config']['ResourceType']) || !is_array($GLOBALS['config']['ResourceType'])) {
+            return array();
+        }
+
+        $_names = array();
+        foreach ($GLOBALS['config']['ResourceType'] as $key => $_resourceType) {
+            if (isset($_resourceType['name'])) {
+                $_names[] = (string)$_resourceType['name'];
+            }
+        }
+
+        return $_names;
+    }
+}
+ No newline at end of file

_source/plugins/filebrowser/core/connector/php/php4/Core/Connector.php

@@ +1 @@
+<?php
+/*
+* Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved.
+* For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+/**
+ * @package CKEditor
+ * @subpackage Core
+ */
+
+/**
+ * Executes all commands
+ *
+ * @package CKEditor
+ * @subpackage Core
+ */
+class CKEditor_Connector_Core_Connector
+{
+    /**
+     * Registry
+     *
+     * @var CKEditor_Connector_Core_Registry
+     * @access private
+     */
+    var $_registry;
+
+    function CKEditor_Connector_Core_Connector()
+    {
+        $this->_registry =& CKEditor_Connector_Core_Factory::getInstance("Core_Registry");
+        $this->_registry->set("errorHandler", "ErrorHandler_Base");
+    }
+
+    /**
+     * Generic handler for invalid commands
+     * @access public
+     *
+     */
+    function handleInvalidCommand()
+    {
+        $oErrorHandler =& $this->getErrorHandler();
+        $oErrorHandler->throwError(CKEDITOR_CONNECTOR_ERROR_INVALID_COMMAND);
+    }
+
+    /**
+     * Execute command
+     *
+     * @param string $command
+     * @access public
+     */
+    function executeCommand($command)
+    {
+        switch ($command)
+        {
+            case 'FileUpload':
+                $this->_registry->set("errorHandler", "ErrorHandler_FileUpload");
+                $obj =& CKEditor_Connector_Core_Factory::getInstance("CommandHandler_".$command);
+                $obj->sendResponse();
+                break;
+
+            case 'QuickUpload':
+                $this->_registry->set("errorHandler", "ErrorHandler_QuickUpload");
+                $obj =& CKEditor_Connector_Core_Factory::getInstance("CommandHandler_".$command);
+                $obj->sendResponse();
+                break;
+
+            case 'CreateFolder':
+            case 'GetFolders':
+            case 'GetFoldersAndFiles':
+            case 'Init':
+                $obj =& CKEditor_Connector_Core_Factory::getInstance("CommandHandler_".$command);
+                $obj->sendResponse();
+                break;
+
+            default:
+                $this->handleInvalidCommand();
+                break;
+        }
+    }
+
+    /**
+     * Get error handler
+     *
+     * @access public
+     * @return CKEditor_Connector_ErrorHandler_Base|CKEditor_Connector_ErrorHandler_FileUpload|CKEditor_Connector_ErrorHandler_Http
+     */
+    function &getErrorHandler()
+    {
+        $_errorHandler = $this->_registry->get("errorHandler");
+        $oErrorHandler =& CKEditor_Connector_Core_Factory::getInstance($_errorHandler);
+        return $oErrorHandler;
+    }
+}
+ No newline at end of file

_source/plugins/filebrowser/core/connector/php/php4/Core/Factory.php

@@ +1 @@
+<?php
+/*
+* Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved.
+* For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+/**
+ * @package CKEditor
+ * @subpackage Core
+ */
+
+/**
+ * Sigleton factory creating objects
+ *
+ * @package CKEditor
+ * @subpackage Core
+ */
+class CKEditor_Connector_Core_Factory
+{
+    static $instances = array();
+
+    /**
+     * Initiate factory
+     * @static
+     */
+    function initFactory()
+    {
+    }
+
+    /**
+     * Get instance of specified class
+     * Short and Long class names are possible
+     * <code>
+     * $obj1 =& CKEditor_Connector_Core_Factory::getInstance("CKEditor_Connector_Core_Xml");
+     * $obj2 =& CKEditor_Connector_Core_Factory::getInstance("Core_Xml");
+     * </code>
+     *
+     * @param string $className class name
+     * @static
+     * @access public
+     * @return object
+     */
+    function &getInstance($className)
+    {
+        $namespace = "CKEditor_Connector_";
+
+        $baseName = str_replace($namespace,"",$className);
+
+        $className = $namespace.$baseName;
+
+        if (!isset(CKEditor_Connector_Core_Factory::$instances[$className])) {
+            require_once CKEDITOR_CONNECTOR_LIB_DIR . "/" . str_replace("_","/",$baseName).".php";
+            CKEditor_Connector_Core_Factory::$instances[$className] = new $className;
+        }
+
+        return CKEditor_Connector_Core_Factory::$instances[$className];
+    }
+}
+ No newline at end of file

_source/plugins/filebrowser/core/connector/php/php4/Core/FolderHandler.php

@@ +1 @@
+<?php
+/*
+* Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved.
+* For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+/**
+ * @package CKEditor
+ * @subpackage Core
+ */
+
+/**
+ * Include file system utils class
+ */
+require_once CKEDITOR_CONNECTOR_LIB_DIR . "/Utils/FileSystem.php";
+
+/**
+ * @package CKEditor
+ * @subpackage Core
+ */
+class CKEditor_Connector_Core_FolderHandler
+{
+    /**
+     * CKEditor_Connector_Core_ResourceTypeConfig object
+     *
+     * @var CKEditor_Connector_Core_ResourceTypeConfig
+     * @access private
+     */
+    var $_resourceTypeConfig;
+    /**
+     * ResourceType name
+     *
+     * @var string
+     * @access private
+     */
+    var $_resourceTypeName = "";
+    /**
+     * Client path
+     *
+     * @var string
+     * @access private
+     */
+    var $_clientPath = "/";
+    /**
+     * Url
+     *
+     * @var string
+     * @access private
+     */
+    var $_url;
+    /**
+     * Server path
+     *
+     * @var string
+     * @access private
+     */
+    var $_serverPath;
+    /**
+     * Folder info
+     *
+     * @var mixed
+     * @access private
+     */
+    var $_folderInfo;
+
+    function CKEditor_Connector_Core_FolderHandler()
+    {
+        if (isset($_GET["type"])) {
+            $this->_resourceTypeName = (string)$_GET["type"];
+        }
+
+        if (isset($_GET["currentFolder"])) {
+            $this->_clientPath = CKEditor_Connector_Utils_FileSystem::convertToFilesystemEncoding((string)$_GET["currentFolder"]);
+        }
+
+        if (!strlen($this->_clientPath)) {
+            $this->_clientPath = "/";
+        }
+        else {
+            if (substr($this->_clientPath, -1, 1) != "/") {
+                $this->_clientPath .= "/";
+            }
+            if (substr($this->_clientPath, 0, 1) != "/") {
+                $this->_clientPath = "/" . $this->_clientPath;
+            }
+        }
+    }
+
+    /**
+     * Get resource type config
+     *
+     * @return CKEditor_Connector_Core_ResourceTypeConfig
+     * @access public
+     */
+    function &getResourceTypeConfig()
+    {
+        if (!isset($this->_resourceTypeConfig)) {
+            $_config =& CKEditor_Connector_Core_Factory::getInstance("Core_Config");
+            $this->_resourceTypeConfig = $_config->getResourceTypeConfig($this->_resourceTypeName);
+        }
+
+        if (is_null($this->_resourceTypeConfig)) {
+            $connector =& CKEditor_Connector_Core_Factory::getInstance("Core_Connector");
+            $oErrorHandler =& $connector->getErrorHandler();
+            $oErrorHandler->throwError(CKEDITOR_CONNECTOR_ERROR_INVALID_TYPE);
+        }
+
+        return $this->_resourceTypeConfig;
+    }
+
+    /**
+     * Get resource type name
+     *
+     * @return string
+     * @access public
+     */
+    function getResourceTypeName()
+    {
+        return $this->_resourceTypeName;
+    }
+
+    /**
+     * Get Client path
+     *
+     * @return string
+     * @access public
+     */
+    function getClientPath()
+    {
+        return $this->_clientPath;
+    }
+
+    /**
+     * Get Url
+     *
+     * @return string
+     * @access public
+     */
+    function getUrl()
+    {
+        if (is_null($this->_url)) {
+            $this->_resourceTypeConfig = $this->getResourceTypeConfig();
+            if (is_null($this->_resourceTypeConfig)) {
+                $connector =& CKEditor_Connector_Core_Factory::getInstance("Core_Connector");
+                $oErrorHandler =& $connector->getErrorHandler();
+                $oErrorHandler->throwError(CKEDITOR_CONNECTOR_ERROR_INVALID_TYPE);
+                $this->_url = "";
+            }
+            else {
+                $this->_url = $this->_resourceTypeConfig->getUrl() . ltrim($this->getClientPath(), "/");
+            }
+        }
+
+        return $this->_url;
+    }
+
+    /**
+     * Get server path
+     *
+     * @return string
+     * @access public
+     */
+    function getServerPath()
+    {
+        if (is_null($this->_serverPath)) {
+            $this->_resourceTypeConfig = $this->getResourceTypeConfig();
+            $this->_serverPath = CKEditor_Connector_Utils_FileSystem::combinePaths($this->_resourceTypeConfig->getDirectory(), ltrim($this->_clientPath, "/"));
+        }
+
+        return $this->_serverPath;
+    }
+}
+ No newline at end of file

_source/plugins/filebrowser/core/connector/php/php4/Core/Registry.php

@@ +1 @@
+<?php
+/*
+* Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved.
+* For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+/**
+ * @package CKEditor
+ * @subpackage Core
+ */
+
+/**
+ * Registry for storing global variables values (not references)
+ *
+ * @package CKEditor
+ * @subpackage Core
+ */
+class CKEditor_Connector_Core_Registry
+{
+    /**
+     * Arrat that stores all values
+     *
+     * @var array
+     * @access private
+     */
+    var $_store = array();
+
+    /**
+     * Chacke if value has been set
+     *
+     * @param string $key
+     * @return boolean
+     * @access private
+     */
+    function isValid($key)
+    {
+        return array_key_exists($key, $this->_store);
+    }
+
+    /**
+     * Set value
+     *
+     * @param string $key
+     * @param mixed $obj
+     * @access public
+     */
+    function set($key, $obj)
+    {
+        $this->_store[$key] = $obj;
+    }
+
+    /**
+     * Get value
+     *
+     * @param string $key
+     * @return mixed
+     * @access public
+     */
+    function get($key)
+    {
+        if ($this->isValid($key)) {
+            return $this->_store[$key];
+        }
+    }
+}
+ No newline at end of file

_source/plugins/filebrowser/core/connector/php/php4/Core/ResourceTypeConfig.php

@@ +1 @@
+<?php
+/*
+* Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved.
+* For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+/**
+ * @package CKEditor
+ * @subpackage Config
+ */
+
+/**
+ * This class keeps resource types configuration
+ *
+ * @package CKEditor
+ * @subpackage Config
+ */
+class CKEditor_Connector_Core_ResourceTypeConfig
+{
+    /**
+     * Resource name
+     *
+     * @var string
+     * @access private
+     */
+    var $_name = "";
+    /**
+     * Resource url
+     *
+     * @var string
+     * @access private
+     */
+    var $_url = "";
+    /**
+     * Directory path on a server
+     *
+     * @var string
+     * @access private
+     */
+    var $_directory = "";
+    /**
+     * Array with allowed extensions
+     *
+     * @var array[]string
+     * @access private
+     */
+    var $_allowedExtensions = array();
+    /**
+     * Array with denied extensions
+     *
+     * @var array[]string
+     * @access private
+     */
+    var $_deniedExtensions = array();
+    /**
+     * used for CKEditor_Connector_Core_Config object caching
+     *
+     * @var CKEditor_Connector_Core_Config
+     * @access private
+     */
+    var $_config;
+
+    /**
+     * Get ResourceType configuration
+     *
+     * @param string $resourceTypeNode
+     * @return array
+     *
+     */
+    function CKEditor_Connector_Core_ResourceTypeConfig($resourceTypeNode)
+    {
+        if (isset($resourceTypeNode["name"])) {
+            $this->_name = $resourceTypeNode["name"];
+        }
+
+        if (isset($resourceTypeNode["url"])) {
+            $this->_url = $resourceTypeNode["url"];
+        }
+
+        if (!strlen($this->_url)) {
+            $this->_url = "/";
+        }
+        else if (substr($this->_url,-1,1) != "/") {
+            $this->_url .= "/";
+        }
+
+        if (isset($resourceTypeNode["directory"])) {
+            $this->_directory = $resourceTypeNode["directory"];
+        }
+
+        if (!strlen($this->_directory)) {
+            $this->_directory = resolveUrl($this->_url);
+        }
+
+        if (isset($resourceTypeNode["allowedExtensions"])) {
+            if (is_array($resourceTypeNode["allowedExtensions"])) {
+                foreach ($resourceTypeNode["allowedExtensions"] as $extension) {
+                    $this->_allowedExtensions[] = strtolower(trim((string)$e));
+                }
+            }
+            else {
+                $resourceTypeNode["allowedExtensions"] = trim((string)$resourceTypeNode["allowedExtensions"]);
+                if (strlen($resourceTypeNode["allowedExtensions"])) {
+                    $extensions = explode(",", $resourceTypeNode["allowedExtensions"]);
+                    foreach ($extensions as $e) {
+                        $this->_allowedExtensions[] = strtolower(trim($e));
+                    }
+                }
+            }
+        }
+
+        if (isset($resourceTypeNode["deniedExtensions"])) {
+            if (is_array($resourceTypeNode["deniedExtensions"])) {
+
+                foreach ($resourceTypeNode["deniedExtensions"] as $extension) {
+                    $this->_deniedExtensions[] = strtolower(trim((string)$e));
+                }
+            }
+            else {
+                $resourceTypeNode["deniedExtensions"] = trim((string)$resourceTypeNode["deniedExtensions"]);
+                if (strlen($resourceTypeNode["deniedExtensions"])) {
+                    $extensions = explode(",", $resourceTypeNode["deniedExtensions"]);
+                    foreach ($extensions as $e) {
+                        $this->_deniedExtensions[] = strtolower(trim($e));
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * Get name
+     *
+     * @access public
+     * @return string
+     */
+    function getName()
+    {
+        return $this->_name;
+    }
+
+    /**
+     * Get url
+     *
+     * @access public
+     * @return string
+     */
+    function getUrl()
+    {
+        return $this->_url;
+    }
+
+    /**
+     * Get directory
+     *
+     * @access public
+     * @return string
+     */
+    function getDirectory()
+    {
+        return $this->_directory;
+    }
+
+    /**
+     * Get allowed extensions
+     *
+     * @access public
+     * @return array[]string
+     */
+    function getAllowedExtensions()
+    {
+        return $this->_allowedExtensions;
+    }
+
+    /**
+     * Get denied extensions
+     *
+     * @access public
+     * @return array[]string
+     */
+    function getDeniedExtensions()
+    {
+        return $this->_deniedExtensions;
+    }
+
+    /**
+     * Check extension, return true if file name is valid.
+     * Return false if extension is on denied list.
+     * If allowed extensions are defined, return false if extension isn't on allowed list.
+     *
+     * @access public
+     * @param string $extension extension
+     * @param boolean $renameIfRequired whether try to rename file or not
+     * @return boolean
+     */
+    function checkExtension(&$fileName, $renameIfRequired = true)
+    {
+        if (strpos($fileName, '.') === false) {
+            return true;
+        }
+
+        if (is_null($this->_config)) {
+            $this->_config =& CKEditor_Connector_Core_Factory::getInstance("Core_Config");
+        }
+
+        $toCheck = array();
+
+        if ($this->_config->getCheckDoubleExtension()) {
+            $pieces = explode('.', $fileName);
+
+            // First, check the last extension (ex. in file.php.jpg, the "jpg").
+            if ( !$this->checkSingleExtension( $pieces[sizeof($pieces)-1] ) ) {
+                return false;
+            }
+
+            if ($renameIfRequired) {
+                // Check the other extensions, rebuilding the file name. If an extension is
+                // not allowed, replace the dot with an underscore.
+                $fileName = $pieces[0] ;
+                for ($i=1; $i<sizeof($pieces)-1; $i++) {
+                    $fileName .= $this->checkSingleExtension( $pieces[$i] ) ? '.' : '_' ;
+                    $fileName .= $pieces[$i];
+                }
+
+                // Add the last extension to the final name.
+                $fileName .= '.' . $pieces[sizeof($pieces)-1] ;
+            }
+        }
+        else {
+            // Check only the last extension (ex. in file.php.jpg, only "jpg").
+            return $this->checkSingleExtension( substr($fileName, strrpos($fileName,'.')+1) );
+        }
+
+        return true;
+    }
+
+    function checkSingleExtension($extension)
+    {
+        $extension = strtolower(ltrim($extension,'.'));
+
+        if (sizeof($this->_deniedExtensions)) {
+            if (in_array($extension, $this->_deniedExtensions)) {
+                return false;
+            }
+        }
+
+        if (sizeof($this->_allowedExtensions)) {
+            return in_array($extension, $this->_allowedExtensions);
+        }
+
+        return true;
+    }
+}

_source/plugins/filebrowser/core/connector/php/php4/Core/Xml.php

@@ +1 @@
+<?php
+/*
+* Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved.
+* For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+/**
+ * @package CKEditor
+ * @subpackage Core
+ */
+
+/**
+ * Include basic Xml library
+ */
+require_once CKEDITOR_CONNECTOR_LIB_DIR . "/Utils/XmlNode.php";
+
+/**
+ * XML document
+ *
+ * @package CKEditor
+ * @subpackage Core
+ */
+class CKEditor_Connector_Core_Xml
+{
+    /**
+     * Connector node (root)
+     *
+     * @var CKEditor_Connector_Utils_XmlNode
+     * @access private
+     */
+    var $_connectorNode;
+    /**
+     * Error node
+     *
+     * @var CKEditor_Connector_Utils_XmlNode
+     * @access private
+     */
+    var $_errorNode;
+
+    function CKEditor_Connector_Core_Xml()
+    {
+        $this->sendXmlHeaders();
+        echo $this->getXMLDeclaration();
+        $this->_connectorNode = new CKEditor_Connector_Utils_XmlNode("Connector");
+        $this->_errorNode = new CKEditor_Connector_Utils_XmlNode("Error");
+        $this->_connectorNode->addChild($this->_errorNode);
+    }
+
+    /**
+     * Return connector node
+     *
+     * @return CKEditor_Connector_Utils_XmlNode
+     * @access public
+     */
+    function &getConnectorNode()
+    {
+        return $this->_connectorNode;
+    }
+
+    /**
+     * Return error node
+     *
+     * @return CKEditor_Connector_Utils_XmlNode
+     * @access public
+     */
+    function &getErrorNode()
+    {
+        return $this->_errorNode;
+    }
+
+    /**
+     * Send XML headers to the browser (and force browser not to use cache)
+     * @access private
+     */
+    function sendXmlHeaders()
+    {
+        // Prevent the browser from caching the result.
+        // Date in the past
+        header('Expires: Mon, 26 Jul 1997 05:00:00 GMT') ;
+        // always modified
+        header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT') ;
+        // HTTP/1.1
+        header('Cache-Control: no-store, no-cache, must-revalidate') ;
+        header('Cache-Control: post-check=0, pre-check=0', false) ;
+        // HTTP/1.0
+        header('Pragma: no-cache') ;
+
+        // Set the response format.
+        header( 'Content-Type:text/xml; charset=utf-8' ) ;
+    }
+
+    /**
+     * Return XML declaration
+     *
+     * @access private
+     * @return string
+     */
+    function getXMLDeclaration()
+    {
+        return '<?xml version="1.0" encoding="utf-8"?>';
+    }
+
+    /**
+     * Send error message to the browser. If error number is set to 1, $text (custom error message) will be displayed
+     * Don't call this function directly
+     *
+     * @access public
+     * @param int $number error number
+     * @param string $text Custom error message (optional)
+     */
+    function raiseError( $number, $text = false)
+    {
+        $this->_errorNode->addAttribute("number", intval($number));
+        if (false!=$text) {
+            $this->_errorNode->addAttribute("text", $text);
+        }
+
+        echo $this->_connectorNode->asXML();
+    }
+}
+ No newline at end of file

_source/plugins/filebrowser/core/connector/php/php4/ErrorHandler/Base.php

@@ +1 @@
+<?php
+/*
+* Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved.
+* For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+/**
+ * @package CKEditor
+ * @subpackage ErrorHandler
+ */
+
+/**
+ * Basic error handler
+ *
+ * @package CKEditor
+ * @subpackage ErrorHandler
+ */
+class CKEditor_Connector_ErrorHandler_Base
+{
+    /**
+     * Try/catch emulation, if set to true, error handler will not throw any error
+     *
+     * @var boolean
+     * @access protected
+     */
+    var $_catchAllErrors = false;
+    /**
+     * Array with error numbers that should be ignored
+     *
+     * @var array[]int
+     * @access protected
+     */
+    var $_skipErrorsArray = array();
+
+    /**
+     * Set whether all errors should be ignored
+     *
+     * @param boolean $newValue
+     * @access public
+     */
+    function setCatchAllErros($newValue)
+    {
+        $this->_catchAllErrors = $newValue ? true : false;
+    }
+
+    /**
+     * Set which errors should be ignored
+     *
+     * @param array $newArray
+     */
+    function setSkipErrorsArray($newArray)
+    {
+        if (is_array($newArray)) {
+            $this->_skipErrorsArray = $newArray;
+        }
+    }
+
+    /**
+     * Throw connector error, return true if error has been thrown, false if error has been catched
+     *
+     * @param int $number
+     * @param string $text
+     * @access public
+     */
+    function throwError($number, $text = false)
+    {
+        if ($this->_catchAllErrors || in_array($number, $this->_skipErrorsArray)) {
+            return false;
+        }
+
+        $_xml =& CKEditor_Connector_Core_Factory::getInstance("Core_Xml");
+        $_xml->raiseError($number,$text);
+
+        exit;
+    }
+}
+ No newline at end of file

_source/plugins/filebrowser/core/connector/php/php4/ErrorHandler/FileUpload.php

@@ +1 @@
+<?php
+/*
+* Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved.
+* For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+/**
+ * @package CKEditor
+ * @subpackage ErrorHandler
+ */
+
+/**
+ * Include base error handling class
+ */
+require_once CKEDITOR_CONNECTOR_LIB_DIR . "/ErrorHandler/Base.php";
+
+/**
+ * File upload error handler
+ *
+ * @package CKEditor
+ * @subpackage ErrorHandler
+ */
+class CKEditor_Connector_ErrorHandler_FileUpload extends CKEditor_Connector_ErrorHandler_Base
+{
+    /**
+     * Throw file upload error, return true if error has been thrown, false if error has been catched
+     *
+     * @param int $number
+     * @param string $text
+     * @access public
+     */
+    function throwError($number, $text = false, $exit = true)
+    {
+        if ($this->_catchAllErrors || in_array($number, $this->_skipErrorsArray)) {
+            return false;
+        }
+
+        $oRegistry =& CKEditor_Connector_Core_Factory::getInstance("Core_Registry");
+        $sFileName = $oRegistry->get("FileUpload_fileName");
+
+        echo "<script type=\"text/javascript\">";
+        if (empty($text)) {
+            echo "window.parent.OnUploadCompleted(" . $number . ") ;";
+        }
+        else {
+            echo "window.parent.OnUploadCompleted(" . $number . ",'" . str_replace("'", "\\'", $sFileName) . "') ;";
+        }
+        echo "</script>";
+
+        if ($exit) {
+            exit;
+        }
+    }
+}
+ No newline at end of file

_source/plugins/filebrowser/core/connector/php/php4/ErrorHandler/Http.php

@@ +1 @@
+<?php
+/*
+* Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved.
+* For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+/**
+ * @package CKEditor
+ * @subpackage ErrorHandler
+ */
+
+/**
+ * Include base error handling class
+ */
+require_once CKEDITOR_CONNECTOR_LIB_DIR . "/ErrorHandler/Base.php";
+
+/**
+ * HTTP error handler
+ *
+ * @package CKEditor
+ * @subpackage ErrorHandler
+ */
+class CKEditor_Connector_ErrorHandler_Http extends CKEditor_Connector_ErrorHandler_Base
+{
+    /**
+     * Throw file upload error, return true if error has been thrown, false if error has been catched
+     *
+     * @param int $number
+     * @param string $text
+     * @access public
+     */
+    function throwError($number, $text = false, $exit = true)
+    {
+        if ($this->_catchAllErrors || in_array($number, $this->_skipErrorsArray)) {
+            return false;
+        }
+
+        switch ($number)
+        {
+            case CKEDITOR_CONNECTOR_ERROR_INVALID_REQUEST:
+            case CKEDITOR_CONNECTOR_ERROR_INVALID_NAME:
+            case CKEDITOR_CONNECTOR_ERROR_UNAUTHORIZED:
+                header("HTTP/1.0 403 Forbidden");
+                header("X-CKEditor-Error: ". $number);
+                break;
+
+            case CKEDITOR_CONNECTOR_ERROR_ACCESS_DENIED:
+                header("HTTP/1.0 500 Internal Server Error");
+                header("X-CKEditor-Error: ".$number);
+                break;
+
+            default:
+                header("HTTP/1.0 404 Not Found");
+                header("X-CKEditor-Error: ". $number);
+                break;
+        }
+
+        if ($exit) {
+            exit;
+        }
+    }
+}
+ No newline at end of file

_source/plugins/filebrowser/core/connector/php/php4/ErrorHandler/QuickUpload.php

@@ +1 @@
+<?php
+/*
+* Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved.
+* For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+/**
+ * @package CKEditor
+ * @subpackage ErrorHandler
+ */
+
+/**
+ * Include base error handling class
+ */
+require_once CKEDITOR_CONNECTOR_LIB_DIR . "/ErrorHandler/Base.php";
+
+/**
+ * File upload error handler
+ *
+ * @package CKEditor
+ * @subpackage ErrorHandler
+ */
+class CKEditor_Connector_ErrorHandler_QuickUpload extends CKEditor_Connector_ErrorHandler_Base
+{
+    /**
+     * Throw file upload error, return true if error has been thrown, false if error has been catched
+     *
+     * @param int $number
+     * @param string $text
+     * @access public
+     */
+    function throwError($number, $text = false, $exit = true)
+    {
+        if ($this->_catchAllErrors || in_array($number, $this->_skipErrorsArray)) {
+            return false;
+        }
+
+        $oRegistry =& CKEditor_Connector_Core_Factory::getInstance("Core_Registry");
+        $sFileName = $oRegistry->get("FileUpload_fileName");
+        $sFileUrl = $oRegistry->get("FileUpload_url");
+
+        echo "<script type=\"text/javascript\">";
+        if (empty($text)) {
+            echo "window.parent.OnUploadCompleted(" . $number . ", '', '', '') ;";
+        }
+        else {
+            echo "window.parent.OnUploadCompleted(" . $number . ", '" .str_replace("'", "\\'", $sFileUrl . $sFileName). "', '" . str_replace("'", "\\'", $sFileName) . "', '') ;";
+        }
+        echo "</script>";
+
+        if ($exit) {
+            exit;
+        }
+    }
+}
+ No newline at end of file

_source/plugins/filebrowser/core/connector/php/php4/Utils/FileSystem.php

@@ +1 @@
+<?php
+/*
+* Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved.
+* For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+/**
+ * @package CKEditor
+ * @subpackage Utils
+ */
+
+/**
+ * @package CKEditor
+ * @subpackage Utils
+ */
+class CKEditor_Connector_Utils_FileSystem
+{
+
+    /**
+     * This function behaves similar to System.IO.Path.Combine in C#, the only diffrenece is that it also accepts null values and treat them as empty string
+     *
+     * @static
+     * @access public
+     * @param string $path1 first path
+     * @param string $path2 scecond path
+     * @return string
+     */
+    function combinePaths($path1, $path2)
+    {
+        if (is_null($path1))  {
+            $path1 = "";
+        }
+        if (is_null($path2))  {
+            $path2 = "";
+        }
+        if (!strlen($path2)) {
+            if (strlen($path1)) {
+                $_lastCharP1 = substr($path1, -1, 1);
+                if ($_lastCharP1 != "/" && $_lastCharP1 != "\\") {
+                    $path1 .= DIRECTORY_SEPARATOR;
+                }
+            }
+        }
+        else {
+            $_firstCharP2 = substr($path2, 0, 1);
+            if (strlen($path1)) {
+                if (strpos($path2, $path1)===0) {
+                    return $path2;
+                }
+                $_lastCharP1 = substr($path1, -1, 1);
+                if ($_lastCharP1 != "/" && $_lastCharP1 != "\\" && $_firstCharP2 != "/" && $_firstCharP2 != "\\") {
+                    $path1 .= DIRECTORY_SEPARATOR;
+                }
+            }
+            else {
+                return $path2;
+            }
+        }
+        return $path1 . $path2;
+    }
+
+    /**
+     * Check whether $fileName is a valid file name, return true on success
+     *
+     * @static
+     * @access public
+     * @param string $fileName
+     * @return boolean
+     */
+    function checkFileName($fileName)
+    {
+        if (is_null($fileName) || !strlen($fileName) || substr($fileName,-1,1)=="." || false!==strpos($fileName, "..")) {
+            return false;
+        }
+
+        if (preg_match(",[[:cntrl:]]|[/\\:\*\?\"\<\>\|],", $fileName)) {
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Unlink file/folder
+     *
+     * @static
+     * @access public
+     * @param string $path
+     * @return boolean
+     */
+    function unlink($path)
+    {
+        /*    make sure the path exists    */
+        if (!file_exists($path)) {
+            return false;
+        }
+
+        /*    If it is a file or link, just delete it    */
+        if (is_file($path) || is_link($path)) {
+            return @unlink($path);
+        }
+
+        /*    Scan the dir and recursively unlink    */
+        $files = scandir($path);
+        if ($files) {
+            foreach($files as $filename)
+            {
+                if ($filename == '.' || $filename == '..') {
+                    continue;
+                }
+                $file = str_replace('//','/',$path.'/'.$filename);
+                CKEditor_Connector_Utils_FileSystem::unlink($file);
+            }
+        }
+
+        /*    Remove the parent dir    */
+        if (!@rmdir($path)) {
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Return file name without extension (without dot & last part after dot)
+     *
+     * @static
+     * @access public
+     * @param string $fileName
+     * @return string
+     */
+    function getFileNameWithoutExtension($fileName)
+    {
+        $dotPos = strrpos( $fileName, '.' );
+        if (false === $dotPos) {
+            return $fileName;
+        }
+
+        return substr($fileName, 0, $dotPos);
+    }
+
+    /**
+     * Get file extension (only last part - e.g. extension of file.foo.bar.jpg = jpg)
+     *
+     * @static
+     * @access public
+     * @param string $fileName
+     * @return string
+     */
+    function getExtension( $fileName )
+    {
+        $dotPos = strrpos( $fileName, '.' );
+        if (false === $dotPos) {
+            return "";
+        }
+
+        return substr( $fileName, strrpos( $fileName, '.' ) +1 ) ;
+    }
+
+    /**
+     * Convert file name from UTF-8 to system encoding
+     *
+     * @static
+     * @access public
+     * @param string $fileName
+     * @return string
+     */
+    function convertToFilesystemEncoding($fileName)
+    {
+        $_config =& CKEditor_Connector_Core_Factory::getInstance("Core_Config");
+        $encoding = $_config->getFilesystemEncoding();
+        if (is_null($encoding) || strcasecmp($encoding, "UTF-8") == 0 || strcasecmp($encoding, "UTF8") == 0) {
+            return $fileName;
+        }
+
+        if (!function_exists("iconv")) {
+            if (strcasecmp($encoding, "ISO-8859-1") == 0 || strcasecmp($encoding, "ISO8859-1") == 0 || strcasecmp($encoding, "Latin1") == 0) {
+                return str_replace("\0", "_", utf8_decode($fileName));
+            } else if (function_exists('mb_convert_encoding')) {
+                /**
+                 * @todo check whether charset is supported - mb_list_encodings
+                 */
+                $encoded = @mb_convert_encoding($fileName, $encoding, 'UTF-8');
+                if (@mb_strlen($fileName, "UTF-8") != @mb_strlen($encoded, $encoding)) {
+                    return str_replace("\0", "_", preg_replace("/[^[:ascii:]]/u","_",$fileName));
+                }
+                else {
+                    return str_replace("\0", "_", $encoded);
+                }
+            } else {
+                return str_replace("\0", "_", preg_replace("/[^[:ascii:]]/u","_",$fileName));
+            }
+        }
+
+        $converted = @iconv("UTF-8", $encoding . "//IGNORE//TRANSLIT", $fileName);
+        if ($converted === false) {
+            return str_replace("\0", "_", preg_replace("/[^[:ascii:]]/u","_",$fileName));
+        }
+
+        return $converted;
+    }
+
+    /**
+     * Convert file name from system encoding into UTF-8
+     *
+     * @static
+     * @access public
+     * @param string $fileName
+     * @return string
+     */
+    function convertToConnectorEncoding($fileName)
+    {
+        $_config =& CKEditor_Connector_Core_Factory::getInstance("Core_Config");
+        $encoding = $_config->getFilesystemEncoding();
+        if (is_null($encoding) || strcasecmp($encoding, "UTF-8") == 0 || strcasecmp($encoding, "UTF8") == 0) {
+            return $fileName;
+        }
+
+        if (!function_exists("iconv")) {
+            if (strcasecmp($encoding, "ISO-8859-1") == 0 || strcasecmp($encoding, "ISO8859-1") == 0 || strcasecmp($encoding, "Latin1") == 0) {
+                return utf8_encode($fileName);
+            } else {
+                return $fileName;
+            }
+        }
+
+        $converted = @iconv($encoding, "UTF-8", $fileName);
+
+        if ($converted === false) {
+            return $fileName;
+        }
+
+        return $converted;
+    }
+
+    /**
+     * Find document root
+     *
+     * @return string
+     * @access public
+     */
+    function getDocumentRootPath()
+    {
+        /**
+         * The absolute pathname of the currently executing script.
+         * If a script is executed with the CLI, as a relative path, such as file.php or ../file.php,
+         * $_SERVER['SCRIPT_FILENAME'] will contain the relative path specified by the user.
+         */
+        if (isset($_SERVER['SCRIPT_FILENAME'])) {
+            $sRealPath = dirname($_SERVER['SCRIPT_FILENAME']);
+        }
+        else {
+            /**
+             * realpath — Returns canonicalized absolute pathname
+             */
+            $sRealPath = realpath( './' ) ;
+        }
+
+        /**
+         * The filename of the currently executing script, relative to the document root.
+         * For instance, $_SERVER['PHP_SELF'] in a script at the address http://example.com/test.php/foo.bar
+         * would be /test.php/foo.bar.
+         */
+        $sSelfPath = dirname($_SERVER['PHP_SELF']);
+
+        return substr($sRealPath, 0, strlen($sRealPath) - strlen($sSelfPath));
+    }
+
+    /**
+     * Create directory recursively
+     *
+     * @access public
+     * @static
+     * @param string $dir
+     * @return boolean
+     */
+    function createDirectoryRecursively($dir)
+    {
+        if (DIRECTORY_SEPARATOR === "\\") {
+            $dir = str_replace("/", "\\", $dir);
+        }
+        else if (DIRECTORY_SEPARATOR === "/") {
+            $dir = str_replace("\\", "/", $dir);
+        }
+
+        $_config =& CKEditor_Connector_Core_Factory::getInstance("Core_Config");
+        if ($perms = $_config->getChmodFolders()) {
+            $oldUmask = umask(0);
+            $bCreated = @mkdir($dir, $perms, true);
+            umask($oldUmask);
+        }
+        else {
+            $bCreated = @mkdir($dir, 0777, true);
+        }
+
+        return $bCreated;
+    }
+
+    /**
+     * Detect HTML in the first KB to prevent against potential security issue with
+     * IE/Safari/Opera file type auto detection bug.
+     * Returns true if file contain insecure HTML code at the beginning.
+     *
+     * @static
+     * @access public
+     * @param string $filePath absolute path to file
+     * @return boolean
+    */
+    function detectHtml($filePath)
+    {
+        $fp = @fopen($filePath, 'rb');
+        if ( $fp === false || !flock( $fp, LOCK_SH ) ) {
+            return -1 ;
+        }
+        $chunk = fread($fp, 1024);
+        flock( $fp, LOCK_UN ) ;
+        fclose($fp);
+
+        $chunk = strtolower($chunk);
+
+        if (!$chunk) {
+            return false;
+        }
+
+        $chunk = trim($chunk);
+
+        if (preg_match("/<!DOCTYPE\W*X?HTML/sim", $chunk)) {
+            return true;
+        }
+
+        $tags = array('<body', '<head', '<html', '<img', '<pre', '<script', '<table', '<title');
+
+        foreach( $tags as $tag ) {
+            if (false !== strpos($chunk, $tag)) {
+                return true ;
+            }
+        }
+
+        //type = javascript
+        if (preg_match('!type\s*=\s*[\'"]?\s*(?:\w*/)?(?:ecma|java)!sim', $chunk)) {
+            return true ;
+        }
+
+        //href = javascript
+        //src = javascript
+        //data = javascript
+        if (preg_match('!(?:href|src|data)\s*=\s*[\'"]?\s*(?:ecma|java)script:!sim',$chunk)) {
+            return true ;
+        }
+
+        //url(javascript
+        if (preg_match('!url\s*\(\s*[\'"]?\s*(?:ecma|java)script:!sim', $chunk)) {
+            return true ;
+        }
+
+        return false ;
+    }
+
+    /**
+     * Check file content.
+     * Currently this function validates only image files.
+     * Returns false if file is invalid.
+     *
+     * @static
+     * @access public
+     * @param string $filePath absolute path to file
+     * @param string $extension file extension
+     * @param integer $detectionLevel 0 = none, 1 = use getimagesize for images, 2 = use DetectHtml for images
+     * @return boolean
+    */
+    function isImageValid($filePath, $extension)
+    {
+        if (!@is_readable($filePath)) {
+            return -1;
+        }
+
+        $imageCheckExtensions = array('gif', 'jpeg', 'jpg', 'png', 'psd', 'bmp', 'tiff');
+
+        // version_compare is available since PHP4 >= 4.0.7
+        if ( function_exists( 'version_compare' ) ) {
+            $sCurrentVersion = phpversion();
+            if ( version_compare( $sCurrentVersion, "4.2.0" ) >= 0 ) {
+                $imageCheckExtensions[] = "tiff";
+                $imageCheckExtensions[] = "tif";
+            }
+            if ( version_compare( $sCurrentVersion, "4.3.0" ) >= 0 ) {
+                $imageCheckExtensions[] = "swc";