Merge branch 'release/2.3.4'

revig · Dec 26, 2022 · e7b2eaa · e7b2eaa
2 parents 32b57af + 9797354
commit e7b2eaa
Show file tree

Hide file tree

Showing 214 changed files with 617 additions and 1,190 deletions.
diff --git a/README.md b/README.md
@@ -32,7 +32,7 @@ To join the discussion relating to using revIgniter subscribe and review archive
 
 ### Meta
 
-- Version: 2.3.3
+- Version: 2.3.4
 - Web Site: <https://revigniter.com/>
 - User Guide: <https://revigniter.com/userGuide/index.html>
 - Author: [Ralf Bitter](mailto:rabit@revigniter.com)
diff --git a/system/libraries/Input.livecodescript b/system/libraries/Input.livecodescript
@@ -148,9 +148,9 @@ end _rigSetDefaultValues
 --| COMMAND _rigSanitizeGlobals
 --|
 --| Author: rabit
---| Version: 1.11
+--| Version: 1.12
 --| Created: 2009-06-17
---| Last Mod: 2021-12-19
+--| Last Mod: 2022-11-06
 --| Requires: Log library, _rigInputConfig, _rigSerializedPOSTtoArray, _rigCleanInputData()
 --| _rigVarPostFallback(), rigLogMessage, _rigCSRFconfig, _rigCSRFverify
 --|
@@ -187,7 +187,8 @@ private command _rigSanitizeGlobals
  end if
 
 
- # THIS SEEMS STRANGE, BUT WE SAVE THE GET ARRAY IN THE POST ARRAY TO SIMPLIFY FURTHER INPUT VALIDATION
+ # THIS SEEMS STRANGE, BUT WE SAVE THE GET ARRAY IN THE
+ # POST ARRAY TO SIMPLIFY FURTHER INPUT VALIDATION
  # ALL VALIDATION IS THEN DONE WITH THE POST ARRAY
  if $_GET is an array then
  if (the number of lines in the keys of $_GET > 1) then
@@ -224,13 +225,27 @@ private command _rigSanitizeGlobals
  put $_POST_RAW into $_POST
 
  else
- # JSON SENT USING post libURLFormData
- # SHOULD WE FILTER THE DATA?
- if sInputA["useXssClean"] is TRUE then
- put rigXssClean(urlDecode(tPOSTrawVariableValue)) into $_POST
- else
- put urlDecode(tPOSTrawVariableValue) into $_POST
- end if
+ # CHECK IF THE JSON DATA SUBMITTED USING AN AJAX REQUEST
+ # IN THIS CASE WE CONTINUE TO PROCESS $_POST_RAW
+ if sInputA["xRequestedWith"] <> "XMLHttpRequest" then
+ # JSON SENT USING post libURLFormData
+ # SHOULD WE FILTER THE DATA?
+ if sInputA["useXssClean"] is TRUE then
+ put rigXssClean(urlDecode(tPOSTrawVariableValue)) into $_POST
+ else
+ put urlDecode(tPOSTrawVariableValue) into $_POST
+ end if
+
+ else -- if sInputA["xRequestedWith"] <> "XMLHttpRequest"
+ # JSON SENT USING post, INCLUDES ESCAPED QUOTATION MARKS
+ # SHOULD WE FILTER THE DATA?
+ if sInputA["useXssClean"] is TRUE then
+ put rigXssClean(urlDecode($_POST_RAW)) into $_POST
+ else
+ put urlDecode($_POST_RAW) into $_POST
+ end if
+ end if -- if sInputA["xRequestedWith"] <> "XMLHttpRequest"
+
  end if -- if tPOSTrawVariableValue is empty
 
  else -- if (sInputA["contentType"] is "application/json")

diff --git a/system/libraries/Output.livecodescript b/system/libraries/Output.livecodescript
@@ -744,13 +744,13 @@ end _rigOutDisplayCache
 
 
 
-----------------------------------------------------------------------
+/*----------------------------------------------------------------------
 --| FUNCTION rigCacheVarsMerged
 --|
 --| Author: rabit
---| Version: 1.0
---| Created: 25-07-09
---| Last Mod: 25-07-09
+--| Version: 1.1
+--| Created: 2009-07-25
+--| Last Mod: 2022-03-22
 --| Requires: --
 --|
 --| Summary: Merge pseudo variables in cached file.
@@ -760,14 +760,14 @@ end _rigOutDisplayCache
 --| Parameters: string <pStr>
 --|
 --| Return: string
-----------------------------------------------------------------------
+----------------------------------------------------------------------*/
 
 function rigCacheVarsMerged pStr
  local tStr, tMergedStr
 
  put pStr into tStr
