Changes for page Get in Touch About Your XWiki Project

Summary

• Page properties (3 modified, 0 added, 0 removed)
• Objects (1 modified, 0 added, 0 removed)
  • XWiki.JavaScriptExtension[0]

Details

Page properties

Default language

...	...	@@ -1,1 +1,0 @@
1		-en

Hidden

...	...	@@ -1,1 +1,1 @@
1		-false
	1	+true

Content

...	...	@@ -3,31 +3,113 @@
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	+ ])
	17	+
6	6	#set ($name = '')
7	7	#set ($email = '')
	20	+ #set ($scope = '')
	21	+ #set ($contactWebsite = '')
	22	+ #set ($startedAtRaw = '')
8	8
	24	+ ## Extract only the values we need for validation.
9	9	#foreach ($parameterName in $request.parameterNames)
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)))
	26	+ #set ($propertyParts = $parameterName.split('_0_'))
	27	+ #if ($propertyParts.size() > 1)
	28	+ #set ($propertyName = $propertyParts[1])
	29	+ #set ($propertyValue = $stringtool.trim($request.get($parameterName)))
	30	+
	31	+ #if ($propertyName == 'name')
	32	+ #set ($name = $propertyValue)
	33	+ #elseif ($propertyName == 'email')
	34	+ #set ($email = $propertyValue)
	35	+ #elseif ($propertyName == 'scope')
	36	+ #set ($scope = $propertyValue)
	37	+ #elseif ($propertyName == 'contactWebsite')
	38	+ #set ($contactWebsite = $propertyValue)
	39	+ #elseif ($propertyName == 'contactStartedAt')
	40	+ #set ($startedAtRaw = $propertyValue)
	41	+ #end
15	15	#end
16	16	#end
17	17
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
22		- #elseif ("$!name" == '' && "$!email" == '')
23		- #set ($statusCode = 400)
	45	+ #set ($spamScore = 0)
	46	+
	47	+ ## Honeypot: real users should never fill this field.
	48	+ #if ("$!contactWebsite" != '')
	49	+ #set ($spamScore = $spamScore + 5)
	50	+ #end
	51	+
	52	+ ## Submission timing check.
	53	+ #if ("$!startedAtRaw" == '')
	54	+ ## The field is expected from the real form, so missing it is suspicious.
	55	+ #set ($spamScore = $spamScore + 2)
	56	+ #else
	57	+ #set ($startedAt = $numbertool.toNumber($startedAtRaw))
	58	+ #if ("$!startedAt" == '')
	59	+ #set ($spamScore = $spamScore + 2)
	60	+ #else
	61	+ #set ($now = $datetool.systemDate.time)
	62	+ #set ($elapsed = $now - $startedAt)
	63	+
	64	+ ## Reject very fast submissions.
	65	+ #if ($elapsed > 0 && $elapsed < 10000)
	66	+ #set ($spamScore = $spamScore + 3)
	67	+ #end
	68	+ #end
	69	+ #end
	70	+
	71	+ ## Random-looking name: long single token.
	72	+ #if ($name.length() >= 16 && !$name.contains(' '))
	73	+ #set ($spamScore = $spamScore + 2)
	74	+ #end
	75	+
	76	+ ## Random-looking project description: long single token.
	77	+ #if ($scope.length() >= 12 && !$scope.contains(' '))
	78	+ #set ($spamScore = $spamScore + 2)
	79	+ #end
	80	+
	81	+ ## Suspicious email local part with many dots and tiny fragments.
	82	+ #set ($emailParts = $email.split('@'))
	83	+ #if ($emailParts.size() == 2)
	84	+ #set ($localPart = $emailParts[0])
	85	+ #set ($localFragments = $localPart.split('\.'))
	86	+ #set ($dotCount = $localFragments.size() - 1)
	87	+ #set ($oneCharFragments = 0)
	88	+
	89	+ #foreach ($fragment in $localFragments)
	90	+ #if ($fragment.length() == 1)
	91	+ #set ($oneCharFragments = $oneCharFragments + 1)
	92	+ #end
	93	+ #end
	94	+
	95	+ #if ($dotCount >= 4 && $oneCharFragments >= 3)
	96	+ #set ($spamScore = $spamScore + 2)
	97	+ #end
	98	+ #else
	99	+ #set ($spamScore = $spamScore + 2)
	100	+ #end
	101	+
	102	+ ## Human-facing validation.
	103	+ #if ("$!name" == '' && "$!email" == '')
24	24	#set ($message = 'Please enter your name and email.')
25	25	#elseif ("$!name" == '')
26		- #set ($statusCode = 400)
27	27	#set ($message = 'Please enter your name.')
28	28	#elseif ("$!email" == '')
29		- #set ($statusCode = 400)
30	30	#set ($message = 'Please enter your email address.')
	109	+ #elseif ("$!scope" == '' || $scope.length() < 30)
	110	+ #set ($message = 'Please add a short description of your XWiki project, question or issue.')
	111	+ #elseif ($spamScore >= 3)
	112	+ #set ($message = 'The request could not be sent. Please add a clearer description of your XWiki request or contact Agnease by email.')
