Point808/LobbySIO
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Encrypt fixes, add carnum options, remove debug lines

Browse Source
This commit is contained in:
Josh North 2021-10-13 01:54:39 -04:00
parent 14d5e510aa
commit b6642469a8
5 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
classes/visit.php
View File

@ -29,7 +29,7 @@ use App\LobbySIO\Config\Registry;
class visit { class visit {
public function dbprefix() { public function dbprefix() {
echo Registry::DB_PRFX; //echo Registry::DB_PRFX;
} }
// Properties // Properties

8
signin.php
View File

@ -27,8 +27,12 @@
session_save_path('.tmp'); // TEMP session_save_path('.tmp'); // TEMP
session_start(); // START session_start(); // START
require_once __DIR__ . '/autoload.php'; // AUTOLOAD 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 use App\LobbySIO\Misc\Csrf; // ANTICSRF
$StaticFunctions = new \App\LobbySIO\Misc\StaticFunctions(); // DEFAULT CLASSES $StaticFunctions = new \App\LobbySIO\Misc\StaticFunctions(); // DEFAULT CLASSES
$encKey = $StaticFunctions->loadEncryptionKeyFromConfig();
$SiteInfo = new \App\LobbySIO\Database\SiteInfo(); $SiteInfo = new \App\LobbySIO\Database\SiteInfo();
$Users = new \App\LobbySIO\Database\Users(); $Users = new \App\LobbySIO\Database\Users();
if (isset($_SESSION['user_id'])) { // LOGGED IN? GET USER OBJECT if (isset($_SESSION['user_id'])) { // LOGGED IN? GET USER OBJECT
@ -229,13 +233,15 @@ if(empty($form_data['fd_formAction'])){
</div> </div>
</div> </div>
<?php if($SiteInfo->getSite($form_data['fd_siteId'], $uid, "0", "0")[0]["sites_region"] == "EMEA") { ?> <?php if($SiteInfo->getSite($form_data['fd_siteId'], $uid, "0", "0")[0]["sites_region"] == "EMEA") { ?>
<div class="row row-cols-2 mb-4"> <div class="row row-cols-<?php if($StaticFunctions->getCarnumReqd() == "true") { echo "2"; } else { echo "1"; }?> mb-4">
<?php if($StaticFunctions->getCarnumReqd() == "true") { ?>
<div class="col d-grid gap-2"> <div class="col d-grid gap-2">
<div class="input-group mb-3"> <div class="input-group mb-3">
<span class="input-group-text"><?=$transLang['CARNUM']?></span> <span class="input-group-text"><?=$transLang['CARNUM']?></span>
<input type="text" id="fd_carNum" name="fd_carNum" class="form-control" placeholder="<?=$transLang['CARNUM']?>" required autofocus> <input type="text" id="fd_carNum" name="fd_carNum" class="form-control" placeholder="<?=$transLang['CARNUM']?>" required autofocus>
</div> </div>
</div> </div>
<?php } ?>
<div class="col d-grid gap-2"> <div class="col d-grid gap-2">
<div class="input-group mb-3"> <div class="input-group mb-3">
<span class="input-group-text"><?=$transLang['SSANUM']?></span> <span class="input-group-text"><?=$transLang['SSANUM']?></span>

6
signout.php
View File

@ -27,8 +27,12 @@
session_save_path('.tmp'); // TEMP session_save_path('.tmp'); // TEMP
session_start(); // START session_start(); // START
require_once __DIR__ . '/autoload.php'; // AUTOLOAD 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 $StaticFunctions = new \App\LobbySIO\Misc\StaticFunctions(); // DEFAULT CLASSES
$encKey = $StaticFunctions->loadEncryptionKeyFromConfig();
$SiteInfo = new \App\LobbySIO\Database\SiteInfo(); $SiteInfo = new \App\LobbySIO\Database\SiteInfo();
$Users = new \App\LobbySIO\Database\Users(); $Users = new \App\LobbySIO\Database\Users();
if (isset($_SESSION['user_id'])) { // LOGGED IN? GET USER OBJECT if (isset($_SESSION['user_id'])) { // LOGGED IN? GET USER OBJECT

3
src/Config/Registry.example.php
View File

@ -42,7 +42,8 @@ class Registry { const
HIDEFOOTER = 'false', // HIDE TIMESTAMP FOOTER HIDEFOOTER = 'false', // HIDE TIMESTAMP FOOTER
AUTHMETHOD = 'INTERNAL', // Auth users using INTERNAL or SAML AUTHMETHOD = 'INTERNAL', // Auth users using INTERNAL or SAML
AUTHIDP = 'default-sp', // Identity Provider if using 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 // 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!!! // online or via encrypt-test.php. WARNING! Changing after in production WILL BREAK YOUR DATA!!!
CARNUMREQD = 'false' // Disable Carnum fields for UK
;} ;}

4
src/Misc/StaticFunctions.php
View File

@ -60,6 +60,10 @@ class StaticFunctions {
return Registry::DEFAULTTZ; return Registry::DEFAULTTZ;
} }
public function getCarnumReqd () {
return Registry::CARNUMREQD;
}
public function getLogo () { public function getLogo () {
if(file_exists('assets/logo-small.png')) { if(file_exists('assets/logo-small.png')) {
return 'assets/logo-small.png'; return 'assets/logo-small.png';