Revert "Merge branch 'dev' into 'master'"

This reverts merge request !783

.gitlab/scripts/lang_sort.sh

@@ -56,8 +56,8 @@ get_keys "${DIR}/en_EN.json" | sort > "${ref_keys}"
 
 # Iterate over each .json file in the directory
 for file in "${DIR}"/*.json; do
-    # Check if file is a regular file and not en_EN.json, humanized index and does not contain "_incomplete" in its name
-    if [[ -f "${file}" && "${file}" != "${DIR}/en_EN.json" && "${file}" != "${DIR}/humanized_index.json" && ! "${file}" =~ _incomplete ]]; then
+    # Check if file is a regular file and not en_EN.json, and does not contain "_incomplete" in its name
+    if [[ -f "${file}" && "${file}" != "${DIR}/en_EN.json" && ! "${file}" =~ _incomplete ]]; then
 
         # Get keys and subkeys from the current file
         current_keys=$(mktemp)

.gitlab/scripts/sort.py

@@ -44,7 +44,6 @@ def main():
             if (
                 "_incomplete" not in file
                 and file != "en_EN.json"
-                and file != "humanized_index.json"
                 and file.endswith(".json")
             ):
                 file_path = os.path.join(root, file)

CHANGELOG.md

@@ -1,38 +1,4 @@
 # Changelog
-## --- [4.4.1] - 2024/07/29
-### Refactor
-- Backups | Allow multiple backup configurations ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/711))
-- UploadAPI | Use Crafty's JWT authentication for file uploads ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/762))
-- UploadAPI | Splice files on the frontend to allow chunked uploads as well as bulk uploads ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/762))
-- UploadAPI | Enhance upload progress feedback on all upload pages ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/762))
-- UploadAPI | Consolidate and improve speed on uploads, supporting 100mb+ uploads through Cloudflare(Free) ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/762))
-### Bug fixes
-- Fix zip imports so the root dir selection is functional ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/764))
-- Fix bug where full access gives minimal access ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/768))
-- Bump tornado & requests for sec advisories ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/774))
-- Ensure audit.log exists or create it on Crafty startup ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/771))
-- Fix typing issue on ID comparison causing general users to not be able to delete their own API keys ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/775))
-- Fix user creation bug where it would fail when a role was selected ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/763))
-- Security improvements for general user creations on roles page ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/763))
-- Security improvements for general user creations on user page ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/763))
-- Use UTC for tokens_valid_from in user config, to resolve token invalidation on instance TZ change ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/765))
-- Remove unused and problematic "dropdown-menu" ident from [!722](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/772) CSS ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/782))
-### Tweaks
-- Add info note to default creds file ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/760))
-- Remove navigation label from sidebar ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/766))
-- Do not allow slashes in server names ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/767))
-- Add a thread dump to support logs ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/769))
-- Remove text from status page and use symbols ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/770))
-- Add better feedback on when errors appear on user creation ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/763))
-- Workaround cpu_freq call catching on obscure cpu architectures ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/776))
-- Change Role selector in server wizard to be a filter list ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/772))
-### Lang
-- Show natural language name instead of country code in User Config Lang select list ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/773))
-- Add remaining `he_IL`, `th_TH` translations from **4.4.0** Release ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/761) | [Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/763))
-- Fix `fr_FR` syntax issues ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/780) | [Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/778))
-- Add `th_TH` translations for [!772](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/772) ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/781))
-<br><br>
-
 ## --- [4.4.0] - 2024/05/11
 ### Refactor
 - Refactor API keys "super user" to "full access" ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/731) | [Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/759))

README.md

@@ -1,5 +1,5 @@
 [![Crafty Logo](app/frontend/static/assets/images/logo_long.svg)](https://craftycontrol.com)
-# Crafty Controller 4.4.1
+# Crafty Controller 4.4.0
 > Python based Control Panel for your Minecraft Server
 
 ## What is Crafty Controller?

app/classes/controllers/management_controller.py

@@ -5,7 +5,6 @@ from prometheus_client import CollectorRegistry, Gauge
 
 from app.classes.models.management import HelpersManagement, HelpersWebhooks
 from app.classes.models.servers import HelperServers
-from app.classes.shared.helpers import Helpers
 
 logger = logging.getLogger(__name__)
 
@@ -76,7 +75,7 @@ class ManagementController:
     #                                   Commands Methods
     # **********************************************************************************
 
-    def send_command(self, user_id, server_id, remote_ip, command, action_id=None):
+    def send_command(self, user_id, server_id, remote_ip, command):
         server_name = HelperServers.get_server_friendly_name(server_id)
 
         # Example: Admin issued command start_server for server Survival
@@ -87,12 +86,7 @@ class ManagementController:
             remote_ip,
         )
         self.queue_command(
-            {
-                "server_id": server_id,
-                "user_id": user_id,
-                "command": command,
-                "action_id": action_id,
-            }
+            {"server_id": server_id, "user_id": user_id, "command": command}
         )
 
     def queue_command(self, command_data):
@@ -129,7 +123,6 @@ class ManagementController:
         cron_string="* * * * *",
         parent=None,
         delay=0,
-        action_id=None,
     ):
         return HelpersManagement.create_scheduled_task(
             server_id,
@@ -144,7 +137,6 @@ class ManagementController:
             cron_string,
             parent,
             delay,
-            action_id,
         )
 
     @staticmethod
@@ -183,47 +175,34 @@ class ManagementController:
     #                                   Backups Methods
     # **********************************************************************************
     @staticmethod
-    def get_backup_config(backup_id):
-        return HelpersManagement.get_backup_config(backup_id)
+    def get_backup_config(server_id):
+        return HelpersManagement.get_backup_config(server_id)
 
-    @staticmethod
-    def get_backups_by_server(server_id, model=False):
-        return HelpersManagement.get_backups_by_server(server_id, model)
-
-    @staticmethod
-    def delete_backup_config(backup_id):
-        HelpersManagement.remove_backup_config(backup_id)
-
-    @staticmethod
-    def update_backup_config(backup_id, updates):
-        if "backup_location" in updates:
-            updates["backup_location"] = Helpers.wtol_path(updates["backup_location"])
-        return HelpersManagement.update_backup_config(backup_id, updates)
-
-    def add_backup_config(self, data) -> str:
-        if "backup_location" in data:
-            data["backup_location"] = Helpers.wtol_path(data["backup_location"])
-        return self.management_helper.add_backup_config(data)
-
-    def add_default_backup_config(self, server_id, backup_path):
-        return self.management_helper.add_backup_config(
-            {
-                "backup_name": "Default Backup",
-                "backup_location": Helpers.wtol_path(backup_path),
-                "max_backups": 0,
-                "before": "",
-                "after": "",
-                "compress": False,
-                "shutdown": False,
-                "server_id": server_id,
-                "excluded_dirs": [],
-                "default": True,
-            }
+    def set_backup_config(
+        self,
+        server_id: int,
+        backup_path: str = None,
+        max_backups: int = None,
+        excluded_dirs: list = None,
+        compress: bool = False,
+        shutdown: bool = False,
+        before: str = "",
+        after: str = "",
+    ):
+        return self.management_helper.set_backup_config(
+            server_id,
+            backup_path,
+            max_backups,
+            excluded_dirs,
+            compress,
+            shutdown,
+            before,
+            after,
         )
 
     @staticmethod
-    def get_excluded_backup_dirs(backup_id: int):
-        return HelpersManagement.get_excluded_backup_dirs(backup_id)
+    def get_excluded_backup_dirs(server_id: int):
+        return HelpersManagement.get_excluded_backup_dirs(server_id)
 
     def add_excluded_backup_dir(self, server_id: int, dir_to_add: str):
         self.management_helper.add_excluded_backup_dir(server_id, dir_to_add)

app/classes/controllers/servers_controller.py

@@ -48,6 +48,7 @@ class ServersController(metaclass=Singleton):
         name: str,
         server_uuid: str,
         server_dir: str,
+        backup_path: str,
         server_command: str,
         server_file: str,
         server_log_file: str,
@@ -82,6 +83,7 @@ class ServersController(metaclass=Singleton):
             server_uuid,
             name,
             server_dir,
+            backup_path,
             server_command,
             server_file,
             server_log_file,
@@ -146,7 +148,8 @@ class ServersController(metaclass=Singleton):
             PermissionsServers.delete_roles_permissions(role_id, role_data["servers"])
         # Remove roles from server
         PermissionsServers.remove_roles_of_server(server_id)
-        self.management_helper.remove_all_server_backups(server_id)
+        # Remove backup configs tied to server
+        self.management_helper.remove_backup_config(server_id)
         # Finally remove server
         self.servers_helper.remove_server(server_id)
 

app/classes/controllers/users_controller.py

@@ -55,7 +55,6 @@ class UsersController:
                 "minLength": self.helper.minimum_password_length,
                 "examples": ["crafty"],
                 "title": "Password",
-                "error": "passLength",
             },
             "email": {
                 "type": "string",

app/classes/minecraft/stats.py

@@ -86,7 +86,7 @@ class Stats:
     def get_node_stats(self) -> NodeStatsReturnDict:
         try:
             cpu_freq = psutil.cpu_freq()
-        except (NotImplementedError, AttributeError, FileNotFoundError):
+        except (NotImplementedError, FileNotFoundError):
             cpu_freq = None
         if cpu_freq is None:
             cpu_freq = psutil._common.scpufreq(current=-1, min=-1, max=-1)

app/classes/models/management.py

@@ -16,7 +16,6 @@ from app.classes.models.base_model import BaseModel
 from app.classes.models.users import HelperUsers
 from app.classes.models.servers import Servers
 from app.classes.models.server_permissions import PermissionsServers
-from app.classes.shared.helpers import Helpers
 from app.classes.shared.websocket_manager import WebSocketManager
 
 logger = logging.getLogger(__name__)
@@ -88,7 +87,6 @@ class Schedules(BaseModel):
     interval_type = CharField()
     start_time = CharField(null=True)
     command = CharField(null=True)
-    action_id = CharField(null=True)
     name = CharField()
     one_time = BooleanField(default=False)
     cron_string = CharField(default="")
@@ -104,19 +102,13 @@ class Schedules(BaseModel):
 #                                   Backups Class
 # **********************************************************************************
 class Backups(BaseModel):
-    backup_id = CharField(primary_key=True, default=Helpers.create_uuid)
-    backup_name = CharField(default="New Backup")
-    backup_location = CharField(default="")
     excluded_dirs = CharField(null=True)
-    max_backups = IntegerField(default=0)
+    max_backups = IntegerField()
     server_id = ForeignKeyField(Servers, backref="backups_server")
     compress = BooleanField(default=False)
     shutdown = BooleanField(default=False)
     before = CharField(default="")
     after = CharField(default="")
-    default = BooleanField(default=False)
-    status = CharField(default='{"status": "Standby", "message": ""}')
-    enabled = BooleanField(default=True)
 
     class Meta:
         table_name = "backups"
@@ -271,7 +263,6 @@ class HelpersManagement:
         cron_string="* * * * *",
         parent=None,
         delay=0,
-        action_id=None,
     ):
         sch_id = Schedules.insert(
             {
@@ -282,7 +273,6 @@ class HelpersManagement:
                 Schedules.interval_type: interval_type,
                 Schedules.start_time: start_time,
                 Schedules.command: command,
-                Schedules.action_id: action_id,
                 Schedules.name: name,
                 Schedules.one_time: one_time,
                 Schedules.cron_string: cron_string,
@@ -345,81 +335,133 @@ class HelpersManagement:
     #                                   Backups Methods
     # **********************************************************************************
     @staticmethod
-    def get_backup_config(backup_id):
-        return model_to_dict(Backups.get(Backups.backup_id == backup_id))
-
-    @staticmethod
-    def get_backups_by_server(server_id, model=False):
-        if not model:
-            data = {}
-            for backup in (
-                Backups.select().where(Backups.server_id == server_id).execute()
-            ):
-                data[str(backup.backup_id)] = {
-                    "backup_id": backup.backup_id,
-                    "backup_name": backup.backup_name,
-                    "backup_location": backup.backup_location,
-                    "excluded_dirs": backup.excluded_dirs,
-                    "max_backups": backup.max_backups,
-                    "server_id": backup.server_id_id,
-                    "compress": backup.compress,
-                    "shutdown": backup.shutdown,
-                    "before": backup.before,
-                    "after": backup.after,
-                    "default": backup.default,
-                    "enabled": backup.enabled,
-                }
-        else:
-            data = Backups.select().where(Backups.server_id == server_id).execute()
-        return data
-
-    @staticmethod
-    def get_default_server_backup(server_id: str) -> dict:
-        print(server_id)
-        bu_query = Backups.select().where(
-            Backups.server_id == server_id,
-            Backups.default == True,  # pylint: disable=singleton-comparison
+    def get_backup_config(server_id):
+        try:
+            row = (
+                Backups.select().where(Backups.server_id == server_id).join(Servers)[0]
             )
-        for item in bu_query:
-            print("HI", item)
-        backup_model = bu_query.first()
-
-        if backup_model:
-            return model_to_dict(backup_model)
-        raise IndexError
+            conf = {
+                "backup_path": row.server_id.backup_path,
+                "excluded_dirs": row.excluded_dirs,
+                "max_backups": row.max_backups,
+                "server_id": row.server_id_id,
+                "compress": row.compress,
+                "shutdown": row.shutdown,
+                "before": row.before,
+                "after": row.after,
+            }
+        except IndexError:
+            conf = {
+                "backup_path": None,
+                "excluded_dirs": None,
+                "max_backups": 0,
+                "server_id": server_id,
+                "compress": False,
+                "shutdown": False,
+                "before": "",
+                "after": "",
+            }
+        return conf
 
     @staticmethod
-    def remove_all_server_backups(server_id):
+    def remove_backup_config(server_id):
         Backups.delete().where(Backups.server_id == server_id).execute()
 
-    @staticmethod
-    def remove_backup_config(backup_id):
-        Backups.delete().where(Backups.backup_id == backup_id).execute()
-
-    def add_backup_config(self, conf) -> str:
-        if "excluded_dirs" in conf:
-            dirs_to_exclude = ",".join(conf["excluded_dirs"])
+    def set_backup_config(
+        self,
+        server_id: int,
+        backup_path: str = None,
+        max_backups: int = None,
+        excluded_dirs: list = None,
+        compress: bool = False,
+        shutdown: bool = False,
+        before: str = "",
+        after: str = "",
+    ):
+        logger.debug(f"Updating server {server_id} backup config with {locals()}")
+        if Backups.select().where(Backups.server_id == server_id).exists():
+            new_row = False
+            conf = {}
+        else:
+            conf = {
+                "excluded_dirs": None,
+                "max_backups": 0,
+                "server_id": server_id,
+                "compress": False,
+                "shutdown": False,
+                "before": "",
+                "after": "",
+            }
+            new_row = True
+        if max_backups is not None:
+            conf["max_backups"] = max_backups
+        if excluded_dirs is not None:
+            dirs_to_exclude = ",".join(excluded_dirs)
             conf["excluded_dirs"] = dirs_to_exclude
-        backup = Backups.create(**conf)
+        conf["compress"] = compress
+        conf["shutdown"] = shutdown
+        conf["before"] = before
+        conf["after"] = after
+        if not new_row:
+            with self.database.atomic():
+                if backup_path is not None:
+                    server_rows = (
+                        Servers.update(backup_path=backup_path)
+                        .where(Servers.server_id == server_id)
+                        .execute()
+                    )
+                else:
+                    server_rows = 0
+                backup_rows = (
+                    Backups.update(conf).where(Backups.server_id == server_id).execute()
+                )
+            logger.debug(
+                f"Updating existing backup record. "
+                f"{server_rows}+{backup_rows} rows affected"
+            )
+        else:
+            with self.database.atomic():
+                conf["server_id"] = server_id
+                if backup_path is not None:
+                    Servers.update(backup_path=backup_path).where(
+                        Servers.server_id == server_id
+                    )
+                Backups.create(**conf)
             logger.debug("Creating new backup record.")
-        return backup.backup_id
 
     @staticmethod
-    def update_backup_config(backup_id, data):
-        if "excluded_dirs" in data:
-            dirs_to_exclude = ",".join(data["excluded_dirs"])
-            data["excluded_dirs"] = dirs_to_exclude
-        Backups.update(**data).where(Backups.backup_id == backup_id).execute()
-
-    @staticmethod
-    def get_excluded_backup_dirs(backup_id: int):
-        excluded_dirs = HelpersManagement.get_backup_config(backup_id)["excluded_dirs"]
+    def get_excluded_backup_dirs(server_id: int):
+        excluded_dirs = HelpersManagement.get_backup_config(server_id)["excluded_dirs"]
         if excluded_dirs is not None and excluded_dirs != "":
             dir_list = excluded_dirs.split(",")
         else:
             dir_list = []
         return dir_list
 
+    def add_excluded_backup_dir(self, server_id: int, dir_to_add: str):
+        dir_list = self.get_excluded_backup_dirs(server_id)
+        if dir_to_add not in dir_list:
+            dir_list.append(dir_to_add)
+            excluded_dirs = ",".join(dir_list)
+            self.set_backup_config(server_id=server_id, excluded_dirs=excluded_dirs)
+        else:
+            logger.debug(
+                f"Not adding {dir_to_add} to excluded directories - "
+                f"already in the excluded directory list for server ID {server_id}"
+            )
+
+    def del_excluded_backup_dir(self, server_id: int, dir_to_del: str):
+        dir_list = self.get_excluded_backup_dirs(server_id)
+        if dir_to_del in dir_list:
+            dir_list.remove(dir_to_del)
+            excluded_dirs = ",".join(dir_list)
+            self.set_backup_config(server_id=server_id, excluded_dirs=excluded_dirs)
+        else:
+            logger.debug(
+                f"Not removing {dir_to_del} from excluded directories - "
+                f"not in the excluded directory list for server ID {server_id}"
+            )
+
 
 # **********************************************************************************
 #                                   Webhooks Class

app/classes/models/servers.py

@@ -26,6 +26,7 @@ class Servers(BaseModel):
     created = DateTimeField(default=datetime.datetime.now)
     server_name = CharField(default="Server", index=True)
     path = CharField(default="")
+    backup_path = CharField(default="")
     executable = CharField(default="")
     log_path = CharField(default="")
     execution_command = CharField(default="")
@@ -64,6 +65,7 @@ class HelperServers:
         server_id: str,
         name: str,
         server_dir: str,
+        backup_path: str,
         server_command: str,
         server_file: str,
         server_log_file: str,
@@ -79,6 +81,7 @@ class HelperServers:
             name: The name of the server
             server_uuid: This is the UUID of the server
             server_dir: The directory where the server is located
+            backup_path: The path to the backup folder
             server_command: The command to start the server
             server_file: The name of the server file
             server_log_file: The path to the server log file
@@ -108,6 +111,7 @@ class HelperServers:
             server_port=server_port,
             server_ip=server_host,
             stop_command=server_stop,
+            backup_path=backup_path,
             type=server_type,
             created_by=created_by,
         ).server_id

app/classes/models/users.py

@@ -38,7 +38,7 @@ class Users(BaseModel):
     superuser = BooleanField(default=False)
     lang = CharField(default="en_EN")
     support_logs = CharField(default="")
-    valid_tokens_from = DateTimeField(default=Helpers.get_utc_now)
+    valid_tokens_from = DateTimeField(default=datetime.datetime.now)
     server_order = CharField(default="")
     preparing = BooleanField(default=False)
     hints = BooleanField(default=True)
@@ -119,6 +119,7 @@ class HelperUsers:
     @staticmethod
     def get_user_total():
         count = Users.select().where(Users.username != "system").count()
+        print(count)
         return count
 
     @staticmethod

app/classes/shared/authentication.py

@@ -1,6 +1,5 @@
 import logging
 import time
-from datetime import datetime
 from typing import Optional, Dict, Any, Tuple
 import jwt
 from jwt import PyJWTError
@@ -63,17 +62,7 @@ class Authentication:
         user = HelperUsers.get_user(user_id)
         # TODO: Have a cache or something so we don't constantly
         # have to query the database
-        valid_tokens_from_str = user.get("valid_tokens_from")
-        # It's possible this will be a string or a dt coming from the DB
-        # We need to account for that
-        try:
-            valid_tokens_from_dt = datetime.strptime(
-                valid_tokens_from_str, "%Y-%m-%d %H:%M:%S.%f%z"
-            )
-        except TypeError:
-            valid_tokens_from_dt = valid_tokens_from_str
-        # Convert the string to a datetime object
-        if int(valid_tokens_from_dt.timestamp()) < iat:
+        if int(user.get("valid_tokens_from").timestamp()) < iat:
             # Success!
             return key, data, user
         return None

app/classes/shared/file_helpers.py

@@ -4,10 +4,7 @@ import logging
 import pathlib
 import tempfile
 import zipfile
-import hashlib
-from typing import BinaryIO
-import mimetypes
-from zipfile import ZipFile, ZIP_DEFLATED, ZIP_STORED
+from zipfile import ZipFile, ZIP_DEFLATED
 import urllib.request
 import ssl
 import time
@@ -25,7 +22,6 @@ class FileHelpers:
 
     def __init__(self, helper):
         self.helper: Helpers = helper
-        self.mime_types = mimetypes.MimeTypes()
 
     @staticmethod
     def ssl_get_file(
@@ -146,32 +142,6 @@ class FileHelpers:
             logger.error(f"Path specified is not a file or does not exist. {path}")
             return e
 
-    def check_mime_types(self, file_path):
-        m_type, _value = self.mime_types.guess_type(file_path)
-        return m_type
-
-    @staticmethod
-    def calculate_file_hash(file_path: str) -> str:
-        """
-        Takes one parameter of file path.
-        It will generate a SHA256 hash for the path and return it.
-        """
-        sha256_hash = hashlib.sha256()
-        with open(file_path, "rb") as f:
-            for byte_block in iter(lambda: f.read(4096), b""):
-                sha256_hash.update(byte_block)
-        return sha256_hash.hexdigest()
-
-    @staticmethod
-    def calculate_buffer_hash(buffer: BinaryIO) -> str:
-        """
-        Takes one argument of a stream buffer. Will return a
-        sha256 hash of the buffer
-        """
-        sha256_hash = hashlib.sha256()
-        sha256_hash.update(buffer)
-        return sha256_hash.hexdigest()
-
     @staticmethod
     def copy_dir(src_path, dest_path, dirs_exist_ok=False):
         # pylint: disable=unexpected-keyword-arg
@@ -259,15 +229,8 @@ class FileHelpers:
 
         return True
 
-    def make_backup(
-        self,
-        path_to_destination,
-        path_to_zip,
-        excluded_dirs,
-        server_id,
-        backup_id,
-        comment="",
-        compressed=None,
+    def make_compressed_backup(
+        self, path_to_destination, path_to_zip, excluded_dirs, server_id, comment=""
     ):
         # create a ZipFile object
         path_to_destination += ".zip"
@@ -284,15 +247,73 @@ class FileHelpers:
             "backup_status",
             results,
         )
+        with ZipFile(path_to_destination, "w", ZIP_DEFLATED) as zip_file:
+            zip_file.comment = bytes(
+                comment, "utf-8"
+            )  # comments over 65535 bytes will be truncated
+            for root, dirs, files in os.walk(path_to_zip, topdown=True):
+                for l_dir in dirs:
+                    if str(os.path.join(root, l_dir)).replace("\\", "/") in ex_replace:
+                        dirs.remove(l_dir)
+                ziproot = path_to_zip
+                for file in files:
+                    if (
+                        str(os.path.join(root, file)).replace("\\", "/")
+                        not in ex_replace
+                        and file != "crafty.sqlite"
+                    ):
+                        try:
+                            logger.info(f"backing up: {os.path.join(root, file)}")
+                            if os.name == "nt":
+                                zip_file.write(
+                                    os.path.join(root, file),
+                                    os.path.join(root.replace(ziproot, ""), file),
+                                )
+                            else:
+                                zip_file.write(
+                                    os.path.join(root, file),
+                                    os.path.join(root.replace(ziproot, "/"), file),
+                                )
+
+                        except Exception as e:
+                            logger.warning(
+                                f"Error backing up: {os.path.join(root, file)}!"
+                                f" - Error was: {e}"
+                            )
+                    total_bytes += os.path.getsize(os.path.join(root, file))
+                    percent = round((total_bytes / dir_bytes) * 100, 2)
+                    results = {
+                        "percent": percent,
+                        "total_files": self.helper.human_readable_file_size(dir_bytes),
+                    }
                     WebSocketManager().broadcast_page_params(
-            "/panel/edit_backup",
+                        "/panel/server_detail",
                         {"id": str(server_id)},
                         "backup_status",
                         results,
                     )
-        # Set the compression mode based on the `compressed` parameter
-        compression_mode = ZIP_DEFLATED if compressed else ZIP_STORED
-        with ZipFile(path_to_destination, "w", compression_mode) as zip_file:
+
+        return True
+
+    def make_backup(
+        self, path_to_destination, path_to_zip, excluded_dirs, server_id, comment=""
+    ):
+        # create a ZipFile object
+        path_to_destination += ".zip"
+        ex_replace = [p.replace("\\", "/") for p in excluded_dirs]
+        total_bytes = 0
+        dir_bytes = Helpers.get_dir_size(path_to_zip)
+        results = {
+            "percent": 0,
+            "total_files": self.helper.human_readable_file_size(dir_bytes),
+        }
+        WebSocketManager().broadcast_page_params(
+            "/panel/server_detail",
+            {"id": str(server_id)},
+            "backup_status",
+            results,
+        )
+        with ZipFile(path_to_destination, "w") as zip_file:
             zip_file.comment = bytes(
                 comment, "utf-8"
             )  # comments over 65535 bytes will be truncated
@@ -343,7 +364,6 @@ class FileHelpers:
                     results = {
                         "percent": percent,
                         "total_files": self.helper.human_readable_file_size(dir_bytes),
-                        "backup_id": backup_id,
                     }
                     # send status results to page.
                     WebSocketManager().broadcast_page_params(
@@ -352,12 +372,6 @@ class FileHelpers:
                         "backup_status",
                         results,
                     )
-                    WebSocketManager().broadcast_page_params(
-                        "/panel/edit_backup",
-                        {"id": str(server_id)},
-                        "backup_status",
-                        results,
-                    )
         return True
 
     @staticmethod

app/classes/shared/helpers.py

@@ -19,7 +19,7 @@ import shutil
 import shlex
 import subprocess
 import itertools
-from datetime import datetime, timezone
+from datetime import datetime
 from socket import gethostname
 from contextlib import redirect_stderr, suppress
 import libgravatar
@@ -508,6 +508,7 @@ class Helpers:
             "max_log_lines": 700,
             "max_audit_entries": 300,
             "disabled_language_files": [],
+            "stream_size_GB": 1,
             "keywords": ["help", "chunk"],
             "allow_nsfw_profile_pictures": False,
             "enable_user_self_delete": False,
@@ -639,10 +640,6 @@ class Helpers:
         version = f"{major}.{minor}.{sub}"
         return str(version)
 
-    @staticmethod
-    def get_utc_now() -> datetime:
-        return datetime.fromtimestamp(time.time(), tz=timezone.utc)
-
     def encode_pass(self, password):
         return self.passhasher.hash(password)
 
@@ -1009,11 +1006,6 @@ class Helpers:
         except PermissionError as e:
             logger.critical(f"Check generated exception due to permssion error: {e}")
             return False
-        except FileNotFoundError as e:
-            logger.critical(
-                f"Check generated exception due to file does not exist error: {e}"
-            )
-            return False
 
     def create_self_signed_cert(self, cert_dir=None):
         if cert_dir is None:

app/classes/shared/main_controller.py

@@ -1,5 +1,4 @@
 import os
-import sys
 import pathlib
 from pathlib import Path
 from datetime import datetime
@@ -252,19 +251,6 @@ class Controller:
         # Copy crafty logs to archive dir
         full_log_name = os.path.join(crafty_path, "logs")
         FileHelpers.copy_dir(os.path.join(self.project_root, "logs"), full_log_name)
-        thread_dump = ""
-        for thread in threading.enumerate():
-            if sys.version_info >= (3, 8):
-                thread_dump += (
-                    f"Name: {thread.name}\tIdentifier:"
-                    f" {thread.ident}\tTID/PID: {thread.native_id}\n"
-                )
-            else:
-                print(f"Name: {thread.name}\tIdentifier: {thread.ident}")
-        with open(
-            os.path.join(temp_dir, "crafty_thread_dump.txt"), "a", encoding="utf-8"
-        ) as f:
-            f.write(thread_dump)
         self.support_scheduler.add_job(
             self.log_status,
             "interval",
@@ -566,6 +552,7 @@ class Controller:
             name=data["name"],
             server_uuid=server_fs_uuid,
             server_dir=new_server_path,
+            backup_path=backup_path,
             server_command=server_command,
             server_file=server_file,
             server_log_file=log_location,
@@ -575,7 +562,7 @@ class Controller:
             server_host=monitoring_host,
             server_type=monitoring_type,
         )
-        self.management.add_default_backup_config(
+        self.management.set_backup_config(
             new_server_id,
             backup_path,
         )
@@ -721,6 +708,7 @@ class Controller:
             server_name,
             server_id,
             new_server_dir,
+            backup_path,
             server_command,
             server_jar,
             server_log_file,
@@ -774,6 +762,7 @@ class Controller:
             server_name,
             server_id,
             new_server_dir,
+            backup_path,
             server_command,
             server_exe,
             server_log_file,
@@ -818,6 +807,7 @@ class Controller:
             server_name,
             server_id,
             new_server_dir,
+            backup_path,
             server_command,
             server_exe,
             server_log_file,
@@ -865,6 +855,7 @@ class Controller:
             server_name,
             server_id,
             new_server_dir,
+            backup_path,
             server_command,
             server_exe,
             server_log_file,
@@ -888,13 +879,16 @@ class Controller:
     # **********************************************************************************
 
     def rename_backup_dir(self, old_server_id, new_server_id, new_uuid):
+        server_data = self.servers.get_server_data_by_id(old_server_id)
         server_obj = self.servers.get_server_obj(new_server_id)
+        old_bu_path = server_data["backup_path"]
         ServerPermsController.backup_role_swap(old_server_id, new_server_id)
-        backup_path = os.path.join(self.helper.backup_path, old_server_id)
+        backup_path = old_bu_path
         backup_path = Path(backup_path)
         backup_path_components = list(backup_path.parts)
         backup_path_components[-1] = new_uuid
         new_bu_path = pathlib.PurePath(os.path.join(*backup_path_components))
+        server_obj.backup_path = new_bu_path
         default_backup_dir = os.path.join(self.helper.backup_path, new_uuid)
         try:
             os.rmdir(default_backup_dir)
@@ -908,6 +902,7 @@ class Controller:
         name: str,
         server_uuid: str,
         server_dir: str,
+        backup_path: str,
         server_command: str,
         server_file: str,
         server_log_file: str,
@@ -922,6 +917,7 @@ class Controller:
             name,
             server_uuid,
             server_dir,
+            backup_path,
             server_command,
             server_file,
             server_log_file,
@@ -986,14 +982,14 @@ class Controller:
                             f"Unable to delete server files for server with ID: "
                             f"{server_id} with error logged: {e}"
                         )
-                    backup_configs = HelpersManagement.get_backups_by_server(
-                        server_id, True
-                    )
-                    for config in backup_configs:
-                        if Helpers.check_path_exists(config.backup_location):
+                    if Helpers.check_path_exists(
+                        self.servers.get_server_data_by_id(server_id)["backup_path"]
+                    ):
                         FileHelpers.del_dirs(
                             Helpers.get_os_understandable_path(
-                                    config.backup_location
+                                self.servers.get_server_data_by_id(server_id)[
+                                    "backup_path"
+                                ]
                             )
                         )
 

app/classes/shared/server.py

@@ -207,6 +207,9 @@ class ServerInstance:
         self.server_scheduler.start()
         self.dir_scheduler.start()
         self.start_dir_calc_task()
+        self.backup_thread = threading.Thread(
+            target=self.backup_server, daemon=True, name=f"backup_{self.name}"
+        )
         self.is_backingup = False
         # Reset crash and update at initialization
         self.stats_helper.server_crash_reset()
@@ -937,7 +940,8 @@ class ServerInstance:
             WebSocketManager().broadcast_user(user, "send_start_reload", {})
 
     def restart_threaded_server(self, user_id):
-        if self.is_backingup:
+        bu_conf = HelpersManagement.get_backup_config(self.server_id)
+        if self.is_backingup and bu_conf["shutdown"]:
             logger.info(
                 "Restart command detected. Supressing - server has"
                 " backup shutdown enabled and server is currently backing up."
@@ -1107,16 +1111,12 @@ class ServerInstance:
             f.write("eula=true")
         self.run_threaded_server(user_id)
 
-    def server_backup_threader(self, backup_id, update=False):
-        # Check to see if we're already backing up
-        if self.check_backup_by_id(backup_id):
-            return False
-
+    def a_backup_server(self):
+        if self.settings["backup_path"] == "":
+            logger.critical("Backup path is None. Canceling Backup!")
+            return
         backup_thread = threading.Thread(
-            target=self.backup_server,
-            daemon=True,
-            name=f"backup_{backup_id}",
-            args=[backup_id, update],
+            target=self.backup_server, daemon=True, name=f"backup_{self.name}"
         )
         logger.info(
             f"Starting Backup Thread for server {self.settings['server_name']}."
@@ -1127,20 +1127,27 @@ class ServerInstance:
                 "Backup Thread - Local server path not defined. "
                 "Setting local server path variable."
             )
-
+        # checks if the backup thread is currently alive for this server
+        if not self.is_backingup:
             try:
                 backup_thread.start()
+                self.is_backingup = True
             except Exception as ex:
                 logger.error(f"Failed to start backup: {ex}")
                 return False
+        else:
+            logger.error(
+                f"Backup is already being processed for server "
+                f"{self.settings['server_name']}. Canceling backup request"
+            )
+            return False
         logger.info(f"Backup Thread started for server {self.settings['server_name']}.")
 
     @callback
-    def backup_server(self, backup_id, update):
+    def backup_server(self):
         was_server_running = None
         logger.info(f"Starting server {self.name} (ID {self.server_id}) backup")
         server_users = PermissionsServers.get_server_user_list(self.server_id)
-        # Alert the start of the backup to the authorized users.
         for user in server_users:
             WebSocketManager().broadcast_user(
                 user,
@@ -1150,40 +1157,30 @@ class ServerInstance:
                 ).format(self.name),
             )
         time.sleep(3)
-
-        # Get the backup config
-        conf = HelpersManagement.get_backup_config(backup_id)
-        # Adjust the location to include the backup ID for destination.
-        backup_location = os.path.join(conf["backup_location"], conf["backup_id"])
-
-        # Check if the backup location even exists.
-        if not backup_location:
-            Console.critical("No backup path found. Canceling")
-            return None
+        conf = HelpersManagement.get_backup_config(self.server_id)
         if conf["before"]:
+            if self.check_running():
                 logger.debug(
                     "Found running server and send command option. Sending command"
                 )
                 self.send_command(conf["before"])
-            # Pause to let command run
-            time.sleep(5)
 
         if conf["shutdown"]:
+            if conf["before"]:
+                # pause to let people read message.
+                time.sleep(5)
             logger.info(
                 "Found shutdown preference. Delaying"
                 + "backup start. Shutting down server."
             )
-            if not update:
-                was_server_running = False
             if self.check_running():
                 self.stop_server()
                 was_server_running = True
 
-        self.helper.ensure_dir_exists(backup_location)
-
+        self.helper.ensure_dir_exists(self.settings["backup_path"])
         try:
             backup_filename = (
-                f"{backup_location}/"
+                f"{self.settings['backup_path']}/"
                 f"{datetime.datetime.now().astimezone(self.tz).strftime('%Y-%m-%d_%H-%M-%S')}"  # pylint: disable=line-too-long
             )
             logger.info(
@@ -1191,36 +1188,42 @@ class ServerInstance:
                 f" (ID#{self.server_id}, path={self.server_path}) "
                 f"at '{backup_filename}'"
             )
-            excluded_dirs = HelpersManagement.get_excluded_backup_dirs(backup_id)
+            excluded_dirs = HelpersManagement.get_excluded_backup_dirs(self.server_id)
             server_dir = Helpers.get_os_understandable_path(self.settings["path"])
-
+            if conf["compress"]:
+                logger.debug(
+                    "Found compress backup to be true. Calling compressed archive"
+                )
+                self.file_helper.make_compressed_backup(
+                    Helpers.get_os_understandable_path(backup_filename),
+                    server_dir,
+                    excluded_dirs,
+                    self.server_id,
+                )
+            else:
+                logger.debug(
+                    "Found compress backup to be false. Calling NON-compressed archive"
+                )
                 self.file_helper.make_backup(
                     Helpers.get_os_understandable_path(backup_filename),
                     server_dir,
                     excluded_dirs,
                     self.server_id,
-                backup_id,
-                conf["backup_name"],
-                conf["compress"],
                 )
 
             while (
-                len(self.list_backups(conf)) > conf["max_backups"]
+                len(self.list_backups()) > conf["max_backups"]
                 and conf["max_backups"] > 0
             ):
-                backup_list = self.list_backups(conf)
+                backup_list = self.list_backups()
                 oldfile = backup_list[0]
-                oldfile_path = f"{backup_location}/{oldfile['path']}"
+                oldfile_path = f"{conf['backup_path']}/{oldfile['path']}"
                 logger.info(f"Removing old backup '{oldfile['path']}'")
                 os.remove(Helpers.get_os_understandable_path(oldfile_path))
 
+            self.is_backingup = False
             logger.info(f"Backup of server: {self.name} completed")
-            results = {
-                "percent": 100,
-                "total_files": 0,
-                "current_file": 0,
-                "backup_id": backup_id,
-            }
+            results = {"percent": 100, "total_files": 0, "current_file": 0}
             if len(WebSocketManager().clients) > 0:
                 WebSocketManager().broadcast_page_params(
                     "/panel/server_detail",
@@ -1245,6 +1248,7 @@ class ServerInstance:
                 )
                 self.run_threaded_server(HelperUsers.get_user_id_by_name("system"))
             time.sleep(3)
+            self.last_backup_failed = False
             if conf["after"]:
                 if self.check_running():
                     logger.debug(
@@ -1252,21 +1256,12 @@ class ServerInstance:
                     )
                     self.send_command(conf["after"])
             # pause to let people read message.
-            HelpersManagement.update_backup_config(
-                backup_id,
-                {"status": json.dumps({"status": "Standby", "message": ""})},
-            )
             time.sleep(5)
-        except Exception as e:
+        except:
             logger.exception(
                 f"Failed to create backup of server {self.name} (ID {self.server_id})"
             )
-            results = {
-                "percent": 100,
-                "total_files": 0,
-                "current_file": 0,
-                "backup_id": backup_id,
-            }
+            results = {"percent": 100, "total_files": 0, "current_file": 0}
             if len(WebSocketManager().clients) > 0:
                 WebSocketManager().broadcast_page_params(
                     "/panel/server_detail",
@@ -1274,51 +1269,56 @@ class ServerInstance:
                     "backup_status",
                     results,
                 )
+            self.is_backingup = False
             if was_server_running:
                 logger.info(
                     "Backup complete. User had shutdown preference. Starting server."
                 )
                 self.run_threaded_server(HelperUsers.get_user_id_by_name("system"))
-            HelpersManagement.update_backup_config(
-                backup_id,
-                {"status": json.dumps({"status": "Failed", "message": f"{e}"})},
+            self.last_backup_failed = True
+
+    def backup_status(self, source_path, dest_path):
+        results = Helpers.calc_percent(source_path, dest_path)
+        self.backup_stats = results
+        if len(WebSocketManager().clients) > 0:
+            WebSocketManager().broadcast_page_params(
+                "/panel/server_detail",
+                {"id": str(self.server_id)},
+                "backup_status",
+                results,
             )
-        self.set_backup_status()
 
     def last_backup_status(self):
         return self.last_backup_failed
 
-    def set_backup_status(self):
-        backups = HelpersManagement.get_backups_by_server(self.server_id, True)
-        alert = False
-        for backup in backups:
-            if json.loads(backup.status)["status"] == "Failed":
-                alert = True
-        self.last_backup_failed = alert
+    def send_backup_status(self):
+        try:
+            return self.backup_stats
+        except:
+            return {"percent": 0, "total_files": 0}
 
-    def list_backups(self, backup_config: dict) -> list:
-        if not backup_config:
+    def list_backups(self):
+        if not self.settings["backup_path"]:
             logger.info(
                 f"Error putting backup file list for server with ID: {self.server_id}"
             )
             return []
-        backup_location = os.path.join(
-            backup_config["backup_location"], backup_config["backup_id"]
-        )
         if not Helpers.check_path_exists(
-            Helpers.get_os_understandable_path(backup_location)
+            Helpers.get_os_understandable_path(self.settings["backup_path"])
         ):
             return []
         files = Helpers.get_human_readable_files_sizes(
             Helpers.list_dir_by_date(
-                Helpers.get_os_understandable_path(backup_location)
+                Helpers.get_os_understandable_path(self.settings["backup_path"])
             )
         )
         return [
             {
                 "path": os.path.relpath(
                     f["path"],
-                    start=Helpers.get_os_understandable_path(backup_location),
+                    start=Helpers.get_os_understandable_path(
+                        self.settings["backup_path"]
+                    ),
                 ),
                 "size": f["size"],
             }
@@ -1330,7 +1330,7 @@ class ServerInstance:
     def jar_update(self):
         self.stats_helper.set_update(True)
         update_thread = threading.Thread(
-            target=self.threaded_jar_update, daemon=True, name=f"exe_update_{self.name}"
+            target=self.a_jar_update, daemon=True, name=f"exe_update_{self.name}"
         )
         update_thread.start()
 
@@ -1371,13 +1371,10 @@ class ServerInstance:
     def check_update(self):
         return self.stats_helper.get_server_stats()["updating"]
 
-    def threaded_jar_update(self):
+    def a_jar_update(self):
         server_users = PermissionsServers.get_server_user_list(self.server_id)
         was_started = "-1"
-        # Get default backup configuration
-        backup_config = HelpersManagement.get_default_server_backup(self.server_id)
-        # start threaded backup
-        self.server_backup_threader(backup_config["backup_id"], True)
+        self.a_backup_server()
         # checks if server is running. Calls shutdown if it is running.
         if self.check_running():
             was_started = True
@@ -1406,22 +1403,47 @@ class ServerInstance:
                     "string": message,
                 },
             )
+        backup_dir = os.path.join(
+            Helpers.get_os_understandable_path(self.settings["path"]),
+            "crafty_executable_backups",
+        )
+        # checks if backup directory already exists
+        if os.path.isdir(backup_dir):
+            backup_executable = os.path.join(backup_dir, self.settings["executable"])
+        else:
+            logger.info(
+                f"Executable backup directory not found for Server: {self.name}."
+                f" Creating one."
+            )
+            os.mkdir(backup_dir)
+            backup_executable = os.path.join(backup_dir, self.settings["executable"])
+
+        if len(os.listdir(backup_dir)) > 0:
+            # removes old backup
+            logger.info(f"Old backups found for server: {self.name}. Removing...")
+            for item in os.listdir(backup_dir):
+                os.remove(os.path.join(backup_dir, item))
+            logger.info(f"Old backups removed for server: {self.name}.")
+        else:
+            logger.info(f"No old backups found for server: {self.name}")
+
         current_executable = os.path.join(
             Helpers.get_os_understandable_path(self.settings["path"]),
             self.settings["executable"],
         )
-        backing_up = True
+
+        try:
+            # copies to backup dir
+            FileHelpers.copy_file(current_executable, backup_executable)
+        except FileNotFoundError:
+            logger.error("Could not create backup of jarfile. File not found.")
+
         # wait for backup
-        while backing_up:
-            # Check to see if we're already backing up
-            backing_up = self.check_backup_by_id(backup_config["backup_id"])
-            time.sleep(2)
+        while self.is_backingup:
+            time.sleep(10)
 
         # check if backup was successful
-        backup_status = json.loads(
-            HelpersManagement.get_backup_config(backup_config["backup_id"])["status"]
-        )["status"]
-        if backup_status == "Failed":
+        if self.last_backup_failed:
             for user in server_users:
                 WebSocketManager().broadcast_user(
                     user,
@@ -1506,6 +1528,12 @@ class ServerInstance:
                 WebSocketManager().broadcast_user_page(
                     user, "/panel/dashboard", "send_start_reload", {}
                 )
+                WebSocketManager().broadcast_user(
+                    user,
+                    "notification",
+                    "Executable update finished for " + self.name,
+                )
+
             self.management_helper.add_to_audit_log_raw(
                 "Alert",
                 "-1",
@@ -1628,14 +1656,6 @@ class ServerInstance:
                 except:
                     Console.critical("Can't broadcast server status to websocket")
 
-    def check_backup_by_id(self, backup_id: str) -> bool:
-        # Check to see if we're already backing up
-        for thread in threading.enumerate():
-            if thread.getName() == f"backup_{backup_id}":
-                Console.debug(f"Backup with id {backup_id} already running!")
-                return True
-        return False
-
     def get_servers_stats(self):
         server_stats = {}
 

app/classes/shared/tasks.py

@@ -140,7 +140,7 @@ class TasksManager:
                         )
 
                 elif command == "backup_server":
-                    svr.server_backup_threader(cmd["action_id"])
+                    svr.a_backup_server()
 
                 elif command == "update_executable":
                     svr.jar_update()
@@ -240,7 +240,6 @@ class TasksManager:
                                         "system"
                                     ),
                                     "command": schedule.command,
-                                    "action_id": schedule.action_id,
                                 }
                             ],
                         )
@@ -269,7 +268,6 @@ class TasksManager:
                                         "system"
                                     ),
                                     "command": schedule.command,
-                                    "action_id": schedule.action_id,
                                 }
                             ],
                         )
@@ -286,7 +284,6 @@ class TasksManager:
                                         "system"
                                     ),
                                     "command": schedule.command,
-                                    "action_id": schedule.action_id,
                                 }
                             ],
                         )
@@ -306,7 +303,6 @@ class TasksManager:
                                         "system"
                                     ),
                                     "command": schedule.command,
-                                    "action_id": schedule.action_id,
                                 }
                             ],
                         )
@@ -341,7 +337,6 @@ class TasksManager:
             job_data["cron_string"],
             job_data["parent"],
             job_data["delay"],
-            job_data["action_id"],
         )
 
         # Checks to make sure some doofus didn't actually make the newly
@@ -372,7 +367,6 @@ class TasksManager:
                                     "system"
                                 ),
                                 "command": job_data["command"],
-                                "action_id": job_data["action_id"],
                             }
                         ],
                     )
@@ -399,7 +393,6 @@ class TasksManager:
                                     "system"
                                 ),
                                 "command": job_data["command"],
-                                "action_id": job_data["action_id"],
                             }
                         ],
                     )
@@ -416,7 +409,6 @@ class TasksManager:
                                     "system"
                                 ),
                                 "command": job_data["command"],
-                                "action_id": job_data["action_id"],
                             }
                         ],
                     )
@@ -436,7 +428,6 @@ class TasksManager:
                                     "system"
                                 ),
                                 "command": job_data["command"],
-                                "action_id": job_data["action_id"],
                             }
                         ],
                     )
@@ -529,7 +520,6 @@ class TasksManager:
                                     "system"
                                 ),
                                 "command": job_data["command"],
-                                "action_id": job_data["action_id"],
                             }
                         ],
                     )
@@ -553,7 +543,6 @@ class TasksManager:
                                     "system"
                                 ),
                                 "command": job_data["command"],
-                                "action_id": job_data["action_id"],
                             }
                         ],
                     )
@@ -570,7 +559,6 @@ class TasksManager:
                                     "system"
                                 ),
                                 "command": job_data["command"],
-                                "action_id": job_data["action_id"],
                             }
                         ],
                     )
@@ -590,7 +578,6 @@ class TasksManager:
                                     "system"
                                 ),
                                 "command": job_data["command"],
-                                "action_id": job_data["action_id"],
                             }
                         ],
                     )
@@ -666,7 +653,6 @@ class TasksManager:
                                             "system"
                                         ),
                                         "command": schedule.command,
-                                        "action_id": schedule.action_id,
                                     }
                                 ],
                             )
@@ -799,18 +785,6 @@ class TasksManager:
         self.helper.ensure_dir_exists(
             os.path.join(self.controller.project_root, "import", "upload")
         )
-        self.helper.ensure_dir_exists(
-            os.path.join(self.controller.project_root, "temp")
-        )
-        for file in os.listdir(os.path.join(self.controller.project_root, "temp")):
-            if self.helper.is_file_older_than_x_days(
-                os.path.join(self.controller.project_root, "temp", file)
-            ):
-                try:
-                    os.remove(os.path.join(file))
-                except FileNotFoundError:
-                    logger.debug("Could not clear out file from temp directory")
-
         for file in os.listdir(
             os.path.join(self.controller.project_root, "import", "upload")
         ):
@@ -819,7 +793,7 @@ class TasksManager:
             ):
                 try:
                     os.remove(os.path.join(file))
-                except FileNotFoundError:
+                except:
                     logger.debug("Could not clear out file from import directory")
 
     def log_watcher(self):

app/classes/shared/translation.py

@@ -20,7 +20,7 @@ class Translation:
     def get_language_file(self, language: str):
         return os.path.join(self.translations_path, str(language) + ".json")
 
-    def translate(self, page, word, language, error=True):
+    def translate(self, page, word, language):
         fallback_language = "en_EN"
 
         translated_word = self.translate_inner(page, word, language)
@@ -37,9 +37,7 @@ class Translation:
             if hasattr(translated_word, "__iter__"):
                 # Multiline strings
                 return "\n".join(translated_word)
-        if error:
         return "Error while getting translation"
-        return word
 
     def translate_inner(self, page, word, language) -> t.Union[t.Any, None]:
         language_file = self.get_language_file(language)

app/classes/web/base_handler.py

@@ -6,7 +6,6 @@ import nh3
 import tornado.web
 
 from app.classes.models.crafty_permissions import EnumPermissionsCrafty
-from app.classes.models.server_permissions import EnumPermissionsServer
 from app.classes.models.users import ApiKeys
 from app.classes.shared.helpers import Helpers
 from app.classes.shared.file_helpers import FileHelpers
@@ -196,8 +195,6 @@ class BaseHandler(tornado.web.RequestHandler):
             if api_key is not None:
                 superuser = superuser and api_key.full_access
                 server_permissions_api_mask = api_key.server_permissions
-                if api_key.full_access:
-                    server_permissions_api_mask = "1" * len(EnumPermissionsServer)
             exec_user_role = set()
             if superuser:
                 authorized_servers = self.controller.servers.get_all_defined_servers()

app/classes/web/panel_handler.py

@@ -41,8 +41,6 @@ SUBPAGE_PERMS = {
     "webhooks": EnumPermissionsServer.CONFIG,
 }
 
-SCHEDULE_AUTH_ERROR_URL = "/panel/error?error=Unauthorized access To Schedules"
-
 
 class PanelHandler(BaseHandler):
     def get_user_roles(self) -> t.Dict[str, list]:
@@ -679,18 +677,36 @@ class PanelHandler(BaseHandler):
                 page_data["java_versions"] = page_java
             if subpage == "backup":
                 server_info = self.controller.servers.get_server_data_by_id(server_id)
-
-                page_data["backups"] = self.controller.management.get_backups_by_server(
-                    server_id, model=True
+                page_data["backup_config"] = (
+                    self.controller.management.get_backup_config(server_id)
+                )
+                exclusions = []
+                page_data["exclusions"] = (
+                    self.controller.management.get_excluded_backup_dirs(server_id)
                 )
                 page_data["backing_up"] = (
                     self.controller.servers.get_server_instance_by_id(
                         server_id
                     ).is_backingup
                 )
+                page_data["backup_stats"] = (
+                    self.controller.servers.get_server_instance_by_id(
+                        server_id
+                    ).send_backup_status()
+                )
                 # makes it so relative path is the only thing shown
-
+                for file in page_data["exclusions"]:
+                    if Helpers.is_os_windows():
+                        exclusions.append(file.replace(server_info["path"] + "\\", ""))
+                    else:
+                        exclusions.append(file.replace(server_info["path"] + "/", ""))
+                page_data["exclusions"] = exclusions
                 self.controller.servers.refresh_server_settings(server_id)
+                try:
+                    page_data["backup_list"] = server.list_backups()
+                except:
+                    page_data["backup_list"] = []
+                page_data["backup_path"] = Helpers.wtol_path(server_info["backup_path"])
 
             if subpage == "metrics":
                 try:
@@ -764,23 +780,20 @@ class PanelHandler(BaseHandler):
 
         elif page == "download_backup":
             file = self.get_argument("file", "")
-            backup_id = self.get_argument("backup_id", "")
 
             server_id = self.check_server_id()
             if server_id is None:
                 return
-            backup_config = self.controller.management.get_backup_config(backup_id)
+
             server_info = self.controller.servers.get_server_data_by_id(server_id)
-            backup_location = os.path.join(backup_config["backup_location"], backup_id)
             backup_file = os.path.abspath(
                 os.path.join(
-                    Helpers.get_os_understandable_path(backup_location),
-                    file,
+                    Helpers.get_os_understandable_path(server_info["backup_path"]), file
                 )
             )
             if not self.helper.is_subdir(
                 backup_file,
-                Helpers.get_os_understandable_path(backup_location),
+                Helpers.get_os_understandable_path(server_info["backup_path"]),
             ) or not os.path.isfile(backup_file):
                 self.redirect("/panel/error?error=Invalid path detected")
                 return
@@ -879,8 +892,6 @@ class PanelHandler(BaseHandler):
                         os.path.join(self.helper.root_dir, "app", "translations")
                     )
                 ):
-                    if file == "humanized_index.json":
-                        continue
                     if file.endswith(".json"):
                         if file.split(".")[0] not in self.helper.get_setting(
                             "disabled_language_files"
@@ -1119,9 +1130,6 @@ class PanelHandler(BaseHandler):
             page_data["server_data"] = self.controller.servers.get_server_data_by_id(
                 server_id
             )
-            page_data["backups"] = self.controller.management.get_backups_by_server(
-                server_id, True
-            )
             page_data["server_stats"] = self.controller.servers.get_server_stats_by_id(
                 server_id
             )
@@ -1142,7 +1150,6 @@ class PanelHandler(BaseHandler):
             page_data["schedule"]["delay"] = 0
             page_data["schedule"]["time"] = ""
             page_data["schedule"]["interval"] = 1
-            page_data["schedule"]["action_id"] = ""
             # we don't need to check difficulty here.
             # We'll just default to basic for new schedules
             page_data["schedule"]["difficulty"] = "basic"
@@ -1151,7 +1158,7 @@ class PanelHandler(BaseHandler):
 
             if not EnumPermissionsServer.SCHEDULE in page_data["user_permissions"]:
                 if not superuser:
-                    self.redirect(SCHEDULE_AUTH_ERROR_URL)
+                    self.redirect("/panel/error?error=Unauthorized access To Schedules")
                     return
 
             template = "panel/server_schedule_edit.html"
@@ -1188,9 +1195,6 @@ class PanelHandler(BaseHandler):
                     exec_user["user_id"], server_id
                 )
             )
-            page_data["backups"] = self.controller.management.get_backups_by_server(
-                server_id, True
-            )
             page_data["server_data"] = self.controller.servers.get_server_data_by_id(
                 server_id
             )
@@ -1205,7 +1209,6 @@ class PanelHandler(BaseHandler):
             page_data["schedule"]["server_id"] = server_id
             page_data["schedule"]["schedule_id"] = schedule.schedule_id
             page_data["schedule"]["action"] = schedule.action
-            page_data["schedule"]["action_id"] = schedule.action_id
             if schedule.name:
                 page_data["schedule"]["name"] = schedule.name
             else:
@@ -1249,141 +1252,11 @@ class PanelHandler(BaseHandler):
 
             if not EnumPermissionsServer.SCHEDULE in page_data["user_permissions"]:
                 if not superuser:
-                    self.redirect(SCHEDULE_AUTH_ERROR_URL)
+                    self.redirect("/panel/error?error=Unauthorized access To Schedules")
                     return
 
             template = "panel/server_schedule_edit.html"
 
-        elif page == "edit_backup":
-            server_id = self.get_argument("id", None)
-            backup_id = self.get_argument("backup_id", None)
-            page_data["active_link"] = "backups"
-            page_data["permissions"] = {
-                "Commands": EnumPermissionsServer.COMMANDS,
-                "Terminal": EnumPermissionsServer.TERMINAL,
-                "Logs": EnumPermissionsServer.LOGS,
-                "Schedule": EnumPermissionsServer.SCHEDULE,
-                "Backup": EnumPermissionsServer.BACKUP,
-                "Files": EnumPermissionsServer.FILES,
-                "Config": EnumPermissionsServer.CONFIG,
-                "Players": EnumPermissionsServer.PLAYERS,
-            }
-            if not self.failed_server:
-                server_obj = self.controller.servers.get_server_instance_by_id(
-                    server_id
-                )
-                page_data["backup_failed"] = server_obj.last_backup_status()
-            page_data["user_permissions"] = (
-                self.controller.server_perms.get_user_id_permissions_list(
-                    exec_user["user_id"], server_id
-                )
-            )
-            server_info = self.controller.servers.get_server_data_by_id(server_id)
-            page_data["backup_config"] = self.controller.management.get_backup_config(
-                backup_id
-            )
-            page_data["backups"] = self.controller.management.get_backups_by_server(
-                server_id, model=True
-            )
-            exclusions = []
-            page_data["backing_up"] = self.controller.servers.get_server_instance_by_id(
-                server_id
-            ).is_backingup
-            self.controller.servers.refresh_server_settings(server_id)
-            try:
-                page_data["backup_list"] = server.list_backups(
-                    page_data["backup_config"]
-                )
-            except:
-                page_data["backup_list"] = []
-            page_data["backup_path"] = Helpers.wtol_path(
-                page_data["backup_config"]["backup_location"]
-            )
-            page_data["server_data"] = self.controller.servers.get_server_data_by_id(
-                server_id
-            )
-            page_data["server_stats"] = self.controller.servers.get_server_stats_by_id(
-                server_id
-            )
-            page_data["server_stats"]["server_type"] = (
-                self.controller.servers.get_server_type_by_id(server_id)
-            )
-            page_data["exclusions"] = (
-                self.controller.management.get_excluded_backup_dirs(backup_id)
-            )
-            # Make exclusion paths relative for page
-            for file in page_data["exclusions"]:
-                if Helpers.is_os_windows():
-                    exclusions.append(file.replace(server_info["path"] + "\\", ""))
-                else:
-                    exclusions.append(file.replace(server_info["path"] + "/", ""))
-            page_data["exclusions"] = exclusions
-
-            if EnumPermissionsServer.BACKUP not in page_data["user_permissions"]:
-                if not superuser:
-                    self.redirect(SCHEDULE_AUTH_ERROR_URL)
-                    return
-            template = "panel/server_backup_edit.html"
-
-        elif page == "add_backup":
-            server_id = self.get_argument("id", None)
-            backup_id = self.get_argument("backup_id", None)
-            page_data["active_link"] = "backups"
-            page_data["permissions"] = {
-                "Commands": EnumPermissionsServer.COMMANDS,
-                "Terminal": EnumPermissionsServer.TERMINAL,
-                "Logs": EnumPermissionsServer.LOGS,
-                "Schedule": EnumPermissionsServer.SCHEDULE,
-                "Backup": EnumPermissionsServer.BACKUP,
-                "Files": EnumPermissionsServer.FILES,
-                "Config": EnumPermissionsServer.CONFIG,
-                "Players": EnumPermissionsServer.PLAYERS,
-            }
-            if not self.failed_server:
-                server_obj = self.controller.servers.get_server_instance_by_id(
-                    server_id
-                )
-                page_data["backup_failed"] = server_obj.last_backup_status()
-            page_data["user_permissions"] = (
-                self.controller.server_perms.get_user_id_permissions_list(
-                    exec_user["user_id"], server_id
-                )
-            )
-            server_info = self.controller.servers.get_server_data_by_id(server_id)
-            page_data["backup_config"] = {
-                "excluded_dirs": [],
-                "max_backups": 0,
-                "server_id": server_id,
-                "backup_location": os.path.join(self.helper.backup_path, server_id),
-                "compress": False,
-                "shutdown": False,
-                "before": "",
-                "after": "",
-            }
-            page_data["backing_up"] = False
-            self.controller.servers.refresh_server_settings(server_id)
-
-            page_data["backup_list"] = []
-            page_data["backup_path"] = Helpers.wtol_path(
-                page_data["backup_config"]["backup_location"]
-            )
-            page_data["server_data"] = self.controller.servers.get_server_data_by_id(
-                server_id
-            )
-            page_data["server_stats"] = self.controller.servers.get_server_stats_by_id(
-                server_id
-            )
-            page_data["server_stats"]["server_type"] = (
-                self.controller.servers.get_server_type_by_id(server_id)
-            )
-            page_data["exclusions"] = []
-
-            if EnumPermissionsServer.BACKUP not in page_data["user_permissions"]:
-                if not superuser:
-                    self.redirect(SCHEDULE_AUTH_ERROR_URL)
-                    return
-            template = "panel/server_backup_edit.html"
-
         elif page == "edit_user":
             user_id = self.get_argument("id", None)
             role_servers = self.controller.servers.get_authorized_servers(user_id)
@@ -1434,8 +1307,6 @@ class PanelHandler(BaseHandler):
             for file in sorted(
                 os.listdir(os.path.join(self.helper.root_dir, "app", "translations"))
             ):
-                if file == "humanized_index.json":
-                    continue
                 if file.endswith(".json"):
                     if file.split(".")[0] not in self.helper.get_setting(
                         "disabled_language_files"

app/classes/web/routes/api/api_handlers.py

@@ -38,14 +38,12 @@ from app.classes.web.routes.api.servers.server.backups.index import (
 )
 from app.classes.web.routes.api.servers.server.backups.backup.index import (
     ApiServersServerBackupsBackupIndexHandler,
-    ApiServersServerBackupsBackupFilesIndexHandler,
 )
 from app.classes.web.routes.api.servers.server.files import (
     ApiServersServerFilesIndexHandler,
     ApiServersServerFilesCreateHandler,
     ApiServersServerFilesZipHandler,
 )
-from app.classes.web.routes.api.crafty.upload.index import ApiFilesUploadHandler
 from app.classes.web.routes.api.servers.server.tasks.task.children import (
     ApiServersServerTasksTaskChildrenHandler,
 )
@@ -220,13 +218,13 @@ def api_handlers(handler_args):
             handler_args,
         ),
         (
-            r"/api/v2/servers/([a-z0-9-]+)/backups/backup/([a-z0-9-]+)/?",
+            r"/api/v2/servers/([a-z0-9-]+)/backups/backup/?",
             ApiServersServerBackupsBackupIndexHandler,
             handler_args,
         ),
         (
-            r"/api/v2/servers/([a-z0-9-]+)/backups/backup/([a-z0-9-]+)/files/?",
-            ApiServersServerBackupsBackupFilesIndexHandler,
+            r"/api/v2/servers/([a-z0-9-]+)/files/?",
+            ApiServersServerFilesIndexHandler,
             handler_args,
         ),
         (
@@ -239,26 +237,6 @@ def api_handlers(handler_args):
             ApiServersServerFilesZipHandler,
             handler_args,
         ),
-        (
-            r"/api/v2/crafty/admin/upload/?",
-            ApiFilesUploadHandler,
-            handler_args,
-        ),
-        (
-            r"/api/v2/servers/import/upload/?",
-            ApiFilesUploadHandler,
-            handler_args,
-        ),
-        (
-            r"/api/v2/servers/([a-z0-9-]+)/files/upload/?",
-            ApiFilesUploadHandler,
-            handler_args,
-        ),
-        (
-            r"/api/v2/servers/([a-z0-9-]+)/files(?:/([a-zA-Z0-9-]+))?/?",
-            ApiServersServerFilesIndexHandler,
-            handler_args,
-        ),
         (
             r"/api/v2/servers/([a-z0-9-]+)/tasks/?",
             ApiServersServerTasksIndexHandler,
@@ -295,8 +273,7 @@ def api_handlers(handler_args):
             handler_args,
         ),
         (
-            # optional third argument when we need a action ID
-            r"/api/v2/servers/([a-z0-9-]+)/action/([a-z_]+)(?:/([a-z0-9-]+))?/?",
+            r"/api/v2/servers/([a-z0-9-]+)/action/([a-z_]+)/?",
             ApiServersServerActionHandler,
             handler_args,
         ),

app/classes/web/routes/api/auth/invalidate_tokens.py

@@ -1,6 +1,6 @@
+import datetime
 import logging
 from app.classes.web.base_api_handler import BaseApiHandler
-from app.classes.shared.helpers import Helpers
 
 logger = logging.getLogger(__name__)
 
@@ -13,7 +13,7 @@ class ApiAuthInvalidateTokensHandler(BaseApiHandler):
 
         logger.debug(f"Invalidate tokens for user {auth_data[4]['user_id']}")
         self.controller.users.raw_update_user(
-            auth_data[4]["user_id"], {"valid_tokens_from": Helpers.get_utc_now()}
+            auth_data[4]["user_id"], {"valid_tokens_from": datetime.datetime.now()}
         )
 
         self.finish_json(200, {"status": "ok"})

app/classes/web/routes/api/crafty/upload/index.py

@@ -1,308 +0,0 @@
-import os
-import logging
-import shutil
-from app.classes.models.server_permissions import EnumPermissionsServer
-from app.classes.shared.helpers import Helpers
-from app.classes.web.base_api_handler import BaseApiHandler
-
-logger = logging.getLogger(__name__)
-IMAGE_MIME_TYPES = [
-    "image/bmp",
-    "image/cis-cod",
-    "image/gif",
-    "image/ief",
-    "image/jpeg",
-    "image/pipeg",
-    "image/svg+xml",
-    "image/tiff",
-    "image/x-cmu-raster",
-    "image/x-cmx",
-    "image/x-icon",
-    "image/x-portable-anymap",
-    "image/x-portable-bitmap",
-    "image/x-portable-graymap",
-    "image/x-portable-pixmap",
-    "image/x-rgb",
-    "image/x-xbitmap",
-    "image/x-xpixmap",
-    "image/x-xwindowdump",
-    "image/png",
-    "image/webp",
-]
-
-ARCHIVE_MIME_TYPES = ["application/zip"]
-
-
-class ApiFilesUploadHandler(BaseApiHandler):
-    async def post(self, server_id=None):
-        auth_data = self.authenticate_user()
-        if not auth_data:
-            return
-
-        upload_type = self.request.headers.get("type")
-        accepted_types = []
-
-        if server_id:
-            # Check to make sure user is authorized for the server
-            if server_id not in [str(x["server_id"]) for x in auth_data[0]]:
-                # if the user doesn't have access to the server, return an error
-                return self.finish_json(
-                    400, {"status": "error", "error": "NOT_AUTHORIZED"}
-                )
-            mask = self.controller.server_perms.get_lowest_api_perm_mask(
-                self.controller.server_perms.get_user_permissions_mask(
-                    auth_data[4]["user_id"], server_id
-                ),
-                auth_data[5],
-            )
-            # Make sure user has file access for the server
-            server_permissions = self.controller.server_perms.get_permissions(mask)
-            if EnumPermissionsServer.FILES not in server_permissions:
-                # if the user doesn't have Files permission, return an error
-                return self.finish_json(
-                    400, {"status": "error", "error": "NOT_AUTHORIZED"}
-                )
-
-            u_type = "server_upload"
-        # Make sure user is a super user if they're changing panel settings
-        elif auth_data[4]["superuser"] and upload_type == "background":
-            u_type = "admin_config"
-            self.upload_dir = os.path.join(
-                self.controller.project_root,
-                "app/frontend/static/assets/images/auth/custom",
-            )
-            accepted_types = IMAGE_MIME_TYPES
-        elif upload_type == "import":
-            # Check that user can make servers
-            if (
-                not self.controller.crafty_perms.can_create_server(
-                    auth_data[4]["user_id"]
-                )
-                and not auth_data[4]["superuser"]
-            ):
-                return self.finish_json(
-                    400,
-                    {
-                        "status": "error",
-                        "error": "NOT_AUTHORIZED",
-                        "data": {"message": ""},
-                    },
-                )
-            # Set directory to upload import dir
-            self.upload_dir = os.path.join(
-                self.controller.project_root, "import", "upload"
-            )
-            u_type = "server_import"
-            accepted_types = ARCHIVE_MIME_TYPES
-        else:
-            return self.finish_json(
-                400,
-                {
-                    "status": "error",
-                    "error": "NOT_AUTHORIZED",
-                    "data": {"message": ""},
-                },
-            )
-        # Get the headers from the request
-        self.chunk_hash = self.request.headers.get("chunkHash", 0)
-        self.file_id = self.request.headers.get("fileId")
-        self.chunked = self.request.headers.get("chunked", False)
-        self.filename = self.request.headers.get("fileName", None)
-        try:
-            file_size = int(self.request.headers.get("fileSize", None))
-            total_chunks = int(self.request.headers.get("totalChunks", 0))
-        except TypeError:
-            return self.finish_json(
-                400, {"status": "error", "error": "TYPE ERROR", "data": {}}
-            )
-        self.chunk_index = self.request.headers.get("chunkId")
-        if u_type == "server_upload":
-            self.upload_dir = self.request.headers.get("location", None)
-        self.temp_dir = os.path.join(self.controller.project_root, "temp", self.file_id)
-
-        if u_type == "server_upload":
-            # If this is an upload from a server the path will be what
-            # Is requested
-            full_path = os.path.join(self.upload_dir, self.filename)
-
-            # Check to make sure the requested path is inside the server's directory
-            if not self.helper.is_subdir(
-                full_path,
-                Helpers.get_os_understandable_path(
-                    self.controller.servers.get_server_data_by_id(server_id)["path"]
-                ),
-            ):
-                return self.finish_json(
-                    400,
-                    {
-                        "status": "error",
-                        "error": "NOT AUTHORIZED",
-                        "data": {"message": "Traversal detected"},
-                    },
-                )
-        # Check to make sure the file type we're being sent is what we're expecting
-        if (
-            self.file_helper.check_mime_types(self.filename) not in accepted_types
-            and u_type != "server_upload"
-        ):
-            return self.finish_json(
-                422,
-                {
-                    "status": "error",
-                    "error": "INVALID FILE TYPE",
-                    "data": {
-                        "message": f"Invalid File Type only accepts {accepted_types}"
-                    },
-                },
-            )
-        _total, _used, free = shutil.disk_usage(self.upload_dir)
-
-        # Check to see if we have enough space
-        if free <= file_size:
-            return self.finish_json(
-                507,
-                {
-                    "status": "error",
-                    "error": "NO STORAGE SPACE",
-                    "data": {"message": "Out Of Space!"},
-                },
-            )
-
-        # If this has no chunk index we know it's the inital request
-        if self.chunked and not self.chunk_index:
-            return self.finish_json(
-                200, {"status": "ok", "data": {"file-id": self.file_id}}
-            )
-        # Create the upload and temp directories if they don't exist
-        os.makedirs(self.upload_dir, exist_ok=True)
-
-        # Check for chunked header. We will handle this request differently
-        # if it doesn't exist
-        if not self.chunked:
-            # Write the file directly to the upload dir
-            with open(os.path.join(self.upload_dir, self.filename), "wb") as file:
-                chunk = self.request.body
-                if chunk:
-                    file.write(chunk)
-            # We'll check the file hash against the sent hash once the file is
-            # written. We cannot check this buffer.
-            calculated_hash = self.file_helper.calculate_file_hash(
-                os.path.join(self.upload_dir, self.filename)
-            )
-            logger.info(
-                f"File upload completed. Filename: {self.filename} Type: {u_type}"
-            )
-            return self.finish_json(
-                200,
-                {
-                    "status": "completed",
-                    "data": {"message": "File uploaded successfully"},
-                },
-            )
-        # Since this is a chunked upload we'll create the temp dir for parts.
-        os.makedirs(self.temp_dir, exist_ok=True)
-
-        # Read headers and query parameters
-        content_length = int(self.request.headers.get("Content-Length"))
-        if content_length <= 0:
-            logger.error(
-                f"File upload failed. Filename: {self.filename}"
-                f"Type: {u_type} Error: INVALID CONTENT LENGTH"
-            )
-            return self.finish_json(
-                400,
-                {
-                    "status": "error",
-                    "error": "INVALID CONTENT LENGTH",
-                    "data": {"message": "Invalid content length"},
-                },
-            )
-
-        # At this point filename, chunk index and total chunks are required
-        # in the request
-        if not self.filename or self.chunk_index is None:
-            logger.error(
-                f"File upload failed. Filename: {self.filename}"
-                f"Type: {u_type} Error: CHUNK INDEX NOT FOUND"
-            )
-            return self.finish_json(
-                400,
-                {
-                    "status": "error",
-                    "error": "INDEX ERROR",
-                    "data": {
-                        "message": "Filename, chunk_index,"
-                        " and total_chunks are required"
-                    },
-                },
-            )
-
-        # Calculate the hash of the buffer and compare it against the expected hash
-        calculated_hash = self.file_helper.calculate_buffer_hash(self.request.body)
-        if str(self.chunk_hash) != str(calculated_hash):
-            logger.error(
-                f"File upload failed. Filename: {self.filename}"
-                f"Type: {u_type} Error: INVALID HASH"
-            )
-            return self.finish_json(
-                400,
-                {
-                    "status": "error",
-                    "error": "INVALID_HASH",
-                    "data": {
-                        "message": "Hash recieved does not match reported sent hash.",
-                        "chunk_id": self.chunk_index,
-                    },
-                },
-            )
-
-        # File paths
-        file_path = os.path.join(self.upload_dir, self.filename)
-        chunk_path = os.path.join(
-            self.temp_dir, f"{self.filename}.part{self.chunk_index}"
-        )
-
-        # Save the chunk
-        with open(chunk_path, "wb") as f:
-            f.write(self.request.body)
-
-        # Check if all chunks are received
-        received_chunks = [
-            f
-            for f in os.listdir(self.temp_dir)
-            if f.startswith(f"{self.filename}.part")
-        ]
-        # When we've reached the total chunks we'll
-        # Compare the hash and write the file
-        if len(received_chunks) == total_chunks:
-            with open(file_path, "wb") as outfile:
-                for i in range(total_chunks):
-                    chunk_file = os.path.join(self.temp_dir, f"{self.filename}.part{i}")
-                    with open(chunk_file, "rb") as infile:
-                        outfile.write(infile.read())
-                    os.remove(chunk_file)
-            logger.info(
-                f"File upload completed. Filename: {self.filename}"
-                f" Path: {file_path} Type: {u_type}"
-            )
-            self.controller.management.add_to_audit_log(
-                auth_data[4]["user_id"],
-                f"Uploaded file {self.filename}",
-                server_id,
-                self.request.remote_ip,
-            )
-            self.finish_json(
-                200,
-                {
-                    "status": "completed",
-                    "data": {"message": "File uploaded successfully"},
-                },
-            )
-        else:
-            self.finish_json(
-                200,
-                {
-                    "status": "partial",
-                    "data": {"message": f"Chunk {self.chunk_index} received"},
-                },
-            )

app/classes/web/routes/api/roles/index.py

@@ -2,7 +2,6 @@ import typing as t
 from jsonschema import ValidationError, validate
 import orjson
 from playhouse.shortcuts import model_to_dict
-from app.classes.models.crafty_permissions import EnumPermissionsCrafty
 from app.classes.web.base_api_handler import BaseApiHandler
 
 create_role_schema = {
@@ -11,7 +10,6 @@ create_role_schema = {
         "name": {
             "type": "string",
             "minLength": 1,
-            "pattern": r"^[^,\[\]]*$",
         },
         "servers": {
             "type": "array",
@@ -24,7 +22,7 @@ create_role_schema = {
                     },
                     "permissions": {
                         "type": "string",
-                        "pattern": r"^[01]{8}$",  # 8 bits, see EnumPermissionsServer
+                        "pattern": "^[01]{8}$",  # 8 bits, see EnumPermissionsServer
                     },
                 },
                 "required": ["server_id", "permissions"],
@@ -73,7 +71,7 @@ class ApiRolesIndexHandler(BaseApiHandler):
             return
         (
             _,
-            exec_user_permissions_crafty,
+            _,
             _,
             superuser,
             _,
@@ -83,10 +81,7 @@ class ApiRolesIndexHandler(BaseApiHandler):
         # GET /api/v2/roles?ids=true
         get_only_ids = self.get_query_argument("ids", None) == "true"
 
-        if (
-            not superuser
-            and EnumPermissionsCrafty.ROLES_CONFIG not in exec_user_permissions_crafty
-        ):
+        if not superuser:
             return self.finish_json(400, {"status": "error", "error": "NOT_AUTHORIZED"})
 
         self.finish_json(
@@ -109,17 +104,14 @@ class ApiRolesIndexHandler(BaseApiHandler):
             return
         (
             _,
-            exec_user_permissions_crafty,
+            _,
             _,
             superuser,
             user,
             _,
         ) = auth_data
 
-        if (
-            not superuser
-            and EnumPermissionsCrafty.ROLES_CONFIG not in exec_user_permissions_crafty
-        ):
+        if not superuser:
             return self.finish_json(400, {"status": "error", "error": "NOT_AUTHORIZED"})
 
         try:
@@ -146,8 +138,6 @@ class ApiRolesIndexHandler(BaseApiHandler):
 
         role_name = data["name"]
         manager = data.get("manager", None)
-        if not superuser and not manager:
-            manager = auth_data[4]["user_id"]
         if manager == self.controller.users.get_id_by_name("SYSTEM") or manager == 0:
             manager = None
 

app/classes/web/routes/api/roles/role/index.py

@@ -1,7 +1,6 @@
 from jsonschema import ValidationError, validate
 import orjson
-from peewee import DoesNotExist, IntegrityError
-from app.classes.models.crafty_permissions import EnumPermissionsCrafty
+from peewee import DoesNotExist
 from app.classes.web.base_api_handler import BaseApiHandler
 
 modify_role_schema = {
@@ -10,7 +9,6 @@ modify_role_schema = {
         "name": {
             "type": "string",
             "minLength": 1,
-            "pattern": r"^[^,\[\]]*$",
         },
         "servers": {
             "type": "array",
@@ -23,7 +21,7 @@ modify_role_schema = {
                     },
                     "permissions": {
                         "type": "string",
-                        "pattern": r"^[01]{8}$",  # 8 bits, see EnumPermissionsServer
+                        "pattern": "^[01]{8}$",  # 8 bits, see EnumPermissionsServer
                     },
                 },
                 "required": ["server_id", "permissions"],
@@ -72,17 +70,14 @@ class ApiRolesRoleIndexHandler(BaseApiHandler):
             return
         (
             _,
-            exec_user_permissions_crafty,
+            _,
             _,
             superuser,
             _,
             _,
         ) = auth_data
 
-        if (
-            not superuser
-            and EnumPermissionsCrafty.ROLES_CONFIG not in exec_user_permissions_crafty
-        ):
+        if not superuser:
             return self.finish_json(400, {"status": "error", "error": "NOT_AUTHORIZED"})
 
         try:
@@ -105,11 +100,8 @@ class ApiRolesRoleIndexHandler(BaseApiHandler):
             user,
             _,
         ) = auth_data
-        role = self.controller.roles.get_role(role_id)
-        if (
-            str(role.get("manager", "no manager found")) != str(auth_data[4]["user_id"])
-            and not superuser
-        ):
+
+        if not superuser:
             return self.finish_json(400, {"status": "error", "error": "NOT_AUTHORIZED"})
 
         self.controller.roles.remove_role(role_id)
@@ -132,7 +124,7 @@ class ApiRolesRoleIndexHandler(BaseApiHandler):
             return
         (
             _,
-            exec_user_permissions_crafty,
+            _,
             _,
             superuser,
             user,
@@ -140,10 +132,7 @@ class ApiRolesRoleIndexHandler(BaseApiHandler):
         ) = auth_data
 
         role = self.controller.roles.get_role(role_id)
-        if not superuser and (
-            user["user_id"] != role["manager"]
-            or EnumPermissionsCrafty.ROLES_CONFIG not in exec_user_permissions_crafty
-        ):
+        if not superuser and user["user_id"] != role["manager"]:
             return self.finish_json(
                 400,
                 {
@@ -190,10 +179,7 @@ class ApiRolesRoleIndexHandler(BaseApiHandler):
             )
         except DoesNotExist:
             return self.finish_json(404, {"status": "error", "error": "ROLE_NOT_FOUND"})
-        except IntegrityError:
-            return self.finish_json(
-                404, {"status": "error", "error": "ROLE_NAME_EXISTS"}
-            )
+
         self.controller.management.add_to_audit_log(
             user["user_id"],
             f"modified role with ID {role_id}",

app/classes/web/routes/api/servers/index.py

@@ -23,7 +23,6 @@ new_server_schema = {
             "type": "string",
             "examples": ["My Server"],
             "minLength": 2,
-            "pattern": "^[^/\\\\]*$",
         },
         "roles": {"title": "Roles to add", "type": "array", "examples": [1, 2, 3]},
         "stop_command": {

app/classes/web/routes/api/servers/server/action.py

@@ -1,6 +1,5 @@
 import logging
 import os
-import json
 from app.classes.models.server_permissions import EnumPermissionsServer
 from app.classes.models.servers import Servers
 from app.classes.shared.file_helpers import FileHelpers
@@ -11,7 +10,7 @@ logger = logging.getLogger(__name__)
 
 
 class ApiServersServerActionHandler(BaseApiHandler):
-    def post(self, server_id: str, action: str, action_id=None):
+    def post(self, server_id: str, action: str):
         auth_data = self.authenticate_user()
         if not auth_data:
             return
@@ -55,7 +54,7 @@ class ApiServersServerActionHandler(BaseApiHandler):
             return self._agree_eula(server_id, auth_data[4]["user_id"])
 
         self.controller.management.send_command(
-            auth_data[4]["user_id"], server_id, self.get_remote_ip(), action, action_id
+            auth_data[4]["user_id"], server_id, self.get_remote_ip(), action
         )
 
         self.finish_json(
@@ -83,20 +82,6 @@ class ApiServersServerActionHandler(BaseApiHandler):
         new_server_id = self.helper.create_uuid()
         new_server_path = os.path.join(self.helper.servers_dir, new_server_id)
         new_backup_path = os.path.join(self.helper.backup_path, new_server_id)
-        backup_data = {
-            "backup_name": f"{new_server_name} Backup",
-            "backup_location": new_backup_path,
-            "excluded_dirs": "",
-            "max_backups": 0,
-            "server_id": new_server_id,
-            "compress": False,
-            "shutdown": False,
-            "before": "",
-            "after": "",
-            "default": True,
-            "status": json.dumps({"status": "Standby", "message": ""}),
-            "enabled": True,
-        }
         new_server_command = str(server_data.get("execution_command")).replace(
             server_id, new_server_id
         )
@@ -108,6 +93,7 @@ class ApiServersServerActionHandler(BaseApiHandler):
             new_server_name,
             new_server_id,
             new_server_path,
+            new_backup_path,
             new_server_command,
             server_data.get("executable"),
             new_server_log_path,
@@ -117,8 +103,6 @@ class ApiServersServerActionHandler(BaseApiHandler):
             server_data.get("type"),
         )
 
-        self.controller.management.add_backup_config(backup_data)
-
         self.controller.management.add_to_audit_log(
             user_id,
             f"is cloning server {server_id} named {server_data.get('server_name')}",

app/classes/web/routes/api/servers/server/backups/backup/index.py

@@ -11,7 +11,7 @@ from app.classes.shared.helpers import Helpers
 
 logger = logging.getLogger(__name__)
 
-BACKUP_SCHEMA = {
+backup_schema = {
     "type": "object",
     "properties": {
         "filename": {"type": "string", "minLength": 5},
@@ -19,127 +19,10 @@ BACKUP_SCHEMA = {
     "additionalProperties": False,
     "minProperties": 1,
 }
-BACKUP_PATCH_SCHEMA = {
-    "type": "object",
-    "properties": {
-        "backup_name": {"type": "string", "minLength": 3},
-        "backup_location": {"type": "string", "minLength": 1},
-        "max_backups": {"type": "integer"},
-        "compress": {"type": "boolean"},
-        "shutdown": {"type": "boolean"},
-        "before": {"type": "string"},
-        "after": {"type": "string"},
-        "excluded_dirs": {"type": "array"},
-    },
-    "additionalProperties": False,
-    "minProperties": 1,
-}
-
-BASIC_BACKUP_PATCH_SCHEMA = {
-    "type": "object",
-    "properties": {
-        "backup_name": {"type": "string", "minLength": 3},
-        "max_backups": {"type": "integer"},
-        "compress": {"type": "boolean"},
-        "shutdown": {"type": "boolean"},
-        "before": {"type": "string"},
-        "after": {"type": "string"},
-        "excluded_dirs": {"type": "array"},
-    },
-    "additionalProperties": False,
-    "minProperties": 1,
-}
-ID_MISMATCH = "Server ID backup server ID different"
-GENERAL_AUTH_ERROR = "Authorization Error"
 
 
 class ApiServersServerBackupsBackupIndexHandler(BaseApiHandler):
-    def get(self, server_id: str, backup_id: str):
-        auth_data = self.authenticate_user()
-        backup_conf = self.controller.management.get_backup_config(backup_id)
-        if not auth_data:
-            return
-        mask = self.controller.server_perms.get_lowest_api_perm_mask(
-            self.controller.server_perms.get_user_permissions_mask(
-                auth_data[4]["user_id"], server_id
-            ),
-            auth_data[5],
-        )
-        if backup_conf["server_id"]["server_id"] != server_id:
-            return self.finish_json(
-                400,
-                {
-                    "status": "error",
-                    "error": "ID_MISMATCH",
-                    "error_data": ID_MISMATCH,
-                },
-            )
-        server_permissions = self.controller.server_perms.get_permissions(mask)
-        if EnumPermissionsServer.BACKUP not in server_permissions:
-            # if the user doesn't have Schedule permission, return an error
-            return self.finish_json(
-                400,
-                {
-                    "status": "error",
-                    "error": "NOT_AUTHORIZED",
-                    "error_data": GENERAL_AUTH_ERROR,
-                },
-            )
-        self.finish_json(200, backup_conf)
-
-    def delete(self, server_id: str, backup_id: str):
-        auth_data = self.authenticate_user()
-        backup_conf = self.controller.management.get_backup_config(backup_id)
-        if backup_conf["server_id"]["server_id"] != server_id:
-            return self.finish_json(
-                400,
-                {
-                    "status": "error",
-                    "error": "ID_MISMATCH",
-                    "error_data": ID_MISMATCH,
-                },
-            )
-        if not auth_data:
-            return
-        mask = self.controller.server_perms.get_lowest_api_perm_mask(
-            self.controller.server_perms.get_user_permissions_mask(
-                auth_data[4]["user_id"], server_id
-            ),
-            auth_data[5],
-        )
-        server_permissions = self.controller.server_perms.get_permissions(mask)
-        if EnumPermissionsServer.BACKUP not in server_permissions:
-            # if the user doesn't have Schedule permission, return an error
-            return self.finish_json(
-                400,
-                {
-                    "status": "error",
-                    "error": "NOT_AUTHORIZED",
-                    "error_data": GENERAL_AUTH_ERROR,
-                },
-            )
-
-        self.controller.management.add_to_audit_log(
-            auth_data[4]["user_id"],
-            f"Edited server {server_id}: removed backup config"
-            f" {backup_conf['backup_name']}",
-            server_id,
-            self.get_remote_ip(),
-        )
-        if backup_conf["default"]:
-            return self.finish_json(
-                405,
-                {
-                    "status": "error",
-                    "error": "NOT_ALLOWED",
-                    "error_data": "Cannot delete default backup",
-                },
-            )
-        self.controller.management.delete_backup_config(backup_id)
-
-        return self.finish_json(200, {"status": "ok"})
-
-    def post(self, server_id: str, backup_id: str):
+    def get(self, server_id: str):
         auth_data = self.authenticate_user()
         if not auth_data:
             return
@@ -152,24 +35,24 @@ class ApiServersServerBackupsBackupIndexHandler(BaseApiHandler):
         server_permissions = self.controller.server_perms.get_permissions(mask)
         if EnumPermissionsServer.BACKUP not in server_permissions:
             # if the user doesn't have Schedule permission, return an error
-            return self.finish_json(
-                400,
-                {
-                    "status": "error",
-                    "error": "NOT_AUTHORIZED",
-                    "error_data": GENERAL_AUTH_ERROR,
-                },
-            )
-        backup_config = self.controller.management.get_backup_config(backup_id)
-        if backup_config["server_id"]["server_id"] != server_id:
-            return self.finish_json(
-                400,
-                {
-                    "status": "error",
-                    "error": "ID_MISMATCH",
-                    "error_data": ID_MISMATCH,
-                },
+            return self.finish_json(400, {"status": "error", "error": "NOT_AUTHORIZED"})
+        self.finish_json(200, self.controller.management.get_backup_config(server_id))
+
+    def delete(self, server_id: str):
+        auth_data = self.authenticate_user()
+        backup_conf = self.controller.management.get_backup_config(server_id)
+        if not auth_data:
+            return
+        mask = self.controller.server_perms.get_lowest_api_perm_mask(
+            self.controller.server_perms.get_user_permissions_mask(
+                auth_data[4]["user_id"], server_id
+            ),
+            auth_data[5],
         )
+        server_permissions = self.controller.server_perms.get_permissions(mask)
+        if EnumPermissionsServer.BACKUP not in server_permissions:
+            # if the user doesn't have Schedule permission, return an error
+            return self.finish_json(400, {"status": "error", "error": "NOT_AUTHORIZED"})
 
         try:
             data = json.loads(self.request.body)
@@ -178,7 +61,7 @@ class ApiServersServerBackupsBackupIndexHandler(BaseApiHandler):
                 400, {"status": "error", "error": "INVALID_JSON", "error_data": str(e)}
             )
         try:
-            validate(data, BACKUP_SCHEMA)
+            validate(data, backup_schema)
         except ValidationError as e:
             return self.finish_json(
                 400,
@@ -189,21 +72,64 @@ class ApiServersServerBackupsBackupIndexHandler(BaseApiHandler):
                 },
             )
 
+        try:
+            FileHelpers.del_file(
+                os.path.join(backup_conf["backup_path"], data["filename"])
+            )
+        except Exception as e:
+            return self.finish_json(
+                400, {"status": "error", "error": f"DELETE FAILED with error {e}"}
+            )
+        self.controller.management.add_to_audit_log(
+            auth_data[4]["user_id"],
+            f"Edited server {server_id}: removed backup {data['filename']}",
+            server_id,
+            self.get_remote_ip(),
+        )
+
+        return self.finish_json(200, {"status": "ok"})
+
+    def post(self, server_id: str):
+        auth_data = self.authenticate_user()
+        if not auth_data:
+            return
+        mask = self.controller.server_perms.get_lowest_api_perm_mask(
+            self.controller.server_perms.get_user_permissions_mask(
+                auth_data[4]["user_id"], server_id
+            ),
+            auth_data[5],
+        )
+        server_permissions = self.controller.server_perms.get_permissions(mask)
+        if EnumPermissionsServer.BACKUP not in server_permissions:
+            # if the user doesn't have Schedule permission, return an error
+            return self.finish_json(400, {"status": "error", "error": "NOT_AUTHORIZED"})
+
+        try:
+            data = json.loads(self.request.body)
+        except json.decoder.JSONDecodeError as e:
+            return self.finish_json(
+                400, {"status": "error", "error": "INVALID_JSON", "error_data": str(e)}
+            )
+        try:
+            validate(data, backup_schema)
+        except ValidationError as e:
+            return self.finish_json(
+                400,
+                {
+                    "status": "error",
+                    "error": "INVALID_JSON_SCHEMA",
+                    "error_data": str(e),
+                },
+            )
+
+        try:
             svr_obj = self.controller.servers.get_server_obj(server_id)
             server_data = self.controller.servers.get_server_data_by_id(server_id)
             zip_name = data["filename"]
             # import the server again based on zipfile
-        backup_config = self.controller.management.get_backup_config(backup_id)
-        backup_location = os.path.join(
-            backup_config["backup_location"], backup_config["backup_id"]
-        )
-        if Helpers.validate_traversal(backup_location, zip_name):
-            try:
-                temp_dir = Helpers.unzip_backup_archive(backup_location, zip_name)
-            except (FileNotFoundError, NotADirectoryError) as e:
-                return self.finish_json(
-                    400, {"status": "error", "error": f"NO BACKUP FOUND {e}"}
-                )
+            backup_path = svr_obj.backup_path
+            if Helpers.validate_traversal(backup_path, zip_name):
+                temp_dir = Helpers.unzip_backup_archive(backup_path, zip_name)
                 if server_data["type"] == "minecraft-java":
                     new_server = self.controller.restore_java_zip_server(
                         svr_obj.server_name,
@@ -225,9 +151,7 @@ class ApiServersServerBackupsBackupIndexHandler(BaseApiHandler):
                 new_server_id = new_server
                 new_server = self.controller.servers.get_server_data(new_server)
                 self.controller.rename_backup_dir(
-                server_id,
-                new_server_id,
-                new_server["server_id"],
+                    server_id, new_server_id, new_server["server_id"]
                 )
                 # preserve current schedules
                 for schedule in self.controller.management.get_schedules_by_server(
@@ -260,26 +184,24 @@ class ApiServersServerBackupsBackupIndexHandler(BaseApiHandler):
                 self.controller.servers.update_server(new_server_obj)
 
                 # preserve backup config
-            server_backups = self.controller.management.get_backups_by_server(server_id)
-            for backup in server_backups:
-                old_backup_id = server_backups[backup]["backup_id"]
-                del server_backups[backup]["backup_id"]
-                server_backups[backup]["server_id"] = new_server_id
-                if str(server_id) in (server_backups[backup]["backup_location"]):
-                    server_backups[backup]["backup_location"] = str(
-                        server_backups[backup]["backup_location"]
-                    ).replace(str(server_id), str(new_server_id))
-                new_backup_id = self.controller.management.add_backup_config(
-                    server_backups[backup]
-                )
-                os.listdir(server_backups[backup]["backup_location"])
-                FileHelpers.move_dir(
-                    os.path.join(
-                        server_backups[backup]["backup_location"], old_backup_id
-                    ),
-                    os.path.join(
-                        server_backups[backup]["backup_location"], new_backup_id
-                    ),
+                backup_config = self.controller.management.get_backup_config(server_id)
+                excluded_dirs = []
+                server_obj = self.controller.servers.get_server_obj(server_id)
+                loop_backup_path = self.helper.wtol_path(server_obj.path)
+                for item in self.controller.management.get_excluded_backup_dirs(
+                    server_id
+                ):
+                    item_path = self.helper.wtol_path(item)
+                    bu_path = os.path.relpath(item_path, loop_backup_path)
+                    bu_path = os.path.join(new_server_obj.path, bu_path)
+                    excluded_dirs.append(bu_path)
+                self.controller.management.set_backup_config(
+                    new_server_id,
+                    new_server_obj.backup_path,
+                    backup_config["max_backups"],
+                    excluded_dirs,
+                    backup_config["compress"],
+                    backup_config["shutdown"],
                 )
                 # remove old server's tasks
                 try:
@@ -287,7 +209,10 @@ class ApiServersServerBackupsBackupIndexHandler(BaseApiHandler):
                 except JobLookupError as e:
                     logger.info("No active tasks found for server: {e}")
                 self.controller.remove_server(server_id, True)
-
+        except (FileNotFoundError, NotADirectoryError) as e:
+            return self.finish_json(
+                400, {"status": "error", "error": f"NO BACKUP FOUND {e}"}
+            )
         self.controller.management.add_to_audit_log(
             auth_data[4]["user_id"],
             f"Restored server {server_id} backup {data['filename']}",
@@ -296,149 +221,3 @@ class ApiServersServerBackupsBackupIndexHandler(BaseApiHandler):
         )
 
         return self.finish_json(200, {"status": "ok"})
-
-    def patch(self, server_id: str, backup_id: str):
-        auth_data = self.authenticate_user()
-        if not auth_data:
-            return
-
-        try:
-            data = json.loads(self.request.body)
-        except json.decoder.JSONDecodeError as e:
-            return self.finish_json(
-                400, {"status": "error", "error": "INVALID_JSON", "error_data": str(e)}
-            )
-
-        try:
-            if auth_data[4]["superuser"]:
-                validate(data, BACKUP_PATCH_SCHEMA)
-            else:
-                validate(data, BASIC_BACKUP_PATCH_SCHEMA)
-        except ValidationError as e:
-            return self.finish_json(
-                400,
-                {
-                    "status": "error",
-                    "error": "INVALID_JSON_SCHEMA",
-                    "error_data": str(e),
-                },
-            )
-        backup_conf = self.controller.management.get_backup_config(backup_id)
-        if server_id not in [str(x["server_id"]) for x in auth_data[0]]:
-            # if the user doesn't have access to the server, return an error
-            return self.finish_json(
-                400,
-                {
-                    "status": "error",
-                    "error": "NOT_AUTHORIZED",
-                    "error_data": GENERAL_AUTH_ERROR,
-                },
-            )
-        if backup_conf["server_id"]["server_id"] != server_id:
-            return self.finish_json(
-                400,
-                {
-                    "status": "error",
-                    "error": "ID_MISMATCH",
-                    "error_data": ID_MISMATCH,
-                },
-            )
-        mask = self.controller.server_perms.get_lowest_api_perm_mask(
-            self.controller.server_perms.get_user_permissions_mask(
-                auth_data[4]["user_id"], server_id
-            ),
-            auth_data[5],
-        )
-        server_permissions = self.controller.server_perms.get_permissions(mask)
-        if EnumPermissionsServer.BACKUP not in server_permissions:
-            # if the user doesn't have Schedule permission, return an error
-            return self.finish_json(
-                400,
-                {
-                    "status": "error",
-                    "error": "NOT_AUTHORIZED",
-                    "error_data": GENERAL_AUTH_ERROR,
-                },
-            )
-        self.controller.management.update_backup_config(backup_id, data)
-        return self.finish_json(200, {"status": "ok"})
-
-
-class ApiServersServerBackupsBackupFilesIndexHandler(BaseApiHandler):
-    def delete(self, server_id: str, backup_id: str):
-        auth_data = self.authenticate_user()
-        backup_conf = self.controller.management.get_backup_config(backup_id)
-        if backup_conf["server_id"]["server_id"] != server_id:
-            return self.finish_json(
-                400,
-                {
-                    "status": "error",
-                    "error": "ID_MISMATCH",
-                    "error_data": ID_MISMATCH,
-                },
-            )
-        if not auth_data:
-            return
-        mask = self.controller.server_perms.get_lowest_api_perm_mask(
-            self.controller.server_perms.get_user_permissions_mask(
-                auth_data[4]["user_id"], server_id
-            ),
-            auth_data[5],
-        )
-        server_permissions = self.controller.server_perms.get_permissions(mask)
-        if EnumPermissionsServer.BACKUP not in server_permissions:
-            # if the user doesn't have Schedule permission, return an error
-            return self.finish_json(
-                400,
-                {
-                    "status": "error",
-                    "error": "NOT_AUTHORIZED",
-                    "error_data": GENERAL_AUTH_ERROR,
-                },
-            )
-
-        try:
-            data = json.loads(self.request.body)
-        except json.decoder.JSONDecodeError as e:
-            return self.finish_json(
-                400, {"status": "error", "error": "INVALID_JSON", "error_data": str(e)}
-            )
-        try:
-            validate(data, BACKUP_SCHEMA)
-        except ValidationError as e:
-            return self.finish_json(
-                400,
-                {
-                    "status": "error",
-                    "error": "INVALID_JSON_SCHEMA",
-                    "error_data": str(e),
-                },
-            )
-        self.helper.validate_traversal(
-            os.path.join(backup_conf["backup_location"], backup_conf["backup_id"]),
-            os.path.join(
-                backup_conf["backup_location"],
-                backup_conf["backup_id"],
-                data["filename"],
-            ),
-        )
-        try:
-            FileHelpers.del_file(
-                os.path.join(
-                    backup_conf["backup_location"],
-                    backup_conf["backup_id"],
-                    data["filename"],
-                )
-            )
-        except Exception as e:
-            return self.finish_json(
-                400, {"status": "error", "error": f"DELETE FAILED with error {e}"}
-            )
-        self.controller.management.add_to_audit_log(
-            auth_data[4]["user_id"],
-            f"Edited server {server_id}: removed backup {data['filename']}",
-            server_id,
-            self.get_remote_ip(),
-        )
-
-        return self.finish_json(200, {"status": "ok"})

app/classes/web/routes/api/servers/server/backups/index.py

@@ -1,4 +1,3 @@
-import os
 import logging
 import json
 from jsonschema import validate
@@ -11,14 +10,13 @@ logger = logging.getLogger(__name__)
 backup_patch_schema = {
     "type": "object",
     "properties": {
-        "backup_name": {"type": "string", "minLength": 3},
-        "backup_location": {"type": "string", "minLength": 1},
+        "backup_path": {"type": "string", "minLength": 1},
         "max_backups": {"type": "integer"},
         "compress": {"type": "boolean"},
         "shutdown": {"type": "boolean"},
-        "before": {"type": "string"},
-        "after": {"type": "string"},
-        "excluded_dirs": {"type": "array"},
+        "backup_before": {"type": "string"},
+        "backup_after": {"type": "string"},
+        "exclusions": {"type": "array"},
     },
     "additionalProperties": False,
     "minProperties": 1,
@@ -27,13 +25,12 @@ backup_patch_schema = {
 basic_backup_patch_schema = {
     "type": "object",
     "properties": {
-        "backup_name": {"type": "string", "minLength": 3},
         "max_backups": {"type": "integer"},
         "compress": {"type": "boolean"},
         "shutdown": {"type": "boolean"},
-        "before": {"type": "string"},
-        "after": {"type": "string"},
-        "excluded_dirs": {"type": "array"},
+        "backup_before": {"type": "string"},
+        "backup_after": {"type": "string"},
+        "exclusions": {"type": "array"},
     },
     "additionalProperties": False,
     "minProperties": 1,
@@ -55,11 +52,9 @@ class ApiServersServerBackupsIndexHandler(BaseApiHandler):
         if EnumPermissionsServer.BACKUP not in server_permissions:
             # if the user doesn't have Schedule permission, return an error
             return self.finish_json(400, {"status": "error", "error": "NOT_AUTHORIZED"})
-        self.finish_json(
-            200, self.controller.management.get_backups_by_server(server_id)
-        )
+        self.finish_json(200, self.controller.management.get_backup_config(server_id))
 
-    def post(self, server_id: str):
+    def patch(self, server_id: str):
         auth_data = self.authenticate_user()
         if not auth_data:
             return
@@ -85,6 +80,7 @@ class ApiServersServerBackupsIndexHandler(BaseApiHandler):
                     "error_data": str(e),
                 },
             )
+
         if server_id not in [str(x["server_id"]) for x in auth_data[0]]:
             # if the user doesn't have access to the server, return an error
             return self.finish_json(400, {"status": "error", "error": "NOT_AUTHORIZED"})
@@ -98,12 +94,33 @@ class ApiServersServerBackupsIndexHandler(BaseApiHandler):
         if EnumPermissionsServer.BACKUP not in server_permissions:
             # if the user doesn't have Schedule permission, return an error
             return self.finish_json(400, {"status": "error", "error": "NOT_AUTHORIZED"})
-        # Set the backup location automatically for non-super users. We should probably
-        # make the default location configurable for SU eventually
-        if not auth_data[4]["superuser"]:
-            data["backup_location"] = os.path.join(self.helper.backup_path, server_id)
-        data["server_id"] = server_id
-        if not data.get("excluded_dirs", None):
-            data["excluded_dirs"] = []
-        self.controller.management.add_backup_config(data)
+
+        self.controller.management.set_backup_config(
+            server_id,
+            data.get(
+                "backup_path",
+                self.controller.management.get_backup_config(server_id)["backup_path"],
+            ),
+            data.get(
+                "max_backups",
+                self.controller.management.get_backup_config(server_id)["max_backups"],
+            ),
+            data.get("exclusions"),
+            data.get(
+                "compress",
+                self.controller.management.get_backup_config(server_id)["compress"],
+            ),
+            data.get(
+                "shutdown",
+                self.controller.management.get_backup_config(server_id)["shutdown"],
+            ),
+            data.get(
+                "backup_before",
+                self.controller.management.get_backup_config(server_id)["before"],
+            ),
+            data.get(
+                "backup_after",
+                self.controller.management.get_backup_config(server_id)["after"],
+            ),
+        )
         return self.finish_json(200, {"status": "ok"})

app/classes/web/routes/api/servers/server/files.py

@@ -72,7 +72,7 @@ file_delete_schema = {
 
 
 class ApiServersServerFilesIndexHandler(BaseApiHandler):
-    def post(self, server_id: str, backup_id=None):
+    def post(self, server_id: str):
         auth_data = self.authenticate_user()
         if not auth_data:
             return
@@ -149,10 +149,9 @@ class ApiServersServerFilesIndexHandler(BaseApiHandler):
                 filename = html.escape(raw_filename)
                 rel = os.path.join(folder, raw_filename)
                 dpath = os.path.join(folder, filename)
-                if backup_id:
-                    if str(
-                        dpath
-                    ) in self.controller.management.get_excluded_backup_dirs(backup_id):
+                if str(dpath) in self.controller.management.get_excluded_backup_dirs(
+                    server_id
+                ):
                     if os.path.isdir(rel):
                         return_json[filename] = {
                             "path": dpath,
@@ -178,19 +177,6 @@ class ApiServersServerFilesIndexHandler(BaseApiHandler):
                             "dir": False,
                             "excluded": False,
                         }
-                else:
-                    if os.path.isdir(rel):
-                        return_json[filename] = {
-                            "path": dpath,
-                            "dir": True,
-                            "excluded": False,
-                        }
-                    else:
-                        return_json[filename] = {
-                            "path": dpath,
-                            "dir": False,
-                            "excluded": False,
-                        }
             self.finish_json(200, {"status": "ok", "data": return_json})
         else:
             try:
@@ -203,7 +189,7 @@ class ApiServersServerFilesIndexHandler(BaseApiHandler):
                 )
             self.finish_json(200, {"status": "ok", "data": file_contents})
 
-    def delete(self, server_id: str, _backup_id=None):
+    def delete(self, server_id: str):
         auth_data = self.authenticate_user()
         if not auth_data:
             return
@@ -261,7 +247,7 @@ class ApiServersServerFilesIndexHandler(BaseApiHandler):
             return self.finish_json(200, {"status": "ok"})
         return self.finish_json(500, {"status": "error", "error": str(proc)})
 
-    def patch(self, server_id: str, _backup_id):
+    def patch(self, server_id: str):
         auth_data = self.authenticate_user()
         if not auth_data:
             return
@@ -315,7 +301,7 @@ class ApiServersServerFilesIndexHandler(BaseApiHandler):
             file_object.write(file_contents)
         return self.finish_json(200, {"status": "ok"})
 
-    def put(self, server_id: str, _backup_id):
+    def put(self, server_id: str):
         auth_data = self.authenticate_user()
         if not auth_data:
             return

app/classes/web/routes/api/servers/server/index.py

@@ -12,7 +12,7 @@ logger = logging.getLogger(__name__)
 server_patch_schema = {
     "type": "object",
     "properties": {
-        "server_name": {"type": "string", "minLength": 2, "pattern": "^[^/\\\\]*$"},
+        "server_name": {"type": "string", "minLength": 1},
         "backup_path": {"type": "string"},
         "executable": {"type": "string"},
         "log_path": {"type": "string", "minLength": 1},

app/classes/web/routes/api/servers/server/tasks/index.py

@@ -21,9 +21,6 @@ new_task_schema = {
         "action": {
             "type": "string",
         },
-        "action_id": {
-            "type": "string",
-        },
         "interval": {"type": "integer"},
         "interval_type": {
             "type": "string",
@@ -113,18 +110,6 @@ class ApiServersServerTasksIndexHandler(BaseApiHandler):
                 )
         if "parent" not in data:
             data["parent"] = None
-        if data.get("action_id"):
-            backup_config = self.controller.management.get_backup_config(
-                data["action_id"]
-            )
-            if backup_config["server_id"]["server_id"] != server_id:
-                return self.finish_json(
-                    405,
-                    {
-                        "status": "error",
-                        "error": "Server ID Mismatch",
-                    },
-                )
         task_id = self.tasks_manager.schedule_job(data)
 
         self.controller.management.add_to_audit_log(

app/classes/web/routes/api/servers/server/tasks/task/index.py

@@ -22,9 +22,6 @@ task_patch_schema = {
         "action": {
             "type": "string",
         },
-        "action_id": {
-            "type": "string",
-        },
         "interval": {"type": "integer"},
         "interval_type": {
             "type": "string",

app/classes/web/routes/api/users/index.py

@@ -2,7 +2,6 @@ import logging
 import json
 from jsonschema import validate
 from jsonschema.exceptions import ValidationError
-from app.classes.shared.translation import Translation
 from app.classes.models.crafty_permissions import EnumPermissionsCrafty
 from app.classes.models.roles import Roles, HelperRoles
 from app.classes.models.users import PUBLIC_USER_ATTRS
@@ -55,7 +54,6 @@ class ApiUsersIndexHandler(BaseApiHandler):
         )
 
     def post(self):
-        self.translator = Translation(self.helper)
         new_user_schema = {
             "type": "object",
             "properties": {
@@ -89,17 +87,12 @@ class ApiUsersIndexHandler(BaseApiHandler):
         try:
             validate(data, new_user_schema)
         except ValidationError as e:
-            err = self.translator.translate(
-                "validators",
-                e.schema["error"],
-                self.controller.users.get_user_lang_by_id(auth_data[4]["user_id"]),
-            )
             return self.finish_json(
                 400,
                 {
                     "status": "error",
                     "error": "INVALID_JSON_SCHEMA",
-                    "error_data": f"{str(err)}",
+                    "error_data": str(e),
                 },
             )
         username = data["username"]
@@ -160,11 +153,7 @@ class ApiUsersIndexHandler(BaseApiHandler):
 
         for role in roles:
             role = self.controller.roles.get_role(role)
-            if (
-                str(role.get("manager", "no manager found"))
-                != str(auth_data[4]["user_id"])
-                and not superuser
-            ):
+            if int(role["manager"]) != int(auth_data[4]["user_id"]) and not superuser:
                 return self.finish_json(
                     400, {"status": "error", "error": "INVALID_ROLES_CREATE"}
                 )

app/classes/web/routes/api/users/user/api.py

@@ -217,7 +217,7 @@ class ApiUsersUserKeyHandler(BaseApiHandler):
                 )
 
             if (
-                str(target_key.user_id) != str(auth_data[4]["user_id"])
+                target_key.user_id != auth_data[4]["user_id"]
                 and not auth_data[4]["superuser"]
             ):
                 return self.finish_json(

app/classes/web/routes/api/users/user/index.py

@@ -132,6 +132,7 @@ class ApiUsersUserIndexHandler(BaseApiHandler):
             return self.finish_json(
                 400, {"status": "error", "error": "INVALID_JSON", "error_data": str(e)}
             )
+
         try:
             validate(data, user_patch_schema)
         except ValidationError as e:
@@ -143,8 +144,10 @@ class ApiUsersUserIndexHandler(BaseApiHandler):
                     "error_data": str(e),
                 },
             )
+
         if user_id == "@me":
             user_id = user["user_id"]
+
         if (
             EnumPermissionsCrafty.USER_CONFIG not in exec_user_crafty_permissions
             and str(user["user_id"]) != str(user_id)
@@ -212,25 +215,6 @@ class ApiUsersUserIndexHandler(BaseApiHandler):
                 return self.finish_json(
                     400, {"status": "error", "error": "INVALID_ROLES_MODIFY"}
                 )
-            user_modify = self.controller.users.get_user_roles_id(user_id)
-
-            for role in data["roles"]:
-                # Check if user is not a super user and that the exec user is the role
-                # manager or that the role already exists in the user's list
-                if not superuser and (
-                    str(
-                        self.controller.roles.get_role(role).get(
-                            "manager", "no manager found"
-                        )
-                    )
-                    != str(auth_data[4]["user_id"])
-                    and role not in user_modify
-                ):
-                    for item in user_modify:
-                        print(type(role), type(item))
-                    return self.finish_json(
-                        400, {"status": "error", "error": "INVALID_ROLES_MODIFY"}
-                    )
 
         user_obj = HelperUsers.get_user_model(user_id)
         if "password" in data and str(user["user_id"]) != str(user_id):

app/classes/web/tornado_handler.py

@@ -24,6 +24,7 @@ from app.classes.web.routes.metrics.metrics_handlers import metrics_handlers
 from app.classes.web.server_handler import ServerHandler
 from app.classes.web.websocket_handler import WebSocketHandler
 from app.classes.web.static_handler import CustomStaticHandler
+from app.classes.web.upload_handler import UploadHandler
 from app.classes.web.status_handler import StatusHandler
 
 
@@ -141,6 +142,7 @@ class Webserver:
             (r"/panel/(.*)", PanelHandler, handler_args),
             (r"/server/(.*)", ServerHandler, handler_args),
             (r"/ws", WebSocketHandler, handler_args),
+            (r"/upload", UploadHandler, handler_args),
             (r"/status", StatusHandler, handler_args),
             # API Routes V2
             *api_handlers(handler_args),

app/classes/web/upload_handler.py

@@ -0,0 +1,331 @@
+import logging
+import os
+import time
+import urllib.parse
+import tornado.web
+import tornado.options
+import tornado.httpserver
+from app.classes.models.crafty_permissions import EnumPermissionsCrafty
+
+from app.classes.models.server_permissions import EnumPermissionsServer
+from app.classes.shared.console import Console
+from app.classes.shared.helpers import Helpers
+from app.classes.shared.main_controller import Controller
+from app.classes.web.base_handler import BaseHandler
+from app.classes.shared.websocket_manager import WebSocketManager
+
+logger = logging.getLogger(__name__)
+
+
+@tornado.web.stream_request_body
+class UploadHandler(BaseHandler):
+    # noinspection PyAttributeOutsideInit
+    def initialize(
+        self,
+        helper: Helpers = None,
+        controller: Controller = None,
+        tasks_manager=None,
+        translator=None,
+        file_helper=None,
+    ):
+        self.helper = helper
+        self.controller = controller
+        self.tasks_manager = tasks_manager
+        self.translator = translator
+        self.file_helper = file_helper
+
+    def prepare(self):
+        # Class & Function Defination
+        api_key, _token_data, exec_user = self.current_user
+        self.upload_type = str(self.request.headers.get("X-Content-Upload-Type"))
+
+        if self.upload_type == "server_import":
+            superuser = exec_user["superuser"]
+            if api_key is not None:
+                superuser = superuser and api_key.full_access
+            user_id = exec_user["user_id"]
+            stream_size_value = self.helper.get_setting("stream_size_GB")
+
+            max_streamed_size = (1024 * 1024 * 1024) * stream_size_value
+
+            self.content_len = int(self.request.headers.get("Content-Length"))
+            if self.content_len > max_streamed_size:
+                logger.error(
+                    f"User with ID {user_id} attempted to upload a file that"
+                    f" exceeded the max body size."
+                )
+
+                return self.finish_json(
+                    413,
+                    {
+                        "status": "error",
+                        "error": "TOO LARGE",
+                        "info": self.helper.translation.translate(
+                            "error",
+                            "fileTooLarge",
+                            self.controller.users.get_user_lang_by_id(user_id),
+                        ),
+                    },
+                )
+            self.do_upload = True
+
+            if superuser:
+                exec_user_server_permissions = (
+                    self.controller.server_perms.list_defined_permissions()
+                )
+            elif api_key is not None:
+                exec_user_server_permissions = (
+                    self.controller.crafty_perms.get_api_key_permissions_list(api_key)
+                )
+            else:
+                exec_user_server_permissions = (
+                    self.controller.crafty_perms.get_crafty_permissions_list(
+                        exec_user["user_id"]
+                    )
+                )
+
+            if user_id is None:
+                logger.warning("User ID not found in upload handler call")
+                Console.warning("User ID not found in upload handler call")
+                self.do_upload = False
+
+            if (
+                EnumPermissionsCrafty.SERVER_CREATION
+                not in exec_user_server_permissions
+                and not exec_user["superuser"]
+            ):
+                logger.warning(
+                    f"User {user_id} tried to upload a server" " without permissions!"
+                )
+                Console.warning(
+                    f"User {user_id} tried to upload a server" " without permissions!"
+                )
+                self.do_upload = False
+
+            path = os.path.join(self.controller.project_root, "import", "upload")
+            self.helper.ensure_dir_exists(path)
+            # Delete existing files
+            if len(os.listdir(path)) > 0:
+                for item in os.listdir():
+                    try:
+                        os.remove(os.path.join(path, item))
+                    except:
+                        logger.debug("Could not delete file on user server upload")
+
+            self.helper.ensure_dir_exists(path)
+            filename = urllib.parse.unquote(
+                self.request.headers.get("X-FileName", None)
+            )
+            if not str(filename).endswith(".zip"):
+                WebSocketManager().broadcast("close_upload_box", "error")
+                self.finish("error")
+            full_path = os.path.join(path, filename)
+
+            if self.do_upload:
+                try:
+                    self.f = open(full_path, "wb")
+                except Exception as e:
+                    logger.error(f"Upload failed with error: {e}")
+                    self.do_upload = False
+            # If max_body_size is not set, you cannot upload files > 100MB
+            self.request.connection.set_max_body_size(max_streamed_size)
+
+        elif self.upload_type == "background":
+            superuser = exec_user["superuser"]
+            if api_key is not None:
+                superuser = superuser and api_key.full_access
+            user_id = exec_user["user_id"]
+            stream_size_value = self.helper.get_setting("stream_size_GB")
+
+            max_streamed_size = (1024 * 1024 * 1024) * stream_size_value
+
+            self.content_len = int(self.request.headers.get("Content-Length"))
+            if self.content_len > max_streamed_size:
+                logger.error(
+                    f"User with ID {user_id} attempted to upload a file that"
+                    f" exceeded the max body size."
+                )
+
+                return self.finish_json(
+                    413,
+                    {
+                        "status": "error",
+                        "error": "TOO LARGE",
+                        "info": self.helper.translation.translate(
+                            "error",
+                            "fileTooLarge",
+                            self.controller.users.get_user_lang_by_id(user_id),
+                        ),
+                    },
+                )
+            self.do_upload = True
+
+            if not superuser:
+                return self.finish_json(
+                    401,
+                    {
+                        "status": "error",
+                        "error": "UNAUTHORIZED ACCESS",
+                        "info": self.helper.translation.translate(
+                            "error",
+                            "superError",
+                            self.controller.users.get_user_lang_by_id(user_id),
+                        ),
+                    },
+                )
+            if not self.request.headers.get("X-Content-Type", None).startswith(
+                "image/"
+            ):
+                return self.finish_json(
+                    415,
+                    {
+                        "status": "error",
+                        "error": "TYPE ERROR",
+                        "info": self.helper.translation.translate(
+                            "error",
+                            "fileError",
+                            self.controller.users.get_user_lang_by_id(user_id),
+                        ),
+                    },
+                )
+            if user_id is None:
+                logger.warning("User ID not found in upload handler call")
+                Console.warning("User ID not found in upload handler call")
+                self.do_upload = False
+
+            path = os.path.join(
+                self.controller.project_root,
+                "app/frontend/static/assets/images/auth/custom",
+            )
+            filename = self.request.headers.get("X-FileName", None)
+            full_path = os.path.join(path, filename)
+
+            if self.do_upload:
+                try:
+                    self.f = open(full_path, "wb")
+                except Exception as e:
+                    logger.error(f"Upload failed with error: {e}")
+                    self.do_upload = False
+            # If max_body_size is not set, you cannot upload files > 100MB
+            self.request.connection.set_max_body_size(max_streamed_size)
+        else:
+            server_id = self.get_argument("server_id", None)
+            superuser = exec_user["superuser"]
+            if api_key is not None:
+                superuser = superuser and api_key.full_access
+            user_id = exec_user["user_id"]
+            stream_size_value = self.helper.get_setting("stream_size_GB")
+
+            max_streamed_size = (1024 * 1024 * 1024) * stream_size_value
+
+            self.content_len = int(self.request.headers.get("Content-Length"))
+            if self.content_len > max_streamed_size:
+                logger.error(
+                    f"User with ID {user_id} attempted to upload a file that"
+                    f" exceeded the max body size."
+                )
+
+                return self.finish_json(
+                    413,
+                    {
+                        "status": "error",
+                        "error": "TOO LARGE",
+                        "info": self.helper.translation.translate(
+                            "error",
+                            "fileTooLarge",
+                            self.controller.users.get_user_lang_by_id(user_id),
+                        ),
+                    },
+                )
+            self.do_upload = True
+
+            if superuser:
+                exec_user_server_permissions = (
+                    self.controller.server_perms.list_defined_permissions()
+                )
+            elif api_key is not None:
+                exec_user_server_permissions = (
+                    self.controller.server_perms.get_api_key_permissions_list(
+                        api_key, server_id
+                    )
+                )
+            else:
+                exec_user_server_permissions = (
+                    self.controller.server_perms.get_user_id_permissions_list(
+                        exec_user["user_id"], server_id
+                    )
+                )
+
+            server_id = self.request.headers.get("X-ServerId", None)
+            if server_id is None:
+                logger.warning("Server ID not found in upload handler call")
+                Console.warning("Server ID not found in upload handler call")
+                self.do_upload = False
+
+            if user_id is None:
+                logger.warning("User ID not found in upload handler call")
+                Console.warning("User ID not found in upload handler call")
+                self.do_upload = False
+
+            if EnumPermissionsServer.FILES not in exec_user_server_permissions:
+                logger.warning(
+                    f"User {user_id} tried to upload a file to "
+                    f"{server_id} without permissions!"
+                )
+                Console.warning(
+                    f"User {user_id} tried to upload a file to "
+                    f"{server_id} without permissions!"
+                )
+                self.do_upload = False
+
+            path = self.request.headers.get("X-Path", None)
+            filename = self.request.headers.get("X-FileName", None)
+            full_path = os.path.join(path, filename)
+
+            if not self.helper.is_subdir(
+                full_path,
+                Helpers.get_os_understandable_path(
+                    self.controller.servers.get_server_data_by_id(server_id)["path"]
+                ),
+            ):
+                logger.warning(
+                    f"User {user_id} tried to upload a file to {server_id} "
+                    f"but the path is not inside of the server!"
+                )
+                Console.warning(
+                    f"User {user_id} tried to upload a file to {server_id} "
+                    f"but the path is not inside of the server!"
+                )
+                self.do_upload = False
+
+            if self.do_upload:
+                try:
+                    self.f = open(full_path, "wb")
+                except Exception as e:
+                    logger.error(f"Upload failed with error: {e}")
+                    self.do_upload = False
+            # If max_body_size is not set, you cannot upload files > 100MB
+            self.request.connection.set_max_body_size(max_streamed_size)
+
+    def post(self):
+        logger.info("Upload completed")
+        if self.upload_type == "server_files":
+            files_left = int(self.request.headers.get("X-Files-Left", None))
+        else:
+            files_left = 0
+
+        if self.do_upload:
+            time.sleep(5)
+            if files_left == 0:
+                WebSocketManager().broadcast("close_upload_box", "success")
+            self.finish("success")  # Nope, I'm sending "success"
+            self.f.close()
+        else:
+            time.sleep(5)
+            if files_left == 0:
+                WebSocketManager().broadcast("close_upload_box", "error")
+            self.finish("error")
+
+    def data_received(self, chunk):
+        if self.do_upload:
+            self.f.write(chunk)

app/config/version.json

@@ -1,5 +1,5 @@
 {
   "major": 4,
   "minor": 4,
-  "sub": 1
+  "sub": 0
 }

app/frontend/static/assets/css/crafty.css

@@ -12,16 +12,6 @@ nav.sidebar {
     position: fixed;
 }
 
-td {
-    -ms-overflow-style: none;
-    /* IE and Edge */
-    scrollbar-width: none;
-    /* Firefox */
-}
-
-td::-webkit-scrollbar {
-    display: none;
-}
 
 @media (min-width: 992px) {
     nav.sidebar {
@@ -278,6 +268,3 @@ div.warnings div.wssError a:hover {
 }
 
 /**************************************************************/
-.hidden-input {
-    margin-left: -40px;
-}

app/frontend/static/assets/css/vendors/bootstrap-select-1.13.18.css

@@ -1,537 +0,0 @@
-/*!
- * Bootstrap-select v1.13.18 (https://developer.snapappointments.com/bootstrap-select)
- *
- * Copyright 2012-2020 SnapAppointments, LLC
- * Licensed under MIT (https://github.com/snapappointments/bootstrap-select/blob/master/LICENSE)
- */
-@-webkit-keyframes bs-notify-fadeOut {
-    0% {
-        opacity: .9
-    }
-
-    100% {
-        opacity: 0
-    }
-}
-
-@-o-keyframes bs-notify-fadeOut {
-    0% {
-        opacity: .9
-    }
-
-    100% {
-        opacity: 0
-    }
-}
-
-@keyframes bs-notify-fadeOut {
-    0% {
-        opacity: .9
-    }
-
-    100% {
-        opacity: 0
-    }
-}
-
-.bootstrap-select>select.bs-select-hidden,
-select.bs-select-hidden,
-select.selectpicker {
-    display: none !important
-}
-
-.bootstrap-select {
-    width: 220px;
-    vertical-align: middle
-}
-
-.bootstrap-select>.dropdown-toggle {
-    position: relative;
-    width: 100%;
-    text-align: right;
-    white-space: nowrap;
-    display: -webkit-inline-box;
-    display: -webkit-inline-flex;
-    display: -ms-inline-flexbox;
-    display: inline-flex;
-    -webkit-box-align: center;
-    -webkit-align-items: center;
-    -ms-flex-align: center;
-    align-items: center;
-    -webkit-box-pack: justify;
-    -webkit-justify-content: space-between;
-    -ms-flex-pack: justify;
-    justify-content: space-between
-}
-
-.bootstrap-select>.dropdown-toggle:after {
-    margin-top: -1px
-}
-
-.bootstrap-select>.dropdown-toggle.bs-placeholder,
-.bootstrap-select>.dropdown-toggle.bs-placeholder:active,
-.bootstrap-select>.dropdown-toggle.bs-placeholder:focus,
-.bootstrap-select>.dropdown-toggle.bs-placeholder:hover {
-    color: #999
-}
-
-.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-danger,
-.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-danger:active,
-.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-danger:focus,
-.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-danger:hover,
-.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-dark,
-.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-dark:active,
-.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-dark:focus,
-.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-dark:hover,
-.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-info,
-.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-info:active,
-.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-info:focus,
-.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-info:hover,
-.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-primary,
-.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-primary:active,
-.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-primary:focus,
-.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-primary:hover,
-.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-secondary,
-.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-secondary:active,
-.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-secondary:focus,
-.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-secondary:hover,
-.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-success,
-.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-success:active,
-.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-success:focus,
-.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-success:hover {
-    color: rgba(255, 255, 255, .5)
-}
-
-.bootstrap-select>select {
-    position: absolute !important;
-    bottom: 0;
-    left: 50%;
-    display: block !important;
-    width: .5px !important;
-    height: 100% !important;
-    padding: 0 !important;
-    opacity: 0 !important;
-    border: none;
-    z-index: 0 !important
-}
-
-.bootstrap-select>select.mobile-device {
-    top: 0;
-    left: 0;
-    display: block !important;
-    width: 100% !important;
-    z-index: 2 !important
-}
-
-.bootstrap-select.is-invalid .dropdown-toggle,
-.error .bootstrap-select .dropdown-toggle,
-.has-error .bootstrap-select .dropdown-toggle,
-.was-validated .bootstrap-select select:invalid+.dropdown-toggle {
-    border-color: #b94a48
-}
-
-.bootstrap-select.is-valid .dropdown-toggle,
-.was-validated .bootstrap-select select:valid+.dropdown-toggle {
-    border-color: #28a745
-}
-
-.bootstrap-select.fit-width {
-    width: auto !important
-}
-
-.bootstrap-select:not([class*=col-]):not([class*=form-control]):not(.input-group-btn) {
-    width: 220px
-}
-
-.bootstrap-select .dropdown-toggle:focus,
-.bootstrap-select>select.mobile-device:focus+.dropdown-toggle {
-    outline: thin dotted #333 !important;
-    outline: 5px auto -webkit-focus-ring-color !important;
-    outline-offset: -2px
-}
-
-.bootstrap-select.form-control {
-    margin-bottom: 0;
-    padding: 0;
-    border: none;
-    height: auto
-}
-
-:not(.input-group)>.bootstrap-select.form-control:not([class*=col-]) {
-    width: 100%
-}
-
-.bootstrap-select.form-control.input-group-btn {
-    float: none;
-    z-index: auto
-}
-
-.form-inline .bootstrap-select,
-.form-inline .bootstrap-select.form-control:not([class*=col-]) {
-    width: auto
-}
-
-.bootstrap-select:not(.input-group-btn),
-.bootstrap-select[class*=col-] {
-    float: none;
-    display: inline-block;
-    margin-left: 0
-}
-
-.bootstrap-select.dropdown-menu-right,
-.bootstrap-select[class*=col-].dropdown-menu-right,
-.row .bootstrap-select[class*=col-].dropdown-menu-right {
-    float: right
-}
-
-.form-group .bootstrap-select,
-.form-horizontal .bootstrap-select,
-.form-inline .bootstrap-select {
-    margin-bottom: 0
-}
-
-.form-group-lg .bootstrap-select.form-control,
-.form-group-sm .bootstrap-select.form-control {
-    padding: 0
-}
-
-.form-group-lg .bootstrap-select.form-control .dropdown-toggle,
-.form-group-sm .bootstrap-select.form-control .dropdown-toggle {
-    height: 100%;
-    font-size: inherit;
-    line-height: inherit;
-    border-radius: inherit
-}
-
-.bootstrap-select.form-control-lg .dropdown-toggle,
-.bootstrap-select.form-control-sm .dropdown-toggle {
-    font-size: inherit;
-    line-height: inherit;
-    border-radius: inherit
-}
-
-.bootstrap-select.form-control-sm .dropdown-toggle {
-    padding: .25rem .5rem
-}
-
-.bootstrap-select.form-control-lg .dropdown-toggle {
-    padding: .5rem 1rem
-}
-
-.form-inline .bootstrap-select .form-control {
-    width: 100%
-}
-
-.bootstrap-select.disabled,
-.bootstrap-select>.disabled {
-    cursor: not-allowed
-}
-
-.bootstrap-select.disabled:focus,
-.bootstrap-select>.disabled:focus {
-    outline: 0 !important
-}
-
-.bootstrap-select.bs-container {
-    position: absolute;
-    top: 0;
-    left: 0;
-    height: 0 !important;
-    padding: 0 !important
-}
-
-.bootstrap-select.bs-container .dropdown-menu {
-    z-index: 1060
-}
-
-.bootstrap-select .dropdown-toggle .filter-option {
-    position: static;
-    top: 0;
-    left: 0;
-    float: left;
-    height: 100%;
-    width: 100%;
-    text-align: left;
-    overflow: hidden;
-    -webkit-box-flex: 0;
-    -webkit-flex: 0 1 auto;
-    -ms-flex: 0 1 auto;
-    flex: 0 1 auto
-}
-
-.bs3.bootstrap-select .dropdown-toggle .filter-option {
-    padding-right: inherit
-}
-
-.input-group .bs3-has-addon.bootstrap-select .dropdown-toggle .filter-option {
-    position: absolute;
-    padding-top: inherit;
-    padding-bottom: inherit;
-    padding-left: inherit;
-    float: none
-}
-
-.input-group .bs3-has-addon.bootstrap-select .dropdown-toggle .filter-option .filter-option-inner {
-    padding-right: inherit
-}
-
-.bootstrap-select .dropdown-toggle .filter-option-inner-inner {
-    overflow: hidden
-}
-
-.bootstrap-select .dropdown-toggle .filter-expand {
-    width: 0 !important;
-    float: left;
-    opacity: 0 !important;
-    overflow: hidden
-}
-
-.bootstrap-select .dropdown-toggle .caret {
-    position: absolute;
-    top: 50%;
-    right: 12px;
-    margin-top: -2px;
-    vertical-align: middle
-}
-
-.input-group .bootstrap-select.form-control .dropdown-toggle {
-    border-radius: inherit
-}
-
-.bootstrap-select[class*=col-] .dropdown-toggle {
-    width: 100%
-}
-
-.bootstrap-select .dropdown-menu {
-    min-width: 100%;
-    -webkit-box-sizing: border-box;
-    -moz-box-sizing: border-box;
-    box-sizing: border-box
-}
-
-.bootstrap-select .dropdown-menu>.inner:focus {
-    outline: 0 !important
-}
-
-.bootstrap-select .dropdown-menu.inner {
-    position: static;
-    float: none;
-    border: 0;
-    padding: 0;
-    margin: 0;
-    border-radius: 0;
-    -webkit-box-shadow: none;
-    box-shadow: none
-}
-
-.bootstrap-select .dropdown-menu li {
-    position: relative
-}
-
-.bootstrap-select .dropdown-menu li.active small {
-    color: rgba(255, 255, 255, .5) !important
-}
-
-.bootstrap-select .dropdown-menu li.disabled a {
-    cursor: not-allowed
-}
-
-.bootstrap-select .dropdown-menu li a {
-    cursor: pointer;
-    -webkit-user-select: none;
-    -moz-user-select: none;
-    -ms-user-select: none;
-    user-select: none
-}
-
-.bootstrap-select .dropdown-menu li a.opt {
-    position: relative;
-    padding-left: 2.25em
-}
-
-.bootstrap-select .dropdown-menu li a span.check-mark {
-    display: none
-}
-
-.bootstrap-select .dropdown-menu li a span.text {
-    display: inline-block
-}
-
-.bootstrap-select .dropdown-menu li small {
-    padding-left: .5em
-}
-
-.bootstrap-select .dropdown-menu .notify {
-    position: absolute;
-    bottom: 5px;
-    width: 96%;
-    margin: 0 2%;
-    min-height: 26px;
-    padding: 3px 5px;
-    background: #f5f5f5;
-    border: 1px solid #e3e3e3;
-    -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .05);
-    box-shadow: inset 0 1px 1px rgba(0, 0, 0, .05);
-    pointer-events: none;
-    opacity: .9;
-    -webkit-box-sizing: border-box;
-    -moz-box-sizing: border-box;
-    box-sizing: border-box
-}
-
-.bootstrap-select .dropdown-menu .notify.fadeOut {
-    -webkit-animation: .3s linear 750ms forwards bs-notify-fadeOut;
-    -o-animation: .3s linear 750ms forwards bs-notify-fadeOut;
-    animation: .3s linear 750ms forwards bs-notify-fadeOut
-}
-
-.bootstrap-select .no-results {
-    padding: 3px;
-    background: #f5f5f5;
-    margin: 0 5px;
-    white-space: nowrap
-}
-
-.bootstrap-select.fit-width .dropdown-toggle .filter-option {
-    position: static;
-    display: inline;
-    padding: 0
-}
-
-.bootstrap-select.fit-width .dropdown-toggle .filter-option-inner,
-.bootstrap-select.fit-width .dropdown-toggle .filter-option-inner-inner {
-    display: inline
-}
-
-.bootstrap-select.fit-width .dropdown-toggle .bs-caret:before {
-    content: '\00a0'
-}
-
-.bootstrap-select.fit-width .dropdown-toggle .caret {
-    position: static;
-    top: auto;
-    margin-top: -1px
-}
-
-.bootstrap-select.show-tick .dropdown-menu .selected span.check-mark {
-    position: absolute;
-    display: inline-block;
-    right: 15px;
-    top: 5px
-}
-
-.bootstrap-select.show-tick .dropdown-menu li a span.text {
-    margin-right: 34px
-}
-
-.bootstrap-select .bs-ok-default:after {
-    content: '';
-    display: block;
-    width: .5em;
-    height: 1em;
-    border-style: solid;
-    border-width: 0 .26em .26em 0;
-    -webkit-transform-style: preserve-3d;
-    transform-style: preserve-3d;
-    -webkit-transform: rotate(45deg);
-    -ms-transform: rotate(45deg);
-    -o-transform: rotate(45deg);
-    transform: rotate(45deg)
-}
-
-.bootstrap-select.show-menu-arrow.open>.dropdown-toggle,
-.bootstrap-select.show-menu-arrow.show>.dropdown-toggle {
-    z-index: 1061
-}
-
-.bootstrap-select.show-menu-arrow .dropdown-toggle .filter-option:before {
-    content: '';
-    border-left: 7px solid transparent;
-    border-right: 7px solid transparent;
-    border-bottom: 7px solid rgba(204, 204, 204, .2);
-    position: absolute;
-    bottom: -4px;
-    left: 9px;
-    display: none
-}
-
-.bootstrap-select.show-menu-arrow .dropdown-toggle .filter-option:after {
-    content: '';
-    border-left: 6px solid transparent;
-    border-right: 6px solid transparent;
-    border-bottom: 6px solid #fff;
-    position: absolute;
-    bottom: -4px;
-    left: 10px;
-    display: none
-}
-
-.bootstrap-select.show-menu-arrow.dropup .dropdown-toggle .filter-option:before {
-    bottom: auto;
-    top: -4px;
-    border-top: 7px solid rgba(204, 204, 204, .2);
-    border-bottom: 0
-}
-
-.bootstrap-select.show-menu-arrow.dropup .dropdown-toggle .filter-option:after {
-    bottom: auto;
-    top: -4px;
-    border-top: 6px solid #fff;
-    border-bottom: 0
-}
-
-.bootstrap-select.show-menu-arrow.pull-right .dropdown-toggle .filter-option:before {
-    right: 12px;
-    left: auto
-}
-
-.bootstrap-select.show-menu-arrow.pull-right .dropdown-toggle .filter-option:after {
-    right: 13px;
-    left: auto
-}
-
-.bootstrap-select.show-menu-arrow.open>.dropdown-toggle .filter-option:after,
-.bootstrap-select.show-menu-arrow.open>.dropdown-toggle .filter-option:before,
-.bootstrap-select.show-menu-arrow.show>.dropdown-toggle .filter-option:after,
-.bootstrap-select.show-menu-arrow.show>.dropdown-toggle .filter-option:before {
-    display: block
-}
-
-.bs-actionsbox,
-.bs-donebutton,
-.bs-searchbox {
-    padding: 4px 8px
-}
-
-.bs-actionsbox {
-    width: 100%;
-    -webkit-box-sizing: border-box;
-    -moz-box-sizing: border-box;
-    box-sizing: border-box
-}
-
-.bs-actionsbox .btn-group button {
-    width: 50%
-}
-
-.bs-donebutton {
-    float: left;
-    width: 100%;
-    -webkit-box-sizing: border-box;
-    -moz-box-sizing: border-box;
-    box-sizing: border-box
-}
-
-.bs-donebutton .btn-group button {
-    width: 100%
-}
-
-.bs-searchbox+.bs-actionsbox {
-    padding: 0 8px 4px
-}
-
-.bs-searchbox .form-control {
-    margin-bottom: 0;
-    width: 100%;
-    float: none
-}

app/frontend/static/assets/js/shared/root-dir.js

@@ -41,7 +41,7 @@ async function getTreeView(path, unzip = false, upload = false) {
     let responseData = await res.json();
     if (responseData.status === "ok") {
         console.log(responseData);
-        process_tree_response(responseData, unzip);
+        process_tree_response(responseData);
         let x = document.querySelector('.bootbox');
         if (x) {
             x.remove()
@@ -61,7 +61,7 @@ async function getTreeView(path, unzip = false, upload = false) {
     }
 }
 
-function process_tree_response(response, unzip) {
+function process_tree_response(response) {
     const styles = window.getComputedStyle(document.getElementById("lower_half"));
     //If this value is still hidden we know the user is executing a zip import and not an upload
     if (styles.visibility === "hidden") {
@@ -70,9 +70,7 @@ function process_tree_response(response, unzip) {
         document.getElementById('upload_submit').disabled = false;
     }
     let path = response.data.root_path.path;
-    if (unzip) {
     $(".root-input").val(response.data.root_path.path);
-    }
     let text = `<ul class="tree-nested d-block" id="${path}ul">`;
     Object.entries(response.data).forEach(([key, value]) => {
         if (key === "root_path" || key === "db_stats") {
@@ -85,7 +83,7 @@ function process_tree_response(response, unzip) {
         if (value.dir) {
             text += `<li class="tree-item" id="${dpath}li"  data-path="${dpath}">
                     <div id="${dpath}" data-path="${dpath}" data-name="${filename}" class="tree-caret tree-ctx-item tree-folder">
-                    <input type="radio" class="root-input" name="root_path" value="${dpath}">
+                    <input type="radio" name="root_path" value="${dpath}">
                     <span id="${dpath}span" class="files-tree-title" data-path="${dpath}" data-name="${filename}" onclick="getDirView(event)">
                       <i style="color: var(--info);" class="far fa-folder"></i>
                       <i style="color: var(--info);" class="far fa-folder-open"></i>

app/frontend/static/assets/js/shared/upload.js

@@ -1,208 +0,0 @@
-async function uploadFile(type, file = null, path = null, file_num = 0, _onProgress = null) {
-    if (file == null) {
-        try {
-            file = $("#file")[0].files[0];
-        } catch {
-            bootbox.alert("Please select a file first.")
-            return;
-        }
-
-    }
-    const fileId = uuidv4();
-    const token = getCookie("_xsrf");
-    if (type !== "server_upload") {
-        document.getElementById("upload_input").innerHTML = '<div class="progress" style="width: 100%;"><div id="upload-progress-bar" class="progress-bar progress-bar-striped progress-bar-animated" role="progressbar" aria-valuenow="100" aria-valuemin="0" aria-valuemax="100" style="width: 100%">&nbsp;<i class="fa-solid fa-spinner"></i></div></div>';
-    }
-
-    let url = ``
-    if (type === "server_upload") {
-        url = `/api/v2/servers/${serverId}/files/upload/`;
-    } else if (type === "background") {
-        url = `/api/v2/crafty/admin/upload/`
-    } else if (type === "import") {
-        url = `/api/v2/servers/import/upload/`
-    }
-    console.log(url)
-    const chunkSize = 1024 * 1024 * 10; // 10MB
-    const totalChunks = Math.ceil(file.size / chunkSize);
-
-    const uploadPromises = [];
-    let errors = []; // Array to store errors
-    try {
-        let res = await fetch(url, {
-            method: 'POST',
-            headers: {
-                'X-XSRFToken': token,
-                'chunked': true,
-                'fileSize': file.size,
-                'type': type,
-                'totalChunks': totalChunks,
-                'fileName': file.name,
-                'location': path,
-                'fileId': fileId,
-            },
-            body: null,
-        });
-
-        if (!res.ok) {
-            let errorResponse = await res.json();
-            throw new Error(JSON.stringify(errorResponse));
-        }
-
-        let responseData = await res.json();
-
-        if (responseData.status !== "ok") {
-            throw new Error(JSON.stringify(responseData));
-        }
-
-        for (let i = 0; i < totalChunks; i++) {
-            const start = i * chunkSize;
-            const end = Math.min(start + chunkSize, file.size);
-            const chunk = file.slice(start, end);
-            const chunk_hash = await calculateFileHash(chunk);
-
-            const uploadPromise = fetch(url, {
-                method: 'POST',
-                body: chunk,
-                headers: {
-                    'Content-Range': `bytes ${start}-${end - 1}/${file.size}`,
-                    'Content-Length': chunk.size,
-                    'fileSize': file.size,
-                    'chunkHash': chunk_hash,
-                    'chunked': true,
-                    'type': type,
-                    'totalChunks': totalChunks,
-                    'fileName': file.name,
-                    'location': path,
-                    'fileId': fileId,
-                    'chunkId': i,
-                },
-            })
-                .then(async response => {
-                    if (!response.ok) {
-                        const errorData = await response.json();
-                        throw new Error(JSON.stringify(errorData) || 'Unknown error occurred');
-                    }
-                    return response.json(); // Return the JSON data
-                })
-                .then(data => {
-                    if (data.status !== "completed" && data.status !== "partial") {
-                        throw new Error(data.message || 'Unknown error occurred');
-                    }
-                    // Update progress bar
-                    const progress = (i + 1) / totalChunks * 100;
-                    updateProgressBar(Math.round(progress), type, file_num);
-                })
-                .catch(error => {
-                    errors.push(error); // Store the error
-                });
-
-            uploadPromises.push(uploadPromise);
-        }
-
-        await Promise.all(uploadPromises);
-    } catch (error) {
-        errors.push(error); // Store the error
-    }
-
-    if (errors.length > 0) {
-        const errorMessage = errors.map(error => JSON.parse(error.message).data.message || 'Unknown error occurred').join('<br>');
-        console.log(errorMessage)
-        bootbox.alert({
-            title: 'Error',
-            message: errorMessage,
-            callback: function () {
-                window.location.reload();
-            },
-        });
-    } else if (type !== "server_upload") {
-        // All promises resolved successfully
-        $("#upload_input").html(`<div class="card-header header-sm d-flex justify-content-between align-items-center" style="width: 100%;"><input value="${file.name}" type="text" id="file-uploaded" disabled></input> 🔒</div>`);
-        if (type === "import") {
-            document.getElementById("lower_half").style.visibility = "visible";
-            document.getElementById("lower_half").hidden = false;
-        } else if (type === "background") {
-            setTimeout(function () {
-                location.href = `/panel/custom_login`;
-            }, 2000);
-        }
-    } else {
-        let caught = false;
-        let expanded = false;
-        try {
-            expanded = document.getElementById(path).classList.contains("clicked");
-        } catch { }
-
-        let par_el;
-        let items;
-        try {
-            par_el = document.getElementById(path + "ul");
-            items = par_el.children;
-        } catch (err) {
-            console.log(err);
-            caught = true;
-            par_el = document.getElementById("files-tree");
-            items = par_el.children;
-        }
-
-        let name = file.name;
-        let full_path = path + '/' + name;
-        let flag = false;
-
-        for (let item of items) {
-            if ($(item).attr("data-name") === name) {
-                flag = true;
-            }
-        }
-
-        if (!flag) {
-            if (caught && !expanded) {
-                $(par_el).append(`<li id="${full_path}li" class="d-block tree-ctx-item tree-file tree-item" data-path="${full_path}" data-name="${name}" onclick="clickOnFile(event)"><span style="margin-right: 6px;"><i class="far fa-file"></i></span>${name}</li>`);
-            } else if (expanded) {
-                $(par_el).append(`<li id="${full_path}li" class="tree-ctx-item tree-file tree-item" data-path="${full_path}" data-name="${name}" onclick="clickOnFile(event)"><span style="margin-right: 6px;"><i class="far fa-file"></i></span>${name}</li>`);
-            }
-            setTreeViewContext();
-        }
-
-        $(`#upload-progress-bar-${file_num + 1}`).removeClass("progress-bar-striped");
-        $(`#upload-progress-bar-${file_num + 1}`).addClass("bg-success");
-        $(`#upload-progress-bar-${file_num + 1}`).html('<i style="color: black;" class="fas fa-box-check"></i>');
-    }
-}
-
-async function calculateFileHash(file) {
-    const arrayBuffer = await file.arrayBuffer();
-    const hashBuffer = await crypto.subtle.digest('SHA-256', arrayBuffer);
-    const hashArray = Array.from(new Uint8Array(hashBuffer));
-    const hashHex = hashArray.map(b => b.toString(16).padStart(2, '0')).join('');
-
-    return hashHex;
-}
-
-function updateProgressBar(progress, type, i) {
-    if (type !== "server_upload") {
-        if (progress === 100) {
-            $(`#upload-progress-bar`).removeClass("progress-bar-striped")
-
-            $(`#upload-progress-bar`).removeClass("progress-bar-animated")
-        }
-        $(`#upload-progress-bar`).css('width', progress + '%');
-        $(`#upload-progress-bar`).html(progress + '%');
-    } else {
-        if (progress === 100) {
-            $(`#upload-progress-bar-${i + 1}`).removeClass("progress-bar-striped")
-
-            $(`#upload-progress-bar-${i + 1}`).removeClass("progress-bar-animated")
-        }
-        $(`#upload-progress-bar-${i + 1}`).css('width', progress + '%');
-        $(`#upload-progress-bar-${i + 1}`).html(progress + '%');
-    }
-}
-
-function uuidv4() {
-    return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
-        const r = Math.random() * 16 | 0,
-            v = c === 'x' ? r : (r & 0x3 | 0x8);
-        return v.toString(16);
-    });
-}

app/frontend/templates/main_menu.html

@@ -63,6 +63,9 @@
 <nav class="sidebar sidebar-offcanvas" id="sidebar">
   <ul class="nav">
 
+    <li class="nav-item nav-category" style="margin-top:10px;">{{ translate('sidebar', 'navigation', data['lang']) }}
+    </li>
+
     <li class="nav-item">
       <a class="nav-link" href="/panel/dashboard">
         <i class="fa-solid fa-diagram-project"></i>&nbsp;

app/frontend/templates/panel/custom_login.html

@@ -69,7 +69,7 @@
                             </div>
                             <div class="input-group-append">
                               <button type="button" class="btn btn-info upload-button" id="upload-button"
-                                onclick="uploadFile('background')" disabled>UPLOAD</button>
+                                onclick="sendFile()" disabled>UPLOAD</button>
                             </div>
                           </div>
                         </div>
@@ -381,6 +381,61 @@
     }
     img.src = src_path;
   }
+
+  var file;
+  function sendFile() {
+    file = $("#file")[0].files[0]
+    document.getElementById("upload_input").innerHTML = '<div class="progress" style="width: 100%"><div class="progress-bar progress-bar-striped progress-bar-animated" role="progressbar" aria-valuenow="100" aria-valuemin="0" aria-valuemax="100" style="width: 100%">&nbsp;<i class="fa-solid fa-spinner"></i></div></div>';
+    let xmlHttpRequest = new XMLHttpRequest();
+    let token = getCookie("_xsrf")
+    let fileName = file.name
+    let target = '/upload'
+    let mimeType = file.type
+    let size = file.size
+    let type = 'background'
+
+    xmlHttpRequest.upload.addEventListener('progress', function (e) {
+
+      if (e.loaded <= size) {
+        var percent = Math.round(e.loaded / size * 100);
+        $(`#upload-progress-bar`).css('width', percent + '%');
+        $(`#upload-progress-bar`).html(percent + '%');
+      }
+    });
+
+    xmlHttpRequest.open('POST', target, true);
+    xmlHttpRequest.setRequestHeader('X-Content-Type', mimeType);
+    xmlHttpRequest.setRequestHeader('X-XSRFToken', token);
+    xmlHttpRequest.setRequestHeader('X-Content-Length', size);
+    xmlHttpRequest.setRequestHeader('X-Content-Disposition', 'attachment; filename="' + fileName + '"');
+    xmlHttpRequest.setRequestHeader('X-Content-Upload-Type', type);
+    xmlHttpRequest.setRequestHeader('X-FileName', fileName);
+    xmlHttpRequest.addEventListener('load', (event) => {
+      if (event.target.responseText == 'success') {
+        console.log('Upload for file', file.name, 'was successful!')
+        document.getElementById("upload_input").innerHTML = '<div class="card-header header-sm d-flex justify-content-between align-items-center" style="width: 100%"><span id="file-uploaded" style="color: gray;">' + fileName + '</span> 🔒</div>';
+        setTimeout(function () {
+          window.location.reload();
+        }, 2000);
+      }
+      else {
+        let response_text = JSON.parse(event.target.responseText);
+        var x = document.querySelector('.bootbox');
+        console.log(JSON.parse(event.target.responseText).info)
+        bootbox.alert({
+          message: JSON.parse(event.target.responseText).info,
+          callback: function () {
+            window.location.reload();
+          }
+        });
+        doUpload = false;
+      }
+    }, false);
+    xmlHttpRequest.addEventListener('error', (e) => {
+      console.error('Error while uploading file', file.name + '.', 'Event:', e)
+    }, false);
+    xmlHttpRequest.send(file);
+  }
 </script>
-<script src="../../static/assets/js/shared/upload.js"></script>
+
 {% end %}

app/frontend/templates/panel/panel_edit_role.html

@@ -428,13 +428,10 @@
       if (responseData.status === "ok") {
         window.location.href = "/panel/panel_config";
       } else {
-        let errordata = responseData.error;
-        if (responseData.error_data){
-          errordata = responseData.error
-        }
+
         bootbox.alert({
           title: responseData.error,
-          message: errordata
+          message: responseData.error_data
         });
       }
     });

app/frontend/templates/panel/panel_edit_user.html

@@ -122,7 +122,7 @@ data['lang']) }}{% end %}
                           name="lang" form="user_form">
                           {% for lang in data['languages'] %}
                           {% if not 'incomplete' in lang %}
-                          <option value="{{lang}}" >{{translate('language', lang, 'humanized_index')}}</option>
+                          <option value="{{lang}}">{{lang}}</option>
                           {% else %}
                           <option value="{{lang}}" disabled>{{lang}}</option>
                           {% end %}
@@ -393,7 +393,6 @@ data['lang']) }}{% end %}
   }
   function replacer(key, value) {
       if (typeof value == "boolean" || key === "email" || key === "permissions" || key === "roles") {
-        console.log(key)
         return value
       } else {
         console.log(key, value)
@@ -434,7 +433,6 @@ data['lang']) }}{% end %}
       let disabled_flag = false;
       let roles = null;
       if (superuser || userId != edit_id){
-        console.log("ROLES")
         roles = $('.role_check').map(function() {
         if ($(this).attr("disabled")){
           disabled_flag = true;
@@ -459,7 +457,9 @@ data['lang']) }}{% end %}
         delete formDataObject.username
       }
       if (superuser || userId != edit_id){
+      if (!disabled_flag){
         formDataObject.roles = roles;
+      }
       if ($("#permissions").length){
         formDataObject.permissions = permissions;
       }

app/frontend/templates/panel/server_backup.html

@@ -39,151 +39,207 @@
           <span class="d-block d-sm-none">
             {% include "parts/m_server_controls_list.html %}
           </span>
+
           <div class="row">
-            <div class="col-md-12 col-sm-12" style="overflow-x:auto;">
-              <div class="card">
-                <div class="card-header header-sm d-flex justify-content-between align-items-center">
-                  <h4 class="card-title"><i class="fa-regular fa-bell"></i> {{ translate('serverBackups', 'backups',
-                    data['lang']) }} </h4>
-                  {% if data['user_data']['hints'] %}
-                  <span class="too_small" title="{{ translate('serverSchedules', 'cannotSee', data['lang']) }}" ,
-                    data-content="{{ translate('serverSchedules', 'cannotSeeOnMobile', data['lang']) }}" ,
-                    data-placement="bottom"></span>
+            <div class="col-md-6 col-sm-12">
+              <br>
+              <br>
+              {% if data['backing_up'] %}
+              <div class="progress" style="height: 15px;">
+                <div class="progress-bar progress-bar-striped progress-bar-animated" id="backup_progress_bar"
+                  role="progressbar" style="width:{{data['backup_stats']['percent']}}%;"
+                  aria-valuenow="{{data['backup_stats']['percent']}}" aria-valuemin="0" aria-valuemax="100">{{
+                  data['backup_stats']['percent'] }}%</div>
+              </div>
+              <p>Backing up <i class="fas fa-spin fa-spinner"></i> <span
+                  id="total_files">{{data['server_stats']['world_size']}}</span></p>
               {% end %}
-                  <div><a class="btn btn-info"
-                      href="/panel/add_backup?id={{ data['server_stats']['server_id']['server_id'] }}"><i
-                        class="fas fa-plus-circle"></i> {{ translate('serverBackups', 'newBackup', data['lang']) }}</a>
-                  </div>
-                </div>
-                <div class="card-body">
-                  {% if len(data['backups']) == 0 %}
-                  <div style="text-align: center; color: grey;">
-                    <h7>{{ translate('serverBackups', 'no-backup', data['lang']) }} <strong>{{
-                        translate('serverBackups', 'newBackup',data['lang']) }}</strong>.</h7>
+
+              <br>
+              {% if not data['backing_up'] %}
+              <div id="backup_button" class="form-group">
+                <button class="btn btn-primary" id="backup_now_button">{{ translate('serverBackups', 'backupNow',
+                  data['lang']) }}</button>
               </div>
               {% end %}
-                  {% if len(data['backups']) > 0 %}
-                  <div class="d-none d-lg-block">
-                    <table class="table table-hover responsive-table" aria-label="backups list" id="backup_table"
-                      style="table-layout:fixed;">
+              <form id="backup-form" class="forms-sample">
+                <div class="form-group">
+                  {% if data['super_user'] %}
+                  <label for="server_name">{{ translate('serverBackups', 'storageLocation', data['lang']) }} <small
+                      class="text-muted ml-1"> - {{ translate('serverBackups', 'storageLocationDesc', data['lang'])
+                      }}</small> </label>
+                  <input type="text" class="form-control" name="backup_path" id="backup_path"
+                    value="{{ data['server_stats']['server_id']['backup_path']  }}"
+                    placeholder="{{ translate('serverBackups', 'storageLocation', data['lang']) }}">
+                  {% end %}
+                </div>
+
+                <div class="form-group">
+                  <label for="server_path">{{ translate('serverBackups', 'maxBackups', data['lang']) }} <small
+                      class="text-muted ml-1"> - {{ translate('serverBackups', 'maxBackupsDesc', data['lang'])
+                      }}</small> </label>
+                  <input type="text" class="form-control" name="max_backups" id="max_backups"
+                    value="{{ data['backup_config']['max_backups']  }}"
+                    placeholder="{{ translate('serverBackups', 'maxBackups', data['lang']) }}">
+                </div>
+                <div class="form-group">
+                  <label for="compress" class="form-check-label ml-4 mb-4"></label>
+                  {% if data['backup_config']['compress'] %}
+                  <input type="checkbox" class="form-check-input" id="compress" name="compress" checked=""
+                    value="True">{{ translate('serverBackups', 'compress', data['lang']) }}
+                  {% else %}
+                  <input type="checkbox" class="form-check-input" id="compress" name="compress" value="True">{{
+                  translate('serverBackups', 'compress', data['lang']) }}
+                  {% end %}
+                </div>
+                <div class="form-group">
+                  <label for="shutdown" class="form-check-label ml-4 mb-4"></label>
+                  {% if data['backup_config']['shutdown'] %}
+                  <input type="checkbox" class="form-check-input" id="shutdown" name="shutdown" checked=""
+                    value="True">{{ translate('serverBackups', 'shutdown', data['lang']) }}
+                  {% else %}
+                  <input type="checkbox" class="form-check-input" id="shutdown" name="shutdown" value="True">{{
+                  translate('serverBackups', 'shutdown', data['lang']) }}
+                  {% end %}
+                </div>
+                <div class="form-group">
+                  <label for="command-check" class="form-check-label ml-4 mb-4"></label>
+                  {% if data['backup_config']['before'] %}
+                  <input type="checkbox" class="form-check-input" id="before-check" name="before-check" checked>{{
+                  translate('serverBackups', 'before', data['lang']) }}
+                  <br>
+                  <input type="text" class="form-control" name="backup_before" id="backup_before"
+                    value="{{ data['backup_config']['before'] }}" placeholder="We enter the / for you"
+                    style="display: inline-block;">
+                  {% else %}
+                  <input type="checkbox" class="form-check-input" id="before-check" name="before-check">{{
+                  translate('serverBackups', 'before', data['lang']) }}
+                  <br>
+                  <input type="text" class="form-control" name="backup_before" id="backup_before" value=""
+                    placeholder="We enter the / for you." style="display: none;">
+                  {% end %}
+                </div>
+                <div class="form-group">
+                  <label for="command-check" class="form-check-label ml-4 mb-4"></label>
+                  {% if data['backup_config']['after'] %}
+                  <input type="checkbox" class="form-check-input" id="after-check" name="after-check" checked>{{
+                  translate('serverBackups', 'after', data['lang']) }}
+                  <br>
+                  <input type="text" class="form-control" name="backup_after" id="backup_after"
+                    value="{{ data['backup_config']['after'] }}" placeholder="We enter the / for you"
+                    style="display: inline-block;">
+                  {% else %}
+                  <input type="checkbox" class="form-check-input" id="after-check" name="after-check">{{
+                  translate('serverBackups', 'after', data['lang']) }}
+                  <br>
+                  <input type="text" class="form-control" name="backup_after" id="backup_after" value=""
+                    placeholder="We enter the / for you." style="display: none;">
+                  {% end %}
+                </div>
+                <div class="form-group">
+                  <label for="server">{{ translate('serverBackups', 'exclusionsTitle', data['lang']) }} <small> - {{
+                      translate('serverBackups', 'excludedChoose', data['lang']) }}</small></label>
+                  <br>
+                  <button class="btn btn-primary mr-2" id="root_files_button"
+                    data-server_path="{{ data['server_stats']['server_id']['path']}}" type="button">{{
+                    translate('serverBackups', 'clickExclude', data['lang']) }}</button>
+                </div>
+                <div class="modal fade" id="dir_select" tabindex="-1" role="dialog" aria-labelledby="dir_select"
+                  aria-hidden="true">
+                  <div class="modal-dialog" role="document">
+                    <div class="modal-content">
+                      <div class="modal-header">
+                        <h5 class="modal-title" id="exampleModalLongTitle">{{ translate('serverBackups',
+                          'excludedChoose', data['lang']) }}</h5>
+                        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                          <span aria-hidden="true">&times;</span>
+                        </button>
+                      </div>
+                      <div class="modal-body">
+                        <div class="tree-ctx-item" id="main-tree-div" data-path=""
+                          style="overflow: scroll; max-height:75%;">
+                          <input type="checkbox" id="main-tree-input" name="root_path" value="" disabled>
+                          <span id="main-tree" class="files-tree-title tree-caret-down root-dir" data-path="">
+                            <i class="far fa-folder"></i>
+                            <i class="far fa-folder-open"></i>
+                            {{ translate('serverFiles', 'files', data['lang']) }}
+                          </span>
+                          </input>
+                        </div>
+                      </div>
+                      <div class="modal-footer">
+                        <button type="button" id="modal-cancel" class="btn btn-secondary" data-dismiss="modal"><i class="fa-solid fa-xmark"></i></button>
+                        <button type="button" id="modal-okay" data-dismiss="modal" class="btn btn-primary"><i class="fa-solid fa-thumbs-up"></i></button>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+
+                <button type="submit" class="btn btn-success mr-2">{{ translate('serverBackups', 'save', data['lang'])
+                  }}</button>
+                <button type="reset" class="btn btn-light">{{ translate('serverBackups', 'cancel', data['lang'])
+                  }}</button>
+              </form>
+            </div>
+
+            <div class="col-md-6 col-sm-12">
+              <div class="text-center">
+
+                <table class="table table-responsive dataTable" id="backup_table">
+                  <h4 class="card-title">{{ translate('serverBackups', 'currentBackups', data['lang']) }}</h4>
                   <thead>
-                        <tr class="rounded">
-                          <th scope="col" style="width: 15%; min-width: 10px;">{{ translate('serverBackups', 'name',
-                            data['lang']) }} </th>
-                          <th scope="col" style="width: 10%; min-width: 10px;">{{ translate('serverBackups', 'status',
-                            data['lang']) }} </th>
-                          <th scope="col" style="width: 50%; min-width: 50px;">{{ translate('serverBackups',
-                            'storageLocation', data['lang']) }}</th>
-                          <th scope="col" style="width: 10%; min-width: 50px;">{{ translate('serverBackups',
-                            'maxBackups', data['lang']) }}</th>
-                          <th scope="col" style="width: 10%; min-width: 50px;">{{ translate('serverBackups', 'actions',
-                            data['lang']) }}</th>
+                    <tr>
+                      <th width="10%">{{ translate('serverBackups', 'options', data['lang']) }}</th>
+                      <th>{{ translate('serverBackups', 'path', data['lang']) }}</th>
+                      <th width="20%">{{ translate('serverBackups', 'size', data['lang']) }}</th>
                     </tr>
                   </thead>
                   <tbody>
-                        {% for backup in data['backups'] %}
+                    {% for backup in data['backup_list'] %}
                     <tr>
-                          <td id="{{backup.backup_name}}" class="id">
-                            <p>{{backup.backup_name}}</p>
-                            <br>
-                            {% if backup.default %}
-                            <span class="badge-pill badge-outline-warning">{{ translate('serverBackups', 'default',
-                              data['lang']) }}</span><small><button class="badge-pill badge-outline-info backup-explain"
-                                data-explain="{{ translate('serverBackups', 'defaultExplain', data['lang'])}}"><i
-                                  class="fa-solid fa-question"></i></button></small>
-                            {% end %}
-                          </td>
                       <td>
-                            <div id="{{backup.backup_id}}_status">
-                              <button class="btn btn-outline-success backup-status" data-status="{{ backup.status }}"
-                                data-Standby="{{ translate('serverBackups', 'standby', data['lang'])}}"
-                                data-Failed="{{ translate('serverBackups', 'failed', data['lang'])}}"></button>
-                            </div>
-                          </td>
-                          <td id="{{backup.backup_location}}" class="type">
-                            <p style="overflow: scroll;" class="no-scroll">{{backup.backup_location}}</p>
-                          </td>
-                          <td id="{{backup.max_backups}}" class="trigger" style="overflow: scroll; max-width: 30px;">
-                            <p>{{backup.max_backups}}</p>
-                          </td>
-                          <td id="backup_edit" class="action">
-                            <button
-                              onclick="window.location.href=`/panel/edit_backup?id={{ data['server_stats']['server_id']['server_id'] }}&backup_id={{backup.backup_id}}`"
-                              class="btn btn-info">
-                              <i class="fas fa-pencil-alt"></i>
-                            </button>
-                            {% if not backup.default %}
-                            <button data-backup={{ backup.backup_id }} class="btn btn-danger del_button">
+                        <a href="/panel/download_backup?file={{ backup['path'] }}&id={{ data['server_stats']['server_id']['server_id'] }}"
+                          class="btn btn-primary">
+                          <i class="fas fa-download" aria-hidden="true"></i>
+                          {{ translate('serverBackups', 'download', data['lang']) }}
+                        </a>
+                        <br>
+                        <br>
+                        <button data-file="{{ backup['path'] }}" data-backup_path="{{ data['backup_path'] }}"
+                          class="btn btn-danger del_button">
                           <i class="fas fa-trash" aria-hidden="true"></i>
+                          {{ translate('serverBackups', 'delete', data['lang']) }}
                         </button>
-                            {% end %}
-                            <button data-backup={{ backup.backup_id }} data-toggle="tooltip"
-                              title="{{ translate('serverBackups', 'run', data['lang']) }}"
-                              class="btn btn-outline-warning run-backup backup_now_button">
-                              <i class="fa-solid fa-forward"></i>
+                        <button data-file="{{ backup['path'] }}" class="btn btn-warning restore_button">
+                          <i class="fas fa-undo-alt" aria-hidden="true"></i>
+                          {{ translate('serverBackups', 'restore', data['lang']) }}
                         </button>
                       </td>
+                      <td>{{ backup['path'] }}</td>
+                      <td>{{ backup['size'] }}</td>
                     </tr>
                     {% end %}
+
                   </tbody>
                 </table>
+
               </div>
-                  <div class="d-block d-lg-none">
-                    <table aria-label="backups list" class="table table-hover responsive-table" id="backup_table_mini"
-                      style="table-layout:fixed;">
-                      <thead>
-                        <tr class="rounded">
-                          <th style="width: 40%; min-width: 10px;">Name
-                          </th>
-                          <th style="width: 40%; min-width: 50px;">{{ translate('serverBackups', 'edit', data['lang'])
-                            }}</th>
-                        </tr>
-                      </thead>
-                      <tbody>
-                        {% for backup in data['backups'] %}
-                        <tr>
-                          <td id="{{backup.backup_name}}" class="id">
-                            <p>{{backup.backup_name}}</p>
+            </div>
+          </div>
+          <div class="col-md-12 col-sm-12">
             <br>
-                            <div id="{{backup.backup_id}}_status">
-                              <button class="btn btn-outline-success backup-status" data-status="{{ backup.status }}"
-                                data-Standby="{{ translate('serverBackups', 'standby', data['lang'])}}"
-                                data-Failed="{{ translate('serverBackups', 'failed', data['lang'])}}"></button>
+            <br>
+            <div class="card-header header-sm d-flex justify-content-between align-items-center">
+              <h4 class="card-title"><i class="fas fa-server"></i> {{ translate('serverBackups', 'excludedBackups',
+                data['lang']) }} <small class="text-muted ml-1"></small> </h4>
             </div>
             <br>
-                            {% if backup.default %}
-                            <span class="badge-pill badge-outline-warning">{{ translate('serverBackups', 'default',
-                              data['lang']) }}</span><small><button class="badge-pill badge-outline-info backup-explain"
-                                data-explain="{{ translate('serverBackups', 'defaultExplain', data['lang'])}}"><i
-                                  class="fa-solid fa-question"></i></button></small>
+            <ul>
+              {% for item in data['exclusions'] %}
+              <li>{{item}}</li>
+              <br>
               {% end %}
-                          </td>
-                          <td id="backup_edit" class="action">
-                            <button
-                              onclick="window.location.href=`/panel/edit_backup?id={{ data['server_stats']['server_id']['server_id'] }}&backup_id={{backup.backup_id}}`"
-                              class="btn btn-info">
-                              <i class="fas fa-pencil-alt"></i>
-                            </button>
-                            {% if not backup.default %}
-                            <button data-backup={{ backup.backup_id }} class="btn btn-danger del_button">
-                              <i class="fas fa-trash" aria-hidden="true"></i>
-                            </button>
-                            {% end %}
-                            <button data-backup={{ backup.backup_id }} data-toggle="tooltip"
-                              title="{{ translate('serverBackups', 'run', data['lang']) }}"
-                              class="btn btn-outline-warning test-socket backup_now_button">
-                              <i class="fa-solid fa-forward"></i>
-                            </button>
-                          </td>
-                        </tr>
-                        {% end %}
-                      </tbody>
-                    </table>
-                  </div>
-                  {% end %}
-                </div>
-              </div>
-            </div>
+            </ul>
           </div>
 
         </div>
@@ -242,7 +298,7 @@
 {% block js %}
 <script>
 
-  const serverId = new URLSearchParams(document.location.search).get('id')
+  const server_id = new URLSearchParams(document.location.search).get('id')
 
 
   //used to get cookies from browser - this is part of tornados xsrf protection - it's for extra security
@@ -251,10 +307,9 @@
     return r ? r[1] : undefined;
   }
 
-  async function backup_started(backup_id) {
+  async function backup_started() {
     const token = getCookie("_xsrf")
-    console.log(backup_id)
-    let res = await fetch(`/api/v2/servers/${serverId}/action/backup_server/${backup_id}/`, {
+    let res = await fetch(`/api/v2/servers/${server_id}/action/backup_server`, {
         method: 'POST',
         headers: {
           'X-XSRFToken': token
@@ -263,7 +318,14 @@
       let responseData = await res.json();
       if (responseData.status === "ok") {
         console.log(responseData);
-      $("#backup_button").prop('disabled', true)
+        $("#backup_button").html(`<div class="progress" style="height: 15px;">
+                  <div class="progress-bar progress-bar-striped progress-bar-animated" id="backup_progress_bar"
+                    role="progressbar" style="width:{{data['backup_stats']['percent']}}%;"
+                    aria-valuenow="{{data['backup_stats']['percent']}}" aria-valuemin="0" aria-valuemax="100">{{
+                    data['backup_stats']['percent'] }}%</div>
+                </div>
+                <p>Backing up <i class="fas fa-spin fa-spinner"></i> <span
+                    id="total_files">{{data['server_stats']['world_size']}}</span></p>`);
       } else {
 
         bootbox.alert({
@@ -273,82 +335,154 @@
       }
     return;
   }
-  async function del_backup(backup_id) {
+  async function del_backup(filename, id) {
     const token = getCookie("_xsrf")
-    let res = await fetch(`/api/v2/servers/${serverId}/backups/backup/${backup_id}`, {
+    let contents = JSON.stringify({"filename": filename})
+    let res = await fetch(`/api/v2/servers/${id}/backups/backup/`, {
       method: 'DELETE',
       headers: {
         'token': token,
       },
-      body: {}
+      body: contents
+    });
+    let responseData = await res.json();
+    if (responseData.status === "ok") {
+      window.location.reload();
+    }else{
+      bootbox.alert({"title": responseData.status,
+                    "message": responseData.error})
+    }
+  }
+
+  async function restore_backup(filename, id) {
+    const token = getCookie("_xsrf")
+    let contents = JSON.stringify({"filename": filename})
+    var dialog = bootbox.dialog({
+      message: "<i class='fa fa-spin fa-spinner'></i> {{ translate('serverBackups', 'restoring', data['lang']) }}",
+      closeButton: false
+    });
+    let res = await fetch(`/api/v2/servers/${id}/backups/backup/`, {
+      method: 'POST',
+      headers: {
+        'token': token,
+      },
+      body: contents
+    });
+    let responseData = await res.json();
+    if (responseData.status === "ok") {
+      window.location.href = "/panel/dashboard";
+    }else{
+      bootbox.alert({"title": responseData.status,
+                    "message": responseData.error})
+    }
+  }
+
+  $("#before-check").on("click", function () {
+    if ($("#before-check:checked").val()) {
+      $("#backup_before").css("display", "inline-block");
+    } else {
+      $("#backup_before").css("display", "none");
+      $("#backup_before").val("");
+    }
+  });
+  $("#after-check").on("click", function () {
+    if ($("#after-check:checked").val()) {
+      $("#backup_after").css("display", "inline-block");
+    } else {
+      $("#backup_after").css("display", "none");
+      $("#backup_after").val("");
+    }
+  });
+
+  function replacer(key, value) {
+    if (key != "backup_before" && key != "backup_after") {
+      if (typeof value == "boolean" || key === "executable_update_url") {
+        return value
+      } else {
+        return (isNaN(value) ? value : +value);
+      }
+    } else {
+      return value;
+    }
+  }
+
+  $(document).ready(function () {
+    $("#backup-form").on("submit", async function (e) {
+      e.preventDefault();
+      const token = getCookie("_xsrf")
+      let backupForm = document.getElementById("backup-form");
+
+      let formData = new FormData(backupForm);
+      //Remove checks that we don't need in form data.
+      formData.delete("after-check");
+      formData.delete("before-check");
+      //Create an object from the form data entries
+      let formDataObject = Object.fromEntries(formData.entries());
+      //We need to make sure these are sent regardless of whether or not they're checked
+      formDataObject.compress = $("#compress").prop('checked');
+      formDataObject.shutdown = $("#shutdown").prop('checked');
+      let excluded = [];
+      $('input.excluded:checkbox:checked').each(function () {
+        excluded.push($(this).val());
+      });
+      if ($("#root_files_button").hasClass("clicked")){
+        formDataObject.exclusions = excluded;
+      }
+      delete formDataObject.root_path
+      console.log(excluded);
+      console.log(formDataObject);
+      // Format the plain form data as JSON
+      let formDataJsonString = JSON.stringify(formDataObject, replacer);
+
+      console.log(formDataJsonString);
+
+      let res = await fetch(`/api/v2/servers/${server_id}/backups/`, {
+        method: 'PATCH',
+        headers: {
+          'X-XSRFToken': token
+        },
+        body: formDataJsonString,
       });
       let responseData = await res.json();
       if (responseData.status === "ok") {
         window.location.reload();
       } else {
+
         bootbox.alert({
-        "title": responseData.status,
-        "message": responseData.error
-      })
-    }
-  }
-
-  $(document).ready(function () {
-    console.log("ready!");
-    $(".backup-explain").on("click", function () {
-      bootbox.alert($(this).data("explain"));
+          title: responseData.error,
+          message: responseData.error_data
         });
-
-    $(".backup-status").on("click", function () {
-      if ($(this).data('message') != "") {
-        bootbox.alert($(this).data('message'));
       }
     });
-    $('.backup-status').each(function () {
-      // Get the JSON string from the element's text
-      var data = $(this).data('status');
 
     try {
+      if ($('#backup_path').val() == '') {
+        console.log('true')
+        try {
+          document.getElementById('backup_now_button').disabled = true;
+        } catch {
 
-        // Update the element's text with the status value
-        $(this).text($(this).data(data["status"].toLowerCase()));
-
-        // Optionally, add classes based on status to style the element
-        $(this).attr('data-message', data["message"]);
-        if (data.status === 'Active') {
-          $(this).removeClass();
-          $(this).addClass('badge-pill badge-outline-success btn');
-        } else if (data.status === 'Failed') {
-          $(this).removeClass();
-          $(this).addClass('badge-pill badge-outline-danger btn');
-        } else if (data.status === 'Standby') {
-          $(this).removeClass();
-          $(this).addClass('badge-pill badge-outline-secondary btn');
         }
-      } catch (e) {
-        console.error('Invalid JSON string:', e);
-      }
-    });
-
-    if (webSocket) {
-      webSocket.on('backup_status', function (backup) {
-        text = ``;
-        console.log(backup)
-        if (backup.percent >= 100) {
-          $(`#${backup.backup_id}_status`).html(`<span class="badge-pill badge-outline-success backup-status"
-        >Completed</span>`);
-          setTimeout(function () {
-            window.location.reload(1);
-          }, 5000);
       } else {
-          text = `<div class="progress-bar progress-bar-striped progress-bar-animated"
-          role="progressbar" style="width:${backup.percent}%;"
-          aria-valuenow="${backup.percent}" aria-valuemin="0" aria-valuemax="100">${backup.percent}%</div>`
+        document.getElementById('backup_now_button').disabled = false;
+      }
+    } catch {
+      try {
+        document.getElementById('backup_now_button').disabled = false;
+      } catch {
 
-          $(`#${backup.backup_id}_status`).html(text);
       }
+    }
+    console.log("ready!");
+    $("#backup_config_box").hide();
+    $("#backup_save_note").hide();
+
+    $("#show_config").click(function () {
+      $("#backup_config_box").toggle();
+      $('#backup_button').hide();
+      $('#backup_save_note').show();
+      $('#backup_data').hide();
     });
-    }
 
     $('#backup_table').DataTable({
       "order": [[1, "desc"]],
@@ -357,12 +491,11 @@
       "searching": true,
       "ordering": true,
       "info": true,
-      "autoWidth": true,
-      "responsive": false,
+      "autoWidth": false,
+      "responsive": true,
     });
 
     $(".del_button").click(function () {
-      let backup = $(this).data('backup');
       var file_to_del = $(this).data("file");
       var backup_path = $(this).data('backup_path');
 
@@ -382,8 +515,8 @@
         callback: function (result) {
           console.log(result);
           if (result == true) {
-
-            del_backup(backup);
+            var full_path = backup_path + '/' + file_to_del;
+            del_backup(file_to_del, server_id);
           }
         }
       });
@@ -408,13 +541,13 @@
         callback: function (result) {
           console.log(result);
           if (result == true) {
-            restore_backup(file_to_restore, serverId);
+            restore_backup(file_to_restore, server_id);
           }
         }
       });
     });
-    $(".backup_now_button").click(function () {
-      backup_started($(this).data('backup'));
+    $("#backup_now_button").click(function () {
+      backup_started();
     });
 
   });
@@ -458,25 +591,40 @@
       bootbox.alert("You must input a path before selecting this button");
     }
   });
+  if (webSocket) {
+    webSocket.on('backup_status', function (backup) {
+      if (backup.percent >= 100) {
+        document.getElementById('backup_progress_bar').innerHTML = '100%';
+        document.getElementById('backup_progress_bar').style.width = '100%';
+        setTimeout(function () {
+          window.location.reload(1);
+        }, 5000);
+      } else {
+        document.getElementById('backup_progress_bar').innerHTML = backup.percent + '%';
+        document.getElementById('backup_progress_bar').style.width = backup.percent + '%';
+        document.getElementById('total_files').innerHTML = backup.total_files;
+      }
+    });
+  }
 
-  function getDirView(event) {
+  function getDirView(event){
     let path = event.target.parentElement.getAttribute("data-path");
     if (document.getElementById(path).classList.contains('clicked')) {
       return;
-    } else {
+    }else{
       getTreeView(path);
     }
 
   }
-  async function getTreeView(path) {
+  async function getTreeView(path){
     console.log(path)
     const token = getCookie("_xsrf");
-    let res = await fetch(`/api/v2/servers/${serverId}/files`, {
+    let res = await fetch(`/api/v2/servers/${server_id}/files`, {
         method: 'POST',
         headers: {
           'X-XSRFToken': token
         },
-      body: JSON.stringify({ "page": "backups", "path": path }),
+        body: JSON.stringify({"page": "backups", "path": path}),
       });
       let responseData = await res.json();
       if (responseData.status === "ok") {
@@ -496,17 +644,17 @@
     let path = response.data.root_path.path;
     let text = `<ul class="tree-nested d-block" id="${path}ul">`;
       Object.entries(response.data).forEach(([key, value]) => {
-      if (key === "root_path" || key === "db_stats") {
+        if (key === "root_path" || key === "db_stats"){
           //continue is not valid in for each. Return acts as a continue.
           return;
         }
       let checked = ""
       let dpath = value.path;
       let filename = key;
-      if (value.excluded) {
+      if (value.excluded){
         checked = "checked"
       }
-      if (value.dir) {
+      if (value.dir){
         text += `<li class="tree-item" data-path="${dpath}">
                             \n<div id="${dpath}" data-path="${dpath}" data-name="${filename}" class="tree-caret tree-ctx-item tree-folder">
                             <input type="checkbox" class="checkBoxClass excluded" value="${dpath}" ${checked}>
@@ -516,7 +664,7 @@
                             <strong>${filename}</strong>
                             </span>
                             </input></div><li>`
-      } else {
+      }else{
         text += `<li
                         class="d-block tree-ctx-item tree-file"
                         data-path="${dpath}"
@@ -526,14 +674,14 @@
       }
     });
     text += `</ul>`;
-    if (response.data.root_path.top) {
+    if(response.data.root_path.top){
       try {
           document.getElementById('main-tree-div').innerHTML += text;
           document.getElementById('main-tree').parentElement.classList.add("clicked");
         } catch {
           document.getElementById('files-tree').innerHTML = text;
         }
-    } else {
+    }else{
       try {
             document.getElementById(path + "span").classList.add('tree-caret-down');
             document.getElementById(path).innerHTML += text;

app/frontend/templates/panel/server_backup_edit.html

@@ -1,758 +0,0 @@
-{% extends ../base.html %}
-
-{% block meta %}
-{% end %}
-
-{% block title %}Crafty Controller - {{ translate('serverDetails', 'serverDetails', data['lang']) }}{% end %}
-
-{% block content %}
-
-<div class="content-wrapper">
-
-  <!-- Page Title Header Starts-->
-  <div class="row page-title-header">
-    <div class="col-12">
-      <div class="page-header">
-        <h4 class="page-title">
-          {{ translate('serverDetails', 'serverDetails', data['lang']) }} - {{
-          data['server_stats']['server_id']['server_name'] }}
-          <br />
-          <small>UUID: {{ data['server_stats']['server_id']['server_id'] }}</small>
-        </h4>
-      </div>
-    </div>
-
-  </div>
-  <!-- Page Title Header Ends-->
-
-  {% include "parts/details_stats.html %}
-
-  <div class="row">
-
-    <div class="col-sm-12 grid-margin">
-      <div class="card">
-        <div class="card-body  pt-0">
-
-          <span class="d-none d-sm-block">
-            {% include "parts/server_controls_list.html %}
-          </span>
-          <span class="d-block d-sm-none">
-            {% include "parts/m_server_controls_list.html %}
-          </span>
-          <div class="row">
-            <div class="col-md-6 col-sm-12">
-              <br>
-              <br>
-              <div id="{{data['backup_config'].get('backup_id', None)}}_status" class="progress"
-                style="height: 15px; display: none;">
-              </div>
-              {% if data['backing_up'] %}
-              <p>Backing up <i class="fas fa-spin fa-spinner"></i> <span
-                  id="total_files">{{data['server_stats']['world_size']}}</span></p>
-              {% end %}
-
-              <br>
-              {% if not data['backing_up'] %}
-              <div id="backup_button" class="form-group">
-                <button class="btn btn-primary" id="backup_now_button">{{ translate('serverBackups', 'backupNow',
-                  data['lang']) }}</button>
-              </div>
-              {% end %}
-              <form id="backup-form" class="forms-sample">
-                <div class="form-group">
-                  <label for="backup_name">{{ translate('serverBackups', 'name', data['lang']) }}
-                    {% if data["backup_config"].get("default", None) %}
-                    &nbsp;&nbsp; <span class="badge-pill badge-outline-warning">{{ translate('serverBackups', 'default',
-                      data['lang']) }}</span><small><button class="badge-pill badge-outline-info backup-explain"
-                        data-explain="{{ translate('serverBackups', 'defaultExplain', data['lang'])}}"><i
-                          class="fa-solid fa-question"></i></button></small>
-                    {% end %}
-                  </label>
-                  {% if data["backup_config"].get("backup_id", None) %}
-                  <input type="text" class="form-control" name="backup_name" id="backup_name"
-                    value="{{ data['backup_config']['backup_name']  }}">
-                  {% else %}
-                  <input type="text" class="form-control" name="backup_name" id="backup_name"
-                    placeholder="{{ translate('serverBackups', 'myBackup', data['lang']) }}">
-                  {% end %}
-                  <br>
-                  <br>
-                  {% if data['super_user'] %}
-                  <label for="server_name">{{ translate('serverBackups', 'storageLocation', data['lang']) }} <small
-                      class="text-muted ml-1"> - {{ translate('serverBackups', 'storageLocationDesc', data['lang'])
-                      }}</small> </label>
-                  <input type="text" class="form-control" name="backup_location" id="backup_location"
-                    value="{{ data['backup_config']['backup_location']  }}"
-                    placeholder="{{ translate('serverBackups', 'storageLocation', data['lang']) }}">
-                  {% end %}
-                </div>
-
-                <div class="form-group">
-                  <label for="server_path">{{ translate('serverBackups', 'maxBackups', data['lang']) }} <small
-                      class="text-muted ml-1"> - {{ translate('serverBackups', 'maxBackupsDesc', data['lang'])
-                      }}</small> </label>
-                  <input type="text" class="form-control" name="max_backups" id="max_backups"
-                    value="{{ data['backup_config']['max_backups']  }}"
-                    placeholder="{{ translate('serverBackups', 'maxBackups', data['lang']) }}">
-                </div>
-                <div class="form-group">
-                  <div class="custom-control custom-switch">
-                    {% if data['backup_config']['compress'] %}
-                    <input type="checkbox" class="custom-control-input" id="compress" name="compress" checked=""
-                      value="True">
-                    {% else %}
-                    <input type="checkbox" class="custom-control-input" id="compress" name="compress" value="True">
-                    {% end %}
-                    <label for="compress" class="custom-control-label">{{ translate('serverBackups', 'compress',
-                      data['lang']) }}</label>
-                  </div>
-                </div>
-                <div class="form-group">
-                  <div class="custom-control custom-switch">
-                    {% if data['backup_config']['shutdown']%}
-                    <input type="checkbox" class="custom-control-input" id="shutdown" name="shutdown" checked=""
-                      value="True">
-                    {% else %}
-                    <input type="checkbox" class="custom-control-input" id="shutdown" name="shutdown" value="True">
-                    {% end %}
-                    <label for="shutdown" class="custom-control-label">{{ translate('serverBackups', 'shutdown',
-                      data['lang']) }}</label>
-                  </div>
-                </div>
-                <div class="form-group">
-                  <div class="custom-control custom-switch">
-                    {% if data['backup_config']['before'] %}
-                    <input type="checkbox" class="custom-control-input" id="before-check" name="before-check" checked>
-                    <input type="text" class="form-control hidden-input" name="before" id="backup_before"
-                      value="{{ data['backup_config']['before'] }}" placeholder="We enter the / for you"
-                      style="display: inline-block;">
-                    {% else %}
-                    <input type="checkbox" class="custom-control-input" id="before-check" name="before-check">
-                    <input type="text" class="form-control hidden-input" name="before" id="backup_before" value=""
-                      placeholder="We enter the / for you." style="display: none;">
-                    {% end %}
-                    <label for="before-check" class="custom-control-label">{{
-                      translate('serverBackups', 'before', data['lang']) }}</label>
-                  </div>
-                </div>
-                <div class="form-group">
-                  <div class="custom-control custom-switch">
-                    {% if data['backup_config']['after'] %}
-                    <input type="checkbox" class="custom-control-input" id="after-check" name="after-check" checked>
-                    <input type="text" class="form-control hidden-input" name="after" id="backup_after"
-                      value="{{ data['backup_config']['after'] }}" placeholder="We enter the / for you"
-                      style="display: inline-block;">
-                    <br>
-                    {% else %}
-                    <input type="checkbox" class="custom-control-input" id="after-check" name="after-check">
-                    <input type="text" class="form-control hidden-input" name="after" id="backup_after" value=""
-                      placeholder="We enter the / for you." style="display: none;">
-                    {% end %}
-                    <label for="after-check" class="custom-control-label">{{
-                      translate('serverBackups', 'after', data['lang']) }}</label>
-                  </div>
-                </div>
-                <div class="form-group">
-                  <label for="server">{{ translate('serverBackups', 'exclusionsTitle', data['lang']) }} <small> - {{
-                      translate('serverBackups', 'excludedChoose', data['lang']) }}</small></label>
-                  <br>
-                  <button class="btn btn-primary mr-2" id="root_files_button"
-                    data-server_path="{{ data['server_stats']['server_id']['path']}}" type="button">{{
-                    translate('serverBackups', 'clickExclude', data['lang']) }}</button>
-                </div>
-                <div class="modal fade" id="dir_select" tabindex="-1" aria-labelledby="dir_select" aria-hidden="true">
-                  <div class="modal-dialog">
-                    <div class="modal-content">
-                      <div class="modal-header">
-                        <h5 class="modal-title" id="exampleModalLongTitle">{{ translate('serverBackups',
-                          'excludedChoose', data['lang']) }}</h5>
-                        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-                          <span aria-hidden="true">&times;</span>
-                        </button>
-                      </div>
-                      <div class="modal-body">
-                        <div class="tree-ctx-item" id="main-tree-div" data-path=""
-                          style="overflow: scroll; max-height:75%;">
-                          <input type="checkbox" id="main-tree-input" name="root_path" value="" disabled>
-                          <span id="main-tree" class="files-tree-title tree-caret-down root-dir" data-path="">
-                            <i class="far fa-folder"></i>
-                            <i class="far fa-folder-open"></i>
-                            {{ translate('serverFiles', 'files', data['lang']) }}
-                          </span>
-                          </input>
-                        </div>
-                      </div>
-                      <div class="modal-footer">
-                        <button type="button" id="modal-cancel" class="btn btn-secondary" data-dismiss="modal"><i
-                            class="fa-solid fa-xmark"></i></button>
-                        <button type="button" id="modal-okay" data-dismiss="modal" class="btn btn-primary"><i
-                            class="fa-solid fa-thumbs-up"></i></button>
-                      </div>
-                    </div>
-                  </div>
-                </div>
-
-                <button type="submit" class="btn btn-success mr-2">{{ translate('serverBackups', 'save', data['lang'])
-                  }}</button>
-                <button type="reset" class="btn btn-light cancel-button">{{ translate('serverBackups', 'cancel',
-                  data['lang'])
-                  }}</button>
-              </form>
-            </div>
-
-            <div class="col-md-6 col-sm-12">
-              <div class="text-center">
-
-                <table class="table table-responsive dataTable" id="backup_table">
-                  <h4 class="card-title">{{ translate('serverBackups', 'currentBackups', data['lang']) }}</h4>
-                  <thead>
-                    <tr>
-                      <th>{{ translate('serverBackups', 'options', data['lang']) }}</th>
-                      <th>{{ translate('serverBackups', 'path', data['lang']) }}</th>
-                      <th>{{ translate('serverBackups', 'size', data['lang']) }}</th>
-                    </tr>
-                  </thead>
-                  <tbody>
-                    {% for backup in data['backup_list'] %}
-                    <tr>
-                      <td>
-                        <a href="/panel/download_backup?file={{ backup['path'] }}&id={{ data['server_stats']['server_id']['server_id'] }}&backup_id={{ data['backup_config']['backup_id']}}"
-                          class="btn btn-primary">
-                          <i class="fas fa-download" aria-hidden="true"></i>
-                          {{ translate('serverBackups', 'download', data['lang']) }}
-                        </a>
-                        <br>
-                        <br>
-                        <button data-file="{{ backup['path'] }}"
-                          data-backup_location="{{ data['backup_config']['backup_location'] }}"
-                          class="btn btn-danger del_button">
-                          <i class="fas fa-trash" aria-hidden="true"></i>
-                          {{ translate('serverBackups', 'delete', data['lang']) }}
-                        </button>
-                        <button data-file="{{ backup['path'] }}" class="btn btn-warning restore_button">
-                          <i class="fas fa-undo-alt" aria-hidden="true"></i>
-                          {{ translate('serverBackups', 'restore', data['lang']) }}
-                        </button>
-                      </td>
-                      <td>{{ backup['path'] }}</td>
-                      <td>{{ backup['size'] }}</td>
-                    </tr>
-                    {% end %}
-
-                  </tbody>
-                </table>
-
-              </div>
-            </div>
-          </div>
-          <div class="col-md-12 col-sm-12">
-            <br>
-            <br>
-            <div class="card-header header-sm d-flex justify-content-between align-items-center">
-              <h4 class="card-title"><i class="fas fa-server"></i> {{ translate('serverBackups', 'excludedBackups',
-                data['lang']) }} <small class="text-muted ml-1"></small> </h4>
-            </div>
-            <br>
-            <ul>
-              {% for item in data['exclusions'] %}
-              <li>{{item}}</li>
-              <br>
-              {% end %}
-            </ul>
-          </div>
-
-        </div>
-      </div>
-    </div>
-  </div>
-
-
-
-</div>
-<style>
-  /* Remove default bullets */
-  .tree-view,
-  .tree-nested {
-    list-style-type: none;
-    margin: 0;
-    padding: 0;
-    margin-left: 10px;
-  }
-
-  /* Style the items */
-  .tree-item,
-  .files-tree-title {
-    cursor: pointer;
-    user-select: none;
-    /* Prevent text selection */
-  }
-
-  /* Create the caret/arrow with a unicode, and style it */
-  .tree-caret .fa-folder {
-    display: inline-block;
-  }
-
-  .tree-caret .fa-folder-open {
-    display: none;
-  }
-
-  /* Rotate the caret/arrow icon when clicked on (using JavaScript) */
-  .tree-caret-down .fa-folder {
-    display: none;
-  }
-
-  .tree-caret-down .fa-folder-open {
-    display: inline-block;
-  }
-
-  /* Hide the nested list */
-  .tree-nested {
-    display: none;
-  }
-</style>
-<!-- content-wrapper ends -->
-
-{% end %}
-
-{% block js %}
-<script>
-
-  const server_id = new URLSearchParams(document.location.search).get('id')
-  const backup_id = new URLSearchParams(document.location.search).get('backup_id')
-
-
-  //used to get cookies from browser - this is part of tornados xsrf protection - it's for extra security
-  function getCookie(name) {
-    var r = document.cookie.match("\\b" + name + "=([^;]*)\\b");
-    return r ? r[1] : undefined;
-  }
-
-  async function backup_started() {
-    const token = getCookie("_xsrf")
-    let res = await fetch(`/api/v2/servers/${server_id}/action/backup_server/${backup_id}`, {
-      method: 'POST',
-      headers: {
-        'X-XSRFToken': token
-      }
-    });
-    let responseData = await res.json();
-    if (responseData.status === "ok") {
-      console.log(responseData);
-      $("#backup_button").prop('disabled', true)
-    } else {
-
-      bootbox.alert({
-        title: responseData.status,
-        message: responseData.error
-      });
-    }
-    return;
-  }
-  async function del_backup(filename, id) {
-    const token = getCookie("_xsrf")
-    let contents = JSON.stringify({ "filename": filename })
-    let res = await fetch(`/api/v2/servers/${server_id}/backups/backup/${backup_id}/files/`, {
-      method: 'DELETE',
-      headers: {
-        'token': token,
-      },
-      body: contents
-    });
-    let responseData = await res.json();
-    if (responseData.status === "ok") {
-      window.location.reload();
-    } else {
-      bootbox.alert({
-        "title": responseData.status,
-        "message": responseData.error
-      })
-    }
-  }
-
-  async function restore_backup(filename, id) {
-    const token = getCookie("_xsrf")
-    let contents = JSON.stringify({ "filename": filename })
-    var dialog = bootbox.dialog({
-      message: "<i class='fa fa-spin fa-spinner'></i> {{ translate('serverBackups', 'restoring', data['lang']) }}",
-      closeButton: false
-    });
-    let res = await fetch(`/api/v2/servers/${server_id}/backups/backup/${backup_id}/`, {
-      method: 'POST',
-      headers: {
-        'token': token,
-      },
-      body: contents
-    });
-    let responseData = await res.json();
-    if (responseData.status === "ok") {
-      window.location.href = "/panel/dashboard";
-    } else {
-      bootbox.alert({
-        "title": responseData.status,
-        "message": responseData.error
-      })
-    }
-  }
-
-  $("#before-check").on("click", function () {
-    if ($("#before-check:checked").val()) {
-      $("#backup_before").css("display", "inline-block");
-    } else {
-      $("#backup_before").css("display", "none");
-      $("#backup_before").val("");
-    }
-  });
-  $("#after-check").on("click", function () {
-    if ($("#after-check:checked").val()) {
-      $("#backup_after").css("display", "inline-block");
-    } else {
-      $("#backup_after").css("display", "none");
-      $("#backup_after").val("");
-    }
-  });
-
-  function replacer(key, value) {
-    if (key === "excluded_dirs") {
-      if (value == 0) {
-        return []
-      } else {
-        return value
-      }
-    }
-    if (key != "before" && key != "after") {
-      if (typeof value == "boolean" || key === "executable_update_url") {
-        return value
-      } else {
-        return (isNaN(value) ? value : +value);
-      }
-    } else {
-      return value;
-    }
-  }
-
-  $(document).ready(function () {
-    $(".backup-explain").on("click", function (e) {
-      e.preventDefault();
-      bootbox.alert($(this).data("explain"));
-    });
-    $(".cancel-button").on("click", function () {
-      location.href = `/panel/server_detail?id=${server_id}&subpage=backup`
-    });
-    webSocket.on('backup_status', function (backup) {
-      text = ``;
-      $(`#${backup.backup_id}_status`).show();
-      if (backup.percent >= 100) {
-        $(`#${backup.backup_id}_status`).hide()
-        setTimeout(function () {
-          window.location.reload(1);
-        }, 5000);
-      } else {
-        text = `<div class="progress-bar progress-bar-striped progress-bar-animated"
-          role="progressbar" style="width:${backup.percent}%;"
-          aria-valuenow="${backup.percent}" aria-valuemin="0" aria-valuemax="100">${backup.percent}%</div>`
-
-        $(`#${backup.backup_id}_status`).html(text);
-      }
-    });
-    $("#backup-form").on("submit", async function (e) {
-      e.preventDefault();
-      const token = getCookie("_xsrf")
-      let backupForm = document.getElementById("backup-form");
-
-      let formData = new FormData(backupForm);
-      //Remove checks that we don't need in form data.
-      formData.delete("after-check");
-      formData.delete("before-check");
-      //Create an object from the form data entries
-      let formDataObject = Object.fromEntries(formData.entries());
-      //We need to make sure these are sent regardless of whether or not they're checked
-      formDataObject.compress = $("#compress").prop('checked');
-      formDataObject.shutdown = $("#shutdown").prop('checked');
-      if ($("#root_files_button").hasClass("clicked")) {
-        excluded = []
-        $('input.excluded:checkbox:checked').each(function () {
-          excluded.push($(this).val());
-        });
-        formDataObject.excluded_dirs = excluded;
-      }
-      delete formDataObject.root_path
-      console.log(formDataObject);
-      // Format the plain form data as JSON
-      let formDataJsonString = JSON.stringify(formDataObject, replacer);
-
-      console.log(formDataJsonString);
-      let url = `/api/v2/servers/${server_id}/backups/backup/${backup_id}/`
-      let method = "PATCH"
-      if (!backup_id) {
-        url = `/api/v2/servers/${server_id}/backups/`
-        method = "POST";
-      }
-      let res = await fetch(url, {
-        method: method,
-        headers: {
-          'X-XSRFToken': token
-        },
-        body: formDataJsonString,
-      });
-      let responseData = await res.json();
-      if (responseData.status === "ok") {
-        window.location.href = `/panel/server_detail?id=${server_id}&subpage=backup`;
-      } else {
-
-        bootbox.alert({
-          title: responseData.error,
-          message: responseData.error_data
-        });
-      }
-    });
-
-    try {
-      if ($('#backup_location').val() == '') {
-        console.log('true')
-        try {
-          document.getElementById('backup_now_button').disabled = true;
-        } catch {
-
-        }
-      } else {
-        document.getElementById('backup_now_button').disabled = false;
-      }
-    } catch {
-      try {
-        document.getElementById('backup_now_button').disabled = false;
-      } catch {
-
-      }
-    }
-    console.log("ready!");
-    $("#backup_config_box").hide();
-    $("#backup_save_note").hide();
-
-    $("#show_config").click(function () {
-      $("#backup_config_box").toggle();
-      $('#backup_button').hide();
-      $('#backup_save_note').show();
-      $('#backup_data').hide();
-    });
-
-    $('#backup_table').DataTable({
-      "order": [[1, "desc"]],
-      "paging": false,
-      "lengthChange": false,
-      "searching": true,
-      "ordering": true,
-      "info": true,
-      "autoWidth": false,
-      "responsive": true,
-    });
-
-    $(".del_button").click(function () {
-      var file_to_del = $(this).data("file");
-      var backup_location = $(this).data('backup_location');
-
-      console.log("file to delete is" + file_to_del);
-
-      bootbox.confirm({
-        title: "{% raw translate('serverBackups', 'destroyBackup', data['lang']) %}",
-        message: "{{ translate('serverBackups', 'confirmDelete', data['lang']) }}",
-        buttons: {
-          cancel: {
-            label: '<i class="fas fa-times"></i> {{ translate("serverBackups", "cancel", data['lang']) }}'
-          },
-          confirm: {
-            label: '<i class="fas fa-check"></i> {{ translate("serverBackups", "confirm", data['lang']) }}'
-          }
-        },
-        callback: function (result) {
-          console.log(result);
-          if (result == true) {
-            var full_path = backup_location + '/' + file_to_del;
-            del_backup(file_to_del, server_id);
-          }
-        }
-      });
-    });
-
-    $(".restore_button").click(function () {
-      var file_to_restore = $(this).data("file");
-
-
-      bootbox.confirm({
-        title: "{{ translate('serverBackups', 'restore', data['lang']) }} " + file_to_restore,
-        message: "{{ translate('serverBackups', 'confirmRestore', data['lang']) }}",
-        buttons: {
-          cancel: {
-            label: '<i class="fas fa-times"></i> {{ translate("serverBackups", "cancel", data['lang']) }}'
-          },
-          confirm: {
-            label: '<i class="fas fa-check"></i> {{ translate("serverBackups", "restore", data['lang']) }}',
-            className: 'btn-outline-danger'
-          }
-        },
-        callback: function (result) {
-          console.log(result);
-          if (result == true) {
-            restore_backup(file_to_restore, server_id);
-          }
-        }
-      });
-    });
-    $("#backup_now_button").click(function () {
-      backup_started();
-    });
-
-  });
-
-  document.getElementById("modal-cancel").addEventListener("click", function () {
-    document.getElementById("root_files_button").classList.remove('clicked');
-    document.getElementById("main-tree-div").innerHTML = '<input type="checkbox" id="main-tree-input" name="root_path" value="" disabled><span id="main-tree" class="files-tree-title tree-caret-down root-dir" data-path=""><i class="far fa-folder"></i><i class="far fa-folder-open"></i>{{ translate("serverFiles", "files", data["lang"]) }}</span></input>'
-  })
-
-  document.getElementById("root_files_button").addEventListener("click", function () {
-    if ($("#root_files_button").data('server_path') != "") {
-      if (document.getElementById('root_files_button').classList.contains('clicked')) {
-        show_file_tree();
-        return;
-      } else {
-        document.getElementById('root_files_button').classList.add('clicked');
-      }
-      path = $("#root_files_button").data('server_path')
-      console.log($("#root_files_button").data('server_path'))
-      const token = getCookie("_xsrf");
-      var dialog = bootbox.dialog({
-        message: '<p class="text-center mb-0"><i class="fa fa-spin fa-cog"></i> Please wait while we gather your files...</p>',
-        closeButton: false
-      });
-
-      setTimeout(function () {
-        var x = document.querySelector('.bootbox');
-        if (x) {
-          x.remove()
-        }
-        var x = document.querySelector('.modal-backdrop');
-        if (x) {
-          x.remove()
-        }
-        document.getElementById('main-tree-input').setAttribute('value', path)
-        getTreeView(path);
-        show_file_tree();
-
-      }, 5000);
-    } else {
-      bootbox.alert("You must input a path before selecting this button");
-    }
-  });
-
-  function getDirView(event) {
-    let path = event.target.parentElement.getAttribute("data-path");
-    if (document.getElementById(path).classList.contains('clicked')) {
-      return;
-    } else {
-      getTreeView(path);
-    }
-
-  }
-  async function getTreeView(path) {
-    console.log(path)
-    const token = getCookie("_xsrf");
-    let url = `/api/v2/servers/${server_id}/files/${backup_id}`
-    if (!backup_id) {
-      url = `/api/v2/servers/${server_id}/files/`
-      console.log("NEW URL")
-    }
-    console.log(url);
-    let res = await fetch(url, {
-      method: 'POST',
-      headers: {
-        'X-XSRFToken': token
-      },
-      body: JSON.stringify({ "page": "backups", "path": path }),
-    });
-    let responseData = await res.json();
-    if (responseData.status === "ok") {
-      console.log(responseData);
-      process_tree_response(responseData);
-
-    } else {
-
-      bootbox.alert({
-        title: responseData.status,
-        message: responseData.error
-      });
-    }
-  }
-
-  function process_tree_response(response) {
-    let path = response.data.root_path.path;
-    let text = `<ul class="tree-nested d-block" id="${path}ul">`;
-    Object.entries(response.data).forEach(([key, value]) => {
-      if (key === "root_path" || key === "db_stats") {
-        //continue is not valid in for each. Return acts as a continue.
-        return;
-      }
-      let checked = ""
-      let dpath = value.path;
-      let filename = key;
-      if (value.excluded) {
-        checked = "checked"
-      }
-      if (value.dir) {
-        text += `<li class="tree-item" data-path="${dpath}">
-                            \n<div id="${dpath}" data-path="${dpath}" data-name="${filename}" class="tree-caret tree-ctx-item tree-folder">
-                            <input type="checkbox" class="checkBoxClass excluded" value="${dpath}" ${checked}>
-                            <span id="${dpath}span" class="files-tree-title" data-path="${dpath}" data-name="${filename}" onclick="getDirView(event)">
-                            <i style="color: var(--info);" class="far fa-folder"></i>
-                            <i style="color: var(--info);" class="far fa-folder-open"></i>
-                            <strong>${filename}</strong>
-                            </span>
-                            </input></div><li>`
-      } else {
-        text += `<li
-                        class="d-block tree-ctx-item tree-file"
-                        data-path="${dpath}"
-                        data-name="${filename}"
-                        onclick=""><input type='checkbox' class="checkBoxClass excluded" name='root_path' value="${dpath}" ${checked}><span style="margin-right: 6px;">
-                        <i class="far fa-file"></i></span></input>${filename}</li>`
-      }
-    });
-    text += `</ul>`;
-    if (response.data.root_path.top) {
-      try {
-        document.getElementById('main-tree-div').innerHTML += text;
-        document.getElementById('main-tree').parentElement.classList.add("clicked");
-      } catch {
-        document.getElementById('files-tree').innerHTML = text;
-      }
-    } else {
-      try {
-        document.getElementById(path + "span").classList.add('tree-caret-down');
-        document.getElementById(path).innerHTML += text;
-        document.getElementById(path).classList.add("clicked");
-      } catch {
-        console.log("Bad")
-      }
-
-      var toggler = document.getElementById(path + "span");
-
-      if (toggler.classList.contains('files-tree-title')) {
-        document.getElementById(path + "span").addEventListener("click", function caretListener() {
-          document.getElementById(path + "ul").classList.toggle("d-block");
-          document.getElementById(path + "span").classList.toggle("tree-caret-down");
-        });
-      }
-    }
-  }
-
-  function getToggleMain(event) {
-    path = event.target.parentElement.getAttribute('data-path');
-    document.getElementById("files-tree").classList.toggle("d-block");
-    document.getElementById(path + "span").classList.toggle("tree-caret-down");
-    document.getElementById(path + "span").classList.toggle("tree-caret");
-  }
-  function show_file_tree() {
-    $("#dir_select").modal();
-  }
-
-</script>
-
-{% end %}

app/frontend/templates/panel/server_files.html

@@ -67,8 +67,7 @@
                     translate('serverFiles', 'download', data['lang']) }}</a>
                   <a onclick="deleteFileE(event)" href="javascript:void(0)" id="deleteFile" href="#"
                     style="color: red">{{ translate('serverFiles', 'delete', data['lang']) }}</a>
-                  <a onclick="deleteFileE(event)" href="javascript:void(0)" id="deleteDir" href="#"
-                    style="color: red">{{
+                  <a onclick="deleteFileE(event)" href="javascript:void(0)" id="deleteDir" href="#" style="color: red">{{
                     translate('serverFiles', 'delete', data['lang']) }}</a>
                   <a href="javascript:void(0)" class="closebtn" style="color: var(--info);"
                     onclick="document.getElementById('files-tree-nav').style.display = 'none';">{{
@@ -157,8 +156,7 @@
                     right: 35px;
                   }
                 }
-
-                .tree-file:hover {
+                .tree-file:hover{
                   cursor: pointer;
                 }
               </style>
@@ -723,7 +721,105 @@
     }
   }
 
+  async function sendFile(file, path, serverId, left, i, onProgress) {
+    let xmlHttpRequest = new XMLHttpRequest();
+    let token = getCookie("_xsrf")
+    let fileName = file.name
+    let target = '/upload?server_id=' + serverId
+    let mimeType = file.type
+    let size = file.size
+
+    xmlHttpRequest.upload.addEventListener('progress', function (e) {
+
+      if (e.loaded <= size) {
+        var percent = Math.round(e.loaded / size * 100);
+        $(`#upload-progress-bar-${i + 1}`).css('width', percent + '%');
+        $(`#upload-progress-bar-${i + 1}`).html(percent + '%');
+      }
+    });
+
+    xmlHttpRequest.open('POST', target, true);
+    xmlHttpRequest.setRequestHeader('X-Content-Type', mimeType);
+    xmlHttpRequest.setRequestHeader('X-XSRFToken', token);
+    xmlHttpRequest.setRequestHeader('X-Content-Length', size);
+    xmlHttpRequest.setRequestHeader('X-Content-Disposition', 'attachment; filename="' + fileName + '"');
+    xmlHttpRequest.setRequestHeader('X-Path', path);
+    xmlHttpRequest.setRequestHeader('X-Content-Upload-Type', 'server_files')
+    xmlHttpRequest.setRequestHeader('X-Files-Left', left);
+    xmlHttpRequest.setRequestHeader('X-FileName', fileName);
+    xmlHttpRequest.setRequestHeader('X-ServerId', serverId);
+    xmlHttpRequest.upload.addEventListener('progress', (event) =>
+      onProgress(Math.floor(event.loaded / event.total * 100)), false);
+    xmlHttpRequest.addEventListener('load', (event) => {
+      if (event.target.responseText == 'success') {
+        console.log('Upload for file', file.name, 'was successful!');
+        let caught = false;
+        try {
+          if (document.getElementById(path).classList.contains("clicked")) {
+            var expanded = true;
+          }
+        } catch {
+          var expanded = false;
+        }
+
+        try {
+          var par_el = document.getElementById(path + "ul");
+          var items = par_el.children;
+        } catch (err) {
+          console.log(err)
+          caught = true;
+          var par_el = document.getElementById("files-tree");
+          var items = par_el.children;
+        }
+        let name = file.name;
+        console.log(par_el)
+        let full_path = path + '/' + name
+        let flag = false;
+        for (var k = 0; k < items.length; ++k) {
+          if ($(items[k]).attr("data-name") == name) {
+            flag = true;
+          }
+        }
+        if (!flag) {
+          if (caught && expanded == false) {
+            $(par_el).append('<li id=' + '"' + full_path.toString() + 'li' + '"' + 'class="d-block tree-ctx-item tree-file tree-item" data-path=' + '"' + full_path.toString() + '"' + ' data-name=' + '"' + name.toString() + '"' + ' onclick="clickOnFile(event)" ><span style="margin-right: 6px;"><i class="far fa-file"></i></span>' + name + '</li>');
+          } else if (expanded == true) {
+            $(par_el).append('<li id=' + '"' + full_path.toString() + 'li' + '"' + 'class="tree-ctx-item tree-file tree-item" data-path=' + '"' + full_path.toString() + '"' + ' data-name=' + '"' + name.toString() + '"' + ' onclick="clickOnFile(event)" ><span style="margin-right: 6px;"><i class="far fa-file"></i></span>' + name + '</li>');
+          }
+          setTreeViewContext();
+        }
+        $(`#upload-progress-bar-${i + 1}`).removeClass("progress-bar-striped");
+        $(`#upload-progress-bar-${i + 1}`).addClass("bg-success");
+        $(`#upload-progress-bar-${i + 1}`).html('<i style="color: black;" class="fas fa-box-check"></i>')
+      }
+      else {
+        let response_text = JSON.parse(event.target.responseText);
+        var x = document.querySelector('.bootbox');
+        if (x) {
+          x.remove()
+        }
+        var x = document.querySelector('.modal-content');
+        if (x) {
+          x.remove()
+        }
+        console.log(JSON.parse(event.target.responseText).info)
+        bootbox.alert({
+          message: JSON.parse(event.target.responseText).info,
+          callback: function () {
+            window.location.reload();
+          }
+        });
+        doUpload = false;
+      }
+    }, false);
+    xmlHttpRequest.addEventListener('error', (e) => {
+      console.error('Error while uploading file', file.name + '.', 'Event:', e)
+    }, false);
+    xmlHttpRequest.send(file);
+  }
+
   let uploadWaitDialog;
+  let doUpload = true;
 
   async function uploadFilesE(event) {
     path = event.target.parentElement.getAttribute('data-path');
@@ -746,9 +842,6 @@
             label: "{{ translate('serverFiles', 'upload', data['lang']) }}",
             className: "btn-default",
             callback: async function () {
-              if ($("#files").get(0).files.length === 0) {
-                return hideUploadBox();
-              }
               var height = files.files.length * 50;
 
               var waitMessage = '<p class="text-center mb-0">' +
@@ -765,13 +858,16 @@
               });
 
               let nFiles = files.files.length;
-              const uploadPromises = [];
+              for (i = 0; i < nFiles; i++) {
+                if (!doUpload) {
+                  doUpload = true;
+                  hideUploadBox();
+                  break;
+                }
 
-              for (let i = 0; i < nFiles; i++) {
-                const file = files.files[i];
                 const progressHtml = `
                 <div style="width: 100%; min-width: 100%;">
-                                ${file.name}:
+                  ${files.files[i].name}:
                   <br><div
                     id="upload-progress-bar-${i + 1}"
                     class="progress-bar progress-bar-striped progress-bar-animated"
@@ -783,38 +879,33 @@
                   ></div>
                 </div><br>
                 `;
-
                 $('#upload-progress-bar-parent').append(progressHtml);
 
-                const uploadPromise = uploadFile("server_upload", file, path, i, (progress) => {
+                await sendFile(files.files[i], path, serverId, nFiles - i - 1, i, (progress) => {
                   $(`#upload-progress-bar-${i + 1}`).attr('aria-valuenow', progress)
                   $(`#upload-progress-bar-${i + 1}`).css('width', progress + '%');
                 });
-                uploadPromises.push(uploadPromise);
               }
-
-
-              await Promise.all(uploadPromises);
-              setTimeout(() => {
               hideUploadBox();
-              }, 2000);
-
+              //$('#upload_file').submit(); //.trigger('submit');
             }
           }
         }
       });
+
+      var fileList = document.getElementById("files");
+      fileList.addEventListener("change", function (e) {
+        var list = "";
+        let files = Array.from(this.files)
+        files.forEach(file => {
+          list += "<li class='col-xs-12 file-list'>" + file.name + "</li>"
+        })
+
+        document.getElementById("fileList").innerHTML = list;
+      }, false);
     });
   }
 
-  async function calculateFileHash(file) {
-    const arrayBuffer = await file.arrayBuffer();
-    const hashBuffer = await crypto.subtle.digest('SHA-256', arrayBuffer);
-    const hashArray = Array.from(new Uint8Array(hashBuffer));
-    const hashHex = hashArray.map(b => b.toString(16).padStart(2, '0')).join('');
-
-    return hashHex;
-  }
-
   function getDirView(event) {
     let path = event.target.parentElement.getAttribute("data-path");
     if (document.getElementById(path).classList.contains('clicked')) {
@@ -1120,5 +1211,5 @@
 
 
 </script>
-<script src="../../static/assets/js/shared/upload.js"></script>
+
 {% end %}

app/frontend/templates/panel/server_schedule_edit.html

@@ -79,24 +79,6 @@
                       <option id="command" value="command">{{ translate('serverScheduleConfig', 'custom' , data['lang'])
                         }}</option>
                     </select>
-                    <div id="ifBackup" style="display: none;">
-                      <br>
-                      <label for="action_id">{{ translate('serverSchedules', 'actionId' , data['lang']) }}<small
-                        class="text-muted ml-1"></small> </label><br>
-                      <select id="action_id" name="action_id"
-                        class="form-control form-control-lg select-css" value="{{ data['schedule']['action_id']  }}">
-                        {% for backup in data["backups"] %}
-                        {% if backup.backup_id == data["schedule"]["action_id"] %}
-                        <option id="{{backup.backup_id}}" value="{{backup.backup_id}}">{{backup.backup_name}}</option>
-                        {% end %}
-                        {% end %}
-                        {% for backup in data["backups"] %}
-                        {% if backup.backup_id != data["schedule"]["action_id"] %}
-                        <option id="{{backup.backup_id}}" value="{{backup.backup_id}}">{{backup.backup_name}}</option>
-                        {% end %}
-                        {% end %}
-                      </select>
-                    </div>
                   </div>
                   <div id="ifBasic">
                     <div class="form-group">
@@ -250,7 +232,7 @@
     }
 
     function replacer(key, value) {
-    if (key != "start_time" && key != "cron_string" && key != "interval_type" && key != "action_id") {
+    if (key != "start_time" && key != "cron_string" && key != "interval_type") {
       if (typeof value == "boolean") {
         return value
       }
@@ -265,7 +247,7 @@
       }
     } else if (value === "" && key == "start_time"){
         return "00:00";
-      }else {
+      }else{
         return value;
       }
     }
@@ -299,11 +281,6 @@
       // Format the plain form data as JSON
       let formDataJsonString = JSON.stringify(formDataObject, replacer);
 
-      let data = JSON.parse(formDataJsonString)
-      if (data["action"] === "backup" && !data["action_id"]){
-        return bootbox.alert("Validation Failed")
-      }
-
       let res = await fetch(`/api/v2/servers/${serverId}/tasks/`, {
         method: 'POST',
         headers: {
@@ -381,14 +358,6 @@
         document.getElementById("ifYes").style.display = "none";
         document.getElementById("command_input").required = false;
       }
-      if (document.getElementById('action').value == "backup"){
-        document.getElementById("ifBackup").style.display = "block";
-        document.getElementById("action_id").required = true;
-      } else {
-        document.getElementById("ifBackup").style.display = "none";
-        document.getElementById("action_id").required = false;
-        $("#action_id").val(null);
-      }
     }
     function basicAdvanced() {
       if (document.getElementById('difficulty').value == "advanced") {

app/frontend/templates/public/status.html

@@ -64,7 +64,7 @@
               <span class="text-warning"><i class="fas fa-exclamation-triangle"></i></span>
             </td>
             <td id="server_motd_{{ server['stats']['server_id']['server_id'] }}">
-              <span class="text-warning"><i class="fa-solid fa-link-slash"></i> </span>
+              <span class="text-warning">Crafty can't get infos from this Server </span>
             </td>
             <td id="server_version_{{ server['stats']['server_id']['server_id'] }}">
               <span class="text-warning"><i class="fas fa-question"></i></i></span>
@@ -148,7 +148,7 @@
             <div class="row">
               <div class="col-12">
                 <div id="m_server_motd_{{ server['stats']['server_id']['server_id'] }}">
-                  <span class="text-warning"><i class="fas fa-exclamation-triangle"></i> Crafty can't get info from
+                  <span class="text-warning"><i class="fas fa-exclamation-triangle"></i> Crafty can't get infos from
                     this Server </span>
                 </div>
                 <div id="m_server_version_{{ server['stats']['server_id']['server_id'] }}"></div>
@@ -223,9 +223,9 @@
     }
     else {
       server_players.innerHTML = `<span class="text-warning"><i class="fas fa-exclamation-triangle"></i></span>`;
-      server_motd.innerHTML = `<span class="text-warning"><i class="fa-solid fa-link-slash"></i> </span>`;
+      server_motd.innerHTML = `<span class="text-warning">Crafty can't get infos from this Server </span>`;
       server_version.innerHTML = `<span class="text-warning"><i class="fas fa-question"></i></i></span>`;
-      m_server_motd.innerHTML = `<span class="text-warning"><i class="fas fa-exclamation-triangle"></i> <i class="fa-solid fa-link-slash"></i> </span>`;
+      m_server_motd.innerHTML = `<span class="text-warning"><i class="fas fa-exclamation-triangle"></i> Crafty can't get infos from this Server </span>`;
     }
 
     /* Update Online Status */

app/frontend/templates/server/bedrock_wizard.html

@@ -3,7 +3,7 @@
 {% block title %}Crafty Controller - {{ translate('serverWizard', 'newServer', data['lang']) }}{% end %}
 
 {% block content %}
-<link rel="stylesheet" href="../../static/assets/css/vendors/bootstrap-select-1.13.18.css">
+
 <div class="content-wrapper">
   <ul class="nav nav-pills tab-simple-styled " role="tablist">
     <li class="nav-item term-nav-item">
@@ -62,24 +62,29 @@
                 </div>
 
                 <div class="form-group">
-                  <p class="mb-0 p-0" aria-expanded="true">{{ translate('serverWizard', 'addRole', data['lang'])
-                    }}
+                  <div id="accordion-1">
+                    <div class="card">
+                      <div class="card-header p-2" id="Role-1">
+                        <p class="mb-0 p-0" data-toggle="collapse" data-target="#collapseRole-1" aria-expanded="true"
+                          aria-controls="collapseRole-1">
+                          <i class="fas fa-chevron-down"></i> {{ translate('serverWizard', 'addRole', data['lang']) }}
                           <small style="text-transform: none;"> - {{ translate('serverWizard', 'autoCreate',
                             data['lang']) }}</small>
                         </p>
-                  <select data-container="body"
-                    data-none-selected-text="{{ translate('serverWizard', 'noneRoles', data['lang']) }}"
-                    data-none-results-text="{{ translate('serverWizard', 'noRole', data['lang']) }} {0}"
-                    class="selectpicker form-control form-control-lg select-css roles_select"
-                    data-styleBase="form-control" data-style="form-control" data-live-search="true" name="server_roles"
-                    multiple>
+                      </div>
+                      <div id="collapseRole-1" class="collapse" aria-labelledby="Role-1" data-parent="">
+                        <div class="card-body scroll">
+                          <div class="form-group">
                             {% for r in data['roles'] %}
-                    <option class="roles" type="checkbox" value="{{ r['role_id'] }}">
-                      &nbsp; {{ r['role_name'].capitalize()
-                      }}
-                    </option>
+                            <span class="d-block menu-option"><label><input name="{{ r['role_id'] }}"
+                                  type="checkbox">&nbsp;
+                                {{ r['role_name'].capitalize() }}</label></span>
                             {% end %}
-                  </select>
+                          </div>
+                        </div>
+                      </div>
+                    </div>
+                  </div>
                 </div>
                 <button onclick="eula_confirm()" type="button" class="btn btn-primary mr-2">{{ translate('serverWizard',
                   'buildServer',
@@ -141,27 +146,30 @@
               <input type="number" class="form-control" id="port2" name="port" value="19132" step="1" min="1"
                 max="65535" required>
             </div>
-
             <div class="form-group">
-              <p class="mb-0 p-0" aria-expanded="true">{{ translate('serverWizard', 'addRole', data['lang'])
-                }}
+              <div id="accordion-2">
+                <div class="card">
+                  <div class="card-header p-2" id="Role-2">
+                    <p class="mb-0 p-0" data-toggle="collapse" data-target="#collapseRole-2" aria-expanded="true"
+                      aria-controls="collapseRole-2">
+                      <i class="fas fa-chevron-down"></i> {{ translate('serverWizard', 'addRole', data['lang']) }}
                       <small style="text-transform: none;"> - {{ translate('serverWizard', 'autoCreate',
                         data['lang']) }}</small>
                     </p>
-              <select data-container="body"
-                data-none-selected-text="{{ translate('serverWizard', 'noneRoles', data['lang']) }}"
-                data-none-results-text="{{ translate('serverWizard', 'noRole', data['lang']) }} {0}"
-                class="selectpicker form-control form-control-lg select-css roles_select" data-styleBase="form-control"
-                data-style="form-control" data-live-search="true" name="server_roles" multiple>
-                {% for r in data['roles'] %}
-                <option class="roles" type="checkbox" value="{{ r['role_id'] }}">
-                  &nbsp; {{ r['role_name'].capitalize()
-                  }}
-                </option>
-                {% end %}
-              </select>
                   </div>
-
+                  <div id="collapseRole-2" class="collapse" aria-labelledby="Role-2" data-parent="">
+                    <div class="card-body scroll">
+                      <div class="form-group">
+                        {% for r in data['roles'] %}
+                        <span class="d-block menu-option"><label><input name="{{ r['role_id'] }}" type="checkbox">&nbsp;
+                            {{ r['role_name'].capitalize() }}</label></span>
+                        {% end %}
+                      </div>
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </div>
             <button type="submit" class="btn btn-primary mr-2">{{ translate('serverWizard', 'importServerButton',
               data['lang']) }}</button>
             <button type="reset" class="btn btn-danger mr-2">{{ translate('serverWizard', 'resetForm', data['lang'])
@@ -214,25 +222,34 @@
               <input type="number" class="form-control" id="port3" name="port" value="19132" step="1" min="1"
                 max="65535" required>
             </div>
-
             <div class="form-group">
-              <p class="mb-0 p-0" aria-expanded="true">{{ translate('serverWizard', 'addRole', data['lang'])
-                }}
-                <small style="text-transform: none;"> - {{ translate('serverWizard', 'autoCreate',
+              <div id="accordion-3">
+                <div class="card">
+                  <div class="card-header p-2" id="Role-3">
+                    <p class="mb-0 p-0" data-toggle="collapse" data-target="#collapseRole-3" aria-expanded="true"
+                      aria-controls="collapseRole-3">
+                      <i class="fas fa-chevron-down"></i> {{ translate('serverWizard', 'addRole', data['lang'])
+                      }} <small style="text-transform: none;"> - {{ translate('serverWizard', 'autoCreate',
                         data['lang']) }}</small>
                     </p>
-              <select data-container="body"
-                data-none-selected-text="{{ translate('serverWizard', 'noneRoles', data['lang']) }}"
-                data-none-results-text="{{ translate('serverWizard', 'noRole', data['lang']) }} {0}"
-                class="selectpicker form-control form-control-lg select-css roles_select" data-styleBase="form-control"
-                data-style="form-control" data-live-search="true" name="server_roles" multiple>
+                  </div>
+                  <div id="collapseRole-3" class="collapse" aria-labelledby="Role-3" data-parent="">
+                    <div class="card-body scroll">
+                      <div class="form-group">
                         {% for r in data['roles'] %}
-                <option class="roles" type="checkbox" value="{{ r['role_id'] }}">
-                  &nbsp; {{ r['role_name'].capitalize()
-                  }}
-                </option>
+                        <span class="d-block menu-option"><label><input name="{{ r['role_id'] }}" type="checkbox">&nbsp;
+                            {{ r['role_name'].capitalize() }}</label></span>
                         {% end %}
-              </select>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </div>
+            <div style="visibility: hidden;">
+              <div class="form-group">
+                <input type="text" class="form-control" id="zip_root_path" name="zip_root_path">
+              </div>
             </div>
             <div class="modal fade" id="dir_select" tabindex="-1" role="dialog" aria-labelledby="dir_select"
               aria-hidden="true">
@@ -301,8 +318,8 @@
                     'labelZipFile', data['lang']) }}</label>
                 </div>
                 <div class="input-group-append">
-                  <button type="button" class="btn btn-info upload-button" id="upload-button"
-                    onclick="uploadFile('import')" disabled>{{ translate('serverWizard',
+                  <button type="button" class="btn btn-info upload-button" id="upload-button" onclick="sendFile()"
+                    disabled>{{ translate('serverWizard',
                     'uploadButton', data['lang']) }}</button>
                 </div>
               </div>
@@ -336,24 +353,35 @@
               </div>
 
               <div class="form-group">
-                <p class="mb-0 p-0" aria-expanded="true">{{ translate('serverWizard', 'addRole', data['lang'])
-                  }}
-                  <small style="text-transform: none;"> - {{ translate('serverWizard', 'autoCreate',
+                <div id="accordion-3">
+                  <div class="card">
+                    <div class="card-header p-2" id="Role-3">
+                      <p class="mb-0 p-0" data-toggle="collapse" data-target="#collapseRole-3" aria-expanded="true"
+                        aria-controls="collapseRole-3">
+                        <i class="fas fa-chevron-down"></i> {{ translate('serverWizard', 'addRole',
+                        data['lang'])
+                        }} <small style="text-transform: none;"> - {{ translate('serverWizard', 'autoCreate',
                           data['lang']) }}</small>
                       </p>
-                <select data-container="body"
-                  data-none-selected-text="{{ translate('serverWizard', 'noneRoles', data['lang']) }}"
-                  data-none-results-text="{{ translate('serverWizard', 'noRole', data['lang']) }} {0}"
-                  class="selectpicker form-control form-control-lg select-css roles_select"
-                  data-styleBase="form-control" data-style="form-control" data-live-search="true" name="server_roles"
-                  multiple>
+                    </div>
+                    <div id="collapseRole-3" class="collapse" aria-labelledby="Role-3" data-parent="">
+                      <div class="card-body scroll">
+                        <div class="form-group">
                           {% for r in data['roles'] %}
-                  <option class="roles" type="checkbox" value="{{ r['role_id'] }}">
-                    &nbsp; {{ r['role_name'].capitalize()
-                    }}
-                  </option>
+                          <span class="d-block menu-option"><label><input name="{{ r['role_id'] }}"
+                                type="checkbox">&nbsp;
+                              {{ r['role_name'].capitalize() }}</label></span>
                           {% end %}
-                </select>
+                        </div>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+              </div>
+              <div style="visibility: hidden;">
+                <div class="form-group">
+                  <input type="text" class="form-control" id="zip_root_path" name="zip_root_path">
+                </div>
               </div>
               <div class="modal fade" id="dir_upload_select" tabindex="-1" role="dialog" aria-labelledby="dir_select"
                 aria-hidden="true">
@@ -495,8 +523,61 @@
 {% end %}
 
 {% block js%}
-<script src="../../static/assets/js/shared/upload.js"></script>
 <script>
+  var upload;
+  var file;
+  function sendFile() {
+    file = $("#file")[0].files[0]
+    document.getElementById("upload_input").innerHTML = '<div class="progress" style="width: 100%;"><div class="progress-bar progress-bar-striped progress-bar-animated" role="progressbar" aria-valuenow="100" aria-valuemin="0" aria-valuemax="100" style="width: 100%">&nbsp;<i class="fa-solid fa-spinner"></i></div></div>'
+    let xmlHttpRequest = new XMLHttpRequest();
+    let token = getCookie("_xsrf")
+    let fileName = encodeURIComponent(file.name)
+    let target = '/upload'
+    let mimeType = file.type
+    let size = file.size
+    let type = 'server_import'
+
+    xmlHttpRequest.upload.addEventListener('progress', function (e) {
+
+      if (e.loaded <= size) {
+        var percent = Math.round(e.loaded / size * 100);
+        $(`#upload-progress-bar`).css('width', percent + '%');
+        $(`#upload-progress-bar`).html(percent + '%');
+      }
+    });
+
+    xmlHttpRequest.open('POST', target, true);
+    xmlHttpRequest.setRequestHeader('X-Content-Type', mimeType);
+    xmlHttpRequest.setRequestHeader('X-XSRFToken', token);
+    xmlHttpRequest.setRequestHeader('X-Content-Length', size);
+    xmlHttpRequest.setRequestHeader('X-Content-Disposition', 'attachment; filename="' + fileName + '"');
+    xmlHttpRequest.setRequestHeader('X-Content-Upload-Type', type);
+    xmlHttpRequest.setRequestHeader('X-FileName', fileName);
+    xmlHttpRequest.addEventListener('load', (event) => {
+      if (event.target.responseText == 'success') {
+        console.log('Upload for file', file.name, 'was successful!')
+        $("#upload_input").html(`<div class="card-header header-sm d-flex justify-content-between align-items-center" style="width: 100%;"><input value="${decodeURIComponent(fileName)}" type="text" id="file-uploaded" disabled></input> 🔒</div>`);
+        document.getElementById("lower_half").style.visibility = "visible";
+      }
+      else {
+        let response_text = JSON.parse(event.target.responseText);
+        var x = document.querySelector('.bootbox');
+        console.log(JSON.parse(event.target.responseText).info)
+        bootbox.alert({
+          message: JSON.parse(event.target.responseText).info,
+          callback: function () {
+            window.location.reload();
+          }
+        });
+        doUpload = false;
+      }
+    }, false);
+    xmlHttpRequest.addEventListener('error', (e) => {
+      console.error('Error while uploading file', file.name + '.', 'Event:', e)
+    }, false);
+    xmlHttpRequest.send(file);
+  }
+
   document.getElementById("root_upload_button").addEventListener("click", function (event) {
     if (file) {
       upload = true;
@@ -510,7 +591,7 @@
         message: '<p class="text-center mb-0"><i class="fa fa-spin fa-cog"></i> Please wait while we gather your files...</p>',
         closeButton: false
       });
-      setTimeout(function () {
+      setTimeout(function(){
         getDirView();
       }, 2000);
     } else {
@@ -559,7 +640,7 @@
         message: '<p class="text-center mb-0"><i class="fa fa-spin fa-cog"></i> Please wait while we gather your files...</p>',
         closeButton: false
       });
-      setTimeout(function () {
+      setTimeout(function(){
         getDirView();
       }, 2000);
     } else {
@@ -569,6 +650,17 @@
 </script>
 
 <script>
+  function dropDown(event) {
+    event.target.parentElement.children[1].classList.remove("d-none");
+    document.getElementById("overlay").classList.remove("d-none");
+  }
+  function hide(event) {
+    var items = document.getElementsByClassName('menu');
+    for (let i = 0; i < items.length; i++) {
+      items[i].classList.add("d-none");
+    }
+    document.getElementById("overlay").classList.add("d-none");
+  }
 
   function wait_msg(importing) {
     bootbox.alert({
@@ -600,15 +692,13 @@
     }
   }
   function calcRoles() {
-    var combinedValues = [];
-    $('.roles_select').each(function () {
-      var selectedValues = $(this).val();
-      console.log(selectedValues)
-      if (selectedValues) {
-        combinedValues = combinedValues.concat(selectedValues);
+    let role_ids = $('.roles').map(function () {
+      if ($(this).is(':checked')) {
+        return $(this).val();
       }
-    });
-    return combinedValues;
+    }).get();
+    console.log(role_ids)
+    return role_ids
   }
   async function send_server(data) {
     let token = getCookie("_xsrf")
@@ -665,6 +755,7 @@
 
 
       console.log(formDataJsonString);
+
       send_server(formDataJsonString);
     });
 
@@ -705,13 +796,7 @@
       wait_msg(true);
       e.preventDefault();
       let jarForm = document.getElementById("import-zip");
-      var checkedRadio = $('.root-input:checked');
-      let zip_root_path = ""
-      if (checkedRadio.length > 0) {
-        // Get the value of the checked radio button
-        var checkedValue = checkedRadio.val();
-        zip_root_path = checkedValue; // Return the checked value if needed
-      }
+
       let formData = new FormData(jarForm);
       //Create an object from the form data entries
       let formDataObject = Object.fromEntries(formData.entries());
@@ -728,7 +813,7 @@
         "minecraft_bedrock_create_data": {
           "create_type": "import_server",
           "import_server_create_data": {
-            "existing_server_path": zip_root_path,
+            "existing_server_path": formDataObject.root_path,
             "executable": formDataObject.server_jar,
           }
         }
@@ -749,13 +834,6 @@
       //Create an object from the form data entries
       let formDataObject = Object.fromEntries(formData.entries());
       console.log(formDataObject);
-      var checkedRadio = $('.root-input:checked');
-      let zip_root_path = ""
-      if (checkedRadio.length > 0) {
-        // Get the value of the checked radio button
-        var checkedValue = checkedRadio.val();
-        zip_root_path = checkedValue; // Return the checked value if needed
-      }
       let send_data = {
         "name": formDataObject.name,
         "roles": calcRoles(),
@@ -768,7 +846,7 @@
         "minecraft_bedrock_create_data": {
           "create_type": "import_server",
           "import_server_create_data": {
-            "existing_server_path": zip_root_path,
+            "existing_server_path": formDataObject.root_path,
             "executable": formDataObject.server_jar,
           }
         }
@@ -782,5 +860,4 @@
   });
 </script>
 <script type="text/javascript" src="../../static/assets/js/shared/root-dir.js"></script>
-<script src="../../static/assets/js/shared/bootstrap-select-1.13.18.js"></script>
 {% end %}

app/frontend/templates/server/wizard.html

@@ -4,7 +4,6 @@
 
 {% block content %}
 
-<link rel="stylesheet" href="../../static/assets/css/vendors/bootstrap-select-1.13.18.css">
 <div class="content-wrapper">
   <ul class="nav nav-pills tab-simple-styled">
     <li class="nav-item term-nav-item">
@@ -153,24 +152,30 @@
                   </div>
                   <div class="col-sm-12">
                     <div class="form-group">
-                      <p class="mb-0 p-0" aria-expanded="true">{{ translate('serverWizard', 'addRole', data['lang'])
+                      <div id="accordion-1">
+                        <div class="card">
+                          <div class="card-header p-2" id="Role-1">
+                            <p class="mb-0 p-0" data-toggle="collapse" data-target="#collapseRole-1"
+                              aria-expanded="true" aria-controls="collapseRole-1">
+                              <i class="fas fa-chevron-down"></i> {{ translate('serverWizard', 'addRole', data['lang'])
                               }}
                               <small style="text-transform: none;"> - {{ translate('serverWizard', 'autoCreate',
                                 data['lang']) }}</small>
                             </p>
-                      <select data-container="body"
-                        data-none-selected-text="{{ translate('serverWizard', 'noneRoles', data['lang']) }}"
-                        data-none-results-text="{{ translate('serverWizard', 'noRole', data['lang']) }} {0}"
-                        class="selectpicker form-control form-control-lg select-css roles_select"
-                        data-styleBase="form-control" data-style="form-control" data-live-search="true"
-                        name="server_roles" multiple>
+                          </div>
+                          <div id="collapseRole-1" class="collapse" aria-labelledby="Role-1" data-parent="">
+                            <div class="card-body scroll">
+                              <div class="form-group">
                                 {% for r in data['roles'] %}
-                        <option class="roles" type="checkbox" value="{{ r['role_id'] }}">
-                          &nbsp; {{ r['role_name'].capitalize()
-                          }}
-                        </option>
+                                <span class="d-block menu-option"><label><input class="roles" name="{{ r['role_id'] }}"
+                                      type="checkbox" value="{{ r['role_id'] }}">&nbsp; {{ r['role_name'].capitalize()
+                                    }}</label></span>
                                 {% end %}
-                      </select>
+                              </div>
+                            </div>
+                          </div>
+                        </div>
+                      </div>
                     </div>
                   </div>
 
@@ -280,24 +285,29 @@
               </div>
               <div class="col-sm-12">
                 <div class="form-group">
-                  <p class="mb-0 p-0" aria-expanded="true">{{ translate('serverWizard', 'addRole', data['lang'])
-                    }}
+                  <div id="accordion-2">
+                    <div class="card">
+                      <div class="card-header p-2" id="Role-2">
+                        <p class="mb-0 p-0" data-toggle="collapse" data-target="#collapseRole-2" aria-expanded="true"
+                          aria-controls="collapseRole-2">
+                          <i class="fas fa-chevron-down"></i> {{ translate('serverWizard', 'addRole', data['lang']) }}
                           <small style="text-transform: none;"> - {{ translate('serverWizard', 'autoCreate',
                             data['lang']) }}</small>
                         </p>
-                  <select data-container="body"
-                    data-none-selected-text="{{ translate('serverWizard', 'noneRoles', data['lang']) }}"
-                    data-none-results-text="{{ translate('serverWizard', 'noRole', data['lang']) }} {0}"
-                    class="selectpicker form-control form-control-lg select-css roles_select"
-                    data-styleBase="form-control" data-style="form-control" data-live-search="true" name="server_roles"
-                    multiple>
+                      </div>
+                      <div id="collapseRole-2" class="collapse" aria-labelledby="Role-2" data-parent="">
+                        <div class="card-body scroll">
+                          <div class="form-group">
                             {% for r in data['roles'] %}
-                    <option class="roles" type="checkbox" value="{{ r['role_id'] }}">
-                      &nbsp; {{ r['role_name'].capitalize()
-                      }}
-                    </option>
+                            <span class="d-block menu-option"><label><input class="roles" name="{{ r['role_id'] }}"
+                                  type="checkbox" value="{{ r['role_id'] }}">&nbsp;
+                                {{ r['role_name'].capitalize() }}</label></span>
                             {% end %}
-                  </select>
+                          </div>
+                        </div>
+                      </div>
+                    </div>
+                  </div>
                 </div>
               </div>
             </div>
@@ -402,24 +412,34 @@
 
                 <div class="col-sm-12">
                   <div class="form-group">
-                    <p class="mb-0 p-0" aria-expanded="true">{{ translate('serverWizard', 'addRole', data['lang'])
-                      }}
-                      <small style="text-transform: none;"> - {{ translate('serverWizard', 'autoCreate',
+                    <div id="accordion-3">
+                      <div class="card">
+                        <div class="card-header p-2" id="Role-3">
+                          <p class="mb-0 p-0" data-toggle="collapse" data-target="#collapseRole-3" aria-expanded="true"
+                            aria-controls="collapseRole-3">
+                            <i class="fas fa-chevron-down"></i> {{ translate('serverWizard', 'addRole', data['lang'])
+                            }} <small style="text-transform: none;"> - {{ translate('serverWizard', 'autoCreate',
                               data['lang']) }}</small>
                           </p>
-                    <select data-container="body"
-                      data-none-selected-text="{{ translate('serverWizard', 'noneRoles', data['lang']) }}"
-                      data-none-results-text="{{ translate('serverWizard', 'noRole', data['lang']) }} {0}"
-                      class="selectpicker form-control form-control-lg select-css roles_select"
-                      data-styleBase="form-control" data-style="form-control" data-live-search="true"
-                      name="server_roles" multiple>
+                        </div>
+                        <div id="collapseRole-3" class="collapse" aria-labelledby="Role-3" data-parent="">
+                          <div class="card-body scroll">
+                            <div class="form-group">
                               {% for r in data['roles'] %}
-                      <option class="roles" type="checkbox" value="{{ r['role_id'] }}">
-                        &nbsp; {{ r['role_name'].capitalize()
-                        }}
-                      </option>
+                              <span class="d-block menu-option"><label><input class="roles" name="{{ r['role_id'] }}"
+                                    type="checkbox" value="{{ r['role_id'] }}">&nbsp;
+                                  {{ r['role_name'].capitalize() }}</label></span>
                               {% end %}
-                    </select>
+                            </div>
+                          </div>
+                        </div>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+                <div class="col-sm-12" style="visibility: hidden;" hidden>
+                  <div class="form-group">
+                    <input type="text" class="form-control" id="zip_root_path" name="zip_root_path">
                   </div>
                 </div>
                 <div class="modal fade" id="dir_select" tabindex="-1" role="dialog" aria-labelledby="dir_select"
@@ -494,8 +514,8 @@
                     'labelZipFile', data['lang']) }}</label>
                 </div>
                 <div class="input-group-append">
-                  <button type="button" class="btn btn-info upload-button" id="upload-button"
-                    onclick="uploadFile('import')" disabled>{{ translate('serverWizard',
+                  <button type="button" class="btn btn-info upload-button" id="upload-button" onclick="sendFile()"
+                    disabled>{{ translate('serverWizard',
                     'uploadButton', data['lang']) }}</button>
                 </div>
               </div>
@@ -543,24 +563,35 @@
               </div>
 
               <div class="form-group">
-                <p class="mb-0 p-0" aria-expanded="true">{{ translate('serverWizard', 'addRole', data['lang'])
-                  }}
-                  <small style="text-transform: none;"> - {{ translate('serverWizard', 'autoCreate',
+                <div id="accordion-3">
+                  <div class="card">
+                    <div class="card-header p-2" id="Role-3">
+                      <p class="mb-0 p-0" data-toggle="collapse" data-target="#collapseRole-3" aria-expanded="true"
+                        aria-controls="collapseRole-3">
+                        <i class="fas fa-chevron-down"></i> {{ translate('serverWizard', 'addRole',
+                        data['lang'])
+                        }} <small style="text-transform: none;"> - {{ translate('serverWizard', 'autoCreate',
                           data['lang']) }}</small>
                       </p>
-                <select data-container="body"
-                  data-none-selected-text="{{ translate('serverWizard', 'noneRoles', data['lang']) }}"
-                  data-none-results-text="{{ translate('serverWizard', 'noRole', data['lang']) }} {0}"
-                  class="selectpicker form-control form-control-lg select-css roles_select"
-                  data-styleBase="form-control" data-style="form-control" data-live-search="true" name="server_roles"
-                  multiple>
+                    </div>
+                    <div id="collapseRole-3" class="collapse" aria-labelledby="Role-3" data-parent="">
+                      <div class="card-body scroll">
+                        <div class="form-group">
                           {% for r in data['roles'] %}
-                  <option class="roles" type="checkbox" value="{{ r['role_id'] }}">
-                    &nbsp; {{ r['role_name'].capitalize()
-                    }}
-                  </option>
+                          <span class="d-block menu-option"><label><input class="roles" name="{{ r['role_id'] }}"
+                                type="checkbox" value="{{ r['role_id'] }}">&nbsp;
+                              {{ r['role_name'].capitalize() }}</label></span>
                           {% end %}
-                </select>
+                        </div>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+              </div>
+              <div style="visibility: hidden;">
+                <div class="form-group">
+                  <input type="text" class="form-control" id="zip_root_path" name="zip_root_path">
+                </div>
               </div>
               <div class="modal fade" id="dir_upload_select" tabindex="-1" role="dialog" aria-labelledby="dir_select"
                 aria-hidden="true">
@@ -784,7 +815,6 @@
 {% end %}
 
 {% block js %}
-<script src="../../static/assets/js/shared/upload.js"></script>
 <script>
   document.getElementById("root_files_button").addEventListener("click", function (event) {
     if (document.forms["zip"]["server_path"].value != "") {
@@ -822,7 +852,55 @@
   });
   var upload = false;
   var file;
+  function sendFile() {
+    file = $("#file")[0].files[0]
+    document.getElementById("upload_input").innerHTML = '<div class="progress" style="width: 100%;"><div class="progress-bar progress-bar-striped progress-bar-animated" role="progressbar" aria-valuenow="100" aria-valuemin="0" aria-valuemax="100" style="width: 100%">&nbsp;<i class="fa-solid fa-spinner"></i></div></div>'
+    let xmlHttpRequest = new XMLHttpRequest();
+    let token = getCookie("_xsrf")
+    let fileName = file.name
+    let target = '/upload'
+    let mimeType = file.type
+    let size = file.size
+    let type = 'server_import'
 
+    xmlHttpRequest.upload.addEventListener('progress', function (e) {
+
+      if (e.loaded <= size) {
+        var percent = Math.round(e.loaded / size * 100);
+        $(`#upload-progress-bar`).css('width', percent + '%');
+        $(`#upload-progress-bar`).html(percent + '%');
+      }
+    });
+
+    xmlHttpRequest.open('POST', target, true);
+    xmlHttpRequest.setRequestHeader('X-Content-Type', mimeType);
+    xmlHttpRequest.setRequestHeader('X-XSRFToken', token);
+    xmlHttpRequest.setRequestHeader('X-Content-Length', size);
+    xmlHttpRequest.setRequestHeader('X-Content-Disposition', 'attachment; filename="' + fileName + '"');
+    xmlHttpRequest.setRequestHeader('X-Content-Upload-Type', type);
+    xmlHttpRequest.setRequestHeader('X-FileName', fileName);
+    xmlHttpRequest.addEventListener('load', (event) => {
+      if (event.target.responseText == 'success') {
+        console.log('Upload for file', file.name, 'was successful!')
+        $("#upload_input").html(`<div class="card-header header-sm d-flex justify-content-between align-items-center" style="width: 100%;"><input value="${fileName}" type="text" id="file-uploaded" disabled></input> 🔒</div>`);
+        document.getElementById("lower_half").style.visibility = "visible";
+        document.getElementById("lower_half").hidden = false;
+      }
+      else {
+        console.log(JSON.parse(event.target.responseText).info)
+        bootbox.alert({
+          message: JSON.parse(event.target.responseText).info,
+          callback: function () {
+            window.location.reload();
+          }
+        });
+      }
+    }, false);
+    xmlHttpRequest.addEventListener('error', (e) => {
+      console.error('Error while uploading file', file.name + '.', 'Event:', e)
+    }, false);
+    xmlHttpRequest.send(file);
+  }
 </script>
 <script type="text/javascript" src="../../static/assets/js/shared/root-dir.js"></script>
 
@@ -842,15 +920,13 @@
     }
   }
   function calcRoles() {
-    var combinedValues = [];
-    $('.roles_select').each(function () {
-      var selectedValues = $(this).val();
-      console.log(selectedValues)
-      if (selectedValues) {
-        combinedValues = combinedValues.concat(selectedValues);
+    let role_ids = $('.roles').map(function () {
+      if ($(this).is(':checked')) {
+        return $(this).val();
       }
-    });
-    return combinedValues;
+    }).get();
+    console.log(role_ids)
+    return role_ids
   }
   async function send_server(data) {
     let token = getCookie("_xsrf")
@@ -910,6 +986,7 @@
 
 
       console.log(formDataJsonString);
+
       send_server(formDataJsonString);
     });
 
@@ -958,13 +1035,6 @@
       //Create an object from the form data entries
       let formDataObject = Object.fromEntries(formData.entries());
       console.log(formDataObject);
-      var checkedRadio = $('.root-input:checked');
-      let zip_root_path = ""
-      if (checkedRadio.length > 0) {
-        // Get the value of the checked radio button
-        var checkedValue = checkedRadio.val();
-        zip_root_path = checkedValue; // Return the checked value if needed
-      }
       let send_data = {
         "name": formDataObject.name,
         "roles": calcRoles(),
@@ -977,7 +1047,7 @@
         "minecraft_java_create_data": {
           "create_type": "import_server",
           "import_server_create_data": {
-            "existing_server_path": zip_root_path,
+            "existing_server_path": formDataObject.root_path,
             "jarfile": formDataObject.server_jar,
             "mem_min": formDataObject.mem_min,
             "mem_max": formDataObject.mem_max,
@@ -1001,13 +1071,6 @@
       //Create an object from the form data entries
       let formDataObject = Object.fromEntries(formData.entries());
       console.log(formDataObject);
-      var checkedRadio = $('.root-input:checked');
-      let zip_root_path = ""
-      if (checkedRadio.length > 0) {
-        // Get the value of the checked radio button
-        var checkedValue = checkedRadio.val();
-        zip_root_path = checkedValue; // Return the checked value if needed
-      }
       let send_data = {
         "name": formDataObject.name,
         "roles": calcRoles(),
@@ -1020,7 +1083,7 @@
         "minecraft_java_create_data": {
           "create_type": "import_server",
           "import_server_create_data": {
-            "existing_server_path": zip_root_path,
+            "existing_server_path": formDataObject.root_path,
             "jarfile": formDataObject.server_jar,
             "mem_min": formDataObject.mem_min,
             "mem_max": formDataObject.mem_max,
@@ -1041,6 +1104,19 @@
   $(".tree-reset").on("click", function () {
     location.href = "/server/step1";
   });
+  function dropDown(event) {
+    event.target.parentElement.children[1].classList.remove("d-none");
+    document.getElementById("overlay").classList.remove("d-none");
+  }
+
+  function hide(event) {
+    let items = document.getElementsByClassName('menu');
+    items.forEach(item => {
+      item.classList.add("d-none");
+    })
+
+    document.getElementById("overlay").classList.add("d-none");
+  }
 
   $(document).ready(function () {
     console.log('ready');
@@ -1221,6 +1297,4 @@
     serverTypeChange(selectObj);
   }
 </script>
-
-<script src="../../static/assets/js/shared/bootstrap-select-1.13.18.js"></script>
 {% end %}

app/migrations/20211120221511_api_keys.py

@@ -1,11 +1,10 @@
 import peewee
 import datetime
-from app.classes.shared.helpers import Helpers
 
 
 def migrate(migrator, database, **kwargs):
     migrator.add_columns(
-        "users", valid_tokens_from=peewee.DateTimeField(default=Helpers.get_utc_now)
+        "users", valid_tokens_from=peewee.DateTimeField(default=datetime.datetime.now)
     )
     migrator.drop_columns("users", ["api_token"])
 

app/migrations/20240217_rework_servers_uuid_part2.py

@@ -5,7 +5,13 @@ import logging
 
 from app.classes.shared.console import Console
 from app.classes.shared.migration import Migrator, MigrateHistory
-from app.classes.models.roles import Roles
+from app.classes.models.management import (
+    Webhooks,
+    Schedules,
+    Backups,
+)
+from app.classes.models.server_permissions import RoleServers
+from app.classes.models.base_model import BaseModel
 
 logger = logging.getLogger(__name__)
 
@@ -47,78 +53,6 @@ def migrate(migrator: Migrator, database, **kwargs):
             table_name = "servers"
             database = db
 
-    # **********************************************************************************
-    #                                  Role Servers Class
-    # **********************************************************************************
-    class RoleServers(peewee.Model):
-        role_id = peewee.ForeignKeyField(Roles, backref="role_server")
-        server_id = peewee.ForeignKeyField(Servers, backref="role_server")
-        permissions = peewee.CharField(default="00000000")
-
-        class Meta:
-            table_name = "role_servers"
-            primary_key = peewee.CompositeKey("role_id", "server_id")
-            database = db
-
-    # **********************************************************************************
-    #                                   Webhooks Class
-    # **********************************************************************************
-    class Webhooks(peewee.Model):
-        id = peewee.AutoField()
-        server_id = peewee.ForeignKeyField(Servers, backref="webhook_server", null=True)
-        name = peewee.CharField(default="Custom Webhook", max_length=64)
-        url = peewee.CharField(default="")
-        webhook_type = peewee.CharField(default="Custom")
-        bot_name = peewee.CharField(default="Crafty Controller")
-        trigger = peewee.CharField(default="server_start,server_stop")
-        body = peewee.CharField(default="")
-        color = peewee.CharField(default="#005cd1")
-        enabled = peewee.BooleanField(default=True)
-
-        class Meta:
-            table_name = "webhooks"
-            database = db
-
-    # **********************************************************************************
-    #                                   Schedules Class
-    # **********************************************************************************
-    class Schedules(peewee.Model):
-        schedule_id = peewee.IntegerField(unique=True, primary_key=True)
-        server_id = peewee.ForeignKeyField(Servers, backref="schedule_server")
-        enabled = peewee.BooleanField()
-        action = peewee.CharField()
-        interval = peewee.IntegerField()
-        interval_type = peewee.CharField()
-        start_time = peewee.CharField(null=True)
-        command = peewee.CharField(null=True)
-        name = peewee.CharField()
-        one_time = peewee.BooleanField(default=False)
-        cron_string = peewee.CharField(default="")
-        parent = peewee.IntegerField(null=True)
-        delay = peewee.IntegerField(default=0)
-        next_run = peewee.CharField(default="")
-
-        class Meta:
-            table_name = "schedules"
-            database = db
-
-    # **********************************************************************************
-    #                                   Backups Class
-    # **********************************************************************************
-    class Backups(peewee.Model):
-        excluded_dirs = peewee.CharField(null=True)
-        max_backups = peewee.IntegerField()
-        max_backups = peewee.IntegerField()
-        server_id = peewee.ForeignKeyField(Servers, backref="backups_server")
-        compress = peewee.BooleanField(default=False)
-        shutdown = peewee.BooleanField(default=False)
-        before = peewee.CharField(default="")
-        after = peewee.CharField(default="")
-
-        class Meta:
-            table_name = "backups"
-            database = db
-
     this_migration = MigrateHistory.get_or_none(
         MigrateHistory.name == "20240217_rework_servers_uuid_part2"
     )
@@ -136,8 +70,8 @@ def migrate(migrator: Migrator, database, **kwargs):
             return
 
     try:
-        logger.debug("Migrating Data from Int to UUID (Foreign Keys)")
-        Console.debug("Migrating Data from Int to UUID (Foreign Keys)")
+        logger.info("Migrating Data from Int to UUID (Foreign Keys)")
+        Console.info("Migrating Data from Int to UUID (Foreign Keys)")
 
         # Changes on Webhooks Log Table
         for webhook in Webhooks.select():
@@ -188,8 +122,8 @@ def migrate(migrator: Migrator, database, **kwargs):
                 and RoleServers.server_id == old_server_id
             ).execute()
 
-        logger.debug("Migrating Data from Int to UUID (Foreign Keys) : SUCCESS")
-        Console.debug("Migrating Data from Int to UUID (Foreign Keys) : SUCCESS")
+        logger.info("Migrating Data from Int to UUID (Foreign Keys) : SUCCESS")
+        Console.info("Migrating Data from Int to UUID (Foreign Keys) : SUCCESS")
 
     except Exception as ex:
         logger.error("Error while migrating Data from Int to UUID (Foreign Keys)")
@@ -201,16 +135,16 @@ def migrate(migrator: Migrator, database, **kwargs):
         return
 
     try:
-        logger.debug("Migrating Data from Int to UUID (Primary Keys)")
-        Console.debug("Migrating Data from Int to UUID (Primary Keys)")
+        logger.info("Migrating Data from Int to UUID (Primary Keys)")
+        Console.info("Migrating Data from Int to UUID (Primary Keys)")
         # Migrating servers from the old id type to the new one
         for server in Servers.select():
             Servers.update(server_id=server.server_uuid).where(
                 Servers.server_id == server.server_id
             ).execute()
 
-        logger.debug("Migrating Data from Int to UUID (Primary Keys) : SUCCESS")
-        Console.debug("Migrating Data from Int to UUID (Primary Keys) : SUCCESS")
+        logger.info("Migrating Data from Int to UUID (Primary Keys) : SUCCESS")
+        Console.info("Migrating Data from Int to UUID (Primary Keys) : SUCCESS")
 
     except Exception as ex:
         logger.error("Error while migrating Data from Int to UUID (Primary Keys)")
@@ -269,81 +203,9 @@ def rollback(migrator: Migrator, database, **kwargs):
             table_name = "servers"
             database = db
 
-    # **********************************************************************************
-    #                                  Role Servers Class
-    # **********************************************************************************
-    class RoleServers(peewee.Model):
-        role_id = peewee.ForeignKeyField(Roles, backref="role_server")
-        server_id = peewee.ForeignKeyField(Servers, backref="role_server")
-        permissions = peewee.CharField(default="00000000")
-
-        class Meta:
-            table_name = "role_servers"
-            primary_key = peewee.CompositeKey("role_id", "server_id")
-            database = db
-
-    # **********************************************************************************
-    #                                   Webhooks Class
-    # **********************************************************************************
-    class Webhooks(peewee.Model):
-        id = peewee.AutoField()
-        server_id = peewee.ForeignKeyField(Servers, backref="webhook_server", null=True)
-        name = peewee.CharField(default="Custom Webhook", max_length=64)
-        url = peewee.CharField(default="")
-        webhook_type = peewee.CharField(default="Custom")
-        bot_name = peewee.CharField(default="Crafty Controller")
-        trigger = peewee.CharField(default="server_start,server_stop")
-        body = peewee.CharField(default="")
-        color = peewee.CharField(default="#005cd1")
-        enabled = peewee.BooleanField(default=True)
-
-        class Meta:
-            table_name = "webhooks"
-            database = db
-
-    # **********************************************************************************
-    #                                   Schedules Class
-    # **********************************************************************************
-    class Schedules(peewee.Model):
-        schedule_id = peewee.IntegerField(unique=True, primary_key=True)
-        server_id = peewee.ForeignKeyField(Servers, backref="schedule_server")
-        enabled = peewee.BooleanField()
-        action = peewee.CharField()
-        interval = peewee.IntegerField()
-        interval_type = peewee.CharField()
-        start_time = peewee.CharField(null=True)
-        command = peewee.CharField(null=True)
-        name = peewee.CharField()
-        one_time = peewee.BooleanField(default=False)
-        cron_string = peewee.CharField(default="")
-        parent = peewee.IntegerField(null=True)
-        delay = peewee.IntegerField(default=0)
-        next_run = peewee.CharField(default="")
-
-        class Meta:
-            table_name = "schedules"
-            database = db
-
-    # **********************************************************************************
-    #                                   Backups Class
-    # **********************************************************************************
-    class Backups(peewee.Model):
-        excluded_dirs = peewee.CharField(null=True)
-        max_backups = peewee.IntegerField()
-        max_backups = peewee.IntegerField()
-        server_id = peewee.ForeignKeyField(Servers, backref="backups_server")
-        compress = peewee.BooleanField(default=False)
-        shutdown = peewee.BooleanField(default=False)
-        before = peewee.CharField(default="")
-        after = peewee.CharField(default="")
-
-        class Meta:
-            table_name = "backups"
-            database = db
-
     try:
-        logger.debug("Migrating Data from UUID to Int (Primary Keys)")
-        Console.debug("Migrating Data from UUID to Int (Primary Keys)")
+        logger.info("Migrating Data from UUID to Int (Primary Keys)")
+        Console.info("Migrating Data from UUID to Int (Primary Keys)")
         # Migrating servers from the old id type to the new one
         new_id = 0
         for server in Servers.select():
@@ -355,8 +217,8 @@ def rollback(migrator: Migrator, database, **kwargs):
                 Servers.server_id == server.server_id
             ).execute()
 
-        logger.debug("Migrating Data from UUID to Int (Primary Keys) : SUCCESS")
-        Console.debug("Migrating Data from UUID to Int (Primary Keys) : SUCCESS")
+        logger.info("Migrating Data from UUID to Int (Primary Keys) : SUCCESS")
+        Console.info("Migrating Data from UUID to Int (Primary Keys) : SUCCESS")
 
     except Exception as ex:
         logger.error("Error while migrating Data from UUID to Int (Primary Keys)")
@@ -368,8 +230,8 @@ def rollback(migrator: Migrator, database, **kwargs):
         return
 
     try:
-        logger.debug("Migrating Data from UUID to Int (Foreign Keys)")
-        Console.debug("Migrating Data from UUID to Int (Foreign Keys)")
+        logger.info("Migrating Data from UUID to Int (Foreign Keys)")
+        Console.info("Migrating Data from UUID to Int (Foreign Keys)")
         # Changes on Webhooks Log Table
         for webhook in Webhooks.select():
             old_server_id = webhook.server_id_id
@@ -419,8 +281,8 @@ def rollback(migrator: Migrator, database, **kwargs):
                 and RoleServers.server_id == old_server_id
             ).execute()
 
-        logger.debug("Migrating Data from UUID to Int (Foreign Keys) : SUCCESS")
-        Console.debug("Migrating Data from UUID to Int (Foreign Keys) : SUCCESS")
+        logger.info("Migrating Data from UUID to Int (Foreign Keys) : SUCCESS")
+        Console.info("Migrating Data from UUID to Int (Foreign Keys) : SUCCESS")
 
     except Exception as ex:
         logger.error("Error while migrating Data from UUID to Int (Foreign Keys)")

app/migrations/20240308_multi-backup.py

@@ -1,238 +0,0 @@
-import os
-import datetime
-import uuid
-import peewee
-import logging
-
-
-from app.classes.shared.helpers import Helpers
-from app.classes.shared.console import Console
-from app.classes.shared.migration import Migrator
-from app.classes.shared.file_helpers import FileHelpers
-
-logger = logging.getLogger(__name__)
-
-
-def migrate(migrator: Migrator, database, **kwargs):
-    """
-    Write your migrations here.
-    """
-    db = database
-    Console.info("Starting Backups migrations")
-    Console.info(
-        "Migrations: Adding columns [backup_id, "
-        "backup_name, backup_location, enabled, default, action_id, backup_status]"
-    )
-    migrator.add_columns(
-        "backups",
-        backup_id=peewee.CharField(default=Helpers.create_uuid),
-    )
-    migrator.add_columns("backups", backup_name=peewee.CharField(default="Default"))
-    migrator.add_columns("backups", backup_location=peewee.CharField(default=""))
-    migrator.add_columns("backups", enabled=peewee.BooleanField(default=True))
-    migrator.add_columns("backups", default=peewee.BooleanField(default=False))
-    migrator.add_columns(
-        "backups",
-        status=peewee.CharField(default='{"status": "Standby", "message": ""}'),
-    )
-    migrator.add_columns(
-        "schedules", action_id=peewee.CharField(null=True, default=None)
-    )
-
-    class Servers(peewee.Model):
-        server_id = peewee.CharField(primary_key=True, default=str(uuid.uuid4()))
-        created = peewee.DateTimeField(default=datetime.datetime.now)
-        server_name = peewee.CharField(default="Server", index=True)
-        path = peewee.CharField(default="")
-        backup_path = peewee.CharField(default="")
-        executable = peewee.CharField(default="")
-        log_path = peewee.CharField(default="")
-        execution_command = peewee.CharField(default="")
-        auto_start = peewee.BooleanField(default=0)
-        auto_start_delay = peewee.IntegerField(default=10)
-        crash_detection = peewee.BooleanField(default=0)
-        stop_command = peewee.CharField(default="stop")
-        executable_update_url = peewee.CharField(default="")
-        server_ip = peewee.CharField(default="127.0.0.1")
-        server_port = peewee.IntegerField(default=25565)
-        logs_delete_after = peewee.IntegerField(default=0)
-        type = peewee.CharField(default="minecraft-java")
-        show_status = peewee.BooleanField(default=1)
-        created_by = peewee.IntegerField(default=-100)
-        shutdown_timeout = peewee.IntegerField(default=60)
-        ignored_exits = peewee.CharField(default="0")
-
-        class Meta:
-            table_name = "servers"
-            database = db
-
-    class Backups(peewee.Model):
-        backup_id = peewee.CharField(primary_key=True, default=Helpers.create_uuid)
-        backup_name = peewee.CharField(default="New Backup")
-        backup_location = peewee.CharField(default="")
-        excluded_dirs = peewee.CharField(null=True)
-        max_backups = peewee.IntegerField()
-        server_id = peewee.ForeignKeyField(Servers, backref="backups_server")
-        compress = peewee.BooleanField(default=False)
-        shutdown = peewee.BooleanField(default=False)
-        before = peewee.CharField(default="")
-        after = peewee.CharField(default="")
-        default = peewee.BooleanField(default=False)
-        status = peewee.CharField(default='{"status": "Standby", "message": ""}')
-        enabled = peewee.BooleanField(default=True)
-
-        class Meta:
-            table_name = "backups"
-            database = db
-
-    class NewBackups(peewee.Model):
-        backup_id = peewee.CharField(primary_key=True, default=Helpers.create_uuid)
-        backup_name = peewee.CharField(default="New Backup")
-        backup_location = peewee.CharField(default="")
-        excluded_dirs = peewee.CharField(null=True)
-        max_backups = peewee.IntegerField()
-        server_id = peewee.ForeignKeyField(Servers, backref="backups_server")
-        compress = peewee.BooleanField(default=False)
-        shutdown = peewee.BooleanField(default=False)
-        before = peewee.CharField(default="")
-        after = peewee.CharField(default="")
-        default = peewee.BooleanField(default=False)
-        status = peewee.CharField(default='{"status": "Standby", "message": ""}')
-        enabled = peewee.BooleanField(default=True)
-
-        class Meta:
-            table_name = "new_backups"
-            database = db
-
-    class Schedules(peewee.Model):
-        schedule_id = peewee.IntegerField(unique=True, primary_key=True)
-        server_id = peewee.ForeignKeyField(Servers, backref="schedule_server")
-        enabled = peewee.BooleanField()
-        action = peewee.CharField()
-        interval = peewee.IntegerField()
-        interval_type = peewee.CharField()
-        start_time = peewee.CharField(null=True)
-        command = peewee.CharField(null=True)
-        action_id = peewee.CharField(null=True)
-        name = peewee.CharField()
-        one_time = peewee.BooleanField(default=False)
-        cron_string = peewee.CharField(default="")
-        parent = peewee.IntegerField(null=True)
-        delay = peewee.IntegerField(default=0)
-        next_run = peewee.CharField(default="")
-
-        class Meta:
-            table_name = "schedules"
-            database = db
-
-    class NewSchedules(peewee.Model):
-        schedule_id = peewee.IntegerField(unique=True, primary_key=True)
-        server_id = peewee.ForeignKeyField(Servers, backref="schedule_server")
-        enabled = peewee.BooleanField()
-        action = peewee.CharField()
-        interval = peewee.IntegerField()
-        interval_type = peewee.CharField()
-        start_time = peewee.CharField(null=True)
-        command = peewee.CharField(null=True)
-        action_id = peewee.CharField(null=True)
-        name = peewee.CharField()
-        one_time = peewee.BooleanField(default=False)
-        cron_string = peewee.CharField(default="")
-        parent = peewee.IntegerField(null=True)
-        delay = peewee.IntegerField(default=0)
-        next_run = peewee.CharField(default="")
-
-        class Meta:
-            table_name = "new_schedules"
-            database = db
-
-    migrator.create_table(NewBackups)
-    migrator.create_table(NewSchedules)
-
-    migrator.run()
-
-    # Copy data from the existing backups table to the new one
-    for backup in Backups.select():
-        # Fetch the related server entry from the Servers table
-        server = Servers.get(Servers.server_id == backup.server_id)
-        Console.info(f"Migrations: Migrating backup for server {server.server_name}")
-        # Create a new backup entry with data from the
-        # old backup entry and related server
-        new_backup = NewBackups.create(
-            backup_name=f"{server.server_name} Backup",
-            # Set backup_location equal to backup_path
-            backup_location=server.backup_path,
-            excluded_dirs=backup.excluded_dirs,
-            max_backups=backup.max_backups,
-            server_id=server.server_id,
-            compress=backup.compress,
-            shutdown=backup.shutdown,
-            before=backup.before,
-            after=backup.after,
-            default=True,
-            enabled=True,
-        )
-        Helpers.ensure_dir_exists(
-            os.path.join(server.backup_path, new_backup.backup_id)
-        )
-        for file in os.listdir(server.backup_path):
-            if not os.path.isdir(os.path.join(os.path.join(server.backup_path, file))):
-                FileHelpers.move_file(
-                    os.path.join(server.backup_path, file),
-                    os.path.join(server.backup_path, new_backup.backup_id, file),
-                )
-
-    Console.debug("Migrations: Dropping old backup table")
-    # Drop the existing backups table
-    migrator.drop_table("backups")
-
-    Console.debug("Migrations: Renaming new_backups to backups")
-    # Rename the new table to backups
-    migrator.rename_table("new_backups", "backups")
-
-    Console.debug("Migrations: Dropping backup_path from servers table")
-    migrator.drop_columns("servers", ["backup_path"])
-
-    for schedule in Schedules.select():
-        action_id = None
-        if schedule.command == "backup_server":
-            Console.info(
-                f"Migrations: Adding backup ID to task with name {schedule.name}"
-            )
-            backup = NewBackups.get(NewBackups.server_id == schedule.server_id)
-            action_id = backup.backup_id
-        NewSchedules.create(
-            schedule_id=schedule.schedule_id,
-            server_id=schedule.server_id,
-            enabled=schedule.enabled,
-            action=schedule.action,
-            interval=schedule.interval,
-            interval_type=schedule.interval_type,
-            start_time=schedule.start_time,
-            command=schedule.command,
-            action_id=action_id,
-            name=schedule.name,
-            one_time=schedule.one_time,
-            cron_string=schedule.cron_string,
-            parent=schedule.parent,
-            delay=schedule.delay,
-            next_run=schedule.next_run,
-        )
-
-    Console.debug("Migrations: dropping old schedules table")
-    # Drop the existing backups table
-    migrator.drop_table("schedules")
-
-    Console.debug("Migrations: renaming new_schedules to schedules")
-    # Rename the new table to backups
-    migrator.rename_table("new_schedules", "schedules")
-
-
-def rollback(migrator: Migrator, database, **kwargs):
-    """
-    Write your rollback migrations here.
-    """
-    db = database
-
-    migrator.drop_columns("backups", ["name", "backup_id", "backup_location"])
-    migrator.add_columns("servers", backup_path=peewee.CharField(default=""))

app/translations/cs_CS.json

@@ -321,12 +321,10 @@
         "serversDesc": "servery, ke kterým má tato role přístup"
     },
     "serverBackups": {
-        "actions": "Akce",
         "after": "Spustit příkaz po záloze",
         "backupAtMidnight": "Automatické zálohování o půlnoci?",
         "backupNow": "Zálohovat nyní!",
         "backupTask": "Bylo spuštěno zálohování.",
-        "backups": "Zálohy serverů",
         "before": "Spustit příkaz před zálohou",
         "cancel": "Zrušit",
         "clickExclude": "Kliknutím vyberete výjimku",
@@ -335,34 +333,21 @@
         "confirmDelete": "Chcete tuto zálohu odstranit? Tuto akci nelze vrátit zpět.",
         "confirmRestore": "Jste si jisti, že chcete provést obnovu z této zálohy. Všechny aktuální soubory serveru se změní na stav zálohy a nebude možné je obnovit.",
         "currentBackups": "Aktuální zálohy",
-        "default": "Defaultní záloha",
-        "defaultExplain": "Tuto zálohu Crafty používalo před aktualizací. Nemůžete ji změnit nebo smazat",
         "delete": "Smazat",
         "destroyBackup": "Zničit zálohu \" + file_to_del + \"?",
         "download": "Stáhnout",
-        "edit": "upravit",
-        "enabled": "Povoleno",
         "excludedBackups": "Vyloučené cesty: ",
         "excludedChoose": "Vyberte cesty, které chcete ze zálohování vyloučit.",
         "exclusionsTitle": "Vyloučení ze zálohování",
-        "failed": "Selhalo",
         "maxBackups": "Maximální počet záloh",
         "maxBackupsDesc": "Crafty neuloží více než N záloh a odstraní nejstarší (zadejte 0 pro zachování všech).",
-        "myBackup": "Moje nová záloha",
-        "name": "Jméno",
-        "newBackup": "Vytvořit novou zálohu",
-        "no-backup": "Žádné zálohy. Pro vytvoření nové zálohy zmáčkněte prosím. Vytvořit novou zálohu",
         "options": "Nastavení",
         "path": "Cesta",
         "restore": "Obnovit",
         "restoring": "Obnovení zálohy. To může chvíli trvat. Buďte prosím trpěliví.",
-        "run": "Nastartovat zálohu",
         "save": "Uložit",
         "shutdown": "Vypnout server po dobu zálohování",
         "size": "Velikost",
-        "standby": "V pohotovosti",
-        "status": "Stav",
-        "storage": "Lokace uložiště",
         "storageLocation": "Umístění úložiště",
         "storageLocationDesc": "Kam chcete ukládat zálohy?"
     },
@@ -527,7 +512,6 @@
     },
     "serverSchedules": {
         "action": "Akce",
-        "actionId": "Vyberte zálohu na které se to má potvrdit!",
         "areYouSure": "Odstranění naplánované úlohy?",
         "cancel": "Zrušit",
         "cannotSee": "Nevidíte všechno?",
@@ -605,8 +589,6 @@
         "minMem": "Minimální paměť",
         "myNewServer": "Nový server",
         "newServer": "Vytvořit nový server",
-        "noRole": "Žádna role nebyla nalezena z tím to vstupem",
-        "noneRoles": "Žádne role vybrány",
         "quickSettings": "Rychlé nastavení",
         "quickSettingsDescription": "Nebojte se, můžete je změnit později.",
         "resetForm": "Obnovit nastavení formuláře",
@@ -637,6 +619,7 @@
         "dashboard": "Ovládací panel",
         "documentation": "Dokumentace",
         "inApp": "V lokalní dokumentaci",
+        "navigation": "Navigace",
         "newServer": "Vytvořit nový server",
         "servers": "Servery"
     },
@@ -690,9 +673,6 @@
         "userTheme": "Motiv UI",
         "uses": "Počet povolených použití (-1==bez omezení)"
     },
-    "validators": {
-        "passLength": "Heslo je příliš krátké. Minimální délka je 8 znaků"
-    },
     "webhooks": {
         "areYouSureDel": "Seš si jistý že chceš smazat tento webhook?",
         "areYouSureRun": "Seš si jistý že chceš otestovat tento webhook?",

app/translations/de_DE.json

@@ -301,12 +301,10 @@
         "serversDesc": "Server, auf die Nutzer mit dieser Rolle zugreifen darf"
     },
     "serverBackups": {
-        "actions": "Aktionen",
         "after": "Befehl nach dem Backup ausführen",
         "backupAtMidnight": "Automatisches Backup um 24:00 Uhr?",
         "backupNow": "Jetzt sichern!",
         "backupTask": "Ein Backup-Auftrag wurde gestartet.",
-        "backups": "Server-Backups",
         "before": "Befehl vor dem Backup ausführen",
         "cancel": "Abbrechen",
         "clickExclude": "Auswählen, um Ausnahmen zu markieren",
@@ -315,34 +313,21 @@
         "confirmDelete": "Möchten Sie diese Backup-Datei löschen? Dies kann nicht rückgängig gemacht werden.",
         "confirmRestore": "Sicher, dass dieses Backup wiederherstellgestellt werden soll? Alle aktuellen Serverdateien werden in den Zustand von diesem Backup versetzt und können nicht wiederhergestellt werden.",
         "currentBackups": "Aktuelle Backups",
-        "default": "Standard-Backup",
-        "defaultExplain": "Das Backup, welches Crafty vor Updates verwendet. Dies kann nicht geändert oder gelöscht werden.",
         "delete": "Löschen",
         "destroyBackup": "Backup löschen \" + file_to_del + \"?",
         "download": "Herunterladen",
-        "edit": "Bearbeiten",
-        "enabled": "Aktiviert",
         "excludedBackups": "Ausgeschlossene Verzeichnisse: ",
         "excludedChoose": "Verzeichnisse auswählen, die nicht gesichert werden sollen",
         "exclusionsTitle": "Backup Ausnahmen",
-        "failed": "Fehlgeschlagen",
         "maxBackups": "Maximale Backups",
         "maxBackupsDesc": "Crafty speichert nicht mehr als N Backups, wodurch das älteste gelöscht wird (geben Sie 0 ein, um alle zu behalten)",
-        "myBackup": "Mein Neues Backup",
-        "name": "Name",
-        "newBackup": "Neues Backup erstellen",
-        "no-backup": "Keine Backups. Um eine neue Backup-Konfiguration zu erstellen, bitte auf 'Neues Backup erstellen' klicken.",
         "options": "Optionen",
         "path": "Pfad",
         "restore": "Wiederherstellen",
         "restoring": "Backup wiederherstellen. Dies kann eine Weile dauern.",
-        "run": "Backup erstellen",
         "save": "Speichern",
         "shutdown": "Server für die Dauer des Backups stoppen",
         "size": "Größe",
-        "standby": "Bereitschaft",
-        "status": "Status",
-        "storage": "Speicherort",
         "storageLocation": "Speicherort",
         "storageLocationDesc": "Wo wollen Sie die Backups speichern?"
     },
@@ -507,7 +492,6 @@
     },
     "serverSchedules": {
         "action": "Aktion",
-        "actionId": "Aktion auswählen",
         "areYouSure": "Geplante Aufgabe löschen?",
         "cancel": "Abbrechen",
         "cannotSee": "Nicht alles sichtbar?",
@@ -586,8 +570,6 @@
         "minMem": "Minimaler RAM",
         "myNewServer": "Mein neuer Server",
         "newServer": "Neuen Server erstellen",
-        "noRole": "Keine Rolle mit aktuellem Suchparameter gefunden",
-        "noneRoles": "Keine Rollen ausgewählt",
         "quickSettings": "Schnelleinstellungen",
         "quickSettingsDescription": "Keine Sorge, Änderungen können später immer noch vorgenommen werden.",
         "resetForm": "Konfiguration zurücksetzen",
@@ -618,6 +600,7 @@
         "dashboard": "Dashboard",
         "documentation": "Dokumentation",
         "inApp": "In-App-Dokumentation",
+        "navigation": "Navigation",
         "newServer": "Neuen Server erstellen",
         "servers": "Server"
     },
@@ -671,9 +654,6 @@
         "userTheme": "Design für die Benutzeroberfläche",
         "uses": "Anzahl der erlaubten Verwendungen (-1==Keine Begrenzung)"
     },
-    "validators": {
-        "passLength": "Passwort zu kurz. Mindestlänge: 8"
-    },
     "webhooks": {
         "areYouSureDel": "Sind Sie sicher, dass Sie diesen Webhook löschen möchten?",
         "areYouSureRun": "Sind Sie sicher, dass Sie diesen Webhook testen möchten?",

app/translations/en_EN.json

@@ -298,12 +298,10 @@
         "serversDesc": "servers this role is allowed to access"
     },
     "serverBackups": {
-        "actions": "Actions",
         "after": "Run command after backup",
         "backupAtMidnight": "Auto-backup at midnight?",
         "backupNow": "Backup Now!",
         "backupTask": "A backup task has been started.",
-        "backups": "Server Backups",
         "before": "Run command before backup",
         "cancel": "Cancel",
         "clickExclude": "Click to select Exclusions",
@@ -312,34 +310,21 @@
         "confirmDelete": "Do you want to delete this backup? This cannot be undone.",
         "confirmRestore": "Are you sure you want to restore from this backup. All current server files will changed to backup state and will be unrecoverable.",
         "currentBackups": "Current Backups",
-        "default": "Default Backup",
-        "defaultExplain": "The backup that Crafty will use before updates. This cannot be changed or deleted.",
         "delete": "Delete",
         "destroyBackup": "Destroy backup \" + file_to_del + \"?",
         "download": "Download",
-        "edit": "Edit",
-        "enabled": "Enabled",
         "excludedBackups": "Excluded Paths: ",
         "excludedChoose": "Choose the paths you wish to exclude from your backups",
         "exclusionsTitle": "Backup Exclusions",
-        "failed": "Failed",
         "maxBackups": "Max Backups",
         "maxBackupsDesc": "Crafty will not store more than N backups, deleting the oldest (enter 0 to keep all)",
-        "myBackup": "My New Backup",
-        "name": "Name",
-        "newBackup": "Create New Backup",
-        "no-backup": "No Backups. To  make a new backup configuration please press. New Backup",
         "options": "Options",
         "path": "Path",
         "restore": "Restore",
         "restoring": "Restoring Backup. This may take a while. Please be patient.",
-        "run": "Run Backup",
         "save": "Save",
         "shutdown": "Shutdown server for duration of backup",
         "size": "Size",
-        "standby": "Standby",
-        "status": "Status",
-        "storage": "Storage Location",
         "storageLocation": "Storage Location",
         "storageLocationDesc": "Where do you want to store backups?"
     },
@@ -504,7 +489,6 @@
     },
     "serverSchedules": {
         "action": "Action",
-        "actionId": "Select Action Child",
         "areYouSure": "Delete Scheduled Task?",
         "cancel": "Cancel",
         "cannotSee": "Not seeing everything?",
@@ -582,8 +566,6 @@
         "minMem": "Minimum Memory",
         "myNewServer": "My New Server",
         "newServer": "Create New Server",
-        "noRole": "No role found with current search parameter",
-        "noneRoles": "No Roles Selected",
         "quickSettings": "Quick Settings",
         "quickSettingsDescription": "Don't worry, you can change these later",
         "resetForm": "Reset Form",
@@ -614,6 +596,7 @@
         "dashboard": "Dashboard",
         "documentation": "Documentation",
         "inApp": "In App Docs",
+        "navigation": "Navigation",
         "newServer": "Create New Server",
         "servers": "Servers"
     },
@@ -667,9 +650,6 @@
         "userTheme": "UI Theme",
         "uses": "Number of uses allowed (-1==No Limit)"
     },
-    "validators": {
-        "passLength": "Password Too Short. Minimum Length: 8"
-    },
     "webhooks": {
         "areYouSureDel": "Are you sure you want to delete this webhook?",
         "areYouSureRun": "Are you sure you want to test this webhook?",

app/translations/es_ES.json

@@ -228,7 +228,7 @@
         "login": "Iniciar Sesión",
         "password": "Contraseña",
         "username": "Usuario",
-        "viewStatus": "Ver página de estado público"
+        "viewStatus": "View Public Status Page"
     },
     "notify": {
         "activityLog": "Registros de actividad",
@@ -301,12 +301,10 @@
         "serversDesc": "Servidores a los que este grupo puede acceder"
     },
     "serverBackups": {
-        "actions": "Acciones",
         "after": "Comando ejecutado después del respaldo",
         "backupAtMidnight": "¿Copia de seguridad automática a medianoche?",
         "backupNow": "¡Respalde ahora!",
         "backupTask": "Se ha iniciado una tarea de copia de seguridad.",
-        "backups": "Copias de seguridad del servidor",
         "before": "Comando ejecutado antes del respaldo",
         "cancel": "Cancelar",
         "clickExclude": "Click para seleccionar las Exclusiones",
@@ -315,34 +313,21 @@
         "confirmDelete": "¿Quieres eliminar esta copia de seguridad? Esto no se puede deshacer.",
         "confirmRestore": "¿Seguro que quiere restaurar desde este respaldo?. Todos los archivos del servidor actuales serán cambiados al estado del respaldo y serán irrecuperables.",
         "currentBackups": "Copias de seguridad actuales",
-        "default": "Copia de seguridad predeterminada",
-        "defaultExplain": "La copia de seguridad que Crafty usará antes de actualizar. No se puede cambiar ni eliminar.",
         "delete": "Eliminar",
         "destroyBackup": "¿Destruir copia de seguridad \" + file_to_del + \"?",
         "download": "Descargar",
-        "edit": "Editar",
-        "enabled": "Habilitado",
         "excludedBackups": "Rutas Excluidas: ",
         "excludedChoose": "Elige las rutas que desea excluir de los respaldos",
         "exclusionsTitle": "Exclusiones en respaldos.",
-        "failed": "Fallido",
         "maxBackups": "Cantidad máxima de respaldos",
         "maxBackupsDesc": "Crafty no almacenará más de N copias de seguridad, eliminando la más antigua. (Sin límite: 0)",
-        "myBackup": "Mi Nueva Copia",
-        "name": "Nombre",
-        "newBackup": "Crear Nueva Copia de Seguridad",
-        "no-backup": "No hay copias de seguridad. Para crear una nueva configuración de copias de seguridad, presiona Crear nueva copia",
         "options": "Opciones",
         "path": "Ruta",
         "restore": "Restaurar",
         "restoring": "Restaurando copia de seguridad. Esto puede tomar un tiempo. Sea paciente.",
-        "run": "Ejecutar Copia de seguridad",
         "save": "Guardar",
         "shutdown": "Apagar el servidor durante la duración de la copia del respaldo.",
         "size": "Tamaño",
-        "standby": "En espera",
-        "status": "Estado",
-        "storage": "Ubicación del almacenamiento",
         "storageLocation": "Ubicación de almacenamiento",
         "storageLocationDesc": "¿Dónde quieres almacenar las copias de seguridad?"
     },
@@ -507,7 +492,6 @@
     },
     "serverSchedules": {
         "action": "Acción",
-        "actionId": "Seleccionar acción secundaria",
         "areYouSure": "¿Borrar tarea programada?",
         "cancel": "Cancelar",
         "cannotSee": "¿No puede ver todo?",
@@ -586,8 +570,6 @@
         "minMem": "Memoria mínima",
         "myNewServer": "Mi nuevo Servidor",
         "newServer": "Crear Servidor",
-        "noRole": "No se encontró ningún rol con el parámetro de búsqueda actual",
-        "noneRoles": "No hay roles seleccionados",
         "quickSettings": "Ajustes rápidos",
         "quickSettingsDescription": "No te preocupes, puedes cambiarlos más tarde.",
         "resetForm": "Limpiar formulario",
@@ -618,6 +600,7 @@
         "dashboard": "Panel de control",
         "documentation": "Documentación",
         "inApp": "Documentación de la Aplicación",
+        "navigation": "Navegación",
         "newServer": "Crear nuevo Servidor",
         "servers": "Servidores"
     },
@@ -671,9 +654,6 @@
         "userTheme": "Tema de Interfaz",
         "uses": "Número de usos permitidos. (Sin límite: -1)"
     },
-    "validators": {
-        "passLength": "Contraseña demasiado corta. Longitud mínima: 8"
-    },
     "webhooks": {
         "areYouSureDel": "¿Estás seguro de que quieres eliminar este webhook?",
         "areYouSureRun": "¿Estás seguro de que quieres probar este webhook?",

app/translations/fi_FI_incomplete.json

@@ -520,6 +520,7 @@
         "credits": "Hyvitykset",
         "dashboard": "Kojelauta",
         "documentation": "Dokumentaatio",
+        "navigation": "Navigaatio",
         "newServer": "Luo uusi palvelin",
         "servers": "Palvelimet"
     },

app/translations/fr_FR.json

@@ -301,12 +301,10 @@
         "serversDesc": "Les serveurs auquels ce rôle a accès"
     },
     "serverBackups": {
-        "actions": "Actions",
         "after": "Exécuter une commande après la sauvegarde",
         "backupAtMidnight": "Sauvegarde Automatique à minuit ?",
         "backupNow": "Sauvegarder Maintenant !",
         "backupTask": "Une sauvegarde vient de démarrer.",
-        "backups": "Sauvegarde de Serveur",
         "before": "Exécuter une commande avant la sauvegarde",
         "cancel": "Annuler",
         "clickExclude": "Cliquer pour sélectionner les Exclusions",
@@ -315,34 +313,21 @@
         "confirmDelete": "Es-tu sûr de vouloir supprimer cette sauvegarde ? Tu ne pourras pas revenir en arrière.",
         "confirmRestore": "Êtes-vous sûr de vouloir restaurer à partir de cette sauvegarde. Tous les fichiers du serveur actuel passeront à l'état de sauvegarde et seront irrécupérables.",
         "currentBackups": "Sauvegardes Actuelles",
-        "default": "Sauvegarde par Défaut",
-        "defaultExplain": "La sauvegarde que Crafty utilisera avant la mise à jour. Cela ne peut être changé ou modifié.",
         "delete": "Supprimer",
         "destroyBackup": "Supprimer la sauvegarde \" + file_to_del + \" ?",
         "download": "Télécharger",
-        "edit": "Modifier",
-        "enabled": "Activé",
         "excludedBackups": "Dossiers Exclus : ",
         "excludedChoose": "Choisir les dossiers à exclure de la sauvegarde",
         "exclusionsTitle": "Exclusions de Sauvegarde",
-        "failed": "Echec",
         "maxBackups": "Sauvergardes Max",
         "maxBackupsDesc": "Crafty ne fera pas plus de N sauvegardes, supprimant les plus anciennes (entrer 0 pour toutes les garder)",
-        "myBackup": "Ma Nouvelle Sauvegarde",
-        "name": "Nom",
-        "newBackup": "Créer une Nouvelle Sauvegarde",
-        "no-backup": "Aucune Sauvegarde. Pour aouter une nouvelle configuration de sauvegarde, il faut clicker sur ",
         "options": "Options",
         "path": "Chemin",
         "restore": "Restaurer",
         "restoring": "Restauration de la sauvegarde. Cela peut prendre un peu de temps. S'il vous plaît soyez patient.",
-        "run": "Lancer la Sauvegarde",
         "save": "Sauvegarder",
         "shutdown": "Extinction du serveur pendant la durée de la sauvegarde",
         "size": "Taille",
-        "standby": "Attente",
-        "status": "Statut",
-        "storage": "Emplacement de la Sauvegarde",
         "storageLocation": "Emplacement de Sauvegarde",
         "storageLocationDesc": "Où veux-tu enregister tes sauvegardes ?"
     },
@@ -507,7 +492,6 @@
     },
     "serverSchedules": {
         "action": "Action",
-        "actionId": "Sélectionner une configuration de sauvegarde",
         "areYouSure": "Supprimer la Tâche Planifiée ?",
         "cancel": "Annuler",
         "cannotSee": "Tu ne peux pas tout voir ?",
@@ -558,7 +542,7 @@
         "importing": "Importation ...",
         "installing": "Installation ...",
         "restart": "Redémarrer",
-        "sendCommand": "Envoyer commande",
+        "sendCommand": "Envoiyer commande",
         "start": "Démarrer",
         "starting": "Démarrage retardé",
         "stop": "Arrêter",
@@ -586,10 +570,8 @@
         "minMem": "Mémoire Minimum",
         "myNewServer": "Mon Nouveau Serveur",
         "newServer": "Créer un Nouveau Serveur",
-        "noRole": "Aucun rôle trouvé avec les paramètres de recherche suivants",
-        "noneRoles": "Aucun Rôle Sélectionné ",
         "quickSettings": "Paramètres Rapides",
-        "quickSettingsDescription": "Pas d'Inquiétude, tu peux changer tout ça plus tard",
+        "quickSettingsDescription": "Pas d'Inquiétude, tu peux changer tout ça polus tard",
         "resetForm": "Réinitialiser Formulaire",
         "save": "Sauvegarder",
         "selectRole": "Sélectionnez le rôle(s)",
@@ -599,7 +581,7 @@
         "selectVersion": "Selectionner une Version",
         "selectZipDir": "Selectionner le dossier de l'archive depuis lequel extraire les fichiers",
         "serverJar": "Fichier Jar du Serveur",
-        "serverName": "Nom du Serveur",
+        "serverName": "Non du Serveur",
         "serverPath": "Chemin du Serveur",
         "serverPort": "Port du Serveur",
         "serverSelect": "Sélectionner un Serveur",
@@ -618,6 +600,7 @@
         "dashboard": "Tableau de Bord",
         "documentation": "Documentation",
         "inApp": "Documentation Interne",
+        "navigation": "Navigation",
         "newServer": "Créer un Nouveau Serveur",
         "servers": "Serveurs"
     },
@@ -671,9 +654,6 @@
         "userTheme": "Theme d'Interface Utilisateur",
         "uses": "Nombre d'utilisation Authorisé (-1 == Illimité)"
     },
-    "validators": {
-        "passLength": "Mot de passe trop court. Longueur minimum : 8"
-    },
     "webhooks": {
         "areYouSureDel": "Es-tu sûr de vouloir supprimer ce webhook ?",
         "areYouSureRun": "Es-tu sûr de vouloir tester ce webhook ?",

app/translations/fy_NL_incomplete.json

@@ -489,6 +489,7 @@
         "credits": "Credits",
         "dashboard": "Dashboard",
         "documentation": "Dokumintaasje",
+        "navigation": "Navigaasje",
         "newServer": "Nije server oanmeitsje",
         "servers": "Servers"
     },

app/translations/he_IL.json

@@ -184,8 +184,6 @@
     "error": {
         "agree": "מסכים",
         "bedrockError": "הורדות Bedrock אינן זמינות. אנא בדוק",
-        "bigBucket1": "בדיקת הבריאות של Big Bucket נכשלה. אנא בדוק",
-        "bigBucket2": "כדי לקבל את המידע המעודכן ביותר.",
         "cancel": "בטל",
         "contact": "בבקשה צרו קשר עם תמיכת פאנל קראפטי באמצעות דיסקורד",
         "craftyStatus": "דף המצב של Crafty",
@@ -208,7 +206,6 @@
         "portReminder": "זיהינו שזו הפעם הראשונה ש-{} מופעל. הקפידו להעביר את היציאה {} דרך הנתב/חומת האש שלכם כדי להפוך אותה לנגישה מרחוק מהאינטרנט.",
         "privMsg": "וה",
         "return": "חזרה לפאנל",
-        "selfHost": "אם אתה מארח בעצמך את הריפו הזה, אנא בדוק את הכתובת שלך או התייעץ עם מדריך פתרון הבעיות שלנו.",
         "serverJars1": "API של צנצנות השרת אינו נגיש. אנא בדוק",
         "serverJars2": "למידע מעודכן ביותר.",
         "start-error": "השרת {} לא הצליח להתחיל עם קוד שגיאה: {}",
@@ -301,12 +298,10 @@
         "serversDesc": "לשרתים מותר לגשת לתפקיד זה"
     },
     "serverBackups": {
-        "actions": "פעולות",
         "after": "הרץ פקודה לאחר הגיבוי",
         "backupAtMidnight": "גיבוי אוטומטי בחצות?",
         "backupNow": "!גיבוי עכשיו",
         "backupTask": "החלה משימת גיבוי.",
-        "backups": "גיבויי שרת",
         "before": "הרץ פקודה לפני הגיבוי",
         "cancel": "לבטל",
         "clickExclude": "לחצו כדי לבחור מה לא יהיה בגיבוי",
@@ -315,34 +310,21 @@
         "confirmDelete": "האם ברצונכם למחוק את הגיבוי הזה? אי אפשר לבטל את זה.",
         "confirmRestore": "האם אתם בטוחים שברצונכם לשחזר מגיבוי זה. כל קבצי השרת הנוכחיים ישתנו למצב גיבוי ולא יהיה אפשר לשחזר.",
         "currentBackups": "גיבויים נוכחיים",
-        "default": "גיבוי ברירת מחדל",
-        "defaultExplain": "הגיבוי ש-Crafty ישתמש בו לפני עדכונים. לא ניתן לשנות או למחוק.",
         "delete": "למחוק",
         "destroyBackup": "?\" + file_to_del + \" להרוס גיבוי",
         "download": "הורדה",
-        "edit": "ערוך",
-        "enabled": "מופעל",
         "excludedBackups": "נתיבים שלא נכללו: ",
         "excludedChoose": "בחרו את הנתיבים שברצונכם לא לכלול בגיבויים",
         "exclusionsTitle": "אי הכללות גיבוי",
-        "failed": "נכשל",
         "maxBackups": "מקסימום גיבויים",
         "maxBackupsDesc": "גיבויים, ימחק את הישן ביותר (הזן 0 כדי לשמור את כולם) N-קראפטי לא יאחסן יותר מ",
-        "myBackup": "הגיבוי החדש שלי",
-        "name": "שם",
-        "newBackup": "צור גיבוי חדש",
-        "no-backup": "אין גיבויים. כדי ליצור תצורת גיבוי חדשה אנא לחץ על גיבוי חדש",
         "options": "אפשרויות",
         "path": "נתיב",
         "restore": "לשחזר",
         "restoring": "שחזור גיבוי. זה עשוי לקחת זמן. אנא חכו בסבלנות.",
-        "run": "הפעל גיבוי",
         "save": "שמירה",
         "shutdown": "כיבוי שרת למשך הגיבוי",
         "size": "גודל",
-        "standby": "בהמתנה",
-        "status": "סטטוס",
-        "storage": "מיקום אחסון",
         "storageLocation": "מקום איחסון",
         "storageLocationDesc": "איפו אתם רוצים לאחסן גיבויים?"
     },
@@ -507,7 +489,6 @@
     },
     "serverSchedules": {
         "action": "פעולה",
-        "actionId": "בחר פעולה משנית",
         "areYouSure": "למחוק משימה מתוזמנת?",
         "cancel": "לבטל",
         "cannotSee": "לא רואים הכל?",
@@ -586,8 +567,6 @@
         "minMem": "מינימום זיכרון",
         "myNewServer": "השרת החדש שלי",
         "newServer": "צור שרת חדש",
-        "noRole": "לא נמצא תפקיד עם פרמטר החיפוש הנוכחי",
-        "noneRoles": "לא נבחרו תפקידים",
         "quickSettings": "הגדרות מהירות",
         "quickSettingsDescription": "אל תדאג, אתה יכול לשנות את אלה מאוחר יותר",
         "resetForm": "אפס טופס",
@@ -618,12 +597,12 @@
         "dashboard": "פאנל",
         "documentation": "ויקיפדייה",
         "inApp": "מסמכים באפליקציה",
+        "navigation": "ניווט",
         "newServer": "צור שרת חדש",
         "servers": "שרתים"
     },
     "startup": {
         "almost": "מסיימים. תחזיקו חזק...",
-        "cache": "מרענן את קובץ המטמון של Big Bucket",
         "internals": "הגדרה והפעלה של הרכיבים הפנימיים של Crafty",
         "internet": "בודק את חיבור האינטרנט",
         "server": "אתחול ",
@@ -671,9 +650,6 @@
         "userTheme": "ערכת נושא UI",
         "uses": "מספר השימושים המותרים (-1==ללא הגבלה)"
     },
-    "validators": {
-        "passLength": "סיסמא קצרה מדי. אורך מינימלי: 8"
-    },
     "webhooks": {
         "areYouSureDel": "האם אתה בטוח שברצונך למחוק את ה-Webhook הזה?",
         "areYouSureRun": "האם אתה בטוח שברצונך לבדוק את ה-Webhook הזה?",

app/translations/hr_HR_incomplete.json

@@ -489,6 +489,7 @@
         "credits": "Zasluge",
         "dashboard": "Upravljačka ploča",
         "documentation": "Dokumentacija",
+        "navigation": "Navigacija",
         "newServer": "Stvorite novi poslužitelj",
         "servers": "Poslužitelji"
     },

app/translations/humanized_index.json

@@ -1,19 +0,0 @@
-{
-    "language": {
-        "cs_CS": "Čeština",
-        "de_DE": "Deutsch",
-        "en_EN": "English (US)",
-        "es_ES": "Español",
-        "fr_FR": "Français (France)",
-        "he_IL": "he_IL",
-        "it_IT": "Italiano",
-        "lol_EN": "Lolcatz",
-        "lv_LV": "Latviešu",
-        "nl_BE": "nl_BE",
-        "pl_PL": "Polski",
-        "th_TH": "ไทย",
-        "tr_TR": "Türkçe",
-        "uk_UA": "Українська",
-        "zh_CN": "中文（中国)"
-    }
-}

app/translations/id_ID_incomplete.json

@@ -496,6 +496,7 @@
         "credits": "Kredit",
         "dashboard": "Dasbor",
         "documentation": "Documentasi",
+        "navigation": "Navigasi",
         "newServer": "Membuat Server Baru",
         "servers": "Server"
     },

app/translations/it_IT.json

@@ -301,12 +301,10 @@
         "serversDesc": "Server a cui questo ruolo è consentito l'accesso"
     },
     "serverBackups": {
-        "actions": "Azioni",
         "after": "Esegui il comando prima del backup",
         "backupAtMidnight": "Auto-backup a mezzanotte?",
         "backupNow": "Effettua il Backup Ora!",
         "backupTask": "Un'azione di backup è cominciata.",
-        "backups": "Backup del server",
         "before": "Esegui il comando dopo il backup",
         "cancel": "Cancella",
         "clickExclude": "Clicca per selezionare le esclusioni",
@@ -315,34 +313,21 @@
         "confirmDelete": "Vuoi eliminare questo backup? Non puoi tornare indietro.",
         "confirmRestore": "Sei sicuro di voler ripristinare qeusto backup? Tutti i file correnti verranno sovrascritti allo stato di backup e saranno irrecuperabili.",
         "currentBackups": "Backup attuali",
-        "default": "Backup predefinito",
-        "defaultExplain": "Il backup che Crafty utilizzerà prima degli aggiornamenti. Non può essere cambiato o eliminato.",
         "delete": "Elimina",
         "destroyBackup": "Distruggere il backup \" + file_to_del + \"?",
         "download": "Scarica",
-        "edit": "Modifica",
-        "enabled": "Abilitato",
         "excludedBackups": "Percorsi esclusi: ",
         "excludedChoose": "Scegli i percorsi che desideri escludere dai tuoi backups",
         "exclusionsTitle": "Fai un backup delle esclusioni",
-        "failed": "Fallito",
         "maxBackups": "Backup massimi",
         "maxBackupsDesc": "Crafty non memorizzerà più di N backup, cancellando quelli più vecchi (inserisci 0 per mantenerli tutti)",
-        "myBackup": "Il mio nuovo backup",
-        "name": "Nome",
-        "newBackup": "Crea nuovo backup",
-        "no-backup": "Nessun backup. Per configurare un nuovo backup clicca Nuovo backup",
         "options": "Opzioni",
         "path": "Percorso",
         "restore": "Ripristina",
         "restoring": "Ripristinando il backup. Potrebber volerci un momento. Per favore sii paziente.",
-        "run": "Esegui backup",
         "save": "Salva",
         "shutdown": "Arresto del server per la durata del backup",
         "size": "Dimensioni",
-        "standby": "Sospeso",
-        "status": "Stato",
-        "storage": "Percorso archiviazione",
         "storageLocation": "Percorso di memorizzazione",
         "storageLocationDesc": "Dove vuoi memorizzare i backup?"
     },
@@ -507,7 +492,6 @@
     },
     "serverSchedules": {
         "action": "Azione",
-        "actionId": "Seleziona azione da eseguire",
         "areYouSure": "Eliminare l'azione programmata?",
         "cancel": "Cancella",
         "cannotSee": "Non vedi tutto?",
@@ -586,8 +570,6 @@
         "minMem": "Memoria minima",
         "myNewServer": "Il mio nuovo Server",
         "newServer": "Crea un Nuovo Server",
-        "noRole": "Nessun ruolo trovato con questo parametro di ricerca",
-        "noneRoles": "Nessun ruolo selezionato",
         "quickSettings": "Impostazioni Rapide",
         "quickSettingsDescription": "Non ti preoccupare, puoi cambiarle più tardi",
         "resetForm": "Reset Form",
@@ -618,6 +600,7 @@
         "dashboard": "Pannello di controllo",
         "documentation": "Documentazione",
         "inApp": "Documenti in app",
+        "navigation": "Navigazione",
         "newServer": "Crea un Nuovo Server",
         "servers": "Servers"
     },
@@ -671,9 +654,6 @@
         "userTheme": "Tema IU",
         "uses": "Numero di usi permessi (-1==Nessun limite)"
     },
-    "validators": {
-        "passLength": "La password è troppo corta. Lunghezza minima: 8"
-    },
     "webhooks": {
         "areYouSureDel": "Sei sicuro di voler eliminare questo webhook?",
         "areYouSureRun": "Sei sicuro di voler testare questo webhook?",

app/translations/lol_EN.json

@@ -301,12 +301,10 @@
         "serversDesc": "SERVRS DIS ROLE IZ ALLOWD 2 ACCES"
     },
     "serverBackups": {
-        "actions": "DO-STUFFZ",
         "after": "RUNZ COMMANDZ AFTUR BAKUP",
         "backupAtMidnight": "AUTO-BAKUP AT MIDDLENIGHTZ?",
         "backupNow": "BAKUP NOWZ!",
         "backupTask": "OKAI I GETZ FISH, BAK SOONZ",
-        "backups": "SERVER BACKUPS",
         "before": "RUNZ COMMANDZ BEFOUR BAKUP",
         "cancel": "STAHP",
         "clickExclude": "CLICK 2 MARK EXCLUSHUNS",
@@ -315,34 +313,21 @@
         "confirmDelete": "R U SURE U WANTZ ME TO EATZ DIS BAKUP? WIAL BEH LOZT FOREVR (LONGIR THAN KITTEHZ NAPZ)",
         "confirmRestore": "R U SURE U WANTZ 2 RESTORE FRUM DIS BAKUP. ALL CURRENT SERVR FISHZ WILL BE EATZ AN WILL BE UNRECOVERABLE.",
         "currentBackups": "CURRENT STASH OV BAKUPS",
-        "default": "USUAL BACKUP",
-        "defaultExplain": "DA BACKUP THAT CRAFTY USE BEFORE UPDATES. DIS NO CAN CHANGE OR GO AWAY.",
         "delete": "MAK GONE",
         "destroyBackup": "EAT BAKUP \" + file_to_del + \"?",
         "download": "DOWNLOADZ",
-        "edit": "MAKE BETTERS",
-        "enabled": "TURNED ON",
         "excludedBackups": "EXCLUSHUNS: ",
         "excludedChoose": "CHOOSE TEH PATHS U WANTS 2 EXCLUDE FRUM UR BAKUPS",
         "exclusionsTitle": "BAKUP EXCLUSHUNS",
-        "failed": "NOPE'D",
         "maxBackups": "MAX BAKUPS",
         "maxBackupsDesc": "CWAFTY WILL NOT KEEPZ MOAR THAN N BCKUPS, DELETIN TEH MOST OLDZ FURST (ENTR 0 TO BE BIG GREEDY)",
-        "myBackup": "MAH NEW BACKUP",
-        "name": "NAMZ",
-        "newBackup": "MAKEZ NEW BACKUP",
-        "no-backup": "NO BACKUPS. TO MAKE A NEW BACKUP THINGY PLEASE BOOP. NEW BACKUP",
         "options": "OPSHUNS",
         "path": "PETH",
         "restore": "RESTOR",
         "restoring": "RESTORIN BAKUP. DIS CUD TAEK WHILE. PLZ BE PATIENT.",
-        "run": "DO BACKUP NOWZ",
         "save": "DUN",
         "shutdown": "SLEEPY SERVR WEN MAK BAKAUPZ?",
         "size": "HOW BIGZ",
-        "standby": "WAITIN'",
-        "status": "WHAT'S UP",
-        "storage": "HIDING SPOT",
         "storageLocation": "SHINY STASH OV HINGZ",
         "storageLocationDesc": "WER DO U WANTS 2 STASH BAKUPS?"
     },
@@ -507,7 +492,6 @@
     },
     "serverSchedules": {
         "action": "ACTSHUN",
-        "actionId": "PICK ACTION KITTY",
         "areYouSure": "FORGET 2 DO DIS ????",
         "cancel": "STAHP",
         "cannotSee": "CANNY SEE?",
@@ -586,8 +570,6 @@
         "minMem": "SMOL MEMZ LIMIT",
         "myNewServer": "MY NEW SOFT CHAIR",
         "newServer": "MAK A NU SERVR",
-        "noRole": "ME NO FINDY ANY ROLEZ WIF DIS SEARCHY",
-        "noneRoles": "NO ROLEZ PICKED",
         "quickSettings": "FAST SETTINGZ!",
         "quickSettingsDescription": "NO FEAR, IT NOT PERMZ",
         "resetForm": "REZET",
@@ -618,6 +600,7 @@
         "dashboard": "DASHBORD",
         "documentation": "DOCUMENTASHUN",
         "inApp": "IN APPZ DOCS",
+        "navigation": "NAVIGASHUN",
         "newServer": "CONSTWUCT A SERVR",
         "servers": "SERVRS"
     },
@@ -671,9 +654,6 @@
         "userTheme": "THEMEZ",
         "uses": "NUMBER OV USES ALLOWED (-1==NO LIMIT)"
     },
-    "validators": {
-        "passLength": "PASSWRD TOO SMOL. NEEDZ 8 CATZ PLZ"
-    },
     "webhooks": {
         "areYouSureDel": "U SURE U WANTZ TO EATZ DIS WEBHOOK?",
         "areYouSureRun": "U SURE U WANTZ TO TESTZ DIS WEBHOOK?",

app/translations/lv_LV.json

@@ -302,12 +302,10 @@
         "serversDesc": "serveri, kuriem šai lomai ir atļauta piekļuve"
     },
     "serverBackups": {
-        "actions": "Darbības",
         "after": "Palaist komandu pēc dublējuma",
         "backupAtMidnight": "Automātiski dublēt pusnaktī?",
         "backupNow": "Dublēt Tagad!",
         "backupTask": "Dublējuma uzdevums ticis startēts.",
-        "backups": "Servera Dublējumi",
         "before": "Palaist komandu pirms dublējuma",
         "cancel": "Atcelt",
         "clickExclude": "Nospied lai izvēlētos Izņēmumus",
@@ -316,34 +314,21 @@
         "confirmDelete": "Vai vēlaties izdzēst šo dublējumu? Šo nevar atdarīt.",
         "confirmRestore": "Vai tiešām vēlieties atjaunot no šī dublējuma. Visas esošās datnes tiks atgrieztas uz dublējuma stāvokli un būs neatgriežamas.",
         "currentBackups": "Pašreizējie Dublējumi",
-        "default": "Noklusētais Dublējums",
-        "defaultExplain": "Dublējums ko Crafty izmanto pirms atjaunināšanas. To nevar mainīt vai izdzēst.",
         "delete": "Dzēst",
         "destroyBackup": "Iznīcināt dublējumu \" + file_to_del + \"?",
         "download": "Lejupielādēt",
-        "edit": "Rediģēt",
-        "enabled": "Iespējots",
         "excludedBackups": "Izņēmuma Ceļi: ",
         "excludedChoose": "Izvēlies ceļus, kurus tu vēlies izņemt no saviem dublējumiem",
         "exclusionsTitle": "Dublējuma Izņēmumi",
-        "failed": "Neizdevās",
         "maxBackups": "Maks. Dublējumi",
         "maxBackupsDesc": "Crafty nesaglabās vairāk nekā N dublējumus, dzēšot vecākaos (ievadi 0 lai saglabātu visus)",
-        "myBackup": "Mans Jaunais Dublējums",
-        "name": "Nosaukums",
-        "newBackup": "Izveidot Jaunu Dublējumu",
-        "no-backup": "Nav Dublējumu. Lai izveidotu dublējuma konfigurāciju, nospied Izveidot Jaunu Dublējumu",
         "options": "Opcijas",
         "path": "Ceļš",
         "restore": "Atjaunot",
         "restoring": "Atjauno dublējumu. Tas var aizņemt kādi laiku. Esiet pacietīgs.",
-        "run": "Veikt Dublējumu",
         "save": "Saglabāt",
         "shutdown": "Apturēt serveri dublējumkopijas laikā",
         "size": "Lielums",
-        "standby": "Gaidstāve",
-        "status": "Statuss",
-        "storage": "Glabātavas Vieta",
         "storageLocation": "Krātuves Vieta",
         "storageLocationDesc": "Kur jūs vēlaties saglabāt dublējumus?"
     },
@@ -508,7 +493,6 @@
     },
     "serverSchedules": {
         "action": "Darbība",
-        "actionId": "Izvēlēties apakšdarbību",
         "areYouSure": "Dzēst Ieplānoto Uzdevumu?",
         "cancel": "Atcelt",
         "cannotSee": "Neredziet visu?",
@@ -587,8 +571,6 @@
         "minMem": "Minimālā Atmiņa",
         "myNewServer": "Mans Jaunais Serveris",
         "newServer": "Izveidot Jaunu Serveri",
-        "noRole": "Nav lomas ar izvēlētiem meklēšanas parametriem",
-        "noneRoles": "Nav Izvēlētas Lomas",
         "quickSettings": "Ātrie Iestatījumi",
         "quickSettingsDescription": "Neuztraucies, tos var izmainīt vēlāk",
         "resetForm": "Notīrīt Formu",
@@ -619,6 +601,7 @@
         "dashboard": "Panelis",
         "documentation": "Dokumentācija",
         "inApp": "Iebūvētā dokumentācija",
+        "navigation": "Navigācija",
         "newServer": "Izveidot Jaunu Serveri",
         "servers": "Serveri"
     },
@@ -672,9 +655,6 @@
         "userTheme": "UI Tēma",
         "uses": "Dauzums, cik reizes lietot (-1==Bez Limita)"
     },
-    "validators": {
-        "passLength": "Parole pārāk īsa. Minimālais Garums: 8"
-    },
     "webhooks": {
         "areYouSureDel": "Vai tiešām vēlies noņemt šo webhook?",
         "areYouSureRun": "Vai tiešām vēlies testēt šo webhook?",

app/translations/nl_BE.json

@@ -301,12 +301,10 @@
         "serversDesc": "servers waar deze rol toegang toe heeft"
     },
     "serverBackups": {
-        "actions": "Acties",
         "after": "Voer opdracht uit na back-up",
         "backupAtMidnight": "Automatische back-up maken om middernacht?",
         "backupNow": "Nu een back-up maken!",
         "backupTask": "Er is een back-uptaak ​​gestart.",
-        "backups": "Serverbackups",
         "before": "Voer opdracht uit vóór back-up",
         "cancel": "Annuleren",
         "clickExclude": "Klik om Uitsluitingen te selecteren",
@@ -315,34 +313,21 @@
         "confirmDelete": "Wil je deze back-up verwijderen? Dit kan niet ongedaan gemaakt worden.",
         "confirmRestore": "Bent u zeker dat u wilt herstellen vanaf deze backup. Alle huidige server bestanden zullen worden veranderd naar de backup status en zullen niet meer hersteld kunnen worden.",
         "currentBackups": "Huidige back-ups",
-        "default": "Standaardbackup",
-        "defaultExplain": "De backup die Crafty gebruikt vóór updates. Deze kan niet worden gewijzigd of verwijderd.",
         "delete": "Verwijderen",
         "destroyBackup": "Back-up vernietigen \" + file_to_del + \"?",
         "download": "Downloaden",
-        "edit": "Bewerken",
-        "enabled": "Ingeschakeld",
         "excludedBackups": "Uitgesloten paden: ",
         "excludedChoose": "Kies de paden die u wilt uitsluiten van uw back-ups",
         "exclusionsTitle": "Uitsluitingen voor back-ups",
-        "failed": "Mislukt",
         "maxBackups": "Max Back-ups",
         "maxBackupsDesc": "Crafty zal niet meer dan N back-ups opslaan, waarbij de oudste wordt verwijderd (voer 0 in om ze allemaal te bewaren)",
-        "myBackup": "Nieuwe backup",
-        "name": "Naam",
-        "newBackup": "Nieuwe backup maken",
-        "no-backup": "Geen backups. Druk op 'Nieuwe backup' om een nieuwe backupconfiguratie te maken.",
         "options": "Opties",
         "path": "Pad",
         "restore": "Herstellen",
         "restoring": "Back-up herstellen. Dit kan een tijdje duren. Even geduld alstublieft.",
-        "run": "Backup uitvoeren",
         "save": "Opslaan",
         "shutdown": "Sluit de server af voor de duur van de backup",
         "size": "Grootte",
-        "standby": "Standby",
-        "status": "Status",
-        "storage": "Opslaglocatie",
         "storageLocation": "Opslaglocatie",
         "storageLocationDesc": "Waar wil je back-ups opslaan?"
     },
@@ -507,7 +492,6 @@
     },
     "serverSchedules": {
         "action": "Actie",
-        "actionId": "Selecteer onderliggende actie",
         "areYouSure": "Verwijder Geplande Taak?",
         "cancel": "Annuleren",
         "cannotSee": "Ziet u niet alles?",
@@ -586,8 +570,6 @@
         "minMem": "Minimaal geheugen",
         "myNewServer": "My New Server",
         "newServer": "Nieuwe server maken",
-        "noRole": "Geen rol gevonden met huidige zoekparameters",
-        "noneRoles": "Geen rollen geselecteerd",
         "quickSettings": "Snelle instellingen",
         "quickSettingsDescription": "Maak je geen zorgen, je kunt deze later wijzigen",
         "resetForm": "Formulier resetten",
@@ -618,6 +600,7 @@
         "dashboard": "Dashboard",
         "documentation": "Documentatie",
         "inApp": "In-app documentatie",
+        "navigation": "Navigatie",
         "newServer": "Nieuwe server maken",
         "servers": "Servers"
     },
@@ -671,9 +654,6 @@
         "userTheme": "UI-thema",
         "uses": "Aantal toegestane gebruiken (-1==Geen Limiet)"
     },
-    "validators": {
-        "passLength": "Wachtwoord te kort. Minimumlengte: 8 tekens"
-    },
     "webhooks": {
         "areYouSureDel": "Weet u zeker dat u deze webhook wilt verwijderen?",
         "areYouSureRun": "Weet u zeker dat u deze webhook wilt testen?",

app/translations/nl_NL_incomplete.json

@@ -489,6 +489,7 @@
         "credits": "Credits",
         "dashboard": "Dashboard",
         "documentation": "Documentatie",
+        "navigation": "Navigatie",
         "newServer": "Nieuwe server maken",
         "servers": "Servers"
     },

app/translations/pl_PL.json

@@ -301,12 +301,10 @@
         "serversDesc": "Serwery które mają tą role mają dostęp"
     },
     "serverBackups": {
-        "actions": "Akcje",
         "after": "Wykonaj tę komendę po backupie",
         "backupAtMidnight": "Auto-backup o północy?",
         "backupNow": "Backup Teraz!",
         "backupTask": "Backup został rozpoczęty.",
-        "backups": "Kopie zapasowe serwera",
         "before": "Wykonaj tę komendę przed backupem",
         "cancel": "Anuluj",
         "clickExclude": "Kliknij aby zaznaczyć wyjątki",
@@ -315,34 +313,21 @@
         "confirmDelete": "Czy chcesz usunąć ten backup? Nie można tego cofnąć.",
         "confirmRestore": "Czy jesteś pewien że chcesz przywrócić z tego backupu. Wszystkie pliki powrócą do stanu z backupu.",
         "currentBackups": "Backupy Teraz",
-        "default": "Podstawowa kopia zapasowa",
-        "defaultExplain": "Kopia zapasowa przed jakimikolwiek zmianami. Nie można jej usunąć ani edytować.",
         "delete": "Usuń",
         "destroyBackup": "Zniszcz Backup \" + file_to_del + \"?",
         "download": "Pobierz",
-        "edit": "Edytuj",
-        "enabled": "Włączony",
         "excludedBackups": "Wykluczone ścieżki: ",
         "excludedChoose": "Wybierz ścieżki do wykluczenia z backupu",
         "exclusionsTitle": "Wykluczenia backupu",
-        "failed": "Nieudany!",
         "maxBackups": "Maks. Backupów",
         "maxBackupsDesc": "Crafty nie będzie zbierał więcej niż X backupów, zacznie usuwać od nadstarszych (wpisz 0, aby zatrzymać nieskończoną ilość)",
-        "myBackup": "Nowa kopia zapasowa",
-        "name": "Nazwa",
-        "newBackup": "Nowa kopia zapasowa",
-        "no-backup": "Brak kopii zapasowych. Aby skonfigurować kopię zapasową kliknij na",
         "options": "Opcje",
         "path": "Nazwa pliku",
         "restore": "Przywróć",
         "restoring": "Przywracanie backupu. To trochę zajmie. Bądź cierpliwy.",
-        "run": "Wykonaj kopię zapasową",
         "save": "Zapisz",
         "shutdown": "Wyłącz serwer na czas backupu",
         "size": "Rozmiar",
-        "standby": "Gotowy",
-        "status": "Status",
-        "storage": "Lokalizacja kopii zapasowych",
         "storageLocation": "Ścieżka zapisywania",
         "storageLocationDesc": "Gdzie chcesz trzymać backupy?"
     },
@@ -507,7 +492,6 @@
     },
     "serverSchedules": {
         "action": "Akcja",
-        "actionId": "Zaznacz zadanie podwładne",
         "areYouSure": "Usuń zaplanowane (zadanie)?",
         "cancel": "Anuluj",
         "cannotSee": "Nie widzisz wszystkiego?",
@@ -585,8 +569,6 @@
         "minMem": "Min. RAMu",
         "myNewServer": "Mój nowy serwer",
         "newServer": "Stwórz nowy serwer",
-        "noRole": "Nie znaleziono roli z tym wyszukiwaniem",
-        "noneRoles": "Nie zaznaczono żadnej roli",
         "quickSettings": "Szybkie ustawienia",
         "quickSettingsDescription": "Nie martw się, możesz te ustawienia zmienić później",
         "resetForm": "Resetuj formę",
@@ -617,6 +599,7 @@
         "dashboard": "Panel",
         "documentation": "Dokumentacja",
         "inApp": "Dokumentacja w Aplikacji",
+        "navigation": "Nawigacja",
         "newServer": "Stwórz nowy serwer",
         "servers": "Serwery"
     },
@@ -670,9 +653,6 @@
         "userTheme": "Wygląd interfejsu",
         "uses": "Ilość użyć (-1==Bez limitu)"
     },
-    "validators": {
-        "passLength": "Hasło jest zbyt krótkie. Hasło musi posiadać minimum 8 znaków."
-    },
     "webhooks": {
         "areYouSureDel": "Usunąć ten webhook?",
         "areYouSureRun": "Przetestować ten webhook?",

app/translations/pt_BR_incomplete.json

@@ -497,6 +497,7 @@
         "credits": "Créditos",
         "dashboard": "Painel de Controle",
         "documentation": "Documentação",
+        "navigation": "Navegação",
         "newServer": "Criar Novo Servidor",
         "servers": "Servidores"
     },

app/translations/th_TH.json

@@ -184,8 +184,6 @@
     "error": {
         "agree": "ยอมรับ",
         "bedrockError": "การดาวน์โหลดเวอร์ชั่น Bedrock ไม่พร้อมใช้งาน โปรดตรวจสอบ",
-        "bigBucket1": "การตรวจสอบสุขภาพ Big Bucket ล้มเหลว โปรดตรวจสอบ",
-        "bigBucket2": "สำหรับข้อมูลล่าสุด",
         "cancel": "ยกเลิก",
         "contact": "ติดต่อฝ่ายสนับสนุน Crafty Control ผ่านดิสคอร์ด",
         "craftyStatus": "หน้าสถานะของ Crafty",
@@ -208,7 +206,6 @@
         "portReminder": "เราตรวจพบว่านี่เป็นครั้งแรกที่มีการเรียกใช้ {} ตรวจสอบให้แน่ใจว่าได้ Forward port {} ผ่านเราเตอร์/ไฟร์วอลล์ของคุณเพื่อให้สามารถเข้าถึงได้จากอินเทอร์เน็ตจากระยะไกล",
         "privMsg": "และ ",
         "return": "ย้อนกลับไปยังแผงควบคุม",
-        "selfHost": "หากคุณโฮสต์ repo นี้ด้วยตนเอง โปรดตรวจสอบที่อยู่ของคุณ หรือศึกษาคู่มือแก้ปัญหาของเรา",
         "serverJars1": "ไม่สามารถเข้าถึงเซิร์ฟเวอร์ JARs API กรุณาตรวจสอบ",
         "serverJars2": "เพื่อข้อมูลที่ทันสมัยที่สุด",
         "start-error": "เซิร์ฟเวอร์ {} ไม่สามารถเริ่มต้นได้เนื่องจากรหัสข้อผิดพลาด: {}",
@@ -301,12 +298,10 @@
         "serversDesc": "เซิร์ฟเวอร์ที่บทบาทนี้ได้รับอนุญาตให้เข้าถึง"
     },
     "serverBackups": {
-        "actions": "คำสั่งด่วน",
         "after": "ส่งคำสั่งหลังการสำรองข้อมูล",
         "backupAtMidnight": "คุณต้องการสำรองข้อมูลอัตโนมัติตอนเที่ยงคืนหรือไม่?",
         "backupNow": "สำรองข้อมูลตอนนี้!",
         "backupTask": "เริ่มการสำรองข้อมูลแล้ว",
-        "backups": "ข้อมูลสำรองเซิร์ฟเวอร์",
         "before": "ส่งคำสั่งก่อนการสำรองข้อมูล",
         "cancel": "ยกเลิก",
         "clickExclude": "คลิกเพื่อเลือกการยกเว้น",
@@ -315,34 +310,21 @@
         "confirmDelete": "คุณต้องการลบข้อมูลสำรองนี้หรือไม่ สิ่งนี้ไม่สามารถยกเลิกได้",
         "confirmRestore": "คุณแน่ใจหรือไม่ว่าต้องการกู้คืนจากข้อมูลสำรองนี้ ไฟล์เซิร์ฟเวอร์ปัจจุบันทั้งหมดจะเปลี่ยนเป็นแบบสำรองและจะไม่สามารถกู้คืนได้",
         "currentBackups": "ไฟล์สำรองข้อมูลปัจจุบัน",
-        "default": "ข้อมูลสำรองเริ่มต้น",
-        "defaultExplain": "ข้อมูลสำรองที่ Crafty จะใช้ก่อนการอัพเดต สิ่งนี้ไม่สามารถเปลี่ยนแปลงหรือลบได้",
         "delete": "ลบ",
         "destroyBackup": "คุณต้องการทำลายข้อมูลสำรอง \" + file_to_del + \"หรือไม่",
         "download": "ดาวน์โหลด",
-        "edit": "แก้ไข",
-        "enabled": "เปิดใช้งาน",
         "excludedBackups": "เส้นทางที่ยกเว้น: ",
         "excludedChoose": "เลือกเส้นทางที่คุณต้องการยกเว้นจากการสำรองข้อมูลของคุณ",
         "exclusionsTitle": "ข้อยกเว้นการสำรองข้อมูล",
-        "failed": "ล้มเหลว",
         "maxBackups": "ต้องการเก็บข้อมูลสำรองกี่ครั้ง?",
         "maxBackupsDesc": "Crafty จะไม่เก็บข้อมูลสำรองมากกว่า N รายการ โดยจะลบข้อมูลสำรองที่เก่าที่สุด (ป้อน 0 เพื่อเก็บทั้งหมด)",
-        "myBackup": "ข้อมูลสำรองใหม่ของฉัน",
-        "name": "ชื่อ",
-        "newBackup": "สร้างข้อมูลสำรองใหม่",
-        "no-backup": "ไม่มีการสำรองข้อมูล หากต้องการตั้งค่าการสำรองข้อมูลใหม่ กรุณากด สร้างข้อมูลสำรองใหม่",
         "options": "ตัวเลือก",
         "path": "เส้นทาง",
         "restore": "คืนค่า",
         "restoring": "กำลังกู้คืนข้อมูลสำรอง การดำเนินการนี้อาจใช้เวลาสักครู่ กรุณาอดทนรออย่างใจเย็น",
-        "run": "เริ่มทำงานไฟล์สำรอง",
         "save": "บันทึก",
         "shutdown": "ปิดเซิร์ฟเวอร์ตามระยะเวลาของการสำรองข้อมูล",
         "size": "ขนาด",
-        "standby": "พร้อมใช้งาน",
-        "status": "สถานะ",
-        "storage": "พื้นที่จัดเก็บข้อมูล",
         "storageLocation": "สถานที่จัดเก็บ",
         "storageLocationDesc": "คุณต้องการสำรองข้อมูลไว้ที่ไหน?"
     },
@@ -507,7 +489,6 @@
     },
     "serverSchedules": {
         "action": "การกระทำ",
-        "actionId": "เลือกลูกของการกระทำ",
         "areYouSure": "ลบงานที่กำหนดเวลาไว้?",
         "cancel": "ยกเลิก",
         "cannotSee": "ไม่เห็นอะไรเลยใช่ใหม?",
@@ -585,8 +566,6 @@
         "minMem": "หน่วยความจำขั้นต่ำ",
         "myNewServer": "เซิร์ฟเวอร์ใหม่ของฉัน",
         "newServer": "สร้างเซิร์ฟเวอร์ใหม่",
-        "noRole": "ไม่พบบทบาทจากพารามิเตอร์การค้นหาปัจจุบัน",
-        "noneRoles": "ไม่มีบทบาทที่เลือก",
         "quickSettings": "การตั้งค่าด่วน",
         "quickSettingsDescription": "ไม่ต้องกังวล คุณสามารถเปลี่ยนแปลงสิ่งเหล่านี้ได้ในภายหลัง",
         "resetForm": "รีเซ็ตแบบฟอร์ม",
@@ -617,12 +596,12 @@
         "dashboard": "แผงควบคุม",
         "documentation": "เอกสารประกอบ",
         "inApp": "เอกสารประกอบภายในแอป",
+        "navigation": "เมนูนำทาง",
         "newServer": "สร้างเซิร์ฟเวอร์ใหม่",
         "servers": "เซิร์ฟเวอร์"
     },
     "startup": {
         "almost": "เสร็จสิ้นการทำงาน. รอซักครู่...",
-        "cache": "กำลังรีเฟรชไฟล์แคช Big Bucket",
         "internals": "กำหนดค่าและเริ่มการทำงานภายในของ Crafty",
         "internet": "กำลังตรวจสอบการเชื่อมต่ออินเทอร์เน็ต",
         "server": "กำลังเริ่มต้นการทำงาน ",
@@ -670,9 +649,6 @@
         "userTheme": "ธีม UI",
         "uses": "จำนวนการใช้งานที่อนุญาต (-1==ไม่มีขีดจำกัด)"
     },
-    "validators": {
-        "passLength": "รหัสผ่านสั้นเกินไป จำนวนตัวอักขระขั้นต่ำ: 8"
-    },
     "webhooks": {
         "areYouSureDel": "คุณแน่ใจหรือไม่ว่าต้องการลบ Webhook นี้?",
         "areYouSureRun": "คุณแน่ใจหรือไม่ว่าต้องการทดสอบ Webhook นี้?",

app/translations/tr_TR.json

@@ -301,12 +301,10 @@
         "serversDesc": "bu rolün erişmesine izin verilen sunucular"
     },
     "serverBackups": {
-        "actions": "Eylemler",
         "after": "Yedeklemeden sonra bir komut çalıştır",
         "backupAtMidnight": "Gece yarısında otomatik yedekleme yapılsın mı?",
         "backupNow": "Backup Now!",
         "backupTask": "Bir yedekleme görevi başlatıldı.",
-        "backups": "Sunucu Yedekleri",
         "before": "Yedeklemeden önce bir komut çalıştır",
         "cancel": "İptal",
         "clickExclude": "İstisnaları seçmek için tıklayın",
@@ -315,34 +313,21 @@
         "confirmDelete": "Bu yedeği silmek istediğine emin misin? Bu geri alınamaz.",
         "confirmRestore": "Bu yedeği geri yüklemek istediğinizden emin misiniz? Tüm mevcut sunucu dosyaları yedeklemedeki durumuna dönecek ve kurtarılamayacaktır.",
         "currentBackups": "Mevcut Yedekmeler",
-        "default": "Varsayılan Yedek",
-        "defaultExplain": "Crafty'nin güncellemelerden önce kullanacağı yedek. Bu değiştirilemez ya da silinemez.",
         "delete": "Sil",
         "destroyBackup": "\" + file_to_del + \" yedeklemesi yok edilsin mi?",
         "download": "İndir",
-        "edit": "Düzenle",
-        "enabled": "Etkin",
         "excludedBackups": "Hariç Tutulan Yollar: ",
         "excludedChoose": "Yedeklemelerinizden hariç tutmak istediğiniz yolları seçin",
         "exclusionsTitle": "Yedekleme İstisnaları",
-        "failed": "Başarısız",
         "maxBackups": "Maksimum Yedekleme Sayısı",
         "maxBackupsDesc": "Crafty N yedeklemeden fazlasını saklamayacak, en eskisini silecektir (tümünü saklamak için 0 girin)",
-        "myBackup": "Benim Yeni Yedeğim",
-        "name": "Ad",
-        "newBackup": "Yeni Yedek Oluştur",
-        "no-backup": "Mevcut yedek bulunmuyor. Yeni bir yedek oluşturmak için lütfen Yeni Yedek Oluştur tuşuna basınız.",
         "options": "Seçenekler",
         "path": "Dosya Yolu",
         "restore": "Geri Yükleme",
         "restoring": "Yedekleme geri yükleniyor. Bu biraz zaman alabilir. Lütfen sabırlı olun.",
-        "run": "Yedeği Çalıştır",
         "save": "Kaydet",
         "shutdown": "Yedekleme süresince sunucuyu kapat",
         "size": "Boyut",
-        "standby": "Beklemede",
-        "status": "Durum",
-        "storage": "Depolama Konumu",
         "storageLocation": "Depolama Konumu",
         "storageLocationDesc": "Yedekmeleri nerede saklamak istiyorsunuz?"
     },
@@ -507,7 +492,6 @@
     },
     "serverSchedules": {
         "action": "Eylem",
-        "actionId": "Alt Eylem Seçiniz",
         "areYouSure": "Zamanlanmış Görev Silinsin mi?",
         "cancel": "İptal",
         "cannotSee": "Her şeyi göremiyor musun?",
@@ -585,8 +569,6 @@
         "minMem": "Minimum Bellek",
         "myNewServer": "Benim Yeni Sunucum",
         "newServer": "Yeni Sunucu Oluştur",
-        "noRole": "Şu arama parametresiyle herhangi bir rol bulunamadı:",
-        "noneRoles": "Rol Seçilmedi",
         "quickSettings": "Hızlı Ayarlar",
         "quickSettingsDescription": "Endişelenmeyin, bunları daha sonra değiştirebilirsiniz",
         "resetForm": "Formu Sıfırla",
@@ -617,6 +599,7 @@
         "dashboard": "Arayüz",
         "documentation": "Dokümantasyon",
         "inApp": "Uygulama İçi Dokümanlar",
+        "navigation": "Navigasyon",
         "newServer": "Yeni Sunucu Oluştur",
         "servers": "Sunucular"
     },
@@ -670,9 +653,6 @@
         "userTheme": "UI Teması",
         "uses": "İzin verilen kullanım sayısı (-1==Sınır Yok)"
     },
-    "validators": {
-        "passLength": "Şifre çok kısa. Şifre en az 8 karakter olmalı."
-    },
     "webhooks": {
         "areYouSureDel": "Bu webhooku silmek istediğinizden emin misiniz?",
         "areYouSureRun": "Bu webhooku test etmek istediğinizden emin misiniz?",

app/translations/uk_UA.json

@@ -301,12 +301,10 @@
         "serversDesc": "сервери які доступні для цієї ролі"
     },
     "serverBackups": {
-        "actions": "Дії",
         "after": "Виконати команду після завершення бекапу",
         "backupAtMidnight": "Авто-бекап опівночі?",
         "backupNow": "Запустити бекап!",
         "backupTask": "Бекап запущено.",
-        "backups": "Сервер Бекапів",
         "before": "Виконати команду перед початком бекапу",
         "cancel": "Відмінити",
         "clickExclude": "Додати винятки",
@@ -315,34 +313,21 @@
         "confirmDelete": "Ви дійсно бажаєте видати бекап? Ця дія незворотня.",
         "confirmRestore": "Ви впевненні що бажаєте відновити даний бекап? При відновленні сервер буде вимкнуто та відновлено за допомогою даного бекапу, минулі файли будуть втрачені!",
         "currentBackups": "Поточні бекапи",
-        "default": "Звичайний Бекап",
-        "defaultExplain": "Бекап цього Crafty буде створений перед оновленням. Це не можна змінити чи видалити.",
         "delete": "Видалити",
         "destroyBackup": "Видалити бекап \" + file_to_del + \"?",
         "download": "Завантажити",
-        "edit": "Редагувати",
-        "enabled": "Увімкненно",
         "excludedBackups": "Винятки: ",
         "excludedChoose": "Виберіть папки які бажаєте додати у винятки",
         "exclusionsTitle": "Бекап винятки",
-        "failed": "Помилка",
         "maxBackups": "Максимум бекапів",
         "maxBackupsDesc": "Crafty не зможе зберігати більше ніж N бекапів, видалятиме старі (введіть 0 для зберігання усіх бекапів)",
-        "myBackup": "Мій новий бекап",
-        "name": "Назва",
-        "newBackup": "Створити новий бекап",
-        "no-backup": "Немає бекапів. Щоб створити бекап, натисніть кнопку Мій новий Бекап",
         "options": "Налаштування",
         "path": "Шлях",
         "restore": "Відновити",
         "restoring": "Відновлення бекапу. Це може зайняти деякий час. Будь ласка будьте терплячі.",
-        "run": "Запустити бекап",
         "save": "Зберегти",
         "shutdown": "Вимикати сервер на час бекапу",
         "size": "Розмір",
-        "standby": "Очікування",
-        "status": "Статус",
-        "storage": "Місце збереження",
         "storageLocation": "Місце зберігання",
         "storageLocationDesc": "Де ви бажаєте зберігати бекапи?"
     },
@@ -507,7 +492,6 @@
     },
     "serverSchedules": {
         "action": "Дія",
-        "actionId": "Вибрати дочірню дію",
         "areYouSure": "Видалити заплановане завдання?",
         "cancel": "Відмінити",
         "cannotSee": "Нічого не бачите?",
@@ -585,8 +569,6 @@
         "minMem": "Мінімум пам'яті",
         "myNewServer": "Мій новий сервер (краще називати латиницею)",
         "newServer": "Створити новий сервер",
-        "noRole": "Не найдено ролей, за даними параметрами",
-        "noneRoles": "Жодних ролей не вибрано",
         "quickSettings": "Швидкі налаштування",
         "quickSettingsDescription": "Не хвилюйтесь, ви можете це змінити це пізніше",
         "resetForm": "Скинути форму",
@@ -617,6 +599,7 @@
         "dashboard": "Панель",
         "documentation": "Документація",
         "inApp": "Швидка документація",
+        "navigation": "Навігація",
         "newServer": "Створити новий сервер",
         "servers": "Сервери"
     },
@@ -670,9 +653,6 @@
         "userTheme": "Тема інтерфейсу",
         "uses": "Дозволена кількість використань(-1==Без ліміту)"
     },
-    "validators": {
-        "passLength": "Пароль, надто короткий. Мінімальна довжина: 8 символів"
-    },
     "webhooks": {
         "areYouSureDel": "Ви впевнені, що хочете видалити цей Вебхук?",
         "areYouSureRun": "Ви впевнені, що хочете перевірити цей Вебхук?",

app/translations/zh_CN.json

@@ -301,12 +301,10 @@
         "serversDesc": "此角色允许访问的服务器"
     },
     "serverBackups": {
-        "actions": "操作",
         "after": "备份后运行指令",
         "backupAtMidnight": "午夜自动备份？",
         "backupNow": "现在备份！",
         "backupTask": "一个备份任务已开始。",
-        "backups": "服务器备份",
         "before": "备份前运行指令",
         "cancel": "取消",
         "clickExclude": "点击来选择排除项",
@@ -315,34 +313,21 @@
         "confirmDelete": "您想要删除这个备份吗？此操作不能撤销。",
         "confirmRestore": "你确定要从此备份恢复吗？所有现存的服务器文件将更改到备份时的状态，并且无法撤销。",
         "currentBackups": "现有备份",
-        "default": "默认备份",
-        "defaultExplain": "Crafty 在更新前会使用的备份。此项目不能被更改或删除。",
         "delete": "删除",
         "destroyBackup": "删除备份 \" + file_to_del + \"？",
         "download": "下载",
-        "edit": "编辑",
-        "enabled": "已启用",
         "excludedBackups": "排除的路径：",
         "excludedChoose": "选择您希望从您的备份中排除的路径",
         "exclusionsTitle": "备份排除项",
-        "failed": "失败",
         "maxBackups": "最大备份数量",
         "maxBackupsDesc": "Crafty 不会存储多于 N 个备份，并且会删除最旧的备份（输入 0 以保留所有备份）",
-        "myBackup": "我的新备份",
-        "name": "名称",
-        "newBackup": "创建新备份",
-        "no-backup": "暂无备份。请点击“新备份”以创建一个新的备份配置。",
         "options": "选项",
         "path": "路径",
         "restore": "恢复",
         "restoring": "正在恢复备份。这需要一点时间。请耐心等待。",
-        "run": "运行备份",
         "save": "保存",
         "shutdown": "在备份期间停止服务器",
         "size": "大小",
-        "standby": "等候",
-        "status": "状态",
-        "storage": "存储位置",
         "storageLocation": "存储位置",
         "storageLocationDesc": "您想要在哪里存储备份？"
     },
@@ -507,7 +492,6 @@
     },
     "serverSchedules": {
         "action": "操作",
-        "actionId": "选择子操作",
         "areYouSure": "删除计划任务？",
         "cancel": "取消",
         "cannotSee": "什么都看不到？",
@@ -586,8 +570,6 @@
         "minMem": "最小内存",
         "myNewServer": "我的新服务器",
         "newServer": "创建新服务器",
-        "noRole": "未找到角色。当前搜索参数：",
-        "noneRoles": "未选择角色",
         "quickSettings": "快捷设置",
         "quickSettingsDescription": "别担心，你可以稍后再更改这些设置",
         "resetForm": "重置表单",
@@ -618,6 +600,7 @@
         "dashboard": "仪表板",
         "documentation": "文档",
         "inApp": "内置文档",
+        "navigation": "导航栏",
         "newServer": "创建新服务器",
         "servers": "服务器"
     },
@@ -671,9 +654,6 @@
         "userTheme": "UI 主题",
         "uses": "使用次数限制（-1==无限制）"
     },
-    "validators": {
-        "passLength": "密码过短。最短长度：8"
-    },
     "webhooks": {
         "areYouSureDel": "您确定要删除此 webhook 吗？",
         "areYouSureRun": "您确定要测试此 webhook 吗？",

main.py

@@ -278,15 +278,6 @@ def setup_logging(debug=True):
             encoding="utf-8",
         ).close()
 
-    if not helper.check_file_exists(
-        os.path.join(APPLICATION_PATH, "logs", "audit.log")
-    ):
-        open(
-            os.path.join(APPLICATION_PATH, "logs", "audit.log"),
-            "a",
-            encoding="utf-8",
-        ).close()
-
     if os.path.exists(logging_config_file):
         # open our logging config file
         with open(logging_config_file, "rt", encoding="utf-8") as f:
@@ -376,15 +367,7 @@ if __name__ == "__main__":
             encoding="utf-8",
         ) as cred_file:
             cred_file.write(
-                json.dumps(
-                    {
-                        "username": "admin",
-                        "password": PASSWORD,
-                        "info": "This is NOT where you change your password."
-                        " This file is only a means to give you a default password.",
-                    },
-                    indent=4,
-                )
+                json.dumps({"username": "admin", "password": PASSWORD}, indent=4)
             )
         os.chmod(
             os.path.join(APPLICATION_PATH, "app", "config", "default-creds.txt"), 0o600

requirements.txt

@@ -13,9 +13,9 @@ psutil==5.9.5
 pyOpenSSL==24.0.0
 pyjwt==2.8.0
 PyYAML==6.0.1
-requests==2.32.0
+requests==2.31.0
 termcolor==1.1
-tornado==6.4.1
+tornado==6.3.3
 tzlocal==5.1
 jsonschema==4.19.1
 orjson==3.9.15

sonar-project.properties

@@ -3,7 +3,7 @@ sonar.organization=crafty-controller
 
 # This is the name and version displayed in the SonarCloud UI.
 sonar.projectName=Crafty 4
-sonar.projectVersion=4.4.1
+sonar.projectVersion=4.4.0
 sonar.python.version=3.9, 3.10, 3.11
 sonar.exclusions=app/migrations/**, app/frontend/static/assets/vendors/**