Merge branch 'master' into feature-69185/PHP8-Vilesci_Berechtigungen

application/libraries/AuthLib.php

@@ -64,7 +64,7 @@ class AuthLib
 		{
 			// - The uid must be NOT an empty string
 			// - The current user should NOT be already logged as the given uid
-			if (!isEmptyString($uid) && $this->getAuthObj()->{self::AO_USERNAME} != $uid)
+			if (!isEmptyString($uid) && $this->getAuthObj()->username != $uid)
 			{
 				$this->_ci->load->library('PermissionLib'); // Loads permissions library
 
@@ -75,28 +75,8 @@ class AuthLib
 					$loginAS = $this->_createAuthObjByPerson(array('uid' => $uid));
 					if (isSuccess($loginAS))
 					{
-						$authObj = getData($loginAS); // get the authenticate object
-
 						// Store the new authentication object in authentication session
-						setSessionElement(self::SESSION_NAME, self::SESSION_AUTH_OBJ, $authObj);
-
-						$authObjOrigin = getSessionElement(self::SESSION_NAME, self::SESSION_AUTH_OBJ_ORIGIN);
-
-						// Load the LogLib
-						$this->_ci->load->library('LogLib');
-						// Setup the LogLib
-						$this->_ci->loglib->setConfigs(
-							array(
-								'dbLogType' => 'API', // required
-								'dbExecuteUser' => $authObjOrigin->{self::AO_USERNAME}, // current logged user
-								'requestId' => 'API'
-							)
-						);
-						// Log into the database
-						$this->_ci->loglib->logInfoDB(
-							'The user "'.$authObjOrigin->{self::AO_USERNAME}.'" has changed identity with the user "'.$authObj->{self::AO_USERNAME}.
-							'" and person id '.$authObj->{self::AO_PERSON_ID}
-						);
+						setSessionElement(self::SESSION_NAME, self::SESSION_AUTH_OBJ, getData($loginAS));
 					}
 				}
 				else
@@ -125,7 +105,7 @@ class AuthLib
 		{
 			// - The person id must be a number
 			// - The current user should NOT be already logged as the given person id
-			if (is_numeric($person_id) && $this->getAuthObj()->{self::AO_PERSON_ID} != $person_id)
+			if (is_numeric($person_id) && $this->getAuthObj()->person_id != $person_id)
 			{
 				$this->_ci->load->library('PermissionLib'); // Loads permissions library
 
@@ -144,24 +124,6 @@ class AuthLib
 							{
 								// Store the new authentication object in authentication session
 								setSessionElement(self::SESSION_NAME, self::SESSION_AUTH_OBJ, $authObj);
-
-								$authObjOrigin = getSessionElement(self::SESSION_NAME, self::SESSION_AUTH_OBJ_ORIGIN);
-
-								// Load the LogLib
-								$this->_ci->load->library('LogLib');
-								// Setup the LogLib
-								$this->_ci->loglib->setConfigs(
-									array(
-										'dbLogType' => 'API', // required
-										'dbExecuteUser' => $authObjOrigin->{self::AO_USERNAME}, // current logged user
-										'requestId' => 'API'
-									)
-								);
-								// Log into the database
-								$this->_ci->loglib->logInfoDB(
-									'The user "'.$authObjOrigin->{self::AO_USERNAME}.'" has changed identity with the user "'.$authObj->{self::AO_USERNAME}.
-									'" and person id '.$authObj->{self::AO_PERSON_ID}
-								);
 							}
 							else // if does NOT have permissions
 							{
@@ -210,22 +172,6 @@ class AuthLib
 			// The LoginAs account is logged out
 			// The user is again connected with its real account
 			setSessionElement(self::SESSION_NAME, self::SESSION_AUTH_OBJ, $authObjOrigin);
-
-			// Load the LogLib
-			$this->_ci->load->library('LogLib');
-			// Setup the LogLib
-			$this->_ci->loglib->setConfigs(
-				array(
-					'dbLogType' => 'API', // required
-					'dbExecuteUser' => $authObjOrigin->{self::AO_USERNAME}, // current logged user
-					'requestId' => 'API'
-				)
-			);
-			// Log into the database
-			$this->_ci->loglib->logInfoDB(
-				'The user "'.$authObjOrigin->{self::AO_USERNAME}.'" has logout from the user "'.$authObj->{self::AO_USERNAME}.
-				'" and person id '.$authObj->{self::AO_PERSON_ID}
-			);
 		}
 	}
 
@@ -662,4 +608,3 @@ class AuthLib
 		return $finalUserBasicDataByUID;
 	}
 }
-

include/basis_db.class.php

@@ -50,12 +50,12 @@ abstract class db extends basis
 	abstract function db_fetch_array($result=null);
 	abstract function db_fetch_row($result=null, $i=null);
 	abstract function db_fetch_assoc($result=null, $i=null);
-	abstract function db_result($result = null, $i, $item);
+	abstract function db_result($result = null, $i=null, $item=null);
 	abstract function db_num_rows($result=null);
 	abstract function db_num_fields($result=null);
-	abstract function db_field_name($result=null, $i);
+	abstract function db_field_name($result=null, $i=null);
 	abstract function db_affected_rows($result=null);
-	abstract function db_result_seek($result=null, $offset);
+	abstract function db_result_seek($result=null, $offset=null);
 	abstract function db_last_error();
 	abstract function db_free_result($result=null);
 	abstract function db_version();

include/benutzer.class.php

@@ -33,6 +33,15 @@ class benutzer extends person
 	public $updateaktivam;
 	public $updateaktivvon;
 
