summaryrefslogtreecommitdiff
path: root/actions
diff options
context:
space:
mode:
authorEvan Prodromou <evan@controlyourself.ca>2009-02-05 16:32:58 -0500
committerEvan Prodromou <evan@controlyourself.ca>2009-02-05 16:32:58 -0500
commit99d520b351cdcfd93901732228d3be3d9e0a442b (patch)
tree7ad6cc379930b74b5dc0b22fc808196ece4c5424 /actions
parent383e6c730db5808b961f53bf39868053fca1fc32 (diff)
Two different functions for file size
Made two different functions for file size in ImageFile; one uses the other. Also, use sprintf() for gettext msgs.
Diffstat (limited to 'actions')
-rw-r--r--actions/avatarsettings.php4
-rw-r--r--actions/grouplogo.php8
2 files changed, 6 insertions, 6 deletions
diff --git a/actions/avatarsettings.php b/actions/avatarsettings.php
index 0f8122c07..5c702ecc0 100644
--- a/actions/avatarsettings.php
+++ b/actions/avatarsettings.php
@@ -75,7 +75,7 @@ class AvatarsettingsAction extends AccountSettingsAction
function getInstructions()
{
- return _('You can upload your personal avatar. The maximum file size is '.ImageFile::maxFileSize().'.');
+ return sprintf(_('You can upload your personal avatar. The maximum file size is %s.'), ImageFile::maxFileSize());
}
/**
@@ -155,7 +155,7 @@ class AvatarsettingsAction extends AccountSettingsAction
$this->element('input', array('name' => 'MAX_FILE_SIZE',
'type' => 'hidden',
'id' => 'MAX_FILE_SIZE',
- 'value' => ImageFile::maxFileSize(true)));
+ 'value' => ImageFile::maxFileSizeInt()));
$this->elementEnd('li');
$this->elementEnd('ul');
diff --git a/actions/grouplogo.php b/actions/grouplogo.php
index 473303373..7cf198dc7 100644
--- a/actions/grouplogo.php
+++ b/actions/grouplogo.php
@@ -152,7 +152,7 @@ class GrouplogoAction extends Action
function getInstructions()
{
- return _('You can upload a logo image for your group. The maximum file size is '.ImageFile::maxFileSize().'.');
+ return sprintf(_('You can upload a logo image for your group. The maximum file size is %s.'), ImageFile::maxFileSize());
}
/**
@@ -229,7 +229,7 @@ class GrouplogoAction extends Action
$this->element('input', array('name' => 'MAX_FILE_SIZE',
'type' => 'hidden',
'id' => 'MAX_FILE_SIZE',
- 'value' => ImageFile::maxFileSize(true)));
+ 'value' => ImageFile::maxFileSizeInt()));
$this->elementEnd('li');
$this->elementEnd('ul');
@@ -382,7 +382,7 @@ class GrouplogoAction extends Action
$this->serverError(_('Lost our file data.'));
return;
}
-
+
// If image is not being cropped assume pos & dimentions of original
$dest_x = $this->arg('avatar_crop_x') ? $this->arg('avatar_crop_x'):0;
$dest_y = $this->arg('avatar_crop_y') ? $this->arg('avatar_crop_y'):0;
@@ -390,7 +390,7 @@ class GrouplogoAction extends Action
$dest_h = $this->arg('avatar_crop_h') ? $this->arg('avatar_crop_h'):$filedata['height'];
$size = min($dest_w, $dest_h);
$size = ($size > MAX_ORIGINAL) ? MAX_ORIGINAL:$size;
-
+
$imagefile = new ImageFile($this->group->id, $filedata['filepath']);
$filename = $imagefile->resize($size, $dest_x, $dest_y, $dest_w, $dest_h);