From 7c822b715adba612655d70d5063767fb3798c68f Mon Sep 17 00:00:00 2001
From: xithical <86810816+xithical@users.noreply.github.com>
Date: Fri, 18 Mar 2022 20:46:56 -0500
Subject: [PATCH 01/12] Add functions for importing 3.x users, require
 passwords when adding users

---
 app/classes/controllers/users_controller.py |  6 +++++-
 app/classes/models/users.py                 | 13 ++++++++++++-
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/app/classes/controllers/users_controller.py b/app/classes/controllers/users_controller.py
index 09adaca7..e073dc12 100644
--- a/app/classes/controllers/users_controller.py
+++ b/app/classes/controllers/users_controller.py
@@ -96,8 +96,12 @@ class Users_Controller:
         users_helper.update_user(user_id, up_data)
 
     @staticmethod
-    def add_user(username, password=None, email="default@example.com", enabled: bool = True, superuser: bool = False):
+    def add_user(username, password, email="default@example.com", enabled: bool = True, superuser: bool = False):
         return users_helper.add_user(username, password=password, email=email, enabled=enabled, superuser=superuser)
+    
+    @staticmethod
+    def add_rawpass_user(username, password, email="default@example.com", enabled: bool = True, superuser: bool = False):
+        return users_helper.add_rawpass_user(username, password=password, email=email, enabled=enabled, superuser=superuser)
 
     @staticmethod
     def remove_user(user_id):
diff --git a/app/classes/models/users.py b/app/classes/models/users.py
index 4c32c538..b99a53fc 100644
--- a/app/classes/models/users.py
+++ b/app/classes/models/users.py
@@ -147,7 +147,7 @@ class helper_users:
         return user
 
     @staticmethod
-    def add_user(username: str, password: Optional[str] = None, email: Optional[str] = None, enabled: bool = True, superuser: bool = False) -> str:
+    def add_user(username: str, password: str = None, email: Optional[str] = None, enabled: bool = True, superuser: bool = False) -> str:
         if password is not None:
             pw_enc = helper.encode_pass(password)
         else:
@@ -161,6 +161,17 @@ class helper_users:
             Users.created: helper.get_time_as_string()
         }).execute()
         return user_id
+    
+    @staticmethod
+    def add_rawpass_user(username: str, password: str = None, email: Optional[str] = None, enabled: bool = True, superuser: bool = False) -> str:
+        user_id = Users.insert({
+            Users.username: username.lower(),
+            Users.password: password,
+            Users.email: email,
+            Users.enabled: enabled,
+            Users.superuser: superuser,
+            Users.created: helper.get_time_as_string()
+        }).execute()
 
     @staticmethod
     def update_user(user_id, up_data=None):

From 4c14b58a2a9dc55aad20e735fcb3c0073565567e Mon Sep 17 00:00:00 2001
From: xithical <86810816+xithical@users.noreply.github.com>
Date: Fri, 18 Mar 2022 21:55:39 -0500
Subject: [PATCH 02/12] Add user importing from 3 - servers to be added

---
 app/classes/shared/command.py |  9 +++++++++
 app/classes/shared/import3.py | 33 +++++++++++++++++++++++++++++++++
 2 files changed, 42 insertions(+)
 create mode 100644 app/classes/shared/import3.py

diff --git a/app/classes/shared/command.py b/app/classes/shared/command.py
index 18b4f868..9acba552 100644
--- a/app/classes/shared/command.py
+++ b/app/classes/shared/command.py
@@ -6,6 +6,7 @@ import logging
 
 from app.classes.shared.console import console
 from app.classes.shared.helpers import helper
+from app.classes.shared.import3 import import3
 from app.classes.web.websocket_helper import websocket_helper
 
 logger = logging.getLogger(__name__)
@@ -58,6 +59,10 @@ class MainPrompt(cmd.Cmd):
             else:
                 print(f'Name: {thread.name} Identifier: {thread.ident}')
 
+    @staticmethod
+    def do_import3():
+        import3.start_import()
+
     def universal_exit(self):
         logger.info("Stopping all server daemons / threads")
         console.info("Stopping all server daemons / threads - This may take a few seconds")
@@ -75,3 +80,7 @@ class MainPrompt(cmd.Cmd):
     @staticmethod
     def help_migrations():
         console.help("Only for advanced users. Use with caution")
+    
+    @staticmethod
+    def help_import3():
+        console.help("Import users and servers from Crafty 3")
\ No newline at end of file
diff --git a/app/classes/shared/import3.py b/app/classes/shared/import3.py
new file mode 100644
index 00000000..8c451492
--- /dev/null
+++ b/app/classes/shared/import3.py
@@ -0,0 +1,33 @@
+import json
+import os
+import console
+import logging
+logger = logging.getLogger(__name__)
+
+from app.classes.controllers.users_controller import users_helper
+from app.classes.shared.main_controller import Controller
+
+class import3:
+    def start_import(self):
+        folder = os.path.normpath(input("Please input the path to the migrations folder in your installation of Crafty 3: "))
+        if not os.path.exists(folder):
+            console.log("Crafty cannot find the path you entered. Does Crafty's user have permission to access it?")
+            console.log("Please run the import3 command again and enter a valid path.")
+        else:
+            with open (os.path.join(folder, "users.json")) as f:
+                user_json = json.load(f.read())
+            with open (os.path.join(folder, "mc_settings.json")) as f:
+                servers_json = json.load(f.read())
+            self.import_users(user_json)
+            self.import_servers(servers_json)
+
+    @staticmethod
+    def import_users(json_data):
+        for user in json_data:
+            users_helper.add_rawpass_user(user.username, user.password)
+            console.log(f"Imported user {user.username} from Crafty 3")
+            logger.info(f"Imported user {user.username} from Crafty 3")
+
+    @staticmethod
+    def import_servers(json_data):
+        return
\ No newline at end of file

