Last modified by Agnease on 2026/06/16 17:18

From version 16.42
edited by Agnease
on 2026/06/16 16:58
Change comment: There is no comment for this version
To version 16.56
edited by Agnease
on 2026/06/16 17:09
Change comment: There is no comment for this version

Summary

Details

Page properties
Content
... ... @@ -5,7 +5,10 @@
5 5  
6 6   #set ($name = '')
7 7   #set ($email = '')
8 + #set ($scope = '')
9 + ## Fields to help preventing bots filled forms.
8 8   #set ($contactWebsite = '')
11 + #set ($startedAtRaw = '')
9 9  
10 10   #foreach ($parameterName in $request.parameterNames)
11 11   #set ($propertyParts = $parameterName.split('_0_'))
... ... @@ -15,6 +15,8 @@
15 15   #set ($name = $stringtool.trim($request.get($parameterName)))
16 16   #elseif ($propertyName == 'email')
17 17   #set ($email = $stringtool.trim($request.get($parameterName)))
21 + #elseif ($propertyName == 'scope')
22 + #set ($scope = $stringtool.trim($request.get($parameterName)))
18 18   #elseif ($propertyName == 'contactWebsite')
19 19   #set ($contactWebsite = $stringtool.trim($request.get($parameterName)))
20 20   #elseif ($propertyName == 'contactStartedAt')
... ... @@ -23,7 +23,17 @@
23 23   #end
24 24   #end
25 25  
26 - #if ("$!contactWebsite.trim()" != '')
31 + #if ("$!startedAtRaw" != '')
32 + #set ($startedAt = $numbertool.toNumber($startedAtRaw))
33 + #set ($now = $datetool.systemDate.time)
34 + #set ($elapsed = $now - $startedAt)
35 +
36 + ## Reject submissions faster than 10 seconds.
37 + #if ($elapsed > 0 && $elapsed < 10000)
38 + #set ($statusCode = 400)
39 + #set ($message = 'Please take a moment to describe your XWiki request before submitting.')
40 + #end
41 + #elseif ("$!contactWebsite.trim()" != '')
27 27   #set ($statusCode = 400)
28 28   #set ($message = 'The request could not be sent. Please try again or contact Agnease by email.')
29 29   #elseif ("$!name" == '' && "$!email" == '')
... ... @@ -35,6 +35,9 @@
35 35   #elseif ("$!email" == '')
36 36   #set ($statusCode = 400)
37 37   #set ($message = 'Please enter your email address.')
53 + #elseif ("$!scope" == '' || $scope.length() < 30)
54 + #set ($statusCode = 400)
55 + #set ($message = 'Please add a short description of your XWiki project, question or issue.')
38 38   #else
39 39   #try('contactException')
40 40   #set ($now = $datetool.get('yyyyMMddHHmm'))
... ... @@ -45,7 +45,9 @@
45 45  
46 46   #foreach ($parameterName in $request.parameterNames)
47 47   #set ($propertyName = $parameterName.split('_0_')[1])
48 - #set ($discard = $contactRequestObj.set($propertyName, $request.get($parameterName)))
66 + #if ($propertyName != 'contactWebsite' && $propertyName != 'contactStartedAt')
67 + #set ($discard = $contactRequestObj.set($propertyName, $request.get($parameterName)))
68 + #end
49 49   #end
50 50  
51 51   #set ($discard = $contactRequestDoc.saveAsAuthor())
... ... @@ -121,7 +121,7 @@
121 121   tabindex="-1"
122 122   />
123 123   </div>
124 - <input type="hidden" name="Agnease.Code.ContactRequest.ContactRequestClass_0_contactStartedAt" value="$datetool.getsystemDate.time" />
144 + <input type="hidden" name="Agnease.Code.ContactRequest.ContactRequestClass_0_contactStartedAt" value="$datetool.systemDate.time" />
125 125   <input id="contactSubmit" type="submit" class="btn btn-primary" value="Send my request">
126 126   </form>
127 127   #end