Index: branches/5.3.x/core/ckeditor/ckfinder/core/connector/php/constants.php =================================================================== diff -u -N -r15483 -r15908 --- branches/5.3.x/core/ckeditor/ckfinder/core/connector/php/constants.php (.../constants.php) (revision 15483) +++ branches/5.3.x/core/ckeditor/ckfinder/core/connector/php/constants.php (.../constants.php) (revision 15908) @@ -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, @@ -34,6 +34,7 @@ define('CKFINDER_CONNECTOR_ERROR_INVALID_EXTENSION',105); define('CKFINDER_CONNECTOR_ERROR_INVALID_REQUEST',109); define('CKFINDER_CONNECTOR_ERROR_UNKNOWN',110); +define('CKFINDER_CONNECTOR_ERROR_CREATED_FILE_TOO_BIG',111); define('CKFINDER_CONNECTOR_ERROR_ALREADY_EXIST',115); define('CKFINDER_CONNECTOR_ERROR_FOLDER_NOT_FOUND',116); define('CKFINDER_CONNECTOR_ERROR_FILE_NOT_FOUND',117); @@ -44,9 +45,11 @@ 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_UPLOADED_INVALID_NAME_RENAMED', 207); 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_DELETE_FAILED',302); +define('CKFINDER_CONNECTOR_ERROR_ZIP_FAILED',303); define('CKFINDER_CONNECTOR_ERROR_CONNECTOR_DISABLED',500); define('CKFINDER_CONNECTOR_ERROR_THUMBNAILS_DISABLED',501); @@ -57,18 +60,11 @@ if (version_compare(phpversion(), '6', '>=')) { define('CKFINDER_CONNECTOR_PHP_MODE', 6); } -else if (version_compare(phpversion(), '5', '>=')) { +else { define('CKFINDER_CONNECTOR_PHP_MODE', 5); } -else { - define('CKFINDER_CONNECTOR_PHP_MODE', 4); -} -if (CKFINDER_CONNECTOR_PHP_MODE == 4) { - define('CKFINDER_CONNECTOR_LIB_DIR', "./php4"); -} else { - define('CKFINDER_CONNECTOR_LIB_DIR', "./php5"); -} +define('CKFINDER_CONNECTOR_LIB_DIR', "./php5"); define('CKFINDER_CHARS', '123456789ABCDEFGHJKLMNPQRSTUVWXYZ'); define('CKFINDER_REGEX_IMAGES_EXT', '/\.(jpg|gif|png|bmp|jpeg)$/i');