- replace "{{" with "[[" in tStr
- replace "}}" with "]]" in tStr
+ replace "{{g_" with "[[g_" in tStr
+ replace "_}}" with "_]]" in tStr
 
  put merge(tStr) into tMergedStr
 

diff --git a/system/libraries/Router.livecodescript b/system/libraries/Router.livecodescript
@@ -395,9 +395,9 @@ end _rigSetRequest
 --| FUNCTION _rigValidateRequest
 --|
 --| Author: rabit
---| Version: 1.5
+--| Version: 1.6
 --| Created: 2009-06-19
---| Last Mod: 2018-11-01
+--| Last Mod: 2022-12-25
 --| Requires: rigSetDirectory, rigShow404, rigSetController, rigSetHandler, _rigValidateModuleRequest()
 --|
 --| Summary: Validates the supplied segments. Attempts to determine the path
@@ -411,7 +411,7 @@ end _rigSetRequest
 ----------------------------------------------------------------------*/
 
 private function _rigValidateRequest pSegmentsArray
- local tDirectory, tSegments, t404ErrorSegments, tErrMsg, tTemp, tModule, tSegmentTwo
+ local tDirectory, tSegments, t404ErrorSegments, tErrMsg, tModule, tSegmentTwo
 
  # DOES THE REQUESTED CONTROLLER EXIST IN THE ROOT FOLDER?
  if there is a file (gRigA["APPPATH"] & "controllers/" & pSegmentsArray[1] & gRigA["EXT"]) then
@@ -461,9 +461,7 @@ private function _rigValidateRequest pSegmentsArray
  rigSetHandler "index"
  # DOES THE DEFAULT CONTROLLER EXIST IN THE SUB-FOLDER?
  if there is a file (gRigA["APPPATH"] & rigFetchDirectory() & sRouterA["defaultController"] & gRigA["EXT"]) then
- put "" into sRouterA["directory"]
- put "" into tTemp[1]
- return tTemp
+ return ""
  end if
 
  end if

diff --git a/system/revigniter/RevIgniter.lc b/system/revigniter/RevIgniter.lc
@@ -43,7 +43,7 @@ end if
 
 
 # RI VERSION
- constant RIVERSION = "2.3.3"
+ constant RIVERSION = "2.3.4"
  constant RISTATE = "final"
 
 # VERSION GETTER

diff --git a/userGuide/changelog.html b/userGuide/changelog.html
@@ -38,7 +38,7 @@
  <span class="icon-bar"></span>
  <span class="icon-bar"></span>
  </button>
- <a class="navbar-brand" href="#">revIgniter User Guide Version 2.3.3</a>
+ <a class="navbar-brand" href="#">revIgniter User Guide Version 2.3.4</a>
  </div>
 
  <div class="collapse navbar-collapse">
@@ -99,6 +99,7 @@ <h1>Change Log</h1>
 
 
 <ul>
+<li><a href="#version234">Version 2.3.4</a></li>
 <li><a href="#version233">Version 2.3.3</a></li>
 <li><a href="#version232">Version 2.3.2</a></li>
 <li><a href="#version231">Version 2.3.1</a></li>
@@ -234,6 +235,19 @@ <h1>Change Log</h1>
 </ul>
 
 
+<h2><a id="version234">&nbsp;</a>Version 2.3.4</h2>
+<p>Release Date: 2022-12-26</p>
+
+<ul>
+ <li><strong>Fixed:</strong> error that occurs when default controllers are located in subfolders, in <kbd>system/libraries/Router.livecodescript</kbd> -> <dfn>_rigValidateRequest()</dfn>.</li>
+ <li><strong>Fixed:</strong> handling of submitted JSON data in <kbd>system/libraries/Input.livecodescript</kbd> -> <dfn>_rigSanitizeGlobals</dfn>.</li>
+ <li><strong>Fixed:</strong> information regarding the ajax model in the JQuery tutorial.</li>
+ <li><strong>Changed:</strong> Tweaked merging of pseudo variables in <kbd>system/libraries/Output.livecodescript</kbd> -> <dfn>rigCacheVarsMerged()</dfn>.</li>
+ <li><strong>Changed:</strong> Tweaked pagination example in chapter "Pagination Library" of User Guide.</li>
+</ul>
+
+
+
 <h2><a id="version233">&nbsp;</a>Version 2.3.3</h2>
 <p>Release Date: 2021-12-21</p>
 

