Merge branch 'pretzel-fixes' into 'pretzel-bedrock'

Pretzel fixes

See merge request crafty-controller/crafty-commander!167

app/classes/models/management.py

@@ -191,11 +191,14 @@ class helpers_management:
             Audit_Log.log_msg: audit_msg,
             Audit_Log.source_ip: source_ip
         }).execute()
-        #todo make this user configurable
         #deletes records when they're more than 100
         ordered = Audit_Log.select().order_by(+Audit_Log.created)
         for item in ordered:
-            if Audit_Log.select().count() > 300:
+            if not helper.get_setting('max_audit_entries'):
+                max_entries = 300
+            else:
+                max_entries = helper.get_setting('max_audit_entries')
+            if Audit_Log.select().count() > max_entries:
                 Audit_Log.delete().where(Audit_Log.audit_id == item.audit_id).execute()
             else:
                 return
@@ -212,7 +215,12 @@ class helpers_management:
         #deletes records when they're more than 100
         ordered = Audit_Log.select().order_by(+Audit_Log.created)
         for item in ordered:
-            if Audit_Log.select().count() > 300:
+            #configurable through app/config/config.json
+            if not helper.get_setting('max_audit_entries'):
+                max_entries = 300
+            else:
+                max_entries = helper.get_setting('max_audit_entries')
+            if Audit_Log.select().count() > max_entries:
                 Audit_Log.delete().where(Audit_Log.audit_id == item.audit_id).execute()
             else:
                 return

app/classes/models/servers.py

@@ -43,6 +43,7 @@ class Servers(Model):
     server_ip = CharField(default="127.0.0.1")
     server_port = IntegerField(default=25565)
     logs_delete_after = IntegerField(default=0)
+    type = CharField(default="minecraft-java")
 
     class Meta:
         table_name = "servers"

app/classes/web/server_handler.py

@@ -282,6 +282,89 @@ class ServerHandler(BaseHandler):
             self.controller.stats.record_stats()
             self.redirect("/panel/dashboard")
 
+        if page == "bedrock_step1":
+            if not superuser:
+                user_roles = self.controller.roles.get_all_roles()
+            else:
+                user_roles = self.controller.roles.get_all_roles()
+            server = bleach.clean(self.get_argument('server', ''))
+            server_name = bleach.clean(self.get_argument('server_name', ''))
+            port = bleach.clean(self.get_argument('port', ''))
+            import_type = bleach.clean(self.get_argument('create_type', ''))
+            import_server_path = bleach.clean(self.get_argument('server_path', ''))
+            import_server_jar = bleach.clean(self.get_argument('server_jar', ''))
+            server_parts = server.split("|")
+            captured_roles = []
+            for role in user_roles:
+                if bleach.clean(self.get_argument(str(role), '')) == "on":
+                    captured_roles.append(role)
+
+            if not server_name:
+                self.redirect("/panel/error?error=Server name cannot be empty!")
+                return
+
+            if import_type == 'import_jar':
+                good_path = self.controller.verify_jar_server(import_server_path, import_server_jar)
+
+                if not good_path:
+                    self.redirect("/panel/error?error=Server path or Server Jar not found!")
+                    return
+
+                new_server_id = self.controller.import_jar_server(server_name, import_server_path,import_server_jar, min_mem, max_mem, port)
+                self.controller.management.add_to_audit_log(exec_user['user_id'],
+                                           f"imported a jar server named \"{server_name}\"", # Example: Admin imported a server named "old creative"
+                                           new_server_id,
+                                           self.get_remote_ip())
+            elif import_type == 'import_zip':
+                # here import_server_path means the zip path
+                zip_path = bleach.clean(self.get_argument('root_path'))
+                good_path = helper.check_path_exists(zip_path)
+                if not good_path:
+                    self.redirect("/panel/error?error=Temp path not found!")
+                    return
+
+                new_server_id = self.controller.import_zip_server(server_name, zip_path, import_server_jar, min_mem, max_mem, port)
+                if new_server_id == "false":
+                    self.redirect("/panel/error?error=Zip file not accessible! You can fix this permissions issue with" +
+                                  f"sudo chown -R crafty:crafty {import_server_path} And sudo chmod 2775 -R {import_server_path}")
+                    return
+                self.controller.management.add_to_audit_log(exec_user['user_id'],
+                                           f"imported a zip server named \"{server_name}\"", # Example: Admin imported a server named "old creative"
+                                           new_server_id,
+                                           self.get_remote_ip())
+                #deletes temp dir
+                shutil.rmtree(zip_path)
+            else:
+                if len(server_parts) != 2:
+                    self.redirect("/panel/error?error=Invalid server data")
+                    return
+                server_type, server_version = server_parts
+                # TODO: add server type check here and call the correct server add functions if not a jar
+                role_ids = self.controller.users.get_user_roles_id(exec_user["user_id"])
+                new_server_id = self.controller.create_jar_server(server_type, server_version, server_name, min_mem, max_mem, port)
+                self.controller.management.add_to_audit_log(exec_user['user_id'],
+                                           f"created a {server_version} {str(server_type).capitalize()} server named \"{server_name}\"",
+                                           # Example: Admin created a 1.16.5 Bukkit server named "survival"
+                                           new_server_id,
+                                           self.get_remote_ip())
+
+            # These lines create a new Role for the Server with full permissions and add the user to it if he's not a superuser
+            if len(captured_roles) == 0:
+                if not superuser:
+                    new_server_uuid = self.controller.servers.get_server_data_by_id(new_server_id).get("server_uuid")
+                    role_id = self.controller.roles.add_role(f"Creator of Server with uuid={new_server_uuid}")
+                    self.controller.server_perms.add_role_server(new_server_id, role_id, "11111111")
+                    self.controller.users.add_role_to_user(exec_user["user_id"], role_id)
+                    self.controller.crafty_perms.add_server_creation(exec_user["user_id"])
+
+            else:
+                for role in captured_roles:
+                    role_id = role
+                    self.controller.server_perms.add_role_server(new_server_id, role_id, "11111111")
+
+            self.controller.stats.record_stats()
+            self.redirect("/panel/dashboard")
+
         try:
             self.render(
                 template,

app/config/config.json

@@ -13,6 +13,7 @@
   "show_contribute_link": true,
   "virtual_terminal_lines": 70,
   "max_log_lines": 700,
+  "max_audit_entries": 300,
   "keywords": ["help", "chunk"],
   "allow_nsfw_profile_pictures": false
 }

