diff --git a/classes/image.php b/classes/image.php index 50695fb..27601e1 100644 --- a/classes/image.php +++ b/classes/image.php @@ -96,8 +96,11 @@ class Image $width = imagesx($img); $height = imagesy($img); - if($maxwidth>$width)$maxwidth = $width; - if($maxheight>$height)$maxheight = $height; + if(!ALLOW_BLOATING) + { + if($maxwidth>$width)$maxwidth = $width; + if($maxheight>$height)$maxheight = $height; + } if ($height > $width) { diff --git a/inc/core.php b/inc/core.php index ca4fc39..594272b 100644 --- a/inc/core.php +++ b/inc/core.php @@ -180,7 +180,7 @@ function renderImage($data) $path = $cachepath; $cached = true; } - else if($pm->countResizedImages($hash)>MAX_RESIZED_IMAGES) //if the number of max resized images is reached, just show the real one + else if(MAX_RESIZED_IMAGES > -1 && $pm->countResizedImages($hash)>MAX_RESIZED_IMAGES) //if the number of max resized images is reached, just show the real one $path = ROOT.DS.'upload'.DS.$hash.DS.$hash; switch($type) diff --git a/index.php b/index.php index 523ff13..796a54b 100644 --- a/index.php +++ b/index.php @@ -4,8 +4,12 @@ session_start(); // shall we log all uploaders IP addresses? define('LOG_UPLOADER', true); -//how many resizes may one image have? -define('MAX_RESIZED_IMAGES',50); +//how many resizes may one image have? set it to -1 for infinite resizes +define('MAX_RESIZED_IMAGES',4); + +//when the user requests a resize. Can the resized image be bigger than the original? +define('ALLOW_BLOATING', false); + //don't change stuff beyond this point define('DOMAINPATH',(isset($_SERVER['HTTPS'])?'https':'http').'://'.$_SERVER['HTTP_HOST'].'/');