diff --git a/app/includes/app_functions.php b/app/includes/app_functions.php index 4cc589a..c70ea82 100644 --- a/app/includes/app_functions.php +++ b/app/includes/app_functions.php @@ -8,21 +8,21 @@ function oidc_set_vars($sub, $uid, $fname, $lname, $email) { - $_SESSION['uuid'] = $sub; - $_SESSION['username'] = $uid; - $_SESSION['given_name'] = $fname; - $_SESSION['family_name'] = $lname; - $_SESSION['full_name'] = $fname . " " . $lname; - $_SESSION['email'] = $email; + $_SESSION['uuid'] = $sub; + $_SESSION['username'] = $uid; + $_SESSION['given_name'] = $fname; + $_SESSION['family_name'] = $lname; + $_SESSION['full_name'] = $fname . " " . $lname; + $_SESSION['email'] = $email; } function is_signed_in() { - if (isset($_SESSION['is_signed_in'])) { - return true; - } else { - return false; - } + if (isset($_SESSION['is_signed_in'])) { + return true; + } else { + return false; + } } function user_exists($db, $uuid) @@ -38,9 +38,9 @@ die(); } if (empty($result)) { - return false; + return false; } else { - return true; + return true; } } diff --git a/app/includes/prereqs.php b/app/includes/prereqs.php index ba1dc19..49f8d98 100644 --- a/app/includes/prereqs.php +++ b/app/includes/prereqs.php @@ -18,15 +18,16 @@ Sentry\init([ // Database auto-generation if (file_exists("/../includes/install.php")) { - return; - add_action('run_db_populate'); + return; + add_action('run_db_populate'); } -function run_db_populate() { +function run_db_populate() +{ // all my glorious one-time-magic. - include( "/../includes/install.php" ); - // after all execution rename your file; - rename( "/../includes/install.php", "/../includes/install-backup.php"); + include("/../includes/install.php"); + // after all execution rename your file; + rename("/../includes/install.php", "/../includes/install-backup.php"); } // Session @@ -38,8 +39,9 @@ $db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION); // OpenID Connect use Jumbojett\OpenIDConnectClient; + $oidc = new OpenIDConnectClient($_ENV['OIDC_HOST'], $_ENV['OIDC_CLIENT_ID'], $_ENV['OIDC_CLIENT_SECRET']); if ($_ENV['OIDC_DISABLE_SSL'] == "true") { - $oidc->setVerifyHost(false); - $oidc->setVerifyPeer(false); + $oidc->setVerifyHost(false); + $oidc->setVerifyPeer(false); }