Last modified by Alex Cotiuga on 2026/07/27 06:09

From version 18.27
edited by Alex Cotiuga
on 2026/07/09 21:01
Change comment: There is no comment for this version
To version 16.49
edited by Alex Cotiuga
on 2026/06/16 17:02
Change comment: There is no comment for this version

Summary

Details

Page properties
Default language
... ... @@ -1,0 +1,1 @@
1 +en
Hidden
... ... @@ -1,1 +1,1 @@
1 -true
1 +false
Content
... ... @@ -3,114 +3,50 @@
3 3   #set ($statusCode = 400)
4 4   #set ($message = 'The request could not be sent. Please try again or contact Agnease by email at alex@agnease.com.')
5 5  
6 - #set ($className = 'Agnease.Code.ContactRequest.ContactRequestClass')
7 - #set ($allowedProperties = [
8 - 'scope',
9 - 'alreadyUseXWiki',
10 - 'name',
11 - 'email',
12 - 'hosting',
13 - 'customDevelopment',
14 - 'timeline',
15 - 'users',
16 - 'sourcePage'
17 - ])
18 -
19 19   #set ($name = '')
20 20   #set ($email = '')
21 - #set ($scope = '')
8 + ## Fields to help preventing bots filled forms.
22 22   #set ($contactWebsite = '')
23 23   #set ($startedAtRaw = '')
24 24  
25 - ## Extract only the values we need for validation.
26 26   #foreach ($parameterName in $request.parameterNames)
27 27   #set ($propertyParts = $parameterName.split('_0_'))
28 28   #if ($propertyParts.size() > 1)
29 - #set ($propertyName = $propertyParts[1])
30 - #set ($propertyValue = $stringtool.trim($request.get($parameterName)))
31 -
15 + #set ($propertyName = $parameterName.split('_0_')[1])
32 32   #if ($propertyName == 'name')
33 - #set ($name = $propertyValue)
17 + #set ($name = $stringtool.trim($request.get($parameterName)))
34 34   #elseif ($propertyName == 'email')
35 - #set ($email = $propertyValue)
36 - #elseif ($propertyName == 'scope')
37 - #set ($scope = $propertyValue)
19 + #set ($email = $stringtool.trim($request.get($parameterName)))
38 38   #elseif ($propertyName == 'contactWebsite')
39 - #set ($contactWebsite = $propertyValue)
21 + #set ($contactWebsite = $stringtool.trim($request.get($parameterName)))
40 40   #elseif ($propertyName == 'contactStartedAt')
41 - #set ($startedAtRaw = $propertyValue)
23 + #set ($startedAtRaw = $stringtool.trim($request.get($parameterName)))
42 42   #end
43 43   #end
44 44   #end
45 45  
46 - #set ($spamScore = 0)
47 -
48 - ## Honeypot: real users should never fill this field.
49 - #if ("$!contactWebsite" != '')
50 - #set ($spamScore = $spamScore + 5)
51 - #end
52 -
53 - ## Submission timing check.
54 - #if ("$!startedAtRaw" == '')
55 - ## The field is expected from the real form, so missing it is suspicious.
56 - #set ($spamScore = $spamScore + 2)
57 - #else
28 + #if ("$!startedAtRaw" != '')
58 58   #set ($startedAt = $numbertool.toNumber($startedAtRaw))
59 - #if ("$!startedAt" == '')
60 - #set ($spamScore = $spamScore + 2)
61 - #else
62 - #set ($now = $datetool.systemDate.time)
63 - #set ($elapsed = $now - $startedAt)
30 + #set ($now = $datetool.systemDate.time)
31 + #set ($elapsed = $now - $startedAt)
64 64  
65 - ## Reject very fast submissions.
66 - #if ($elapsed > 0 && $elapsed < 10000)
67 - #set ($spamScore = $spamScore + 3)
68 - #end
33 + ## Reject submissions faster than 10 seconds.
34 + #if ($elapsed > 0 && $elapsed < 10000)
35 + #set ($statusCode = 400)
36 + #set ($message = 'Please take a moment to describe your XWiki request before submitting.')
69 69   #end
70 - #end
71 -
72 - ## Random-looking name: long single token.
73 - #if ($name.length() >= 16 && !$name.contains(' '))
74 - #set ($spamScore = $spamScore + 2)
75 - #end
76 -
77 - ## Random-looking project description: long single token.
78 - #if ($scope.length() >= 12 && !$scope.contains(' '))
79 - #set ($spamScore = $spamScore + 2)
80 - #end
81 -
82 - ## Suspicious email local part with many dots and tiny fragments.
83 - #set ($emailParts = $email.split('@'))
84 - #if ($emailParts.size() == 2)
85 - #set ($localPart = $emailParts[0])
86 - #set ($localFragments = $localPart.split('\.'))
87 - #set ($dotCount = $localFragments.size() - 1)
88 - #set ($oneCharFragments = 0)
89 -
90 - #foreach ($fragment in $localFragments)
91 - #if ($fragment.length() == 1)
92 - #set ($oneCharFragments = $oneCharFragments + 1)
93 - #end
94 - #end
95 -
96 - #if ($dotCount >= 4 && $oneCharFragments >= 3)
97 - #set ($spamScore = $spamScore + 2)
98 - #end
99 - #else
100 - #set ($spamScore = $spamScore + 2)
101 - #end
102 -
103 - ## Human-facing validation.
104 - #if ("$!name" == '' && "$!email" == '')
38 + #elseif ("$!contactWebsite.trim()" != '')
39 + #set ($statusCode = 400)
40 + #set ($message = 'The request could not be sent. Please try again or contact Agnease by email.')
41 + #elseif ("$!name" == '' && "$!email" == '')
42 + #set ($statusCode = 400)
105 105   #set ($message = 'Please enter your name and email.')
106 106   #elseif ("$!name" == '')
45 + #set ($statusCode = 400)
107 107   #set ($message = 'Please enter your name.')
108 108   #elseif ("$!email" == '')
48 + #set ($statusCode = 400)
109 109   #set ($message = 'Please enter your email address.')
110 - #elseif ("$!scope" == '' || $scope.length() < 30)
111 - #set ($message = 'Please add a short description of your XWiki project, question or issue.')
112 - #elseif ($spamScore >= 3)
113 - #set ($message = 'The request could not be sent. Please add a clearer description of your XWiki request or contact Agnease by email.')
114 114   #else
115 115   #try('contactException')
116 116   #set ($now = $datetool.get('yyyyMMddHHmm'))
... ... @@ -117,74 +117,14 @@
117 117   #set ($random = $mathtool.random(100000, 999999))
118 118   #set ($uniqueName = "ContactRequest-${now}-${random}")
119 119   #set ($contactRequestDoc = $xwiki.getDocumentAsAuthor('ContactRequests.' + $uniqueName))
120 - #set ($contactRequestObj = $contactRequestDoc.getObject($className, true))
56 + #set ($contactRequestObj = $contactRequestDoc.getObject('Agnease.Code.ContactRequest.ContactRequestClass', true))
121 121  
122 - ## Save only known ContactRequest fields.
123 123   #foreach ($parameterName in $request.parameterNames)
124 - #if ($parameterName == 'sourcePage')
125 - #set ($discard = $contactRequestObj.set($parameterName, $stringtool.trim($request.get($parameterName))))
126 - #end
127 - #set ($propertyParts = $parameterName.split('_0_'))
128 - #if ($propertyParts.size() > 1)
129 - #set ($propertyName = $propertyParts[1])
130 -
131 - #if ($allowedProperties.contains($propertyName))
132 - #set ($discard = $contactRequestObj.set($propertyName, $stringtool.trim($request.get($parameterName))))
133 - #end
134 - #end
59 + #set ($propertyName = $parameterName.split('_0_')[1])
60 + #set ($discard = $contactRequestObj.set($propertyName, $request.get($parameterName)))
135 135   #end
136 136  
137 137   #set ($discard = $contactRequestDoc.saveAsAuthor())
138 - ## Send internal notification email.
139 - ## This is intentionally best-effort: if email fails, the contact request is still saved.
140 - #try('mailException')
141 - #set ($notificationRecipient = 'alex@agnease.com')
142 - #set ($sourcePage = "$!contactRequestObj.getValue('sourcePage')")
143 -
144 - #set ($notificationSubject = 'New Agnease contact request')
145 - #if ($sourcePage != '')
146 - #set ($notificationSubject = "New Agnease contact request from $sourcePage")
147 - #end
148 -
149 - #set ($notificationBody = "
150 - New Agnease contact request
151 -
152 - Name:
153 - $!contactRequestObj.get('name')
154 -
155 - Email:
156 - $!contactRequestObj.get('email')
157 -
158 - Source page:
159 - $!contactRequestObj.get('sourcePage')
160 -
161 - Already uses XWiki:
162 - $!contactRequestObj.get('alreadyUseXWiki')
163 -
164 - Hosting:
165 - $!contactRequestObj.get('hosting')
166 -
167 - Custom development:
168 - $!contactRequestObj.get('customDevelopment')
169 -
170 - Timeline:
171 - $!contactRequestObj.get('timeline')
172 -
173 - Users:
174 - $!contactRequestObj.get('users')
175 -
176 - Message:
177 - $!contactRequestObj.get('scope')
178 -
179 - Internal request page:
180 - $xwiki.getURL($contactRequestDoc.fullName)
181 - ")
182 -
183 - #set ($message = $services.mail.sender.createMessage($notificationRecipient, $notificationSubject))
184 - #set ($discard = $message.setType('Agnease Contact Request'))
185 - #set ($discard = $message.addPart('text/plain', $notificationBody))
186 - #set ($mailResult = $services.mail.sender.sendAsynchronously([$message], 'database'))
187 - #end
188 188   #set ($statusCode = 200)
189 189   #set ($message = 'Your request was successfully sent.')
190 190   #end
... ... @@ -216,31 +216,28 @@
216 216   ## As a measure to avoid high load on website.
217 217   Tell us more about your project at <a href="mailto:alex@agnease.com">alex@agnease.com</a>
218 218   #else
219 - #set ($hiddenProperties = ['sourcePage'])
220 220   <form id="contactForm">
221 221   <dl>
222 222   #foreach ($property in $xclass.properties)
223 - #if (!$hiddenProperties.contains($property.name))
224 - #if ($property.name == 'hosting')
225 - <hr>
226 - <h3>Optional project details</h3>
227 - <p>These details help us understand the scope and suggest practical next steps.</p>
228 - #end
229 - <dt #if (!$editing && $hasEdit)
230 - class="editableProperty"
231 - #set ($xobjectPropertyReference = $xobject.getPropertyReference($property.name))
232 - data-property="$escapetool.xml($services.model.serialize($xobjectPropertyReference))"
233 - data-property-type="object"#end>
234 - ## This must match the id generated by the $doc.display() method below.
235 - #set ($propertyId = "${xclass.name}_${xobject.number}_$property.name")
236 - <label#if ($editing) for="$escapetool.xml($propertyId)"#end>
237 - $escapetool.xml($property.translatedPrettyName)
238 - </label>
239 - ## Support for specifying a translation key as hint in the property definition.
240 - <span class="xHint">$!escapetool.xml($services.localization.render($property.hint))</span>
241 - </dt>
242 - <dd>$doc.display($property.name, 'edit').replace('{{html clean="false" wiki="false"}}', '').replace("{{/html}}", '')</dd>
98 + #if ($property.name == 'hosting')
99 + <hr>
100 + <h3>Optional project details</h3>
101 + <p>These details help us understand the scope and suggest practical next steps.</p>
243 243   #end
103 + <dt #if (!$editing && $hasEdit)
104 + class="editableProperty"
105 + #set ($xobjectPropertyReference = $xobject.getPropertyReference($property.name))
106 + data-property="$escapetool.xml($services.model.serialize($xobjectPropertyReference))"
107 + data-property-type="object"#end>
108 + ## This must match the id generated by the $doc.display() method below.
109 + #set ($propertyId = "${xclass.name}_${xobject.number}_$property.name")
110 + <label#if ($editing) for="$escapetool.xml($propertyId)"#end>
111 + $escapetool.xml($property.translatedPrettyName)
112 + </label>
113 + ## Support for specifying a translation key as hint in the property definition.
114 + <span class="xHint">$!escapetool.xml($services.localization.render($property.hint))</span>
115 + </dt>
116 + <dd>$doc.display($property.name, 'edit').replace('{{html clean="false" wiki="false"}}', '').replace("{{/html}}", '')</dd>
244 244   #end
245 245   #if (!$xclass.properties || $xclass.properties.size() == 0)
246 246   ## Keep the empty definition term in order to have valid HTML.
... ... @@ -253,7 +253,7 @@
253 253   <div class="contact-hp-wrapper" aria-hidden="true">
254 254   <label for="Agnease.Code.ContactRequest.ContactRequestClass_0_contactWebsite">Website</label>
255 255   <input
256 - id="Agnease.Code.ContactRequest.ContactRequestClass_0_contactWebsite"
129 + id="contactWebsite"
257 257   type="text"
258 258   name="Agnease.Code.ContactRequest.ContactRequestClass_0_contactWebsite"
259 259   autocomplete="off"
... ... @@ -261,7 +261,6 @@
261 261   />
262 262   </div>
263 263   <input type="hidden" name="Agnease.Code.ContactRequest.ContactRequestClass_0_contactStartedAt" value="$datetool.systemDate.time" />
264 - <input type="hidden" name="sourcePage" />
265 265   <input id="contactSubmit" type="submit" class="btn btn-primary" value="Send my request">
266 266   </form>
267 267   #end
... ... @@ -282,13 +282,9 @@
282 282   {{/html}}
283 283   {{html clean="false"}}
284 284   </div>
285 - <div class="col-md-5 contact-side-panel">
286 - <div class="split-copy contact-help-panel">
287 - <h2>
288 - <i class="fa fa-check-circle" aria-hidden="true"></i>
289 - How Agnease can help
290 - </h2>
291 -
157 + <div class="col-md-5">
158 + <div class="widget">
159 + <h4>$services.icon.renderHTML('check') How Agnease can help</h4>
292 292   <ul>
293 293   <li>XWiki upgrades and long-term maintenance</li>
294 294   <li>Knowledge bases, intranets, SOP and documentation workflows</li>
... ... @@ -298,21 +298,14 @@
298 298   <li>Security-aware reviews and platform stabilization</li>
299 299   </ul>
300 300   </div>
301 -
302 - <ol class="process-list contact-process-list">
303 - <li>
304 - <strong>Your request is reviewed</strong>
305 - The project description is checked to understand the context and initial scope.
306 - </li>
307 - <li>
308 - <strong>You receive a reply</strong>
309 - Agnease replies with clarifying questions or suggested next steps.
310 - </li>
311 - <li>
312 - <strong>A short call can be scheduled</strong>
313 - If useful, we discuss scope, timeline and estimated effort together.
314 - </li>
315 - </ol>
169 + <div class="widget">
170 + <h4>$services.icon.renderHTML('right') What happens next?</h4>
171 + <ol>
172 + <li>Your request is reviewed.</li>
173 + <li>You receive a reply with clarifying questions or suggested next steps.</li>
174 + <li>If useful, we schedule a short call to discuss scope, timeline, and estimated effort.</li>
175 + </ol>
176 + </div>
316 316   </div>
317 317   </div>
318 318  {{/html}}
XWiki.JavaScriptExtension[1]
cache
... ... @@ -1,1 +1,0 @@
1 -long
code
... ... @@ -1,32 +1,0 @@
1 -require(['jquery'], function ($) {
2 - $(function () {
3 - var sourcePageField = $('input[name="sourcePage"]');
4 -
5 - if (!sourcePageField.length || sourcePageField.val()) {
6 - return;
7 - }
8 -
9 - if (!document.referrer) {
10 - return;
11 - }
12 -
13 - try {
14 - var referrerUrl = new URL(document.referrer);
15 -
16 - if (referrerUrl.origin !== window.location.origin) {
17 - return;
18 - }
19 -
20 - var sourcePage = referrerUrl.pathname
21 - .replace(/^\/bin\//, '')
22 - .replace(/\/$/, '')
23 - .replace(/\//g, '.');
24 -
25 - if (sourcePage) {
26 - sourcePageField.val(sourcePage);
27 - }
28 - } catch (e) {
29 - // Ignore invalid referrer values.
30 - }
31 - });
32 -});
name
... ... @@ -1,1 +1,0 @@
1 -document referrer catcher
use
... ... @@ -1,1 +1,0 @@
1 -currentPage
XWiki.StyleSheetExtension[0]
code
... ... @@ -1,17 +1,71 @@
1 -/* ===== Contact page side panel ===== */
1 +@brand: #00937D;
2 +@brand-strong: #007B6A;
3 +@text: #2D3A34;
4 +@muted: #5B6B64;
5 +@line: #E4ECE9;
6 +@radius: 16px;
7 +@shadow-sm: 0 6px 20px rgba(0,0,0,.06);
8 +@shadow: 0 12px 36px rgba(0,0,0,.08);
9 +@maxw: 1140px;
2 2  
3 -.contact-side-panel {
4 - padding-top: 10px;
11 +/* ===== Contact page widgets ===== */
12 +#mainContentArea {
13 + padding: 0;
5 5  }
6 6  
7 -.contact-help-panel {
8 - margin-bottom: 18px;
16 +.col-xs-5 {
17 + padding-top: 45px;
9 9  }
10 10  
11 -.contact-process-list li {
12 - min-height: auto;
20 +.col-xs-5 .widget {
21 + margin-bottom: 16px;
22 + padding: 16px;
13 13  }
14 14  
25 +.col-xs-5 .widget h4 {
26 + display: flex;
27 + align-items: center;
28 + gap: 8px;
29 + margin: 0 0 10px;
30 + padding-bottom: 8px;
31 + border-bottom: 1px solid fade(@line, 60%);
32 + color: @text;
33 + font-size: 18px;
34 + line-height: 1.25;
35 +}
36 +
37 +.col-xs-5 .widget h4 .fa,
38 +.col-xs-5 .widget h4 .glyphicon {
39 + color: @brand;
40 + font-size: 15px;
41 +}
42 +
43 +.col-xs-5 .widget ul,
44 +.col-xs-5 .widget ol {
45 + margin: 0;
46 + padding-left: 1.2rem;
47 + color: @muted;
48 +}
49 +
50 +.col-xs-5 .widget li {
51 + margin: 5px 0;
52 + line-height: 1.4;
53 +}
54 +
55 +.col-xs-5 .widget p {
56 + margin: 0 0 8px;
57 + color: @muted;
58 + line-height: 1.45;
59 +}
60 +
61 +.col-xs-5 .widget p:last-child {
62 + margin-bottom: 0;
63 +}
64 +
65 +.col-xs-5 .widget a {
66 + color: @brand;
67 + font-weight: 700;
68 +}
15 15  /* CSS for hidden field to identify requests filled by bots. */
16 16  .contact-hp-wrapper {
17 17   position: absolute;
... ... @@ -20,9 +20,3 @@
20 20   height: 1px;
21 21   overflow: hidden;
22 22  }
23 -
24 -@media (max-width: 991px) {
25 - .contact-side-panel {
26 - padding-top: 24px;
27 - }
28 -}