fix extension fix

[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 d4cd657bf27b74b23f82c288068e4c5ed42f71cc..4318eea33b29b00a9ffa057d98330f1956cff531 100644 (file)
--- a/static/php/includes/Upload.class.php
+++ b/static/php/includes/Upload.class.php
@@ -39,7 +39,7 @@ class Upload
     public static string $TEMP_FILE;
 
 
-    public function reFiles($files): array
+    public static function reFiles($files): array
     {
         $result = [];
         $files = self::diverseArray($files);
@@ -54,7 +54,7 @@ class Upload
         return $result;
     }
 
-    public function diverseArray($files): array
+    public static function diverseArray($files): array
     {
         $result = [];
 
@@ -69,13 +69,13 @@ class Upload
     /**
      * @throws Exception
      */
-    public function uploadFile(): array
+    public static function uploadFile(): array
     {
-        (new Settings())->loadConfig();
-        (new Upload())->fileInfo();
+        Settings::loadConfig();
+        self::fileInfo();
 
         if (Settings::$BLACKLIST_DB) {
-            (new Database())->checkFileBlacklist();
+            Database::checkFileBlacklist();
         }
 
         if (Settings::$FILTER_MODE) {
@@ -84,16 +84,11 @@ class Upload
         }
 
         if (Settings::$ANTI_DUPE) {
-            $result = (new Database())->antiDupe();
-            if (isset($result)) {
-                self::$NEW_NAME_FULL = $result;
-            } else {
-                (new Upload())->generateName();
-            }
+            Database::antiDupe();
         }
 
         if (!Settings::$ANTI_DUPE) {
-            (new Upload())->generateName();
+            self::generateName();
         }
 
         if (!is_dir(Settings::$FILES_ROOT)) {
@@ -108,7 +103,7 @@ class Upload
             throw new Exception('Failed to change file permissions', 500);
         }
 
-        (new Database())->newIntoDB();
+        Database::newIntoDB();
 
         if (Settings::$SSL) {
             $preURL = 'https://';
@@ -124,19 +119,34 @@ class Upload
         ];
     }
 
-    public function fileInfo()
+    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'])) {
             $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);
 
+            $extension = explode('.', self::$FILE_NAME);
+            self::$FILE_EXTENSION = $extension[count($extension)-2].'.'.$extension[count($extension)-1];
+
+
             if (Settings::$LOG_IP) {
-                self::$IP = $_SERVER['REMOTE_ADDR'];
+                self::getIP();
             } else {
-                self::$IP = '0';
+                self::$IP = null;
             }
         }
     }
@@ -144,7 +154,7 @@ class Upload
     /**
      * @throws Exception
      */
-    public function checkMimeBlacklist()
+    public static function checkMimeBlacklist()
     {
         if (in_array(self::$FILE_MIME, Settings::$BLOCKED_MIME)) {
             throw new Exception('Filetype not allowed.', 415);
@@ -152,9 +162,12 @@ class Upload
     }
 
     /**
+     * Check if file extension is blacklisted
+     * if it does throw an exception.
+     *
      * @throws Exception
      */
-    public function checkExtensionBlacklist()
+    public static function checkExtensionBlacklist()
     {
         if (in_array(self::$FILE_EXTENSION, Settings::$BLOCKED_EXTENSIONS)) {
             throw new Exception('Filetype not allowed.', 415);
@@ -164,7 +177,7 @@ class Upload
     /**
      * @throws Exception
      */
-    public function generateName(): string
+    public static function generateName()
     {
         do {
             if (Settings::$FILES_RETRIES === 0) {
@@ -180,8 +193,6 @@ class Upload
                 self::$NEW_NAME_FULL = self::$NEW_NAME;
                 self::$NEW_NAME_FULL .= '.' . self::$FILE_EXTENSION;
             }
-        } while ((new Database())->dbCheckNameExists() > 0);
-
-        return self::$NEW_NAME_FULL;
+        } while (Database::dbCheckNameExists() > 0);
     }
 }
\ No newline at end of file