moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-04 16:36:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-51828-master' of git://github.com/FMCorz/moodle

Browse source
This commit is contained in:
Andrew Nicols 2016-03-16 10:03:12 +08:00
commit 0eb474ec49
1 changed files with 20 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

24
repository/wikimedia/wikimedia.php
View file

@ -106,13 +106,14 @@ class wikimedia {
* @param int $orig_width * @param int $orig_width
* @param int $orig_height * @param int $orig_height
* @param int $thumb_width * @param int $thumb_width
* @param bool $force When true, forces the generation of a thumb URL.
* @global object OUTPUT * @global object OUTPUT
* @return string * @return string
*/ */
public function get_thumb_url($image_url, $orig_width, $orig_height, $thumb_width=75) { public function get_thumb_url($image_url, $orig_width, $orig_height, $thumb_width = 75, $force = false) {
global $OUTPUT; global $OUTPUT;
if ($orig_width <= $thumb_width AND $orig_height <= $thumb_width) { if (!$force && $orig_width <= $thumb_width && $orig_height <= $thumb_width) {
return $image_url; return $image_url;
} else { } else {
$thumb_url = ''; $thumb_url = '';
@ -169,9 +170,14 @@ class wikimedia {
$image_types = array('image/jpeg', 'image/png', 'image/gif', 'image/svg+xml'); $image_types = array('image/jpeg', 'image/png', 'image/gif', 'image/svg+xml');
if (in_array($file_type, $image_types)) { //is image if (in_array($file_type, $image_types)) { //is image
$extension = pathinfo($title, PATHINFO_EXTENSION); $extension = pathinfo($title, PATHINFO_EXTENSION);
if (strcmp($extension, 'svg') == 0) { //upload png version of svg-s $issvg = strcmp($extension, 'svg') == 0;
// Get PNG equivalent to SVG files.
if ($issvg) {
$title .= '.png'; $title .= '.png';
} }
// The thumbnail (max size requested) is smaller than the original size, we will use the thumbnail.
if ($page['imageinfo'][0]['thumbwidth'] < $page['imageinfo'][0]['width']) { if ($page['imageinfo'][0]['thumbwidth'] < $page['imageinfo'][0]['width']) {
$attrs = array( $attrs = array(
//upload scaled down image //upload scaled down image
@ -185,14 +191,24 @@ class wikimedia {
if ($attrs['image_width'] <= 24 && $attrs['image_height'] <= 24) { if ($attrs['image_width'] <= 24 && $attrs['image_height'] <= 24) {
$attrs['realicon'] = $attrs['source']; $attrs['realicon'] = $attrs['source'];
} }
// We use the original file.
} else { } else {
$attrs = array( $attrs = array(
//upload full size image //upload full size image
'source' => $page['imageinfo'][0]['url'],
'image_width' => $page['imageinfo'][0]['width'], 'image_width' => $page['imageinfo'][0]['width'],
'image_height' => $page['imageinfo'][0]['height'], 'image_height' => $page['imageinfo'][0]['height'],
'size' => $page['imageinfo'][0]['size'] 'size' => $page['imageinfo'][0]['size']
); );
// We cannot use the source when the file is SVG.
if ($issvg) {
// So we generate a PNG thumbnail of the file at its original size.
$attrs['source'] = $this->get_thumb_url($page['imageinfo'][0]['url'], $page['imageinfo'][0]['width'],
$page['imageinfo'][0]['height'], $page['imageinfo'][0]['width'], true);
} else {
$attrs['source'] = $page['imageinfo'][0]['url'];
}
} }
$attrs += array( $attrs += array(
'realthumbnail' => $this->get_thumb_url($page['imageinfo'][0]['url'], $page['imageinfo'][0]['width'], $page['imageinfo'][0]['height'], WIKIMEDIA_THUMB_SIZE), 'realthumbnail' => $this->get_thumb_url($page['imageinfo'][0]['url'], $page['imageinfo'][0]['width'], $page['imageinfo'][0]['height'], WIKIMEDIA_THUMB_SIZE),