From 269f463f1612f9dd8fc22bb329993604f29fe139 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Thu, 25 Jun 2020 12:57:57 +0200
Subject: Make surname and eppn configurable

---
 inc/user.inc.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'inc')

diff --git a/inc/user.inc.php b/inc/user.inc.php
index 6e3c06d..e2523f9 100644
--- a/inc/user.inc.php
+++ b/inc/user.inc.php
@@ -181,8 +181,8 @@ class User
 				Util::redirect('?do=Main&force-cookie=true.dat');
 		}
 		self::$isShib = true;
-		if (!isset($_SERVER['sn']))
-			$_SERVER['sn'] = '';
+		if (!isset($_SERVER[CONFIG_SURNAME]))
+			$_SERVER[CONFIG_SURNAME] = '';
 		if (!isset($_SERVER['givenName']))
 			$_SERVER['givenName'] = '';
 		if (!isset($_SERVER['mail']))
@@ -192,7 +192,7 @@ class User
 			'userid' => NULL,
 			'shibid' => $shibId,
 			'firstname' => $_SERVER['givenName'],
-			'lastname' => $_SERVER['sn'],
+			'lastname' => $_SERVER[CONFIG_SURNAME],
 			'email' => $_SERVER['mail'],
 		);
 		// Figure out whether the user should be considered a tutor
@@ -205,7 +205,7 @@ class User
 		else
 			self::$user['role'] = 'STUDENT';
 		// Try to figure out organization
-		if (isset($_SERVER['eppn']) && preg_match('/@([0-9a-zA-Z\-\._]+)$/', $_SERVER['eppn'], $out)) {
+		if (isset($_SERVER[CONFIG_EPPN]) && preg_match('/@([0-9a-zA-Z\-\._]+)$/', $_SERVER[CONFIG_EPPN], $out)) {
 			self::$user['organization'] = $out[1];
 		}
 		if (!isset(self::$user['organization']) && isset($_SERVER['affiliation']) && preg_match('/@([0-9a-zA-Z\-\._]+)(;|$)/', $_SERVER['affiliation'], $out)) {
-- 
cgit v1.2.3-55-g7522