<
From version < 1.25 >
edited by SuperUwe Trueggelmann
on 2022-10-13
To version < 1.12 >
edited by SuperUwe Trueggelmann
on 2022-10-13
>
Change comment: There is no comment for this version

Summary

Details

Page properties
Content
... ... @@ -38,11 +38,7 @@
38 38   if ((strEditCommand == "Correct") || (strEditCommand == "Register") || (strEditCommand == "Proceed")){
39 39  
40 40   strCompanyName = services.cleanStr.alphanum(request.companyname)
41 - strCompanyAddress = services.cleanStr.alphanum(request.companycity)
42 - strCompanyCity = services.cleanStr.alphanum(request.companyaddress)
43 - strCompanyPostcode = services.cleanStr.alphanum(request.companypostcode)
44 - strCompanyProvince = services.cleanStr.alphanum(request.companyprovince)
45 - strCompanyCountry = services.cleanStr.alphanum(request.companycountry)
41 +// println "Received Company name: " + strCompanyName
46 46   strTitle = services.cleanStr.alphanum(request.title)
47 47   strFirstname = services.cleanStr.alphanum(request.firstname)
48 48   strLastname = services.cleanStr.alphanum(request.lastname)
... ... @@ -51,6 +51,7 @@
51 51   strLphone = services.cleanStr.numphone(request.lphone)
52 52   strMphone = services.cleanStr.numphone(request.mphone)
53 53   strEmail = services.cleanStr.alphanum(request.email)
50 +// println "Received E-mail: " + strEmail
54 54   strEmail2 = services.cleanStr.alphanum(request.email2)
55 55   strCreateTime = java.time.ZonedDateTime.now()
56 56   strCreateIP = request.remoteAddr
... ... @@ -120,12 +120,7 @@
120 120   strEmailBody = "Dear " + strPrefname + ","
121 121   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"
122 122   strEmailBody = strEmailBody + "Name: " + strTitle + " " + strFirstname + " " + strLastname + "\r\n"
123 - strEmailBody = strEmailBody + "Registered Business Name: " + strCompanyName + "\r\n"
124 - strEmailBody = strEmailBody + "Registered Business Address: " + strCompanyAddress + "\r\n"
125 - strEmailBody = strEmailBody + "Registered Business City: " + strCompanyAddress + "\r\n"
126 - strEmailBody = strEmailBody + "Registered Business Postal Code: " + strCompanyAddress + "\r\n"
127 - strEmailBody = strEmailBody + "Registered Business Province/State: " + strCompanyAddress + "\r\n"
128 - strEmailBody = strEmailBody + "Registered Business Country: " + strCompanyAddress + "\r\n"
120 + strEmailBody = strEmailBody + "Company: " + strCompanyName + "\r\n"
129 129   strEmailBody = strEmailBody + "Role: " + strRole + "\r\n"
130 130   strEmailBody = strEmailBody + "Landline phone: " + strLphone + "\r\n"
131 131   strEmailBody = strEmailBody + "Mobile phone:" + strMphone + "\r\n" + "\r\n"
... ... @@ -139,11 +139,6 @@
139 139   xcontext.put("strEmailBody",strEmailBody)
140 140  // services.writeLog.writeLogEntry(xcontext.getUser(), request.remoteAddr, doc.space, "INSERT AS NEW", intCurUID)
141 141   xcontext.put("strCompanyName",strCompanyName)
142 - xcontext.put("strCompanyName",strCompanyAddress)
143 - xcontext.put("strCompanyName",strCompanyCity)
144 - xcontext.put("strCompanyName",strCompanyPostcode)
145 - xcontext.put("strCompanyName",strCompanyProvince)
146 - xcontext.put("strCompanyName",strCompanyCountry)
147 147   xcontext.put("strTitle",strTitle)
148 148   xcontext.put("strFirstname",strFirstname)
149 149   xcontext.put("strLastname",strLastname)
... ... @@ -158,11 +158,6 @@
158 158   }
159 159   if (strEditCommand == "Proceed"){
160 160   xcontext.put("strCompanyName",strCompanyName)
161 - xcontext.put("strCompanyName",strCompanyAddress)
162 - xcontext.put("strCompanyName",strCompanyCity)
163 - xcontext.put("strCompanyName",strCompanyPostcode)
164 - xcontext.put("strCompanyName",strCompanyProvince)
165 - xcontext.put("strCompanyName",strCompanyCountry)
166 166   xcontext.put("strTitle",strTitle)
167 167   xcontext.put("strFirstname",strFirstname)
168 168   xcontext.put("strLastname",strLastname)
... ... @@ -177,11 +177,6 @@
177 177   }
178 178   if (strEditCommand == "Correct"){
179 179   xcontext.put("strCompanyName",strCompanyName)
180 - xcontext.put("strCompanyName",strCompanyAddress)
181 - xcontext.put("strCompanyName",strCompanyCity)
182 - xcontext.put("strCompanyName",strCompanyPostcode)
183 - xcontext.put("strCompanyName",strCompanyProvince)
184 - xcontext.put("strCompanyName",strCompanyCountry)
185 185   xcontext.put("strTitle",strTitle)
186 186   xcontext.put("strFirstname",strFirstname)
187 187   xcontext.put("strLastname",strLastname)
... ... @@ -204,40 +204,10 @@
204 204   ##$xcontext.strFormStatus
205 205   #if( $xcontext.strFormStatus == "DataEntry" )
206 206   {{html wiki=false clean=false}}
207 -<head>
208 -<style>
209 -#cecTable {
210 - font-family: Arial, Helvetica, sans-serif;
211 - border-collapse: collapse;
212 - border-color: #007d84
213 - width: 100%;
214 -}
215 -
216 -#cecTable td, #cecTable th {
217 - border: 1px solid #007d84;
218 - padding: 8px;
219 -}
220 -
221 -#cecTable tr:nth-child(even){background-color: #d0d3d4;}
222 -
223 -#cecTable tr:hover {background-color: #ddd;}
224 -
225 -#cecTable th {
226 - padding-top: 12px;
227 - padding-bottom: 12px;
228 - text-align: left;
229 - background-color: #007d84;
230 - color: white;
231 -}
232 -</style>
233 -</head>
234 - <form action="" class="xformInline" method="post" name="Contact Edit Form">
235 - <table id="cecTable"; cellspacing="5px" cellpadding="5%" border="1" width="100%"; align="left">
184 + <form action="" class="xformInline" method="post" name="User Registration Form">
185 + <table id="table1"; cellspacing="5px" cellpadding="5%" border="1" width="100%"; align="left">
236 236   <col style="width:30%">
237 - <col style="width:70%">
238 - <th colspan = "2">
239 - <b>Company Information</b>
240 - </th>
187 + <col style="width:70%">
241 241   <tr>
242 242   <td align="left" class="style1">Company name:</td>
243 243   <td class="style1">
... ... @@ -255,7 +255,7 @@
255 255   <tr>
256 256   <td align="left" class="style1">Registered Business Address - City:</td>
257 257   <td class="style1">
258 - <input type="text" id="companycity" name="companycity" placeholder="Enter the City part of your company's registered business address" size="100">
205 + <input type="text" id="companycity" name="companycity" placeholder="Enter the City part of your company's registered business address" size="50">
259 259   </select>
260 260   </td>
261 261   </tr>
... ... @@ -262,7 +262,7 @@
262 262   <tr>
263 263   <td align="left" class="style1">Registered Business Address - Postal Code:</td>
264 264   <td class="style1">
265 - <input type="text" id="companypostcode" name="companypostcode" placeholder="Enter the Postal Code part of your company's registered business address" size="100">
212 + <input type="text" id="companypostcode" name="companypostcode" placeholder="Enter the Postal Code part of your company's registered business address" size="10">
266 266   </select>
267 267   </td>
268 268   </tr>
... ... @@ -269,21 +269,11 @@
269 269   <tr>
270 270   <td align="left" class="style1">Registered Business Address - Province or State:</td>
271 271   <td class="style1">
272 - <input type="text" id="companyprovince" name="companyprovince" placeholder="Enter the Province or State part of your company's registered business address, leave empty if n/a" size="100">
219 + <input type="text" id="companycity" name="companycity" placeholder="Enter the Province or State part of your company's registered business address, leave empty if not applicable" size="100">
273 273   </select>
274 274   </td>
275 275   </tr>
276 276   <tr>
277 - <td align="left" class="style1">Registered Business Address - Country:</td>
278 - <td class="style1">
279 - <input type="text" id="companycountry" name="companycountry" placeholder="Enter the Country part of your company's registered business address" size="50">
280 - </select>
281 - </td>
282 - </tr>
283 - <th colspan = "2">
284 - <b>Your Contact Information</b>
285 - </th>
286 - <tr>
287 287   <td align="left" class="style1">Title:</td>
288 288   <td class="style1">
289 289   <input type="text" id="title" name="title" placeholder="Enter your title (Ms, Mr, Dr, etc)" size="30">
... ... @@ -350,12 +350,9 @@
350 350   #if( $xcontext.strFormStatus == "DataCorrection" )
351 351   {{html wiki=false clean=false}}
352 352   <form action="" class="xformInline" method="post" name="User Registration Form">
353 - <table id="cecTable"; cellspacing="5px" cellpadding="5%" border="1" width="100%"; align="left">
290 + <table id="table1"; cellspacing="5px" cellpadding="5%" border="1" width="100%"; align="left">
354 354   <col style="width:30%">
355 355   <col style="width:70%">
356 - <th colspan = "2">
357 - <b>Company Information</b>
358 - </th>
359 359   <tr>
360 360   <td align="left" class="style1">Company name:</td>
361 361   <td class="style1">
... ... @@ -364,44 +364,6 @@
364 364   </td>
365 365   </tr>
366 366   <tr>
367 - <td align="left" class="style1">Registered Business Address - House Number, Street:</td>
368 - <td class="style1">
369 - <input type="text" id="companyaddress" name="companyaddress" placeholder="Enter the House Number, Street, Floor, etc part of your company's registered business address" size="100">
370 - </select>
371 - </td>
372 - </tr>
373 - <tr>
374 - <td align="left" class="style1">Registered Business Address - City:</td>
375 - <td class="style1">
376 - <input type="text" id="companycity" name="companycity" placeholder="Enter the City part of your company's registered business address" size="100">
377 - </select>
378 - </td>
379 - </tr>
380 - <tr>
381 - <td align="left" class="style1">Registered Business Address - Postal Code:</td>
382 - <td class="style1">
383 - <input type="text" id="companypostcode" name="companypostcode" placeholder="Enter the Postal Code part of your company's registered business address" size="100">
384 - </select>
385 - </td>
386 - </tr>
387 - <tr>
388 - <td align="left" class="style1">Registered Business Address - Province or State:</td>
389 - <td class="style1">
390 - <input type="text" id="companyprovince" name="companyprovince" placeholder="Enter the Province or State part of your company's registered business address, leave empty if n/a" size="100">
391 - </select>
392 - </td>
393 - </tr>
394 - <tr>
395 - <td align="left" class="style1">Registered Business Address - Country:</td>
396 - <td class="style1">
397 - <input type="text" id="companycountry" name="companycountry" placeholder="Enter the Country part of your company's registered business address" size="50">
398 - </select>
399 - </td>
400 - </tr>
401 - <th colspan = "2">
402 - <b>Your Contact Information</b>
403 - </th>
404 - <tr>
405 405   <td align="left" class="style1">Title:</td>
406 406   <td class="style1">
407 407   <input type="text" id="title" name="title" placeholder="Enter your title" value="${xcontext.strTitle}" size="20">
... ... @@ -555,13 +555,6 @@
555 555  <p>After you click the below <b>Register</b> button, you should receive an automatically generated e-mail to the primary e-mail address you provide in the form above, containing a verification link. You must verify your e-mail address by clicking this verification link contained in the e-mail within 24 hours, otherwise your data may be deleted and you will have to restart the registration process.</p>
556 556  
557 557  <input type="hidden" id="companyname" name="companyname" readonly value="${xcontext.strCompanyName}" size="50">
558 -
559 -<input type="hidden" id="companycity" name="companycity" readonly value="${xcontext.strCompanyAddress}" size="100">
560 -<input type="hidden" id="companyaddress" name="companyaddress" readonly value="${xcontext.strCompanyCity}" size="100">
561 -<input type="hidden" id="companypostcode" name="companypostcode" readonly value="${xcontext.strCompanyPostcode}" size="100">
562 -<input type="hidden" id="companyprovince" name="companyprovince" readonly value="${xcontext.strCompanyProvince}" size="100">
563 -<input type="hidden" id="companycountry" name="companycountry" readonly value="${xcontext.strCompanyCountry}" size="50">
564 -
565 565  <input type="hidden" id="title" name="title" readonly value="${xcontext.strTitle}" size="10">
566 566  <input type="hidden" id="firstname" name="firstname" readonly value="${xcontext.strFirstname}" size="50">
567 567  <input type="hidden" id="lastname" name="lastname" readonly value="${xcontext.strLastname}" size="50">
© 2022 TruCert Assessment Services Inc.
V01-00