Merge branch 'release/2.3.0'

NOTICE.txt

@@ -5,7 +5,7 @@
  ===================================================================
 
 revIgniter
-Copyright 2009-2020 Ralf Bitter
+Copyright 2009-2021 Ralf Bitter
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this code except in compliance with the License.

README.md

@@ -32,7 +32,7 @@ To join the discussion relating to using revIgniter subscribe and review archive
 
 ### Meta
 
-- Version: 2.2.1
+- Version: 2.3.0
 - Web Site: <https://revigniter.com/>
 - User Guide: <https://revigniter.com/userGuide/index.html>
 - Author: [Ralf Bitter](mailto:rabit@revigniter.com)

application/config/config.lc

@@ -374,6 +374,25 @@ end if
  put 90000 into gConfig["csrf_expire"]
 
 
+##
+#--------------------------------------------------------------------------
+# Bot Detection
+#--------------------------------------------------------------------------
+# Determine when a bot makes a request and display an error in that case.
+#
+# 'honeypot_hidden' = The visibility of the text field. Default is TRUE.
+# 'honeypot_label' = The label of the text field.
+# 'honeypot_name' = The name of the text field.
+# 'honeypot-containerID' = The ID selector of the honeypot container
+##
+
+ put FALSE into gConfig["honeypot"]
+ put TRUE into gConfig["honeypot_hidden"]
+ put "Fill in this field" into gConfig["honeypot_label"]
+ put "honeypot" into gConfig["honeypot_name"]
+ put "rigHP" into gConfig["honeypot_containerID"]
+
+
 
 ##
 #--------------------------------------------------------------------------

system/helpers/assetHelper.livecodescript

@@ -459,9 +459,9 @@ end rigJsAssetURL
 --| FUNCTION rigJsAsset
 --|
 --| Author: rabit
---| Version: 1.8
+--| Version: 1.9
 --| Created: 2009-10-06
---| Last Mod: 2020-01-14
+--| Last Mod: 2021-11-06
 --| Requires: rigJsAssetURL()
 --|
 --| Summary: Generate JavaScript asset location html code. If you want to use
@@ -492,7 +492,9 @@ function rigJsAsset pAsset pModule pCacheBusterOrFallbackAsset pAttribute pNonce
  end if
 
  if pNonce <> empty then
- put " nonce='" & pNonce & "'" into tNonce
+ put " nonce=" & quote & pNonce & quote into tNonce
+ else if "Contentsecuritypolicy" is among the lines of the stacksInUse then
+ put " {{g_ScriptNonce_}}" into tNonce
  end if
 
  if char 1 to 12 of pAsset <> "jsGoogleapis" then