oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

More image uploading fixes. Copying/pasted code. Should probably be refactored a bit.

Browse source
This commit is contained in:
Graham Knop 2007-04-27 17:12:50 +00:00
parent 885a369c67
commit 58018d5d69
4 changed files with 24 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
docs/changelog/7.x.x.txt
View file

@ -1,7 +1,7 @@
7.3.16
- fix: The POD of Form::Image is faulty (perlDreamer Consulting, LLC)
- fix: Method name clash between WebGUI::Asset::Post::Thread and WebGUI::AssetVersioning (perlDreamer Consulting, LLC)
- fix: Images in Collaboration Systems were broken in 7.3.15
- fix: Images in various places were broken in 7.3.15

2
docs/gotcha.txt
View file

@ -18,7 +18,7 @@ save you many hours of grief.
In 7.3.16, the thread lock method inside Thread.pm was renamed
isThreadLocked. No template variables, field names or database
columsn were changed.
columns were changed.
7.3.15
--------------------------------------------------------------------

14
lib/WebGUI/Asset/File/Image.pm
View file

@ -208,9 +208,17 @@ sub processPropertiesFromFormPost {
$self->update({parameters=>$parameters.' alt="'.$self->get("title").'"'});
}
my $storage = $self->getStorageLocation;
$self->generateThumbnail($self->session->setting->get("maxImageSize"));
$storage->deleteFile($self->get("filename"));
$storage->renameFile('thumb-'.$self->get("filename"),$self->get("filename"));
my $max_size = $self->session->setting->get("maxImageSize");
my $file = $self->get("filename");
my ($w, $h) = $storage->getSizeInPixels($file);
if($w > $max_size || $h > $max_size) {
if($w > $h) {
$storage->resize($file, $max_size);
}
else {
$storage->resize($file, 0, $max_size);
}
}
$self->generateThumbnail($self->session->form->process("thumbnailSize"));
}

16
lib/WebGUI/Asset/WikiPage.pm
View file

@ -252,11 +252,17 @@ sub processPropertiesFromFormPost {
foreach my $file (@{$storage->getFiles}) {
if ($storage->isImage($file)) {
##Use generateThumbnail to shrink size to site's max image size
##We should look into using the new resize method instead.
$storage->generateThumbnail($file, $self->getWiki->get("maxImageSize") || $self->session->setting->get("maxImageSize"));
$storage->deleteFile($file);
$storage->renameFile('thumb-'.$file,$file);
my ($w, $h) = $storage->getSizeInPixels($file);
my $max_size = $self->getWiki->get("maxImageSize")
|| $self->session->setting->get("maxImageSize");
if($w > $max_size || $h > $max_size) {
if($w > $h) {
$storage->resize($file, $max_size);
}
else {
$storage->resize($file, 0, $max_size);
}
}
$storage->generateThumbnail($file, $self->getWiki->get("thumbnailSize"));
}
$size += $storage->getFileSize($file);