app/frontend/templates/panel/dashboard.html

@@ -391,7 +391,7 @@
         server_desc.innerHTML = server.online + ` / ` + server.max + ` {{ translate('dashboard', 'max', data['lang']) }}<br />`
 
         server_infos = "";
-        server_infos = server.online + " / " + server.max + "{{ translate('dashboard', 'max', data['lang']) }}<br />"
+        server_infos = server.online + " / " + server.max + " {{ translate('dashboard', 'max', data['lang']) }}<br />"
       }
 
       /* Update Motd */

app/frontend/templates/panel/panel_edit_user.html

@@ -133,7 +133,7 @@
 
                       <div class="card">
                         <div class="card-header header-sm d-flex justify-content-between align-items-center">
-                          <h4 class="card-title"><i class="fas fa-user-lock"></i> {{ translate('userConfig', 'craftyPerms', data['lang']) }} <small class="text-muted ml-1"> - {{ translate('userConfig', 'craftyPermDesc', data['lang']) }}permissions this user has on Crafty Controller </small></h4>
+                          <h4 class="card-title"><i class="fas fa-user-lock"></i> {{ translate('userConfig', 'craftyPerms', data['lang']) }} <small class="text-muted ml-1"> - {{ translate('userConfig', 'craftyPermDesc', data['lang']) }}</small></h4>
                         </div>
                         <div class="card-body">
                           <div class="form-group">

app/frontend/templates/panel/parts/details_stats.html

@@ -6,7 +6,7 @@
           <div class="col-sm-4 mr-2">
             {% if data['server_stats']['running'] %}
             <b>{{ translate('serverStats', 'serverStatus', data['lang']) }}:</b> <span id="status" class="text-success">{{ translate('serverStats', 'online', data['lang']) }}</span><br />
-            <b>{{ translate('serverStats', 'serverStarted', data['lang']) }}:</b> <span id="started">{{ data['server_stats']['started'] }} ({{ translate('serverStats', 'serverTime', data['lang']) }})</span><br />
+            <b>{{ translate('serverStats', 'serverStarted', data['lang']) }}:</b> <span id="started">{{ data['server_stats']['started'] }}</span><br />
             <b>{{ translate('serverStats', 'serverUptime', data['lang']) }}:</b> <span id="uptime">{{ translate('serverStats', 'errorCalculatingUptime', data['lang']) }}</span>
             {% elif data['server_stats']['crashed'] %}
             <b>{{ translate('serverStats', 'serverStatus', data['lang']) }}:</b> <span id="status" class="text-danger"> <i class="fas fa-exclamation-triangle"></i> {{ translate('dashboard', 'crashed', data['lang']) }}</span><br />
