- Moved old libraries to CI

- Extended Controllers functionalities
- Added controls to ueberbuchung.php, zeitwuensche.php and funktion_det.php
pages to avoid warnings and notices, especially when no data are in DB
- Removed fhcdb_helper.php because it's no more needed

application/controllers/api/v1/crm/Prestudent.php

@@ -65,6 +65,27 @@ class Prestudent extends APIv1_Controller
 			$this->response();
 		}
 	}
+	
+	/**
+	 * @return void
+	 */
+	public function getLastStatus()
+	{
+		$prestudent_id = $this->get('prestudent_id');
+		$studiensemester_kurzbz = $this->get('studiensemester_kurzbz');
+		$status_kurzbz = $this->get('status_kurzbz');
+		
+		if (isset($prestudent_id))
+		{
+			$result = $this->PrestudentModel->getLastStatus($prestudent_id, $studiensemester_kurzbz, $status_kurzbz);
+			
+			$this->response($result, REST_Controller::HTTP_OK);
+		}
+		else
+		{
+			$this->response();
+		}
+	}
 
 	/**
 	 * @return void

application/controllers/api/v1/ressource/Ort.php

@@ -46,6 +46,31 @@ class Ort extends APIv1_Controller
 			$this->response();
 		}
 	}
+	
+	/**
+	 * @return void
+	 */
+	public function getAll()
+	{
+		$raumtyp_kurzbz = $this->get('raumtyp_kurzbz');
+
+		$this->OrtModel->addOrder('ort_kurzbz');
+		
+		if (!is_null($raumtyp_kurzbz) && $raumtyp_kurzbz != '')
+		{
+			$result = $this->OrtModel->addJoin('public.tbl_ortraumtyp', 'ort_kurzbz');
+			if ($result->error == EXIT_SUCCESS)
+			{
+				$result = $this->OrtModel->loadWhere(array('raumtyp_kurzbz' => $raumtyp_kurzbz));
+			}
+		}
+		else
+		{
+			$result = $this->OrtModel->loadWhole();
+		}
+		
+		$this->response($result, REST_Controller::HTTP_OK);
+	}
 
 	/**
 	 * @return void

application/helpers/fhcdb_helper.php

@@ -1,450 +0,0 @@
-<?php
-/**
- * FH-Complete
- *
- * @package	FHC-Helper
- * @author	FHC-Team
- * @copyright	Copyright (c) 2016 fhcomplete.org
- * @license	GPLv3
- * @link	https://fhcomplete.org
- * @since	Version 1.0.0
- * @filesource
- */
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-//require_once 'include/basis.class.php';
-
-/**
- * FHC-Auth Helpers
- *
- * @package		FH-Complete
- * @subpackage	Helpers
- * @category	Helpers
- * @author		FHC-Team
- * @link		http://fhcomplete.org/user_guide/helpers/fhcauth_helper.html
- */
-
-// ------------------------------------------------------------------------
-
-//require_once('include/sprache.class.php');
-
-class basis_db
-{
-	protected $ci=null;
-	protected $db_result=null;
-	protected $errormsg=null;
-
-	public function __construct($ci)
-	{
-		$this->ci=$ci;
-	}
-
-	public function db_connect()
-	{
-		$conn_str='host='.DB_HOST.' port='.DB_PORT.' dbname='.DB_NAME.' user='.DB_USER.' password='.DB_PASSWORD;
-		//Connection Herstellen
-		if (DB_CONNECT_PERSISTENT)
-		{
-			if (!basis_db::$db_conn = pg_pconnect($conn_str))
-				die('Fehler beim Oeffnen der Datenbankverbindung');
-		}
-		else
-		{
-			if (!basis_db::$db_conn = pg_connect($conn_str))
-				die('Fehler beim Oeffnen der Datenbankverbindung');
-		}
-	}
-
-	public function db_query($sql)
-	{
-		if ($this->db_result=$this->ci->db->simple_query($sql))
-			return $this->db_result;
-		else
-		{
-			$this->errormsg.='Abfrage in Datenbank fehlgeschlagen! '.$this->db_last_error();
-			return false;
-		}
-	}
-
-	public function db_num_rows($result=null)
-	{
-		if (is_null($result))
-			return pg_num_rows($this->db_result);
-		else
-			return pg_num_rows($result);
-	}
-
-	public function db_fetch_object($result = null, $i=null)
-	{
-		if (is_null($result))
-		{
-			if (is_null($i))
-				return pg_fetch_object($this->db_result);
-			else
-				return pg_fetch_object($this->db_result, $i);
-		}
-		else
-		{
-			if (is_null($i))
-				return pg_fetch_object($result);
-			else
-				return pg_fetch_object($result, $i);
-		}
-	}
-
-	public function db_fetch_row($result = null, $i=null)
-	{
-		if (is_null($result))
-		{
-			if (is_null($i))
-				return pg_fetch_row($this->db_result);
-			else
-				return pg_fetch_row($this->db_result, $i);
-		}
-		else
-		{
-			if (is_null($i))
-				return pg_fetch_row($result);
-			else
-				return pg_fetch_row($result, $i);
-		}
-	}
-
-	public function db_fetch_assoc($result = null, $i=null)
-	{
-		if (is_null($result))
-		{
-			if (is_null($i))
-				return pg_fetch_assoc($this->db_result);
-			else
-				return pg_fetch_assoc($this->db_result, $i);
-		}
-		else
-		{
-			if (is_null($i))
-				return pg_fetch_row($result);
-			else
-				return pg_fetch_row($result, $i);
-		}
-	}
-
-	public function db_result($result = null, $i,$item)
-	{
-		if (is_null($result))
-		{
-			return pg_result($this->db_result, $i,$item);
-		}
-		else
-		{
-			return pg_result($result, $i,$item);
-		}
-	}
-
-	public function db_getResultJSON($result = null)
-	{
-		$rows=array();
-		if (is_null($result))
-		{
-			while ($r = pg_fetch_assoc($this->db_result))
-				$rows[] = $r;
-
-			//print json_encode($rows);
-		}
-		else
-		{
-			pg_result_seek($result, 0);
-			//var_dump($result);
-			while ($r = pg_fetch_assoc($result))
-			{
-				$rows[] = $r;
-			}
-
-			//print json_encode($rows);
-		}
-		return json_encode($rows);
-	}
-
-	public function db_last_error()
-	{
-		return pg_last_error();
-	}
-
-	public function db_affected_rows($result=null)
-	{
-		if (is_null($result))
-			return pg_affected_rows($this->db_result);
-		else
-			return pg_affected_rows($result);
-	}
-
-	public function db_result_seek($result=null, $offset)
-	{
-		if (is_null($result))
-			return pg_result_seek($this->db_result, $offset);
-		else
-			return pg_result_seek($result, $offset);
-	}
-
-	public function db_fetch_array($result=null)
-	{
-		if (is_null($result))
-			return pg_fetch_array($this->db_result);
-		else
-			return pg_fetch_array($result);
-	}
-
-	public function db_num_fields($result=null)
-	{
-		if (is_null($result))
-			return pg_num_fields($this->db_result);
-		else
-			return pg_num_fields($result);
-	}
-
-	/**
-	 * Liefert den Feldnamen mit index i
-	 */
-	public function db_field_name($result=null, $i)
-	{
-		if (is_null($result))
-			return pg_field_name($this->db_result, $i);
-		else
-			return pg_field_name($result, $i);
-	}
-
-	/**
-	 * Gibt den Speicher wieder Frei.
-	 * (ist das sinnvoll wenn es per Value uebergeben wird??)
-	 */
-	public function db_free_result($result = null)
-	{
-		if (is_null($result))
-		{
-			return pg_free_result($this->db_result);
-		}
-		else
-		{
-			return pg_free_result($result);
-		}
-	}
-
-	/**
-	 * Liefert die aktuelle Datenbankversion
-	 */
-	public function db_version()
-	{
-		return pg_version(basis_db::$db_conn);
-	}
-
-	/**
-	 * Escaped Sonderzeichen in Variablen vor der Verwendung in SQL Statements
-	 * um SQL Injections zu verhindern
-	 *
-	 */
-	public function db_escape($var)
-	{
-		return pg_escape_string($var);
-	}
-
-	/**
-	 * Null Value Handling und Hochkomma für Inserts / Updates
-	 * Wenn die Uebergebe Variable leer ist, wird ein String mit null
-	 * zurueckgeliefert, wenn nicht dann wird der string unter Hochkomma zurueckgeliefert
-	 * es sei denn qoute=false dann wird nur der String zurueckgeliefert
-	 *
-	 * @param $var String-Value fuer SQL Request
-	 * @return string
-	 */
-	public function db_null_value($var, $qoute=true)
-	{
-		if ($qoute)
-			return ($var!==''?$this->db_qoute($var):'null');
-		else
-			return ($var!==''?$var:'null');
-	}
-
-	/**
-	 * Setzt einen String unter Hochkomma
-	 * @param $var Value fuer Insert/Update
-	 * @return value unter Hochkomma
-	 */
-	public function db_qoute($var)
-	{
-		return "'".$var."'";
-	}
-
-	/**
-	 * Escaped einen Parameter fuer die Verwendung in Insert/Update SQL Befehlen
-     * Es werden abhaengig vom Typ Hochkomma oder Null hinzugefuegt
-	 * @param $var Value der gesetzt werden soll
-	 * @param $type Typ des Values (FHC_STRING | FHC_BOOLEAN | FHC_INTEGER | ...)
-	 * @param $nullable boolean gibt an ob das Feld NULL sein darf. Wenn true wird
-	 *                  NULL statt einem Leerstring zurueckgeliefert
-	 * @return Escapter Value inklusive Hochkomma wenn noetig
-	 *
-     * Verwendungsbeispiel:
-	 *	Update tbl_person set nachname=$this->db_add_param($var)
-	 *  Update tbl_person set aktiv=$this->db_add_param($var, FHC_BOOL, false)
-     *	Update tbl_person set anzahlkinder=$this->db_add_param($var, FHC_INT)
-	 */
-	public function db_add_param($var, $type=FHC_STRING, $nullable=true)
-	{
-		if (($var==='' || is_null($var)) && $type!=FHC_BOOLEAN)
-		{
-			if ($nullable)
-				return 'null';
-			else
-				return "''";
-		}
-
-		switch($type)
-		{
-			case FHC_INTEGER:
-				$var = $this->db_escape($var);
-				if (!is_numeric($var) && $var!=='')
-					die('Invalid Integer Parameter detected:'.$var);
-				$var = $this->db_null_value($var, false);
-				break;
-
-			case FHC_LANG_ARRAY:
-
-				$sprache = new sprache();
-				$sprache->getAll(true);
-				$buf = $var;
-				$var = array();
-				$languages = $sprache->getAllIndexesSorted();
-
-				foreach($languages as $sk => $sp)
-				{
-					if (!$sp || !isset($buf[$sp]))
-						$var[$sk] = "";
-					else
-						$var[$sk] = $this->db_escape($buf[$sp]);
-				}
-				$var = str_replace('\\', '\\\\', $var);
-				$var = str_replace('"', '\\\"', $var);
-				$var = '\'{"' . join('","', $var) . '"}\'';
-
-				break;
-
-			case FHC_BOOLEAN:
-				if ($var===true)
-					$var='true';
-				elseif ($var===false)
-					$var='false';
-				elseif ($var=='' && $nullable)
-					$var = 'null';
-				else
-					die('Invalid Boolean Parameter detected');
-				break;
-
-			case FHC_STRING:
-			default:
-				$var = $this->db_escape($var);
-				$var = $this->db_null_value($var);
-				break;
-		}
-		return $var;
-	}
-
-	/**
-	 * Erzeugt aus einem DB-Result-Boolean einen PHP Boolean
-	 */
-	public function db_parse_bool($var)
-	{
-		if ($var=='t')
-			return true;
-		elseif ($var=='f')
-			return false;
-		elseif ($var=='')
-			return '';
-		else
-			die('Invalid DB Boolean. Wrong DB-Engine?');
-	}
-
-	/**
-	 * Bereitet ein Array von Elementen auf, damit es in der IN-Klausel eines
-	 * Select Befehls verwendet werden kann.
-	 */
-	public function db_implode4SQL($array)
-	{
-		$string = '';
-		foreach($array as $row)
-		{
-			if ($string!='')
-				$string.=',';
-			$string.=$this->db_add_param($row);
-		}
-		return $string;
-	}
-
-	/**
-	 * Erstellt aus einem DB Array ein PHP Array
-	 * @param $var DB Result Array Spalte
-	 * @return php array
-	 */
-	public function db_parse_array($var)
-	{
-		if ($var == '')
-			return;
-		preg_match_all('/(?<=^\{|,)(([^,"{]*)|\s*"((?:[^"\\\\]|\\\\(?:.|[0-9]+|x[0-9a-f]+))*)"\s*)(,|(?<!^\{)(?=\}$))/i', $var, $matches, PREG_SET_ORDER);
-		$values = array();
-		foreach ($matches as $match)
-		{
-			$values[] = $match[3] != '' ? stripcslashes($match[3]) : (strtolower($match[2]) == 'null' ? null : $match[2]);
-		}
-		return $values;
-	}
-
-	/**
-	 * Erstellt aus einem DB Array ein PHP Array
-	 * @param $var DB Result Array Spalte
-	 * @return php array
-	 */
-	public function db_parse_lang_array($var)
-	{
-
-		if ($var == '')
-			return;
-		preg_match_all('/(?<=^\{|,)(([^,"{]*)|\s*"((?:[^"\\\\]|\\\\(?:.|[0-9]+|x[0-9a-f]+))*)"\s*)(,|(?<!^\{)(?=\}$))/i', $var, $matches, PREG_SET_ORDER);
-		$values = array();
-
-		$sprache = new sprache();
-		$sprache->loadIndexArray();
-
-		$sprache = new sprache();
-		$sprache->getAll(true);
-		$languages = $sprache->getAllIndexesSorted();
-
-
-		foreach ($matches as $mk => $match)
-		{
-			$values[$languages[$mk+1]] = $match[3] != '' ? stripcslashes($match[3]) : (strtolower($match[2]) == 'null' ? null : $match[2]);
-		}
-		return $values;
-	}
-}
-
-function indexSort($a, $b)
-{
-	return strcmp($a->index, $b->index);
-}
-
-/**
- * Bereitet ein Array von Elementen auf, damit es in der IN-Klausel eines
- * Select Befehls verwendet werden kann.
- */
-function dbImplode4SQL($array)
-{
-	$string = '';
-	
-	foreach($array as $row)
-	{
-		if ($string != '')
-		{
-			$string.=',';
-		}
-		$string.=$this->db_add_param($row);
-	}
-	
-	return $string;
-}

