Piou-piou / ribs-framework

libs/ckfinder/plugins/watermark/plugin.php

Indentation +153 added lines, -153 removed lines

@@ -15,174 +15,174 @@
 
 class Watermark
 {
-    function onAfterFileUpload($currentFolder, $uploadedFile, $sFilePath)
-    {
-        global $config;
-        $watermarkSettings = $config['Plugin_Watermark'];
+	function onAfterFileUpload($currentFolder, $uploadedFile, $sFilePath)
+	{
+		global $config;
+		$watermarkSettings = $config['Plugin_Watermark'];
 
-        $this->createWatermark($sFilePath, $watermarkSettings['source'], $watermarkSettings['marginRight'],
-            $watermarkSettings['marginBottom'], $watermarkSettings['quality'], $watermarkSettings['transparency']);
+		$this->createWatermark($sFilePath, $watermarkSettings['source'], $watermarkSettings['marginRight'],
+			$watermarkSettings['marginBottom'], $watermarkSettings['quality'], $watermarkSettings['transparency']);
 
-        return true;
-    }
+		return true;
+	}
 
-    function createWatermark($sourceFile, $watermarkFile, $marginLeft = 5, $marginBottom = 5, $quality = 90, $transparency = 100)
-    {
-        if (!file_exists($watermarkFile)) {
-            $watermarkFile = dirname(__FILE__) . "/" . $watermarkFile;
-        }
-        if (!file_exists($watermarkFile)) {
-            return false;
-        }
+	function createWatermark($sourceFile, $watermarkFile, $marginLeft = 5, $marginBottom = 5, $quality = 90, $transparency = 100)
+	{
+		if (!file_exists($watermarkFile)) {
+			$watermarkFile = dirname(__FILE__) . "/" . $watermarkFile;
+		}
+		if (!file_exists($watermarkFile)) {
+			return false;
+		}
 
-        $watermarkImageAttr = @getimagesize($watermarkFile);
-        $sourceImageAttr = @getimagesize($sourceFile);
-        if ($sourceImageAttr === false || $watermarkImageAttr === false) {
-            return false;
-        }
+		$watermarkImageAttr = @getimagesize($watermarkFile);
+		$sourceImageAttr = @getimagesize($sourceFile);
+		if ($sourceImageAttr === false || $watermarkImageAttr === false) {
+			return false;
+		}
 
-        switch ($watermarkImageAttr['mime'])
-        {
-            case 'image/gif':
-                {
-                    if (@imagetypes() & IMG_GIF) {
-                        $oWatermarkImage = @imagecreatefromgif($watermarkFile);
-                    } else {
-                        $ermsg = 'GIF images are not supported';
-                    }
-                }
-                break;
-            case 'image/jpeg':
-                {
-                    if (@imagetypes() & IMG_JPG) {
-                        $oWatermarkImage = @imagecreatefromjpeg($watermarkFile) ;
-                    } else {
-                        $ermsg = 'JPEG images are not supported';
-                    }
-                }
-                break;
-            case 'image/png':
-                {
-                    if (@imagetypes() & IMG_PNG) {
-                        $oWatermarkImage = @imagecreatefrompng($watermarkFile) ;
-                    } else {
-                        $ermsg = 'PNG images are not supported';
-                    }
-                }
-                break;
-            case 'image/wbmp':
-                {
-                    if (@imagetypes() & IMG_WBMP) {
-                        $oWatermarkImage = @imagecreatefromwbmp($watermarkFile);
-                    } else {
-                        $ermsg = 'WBMP images are not supported';
-                    }
-                }
-                break;
-            default:
-                $ermsg = $watermarkImageAttr['mime'].' images are not supported';
-                break;
-        }
+		switch ($watermarkImageAttr['mime'])
+		{
+			case 'image/gif':
+				{
+					if (@imagetypes() & IMG_GIF) {
+						$oWatermarkImage = @imagecreatefromgif($watermarkFile);
+					} else {
+						$ermsg = 'GIF images are not supported';
+					}
+				}
+				break;
+			case 'image/jpeg':
+				{
+					if (@imagetypes() & IMG_JPG) {
+						$oWatermarkImage = @imagecreatefromjpeg($watermarkFile) ;
+					} else {
+						$ermsg = 'JPEG images are not supported';
+					}
+				}
+				break;
+			case 'image/png':
+				{
+					if (@imagetypes() & IMG_PNG) {
+						$oWatermarkImage = @imagecreatefrompng($watermarkFile) ;
+					} else {
+						$ermsg = 'PNG images are not supported';
+					}
+				}
+				break;
+			case 'image/wbmp':
+				{
+					if (@imagetypes() & IMG_WBMP) {
+						$oWatermarkImage = @imagecreatefromwbmp($watermarkFile);
+					} else {
+						$ermsg = 'WBMP images are not supported';
+					}
+				}
+				break;
+			default:
+				$ermsg = $watermarkImageAttr['mime'].' images are not supported';
+				break;
+		}
 
-        switch ($sourceImageAttr['mime'])
-        {
-            case 'image/gif':
-                {
-                    if (@imagetypes() & IMG_GIF) {
-                        $oImage = @imagecreatefromgif($sourceFile);
-                    } else {
-                        $ermsg = 'GIF images are not supported';
-                    }
-                }
-                break;
-            case 'image/jpeg':
-                {
-                    if (@imagetypes() & IMG_JPG) {
-                        $oImage = @imagecreatefromjpeg($sourceFile) ;
-                    } else {
-                        $ermsg = 'JPEG images are not supported';
-                    }
-                }
-                break;
-            case 'image/png':
-                {
-                    if (@imagetypes() & IMG_PNG) {
-                        $oImage = @imagecreatefrompng($sourceFile) ;
-                    } else {
-                        $ermsg = 'PNG images are not supported';
-                    }
-                }
-                break;
-            case 'image/wbmp':
-                {
-                    if (@imagetypes() & IMG_WBMP) {
-                        $oImage = @imagecreatefromwbmp($sourceFile);
-                    } else {
-                        $ermsg = 'WBMP images are not supported';
-                    }
-                }
-                break;
-            default:
-                $ermsg = $sourceImageAttr['mime'].' images are not supported';
-                break;
-        }
+		switch ($sourceImageAttr['mime'])
+		{
+			case 'image/gif':
+				{
+					if (@imagetypes() & IMG_GIF) {
+						$oImage = @imagecreatefromgif($sourceFile);
+					} else {
+						$ermsg = 'GIF images are not supported';
+					}
+				}
+				break;
+			case 'image/jpeg':
+				{
+					if (@imagetypes() & IMG_JPG) {
+						$oImage = @imagecreatefromjpeg($sourceFile) ;
+					} else {
+						$ermsg = 'JPEG images are not supported';
+					}
+				}
+				break;
+			case 'image/png':
+				{
+					if (@imagetypes() & IMG_PNG) {
+						$oImage = @imagecreatefrompng($sourceFile) ;
+					} else {
+						$ermsg = 'PNG images are not supported';
+					}
+				}
+				break;
+			case 'image/wbmp':
+				{
+					if (@imagetypes() & IMG_WBMP) {
+						$oImage = @imagecreatefromwbmp($sourceFile);
+					} else {
+						$ermsg = 'WBMP images are not supported';
+					}
+				}
+				break;
+			default:
+				$ermsg = $sourceImageAttr['mime'].' images are not supported';
+				break;
+		}
 
-        if (isset($ermsg) || false === $oImage || false === $oWatermarkImage) {
-            return false;
-        }
+		if (isset($ermsg) || false === $oImage || false === $oWatermarkImage) {
+			return false;
+		}
 
-        $watermark_width = $watermarkImageAttr[0];
-        $watermark_height = $watermarkImageAttr[1];
-        $dest_x = $sourceImageAttr[0] - $watermark_width - $marginLeft;
-        $dest_y = $sourceImageAttr[1] - $watermark_height - $marginBottom;
+		$watermark_width = $watermarkImageAttr[0];
+		$watermark_height = $watermarkImageAttr[1];
+		$dest_x = $sourceImageAttr[0] - $watermark_width - $marginLeft;
+		$dest_y = $sourceImageAttr[1] - $watermark_height - $marginBottom;
 
-        if ( $sourceImageAttr['mime'] == 'image/png')
-        {
-            if(function_exists('imagesavealpha') && function_exists('imagecolorallocatealpha') )
-            {
-                 $bg = imagecolorallocatealpha($oImage, 255, 255, 255, 127); // (PHP 4 >= 4.3.2, PHP 5)
-                 imagefill($oImage, 0, 0 , $bg);
-                 imagealphablending($oImage, false);
-                 imagesavealpha($oImage, true);  // (PHP 4 >= 4.3.2, PHP 5)
-            }
-        }
-        if ($watermarkImageAttr['mime'] == 'image/png') {
-            imagecopy($oImage, $oWatermarkImage, $dest_x, $dest_y, 0, 0, $watermark_width, $watermark_height);
-        }
-        else {
-            imagecopymerge($oImage, $oWatermarkImage, $dest_x, $dest_y, 0, 0, $watermark_width, $watermark_height, $transparency);
-        }
+		if ( $sourceImageAttr['mime'] == 'image/png')
+		{
+			if(function_exists('imagesavealpha') && function_exists('imagecolorallocatealpha') )
+			{
+				 $bg = imagecolorallocatealpha($oImage, 255, 255, 255, 127); // (PHP 4 >= 4.3.2, PHP 5)
+				 imagefill($oImage, 0, 0 , $bg);
+				 imagealphablending($oImage, false);
+				 imagesavealpha($oImage, true);  // (PHP 4 >= 4.3.2, PHP 5)
+			}
+		}
+		if ($watermarkImageAttr['mime'] == 'image/png') {
+			imagecopy($oImage, $oWatermarkImage, $dest_x, $dest_y, 0, 0, $watermark_width, $watermark_height);
+		}
+		else {
+			imagecopymerge($oImage, $oWatermarkImage, $dest_x, $dest_y, 0, 0, $watermark_width, $watermark_height, $transparency);
+		}
 
-        switch ($sourceImageAttr['mime'])
-        {
-            case 'image/gif':
-                imagegif($oImage, $sourceFile);
-                break;
-            case 'image/jpeg':
-                imagejpeg($oImage, $sourceFile, $quality);
-                break;
-            case 'image/png':
-                imagepng($oImage, $sourceFile);
-                break;
-            case 'image/wbmp':
-                imagewbmp($oImage, $sourceFile);
-                break;
-        }
+		switch ($sourceImageAttr['mime'])
+		{
+			case 'image/gif':
+				imagegif($oImage, $sourceFile);
+				break;
+			case 'image/jpeg':
+				imagejpeg($oImage, $sourceFile, $quality);
+				break;
+			case 'image/png':
+				imagepng($oImage, $sourceFile);
+				break;
+			case 'image/wbmp':
+				imagewbmp($oImage, $sourceFile);
+				break;
+		}
 
-        imageDestroy($oImage);
-        imageDestroy($oWatermarkImage);
-    }
+		imageDestroy($oImage);
+		imageDestroy($oWatermarkImage);
+	}
 }
 
 $watermark = new Watermark();
 $config['Hooks']['AfterFileUpload'][] = array($watermark, 'onAfterFileUpload');
 if (empty($config['Plugin_Watermark']))
 {
-    $config['Plugin_Watermark'] = array(
-        "source" => "logo.gif",
-        "marginRight" => 5,
-        "marginBottom" => 5,
-        "quality" => 90,
-        "transparency" => 80,
-    );
+	$config['Plugin_Watermark'] = array(
+		"source" => "logo.gif",
+		"marginRight" => 5,
+		"marginBottom" => 5,
+		"quality" => 90,
+		"transparency" => 80,
+	);
 }