diff --git a/userGuide/database/active_record.html b/userGuide/database/active_record.html
@@ -15,11 +15,7 @@
 
  <script src="../js/nav-ck.js"></script>
 
- <!-- Touch icons -->
- <link rel="apple-touch-icon-precomposed" sizes="144x144" href="../images/apple-touch-icon-144-precomposed.png">
- <link rel="apple-touch-icon-precomposed" sizes="114x114" href="../images/apple-touch-icon-114-precomposed.png">
- <link rel="apple-touch-icon-precomposed" sizes="72x72" href="../images/apple-touch-icon-72-precomposed.png">
- <link rel="apple-touch-icon-precomposed" href="../images/apple-touch-icon-57-precomposed.png">
+ <link rel="apple-touch-icon" href="https://revigniter.com/assets/img/apple-touch-icon.png">
 
  <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
  <!--[if lt IE 9]>
@@ -38,7 +34,7 @@
  <span class="icon-bar"></span>
  <span class="icon-bar"></span>
  </button>
- <a class="navbar-brand" href="#">revIgniter User Guide Version 2.3.3</a>
+ <a class="navbar-brand" href="#">revIgniter User Guide Version 2.3.4</a>
  </div>
 
  <div class="collapse navbar-collapse">

diff --git a/userGuide/database/caching.html b/userGuide/database/caching.html
@@ -15,11 +15,7 @@
 
  <script src="../js/nav-ck.js"></script>
 
- <!-- Touch icons -->
- <link rel="apple-touch-icon-precomposed" sizes="144x144" href="../images/apple-touch-icon-144-precomposed.png">
- <link rel="apple-touch-icon-precomposed" sizes="114x114" href="../images/apple-touch-icon-114-precomposed.png">
- <link rel="apple-touch-icon-precomposed" sizes="72x72" href="../images/apple-touch-icon-72-precomposed.png">
- <link rel="apple-touch-icon-precomposed" href="../images/apple-touch-icon-57-precomposed.png">
+ <link rel="apple-touch-icon" href="https://revigniter.com/assets/img/apple-touch-icon.png">
 
  <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
  <!--[if lt IE 9]>
@@ -38,7 +34,7 @@
  <span class="icon-bar"></span>
  <span class="icon-bar"></span>
  </button>
- <a class="navbar-brand" href="#">revIgniter User Guide Version 2.3.3</a>
+ <a class="navbar-brand" href="#">revIgniter User Guide Version 2.3.4</a>
  </div>
 
  <div class="collapse navbar-collapse">

diff --git a/userGuide/database/configuration.html b/userGuide/database/configuration.html
@@ -15,11 +15,7 @@
 
  <script src="../js/nav-ck.js"></script>
 
- <!-- Touch icons -->
- <link rel="apple-touch-icon-precomposed" sizes="144x144" href="../images/apple-touch-icon-144-precomposed.png">
- <link rel="apple-touch-icon-precomposed" sizes="114x114" href="../images/apple-touch-icon-114-precomposed.png">
- <link rel="apple-touch-icon-precomposed" sizes="72x72" href="../images/apple-touch-icon-72-precomposed.png">
- <link rel="apple-touch-icon-precomposed" href="../images/apple-touch-icon-57-precomposed.png">
+ <link rel="apple-touch-icon" href="https://revigniter.com/assets/img/apple-touch-icon.png">
 
  <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
  <!--[if lt IE 9]>
@@ -38,7 +34,7 @@
  <span class="icon-bar"></span>
  <span class="icon-bar"></span>
  </button>
- <a class="navbar-brand" href="#">revIgniter User Guide Version 2.3.3</a>
+ <a class="navbar-brand" href="#">revIgniter User Guide Version 2.3.4</a>
  </div>
 
  <div class="collapse navbar-collapse">

diff --git a/userGuide/database/connecting.html b/userGuide/database/connecting.html
@@ -15,11 +15,7 @@
 
  <script src="../js/nav-ck.js"></script>
 
