Merge branch 'master' into feature-76233/LoginAsUser_Logging

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()->username != $uid)
+			if (!isEmptyString($uid) && $this->getAuthObj()->{self::AO_USERNAME} != $uid)
 			{
 				$this->_ci->load->library('PermissionLib'); // Loads permissions library
 
@@ -75,8 +75,28 @@ 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, getData($loginAS));
+						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
@@ -105,7 +125,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()->person_id != $person_id)
+			if (is_numeric($person_id) && $this->getAuthObj()->{self::AO_PERSON_ID} != $person_id)
 			{
 				$this->_ci->load->library('PermissionLib'); // Loads permissions library
 
@@ -124,6 +144,24 @@ 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
 							{
@@ -172,6 +210,22 @@ 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}
+			);
 		}
 	}
 
@@ -608,3 +662,4 @@ class AuthLib
 		return $finalUserBasicDataByUID;
 	}
 }
+

include/basis_db.class.php

@@ -27,8 +27,8 @@ require_once(dirname(__FILE__).'/basis.class.php');
 
 abstract class db extends basis
 {
-	protected static $db_conn = null;
-	protected $db_result = null;
+	protected static $db_conn=null;
+	protected $db_result=null;
 	protected $debug=false;
 
 	function __construct()
@@ -46,18 +46,18 @@ abstract class db extends basis
 
 	abstract function db_connect();
 	abstract function db_query($sql);
-	abstract function db_fetch_object($result = null, $i = null);
-	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 = 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 = null);
-	abstract function db_affected_rows($result = null);
-	abstract function db_result_seek($result = null, $offset = null);
+	abstract function db_fetch_object($result=null, $i=null);
+	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_num_rows($result=null);
+	abstract function db_num_fields($result=null);
+	abstract function db_field_name($result=null, $i);
+	abstract function db_affected_rows($result=null);
+	abstract function db_result_seek($result=null, $offset);
 	abstract function db_last_error();
-	abstract function db_free_result($result = null);
+	abstract function db_free_result($result=null);
 	abstract function db_version();
 	abstract function db_escape($var);
 	abstract function db_null_value($var, $qoute=true);

include/organisationseinheit.class.php

@@ -49,8 +49,6 @@ class organisationseinheit extends basis_db
 	public $beschreibung;
 	public $oetyp_bezeichnung;
 
-	public $kurzzeichen;
-
 
 	/**
 	 * Konstruktor

include/pgsql.class.php

@@ -44,7 +44,7 @@ class basis_db extends db
 
 	public function db_query($sql)
 	{
-		if ($this->db_result = @pg_query(basis_db::$db_conn,$sql))
+		if ($this->db_result=pg_query(basis_db::$db_conn,$sql))
 			return $this->db_result;
 		else
 		{
@@ -53,7 +53,7 @@ class basis_db extends db
 		}
 	}
 
-	public function db_num_rows($result = null)
+	public function db_num_rows($result=null)
 	{
 		if(is_null($result))
 			return pg_num_rows($this->db_result);
@@ -61,7 +61,7 @@ class basis_db extends db
 			return pg_num_rows($result);
 	}
 
-	public function db_fetch_object($result = null, $i = null)
+	public function db_fetch_object($result = null, $i=null)
 	{
 		if(is_null($result))
 		{
@@ -79,7 +79,7 @@ class basis_db extends db
 		}
 	}
 
-	public function db_fetch_row($result = null, $i = null)
+	public function db_fetch_row($result = null, $i=null)
 	{
 		if(is_null($result))
 		{
@@ -97,7 +97,7 @@ class basis_db extends db
 		}
 	}
 
-	public function db_fetch_assoc($result = null, $i = null)
+	public function db_fetch_assoc($result = null, $i=null)
 	{
 		if(is_null($result))
 		{
@@ -115,7 +115,7 @@ class basis_db extends db
 		}
 	}
 
-	public function db_result($result = null, $i = null, $item = null)
+	public function db_result($result = null, $i,$item)
 	{
 		if(is_null($result))
 		{
@@ -153,10 +153,10 @@ class basis_db extends db
 
 	public function db_last_error()
 	{
-		return pg_last_error(basis_db::$db_conn);
+		return pg_last_error();
 	}
 
-	public function db_affected_rows($result = null)
+	public function db_affected_rows($result=null)
 	{
 		if(is_null($result))
 			return pg_affected_rows($this->db_result);
@@ -164,7 +164,7 @@ class basis_db extends db
 			return pg_affected_rows($result);
 	}
 
-	public function db_result_seek($result = null, $offset = null)
+	public function db_result_seek($result=null, $offset)
 	{
 		if(is_null($result))
 			return pg_result_seek($this->db_result, $offset);
@@ -172,7 +172,7 @@ class basis_db extends db
 			return pg_result_seek($result, $offset);
 	}
 
-	public function db_fetch_array($result = null, $row = null, $result_type=PGSQL_NUM)
+	public function db_fetch_array($result=null, $row=null, $result_type=PGSQL_NUM)
 	{
 		if(is_null($result))
 			return pg_fetch_array($this->db_result, $row, $result_type);
@@ -180,7 +180,7 @@ class basis_db extends db
 			return pg_fetch_array($result, $row, $result_type);
 	}
 
-	public function db_num_fields($result = null)
+	public function db_num_fields($result=null)
 	{
 		if(is_null($result))
 			return pg_num_fields($this->db_result);
@@ -191,7 +191,7 @@ class basis_db extends db
 	/**
 	 * Liefert den Feldnamen mit index i
 	 */
-	public function db_field_name($result = null, $i = null)
+	public function db_field_name($result=null, $i)
 	{
 		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(basis_db::$db_conn, $var);
+		return pg_escape_string($var);
 	}
 
 	/**

include/studiengang.class.php

@@ -68,11 +68,6 @@ class studiengang extends basis_db
 	public $beschreibung;
 	public $studiengang_typ_arr = array(); 	// Array mit den Studiengangstypen
 
-	public $telefon;
-	public $aktiv;
-	public $beantragung;
-	public $lgart_biscode;
-
 	/**
 	 * Konstruktor
 	 * @param studiengang_kz Kennzahl des zu ladenden Studienganges