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

From version 16.46
edited by Agnease
on 2026/06/16 17:00
Change comment: There is no comment for this version
To version 16.55
edited by Agnease
on 2026/06/16 17:09
Change comment: There is no comment for this version

Summary

Details

Page properties
Content
... ... @@ -5,6 +5,7 @@
5 5  
6 6   #set ($name = '')
7 7   #set ($email = '')
8 + #set ($scope = '')
8 8   ## Fields to help preventing bots filled forms.
9 9   #set ($contactWebsite = '')
10 10   #set ($startedAtRaw = '')
... ... @@ -17,6 +17,8 @@
17 17   #set ($name = $stringtool.trim($request.get($parameterName)))
18 18   #elseif ($propertyName == 'email')
19 19   #set ($email = $stringtool.trim($request.get($parameterName)))
21 + #elseif ($propertyName == 'scope')
22 + #set ($scope = $stringtool.trim($request.get($parameterName)))
20 20   #elseif ($propertyName == 'contactWebsite')
21 21   #set ($contactWebsite = $stringtool.trim($request.get($parameterName)))
22 22   #elseif ($propertyName == 'contactStartedAt')
... ... @@ -32,8 +32,8 @@
32 32  
33 33   ## Reject submissions faster than 10 seconds.
34 34   #if ($elapsed > 0 && $elapsed < 10000)
35 - #set ($discard = $response.setStatus(400))
36 - #jsonResponse({'message': 'Please take a moment to describe your XWiki request before submitting.'})
38 + #set ($statusCode = 400)
39 + #set ($message = 'Please take a moment to describe your XWiki request before submitting.')
37 37   #end
38 38   #elseif ("$!contactWebsite.trim()" != '')
39 39   #set ($statusCode = 400)
... ... @@ -47,6 +47,9 @@
47 47   #elseif ("$!email" == '')
48 48   #set ($statusCode = 400)
49 49   #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.')
50 50   #else
51 51   #try('contactException')
52 52   #set ($now = $datetool.get('yyyyMMddHHmm'))
... ... @@ -57,7 +57,9 @@
57 57  
58 58   #foreach ($parameterName in $request.parameterNames)
59 59   #set ($propertyName = $parameterName.split('_0_')[1])
60 - #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
61 61   #end
62 62  
63 63   #set ($discard = $contactRequestDoc.saveAsAuthor())
... ... @@ -133,7 +133,7 @@
133 133   tabindex="-1"
134 134   />
135 135   </div>
136 - <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" />
137 137   <input id="contactSubmit" type="submit" class="btn btn-primary" value="Send my request">
138 138   </form>
139 139   #end