From fd4296c70ffe9c274a1e4215191955a41c4e98e2 Mon Sep 17 00:00:00 2001 From: Bharat Mediratta Date: Fri, 11 May 2012 14:34:27 -0700 Subject: Inject some sanity into watermark file extensions. --- modules/watermark/controllers/admin_watermarks.php | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'modules/watermark/controllers') diff --git a/modules/watermark/controllers/admin_watermarks.php b/modules/watermark/controllers/admin_watermarks.php index 2c4c602d..92a44a86 100644 --- a/modules/watermark/controllers/admin_watermarks.php +++ b/modules/watermark/controllers/admin_watermarks.php @@ -106,6 +106,20 @@ class Admin_Watermarks_Controller extends Admin_Controller { return; } + if (!in_array($pathinfo["extension"], legal_file::get_photo_extensions())) { + switch ($image_info[2]) { + case IMAGETYPE_GIF: + $name = legal_file::change_extension($name, "gif"); + break; + case IMAGETYPE_JPEG: + $name = legal_file::change_extension($name, "jpg"); + break; + case IMAGETYPE_PNG: + $name = legal_file::change_extension($name, "png"); + break; + } + } + rename($file, VARPATH . "modules/watermark/$name"); module::set_var("watermark", "name", $name); module::set_var("watermark", "width", $image_info[0]); -- cgit v1.2.3