Merge branch 'dev' into enhancement/themes

CHANGELOG.md

@@ -1,9 +1,11 @@
 # Changelog
-## --- [4.0.15] - 2022/TBD
+## --- [4.0.15] - 2022/10/02
 ### New features
 TBD
 ### Bug fixes
-TBD
+- Fix traceback on basic schedule with "days" interval ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/469))
+- Fix bad method call with API stdin ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/470))<br>
+    *(Thank you ['IWant2Tryhard'](https://github.com/MyNameTsThad) for catching that 🐛)*
 ### Tweaks
 TBD
 ### Lang

app/classes/web/panel_handler.py

@@ -1702,7 +1702,7 @@ class PanelHandler(BaseHandler):
                 # only check for time if it's number of days
                 if interval_type == "days":
                     sch_time = bleach.clean(self.get_argument("time", None))
-                    if interval > 30:
+                    if int(interval) > 30:
                         self.redirect(
                             "/panel/error?error=Invalid argument."
                             " Days must be 30 or fewer."
@@ -1870,7 +1870,7 @@ class PanelHandler(BaseHandler):
                 # only check for time if it's number of days
                 if interval_type == "days":
                     sch_time = bleach.clean(self.get_argument("time", None))
-                    if interval > 30:
+                    if int(interval) > 30:
                         self.redirect(
                             "/panel/error?error=Invalid argument."
                             " Days must be 30 or fewer."

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

@@ -26,7 +26,7 @@ class ApiServersServerStdinHandler(BaseApiHandler):
             # if the user doesn't have Commands permission, return an error
             return self.finish_json(400, {"status": "error", "error": "NOT_AUTHORIZED"})
 
-        svr = self.controller.get_server_obj_optional(server_id)
+        svr = self.controller.servers.get_server_obj_optional(server_id)
         if svr is None:
             # It's in auth_data[0] but not as a Server object
             logger.critical(