Merge pull request #48 from coldbox-modules/development

3.4.2

box.json

@@ -1,6 +1,6 @@
 {
     "name":"ColdBox Security",
-    "version":"3.4.1",
+    "version":"3.4.2",
     "location":"https://downloads.ortussolutions.com/ortussolutions/coldbox-modules/cbsecurity/@build.version@/[email protected]@.zip",
     "author":"Ortus Solutions.com <[email protected]>",
     "slug":"cbsecurity",

changelog.md

@@ -13,6 +13,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
+- `cbsecurity_logs` is hard coded instead of using module setting
+
+## [3.4.1] - 2023-08-09
+
+### Fixed
+
 - Parenthesis on `top` statements for MSSQL Server on the `DBLogger` thanks to @irvirv
 
 ## [3.4.0] - 2023-06-14

models/util/DBLogger.cfc

@@ -188,7 +188,7 @@ component accessors="true" singleton threadsafe {
 			"select
 				#getLimitStart()#
 				count( id ) as total, #arguments.column#
-				from cbsecurity_logs
+				from #getTable()#
 				group by #arguments.column#
 				order by count( id ) desc
 				#getLimitEnd()#
@@ -207,8 +207,8 @@ component accessors="true" singleton threadsafe {
 	struct function getActionsReport(){
 		return queryExecute(
 			"select
-			count( id ) as total, action, ( count(id) / ( select count(id) from cbsecurity_logs ) ) * 100 as percentage
-			from cbsecurity_logs
+			count( id ) as total, action, ( count(id) / ( select count(id) from #getTable()# ) ) * 100 as percentage
+			from #getTable()#
 			group by action",
 			{},
 			{ datasource : variables.settings.firewall.logs.dsn }
@@ -230,7 +230,7 @@ component accessors="true" singleton threadsafe {
 	 */
 	struct function getBlockTypesReport(){
 		return queryExecute(
-			"select count( id ) as total, blockType from cbsecurity_logs group by blockType",
+			"select count( id ) as total, blockType from #getTable()# group by blockType",
 			{},
 			{ datasource : variables.settings.firewall.logs.dsn }
 		).reduce( ( results, row ) => {