james/fembooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

make this work?

Browse Source
This commit is contained in:
Shish 2010-03-22 15:36:44 +00:00
parent e49bb14aaf
commit 6071fb5e88
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
contrib/res_limit/main.php
View File

@ -14,7 +14,6 @@ class ResolutionLimit implements Extension {
$max_w = $config->get_int("upload_max_width", -1); $max_w = $config->get_int("upload_max_width", -1);
$max_h = $config->get_int("upload_max_height", -1); $max_h = $config->get_int("upload_max_height", -1);
$ratios = explode(" ", $config->get_string("upload_ratios", "")); $ratios = explode(" ", $config->get_string("upload_ratios", ""));
$ratios = array_filter($ratios, "strlen");
$image = $event->image; $image = $event->image;
@ -25,9 +24,11 @@ class ResolutionLimit implements Extension {
if(count($ratios) > 0) { if(count($ratios) > 0) {
$ok = false; $ok = false;
$valids = 0;
foreach($ratios as $ratio) { foreach($ratios as $ratio) {
$parts = explode(":", $ratio); $parts = explode(":", $ratio);
if(count($parts) < 2) continue; if(count($parts) < 2) continue;
$valids++;
$width = $parts[0]; $width = $parts[0];
$height = $parts[1]; $height = $parts[1];
if($image->width / $width == $image->height / $height) { if($image->width / $width == $image->height / $height) {
@ -35,7 +36,7 @@ class ResolutionLimit implements Extension {
break; break;
} }
} }
if(!$ok) { if($valids > 0 && !$ok) {
throw new UploadException( throw new UploadException(
"Image needs to be in one of these ratios: ". "Image needs to be in one of these ratios: ".
html_escape($config->get_string("upload_ratios", ""))); html_escape($config->get_string("upload_ratios", "")));