application/models/crm/Prestudent_model.php

@@ -11,30 +11,50 @@ class Prestudent_model extends DB_Model
 		$this->dbTable = 'public.tbl_prestudent';
 		$this->pk = 'prestudent_id';
 	}
-
+	
 	/**
-	 * 
+	 * @return void
 	 */
-	public function loadPrestudentPerson($prestudentID)
+	public function getLastStatus($prestudent_id, $studiensemester_kurzbz = '', $status_kurzbz = '')
 	{
-		// Check the rights
-		if (! $this->fhc_db_acl->isBerechtigt('basis/person', 's'))
-			return $this->_error(lang('fhc_'.FHC_NORIGHT).' -> basis/person', FHC_MODEL_ERROR);
+		// Checks if the operation is permitted by the API caller
+		if (! $this->fhc_db_acl->isBerechtigt($this->acl['public.tbl_prestudentstatus'], 's'))
+			return $this->_error(lang('fhc_'.FHC_NORIGHT).' -> '.$this->acl['public.tbl_prestudentstatus'], FHC_MODEL_ERROR);
 		
-		// Prepare SQL-Query
-		$this->db->select('*')
-					->from('public.tbl_prestudent')
-					->join('public.tbl_person', 'person_id')
-					->where('prestudent_id', $prestudentID);
-		// Do the query
-		$result = $this->db->get()->result_object();
+		if (! $this->fhc_db_acl->isBerechtigt($this->acl['lehre.tbl_studienplan'], 's'))
+			return $this->_error(lang('fhc_'.FHC_NORIGHT).' -> '.$this->acl['lehre.tbl_studienplan'], FHC_MODEL_ERROR);
 		
-		// Return the result
-		if ($result)
-			return $this->_success($result);
+		if (! $this->fhc_db_acl->isBerechtigt($this->acl['public.tbl_status'], 's'))
+			return $this->_error(lang('fhc_'.FHC_NORIGHT).' -> '.$this->acl['public.tbl_status'], FHC_MODEL_ERROR);
+		
+		$query = "SELECT tbl_prestudentstatus.*,
+						 bezeichnung AS studienplan_bezeichnung,
+						 tbl_status.bezeichnung_mehrsprachig
+					FROM public.tbl_prestudentstatus LEFT JOIN lehre.tbl_studienplan USING (studienplan_id)
+						 JOIN public.tbl_status USING (status_kurzbz)
+				   WHERE tbl_status.status_kurzbz = tbl_prestudentstatus.status_kurzbz
+					 AND prestudent_id = ?";
+
+		$parametersArray = array($prestudent_id);
+		
+		if ($studiensemester_kurzbz != '')
+		{
+			array_push($parametersArray, $studiensemester_kurzbz);
+			$query .= ' AND studiensemester_kurzbz = ?';
+		}
+		if ($status_kurzbz != '')
+		{
+			array_push($parametersArray, $status_kurzbz);
+			$query .= ' AND status_kurzbz = ?';
+		}
+		
+		$query .= ' ORDER BY datum DESC, insertamum DESC, ext_id DESC LIMIT 1';
+		
+		$result = $this->db->query($query, $parametersArray);
+		
+		if (is_object($result))
+			return $this->_success($result->result());
 		else
 			return $this->_error($this->db->error(), FHC_DB_ERROR);
 	}
-
-
-}
+}