31	31	#else
32	32	#try('contactException')
33	33	#set ($now = $datetool.get('yyyyMMddHHmm'))
...	...	@@ -34,11 +34,18 @@
34	34	#set ($random = $mathtool.random(100000, 999999))
35	35	#set ($uniqueName = "ContactRequest-${now}-${random}")
36	36	#set ($contactRequestDoc = $xwiki.getDocumentAsAuthor('ContactRequests.' + $uniqueName))
37		- #set ($contactRequestObj = $contactRequestDoc.getObject('Agnease.Code.ContactRequest.ContactRequestClass', true))
	119	+ #set ($contactRequestObj = $contactRequestDoc.getObject($className, true))
38	38
	121	+ ## Save only known ContactRequest fields.
39	39	#foreach ($parameterName in $request.parameterNames)
40		- #set ($propertyName = $parameterName.split('_0_')[1])
41		- #set ($discard = $contactRequestObj.set($propertyName, $request.get($parameterName)))
	123	+ #set ($propertyParts = $parameterName.split('_0_'))
	124	+ #if ($propertyParts.size() > 1)
	125	+ #set ($propertyName = $propertyParts[1])
	126	+
	127	+ #if ($allowedProperties.contains($propertyName))
	128	+ #set ($discard = $contactRequestObj.set($propertyName, $request.get($parameterName)))
	129	+ #end
	130	+ #end
42	42	#end
43	43
44	44	#set ($discard = $contactRequestDoc.saveAsAuthor())
...	...	@@ -105,15 +105,16 @@
105	105	<p class="xHint">* Your information will only be used to respond to this request.</p>
106	106	## Hidden fields to catch requests filled by bots.
107	107	<div class="contact-hp-wrapper" aria-hidden="true">
108		- <label for="contactWebsite">Website</label>
	197	+ <label for="Agnease.Code.ContactRequest.ContactRequestClass_0_contactWebsite">Website</label>
109	109	<input
110		- id="contactWebsite"
	199	+ id="Agnease.Code.ContactRequest.ContactRequestClass_0_contactWebsite"
111	111	type="text"
112		- name="contactWebsite"
	201	+ name="Agnease.Code.ContactRequest.ContactRequestClass_0_contactWebsite"
113	113	autocomplete="off"
114	114	tabindex="-1"
115	115	/>
116	116	</div>
	206	+ <input type="hidden" name="Agnease.Code.ContactRequest.ContactRequestClass_0_contactStartedAt" value="$datetool.systemDate.time" />
117	117	<input id="contactSubmit" type="submit" class="btn btn-primary" value="Send my request">
118	118	</form>
119	119	#end
...	...	@@ -134,9 +134,13 @@
134	134	{{/html}}
135	135	{{html clean="false"}}
136	136	</div>
137		- <div class="col-md-5">
138		- <div class="widget">
139		- <h4>$services.icon.renderHTML('check') How Agnease can help</h4>
	227	+ <div class="col-md-5 contact-side-panel">
	228	+ <div class="split-copy contact-help-panel">
	229	+ <h2>
	230	+ <i class="fa fa-check-circle" aria-hidden="true"></i>
	231	+ How Agnease can help
	232	+ </h2>
	233	+
140	140	<ul>
141	141	<li>XWiki upgrades and long-term maintenance</li>
142	142	<li>Knowledge bases, intranets, SOP and documentation workflows</li>
...	...	@@ -146,14 +146,21 @@
146	146	<li>Security-aware reviews and platform stabilization</li>
147	147	</ul>
148	148	</div>
149		- <div class="widget">
150		- <h4>$services.icon.renderHTML('right') What happens next?</h4>
151		- <ol>
152		- <li>Your request is reviewed.</li>
153		- <li>You receive a reply with clarifying questions or suggested next steps.</li>
154		- <li>If useful, we schedule a short call to discuss scope, timeline, and estimated effort.</li>
155		- </ol>
156		- </div>
	243	+
	244	+ <ol class="process-list contact-process-list">
	245	+ <li>
	246	+ <strong>Your request is reviewed</strong>
	247	+ The project description is checked to understand the context and initial scope.
	248	+ </li>
	249	+ <li>
	250	+ <strong>You receive a reply</strong>
	251	+ Agnease replies with clarifying questions or suggested next steps.
	252	+ </li>
	253	+ <li>
	254	+ <strong>A short call can be scheduled</strong>
	255	+ If useful, we discuss scope, timeline and estimated effort together.
	256	+ </li>
	257	+ </ol>
157	157	</div>
158	158	</div>
159	159	{{/html}}

XWiki.JavaScriptExtension[0]

code

...	...	@@ -21,10 +21,12 @@
21	21	url: serviceURL,
22	22	data: $.param(form.serializeArray())
23	23	}).done(function (data) {
	24	+ console.log(data)
24	24	successBox.find('.box div p').text(data.message);
25	25	successBox.removeClass('hidden');
26	26	form[0].reset();
27	27	}).fail(function (xhr) {
	29	+ console.log('fail' + xhr)
28	28	var message = xhr.responseJSON && xhr.responseJSON.message ? xhr.responseJSON.message
29	29	: 'The request could not be sent. Please try again or contact Agnease by email at alex@agnease.com';
30	30	errorBox.find('.box div p').text(message);