diff options
author | Sebastian Mendel <cybot_tm@users.sourceforge.net> | 2008-05-06 12:45:08 +0400 |
---|---|---|
committer | Sebastian Mendel <cybot_tm@users.sourceforge.net> | 2008-05-06 12:45:08 +0400 |
commit | 7c7b9b55a2ab727042bf61bff8b0c954e9f9ee83 (patch) | |
tree | fcb486ad6cc48aba43bdf080a530bbca4fe97aa0 /transformation_wrapper.php | |
parent | e5458c079917de1eb77cea4f04957c4c750f2e36 (diff) |
$_REQUEST variables are ALWAYS already url decoded
Diffstat (limited to 'transformation_wrapper.php')
-rw-r--r-- | transformation_wrapper.php | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/transformation_wrapper.php b/transformation_wrapper.php index 1871baf7c2..c965f14825 100644 --- a/transformation_wrapper.php +++ b/transformation_wrapper.php @@ -46,7 +46,7 @@ $default_ct = 'application/octet-stream'; if ($cfgRelation['commwork'] && $cfgRelation['mimework']) { $mime_map = PMA_getMime($db, $table); - $mime_options = PMA_transformation_getOptions((isset($mime_map[urldecode($transform_key)]['transformation_options']) ? $mime_map[urldecode($transform_key)]['transformation_options'] : '')); + $mime_options = PMA_transformation_getOptions((isset($mime_map[$transform_key]['transformation_options']) ? $mime_map[$transform_key]['transformation_options'] : '')); foreach ($mime_options AS $key => $option) { if (substr($option, 0, 10) == '; charset=') { @@ -62,23 +62,23 @@ if ($cfgRelation['commwork'] && $cfgRelation['mimework']) { require_once './libraries/header_http.inc.php'; // [MIME] if (isset($ct) && !empty($ct)) { - $content_type = 'Content-Type: ' . urldecode($ct); + $content_type = 'Content-Type: ' . $ct; } else { - $content_type = 'Content-Type: ' . (isset($mime_map[urldecode($transform_key)]['mimetype']) ? str_replace('_', '/', $mime_map[urldecode($transform_key)]['mimetype']) : $default_ct) . (isset($mime_options['charset']) ? $mime_options['charset'] : ''); + $content_type = 'Content-Type: ' . (isset($mime_map[$transform_key]['mimetype']) ? str_replace('_', '/', $mime_map[$transform_key]['mimetype']) : $default_ct) . (isset($mime_options['charset']) ? $mime_options['charset'] : ''); } header($content_type); if (isset($cn) && !empty($cn)) { - header('Content-Disposition: attachment; filename=' . urldecode($cn)); + header('Content-Disposition: attachment; filename=' . $cn); } if (!isset($resize)) { - echo $row[urldecode($transform_key)]; + echo $row[$transform_key]; } else { // if image_*__inline.inc.php finds that we can resize, // it sets $resize to jpeg or png - $srcImage = imagecreatefromstring($row[urldecode($transform_key)]); + $srcImage = imagecreatefromstring($row[$transform_key]); $srcWidth = ImageSX($srcImage); $srcHeight = ImageSY($srcImage); |