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

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

Summary

Details

Page properties
Content
... ... @@ -5,7 +5,6 @@
5 5  
6 6   #set ($name = '')
7 7   #set ($email = '')
8 - #set ($scope = '')
9 9   ## Fields to help preventing bots filled forms.
10 10   #set ($contactWebsite = '')
11 11   #set ($startedAtRaw = '')
... ... @@ -18,8 +18,6 @@
18 18   #set ($name = $stringtool.trim($request.get($parameterName)))
19 19   #elseif ($propertyName == 'email')
20 20   #set ($email = $stringtool.trim($request.get($parameterName)))
21 - #elseif ($propertyName == 'scope')
22 - #set ($scope = $stringtool.trim($request.get($parameterName)))
23 23   #elseif ($propertyName == 'contactWebsite')
24 24   #set ($contactWebsite = $stringtool.trim($request.get($parameterName)))
25 25   #elseif ($propertyName == 'contactStartedAt')
... ... @@ -35,8 +35,8 @@
35 35  
36 36   ## Reject submissions faster than 10 seconds.
37 37   #if ($elapsed > 0 && $elapsed < 10000)
38 - #set ($statusCode = 400)
39 - #set ($message = 'Please take a moment to describe your XWiki request before submitting.')
35 + #set ($discard = $response.setStatus(400))
36 + #jsonResponse({'message': 'Please take a moment to describe your XWiki request before submitting.'})
40 40   #end
41 41   #elseif ("$!contactWebsite.trim()" != '')
42 42   #set ($statusCode = 400)
... ... @@ -50,9 +50,6 @@
50 50   #elseif ("$!email" == '')
51 51   #set ($statusCode = 400)
52 52   #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.')
56 56   #else
57 57   #try('contactException')
58 58   #set ($now = $datetool.get('yyyyMMddHHmm'))
... ... @@ -63,9 +63,7 @@
63 63  
64 64   #foreach ($parameterName in $request.parameterNames)
65 65   #set ($propertyName = $parameterName.split('_0_')[1])
66 - #if ($propertyName != 'contactWebsite' && $propertyName != 'contactStartedAt')
67 - #set ($discard = $contactRequestObj.set($propertyName, $request.get($parameterName)))
68 - #end
60 + #set ($discard = $contactRequestObj.set($propertyName, $request.get($parameterName)))
69 69   #end
70 70  
71 71   #set ($discard = $contactRequestDoc.saveAsAuthor())
... ... @@ -141,7 +141,7 @@
141 141   tabindex="-1"
142 142   />
143 143   </div>
144 - <input type="hidden" name="Agnease.Code.ContactRequest.ContactRequestClass_0_contactStartedAt" value="$datetool.systemDate.time" />
136 + <input type="hidden" name="Agnease.Code.ContactRequest.ContactRequestClass_0_contactStartedAt" value="$datetool.getsystemDate.time" />
145 145   <input id="contactSubmit" type="submit" class="btn btn-primary" value="Send my request">
146 146   </form>
147 147   #end