From 310246dd20becfbb85a03eb55bac9162039c3ff7 Mon Sep 17 00:00:00 2001 From: Felix Albrigtsen Date: Tue, 12 Mar 2024 19:33:09 +0100 Subject: [PATCH] Update global config variables --- dist/config.example.php | 15 +++++++++++++++ dist/sql_config_example.php | 6 ------ inc/agenda.php | 2 +- inc/include.php | 2 +- www/admin/aktiviteter/delete.php | 2 +- www/admin/aktiviteter/edit.php | 2 +- www/admin/aktiviteter/index.php | 2 +- www/admin/aktiviteter/update.php | 2 +- www/admin/brukere/index.php | 2 +- www/admin/brukere/update.php | 2 +- www/admin/index.php | 2 +- www/admin/motd/index.php | 2 +- www/admin/motd/update.php | 2 +- www/admin/prosjekter/delete.php | 2 +- www/admin/prosjekter/edit.php | 2 +- www/admin/prosjekter/index.php | 2 +- www/admin/prosjekter/update.php | 2 +- www/door/index.php | 2 +- www/galleri/index.php | 2 +- www/index.php | 2 +- www/prosjekt/edit.php | 2 +- www/prosjekt/mine.php | 2 +- www/prosjekt/update.php | 2 +- 23 files changed, 36 insertions(+), 27 deletions(-) create mode 100644 dist/config.example.php delete mode 100644 dist/sql_config_example.php diff --git a/dist/config.example.php b/dist/config.example.php new file mode 100644 index 0000000..ec22397 --- /dev/null +++ b/dist/config.example.php @@ -0,0 +1,15 @@ + diff --git a/dist/sql_config_example.php b/dist/sql_config_example.php deleted file mode 100644 index af802f3..0000000 --- a/dist/sql_config_example.php +++ /dev/null @@ -1,6 +0,0 @@ -setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION); $agenda = new \pvv\side\Agenda([ new \pvv\side\social\NerdepitsaActivity, diff --git a/inc/include.php b/inc/include.php index 03e9b74..66107f6 100644 --- a/inc/include.php +++ b/inc/include.php @@ -13,7 +13,7 @@ require_once dirname(__DIR__) . implode(DIRECTORY_SEPARATOR, ['', 'vendor', 'sim date_default_timezone_set('Europe/Oslo'); setlocale(LC_ALL, 'nb_NO'); -$pdo = new \PDO($dbDsn, $dbUser, $dbPass); +$pdo = new \PDO($DB_DSN, $DB_USER, $DB_PASS); $pdo->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION); $userManager = new \pvv\admin\UserManager($pdo); diff --git a/www/admin/aktiviteter/delete.php b/www/admin/aktiviteter/delete.php index b51581d..fd55dc6 100644 --- a/www/admin/aktiviteter/delete.php +++ b/www/admin/aktiviteter/delete.php @@ -1,7 +1,7 @@ setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION); $userManager = new \pvv\admin\UserManager($pdo); diff --git a/www/admin/aktiviteter/edit.php b/www/admin/aktiviteter/edit.php index 6e43f5b..1cc40ec 100644 --- a/www/admin/aktiviteter/edit.php +++ b/www/admin/aktiviteter/edit.php @@ -5,7 +5,7 @@ require __DIR__ . '/../../../inc/navbar.php'; require __DIR__ . '/../../../src/_autoload.php'; require __DIR__ . '/../../../config.php'; -$pdo = new \PDO($dbDsn, $dbUser, $dbPass); +$pdo = new \PDO($DB_DSN, $DB_USER, $DB_PASS); $pdo->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION); $userManager = new \pvv\admin\UserManager($pdo); diff --git a/www/admin/aktiviteter/index.php b/www/admin/aktiviteter/index.php index 768b97f..8dc9ba8 100644 --- a/www/admin/aktiviteter/index.php +++ b/www/admin/aktiviteter/index.php @@ -5,7 +5,7 @@ require __DIR__ . '/../../../inc/navbar.php'; require __DIR__ . '/../../../src/_autoload.php'; require __DIR__ . '/../../../config.php'; -$pdo = new \PDO($dbDsn, $dbUser, $dbPass); +$pdo = new \PDO($DB_DSN, $DB_USER, $DB_PASS); $pdo->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION); $userManager = new \pvv\admin\UserManager($pdo); diff --git a/www/admin/aktiviteter/update.php b/www/admin/aktiviteter/update.php index b5abf9b..f96ea0c 100644 --- a/www/admin/aktiviteter/update.php +++ b/www/admin/aktiviteter/update.php @@ -3,7 +3,7 @@ date_default_timezone_set('Europe/Oslo'); setlocale(LC_ALL, 'nb_NO'); require __DIR__ . '/../../../src/_autoload.php'; require __DIR__ . '/../../../config.php'; -$pdo = new \PDO($dbDsn, $dbUser, $dbPass); +$pdo = new \PDO($DB_DSN, $DB_USER, $DB_PASS); $pdo->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION); $userManager = new \pvv\admin\UserManager($pdo); diff --git a/www/admin/brukere/index.php b/www/admin/brukere/index.php index 5c0b04b..dbbfa77 100644 --- a/www/admin/brukere/index.php +++ b/www/admin/brukere/index.php @@ -10,7 +10,7 @@ require_once(__DIR__ . '/../../../vendor/simplesamlphp/simplesamlphp/lib/_autolo $as = new SimpleSAML_Auth_Simple('default-sp'); $attrs = $as->getAttributes(); -$pdo = new \PDO($dbDsn, $dbUser, $dbPass); +$pdo = new \PDO($DB_DSN, $DB_USER, $DB_PASS); $pdo->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION); $userManager = new \pvv\admin\UserManager($pdo); diff --git a/www/admin/brukere/update.php b/www/admin/brukere/update.php index adc2352..2bd1bc9 100644 --- a/www/admin/brukere/update.php +++ b/www/admin/brukere/update.php @@ -5,7 +5,7 @@ setlocale(LC_ALL, 'nb_NO'); error_reporting(E_ALL); require __DIR__ . '/../../../src/_autoload.php'; require __DIR__ . '/../../../config.php'; -$pdo = new \PDO($dbDsn, $dbUser, $dbPass); +$pdo = new \PDO($DB_DSN, $DB_USER, $DB_PASS); $pdo->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION); $userManager = new \pvv\admin\UserManager($pdo); diff --git a/www/admin/index.php b/www/admin/index.php index 0218c04..00c91f1 100644 --- a/www/admin/index.php +++ b/www/admin/index.php @@ -1,7 +1,7 @@ setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION); $userManager = new \pvv\admin\UserManager($pdo); diff --git a/www/admin/motd/index.php b/www/admin/motd/index.php index 76be183..ba55252 100644 --- a/www/admin/motd/index.php +++ b/www/admin/motd/index.php @@ -10,7 +10,7 @@ require_once(__DIR__ . '/../../../vendor/simplesamlphp/simplesamlphp/lib/_autolo $as = new SimpleSAML_Auth_Simple('default-sp'); $attrs = $as->getAttributes(); -$pdo = new \PDO($dbDsn, $dbUser, $dbPass); +$pdo = new \PDO($DB_DSN, $DB_USER, $DB_PASS); $pdo->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION); $userManager = new \pvv\admin\UserManager($pdo); diff --git a/www/admin/motd/update.php b/www/admin/motd/update.php index d92003e..9b63307 100644 --- a/www/admin/motd/update.php +++ b/www/admin/motd/update.php @@ -5,7 +5,7 @@ setlocale(LC_ALL, 'no_NO'); error_reporting(E_ALL); require __DIR__ . '/../../../src/_autoload.php'; require __DIR__ . '/../../../config.php'; -$pdo = new \PDO($dbDsn, $dbUser, $dbPass); +$pdo = new \PDO($DB_DSN, $DB_USER, $DB_PASS); $pdo->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION); $userManager = new \pvv\admin\UserManager($pdo); diff --git a/www/admin/prosjekter/delete.php b/www/admin/prosjekter/delete.php index 83cdc7d..586daa9 100644 --- a/www/admin/prosjekter/delete.php +++ b/www/admin/prosjekter/delete.php @@ -1,7 +1,7 @@ setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION); $userManager = new \pvv\admin\UserManager($pdo); diff --git a/www/admin/prosjekter/edit.php b/www/admin/prosjekter/edit.php index 69f8223..51dc7d4 100644 --- a/www/admin/prosjekter/edit.php +++ b/www/admin/prosjekter/edit.php @@ -5,7 +5,7 @@ require __DIR__ . '/../../../inc/navbar.php'; require __DIR__ . '/../../../src/_autoload.php'; require __DIR__ . '/../../../config.php'; -$pdo = new \PDO($dbDsn, $dbUser, $dbPass); +$pdo = new \PDO($DB_DSN, $DB_USER, $DB_PASS); $pdo->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION); $userManager = new \pvv\admin\UserManager($pdo); diff --git a/www/admin/prosjekter/index.php b/www/admin/prosjekter/index.php index f76b5d0..b372f9a 100644 --- a/www/admin/prosjekter/index.php +++ b/www/admin/prosjekter/index.php @@ -5,7 +5,7 @@ require __DIR__ . '/../../../inc/navbar.php'; require __DIR__ . '/../../../src/_autoload.php'; require __DIR__ . '/../../../config.php'; -$pdo = new \PDO($dbDsn, $dbUser, $dbPass); +$pdo = new \PDO($DB_DSN, $DB_USER, $DB_PASS); $pdo->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION); $userManager = new \pvv\admin\UserManager($pdo); diff --git a/www/admin/prosjekter/update.php b/www/admin/prosjekter/update.php index 2d14490..02e6fa5 100644 --- a/www/admin/prosjekter/update.php +++ b/www/admin/prosjekter/update.php @@ -3,7 +3,7 @@ date_default_timezone_set('Europe/Oslo'); setlocale(LC_ALL, 'nb_NO'); require __DIR__ . '/../../../src/_autoload.php'; require __DIR__ . '/../../../config.php'; -$pdo = new \PDO($dbDsn, $dbUser, $dbPass); +$pdo = new \PDO($DB_DSN, $DB_USER, $DB_PASS); $pdo->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION); $userManager = new \pvv\admin\UserManager($pdo); diff --git a/www/door/index.php b/www/door/index.php index 67bb250..0ca290e 100644 --- a/www/door/index.php +++ b/www/door/index.php @@ -9,7 +9,7 @@ if($_SERVER['REQUEST_METHOD'] === 'POST') { if (isset($_SERVER["HTTP_AUTHORIZATION"])) { list($type, $data) = explode(" ", $_SERVER["HTTP_AUTHORIZATION"], 2); if (strcasecmp($type, "Bearer") == 0) { - if (hash_equals($data, $doorSensorSecret)) { + if (hash_equals($data, $DOOR_SECRET)) { handleSetState(); } else { echo '{"status": "error", "message": "Invalid authentication key"}'; diff --git a/www/galleri/index.php b/www/galleri/index.php index 35d25f4..c5ab4cb 100644 --- a/www/galleri/index.php +++ b/www/galleri/index.php @@ -2,7 +2,7 @@ error_reporting(0); require_once dirname(dirname(__DIR__)) . implode(DIRECTORY_SEPARATOR, ['', 'inc', 'include.php']); -$pdo = new \PDO($dbDsn, $dbUser, $dbPass); +$pdo = new \PDO($DB_DSN, $DB_USER, $DB_PASS); $pdo->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION); $userManager = new \pvv\admin\UserManager($pdo); diff --git a/www/index.php b/www/index.php index 48fb531..11adae9 100644 --- a/www/index.php +++ b/www/index.php @@ -2,7 +2,7 @@ require_once dirname(__DIR__) . implode(DIRECTORY_SEPARATOR, ['', 'inc', 'include.php']); $translation = ['I dag', 'I morgen', 'Denne uka', 'Neste uke', 'Denne måneden', 'Neste måned']; -$pdo = new \PDO($dbDsn, $dbUser, $dbPass); +$pdo = new \PDO($DB_DSN, $DB_USER, $DB_PASS); $pdo->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION); $motdfetcher = new \pvv\side\MOTD($pdo); diff --git a/www/prosjekt/edit.php b/www/prosjekt/edit.php index 306ffc1..ece7a7b 100644 --- a/www/prosjekt/edit.php +++ b/www/prosjekt/edit.php @@ -10,7 +10,7 @@ $as = new SimpleSAML_Auth_Simple('default-sp'); $as->requireAuth(); $attrs = $as->getAttributes(); -$pdo = new \PDO($dbDsn, $dbUser, $dbPass); +$pdo = new \PDO($DB_DSN, $DB_USER, $DB_PASS); $pdo->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION); $projectManager = new \pvv\side\ProjectManager($pdo); diff --git a/www/prosjekt/mine.php b/www/prosjekt/mine.php index b532593..5cf0ddd 100644 --- a/www/prosjekt/mine.php +++ b/www/prosjekt/mine.php @@ -10,7 +10,7 @@ $as = new SimpleSAML_Auth_Simple('default-sp'); $as->requireAuth(); $attrs = $as->getAttributes(); -$pdo = new \PDO($dbDsn, $dbUser, $dbPass); +$pdo = new \PDO($DB_DSN, $DB_USER, $DB_PASS); $pdo->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION); $projectManager = new \pvv\side\ProjectManager($pdo); $projects = $projectManager->getByOwner($attrs['uid'][0]); diff --git a/www/prosjekt/update.php b/www/prosjekt/update.php index 2ac71b3..9822c7f 100644 --- a/www/prosjekt/update.php +++ b/www/prosjekt/update.php @@ -3,7 +3,7 @@ date_default_timezone_set('Europe/Oslo'); setlocale(LC_ALL, 'nb_NO'); require __DIR__ . '/../../src/_autoload.php'; require __DIR__ . '/../../config.php'; -$pdo = new \PDO($dbDsn, $dbUser, $dbPass); +$pdo = new \PDO($DB_DSN, $DB_USER, $DB_PASS); $pdo->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION); if(!isset($_POST['title']) or !isset($_POST['desc']) or !isset($_POST['active'])){