Spacing +9 added lines, -9 removed lines

@@ -29,7 +29,7 @@ 
     function createWatermark($sourceFile, $watermarkFile, $marginLeft = 5, $marginBottom = 5, $quality = 90, $transparency = 100)
     {
         if (!file_exists($watermarkFile)) {
-            $watermarkFile = dirname(__FILE__) . "/" . $watermarkFile;
+            $watermarkFile = dirname(__FILE__)."/".$watermarkFile;
         }
         if (!file_exists($watermarkFile)) {
             return false;
@@ -55,7 +55,7 @@ 
             case 'image/jpeg':
                 {
                     if (@imagetypes() & IMG_JPG) {
-                        $oWatermarkImage = @imagecreatefromjpeg($watermarkFile) ;
+                        $oWatermarkImage = @imagecreatefromjpeg($watermarkFile);
                     } else {
                         $ermsg = 'JPEG images are not supported';
                     }
@@ -64,7 +64,7 @@ 
             case 'image/png':
                 {
                     if (@imagetypes() & IMG_PNG) {
-                        $oWatermarkImage = @imagecreatefrompng($watermarkFile) ;
+                        $oWatermarkImage = @imagecreatefrompng($watermarkFile);
                     } else {
                         $ermsg = 'PNG images are not supported';
                     }
@@ -98,7 +98,7 @@ 
             case 'image/jpeg':
                 {
                     if (@imagetypes() & IMG_JPG) {
-                        $oImage = @imagecreatefromjpeg($sourceFile) ;
+                        $oImage = @imagecreatefromjpeg($sourceFile);
                     } else {
                         $ermsg = 'JPEG images are not supported';
                     }
@@ -107,7 +107,7 @@ 
             case 'image/png':
                 {
                     if (@imagetypes() & IMG_PNG) {
-                        $oImage = @imagecreatefrompng($sourceFile) ;
+                        $oImage = @imagecreatefrompng($sourceFile);
                     } else {
                         $ermsg = 'PNG images are not supported';
                     }
@@ -136,14 +136,14 @@ 
         $dest_x = $sourceImageAttr[0] - $watermark_width - $marginLeft;
         $dest_y = $sourceImageAttr[1] - $watermark_height - $marginBottom;
 
-        if ( $sourceImageAttr['mime'] == 'image/png')
+        if ($sourceImageAttr['mime'] == 'image/png')
         {
-            if(function_exists('imagesavealpha') && function_exists('imagecolorallocatealpha') )
+            if (function_exists('imagesavealpha') && function_exists('imagecolorallocatealpha'))
             {
                  $bg = imagecolorallocatealpha($oImage, 255, 255, 255, 127); // (PHP 4 >= 4.3.2, PHP 5)
-                 imagefill($oImage, 0, 0 , $bg);
+                 imagefill($oImage, 0, 0, $bg);
                  imagealphablending($oImage, false);
-                 imagesavealpha($oImage, true);  // (PHP 4 >= 4.3.2, PHP 5)
+                 imagesavealpha($oImage, true); // (PHP 4 >= 4.3.2, PHP 5)
             }
         }
         if ($watermarkImageAttr['mime'] == 'image/png') {

Braces +1 added lines, -2 removed lines

@@ -148,8 +148,7 @@
         }
         if ($watermarkImageAttr['mime'] == 'image/png') {
             imagecopy($oImage, $oWatermarkImage, $dest_x, $dest_y, 0, 0, $watermark_width, $watermark_height);
-        }
-        else {
+        } else {
             imagecopymerge($oImage, $oWatermarkImage, $dest_x, $dest_y, 0, 0, $watermark_width, $watermark_height, $transparency);
         }
 

libs/ckfinder/plugins/imageresize/plugin.php

Indentation +211 added lines, -211 removed lines

@@ -21,221 +21,221 @@
 
 class CKFinder_Connector_CommandHandler_ImageResize extends CKFinder_Connector_CommandHandler_XmlCommandHandlerBase
 {
-    /**
-     * @access private
-     */
-    function getConfig()
-    {
-        $config = array();
-        if (isset($GLOBALS['config']['plugin_imageresize'])) {
-            $config = $GLOBALS['config']['plugin_imageresize'];
-        }
-        if (!isset($config['smallThumb'])) {
-            $config['smallThumb'] = "90x90";
-        }
-        if (!isset($config['mediumThumb'])) {
-            $config['mediumThumb'] = "120x120";
-        }
-        if (!isset($config['largeThumb'])) {
-            $config['largeThumb'] = "180x180";
-        }
-        return $config;
-    }
-
-    /**
-     * handle request and build XML
-     * @access protected
-     *
-     */
-    function buildXml()
-    {
-        if (empty($_POST['CKFinderCommand']) || $_POST['CKFinderCommand'] != 'true') {
-            $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_INVALID_REQUEST);
-        }
-
-        $this->checkConnector();
-        $this->checkRequest();
-
-        //resizing to 1x1 is almost equal to deleting a file, that's why FILE_DELETE permissions are required
-        if (!$this->_currentFolder->checkAcl(CKFINDER_CONNECTOR_ACL_FILE_DELETE) || !$this->_currentFolder->checkAcl(CKFINDER_CONNECTOR_ACL_FILE_UPLOAD)) {
-            $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_UNAUTHORIZED);
-        }
-
-        $_config =& CKFinder_Connector_Core_Factory::getInstance("Core_Config");
-        $resourceTypeInfo = $this->_currentFolder->getResourceTypeConfig();
-
-        if (!isset($_POST["fileName"])) {
-            $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_INVALID_NAME);
-        }
-
-        $fileName = CKFinder_Connector_Utils_FileSystem::convertToFilesystemEncoding($_POST["fileName"]);
-
-        if (!CKFinder_Connector_Utils_FileSystem::checkFileName($fileName) || $resourceTypeInfo->checkIsHiddenFile($fileName)) {
-            $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_INVALID_REQUEST);
-        }
-
-        if (!$resourceTypeInfo->checkExtension($fileName, false)) {
-            $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_INVALID_REQUEST);
-        }
-
-        $filePath = CKFinder_Connector_Utils_FileSystem::combinePaths($this->_currentFolder->getServerPath(), $fileName);
-
-        if (!file_exists($filePath) || !is_file($filePath)) {
-            $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_FILE_NOT_FOUND);
-        }
-
-        $newWidth = trim($_POST['width']);
-        $newHeight = trim($_POST['height']);
-        $quality = 80;
-        $resizeOriginal = !empty($_POST['width']) && !empty($_POST['height']);
-
-        if ($resizeOriginal) {
-            if (!preg_match("/^\d+$/", $newWidth) || !preg_match("/^\d+$/", $newHeight) || !preg_match("/^\d+$/", $newWidth)) {
-                $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_INVALID_REQUEST);
-            }
-            if (!isset($_POST["newFileName"])) {
-                $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_INVALID_NAME);
-            }
-            $newFileName = CKFinder_Connector_Utils_FileSystem::convertToFilesystemEncoding($_POST["newFileName"]);
-            if (!$resourceTypeInfo->checkExtension($newFileName)) {
-                $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_INVALID_EXTENSION);
-            }
-            if (!CKFinder_Connector_Utils_FileSystem::checkFileName($newFileName) || $resourceTypeInfo->checkIsHiddenFile($newFileName)) {
-                $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_INVALID_NAME);
-            }
-            $newFilePath = CKFinder_Connector_Utils_FileSystem::combinePaths($this->_currentFolder->getServerPath(), $newFileName);
-            if (!is_writable(dirname($newFilePath))) {
-                $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_ACCESS_DENIED);
-            }
-            if ($_POST['overwrite'] != "1" && file_exists($newFilePath)) {
-                $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_ALREADY_EXIST);
-            }
-            $_imagesConfig = $_config->getImagesConfig();
-            $maxWidth = $_imagesConfig->getMaxWidth();
-            $maxHeight = $_imagesConfig->getMaxHeight();
-            // Shouldn't happen as the JavaScript validation should not allow this.
-            if ( ( $maxWidth > 0 && $newWidth > $maxWidth ) || ( $maxHeight > 0 && $newHeight > $maxHeight ) ) {
-                $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_INVALID_REQUEST);
-            }
-        }
-
-        require_once CKFINDER_CONNECTOR_LIB_DIR . "/CommandHandler/Thumbnail.php";
-
-        if ($resizeOriginal) {
-            $result = CKFinder_Connector_CommandHandler_Thumbnail::createThumb($filePath, $newFilePath, $newWidth, $newHeight, $quality, false) ;
-            if (!$result) {
-                $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_ACCESS_DENIED);
-            }
-        }
-
-        $config = $this->getConfig();
-        $nameWithoutExt = preg_replace("/^(.+)\_\d+x\d+$/", "$1", CKFinder_Connector_Utils_FileSystem::getFileNameWithoutExtension($fileName));
-        $extension = CKFinder_Connector_Utils_FileSystem::getExtension($fileName);
-        foreach (array('small', 'medium', 'large') as $size) {
-            if (!empty($_POST[$size]) && $_POST[$size] == '1') {
-                $thumbName = $nameWithoutExt."_".$size.".".$extension;
-                $newFilePath = CKFinder_Connector_Utils_FileSystem::combinePaths($this->_currentFolder->getServerPath(), $thumbName);
-                if (!empty($config[$size.'Thumb'])) {
-                    if (preg_match("/^(\d+)x(\d+)$/", $config[$size.'Thumb'], $matches)) {
-                        CKFinder_Connector_CommandHandler_Thumbnail::createThumb($filePath, $newFilePath, $matches[1], $matches[2], $quality, true) ;
-                    }
-                }
-            }
-        }
-
-    }
-
-    /**
-     * @access public
-     */
-    function onInitCommand( &$connectorNode )
-    {
-        // "@" protects against E_STRICT (Only variables should be assigned by reference)
-        @$pluginsInfo = &$connectorNode->getChild("PluginsInfo");
-        $imageresize = new CKFinder_Connector_Utils_XmlNode("imageresize");
-        $pluginsInfo->addChild($imageresize);
-        $config = $this->getConfig();
-        foreach (array('small', 'medium', 'large') as $size) {
-            if (!empty($config[$size.'Thumb'])) {
-                $imageresize->addAttribute($size.'Thumb', $config[$size.'Thumb']);
-            }
-        }
-        return true ;
-    }
-
-    /**
-     * @access public
-     */
-    function onBeforeExecuteCommand( &$command )
-    {
-        if ( $command == 'ImageResize' )
-        {
-            $this->sendResponse();
-            return false;
-        }
-
-        return true ;
-    }
+	/**
+	 * @access private
+	 */
+	function getConfig()
+	{
+		$config = array();
+		if (isset($GLOBALS['config']['plugin_imageresize'])) {
+			$config = $GLOBALS['config']['plugin_imageresize'];
+		}
+		if (!isset($config['smallThumb'])) {
+			$config['smallThumb'] = "90x90";
+		}
+		if (!isset($config['mediumThumb'])) {
+			$config['mediumThumb'] = "120x120";
+		}
+		if (!isset($config['largeThumb'])) {
+			$config['largeThumb'] = "180x180";
+		}
+		return $config;
+	}
+
+	/**
+	 * handle request and build XML
+	 * @access protected
+	 *
+	 */
+	function buildXml()
+	{
+		if (empty($_POST['CKFinderCommand']) || $_POST['CKFinderCommand'] != 'true') {
+			$this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_INVALID_REQUEST);
+		}
+
+		$this->checkConnector();
+		$this->checkRequest();
+
+		//resizing to 1x1 is almost equal to deleting a file, that's why FILE_DELETE permissions are required
+		if (!$this->_currentFolder->checkAcl(CKFINDER_CONNECTOR_ACL_FILE_DELETE) || !$this->_currentFolder->checkAcl(CKFINDER_CONNECTOR_ACL_FILE_UPLOAD)) {
+			$this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_UNAUTHORIZED);
+		}
+
+		$_config =& CKFinder_Connector_Core_Factory::getInstance("Core_Config");
+		$resourceTypeInfo = $this->_currentFolder->getResourceTypeConfig();
+
+		if (!isset($_POST["fileName"])) {
+			$this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_INVALID_NAME);
+		}
+
+		$fileName = CKFinder_Connector_Utils_FileSystem::convertToFilesystemEncoding($_POST["fileName"]);
+
+		if (!CKFinder_Connector_Utils_FileSystem::checkFileName($fileName) || $resourceTypeInfo->checkIsHiddenFile($fileName)) {
+			$this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_INVALID_REQUEST);
+		}
+
+		if (!$resourceTypeInfo->checkExtension($fileName, false)) {
+			$this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_INVALID_REQUEST);
+		}
+
+		$filePath = CKFinder_Connector_Utils_FileSystem::combinePaths($this->_currentFolder->getServerPath(), $fileName);
+
+		if (!file_exists($filePath) || !is_file($filePath)) {
+			$this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_FILE_NOT_FOUND);
+		}
+
+		$newWidth = trim($_POST['width']);
+		$newHeight = trim($_POST['height']);
+		$quality = 80;
+		$resizeOriginal = !empty($_POST['width']) && !empty($_POST['height']);
+
+		if ($resizeOriginal) {
+			if (!preg_match("/^\d+$/", $newWidth) || !preg_match("/^\d+$/", $newHeight) || !preg_match("/^\d+$/", $newWidth)) {
+				$this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_INVALID_REQUEST);
+			}
+			if (!isset($_POST["newFileName"])) {
+				$this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_INVALID_NAME);
+			}
+			$newFileName = CKFinder_Connector_Utils_FileSystem::convertToFilesystemEncoding($_POST["newFileName"]);
+			if (!$resourceTypeInfo->checkExtension($newFileName)) {
+				$this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_INVALID_EXTENSION);
+			}
+			if (!CKFinder_Connector_Utils_FileSystem::checkFileName($newFileName) || $resourceTypeInfo->checkIsHiddenFile($newFileName)) {
+				$this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_INVALID_NAME);
+			}
+			$newFilePath = CKFinder_Connector_Utils_FileSystem::combinePaths($this->_currentFolder->getServerPath(), $newFileName);
+			if (!is_writable(dirname($newFilePath))) {
+				$this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_ACCESS_DENIED);
+			}
+			if ($_POST['overwrite'] != "1" && file_exists($newFilePath)) {
+				$this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_ALREADY_EXIST);
+			}
+			$_imagesConfig = $_config->getImagesConfig();
+			$maxWidth = $_imagesConfig->getMaxWidth();
+			$maxHeight = $_imagesConfig->getMaxHeight();
+			// Shouldn't happen as the JavaScript validation should not allow this.
+			if ( ( $maxWidth > 0 && $newWidth > $maxWidth ) || ( $maxHeight > 0 && $newHeight > $maxHeight ) ) {
+				$this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_INVALID_REQUEST);
+			}
+		}
+
+		require_once CKFINDER_CONNECTOR_LIB_DIR . "/CommandHandler/Thumbnail.php";
+
+		if ($resizeOriginal) {
+			$result = CKFinder_Connector_CommandHandler_Thumbnail::createThumb($filePath, $newFilePath, $newWidth, $newHeight, $quality, false) ;
+			if (!$result) {
+				$this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_ACCESS_DENIED);
+			}
+		}
+
+		$config = $this->getConfig();
+		$nameWithoutExt = preg_replace("/^(.+)\_\d+x\d+$/", "$1", CKFinder_Connector_Utils_FileSystem::getFileNameWithoutExtension($fileName));
+		$extension = CKFinder_Connector_Utils_FileSystem::getExtension($fileName);
+		foreach (array('small', 'medium', 'large') as $size) {
+			if (!empty($_POST[$size]) && $_POST[$size] == '1') {
+				$thumbName = $nameWithoutExt."_".$size.".".$extension;
+				$newFilePath = CKFinder_Connector_Utils_FileSystem::combinePaths($this->_currentFolder->getServerPath(), $thumbName);
+				if (!empty($config[$size.'Thumb'])) {
+					if (preg_match("/^(\d+)x(\d+)$/", $config[$size.'Thumb'], $matches)) {
+						CKFinder_Connector_CommandHandler_Thumbnail::createThumb($filePath, $newFilePath, $matches[1], $matches[2], $quality, true) ;
+					}
+				}
+			}
+		}
+
+	}
+
+	/**
+	 * @access public
+	 */
+	function onInitCommand( &$connectorNode )
+	{
+		// "@" protects against E_STRICT (Only variables should be assigned by reference)
+		@$pluginsInfo = &$connectorNode->getChild("PluginsInfo");
+		$imageresize = new CKFinder_Connector_Utils_XmlNode("imageresize");
+		$pluginsInfo->addChild($imageresize);
+		$config = $this->getConfig();
+		foreach (array('small', 'medium', 'large') as $size) {
+			if (!empty($config[$size.'Thumb'])) {
+				$imageresize->addAttribute($size.'Thumb', $config[$size.'Thumb']);
+			}
+		}
+		return true ;
+	}
+
+	/**
+	 * @access public
+	 */
+	function onBeforeExecuteCommand( &$command )
+	{
+		if ( $command == 'ImageResize' )
+		{
+			$this->sendResponse();
+			return false;
+		}
+
+		return true ;
+	}
 }
 
 class CKFinder_Connector_CommandHandler_ImageResizeInfo extends CKFinder_Connector_CommandHandler_XmlCommandHandlerBase
 {
-    /**
-     * handle request and build XML
-     * @access protected
-     *
-     */
-    function buildXml()
-    {
-        $this->checkConnector();
-        $this->checkRequest();
-
-        if (!$this->_currentFolder->checkAcl(CKFINDER_CONNECTOR_ACL_FILE_VIEW)) {
-            $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_UNAUTHORIZED);
-        }
-
-        $resourceTypeInfo = $this->_currentFolder->getResourceTypeConfig();
-
-        if (!isset($_GET["fileName"])) {
-            $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_INVALID_NAME);
-        }
-
-        $fileName = CKFinder_Connector_Utils_FileSystem::convertToFilesystemEncoding($_GET["fileName"]);
-
-        if (!CKFinder_Connector_Utils_FileSystem::checkFileName($fileName) || $resourceTypeInfo->checkIsHiddenFile($fileName)) {
-            $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_INVALID_REQUEST);
-        }
-
-        if (!$resourceTypeInfo->checkExtension($fileName, false)) {
-            $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_INVALID_REQUEST);
-        }
-
-        $filePath = CKFinder_Connector_Utils_FileSystem::combinePaths($this->_currentFolder->getServerPath(), $fileName);
-
-        if (!file_exists($filePath) || !is_file($filePath)) {
-            $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_FILE_NOT_FOUND);
-        }
-
-        list($width, $height) = getimagesize($filePath);
-        $oNode = new Ckfinder_Connector_Utils_XmlNode("ImageInfo");
-        $oNode->addAttribute("width", $width);
-        $oNode->addAttribute("height", $height);
-        $this->_connectorNode->addChild($oNode);
-    }
-
-    /**
-     * @access public
-     */
-    function onBeforeExecuteCommand( &$command )
-    {
-        if ( $command == 'ImageResizeInfo' )
-        {
-            $this->sendResponse();
-            return false;
-        }
-
-        return true ;
-    }
+	/**
+	 * handle request and build XML
+	 * @access protected
+	 *
+	 */
+	function buildXml()
+	{
+		$this->checkConnector();
+		$this->checkRequest();
+
+		if (!$this->_currentFolder->checkAcl(CKFINDER_CONNECTOR_ACL_FILE_VIEW)) {
+			$this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_UNAUTHORIZED);
+		}
+
+		$resourceTypeInfo = $this->_currentFolder->getResourceTypeConfig();
+
+		if (!isset($_GET["fileName"])) {
+			$this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_INVALID_NAME);
+		}
+
+		$fileName = CKFinder_Connector_Utils_FileSystem::convertToFilesystemEncoding($_GET["fileName"]);
+
+		if (!CKFinder_Connector_Utils_FileSystem::checkFileName($fileName) || $resourceTypeInfo->checkIsHiddenFile($fileName)) {
+			$this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_INVALID_REQUEST);
+		}
+
+		if (!$resourceTypeInfo->checkExtension($fileName, false)) {
+			$this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_INVALID_REQUEST);
+		}
+
+		$filePath = CKFinder_Connector_Utils_FileSystem::combinePaths($this->_currentFolder->getServerPath(), $fileName);
+
+		if (!file_exists($filePath) || !is_file($filePath)) {
+			$this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_FILE_NOT_FOUND);
+		}
+
+		list($width, $height) = getimagesize($filePath);
+		$oNode = new Ckfinder_Connector_Utils_XmlNode("ImageInfo");
+		$oNode->addAttribute("width", $width);
+		$oNode->addAttribute("height", $height);
+		$this->_connectorNode->addChild($oNode);
+	}
+
+	/**
+	 * @access public
+	 */
+	function onBeforeExecuteCommand( &$command )
+	{
+		if ( $command == 'ImageResizeInfo' )
+		{
+			$this->sendResponse();
+			return false;
+		}
+
+		return true ;
+	}
 }
 
 if (function_exists('imagecreate')) {

Spacing +14 added lines, -14 removed lines

@@ -17,7 +17,7 @@ 
 /**
  * Include base XML command handler
  */
-require_once CKFINDER_CONNECTOR_LIB_DIR . "/CommandHandler/XmlCommandHandlerBase.php";
+require_once CKFINDER_CONNECTOR_LIB_DIR."/CommandHandler/XmlCommandHandlerBase.php";
 
 class CKFinder_Connector_CommandHandler_ImageResize extends CKFinder_Connector_CommandHandler_XmlCommandHandlerBase
 {
@@ -61,7 +61,7 @@ 
             $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_UNAUTHORIZED);
         }
 