From 4af62cbacaae5975990972268b166558123cf310 Mon Sep 17 00:00:00 2001
From: _iEpic <david.larmore.dl@gmail.com>
Date: Fri, 18 Mar 2022 23:59:10 -0400
Subject: [PATCH 03/12] Added basic Import functions

---
 app/classes/models/users.py   |  1 +
 app/classes/shared/command.py |  5 ++--
 app/classes/shared/import3.py | 45 +++++++++++++++++++++++++----------
 3 files changed, 36 insertions(+), 15 deletions(-)

diff --git a/app/classes/models/users.py b/app/classes/models/users.py
index b99a53fc..6027c2b9 100644
--- a/app/classes/models/users.py
+++ b/app/classes/models/users.py
@@ -172,6 +172,7 @@ class helper_users:
             Users.superuser: superuser,
             Users.created: helper.get_time_as_string()
         }).execute()
+        return user_id
 
     @staticmethod
     def update_user(user_id, up_data=None):
diff --git a/app/classes/shared/command.py b/app/classes/shared/command.py
index 9acba552..5306b8e5 100644
--- a/app/classes/shared/command.py
+++ b/app/classes/shared/command.py
@@ -59,8 +59,7 @@ class MainPrompt(cmd.Cmd):
             else:
                 print(f'Name: {thread.name} Identifier: {thread.ident}')
 
-    @staticmethod
-    def do_import3():
+    def do_import3(self, _line):
         import3.start_import()
 
     def universal_exit(self):
@@ -83,4 +82,4 @@ class MainPrompt(cmd.Cmd):
     
     @staticmethod
     def help_import3():
-        console.help("Import users and servers from Crafty 3")
\ No newline at end of file
+        console.help("Import users and servers from Crafty 3")
diff --git a/app/classes/shared/import3.py b/app/classes/shared/import3.py
index 8c451492..593a6e25 100644
--- a/app/classes/shared/import3.py
+++ b/app/classes/shared/import3.py
@@ -1,33 +1,54 @@
 import json
 import os
-import console
 import logging
 logger = logging.getLogger(__name__)
 
 from app.classes.controllers.users_controller import users_helper
 from app.classes.shared.main_controller import Controller
+from app.classes.shared.console import console
 
 class import3:
+
+    def __init__(self):
+        self.controller = Controller()
+
     def start_import(self):
         folder = os.path.normpath(input("Please input the path to the migrations folder in your installation of Crafty 3: "))
         if not os.path.exists(folder):
-            console.log("Crafty cannot find the path you entered. Does Crafty's user have permission to access it?")
-            console.log("Please run the import3 command again and enter a valid path.")
+            console.info("Crafty cannot find the path you entered. Does Crafty's user have permission to access it?")
+            console.info("Please run the import3 command again and enter a valid path.")
         else:
             with open (os.path.join(folder, "users.json")) as f:
-                user_json = json.load(f.read())
+                user_json = json.loads(f.read())
             with open (os.path.join(folder, "mc_settings.json")) as f:
-                servers_json = json.load(f.read())
+                servers_json = json.loads(f.read())
             self.import_users(user_json)
-            self.import_servers(servers_json)
+            self.import_servers(servers_json, self.controller)
 
     @staticmethod
     def import_users(json_data):
-        for user in json_data:
-            users_helper.add_rawpass_user(user.username, user.password)
-            console.log(f"Imported user {user.username} from Crafty 3")
-            logger.info(f"Imported user {user.username} from Crafty 3")
+        # If there is only one user to import json needs to call the data differently
+        if isinstance(json_data, list):
+            for user in json_data:
+                users_helper.add_rawpass_user(user['username'], user['password'])
+                console.info(f"Imported user {user['username']} from Crafty 3")
+                logger.info(f"Imported user {user['username']} from Crafty 3")
+        else:
+            console.info("There is only one user detected. Cannot create duplicate Admin account.")
+            logger.info("There is only one user detected. Cannot create duplicate Admin account.")
 
     @staticmethod
