Changes for page X1000 - Contact Registration Form

Summary

• Page properties (1 modified, 0 added, 0 removed)

Details

Page properties

Content

...	...	@@ -52,7 +52,7 @@
52	52	strFirstname = services.cleanStr.alphanum(request.firstname)
53	53	strLastname = services.cleanStr.alphanum(request.lastname)
54	54	strPrefname = services.cleanStr.alphanum(request.prefname)
55		- strRole = services.cleanStr.alphanum(request.role)
	55	+ strRole = services.cleanStr.alphanum(request.role) ?:""
56	56	strLphone = services.cleanStr.numphone(request.lphone)
57	57	strMphone = services.cleanStr.numphone(request.mphone)
58	58	strEmail = services.cleanStr.alphanum(request.email)
...	...	@@ -139,11 +139,10 @@
139	139	}
140	140	strEmailBody = "Dear " + strPrefname + ","
141	141	strEmailBody = strEmailBody + "\r\n" + "\r\n" + "A request was made to register you to the CEC website (https://cecocert.com) with the following information:" + "\r\n" + "\r\n"
142		- strEmailBody = strEmailBody + "Registered name: " + strTitle + " " + strFirstname + " " + strLastname + "\r\n"
143	143	strEmailBody = strEmailBody + "Registered Business: " + strCompanyName + ", " + strCompanyAddress + ", " + strCompanyCity + ", " + strCompanyPostcode + ", " + strCompanyProvince + ", " + strCompanyCountry + "\r\n" + "\r\n"
144		- strEmailBody = strEmailBody + "Contact info: " + strTitle + " " + strFirstname + " " + strLastname + "\r\n "
145		- strEmailBody = strEmailBody + "Contact role: " + strRole + "\r\n "
146		- strEmailBody = strEmailBody + "Landline phone: " + strLphone + "\r\n" + "\r\n"
	143	+ strEmailBody = strEmailBody + "Contact info: " + strTitle + " " + strFirstname + " " + strLastname + "\r\n"
	144	+ strEmailBody = strEmailBody + "Contact role: " + strRole + "\r\n"
	145	+ strEmailBody = strEmailBody + "Landline phone: " + strLphone + "\r\n"
147	147	strEmailBody = strEmailBody + "Mobile phone: " + strMphone + "\r\n" + "\r\n"
148	148	strEmailBody = strEmailBody + "The request was made from IP address: " + strCreateIP
149	149	strEmailBody = strEmailBody + "\r\n" + "\r\n" + "Please click the below link to confirm your e-mail address:" + "\r\n"
...	...	@@ -318,9 +318,9 @@
318	318	</td>
319	319	</tr>
320	320	<tr>
321		- <td align="left" class="style1">Preferred name to address you:</td>
	320	+ <td align="left" class="style1">Preferred name to address you:<br>Examples: Peter, Mr. Parker, Fujikawa-san</td>
322	322	<td class="style1">
323		- <input type="text" id="prefname" name="prefname" placeholder="Enter the name you want to be addressed by" size="50">
	322	+ <input type="text" id="prefname" name="prefname" placeholder="Enter the name you want to be addressed by, for example in e-mails and letters" size="70">
324	324	</td>
325	325	</tr>
326	326	<tr>
...	...	@@ -702,15 +702,27 @@
702	702	## Check if the mail we tried to send has failed to be sent
703	703	#set ($statuses = $mailResult.statusResult.getAllErrors())
704	704	#if ($statuses.hasNext())
	704	+ <p>Sorry, something has gone wrong! Please do not try again!</p>
705	705	#set ($status = $statuses.next())
706	706	{{error}}
	707	+ <p>I am sorry, but there was a problem with sending you your confirmation e-mail!</p>
	708	+ <p>The data you entered has most likely already been stored in our database, and will not need to be entered again.</p>
	709	+ <p>Hence, please do not try entering the information again but instead send an e-mail to contact@cecocert.com informing us about the problem.</p>
	710	+ <p>As the subject line, please enter "CEC Registration - e-mail problem".</p>
	711	+ <p>In the body of the e-mail, please simply provide your name and that of your company.</p>
	712	+ <p>If possible, please copy the error message shown below into the e-mail.</p>
	713	+ <p>We are sorry for the inconvenience!
	714	+ <br>
	715	+ <p>Error Message:</p>
707	707	Error: $status.errorSummary ($status.state)
708	708	$status.errorDescription
709		- {{/error}}
	718	+ <br>
	719	+ {{/error}}
	720	+ #else
	721	+ An e-mail asking you to confirm your e-mail address was sent to ${xcontext.strEmail}.
	722	+ Please check your inbox and click on the link to confirm your e-mail address!
	723	+ The process will only continue after you have confirmed your e-mail address.
710	710	#end
711		- An e-mail asking you to confirm your e-mail address was sent to ${xcontext.strEmail}.
712		- Please check your inbox and click on the link to confirm your e-mail address!
713		- The process will only continue after you have confirmed your e-mail address.
714	714	#end
715	715
716	716	{{/velocity}}