-        $_config =& CKFinder_Connector_Core_Factory::getInstance("Core_Config");
+        $_config = & CKFinder_Connector_Core_Factory::getInstance("Core_Config");
         $resourceTypeInfo = $this->_currentFolder->getResourceTypeConfig();
 
         if (!isset($_POST["fileName"])) {
@@ -114,15 +114,15 @@ 
             $maxWidth = $_imagesConfig->getMaxWidth();
             $maxHeight = $_imagesConfig->getMaxHeight();
             // Shouldn't happen as the JavaScript validation should not allow this.
-            if ( ( $maxWidth > 0 && $newWidth > $maxWidth ) || ( $maxHeight > 0 && $newHeight > $maxHeight ) ) {
+            if (($maxWidth > 0 && $newWidth > $maxWidth) || ($maxHeight > 0 && $newHeight > $maxHeight)) {
                 $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_INVALID_REQUEST);
             }
         }
 
-        require_once CKFINDER_CONNECTOR_LIB_DIR . "/CommandHandler/Thumbnail.php";
+        require_once CKFINDER_CONNECTOR_LIB_DIR."/CommandHandler/Thumbnail.php";
 
         if ($resizeOriginal) {
-            $result = CKFinder_Connector_CommandHandler_Thumbnail::createThumb($filePath, $newFilePath, $newWidth, $newHeight, $quality, false) ;
+            $result = CKFinder_Connector_CommandHandler_Thumbnail::createThumb($filePath, $newFilePath, $newWidth, $newHeight, $quality, false);
             if (!$result) {
                 $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_ACCESS_DENIED);
             }