- <!-- Touch icons -->
- <link rel="apple-touch-icon-precomposed" sizes="144x144" href="../images/apple-touch-icon-144-precomposed.png">
- <link rel="apple-touch-icon-precomposed" sizes="114x114" href="../images/apple-touch-icon-114-precomposed.png">
- <link rel="apple-touch-icon-precomposed" sizes="72x72" href="../images/apple-touch-icon-72-precomposed.png">
- <link rel="apple-touch-icon-precomposed" href="../images/apple-touch-icon-57-precomposed.png">
+ <link rel="apple-touch-icon" href="https://revigniter.com/assets/img/apple-touch-icon.png">
 
  <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
  <!--[if lt IE 9]>
@@ -38,7 +34,7 @@
  <span class="icon-bar"></span>
  <span class="icon-bar"></span>
  </button>
- <a class="navbar-brand" href="#">revIgniter User Guide Version 2.3.3</a>
+ <a class="navbar-brand" href="#">revIgniter User Guide Version 2.3.4</a>
  </div>
 
  <div class="collapse navbar-collapse">

diff --git a/userGuide/database/examples.html b/userGuide/database/examples.html
@@ -15,11 +15,7 @@
 
  <script src="../js/nav-ck.js"></script>
 
- <!-- Touch icons -->
- <link rel="apple-touch-icon-precomposed" sizes="144x144" href="../images/apple-touch-icon-144-precomposed.png">
- <link rel="apple-touch-icon-precomposed" sizes="114x114" href="../images/apple-touch-icon-114-precomposed.png">
- <link rel="apple-touch-icon-precomposed" sizes="72x72" href="../images/apple-touch-icon-72-precomposed.png">
- <link rel="apple-touch-icon-precomposed" href="../images/apple-touch-icon-57-precomposed.png">
+ <link rel="apple-touch-icon" href="https://revigniter.com/assets/img/apple-touch-icon.png">
 
  <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
  <!--[if lt IE 9]>
@@ -38,7 +34,7 @@
  <span class="icon-bar"></span>
  <span class="icon-bar"></span>
  </button>
- <a class="navbar-brand" href="#">revIgniter User Guide Version 2.3.3</a>
+ <a class="navbar-brand" href="#">revIgniter User Guide Version 2.3.4</a>
  </div>
 
  <div class="collapse navbar-collapse">

diff --git a/userGuide/database/fields.html b/userGuide/database/fields.html
@@ -15,11 +15,7 @@
 
  <script src="../js/nav-ck.js"></script>
 
- <!-- Touch icons -->
- <link rel="apple-touch-icon-precomposed" sizes="144x144" href="../images/apple-touch-icon-144-precomposed.png">
- <link rel="apple-touch-icon-precomposed" sizes="114x114" href="../images/apple-touch-icon-114-precomposed.png">
- <link rel="apple-touch-icon-precomposed" sizes="72x72" href="../images/apple-touch-icon-72-precomposed.png">
- <link rel="apple-touch-icon-precomposed" href="../images/apple-touch-icon-57-precomposed.png">
+ <link rel="apple-touch-icon" href="https://revigniter.com/assets/img/apple-touch-icon.png">
 
  <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
  <!--[if lt IE 9]>
@@ -38,7 +34,7 @@
  <span class="icon-bar"></span>
  <span class="icon-bar"></span>
  </button>
- <a class="navbar-brand" href="#">revIgniter User Guide Version 2.3.3</a>
+ <a class="navbar-brand" href="#">revIgniter User Guide Version 2.3.4</a>
  </div>
 
  <div class="collapse navbar-collapse">

diff --git a/userGuide/database/helpers.html b/userGuide/database/helpers.html
@@ -15,11 +15,7 @@
 
  <script src="../js/nav-ck.js"></script>
 
- <!-- Touch icons -->
- <link rel="apple-touch-icon-precomposed" sizes="144x144" href="../images/apple-touch-icon-144-precomposed.png">
- <link rel="apple-touch-icon-precomposed" sizes="114x114" href="../images/apple-touch-icon-114-precomposed.png">
- <link rel="apple-touch-icon-precomposed" sizes="72x72" href="../images/apple-touch-icon-72-precomposed.png">
- <link rel="apple-touch-icon-precomposed" href="../images/apple-touch-icon-57-precomposed.png">
+ <link rel="apple-touch-icon" href="https://revigniter.com/assets/img/apple-touch-icon.png">
 
  <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
  <!--[if lt IE 9]>