-    def import_servers(json_data):
-        return
\ No newline at end of file
+    def import_servers(json_data, controller):
+        # If there is only one server to import json needs to call the data differently
+        if isinstance(json_data, list):
+            for server in json_data:
+                new_server_id = controller.import_jar_server(server_name=server['server_name'], server_path=server['server_path'], server_jar=server['server_jar'], min_mem=int(server['memory_min']), max_mem=int(server['memory_max']), port=server['server_port'])
+                console.info(f"Imported server {server['server_name']}[{server['id']}] from Crafty 3 to new server id {new_server_id}")
+                logger.info(f"Imported server {server['server_name']}[{server['id']}] from Crafty 3 to new server id {new_server_id}")
+        else:
+            new_server_id = controller.import_jar_server(server_name=json_data['server_name'], server_path=json_data['server_path'], server_jar=json_data['server_jar'], min_mem=int(json_data['memory_min']), max_mem=int(json_data['memory_max']), port=json_data['server_port'])
+            console.info(f"Imported server {json_data['server_name']}[{json_data['id']}] from Crafty 3 to new server id {new_server_id}")
+            logger.info(f"Imported server {json_data['server_name']}[{json_data['id']}] from Crafty 3 to new server id {new_server_id}")
+
+
+import3 = import3()

From cda7b59a12bd9153f0430d16cfef7b0c7143a0bb Mon Sep 17 00:00:00 2001
From: xithical <86810816+xithical@users.noreply.github.com>
Date: Fri, 18 Mar 2022 23:06:04 -0500
Subject: [PATCH 04/12] Fix how memory args are passed in importing from 3

---
 app/classes/shared/import3.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/classes/shared/import3.py b/app/classes/shared/import3.py
index 593a6e25..0cb7ace5 100644
--- a/app/classes/shared/import3.py
+++ b/app/classes/shared/import3.py
@@ -42,11 +42,11 @@ class import3:
         # If there is only one server to import json needs to call the data differently
         if isinstance(json_data, list):
             for server in json_data:
-                new_server_id = controller.import_jar_server(server_name=server['server_name'], server_path=server['server_path'], server_jar=server['server_jar'], min_mem=int(server['memory_min']), max_mem=int(server['memory_max']), port=server['server_port'])
+                new_server_id = controller.import_jar_server(server_name=server['server_name'], server_path=server['server_path'], server_jar=server['server_jar'], min_mem=(int(server['memory_min'])/1000), max_mem=(int(server['memory_max'])/1000), port=server['server_port'])
                 console.info(f"Imported server {server['server_name']}[{server['id']}] from Crafty 3 to new server id {new_server_id}")
                 logger.info(f"Imported server {server['server_name']}[{server['id']}] from Crafty 3 to new server id {new_server_id}")
         else:
-            new_server_id = controller.import_jar_server(server_name=json_data['server_name'], server_path=json_data['server_path'], server_jar=json_data['server_jar'], min_mem=int(json_data['memory_min']), max_mem=int(json_data['memory_max']), port=json_data['server_port'])
+            new_server_id = controller.import_jar_server(server_name=json_data['server_name'], server_path=json_data['server_path'], server_jar=json_data['server_jar'], min_mem=(int(json_data['memory_min'])/1000), max_mem=(int(json_data['memory_max'])/1000), port=json_data['server_port'])
             console.info(f"Imported server {json_data['server_name']}[{json_data['id']}] from Crafty 3 to new server id {new_server_id}")
             logger.info(f"Imported server {json_data['server_name']}[{json_data['id']}] from Crafty 3 to new server id {new_server_id}")
 

From c303a866b657aa7f302662463065f8217a370970 Mon Sep 17 00:00:00 2001
From: Randy Carranza <badrockr.email@gmail.com>
Date: Sun, 20 Mar 2022 06:04:06 -0400
Subject: [PATCH 05/12] Added code to disabled sorting when the user is a
 mobile user

---
 app/frontend/templates/panel/dashboard.html | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/app/frontend/templates/panel/dashboard.html b/app/frontend/templates/panel/dashboard.html
index 4c357f01..2b3ab52a 100644
--- a/app/frontend/templates/panel/dashboard.html
+++ b/app/frontend/templates/panel/dashboard.html
@@ -265,6 +265,7 @@
 
 </div>
 <!-- content-wrapper ends -->
