From 9f38e2af1a68fec698287c3e94a550099221d8f1 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Sat, 10 Feb 2018 18:33:36 +0100 Subject: [PATCH] Move agenda creation to single include This is to minimize problems arizing from adding and removing recurring events --- inc/agenda.php | 11 +++++++++++ www/index.php | 10 +--------- www/kalender/index.php | 13 ++----------- 3 files changed, 14 insertions(+), 20 deletions(-) create mode 100644 inc/agenda.php diff --git a/inc/agenda.php b/inc/agenda.php new file mode 100644 index 0000000..92e393c --- /dev/null +++ b/inc/agenda.php @@ -0,0 +1,11 @@ +setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION); +$agenda = new \pvv\side\Agenda([ + new \pvv\side\social\NerdepitsaActivity, + new \pvv\side\social\AnimekveldActivity, + new \pvv\side\DBActivity($pdo), + ]); diff --git a/www/index.php b/www/index.php index 7f35b23..dc7ced3 100644 --- a/www/index.php +++ b/www/index.php @@ -2,17 +2,9 @@ date_default_timezone_set('Europe/Oslo'); setlocale(LC_ALL, 'nb_NO'); require __DIR__ . '/../inc/navbar.php'; -require __DIR__ . '/../src/_autoload.php'; -require __DIR__ . '/../sql_config.php'; +require __DIR__ . '/../inc/agenda.php'; $translation = ['i dag', 'i morgen', 'denne uka', 'neste uke', 'denne måneden', 'neste måned']; -$pdo = new \PDO($dbDsn, $dbUser, $dbPass); -$pdo->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION); -$agenda = new \pvv\side\Agenda([ - new \pvv\side\social\NerdepitsaActivity, - new \pvv\side\social\AnimekveldActivity, - new \pvv\side\DBActivity($pdo), - ]); ?> diff --git a/www/kalender/index.php b/www/kalender/index.php index 8d69db4..a77ea10 100644 --- a/www/kalender/index.php +++ b/www/kalender/index.php @@ -1,19 +1,10 @@ setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION); -$agenda = new \pvv\side\Agenda([ - new \pvv\side\social\NerdepitsaActivity, - new \pvv\side\social\AnimekveldActivity, - new \pvv\side\DBActivity($pdo), -]); $year = (isset($_GET['year'])) ? $_GET['year']