This repository has been archived by the owner on Feb 23, 2021. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 207
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Performance fix
Showing
37 changed files
with
295 additions
and
46 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -4,7 +4,7 @@ | |
* | ||
* @desc Browser calling script | ||
* @package KCFinder | ||
* @version 2.53 | ||
* @version 2.54 | ||
* @author Pavel Tzonkov <[email protected]> | ||
* @copyright 2010-2014 KCFinder Project | ||
* @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -4,7 +4,7 @@ | |
* | ||
* @desc Base configuration file | ||
* @package KCFinder | ||
* @version 2.53 | ||
* @version 2.54 | ||
* @author Pavel Tzonkov <[email protected]> | ||
* @copyright 2010-2014 KCFinder Project | ||
* @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -4,7 +4,7 @@ | |
* | ||
* @desc This file is included first, before each other | ||
* @package KCFinder | ||
* @version 2.53 | ||
* @version 2.54 | ||
* @author Pavel Tzonkov <[email protected]> | ||
* @copyright 2010-2014 KCFinder Project | ||
* @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -4,7 +4,7 @@ | |
* | ||
* @desc Browser actions class | ||
* @package KCFinder | ||
* @version 2.53 | ||
* @version 2.54 | ||
* @author Pavel Tzonkov <[email protected]> | ||
* @copyright 2010-2014 KCFinder Project | ||
* @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2 | ||
|
@@ -708,18 +708,27 @@ protected function getFiles($dir) { | |
return $return; | ||
|
||
foreach ($files as $file) { | ||
$size = @getimagesize($file); | ||
if (is_array($size) && count($size)) { | ||
$thumb_file = "$thumbDir/" . basename($file); | ||
if (!is_file($thumb_file)) | ||
$this->makeThumb($file, false); | ||
$smallThumb = | ||
($size[0] <= $this->config['thumbWidth']) && | ||
($size[1] <= $this->config['thumbHeight']) && | ||
in_array($size[2], array(IMAGETYPE_GIF, IMAGETYPE_PNG, IMAGETYPE_JPEG)); | ||
$img = new fastImage($file); | ||
$type = $img->getType(); | ||
|
||
if ($type !== false) { | ||
$size = $img->getSize($file); | ||
|
||
if (is_array($size) && count($size)) { | ||
$thumb_file = "$thumbDir/" . basename($file); | ||
if (!is_file($thumb_file)) | ||
$this->makeThumb($file, false); | ||
$smallThumb = | ||
($size[0] <= $this->config['thumbWidth']) && | ||
($size[1] <= $this->config['thumbHeight']) && | ||
in_array($type, array("gif", "jpeg", "png")); | ||
} else | ||
$smallThumb = false; | ||
} else | ||
$smallThumb = false; | ||
|
||
$img->close(); | ||
|
||
$stat = stat($file); | ||
if ($stat === false) continue; | ||
$name = basename($file); | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -4,7 +4,7 @@ | |
* | ||
* @desc Image detection class | ||
* @package KCFinder | ||
* @version 2.53 | ||
* @version 2.54 | ||
* @author Pavel Tzonkov <[email protected]> | ||
* @copyright 2010-2014 KCFinder Project | ||
* @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -4,7 +4,7 @@ | |
* | ||
* @desc MIME type detection class | ||
* @package KCFinder | ||
* @version 2.53 | ||
* @version 2.54 | ||
* @author Pavel Tzonkov <[email protected]> | ||
* @copyright 2010-2014 KCFinder Project | ||
* @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -4,7 +4,7 @@ | |
* | ||
* @desc Uploader class | ||
* @package KCFinder | ||
* @version 2.53 | ||
* @version 2.54 | ||
* @author Pavel Tzonkov <[email protected]> | ||
* @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.53"; | ||
const VERSION = "2.54"; | ||
|
||
/** Config session-overrided settings | ||
* @var array */ | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -4,7 +4,7 @@ | |
* | ||
* @desc Base CSS definitions | ||
* @package KCFinder | ||
* @version 2.53 | ||
* @version 2.54 | ||
* @author Pavel Tzonkov <[email protected]> | ||
* @copyright 2010-2014 KCFinder Project | ||
* @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -4,7 +4,7 @@ | |
* | ||
* @desc CMS integration code: Drupal | ||
* @package KCFinder | ||
* @version 2.53 | ||
* @version 2.54 | ||
* @author Dany Alejandro Cabrera <[email protected]> | ||
* @copyright 2010-2014 KCFinder Project | ||
* @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -4,7 +4,7 @@ | |
* | ||
* @desc Base JavaScript object properties | ||
* @package KCFinder | ||
* @version 2.53 | ||
* @version 2.54 | ||
* @author Pavel Tzonkov <[email protected]> | ||
* @copyright 2010-2014 KCFinder Project | ||
* @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -4,7 +4,7 @@ | |
* | ||
* @desc Clipboard functionality | ||
* @package KCFinder | ||
* @version 2.53 | ||
* @version 2.54 | ||
* @author Pavel Tzonkov <[email protected]> | ||
* @copyright 2010-2014 KCFinder Project | ||
* @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -4,7 +4,7 @@ | |
* | ||
* @desc File related functionality | ||
* @package KCFinder | ||
* @version 2.53 | ||
* @version 2.54 | ||
* @author Pavel Tzonkov <[email protected]> | ||
* @copyright 2010-2014 KCFinder Project | ||
* @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -4,7 +4,7 @@ | |
* | ||
* @desc Folder related functionality | ||
* @package KCFinder | ||
* @version 2.53 | ||
* @version 2.54 | ||
* @author Pavel Tzonkov <[email protected]> | ||
* @copyright 2010-2014 KCFinder Project | ||
* @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -4,7 +4,7 @@ | |
* | ||
* @desc Object initializations | ||
* @package KCFinder | ||
* @version 2.53 | ||
* @version 2.54 | ||
* @author Pavel Tzonkov <[email protected]> | ||
* @copyright 2010-2014 KCFinder Project | ||
* @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -4,7 +4,7 @@ | |
* | ||
* @desc Join all JavaScript files in current directory | ||
* @package KCFinder | ||
* @version 2.53 | ||
* @version 2.54 | ||
* @author Pavel Tzonkov <[email protected]> | ||
* @copyright 2010-2014 KCFinder Project | ||
* @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -4,7 +4,7 @@ | |
* | ||
* @desc Miscellaneous functionality | ||
* @package KCFinder | ||
* @version 2.53 | ||
* @version 2.54 | ||
* @author Pavel Tzonkov <[email protected]> | ||
* @copyright 2010-2014 KCFinder Project | ||
* @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -4,7 +4,7 @@ | |
* | ||
* @desc Settings panel functionality | ||
* @package KCFinder | ||
* @version 2.53 | ||
* @version 2.54 | ||
* @author Pavel Tzonkov <[email protected]> | ||
* @copyright 2010-2014 KCFinder Project | ||
* @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -4,7 +4,7 @@ | |
* | ||
* @desc Toolbar functionality | ||
* @package KCFinder | ||
* @version 2.53 | ||
* @version 2.54 | ||
* @author Pavel Tzonkov <[email protected]> | ||
* @copyright 2010-2014 KCFinder Project | ||
* @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2,7 +2,7 @@ | |
* | ||
* @desc Helper object | ||
* @package KCFinder | ||
* @version 2.53 | ||
* @version 2.54 | ||
* @author Pavel Tzonkov <[email protected]> | ||
* @copyright 2010-2014 KCFinder Project | ||
* @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -4,7 +4,7 @@ | |
* | ||
* @desc Load language labels into JavaScript | ||
* @package KCFinder | ||
* @version 2.53 | ||
* @version 2.54 | ||
* @author Pavel Tzonkov <[email protected]> | ||
* @copyright 2010-2014 KCFinder Project | ||
* @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -4,7 +4,7 @@ | |
* | ||
* @desc Default English localization | ||
* @package KCFinder | ||
* @version 2.53 | ||
* @version 2.54 | ||
* @author Pavel Tzonkov <[email protected]> | ||
* @copyright 2010-2014 KCFinder Project | ||
* @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2 | ||
|
Oops, something went wrong.