@@ -137,7 +137,7 @@ 
                 $newFilePath = CKFinder_Connector_Utils_FileSystem::combinePaths($this->_currentFolder->getServerPath(), $thumbName);
                 if (!empty($config[$size.'Thumb'])) {
                     if (preg_match("/^(\d+)x(\d+)$/", $config[$size.'Thumb'], $matches)) {
-                        CKFinder_Connector_CommandHandler_Thumbnail::createThumb($filePath, $newFilePath, $matches[1], $matches[2], $quality, true) ;
+                        CKFinder_Connector_CommandHandler_Thumbnail::createThumb($filePath, $newFilePath, $matches[1], $matches[2], $quality, true);
                     }
                 }
             }
@@ -148,7 +148,7 @@ 
     /**
      * @access public
      */
-    function onInitCommand( &$connectorNode )
+    function onInitCommand(&$connectorNode)
     {
         // "@" protects against E_STRICT (Only variables should be assigned by reference)
         @$pluginsInfo = &$connectorNode->getChild("PluginsInfo");
@@ -160,21 +160,21 @@ 
                 $imageresize->addAttribute($size.'Thumb', $config[$size.'Thumb']);
             }
         }
-        return true ;
+        return true;
     }
 
     /**
      * @access public
      */
-    function onBeforeExecuteCommand( &$command )
+    function onBeforeExecuteCommand(&$command)
     {
-        if ( $command == 'ImageResize' )
+        if ($command == 'ImageResize')
         {
             $this->sendResponse();
             return false;
         }
 
-        return true ;
+        return true;
     }
 }
 
@@ -226,15 +226,15 @@ 
     /**
      * @access public
      */
-    function onBeforeExecuteCommand( &$command )
+    function onBeforeExecuteCommand(&$command)
     {
-        if ( $command == 'ImageResizeInfo' )
+        if ($command == 'ImageResizeInfo')
         {
             $this->sendResponse();
             return false;
         }
 
-        return true ;
+        return true;
     }
 }
 

Braces +3 added lines, -1 removed lines

@@ -10,7 +10,9 @@
  * modifying or distribute this file or part of its contents. The contents of
  * this file is part of the Source Code of CKFinder.
  */
-if (!defined('IN_CKFINDER')) exit;
+if (!defined('IN_CKFINDER')) {
+	exit;
+}
 
 /**
  * @package CKFinder

libs/ckfinder/plugins/fileeditor/plugin.php

Indentation +61 added lines, -61 removed lines

@@ -21,79 +21,79 @@
 
 class CKFinder_Connector_CommandHandler_FileEditor extends CKFinder_Connector_CommandHandler_XmlCommandHandlerBase
 {
-    /**
-     * handle request and build XML
-     * @access protected
-     */
-    function buildXml()
-    {
-        if (empty($_POST['CKFinderCommand']) || $_POST['CKFinderCommand'] != 'true') {
-            $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_INVALID_REQUEST);
-        }
+	/**
+	 * handle request and build XML
+	 * @access protected
+	 */
+	function buildXml()
+	{
+		if (empty($_POST['CKFinderCommand']) || $_POST['CKFinderCommand'] != 'true') {
+			$this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_INVALID_REQUEST);
+		}
 
-        $this->checkConnector();
-        $this->checkRequest();
+		$this->checkConnector();
+		$this->checkRequest();
 
-        // Saving empty file is equal to deleting a file, that's why FILE_DELETE permissions are required
-        if (!$this->_currentFolder->checkAcl(CKFINDER_CONNECTOR_ACL_FILE_DELETE)) {
-            $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_UNAUTHORIZED);
-        }
+		// Saving empty file is equal to deleting a file, that's why FILE_DELETE permissions are required
+		if (!$this->_currentFolder->checkAcl(CKFINDER_CONNECTOR_ACL_FILE_DELETE)) {
+			$this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_UNAUTHORIZED);
+		}
 
-        if (!isset($_POST["fileName"])) {
-            $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_INVALID_NAME);
-        }
-        if (!isset($_POST["content"])) {
-            $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_INVALID_REQUEST);
-        }
+		if (!isset($_POST["fileName"])) {
+			$this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_INVALID_NAME);
+		}
+		if (!isset($_POST["content"])) {
+			$this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_INVALID_REQUEST);
+		}
 
-        $fileName = CKFinder_Connector_Utils_FileSystem::convertToFilesystemEncoding($_POST["fileName"]);
-        $resourceTypeInfo = $this->_currentFolder->getResourceTypeConfig();
+		$fileName = CKFinder_Connector_Utils_FileSystem::convertToFilesystemEncoding($_POST["fileName"]);
+		$resourceTypeInfo = $this->_currentFolder->getResourceTypeConfig();
 
-        if (!$resourceTypeInfo->checkExtension($fileName)) {
-            $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_INVALID_EXTENSION);
-        }
+		if (!$resourceTypeInfo->checkExtension($fileName)) {
+			$this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_INVALID_EXTENSION);
+		}
 
-        if (!CKFinder_Connector_Utils_FileSystem::checkFileName($fileName) || $resourceTypeInfo->checkIsHiddenFile($fileName)) {
-            $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_INVALID_REQUEST);
-        }
+		if (!CKFinder_Connector_Utils_FileSystem::checkFileName($fileName) || $resourceTypeInfo->checkIsHiddenFile($fileName)) {
+			$this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_INVALID_REQUEST);
+		}
 
-        $filePath = CKFinder_Connector_Utils_FileSystem::combinePaths($this->_currentFolder->getServerPath(), $fileName);
+		$filePath = CKFinder_Connector_Utils_FileSystem::combinePaths($this->_currentFolder->getServerPath(), $fileName);
 
-        if (!file_exists($filePath) || !is_file($filePath)) {
-            $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_FILE_NOT_FOUND);
-        }
+		if (!file_exists($filePath) || !is_file($filePath)) {
+			$this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_FILE_NOT_FOUND);
+		}
 
-        if (!is_writable(dirname($filePath))) {
-            $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_ACCESS_DENIED);
-        }
+		if (!is_writable(dirname($filePath))) {
+			$this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_ACCESS_DENIED);
+		}
 
-        $fp = @fopen($filePath, 'wb');
-        if ($fp === false || !flock($fp, LOCK_EX)) {
-            $result = false;
-        }
-        else {
-            $result = fwrite($fp, $_POST["content"]);
-            flock($fp, LOCK_UN);
-            fclose($fp);
-        }
-        if ($result === false) {
-            $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_ACCESS_DENIED);
-        }
-    }
+		$fp = @fopen($filePath, 'wb');
+		if ($fp === false || !flock($fp, LOCK_EX)) {
+			$result = false;
+		}
+		else {
+			$result = fwrite($fp, $_POST["content"]);
+			flock($fp, LOCK_UN);
+			fclose($fp);
+		}
+		if ($result === false) {
+			$this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_ACCESS_DENIED);
+		}
+	}
 
-    /**
-     * @access public
-     */
-    function onBeforeExecuteCommand( &$command )
-    {
-        if ( $command == 'SaveFile' )
-        {
-            $this->sendResponse();
-            return false;
-        }
+	/**
+	 * @access public
+	 */
+	function onBeforeExecuteCommand( &$command )
+	{
+		if ( $command == 'SaveFile' )
+		{
+			$this->sendResponse();
+			return false;
+		}
 
-        return true ;
-    }
+		return true ;
+	}
 }
 
 $CommandHandler_FileEditor = new CKFinder_Connector_CommandHandler_FileEditor();

Spacing +4 added lines, -4 removed lines

@@ -17,7 +17,7 @@ 
 /**
  * Include base XML command handler
  */
-require_once CKFINDER_CONNECTOR_LIB_DIR . "/CommandHandler/XmlCommandHandlerBase.php";
+require_once CKFINDER_CONNECTOR_LIB_DIR."/CommandHandler/XmlCommandHandlerBase.php";
 
 class CKFinder_Connector_CommandHandler_FileEditor extends CKFinder_Connector_CommandHandler_XmlCommandHandlerBase
 {
@@ -84,15 +84,15 @@ 
     /**
      * @access public
      */
-    function onBeforeExecuteCommand( &$command )
+    function onBeforeExecuteCommand(&$command)
     {
-        if ( $command == 'SaveFile' )
+        if ($command == 'SaveFile')
         {
             $this->sendResponse();
             return false;
         }
 
-        return true ;
+        return true;
     }
 }
 

Braces +4 added lines, -3 removed lines

@@ -10,7 +10,9 @@ 
  * modifying or distribute this file or part of its contents. The contents of
  * this file is part of the Source Code of CKFinder.
  */
-if (!defined('IN_CKFINDER')) exit;
+if (!defined('IN_CKFINDER')) {
+	exit;
+}
 
 /**
  * @package CKFinder
@@ -66,8 +68,7 @@ 
 
             $funcNum = preg_replace("/[^0-9]/", "", $_GET['CKEditorFuncNum']);
             echo "window.parent.CKEDITOR.tools.callFunction($funcNum, '" . str_replace("'", "\\'", $sFileUrl . $sFileName) . "', '" .str_replace("'", "\\'", $errorMessage). "');";
-        }
-        else {
+        } else {
             if (!$uploaded) {
                 echo "window.parent.OnUploadCompleted(" . $number . ", '', '', '') ;";
             } else {

libs/ckfinder/ckfinder.php

Spacing +3 added lines, -3 removed lines

@@ -11,7 +11,7 @@
  * this file is part of the Source Code of CKFinder.
  */
 
-if ( version_compare( phpversion(), '5', '<' ) )
-	require_once 'core/ckfinder_php4.php' ;
+if (version_compare(phpversion(), '5', '<'))
+	require_once 'core/ckfinder_php4.php';
 else
-	require_once 'core/ckfinder_php5.php' ;
+	require_once 'core/ckfinder_php5.php';

Braces +3 added lines, -2 removed lines

@@ -11,7 +11,8 @@
  * this file is part of the Source Code of CKFinder.
  */
 
-if ( version_compare( phpversion(), '5', '<' ) )
+if ( version_compare( phpversion(), '5', '<' ) ) {
 	require_once 'core/ckfinder_php4.php' ;
-else
+} else {
 	require_once 'core/ckfinder_php5.php' ;
+}

libs/ckfinder/config.php

Indentation +53 added lines, -53 removed lines

@@ -21,16 +21,16 @@ 
  */
 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...
+	// 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 true;
+		return true;
 
 
-    // ... where $_SESSION['IsAuthorized'] is set to "true" as soon as the
-    // user logs in your system. To be able to use session variables don't
-    // forget to add session_start() at the top of this file.
+	// ... where $_SESSION['IsAuthorized'] is set to "true" as soon as the
+	// user logs in your system. To be able to use session variables don't
+	// forget to add session_start() at the top of this file.
 
     
 }
