diff options
| author | Andrey Andreev <narf@devilix.net> | 2013-06-28 14:04:57 +0200 |
|---|---|---|
| committer | Andrey Andreev <narf@devilix.net> | 2013-06-28 14:04:57 +0200 |
| commit | 58706adfae1f8aea16a3ee43d333991f1daf0484 (patch) | |
| tree | f410bc72a2cfc3b5e7f11f5c830af1926da85b8f | |
| parent | cd9797a210089ea65b4d4b16db051d06188b66ed (diff) | |
| parent | eac8b2f1e70e3155ae6bacbc37228a0a647a18be (diff) | |
Merge pull request #2497 from yazuu/upload
Upload : change the file extension to lower case
| -rw-r--r-- | system/libraries/Upload.php | 17 | ||||
| -rw-r--r-- | user_guide_src/source/changelog.rst | 1 | ||||
| -rw-r--r-- | user_guide_src/source/libraries/file_uploading.rst | 1 |
3 files changed, 18 insertions, 1 deletions
diff --git a/system/libraries/Upload.php b/system/libraries/Upload.php index 7c48b4294..5861df584 100644 --- a/system/libraries/Upload.php +++ b/system/libraries/Upload.php @@ -136,6 +136,13 @@ class CI_Upload { public $file_ext = ''; /** + * Force filename extension to lowercase + * + * @var string + */ + public $file_ext_tolower = FALSE; + + /** * Upload path * * @var string @@ -294,6 +301,7 @@ class CI_Upload { 'file_type' => '', 'file_size' => NULL, 'file_ext' => '', + 'file_ext_tolower' => FALSE, 'upload_path' => '', 'overwrite' => FALSE, 'encrypt_name' => FALSE, @@ -965,7 +973,14 @@ class CI_Upload { public function get_extension($filename) { $x = explode('.', $filename); - return (count($x) !== 1) ? '.'.end($x) : ''; + + if (count($x) === 1) + { + return ''; + } + + $ext = ($this->file_ext_tolower) ? strtolower(end($x)) : end($x); + return '.'.$ext; } // -------------------------------------------------------------------- diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst index 0149d9f66..b60580919 100644 --- a/user_guide_src/source/changelog.rst +++ b/user_guide_src/source/changelog.rst @@ -217,6 +217,7 @@ Release Date: Not Released - Added an **index** parameter to the ``data()`` method. - Added the **min_width** and **min_height** options for images. - Removed method ``clean_file_name()`` and its usage in favor of :doc:`Security Library <libraries/security>`'s ``sanitize_filename()``. + - Added **file_ext_tolower** config setting. - :doc:`Cart library <libraries/cart>` changes include: - ``insert()`` now auto-increments quantity for an item when inserted twice instead of resetting it, this is the default behaviour of large e-commerce sites. - *Product Name* strictness can be disabled by switching the ``$product_name_safe`` property to FALSE. diff --git a/user_guide_src/source/libraries/file_uploading.rst b/user_guide_src/source/libraries/file_uploading.rst index c7965ae11..a92d3af34 100644 --- a/user_guide_src/source/libraries/file_uploading.rst +++ b/user_guide_src/source/libraries/file_uploading.rst @@ -198,6 +198,7 @@ Preference Default Value Options Descripti **file_name** None Desired file name If set CodeIgniter will rename the uploaded file to this name. The extension provided in the file name must also be an allowed file type. If no extension is provided in the original file_name will be used. +**file_ext_tolower** FALSE TRUE/FALSE (boolean) If set to TRUE, the file extension will be forced to lower case **overwrite** FALSE TRUE/FALSE (boolean) If set to true, if a file with the same name as the one you are uploading exists, it will be overwritten. If set to false, a number will be appended to the filename if another with the same name exists. |