@@ -38,7 +34,7 @@
  <span class="icon-bar"></span>
  <span class="icon-bar"></span>
  </button>
- <a class="navbar-brand" href="#">revIgniter User Guide Version 2.3.3</a>
+ <a class="navbar-brand" href="#">revIgniter User Guide Version 2.3.4</a>
  </div>
 
  <div class="collapse navbar-collapse">

diff --git a/userGuide/database/index.html b/userGuide/database/index.html
@@ -15,11 +15,7 @@
 
  <script src="../js/nav-ck.js"></script>
 
- <!-- Touch icons -->
- <link rel="apple-touch-icon-precomposed" sizes="144x144" href="../images/apple-touch-icon-144-precomposed.png">
- <link rel="apple-touch-icon-precomposed" sizes="114x114" href="../images/apple-touch-icon-114-precomposed.png">
- <link rel="apple-touch-icon-precomposed" sizes="72x72" href="../images/apple-touch-icon-72-precomposed.png">
- <link rel="apple-touch-icon-precomposed" href="../images/apple-touch-icon-57-precomposed.png">
+ <link rel="apple-touch-icon" href="https://revigniter.com/assets/img/apple-touch-icon.png">
 
  <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
  <!--[if lt IE 9]>
@@ -38,7 +34,7 @@
  <span class="icon-bar"></span>
  <span class="icon-bar"></span>
  </button>
- <a class="navbar-brand" href="#">revIgniter User Guide Version 2.3.3</a>
+ <a class="navbar-brand" href="#">revIgniter User Guide Version 2.3.4</a>
  </div>
 
  <div class="collapse navbar-collapse">

diff --git a/userGuide/database/queries.html b/userGuide/database/queries.html
@@ -15,11 +15,7 @@
 
  <script src="../js/nav-ck.js"></script>
 
- <!-- Touch icons -->
- <link rel="apple-touch-icon-precomposed" sizes="144x144" href="../images/apple-touch-icon-144-precomposed.png">
- <link rel="apple-touch-icon-precomposed" sizes="114x114" href="../images/apple-touch-icon-114-precomposed.png">
- <link rel="apple-touch-icon-precomposed" sizes="72x72" href="../images/apple-touch-icon-72-precomposed.png">
- <link rel="apple-touch-icon-precomposed" href="../images/apple-touch-icon-57-precomposed.png">
+ <link rel="apple-touch-icon" href="https://revigniter.com/assets/img/apple-touch-icon.png">
 
  <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
  <!--[if lt IE 9]>
@@ -38,7 +34,7 @@
  <span class="icon-bar"></span>
  <span class="icon-bar"></span>
  </button>
- <a class="navbar-brand" href="#">revIgniter User Guide Version 2.3.3</a>
+ <a class="navbar-brand" href="#">revIgniter User Guide Version 2.3.4</a>
  </div>
 
  <div class="collapse navbar-collapse">

diff --git a/userGuide/database/results.html b/userGuide/database/results.html
@@ -15,11 +15,7 @@
 
  <script src="../js/nav-ck.js"></script>
 
- <!-- Touch icons -->
- <link rel="apple-touch-icon-precomposed" sizes="144x144" href="../images/apple-touch-icon-144-precomposed.png">
- <link rel="apple-touch-icon-precomposed" sizes="114x114" href="../images/apple-touch-icon-114-precomposed.png">
- <link rel="apple-touch-icon-precomposed" sizes="72x72" href="../images/apple-touch-icon-72-precomposed.png">
- <link rel="apple-touch-icon-precomposed" href="../images/apple-touch-icon-57-precomposed.png">
+ <link rel="apple-touch-icon" href="https://revigniter.com/assets/img/apple-touch-icon.png">
 
  <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
  <!--[if lt IE 9]>
@@ -38,7 +34,7 @@
  <span class="icon-bar"></span>
  <span class="icon-bar"></span>
  </button>
- <a class="navbar-brand" href="#">revIgniter User Guide Version 2.3.3</a>
+ <a class="navbar-brand" href="#">revIgniter User Guide Version 2.3.4</a>
  </div>
 
  <div class="collapse navbar-collapse">