+	// PHP8 adaption
+	public $mitarbeiter_uid;
+	public $studiengang;
+	public $studiengang_kz;
+	public $telefonklappe;
+	public $raum;
+	public $lektor;
+	public $fixangestellt;
+
 	/**
 	 * Konstruktor - Uebergibt die Connection und laedt optional einen Benutzer
 	 * @param $uid            Benutzer der geladen werden soll (default=null)

include/benutzerberechtigung.class.php

@@ -134,12 +134,12 @@ class benutzerberechtigung extends basis_db
 			return false;
 		}
 
-		if(mb_strlen($this->berechtigung_kurzbz)>32)
+		if(mb_strlen($this->berechtigung_kurzbz ?? '')>32)
 		{
 			$this->errormsg = 'Berechtigung_kurzbz darf nicht laenger als 32 Zeichen sein';
 			return false;
 		}
-		if(mb_strlen($this->uid)>32)
+		if(mb_strlen($this->uid ?? '')>32)
 		{
 			$this->errormsg = 'UID darf nicht laenger als 32 Zeichen sein';
 			return false;

include/mitarbeiter.class.php

@@ -411,7 +411,7 @@ class mitarbeiter extends benutzer
 	 * @param $datum_bis
 	 * @return boolean
 	 */
-	public function getMitarbeiterStg($lektor=true,$fixangestellt, $stge, $fkt_kurzbz, $order='studiengang_kz, nachname, vorname, kurzbz', $datum_von='', $datum_bis='')
+	public function getMitarbeiterStg($lektor=true,$fixangestellt=null, $stge=null, $fkt_kurzbz='', $order='studiengang_kz, nachname, vorname, kurzbz', $datum_von='', $datum_bis='')
 	{
 		$sql_query='SELECT DISTINCT campus.vw_mitarbeiter.*, studiengang_kz, tbl_studiengang.typ, tbl_studiengang.kurzbz AS stg_kurzbz FROM campus.vw_mitarbeiter
 					JOIN public.tbl_benutzerfunktion USING (uid) JOIN public.tbl_studiengang USING(oe_kurzbz)
@@ -1554,7 +1554,7 @@ class mitarbeiter extends benutzer
      * @param $studSemArray Array mit Studiensemestern in denen der externe Lektor zumindest in einem Unterrichtet haben soll oder NULL. Wenn NULL werden nur externe Mitarbeiter ohne Lehrauftrag ausgegeben.
      * @return boolean
      */
-    public function getMitarbeiterForZutrittskarte($filter, $fixangestellt=true, $studSemArray)
+    public function getMitarbeiterForZutrittskarte($filter, $fixangestellt=true, $studSemArray=array())
     {
         $qry = "SELECT
                     vorname,nachname,gebdatum,uid,personalnummer,person_id

include/pgsql.class.php

@@ -115,7 +115,7 @@ class basis_db extends db
 		}
 	}
 
-	public function db_result($result = null, $i,$item)
+	public function db_result($result = null, $i=null,$item=null)
 	{
 		if(is_null($result))
 		{
@@ -164,7 +164,7 @@ class basis_db extends db
 			return pg_affected_rows($result);
 	}
 
-	public function db_result_seek($result=null, $offset)
+	public function db_result_seek($result=null, $offset=null)
 	{
 		if(is_null($result))
 			return pg_result_seek($this->db_result, $offset);
@@ -191,7 +191,7 @@ class basis_db extends db
 	/**
 	 * Liefert den Feldnamen mit index i
 	 */
-	public function db_field_name($result=null, $i)
+	public function db_field_name($result=null, $i=null)
 	{
 		if(is_null($result))
 			return pg_field_name($this->db_result, $i);
@@ -230,7 +230,7 @@ class basis_db extends db
 	 */
 	public function db_escape($var)
 	{
-		return pg_escape_string($var);
+		return pg_escape_string(basis_db::$db_conn, $var);
 	}
 
 	/**

vilesci/stammdaten/benutzerberechtigung_details.php

@@ -725,7 +725,7 @@ if (isset($_REQUEST['uid']) || isset($_REQUEST['funktion_kurzbz']))
 				$htmlstr .= '</a></p>';
 			}
 		}
-		if (count($bn) > 0)
+		if (count($bn->berechtigungen) > 0)
 		{
 			$htmlstr .= "<p><a href='benutzerberechtigung_detailliste.php?uid=$uid' target='_blank'>Rechte Detailaufschlüsselung</a></p>";
 		}
@@ -928,7 +928,7 @@ if (isset($_REQUEST['uid']) || isset($_REQUEST['funktion_kurzbz']))
 			$data = 'gruen';
 		}
 		// Inaktive Elemente sowie WaWi-Rechte ausblenden
-		if ($b->ende!='' && strtotime($b->ende) < $heute || $b->rolle_kurzbz == 'wawi' || substr($b->berechtigung_kurzbz, 0, 4) == 'wawi')
+		if ($b->ende!='' && strtotime($b->ende) < $heute || $b->rolle_kurzbz == 'wawi' || substr($b->berechtigung_kurzbz ?? '', 0, 4) == 'wawi')
 		{
 			$htmlstr .= "	<tr class='row_berechtigung ausgeblendet' id='".$b->benutzerberechtigung_id."'>";
 			$countInaktiveUndWawi++;
@@ -1061,7 +1061,7 @@ if (isset($_REQUEST['uid']) || isset($_REQUEST['funktion_kurzbz']))
 									name='dataset[$b->benutzerberechtigung_id][anmerkung]'
 									class='input_anmerkung $inaktiv_class' 
 									value='".$b->anmerkung."' 
-									title='".$db->convert_html_chars(mb_eregi_replace('\r'," ",$b->anmerkung))."' 
+									title='".$db->convert_html_chars(mb_eregi_replace('\r'," ",$b->anmerkung ?? ''))."' 
 									data-toggle='tooltip' 
 									data-html='true' 
 									data-placement='auto'