diff --git a/classes/visit.php b/classes/visit.php index bf2f419..0f0d6c3 100644 --- a/classes/visit.php +++ b/classes/visit.php @@ -29,7 +29,7 @@ use App\LobbySIO\Config\Registry; class visit { public function dbprefix() { - echo Registry::DB_PRFX; + //echo Registry::DB_PRFX; } // Properties diff --git a/signin.php b/signin.php index c4d8b2c..1aac7c3 100644 --- a/signin.php +++ b/signin.php @@ -27,8 +27,12 @@ session_save_path('.tmp'); // TEMP session_start(); // START require_once __DIR__ . '/autoload.php'; // AUTOLOAD + require_once __DIR__ . '/src/Misc/defuse-crypto.phar'; + use App\LobbySIO\Config\Registry; + use Defuse\Crypto\Crypto; use App\LobbySIO\Misc\Csrf; // ANTICSRF $StaticFunctions = new \App\LobbySIO\Misc\StaticFunctions(); // DEFAULT CLASSES + $encKey = $StaticFunctions->loadEncryptionKeyFromConfig(); $SiteInfo = new \App\LobbySIO\Database\SiteInfo(); $Users = new \App\LobbySIO\Database\Users(); if (isset($_SESSION['user_id'])) { // LOGGED IN? GET USER OBJECT @@ -229,13 +233,15 @@ if(empty($form_data['fd_formAction'])){ getSite($form_data['fd_siteId'], $uid, "0", "0")[0]["sites_region"] == "EMEA") { ?> -
+
mb-4"> + getCarnumReqd() == "true") { ?>
+
diff --git a/signout.php b/signout.php index 4bce2d1..57f9688 100644 --- a/signout.php +++ b/signout.php @@ -27,8 +27,12 @@ session_save_path('.tmp'); // TEMP session_start(); // START require_once __DIR__ . '/autoload.php'; // AUTOLOAD - use App\LobbySIO\Misc\Csrf; // ANTICSRF + require_once __DIR__ . '/src/Misc/defuse-crypto.phar'; + use App\LobbySIO\Config\Registry; + use Defuse\Crypto\Crypto; + use App\LobbySIO\Misc\Csrf; // ANTICSRF $StaticFunctions = new \App\LobbySIO\Misc\StaticFunctions(); // DEFAULT CLASSES + $encKey = $StaticFunctions->loadEncryptionKeyFromConfig(); $SiteInfo = new \App\LobbySIO\Database\SiteInfo(); $Users = new \App\LobbySIO\Database\Users(); if (isset($_SESSION['user_id'])) { // LOGGED IN? GET USER OBJECT diff --git a/src/Config/Registry.example.php b/src/Config/Registry.example.php index 80973a1..4daf2cd 100644 --- a/src/Config/Registry.example.php +++ b/src/Config/Registry.example.php @@ -42,7 +42,8 @@ class Registry { const HIDEFOOTER = 'false', // HIDE TIMESTAMP FOOTER AUTHMETHOD = 'INTERNAL', // Auth users using INTERNAL or SAML AUTHIDP = 'default-sp', // Identity Provider if using SAML - ENCKEY = 'def00000231550b3ca99ed79ffe1010c5555d9ff9f6b3d0844c65dd5705aa72da77d427c76a50c7a19e52e5e3c38137f2db2d95a4d845c85b691e384d9ba6ee6e706baac' + ENCKEY = 'def00000231550b3ca99ed79ffe1010c5555d9ff9f6b3d0844c65dd5705aa72da77d427c76a50c7a19e52e5e3c38137f2db2d95a4d845c85b691e384d9ba6ee6e706baac', // CHANGE ME BEFORE USING! Encryption key - 136 char ascii encryption key - generate // online or via encrypt-test.php. WARNING! Changing after in production WILL BREAK YOUR DATA!!! + CARNUMREQD = 'false' // Disable Carnum fields for UK ;} diff --git a/src/Misc/StaticFunctions.php b/src/Misc/StaticFunctions.php index 893d675..97c3795 100644 --- a/src/Misc/StaticFunctions.php +++ b/src/Misc/StaticFunctions.php @@ -60,6 +60,10 @@ class StaticFunctions { return Registry::DEFAULTTZ; } + public function getCarnumReqd () { + return Registry::CARNUMREQD; + } + public function getLogo () { if(file_exists('assets/logo-small.png')) { return 'assets/logo-small.png';