diff --git a/browse.php b/browse.php index 0d00fd8..e15b228 100644 --- a/browse.php +++ b/browse.php @@ -4,7 +4,7 @@ * * @desc Browser calling script * @package KCFinder - * @version 2.52 + * @version 2.53 * @author Pavel Tzonkov * @copyright 2010-2014 KCFinder Project * @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2 diff --git a/config.php b/config.php index 4b0c005..d3048d8 100644 --- a/config.php +++ b/config.php @@ -4,7 +4,7 @@ * * @desc Base configuration file * @package KCFinder - * @version 2.52 + * @version 2.53 * @author Pavel Tzonkov * @copyright 2010-2014 KCFinder Project * @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2 @@ -21,7 +21,7 @@ // GENERAL SETTINGS - 'disabled' => false, + 'disabled' => true, 'theme' => "oxygen", 'uploadURL' => "upload", 'uploadDir' => "", diff --git a/core/autoload.php b/core/autoload.php index ae2f4df..550367f 100644 --- a/core/autoload.php +++ b/core/autoload.php @@ -4,7 +4,7 @@ * * @desc This file is included first, before each other * @package KCFinder - * @version 2.52 + * @version 2.53 * @author Pavel Tzonkov * @copyright 2010-2014 KCFinder Project * @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2 diff --git a/core/browser.php b/core/browser.php index 370fc88..553d5ed 100644 --- a/core/browser.php +++ b/core/browser.php @@ -4,7 +4,7 @@ * * @desc Browser actions class * @package KCFinder - * @version 2.52 + * @version 2.53 * @author Pavel Tzonkov * @copyright 2010-2014 KCFinder Project * @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2 diff --git a/core/types/type_img.php b/core/types/type_img.php index a2089b8..cbdb651 100644 --- a/core/types/type_img.php +++ b/core/types/type_img.php @@ -4,7 +4,7 @@ * * @desc Image detection class * @package KCFinder - * @version 2.52 + * @version 2.53 * @author Pavel Tzonkov * @copyright 2010-2014 KCFinder Project * @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2 diff --git a/core/types/type_mime.php b/core/types/type_mime.php index 0b9a0d0..1484031 100644 --- a/core/types/type_mime.php +++ b/core/types/type_mime.php @@ -4,7 +4,7 @@ * * @desc MIME type detection class * @package KCFinder - * @version 2.52 + * @version 2.53 * @author Pavel Tzonkov * @copyright 2010-2014 KCFinder Project * @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2 diff --git a/core/uploader.php b/core/uploader.php index 42414fc..c45d915 100644 --- a/core/uploader.php +++ b/core/uploader.php @@ -4,7 +4,7 @@ * * @desc Uploader class * @package KCFinder - * @version 2.52 + * @version 2.53 * @author Pavel Tzonkov * @copyright 2010-2014 KCFinder Project * @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2 @@ -15,7 +15,7 @@ class uploader { /** Release version */ - const VERSION = "2.52"; + const VERSION = "2.53"; /** Config session-overrided settings * @var array */ diff --git a/css.php b/css.php index fcf0830..4df71ba 100644 --- a/css.php +++ b/css.php @@ -4,7 +4,7 @@ * * @desc Base CSS definitions * @package KCFinder - * @version 2.52 + * @version 2.53 * @author Pavel Tzonkov * @copyright 2010-2014 KCFinder Project * @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2 diff --git a/doc/Changelog b/doc/Changelog index 4191861..2944c78 100644 --- a/doc/Changelog +++ b/doc/Changelog @@ -1,3 +1,15 @@ +VERSION 2.53 - 2014-02-22 +------------------------- +* Session start fix +* TinyMCE 4 support + + +VERSION 2.52 - 2014-01-20 +------------------------- +* Various image drivers support (gd, imagemagick, graphicsmagic) +* Auto-rotate images based on EXIF data +* PNG watermark support + VERSION 2.51 - 2010-08-25 ------------------------- diff --git a/doc/README b/doc/README index 2ddaad8..556da26 100644 --- a/doc/README +++ b/doc/README @@ -1,4 +1,4 @@ -[===========================< KCFinder 2.52 >================================] +[===========================< KCFinder 2.53 >================================] [ ] [ Copyright 2010-2014 KCFinder Project ] [ http://kcfinder.sunhater.com ] @@ -7,72 +7,10 @@ [============================================================================] -I. DESCRIPTION +KCFinder free open-source alternative to the CKFinder Web file manager. It can +be integrated into FCKeditor, CKEditor, and TinyMCE WYSIWYG web editors or +your custom web applications to upload and manage images, flash movies, and +other files that can be embedded in an editor's generated HTML content. Only +PHP server-side scripting is supported. - KCFinder free open-source alternative to the CKFinder Web file manager. It - can be integrated into FCKeditor, CKEditor, and TinyMCE WYSIWYG web - editors or your custom web applications to upload and manage images, flash - movies, and other files that can be embedded in an editor's generated HTML - content. Only PHP server-side scripting is supported. - - -II. FEATURES - - 1. Ajax engine with JSON responses. - - 2. Easy to integrate and configure in web applications. - - 3. Clipboard for copy and move multiple files - - 4. Select multiple files with Ctrl key - - 5. Download multiple files or a folder as ZIP file - - 6. Resize bigger uploaded images. Configurable maximum image resolution. - - 7. Configurable thumbnail resolution. - - 8. Visual themes. - - 9. Multilanguage system. - - 10. Slideshow. - - 11. Multiple files upload (ala Facebook) - - 12. Drag and drop uploading - - -III. REQUIREMENTS - - 1. Web server (only Apache 2 is well tested) - - 2. PHP 5.x.x. with GD extension. Safe mode should be disabled. To work - with client-side HTTP cache, the PHP must be installed as Apache - module. - - 3. PHP ZIP extension for multiple files download. If it's not available, - KCFinder will work but without this feature. - - 4. PHP Fileinfo extension if you want to check file's MIME type before - moving to upload directory. PHP versions lesser than 5.3 needs to - install Fileinfo PECL extension: http://pecl.php.net/package/Fileinfo - - 5. Modern browser (not IE6!). - - -IV. INSTALLATION - - See http://kcfinder.sunhater.com/install - - -V. USED 3RD PARTY SOFTWARE - - 1. jQuery JavaScript library v1.4.2 - http://www.jquery.com - - 2. jQuery Right-Click Plugin v1.01 - http://abeautifulsite.net/notebook/68 - - 3. jquery.event.drag Plugin v2.0.0 - http://threedubmedia.com/code/event/drag - - 4. In realization of "oxygen" theme were used icons and color schemes of - default KDE4 theme - http://www.kde.org +More information available at http://kcfinder.sunhater.com \ No newline at end of file diff --git a/integration/drupal.php b/integration/drupal.php index 9791138..7f80a09 100644 --- a/integration/drupal.php +++ b/integration/drupal.php @@ -4,7 +4,7 @@ * * @desc CMS integration code: Drupal * @package KCFinder - * @version 2.52 + * @version 2.53 * @author Dany Alejandro Cabrera * @copyright 2010-2014 KCFinder Project * @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2 diff --git a/js/browser/0bject.js b/js/browser/0bject.js index 521b1e4..b66e244 100644 --- a/js/browser/0bject.js +++ b/js/browser/0bject.js @@ -4,7 +4,7 @@ * * @desc Base JavaScript object properties * @package KCFinder - * @version 2.52 + * @version 2.53 * @author Pavel Tzonkov * @copyright 2010-2014 KCFinder Project * @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2 diff --git a/js/browser/clipboard.js b/js/browser/clipboard.js index c97af84..20491c6 100644 --- a/js/browser/clipboard.js +++ b/js/browser/clipboard.js @@ -4,7 +4,7 @@ * * @desc Clipboard functionality * @package KCFinder - * @version 2.52 + * @version 2.53 * @author Pavel Tzonkov * @copyright 2010-2014 KCFinder Project * @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2 diff --git a/js/browser/dropUpload.js b/js/browser/dropUpload.js index f7e28f8..b6847cd 100644 --- a/js/browser/dropUpload.js +++ b/js/browser/dropUpload.js @@ -4,7 +4,7 @@ * * @desc Upload files using drag and drop * @package KCFinder - * @version 2.52 + * @version 2.53 * @author Forum user (updated by Pavel Tzonkov) * @copyright 2010-2014 KCFinder Project * @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2 diff --git a/js/browser/files.js b/js/browser/files.js index 2d7707c..318fa2d 100644 --- a/js/browser/files.js +++ b/js/browser/files.js @@ -4,7 +4,7 @@ * * @desc File related functionality * @package KCFinder - * @version 2.52 + * @version 2.53 * @author Pavel Tzonkov * @copyright 2010-2014 KCFinder Project * @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2 @@ -159,7 +159,12 @@ browser.returnFile = function(file) { ? file : browser.uploadURL + '/' + browser.dir + '/' + file.data('name'); fileURL = _.escapeDirs(fileURL); - if (this.opener.CKEditor) { + if (this.opener.TinyMCE4) { + var win = window.opener ? window.opener : window.parent; + $(win.document).find('#' + this.opener.TinyMCE4).val(fileURL); + win.tinyMCE.activeEditor.windowManager.close(); + + } else if (this.opener.CKEditor) { this.opener.CKEditor.object.tools.callFunction(this.opener.CKEditor.funcNum, fileURL, ''); window.close(); diff --git a/js/browser/folders.js b/js/browser/folders.js index e170cc4..299fbfc 100644 --- a/js/browser/folders.js +++ b/js/browser/folders.js @@ -4,7 +4,7 @@ * * @desc Folder related functionality * @package KCFinder - * @version 2.52 + * @version 2.53 * @author Pavel Tzonkov * @copyright 2010-2014 KCFinder Project * @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2 diff --git a/js/browser/init.js b/js/browser/init.js index ab8df3d..76cc67d 100644 --- a/js/browser/init.js +++ b/js/browser/init.js @@ -4,7 +4,7 @@ * * @desc Object initializations * @package KCFinder - * @version 2.52 + * @version 2.53 * @author Pavel Tzonkov * @copyright 2010-2014 KCFinder Project * @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2 @@ -30,6 +30,7 @@ browser.init = function() { return false; }); this.initOpeners(); + console.log(this.opener); this.initSettings(); this.initContent(); this.initToolbar(); @@ -77,6 +78,9 @@ browser.initOpeners = function() { this.opener.CKEditor = null; } + if (this.opener.name && (this.opener.name == "tinymce4")) + this.opener.callBack = true; + if (!this.opener.CKEditor && !this.opener.FCKEditor && !this.TinyMCE) { if ((window.opener && window.opener.KCFinder && window.opener.KCFinder.callBack) || (window.parent && window.parent.KCFinder && window.parent.KCFinder.callBack) diff --git a/js/browser/joiner.php b/js/browser/joiner.php index f587098..3006f8a 100644 --- a/js/browser/joiner.php +++ b/js/browser/joiner.php @@ -4,7 +4,7 @@ * * @desc Join all JavaScript files in current directory * @package KCFinder - * @version 2.52 + * @version 2.53 * @author Pavel Tzonkov * @copyright 2010-2014 KCFinder Project * @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2 diff --git a/js/browser/misc.js b/js/browser/misc.js index 5c1a6d8..18d0848 100644 --- a/js/browser/misc.js +++ b/js/browser/misc.js @@ -4,7 +4,7 @@ * * @desc Miscellaneous functionality * @package KCFinder - * @version 2.52 + * @version 2.53 * @author Pavel Tzonkov * @copyright 2010-2014 KCFinder Project * @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2 diff --git a/js/browser/settings.js b/js/browser/settings.js index 30f98b6..94020d0 100644 --- a/js/browser/settings.js +++ b/js/browser/settings.js @@ -4,7 +4,7 @@ * * @desc Settings panel functionality * @package KCFinder - * @version 2.52 + * @version 2.53 * @author Pavel Tzonkov * @copyright 2010-2014 KCFinder Project * @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2 diff --git a/js/browser/toolbar.js b/js/browser/toolbar.js index e3fc3d7..4051afd 100644 --- a/js/browser/toolbar.js +++ b/js/browser/toolbar.js @@ -4,7 +4,7 @@ * * @desc Toolbar functionality * @package KCFinder - * @version 2.52 + * @version 2.53 * @author Pavel Tzonkov * @copyright 2010-2014 KCFinder Project * @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2 diff --git a/js/helper.js b/js/helper.js index 264afb6..78f254a 100644 --- a/js/helper.js +++ b/js/helper.js @@ -2,7 +2,7 @@ * * @desc Helper object * @package KCFinder - * @version 2.52 + * @version 2.53 * @author Pavel Tzonkov * @copyright 2010-2014 KCFinder Project * @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2 diff --git a/js_localize.php b/js_localize.php index 94235b2..edf294c 100644 --- a/js_localize.php +++ b/js_localize.php @@ -4,7 +4,7 @@ * * @desc Load language labels into JavaScript * @package KCFinder - * @version 2.52 + * @version 2.53 * @author Pavel Tzonkov * @copyright 2010-2014 KCFinder Project * @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2 diff --git a/lang/en.php b/lang/en.php index c311c7a..ab0b79f 100644 --- a/lang/en.php +++ b/lang/en.php @@ -4,7 +4,7 @@ * * @desc Default English localization * @package KCFinder - * @version 2.52 + * @version 2.53 * @author Pavel Tzonkov * @copyright 2010-2014 KCFinder Project * @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2 diff --git a/lang/pt.php b/lang/pt.php index f0c7f04..dfcd2dd 100644 --- a/lang/pt.php +++ b/lang/pt.php @@ -41,7 +41,7 @@ "Falta a pasta temporária.", "Failed to write file." => - "Não foi possÃvel guardar o ficheiro.", + "Não foi poss�vel guardar o ficheiro.", "Denied file extension." => "Extensão do ficheiro inválida.", @@ -53,25 +53,25 @@ "A imagem é muito grande e não pode ser redimensionada.", "Cannot create {dir} folder." => - "Não foi possÃvel criar a pasta '{dir}'.", + "Não foi poss�vel criar a pasta '{dir}'.", "Cannot write to upload folder." => - "Não foi possÃvel guardar o ficheiro.", + "Não foi poss�vel guardar o ficheiro.", "Cannot read .htaccess" => - "Não foi possÃvel ler o ficheiro '.htaccess'.", + "Não foi poss�vel ler o ficheiro '.htaccess'.", "Incorrect .htaccess file. Cannot rewrite it!" => - "Ficheiro '.htaccess' incorrecto. Não foi possÃvel altera-lo.", + "Ficheiro '.htaccess' incorrecto. Não foi poss�vel altera-lo.", "Cannot read upload folder." => - "Não foi possÃvel ler a pasta de upload.", + "Não foi poss�vel ler a pasta de upload.", "Cannot access or create thumbnails folder." => - "Não foi possÃvel aceder ou criar a pasta de miniaturas.", + "Não foi poss�vel aceder ou criar a pasta de miniaturas.", "Cannot access or write to upload folder." => - "Não foi possÃvel aceder ou criar a pasta de upload.", + "Não foi poss�vel aceder ou criar a pasta de upload.", "Please enter new folder name." => "Por favor insira o nome da pasta.", @@ -80,7 +80,7 @@ "Caracteres não autorizados no nome da pasta.", "Folder name shouldn't begins with '.'" => - "O nome da pasta não deve começar por '.'.", + "O nome da pasta não deve come�ar por '.'.", "Please enter new file name." => "Por favor defina o nome do ficheiro.", @@ -89,7 +89,7 @@ "Caracteres não autorizados no nome do ficheiro.", "File name shouldn't begins with '.'" => - "O nome do ficheiro não deve começar por '.'.", + "O nome do ficheiro não deve come�ar por '.'.", "Are you sure you want to delete this file?" => "Tem a certeza que deseja apagar este ficheiro?", @@ -98,7 +98,7 @@ "Tem a certeza que deseja apagar esta pasta e todos os seus conteúdos?", "Inexistant or inaccessible folder." => - "Pasta inexistente ou inacessÃvel.", + "Pasta inexistente ou inacess�vel.", "Undefined MIME types." => "Tipos MIME indefinidos.", diff --git a/lib/class_image.php b/lib/class_image.php index 8dec4c2..75929c7 100644 --- a/lib/class_image.php +++ b/lib/class_image.php @@ -4,7 +4,7 @@ * * @desc Abstract image driver class * @package KCFinder - * @version 2.52 + * @version 2.53 * @author Pavel Tzonkov * @copyright 2010-2014 KCFinder Project * @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2 diff --git a/lib/class_image_gd.php b/lib/class_image_gd.php index a79bd79..6a88ff8 100644 --- a/lib/class_image_gd.php +++ b/lib/class_image_gd.php @@ -4,7 +4,7 @@ * * @desc GD image driver class * @package KCFinder - * @version 2.52 + * @version 2.53 * @author Pavel Tzonkov * @copyright 2010-2014 KCFinder Project * @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2 diff --git a/lib/class_image_gmagick.php b/lib/class_image_gmagick.php index 7c7e02e..13c6cce 100644 --- a/lib/class_image_gmagick.php +++ b/lib/class_image_gmagick.php @@ -4,7 +4,7 @@ * * @desc GraphicsMagick image driver class * @package KCFinder - * @version 2.52 + * @version 2.53 * @author Pavel Tzonkov * @copyright 2010-2014 KCFinder Project * @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2 diff --git a/lib/class_image_imagick.php b/lib/class_image_imagick.php index d492769..0cf02a7 100644 --- a/lib/class_image_imagick.php +++ b/lib/class_image_imagick.php @@ -4,7 +4,7 @@ * * @desc ImageMagick image driver class * @package KCFinder - * @version 2.52 + * @version 2.53 * @author Pavel Tzonkov * @copyright 2010-2014 KCFinder Project * @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2 diff --git a/lib/class_input.php b/lib/class_input.php index 34e159a..d418f31 100644 --- a/lib/class_input.php +++ b/lib/class_input.php @@ -4,7 +4,7 @@ * * @desc Input class for GET, POST and COOKIE requests * @package KCFinder - * @version 2.52 + * @version 2.53 * @author Pavel Tzonkov * @copyright 2010-2014 KCFinder Project * @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2 diff --git a/lib/class_zipFolder.php b/lib/class_zipFolder.php index 124304f..fcf46f2 100644 --- a/lib/class_zipFolder.php +++ b/lib/class_zipFolder.php @@ -5,7 +5,7 @@ * * @desc Directory to ZIP file archivator * @package KCFinder - * @version 2.52 + * @version 2.53 * @author Pavel Tzonkov * @copyright 2010-2014 KCFinder Project * @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2 diff --git a/lib/helper_dir.php b/lib/helper_dir.php index a0a8689..d9328e8 100644 --- a/lib/helper_dir.php +++ b/lib/helper_dir.php @@ -4,7 +4,7 @@ * * @desc Directory helper class * @package KCFinder - * @version 2.52 + * @version 2.53 * @author Pavel Tzonkov * @copyright 2010-2014 KCFinder Project * @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2 diff --git a/lib/helper_file.php b/lib/helper_file.php index 3dceb95..e1f860f 100644 --- a/lib/helper_file.php +++ b/lib/helper_file.php @@ -4,7 +4,7 @@ * * @desc File helper class * @package KCFinder - * @version 2.52 + * @version 2.53 * @author Pavel Tzonkov * @copyright 2010-2014 KCFinder Project * @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2 diff --git a/lib/helper_httpCache.php b/lib/helper_httpCache.php index 9e51488..ea785f9 100644 --- a/lib/helper_httpCache.php +++ b/lib/helper_httpCache.php @@ -4,7 +4,7 @@ * * @desc HTTP cache helper class * @package KCFinder - * @version 2.52 + * @version 2.53 * @author Pavel Tzonkov * @copyright 2010-2014 KCFinder Project * @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2 diff --git a/lib/helper_path.php b/lib/helper_path.php index aeb87f6..352cf25 100644 --- a/lib/helper_path.php +++ b/lib/helper_path.php @@ -4,7 +4,7 @@ * * @desc Path helper class * @package KCFinder - * @version 2.52 + * @version 2.53 * @author Pavel Tzonkov * @copyright 2010-2014 KCFinder Project * @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2 diff --git a/lib/helper_text.php b/lib/helper_text.php index e9cbb83..9c392cd 100644 --- a/lib/helper_text.php +++ b/lib/helper_text.php @@ -4,7 +4,7 @@ * * @desc Text processing helper class * @package KCFinder - * @version 2.52 + * @version 2.53 * @author Pavel Tzonkov * @copyright 2010-2014 KCFinder Project * @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2 diff --git a/themes/oxygen/about.txt b/themes/oxygen/about.txt index 41cf073..6e7a56a 100644 --- a/themes/oxygen/about.txt +++ b/themes/oxygen/about.txt @@ -5,7 +5,7 @@ http://www.kde.org Theme Details: Project: KCFinder - http://kcfinder.sunhater.com -Version: 2.52 +Version: 2.53 Author: Pavel Tzonkov Licenses: GPLv2 - http://www.opensource.org/licenses/gpl-2.0.php LGPLv2 - http://www.opensource.org/licenses/lgpl-2.1.php diff --git a/tpl/tpl_javascript.php b/tpl/tpl_javascript.php index 0d8aeaa..6ae619b 100644 --- a/tpl/tpl_javascript.php +++ b/tpl/tpl_javascript.php @@ -32,6 +32,9 @@ opener['TinyMCE']) && $this->opener['TinyMCE']): ?> browser.opener.TinyMCE = true; +get['opener']) && ($this->get['opener'] == "tinymce4") && isset($this->get['field'])): ?> +browser.opener.TinyMCE4 = "get['field']) ?>"; + browser.cms = "cms) ?>"; _.kuki.domain = "config['cookieDomain']) ?>"; _.kuki.path = "config['cookiePath']) ?>"; diff --git a/upload.php b/upload.php index cf667e7..5eb1ab3 100644 --- a/upload.php +++ b/upload.php @@ -4,7 +4,7 @@ * * @desc Upload calling script * @package KCFinder - * @version 2.52 + * @version 2.53 * @author Pavel Tzonkov * @copyright 2010-2014 KCFinder Project * @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2