diff --git a/config/global.config-default.inc.php b/config/global.config-default.inc.php index 32136bef4..2a9afe342 100644 --- a/config/global.config-default.inc.php +++ b/config/global.config-default.inc.php @@ -100,4 +100,7 @@ Ihre Fachhochschule'); // Bei neuen Studierenden UID automatisch als Matrikelnummer setzen (true|false) define('SET_UID_AS_MATRIKELNUMMER',false); + +// Legt fest ob fuer Studierende eine Alias EMail Adresse generiert wird (true|false) +define('GENERATE_ALIAS_STUDENT',true); ?> diff --git a/content/student/studentDBDML.php b/content/student/studentDBDML.php index 8a12a6039..73e1965ce 100644 --- a/content/student/studentDBDML.php +++ b/content/student/studentDBDML.php @@ -1056,12 +1056,17 @@ if(!$error) $nachname_clean = str_replace(' ','_', $nachname_clean); $vorname_clean = str_replace(' ','_', $vorname_clean); - $qry_alias = "SELECT * FROM public.tbl_benutzer WHERE alias=LOWER('".$vorname_clean.".".$nachname_clean."')"; - $result_alias = $db->db_query($qry_alias); - if($db->db_num_rows($result_alias)==0) - $benutzer->alias = $vorname_clean.'.'.$nachname_clean; + if(!defined('GENERATE_ALIAS_STUDENT') || GENERATE_ALIAS_STUDENT===true) + { + $qry_alias = "SELECT * FROM public.tbl_benutzer WHERE alias=LOWER('".$vorname_clean.".".$nachname_clean."')"; + $result_alias = $db->db_query($qry_alias); + if($db->db_num_rows($result_alias)==0) + $benutzer->alias = $vorname_clean.'.'.$nachname_clean; + else + $benutzer->alias = ''; + } else - $benutzer->alias = ''; + $benutzer->alias=''; $benutzer->insertamum = date('Y-m-d H:i:s'); $benutzer->insertvon = $user; diff --git a/vilesci/personen/import/interessentenimport.php b/vilesci/personen/import/interessentenimport.php index 38969931f..306b2a06b 100644 --- a/vilesci/personen/import/interessentenimport.php +++ b/vilesci/personen/import/interessentenimport.php @@ -21,6 +21,7 @@ */ require_once('../../../config/vilesci.config.inc.php'); +require_once('../../../config/global.config.inc.php'); require_once('../../../include/'.EXT_FKT_PATH.'/generateuid.inc.php'); require_once('../../../include/functions.inc.php'); require_once('../../../include/benutzerberechtigung.class.php'); @@ -890,12 +891,17 @@ if(isset($_POST['save'])) $nachname_clean = str_replace(' ','_', $nachname_clean); $vorname_clean = str_replace(' ','_', $vorname_clean); - $qry_alias = "SELECT * FROM public.tbl_benutzer WHERE alias=LOWER('".$vorname_clean.".".$nachname_clean."')"; - $result_alias = $db->db_query($qry_alias); - if($db->db_num_rows($result_alias)==0) - $benutzer->alias =$vorname_clean.'.'.$nachname_clean; - else - $benutzer->alias = ''; + if(!defined('GENERATE_ALIAS_STUDENT') || GENERATE_ALIAS_STUDENT===true) + { + $qry_alias = "SELECT * FROM public.tbl_benutzer WHERE alias=LOWER('".$vorname_clean.".".$nachname_clean."')"; + $result_alias = $db->db_query($qry_alias); + if($db->db_num_rows($result_alias)==0) + $benutzer->alias =$vorname_clean.'.'.$nachname_clean; + else + $benutzer->alias = ''; + } + else + $benutzer->alias=''; $benutzer->insertamum = date('Y-m-d H:i:s'); $benutzer->insertvon = $user; diff --git a/vilesci/personen/incoming_detail.php b/vilesci/personen/incoming_detail.php index 61e17b095..fb872e042 100644 --- a/vilesci/personen/incoming_detail.php +++ b/vilesci/personen/incoming_detail.php @@ -20,6 +20,7 @@ * Karl Burkhart < burkhart@technikum-wien.at > */ require_once('../../config/vilesci.config.inc.php'); +require_once('../../config/global.config.inc.php'); require_once('../../include/functions.inc.php'); require_once('../../include/benutzerberechtigung.class.php'); require_once('../../include/preincoming.class.php'); @@ -343,13 +344,18 @@ if($method!='') $nachname_clean = str_replace(' ','_', $nachname_clean); $vorname_clean = str_replace(' ','_', $vorname_clean); - $qry_alias = "SELECT * FROM public.tbl_benutzer WHERE alias=LOWER(".$db->db_add_param($vorname_clean.".".$nachname_clean).")"; - $result_alias = $db->db_query($qry_alias); - if($db->db_num_rows($result_alias)==0) - $benutzer->alias =$vorname_clean.'.'.$nachname_clean; - else - $benutzer->alias = ''; - + 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).")"; + $result_alias = $db->db_query($qry_alias); + if($db->db_num_rows($result_alias)==0) + $benutzer->alias =$vorname_clean.'.'.$nachname_clean; + else + $benutzer->alias = ''; + } + else + $benutzer->alias=''; + $benutzer->insertamum = date('Y-m-d H:i:s'); $benutzer->insertvon = $user;