From 746a5d75071a2a7c913c522ea78f2b88b87f4ce2 Mon Sep 17 00:00:00 2001 From: Sean Murphy Date: Thu, 5 Feb 2009 14:11:50 -0500 Subject: Fixed #905: Presenting image size limit to user. --- actions/avatarsettings.php | 2 +- actions/grouplogo.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'actions') diff --git a/actions/avatarsettings.php b/actions/avatarsettings.php index 643c0e567..79ca6b789 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.'); + return _('You can upload your personal avatar. The maximum file size is '.ImageFile::maxFileSize().'.'); } /** diff --git a/actions/grouplogo.php b/actions/grouplogo.php index 294005f1b..4be7c4e12 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.'); + return _('You can upload a logo image for your group. The maximum file size is '.ImageFile::maxFileSize().'.'); } /** -- cgit v1.2.3-54-g00ecf From d4bdb2dc1924e2753baa4cf1751acb08b6ed3cae Mon Sep 17 00:00:00 2001 From: Sean Murphy Date: Thu, 5 Feb 2009 15:01:44 -0500 Subject: Better fix for displaying max file size. --- actions/avatarsettings.php | 2 +- actions/grouplogo.php | 2 +- lib/common.php | 1 - lib/imagefile.php | 9 +++++++-- 4 files changed, 9 insertions(+), 5 deletions(-) (limited to 'actions') diff --git a/actions/avatarsettings.php b/actions/avatarsettings.php index 79ca6b789..139d85b4c 100644 --- a/actions/avatarsettings.php +++ b/actions/avatarsettings.php @@ -155,7 +155,7 @@ class AvatarsettingsAction extends AccountSettingsAction $this->element('input', array('name' => 'MAX_FILE_SIZE', 'type' => 'hidden', 'id' => 'MAX_FILE_SIZE', - 'value' => MAX_AVATAR_SIZE)); + 'value' => ImageFile::maxFileSize(true))); $this->elementEnd('li'); $this->elementEnd('ul'); diff --git a/actions/grouplogo.php b/actions/grouplogo.php index 4be7c4e12..473303373 100644 --- a/actions/grouplogo.php +++ b/actions/grouplogo.php @@ -229,7 +229,7 @@ class GrouplogoAction extends Action $this->element('input', array('name' => 'MAX_FILE_SIZE', 'type' => 'hidden', 'id' => 'MAX_FILE_SIZE', - 'value' => MAX_AVATAR_SIZE)); + 'value' => ImageFile::maxFileSize(true))); $this->elementEnd('li'); $this->elementEnd('ul'); diff --git a/lib/common.php b/lib/common.php index 825ba0ff7..482800876 100644 --- a/lib/common.php +++ b/lib/common.php @@ -24,7 +24,6 @@ define('LACONICA_VERSION', '0.7.0'); define('AVATAR_PROFILE_SIZE', 96); define('AVATAR_STREAM_SIZE', 48); define('AVATAR_MINI_SIZE', 24); -define('MAX_AVATAR_SIZE', 256 * 1024); define('NOTICES_PER_PAGE', 20); define('PROFILES_PER_PAGE', 20); diff --git a/lib/imagefile.php b/lib/imagefile.php index f9f47a47e..74c3d14f0 100644 --- a/lib/imagefile.php +++ b/lib/imagefile.php @@ -183,9 +183,14 @@ class ImageFile @unlink($this->filename); } - static function maxFileSize() + static function maxFileSize($return_bytes = false) { - $limit = min(ImageFile::strToInt(ini_get('post_max_size')), ImageFile::strToInt(ini_get('upload_max_filesize'))); + $limit = min(ImageFile::strToInt(ini_get('post_max_size')), ImageFile::strToInt(ini_get('upload_max_filesize')), ImageFile::strToInt(ini_get('memory_limit'))); + + if ($return_bytes) { + return $limit; + } + return ($limit/(1024*1024)).'MB'; } -- cgit v1.2.3-54-g00ecf From 99d520b351cdcfd93901732228d3be3d9e0a442b Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Thu, 5 Feb 2009 16:32:58 -0500 Subject: 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. --- actions/avatarsettings.php | 4 ++-- actions/grouplogo.php | 8 +++---- lib/imagefile.php | 57 +++++++++++++++++++++++++++------------------- 3 files changed, 39 insertions(+), 30 deletions(-) (limited to 'actions') 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); diff --git a/lib/imagefile.php b/lib/imagefile.php index 74c3d14f0..fa0581dd0 100644 --- a/lib/imagefile.php +++ b/lib/imagefile.php @@ -58,7 +58,7 @@ class ImageFile { $this->id = $id; $this->filepath = $filepath; - + $info = @getimagesize($this->filepath); $this->type = ($info) ? $info[2]:$type; $this->width = ($info) ? $info[0]:$width; @@ -72,7 +72,7 @@ class ImageFile break; case UPLOAD_ERR_INI_SIZE: case UPLOAD_ERR_FORM_SIZE: - throw new Exception(_('That file is too big. The maximum file size is '.$this->maxFileSize().'.')); + throw new Exception(sprintf(_('That file is too big. The maximum file size is %d.'), $this->maxFileSize())); return; case UPLOAD_ERR_PARTIAL: @unlink($_FILES[$param]['tmp_name']); @@ -82,19 +82,19 @@ class ImageFile throw new Exception(_('System error uploading file.')); return; } - + $info = @getimagesize($_FILES[$param]['tmp_name']); - + if (!$info) { @unlink($_FILES[$param]['tmp_name']); throw new Exception(_('Not an image or corrupt file.')); return; } - + if ($info[2] !== IMAGETYPE_GIF && $info[2] !== IMAGETYPE_JPEG && $info[2] !== IMAGETYPE_PNG) { - + @unlink($_FILES[$param]['tmp_name']); throw new Exception(_('Unsupported image file format.')); return; @@ -102,7 +102,7 @@ class ImageFile return new ImageFile(null, $_FILES[$param]['tmp_name']); } - + function resize($size, $x = 0, $y = 0, $w = null, $h = null) { $w = ($w === null) ? $this->width:$w; @@ -129,25 +129,25 @@ class ImageFile } $image_dest = imagecreatetruecolor($size, $size); - + if ($this->type == IMAGETYPE_GIF || $this->type == IMAGETYPE_PNG) { $transparent_idx = imagecolortransparent($image_src); - + if ($transparent_idx >= 0) { - + $transparent_color = imagecolorsforindex($image_src, $transparent_idx); $transparent_idx = imagecolorallocate($image_dest, $transparent_color['red'], $transparent_color['green'], $transparent_color['blue']); imagefill($image_dest, 0, 0, $transparent_idx); imagecolortransparent($image_dest, $transparent_idx); - + } elseif ($this->type == IMAGETYPE_PNG) { - + imagealphablending($image_dest, false); $transparent = imagecolorallocatealpha($image_dest, 0, 0, 0, 127); imagefill($image_dest, 0, 0, $transparent); imagesavealpha($image_dest, true); - + } } @@ -182,23 +182,32 @@ class ImageFile { @unlink($this->filename); } - - static function maxFileSize($return_bytes = false) + + static function maxFileSize() { - $limit = min(ImageFile::strToInt(ini_get('post_max_size')), ImageFile::strToInt(ini_get('upload_max_filesize')), ImageFile::strToInt(ini_get('memory_limit'))); - - if ($return_bytes) { - return $limit; + $value = ImageFile::maxFileSizeInt(); + + if ($value > 1024 * 1024) { + return ($value/(1024*1024)).'Mb'; + } else if ($value > 1024) { + return ($value/(1024)).'kB'; + } else { + return $value; } - - return ($limit/(1024*1024)).'MB'; } - + + static function maxFileSizeInt() + { + return min(ImageFile::strToInt(ini_get('post_max_size')), + ImageFile::strToInt(ini_get('upload_max_filesize')), + ImageFile::strToInt(ini_get('memory_limit'))); + } + static function strToInt($str) { $unit = substr($str, -1); $num = substr($str, 0, -1); - + switch(strtoupper($unit)){ case 'G': $num *= 1024; @@ -207,7 +216,7 @@ class ImageFile case 'K': $num *= 1024; } - + return $num; } } \ No newline at end of file -- cgit v1.2.3-54-g00ecf From 444c7944809544928e05bd71479f6551acc98fc4 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Thu, 5 Feb 2009 16:34:38 -0500 Subject: Don't show stretchy-box on avatar if not cropping --- actions/avatarsettings.php | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'actions') diff --git a/actions/avatarsettings.php b/actions/avatarsettings.php index 5c702ecc0..3f50ca24c 100644 --- a/actions/avatarsettings.php +++ b/actions/avatarsettings.php @@ -373,12 +373,14 @@ class AvatarsettingsAction extends AccountSettingsAction { parent::showScripts(); - $jcropPack = common_path('js/jcrop/jquery.Jcrop.pack.js'); - $jcropGo = common_path('js/jcrop/jquery.Jcrop.go.js'); + if ($this->mode == 'crop') { + $jcropPack = common_path('js/jcrop/jquery.Jcrop.pack.js'); + $jcropGo = common_path('js/jcrop/jquery.Jcrop.go.js'); - $this->element('script', array('type' => 'text/javascript', - 'src' => $jcropPack)); - $this->element('script', array('type' => 'text/javascript', - 'src' => $jcropGo)); + $this->element('script', array('type' => 'text/javascript', + 'src' => $jcropPack)); + $this->element('script', array('type' => 'text/javascript', + 'src' => $jcropGo)); + } } } -- cgit v1.2.3-54-g00ecf From ab82978b2d67545a9cd7bfc80837798212cff31b Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Thu, 5 Feb 2009 16:16:10 -0800 Subject: Trac #894 and #1013 - fixed bad redirects after delete notice --- actions/all.php | 3 +++ actions/deletenotice.php | 4 ++++ actions/favorited.php | 3 +++ actions/noticesearch.php | 10 ++++++++++ actions/public.php | 3 +++ actions/replies.php | 2 ++ actions/showfavorites.php | 2 ++ actions/showgroup.php | 2 ++ actions/showstream.php | 2 ++ actions/tag.php | 3 +++ lib/mailbox.php | 2 ++ lib/personal.php | 1 - 12 files changed, 36 insertions(+), 1 deletion(-) (limited to 'actions') diff --git a/actions/all.php b/actions/all.php index b03ad7ec3..d75d1b946 100644 --- a/actions/all.php +++ b/actions/all.php @@ -42,6 +42,9 @@ class AllAction extends Action if (!$this->page) { $this->page = 1; } + + common_set_returnto($this->selfUrl()); + return true; } diff --git a/actions/deletenotice.php b/actions/deletenotice.php index d4b8e50e5..fc4a74eac 100644 --- a/actions/deletenotice.php +++ b/actions/deletenotice.php @@ -134,6 +134,10 @@ class DeletenoticeAction extends DeleteAction $url = common_get_returnto(); + + $urlval = ($url) ? $url : 'null'; + common_debug("deleteNotice() - returnto url = $urlval"); + if ($url) { common_set_returnto(null); } else { diff --git a/actions/favorited.php b/actions/favorited.php index 4155b3a23..fd5ff413c 100644 --- a/actions/favorited.php +++ b/actions/favorited.php @@ -104,6 +104,9 @@ class FavoritedAction extends Action { parent::prepare($args); $this->page = ($this->arg('page')) ? ($this->arg('page')+0) : 1; + + common_set_returnto($this->selfUrl()); + return true; } diff --git a/actions/noticesearch.php b/actions/noticesearch.php index 630fb8857..c0c238120 100644 --- a/actions/noticesearch.php +++ b/actions/noticesearch.php @@ -48,6 +48,16 @@ require_once INSTALLDIR.'/lib/searchaction.php'; */ class NoticesearchAction extends SearchAction { + + function prepare($args) + { + parent::prepare($args); + + common_set_returnto($this->selfUrl()); + + return true; + } + /** * Get instructions * diff --git a/actions/public.php b/actions/public.php index cfdc99bb3..cc6537f74 100644 --- a/actions/public.php +++ b/actions/public.php @@ -73,6 +73,9 @@ class PublicAction extends Action { parent::prepare($args); $this->page = ($this->arg('page')) ? ($this->arg('page')+0) : 1; + + common_set_returnto($this->selfUrl()); + return true; } diff --git a/actions/replies.php b/actions/replies.php index 9ec373a96..7eff74a66 100644 --- a/actions/replies.php +++ b/actions/replies.php @@ -83,6 +83,8 @@ class RepliesAction extends Action $this->page = ($this->arg('page')) ? ($this->arg('page')+0) : 1; + common_set_returnto($this->selfUrl()); + return true; } diff --git a/actions/showfavorites.php b/actions/showfavorites.php index bb68f8d94..31479e1a7 100644 --- a/actions/showfavorites.php +++ b/actions/showfavorites.php @@ -112,6 +112,8 @@ class ShowfavoritesAction extends Action $this->page = 1; } + common_set_returnto($this->selfUrl()); + return true; } diff --git a/actions/showgroup.php b/actions/showgroup.php index 468990e7b..7bc68fbc6 100644 --- a/actions/showgroup.php +++ b/actions/showgroup.php @@ -129,6 +129,8 @@ class ShowgroupAction extends Action return false; } + common_set_returnto($this->selfUrl()); + return true; } diff --git a/actions/showstream.php b/actions/showstream.php index 4b1679969..224bbce9f 100644 --- a/actions/showstream.php +++ b/actions/showstream.php @@ -110,6 +110,8 @@ class ShowstreamAction extends Action $this->page = ($this->arg('page')) ? ($this->arg('page')+0) : 1; + common_set_returnto($this->selfUrl()); + return true; } diff --git a/actions/tag.php b/actions/tag.php index 803026e62..4401f892a 100644 --- a/actions/tag.php +++ b/actions/tag.php @@ -37,6 +37,9 @@ class TagAction extends Action } $this->page = ($this->arg('page')) ? ($this->arg('page')+0) : 1; + + common_set_returnto($this->selfUrl()); + return true; } diff --git a/lib/mailbox.php b/lib/mailbox.php index 8d5d44e49..e8323dc28 100644 --- a/lib/mailbox.php +++ b/lib/mailbox.php @@ -63,6 +63,8 @@ class MailboxAction extends PersonalAction $this->page = 1; } + common_set_returnto($this->selfUrl()); + return true; } diff --git a/lib/personal.php b/lib/personal.php index 900df0257..e46350c63 100644 --- a/lib/personal.php +++ b/lib/personal.php @@ -55,7 +55,6 @@ class PersonalAction extends Action function handle($args) { parent::handle($args); - common_set_returnto($this->selfUrl()); } } -- cgit v1.2.3-54-g00ecf From d51be320caf9371d3b45b231e7c6de61c67d9068 Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Thu, 5 Feb 2009 16:21:23 -0800 Subject: Removed debugging statements I accidentally left in deletenotice.php --- actions/deletenotice.php | 4 ---- 1 file changed, 4 deletions(-) (limited to 'actions') diff --git a/actions/deletenotice.php b/actions/deletenotice.php index fc4a74eac..d4b8e50e5 100644 --- a/actions/deletenotice.php +++ b/actions/deletenotice.php @@ -134,10 +134,6 @@ class DeletenoticeAction extends DeleteAction $url = common_get_returnto(); - - $urlval = ($url) ? $url : 'null'; - common_debug("deleteNotice() - returnto url = $urlval"); - if ($url) { common_set_returnto(null); } else { -- cgit v1.2.3-54-g00ecf