<
From version < 1.29 >
edited by SuperUwe Trueggelmann
on 2022-10-13
To version < 1.14 >
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.companyaddress)
42 - strCompanyCity = services.cleanStr.alphanum(request.companycity)
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
... ... @@ -62,11 +62,6 @@
62 62   sqlQueryInsertRec = "INSERT INTO " + strDBTable +
63 63   """(
64 64   companyname,
65 - companyaddress,
66 - companycity,
67 - companypostcode,
68 - companyprovince,
69 - companycountry,
70 70   title,
71 71   firstname,
72 72   lastname,
... ... @@ -82,11 +82,6 @@
82 82   confemailsentcode)
83 83   VALUES(
84 84   '$strCompanyName',
85 - '$strCompanyAddress',
86 - '$strCompanyCity',
87 - '$strCompanyPostcode',
88 - '$strCompanyProvince',
89 - '$strCompanyCountry',
90 90   '$strTitle',
91 91   '$strFirstname',
92 92   '$strLastname',
... ... @@ -108,11 +108,6 @@
108 108   """
109 109   SET
110 110   companyname = '$strCompanyName',
111 - companyaddress = '$strCompanyAddress',
112 - companycity = '$strCompanyCity',
113 - companypostcode = '$strCompanyPostcode',
114 - companyprovince = '$strCompanyProvince',
115 - companycountry = '$strCompanyCountry',
116 116   title = '$strTitle',
117 117   firstname = '$strFirstname',
118 118   lastname = '$strLastname',
... ... @@ -134,16 +134,8 @@
134 134   }
135 135   strEmailBody = "Dear " + strPrefname + ","
136 136   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"
137 - strEmailBody = strEmailBody + "Registered name:\r\n"
138 138   strEmailBody = strEmailBody + "Name: " + strTitle + " " + strFirstname + " " + strLastname + "\r\n"
139 - strEmailBody = strEmailBody + "Registered Business Address:\r\n"
140 - strEmailBody = strEmailBody + "Registered Business Name: " + strCompanyName + "\r\n"
141 - strEmailBody = strEmailBody + "Registered Business Address: " + strCompanyAddress + "\r\n"
142 - strEmailBody = strEmailBody + "Registered Business City: " + strCompanyAddress + "\r\n"
143 - strEmailBody = strEmailBody + "Registered Business Postal Code: " + strCompanyAddress + "\r\n"
144 - strEmailBody = strEmailBody + "Registered Business Province/State: " + strCompanyAddress + "\r\n"
145 - strEmailBody = strEmailBody + "Registered Business Country: " + strCompanyAddress + "\r\n"
146 - strEmailBody = strEmailBody + "Contact info:"
120 + strEmailBody = strEmailBody + "Company: " + strCompanyName + "\r\n"
147 147   strEmailBody = strEmailBody + "Role: " + strRole + "\r\n"
148 148   strEmailBody = strEmailBody + "Landline phone: " + strLphone + "\r\n"
149 149   strEmailBody = strEmailBody + "Mobile phone:" + strMphone + "\r\n" + "\r\n"
... ... @@ -157,11 +157,6 @@
157 157   xcontext.put("strEmailBody",strEmailBody)
158 158  // services.writeLog.writeLogEntry(xcontext.getUser(), request.remoteAddr, doc.space, "INSERT AS NEW", intCurUID)
159 159   xcontext.put("strCompanyName",strCompanyName)
160 - xcontext.put("strCompanyName",strCompanyAddress)
161 - xcontext.put("strCompanyName",strCompanyCity)
162 - xcontext.put("strCompanyName",strCompanyPostcode)
163 - xcontext.put("strCompanyName",strCompanyProvince)
164 - xcontext.put("strCompanyName",strCompanyCountry)
165 165   xcontext.put("strTitle",strTitle)
166 166   xcontext.put("strFirstname",strFirstname)
167 167   xcontext.put("strLastname",strLastname)
... ... @@ -176,11 +176,6 @@
176 176   }
177 177   if (strEditCommand == "Proceed"){
178 178   xcontext.put("strCompanyName",strCompanyName)
179 - xcontext.put("strCompanyName",strCompanyAddress)
180 - xcontext.put("strCompanyName",strCompanyCity)
181 - xcontext.put("strCompanyName",strCompanyPostcode)
182 - xcontext.put("strCompanyName",strCompanyProvince)
183 - xcontext.put("strCompanyName",strCompanyCountry)
184 184   xcontext.put("strTitle",strTitle)
185 185   xcontext.put("strFirstname",strFirstname)
186 186   xcontext.put("strLastname",strLastname)
... ... @@ -195,11 +195,6 @@
195 195   }
196 196   if (strEditCommand == "Correct"){
197 197   xcontext.put("strCompanyName",strCompanyName)
198 - xcontext.put("strCompanyName",strCompanyAddress)
199 - xcontext.put("strCompanyName",strCompanyCity)
200 - xcontext.put("strCompanyName",strCompanyPostcode)
201 - xcontext.put("strCompanyName",strCompanyProvince)
202 - xcontext.put("strCompanyName",strCompanyCountry)
203 203   xcontext.put("strTitle",strTitle)
204 204   xcontext.put("strFirstname",strFirstname)
205 205   xcontext.put("strLastname",strLastname)
... ... @@ -222,40 +222,10 @@
222 222   ##$xcontext.strFormStatus
223 223   #if( $xcontext.strFormStatus == "DataEntry" )
224 224   {{html wiki=false clean=false}}
225 -<head>
226 -<style>
227 -#cecTable {
228 - font-family: Arial, Helvetica, sans-serif;
229 - border-collapse: collapse;
230 - border-color: #007d84
231 - width: 100%;
232 -}
233 -
234 -#cecTable td, #cecTable th {
235 - border: 1px solid #007d84;
236 - padding: 8px;
237 -}
238 -
239 -#cecTable tr:nth-child(even){background-color: #d0d3d4;}
240 -
241 -#cecTable tr:hover {background-color: #ddd;}
242 -
243 -#cecTable th {
244 - padding-top: 12px;
245 - padding-bottom: 12px;
246 - text-align: left;
247 - background-color: #007d84;
248 - color: white;
249 -}
250 -</style>
251 -</head>
252 - <form action="" class="xformInline" method="post" name="Contact Edit Form">
253 - <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">
254 254   <col style="width:30%">
255 - <col style="width:70%">
256 - <th colspan = "2">
257 - <b>Company Information</b>
258 - </th>
187 + <col style="width:70%">
259 259   <tr>
260 260   <td align="left" class="style1">Company name:</td>
261 261   <td class="style1">
... ... @@ -273,7 +273,7 @@
273 273   <tr>
274 274   <td align="left" class="style1">Registered Business Address - City:</td>
275 275   <td class="style1">
276 - <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">
277 277   </select>
278 278   </td>
279 279   </tr>
... ... @@ -280,7 +280,7 @@
280 280   <tr>
281 281   <td align="left" class="style1">Registered Business Address - Postal Code:</td>
282 282   <td class="style1">
283 - <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">
284 284   </select>
285 285   </td>
286 286   </tr>
... ... @@ -287,7 +287,7 @@
287 287   <tr>
288 288   <td align="left" class="style1">Registered Business Address - Province or State:</td>
289 289   <td class="style1">
290 - <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 n/a" size="100">
291 291   </select>
292 292   </td>
293 293   </tr>
... ... @@ -294,13 +294,10 @@
294 294   <tr>
295 295   <td align="left" class="style1">Registered Business Address - Country:</td>
296 296   <td class="style1">
297 - <input type="text" id="companycountry" name="companycountry" placeholder="Enter the Country part of your company's registered business address" size="50">
226 + <input type="text" id="companycity" name="companycity" placeholder="Enter the Country part of your company's registered business address" size="50">
298 298   </select>
299 299   </td>
300 300   </tr>
301 - <th colspan = "2">
302 - <b>Your Contact Information</b>
303 - </th>
304 304   <tr>
305 305   <td align="left" class="style1">Title:</td>
306 306   <td class="style1">
... ... @@ -368,12 +368,9 @@
368 368   #if( $xcontext.strFormStatus == "DataCorrection" )
369 369   {{html wiki=false clean=false}}
370 370   <form action="" class="xformInline" method="post" name="User Registration Form">
371 - <table id="cecTable"; cellspacing="5px" cellpadding="5%" border="1" width="100%"; align="left">
297 + <table id="table1"; cellspacing="5px" cellpadding="5%" border="1" width="100%"; align="left">
372 372   <col style="width:30%">
373 373   <col style="width:70%">
374 - <th colspan = "2">
375 - <b>Company Information</b>
376 - </th>
377 377   <tr>
378 378   <td align="left" class="style1">Company name:</td>
379 379   <td class="style1">
... ... @@ -382,44 +382,6 @@
382 382   </td>
383 383   </tr>
384 384   <tr>
385 - <td align="left" class="style1">Registered Business Address - House Number, Street:</td>
386 - <td class="style1">
387 - <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">
388 - </select>
389 - </td>
390 - </tr>
391 - <tr>
392 - <td align="left" class="style1">Registered Business Address - City:</td>
393 - <td class="style1">
394 - <input type="text" id="companycity" name="companycity" placeholder="Enter the City part of your company's registered business address" size="100">
395 - </select>
396 - </td>
397 - </tr>
398 - <tr>
399 - <td align="left" class="style1">Registered Business Address - Postal Code:</td>
400 - <td class="style1">
401 - <input type="text" id="companypostcode" name="companypostcode" placeholder="Enter the Postal Code part of your company's registered business address" size="100">
402 - </select>
403 - </td>
404 - </tr>
405 - <tr>
406 - <td align="left" class="style1">Registered Business Address - Province or State:</td>
407 - <td class="style1">
408 - <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">
409 - </select>
410 - </td>
411 - </tr>
412 - <tr>
413 - <td align="left" class="style1">Registered Business Address - Country:</td>
414 - <td class="style1">
415 - <input type="text" id="companycountry" name="companycountry" placeholder="Enter the Country part of your company's registered business address" size="50">
416 - </select>
417 - </td>
418 - </tr>
419 - <th colspan = "2">
420 - <b>Your Contact Information</b>
421 - </th>
422 - <tr>
423 423   <td align="left" class="style1">Title:</td>
424 424   <td class="style1">
425 425   <input type="text" id="title" name="title" placeholder="Enter your title" value="${xcontext.strTitle}" size="20">
... ... @@ -573,13 +573,6 @@
573 573  <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>
574 574  
575 575  <input type="hidden" id="companyname" name="companyname" readonly value="${xcontext.strCompanyName}" size="50">
576 -
577 -<input type="hidden" id="companycity" name="companycity" readonly value="${xcontext.strCompanyAddress}" size="100">
578 -<input type="hidden" id="companyaddress" name="companyaddress" readonly value="${xcontext.strCompanyCity}" size="100">
579 -<input type="hidden" id="companypostcode" name="companypostcode" readonly value="${xcontext.strCompanyPostcode}" size="100">
580 -<input type="hidden" id="companyprovince" name="companyprovince" readonly value="${xcontext.strCompanyProvince}" size="100">
581 -<input type="hidden" id="companycountry" name="companycountry" readonly value="${xcontext.strCompanyCountry}" size="50">
582 -
583 583  <input type="hidden" id="title" name="title" readonly value="${xcontext.strTitle}" size="10">
584 584  <input type="hidden" id="firstname" name="firstname" readonly value="${xcontext.strFirstname}" size="50">
585 585  <input type="hidden" id="lastname" name="lastname" readonly value="${xcontext.strLastname}" size="50">
© 2022 TruCert Assessment Services Inc.
V01-00