Index: branches/5.2.x/core/ckeditor/ckfinder/core/connector/php/php5/CommandHandler/Init.php =================================================================== diff -u -N -r15316 -r16404 --- branches/5.2.x/core/ckeditor/ckfinder/core/connector/php/php5/CommandHandler/Init.php (.../Init.php) (revision 15316) +++ branches/5.2.x/core/ckeditor/ckfinder/core/connector/php/php5/CommandHandler/Init.php (.../Init.php) (revision 16404) @@ -2,8 +2,8 @@ /* * CKFinder * ======== - * http://ckfinder.com - * Copyright (C) 2007-2012, CKSource - Frederico Knabben. All rights reserved. + * http://cksource.com/ckfinder + * Copyright (C) 2007-2013, CKSource - Frederico Knabben. All rights reserved. * * The software, this file and its contents are subject to the CKFinder * License. Please read the license.txt file before using, installing, copying, @@ -89,6 +89,8 @@ if ($_thumbnailsEnabled) { $_oConnInfo->addAttribute("thumbsUrl", $_thumbnailsConfig->getUrl()); $_oConnInfo->addAttribute("thumbsDirectAccess", $_thumbnailsConfig->getDirectAccess() ? "true" : "false" ); + $_oConnInfo->addAttribute("thumbsWidth", $_thumbnailsConfig->getMaxWidth()); + $_oConnInfo->addAttribute("thumbsHeight", $_thumbnailsConfig->getMaxHeight()); } $_imagesConfig = $_config->getImagesConfig(); $_oConnInfo->addAttribute("imgWidth", $_imagesConfig->getMaxWidth()); @@ -148,8 +150,8 @@ $_oResourceType[$i]->addAttribute("url", $_oTypeInfo->getUrl()); $_oResourceType[$i]->addAttribute("allowedExtensions", implode(",", $_oTypeInfo->getAllowedExtensions())); $_oResourceType[$i]->addAttribute("deniedExtensions", implode(",", $_oTypeInfo->getDeniedExtensions())); - $_oResourceType[$i]->addAttribute("hash", substr(md5($_oTypeInfo->getDirectory()), 0, 16)); - $_oResourceType[$i]->addAttribute("hasChildren", CKFinder_Connector_Utils_FileSystem::hasChildren($_oTypeInfo->getDirectory()) ? "true" : "false"); + $_oResourceType[$i]->addAttribute("hash", $_oTypeInfo->getHash()); + $_oResourceType[$i]->addAttribute("hasChildren", CKFinder_Connector_Utils_FileSystem::hasChildren('/', $_oTypeInfo) ? "true" : "false"); $_oResourceType[$i]->addAttribute("acl", $_aclMask); $maxSize = $_oTypeInfo->getMaxSize(); if ($phpMaxSize) {