Cleanup and consolidation, signin process updates

This commit is contained in:
2021-06-11 22:51:00 -04:00
parent ac0225939e
commit f19434ec0c
9 changed files with 480 additions and 838 deletions

View File

@@ -65,20 +65,47 @@
<!-- START CONTENT -->
<?php if (!empty($_POST)) { // PROCESS POST
if (empty(filter_input(INPUT_POST, 'carnum', FILTER_SANITIZE_STRING))) { $carnum="";} else {$carnum=filter_input(INPUT_POST, 'carnum', FILTER_SANITIZE_STRING);};
if (empty(filter_input(INPUT_POST, 'ssanum', FILTER_SANITIZE_STRING))) { $ssanum="";} else {$ssanum=filter_input(INPUT_POST, 'ssanum', FILTER_SANITIZE_STRING);};
if (empty(filter_input(INPUT_POST, 'isvendor', FILTER_SANITIZE_STRING))) { $isvendor="0";} else {$isvendor=filter_input(INPUT_POST, 'isvendor', FILTER_SANITIZE_STRING);};
if (empty(filter_input(INPUT_POST, 'db_vendorinfo_contact1', FILTER_SANITIZE_STRING))) { $db_vendorinfo_contact1="";} else {$db_vendorinfo_contact1=filter_input(INPUT_POST, 'db_vendorinfo_contact1', FILTER_SANITIZE_STRING);};
if (empty(filter_input(INPUT_POST, 'db_vendorinfo_contact2', FILTER_SANITIZE_STRING))) { $db_vendorinfo_contact2="";} else {$db_vendorinfo_contact2=filter_input(INPUT_POST, 'db_vendorinfo_contact2', FILTER_SANITIZE_STRING);};
if (empty(filter_input(INPUT_POST, 'db_vendorinfo_workstart', FILTER_SANITIZE_STRING))) { $db_vendorinfo_workstart="";} else {$db_vendorinfo_workstart=filter_input(INPUT_POST, 'db_vendorinfo_workstart', FILTER_SANITIZE_STRING);};
if (empty(filter_input(INPUT_POST, 'db_vendorinfo_workend', FILTER_SANITIZE_STRING))) { $db_vendorinfo_workend="";} else {$db_vendorinfo_workend=filter_input(INPUT_POST, 'db_vendorinfo_workend', FILTER_SANITIZE_STRING);};
$visitid = $VisitActions->newVisit(filter_input(INPUT_POST, 'firstname', FILTER_SANITIZE_STRING), filter_input(INPUT_POST, 'lastname', FILTER_SANITIZE_STRING), filter_input(INPUT_POST, 'company', FILTER_SANITIZE_STRING), filter_input(INPUT_POST, 'visit_type', FILTER_SANITIZE_STRING), $StaticFunctions->getUTC(), filter_input(INPUT_POST, 'v_signature', FILTER_SANITIZE_STRING), filter_input(INPUT_POST, 'siteid', FILTER_SANITIZE_STRING), "1", filter_input(INPUT_POST, 'e_signature', FILTER_SANITIZE_STRING), filter_input(INPUT_POST, 'escort', FILTER_SANITIZE_STRING), $carnum, $ssanum, $isvendor);
if ($isvendor == "1") {
<?php
// FILTER POSTED DATA
$form_data = filter_input_array(INPUT_POST, [
'form_data_stage' => (string)FILTER_SANITIZE_STRING,
'form_data_siteid' => (int)FILTER_VALIDATE_INT,
'form_data_isvendor' => (int)FILTER_VALIDATE_INT,
'form_data_firstname' => (string)FILTER_SANITIZE_STRING,
'form_data_lastname' => (string)FILTER_SANITIZE_STRING,
'form_data_carnum' => (string)FILTER_SANITIZE_STRING,
'form_data_ssanum' => (string)FILTER_SANITIZE_STRING,
'form_data_company' => (string)FILTER_SANITIZE_STRING,
'form_data_contact1' => (string)FILTER_SANITIZE_STRING,
'form_data_contact2' => (string)FILTER_SANITIZE_STRING,
'form_data_workstart' => (string)FILTER_SANITIZE_STRING,
'form_data_workend' => (string)FILTER_SANITIZE_STRING,
'form_data_visittype' => (int)FILTER_VALIDATE_INT,
'form_data_escortrequired' => (int)FILTER_VALIDATE_INT,
'form_data_v_signature' => (string)FILTER_SANITIZE_STRING,
'form_data_e_signature' => (string)FILTER_SANITIZE_STRING,
'form_data_escortname' => (string)FILTER_SANITIZE_STRING
]);
if (empty($form_data['form_data_carnum'])) { $carnum="";} else {$carnum=$form_data['form_data_carnum'];}
if (empty($form_data['form_data_ssanum'])) { $ssanum="";} else {$ssanum=$form_data['form_data_ssanum'];}
if (empty($form_data['form_data_isvendor'])) { $isvendor="0";} else {$isvendor=$form_data['form_data_isvendor'];}
if (empty($form_data['form_data_contact1'])) { $db_vendorinfo_contact1="";} else {$db_vendorinfo_contact1=$form_data['form_data_contact1'];}
if (empty($form_data['form_data_contact2'])) { $db_vendorinfo_contact2="";} else {$db_vendorinfo_contact2=$form_data['form_data_contact2'];}
if (empty($form_data['form_data_workstart'])) { $db_vendorinfo_workstart="";} else {$db_vendorinfo_workstart=$form_data['form_data_workstart'];}
if (empty($form_data['form_data_workend'])) { $db_vendorinfo_workend="";} else {$db_vendorinfo_workend=$form_data['form_data_workend'];}
$visitid = $VisitActions->newVisit($form_data['form_data_firstname'], $form_data['form_data_lastname'], $form_data['form_data_company'], $form_data['form_data_visittype'], $StaticFunctions->getUTC(), $form_data['form_data_v_signature'], $form_data['form_data_siteid'], "1", $form_data['form_data_e_signature'], $form_data['form_data_escortname'], $carnum, $ssanum, $isvendor);
if($form_data['form_data_isvendor'] === (int)"1") {
$vendorid = $VisitActions->setInfoVendorVisitNew($visitid, $db_vendorinfo_contact1, $db_vendorinfo_contact2, $db_vendorinfo_workstart, $db_vendorinfo_workend);
};
?>
}
// SET INITIAL STAGE
if(!empty($form_data['form_data_stage'])){
$form_data['form_data_stage'] = 'readytosubmit';
}?>
<!-- CONTENT -->
<?php if($form_data['form_data_stage'] === "readytosubmit"){ ?>
<div class="container">
<div class="row row-cols-1">
<div class="col d-grid gap-2">
@@ -95,7 +122,7 @@ if ($isvendor == "1") {
</thead>
<tbody>
<tr>
<td><?php echo $timenow; ?><br><?php echo $transLang[$VisitTypeInfo->getInfoVisitType("%", filter_input(INPUT_POST, 'visit_type', FILTER_SANITIZE_STRING))[0]["visittypes_name"]]; ?></td><td><?php echo filter_input(INPUT_POST, 'company', FILTER_SANITIZE_STRING); ?></td><td><?php echo filter_input(INPUT_POST, 'lastname', FILTER_SANITIZE_STRING); ?>, <?php echo filter_input(INPUT_POST, 'firstname', FILTER_SANITIZE_STRING); ?><br><img src="<?php echo filter_input(INPUT_POST, 'v_signature', FILTER_SANITIZE_STRING); ?>" width="200" height="50" /></td><td><?php if (!empty(filter_input(INPUT_POST, 'escort', FILTER_SANITIZE_STRING))): echo filter_input(INPUT_POST, 'escort', FILTER_SANITIZE_STRING); endif; ?><br /><?php if (!empty(filter_input(INPUT_POST, 'e_signature', FILTER_SANITIZE_STRING))): ?><img src="<?php echo filter_input(INPUT_POST, 'e_signature', FILTER_SANITIZE_STRING); ?>" width="200" height="50" /><?php endif; ?></td>
<td><?php echo $timenow; ?><br><?php echo $transLang[$VisitTypeInfo->getInfoVisitType("%", $form_data['form_data_visittype'])[0]["visittypes_name"]]; ?></td><td><?php echo $form_data['form_data_company']; ?></td><td><?php echo $form_data['form_data_lastname']; ?>, <?php echo $form_data['form_data_firstname']; ?><br><img src="<?php echo $form_data['form_data_v_signature']; ?>" width="200" height="50" /></td><td><?php if (!empty($form_data['form_data_escortname'])): echo $form_data['form_data_escortname']; endif; ?><br /><?php if (!empty($form_data['form_data_e_signature'])): ?><img src="<?php echo $form_data['form_data_e_signature']; ?>" width="200" height="50" /><?php endif; ?></td>
</tr>
</tbody>
</table>
@@ -103,7 +130,7 @@ if ($isvendor == "1") {
</div>
<div class="row row-cols-1">
<div class="col d-grid gap-2">
<?php if($SiteInfo->getSite($siteid, $uid, "0", "0")[0]["sites_region"] == "US") { ?>
<?php if($SiteInfo->getSite($form_data['form_data_siteid'], $uid, "0", "0")[0]["sites_region"] == "US") { ?>
<p><?php echo $transLang['ACKNOWLEDGEMENT']; ?></p>
<?php } ?>
<p><?php echo $transLang['GDPR_TEXT']; ?><p>
@@ -115,7 +142,7 @@ if ($isvendor == "1") {
</div>
</div>
<!-- END CONTENT -->
<?php } else { ?>
<?php }else{ ?>
<!-- START ERROR -->
<div class="container">
<div class="row row-cols-1">