Changes for page X1000 - Contact Registration Form

Summary

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

Details

Page properties

Content

...	...	@@ -3,7 +3,7 @@
3	3	import groovy.sql.Sql
4	4
5	5	String strDBTable = "\"regUser\".\"newUser\""
6		- def sqlConnection = new Sql(services.cmpConnectRegDB.connectRegDB())
	6	+ def sqlConnection = new Sql(services.cmpConnectDB.connectRegDB())
7	7
8	8	String strCurRecCol = "firstname"
9	9	int intRecCount=0
...	...	@@ -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,19 +139,11 @@
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:\r\n"
143		- strEmailBody = strEmailBody + "Name: " + strTitle + " " + strFirstname + " " + strLastname + "\r\n"
144		- strEmailBody = strEmailBody + "Registered Business Address:\r\n"
145		- strEmailBody = strEmailBody + "Registered Business Name: " + strCompanyName + "\r\n"
146		- strEmailBody = strEmailBody + "Registered Business Address: " + strCompanyAddress + "\r\n"
147		- strEmailBody = strEmailBody + "Registered Business City: " + strCompanyAddress + "\r\n"
148		- strEmailBody = strEmailBody + "Registered Business Postal Code: " + strCompanyAddress + "\r\n"
149		- strEmailBody = strEmailBody + "Registered Business Province/State: " + strCompanyAddress + "\r\n"
150		- strEmailBody = strEmailBody + "Registered Business Country: " + strCompanyAddress + "\r\n"
151		- strEmailBody = strEmailBody + "Contact info:"
152		- strEmailBody = strEmailBody + "Role: " + strRole + "\r\n"
	142	+ strEmailBody = strEmailBody + "Registered Business: " + strCompanyName + ", " + strCompanyAddress + ", " + strCompanyCity + ", " + strCompanyPostcode + ", " + strCompanyProvince + ", " + strCompanyCountry + "\r\n" + "\r\n"
	143	+ strEmailBody = strEmailBody + "Contact info: " + strTitle + " " + strFirstname + " " + strLastname + "\r\n"
	144	+ strEmailBody = strEmailBody + "Contact role: " + strRole + "\r\n"
153	153	strEmailBody = strEmailBody + "Landline phone: " + strLphone + "\r\n"
154		- strEmailBody = strEmailBody + "Mobile phone:" + strMphone + "\r\n" + "\r\n"
	146	+ strEmailBody = strEmailBody + "Mobile phone: " + strMphone + "\r\n" + "\r\n"
155	155	strEmailBody = strEmailBody + "The request was made from IP address: " + strCreateIP
156	156	strEmailBody = strEmailBody + "\r\n" + "\r\n" + "Please click the below link to confirm your e-mail address:" + "\r\n"
157	157	strEmailBody = strEmailBody + "https://cecocert.com/bin/view/StartPage/X1100%20-%20Process%20e-mail%20confirmation/WebHome"
...	...	@@ -325,9 +325,9 @@
325	325	</td>
326	326	</tr>
327	327	<tr>
328		- <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>
329	329	<td class="style1">
330		- <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">
331	331	</td>
332	332	</tr>
333	333	<tr>
...	...	@@ -709,15 +709,34 @@
709	709	## Check if the mail we tried to send has failed to be sent
710	710	#set ($statuses = $mailResult.statusResult.getAllErrors())
711	711	#if ($statuses.hasNext())
	704	+
	705	+ {{warning}}
	706	+ Something has gone wrong! Please do not try again!
	707	+ {{/warning}}
	708	+
712	712	#set ($status = $statuses.next())
	710	+ {{warning}}
	711	+ I am sorry, but there was a problem with sending you your confirmation e-mail!
	712	+ The data you entered has likely already been stored in our database, and will not need to be entered again.
	713	+ Hence, please do not try entering the information again but instead send an e-mail to contact@cecocert.com informing us about the problem.
	714	+ As the subject line, please enter "CEC Registration - e-mail problem".
	715	+ In the body of the e-mail, please simply provide your name and that of your company.
	716	+ If possible, please copy and paste the error message shown below in red into the e-mail, below your name and that of your company.
	717	+ We are sorry for the inconvenience!
	718	+ {{/warning}}
	719	+
713	713	{{error}}
714	714	Error: $status.errorSummary ($status.state)
715	715	$status.errorDescription
716		- {{/error}}
	723	+ {{/error}}
	724	+
	725	+ #else
	726	+ {{info}}
	727	+ An e-mail asking you to confirm your e-mail address was sent to ${xcontext.strEmail}.
	728	+ Please check your inbox and click on the link to confirm your e-mail address!
	729	+ The process will only continue after you have confirmed your e-mail address.
	730	+ {{/info}}
717	717	#end
718		- An e-mail asking you to confirm your e-mail address was sent to ${xcontext.strEmail}.
719		- Please check your inbox and click on the link to confirm your e-mail address!
720		- The process will only continue after you have confirmed your e-mail address.
721	721	#end
722	722
723	723	{{/velocity}}