@@ -98,23 +98,23 @@ 
 directory, no matter the resource type.
 */
 $config['Thumbnails'] = Array(
-        'url' => $baseUrl . '_thumbs',
-        'directory' => $baseDir . '_thumbs',
-        'enabled' => true,
-        'directAccess' => false,
-        'maxWidth' => 100,
-        'maxHeight' => 100,
-        'bmpSupported' => false,
-        'quality' => 80);
+		'url' => $baseUrl . '_thumbs',
+		'directory' => $baseDir . '_thumbs',
+		'enabled' => true,
+		'directAccess' => false,
+		'maxWidth' => 100,
+		'maxHeight' => 100,
+		'bmpSupported' => false,
+		'quality' => 80);
 
 /*
 Set the maximum size of uploaded images. If an uploaded image is larger, it
 gets scaled down proportionally. Set to 0 to disable this feature.
 */
 $config['Images'] = Array(
-        'maxWidth' => 700,
-        'maxHeight' => 1200,
-        'quality' => 80);
+		'maxWidth' => 700,
+		'maxHeight' => 1200,
+		'quality' => 80);
 
 /*
 RoleSessionVar : the session variable name that CKFinder must use to retrieve
@@ -140,19 +140,19 @@ 
 */
 
 $config['AccessControl'][] = Array(
-        'role' => '*',
-        'resourceType' => '*',
-        'folder' => '/',
+		'role' => '*',
+		'resourceType' => '*',
+		'folder' => '/',
 
-        'folderView' => true,
-        'folderCreate' => true,
-        'folderRename' => true,
-        'folderDelete' => true,
+		'folderView' => true,
+		'folderCreate' => true,
+		'folderRename' => true,
+		'folderDelete' => true,
 
-        'fileView' => true,
-        'fileUpload' => true,
-        'fileRename' => true,
-        'fileDelete' => true);
+		'fileView' => true,
+		'fileUpload' => true,
+		'fileRename' => true,
+		'fileDelete' => true);
 
 /*
 For example, if you want to restrict the upload, rename or delete of files in
@@ -195,36 +195,36 @@ 
 $config['DefaultResourceTypes'] = '';
 
 $config['ResourceType'][] = Array(
-        'name' => 'Files',              // Single quotes not allowed
-        'url' => $baseUrl . '/file/',
-        'directory' => $baseDir .  '/file/',
-        'maxSize' => 0,
-        'allowedExtensions' => '7z,aiff,asf,avi,bmp,csv,doc,docx,fla,flv,gif,gz,gzip,jpeg,jpg,mid,mov,mp3,mp4,mpc,mpeg,mpg,ods,odt,pdf,png,ppt,pptx,pxd,qt,ram,rar,rm,rmi,rmvb,rtf,sdc,sitd,swf,sxc,sxw,tar,tgz,tif,tiff,txt,vsd,wav,wma,wmv,xls,xlsx,zip,ai,psd',
-        'deniedExtensions' => '');
+		'name' => 'Files',              // Single quotes not allowed
+		'url' => $baseUrl . '/file/',
+		'directory' => $baseDir .  '/file/',
+		'maxSize' => 0,
+		'allowedExtensions' => '7z,aiff,asf,avi,bmp,csv,doc,docx,fla,flv,gif,gz,gzip,jpeg,jpg,mid,mov,mp3,mp4,mpc,mpeg,mpg,ods,odt,pdf,png,ppt,pptx,pxd,qt,ram,rar,rm,rmi,rmvb,rtf,sdc,sitd,swf,sxc,sxw,tar,tgz,tif,tiff,txt,vsd,wav,wma,wmv,xls,xlsx,zip,ai,psd',
+		'deniedExtensions' => '');
 
 $config['ResourceType'][] = Array(
-        'name' => 'Images',
-        'url' => $baseUrl .  '/image/',
-        'directory' => $baseDir .  '/image/',
-        'maxSize' => "16M",
-        'allowedExtensions' => 'bmp,gif,jpeg,jpg,png,',
-        'deniedExtensions' => '');
+		'name' => 'Images',
+		'url' => $baseUrl .  '/image/',
+		'directory' => $baseDir .  '/image/',
+		'maxSize' => "16M",
+		'allowedExtensions' => 'bmp,gif,jpeg,jpg,png,',
+		'deniedExtensions' => '');
 
 $config['ResourceType'][] = Array(
-        'name' => 'Flash',
-        'url' => $baseUrl .  '/flash/',
-        'directory' => $baseDir .  '/flash/',
-        'maxSize' => 0,
-        'allowedExtensions' => 'swf,flv',
-        'deniedExtensions' => '');
+		'name' => 'Flash',
+		'url' => $baseUrl .  '/flash/',
+		'directory' => $baseDir .  '/flash/',
+		'maxSize' => 0,
+		'allowedExtensions' => 'swf,flv',
+		'deniedExtensions' => '');
 
 $config['ResourceType'][] = Array(
-        'name' => 'Media',
-        'url' => $baseUrl .  '/media/',
-        'directory' => $baseDir .  '/media/',
-        'maxSize' => 0,
-        'allowedExtensions' => 'mp3,mp4,swf,flv,avi',
-        'deniedExtensions' => '');
+		'name' => 'Media',
+		'url' => $baseUrl .  '/media/',
+		'directory' => $baseDir .  '/media/',
+		'maxSize' => 0,
+		'allowedExtensions' => 'mp3,mp4,swf,flv,avi',
+		'deniedExtensions' => '');
 
 /*
  Due to security issues with Apache modules, it is recommended to leave the

Spacing +13 added lines, -13 removed lines

@@ -98,8 +98,8 @@ 
 directory, no matter the resource type.
 */
 $config['Thumbnails'] = Array(
-        'url' => $baseUrl . '_thumbs',
-        'directory' => $baseDir . '_thumbs',
+        'url' => $baseUrl.'_thumbs',
+        'directory' => $baseDir.'_thumbs',
         'enabled' => true,
         'directAccess' => false,
         'maxWidth' => 100,
@@ -195,33 +195,33 @@ 
 $config['DefaultResourceTypes'] = '';
 
 $config['ResourceType'][] = Array(
-        'name' => 'Files',              // Single quotes not allowed
-        'url' => $baseUrl . '/file/',
-        'directory' => $baseDir .  '/file/',
+        'name' => 'Files', // Single quotes not allowed
+        'url' => $baseUrl.'/file/',
+        'directory' => $baseDir.'/file/',
         'maxSize' => 0,
         'allowedExtensions' => '7z,aiff,asf,avi,bmp,csv,doc,docx,fla,flv,gif,gz,gzip,jpeg,jpg,mid,mov,mp3,mp4,mpc,mpeg,mpg,ods,odt,pdf,png,ppt,pptx,pxd,qt,ram,rar,rm,rmi,rmvb,rtf,sdc,sitd,swf,sxc,sxw,tar,tgz,tif,tiff,txt,vsd,wav,wma,wmv,xls,xlsx,zip,ai,psd',
         'deniedExtensions' => '');
 
 $config['ResourceType'][] = Array(
         'name' => 'Images',
-        'url' => $baseUrl .  '/image/',
-        'directory' => $baseDir .  '/image/',
+        'url' => $baseUrl.'/image/',
+        'directory' => $baseDir.'/image/',
         'maxSize' => "16M",
         'allowedExtensions' => 'bmp,gif,jpeg,jpg,png,',
         'deniedExtensions' => '');
 
 $config['ResourceType'][] = Array(
         'name' => 'Flash',
-        'url' => $baseUrl .  '/flash/',
-        'directory' => $baseDir .  '/flash/',
+        'url' => $baseUrl.'/flash/',
+        'directory' => $baseDir.'/flash/',
         'maxSize' => 0,
         'allowedExtensions' => 'swf,flv',
         'deniedExtensions' => '');
 
 $config['ResourceType'][] = Array(
         'name' => 'Media',
-        'url' => $baseUrl .  '/media/',
-        'directory' => $baseDir .  '/media/',
+        'url' => $baseUrl.'/media/',
+        'directory' => $baseDir.'/media/',
         'maxSize' => 0,
         'allowedExtensions' => 'mp3,mp4,swf,flv,avi',
         'deniedExtensions' => '');
@@ -299,13 +299,13 @@ 
 Set to 0 to disable this feature.
 Note: not needed on Windows-based servers.
 */
-$config['ChmodFiles'] = 0777 ;
+$config['ChmodFiles'] = 0777;
 
 /*
 See comments above.
 Used when creating folders that does not exist.
 */
-$config['ChmodFolders'] = 0777 ;
+$config['ChmodFolders'] = 0777;
 
 /*
 Force ASCII names for files and folders.

libs/ckfinder/core/connector/php/constants.php

Indentation +5 added lines, -5 removed lines

@@ -55,19 +55,19 @@
 define('CKFINDER_CONNECTOR_CONFIG_FILE_PATH',"./../../../config.php");
 
 if (version_compare(phpversion(), '6', '>=')) {
-    define('CKFINDER_CONNECTOR_PHP_MODE', 6);
+	define('CKFINDER_CONNECTOR_PHP_MODE', 6);
 }
 else if (version_compare(phpversion(), '5', '>=')) {
-    define('CKFINDER_CONNECTOR_PHP_MODE', 5);
+	define('CKFINDER_CONNECTOR_PHP_MODE', 5);
 }
 else {
-    define('CKFINDER_CONNECTOR_PHP_MODE', 4);
+	define('CKFINDER_CONNECTOR_PHP_MODE', 4);
 }
 
 if (CKFINDER_CONNECTOR_PHP_MODE == 4) {
-    define('CKFINDER_CONNECTOR_LIB_DIR', "./php4");
+	define('CKFINDER_CONNECTOR_LIB_DIR', "./php4");
 } else {
-    define('CKFINDER_CONNECTOR_LIB_DIR', "./php5");
+	define('CKFINDER_CONNECTOR_LIB_DIR', "./php5");
 }
 
 define('CKFINDER_CHARS', '123456789ABCDEFGHJKLMNPQRSTUVWXYZ');

Spacing +28 added lines, -28 removed lines

@@ -23,36 +23,36 @@
  * No errors
  */
 define('IN_CKFINDER', true);
-define('CKFINDER_CONNECTOR_ERROR_NONE',0);
-define('CKFINDER_CONNECTOR_ERROR_CUSTOM_ERROR',1);
-define('CKFINDER_CONNECTOR_ERROR_INVALID_COMMAND',10);
-define('CKFINDER_CONNECTOR_ERROR_TYPE_NOT_SPECIFIED',11);
-define('CKFINDER_CONNECTOR_ERROR_INVALID_TYPE',12);
-define('CKFINDER_CONNECTOR_ERROR_INVALID_NAME',102);
-define('CKFINDER_CONNECTOR_ERROR_UNAUTHORIZED',103);
-define('CKFINDER_CONNECTOR_ERROR_ACCESS_DENIED',104);
-define('CKFINDER_CONNECTOR_ERROR_INVALID_EXTENSION',105);
-define('CKFINDER_CONNECTOR_ERROR_INVALID_REQUEST',109);
-define('CKFINDER_CONNECTOR_ERROR_UNKNOWN',110);
-define('CKFINDER_CONNECTOR_ERROR_ALREADY_EXIST',115);
-define('CKFINDER_CONNECTOR_ERROR_FOLDER_NOT_FOUND',116);
-define('CKFINDER_CONNECTOR_ERROR_FILE_NOT_FOUND',117);
-define('CKFINDER_CONNECTOR_ERROR_SOURCE_AND_TARGET_PATH_EQUAL',118);
-define('CKFINDER_CONNECTOR_ERROR_UPLOADED_FILE_RENAMED',201);
-define('CKFINDER_CONNECTOR_ERROR_UPLOADED_INVALID',202);
-define('CKFINDER_CONNECTOR_ERROR_UPLOADED_TOO_BIG',203);
-define('CKFINDER_CONNECTOR_ERROR_UPLOADED_CORRUPT',204);
-define('CKFINDER_CONNECTOR_ERROR_UPLOADED_NO_TMP_DIR',205);
-define('CKFINDER_CONNECTOR_ERROR_UPLOADED_WRONG_HTML_FILE',206);
-define('CKFINDER_CONNECTOR_ERROR_MOVE_FAILED',300);
-define('CKFINDER_CONNECTOR_ERROR_COPY_FAILED',301);
+define('CKFINDER_CONNECTOR_ERROR_NONE', 0);
+define('CKFINDER_CONNECTOR_ERROR_CUSTOM_ERROR', 1);
+define('CKFINDER_CONNECTOR_ERROR_INVALID_COMMAND', 10);
+define('CKFINDER_CONNECTOR_ERROR_TYPE_NOT_SPECIFIED', 11);
+define('CKFINDER_CONNECTOR_ERROR_INVALID_TYPE', 12);
+define('CKFINDER_CONNECTOR_ERROR_INVALID_NAME', 102);
+define('CKFINDER_CONNECTOR_ERROR_UNAUTHORIZED', 103);
+define('CKFINDER_CONNECTOR_ERROR_ACCESS_DENIED', 104);
+define('CKFINDER_CONNECTOR_ERROR_INVALID_EXTENSION', 105);
+define('CKFINDER_CONNECTOR_ERROR_INVALID_REQUEST', 109);
+define('CKFINDER_CONNECTOR_ERROR_UNKNOWN', 110);
+define('CKFINDER_CONNECTOR_ERROR_ALREADY_EXIST', 115);
+define('CKFINDER_CONNECTOR_ERROR_FOLDER_NOT_FOUND', 116);
+define('CKFINDER_CONNECTOR_ERROR_FILE_NOT_FOUND', 117);
+define('CKFINDER_CONNECTOR_ERROR_SOURCE_AND_TARGET_PATH_EQUAL', 118);
+define('CKFINDER_CONNECTOR_ERROR_UPLOADED_FILE_RENAMED', 201);
+define('CKFINDER_CONNECTOR_ERROR_UPLOADED_INVALID', 202);
+define('CKFINDER_CONNECTOR_ERROR_UPLOADED_TOO_BIG', 203);
+define('CKFINDER_CONNECTOR_ERROR_UPLOADED_CORRUPT', 204);
+define('CKFINDER_CONNECTOR_ERROR_UPLOADED_NO_TMP_DIR', 205);
+define('CKFINDER_CONNECTOR_ERROR_UPLOADED_WRONG_HTML_FILE', 206);
+define('CKFINDER_CONNECTOR_ERROR_MOVE_FAILED', 300);
+define('CKFINDER_CONNECTOR_ERROR_COPY_FAILED', 301);
 define('CKFINDER_CONNECTOR_ERROR_UPLOADED_INVALID_NAME_RENAMED', 207);
-define('CKFINDER_CONNECTOR_ERROR_CONNECTOR_DISABLED',500);
-define('CKFINDER_CONNECTOR_ERROR_THUMBNAILS_DISABLED',501);
+define('CKFINDER_CONNECTOR_ERROR_CONNECTOR_DISABLED', 500);
+define('CKFINDER_CONNECTOR_ERROR_THUMBNAILS_DISABLED', 501);
 
-define('CKFINDER_CONNECTOR_DEFAULT_USER_FILES_PATH',"/userfiles/");
-define('CKFINDER_CONNECTOR_LANG_PATH',"./lang");
-define('CKFINDER_CONNECTOR_CONFIG_FILE_PATH',"./../../../config.php");
+define('CKFINDER_CONNECTOR_DEFAULT_USER_FILES_PATH', "/userfiles/");
+define('CKFINDER_CONNECTOR_LANG_PATH', "./lang");
+define('CKFINDER_CONNECTOR_CONFIG_FILE_PATH', "./../../../config.php");
 
 if (version_compare(phpversion(), '6', '>=')) {
     define('CKFINDER_CONNECTOR_PHP_MODE', 6);

Braces +2 added lines, -4 removed lines

@@ -56,11 +56,9 @@
 
 if (version_compare(phpversion(), '6', '>=')) {
     define('CKFINDER_CONNECTOR_PHP_MODE', 6);
-}
-else if (version_compare(phpversion(), '5', '>=')) {
+} else if (version_compare(phpversion(), '5', '>=')) {
     define('CKFINDER_CONNECTOR_PHP_MODE', 5);
-}
-else {
+} else {
     define('CKFINDER_CONNECTOR_PHP_MODE', 4);
 }
 

libs/ckfinder/core/connector/php/connector.php

Indentation +4 added lines, -4 removed lines

@@ -64,8 +64,8 @@ 
  * @return string
  */
 function resolveUrl($baseUrl) {
-    $fileSystem =& CKFinder_Connector_Core_Factory::getInstance("Utils_FileSystem");
-    return $fileSystem->getDocumentRootPath() . $baseUrl;
+	$fileSystem =& CKFinder_Connector_Core_Factory::getInstance("Utils_FileSystem");
+	return $fileSystem->getDocumentRootPath() . $baseUrl;
 }
 
 $utilsSecurity =& CKFinder_Connector_Core_Factory::getInstance("Utils_Security");
@@ -87,8 +87,8 @@ 
 $connector =& CKFinder_Connector_Core_Factory::getInstance("Core_Connector");
 
 if(isset($_GET['command'])) {
-    $connector->executeCommand($_GET['command']);
+	$connector->executeCommand($_GET['command']);
 }
 else {
-    $connector->handleInvalidCommand();
+	$connector->handleInvalidCommand();
 }

Spacing +9 added lines, -9 removed lines

@@ -41,19 +41,19 @@ 
 /**
  * we need this class in each call
  */
-require_once CKFINDER_CONNECTOR_LIB_DIR . "/CommandHandler/CommandHandlerBase.php";
+require_once CKFINDER_CONNECTOR_LIB_DIR."/CommandHandler/CommandHandlerBase.php";
 /**
  * singleton factory
  */
-require_once CKFINDER_CONNECTOR_LIB_DIR . "/Core/Factory.php";
+require_once CKFINDER_CONNECTOR_LIB_DIR."/Core/Factory.php";
 /**
  * utils class
  */
-require_once CKFINDER_CONNECTOR_LIB_DIR . "/Utils/Misc.php";
+require_once CKFINDER_CONNECTOR_LIB_DIR."/Utils/Misc.php";
 /**
  * hooks class
  */
-require_once CKFINDER_CONNECTOR_LIB_DIR . "/Core/Hooks.php";
+require_once CKFINDER_CONNECTOR_LIB_DIR."/Core/Hooks.php";
 /**
  * Simple function required by config.php - discover the server side path
  * to the directory relative to the "$baseUrl" attribute
@@ -64,11 +64,11 @@ 
  * @return string
  */
 function resolveUrl($baseUrl) {
-    $fileSystem =& CKFinder_Connector_Core_Factory::getInstance("Utils_FileSystem");
-    return $fileSystem->getDocumentRootPath() . $baseUrl;
+    $fileSystem = & CKFinder_Connector_Core_Factory::getInstance("Utils_FileSystem");
+    return $fileSystem->getDocumentRootPath().$baseUrl;
 }
 
-$utilsSecurity =& CKFinder_Connector_Core_Factory::getInstance("Utils_Security");
+$utilsSecurity = & CKFinder_Connector_Core_Factory::getInstance("Utils_Security");
 $utilsSecurity->getRidOfMagicQuotes();
 
 /**
@@ -84,9 +84,9 @@ 
 require_once CKFINDER_CONNECTOR_CONFIG_FILE_PATH;
 
 CKFinder_Connector_Core_Factory::initFactory();
-$connector =& CKFinder_Connector_Core_Factory::getInstance("Core_Connector");
+$connector = & CKFinder_Connector_Core_Factory::getInstance("Core_Connector");
 
-if(isset($_GET['command'])) {
+if (isset($_GET['command'])) {
     $connector->executeCommand($_GET['command']);
 }
 else {

Braces +1 added lines, -2 removed lines

@@ -88,7 +88,6 @@
 
 if(isset($_GET['command'])) {
     $connector->executeCommand($_GET['command']);
-}
-else {
+} else {
     $connector->handleInvalidCommand();
 }

libs/ckfinder/core/connector/php/php5/CommandHandler/CopyFiles.php

Indentation +220 added lines, -220 removed lines

@@ -32,224 +32,224 @@
  */
 class CKFinder_Connector_CommandHandler_CopyFiles extends CKFinder_Connector_CommandHandler_XmlCommandHandlerBase
 {
-    /**
-     * Command name
-     *
-     * @access private
-     * @var string
-     */
-    private $command = "CopyFiles";
-
-
-    /**
-     * handle request and build XML
-     * @access protected
-     *
-     */
-    protected function buildXml()
-    {
-        if (empty($_POST['CKFinderCommand']) || $_POST['CKFinderCommand'] != 'true') {
-            $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_INVALID_REQUEST);
-        }
-
-        $clientPath = $this->_currentFolder->getClientPath();
-        $sServerDir = $this->_currentFolder->getServerPath();
-        $currentResourceTypeConfig = $this->_currentFolder->getResourceTypeConfig();
-        $_config =& CKFinder_Connector_Core_Factory::getInstance("Core_Config");
-        $_aclConfig = $_config->getAccessControlConfig();
-        $aclMasks = array();
-        $_resourceTypeConfig = array();
-
-        if (!$this->_currentFolder->checkAcl(CKFINDER_CONNECTOR_ACL_FILE_RENAME | CKFINDER_CONNECTOR_ACL_FILE_UPLOAD | CKFINDER_CONNECTOR_ACL_FILE_DELETE)) {
-            $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_UNAUTHORIZED);
-        }
-
-        // Create the "Errors" node.
-        $oErrorsNode = new CKFinder_Connector_Utils_XmlNode("Errors");
-        $errorCode = CKFINDER_CONNECTOR_ERROR_NONE;
-        $copied = 0;
-        $copiedAll = 0;
-        if (!empty($_POST['copied'])) {
-            $copiedAll = intval($_POST['copied']);
-        }
-        $checkedPaths = array();
-
-        $oCopyFilesNode = new Ckfinder_Connector_Utils_XmlNode("CopyFiles");
-
-        if (!empty($_POST['files']) && is_array($_POST['files'])) {
-            foreach ($_POST['files'] as $index => $arr) {
-                if (empty($arr['name'])) {
-                    continue;
-                }
-                if (!isset($arr['name'], $arr['type'], $arr['folder'])) {
-                    $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_INVALID_REQUEST);
-                }
-
-                // file name
-                $name = CKFinder_Connector_Utils_FileSystem::convertToFilesystemEncoding($arr['name']);
-                // resource type
-                $type = $arr['type'];
-                // client path
-                $path = CKFinder_Connector_Utils_FileSystem::convertToFilesystemEncoding($arr['folder']);
-                // options
-                $options = (!empty($arr['options'])) ? $arr['options'] : '';
-
-                $destinationFilePath = $sServerDir.$name;
-
-                // check #1 (path)
-                if (!CKFinder_Connector_Utils_FileSystem::checkFileName($name) || preg_match(CKFINDER_REGEX_INVALID_PATH, $path)) {
-                    $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_INVALID_REQUEST);
-                }
-
-                // get resource type config for current file
-                if (!isset($_resourceTypeConfig[$type])) {
-                    $_resourceTypeConfig[$type] = $_config->getResourceTypeConfig($type);
-                }
-
-                // check #2 (resource type)
-                if (is_null($_resourceTypeConfig[$type])) {
-                    $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_INVALID_REQUEST);
-                }
-
-                // check #3 (extension)
-                if (!$_resourceTypeConfig[$type]->checkExtension($name, false)) {
-                    $errorCode = CKFINDER_CONNECTOR_ERROR_INVALID_EXTENSION;
-                    $this->appendErrorNode($oErrorsNode, $errorCode, $name, $type, $path);
-                    continue;
-                }
-
-                // check #4 (extension) - when moving to another resource type, double check extension
-                if ($currentResourceTypeConfig->getName() != $type) {
-                    if (!$currentResourceTypeConfig->checkExtension($name, false)) {
-                        $errorCode = CKFINDER_CONNECTOR_ERROR_INVALID_EXTENSION;
-                        $this->appendErrorNode($oErrorsNode, $errorCode, $name, $type, $path);
-                        continue;
-                    }
-                }
-
-                // check #5 (hidden folders)
-                // cache results
-                if (empty($checkedPaths[$path])) {
-                    $checkedPaths[$path] = true;
-
-                    if ($_resourceTypeConfig[$type]->checkIsHiddenPath($path)) {
-                        $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_INVALID_REQUEST);
-                    }
-                }
-
-                $sourceFilePath = $_resourceTypeConfig[$type]->getDirectory().$path.$name;
-
-                // check #6 (hidden file name)
-                if ($currentResourceTypeConfig->checkIsHiddenFile($name)) {
-                    $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_INVALID_REQUEST);
-                }
-
-                // check #7 (Access Control, need file view permission to source files)
-                if (!isset($aclMasks[$type."@".$path])) {
-                    $aclMasks[$type."@".$path] = $_aclConfig->getComputedMask($type, $path);
-                }
-
-                $isAuthorized = (($aclMasks[$type."@".$path] & CKFINDER_CONNECTOR_ACL_FILE_VIEW) == CKFINDER_CONNECTOR_ACL_FILE_VIEW);
-                if (!$isAuthorized) {
-                    $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_UNAUTHORIZED);
-                }
-
-                // check #8 (invalid file name)
-                if (!file_exists($sourceFilePath) || !is_file($sourceFilePath)) {
-                    $errorCode = CKFINDER_CONNECTOR_ERROR_FILE_NOT_FOUND;
-                    $this->appendErrorNode($oErrorsNode, $errorCode, $name, $type, $path);
-                    continue;
-                }
-
-                // check #9 (max size)
-                if ($currentResourceTypeConfig->getName() != $type) {
-                    $maxSize = $currentResourceTypeConfig->getMaxSize();
-                    $fileSize = filesize($sourceFilePath);
-                    if ($maxSize && $fileSize>$maxSize) {
-                        $errorCode = CKFINDER_CONNECTOR_ERROR_UPLOADED_TOO_BIG;
-                        $this->appendErrorNode($oErrorsNode, $errorCode, $name, $type, $path);
-                        continue;
-                    }
-                }
-
-                //$overwrite
-                // finally, no errors so far, we may attempt to copy a file
-                // protection against copying files to itself
-                if ($sourceFilePath == $destinationFilePath) {
-                    $errorCode = CKFINDER_CONNECTOR_ERROR_SOURCE_AND_TARGET_PATH_EQUAL;
-                    $this->appendErrorNode($oErrorsNode, $errorCode, $name, $type, $path);
-                    continue;
-                }
-                // check if file exists if we don't force overwriting
-                else if (file_exists($destinationFilePath) && strpos($options, "overwrite") === false) {
-                    if (strpos($options, "autorename") !== false) {
-                        $iCounter = 1;
-                        while (true)
-                        {
-                            $fileName = CKFinder_Connector_Utils_FileSystem::getFileNameWithoutExtension($name) .
-                                "(" . $iCounter . ")" . "." .
-                                CKFinder_Connector_Utils_FileSystem::getExtension($name);
-
-                            $destinationFilePath = $sServerDir.$fileName;
-                            if (!file_exists($destinationFilePath)) {
-                                break;
-                            }
-                            else {
-                                $iCounter++;
-                            }
-                        }
-                        if (!@copy($sourceFilePath, $destinationFilePath)) {
-                            $errorCode = CKFINDER_CONNECTOR_ERROR_ACCESS_DENIED;
-                            $this->appendErrorNode($oErrorsNode, $errorCode, $name, $type, $path);
-                            continue;
-                        }
-                        else {
-                            $copied++;
-                        }
-                    }
-                    else {
-                        $errorCode = CKFINDER_CONNECTOR_ERROR_ALREADY_EXIST;
-                        $this->appendErrorNode($oErrorsNode, $errorCode, $name, $type, $path);
-                        continue;
-                    }
-                }
-                // copy() overwrites without warning
-                else {
-                    if (!@copy($sourceFilePath, $destinationFilePath)) {
-                        $errorCode = CKFINDER_CONNECTOR_ERROR_ACCESS_DENIED;
-                        $this->appendErrorNode($oErrorsNode, $errorCode, $name, $type, $path);
-                        continue;
-                    }
-                    else {
-                        $copied++;
-                    }
-                }
-            }
-        }
-
-        $this->_connectorNode->addChild($oCopyFilesNode);
-        if ($errorCode != CKFINDER_CONNECTOR_ERROR_NONE) {
-            $this->_connectorNode->addChild($oErrorsNode);
-        }
-        $oCopyFilesNode->addAttribute("copied", $copied);
-        $oCopyFilesNode->addAttribute("copiedTotal", $copiedAll + $copied);
-
-        /**
-         * Note: actually we could have more than one error.
-         * This is just a flag for CKFinder interface telling it to check all errors.
-         */
-        if ($errorCode != CKFINDER_CONNECTOR_ERROR_NONE) {
-            $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_COPY_FAILED);
-        }
-    }
-
-    private function appendErrorNode($oErrorsNode, $errorCode, $name, $type, $path)
-    {
-        $oErrorNode = new CKFinder_Connector_Utils_XmlNode("Error");
-        $oErrorNode->addAttribute("code", $errorCode);
-        $oErrorNode->addAttribute("name", CKFinder_Connector_Utils_FileSystem::convertToConnectorEncoding($name));
-        $oErrorNode->addAttribute("type", $type);
-        $oErrorNode->addAttribute("folder", $path);
-        $oErrorsNode->addChild($oErrorNode);
-    }
+	/**
+	 * Command name
+	 *
+	 * @access private
+	 * @var string
+	 */
+	private $command = "CopyFiles";
+
+
+	/**
+	 * handle request and build XML
+	 * @access protected
+	 *
+	 */
+	protected function buildXml()
+	{
+		if (empty($_POST['CKFinderCommand']) || $_POST['CKFinderCommand'] != 'true') {
+			$this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_INVALID_REQUEST);
+		}
+
+		$clientPath = $this->_currentFolder->getClientPath();
+		$sServerDir = $this->_currentFolder->getServerPath();
+		$currentResourceTypeConfig = $this->_currentFolder->getResourceTypeConfig();
+		$_config =& CKFinder_Connector_Core_Factory::getInstance("Core_Config");
+		$_aclConfig = $_config->getAccessControlConfig();
+		$aclMasks = array();
+		$_resourceTypeConfig = array();
+
+		if (!$this->_currentFolder->checkAcl(CKFINDER_CONNECTOR_ACL_FILE_RENAME | CKFINDER_CONNECTOR_ACL_FILE_UPLOAD | CKFINDER_CONNECTOR_ACL_FILE_DELETE)) {
+			$this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_UNAUTHORIZED);
+		}
+
+		// Create the "Errors" node.
+		$oErrorsNode = new CKFinder_Connector_Utils_XmlNode("Errors");
+		$errorCode = CKFINDER_CONNECTOR_ERROR_NONE;
+		$copied = 0;
+		$copiedAll = 0;
+		if (!empty($_POST['copied'])) {
+			$copiedAll = intval($_POST['copied']);
+		}
+		$checkedPaths = array();
+
+		$oCopyFilesNode = new Ckfinder_Connector_Utils_XmlNode("CopyFiles");
+
+		if (!empty($_POST['files']) && is_array($_POST['files'])) {
+			foreach ($_POST['files'] as $index => $arr) {
+				if (empty($arr['name'])) {
+					continue;
+				}
+				if (!isset($arr['name'], $arr['type'], $arr['folder'])) {
+					$this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_INVALID_REQUEST);
+				}
+
+				// file name
+				$name = CKFinder_Connector_Utils_FileSystem::convertToFilesystemEncoding($arr['name']);
+				// resource type
+				$type = $arr['type'];
+				// client path
+				$path = CKFinder_Connector_Utils_FileSystem::convertToFilesystemEncoding($arr['folder']);
+				// options
+				$options = (!empty($arr['options'])) ? $arr['options'] : '';
+
+				$destinationFilePath = $sServerDir.$name;
+
+				// check #1 (path)
+				if (!CKFinder_Connector_Utils_FileSystem::checkFileName($name) || preg_match(CKFINDER_REGEX_INVALID_PATH, $path)) {
+					$this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_INVALID_REQUEST);
+				}
+
+				// get resource type config for current file
+				if (!isset($_resourceTypeConfig[$type])) {
+					$_resourceTypeConfig[$type] = $_config->getResourceTypeConfig($type);
+				}
+
+				// check #2 (resource type)
+				if (is_null($_resourceTypeConfig[$type])) {
+					$this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_INVALID_REQUEST);
+				}
+
+				// check #3 (extension)
+				if (!$_resourceTypeConfig[$type]->checkExtension($name, false)) {
+					$errorCode = CKFINDER_CONNECTOR_ERROR_INVALID_EXTENSION;
+					$this->appendErrorNode($oErrorsNode, $errorCode, $name, $type, $path);
+					continue;
+				}
+
+				// check #4 (extension) - when moving to another resource type, double check extension
+				if ($currentResourceTypeConfig->getName() != $type) {
+					if (!$currentResourceTypeConfig->checkExtension($name, false)) {
+						$errorCode = CKFINDER_CONNECTOR_ERROR_INVALID_EXTENSION;
+						$this->appendErrorNode($oErrorsNode, $errorCode, $name, $type, $path);
+						continue;
+					}
+				}
+
+				// check #5 (hidden folders)
+				// cache results
+				if (empty($checkedPaths[$path])) {
+					$checkedPaths[$path] = true;
+
+					if ($_resourceTypeConfig[$type]->checkIsHiddenPath($path)) {
+						$this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_INVALID_REQUEST);
+					}
+				}
+
+				$sourceFilePath = $_resourceTypeConfig[$type]->getDirectory().$path.$name;
+
+				// check #6 (hidden file name)
+				if ($currentResourceTypeConfig->checkIsHiddenFile($name)) {
+					$this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_INVALID_REQUEST);
+				}
+
+				// check #7 (Access Control, need file view permission to source files)
+				if (!isset($aclMasks[$type."@".$path])) {
+					$aclMasks[$type."@".$path] = $_aclConfig->getComputedMask($type, $path);
+				}
+
+				$isAuthorized = (($aclMasks[$type."@".$path] & CKFINDER_CONNECTOR_ACL_FILE_VIEW) == CKFINDER_CONNECTOR_ACL_FILE_VIEW);
+				if (!$isAuthorized) {
+					$this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_UNAUTHORIZED);
+				}
+
+				// check #8 (invalid file name)
+				if (!file_exists($sourceFilePath) || !is_file($sourceFilePath)) {
+					$errorCode = CKFINDER_CONNECTOR_ERROR_FILE_NOT_FOUND;
+					$this->appendErrorNode($oErrorsNode, $errorCode, $name, $type, $path);
+					continue;
+				}
+
+				// check #9 (max size)
+				if ($currentResourceTypeConfig->getName() != $type) {
+					$maxSize = $currentResourceTypeConfig->getMaxSize();
+					$fileSize = filesize($sourceFilePath);
+					if ($maxSize && $fileSize>$maxSize) {
+						$errorCode = CKFINDER_CONNECTOR_ERROR_UPLOADED_TOO_BIG;
+						$this->appendErrorNode($oErrorsNode, $errorCode, $name, $type, $path);
+						continue;
+					}
+				}
+
+				//$overwrite
+				// finally, no errors so far, we may attempt to copy a file
+				// protection against copying files to itself
+				if ($sourceFilePath == $destinationFilePath) {
+					$errorCode = CKFINDER_CONNECTOR_ERROR_SOURCE_AND_TARGET_PATH_EQUAL;
+					$this->appendErrorNode($oErrorsNode, $errorCode, $name, $type, $path);
+					continue;
+				}
+				// check if file exists if we don't force overwriting
+				else if (file_exists($destinationFilePath) && strpos($options, "overwrite") === false) {
+					if (strpos($options, "autorename") !== false) {
+						$iCounter = 1;
+						while (true)
+						{
+							$fileName = CKFinder_Connector_Utils_FileSystem::getFileNameWithoutExtension($name) .
+								"(" . $iCounter . ")" . "." .
+								CKFinder_Connector_Utils_FileSystem::getExtension($name);
+
+							$destinationFilePath = $sServerDir.$fileName;
+							if (!file_exists($destinationFilePath)) {
+								break;
+							}
+							else {
+								$iCounter++;
+							}
+						}
+						if (!@copy($sourceFilePath, $destinationFilePath)) {
+							$errorCode = CKFINDER_CONNECTOR_ERROR_ACCESS_DENIED;
+							$this->appendErrorNode($oErrorsNode, $errorCode, $name, $type, $path);
+							continue;
+						}
+						else {
+							$copied++;
+						}
+					}
+					else {
+						$errorCode = CKFINDER_CONNECTOR_ERROR_ALREADY_EXIST;
+						$this->appendErrorNode($oErrorsNode, $errorCode, $name, $type, $path);
+						continue;
+					}
+				}
+				// copy() overwrites without warning
+				else {
+					if (!@copy($sourceFilePath, $destinationFilePath)) {
+						$errorCode = CKFINDER_CONNECTOR_ERROR_ACCESS_DENIED;
+						$this->appendErrorNode($oErrorsNode, $errorCode, $name, $type, $path);
+						continue;
+					}
+					else {
+						$copied++;
+					}
+				}
+			}
+		}
+
+		$this->_connectorNode->addChild($oCopyFilesNode);
+		if ($errorCode != CKFINDER_CONNECTOR_ERROR_NONE) {
+			$this->_connectorNode->addChild($oErrorsNode);
+		}
+		$oCopyFilesNode->addAttribute("copied", $copied);
+		$oCopyFilesNode->addAttribute("copiedTotal", $copiedAll + $copied);
+
+		/**
+		 * Note: actually we could have more than one error.
+		 * This is just a flag for CKFinder interface telling it to check all errors.
+		 */
+		if ($errorCode != CKFINDER_CONNECTOR_ERROR_NONE) {
+			$this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_COPY_FAILED);
+		}
+	}
+
+	private function appendErrorNode($oErrorsNode, $errorCode, $name, $type, $path)
+	{
+		$oErrorNode = new CKFinder_Connector_Utils_XmlNode("Error");
+		$oErrorNode->addAttribute("code", $errorCode);
+		$oErrorNode->addAttribute("name", CKFinder_Connector_Utils_FileSystem::convertToConnectorEncoding($name));
+		$oErrorNode->addAttribute("type", $type);
+		$oErrorNode->addAttribute("folder", $path);
+		$oErrorsNode->addChild($oErrorNode);
+	}
 }

