summaryrefslogtreecommitdiff
path: root/lib
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 /lib
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 'lib')
-rw-r--r--lib/imagefile.php57
1 files changed, 33 insertions, 24 deletions
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