refactoring

[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 7de2e1dd7cae7d89a5b5285e4ca522b2286d4842..d0b52b6ea01b72f40947248bf800265953138916 100644 (file)
--- a/static/php/includes/Upload.class.php
+++ b/static/php/includes/Upload.class.php
@@ -28,12 +28,12 @@ class Upload
 {
 
     public static string $FILE_NAME;
-    public static string $FILE_EXTENSION;
+    public static mixed $FILE_EXTENSION;
     public static string $FILE_MIME;
     public static string $SHA1;
     public static string $NEW_NAME;
     public static string $NEW_NAME_FULL;
-    public static string $IP;
+    public static mixed $IP;
 
     public static string $FILE_SIZE;
     public static string $TEMP_FILE;
@@ -45,7 +45,7 @@ class Upload
         $files = self::diverseArray($files);
 
         foreach ($files as $file) {
-            self::$FILE_NAME = $file['name'];
+            self::$FILE_NAME = strip_tags($file['name']);
             self::$FILE_SIZE = $file['size'];
             self::$TEMP_FILE = $file['tmp_name'];
             self::$SHA1 = sha1_file(self::$TEMP_FILE);
@@ -121,19 +121,6 @@ class Upload
         ];
     }
 
-    public static function getIP()
-    {
-        if (!empty($_SERVER['HTTP_CLIENT_IP'])) {
-            self::$IP = $_SERVER['HTTP_CLIENT_IP'];
-        }
-        if (!empty($_SERVER['HTTP_X_FORWARDED_FOR'])) {
-            self::$IP = $_SERVER['HTTP_X_FORWARDED_FOR'];
-        }
-        if (!isset(self::$IP)) {
-            self::$IP = $_SERVER['REMOTE_ADDR'];
-        }
-    }
-
     public static function fileInfo()
     {
         if (isset($_FILES['files'])) {
@@ -142,16 +129,14 @@ class Upload
             finfo_close($finfo);
 
             $extension = explode('.', self::$FILE_NAME);
-            if(substr_count(self::$FILE_NAME, '.') === 0) {
-                self::$FILE_EXTENSION = null;
-            } elseif(substr_count(self::$FILE_NAME, '.') > 1) {
-                self::$FILE_EXTENSION = $extension[count($extension)-2].'.'.$extension[count($extension)-1];
-            } else {
+            if(substr_count(self::$FILE_NAME, '.') > 0) {
                 self::$FILE_EXTENSION = $extension[count($extension)-1];
+            } else {
+                self::$FILE_EXTENSION = null;
             }
 
             if (Settings::$LOG_IP) {
-                self::getIP();
+                self::$IP = $_SERVER['REMOTE_ADDR'];
             } else {
                 self::$IP = null;
             }