+<div id="mobile"></div>
 <style>
   .popover-body {
     color: white !important;
@@ -586,6 +587,11 @@
 <script src="/static/assets/js/jquery-ui.js"></script>
 <link rel="stylesheet" href="/static/assets/css/jquery-ui.css">
 <link rel="stylesheet" href="/static/assets/css/jquery-ui.structure.css">
+<style>
+  @media only screen and (max-width: 760px) {
+    #mobile { display: none; }
+  }
+</style>
 <script>
 
   /* Search Bar */
@@ -601,8 +607,9 @@
 
   $(document).on("mousedown keyup click", function(event) {
     const value = $('.dataTables_filter input').val();
+    const is_mobile = $('#some-element').css('display')=='none';
 
-    if ($("table#servers_table tbody").sortable("toArray").length > 1 && value === '') {
+    if ($("table#servers_table tbody").sortable("toArray").length > 1 && value === '' && !is_mobile) {
       $("table#servers_table tbody").sortable("enable");
     } else {
       $("table#servers_table tbody").sortable("disable");

From d311ccbfa11e18a561fe935431f9c92d974474f5 Mon Sep 17 00:00:00 2001
From: Andrew <mcdeweykp@gmail.com>
Date: Sun, 20 Mar 2022 07:05:11 -0400
Subject: [PATCH 06/12] Remove print statement everytime a page loads

---
 app/classes/web/panel_handler.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/app/classes/web/panel_handler.py b/app/classes/web/panel_handler.py
index ee07a227..89a6fd1b 100644
--- a/app/classes/web/panel_handler.py
+++ b/app/classes/web/panel_handler.py
@@ -184,7 +184,6 @@ class PanelHandler(BaseHandler):
         # pylint: disable=unused-variable
         api_key, token_data, exec_user = self.current_user
         superuser = exec_user['superuser']
-        print()
         if api_key is not None:
             superuser = superuser and api_key.superuser
 
@@ -1037,7 +1036,6 @@ class PanelHandler(BaseHandler):
                 server_obj.path = server_obj.path
                 server_obj.log_path = server_obj.log_path
                 server_obj.executable = server_obj.executable
-                print(server_obj.execution_command)
                 server_obj.execution_command = server_obj.execution_command
                 server_obj.server_ip = server_obj.server_ip
                 server_obj.server_port = server_obj.server_port

From 6d6699638a9f391074e96f18bebfbe57ed4b62b7 Mon Sep 17 00:00:00 2001
From: Randy Carranza <badrockr.email@gmail.com>
Date: Sun, 20 Mar 2022 08:03:56 -0400
Subject: [PATCH 07/12] Resolves an issue on mobile where the table cant be
 scrolled to the side

---
 app/frontend/templates/panel/dashboard.html | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/app/frontend/templates/panel/dashboard.html b/app/frontend/templates/panel/dashboard.html
index 2b3ab52a..d58b43fb 100644
--- a/app/frontend/templates/panel/dashboard.html
+++ b/app/frontend/templates/panel/dashboard.html
@@ -591,6 +591,14 @@
   @media only screen and (max-width: 760px) {
     #mobile { display: none; }
   }
+  .ui-sortable-handle {
+    cursor: default;
+    padding:2px;
+  }
+  .ui-sortable-handle:hover {
+    cursor: grab !important;
+    padding:2px;
+  }
 </style>
 <script>
 
@@ -607,7 +615,7 @@
 
   $(document).on("mousedown keyup click", function(event) {
     const value = $('.dataTables_filter input').val();
-    const is_mobile = $('#some-element').css('display')=='none';
+    const is_mobile = $('#mobile').css('display')=='none';
 
     if ($("table#servers_table tbody").sortable("toArray").length > 1 && value === '' && !is_mobile) {
       $("table#servers_table tbody").sortable("enable");
@@ -638,9 +646,10 @@ $(document).ready(function() {
   $("table#servers_table tbody")
     .sortable({
       items: '> tr',
-      cursor: "move",
+      cursor: "grabbing",
       axis: "y",
       revert: true,
+      handle:"i.fas.fa-server,a",
       forcePlaceholderSize: true,
       placeholder:'table-placeholder',
       deactivate: function(event, ui) {
@@ -664,7 +673,10 @@ $(document).ready(function() {
   });
 
   // Fixes the appearance of a scrollbar when a user tries to drag an item too low
-  $("div#servers_table_wrapper").css({ overflow: "hidden" });
+  // Disabled on mobile since sorting is disabled on mobile
+  if($('#mobile').css('display') != 'none'){
+    $("div#servers_table_wrapper").css({ overflow: "hidden" });
+  }
 });
 
 </script>

From 5682455bccea61cdc0903741b2494bdd2d456b71 Mon Sep 17 00:00:00 2001
From: Andrew <mcdeweykp@gmail.com>
Date: Sun, 20 Mar 2022 12:39:57 -0400
Subject: [PATCH 08/12] Appease the linter

---
 app/classes/web/panel_handler.py | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/app/classes/web/panel_handler.py b/app/classes/web/panel_handler.py
index 89a6fd1b..3fa99fcc 100644
--- a/app/classes/web/panel_handler.py
+++ b/app/classes/web/panel_handler.py
@@ -181,8 +181,7 @@ class PanelHandler(BaseHandler):
         now = time.time()
         formatted_time = str(datetime.datetime.fromtimestamp(now).strftime('%Y-%m-%d %H:%M:%S'))
 
-        # pylint: disable=unused-variable
-        api_key, token_data, exec_user = self.current_user
+        api_key, _token_data, exec_user = self.current_user
         superuser = exec_user['superuser']
         if api_key is not None:
             superuser = superuser and api_key.superuser
@@ -531,8 +530,6 @@ class PanelHandler(BaseHandler):
         elif page == 'panel_config':
             auth_servers = {}
             auth_role_servers = {}
-            users_list = []
-            role_users = {}
             roles = self.controller.roles.get_all_roles()
             user_roles = {}
             for user in self.controller.users.get_all_users():
@@ -951,8 +948,7 @@ class PanelHandler(BaseHandler):
 
     @tornado.web.authenticated
     def post(self, page):
-        # pylint: disable=unused-variable
-        api_key, token_data, exec_user = self.current_user
+        api_key, _token_data, exec_user = self.current_user
         superuser = exec_user['superuser']
         if api_key is not None:
             superuser = superuser and api_key.superuser
@@ -1681,8 +1677,7 @@ class PanelHandler(BaseHandler):
 
     @tornado.web.authenticated
     def delete(self, page):
-        # pylint: disable=unused-variable
-        api_key, token_data, exec_user = self.current_user
+        api_key, _token_data, exec_user = self.current_user
         superuser = exec_user['superuser']
         if api_key is not None:
             superuser = superuser and api_key.superuser

From bf6d0d0368768e9b22f9a0dc4fab20a703e9f86a Mon Sep 17 00:00:00 2001
From: xithical <86810816+xithical@users.noreply.github.com>
Date: Sun, 20 Mar 2022 12:01:14 -0500
Subject: [PATCH 09/12] Appease the linter

---
 app/classes/controllers/users_controller.py |  2 +-
 app/classes/models/users.py                 |  2 +-
 app/classes/shared/import3.py               | 11 +++++++----
 app/classes/web/public_handler.py           | 10 +++++-----
 4 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/app/classes/controllers/users_controller.py b/app/classes/controllers/users_controller.py
index e073dc12..bd51fd8f 100644
--- a/app/classes/controllers/users_controller.py
+++ b/app/classes/controllers/users_controller.py
@@ -98,7 +98,7 @@ class Users_Controller:
     @staticmethod
     def add_user(username, password, email="default@example.com", enabled: bool = True, superuser: bool = False):
         return users_helper.add_user(username, password=password, email=email, enabled=enabled, superuser=superuser)
-    
+
     @staticmethod
     def add_rawpass_user(username, password, email="default@example.com", enabled: bool = True, superuser: bool = False):
         return users_helper.add_rawpass_user(username, password=password, email=email, enabled=enabled, superuser=superuser)
diff --git a/app/classes/models/users.py b/app/classes/models/users.py
index 6027c2b9..751fdb1c 100644
--- a/app/classes/models/users.py
+++ b/app/classes/models/users.py
@@ -161,7 +161,7 @@ class helper_users:
             Users.created: helper.get_time_as_string()
         }).execute()
         return user_id
-    
+
     @staticmethod
     def add_rawpass_user(username: str, password: str = None, email: Optional[str] = None, enabled: bool = True, superuser: bool = False) -> str:
         user_id = Users.insert({
diff --git a/app/classes/shared/import3.py b/app/classes/shared/import3.py
index 0cb7ace5..db9670b7 100644
--- a/app/classes/shared/import3.py
+++ b/app/classes/shared/import3.py
@@ -1,12 +1,13 @@
 import json
 import os
 import logging
-logger = logging.getLogger(__name__)
 
 from app.classes.controllers.users_controller import users_helper
 from app.classes.shared.main_controller import Controller
 from app.classes.shared.console import console
 
+logger = logging.getLogger(__name__)
+
 class import3:
 
     def __init__(self):
@@ -42,13 +43,15 @@ class import3:
         # If there is only one server to import json needs to call the data differently
         if isinstance(json_data, list):
             for server in json_data:
-                new_server_id = controller.import_jar_server(server_name=server['server_name'], server_path=server['server_path'], server_jar=server['server_jar'], min_mem=(int(server['memory_min'])/1000), max_mem=(int(server['memory_max'])/1000), port=server['server_port'])
+                new_server_id = controller.import_jar_server(server_name=server['server_name'], server_path=server['server_path'], server_jar=server['server_jar'],
+                                                             min_mem=(int(server['memory_min'])/1000), max_mem=(int(server['memory_max'])/1000), port=server['server_port'])
                 console.info(f"Imported server {server['server_name']}[{server['id']}] from Crafty 3 to new server id {new_server_id}")
                 logger.info(f"Imported server {server['server_name']}[{server['id']}] from Crafty 3 to new server id {new_server_id}")
         else:
-            new_server_id = controller.import_jar_server(server_name=json_data['server_name'], server_path=json_data['server_path'], server_jar=json_data['server_jar'], min_mem=(int(json_data['memory_min'])/1000), max_mem=(int(json_data['memory_max'])/1000), port=json_data['server_port'])
+            new_server_id = controller.import_jar_server(server_name=json_data['server_name'], server_path=json_data['server_path'], server_jar=json_data['server_jar'],
+                                                         min_mem=(int(json_data['memory_min'])/1000), max_mem=(int(json_data['memory_max'])/1000), port=json_data['server_port'])
             console.info(f"Imported server {json_data['server_name']}[{json_data['id']}] from Crafty 3 to new server id {new_server_id}")
             logger.info(f"Imported server {json_data['server_name']}[{json_data['id']}] from Crafty 3 to new server id {new_server_id}")
 
 
-import3 = import3()
+import3 = import3()
\ No newline at end of file
diff --git a/app/classes/web/public_handler.py b/app/classes/web/public_handler.py
index 8cc2d7c2..72d2d4aa 100644
--- a/app/classes/web/public_handler.py
+++ b/app/classes/web/public_handler.py
@@ -42,7 +42,7 @@ class PublicHandler(BaseHandler):
             'lang_page': helper.getLangPage(helper.get_setting('language')),
             'query': ""
         }
-        if (self.request.query):
+        if self.request.query:
             page_data['query'] = self.request.query
 
         # sensible defaults
@@ -66,7 +66,7 @@ class PublicHandler(BaseHandler):
 
         # if we have no page, let's go to login
         else:
-            if (self.request.query):
+            if self.request.query:
                 self.redirect('/public/login?'+self.request.query)
             else:
                 self.redirect('/public/login')
@@ -90,7 +90,7 @@ class PublicHandler(BaseHandler):
             'lang_page': helper.getLangPage(helper.get_setting('language')),
             'query': ""
         }
-        if (self.request.query):
+        if self.request.query:
             page_data['query'] = self.request.query
 
         if page == 'login':
@@ -147,7 +147,7 @@ class PublicHandler(BaseHandler):
                 self.controller.management.add_to_audit_log(user_data.user_id, "Logged in", 0, self.get_remote_ip())
 
 
-                if (self.request.query_arguments.get('next')):
+                if self.request.query_arguments.get('next'):
                     next_page = self.request.query_arguments.get('next')[0].decode()
                 else:
                     next_page = "/panel/dashboard"
@@ -165,7 +165,7 @@ class PublicHandler(BaseHandler):
                 else:
                     self.redirect(f'/public/login?error_msg={error_msg}')
         else:
-            if (self.request.query):
+            if self.request.query:
                 self.redirect('/public/login?'+self.request.query)
             else:
                 self.redirect('/public/login')

From 1279784cc74b5ec7821d17fcf714bb990e6a13f5 Mon Sep 17 00:00:00 2001
From: xithical <86810816+xithical@users.noreply.github.com>
Date: Sun, 20 Mar 2022 12:14:51 -0500
Subject: [PATCH 10/12] Appease the linter again

---
 app/classes/shared/command.py     |  2 +-
 app/classes/shared/import3.py     | 17 +++++++++--------
 app/classes/web/public_handler.py |  8 ++++----
 3 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/app/classes/shared/command.py b/app/classes/shared/command.py
index 5306b8e5..112effbb 100644
--- a/app/classes/shared/command.py
+++ b/app/classes/shared/command.py
@@ -79,7 +79,7 @@ class MainPrompt(cmd.Cmd):
     @staticmethod
     def help_migrations():
         console.help("Only for advanced users. Use with caution")
-    
+
     @staticmethod
     def help_import3():
         console.help("Import users and servers from Crafty 3")
diff --git a/app/classes/shared/import3.py b/app/classes/shared/import3.py
index db9670b7..0d244460 100644
--- a/app/classes/shared/import3.py
+++ b/app/classes/shared/import3.py
@@ -19,9 +19,9 @@ class import3:
             console.info("Crafty cannot find the path you entered. Does Crafty's user have permission to access it?")
             console.info("Please run the import3 command again and enter a valid path.")
         else:
-            with open (os.path.join(folder, "users.json")) as f:
+            with open (os.path.join(folder, "users.json"), encoding="utf-8") as f:
                 user_json = json.loads(f.read())
-            with open (os.path.join(folder, "mc_settings.json")) as f:
+            with open (os.path.join(folder, "mc_settings.json", encoding="utf-8")) as f:
                 servers_json = json.loads(f.read())
             self.import_users(user_json)
             self.import_servers(servers_json, self.controller)
@@ -43,15 +43,16 @@ class import3:
         # If there is only one server to import json needs to call the data differently
         if isinstance(json_data, list):
             for server in json_data:
-                new_server_id = controller.import_jar_server(server_name=server['server_name'], server_path=server['server_path'], server_jar=server['server_jar'],
-                                                             min_mem=(int(server['memory_min'])/1000), max_mem=(int(server['memory_max'])/1000), port=server['server_port'])
+                new_server_id = controller.import_jar_server(server_name=server['server_name'], server_path=server['server_path'],
+                                                             server_jar=server['server_jar'], min_mem=(int(server['memory_min'])/1000),
+                                                             max_mem=(int(server['memory_max'])/1000), port=server['server_port'])
                 console.info(f"Imported server {server['server_name']}[{server['id']}] from Crafty 3 to new server id {new_server_id}")
                 logger.info(f"Imported server {server['server_name']}[{server['id']}] from Crafty 3 to new server id {new_server_id}")
         else:
-            new_server_id = controller.import_jar_server(server_name=json_data['server_name'], server_path=json_data['server_path'], server_jar=json_data['server_jar'],
-                                                         min_mem=(int(json_data['memory_min'])/1000), max_mem=(int(json_data['memory_max'])/1000), port=json_data['server_port'])
+            new_server_id = controller.import_jar_server(server_name=json_data['server_name'], server_path=json_data['server_path'],
+                                                         server_jar=json_data['server_jar'], min_mem=(int(json_data['memory_min'])/1000),
+                                                         max_mem=(int(json_data['memory_max'])/1000), port=json_data['server_port'])
             console.info(f"Imported server {json_data['server_name']}[{json_data['id']}] from Crafty 3 to new server id {new_server_id}")
             logger.info(f"Imported server {json_data['server_name']}[{json_data['id']}] from Crafty 3 to new server id {new_server_id}")
 
-
-import3 = import3()
\ No newline at end of file
+import3 = import3()
diff --git a/app/classes/web/public_handler.py b/app/classes/web/public_handler.py
index 72d2d4aa..80363afb 100644
--- a/app/classes/web/public_handler.py
+++ b/app/classes/web/public_handler.py
@@ -96,7 +96,7 @@ class PublicHandler(BaseHandler):
         if page == 'login':
 
             next_page = "/public/login"
-            if (self.request.query):
+            if self.request.query:
                 next_page = '/public/login?'+self.request.query
 
             entered_username = bleach.clean(self.get_argument('username'))
@@ -112,7 +112,7 @@ class PublicHandler(BaseHandler):
                 #self.clear_cookie("user")
                 #self.clear_cookie("user_data")
                 self.clear_cookie("token")
-                if (self.request.query):
+                if self.request.query:
                     self.redirect(f'/public/login?error_msg={error_msg}&{self.request.query}')
                 else:
                     self.redirect(f'/public/login?error_msg={error_msg}')
@@ -124,7 +124,7 @@ class PublicHandler(BaseHandler):
                 #self.clear_cookie("user")
                 #self.clear_cookie("user_data")
                 self.clear_cookie("token")
-                if (self.request.query):
+                if self.request.query:
                     self.redirect(f'/public/login?error_msg={error_msg}&{self.request.query}')
                 else:
                     self.redirect(f'/public/login?error_msg={error_msg}')
@@ -160,7 +160,7 @@ class PublicHandler(BaseHandler):
                 error_msg = "Inncorrect username or password. Please try again."
                 # log this failed login attempt
                 self.controller.management.add_to_audit_log(user_data.user_id, "Tried to log in", 0, self.get_remote_ip())
-                if (self.request.query):
+                if self.request.query:
                     self.redirect(f'/public/login?error_msg={error_msg}&{self.request.query}')
                 else:
                     self.redirect(f'/public/login?error_msg={error_msg}')

From 4177ca882c42b4023b64b40644c3d63918b4a401 Mon Sep 17 00:00:00 2001
From: xithical <86810816+xithical@users.noreply.github.com>
Date: Sun, 20 Mar 2022 12:19:11 -0500
Subject: [PATCH 11/12] Put encoding arg in its proper location for maximum
 linter appeasal

---
 app/classes/shared/import3.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/classes/shared/import3.py b/app/classes/shared/import3.py
index 0d244460..dfcd5bcf 100644
--- a/app/classes/shared/import3.py
+++ b/app/classes/shared/import3.py
@@ -21,7 +21,7 @@ class import3:
         else:
             with open (os.path.join(folder, "users.json"), encoding="utf-8") as f:
                 user_json = json.loads(f.read())
-            with open (os.path.join(folder, "mc_settings.json", encoding="utf-8")) as f:
+            with open (os.path.join(folder, "mc_settings.json"), encoding="utf-8") as f:
                 servers_json = json.loads(f.read())
             self.import_users(user_json)
             self.import_servers(servers_json, self.controller)

From ecc87a6137181e51fc070bc436538c081a4b0ba6 Mon Sep 17 00:00:00 2001
From: Andrew <mcdeweykp@gmail.com>
Date: Tue, 22 Mar 2022 14:24:15 +0000
Subject: [PATCH 12/12] Add context menu for iOS + Bug fix

---
 app/classes/web/ajax_handler.py               |   1 +
 app/classes/web/panel_handler.py              |  25 +++-
 .../templates/panel/server_files.html         | 107 +++++++++++++++++-
 3 files changed, 127 insertions(+), 6 deletions(-)

diff --git a/app/classes/web/ajax_handler.py b/app/classes/web/ajax_handler.py
index 3c9c05e5..dc916ed1 100644
--- a/app/classes/web/ajax_handler.py
+++ b/app/classes/web/ajax_handler.py
@@ -312,6 +312,7 @@ class AjaxHandler(BaseHandler):
         elif page == "backup_now":
             server_id = self.get_argument('id', None)
             if server_id is None:
+                logger.error("Server ID is none. Canceling backup!")
                 return
 
             server = self.controller.get_server_obj(server_id)
diff --git a/app/classes/web/panel_handler.py b/app/classes/web/panel_handler.py
index 3fa99fcc..3ceb38e1 100644
--- a/app/classes/web/panel_handler.py
+++ b/app/classes/web/panel_handler.py
@@ -391,11 +391,6 @@ class PanelHandler(BaseHandler):
 
             valid_subpages = ['term', 'logs', 'backup', 'config', 'files', 'admin_controls', 'schedules']
 
-            if subpage not in valid_subpages:
-                logger.debug('not a valid subpage')
-                subpage = 'term'
-            logger.debug(f'Subpage: "{subpage}"')
-
             server = self.controller.get_server_obj(server_id)
             # server_data isn't needed since the server_stats also pulls server data
             page_data['server_data'] = self.controller.servers.get_server_data_by_id(server_id)
@@ -422,6 +417,26 @@ class PanelHandler(BaseHandler):
             page_data['user_permissions'] = self.controller.server_perms.get_user_id_permissions_list(exec_user["user_id"], server_id)
             page_data['server_stats']['crashed'] = self.controller.servers.is_crashed(server_id)
             page_data['server_stats']['server_type'] = self.controller.servers.get_server_type_by_id(server_id)
+            if subpage not in valid_subpages:
+                logger.debug('not a valid subpage')
+            if not subpage:
+                if page_data['permissions']['Terminal'] in page_data['user_permissions']:
+                    subpage = 'term'
+                elif page_data['permissions']['Logs'] in page_data['user_permissions']:
+                    subpage = 'logs'
+                elif page_data['permissions']['Schedule'] in page_data['user_permissions']:
+                    subpage = 'schedules'
+                elif page_data['permissions']['Backup'] in page_data['user_permissions']:
+                    subpage = 'backup'
+                elif page_data['permissions']['Files'] in page_data['user_permissions']:
+                    subpage = 'files'
+                elif page_data['permissions']['Config'] in page_data['user_permissions']:
+                    subpage = 'config'
+                elif page_data['permissions']['Players'] in page_data['user_permissions']:
+                    subpage = 'admin_controls'
+                else:
+                    self.redirect("/panel/error?error=Unauthorized access to Server")
+            logger.debug(f'Subpage: "{subpage}"')
 
             if subpage == 'term':
                 if not page_data['permissions']['Terminal'] in page_data['user_permissions']:
diff --git a/app/frontend/templates/panel/server_files.html b/app/frontend/templates/panel/server_files.html
index 225f5ba6..87daf416 100644
--- a/app/frontend/templates/panel/server_files.html
+++ b/app/frontend/templates/panel/server_files.html
@@ -163,7 +163,6 @@
                   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;
@@ -377,6 +376,99 @@
     }
   }
 
+  var onlongtouch; 
+  var timer;
+  var touchduration = 500; //length of time we want the user to touch before we do something
+  const longtouch = new Event('longtouch');
+  
+  function touchstart(event) {
+      if (!timer) {
+          timer = setTimeout(onlongtouch, touchduration, event);
+      }
+  }
+  
+  function touchend(event) {
+      //stops short touches from firing the event
+      if (timer) {
+          clearTimeout(timer);
+          console.log('Timer: ' + timer)
+          timer = null;
+      }
+  }
+  
+    onlongtouch = function(e) {
+        console.log('iOS long touch detected!');
+        if([
+          'iPad Simulator',
+          'iPhone Simulator',
+          'iPod Simulator',
+          'iPad',
+          'iPhone',
+          'iPod'
+        ].includes(navigator.platform)
+        // iPad on iOS 13 detection
+        || (navigator.userAgent.includes("Mac") && "ontouchend" in document)){
+            e.preventDefault();
+            e.stopImmediatePropagation();
+            var ctxmenuPath = e.target.getAttribute('data-path');
+            var ctxmenuName = e.target.getAttribute('data-name');
+            if (!ctxmenuPath) {
+              console.log({ 'event.target': e.target, ctxmenuPath });
+              return;
+            }
+            $('#renameItem').show();
+        
+            var isDir = e.target.classList.contains('files-tree-title');
+            $('#createFile').toggle(isDir);
+            $('#createDir').toggle(isDir);
+            $('#deleteDir').toggle(isDir);
+            $('#upload').toggle(isDir);
+        
+            var isFile = e.target.classList.contains('tree-file');
+            $('#deleteFile').toggle(isFile);
+            $('#downloadFile').toggle(isFile);
+            console.log({ 'event.target': e.target, isDir, isFile });
+        
+            if (e.target.classList.contains('root-dir')) {
+              $('#createFile').show();
+              $('#createDir').show();
+              $('#renameItem').hide();
+              $('#deleteDir').hide();
+              $('#deleteFile').hide();
+              $('#downloadFile').hide();
+              $('#upload').show();
+            }
+            if (e.target.textContent.endsWith('.zip')) {
+              $('#unzip').show();
+              console.log(e.target.textContent)
+            } else {
+              $('#unzip').hide();
+            }
+        
+            var clientX = e.layerX + 2;
+            var clientY = e.layerY + 5;
+        
+        
+        
+            document.getElementById('files-tree-nav-content')
+              .setAttribute('data-path', ctxmenuPath);
+            document.getElementById('files-tree-nav-content')
+              .setAttribute('data-name', ctxmenuName);
+            document.getElementById("files-tree-nav").style.display = "flex";
+            document.getElementById("files-tree-nav").style.position = "fixed";
+            domRect = document.getElementById("files-tree-nav").getBoundingClientRect();
+            sum = (clientY+domRect['height']) - window.innerHeight
+            if(domRect['height']+clientY > window.innerHeight){
+              clientY = clientY - sum;
+            }
+            document.getElementById("files-tree-nav").style.top = clientY + 'px';
+            document.getElementById("files-tree-nav").style.left =  clientX + 'px';
+            console.log(window.innerHeight)
+            timer = null;
+        };
+      }
+
+  
   setFileName();
   $('#editorParent').toggle(false) // show
   $('#fileError').toggle(false)    // hide
@@ -739,6 +831,19 @@
 
     for (var i = 0; i < treeItems.length; i++) {
       var treeItem = treeItems[i];
+      if([
+          'iPad Simulator',
+          'iPhone Simulator',
+          'iPod Simulator',
+          'iPad',
+          'iPhone',
+          'iPod'
+        ].includes(navigator.platform)
+        // iPad on iOS 13 detection
+        || (navigator.userAgent.includes("Mac") && "ontouchend" in document)){
+        treeItem.addEventListener("touchstart", touchstart, false);
+        treeItem.addEventListener("touchend", touchend, false);
+  }
       treeItem.addEventListener('contextmenu', function contextListener(event) {
         event.preventDefault();
         var ctxmenuPath = event.target.getAttribute('data-path');