dever 6 anni fa
parent
commit
0683ffedaa
2 ha cambiato i file con 17 aggiunte e 11 eliminazioni
  1. 10 9
      src/Store/Core.php
  2. 7 2
      src/View.php

+ 10 - 9
src/Store/Core.php

@@ -303,18 +303,19 @@ class Core
 	 */
 	protected function getExt($filename)
 	{
-		if (!function_exists('finfo_open')) {
-			return $this->getExtByByte($filename);
-		}
-
 		if (isset($this->data['file']['type'])) {
 			$ext = $this->getExtByMine($this->data['file']['type']);
 		}
-		$finfo = finfo_open(FILEINFO_MIME); // 返回 mime 类型
-		$code = finfo_file($finfo, $filename);
-		finfo_close($finfo);
-		$temp = explode(';', $code);
-		$ext = $this->getExtByMine($temp[0]);
+		if (function_exists('finfo_open')) {
+			$finfo = finfo_open(FILEINFO_MIME); // 返回 mime 类型
+			$code = finfo_file($finfo, $filename);
+			finfo_close($finfo);
+			$temp = explode(';', $code);
+			$ext = $this->getExtByMine($temp[0]);
+		} else {
+			$ext = $this->getExtByByte($filename);
+		}
+		
 		if (!$ext || $ext == 'txt' || $ext == 'exe') {
 			if (isset($this->data['file']['type'])) {
 				$ext = $this->getExtByMine($this->data['file']['type']);

+ 7 - 2
src/View.php

@@ -59,11 +59,16 @@ class View
             $pic = Dever::config('host')->script . 'img/video.jpg';
             foreach ($data['file'] as $k => $v) {
                 $data['file'][$k]['url'] = Dever::upload('{uploadRes}' . $v['file']);
-                if ($v['ext'] != '.jpg' && $v['ext'] != '.png' && $v['ext'] != '.bmp' && $v['ext'] != '.gif') {
+                if (!isset($v['ext'])) {
                     $data['file'][$k]['pic'] = $pic;
                 } else {
-                    $data['file'][$k]['pic'] = $data['file'][$k]['url'];
+                    if ($v['ext'] != '.jpg' && $v['ext'] != '.png' && $v['ext'] != '.bmp' && $v['ext'] != '.gif') {
+                        $data['file'][$k]['pic'] = $pic;
+                    } else {
+                        $data['file'][$k]['pic'] = $data['file'][$k]['url'];
+                    }
                 }
+                
                 if (!isset($data['file'][$k]['pic'])) {
                     $data['file'][$k]['pic'] = $pic;
                 }