From dee4af2fb8ffa13985cf476f07e819d07c02805c Mon Sep 17 00:00:00 2001 From: Nikolaus Krondraf Date: Tue, 21 Feb 2023 08:02:15 +0100 Subject: [PATCH] add parameters to generateUID() --- content/student/studentDBDML.php | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/content/student/studentDBDML.php b/content/student/studentDBDML.php index fc2043b54..2d5c9e0b8 100644 --- a/content/student/studentDBDML.php +++ b/content/student/studentDBDML.php @@ -1797,7 +1797,13 @@ if(!$error) $stg = $prestd->studiengang_kz; $stg_obj = new studiengang(); $stg_obj->load(ltrim($stg,'0')); - $uid = generateUID($stg_obj->kurzbz,$jahr,$stg_obj->typ,$matrikelnr); + + $nachname_clean = mb_strtolower(convertProblemChars($prestd->nachname)); + $vorname_clean = mb_strtolower(convertProblemChars($prestd->vorname)); + $nachname_clean = str_replace(' ','_', $nachname_clean); + $vorname_clean = str_replace(' ','_', $vorname_clean); + + $uid = generateUID($stg_obj->kurzbz,$jahr,$stg_obj->typ,$matrikelnr,$vorname_clean,$nachname_clean); $matrikelnummer = generateMatrikelnr($stg_obj->oe_kurzbz); if($matrikelnummer != null) @@ -1823,11 +1829,6 @@ if(!$error) $benutzer->aktiv = true; $benutzer->aktivierungscode = generateActivationKey(); - $nachname_clean = mb_strtolower(convertProblemChars($prestd->nachname)); - $vorname_clean = mb_strtolower(convertProblemChars($prestd->vorname)); - $nachname_clean = str_replace(' ','_', $nachname_clean); - $vorname_clean = str_replace(' ','_', $vorname_clean); - if(!defined('GENERATE_ALIAS_STUDENT') || GENERATE_ALIAS_STUDENT===true) { $qry_alias = "SELECT * FROM public.tbl_benutzer WHERE alias=LOWER(".$db->db_add_param($vorname_clean.".".$nachname_clean).")";