resize Quest images to the actually used size

This commit is contained in:
oliver 2015-08-20 13:23:03 +02:00
commit b854554ed0
3 changed files with 30 additions and 48 deletions

View file

@ -88,6 +88,10 @@
'width' => 480, 'width' => 480,
'height' => 5000 'height' => 5000
), ),
'quest' => array(
'width' => 200,
'height' => 200
),
'avatar' => array( 'avatar' => array(
'width' => 500, 'width' => 500,
'height' => 500 'height' => 500

View file

@ -473,55 +473,33 @@
// Load and process file // Load and process file
$file = null; $file = null;
switch($action) if(is_null($action) || !in_array(strtoupper($format), self::getImageTypes()))
{ {
// No action
case null:
// Do not process the file // Do not process the file
$file = file_get_contents($media['filename']); $file = file_get_contents($media['filename']);
break;
case 'questgroup':
if(!in_array(strtoupper($format), self::getImageTypes())) {
$file = file_get_contents($media['filename']);
} }
else else
{ {
$file = self::resizeImage( // Process file
$media['filename'], switch($action)
$format, {
\nre\configs\AppConfig::$media['questgroup']['width'], case 'questgroup':
\nre\configs\AppConfig::$media['questgroup']['height'] case 'quest':
);
}
break;
case 'avatar': case 'avatar':
$file = self::resizeImage(
$media['filename'],
$format,
\nre\configs\AppConfig::$media['avatar']['width'],
\nre\configs\AppConfig::$media['avatar']['height']
);
break;
case 'charactergroup': case 'charactergroup':
$file = self::resizeImage(
$media['filename'],
$format,
\nre\configs\AppConfig::$media['charactergroup']['width'],
\nre\configs\AppConfig::$media['charactergroup']['height']
);
break;
case 'charactergroupsquest': case 'charactergroupsquest':
$file = self::resizeImage( $file = self::resizeImage(
$media['filename'], $media['filename'],
$format, $format,
\nre\configs\AppConfig::$media['charactergroupsquest']['width'], \nre\configs\AppConfig::$media[$action]['width'],
\nre\configs\AppConfig::$media['charactergroupsquest']['height'] \nre\configs\AppConfig::$media[$action]['height']
); );
break; break;
default: default:
throw new ParamsNotValidException($action); throw new ParamsNotValidException($action);
break; break;
} }
}
// Return file // Return file

View file

@ -19,10 +19,10 @@
<?php foreach($questtexts['Prolog'] as &$questtext) : ?> <?php foreach($questtexts['Prolog'] as &$questtext) : ?>
<p class="qtext cf"> <p class="qtext cf">
<?php if(array_key_exists('media', $questtext)) : ?> <?php if(array_key_exists('media', $questtext)) : ?>
<a href="<?=$linker->link(array('media','seminary',$seminary['url'],$questtext['media']['url']))?>"><img src="<?=$linker->link(array('media','seminary',$seminary['url'],$questtext['media']['url']))?>" /></a> <a href="<?=$linker->link(array('media','seminary',$seminary['url'],$questtext['media']['url']))?>"><img src="<?=$linker->link(array('media','seminary',$seminary['url'],$questtext['media']['url'], 'quest'))?>" /></a>
<?php elseif(!is_null($media) && !$mediaShown) : ?> <?php elseif(!is_null($media) && !$mediaShown) : ?>
<?php $mediaShown = true; ?> <?php $mediaShown = true; ?>
<a href="<?=$linker->link(array('media','seminary',$seminary['url'],$media['url']))?>"><img src="<?=$linker->link(array('media','seminary',$seminary['url'],$media['url']))?>" /></a> <a href="<?=$linker->link(array('media','seminary',$seminary['url'],$media['url']))?>"><img src="<?=$linker->link(array('media','seminary',$seminary['url'],$media['url'],'quest'))?>" /></a>
<?php endif ?> <?php endif ?>
<?=$t->t($questtext['text'])?> <?=$t->t($questtext['text'])?>
</p> </p>
@ -85,7 +85,7 @@
<?php foreach($questtexts['Epilog'] as &$questtext) : ?> <?php foreach($questtexts['Epilog'] as &$questtext) : ?>
<p class="qtext cf"> <p class="qtext cf">
<?php if(array_key_exists('media', $questtext)) : ?> <?php if(array_key_exists('media', $questtext)) : ?>
<a href="<?=$linker->link(array('media','seminary',$seminary['url'],$questtext['media']['url']))?>"><img src="<?=$linker->link(array('media','seminary',$seminary['url'],$questtext['media']['url']))?>" /></a> <a href="<?=$linker->link(array('media','seminary',$seminary['url'],$questtext['media']['url']))?>"><img src="<?=$linker->link(array('media','seminary',$seminary['url'],$questtext['media']['url'],'quest'))?>" /></a>
<?php endif ?> <?php endif ?>
<?=$t->t($questtext['text'])?> <?=$t->t($questtext['text'])?>
</p> </p>