From 5dde52a309227892acbe34679e359cad6bfd7912 Mon Sep 17 00:00:00 2001 From: Clemens Schwaighofer Date: Fri, 14 Jul 2023 15:10:03 +0900 Subject: [PATCH] DB\IO error/warning log prefix remove, Admin\Backend acl default value check --- src/Admin/Backend.php | 4 ++++ src/DB/IO.php | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/Admin/Backend.php b/src/Admin/Backend.php index 67f6659..2a8a1dc 100644 --- a/src/Admin/Backend.php +++ b/src/Admin/Backend.php @@ -164,6 +164,10 @@ class Backend ); } $this->default_acl = $set_default_acl_level ?? DEFAULT_ACL_LEVEL; + // if negative or larger than 100, reset to 0 + if ($this->default_acl < 0 || $this->default_acl > 100) { + $this->default_acl = 0; + } // queue key if (preg_match("/^(add|save|delete|remove|move|up|down|push_live)$/", $this->action)) { diff --git a/src/DB/IO.php b/src/DB/IO.php index 622c4f7..3a9d885 100644 --- a/src/DB/IO.php +++ b/src/DB/IO.php @@ -814,13 +814,13 @@ class IO switch ($id) { case 'DB_ERROR': $this->log->error( - $debug_id . ' :' . $prefix . $error_string, + $prefix . $error_string, $context ); break; case 'DB_WARNING': $this->log->warning( - $debug_id . ' :' . $prefix . $error_string, + $prefix . $error_string, $context ); break;