Doc Comments +4 added lines

@@ -259,6 +259,10 @@
         }
     }
 
+    /**
+     * @param integer $errorCode
+     * @param string $path
+     */
     private function appendErrorNode($oErrorsNode, $errorCode, $name, $type, $path)
     {
         $oErrorNode = new CKFinder_Connector_Utils_XmlNode("Error");

Spacing +5 added lines, -5 removed lines

@@ -21,7 +21,7 @@ 
 /**
  * Include base XML command handler
  */
-require_once CKFINDER_CONNECTOR_LIB_DIR . "/CommandHandler/XmlCommandHandlerBase.php";
+require_once CKFINDER_CONNECTOR_LIB_DIR."/CommandHandler/XmlCommandHandlerBase.php";
 
 /**
  * Handle MoveFiles command
@@ -55,7 +55,7 @@ 
         $clientPath = $this->_currentFolder->getClientPath();
         $sServerDir = $this->_currentFolder->getServerPath();
         $currentResourceTypeConfig = $this->_currentFolder->getResourceTypeConfig();
-        $_config =& CKFinder_Connector_Core_Factory::getInstance("Core_Config");
+        $_config = & CKFinder_Connector_Core_Factory::getInstance("Core_Config");
         $_aclConfig = $_config->getAccessControlConfig();
         $aclMasks = array();
         $_resourceTypeConfig = array();
@@ -165,7 +165,7 @@ 
                 if ($currentResourceTypeConfig->getName() != $type) {
                     $maxSize = $currentResourceTypeConfig->getMaxSize();
                     $fileSize = filesize($sourceFilePath);
-                    if ($maxSize && $fileSize>$maxSize) {
+                    if ($maxSize && $fileSize > $maxSize) {
                         $errorCode = CKFINDER_CONNECTOR_ERROR_UPLOADED_TOO_BIG;
                         $this->appendErrorNode($oErrorsNode, $errorCode, $name, $type, $path);
                         continue;
@@ -203,8 +203,8 @@ 
                         $iCounter = 1;
                         while (true)
                         {
-                            $fileName = CKFinder_Connector_Utils_FileSystem::getFileNameWithoutExtension($name) .
-                                "(" . $iCounter . ")" . "." .
+                            $fileName = CKFinder_Connector_Utils_FileSystem::getFileNameWithoutExtension($name).
+                                "(".$iCounter.")".".".
                                 CKFinder_Connector_Utils_FileSystem::getExtension($name);
 
                             $destinationFilePath = $sServerDir.$fileName;

Braces +7 added lines, -9 removed lines

@@ -10,7 +10,9 @@ 
  * modifying or distribute this file or part of its contents. The contents of
  * this file is part of the Source Code of CKFinder.
  */
-if (!defined('IN_CKFINDER')) exit;
+if (!defined('IN_CKFINDER')) {
+	exit;
+}
 
 /**
  * @package CKFinder
@@ -193,8 +195,7 @@ 
                             $destinationFilePath = $sServerDir.$fileName;
                             if (!file_exists($destinationFilePath)) {
                                 break;
-                            }
-                            else {
+                            } else {
                                 $iCounter++;
                             }
                         }
@@ -202,12 +203,10 @@ 
                             $errorCode = CKFINDER_CONNECTOR_ERROR_ACCESS_DENIED;
                             $this->appendErrorNode($oErrorsNode, $errorCode, $name, $type, $path);
                             continue;
-                        }
-                        else {
+                        } else {
                             $copied++;
                         }
-                    }
-                    else {
+                    } else {
                         $errorCode = CKFINDER_CONNECTOR_ERROR_ALREADY_EXIST;
                         $this->appendErrorNode($oErrorsNode, $errorCode, $name, $type, $path);
                         continue;
@@ -219,8 +218,7 @@ 
                         $errorCode = CKFINDER_CONNECTOR_ERROR_ACCESS_DENIED;
                         $this->appendErrorNode($oErrorsNode, $errorCode, $name, $type, $path);
                         continue;
-                    }
-                    else {
+                    } else {
                         $copied++;
                     }
                 }

libs/ckfinder/core/connector/php/php5/CommandHandler/DeleteFolder.php

Indentation +33 added lines, -33 removed lines

@@ -32,44 +32,44 @@
  */
 class CKFinder_Connector_CommandHandler_DeleteFolder extends CKFinder_Connector_CommandHandler_XmlCommandHandlerBase
 {
-    /**
-     * Command name
-     *
-     * @access private
-     * @var string
-     */
-    private $command = "DeleteFolder";
+	/**
+	 * Command name
+	 *
+	 * @access private
+	 * @var string
+	 */
+	private $command = "DeleteFolder";
 
 
-    /**
-     * handle request and build XML
-     * @access protected
-     *
-     */
-    protected function buildXml()
-    {
-        if (empty($_POST['CKFinderCommand']) || $_POST['CKFinderCommand'] != 'true') {
-            $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_INVALID_REQUEST);
-        }
+	/**
+	 * handle request and build XML
+	 * @access protected
+	 *
+	 */
+	protected function buildXml()
+	{
+		if (empty($_POST['CKFinderCommand']) || $_POST['CKFinderCommand'] != 'true') {
+			$this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_INVALID_REQUEST);
+		}
 
-        if (!$this->_currentFolder->checkAcl(CKFINDER_CONNECTOR_ACL_FOLDER_DELETE)) {
-            $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_UNAUTHORIZED);
-        }
+		if (!$this->_currentFolder->checkAcl(CKFINDER_CONNECTOR_ACL_FOLDER_DELETE)) {
+			$this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_UNAUTHORIZED);
+		}
 
