Merge branch 'master' into feature-15029/Docsbox

application/libraries/AkteLib.php

@@ -0,0 +1,268 @@
+<?php
+
+/**
+ * FH-Complete
+ *
+ * @package             FHC-Helper
+ * @author              FHC-Team
+ * @copyright           Copyright (c) 2022 fhcomplete.net
+ * @license             GPLv3
+ */
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+class AkteLib
+{
+	const AKTE_KATEGORIE_KURZBZ = 'Akte'; // kategorie_kurzbz of dms when inserting for akte
+
+	private $_ci; // Code igniter instance
+	private $_who; // who added this document
+
+	/**
+	 * Object initialization
+	 */
+	public function __construct($params = null)
+	{
+		$this->_ci =& get_instance();
+
+		// Set the the _who property
+		$this->_who = 'Akte system'; // default
+		// It is possible to set it using the who parameter
+		if (!isEmptyArray($params) && isset($params['who']) && !isEmptyString($params['who'])) $this->_who = $params['who'];
+
+		$this->_ci->load->model('crm/Akte_model', 'AkteModel');
+		$this->_ci->load->model('content/DmsFS_model', 'DmsFSModel');
+
+		$this->_ci->load->library('DmsLib');
+	}
+
+	/**
+	 * Writes a new file, adds a new dms entry with given akte data,
+	 * adds a new dms version 0 for the written file, and adds Akte if dms add was successfull
+	 * Returns success with inserted akte id or error
+	 */
+	public function add(
+		$person_id, $dokument_kurzbz, $titel, $mimetype, $fileHandle, // Required parameters
+		$bezeichnung = null, $archiv = false, $signiert = false, $stud_selfservice = false
+	)
+	{
+		// add new dms entry and new dms version for the Akte, using Akte data (title, mimetype, file content as handle)
+		$dmsAddResult = $this->_ci->dmslib->add($titel, $mimetype, $fileHandle, self::AKTE_KATEGORIE_KURZBZ, $dokument_kurzbz, $bezeichnung);
+
+		if (isError($dmsAddResult)) return $dmsAddResult;
+
+		if (!hasData($dmsAddResult)) return error("Dms document could not be added");
+
+		$dmsAddData = getData($dmsAddResult);
+
+		// insert the Akte
+		return $this->_ci->AkteModel->insert(
+			array(
+				'person_id' => $person_id,
+				'dokument_kurzbz' => $dokument_kurzbz,
+				'titel' => $titel,
+				'mimetype' => $mimetype,
+				'bezeichnung' => $bezeichnung,
+				'erstelltam' => date('Y-m-d'),
+				'dms_id' => $dmsAddData->dms_id,
+				'archiv' => $archiv,
+				'signiert' => $signiert,
+				'stud_selfservice' => $stud_selfservice,
+				'insertamum' => date('Y-m-d H:i:s'),
+				'insertvon' => $this->_who
+			)
+		);
+	}
+
+	/**
+	 * Writes a new file, adds a new dms version 0 for the written file, and updates Akte if dms version add was successfull
+	 * Returns success with updated akte id or error
+	 */
+	public function update($akte_id, $titel, $mimetype, $fileHandle, $bezeichnung = null, $archiv = false, $signiert = false, $stud_selfservice = false)
+	{
+		// check if Akte with dms exists
+		$this->_ci->AkteModel->addSelect('dms_id');
+		$akteResult = $this->_ci->AkteModel->load($akte_id);
+
+		if (isError($akteResult)) return $akteResult;
+
+		if (!hasData($akteResult)) return error("Akte not found");
+
+		$dms_id = getData($akteResult)[0]->dms_id;
+
+		if (isEmptyString($dms_id)) return error("Akte has no dms document");
+
+		// if Akte with dms found, update the last dms version
+		$dmsUpdateResult = $this->_ci->dmslib->updateLastVersion($dms_id, $fileHandle, $titel, $mimetype, $bezeichnung);
+
+		if (isError($dmsUpdateResult)) return $dmsUpdateResult;
+
+		if (!hasData($dmsUpdateResult)) return error("Dms document could not be updated");
+
+		// update the Akte
+		return $this->_ci->AkteModel->update(
+			$akte_id,
+			array(
+				'titel' => $titel,
+				'mimetype' => $mimetype,
+				'bezeichnung' => $bezeichnung,
+				'erstelltam' => date('Y-m-d'),
+				'dms_id' => $dms_id,
+				'archiv' => $archiv,
+				'signiert' => $signiert,
+				'stud_selfservice' => $stud_selfservice,
+				'updateamum' => date('Y-m-d H:i:s'),
+				'updatevon' => $this->_who
+			)
+		);
+	}
+
+	/**
+	 * Gets akte data and associated dms data by akte Id
+	 * Returns success with akte and dms data or error
+	 */
+	public function get($akte_id)
+	{
+		// get Akte data
+		$this->_ci->AkteModel->addSelect('person_id, dokument_kurzbz, mimetype, erstelltam, titel, bezeichnung,
+											gedruckt, uid, dms_id, nachgereicht, nachgereicht_am, anmerkung,
+											ausstellungsnation, formal_geprueft_amum, archiv, signiert,
+											stud_selfservice, akzeptiertamum, insertvon, insertamum, updatevon, updateamum');
+		$this->_ci->AkteModel->load($akte_id);
+		$akteResult = $this->_ci->AkteModel->load($akte_id);
+
+		if (isError($akteResult)) return $akteResult;
+
+		if (!hasData($akteResult)) return error("Akte not found");
+
+		$resultObject = getData($akteResult)[0];
+
+		// set properties with same name in Akte and Dms table
+		$resultObject->akte_mimetype = $resultObject->mimetype;
+
+		// get dms data
+		$dmsResult = $this->_ci->dmslib->getLastVersion($resultObject->dms_id);
+
+		if (isError($dmsResult)) return $dmsResult;
+
+		// properties to retrieve from dms
+		$dmsProperties = array('version', 'filename', 'mimetype', 'name', 'beschreibung', 'cis_suche', 'schlagworte', DmsLib::FILE_CONTENT_PROPERTY);
+
+		// set dms properties
+		if (hasData($dmsResult))
+		{
+			$dmsData = getData($dmsResult);
+
+			foreach ($dmsProperties as $dmsProperty)
+			{
+				$resultObject->{$dmsProperty} = $dmsData->{$dmsProperty};
+			}
+		}
+		else
+		{
+			// set null if no dms result found
+			foreach ($dmsProperties as $dmsProperty)
+			{
+				$resultObject->{$dmsProperty} = null;
+			}
+		}
+
+		// return the object containing akte and dms data
+		return success($resultObject);
+	}
+
+	/**
+	 * Gets Akte data and associated dms data by person Id and dokument_kurzbz
+	 * Returns success with result array with akte and dms data or error
+	 */
+	public function getByPersonIdAndDocumentType($person_id, $dokument_kurzbz)
+	{
+		// load all Akte entries for given person and dokument_kurzbz
+		$this->_ci->AkteModel->addSelect('akte_id');
+		$akteResult = $this->_ci->AkteModel->loadWhere(
+			array(
+				'person_id' => $person_id,
+				'dokument_kurzbz' => $dokument_kurzbz
+			)
+		);
+
+		if (!hasData($akteResult)) return error("Akte not found");
+
+		$akteData = getData($akteResult);
+
+		$resultArr = array();
+
+		// for each found akte entry
+		foreach ($akteData as $akte)
+		{
+			// get dms and akte data from akte Id
+			$getAkteDmsResult = $this->get($akte->akte_id);
+
+			if (isError($getAkteDmsResult)) return $getAkteDmsResult;
+
+			$resultArr[] = getData($getAkteDmsResult);
+		}
+
+		// return all found entries
+		return success($resultArr);
+	}
+
+	/**
+	 * Removes Akte by akte Id, removes all associated dms entries and versions, and deletes all associated files
+	 * Returns success with removed version numbers or error
+	 */
+	public function remove($akte_id)
+	{
+		// get dms_id for akte
+		$this->_ci->AkteModel->addSelect('dms_id');
+		$akteResult = $this->_ci->AkteModel->load($akte_id);
+
+		if (isError($akteResult)) return $akteResult;
+
+		if (!hasData($akteResult)) return error("Akte not found");
+
+		$dms_id = getData($akteResult)[0]->dms_id;
+		$error = null;
+
+		// Start DB transaction to avoid deleting only part of the data
+		$this->_ci->db->trans_begin();
+
+		// delete Akte
+		$deleteResult = $this->_ci->AkteModel->delete($akte_id);
+
+		if (isError($deleteResult))
+		{
+			$error = $deleteResult;
+		}
+		else
+		{
+			// remove all dms entry for dms of the akte
+			$removeAllResult = $this->_ci->dmslib->removeAll($dms_id);
+
+			if (isError($removeAllResult))
+				$error = $removeAllResult;
+		}
+
+		// Transaction complete!
+		$this->_ci->db->trans_complete();
+
+		// Check if everything went ok during the transaction
+		if ($this->_ci->db->trans_status() === false || isset($error))
+		{
+			$this->_ci->db->trans_rollback();
+
+			// return occured error
+			if (isset($error))
+				return $error;
+			else
+				return error("Error occured when deleting, rolled back");
+		}
+		else
+		{
+			$this->_ci->db->trans_commit();
+
+			// return removed dms entry data
+			return $removeAllResult;
+		}
+	}
+}

application/libraries/AnrechnungLib.php

@@ -80,14 +80,24 @@ class AnrechnungLib
 		// Get latest ZGV
 		$result = $this->ci->PrestudentModel->getLatestZGVBezeichnung($prestudent_id);
 		$latest_zgv_bezeichnung = hasData($result) ? getData($result)[0]->bezeichnung : '';
-		
+
+        // Get Sum of berufliche and schulische ECTS
+        $result = $this->ci->LehrveranstaltungModel->getEctsSumSchulisch($uid, $prestudent_id, $lv->studiengang_kz);
+        $sumEctsSchulisch = getData($result)[0]->ectssumschulisch;
+
+        $result = $this->ci->LehrveranstaltungModel->getEctsSumBeruflich($uid);
+        $sumEctsBeruflich = getData($result)[0]->ectssumberuflich;
+
 		// Set the given studiensemester
 		$antrag_data->lv_id = $lv_id;
 		$antrag_data->lv_bezeichnung = $lv->bezeichnung;
 		$antrag_data->ects = $lv->ects;
+        $antrag_data->sumEctsSchulisch = $sumEctsSchulisch;
+        $antrag_data->sumEctsBeruflich = $sumEctsBeruflich;
 		$antrag_data->studiensemester_kurzbz = $studiensemester_kurzbz;
 		$antrag_data->vorname = $person->vorname;
 		$antrag_data->nachname = $person->nachname;
+		$antrag_data->student_uid = $uid;
 		$antrag_data->matrikelnr = $student->matrikelnr;
         $antrag_data->studiengang_kz = $studiengang->studiengang_kz;
 		$antrag_data->stg_bezeichnung = $studiengang->bezeichnung;
@@ -112,6 +122,7 @@ class AnrechnungLib
 
 		$anrechnung_data = new StdClass();
 
+        $this->ci->AnrechnungModel->addJoin('lehre.tbl_anrechnung_begruendung', 'begruendung_id');
 		$result = $this->ci->AnrechnungModel->load($anrechnung_id);
 
 		if (isError($result))
@@ -145,6 +156,7 @@ class AnrechnungLib
 		$anrechnung_data->prestudent_id = '';
 		$anrechnung_data->lehrveranstaltung = '';
 		$anrechnung_data->begruendung_id = '';
+		$anrechnung_data->begruendung = '';
 		$anrechnung_data->anmerkung = '';
 		$anrechnung_data->dms_id = '';
 		$anrechnung_data->insertamum = '';
@@ -155,6 +167,7 @@ class AnrechnungLib
 		$anrechnung_data->status = getUserLanguage() == 'German' ? 'neu' : 'new';
 		$anrechnung_data->dokumentname = '';
 
+        $this->ci->AnrechnungModel->addJoin('lehre.tbl_anrechnung_begruendung', 'begruendung_id');
 		$result = $this->ci->AnrechnungModel->loadWhere(
 			array(
 				'lehrveranstaltung_id' => $lehrveranstaltung_id,
@@ -800,6 +813,7 @@ class AnrechnungLib
 		$anrechnung_data->prestudent_id = $anrechnung->prestudent_id;
 		$anrechnung_data->lehrveranstaltung_id = $anrechnung->lehrveranstaltung_id;
 		$anrechnung_data->begruendung_id =  $anrechnung->begruendung_id;
+		$anrechnung_data->begruendung =  $anrechnung->bezeichnung;
 		$anrechnung_data->anmerkung = $anrechnung->anmerkung_student;
 		$anrechnung_data->dms_id = $anrechnung->dms_id;
 		$anrechnung_data->insertamum = (new DateTime($anrechnung->insertamum))->format('d.m.Y');
@@ -823,4 +837,110 @@ class AnrechnungLib
 
 		return $anrechnung_data;
 	}
+
+    /**
+     * If Student is a Quereinsteiger, get ECTS Summe of all angerechnete Studiensemester.
+     *
+     * @param $prestudent_id
+     * @param $studiengang_kz Studiengang_kz der LV
+     * @return int|mixed
+     */
+    public function getQuereinsteigerEctsSumme($prestudent_id, $studiengang_kz)
+    {
+        $sumEctsQuereinsteiger = 0;
+
+        // Check, if student is Quereinsteiger
+        $this->ci->load->model('crm/Prestudentstatus_model', 'PrestudentstatusModel');
+        $result = $this->ci->PrestudentstatusModel->getFirstStatus($prestudent_id, 'Student');
+
+        $prestudentFirstStudentStatus = getData($result)[0];
+
+        // If Prestudent is not a Quereinsteiger
+        if ($prestudentFirstStudentStatus->ausbildungssemester == 1)
+        {
+            return $sumEctsQuereinsteiger; // return 0
+        }
+
+        $anzahlAngerechneteStudiensemester = $prestudentFirstStudentStatus->ausbildungssemester - 1;
+
+        // If Prestudent is a Quereinsteiger
+        if ($prestudentFirstStudentStatus->ausbildungssemester > 1)
+        {
+            // Get the 'angerechnete Studiensemester'
+            $this->ci->load->model('organisations/Studiensemester_model', 'StudiensemesterModel');
+            $result = $this->ci->StudiensemesterModel->getPreviousFrom(
+                $prestudentFirstStudentStatus->studiensemester_kurzbz,
+                $anzahlAngerechneteStudiensemester
+            );
+
+            // Get ECTS Summe of each 'angerechnetes Studiensemester'
+            foreach (getData($result) as $studiensemester)
+            {
+                $result = $this->ci->LehrveranstaltungModel->getSumQuereinstiegsECTSProSemester(
+                    $studiengang_kz,
+                    $studiensemester->studiensemester_kurzbz,
+                    $anzahlAngerechneteStudiensemester--,
+                    $prestudentFirstStudentStatus->orgform_kurzbz
+                );
+
+                if (hasData($result))
+                {
+                    $sumEctsQuereinsteiger = $sumEctsQuereinsteiger + getData($result)[0]->sum_ects;
+                }
+            }
+        }
+        return $sumEctsQuereinsteiger;  // return sum of ects of all 'angerechnete Studiensemester'
+    }
+
+    /**
+     * Get ECTS Summe of all Anrechnungen based on schulische Kenntnisse.
+     *
+     * @param $student_uid
+     * @return int|mixed
+     */
+    public function getSchulischeAnrechnungenEctsSumme($student_uid)
+    {
+        $sumEctsSchule = 0;
+
+        $result = $this->ci->LehrveranstaltungModel->getSumAngerechneteECTSByBegruendung($student_uid);
+
+        if (hasData($result))
+        {
+            foreach (getData($result) as $ects)
+            {
+                if ($ects->begruendung_id != 4)
+                {
+                    $sumEctsSchule = $sumEctsSchule + $ects->sum;
+                }
+            }
+        }
+
+        return $sumEctsSchule;
+    }
+
+    /**
+     * Get ECTS Summe of all Anrechnungen based on berufliche Kenntnisse.
+     *
+     * @param $student_uid
+     * @return int
+     */
+    public function getBeruflicheAnrechnungenEctsSumme($student_uid)
+    {
+        $sumEctsBeruflich = 0;
+
+        $result = $this->ci->LehrveranstaltungModel->getSumAngerechneteECTSByBegruendung($student_uid);
+
+        if (hasData($result))
+        {
+            foreach (getData($result) as $ects)
+            {
+                if ($ects->begruendung_id == 4)
+                {
+                    $sumEctsBeruflich = $ects->sum;
+                }
+            }
+        }
+
+        return $sumEctsBeruflich;
+    }
 }

application/libraries/DmsLib.php

@@ -1,26 +1,483 @@
 <?php
 
+/**
+ * FH-Complete
+ *
+ * @package		FHC-Helper
+ * @author		FHC-Team
+ * @copyright		Copyright (c) 2022 fhcomplete.net
+ * @license		GPLv3
+ */
+
 if (! defined('BASEPATH')) exit('No direct script access allowed');
 
-class DmsLib extends FHC_Controller
+use \stdClass as stdClass;
+
+class DmsLib
 {
-	const FILE_CONTENT_PROPERTY = 'file_content';
-	
-	private $UPLOAD_PATH = DMS_PATH; // temporary directory to store the upload file
+	const FILE_CONTENT_PROPERTY = 'file_content'; // property name for file content
+
+	private $_ci; // code igniter instance
+	private $_who; // who added this document
 
 	/**
 	 * Object initialization
 	 */
-	public function __construct()
+	public function __construct($params = null)
 	{
-		$this->ci =& get_instance();
+		$this->_ci =& get_instance();
 
-		$this->ci->load->model('crm/Akte_model', 'AkteModel');
-		$this->ci->load->model('content/Dms_model', 'DmsModel');
-		$this->ci->load->model('content/DmsVersion_model', 'DmsVersionModel');
-		$this->ci->load->model('content/DmsFS_model', 'DmsFSModel');
+		// Set the the _who property
+		$this->_who = 'DMS system'; // default
+		// It is possible to set it using the who parameter
+		if (!isEmptyArray($params) && isset($params['who']) && !isEmptyString($params['who'])) $this->_who = $params['who'];
+
+		$this->_ci->load->model('crm/Akte_model', 'AkteModel'); // deprecated, should not be used here!
+		$this->_ci->load->model('content/Dms_model', 'DmsModel');
+		$this->_ci->load->model('content/DmsVersion_model', 'DmsVersionModel');
+		$this->_ci->load->model('content/DmsFS_model', 'DmsFSModel');
 	}
-	
+
+	// -----------------------------------------------------------------------------------------------------------
+	// Public methods
+
+	/**
+	 * Writes a new file, adds a new dms entry and a new dms version 0 for the written file
+	 * Returns success info of added dms entry (dms_id, version, filename) or error
+	 */
+	public function add(
+		$name, $mimetype, $fileHandle, // Required parameters
+		$kategorie_kurzbz = null, $dokument_kurzbz = null, $beschreibung = null, $cis_suche = false, $schlagworte = null
+	)
+	{
+			// create unique filename, using original document name to detect file extension
+			$filename = $this->_getUniqueFilename($name);
+
+			// copy file from fileHandle to dms folder
+			$copyFileResult = $this->_copyFile($fileHandle, $filename);
+
+			if (isError($copyFileResult)) return $copyFileResult;
+
+			// if file written successful, insert dms
+			$dmsResult = $this->_ci->DmsModel->insert(
+				array(
+					'kategorie_kurzbz' => $kategorie_kurzbz,
+					'dokument_kurzbz' => $dokument_kurzbz
+				)
+			);
+
+			if (isError($dmsResult)) return $dmsResult;
+
+			if (hasData($dmsResult))
+			{
+				$dms_id = getData($dmsResult);
+				$version = 0;
+
+				// insert dms version
+				$dmsVersion = array(
+					'dms_id' => $dms_id,
+					'version' => $version,
+					'filename' => $filename,
+					'mimetype' => $mimetype,
+					'name' => $name,
+					'beschreibung' => $beschreibung,
+					'cis_suche' => $cis_suche,
+					'schlagworte' => $schlagworte,
+					'insertvon' => $this->_who,
+					'insertamum' => date('Y-m-d H:i:s')
+				);
+
+				$dmsVersionResult = $this->_ci->DmsVersionModel->insert($dmsVersion);
+
+				if (isError($dmsVersionResult)) return $dmsVersionResult;
+
+				// return dms info
+				$resObj = new stdClass();
+				$resObj->dms_id = $dms_id;
+				$resObj->version = $version;
+				$resObj->filename = $filename;
+
+				return success($resObj);
+			}
+			else
+				return error("error when inserting DMS");
+	}
+
+	/**
+	 * Writes a new file with content of fileHandle, adds a new dms version (max version number + 1) for the written file
+	 * Returns success with info of added dms version (version, filename) or error
+	 */
+	public function addNewVersion($dms_id, $fileHandle, $name = null, $mimetype = null, $beschreibung = null, $cis_suche = false, $schlagworte = null)
+	{
+		// get the latest version
+		$lastVersionResult = $this->getLastVersion($dms_id);
+
+		if (isError($lastVersionResult)) return $lastVersionResult;
+
+		if (hasData($lastVersionResult))
+		{
+			$lastVersion = getData($lastVersionResult);
+
+			$originalName = isset($name) ? $name : $lastVersion->name;
+
+			// create unique filename, using original document name to detect file extension
+			$filename = $this->_getUniqueFilename($originalName);
+
+			// copy file from fileHandle to dms folder
+			$copyFileResult = $this->_copyFile($fileHandle, $filename);
+
+			if (isError($copyFileResult)) return $copyFileResult;
+
+			// insert new version
+			$newVersionNumber = $lastVersion->version + 1;
+
+			// if new parameters given, use them, otherwise use parameters from last version
+			$newVersion = array(
+				'dms_id' => $dms_id,
+				'name' => $originalName,
+				'filename' => $filename,
+				'version' => $newVersionNumber,
+				'mimetype' => isset($mimetype) ? $mimetype : $lastVersion->mimetype,
+				'beschreibung' => isset($beschreibung) ? $beschreibung : $lastVersion->beschreibung,
+				'cis_suche' => isset($cis_suche) ? $cis_suche : $lastVersion->cis_suche,
+				'schlagworte' => isset($schlagworte) ? $schlagworte : $lastVersion->schlagworte,
+				'insertvon' => $this->_who,
+				'insertamum' => date('Y-m-d H:i:s')
+			);
+
+			$addVersionResult = $this->_ci->DmsVersionModel->insert($newVersion);
+
+			if (isError($addVersionResult)) return $addVersionResult;
+
+			// return dms info
+			$resObj = new stdClass();
+			$resObj->version = $newVersionNumber;
+			$resObj->filename = $filename;
+
+			return success($resObj);
+		}
+		else
+			return error("last version not found");
+	}
+
+	/**
+	 * Updates the last version (max version number) of a dms entry
+	 * Overwrites the file associated with this version with content read from fileHandle
+	 * Returns success with info of added dms version (version, filename) or error
+	 */
+	public function updateLastVersion($dms_id, $fileHandle, $name = null, $mimetype = null, $beschreibung = null, $cis_suche = false, $schlagworte = null)
+	{
+		// get the latest version
+		$lastVersionResult = $this->getLastVersion($dms_id);
+
+		if (isError($lastVersionResult)) return $lastVersionResult;
+
+		if (hasData($lastVersionResult))
+		{
+			$lastVersion = getData($lastVersionResult);
+			$filename = $lastVersion->filename;
+
+			// update file in filesystem
+			$copyFileResult = $this->_copyFile($fileHandle, $filename);
+
+			if (isError($copyFileResult)) return $copyFileResult;
+
+			// if new parameters given, use them, otherwise use parameters from last version
+			$newVersion = array(
+				'name' => isset($name) ? $name : $lastVersion->name,
+				'filename' => $filename,
+				'mimetype' => isset($mimetype) ? $mimetype : $lastVersion->mimetype,
+				'beschreibung' => isset($beschreibung) ? $beschreibung : $lastVersion->beschreibung,
+				'cis_suche' => isset($cis_suche) ? $cis_suche : $lastVersion->cis_suche,
+				'schlagworte' => isset($schlagworte) ? $schlagworte : $lastVersion->schlagworte,
+			);
+
+			// update last dms version
+			$addVersionResult = $this->_ci->DmsVersionModel->update(
+				array($dms_id, $lastVersion->version),
+				$newVersion
+			);
+
+			if (isError($addVersionResult)) return $addVersionResult;
+
+			// return dms info
+			$resObj = new stdClass();
+			$resObj->version = $lastVersion->version;
+			$resObj->filename = $filename;
+
+			return success($resObj);
+		}
+		else
+			return error("last version not found");
+	}
+
+	/**
+	 * Gets dms version with highest number
+	 * Returns success with dms data and fileHandle with file content or error
+	 */
+	public function getLastVersion($dms_id)
+	{
+		// get the latest version number
+		$this->_ci->DmsVersionModel->addSelect('version');
+		$this->_ci->DmsVersionModel->addOrder('version', 'DESC');
+		$this->_ci->DmsVersionModel->addOrder('insertamum', 'DESC');
+		$this->_ci->DmsVersionModel->addLimit(1);
+		$lastDmsVersionResult = $this->_ci->DmsVersionModel->loadWhere(
+			array('dms_id' => $dms_id)
+		);
+
+		if (isError($lastDmsVersionResult)) return $lastDmsVersionResult;
+
+		if (hasData($lastDmsVersionResult))
+		{
+			$lastDmsVersionData = getData($lastDmsVersionResult)[0];
+			$lastDmsVersion = $lastDmsVersionData->version;
+
+			// call get Version with last version number
+			return $this->getVersion($dms_id, $lastDmsVersion);
+		}
+		else
+			return error("Dms last version not found");
+	}
+
+	/**
+	 * Gets specified dms version
+	 * Returns success with dms data and fileHandle with file content or error
+	 */
+	public function getVersion($dms_id, $version)
+	{
+		$this->_ci->DmsVersionModel->addSelect('dms_id, version, filename, mimetype, name, beschreibung, cis_suche, schlagworte');
+		$dmsVersionResult = $this->_ci->DmsVersionModel->loadWhere(
+			array(
+				'dms_id' => $dms_id,
+				'version' => $version
+			)
+		);
+
+		if (isError($dmsVersionResult)) return $dmsVersionResult;
+
+		if (hasData($dmsVersionResult))
+		{
+			$dmsVersion = getData($dmsVersionResult)[0];
+
+			// get file content as file pointer
+			$fileHandleResult = $this->_ci->DmsFSModel->openRead($dmsVersion->filename);
+
+			if (isError($fileHandleResult)) return $fileHandleResult;
+
+			if (hasData($fileHandleResult))
+			{
+				$fileHandle = getData($fileHandleResult);
+				$dmsVersion->{self::FILE_CONTENT_PROPERTY} = $fileHandle;
+
+				// close file pointer
+				$closeResult = $this->_ci->DmsFSModel->close($fileHandle);
+
+				if (isError($closeResult)) return $closeResult;
+
+				return success($dmsVersion);
+			}
+			else
+				return error("File could not be opened");
+		}
+		else
+			return error("Dms version not found");
+	}
+
+	/**
+	 * Removes dms entry and all its versions, deletes all associated files
+	 * Returns success with removed version numbers or error
+	 */
+	public function removeAll($dms_id)
+	{
+		$versionsRemoved = array();
+
+		$this->_ci->DmsVersionModel->addSelect('version, filename');
+		$allVersionsResult = $this->_ci->DmsVersionModel->loadWhere(array('dms_id' => $dms_id));
+
+		if (hasData($allVersionsResult))
+		{
+			$allVersionsData = getData($allVersionsResult);
+
+			$error = null;
+
+			// Start DB transaction to avoid deleting only part of the data
+			$this->_ci->db->trans_begin();
+
+			// remove all versions of the dms Id
+			foreach ($allVersionsData as $version)
+			{
+				$removeVersionResult = $this->removeVersion($dms_id, $version->version);
+
+				if (isError($removeVersionResult))
+				{
+					$error = $removeVersionResult;
+					break;
+				}
+				else
+					$versionsRemoved[] = $version; // return removed versions
+			}
+
+			// Transaction complete!
+			$this->_ci->db->trans_complete();
+
+			// Check if everything went ok during the transaction
+			if ($this->_ci->db->trans_status() === false || isset($error))
+			{
+				$this->_ci->db->trans_rollback();
+
+				if (isset($error))
+					return $error;
+				else
+					return error("Error occured when deleting, rolled back");
+			}
+			else
+			{
+				$this->_ci->db->trans_commit();
+			}
+		}
+
+		return success($versionsRemoved);
+	}
+
+	/**
+	 * Removes latest version and its associated file
+	 * Returns success with removed dms version data (dms_id, version, filename) or error
+	 */
+	public function removeLastVersion($dms_id)
+	{
+		$lastVersionNumber = 0;
+		// get the latest version
+		$lastVersionResult = $this->getLastVersion($dms_id);
+
+		if (isError($lastVersionResult)) return $lastVersionResult;
+
+		if (hasData($lastVersionResult))
+		{
+			$lastVersion = getData($lastVersionResult);
+			$lastVersionNumber = $lastVersion->version;
+		}
+
+		// call remove method for latest version
+		return $this->removeVersion($dms_id, $lastVersionNumber);
+	}
+
+	/**
+	 * Removes latest version and its associated file
+	 * Returns success with removed dms version data (dms_id, version, filename) or error
+	 */
+	public function removeVersion($dms_id, $version)
+	{
+		$removeVersionResultObj = new stdClass();
+		$removeVersionResultObj->dms_id = null;
+		$removeVersionResultObj->version = null;
+		$removeVersionResultObj->filename = null;
+
+		// load dms version and check how many versions there are
+		$db = new DB_Model();
+
+		$checkDeleteResult = $db->execReadOnlyQuery(
+			"SELECT filename,
+					(SELECT count(version)
+						FROM campus.tbl_dms_version dv_anzahl
+						WHERE dv_anzahl.dms_id = dv.dms_id) AS anzahl_versionen
+					FROM campus.tbl_dms_version dv
+					WHERE dms_id=?
+					AND version=?",
+			array($dms_id, $version)
+		);
+
+		if (isError($checkDeleteResult)) return $checkDeleteResult;
+
+		if (hasData($checkDeleteResult))
+		{
+			$checkDeleteData = getData($checkDeleteResult)[0];
+
+			// delete version
+			$deleteVersionResult = $this->_ci->DmsVersionModel->delete(array($dms_id, $version));
+
+			if (isError($deleteVersionResult)) return $deleteVersionResult;
+
+			$removeVersionResultObj->version = $version;
+			$removeVersionResultObj->filename = $checkDeleteData->filename;
+
+			// delete dms too if no versions left
+			if ($checkDeleteData->anzahl_versionen <= 1)
+			{
+				$deleteDmsResult = $this->_ci->DmsModel->delete($dms_id);
+
+				if (isError($deleteDmsResult)) return $deleteDmsResult;
+
+				$removeVersionResultObj->dms_id = $dms_id;
+			}
+
+			// delete file from file system
+			$removeResult = $this->_ci->DmsFSModel->remove($checkDeleteData->filename);
+
+			if (isError($removeResult)) return $removeResult;
+		}
+
+		return success($removeVersionResultObj);
+	}
+
+	// -----------------------------------------------------------------------------------------------------------
+	// Private methods
+
+	/**
+	 * Copies file from sourceFileHandle to destinationFilename in DMS folder
+	 * Returns success or error on fail
+	 */
+	private function _copyFile($sourceFileHandle, $destinationFilename)
+	{
+		// get file location from file handle
+		$metaData = stream_get_meta_data($sourceFileHandle);
+
+		if (isset($metaData['uri']) && !isEmptyString($metaData['uri']))
+		{
+			// if file location determined, copy file
+			$source = $metaData['uri'];
+
+			if (copy($source, DMS_PATH.$destinationFilename))
+			{
+				return success();
+			}
+			else
+			{
+				// error if copy returned false
+				return error('error occured while copying file');
+			}
+		}
+		else
+		{
+			// error when source location could not be determined
+			return error('error occured while getting source file name');
+		}
+
+		return success($resObj);
+	}
+
+	/**
+	 * Generates unique filename, appends file extension from document name
+	 * Returns the filename string
+	 */
+	private function _getUniqueFilename($dokname)
+	{
+		// create unique id
+		$uniqueFilename = uniqid();
+
+		// getting extension of file from document name
+		$fileExtension = pathinfo($dokname, PATHINFO_EXTENSION);
+
+		// if file extension found, append it
+		if (!isEmptyString($fileExtension))
+			$uniqueFilename .= '.'.$fileExtension;
+
+		return $uniqueFilename;
+	}
+
+	// -----------------------------------------------------------------------------------------------------------
+	// Deprecated methods, not to be used
+
 	/**
 	 * Load a DMS Document.
 	 * If no version is particularly given, the latest version is loaded.
@@ -33,19 +490,20 @@ class DmsLib extends FHC_Controller
 	{
 		if (is_numeric($dms_id))
 		{
-			$this->ci->DmsModel->addJoin('campus.tbl_dms_version', 'dms_id');
-			$this->ci->DmsModel->addOrder('version', 'DESC');
-			$this->ci->DmsModel->addLimit(1);
-			
+			$this->_ci->DmsModel->addJoin('campus.tbl_dms_version', 'dms_id');
+			$this->_ci->DmsModel->addOrder('version', 'DESC');
+			$this->_ci->DmsModel->addLimit(1);
+
 			if (!is_numeric($version))
 			{
-				return $this->ci->DmsModel->load($dms_id);
+				return $this->_ci->DmsModel->load($dms_id);
 			}
 			else
 			{
-				return $this->ci->DmsModel->loadWhere(array('dms_id' => $dms_id, 'version' => $version));
+				return $this->_ci->DmsModel->loadWhere(array('dms_id' => $dms_id, 'version' => $version));
 			}
 		}
+
 		return error('The parameter DMS ID must be a number');
 	}
 
@@ -57,34 +515,30 @@ class DmsLib extends FHC_Controller
 	 */
 	public function read($dms_id, $version = null)
 	{
-		$result = null;
+		$result = error('Wrong dms_id parameter');
 
 		if (isset($dms_id))
 		{
-			$this->ci->DmsModel->addJoin('campus.tbl_dms_version', 'dms_id');
-			$this->ci->DmsModel->addOrder('version', 'DESC');
-			$this->ci->DmsModel->addLimit(1);
+			$this->_ci->DmsModel->addJoin('campus.tbl_dms_version', 'dms_id');
+			$this->_ci->DmsModel->addOrder('version', 'DESC');
+			$this->_ci->DmsModel->addLimit(1);
 
 			if (!isset($version))
 			{
-				$result = $this->ci->DmsModel->load($dms_id);
+				$result = $this->_ci->DmsModel->load($dms_id);
 			}
 			else
 			{
-				$result = $this->ci->DmsModel->loadWhere(array('dms_id' => $dms_id, 'version' => $version));
+				$result = $this->_ci->DmsModel->loadWhere(array('dms_id' => $dms_id, 'version' => $version));
 			}
-		}
 
-		if (hasData($result))
-		{
-			$resultFS = $this->ci->DmsFSModel->read($result->retval[0]->filename);
-			if (isSuccess($resultFS))
+			// If a dms has been found
+			if (hasData($result))
 			{
-				$result->retval[0]->{DmsLib::FILE_CONTENT_PROPERTY} = $resultFS->retval;
-			}
-			else
-			{
-				$result = $resultFS;
+				$resultFS = $this->_ci->DmsFSModel->readBase64(getData($result)[0]->filename);
+				if (isError($resultFS)) return $resultFS; // if an error occurred return it
+
+				$result->retval[0]->{self::FILE_CONTENT_PROPERTY} = getData($resultFS);
 			}
 		}
 
@@ -101,28 +555,22 @@ class DmsLib extends FHC_Controller
 	 */
 	public function getAktenAcceptedDms($person_id, $dokument_kurzbz = null, $no_file = null)
 	{
-		$result = $this->ci->AkteModel->getAktenAcceptedDms($person_id, $dokument_kurzbz);
+		$result = $this->_ci->AkteModel->getAktenAcceptedDms($person_id, $dokument_kurzbz);
 
 		if (hasData($result) && $no_file == null)
 		{
-			$cnt = count($result->retval);
-			for ($i = 0; $i < $cnt; $i++)
+			for ($i = 0; $i < count(getData($result)); $i++)
 			{
-				$resultFS = $this->ci->DmsFSModel->read($result->retval[$i]->filename);
-				if (isSuccess($resultFS))
-				{
-					$result->retval[$i]->{DmsLib::FILE_CONTENT_PROPERTY} = $resultFS->retval;
-				}
-				else
-				{
-					$result = $resultFS;
-				}
+				$resultFS = $this->_ci->DmsFSModel->readBase64(getData($result)[$i]->filename);
+				if (isError($resultFS)) return $resultFS; // if an error occurred return it
+
+				$result->retval[$i]->{self::FILE_CONTENT_PROPERTY} = getData($resultFS);
 			}
 		}
 
 		return $result;
 	}
-	
+
 	/**
 	 * Uploads a document and saves it to DMS
 	 * @param $dms DMS assoc array
@@ -135,32 +583,33 @@ class DmsLib extends FHC_Controller
 		// Init upload configs
 		$this->_loadUploadLibrary($allowed_types);
 
-		if (!$this->ci->upload->do_upload($field_name))
+		if (!$this->_ci->upload->do_upload($field_name))
 		{
-			return error($this->ci->upload->display_errors());
+			return error($this->_ci->upload->display_errors());
 		}
 
-		$upload_data = $this->ci->upload->data();  // data about the uploaded file
-		$filename = $upload_data['file_name'];
+		$upload_data = $this->_ci->upload->data();  // data about the uploaded file
 
 		// Insert to DMS table
-		if (!$result = $this->ci->DmsModel->insert($this->ci->DmsModel->filterFields($dms)))
-		{
-			return error('Failed inserting to DMS');
-		}
-		$upload_data['dms_id'] = $result->retval;
+		$insDmsResult = $this->_ci->DmsModel->insert($this->_ci->DmsModel->filterFields($dms));
+		if (isError($insDmsResult)) return $insDmsResult;
+
+		$upload_data['dms_id'] = getData($insDmsResult);
 
 		// Insert DMS version
-		if (!$result = $this->ci->DmsVersionModel->insert(
-			$this->ci->DmsVersionModel->filterFields($dms, $result->retval, $filename)))
-		{
-			return error('Failed inserting DMS version');
-		}
+		$insVersionResult = $this->_ci->DmsVersionModel->insert(
+			$this->_ci->DmsVersionModel->filterFields(
+				$dms,
+				$upload_data['dms_id'],
+				$upload_data['file_name']
+			)
+		);
+		if (isError($insVersionResult)) return $insVersionResult;
 
-		// return result of uploaded data
-		return success($upload_data); // data about the uploaded file
+		// Return result of uploaded data
+		return success($upload_data);
 	}
-	
+
 	/**
 	 * Download a document.
 	 *
@@ -171,38 +620,31 @@ class DmsLib extends FHC_Controller
 	 */
 	public function download($dms_id, $filename = null, $disposition = 'inline')
 	{
-		$result = $this->getFileInfo($dms_id);
-		
-		if (isError($result))
+		// Retrieves info about the given dms
+		$fileInfoResult = $this->getFileInfo($dms_id);
+		if (isError($fileInfoResult)) return error(getError($fileInfoResult));
+
+		// If data have been found
+		if (hasData($fileInfoResult))
 		{
-			return error(getError($result));
+			$fileObj = getData($fileInfoResult);
+
+			// Change filename, if filename is provided
+			if (!isEmptyString($filename)) $fileObj->name = $filename;
+
+			// Add file disposition if disposition has a valid value
+			if ($disposition == 'attachment' || $disposition == 'inline')
+			{
+				$fileObj->disposition = $disposition;
+			}
+
+			return success($fileObj);
 		}
 
-		$fileObj = getData($result);
-		
-		// Change filename, if filename is provided
-		if (is_string($filename))
-		{
-			$fileObj->name = $filename;
-		}
-		
-		// Add file disposition
-		if ($disposition == 'attachment')
-		{
-			$fileObj->disposition = 'attachment';
-		}
-		else
-		{
-			$fileObj->disposition = 'inline';
-		}
-	
-		// Output file
-		if(!$this->outputFile($fileObj))
-		{
-			return error('Error on file output');
-		}
+		// If no data have been found then return an empty success
+		return success();
 	}
-	
+
 	/**
 	 * Get file information.
 	 *
@@ -212,28 +654,28 @@ class DmsLib extends FHC_Controller
 	 */
 	public function getFileInfo($dms_id, $version = null)
 	{
-		if (!is_numeric($dms_id))
-		{
-			return error('Wrong parameter');
-		}
-		
-		// Load file
+		// Checks the dms_id parameter
+		if (!is_numeric($dms_id)) return error('Wrong parameter');
+
+		// Load DMS from database
 		$result = $this->load($dms_id, $version);
+		if (isError($result)) return error(getError($result));
 
-		if (isError($result))
+		// If data have been found
+		if (hasData($result))
 		{
-			return error(getError($result));
+			// Store file information in fileObj
+			$fileObj = new stdClass();
+			$fileObj->filename = getData($result)[0]->filename;
+			$fileObj->file = DMS_PATH.getData($result)[0]->filename;
+			$fileObj->name = DMS_PATH.getData($result)[0]->name;   // original user filename
+			$fileObj->mimetype = getData($result)[0]->mimetype;
+
+			return success($fileObj);
 		}
 
-		// Store file information in fileObj
-		$fileObj = new StdClass();
-		$fileObj->filename = getData($result)[0]->filename;
-		$fileObj->file = DMS_PATH. getData($result)[0]->filename;
-		$fileObj->name = DMS_PATH. getData($result)[0]->name;   // original users filename
-		$fileObj->mimetype = DMS_PATH. getData($result)[0]->mimetype;
-		
-		return success($fileObj);
-
+		// If no data have been found return an empty success
+		return success();
 	}
 
 	/**
@@ -253,20 +695,20 @@ class DmsLib extends FHC_Controller
 			$result = $this->_saveFileOnInsert($dms);
 			if (isSuccess($result))
 			{
-				$filename = $result->retval;
+				$filename = getData($result);
 				if (isset($dms['dms_id']) && $dms['dms_id'] != '')
 				{
-					$result = $this->ci->DmsVersionModel->insert(
-						$this->ci->DmsVersionModel->filterFields($dms, $dms['dms_id'], $filename)
+					$result = $this->_ci->DmsVersionModel->insert(
+						$this->_ci->DmsVersionModel->filterFields($dms, $dms['dms_id'], $filename)
 					);
 				}
 				else
 				{
-					$result = $this->ci->DmsModel->insert($this->ci->DmsModel->filterFields($dms));
+					$result = $this->_ci->DmsModel->insert($this->_ci->DmsModel->filterFields($dms));
 					if (isSuccess($result))
 					{
-						$result = $this->ci->DmsVersionModel->insert(
-							$this->ci->DmsVersionModel->filterFields($dms, $result->retval, $filename)
+						$result = $this->_ci->DmsVersionModel->insert(
+							$this->_ci->DmsVersionModel->filterFields($dms, getData($result), $filename)
 						);
 					}
 				}
@@ -277,15 +719,15 @@ class DmsLib extends FHC_Controller
 			$result = $this->_saveFileOnUpdate($dms);
 			if (isSuccess($result))
 			{
-				$result = $this->ci->DmsModel->update($dms['dms_id'], $this->ci->DmsModel->filterFields($dms));
+				$result = $this->_ci->DmsModel->update($dms['dms_id'], $this->_ci->DmsModel->filterFields($dms));
 				if (isSuccess($result))
 				{
-					$result = $this->ci->DmsVersionModel->update(
+					$result = $this->_ci->DmsVersionModel->update(
 						array(
 							$dms['dms_id'],
 							$dms['version']
 						),
-						$this->ci->DmsVersionModel->filterFields($dms)
+						$this->_ci->DmsVersionModel->filterFields($dms)
 					);
 				}
 			}
@@ -308,56 +750,54 @@ class DmsLib extends FHC_Controller
 		if (is_numeric($person_id) && is_numeric($dms_id))
 		{
 			// Start DB transaction
-			$this->ci->db->trans_start(false);
+			$this->_ci->db->trans_start(false);
 
 			// Get akte_id from table tbl_akte
-			$result = $this->ci->AkteModel->loadWhere(array('person_id' => $person_id, 'dms_id' => $dms_id));
+			$result = $this->_ci->AkteModel->loadWhere(array('person_id' => $person_id, 'dms_id' => $dms_id));
 			if (isSuccess($result))
 			{
 				// Delete all entries in tbl_akte
-				$cnt = count($result->retval);
-				for ($i = 0; $i < $cnt; $i++)
+				for ($i = 0; $i < count(getData($result)); $i++)
 				{
-					$this->ci->AkteModel->delete($result->retval[$i]->akte_id);
+					$this->_ci->AkteModel->delete(getData($result)[$i]->akte_id);
 				}
 
 				// Get all filenames related to this dms
-				$resultFileNames = $this->ci->DmsVersionModel->loadWhere(array('dms_id' => $dms_id));
+				$resultFileNames = $this->_ci->DmsVersionModel->loadWhere(array('dms_id' => $dms_id));
 				if (isSuccess($resultFileNames))
 				{
 					// Delete from tbl_dms_version
-					$result = $this->ci->DmsVersionModel->delete(array('dms_id' => $dms_id));
+					$result = $this->_ci->DmsVersionModel->delete(array('dms_id' => $dms_id));
 					if (isSuccess($result))
 					{
 						// Delete from tbl_dms
-						$result = $this->ci->DmsModel->delete($dms_id);
+						$result = $this->_ci->DmsModel->delete($dms_id);
 					}
 				}
 			}
 
 			// Transaction complete!
-			$this->ci->db->trans_complete();
+			$this->_ci->db->trans_complete();
 
 			// Check if everything went ok during the transaction
-			if ($this->ci->db->trans_status() === false || isError($result))
+			if ($this->_ci->db->trans_status() === false || isError($result))
 			{
-				$this->ci->db->trans_rollback();
+				$this->_ci->db->trans_rollback();
 				$result = error('An error occurred while performing a delete operation', EXIT_ERROR);
 			}
 			else
 			{
-				$this->ci->db->trans_commit();
+				$this->_ci->db->trans_commit();
 				$result = success('Dms successfully removed from DB');
 			}
 
 			// If everything is ok
 			if (isSuccess($result))
 			{
-				$cnt = count($resultFileNames->retval);
 				// Remove all files related to this person and dms
-				for ($i = 0; $i < $cnt; $i++)
+				for ($i = 0; $i < count(getData($resultFileNames)); $i++)
 				{
-					$this->ci->DmsFSModel->remove($resultFileNames->retval[$i]->filename);
+					$this->_ci->DmsFSModel->removeBase64(getData($resultFileNames)[$i]->filename);
 				}
 			}
 		}
@@ -376,19 +816,19 @@ class DmsLib extends FHC_Controller
 	 */
 	public function getAkteContent($akte_id)
 	{
-		$akte = $this->ci->AkteModel->load($akte_id);
+		$akte = $this->_ci->AkteModel->load($akte_id);
 		if (hasData($akte))
 		{
-			if ($akte->retval[0]->inhalt != '')
+			if (getData($akte)[0]->inhalt != '')
 			{
-				return success(base64_decode($akte->retval[0]->inhalt));
+				return success(base64_decode(getData($akte)[0]->inhalt));
 			}
-			elseif ($akte->retval[0]->dms_id != '')
+			elseif (getData($akte)[0]->dms_id != '')
 			{
-				$dmscontent = $this->read($akte->retval[0]->dms_id);
+				$dmscontent = $this->read(getData($akte)[0]->dms_id);
 				if (isSuccess($dmscontent))
 				{
-					return success(base64_decode($dmscontent->retval[0]->file_content));
+					return success(base64_decode(getData($dmscontent)[0]->file_content));
 				}
 				else
 				{
@@ -415,10 +855,10 @@ class DmsLib extends FHC_Controller
 	{
 		$filename = uniqid().'.'.pathinfo($dms['name'], PATHINFO_EXTENSION);
 
-		$result = $this->ci->DmsFSModel->write($filename, $dms['file_content']);
+		$result = $this->_ci->DmsFSModel->writeBase64($filename, $dms['file_content']);
 		if (isSuccess($result))
 		{
-			$result->retval = $filename;
+			$result = success($filename);
 		}
 
 		return $result;
@@ -439,7 +879,7 @@ class DmsLib extends FHC_Controller
 
 			if (hasData($result))
 			{
-				$result = $this->ci->DmsFSModel->write($result->retval[0]->filename, $dms['file_content']);
+				$result = $this->_ci->DmsFSModel->writeBase64(getData($result)[0]->filename, $dms['file_content']);
 			}
 		}
 
@@ -451,12 +891,13 @@ class DmsLib extends FHC_Controller
 	 */
 	private function _loadUploadLibrary($allowed_types)
 	{
-		$config['upload_path']          = $this->UPLOAD_PATH;
-		$config['allowed_types']        = implode('|', $allowed_types);
-		$config['overwrite']            = true;
-		$config['file_name']				= uniqid().'.pdf';
+		$config = array();
+		$config['upload_path'] = DMS_PATH;
+		$config['allowed_types'] = implode('|', $allowed_types);
+		$config['overwrite'] = true;
+		$config['file_name'] = uniqid().'.pdf';
 
-		$this->ci->load->library('upload', $config);
-		$this->ci->upload->initialize($config);
+		$this->_ci->load->library('upload', $config);
+		$this->_ci->upload->initialize($config);
 	}
 }

application/libraries/FilesystemLib.php

@@ -1,142 +0,0 @@
-<?php
-/***
- * FH-Complete
- *
- * @package		FHC-API
- * @author		FHC-Team
- * @copyright	Copyright (c) 2016, fhcomplete.org
- * @license		GPLv3
- * @link		http://fhcomplete.org
- * @since		Version 1.0
- * @filesource
- */
-
-if (!defined('BASEPATH')) exit('No direct script access allowed');
-
-class FilesystemLib
-{
-	/**
-	 * checkParameters
-	 */
-	private function checkParameters($filepath, $filename)
-	{
-		if (isset($filepath) && isset($filename) &&
-			$filepath != '' && $filename != '')
-		{
-			return true;
-		}
-		else
-		{
-			return false;
-		}
-	}
-	
-	/**
-	 * read
-	 */
-	public function read($filepath, $filename)
-	{
-		$result = null;
-		
-		if ($this->checkParameters($filepath, $filename))
-		{
-			$resource = $filepath.DIRECTORY_SEPARATOR.$filename;
-			if (file_exists($resource) && $fileHandle = fopen($resource, 'r'))
-			{
-				$result = '';
-				while (!feof($fileHandle))
-				{
-					$result .= fread($fileHandle, 8192);
-				}
-				fclose($fileHandle);
-			}
-		}
-		
-		return $result;
-	}
-	
-	/**
-	 * write
-	 */
-	public function write($filepath, $filename, $content)
-	{
-		$result = null;
-
-		if ($this->checkParameters($filepath, $filename) && isset($content))
-		{
-			$resource = $filepath.DIRECTORY_SEPARATOR.$filename;
-			if (is_writable($filepath) && $fileHandle = fopen($resource, 'w'))
-			{
-				if (fwrite($fileHandle, $content) !== false)
-				{
-					$result = true;
-				}
-				fclose($fileHandle);
-			}
-		}
-		
-		return $result;
-	}
-	
-	/**
-	 * append
-	 */
-	public function append($filepath, $filename, $content)
-	{
-		$result = null;
-
-		if ($this->checkParameters($filepath, $filename) && isset($content))
-		{
-			$resource = $filepath.DIRECTORY_SEPARATOR.$filename;
-			if (is_writable($resource) && $fileHandle = fopen($resource, 'a'))
-			{
-				if (fwrite($fileHandle, $content) !== false)
-				{
-					$result = true;
-				}
-				fclose($fileHandle);
-			}
-		}
-		
-		return $result;
-	}
-	
-	/**
-	 * remove
-	 */
-	public function remove($filepath, $filename)
-	{
-		$result = null;
-
-		if ($this->checkParameters($filepath, $filename))
-		{
-			if (is_writable($filepath))
-			{
-				$resource = $filepath.DIRECTORY_SEPARATOR.$filename;
-				$result = unlink($resource);
-			}
-		}
-		
-		return $result;
-	}
-	
-	/**
-	 * rename
-	 */
-	public function rename($filepath, $filename, $newFilepath, $newFilename)
-	{
-		$result = null;
-
-		if ($this->checkParameters($filepath, $filename) && $this->checkParameters($newFilepath, $newFilename))
-		{
-			$resource = $filepath.DIRECTORY_SEPARATOR.$filename;
-			if (is_writable($filepath) && is_writable($newFilepath) && file_exists($resource))
-			{
-				$destination = $newFilepath.DIRECTORY_SEPARATOR.$newFilename;
-				$result = rename($resource, $destination);
-			}
-		}
-		
-		return $result;
-	}
-}

application/libraries/FilterWidgetLib.php

@@ -340,20 +340,25 @@ class FilterWidgetLib
 			{
 				$filterDefinition = $filters[$filtersCounter]; // definition of one filter
 
-				if ($filtersCounter > 0)
-					$where .= ' AND '; // if it's NOT the last one
-
-				if (!isEmptyString($filterDefinition->name)) // if the name of the applied filter is valid
+				// If the name of the applied filter is valid
+				if (!isEmptyString($filterDefinition->name))
 				{
-					// ...build the condition
-					$where .= '"'.$filterDefinition->name.'"'.$this->_getDatasetQueryCondition($filterDefinition);
+					// Build the query conditions
+					$datasetQueryCondition = $this->_getDatasetQueryCondition($filterDefinition);
+
+					// If the built condition is valid then add it to the query clause
+					if (!isEmptyString($datasetQueryCondition))
+					{
+						// // If this is NOT the first one
+						if ($filtersCounter > 0) $where .= ' AND ';
+
+						$where .= '"'.$filterDefinition->name.'"'.$datasetQueryCondition;
+					}
 				}
 			}
 
-			if ($where != '') // if the SQL where clause was built
-			{
-				$datasetQuery .= ' WHERE '.$where;
-			}
+			// If the SQL where clause was built
+			if ($where != '') $datasetQuery .= ' WHERE '.$where;
 		}
 
 		return $datasetQuery;