@@ -153,7 +153,7 @@
       startedLocal = startedUTC.utcOffset(browserUTCOffset);
       startedLocalFormatted = startedLocal.format('YYYY-MM-DD HH:mm:ss');
       server_started.setAttribute("class", "");
-      server_started.innerHTML = startedLocalFormatted +` ({{ translate('serverStats', 'serverTime', data['lang']) }})`;
+      server_started.innerHTML = startedLocalFormatted;
       server_uptime.setAttribute("class", "");
       if (!uptimeLoop) {
         var calculateUptime = () => {

app/frontend/templates/server/wizard.html

@@ -1,650 +0,0 @@
-{% extends ../base.html %}
-
-{% block title %}Crafty Controller - {{ translate('serverWizard', 'newServer', data['lang']) }}{% end %}
-
-{% block content %}
-
-<div class="content-wrapper">
-  <div class="content-wrapper">
-    <ul class="nav nav-tabs col-md-12 tab-simple-styled " role="tablist">
-      <li class="nav-item term-nav-item">
-          <a class="nav-link active" href="/server/step1" role="tab" aria-selected="false">
-          <i class="fas fa-file-signature"></i>Minecraft-Java</a>
-      </li>
-      <li class="nav-item term-nav-item">
-        <a class="nav-link" href="/server/bedrock_step1" role="tab" aria-selected="false">
-          <i class="fas fa-file-signature"></i>Minecraft-Bedrock</a>
-      </li>
-  </ul>
-<div class="d-none" id="overlay" onclick="hide(event)"></div>
-    <div class="row">
-      <div class="col-sm-6 grid-margin stretch-card">
-        <div class="card">
-          <div class="card-body">
-
-            <h4>{{ translate('serverWizard', 'newServer', data['lang']) }}</h4>
-            <br />
-            <p class="card-description">
-
-              <form method="post" class="server-wizard" onSubmit="wait_msg()">
-                {% raw xsrf_form_html() %}
-                <div class="row">
-                  <div class="col-sm-12">
-                    <div class="form-group">
-                      <label for="server_type">{{ translate('serverWizard', 'serverType', data['lang']) }}</label>
-                      <select required class="form-control form-control-lg select-css" id="server_type" name="server_type" onchange="serverTypeChange(this)">
-                          <option value="">{{ translate('serverWizard', 'selectType', data['lang']) }}</option>
-                        {% for s in data['server_types'] %}
-                          <option value="{{ s }}">{{ s.capitalize() }}</option>
-                        {% end %}
-                      </select>
-                    </div>
-                  </div>
-
-                  <div class="col-sm-12">
-                    <div class="form-group">
-                      <label for="server_version">{{ translate('serverWizard', 'serverVersion', data['lang']) }}</label>
-                      <select required class="form-control form-control-lg select-css" id="server" name="server">
-                            <option value="">{{ translate('serverWizard', 'selectVersion', data['lang']) }}</option>
-                      </select>
-                    </div>
-                  </div>
-
-                  <div class="col-sm-12">
-                    <div class="form-group">
-                      <label for="server_name">{{ translate('serverWizard', 'serverName', data['lang']) }}</label>
-                      <input type="text" class="form-control" id="server_name" name="server_name" placeholder="{{ translate('serverWizard', 'myNewServer', data['lang']) }}" required>
-                    </div>
-                  </div>
-
-                </div>
-                <br />
-                <h4 class="card-title">{{ translate('serverWizard', 'quickSettings', data['lang']) }} <small style="text-transform: none;"> - {{ translate('serverWizard', 'quickSettingsDescription', data['lang']) }}</small></h4>
-                <hr>
-                <div class="row">
-
-                  <div class="col-sm-3">
-                    <div class="form-group">
-                      <label for="min_memory1">{{ translate('serverWizard', 'minMem', data['lang']) }} <small> - {{ translate('serverWizard', 'sizeInGB', data['lang']) }}</small></label>
-                      <input type="number" class="form-control" id="min_memory1"  name="min_memory" value="1" step="0.5" min="0.5" required>
-                    </div>
-                  </div>
-
-                  <div class="col-sm-3 offset-1">
-                    <div class="form-group">
-                      <label for="max_memory1">{{ translate('serverWizard', 'maxMem', data['lang']) }} <small> - {{ translate('serverWizard', 'sizeInGB', data['lang']) }}</small></label>
-                      <input type="number" class="form-control" id="max_memory1"  name="max_memory" value="2" step="0.5" min="0.5" required>
-                    </div>
-                  </div>
-
-                  <div class="col-sm-3 offset-1">
-                    <div class="form-group">
-                      <label for="port1">{{ translate('serverWizard', 'serverPort', data['lang']) }} <small> - {{ translate('serverWizard', 'defaultPort', data['lang']) }}</small></label>
-                      <input type="number" class="form-control" id="port1" name="port" value="25565" step="1" min="1" required>
-                    </div>
-                  </div>
-                  <div class="col-sm-12">
-                    <div class="form-group">
-                      <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>
-                          </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'] %}
-                                  <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>
-                  </div>
-
-                </div>
-                <button type="submit" class="btn btn-primary mr-2">{{ translate('serverWizard', 'buildServer', data['lang']) }}</button>
-                <button type="reset" class="btn btn-danger mr-2">{{ translate('serverWizard', 'resetForm', data['lang']) }}</button>
-
-              </form>
-            </p>
-          </div>
-        </div>
-      </div>
-
-      <div class="col-sm-6 grid-margin stretch-card">
-        <div class="card">
-          <div class="card-body">
-
-            <h4>{{ translate('serverWizard', 'importServer', data['lang']) }}</h4>
-            <br />
-            <p class="card-description">
-
-              <form method="post" class="server-wizard" onSubmit="wait_msg(true)">
-                {% raw xsrf_form_html() %}
-                <input type="hidden" value="import_jar" name="create_type">
-                <div class="row">
-
-                  <div class="col-sm-12">
-                    <div class="form-group">
-                      <label for="server_name">{{ translate('serverWizard', 'serverName', data['lang']) }}</label>
-                      <input type="text" class="form-control" id="server_name" name="server_name" value="" placeholder="{{ translate('serverWizard', 'myNewServer', data['lang']) }}" required>
-                    </div>
-                  </div>
-
-                  <div class="col-sm-12">
-                    <div class="form-group">
-                      <label for="server">{{ translate('serverWizard', 'serverPath', data['lang']) }} <small>{{ translate('serverWizard', 'absoluteServerPath', data['lang']) }}</small></label>
-                      <input type="text" class="form-control" id="server_path" name="server_path" placeholder="/var/opt/server" required>
-                    </div>
-                  </div>
-
-                  <div class="col-sm-12">
-                    <div class="form-group">
-                      <label for="server_jar">{{ translate('serverWizard', 'serverJar', data['lang']) }}</label>
-                      <input type="text" class="form-control" id="server_jar" name="server_jar" value="" placeholder="paper.jar" required>
-                    </div>
-                  </div>
-
-
-
-                </div>
-                <br />
-                <h4 class="card-title">{{ translate('serverWizard', 'quickSettings', data['lang']) }} <small style="text-transform: none;"> - {{ translate('serverWizard', 'quickSettingsDescription', data['lang']) }}</small></h4>
-                <hr>
-                <div class="row">
-
-                  <div class="col-sm-3">
-                    <div class="form-group">
-                      <label for="min_memory2">{{ translate('serverWizard', 'minMem', data['lang']) }} <small> - {{ translate('serverWizard', 'sizeInGB', data['lang']) }}</small></label>
-                      <input type="number" class="form-control" id="min_memory2"  name="min_memory" value="1" step="0.5" min="0.5" required>
-                    </div>
-                  </div>
-
-                  <div class="col-sm-3 offset-1">
-                    <div class="form-group">
-                      <label for="max_memory2">{{ translate('serverWizard', 'maxMem', data['lang']) }} <small> - {{ translate('serverWizard', 'sizeInGB', data['lang']) }}</small></label>
-                      <input type="number" class="form-control" id="max_memory2"  name="max_memory" value="2" step="0.5" min="0.5" required>
-                    </div>
-                  </div>
-
-                  <div class="col-sm-3 offset-1">
-                    <div class="form-group">
-                      <label for="port2">{{ translate('serverWizard', 'serverPort', data['lang']) }} <small> - {{ translate('serverWizard', 'defaultPort', data['lang']) }}</small></label>
-                      <input type="number" class="form-control" id="port2" name="port" value="25565" step="1" min="1" required>
-                    </div>
-                  </div>
-                  <div class="col-sm-12">
-                    <div class="form-group">
-                      <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>
-                          </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>
-                  </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']) }}</button>
-
-              </form>
-            </p>
-          </div>
-        </div>
-      </div>
-    </div>
-    <div class="col-sm-13 grid-margin stretch-card">
-        <div class="card">
-          <div class="card-body">
-
-            <h4>{{ translate('serverWizard', 'importZip', data['lang']) }}</h4>
-            <br />
-            <p class="card-description">
-
-              <form name="zip" method="post" class="server-wizard" onSubmit="wait_msg(true)">
-                {% raw xsrf_form_html() %}
-                <input type="hidden" value="import_zip" name="create_type">
-
-                <div class="row">
-                  <div class="col-sm-9">
-                    <div class="col-sm-12">
-                      <div class="form-group">
-                        <label for="server_name">{{ translate('serverWizard', 'serverName', data['lang']) }}</label>
-                        <input type="text" class="form-control" id="server_name" name="server_name" value="" placeholder="{{ translate('serverWizard', 'myNewServer', data['lang']) }}" required>
-                      </div>
-                    </div>
-
-                    <div class="col-sm-12">
-                      <div class="form-group">
-                        <label for="server">{{ translate('serverWizard', 'zipPath', data['lang']) }} <small>{{ translate('serverWizard', 'absoluteZipPath', data['lang']) }}</small></label>
-                        <input type="text" class="form-control" id="server_path" name="server_path" placeholder="/var/opt/server.zip" required>
-                      </div>
-                    </div>
-
-                    <div class="col-sm-12">
-                      <div class="form-group">
-                        <label for="server">{{ translate('serverWizard', 'selectRoot', data['lang']) }} <small>{{ translate('serverWizard', 'explainRoot', data['lang']) }}</small></label>
-                        <br>
-                        <button class="btn btn-primary mr-2" id="root_files_button" type="button">{{ translate('serverWizard', 'clickRoot', data['lang']) }}</button>
-                      </div>
-                    </div>
-                    
-
-                    <div class="col-sm-12">
-                      <div class="form-group">
-                        <label for="server_jar">{{ translate('serverWizard', 'serverJar', data['lang']) }}</label>
-                        <input type="text" class="form-control" id="server_jar" name="server_jar" value="" placeholder="paper.jar" required>
-                      </div>
-                    </div>
-                  </div>
-
-
-
-                  <div class="col-sm-3">
-                    <h4 class="card-title">{{ translate('serverWizard', 'quickSettings', data['lang']) }} <small style="text-transform: none;"> - {{ translate('serverWizard', 'quickSettingsDescription', data['lang']) }}</small></h4>
-                    <hr>
-                    <div class="row">
-
-                      <div class="col-sm-12">
-                        <div class="form-group">
-                          <label for="min_memory3">{{ translate('serverWizard', 'minMem', data['lang']) }} <small> - {{ translate('serverWizard', 'sizeInGB', data['lang']) }}</small></label>
-                          <input type="number" class="form-control" id="min_memory3"  name="min_memory" value="1" step="0.5" min="0.5" required>
-                        </div>
-                      </div>
-
-                      <div class="col-sm-12">
-                        <div class="form-group">
-                          <label for="max_memory3">{{ translate('serverWizard', 'maxMem', data['lang']) }} <small> - {{ translate('serverWizard', 'sizeInGB', data['lang']) }}</small></label>
-                          <input type="number" class="form-control" id="max_memory3"  name="max_memory" value="2" step="0.5" min="0.5" required>
-                        </div>
-                      </div>
-
-                      <div class="col-sm-12">
-                        <div class="form-group">
-                          <label for="port3">{{ translate('serverWizard', 'serverPort', data['lang']) }} <small> - {{ translate('serverWizard', 'defaultPort', data['lang']) }}</small></label>
-                          <input type="number" class="form-control" id="port3" name="port" value="25565" step="1" min="1" required>
-                        </div>
-                      </div>
-
-                      <div class="col-sm-12">
-                        <div class="form-group">
-                          <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>
-                              </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'] %}
-                                      <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>
-                      </div>
-                      <div class="col-sm-12" 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">
-                        <div class="modal-dialog" role="document">
-                          <div class="modal-content">
-                            <div class="modal-header">
-                              <h5 class="modal-title" id="exampleModalLongTitle">{{ translate('serverWizard', 'selectZipDir', 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="radio" id="main-tree-input" name="root_path" value="" checked>
-                                  <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" class="btn btn-secondary" data-dismiss="modal">{{ translate('serverWizard', 'close', data['lang']) }}</button>
-                              <button type="button" id="modal-okay" data-dismiss="modal" class="btn btn-primary">{{ translate('serverWizard', 'save', data['lang']) }}</button>
-                            </div>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                    <button id="zip_submit" type="submit" title="You must select server root dir first" disabled 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']) }}</button>
-                  </div>
-                </div>
-              </form>
-            </p>
-          </div>
-        </div>
-      </div>
-</div>
-<style>
-.scroll {
-    max-height: 12em;
-    overflow-y: auto;
-}
-.menu-btn {
-    font-size: 0.9em;
-    padding: 2px 10px;
-}
-.menu {
-    padding-top: 10px;
-    z-index: 200;
-    margin-top: 4px;
-    position: absolute;
-    background-color: #2a2c44;
-}
-.menu-option {
-    padding: 6px 20px 6px;
-    color: white;
-}
-#overlay {
-    position: absolute;
-    top: 0px;
-    left: 0px;
-    width: 100%;
-    height: 100%;
-    z-index: 100;
-}
-</style>
-<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>
-
-{% end %}
-
-{% block js%}
-<script>
-  document.getElementById("root_files_button").addEventListener("click", function(){
-    if(document.forms["zip"]["server_path"].value != ""){
-      if(document.getElementById('root_files_button').classList.contains('clicked')){
-        document.getElementById('main-tree-div').innerHTML = '<input type="radio" id="main-tree-input" name="root_path" value="" checked><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>'
-      }else{
-        document.getElementById('root_files_button').classList.add('clicked')
-      }
-    path = document.forms["zip"]["server_path"].value;
-    console.log(document.forms["zip"]["server_path"].value)
-    var 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(){
-    dialog.modal('hide');
-}, 2000);
-    $.ajax({
-      type: "POST",
-      headers: {'X-XSRFToken': token},
-      url: '/ajax/unzip_server?id=-1&path='+path,
-    });
-  }else{
-    bootbox.alert("You must input a path before selecting this button");
-  }
-  });
-</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");
-}
-  $( document ).ready(function() {
-    console.log('ready');
-    var forms = $('form.server-wizard');
-    forms.each(function(i, formEl) {
-      var form = $(formEl);
-      var min = form.find('[name=min_memory]');
-      var max = form.find('[name=max_memory]');
-      console.log(form, min, max)
-      min.change(function(){
-        check_sizes(max, min, 'min');
-      });
-      max.change(function(){
-        check_sizes(max, min, 'max');
-      });
-    });
-  });
-
-  function wait_msg(importing){
-    bootbox.alert({
-        title: importing ? '{% raw translate("serverWizard", "importing", data['lang']) %}' : '{% raw translate("serverWizard", "downloading", data['lang']) %}',
-        message: '<i class="fas fa-cloud-download"></i> {% raw translate("serverWizard", "bePatient", data['lang']) %}',
-      });
-  }
-
-  function show_file_tree(){
-    $("#dir_select").modal();
-  }
-
-  function check_sizes(a, b, changed){
-    max_mem = parseFloat(a.val());
-    min_mem = parseFloat(b.val());
-    if (max_mem < min_mem && changed === 'min'){
-      a.val(min_mem)
-    }
-    if (max_mem < min_mem && changed === 'max'){
-      b.val(max_mem)
-    }
-  }
-
-    function getTreeView(path) {
-      document.getElementById('zip_submit').disabled = false;
-      path = path
-
-      $.ajax({
-        type: "GET",
-        url: '/ajax/get_zip_tree?id=-1&path='+path,
-        dataType: 'text',
-        success: function(data){
-          console.log("got response:");
-          console.log(data);
-
-          dataArr = data.split('\n');
-          serverDir = dataArr.shift(); // Remove & return first element (server directory)
-          text = dataArr.join('\n');
-
-          try{
-            document.getElementById('main-tree-div').innerHTML += text;
-            document.getElementById('main-tree').parentElement.classList.add("clicked");
-          }catch{
-            document.getElementById('files-tree').innerHTML = text;
-          }
-          
-
-          document.getElementsByClassName('files-tree-title')[0].setAttribute('data-path', serverDir);
-          document.getElementsByClassName('files-tree-title')[0].setAttribute('data-name', 'Files');
-
-        },
-      });
-    }
-
-    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 getDirView(event) {
-        path = event.target.parentElement.getAttribute('data-path');
-
-        if (document.getElementById(path).classList.contains('clicked')){
-
-        var toggler = document.getElementById(path+"span");
-
-        if (toggler.classList.contains('files-tree-title')){
-            document.getElementById(path+"ul").classList.toggle("d-block");
-            document.getElementById(path+"span").classList.toggle("tree-caret-down");
-        }
-        return;
-      }else{
-      $.ajax({
-        type: "GET",
-        url: '/ajax/get_zip_dir?id=-1&path='+path,
-        dataType: 'text',
-        success: function(data){
-          console.log("got response:");
-
-          dataArr = data.split('\n');
-          serverDir = dataArr.shift(); // Remove & return first element (server directory)
-          text = dataArr.join('\n');
-
-          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);
-  
-            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");
-            });
-          }
-        },
-      });
-    }
-    }
-    if (webSocket) {
-      webSocket.on('send_temp_path', function (data) {
-        document.getElementById('main-tree-input').setAttribute('value', data.path)
-        getTreeView(data.path);
-        show_file_tree();
-      });
-    }
-
-</script>
-<script type="text/javascript">
-  //<![CDATA[
-  // array of possible countries in the same order as they appear in the country selection list
-
-  function decodeHtmlCharCodes(str) {
-    return str.replace("&quot;", "\"");
-  }
-
-  function convertHtmlJsonToJavacriptArray(str) {
-    var result = []
-    str = decodeHtmlCharCodes(str)
-    for(var i in str)
-      result.push([i, str [i]]);
-    return result
-  }
-
-  var text = '{% raw data["js_server_types"] %}';
-  var serverTypesLists = JSON.parse(text);
-  //convertHtmlJsonToJavacriptArray('{{ data["js_server_types"] }}')
-  /* CountryChange() is called from the onchange event of a select element.
-  * param selectObj - the select object which fired the on change event.
-  */
-  function serverTypeChange(selectObj) {
-    // get the index of the selected option
-    var idx = selectObj.selectedIndex;
-    // get the value of the selected option
-    var which = selectObj.options[idx].value;
-    // use the selected option value to retrieve the list of items from the serverTypesLists array
-    cList = serverTypesLists[which];
-    // get the country select element via its known id
-    var cSelect = document.getElementById("server");
-    // remove the current options from the country select
-    var len=cSelect.options.length;
-    while (cSelect.options.length > 0) {
-      cSelect.remove(0);
-    }
-    var newOption;
-    // create new options ordered by descending
-    for (var i=(cList.length)-1; i>=0; i--) {
-      newOption = document.createElement("option");
-      newOption.value = which+"|"+cList[i];  // assumes option string and value are the same
-      newOption.text=cList[i];
-      // add the new option
-      try {
-        cSelect.add(newOption);  // this will fail in DOM browsers but is needed for IE
-      }
-      catch (e) {
-        cSelect.appendChild(newOption);
-      }
-    }
-  }
- //]]>
- </script>
-{% end %}

app/migrations/20210915205501_server_type.py

@@ -0,0 +1,16 @@
+# Generated by database migrator
+import peewee
+
+def migrate(migrator, database, **kwargs):
+    migrator.add_columns('servers', type=peewee.CharField(default="minecraft-java"))
+    """
+    Write your migrations here.
+    """
+
+
+
+def rollback(migrator, database, **kwargs):
+    migrator.drop_columns('servers', ['type']) 
+    """
+    Write your rollback migrations here.
+    """

app/translations/en_EN.json

@@ -49,7 +49,7 @@
         "serverVersion": "Server Version",
         "selectVersion": "Select a Version",
         "absoluteServerPath": "Absolute path to your server",
-        "serverJar": "Server Jarfile",
+        "serverJar": "Server Executable File",
         "minMem": "Minimum Memory",
         "maxMem": "Maximum Memory",
         "serverPort": "Server Port",