-        // The root folder cannot be deleted.
-        if ($this->_currentFolder->getClientPath() == "/") {
-            $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_INVALID_REQUEST);
-        }
+		// The root folder cannot be deleted.
+		if ($this->_currentFolder->getClientPath() == "/") {
+			$this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_INVALID_REQUEST);
+		}
 
-        $folderServerPath = $this->_currentFolder->getServerPath();
-        if (!file_exists($folderServerPath) || !is_dir($folderServerPath)) {
-            $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_FOLDER_NOT_FOUND);
-        }
+		$folderServerPath = $this->_currentFolder->getServerPath();
+		if (!file_exists($folderServerPath) || !is_dir($folderServerPath)) {
+			$this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_FOLDER_NOT_FOUND);
+		}
 
-        if (!CKFinder_Connector_Utils_FileSystem::unlink($folderServerPath)) {
-            $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_ACCESS_DENIED);
-        }
+		if (!CKFinder_Connector_Utils_FileSystem::unlink($folderServerPath)) {
+			$this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_ACCESS_DENIED);
+		}
 
-        CKFinder_Connector_Utils_FileSystem::unlink($this->_currentFolder->getThumbsServerPath());
-    }
+		CKFinder_Connector_Utils_FileSystem::unlink($this->_currentFolder->getThumbsServerPath());
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -21,7 +21,7 @@
 /**
  * Include base XML command handler
  */
-require_once CKFINDER_CONNECTOR_LIB_DIR . "/CommandHandler/XmlCommandHandlerBase.php";
+require_once CKFINDER_CONNECTOR_LIB_DIR."/CommandHandler/XmlCommandHandlerBase.php";
 
 /**
  * Handle DeleteFile command

Braces +3 added lines, -1 removed lines

@@ -10,7 +10,9 @@
  * modifying or distribute this file or part of its contents. The contents of
  * this file is part of the Source Code of CKFinder.
  */
-if (!defined('IN_CKFINDER')) exit;
+if (!defined('IN_CKFINDER')) {
+	exit;
+}
 
 /**
  * @package CKFinder