From dfad252c9e08b82e07dc0fe340bc580dbdb66ed4 Mon Sep 17 00:00:00 2001 From: David Mudrak Date: Thu, 10 May 2012 06:12:24 +0200 Subject: [PATCH] MDL-31901 repositories serving images from the filepool now provide preview details --- repository/coursefiles/lib.php | 7 +++++++ repository/local/lib.php | 8 ++++++++ repository/recent/lib.php | 7 +++++++ repository/user/lib.php | 7 +++++++ 4 files changed, 29 insertions(+) diff --git a/repository/coursefiles/lib.php b/repository/coursefiles/lib.php index 91f94ce32ef..8890ea7f635 100644 --- a/repository/coursefiles/lib.php +++ b/repository/coursefiles/lib.php @@ -124,6 +124,13 @@ class repository_coursefiles extends repository { 'source'=> $encodedpath, 'thumbnail' => $OUTPUT->pix_url(file_extension_icon($child->get_visible_name(), 32))->out(false) ); + if ($imageinfo = $child->get_imageinfo()) { + $fileurl = new moodle_url($child->get_url()); + $node['realthumbnail'] = $fileurl->out(false, array('preview' => 'thumb')); + $node['realicon'] = $fileurl->out(false, array('preview' => 'tinyicon')); + $node['image_width'] = $imageinfo['width']; + $node['image_height'] = $imageinfo['height']; + } $list[] = $node; } } diff --git a/repository/local/lib.php b/repository/local/lib.php index 6a5ca884d47..93bc5e8251e 100644 --- a/repository/local/lib.php +++ b/repository/local/lib.php @@ -221,6 +221,14 @@ class repository_local_file { $node['license'] = $this->fileinfo->get_license(); $node['source'] = $encodedpath; $node['thumbnail'] = $OUTPUT->pix_url(file_extension_icon($node['title'], 32))->out(false); + if ($imageinfo = $this->fileinfo->get_imageinfo()) { + // what a beautiful picture, isn't it + $fileurl = new moodle_url($this->fileinfo->get_url()); + $node['realthumbnail'] = $fileurl->out(false, array('preview' => 'thumb')); + $node['realicon'] = $fileurl->out(false, array('preview' => 'tinyicon')); + $node['image_width'] = $imageinfo['width']; + $node['image_height'] = $imageinfo['height']; + } } return $node; } diff --git a/repository/recent/lib.php b/repository/recent/lib.php index d1f5bbaca9d..fa3b7278f31 100644 --- a/repository/recent/lib.php +++ b/repository/recent/lib.php @@ -132,6 +132,13 @@ class repository_recent extends repository { 'source'=> $params, 'thumbnail' => $OUTPUT->pix_url(file_extension_icon($file['filename'], 32))->out(false), ); + if ($imageinfo = $fileinfo->get_imageinfo()) { + $fileurl = new moodle_url($fileinfo->get_url()); + $node['realthumbnail'] = $fileurl->out(false, array('preview' => 'thumb')); + $node['realicon'] = $fileurl->out(false, array('preview' => 'tinyicon')); + $node['image_width'] = $imageinfo['width']; + $node['image_height'] = $imageinfo['height']; + } $list[] = $node; } } diff --git a/repository/user/lib.php b/repository/user/lib.php index d0a07372bc7..80dc94b6667 100644 --- a/repository/user/lib.php +++ b/repository/user/lib.php @@ -115,6 +115,13 @@ class repository_user extends repository { 'source'=> $encodedpath, 'thumbnail' => $OUTPUT->pix_url(file_extension_icon($child->get_visible_name(), 32))->out(false) ); + if ($imageinfo = $child->get_imageinfo()) { + $fileurl = new moodle_url($child->get_url()); + $node['realthumbnail'] = $fileurl->out(false, array('preview' => 'thumb')); + $node['realicon'] = $fileurl->out(false, array('preview' => 'tinyicon')); + $node['image_width'] = $imageinfo['width']; + $node['image_height'] = $imageinfo['height']; + } $list[] = $node; } }