Include self in method call

app/classes/web/ajax_handler.py

@@ -656,14 +656,13 @@ class AjaxHandler(BaseHandler):
 
             server_info = self.controller.servers.get_server_data_by_id(server_id)
             if not (
-                file_path,
-                Helpers.is_subdir(
-                    Helpers.get_os_understandable_path(server_info["path"])
+                self.helper.is_subdir(
+                    file_path, Helpers.get_os_understandable_path(server_info["path"])
                 )
-                or Helpers.is_subdir(
+                or self.helper.is_subdir(
                     file_path,
                     Helpers.get_os_understandable_path(server_info["backup_path"]),
-                ),
+                )
             ) or not Helpers.check_file_exists(os.path.abspath(file_path)):
                 logger.warning(f"Invalid path in del_backup ajax call ({file_path})")
                 Console.warning(f"Invalid path in del_backup ajax call ({file_path})")

app/classes/web/file_handler.py

@@ -57,7 +57,7 @@ class FileHandler(BaseHandler):
                 return
             server_id = bleach.clean(server_id)
 
-            if not Helpers.is_subdir(
+            if not self.helper.is_subdir(
                 file_path,
                 Helpers.get_os_understandable_path(
                     self.controller.servers.get_server_data_by_id(server_id)["path"]
@@ -163,7 +163,7 @@ class FileHandler(BaseHandler):
                 return
             server_id = bleach.clean(server_id)
 
-            if not Helpers.is_subdir(
+            if not self.helper.is_subdir(
                 file_path,
                 Helpers.get_os_understandable_path(
                     self.controller.servers.get_server_data_by_id(server_id)["path"]
@@ -196,7 +196,7 @@ class FileHandler(BaseHandler):
                 return
             server_id = bleach.clean(server_id)
 
-            if not Helpers.is_subdir(
+            if not self.helper.is_subdir(
                 dir_path,
                 Helpers.get_os_understandable_path(
                     self.controller.servers.get_server_data_by_id(server_id)["path"]
@@ -263,10 +263,10 @@ class FileHandler(BaseHandler):
 
             server_info = self.controller.servers.get_server_data_by_id(server_id)
             if not (
-                Helpers.is_subdir(
+                self.helper.is_subdir(
                     file_path, Helpers.get_os_understandable_path(server_info["path"])
                 )
-                or Helpers.is_subdir(
+                or self.helper.is_subdir(
                     file_path,
                     Helpers.get_os_understandable_path(server_info["backup_path"]),
                 )
@@ -296,7 +296,7 @@ class FileHandler(BaseHandler):
             server_id = bleach.clean(server_id)
 
             server_info = self.controller.servers.get_server_data_by_id(server_id)
-            if not Helpers.is_subdir(
+            if not self.helper.is_subdir(
                 dir_path, Helpers.get_os_understandable_path(server_info["path"])
             ) or not Helpers.check_path_exists(os.path.abspath(dir_path)):
                 logger.warning(f"Invalid path in del_file file ajax call ({dir_path})")
@@ -348,7 +348,7 @@ class FileHandler(BaseHandler):
                 return
             server_id = bleach.clean(server_id)
 
-            if not Helpers.is_subdir(
+            if not self.helper.is_subdir(
                 file_path,
                 Helpers.get_os_understandable_path(
                     self.controller.servers.get_server_data_by_id(server_id)["path"]
@@ -366,60 +366,6 @@ class FileHandler(BaseHandler):
             with open(file_path, "w", encoding="utf-8") as file_object:
                 file_object.write(file_contents)
 
-        elif page == "rename_file":
-            if not permissions["Files"] in user_perms:
-                if not superuser:
-                    self.redirect("/panel/error?error=Unauthorized access to Files")
-                    return
-            item_path = Helpers.get_os_understandable_path(
-                self.get_body_argument("item_path", default=None, strip=True)
-            )
-            new_item_name = self.get_body_argument(
-                "new_item_name", default=None, strip=True
-            )
-
-            if not self.check_server_id(server_id, "rename_file"):
-                return
-            server_id = bleach.clean(server_id)
-
-            if item_path is None or new_item_name is None:
-                logger.warning("Invalid path(s) in rename_file file ajax call")
-                Console.warning("Invalid path(s) in rename_file file ajax call")
-                return
-
-            if not Helpers.is_subdir(
-                item_path,
-                Helpers.get_os_understandable_path(
-                    self.controller.servers.get_server_data_by_id(server_id)["path"]
-                ),
-            ) or not Helpers.check_path_exists(os.path.abspath(item_path)):
-                logger.warning(
-                    f"Invalid old name path in rename_file file ajax call ({server_id})"
-                )
-                Console.warning(
-                    f"Invalid old name path in rename_file file ajax call ({server_id})"
-                )
-                return
-
-            new_item_path = os.path.join(os.path.split(item_path)[0], new_item_name)
-
-            if not Helpers.is_subdir(
-                new_item_path,
-                Helpers.get_os_understandable_path(
-                    self.controller.servers.get_server_data_by_id(server_id)["path"]
-                ),
-            ) or Helpers.check_path_exists(os.path.abspath(new_item_path)):
-                logger.warning(
-                    f"Invalid new name path in rename_file file ajax call ({server_id})"
-                )
-                Console.warning(
-                    f"Invalid new name path in rename_file file ajax call ({server_id})"
-                )
-                return
-
-            # RENAME
-            os.rename(item_path, new_item_path)
-
     @tornado.web.authenticated
     def patch(self, page):
         api_key, _, exec_user = self.current_user
@@ -462,7 +408,7 @@ class FileHandler(BaseHandler):
                 Console.warning("Invalid path(s) in rename_file file ajax call")
                 return
 
-            if not Helpers.is_subdir(
+            if not self.helper.is_subdir(
                 item_path,
                 Helpers.get_os_understandable_path(
                     self.controller.servers.get_server_data_by_id(server_id)["path"]
@@ -478,7 +424,7 @@ class FileHandler(BaseHandler):
 
             new_item_path = os.path.join(os.path.split(item_path)[0], new_item_name)
 
-            if not Helpers.is_subdir(
+            if not self.helper.is_subdir(
                 new_item_path,
                 Helpers.get_os_understandable_path(
                     self.controller.servers.get_server_data_by_id(server_id)["path"]

app/classes/web/panel_handler.py

@@ -808,7 +808,7 @@ class PanelHandler(BaseHandler):
                     Helpers.get_os_understandable_path(server_info["backup_path"]), file
                 )
             )
-            if not Helpers.is_subdir(
+            if not self.helper.is_subdir(
                 backup_file,
                 Helpers.get_os_understandable_path(server_info["backup_path"]),
             ) or not os.path.isfile(backup_file):
@@ -1463,7 +1463,7 @@ class PanelHandler(BaseHandler):
 
             server_info = self.controller.servers.get_server_data_by_id(server_id)
 
-            if not Helpers.is_subdir(
+            if not self.helper.is_subdir(
                 file,
                 Helpers.get_os_understandable_path(server_info["path"]),
             ) or not os.path.isfile(file):

app/classes/web/upload_handler.py

@@ -278,7 +278,7 @@ class UploadHandler(BaseHandler):
             filename = self.request.headers.get("X-FileName", None)
             full_path = os.path.join(path, filename)
 
-            if not Helpers.is_subdir(
+            if not self.helper.is_subdir(
                 full_path,
                 Helpers.get_os_understandable_path(
                     self.controller.servers.get_server_data_by_id(server_id)["path"]