diff options
| -rw-r--r-- | actions/avatarsettings.php | 2 | ||||
| -rw-r--r-- | actions/grouplogo.php | 2 | ||||
| -rw-r--r-- | lib/imagefile.php | 25 |
3 files changed, 26 insertions, 3 deletions
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().'.'); } /** diff --git a/lib/imagefile.php b/lib/imagefile.php index 5e9913235..f9f47a47e 100644 --- a/lib/imagefile.php +++ b/lib/imagefile.php @@ -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.')); + throw new Exception(_('That file is too big. The maximum file size is '.$this->maxFileSize().'.')); return; case UPLOAD_ERR_PARTIAL: @unlink($_FILES[$param]['tmp_name']); @@ -182,4 +182,27 @@ class ImageFile { @unlink($this->filename); } + + static function maxFileSize() + { + $limit = min(ImageFile::strToInt(ini_get('post_max_size')), ImageFile::strToInt(ini_get('upload_max_filesize'))); + return ($limit/(1024*1024)).'MB'; + } + + static function strToInt($str) + { + $unit = substr($str, -1); + $num = substr($str, 0, -1); + + switch(strtoupper($unit)){ + case 'G': + $num *= 1024; + case 'M': + $num *= 1024; + case 'K': + $num *= 1024; + } + + return $num; + } }
\ No newline at end of file |