fix sha1 issue

[uguu.git] / static / php / includes / Upload.class.php

diff --git a/static/php/includes/Upload.class.php b/static/php/includes/Upload.class.php
index 15ba8f68933148b04d86ce511f5d63463896a5d2..8c7c0734596cb36e5de623e4ba581bc58534dd66 100644 (file)
--- a/static/php/includes/Upload.class.php
+++ b/static/php/includes/Upload.class.php
@@ -48,7 +48,8 @@ class Upload
             self::$FILE_NAME = $file['name'];
             self::$FILE_SIZE = $file['size'];
             self::$TEMP_FILE = $file['tmp_name'];
-            $result[] = [self::$FILE_NAME, self::$FILE_SIZE, self::$TEMP_FILE];
+            self::$SHA1 = sha1_file(self::$TEMP_FILE);
+            $result[] = [self::$FILE_NAME, self::$FILE_SIZE, self::$TEMP_FILE, self::$SHA1];
         }
         return $result;
     }
@@ -106,7 +107,22 @@ class Upload
             'size' => self::$FILE_SIZE
         ];
     }
+    public function fileInfo()
+    {
+        if (isset($_FILES['files'])) {
+            $finfo = finfo_open(FILEINFO_MIME_TYPE);
+            self::$FILE_MIME = finfo_file($finfo, self::$TEMP_FILE);
+            $extension = explode('.',self::$FILE_NAME,2);
+            self::$FILE_EXTENSION = $extension['1'];
+            finfo_close($finfo);
 
+            if (Settings::$LOG_IP) {
+                self::$IP = $_SERVER['REMOTE_ADDR'];
+            } else {
+                self::$IP = '0';
+            }
+        }
+    }
     /**
      * @throws Exception
      */
@@ -124,8 +140,9 @@ class Upload
                 self::$NEW_NAME .= Settings::$ID_CHARSET[mt_rand(0, strlen(Settings::$ID_CHARSET))];
             }
 
-            if (isset(self::$FILE_EXTENSION) && self::$FILE_EXTENSION !== '') {
-                self::$NEW_NAME_FULL = self::$NEW_NAME . '.' . self::$FILE_EXTENSION;
+            if(isset(self::$FILE_EXTENSION)){
+                self::$NEW_NAME_FULL = self::$NEW_NAME;
+                self::$NEW_NAME_FULL .= '.'.self::$FILE_EXTENSION;
             }
 
             if (Settings::$BLACKLIST_DB) {
@@ -141,30 +158,6 @@ class Upload
         return self::$NEW_NAME_FULL;
     }
 
-    public function fileInfo()
-    {
-        if (isset($_FILES['files'])) {
-            self::$SHA1 = sha1_file(self::$TEMP_FILE);
-            $finfo = finfo_open(FILEINFO_MIME_TYPE);
-            self::$FILE_MIME = finfo_file($finfo, self::$TEMP_FILE);
-            finfo_close($finfo);
-
-            if (Settings::$LOG_IP) {
-                self::$IP = $_SERVER['REMOTE_ADDR'];
-            } else {
-                self::$IP = '0';
-            }
-
-            foreach (Settings::$DOUBLE_DOTS as $DDOT) {
-                if (stripos(strrev(self::$FILE_NAME), $DDOT) === 0) {
-                    self::$FILE_EXTENSION = strrev($DDOT);
-                } else {
-                    self::$FILE_EXTENSION = pathinfo(self::$FILE_NAME, PATHINFO_EXTENSION);
-                }
-            }
-        }
-    }
-
     /**
      * @throws Exception
      */