改进验证类的image方法

2026-07-09 08:02:48 +08:00 · 2016-10-21 17:51:19 +08:00
parent 35a12fac90
commit 294a49b8b1
1 changed files with 16 additions and 11 deletions
--- a/library/think/Validate.php
+++ b/library/think/Validate.php
@@ -723,6 +723,7 @@ class Validate
        if (!($file instanceof File)) {
            return false;
        }
+        if ($rule) {
            $rule                        = explode(',', $rule);
            list($width, $height, $type) = getimagesize($file->getRealPath());
            if (isset($rule[2])) {
@@ -734,8 +735,12 @@ class Validate
                    return false;
                }
            }
+
            list($w, $h) = $rule;
            return $w == $width && $h == $height;
+        } else {
+            return in_array($this->getImageType($file->getRealPath()), [1, 2, 3, 6]);
+        }
    }

    /**