From 4e1d50433977fbcbba75a1546f58774d4c13429c Mon Sep 17 00:00:00 2001 From: Josh North Date: Sat, 12 Jun 2021 09:29:10 -0400 Subject: [PATCH] Cleanup and consolidatio --- .tmp/index.php | 19 ++++++++- assets/index.php | 19 ++++++++- autoload.php | 4 +- changelang.php | 2 +- changesite.php | 2 +- css/index.php | 19 ++++++++- fonts/index.php | 19 ++++++++- inc/footer.inc.php | 17 ++++++++ inc/header.inc.php | 2 +- inc/index.php | 19 ++++++++- index.php | 74 +++++++++++++++++---------------- js/index.php | 19 ++++++++- login.php | 4 +- logout.php | 4 +- profile.php | 4 +- reports.php | 2 +- signin.php | 4 +- signin_display.php | 6 +-- signout.php | 6 +-- src/Config/Registry.example.php | 3 +- src/Config/index.php | 19 ++++++++- src/Database/Connect.php | 3 +- src/Database/IDTypeInfo.php | 3 +- src/Database/SiteInfo.php | 3 +- src/Database/Users.php | 3 +- src/Database/VisitActions.php | 3 +- src/Database/VisitInfo.php | 3 +- src/Database/VisitTypeInfo.php | 3 +- src/Database/index.php | 19 ++++++++- src/Language/Translate.php | 3 +- src/Language/index.php | 19 ++++++++- src/Misc/Csrf.php | 16 +++++++ src/Misc/DateFunctions.php | 3 +- src/Misc/PasswordHash.php | 3 +- src/Misc/StaticFunctions.php | 5 +-- src/Misc/index.php | 19 ++++++++- src/index.php | 19 ++++++++- users.php | 2 +- webfonts/index.php | 19 ++++++++- 39 files changed, 320 insertions(+), 95 deletions(-) diff --git a/.tmp/index.php b/.tmp/index.php index 70bbb31..6858dd0 100644 --- a/.tmp/index.php +++ b/.tmp/index.php @@ -1 +1,18 @@ -. + */ + diff --git a/assets/index.php b/assets/index.php index 70bbb31..6858dd0 100644 --- a/assets/index.php +++ b/assets/index.php @@ -1 +1,18 @@ -. + */ + diff --git a/autoload.php b/autoload.php index 723dd72..5b45be8 100755 --- a/autoload.php +++ b/autoload.php @@ -1,6 +1,6 @@ . + */ + diff --git a/fonts/index.php b/fonts/index.php index 70bbb31..6858dd0 100644 --- a/fonts/index.php +++ b/fonts/index.php @@ -1 +1,18 @@ -. + */ + diff --git a/inc/footer.inc.php b/inc/footer.inc.php index a6a28c6..9a00e32 100755 --- a/inc/footer.inc.php +++ b/inc/footer.inc.php @@ -1,4 +1,21 @@ . + */ + $StaticFunctions = new \App\LobbySIO\Misc\StaticFunctions(); // INSTANTIATE CLASSES ?> diff --git a/inc/header.inc.php b/inc/header.inc.php index c01ef48..8a4fe89 100644 --- a/inc/header.inc.php +++ b/inc/header.inc.php @@ -1,6 +1,6 @@ . + */ + diff --git a/index.php b/index.php index 9ee8e20..affec9f 100644 --- a/index.php +++ b/index.php @@ -1,6 +1,6 @@ - getSite($siteid, $uid, "0", "0")[0]["sites_region"] == "EMEA") { ?> + getSite($siteid, $uid, "0", "0")[0]["sites_region"] == "EMEA") { ?> @@ -284,10 +284,10 @@ if (Registry::AUTHMETHOD == 'SAML') { $timein = new DateTime($row['visits_intime'], new DateTimeZone('UTC')); $timein->setTimezone(new DateTimeZone("$timezone")); $timein_disp = $timein->format('Y-m-d H:i:s'); - if(!empty($row['visits_carnum'])) { $carnum=$row['visits_carnum']; } else { $carnum="";}; - if(!empty($row['visits_ssanum'])) { $ssanum=$row['visits_ssanum']; } else { $ssanum="";}; - if(!empty($row['visits_isvendor'])) { $isvendor=$row['visits_isvendor']; } else { $isvendor="";}; - if(!empty($row['visits_approved'])) { $visitapproved=$row['visits_approved']; } else { $visitapproved="";}; + if(!empty($row['visits_carnum'])) { $carnum=$row['visits_carnum']; } else { $carnum="";} + if(!empty($row['visits_ssanum'])) { $ssanum=$row['visits_ssanum']; } else { $ssanum="";} + if(!empty($row['visits_isvendor'])) { $isvendor=$row['visits_isvendor']; } else { $isvendor="";} + if(!empty($row['visits_approved'])) { $visitapproved=$row['visits_approved']; } else { $visitapproved="";} ?> @@ -306,8 +306,8 @@ if (Registry::AUTHMETHOD == 'SAML') { $db_vendorinfo_worksummary = $rowvn['db_vendorinfo_worksummary']; $db_vendorinfo_equipmentsummary = $rowvn['db_vendorinfo_equipmentsummary']; if ($db_vendorinfo_routinework === 1 || $db_vendorinfo_nonroutinework === 1) { - if (!empty($db_vendorinfo_worksummary) && !empty($db_vendorinfo_equipmentsummary)){$initialvendorformcomplete=1;}; - } else $initialvendorformcomplete=0; + if (!empty($db_vendorinfo_worksummary) && !empty($db_vendorinfo_equipmentsummary)){$initialvendorformcomplete=1;} + } else {$initialvendorformcomplete=0;} ?> - + @@ -431,7 +431,7 @@ $db_vendorinfo_checklistcompleted = $rowvm['db_vendorinfo_checklistcompleted']; $db_vendorinfo_workcompleted = $rowvm['db_vendorinfo_workcompleted']; $db_vendorinfo_sitecleanup = $rowvm['db_vendorinfo_sitecleanup']; $db_vendorinfo_doccompleted = $rowvm['db_vendorinfo_doccompleted']; -if ($db_vendorinfo_workcompleted === 1 && $db_vendorinfo_sitecleanup === 1) { $finalvendorformcomplete=1; } else { $finalvendorformcomplete=0; }; +if ($db_vendorinfo_workcompleted === 1 && $db_vendorinfo_sitecleanup === 1) { $finalvendorformcomplete=1; } else { $finalvendorformcomplete=0; } ?> - + - + @@ -601,12 +603,12 @@ if ($db_vendorinfo_workcompleted === 1 && $db_vendorinfo_sitecleanup === 1) { $f
- + getSite($siteid, $uid, "0", "0")[0]["sites_region"] == "US") { ?>
? getCountryInfo($row['visits_citizen'])[0]["countries_name"]; ?>
- +
@@ -621,17 +623,17 @@ if ($db_vendorinfo_workcompleted === 1 && $db_vendorinfo_sitecleanup === 1) { $f     - +
- + getSite($siteid, $uid, "0", "0")[0]["sites_region"] == "EMEA") { ?> / - +
- +
@@ -679,7 +681,7 @@ if ($db_vendorinfo_workcompleted === 1 && $db_vendorinfo_sitecleanup === 1) { $f getCountryInfo('%') as $row) { ?> - +
@@ -700,7 +702,7 @@ if ($db_vendorinfo_workcompleted === 1 && $db_vendorinfo_sitecleanup === 1) { $f }); $('#citizen-').trigger("change"); - +
@@ -713,17 +715,17 @@ if ($db_vendorinfo_workcompleted === 1 && $db_vendorinfo_sitecleanup === 1) { $f     - +
- + getSite($siteid, $uid, "0", "0")[0]["sites_region"] == "EMEA") { ?> / - +
@@ -741,7 +743,7 @@ if ($db_vendorinfo_workcompleted === 1 && $db_vendorinfo_sitecleanup === 1) { $f
- + @@ -757,4 +759,4 @@ if ($db_vendorinfo_workcompleted === 1 && $db_vendorinfo_sitecleanup === 1) { $f - +. + */ + diff --git a/login.php b/login.php index fb8fee5..05258df 100644 --- a/login.php +++ b/login.php @@ -1,6 +1,6 @@ -killSession(); ?> - - + - + - + - + - + -. + */ + diff --git a/src/Database/Connect.php b/src/Database/Connect.php index db2a77f..ad660ab 100755 --- a/src/Database/Connect.php +++ b/src/Database/Connect.php @@ -1,7 +1,6 @@ . + */ + diff --git a/src/Language/Translate.php b/src/Language/Translate.php index 5a72c35..0f6a7b8 100644 --- a/src/Language/Translate.php +++ b/src/Language/Translate.php @@ -1,7 +1,6 @@ . + */ + diff --git a/src/Misc/Csrf.php b/src/Misc/Csrf.php index cd96f20..9dcba15 100644 --- a/src/Misc/Csrf.php +++ b/src/Misc/Csrf.php @@ -1,4 +1,20 @@ . + */ namespace App\LobbySIO\Misc; diff --git a/src/Misc/DateFunctions.php b/src/Misc/DateFunctions.php index cce1823..270cfbe 100755 --- a/src/Misc/DateFunctions.php +++ b/src/Misc/DateFunctions.php @@ -1,7 +1,6 @@ userLanguage(); - echo $transLang['SOFTWARE_VERSION'] . ': lobbysio_v0.19-beta'; + echo $transLang['SOFTWARE_VERSION'] . ': lobbysio_v0.20-beta'; } public function getUTC () { diff --git a/src/Misc/index.php b/src/Misc/index.php index 70bbb31..6858dd0 100644 --- a/src/Misc/index.php +++ b/src/Misc/index.php @@ -1 +1,18 @@ -. + */ + diff --git a/src/index.php b/src/index.php index 70bbb31..6858dd0 100644 --- a/src/index.php +++ b/src/index.php @@ -1 +1,18 @@ -. + */ + diff --git a/users.php b/users.php index 6c74a1b..c15f906 100644 --- a/users.php +++ b/users.php @@ -1,6 +1,6 @@ . + */ +