archives/FHeD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Releases 40 Activity

Restyle Updates (#135)

Browse Source 
* Restyled by jq

* Restyled by php-cs-fixer

* Restyled by whitespace

Co-authored-by: Restyled.io <commits@restyled.io>
This commit was merged in pull request #135.
This commit is contained in:
restyled-io[bot]
2020-09-05 16:43:48 +01:00
committed by GitHub
parent 9809b028d4
commit e9f1b8477a
4 changed files with 31 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/.env.sample
View File

@@ -14,4 +14,4 @@ OIDC_CLIENT_ID = ""
OIDC_CLIENT_SECRET = ""
OIDC_DISABLE_SSL = ""
SENTRY_ENVIRONMENT = ""
SENTRY_ENVIRONMENT = ""

12
app/composer.json
View File

@@ -1,8 +1,8 @@
{
"require": {
"ramsey/uuid": "^4.0",
"vlucas/phpdotenv": "^5.0",
"jumbojett/openid-connect-php": "^0.9.0",
"sentry/sdk": "^2.1"
}
"require": {
"ramsey/uuid": "^4.0",
"vlucas/phpdotenv": "^5.0",
"jumbojett/openid-connect-php": "^0.9.0",
"sentry/sdk": "^2.1"
}
}

28
app/includes/app_functions.php
View File

@@ -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;
}
}

18
app/includes/prereqs.php
View File

@@ -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);
}