Skip to content
This repository has been archived by the owner on Feb 23, 2021. It is now read-only.

Commit

Permalink
2.53
Browse files Browse the repository at this point in the history
- Session start fix
- TinyMCE 4 support
  • Loading branch information
sunhater committed Feb 22, 2014
1 parent d829773 commit 1d0ba97
Show file tree
Hide file tree
Showing 39 changed files with 80 additions and 118 deletions.
2 changes: 1 addition & 1 deletion browse.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*
* @desc Browser calling script
* @package KCFinder
* @version 2.52
* @version 2.53
* @author Pavel Tzonkov <[email protected]>
* @copyright 2010-2014 KCFinder Project
* @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2
Expand Down
4 changes: 2 additions & 2 deletions config.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*
* @desc Base configuration file
* @package KCFinder
* @version 2.52
* @version 2.53
* @author Pavel Tzonkov <[email protected]>
* @copyright 2010-2014 KCFinder Project
* @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2
Expand All @@ -21,7 +21,7 @@

// GENERAL SETTINGS

'disabled' => false,
'disabled' => true,
'theme' => "oxygen",
'uploadURL' => "upload",
'uploadDir' => "",
Expand Down
2 changes: 1 addition & 1 deletion core/autoload.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*
* @desc This file is included first, before each other
* @package KCFinder
* @version 2.52
* @version 2.53
* @author Pavel Tzonkov <[email protected]>
* @copyright 2010-2014 KCFinder Project
* @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2
Expand Down
2 changes: 1 addition & 1 deletion core/browser.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*
* @desc Browser actions class
* @package KCFinder
* @version 2.52
* @version 2.53
* @author Pavel Tzonkov <[email protected]>
* @copyright 2010-2014 KCFinder Project
* @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2
Expand Down
2 changes: 1 addition & 1 deletion core/types/type_img.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*
* @desc Image detection class
* @package KCFinder
* @version 2.52
* @version 2.53
* @author Pavel Tzonkov <[email protected]>
* @copyright 2010-2014 KCFinder Project
* @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2
Expand Down
2 changes: 1 addition & 1 deletion core/types/type_mime.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*
* @desc MIME type detection class
* @package KCFinder
* @version 2.52
* @version 2.53
* @author Pavel Tzonkov <[email protected]>
* @copyright 2010-2014 KCFinder Project
* @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2
Expand Down
4 changes: 2 additions & 2 deletions core/uploader.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*
* @desc Uploader class
* @package KCFinder
* @version 2.52
* @version 2.53
* @author Pavel Tzonkov <[email protected]>
* @copyright 2010-2014 KCFinder Project
* @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2
Expand All @@ -15,7 +15,7 @@
class uploader {

/** Release version */
const VERSION = "2.52";
const VERSION = "2.53";

/** Config session-overrided settings
* @var array */
Expand Down
2 changes: 1 addition & 1 deletion css.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*
* @desc Base CSS definitions
* @package KCFinder
* @version 2.52
* @version 2.53
* @author Pavel Tzonkov <[email protected]>
* @copyright 2010-2014 KCFinder Project
* @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2
Expand Down
12 changes: 12 additions & 0 deletions doc/Changelog
Original file line number Diff line number Diff line change
@@ -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
-------------------------
Expand Down
76 changes: 7 additions & 69 deletions doc/README
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[===========================< KCFinder 2.52 >================================]
[===========================< KCFinder 2.53 >================================]
[ ]
[ Copyright 2010-2014 KCFinder Project ]
[ http://kcfinder.sunhater.com ]
Expand All @@ -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
2 changes: 1 addition & 1 deletion integration/drupal.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*
* @desc CMS integration code: Drupal
* @package KCFinder
* @version 2.52
* @version 2.53
* @author Dany Alejandro Cabrera <[email protected]>
* @copyright 2010-2014 KCFinder Project
* @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2
Expand Down
2 changes: 1 addition & 1 deletion js/browser/0bject.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*
* @desc Base JavaScript object properties
* @package KCFinder
* @version 2.52
* @version 2.53
* @author Pavel Tzonkov <[email protected]>
* @copyright 2010-2014 KCFinder Project
* @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2
Expand Down
2 changes: 1 addition & 1 deletion js/browser/clipboard.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*
* @desc Clipboard functionality
* @package KCFinder
* @version 2.52
* @version 2.53
* @author Pavel Tzonkov <[email protected]>
* @copyright 2010-2014 KCFinder Project
* @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2
Expand Down
2 changes: 1 addition & 1 deletion js/browser/dropUpload.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
9 changes: 7 additions & 2 deletions js/browser/files.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*
* @desc File related functionality
* @package KCFinder
* @version 2.52
* @version 2.53
* @author Pavel Tzonkov <[email protected]>
* @copyright 2010-2014 KCFinder Project
* @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2
Expand Down Expand Up @@ -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();

Expand Down
2 changes: 1 addition & 1 deletion js/browser/folders.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*
* @desc Folder related functionality
* @package KCFinder
* @version 2.52
* @version 2.53
* @author Pavel Tzonkov <[email protected]>
* @copyright 2010-2014 KCFinder Project
* @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2
Expand Down
6 changes: 5 additions & 1 deletion js/browser/init.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*
* @desc Object initializations
* @package KCFinder
* @version 2.52
* @version 2.53
* @author Pavel Tzonkov <[email protected]>
* @copyright 2010-2014 KCFinder Project
* @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2
Expand All @@ -30,6 +30,7 @@ browser.init = function() {
return false;
});
this.initOpeners();
console.log(this.opener);
this.initSettings();
this.initContent();
this.initToolbar();
Expand Down Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion js/browser/joiner.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*
* @desc Join all JavaScript files in current directory
* @package KCFinder
* @version 2.52
* @version 2.53
* @author Pavel Tzonkov <[email protected]>
* @copyright 2010-2014 KCFinder Project
* @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2
Expand Down
2 changes: 1 addition & 1 deletion js/browser/misc.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*
* @desc Miscellaneous functionality
* @package KCFinder
* @version 2.52
* @version 2.53
* @author Pavel Tzonkov <[email protected]>
* @copyright 2010-2014 KCFinder Project
* @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2
Expand Down
2 changes: 1 addition & 1 deletion js/browser/settings.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*
* @desc Settings panel functionality
* @package KCFinder
* @version 2.52
* @version 2.53
* @author Pavel Tzonkov <[email protected]>
* @copyright 2010-2014 KCFinder Project
* @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2
Expand Down
2 changes: 1 addition & 1 deletion js/browser/toolbar.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*
* @desc Toolbar functionality
* @package KCFinder
* @version 2.52
* @version 2.53
* @author Pavel Tzonkov <[email protected]>
* @copyright 2010-2014 KCFinder Project
* @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2
Expand Down
2 changes: 1 addition & 1 deletion js/helper.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
*
* @desc Helper object
* @package KCFinder
* @version 2.52
* @version 2.53
* @author Pavel Tzonkov <[email protected]>
* @copyright 2010-2014 KCFinder Project
* @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2
Expand Down
2 changes: 1 addition & 1 deletion js_localize.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*
* @desc Load language labels into JavaScript
* @package KCFinder
* @version 2.52
* @version 2.53
* @author Pavel Tzonkov <[email protected]>
* @copyright 2010-2014 KCFinder Project
* @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2
Expand Down
2 changes: 1 addition & 1 deletion lang/en.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*
* @desc Default English localization
* @package KCFinder
* @version 2.52
* @version 2.53
* @author Pavel Tzonkov <[email protected]>
* @copyright 2010-2014 KCFinder Project
* @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2
Expand Down
Loading

0 comments on commit 1d0ba97

Please sign in to comment.