From 53d97b5ccd430b93cbc127b473b3190f3e757cf0 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Sat, 28 Oct 2017 20:55:24 +0200 Subject: [PATCH] Fix navbar in adminpanel --- .gitignore | 2 +- www/admin/aktiviteter/edit.php | 29 +++++++++++++++++++++++------ www/admin/aktiviteter/index.php | 13 +++++++------ www/admin/prosjekter/edit.php | 20 ++++++++++++++++++-- www/admin/prosjekter/index.php | 2 +- 5 files changed, 50 insertions(+), 16 deletions(-) diff --git a/.gitignore b/.gitignore index 9c8cecf..2bc9773 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,4 @@ *.sqlite /test.sql /vendor/ -/www/simplesaml \ No newline at end of file +/www/simplesaml diff --git a/www/admin/aktiviteter/edit.php b/www/admin/aktiviteter/edit.php index fcdc3e2..bc14ee4 100644 --- a/www/admin/aktiviteter/edit.php +++ b/www/admin/aktiviteter/edit.php @@ -5,6 +5,9 @@ setlocale(LC_ALL, 'no_NO'); error_reporting(E_ALL); require __DIR__ . '/../../../src/_autoload.php'; require __DIR__ . '/../../../sql_config.php'; +require_once(__DIR__ . '/../../../vendor/simplesamlphp/simplesamlphp/lib/_autoload.php'); +$as = new SimpleSAML_Auth_Simple('default-sp'); +$attrs = $as->getAttributes(); $pdo = new \PDO($dbDsn, $dbUser, $dbPass); $pdo->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION); $customActivity = new \pvv\side\DBActivity($pdo); @@ -47,11 +50,25 @@ if($new == 0){ -