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

From version 16.54
edited by Agnease
on 2026/06/16 17:09
Change comment: There is no comment for this version
To version 16.20
edited by Agnease
on 2026/06/16 16:05
Change comment: There is no comment for this version

Summary

Details

Page properties
Content
... ... @@ -5,42 +5,20 @@
5 5  
6 6   #set ($name = '')
7 7   #set ($email = '')
8 - #set ($scope = '')
9 - ## Fields to help preventing bots filled forms.
10 - #set ($contactWebsite = '')
11 - #set ($startedAtRaw = '')
12 12  
13 13   #foreach ($parameterName in $request.parameterNames)
14 - #set ($propertyParts = $parameterName.split('_0_'))
15 - #if ($propertyParts.size() > 1)
16 - #set ($propertyName = $parameterName.split('_0_')[1])
17 - #if ($propertyName == 'name')
18 - #set ($name = $stringtool.trim($request.get($parameterName)))
19 - #elseif ($propertyName == 'email')
20 - #set ($email = $stringtool.trim($request.get($parameterName)))
21 - #elseif ($propertyName == 'scope')
22 - #set ($scope = $stringtool.trim($request.get($parameterName)))
23 - #elseif ($propertyName == 'contactWebsite')
24 - #set ($contactWebsite = $stringtool.trim($request.get($parameterName)))
25 - #elseif ($propertyName == 'contactStartedAt')
26 - #set ($startedAtRaw = $stringtool.trim($request.get($parameterName)))
27 - #end
10 + #set ($propertyName = $parameterName.split('_0_')[1])
11 + #if ($propertyName == 'name')
12 + #set ($name = $stringtool.trim($request.get($parameterName)))
13 + #elseif ($propertyName == 'email')
14 + #set ($email = $stringtool.trim($request.get($parameterName)))
28 28   #end
29 29   #end
30 30  
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()" != '')
42 - #set ($statusCode = 400)
43 - #set ($message = 'The request could not be sent. Please try again or contact Agnease by email.')
18 + #if ("$!request.contactWebsite".trim() != '')
19 + #set ($discard = $response.setStatus(400))
20 + #jsonResponse({'message': 'The request could not be sent. Please try again or contact Agnease by email.'})
21 + #stop
44 44   #elseif ("$!name" == '' && "$!email" == '')
45 45   #set ($statusCode = 400)
46 46   #set ($message = 'Please enter your name and email.')
... ... @@ -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
41 + #set ($discard = $contactRequestObj.set($propertyName, $request.get($parameterName)))
69 69   #end
70 70  
71 71   #set ($discard = $contactRequestDoc.saveAsAuthor())
... ... @@ -132,16 +132,15 @@
132 132   <p class="xHint">* Your information will only be used to respond to this request.</p>
133 133   ## Hidden fields to catch requests filled by bots.
134 134   <div class="contact-hp-wrapper" aria-hidden="true">
135 - <label for="Agnease.Code.ContactRequest.ContactRequestClass_0_contactWebsite">Website</label>
108 + <label for="contactWebsite">Website</label>
136 136   <input
137 137   id="contactWebsite"
138 138   type="text"
139 - name="Agnease.Code.ContactRequest.ContactRequestClass_0_contactWebsite"
112 + name="contactWebsite"
140 140   autocomplete="off"
141 141   tabindex="-1"
142 142   />
143 143   </div>
144 - <input type="hidden" name="Agnease.Code.ContactRequest.ContactRequestClass_0_contactStartedAt" value="$datetool.systemDate.time" />
145 145   <input id="contactSubmit" type="submit" class="btn btn-primary" value="Send my request">
146 146   </form>
147 147   #end
XWiki.JavaScriptExtension[0]
code
... ... @@ -21,12 +21,10 @@
21 21   url: serviceURL,
22 22   data: $.param(form.serializeArray())
23 23   }).done(function (data) {
24 - console.log(data)
25 25   successBox.find('.box div p').text(data.message);
26 26   successBox.removeClass('hidden');
27 27   form[0].reset();
28 28   }).fail(function (xhr) {
29 - console.log('fail' + xhr)
30 30   var message = xhr.responseJSON && xhr.responseJSON.message ? xhr.responseJSON.message
31 31   : 'The request could not be sent. Please try again or contact Agnease by email at alex@agnease.com';
32 32   errorBox.find('.box div p').text(message);