rabin 1 年之前
父节点
当前提交
150c15a4d1
共有 7 个文件被更改,包括 7 次插入6 次删除
  1. 6 6
      lib/Save.php
  2. 0 0
      manage/core.php
  3. 0 0
      manage/file.php
  4. 0 0
      manage/rule.php
  5. 0 0
      manage/rule_after.php
  6. 0 0
      manage/save.php
  7. 1 0
      table/rule.php

+ 6 - 6
lib/Save.php

@@ -128,9 +128,6 @@ class Save
                     finfo_close($finfo);
                     $temp = explode(';', $code);
                     $ext = $this->getExtByMine($temp[0]);
-                    if (!$ext) {
-                        $ext = $this->getExtByByte($source);
-                    }
                     $size = filesize($source);
                     $method = 'getimagesize';
                 }
@@ -141,6 +138,9 @@ class Save
         if (!$source) {
             Dever::error('源文件不存在');
         }
+        if (!$ext) {
+            $ext = $this->getExtByByte($source);
+        }
         if (!$ext && $default_ext) {
             $ext = $default_ext;
         }
@@ -319,6 +319,9 @@ class Save
 
     protected function getExtByMine($mine, $flip = false, $result = false)
     {
+        if (!$mine) {
+            return '';
+        }
         $config = array
         (
             'application/envoy' => 'evy',
@@ -476,9 +479,6 @@ class Save
         if ($flip) {
             $config = array_flip($config);
         }
-        if (!$mine) {
-            return $config;
-        }
         $mine = trim($mine);
         if (isset($config[$mine])) {
             return $config[$mine];

+ 0 - 0
table/manage/core.php → manage/core.php


+ 0 - 0
table/manage/file.php → manage/file.php


+ 0 - 0
table/manage/rule.php → manage/rule.php


+ 0 - 0
table/manage/rule_after.php → manage/rule_after.php


+ 0 - 0
table/manage/save.php → manage/save.php


+ 1 - 0
table/rule.php

@@ -90,6 +90,7 @@ return array
             '5,"pdf文件",5,' . DEVER_TIME,
             '6,"裁剪图片",1,' . DEVER_TIME,
             '7,"用户上传图片",1,' . DEVER_TIME,
+            '8,"文件","1,2,3,4,5",' . DEVER_TIME,
         ),
     ),
 );