Merge branch 'master' into permissions

application/config/fhcomplete.php

@@ -4,6 +4,5 @@ if (! defined('BASEPATH')) exit('No direct script access allowed');
 
 $config['fhc_version'] = '3.2';
 
-//
 $config['addons_aufnahme_url'] = array();
-$config['addons_aufnahme_url']['OE_ROOT'] = 'http://debian.dev/addons/aufnahme/OE_ROOT/cis/index.php';
+$config['addons_aufnahme_url']['OE_ROOT'] = 'https://SERVER-NAME/addons/aufnahme/OE_ROOT/cis/index.php';

application/config/navigation.php

@@ -1,17 +1,12 @@
 <?php
 
 $config['navigation_header'] = array(
-	'Vilesci/index' => array(
-		'FH-Complete' => base_url('index.ci.php/'),
+	'*' => array(
+		'FH-Complete' => site_url(''),
 		'Vilesci' => base_url('/vilesci'),
 		'CIS' => CIS_ROOT
 	),
-	'system/infocenter/InfoCenter/index' => array(
-		'FH-Complete' => base_url('index.ci.php/'),
-		'Vilesci' => base_url('/vilesci'),
-		'CIS' => CIS_ROOT
-	),
-	'system/infocenter/InfoCenter/showDetails' => array(
+	'system/infocenter/InfoCenter/infocenterFreigegeben' => array(
 		'FH-Complete' => base_url('index.ci.php/'),
 		'Vilesci' => base_url('/vilesci'),
 		'CIS' => CIS_ROOT
@@ -39,7 +34,7 @@ $config['navigation_menu']['Vilesci/index'] = array(
 				'expand' => true
 			),
 			'Infocenter' => array(
-				'link' => base_url('index.ci.php/system/infocenter/InfoCenter'),
+				'link' => site_url('/system/infocenter/InfoCenter'),
 				'icon' => 'info',
 				'description' => 'Infocenter',
 				'expand' => true
@@ -59,17 +54,35 @@ $config['navigation_menu']['Vilesci/index'] = array(
 				'expand' => true
 			),
 			'Extensions' => array(
-				'link' => base_url('index.ci.php/system/extensions/Manager'),
+				'link' => site_url('/system/extensions/Manager'),
 				'icon' => 'cubes',
 				'description' => 'Extensions Manager',
 				'expand' => true
-			),
-			'Datenschutz' => array(
-				'link' => base_url('index.ci.php/extensions/FHC-Core-DSMS/export'),
-				'description' => 'Datenschutz',
-				'icon' => 'legal',
-				'expand' => true
 			)
 		)
 	)
 );
+
+//HIDDEN as long as filter is revised
+//$config['navigation_menu']['system/infocenter/InfoCenter/index'] = array(
+//	'Freigegeben' => array(
+//		'link' => base_url('index.ci.php/system/infocenter/InfoCenter/infocenterFreigegeben'),
+//		'description' => 'Freigegeben',
+//		'icon' => 'thumbs-up'
+//	));
+
+$config['navigation_menu']['system/infocenter/InfoCenter/showDetails'] = array(
+	'Freigegeben' => array(
+		'link' => base_url('index.ci.php/system/infocenter/InfoCenter/infocenterFreigegeben'),
+		'description' => 'Freigegeben',
+		'icon' => 'thumbs-up'
+	));
+
+$config['navigation_menu']['system/infocenter/InfoCenter/infocenterFreigegeben'] = array(
+	'Zurück' => array(
+		'link' => base_url('index.ci.php/system/infocenter/InfoCenter/index'),
+		'description' => 'Zurück',
+		'icon' => 'angle-left'
+	));
+
+

application/controllers/api/v1/system/Phrase.php

@@ -22,11 +22,12 @@ class Phrase extends APIv1_Controller
 	public function __construct()
 	{
 		parent::__construct(array('Phrase' => 'system/phrase:rw', 'Phrases' => 'system/phrase:r'));
+
 		$this->load->library('PhrasesLib');
 	}
 
 	/**
-	 * @return void
+	 *
 	 */
 	public function getPhrase()
 	{
@@ -45,7 +46,7 @@ class Phrase extends APIv1_Controller
 	}
 
 	/**
-	 * @return void
+	 *
 	 */
 	public function getPhrases()
 	{
@@ -69,7 +70,7 @@ class Phrase extends APIv1_Controller
 	}
 
 	/**
-	 * @return void
+	 *
 	 */
 	public function postPhrase()
 	{
@@ -92,6 +93,9 @@ class Phrase extends APIv1_Controller
 		}
 	}
 
+	/**
+	 *
+	 */
 	private function _validate($phrase = null)
 	{
 		return false;

application/controllers/system/Filters.php

@@ -439,6 +439,11 @@ class Filters extends CI_Controller
 		$filterOperationValues = $this->input->post('filterOperationValues');
 		$filterOptions = $this->input->post('filterOptions');
 
+		if ($fieldNames == null) $fieldNames = array();
+		if ($filterOperationValues == null) $filterOperationValues = array();
+		if ($filterOperations == null) $filterOperations = array();
+		if ($filterOptions == null) $filterOptions = array();
+
 		$activeFilters = array_combine($fieldNames, $filterOperationValues);
 		$activeFiltersOperation = array_combine($fieldNames, $filterOperations);
 		$activeFiltersOption = array_combine($fieldNames, $filterOptions);

application/controllers/system/Navigation.php

@@ -10,7 +10,7 @@ class Navigation extends FHC_Controller
 	const SESSION_NAME = 'NAVIGATION_MENU';
 
 	/**
-	 *
+	 * Constructor
 	 */
 	public function __construct()
     {
@@ -23,12 +23,15 @@ class Navigation extends FHC_Controller
 
 		$this->config->load('navigation');
 
-        // Load session library
-        $this->load->library('session');
-    }
+		// Load session library
+		$this->load->library('session');
+		$this->load->library('ExtensionsLib');
+	}
 
 	/**
-	 *
+	 * This function creates the left Menu for each Page
+	 * @param navigation_widget_called GET Parameter witch holds the currently called Page
+	 * @return JSON object with the Menu Entries
 	 */
 	public function menu()
 	{
@@ -37,16 +40,33 @@ class Navigation extends FHC_Controller
 
 		if (isset($navigation_widget_called))
 		{
+			// Get Menu Entries of the Core
 			$navigationMenuArray = $this->config->item('navigation_menu');
+			$json = $this->wildcardsearch($navigationMenuArray, $navigation_widget_called);
 
-			if (isset($navigationMenuArray) && is_array($navigationMenuArray))
+			// Load Menu Entries of Extensions
+			$extensions = $this->extensionslib->getInstalledExtensions();
+			if(hasData($extensions))
 			{
-				if (isset($navigationMenuArray[$navigation_widget_called]))
+				$json_extension = array();
+				foreach($extensions->retval as $ext)
 				{
-					$json = $navigationMenuArray[$navigation_widget_called];
+					$filename = APPPATH.'config/'.ExtensionsLib::EXTENSIONS_DIR_NAME.'/'.$ext->name.'/navigation.php';
+					if (file_exists($filename))
+					{
+						unset($config);
+						include($filename);
+						if(isset($config['navigation_menu']) && is_array($config['navigation_menu']))
+						{
+							$json_extension = array_merge_recursive($json_extension, $this->wildcardsearch($config['navigation_menu'], $navigation_widget_called));
+						}
+					}
 				}
+				// Merge Extension Menuentries with the Core Entries
+				$json = array_merge_recursive($json, $json_extension);
 			}
 
+			// Load dynamic Menu Entries from Session
 			if (isset($_SESSION['navigation_menu']))
 			{
 				$navigationMenuSessionArray = $_SESSION['navigation_menu'];
@@ -55,7 +75,7 @@ class Navigation extends FHC_Controller
 				{
 					if (isset($navigationMenuSessionArray[$navigation_widget_called]))
 					{
-						$json = array_merge($json, $navigationMenuSessionArray[$navigation_widget_called]);
+						$json = array_merge_recursive($json, $navigationMenuSessionArray[$navigation_widget_called]);
 					}
 				}
 			}
@@ -65,7 +85,9 @@ class Navigation extends FHC_Controller
 	}
 
 	/**
-	 *
+	 * This function creates the Top Menu for each Page
+	 * @param navigation_widget_called GET Parameter witch holds the currently called Page
+	 * @return JSON object with the Menu Entries
 	 */
 	public function header()
 	{
@@ -74,16 +96,32 @@ class Navigation extends FHC_Controller
 
 		if (isset($navigation_widget_called))
 		{
+			// Load Header Entries of Core
 			$navigationHeaderArray = $this->config->item('navigation_header');
+			$json = $this->wildcardsearch($navigationHeaderArray, $navigation_widget_called);
 
-			if (isset($navigationHeaderArray) && is_array($navigationHeaderArray))
+			// Load Header Entries of Extensions
+			$extensions = $this->extensionslib->getInstalledExtensions();
+			if(hasData($extensions))
 			{
-				if (isset($navigationHeaderArray[$navigation_widget_called]))
+				$json_extension = array();
+				foreach($extensions->retval as $ext)
 				{
-					$json = $navigationHeaderArray[$navigation_widget_called];
+					$filename = APPPATH.'config/'.ExtensionsLib::EXTENSIONS_DIR_NAME.'/'.$ext->name.'/navigation.php';
+					if (file_exists($filename))
+					{
+						unset($config);
+						include($filename);
+						if(isset($config['navigation_header']) && is_array($config['navigation_header']))
+						{
+							$json_extension = array_merge_recursive($json_extension, $this->wildcardsearch($config['navigation_header'], $navigation_widget_called));
+						}
+					}
 				}
+				$json = array_merge_recursive($json, $json_extension);
 			}
 
+			// Load dynamic Header Entries from Session
 			if (isset($_SESSION['navigation_header']))
 			{
 				$navigationHeaderSessionArray = $_SESSION['navigation_header'];
@@ -92,7 +130,8 @@ class Navigation extends FHC_Controller
 				{
 					if (isset($navigationHeaderSessionArray[$navigation_widget_called]))
 					{
-						$json = array_merge($json, $navigationHeaderSessionArray[$navigation_widget_called]);
+						$jsontmp = $this->wildcardsearch($navigationHeaderSessionArray, $navigation_widget_called);
+						$json = array_merge_recursive($json, $jsontmp);
 					}
 				}
 			}
@@ -100,4 +139,47 @@ class Navigation extends FHC_Controller
 
 		$this->output->set_content_type('application/json')->set_output(json_encode($json));
 	}
+
+	/**
+	 * Searches a Menuentry. If there is no exact entry it searches for Wildcard Entries with a Star
+	 * Example:
+	 * Searching for /system/foo/index will Match the following Menuentries:
+	 * 		/system/foo/index
+	 *		/system/foo/*
+	 *		/system/*
+	 *		*
+	 *
+	 * @param $navigationArray Array to Search in.
+	 * @param $navigation_widget_called Navigation to search for.
+	 * @return Navigation Array if found, empty array otherwise
+	 */
+	private function wildcardsearch($navigationArray, $navigation_widget_called)
+	{
+		// Sort Navigation to have them in correct order
+		krsort($navigationArray);
+
+		// 100% match found
+		if(isset($navigationArray[$navigation_widget_called]))
+		{
+			return $navigationArray[$navigation_widget_called];
+		}
+		else
+		{
+			foreach($navigationArray as $key=>$row)
+			{
+				// Search for * Entries
+				if(mb_strpos($key, '*') === 0 || mb_strpos($key, '*') === mb_strlen($key) - 1)
+				{
+					// Take * Entry if Matches
+					$search = mb_substr($key, 0, -1);
+					if($search == '' || mb_strpos($navigation_widget_called, $search) === 0)
+					{
+						return $row;
+					}
+				}
+			}
+		}
+
+		return array();
+	}
 }

application/controllers/system/Phrases.php

@@ -1,9 +1,12 @@
 <?php
+
 if (! defined('BASEPATH')) exit('No direct script access allowed');
 
 class Phrases extends FHC_Controller
 {
-
+	/**
+	 *
+	 */
 	public function __construct()
     {
         parent::__construct(
@@ -31,107 +34,133 @@ class Phrases extends FHC_Controller
 		$this->load->helper('message');
     }
 
+	/**
+	 *
+	 */
 	public function index()
 	{
-		$this->load->view('system/phrases.php');
+		$this->load->view('system/phrases/phrases.php');
 	}
 
+	/**
+	 *
+	 */
 	public function table()
 	{
 		$phrases = $this->phraseslib->getPhraseByApp('aufnahme');
 		if ($phrases->error)
 			show_error($phrases->retval);
-		//var_dump($vorlage);
 
-		$data = array
-		(
+		$data = array(
 			'app' => 'aufnahme',
 			'phrases' => $phrases->retval
 		);
-		$v = $this->load->view('system/phrasesList.php', $data);
+
+		$this->load->view('system/phrases/phrasesList.php', $data);
 	}
 
-	public function view($phrase_id = null)
+	/**
+	 *
+	 */
+	public function view($phrase_id)
 	{
 		if (empty($phrase_id))
-			exit;
-		$phrase_inhalt = $this->phraseslib->getPhraseInhalt($phrase_id);
+			show_error('Invalid phrase_id parameter');
+
 		$phrase = $this->phraseslib->getPhrase($phrase_id);
+
+		$phrase_inhalt = $this->phraseslib->getPhraseInhalt($phrase_id);
 		if ($phrase_inhalt->error)
 			show_error($phrase_inhalt->retval);
-		//var_dump($vorlage);
 
-		$data = array
-		(
+		$data = array(
 			'phrase_id' => $phrase_id,
 			'phrase' => $phrase->retval[0]->phrase,
 			'phrase_inhalt' => $phrase_inhalt->retval
 		);
-		$v = $this->load->view('system/phrasesinhaltList.php', $data);
+
+		$this->load->view('system/phrases/phrasesinhaltList.php', $data);
 	}
 
-	public function deltext($phrasentext_id=null, $phrase_id = null)
+	/**
+	 *
+	 */
+	public function deltext($phrasentext_id, $phrase_id)
 	{
-		if (empty($phrase_id) or empty($phrasentext_id))
-			exit;
+		if (empty($phrasentext_id) || empty($phrase_id))
+			show_error('Invalid phrasentext_id or phrase_id parameter');
+
 		$phrase_inhalt = $this->phraseslib->delPhrasentext($phrasentext_id);
 		if ($phrase_inhalt->error)
 			show_error($phrase_inhalt->retval);
-		//var_dump($vorlage);
 
 		redirect('/system/Phrases/view/'.$phrase_id);
 	}
 
+	/**
+	 *
+	 */
 	public function edit($phrase_id = null)
 	{
-		if (empty($phrase_id))
-			exit;
+		if (empty($phrase_id)) return;
+
 		$phrase = $this->phraseslib->getPhrase($phrase_id);
-		//var_dump($vorlage);
 		if ($phrase->error)
 			show_error($phrase->retval);
+
 		if (count($phrase->retval) != 1)
 			show_error('Phrase nicht vorhanden! ID: '.$phrase_id);
 
-		$data = array
-		(
+		$data = array(
 			'phrase' => $phrase->retval[0]
 		);
-		//var_dump($data['message']);
-		$v = $this->load->view('system/phrasesEdit', $data);
+
+		$this->load->view('system/phrases/phrasesEdit', $data);
 	}
 
-	public function write($vorlage_kurzbz = null)
+	/**
+	 *
+	 */
+	public function write()
 	{
-		$data = array
-		(
+		$data = array(
 			'subject' => 'TestSubject',
 			'body' => 'TestDevelopmentBodyText'
 		);
-		$v = $this->load->view('system/messageWrite', $data);
+
+		$this->load->view('system/messageWrite', $data);
 	}
 
+	/**
+	 *
+	 */
 	public function save()
 	{
 		$phrase_id = $this->input->post('phrase_id');
-		$data['phrase'] = $this->input->post('phrase');
+		$data = array('phrase' => $this->input->post('phrase'));
+
 		$phrase = $this->phraseslib->savePhrase($phrase_id, $data);
 		if ($phrase->error)
 			show_error($phrase->retval);
+
 		$phrase_id = $phrase->retval;
 
 		redirect('/system/Phrases/edit/'.$phrase_id);
 	}
 
+	/**
+	 *
+	 */
 	public function newText()
 	{
 		$phrase_id = $this->input->post('phrase_id');
 
 		$this->load->model('organisation/Organisationseinheit_model', 'OrganisationseinheitModel');
+
 		$this->OrganisationseinheitModel->addLimit(1);
 		$this->OrganisationseinheitModel->addOrder('oe_kurzbz');
-		$resultOE = $this->OrganisationseinheitModel->loadWhere(array('aktiv' => true, 'oe_parent_kurzbz' => null));
 
+		$resultOE = $this->OrganisationseinheitModel->loadWhere(array('aktiv' => true, 'oe_parent_kurzbz' => null));
 		if ($resultOE->error)
 			show_error($resultOE->retval);
 
@@ -139,7 +168,7 @@ class Phrases extends FHC_Controller
 		{
 			$orgeinheit_kurzbz = $resultOE->retval[0]->oe_kurzbz;
 
-			$data = array (
+			$data = array(
 				'phrase_id' => $phrase_id,
 				'sprache' => 'German',
 				'text' => '',
@@ -161,30 +190,40 @@ class Phrases extends FHC_Controller
 		}
 	}
 
+	/**
+	 *
+	 */
 	public function editText($phrasentext_id)
 	{
 		$phrase_inhalt = $this->phraseslib->getPhrasentextById($phrasentext_id);
 		if ($phrase_inhalt->error)
 			show_error($phrase_inhalt->retval);
+
 		$data = $phrase_inhalt->retval[0];
 
-		$this->load->view('system/phraseinhaltEdit', $data);
+		$this->load->view('system/phrases/phraseinhaltEdit', $data);
 	}
 
+	/**
+	 *
+	 */
 	public function saveText()
 	{
 		$phrase_inhalt_id = $this->input->post('phrase_inhalt_id');
-		$data['orgeinheit_kurzbz'] = $this->input->post('oe_kurzbz');
-		$data['orgform_kurzbz'] = $this->input->post('orgform_kurzbz');
-		$data['text'] = $this->input->post('text');
-		$data['description'] = $this->input->post('description');
-		$data['sprache'] = $this->input->post('sprache');
+
+		$data = array(
+			'orgeinheit_kurzbz' => $this->input->post('oe_kurzbz'),
+			'orgform_kurzbz' => $this->input->post('orgform_kurzbz'),
+			'text' => $this->input->post('text'),
+			'description' => $this->input->post('description'),
+			'sprache' => $this->input->post('sprache')
+		);
+
 		$phrase_inhalt = $this->phraseslib->updatePhraseInhalt($phrase_inhalt_id, $data);
 		if ($phrase_inhalt->error)
 			show_error($phrase_inhalt->retval);
-		$data['phrase_inhalt_id'] = $phrase_inhalt_id;
-		redirect('/system/Phrases/editText/'.$phrase_inhalt_id);
-		//$this->load->view('system/templatetextEdit', $data);
-	}
 
+
+		redirect('/system/Phrases/editText/'.$phrase_inhalt_id);
+	}
 }

application/controllers/system/extensions/Manager.php

@@ -24,9 +24,9 @@ class Manager extends FHC_Controller
 		// Load helpers to upload files
 		$this->load->helper(array('form', 'url'));
 
-        // Loads the extensions library
-        $this->load->library('ExtensionsLib');
-    }
+		// Loads the extensions library
+		$this->load->library('ExtensionsLib');
+	}
 
 	/**
 	 *

application/controllers/system/infocenter/InfoCenter.php

@@ -42,6 +42,11 @@ class InfoCenter extends FHC_Controller
 			'logtype' => 'Action',
 			'name' => 'Note added',
 			'message' => 'Note with title %s was added'
+		),
+		'updatenotiz' => array(
+			'logtype' => 'Action',
+			'name' => 'Note updated',
+			'message' => 'Note with title %s was updated'
 		)
 	);
 	private $uid; // contains the UID of the logged user
@@ -103,7 +108,12 @@ class InfoCenter extends FHC_Controller
 	{
 		$this->load->view('system/infocenter/infocenter.php');
 	}
-
+	
+	public function infocenterFreigegeben()
+	{
+		$this->load->view('system/infocenter/infocenterFreigegeben.php');
+	}
+	
 	/**
 	 * Initialization function, gets person and prestudent data and loads the view with the data
 	 * @param $person_id
@@ -137,7 +147,7 @@ class InfoCenter extends FHC_Controller
 			)
 		);
 	}
-
+	
 	/**
 	 * unlocks page from edit by a person, redirects to overview filter page
 	 * @param $person_id
@@ -367,7 +377,7 @@ class InfoCenter extends FHC_Controller
 
 		$this->_redirectToStart($prestudent_id, 'ZgvPruef');
 	}
-
+	
 	/**
 	 * Saves a new Notiz for a person
 	 * @param $person_id
@@ -391,6 +401,44 @@ class InfoCenter extends FHC_Controller
 			->set_content_type('application/json')
 			->set_output(json_encode($result->retval));
 	}
+	
+	/**
+	 * Updates a new Notiz for a person
+	 * @param int $notiz_id
+	 * @param int $person_id
+	 * @return bool true if success
+	 */
+	public function updateNotiz($notiz_id, $person_id)
+	{	
+		$titel = $this->input->post('notiztitel');
+		$text = $this->input->post('notiz');
+
+		$result = $this->NotizModel->update(
+			$notiz_id,
+			array(
+				'titel' => $titel,
+				'text' => $text,
+				'verfasser_uid' => $this->uid,
+				"updateamum" => 'NOW()',
+				"updatevon" => $this->uid
+			)
+		);
+		
+		
+		$json = FALSE;
+		
+		if (isSuccess($result))
+		{
+			$json = TRUE;
+			
+			//set log "Notiz updated"
+			$this->_log($person_id, 'updatenotiz', array($titel));
+		}
+		
+		$this->output
+			->set_content_type('application/json')
+			->set_output(json_encode($json));
+	}
 
 	/**
 	 * Loads Notizen view for a person, helper for reloading after ajax request
@@ -514,7 +562,7 @@ class InfoCenter extends FHC_Controller
 				'children' => array()
 			)
 		);
-
+				
 		$this->_fillFilters($listFiltersSent, $filtersarray['abgeschickt']);
 		$this->_fillFilters($listFiltersNotSent, $filtersarray['nichtabgeschickt']);
 
@@ -562,7 +610,7 @@ class InfoCenter extends FHC_Controller
 		{
 			$toPrint = "%s=%s";
 			$tofill['children'][] = array(
-				'link' => sprintf($toPrint, base_url('index.ci.php/system/infocenter/InfoCenter?filter_id'), $filterId),
+				'link' => sprintf($toPrint, site_url('system/infocenter/InfoCenter?filter_id'), $filterId),
 				'description' => $description
 			);
 		}
@@ -574,13 +622,8 @@ class InfoCenter extends FHC_Controller
 		{
 			$toPrint = "%s=%s";
 
-			if ($this->router->method != 'index')
-			{
-
-			}
-
 			$tofill['children'][] = array(
-				'link' => sprintf($toPrint, base_url('index.ci.php/system/infocenter/InfoCenter?filter_id'), $filterId),
+				'link' => sprintf($toPrint, site_url('system/infocenter/InfoCenter?filter_id'), $filterId),
 				'description' => $description,
 				'subscriptDescription' => 'Remove',
 				'subscriptLinkClass' => 'remove-filter',
@@ -831,6 +874,8 @@ class InfoCenter extends FHC_Controller
 		$prestudentstatus = $prestudent->prestudentstatus;
 		$person_id = $prestudent->person_id;
 		$person = $this->PersonModel->getPersonStammdaten($person_id, true)->retval;
+		$dokumente = $this->AkteModel->getAktenWithDokInfo($person_id, null, false)->retval;
+		$dokumenteNachzureichen = $this->AkteModel->getAktenWithDokInfo($person_id, null, true)->retval;
 
 		//fill mail variables
 		$interessentbez = $person->geschlecht == 'm' ? 'Ein Interessent' : 'Eine Interessentin';
@@ -838,6 +883,25 @@ class InfoCenter extends FHC_Controller
 		$orgform = $prestudentstatus->orgform != '' ? ' ('.$prestudentstatus->orgform.')' : '';
 		$geschlecht = $person->geschlecht == 'm' ? 'männlich' : 'weiblich';
 		$geburtsdatum = date('d.m.Y', strtotime($person->gebdatum));
+		$zgvort = !empty($prestudent->zgvort) ? ' in '.$prestudent->zgvort : '';
+		$zgvnation = !empty($prestudent->zgvnation_bez) ? ', '.$prestudent->zgvnation_bez : '';
+		$zgvdatum = !empty($prestudent->zgvdatum) ? ', am '.date_format(date_create($prestudent->zgvdatum), 'd.m.Y') : '';
+
+		$dokumenteNachzureichenMail = $dokumenteMail = array();
+		//convert documents to array so they can be parsed, and keeping only needed fields
+		$lastel = end($dokumente);
+		foreach ($dokumente as $dokument)
+		{
+			$postfix = $lastel === $dokument ? '' : ' |';
+			$dokumenteMail[] = array('dokument_bezeichnung' => $dokument->dokument_bezeichnung.$postfix);
+		}
+
+		foreach ($dokumenteNachzureichen as $dokument)
+		{
+			$anmerkung = !empty($dokument->anmerkung) ? ' | Anmerkung: '.$dokument->anmerkung : '';
+			$nachgereichtam = !empty($dokument->nachgereicht_am) ? ' | wird nachgereicht bis '.date_format(date_create($dokument->nachgereicht_am), 'd.m.Y') : '';
+			$dokumenteNachzureichenMail[] = array('dokument_bezeichnung' => $dokument->dokument_bezeichnung, 'anmerkung' => $anmerkung, 'nachgereicht_am' => $nachgereichtam);
+		}
 
 		$notizenBewerbung = $this->NotizModel->getNotizByTitel($person_id, 'Anmerkung zur Bewerbung')->retval;
 
@@ -874,7 +938,13 @@ class InfoCenter extends FHC_Controller
 			'gebdatum' => $geburtsdatum,
 			'mailadresse' => $mailadresse,
 			'prestudentid' => $prestudent_id,
-			'notizentext' => $notizentext
+			'zgvbez' => $prestudent->zgv_bez,
+			'zgvort' => $zgvort,
+			'zgvdatum' => $zgvdatum,
+			'zgvnation' => $zgvnation,
+			'notizentext' => $notizentext,
+			'dokumente' => $dokumenteMail,
+			'dokumente_nachgereicht' => $dokumenteNachzureichenMail
 		);
 
 		$this->load->library('parser');
@@ -884,7 +954,7 @@ class InfoCenter extends FHC_Controller
 		//parse freigabe html email template, wordwrap wraps text so no display errors
 		$email = wordwrap($this->parser->parse('templates/mailtemplates/interessentFreigabe', $data, true), 70);
 
-		$subject = ($person->geschlecht == 'm' ? 'Interessent ' : 'Interessentin ').$person->vorname.' '.$person->nachname.' freigegeben';
+		$subject = ($person->geschlecht == 'm' ? 'Interessent ' : 'Interessentin ').$person->vorname.' '.$person->nachname.' für '.$prestudent->studiengangbezeichnung.$orgform.' freigegeben';
 
 		$receiver = $prestudent->studiengangmail;
 

application/core/DB_Model.php

@@ -29,18 +29,16 @@ class DB_Model extends FHC_Model
 	/**
 	 * Constructor
 	 */
-	public function __construct($dbTable = null, $pk = null, $hasSequence = true)
+	public function __construct($dbtype = 'default')
 	{
 		// Call parent constructor
 		parent::__construct();
 
 		// Set properties
-		$this->pk = $pk;
-		$this->dbTable = $dbTable;
-		$this->hasSequence = $hasSequence;
+		$this->hasSequence = true;
 
 		// Loads DB conns and confs
-		$this->load->database();
+		$this->load->database($dbtype);
 
 		// Loads the UDF library
 		$this->load->library('UDFLib');

application/core/FHC_Controller.php

@@ -35,4 +35,14 @@ class FHC_Controller extends CI_Controller
 			exit;
 		}
 	}
+
+	/**
+	 * Wrapper to load phrases using the PhrasesLib
+	 * NOTE: The library is loaded with the alias 'p', so must me used with this alias in the rest of the code.
+	 *		EX: $this->p->t(<category>, <phrase name>)
+	 */
+	public function loadPhrases($categories, $language = null)
+	{
+		$this->load->library('PhrasesLib', array($categories, $language), 'p');
+	}
 }

application/libraries/ExtensionsLib.php

@@ -15,12 +15,17 @@ class ExtensionsLib
 	const EXTENSION_JSON_NAME = 'extension.json'; // file that contains extension data
 	const EXTENSIONS_DIR_NAME = 'extensions'; // name of the directories where will be created the symlinks
 
+	private $_ci;
+
 	private $ARCHIVE_EXTENSIONS = array('.tgz', '.tbz2'); // accepted file extensions for an uploaded extension
 	private $UPLOAD_PATH; // temporary directory to store the upload file and checks the archive
 	private $EXTENSIONS_PATH; // directory where all the extensions are
 
 	// Directories that are part of the extension archive
-	private $SOFTLINK_TARGET_DIRECTORIES = array('config', 'controllers', 'helpers', 'hooks', 'libraries', 'models', 'views', 'widgets');
+	private $SOFTLINK_TARGET_DIRECTORIES = array(
+		APPPATH => array('config', 'controllers', 'helpers', 'hooks', 'libraries', 'models', 'views', 'widgets'),
+		DOC_ROOT => array('public')
+	);
 
 	private $_errorOccurred; // boolean, true if an error occurred while installing an extension
 	private $_currentInstalledExtensionVersion; // contains the version of the current installation of an extension
@@ -33,16 +38,16 @@ class ExtensionsLib
 		$this->UPLOAD_PATH = APPPATH.'tmp/';
 		$this->EXTENSIONS_PATH = APPPATH.'extensions/';
 		// Get code igniter instance
-		$this->ci =& get_instance();
+		$this->_ci =& get_instance();
 
 		// Loads message configurationx
-		$this->ci->config->load('message');
+		$this->_ci->config->load('message');
 
 		// Loads EPrintfLib
-		$this->ci->load->library('EPrintfLib');
+		$this->_ci->load->library('EPrintfLib');
 
 		// Loading models
-		$this->ci->load->model('system/Extensions_model', 'ExtensionsModel');
+		$this->_ci->load->model('system/Extensions_model', 'ExtensionsModel');
 
 		// Set default values fot class properties
 		$this->_errorOccurred = false;
@@ -153,7 +158,7 @@ class ExtensionsLib
 		$delExtension = false;
 
 		// Loads data about this extension from the DB
-		$result = $this->ci->ExtensionsModel->load($extensionId);
+		$result = $this->_ci->ExtensionsModel->load($extensionId);
 		if (hasData($result)) // if something was found
 		{
 			$extensionName = $result->retval[0]->name; // extension name
@@ -162,15 +167,15 @@ class ExtensionsLib
 			$delExtension = $this->_rrm($this->EXTENSIONS_PATH.$extensionName);
 
 			// Select all the version of this extension
-			$this->ci->ExtensionsModel->addSelect('extension_id');
-			$result = $this->ci->ExtensionsModel->loadWhere(array('name' => $extensionName));
+			$this->_ci->ExtensionsModel->addSelect('extension_id');
+			$result = $this->_ci->ExtensionsModel->loadWhere(array('name' => $extensionName));
 			if (hasData($result)) // if something was found
 			{
 				$extsArray = array();
 				foreach ($result->retval as $key => $extension) // loops on them
 				{
 					// Remove them all
-					$result = $this->ci->ExtensionsModel->delete($extension->extension_id);
+					$result = $this->_ci->ExtensionsModel->delete($extension->extension_id);
 					if (isSuccess($result))
 					{
 						$delExtension = true;
@@ -187,7 +192,7 @@ class ExtensionsLib
 	 */
 	public function getInstalledExtensions()
 	{
-		return $this->ci->ExtensionsModel->getInstalledExtensions();
+		return $this->_ci->ExtensionsModel->getInstalledExtensions();
 	}
 
 	/**
@@ -214,7 +219,7 @@ class ExtensionsLib
 	 */
 	private function _loadUploadLibrary()
 	{
-		$this->ci->load->library(
+		$this->_ci->load->library(
 			'upload',
 			array(
 				'upload_path' => $this->UPLOAD_PATH,
@@ -234,9 +239,9 @@ class ExtensionsLib
 		$this->_printStart('Uploading extension');
 
 		// If the upload was a success
-		if ($this->ci->upload->do_upload(ExtensionsLib::FILE_INPUT_NAME))
+		if ($this->_ci->upload->do_upload(ExtensionsLib::FILE_INPUT_NAME))
 		{
-			$uploadData = $this->ci->upload->data(); // retrives data about the uploaded file
+			$uploadData = $this->_ci->upload->data(); // retrives data about the uploaded file
 			// Checks the file extension
 			$uploadedFileExtension = '.'.pathinfo($uploadData['full_path'], PATHINFO_EXTENSION);
 			if (!in_array($uploadedFileExtension, $this->ARCHIVE_EXTENSIONS))
@@ -259,7 +264,7 @@ class ExtensionsLib
 		}
 		else
 		{
-			$this->_printFailure($this->ci->upload->display_errors('', ''));
+			$this->_printFailure($this->_ci->upload->display_errors('', ''));
 		}
 
 		$this->_printSuccess($_uploadExtension != null);
@@ -309,9 +314,9 @@ class ExtensionsLib
 		$this->_printStart('Loads any previous installation data');
 
 		// Loads the last version of the previous installation of this extension
-		$this->ci->ExtensionsModel->addOrder('version', 'DESC');
-		$this->ci->ExtensionsModel->addLimit(1);
-		$result = $this->ci->ExtensionsModel->loadWhere(array('name' => $extensionName));
+		$this->_ci->ExtensionsModel->addOrder('version', 'DESC');
+		$this->_ci->ExtensionsModel->addLimit(1);
+		$result = $this->_ci->ExtensionsModel->loadWhere(array('name' => $extensionName));
 		if (isError($result))
 		{
 			$this->_errorOccurred = true;
@@ -428,7 +433,7 @@ class ExtensionsLib
 							&& count($extensionJson->dependencies) > 0)
 						{
 							// Gets the required dependencies
-							$result = $this->ci->ExtensionsModel->getDependencies($extensionJson->dependencies);
+							$result = $this->_ci->ExtensionsModel->getDependencies($extensionJson->dependencies);
 							// If they are matcheds
 							if (hasData($result) && count($result->retval) == count($extensionJson->dependencies))
 							{
@@ -525,7 +530,7 @@ class ExtensionsLib
 	{
 		$this->_printStart('Adding new entry in the DB');
 
-		$result = $this->ci->ExtensionsModel->insert(
+		$result = $this->_ci->ExtensionsModel->insert(
 			array(
 				'name' => $extensionJson->name,
 				'description' => isset($extensionJson->description) ? $extensionJson->description : null,
@@ -581,7 +586,7 @@ class ExtensionsLib
 					$this->_printMessage($sql);
 
 					// Try to execute that
-					if (!isSuccess($result = @$this->ci->ExtensionsModel->executeQuery($sql)))
+					if (!isSuccess($result = @$this->_ci->ExtensionsModel->executeQuery($sql)))
 					{
 						$this->_errorOccurred = true;
 						$this->_printFailure(' error occurred while executing the query');
@@ -592,7 +597,7 @@ class ExtensionsLib
 					{
 						$this->_printMessage('Query result:');
 						var_dump($result->retval); // KEEP IT!!!
-						$this->ci->eprintflib->printEOL();
+						$this->_ci->eprintflib->printEOL();
 					}
 	            }
 	        }
@@ -654,11 +659,14 @@ class ExtensionsLib
 	{
 		$_delSoftLinks = false;
 
-		foreach ($this->SOFTLINK_TARGET_DIRECTORIES as $key => $targetDirectory)
+		foreach ($this->SOFTLINK_TARGET_DIRECTORIES as $rootPath => $targetDirectories)
 		{
-			if (file_exists(APPPATH.$targetDirectory.'/'.ExtensionsLib::EXTENSIONS_DIR_NAME.'/'.$extensionName))
+			foreach ($targetDirectories as $key => $targetDirectory)
 			{
-				$_delSoftLinks = unlink(APPPATH.$targetDirectory.'/'.ExtensionsLib::EXTENSIONS_DIR_NAME.'/'.$extensionName);
+				if (file_exists($rootPath.$targetDirectory.'/'.ExtensionsLib::EXTENSIONS_DIR_NAME.'/'.$extensionName))
+				{
+					$_delSoftLinks = unlink($rootPath.$targetDirectory.'/'.ExtensionsLib::EXTENSIONS_DIR_NAME.'/'.$extensionName);
+				}
 			}
 		}
 
@@ -705,25 +713,29 @@ class ExtensionsLib
 		$extensionPath = $this->EXTENSIONS_PATH.$extensionName.'/';
 
 		// For every target directory
-		foreach ($this->SOFTLINK_TARGET_DIRECTORIES as $key => $targetDirectory)
+		foreach ($this->SOFTLINK_TARGET_DIRECTORIES as $rootPath => $targetDirectories)
 		{
-			// If destination of the symlink does not exist
-			if (!file_exists(APPPATH.$targetDirectory.'/'.ExtensionsLib::EXTENSIONS_DIR_NAME.'/'.$extensionName))
+			foreach ($targetDirectories as $key => $targetDirectory)
 			{
-				// If the target directory does not exist than creates that
-				if (!is_dir($extensionPath.$targetDirectory))
+				// If destination of the symlink does not exist
+				if (!file_exists($rootPath.$targetDirectory.'/'.ExtensionsLib::EXTENSIONS_DIR_NAME.'/'.$extensionName))
 				{
-					mkdir($extensionPath.$targetDirectory);
-				}
+					// If the target directory does not exist than creates that
+					if (!is_dir($extensionPath.$targetDirectory))
+					{
+						mkdir($extensionPath.$targetDirectory);
+					}
 
-				// Create the symlink
-				$_addSoftLinks = symlink(
-					$extensionPath.$targetDirectory,
-					APPPATH.$targetDirectory.'/'.ExtensionsLib::EXTENSIONS_DIR_NAME.'/'.$extensionName
-				);
-				if (!$_addSoftLinks)
-				{
-					break;
+					// Create the symlink
+					$_addSoftLinks = symlink(
+						$extensionPath.$targetDirectory,
+						$rootPath.$targetDirectory.'/'.ExtensionsLib::EXTENSIONS_DIR_NAME.'/'.$extensionName
+					);
+					if (!$_addSoftLinks)
+					{
+						log_message('error','Failed to create Symlink to '.$extensionPath.$targetDirectory);
+						break;
+					}
 				}
 			}
 		}
@@ -757,13 +769,13 @@ class ExtensionsLib
 		if ($uploadData != null && isset($uploadData->extensionName) && $extensionDB == null)
 		{
 			// Loads all the previous installations of this extension
-			$this->ci->ExtensionsModel->addOrder('version', 'DESC');
-			$this->ci->ExtensionsModel->addLimit(1);
-			$result = $this->ci->ExtensionsModel->loadWhere(array('name' => $uploadData->extensionName));
+			$this->_ci->ExtensionsModel->addOrder('version', 'DESC');
+			$this->_ci->ExtensionsModel->addLimit(1);
+			$result = $this->_ci->ExtensionsModel->loadWhere(array('name' => $uploadData->extensionName));
 			if (hasData($result)) // if found
 			{
 				// Remove them all from file system and DB
-				$this->_printMessage('Removing entries in the DB related to this extension');
+				$this->_printMessage('Removing entries in the DB related to this extension and from extensions directory');
 				$this->delExtension($result->retval[0]->extension_id);
 			}
 		}
@@ -772,7 +784,7 @@ class ExtensionsLib
 			// Remove them all only from DB
 			if ($extensionJson != null && isset($extensionJson->extension_id))
 			{
-				$this->ci->ExtensionsModel->delete($extensionJson->extension_id);
+				$this->_ci->ExtensionsModel->delete($extensionJson->extension_id);
 			}
 		}
 
@@ -789,7 +801,7 @@ class ExtensionsLib
 		$_toggleExtension = false;
 
 		// Loads data from DB about the given extension
-		$result = $this->ci->ExtensionsModel->load($extensionId);
+		$result = $this->_ci->ExtensionsModel->load($extensionId);
 		if (hasData($result))
 		{
 			$extensionName = $result->retval[0]->name; // extension name
@@ -809,7 +821,7 @@ class ExtensionsLib
 			if ($_toggleExtension) // if is a success
 			{
 				// Updates DB
-				$result = $this->ci->ExtensionsModel->update($extensionId, array('enabled' => $enabled));
+				$result = $this->_ci->ExtensionsModel->update($extensionId, array('enabled' => $enabled));
 				if (isSuccess($result))
 				{
 					$_toggleExtension = true;
@@ -829,7 +841,7 @@ class ExtensionsLib
 	 */
 	private function _printError($error)
 	{
-		$this->ci->eprintflib->printError($error);
+		$this->_ci->eprintflib->printError($error);
 	}
 
 	/**
@@ -845,7 +857,7 @@ class ExtensionsLib
 	 */
 	private function _printMessage($message)
 	{
-		$this->ci->eprintflib->printMessage($message);
+		$this->_ci->eprintflib->printMessage($message);
 	}
 
 	/**
@@ -864,7 +876,7 @@ class ExtensionsLib
 	 */
 	private function _printInfo($info)
 	{
-		$this->ci->eprintflib->printInfo($info);
+		$this->_ci->eprintflib->printInfo($info);
 	}
 
 	/**

application/libraries/PhrasesLib.php

@@ -4,38 +4,40 @@ if (! defined('BASEPATH')) exit('No direct script access allowed');
 
 class PhrasesLib
 {
+	private $_ci; // Code igniter instance
+	private $_phrases; // Contains the retrived phrases
+
 	/**
 	 * Loads parser library
 	 */
     public function __construct()
     {
-        //require_once APPPATH.'config/message.php';
+		$this->_ci =& get_instance();
 
-		$this->ci =& get_instance();
+		// CI parser
+		$this->_ci->load->library('parser');
 
-		// Loads message configuration
-		$this->ci->config->load('message');
-		
-		$this->ci->load->library('parser');
-		
-		$this->ci->load->model('system/Phrase_model', 'PhraseModel');
-		$this->ci->load->model('system/Phrasentext_model', 'PhrasentextModel');
+		$this->_ci->load->model('system/Phrase_model', 'PhraseModel');
+		$this->_ci->load->model('system/Phrasentext_model', 'PhrasentextModel');
 
-        $this->ci->load->helper('language');
 		// Loads helper message to manage returning messages
-		$this->ci->load->helper('message');
+		$this->_ci->load->helper('message');
+
+		// Workaround to use more parameters in the construct since PHP doesn't support many constructors
+		$this->_extend_construct(func_get_args());
     }
 
+	// -----------------------------------------------------------------------------------------------------------------
+	// Public methods
+
    	/**
-     * getPhrase() - will load a spezific Phrase
+     * getPhrase() - loads a specific Phrase
      */
     public function getPhrase($phrase_id)
     {
-        if (empty($phrase_id))
-        	return error(MSG_ERR_INVALID_MSG_ID);
+        if (empty($phrase_id)) return error(MSG_ERR_INVALID_MSG_ID);
 
-        $phrase = $this->ci->PhraseModel->load($phrase_id);
-        return $phrase;
+        return $this->_ci->PhraseModel->load($phrase_id);
     }
 
     /**
@@ -43,8 +45,7 @@ class PhrasesLib
      */
     public function getPhraseByApp($app = null)
     {
-	    $phrases = $this->ci->PhraseModel->loadWhere(array('app' => $app));
-        return $phrases;
+	    return $this->_ci->PhraseModel->loadWhere(array('app' => $app));
     }
 
     /**
@@ -52,11 +53,9 @@ class PhrasesLib
      */
 	public function getPhraseInhalt($phrase_id)
     {
-        if (empty($phrase_id))
-        	return error(MSG_ERR_INVALID_MSG_ID);
+        if (empty($phrase_id)) return error(MSG_ERR_INVALID_MSG_ID);
 
-        $phrasentext = $this->ci->PhrasentextModel->loadWhere(array('phrase_id' => $phrase_id));
-        return $phrasentext;
+        return $this->_ci->PhrasentextModel->loadWhere(array('phrase_id' => $phrase_id));
     }
 
     /**
@@ -64,11 +63,9 @@ class PhrasesLib
      */
     public function delPhrasentext($phrasentext_id)
     {
-        if (empty($phrasentext_id))
-        	return error(MSG_ERR_INVALID_MSG_ID);
+        if (empty($phrasentext_id)) return error(MSG_ERR_INVALID_MSG_ID);
 
-        $phrasentext = $this->ci->PhrasentextModel->delete(array('phrasentext_id' => $phrasentext_id));
-        return $phrasentext;
+        return $this->_ci->PhrasentextModel->delete(array('phrasentext_id' => $phrasentext_id));
     }
 
 	/**
@@ -76,11 +73,9 @@ class PhrasesLib
      */
     public function savePhrase($phrase_id, $data)
     {
-        if (empty($data))
-        	return error(MSG_ERR_INVALID_MSG_ID);
+        if (empty($data)) return error(MSG_ERR_INVALID_MSG_ID);
 
-        $phrase = $this->ci->PhraseModel->update($phrase_id, $data);
-        return $phrase;
+        return $this->_ci->PhraseModel->update($phrase_id, $data);
     }
 
 
@@ -90,32 +85,33 @@ class PhrasesLib
     public function getPhrasentextById($phrasentext_id)
 	{
         if (empty($phrasentext_id))
-        	return error($this->ci->lang->line('fhc_'.FHC_INVALIDID, false));
+        	return error($this->_ci->lang->line('fhc_'.FHC_INVALIDID, false));
 
-        $phrasentext = $this->ci->PhrasentextModel->load($phrasentext_id);
-        return $phrasentext;
+        return $this->_ci->PhrasentextModel->load($phrasentext_id);
     }
 
 	/**
-     * getPhrases()
+     * getPhrases() - Retrives phrases from the DB
+	 * The given parameter are the same needed to read from the table system.tb_phrase
      */
     public function getPhrases($app, $sprache, $phrase = null, $orgeinheit_kurzbz = null, $orgform_kurzbz = null, $blockTags = null)
     {
 		if (isset($app) && isset($sprache))
 		{
-			$result = $this->ci->PhraseModel->getPhrases($app, $sprache, $phrase, $orgeinheit_kurzbz, $orgform_kurzbz);
-			
+			$result = $this->_ci->PhraseModel->getPhrases($app, $sprache, $phrase, $orgeinheit_kurzbz, $orgform_kurzbz);
+
 			if (hasData($result))
 			{
-				$parser = new \Netcarver\Textile\Parser();
-				
+				// Textile parser
+				$textileParser = new \Netcarver\Textile\Parser();
+
 				for ($i = 0; $i < count($result->retval); $i++)
 				{
 					// If no <p> tags required
 					if ($blockTags == 'no')
 					{
-						$tmpText = $parser->textileThis($result->retval[$i]->text); // Parse
-						
+						$tmpText = $textileParser->textileThis($result->retval[$i]->text); // Parse
+
 						// Removes tags <p> and </p> from the beginning and from the end of the string if they are present
 						// NOTE: Those tags are usually, but not always, added by the textile parser
 						if (strlen($tmpText) >= 7)
@@ -129,12 +125,12 @@ class PhrasesLib
 								$tmpText = substr($tmpText, 0, strlen($tmpText) - 4);
 							}
 						}
-						
+
 						$result->retval[$i]->text = $tmpText;
 					}
 					else
 					{
-						$result->retval[$i]->text = $parser->textileThis($result->retval[$i]->text);
+						$result->retval[$i]->text = $textileParser->textileThis($result->retval[$i]->text);
 					}
 				}
 			}
@@ -152,8 +148,7 @@ class PhrasesLib
      */
     public function insertPhraseinhalt($data)
 	{
-        $phrasentext = $this->ci->PhrasentextModel->insert($data);
-        return $phrasentext;
+        return $this->_ci->PhrasentextModel->insert($data);
     }
 
 	/**
@@ -161,8 +156,7 @@ class PhrasesLib
      */
     public function getVorlagetextById($vorlagestudiengang_id)
 	{
-        $vorlagetext = $this->ci->VorlageStudiengangModel->load($vorlagestudiengang_id);
-        return $vorlagetext;
+        return $this->_ci->VorlageStudiengangModel->load($vorlagestudiengang_id);
     }
 
 	/**
@@ -170,8 +164,7 @@ class PhrasesLib
      */
     public function updatePhraseInhalt($phrasentext_id, $data)
 	{
-        $phrasentext = $this->ci->PhrasentextModel->update($phrasentext_id, $data);
-        return $phrasentext;
+        return $this->_ci->PhrasentextModel->update($phrasentext_id, $data);
     }
 
 	/**
@@ -180,8 +173,84 @@ class PhrasesLib
     public function parseVorlagetext($text, $data = array())
 	{
         if (empty($text))
-        	return error($this->ci->lang->line('fhc_'.FHC_INVALIDID, false));
-		$text = $this->ci->parser->parse_string($text, $data, true);
-		return $text;
+        	return error($this->_ci->lang->line('fhc_'.FHC_INVALIDID, false));
+
+		return $this->_ci->parser->parse_string($text, $data, true);
     }
+
+	/**
+	 *
+	 */
+	public function t($category, $phrase, $parameters = array(), $orgeinheit_kurzbz = null, $orgform_kurzbz = null)
+	{
+		if (isset($this->_phrases) && is_array($this->_phrases))
+		{
+			for ($i = 0; $i < count($this->_phrases); $i++)
+			{
+				$_phrase = $this->_phrases[$i];
+
+				if ($_phrase->category == $category
+					&& $_phrase->phrase == $phrase
+					&& $_phrase->orgeinheit_kurzbz == $orgeinheit_kurzbz
+					&& $_phrase->orgform_kurzbz== $orgform_kurzbz)
+				{
+					if ($parameters == null) $parameters = array();
+
+					echo $this->_ci->parser->parse_string($_phrase->text, $parameters, true)."\n";
+					break;
+				}
+			}
+		}
+	}
+
+	// -----------------------------------------------------------------------------------------------------------------
+	// Private methods
+
+	/**
+	 * Extends the functionalities of the constructor of this class
+	 * This is a workaround to use more parameters in the construct since PHP doesn't support many constructors
+	 * The new accepted parameters are:
+	 * - categories: could be a string or an array of strings. These are the categories used to load phrases
+	 * - language: optional parameter must be a string. It's used to load phrases
+	 */
+	private function _extend_construct($params)
+	{
+		// Checks if the $params is an array with at least one element
+		if (is_array($params) && count($params) > 0)
+		{
+			$parameters = $params[0]; // temporary variable
+
+			// If there are parameters
+			if (is_array($parameters) && count($parameters) > 0)
+			{
+				$categories = $parameters[0]; // categories is always the first parameter
+				if (!is_array($categories)) // if it is not an array, then convert into one
+				{
+					$categories = array($categories);
+				}
+
+				// Use the given language if present, otherwise retrives the language for the logged user
+				$language = DEFAULT_LANGUAGE;
+				if (count($parameters) == 2 && !empty($parameters[1]) && is_string($parameters[1]))
+				{
+					$language = $parameters[1];
+				}
+				else
+				{
+					$this->_ci->load->model('person/Person_model', 'PersonModel');
+
+					$language = $this->_ci->PersonModel->getLanguage(getAuthUID());
+				}
+
+				// Loads phrases
+				$phrases = $this->_ci->PhraseModel->getPhrasesByCategoryAndLanguage($categories, $language);
+
+				// If there are phrases loaded then store them in the property _phrases
+				if (hasData($phrases))
+				{
+					$this->_phrases = $phrases->retval;
+				}
+			}
+		}
+	}
 }

application/libraries/VorlageLib.php

@@ -114,6 +114,8 @@ class VorlageLib
 			$queryParameters["sprache"] = $sprache;
 		}
 
+		$this->ci->VorlageStudiengangModel->addOrder('version', 'DESC');
+
 		$vorlage = $this->ci->VorlageStudiengangModel->loadWhere($queryParameters);
 		// If the searched template was not found
 		if (!hasData($vorlage))

application/models/accounting/Konto_model.php

@@ -11,4 +11,20 @@ class Konto_model extends DB_Model
 		$this->dbTable = 'wawi.tbl_konto';
 		$this->pk = 'konto_id';
 	}
+
+	/**
+	 * Gets all Konten connected for a Kostenstelle
+	 * @param $kostenstelle_id
+	 * @return array
+	 */
+	public function getKontenForKostenstelle($kostenstelle_id)
+	{
+		$this->addJoin('wawi.tbl_konto_kostenstelle', 'konto_id');
+		$konten = $this->loadWhere(array('kostenstelle_id' => $kostenstelle_id));
+
+		if ($konten->error)
+			return error($konten->retval);
+
+		return $konten;
+	}
 }

application/models/accounting/Kostenstelle_model.php

@@ -11,4 +11,70 @@ class Kostenstelle_model extends DB_Model
 		$this->dbTable = 'wawi.tbl_kostenstelle';
 		$this->pk = 'kostenstelle_id';
 	}
+
+	/**
+	 * Gets all active Kostenstellen for a geschaeftsjahr, as determined by the geschaeftsjahrvon and bis fields
+	 * Gets Kostenstellen of current Geschaeftsjahr if Geschaeftsjahr not specified
+	 * Only the Kostenstellen for which a permission exists are returned!
+	 * @param $geschaeftsjahr
+	 * @return array|null
+	 */
+	public function getActiveKostenstellenForGeschaeftsjahr($geschaeftsjahr = null)
+	{
+		$this->load->model('organisation/geschaeftsjahr_model', 'GeschaeftsjahrModel');
+
+		if ($geschaeftsjahr === null)
+		{
+			$lgj = $this->GeschaeftsjahrModel->getCurrGeschaeftsjahr();
+
+			if ($lgj->error)
+				return error($lgj->retval);
+
+			if (count($lgj->retval) < 1)
+				return success(array());
+
+			$geschaeftsjahr = $lgj->retval[0]->geschaeftsjahr_kurzbz;
+		}
+
+		$this->GeschaeftsjahrModel->addSelect('start, ende');
+		$gj = $this->GeschaeftsjahrModel->load($geschaeftsjahr);
+
+		if ($gj->error)
+			return error($gj->retval);
+
+		if (count($gj->retval) < 1)
+			return success(array());
+
+		$gjstart = $gj->retval[0]->start;
+
+		$query = 'SELECT kostenstelle_id, kurzbz, wawi.tbl_kostenstelle.bezeichnung, wawi.tbl_kostenstelle.aktiv
+					FROM wawi.tbl_kostenstelle 
+					LEFT JOIN public.tbl_geschaeftsjahr kgjvon on wawi.tbl_kostenstelle.geschaeftsjahrvon = kgjvon.geschaeftsjahr_kurzbz
+					LEFT JOIN public.tbl_geschaeftsjahr kgjbis on wawi.tbl_kostenstelle.geschaeftsjahrbis = kgjbis.geschaeftsjahr_kurzbz 
+					WHERE
+					(DATE ? >= kgjvon.start OR wawi.tbl_kostenstelle.geschaeftsjahrvon IS NULL)
+					AND
+					(DATE ? < kgjbis.ende OR wawi.tbl_kostenstelle.geschaeftsjahrbis IS NULL)
+					ORDER BY wawi.tbl_kostenstelle.bezeichnung';
+
+		$kostenstellen = $this->execQuery($query, array($gjstart, $gjstart));
+
+		if ($kostenstellen->error)
+			return error($kostenstellen->retval);
+
+		$this->load->library('PermissionLib');
+
+		$kostenstellenresult = array();
+
+		//filter kostenstellen, only kostenstellen for which berechtigt
+		foreach ($kostenstellen->retval as $kostenstelle)
+		{
+			if ($this->permissionlib->isBerechtigt('extension/budget_verwaltung', 'suid', null, $kostenstelle->kostenstelle_id) === true)
+			{
+				$kostenstellenresult[] = $kostenstelle;
+			}
+		}
+
+		return success($kostenstellenresult);
+	}
 }

application/models/organisation/Geschaeftsjahr_model.php

@@ -11,4 +11,33 @@ class Geschaeftsjahr_model extends DB_Model
 		$this->dbTable = 'public.tbl_geschaeftsjahr';
 		$this->pk = 'geschaeftsjahr_kurzbz';
 	}
+
+	/**
+	 * Gets current Geschaeftsjahr, as determined by its start date
+	 * @return array|null
+	 */
+	public function getCurrGeschaeftsjahr()
+	{
+		$query = 'SELECT *
+					FROM public.tbl_geschaeftsjahr
+					WHERE start <= now()
+					AND ende >= now()';
+
+		return $this->execQuery($query);
+	}
+
+	/**
+	 * Gets next Geschaeftsjahr, as determined by its start date
+	 * @return array|null
+	 */
+	public function getNextGeschaeftsjahr()
+	{
+		$query = 'SELECT *
+					FROM public.tbl_geschaeftsjahr
+					WHERE start > now()
+					ORDER BY start
+					LIMIT 1';
+
+		return $this->execQuery($query);
+	}
 }

application/models/person/Person_model.php

@@ -94,10 +94,13 @@ class Person_model extends DB_Model
 	{
 		$this->addJoin('public.tbl_prestudent', 'person_id');
 
+		$this->addJoin('public.tbl_benutzer', 'person_id');
+
 		$result = $this->loadTree(
 			'public.tbl_person',
 			array(
-				'public.tbl_prestudent'
+				'public.tbl_prestudent',
+				'public.tbl_benutzer'
 			),
 			'EXISTS (
 				SELECT
@@ -112,7 +115,8 @@ class Person_model extends DB_Model
 					AND datum <= '.$this->escape($bis).'
 				)',
 			array(
-				'prestudenten'
+				'prestudenten',
+				'benutzer'
 			)
 		);
 
@@ -192,4 +196,37 @@ class Person_model extends DB_Model
 
 		return $this->loadWhere(array('uid' => $uid));
 	}
+
+	/**
+	 * Retrives the language of the user by the UID
+	 * Gets all the persons related to the given UID and starting from the most recent person in DB
+	 * tries to find a valid language (!= null), if found is returned, otherwise is returned the
+	 * default global language of the system
+	 */
+	public function getLanguage($uid)
+	{
+		$language = DEFAULT_LANGUAGE;
+
+		$this->addJoin('public.tbl_benutzer', 'person_id');
+		$this->addOrder('public.tbl_person.updateamum', 'DESC');
+		$this->addOrder('public.tbl_person.insertvon', 'DESC');
+
+		$persons = $this->loadWhere(array('uid' => $uid));
+
+		if (hasData($persons))
+		{
+			for ($i = 0; $i < count($persons->retval); $i++)
+			{
+				$person = $persons->retval[$i];
+
+				if (!empty($person->sprache))
+				{
+					$language = $person->sprache;
+					break;
+				}
+			}
+		}
+
+		return $language;
+	}
 }

application/models/system/Extensions_model.php

@@ -7,7 +7,7 @@ class Extensions_model extends DB_Model
 	 */
 	public function __construct()
 	{
-		parent::__construct();
+		parent::__construct('system');
 		$this->dbTable = 'system.tbl_extensions';
 		$this->pk = 'extension_id';
 	}

application/models/system/Phrase_model.php

@@ -54,4 +54,21 @@ class Phrase_model extends DB_Model
 
 		return $this->execQuery($query, $parametersArray);
 	}
+
+	/**
+	 * Loads phrases using category(s) and language as keys
+	 * The retrived fields are category, phrase, orgeinheit_kurzbz, orgform_kurzbz and text
+	 * They are ordered by p.category, p.phrase, pt.orgeinheit_kurzbz DESC and pt.orgform_kurzbz DESC'
+	 */
+	public function getPhrasesByCategoryAndLanguage($categories, $language)
+	{
+		$query = 'SELECT p.category, p.phrase, pt.orgeinheit_kurzbz, pt.orgform_kurzbz, pt.text
+					FROM system.tbl_phrase p
+			  INNER JOIN system.tbl_phrasentext pt USING(phrase_id)
+				   WHERE p.category IN ?
+				   	 AND pt.sprache = ?
+				ORDER BY p.category, p.phrase, pt.orgeinheit_kurzbz DESC, pt.orgform_kurzbz DESC';
+
+		return $this->execQuery($query, array($categories, $language));
+	}
 }

application/views/system/infocenter/addNotiz.php

@@ -1,4 +1,5 @@
 <form method="post" action="#" id="notizform">
+	<input type="hidden" name="hiddenNotizId" value="">
 	<div class="form-group">
 		<div class="text-center">
 			<label>Notiz hinzuf&uuml;gen</label>
@@ -19,6 +20,8 @@
 			<textarea name="notiz" class="form-control" rows="10" cols="32"></textarea>
 		</div>
 		<div class="text-right">
+			<!--abbrechen-button only shown when notice is clicked to be changed-->
+			<button type="reset" class="btn btn-default" style="display: none">Abbrechen</button>
 			<button type="submit" class="btn btn-default">Speichern</button>
 		</div>
 	</div>

application/views/system/infocenter/infocenterData.php

@@ -9,10 +9,12 @@
 				p.vorname AS "Vorname",
 				p.nachname AS "Nachname",
 				p.gebdatum AS "Gebdatum",
+				p.staatsbuergerschaft AS "Nation",
 				(
 					SELECT zeitpunkt
 					FROM system.tbl_log
 					WHERE taetigkeit_kurzbz IN(\'bewerbung\',\'kommunikation\')
+					AND logdata->>\'name\' NOT IN (\'Login with code\', \'New application\')
 					AND person_id = p.person_id
 					ORDER BY zeitpunkt DESC
 					LIMIT 1
@@ -21,6 +23,7 @@
 					SELECT insertvon
 					FROM system.tbl_log
 					WHERE taetigkeit_kurzbz IN(\'bewerbung\',\'kommunikation\')
+					AND logdata->>\'name\' NOT IN (\'Login with code\', \'New application\')
 					AND person_id = p.person_id
 					ORDER BY zeitpunkt DESC
 					LIMIT 1
@@ -79,15 +82,17 @@
 							FROM public.tbl_studiensemester
 							WHERE ende >= NOW()
 						)
+						AND not exists (select 1 from tbl_prestudentstatus psss where psss.prestudent_id = pss.prestudent_id and psss.status_kurzbz = \'Abgewiesener\')
 					LIMIT 1
 				) AS "AnzahlAbgeschickt",
 				array_to_string(
 					(
-					SELECT array_agg(distinct UPPER(tbl_studiengang.typ || tbl_studiengang.kurzbz))
+					SELECT array_agg(distinct UPPER(tbl_studiengang.typ || tbl_studiengang.kurzbz) || \':\' || tbl_studienplan.orgform_kurzbz)
 					FROM
 						public.tbl_prestudentstatus pss
 						INNER JOIN public.tbl_prestudent ps USING(prestudent_id)
 						JOIN public.tbl_studiengang USING(studiengang_kz)
+						JOIN lehre.tbl_studienplan using (studienplan_id)
 					WHERE pss.status_kurzbz = \'Interessent\'
 						AND (pss.bewerbung_abgeschicktamum IS NOT NULL AND pss.bewerbung_abgeschicktamum>=\''.$NOTBEFORE.'\')
 						AND pss.bestaetigtam IS NULL
@@ -98,9 +103,53 @@
 							FROM public.tbl_studiensemester
 							WHERE ende >= NOW()
 						)
+						AND not exists (select 1 from tbl_prestudentstatus psss where psss.prestudent_id = pss.prestudent_id and psss.status_kurzbz = \'Abgewiesener\')
 					LIMIT 1
 					),\', \'
 				) AS "StgAbgeschickt",
+				array_to_string(
+					(
+					SELECT array_agg(distinct UPPER(tbl_studiengang.typ || tbl_studiengang.kurzbz) || \':\' || tbl_studienplan.orgform_kurzbz)
+					FROM
+						public.tbl_prestudentstatus pss
+						INNER JOIN public.tbl_prestudent ps USING(prestudent_id)
+						JOIN public.tbl_studiengang USING(studiengang_kz)
+						JOIN lehre.tbl_studienplan using (studienplan_id)
+					WHERE pss.status_kurzbz = \'Interessent\'
+						AND (pss.bewerbung_abgeschicktamum IS NULL)
+						AND pss.bestaetigtam IS NULL
+						AND ps.person_id = p.person_id
+						AND tbl_studiengang.typ in(\'b\')
+						AND studiensemester_kurzbz IN (
+							SELECT studiensemester_kurzbz
+							FROM public.tbl_studiensemester
+							WHERE ende >= NOW()
+						)
+					AND not exists (select 1 from tbl_prestudentstatus psss where psss.prestudent_id = pss.prestudent_id and psss.status_kurzbz = \'Abgewiesener\')
+					LIMIT 1
+					),\', \'
+				) AS "StgNichtAbgeschickt",
+				array_to_string(
+					(
+					SELECT array_agg(distinct UPPER(tbl_studiengang.typ || tbl_studiengang.kurzbz) || \':\' || tbl_studienplan.orgform_kurzbz)
+					FROM
+						public.tbl_prestudentstatus pss
+						INNER JOIN public.tbl_prestudent ps USING(prestudent_id)
+						JOIN public.tbl_studiengang USING(studiengang_kz)
+						JOIN lehre.tbl_studienplan using (studienplan_id)
+					WHERE pss.status_kurzbz in (\'Wartender\', \'Bewerber\', \'Aufgenommener\', \'Student\')
+						AND (pss.bewerbung_abgeschicktamum IS NULL)
+						AND ps.person_id = p.person_id
+						AND tbl_studiengang.typ in(\'b\')
+						AND studiensemester_kurzbz IN (
+							SELECT studiensemester_kurzbz
+							FROM public.tbl_studiensemester
+							WHERE start >= NOW()
+						)
+					AND not exists (select 1 from tbl_prestudentstatus psss where psss.prestudent_id = pss.prestudent_id and psss.status_kurzbz = \'Abgewiesener\')
+					LIMIT 1
+					),\', \'
+				) AS "StgAktiv",
 				pl.zeitpunkt AS "LockDate",
 				pl.lockuser as "LockUser"
 			FROM public.tbl_person p
@@ -141,14 +190,17 @@
 		'checkboxes' => 'PersonId',
 		'additionalColumns' => array('Details'),
 		'columnsAliases' => array(
-			'PersonID','Vorname','Nachname','GebDatum','Letzte Aktion','Letzter Bearbeiter',
-			'StSem','GesendetAm','NumAbgeschickt','Studiengänge','Sperrdatum','GesperrtVon'
+			'PersonID', 'Vorname', 'Nachname',
+			'GebDatum', 'Nation', 'Letzte Aktion',
+			'Letzter Bearbeiter', 'StSem', 'GesendetAm',
+			'NumAbgeschickt', 'StgSent', 'StgNotSent',
+			'StgAktiv', 'Sperrdatum', 'GesperrtVon'
 		),
 		'formatRaw' => function($datasetRaw) {
 
 			$datasetRaw->{'Details'} = sprintf(
 				'<a href="%s%s">Details</a>',
-				base_url('index.ci.php/system/infocenter/InfoCenter/showDetails/'),
+				site_url('system/infocenter/InfoCenter/showDetails/'),
 				$datasetRaw->{'PersonId'}
 			);
 
@@ -187,7 +239,19 @@
 
 			if ($datasetRaw->{'StgAbgeschickt'} == null)
 			{
-				$datasetRaw->{'StgAbgeschickt'} = 'N/A';
+				$datasetRaw->{'StgAbgeschickt'} = '-';
+			}
+			if ($datasetRaw->{'StgNichtAbgeschickt'} == null)
+			{
+				$datasetRaw->{'StgNichtAbgeschickt'} = '-';
+			}
+			if ($datasetRaw->{'StgAktiv'} == null)
+			{
+				$datasetRaw->{'StgAktiv'} = '-';
+			}
+			if ($datasetRaw->{'Nation'} == null)
+			{
+				$datasetRaw->{'Nation'} = '-';
 			}
 
 			return $datasetRaw;

application/views/system/infocenter/infocenterFreigegeben.php

@@ -0,0 +1,264 @@
+<?php
+	$this->load->view(
+		'templates/FHC-Header',
+		array(
+			'title' => 'Info Center',
+			'jquery' => true,
+			'jqueryui' => true,
+			'bootstrap' => true,
+			'fontawesome' => true,
+			'sbadmintemplate' => true,
+			'tablesorter' => true,
+			'customCSSs' => 'skin/tablesort_bootstrap.css',
+			'customJSs' => array('include/js/bootstrapper.js', 'include/js/infocenter/infocenterPersonDataset.js')
+		)
+	);
+?>
+
+<body>
+	<div id="wrapper">
+
+		<?php echo $this->widgetlib->widget('NavigationWidget'); ?>
+
+		<div id="page-wrapper">
+			<div class="container-fluid">
+				<div class="row">
+					<div class="col-lg-12">
+						<h3 class="page-header">Freigegebene Interessenten</h3>
+					</div>
+				</div>
+				<div>
+					<?php
+
+						$APP = 'infocenter';
+						$NOTBEFORE = '2018-03-01 18:00:00';
+						$filterWidgetArray = array(
+							'query' => '
+							SELECT
+									p.person_id AS "PersonId",
+									p.vorname AS "Vorname",
+									p.nachname AS "Nachname",
+									p.gebdatum AS "Gebdatum",
+									p.staatsbuergerschaft AS "Nation",
+									(
+										SELECT zeitpunkt
+										FROM system.tbl_log
+										WHERE taetigkeit_kurzbz IN(\'bewerbung\',\'kommunikation\')
+										AND logdata->>\'name\' NOT IN (\'Login with code\', \'New application\')
+										AND person_id = p.person_id
+										ORDER BY zeitpunkt DESC
+										LIMIT 1
+									) AS "LastAction",
+									(
+										SELECT insertvon
+										FROM system.tbl_log
+										WHERE taetigkeit_kurzbz IN(\'bewerbung\',\'kommunikation\')
+										AND logdata->>\'name\' NOT IN (\'Login with code\', \'New application\')
+										AND person_id = p.person_id
+										ORDER BY zeitpunkt DESC
+										LIMIT 1
+									) AS "User/Operator",
+									(
+										SELECT
+											pss.studiensemester_kurzbz
+										FROM
+											public.tbl_prestudentstatus pss
+											INNER JOIN public.tbl_prestudent ps USING(prestudent_id)
+											JOIN public.tbl_studiengang USING(studiengang_kz)
+										WHERE pss.status_kurzbz = \'Interessent\'
+										AND pss.bestaetigtam IS NULL
+										AND ps.person_id = p.person_id
+										AND tbl_studiengang.typ in(\'b\')
+										AND studiensemester_kurzbz IN (
+											SELECT studiensemester_kurzbz
+											FROM public.tbl_studiensemester
+											WHERE ende >= NOW()
+										)
+										ORDER BY pss.datum DESC, pss.insertamum DESC, pss.ext_id DESC
+										LIMIT 1
+									) AS "Studiensemester",
+									(
+										SELECT pss.bewerbung_abgeschicktamum
+										FROM
+											public.tbl_prestudentstatus pss
+											INNER JOIN public.tbl_prestudent ps USING(prestudent_id)
+											JOIN public.tbl_studiengang USING(studiengang_kz)
+										WHERE pss.status_kurzbz = \'Interessent\'
+											AND (pss.bewerbung_abgeschicktamum IS NOT NULL AND pss.bewerbung_abgeschicktamum>=\''.$NOTBEFORE.'\')
+											AND pss.bestaetigtam IS NULL
+											AND ps.person_id = p.person_id
+											AND tbl_studiengang.typ in(\'b\')
+											AND studiensemester_kurzbz IN (
+												SELECT studiensemester_kurzbz
+												FROM public.tbl_studiensemester
+												WHERE ende >= NOW()
+											)
+										ORDER BY pss.datum DESC, pss.insertamum DESC, pss.ext_id DESC
+										LIMIT 1
+									) AS "SendDate",
+									(
+										SELECT count(*)
+										FROM
+											public.tbl_prestudentstatus pss
+											INNER JOIN public.tbl_prestudent ps USING(prestudent_id)
+											JOIN public.tbl_studiengang USING(studiengang_kz)
+										WHERE pss.status_kurzbz = \'Interessent\'
+											AND (pss.bewerbung_abgeschicktamum IS NOT NULL AND pss.bewerbung_abgeschicktamum>=\''.$NOTBEFORE.'\')
+											AND pss.bestaetigtam IS NULL
+											AND ps.person_id = p.person_id
+											AND tbl_studiengang.typ in(\'b\')
+											AND studiensemester_kurzbz IN (
+												SELECT studiensemester_kurzbz
+												FROM public.tbl_studiensemester
+												WHERE ende >= NOW()
+											)
+										LIMIT 1
+									) AS "AnzahlAbgeschickt",
+									array_to_string(
+										(
+										SELECT array_agg(distinct UPPER(tbl_studiengang.typ || tbl_studiengang.kurzbz))
+										FROM
+											public.tbl_prestudentstatus pss
+											INNER JOIN public.tbl_prestudent ps USING(prestudent_id)
+											JOIN public.tbl_studiengang USING(studiengang_kz)
+										WHERE pss.status_kurzbz = \'Interessent\'
+											AND (pss.bewerbung_abgeschicktamum IS NOT NULL AND pss.bewerbung_abgeschicktamum>=\''.$NOTBEFORE.'\')
+											AND pss.bestaetigtam IS NULL
+											AND ps.person_id = p.person_id
+											AND tbl_studiengang.typ in(\'b\')
+											AND studiensemester_kurzbz IN (
+												SELECT studiensemester_kurzbz
+												FROM public.tbl_studiensemester
+												WHERE ende >= NOW()
+											)
+										LIMIT 1
+										),\', \'
+									) AS "StgAbgeschickt",
+									pl.zeitpunkt AS "LockDate",
+									pl.lockuser as "LockUser"
+								FROM public.tbl_person p
+							LEFT JOIN (SELECT person_id, zeitpunkt, uid as lockuser FROM system.tbl_person_lock WHERE app = \''.$APP.'\') pl USING(person_id)
+								WHERE
+									EXISTS(
+										SELECT 1
+										FROM
+											public.tbl_prestudent
+											JOIN public.tbl_studiengang USING(studiengang_kz)
+										WHERE
+											person_id=p.person_id
+											AND tbl_studiengang.typ in(\'b\')  
+											AND \'Interessent\' = (SELECT status_kurzbz FROM public.tbl_prestudentstatus
+																	WHERE prestudent_id=tbl_prestudent.prestudent_id
+																	ORDER BY datum DESC, insertamum DESC, ext_id DESC
+																	LIMIT 1
+																	)
+											AND EXISTS (
+												SELECT
+													1
+												FROM
+													public.tbl_prestudentstatus
+												WHERE
+													prestudent_id = tbl_prestudent.prestudent_id
+													AND status_kurzbz = \'Interessent\'
+													AND (bestaetigtam IS NOT NULL AND (bewerbung_abgeschicktamum is null OR bewerbung_abgeschicktamum>=\''.$NOTBEFORE.'\'))
+													AND studiensemester_kurzbz IN (
+														SELECT studiensemester_kurzbz
+														FROM public.tbl_studiensemester
+														WHERE ende >= NOW()
+												)
+										)
+									)
+								ORDER BY "LastAction" ASC
+							',
+							'hideHeader' => false,
+							'hideSave' => false,
+							'checkboxes' => 'PersonId',
+							'additionalColumns' => array('Details'),
+							'columnsAliases' => array('PersonID','Vorname','Nachname','GebDatum','Nation','Letzte Aktion','Letzter Bearbeiter',
+								'StSem','GesendetAm','NumAbgeschickt','Studiengänge','Sperrdatum','GesperrtVon'),
+							'formatRaw' => function($datasetRaw) {
+
+								$datasetRaw->{'Details'} = sprintf(
+									'<a href="%s%s">Details</a>',
+									base_url('index.ci.php/system/infocenter/InfoCenter/showDetails/'),
+									$datasetRaw->{'PersonId'}
+								);
+
+								if ($datasetRaw->{'SendDate'} == null)
+								{
+									$datasetRaw->{'SendDate'} = 'Not sent';
+								}
+								else
+								{
+									$datasetRaw->{'SendDate'} = date_format(date_create($datasetRaw->{'SendDate'}),'Y-m-d H:i');
+								}
+
+								if ($datasetRaw->{'LastAction'} == null)
+								{
+									$datasetRaw->{'LastAction'} = '-';
+								}
+								else
+								{
+									$datasetRaw->{'LastAction'} = date_format(date_create($datasetRaw->{'LastAction'}),'Y-m-d H:i');
+								}
+
+								if ($datasetRaw->{'User/Operator'} == '')
+								{
+									$datasetRaw->{'User/Operator'} = 'NA';
+								}
+
+								if ($datasetRaw->{'LockDate'} == null)
+								{
+									$datasetRaw->{'LockDate'} = '-';
+								}
+
+								if ($datasetRaw->{'LockUser'} == null)
+								{
+									$datasetRaw->{'LockUser'} = '-';
+								}
+
+								if ($datasetRaw->{'StgAbgeschickt'} == null)
+								{
+									$datasetRaw->{'StgAbgeschickt'} = 'N/A';
+								}
+
+								if ($datasetRaw->{'Nation'} == null)
+								{
+									$datasetRaw->{'Nation'} = '-';
+								}
+
+								return $datasetRaw;
+							},
+							'markRow' => function($datasetRaw) {
+
+								if ($datasetRaw->LockDate != null)
+								{
+									return FilterWidget::DEFAULT_MARK_ROW_CLASS;
+								}
+							}
+						);
+
+					
+						$filterId = isset($_GET[InfoCenter::FILTER_ID]) ? $_GET[InfoCenter::FILTER_ID] : null;
+						
+						if (isset($filterId) && is_numeric($filterId))
+						{
+							$filterWidgetArray[InfoCenter::FILTER_ID] = $filterId;
+						}
+						else
+						{
+							$filterWidgetArray['app'] = $APP;
+							$filterWidgetArray['datasetName'] = 'PersonActions';
+							$filterWidgetArray['filterKurzbz'] = 'InfoCenterNotSentApplicationAll';
+						}
+						
+						echo $this->widgetlib->widget('FilterWidget', $filterWidgetArray);
+					?>
+
+				</div>
+			</div>
+		</div>
+	</div>
+</body>
+
+<?php $this->load->view('templates/FHC-Footer'); ?>

application/views/system/infocenter/notizen.php

@@ -1,19 +1,20 @@
-<table id="notiztable" class="table table-bordered table-hover">
-	<thead>
-	<tr>
-		<th>Datum</th>
-		<th>Notiz</th>
-		<th>User</th>
-	</tr>
-	</thead>
-	<tbody>
-	<?php foreach ($notizen as $notiz): ?>
-		<tr data-toggle="tooltip"
-			title="<?php echo isset($notiz->text) ? strip_tags($notiz->text) : '' ?>">
-			<td><?php echo date_format(date_create($notiz->insertamum), 'd.m.Y H:i:s') ?></td>
-			<td><?php echo html_escape($notiz->titel) ?></td>
-			<td><?php echo $notiz->verfasser_uid ?></td>
-		</tr>
-	<?php endforeach ?>
-	</tbody>
+<table id="notiztable" class="table table-bordered table-hover">
+	<thead>
+	<tr>
+		<th>Datum</th>
+		<th>Notiz</th>
+		<th>User</th>
+	</tr>
+	</thead>
+	<tbody>
+	<?php foreach ($notizen as $notiz): ?>	
+		<tr data-toggle="tooltip"
+			title="<?php echo isset($notiz->text) ? strip_tags($notiz->text) : '' ?>">		
+			<td><?php echo date_format(date_create($notiz->insertamum), 'd.m.Y H:i:s') ?></td>
+			<td><?php echo html_escape($notiz->titel) ?></td>
+			<td><?php echo $notiz->verfasser_uid ?></td>
+			<td style="display: none"><?php echo $notiz->notiz_id ?></td>
+		</tr>
+	<?php endforeach ?>
+	</tbody>
 </table>

application/views/system/infocenter/zgvpruefungen.php

@@ -287,10 +287,25 @@
 								</div>
 							</div><!-- /.column-absage -->
 							<div class="col-lg-6 text-right">
+								<?php  
+								$disabled = $disabledTxt = '';
+								if (empty($zgvpruefung->prestudentstatus->bewerbung_abgeschicktamum))
+								{
+									$disabled = 'disabled';
+									$disabledTxt = 'Die Bewerbung muss erst abgeschickt worden sein.';
+								} 
+								
+								if ($zgvpruefung->studiengangtyp !== 'b')
+								{
+									$disabled = 'disabled';
+									$disabledTxt = 'Nur Bachelorstudiengänge können freigegeben werden.';;
+								}
+								?>
 								<div>
-									<button type="button" class="btn btn-default"
+									<button type="button" class="btn btn-default" <?php echo $disabled ?>			
 											data-toggle="modal"
-											data-target="#freigabeModal_<?php echo $zgvpruefung->prestudent_id ?>">
+											data-target="#freigabeModal_<?php echo $zgvpruefung->prestudent_id ?>"
+											data-toggle="tooltip" title="<?php echo $disabledTxt ?>">
 										Freigabe an Studiengang
 									</button>
 								</div>

application/views/system/phrases/phraseinhaltEdit.php

@@ -65,10 +65,6 @@
 			</code><br/>
 		<a href="https://warpedvisions.org/projects/textile-cheat-sheet/" target="_blank">Textile CheatSheet</a>
 	</td></tr>
- 	<?php
-		// This is an example to show that you can load stuff from inside the template file
-		//echo $this->widgetlib->widget("tinymce_widget", array('name' => 'text', 'text' => $text));
-	?>
 	<tr><td colspan="2" align="right"><button type="submit">Save</button></td></tr>
 </table>
 </form>
@@ -77,34 +73,29 @@
 </div>
 
 
-<script>
+		<script>
 
-$(document).ready(function () {
-    initTextile();
-});
+			$(document).ready(function () {
+			    initTextile();
+			});
 
-function initTextile() {
-    var $content = $('#markitup'); // my textarea
-    var $preview = $('#textile-preview'); // the preview div
+			function initTextile() {
+			    var $content = $('#markitup'); // my textarea
+			    var $preview = $('#textile-preview'); // the preview div
 
-    //$content.markItUp(); // init markitup
+			    // use a simple timer to check if the textarea content has changed
+			    var value = $content.val();
+				$preview.html(textile.parse(value));
+			    setInterval(function () {
+			        var newValue = $content.val();
+			        if (value != newValue) {
+			            value = newValue;
+			            $preview.html(textile.parse(newValue)); // convert the textile to html
+			        }
+			    }, 500);
+			};
 
-    // use a simple timer to check if the textarea content has changed
-    var value = $content.val();
-	$preview.html(textile.parse(value));
-    setInterval(function () {
-        var newValue = $content.val();
-        if (value != newValue) {
-            value = newValue;
-            $preview.html(textile.parse(newValue)); // convert the textile to html
-        }
-    }, 500);
-};
+		</script>
 
-</script>
-
-<!--
-<iframe name="TemplatePreview" width="100%" src=""/>
--->
-</body>
+	</body>
 </html>

application/views/system/phrases/phrasesList.php

@@ -4,16 +4,6 @@
 <div class="row">
 	<div class="span4">
 	  <h2>Phrasen</h2>
-<!--
-<form method="post" action="">
-App: aufnahme
-<?php
-    // This is an example to show that you can load stuff from inside the template file
-    //echo $this->widgetlib->widget("mimetype_widget", array('mimetype' => $mimetype));
-?>
- <button type="submit">Filter</button>
-</form>
--->
 <table id="t1" class="tablesorter">
 	<thead>
 		<tr><th class='table-sortable:default'>ID</th>

application/views/templates/FHC-Header.php

@@ -2,6 +2,11 @@
 
 if (! defined('BASEPATH')) exit('No direct script access allowed');
 
+// Retrives the URL path of the called controller + controller method
+// NOTE: placed here because it doesn't work inside functions
+$calledPath = $this->router->directory.$this->router->class;
+$calledMethod = $this->router->method;
+
 // By default set the parameters to null
 $title = isset($title) ? $title : null;
 $customCSSs = isset($customCSSs) ? $customCSSs : null;
@@ -55,6 +60,27 @@ function _generateCSSsInclude($CSSs)
 	}
 }
 
+/**
+ * Generates global JS-Object to pass parms to other javascripts
+ */
+function _generateJSDataStorageObject($calledPath, $calledMethod)
+{
+	$toPrint = "\n";
+	$toPrint .= '<script type="text/javascript">';
+	$toPrint .= '
+		var FHC_JS_DATA_STORAGE_OBJECT = {
+			app_root: "'.APP_ROOT.'",
+			ci_router: "index.ci.php",
+			called_path: "'.$calledPath.'",
+			called_method: "'.$calledMethod.'"
+		};';
+	$toPrint .= "\n";
+	$toPrint .= '</script>';
+	$toPrint .= "\n\n";
+
+	echo $toPrint;
+}
+
 /**
  * Generates tags for the javascripts you want to include, the parameter could by a string or an array of strings
  */
@@ -78,13 +104,25 @@ function _generateJSsInclude($JSs)
 }
 
 /**
- * Generates global JS-Object to pass parms to addon-js-functions
+ * Generates all the includes needed by the Addons
  */
-function _generateAddonDataStorageObject()
+function _generateAddonsJSsInclude($calledFrom)
 {
-	echo '<script type="text/javascript">';
-	echo 'var FHC_ADDON_DATA_STORAGE_OBJECT = {app_root:"'.APP_ROOT.'"};';
-	echo "</script>\n";
+	$aktive_addons = array_filter(explode(";", ACTIVE_ADDONS));
+
+	foreach ($aktive_addons as $addon)
+	{
+		$hookfile = DOC_ROOT.'addons/'.$addon.'/hooks.config.inc.php';
+		if (file_exists($hookfile))
+		{
+			include($hookfile);
+			if (key_exists($calledFrom, $js_hooks))
+			{
+				foreach ($js_hooks[$calledFrom] as $js_file)
+					_generateJSsInclude('addons/'.$addon.'/'.$js_file);
+			}
+		}
+	}
 }
 
 ?>
@@ -102,16 +140,20 @@ function _generateAddonDataStorageObject()
 
 			// jQuery UI CSS
 			if ($jqueryui === true) _generateCSSsInclude('vendor/components/jqueryui/themes/base/jquery-ui.min.css');
+
 			// bootstrap CSS
 			if ($bootstrap === true) _generateCSSsInclude('vendor/twbs/bootstrap/dist/css/bootstrap.min.css');
+
 			// font awesome CSS
 			if ($fontawesome === true) _generateCSSsInclude('vendor/components/font-awesome/css/font-awesome.min.css');
+
 			// Table sorter CSS
 			if ($tablesorter === true)
 			{
 				_generateCSSsInclude('vendor/mottie/tablesorter/dist/css/theme.default.min.css');
 				_generateCSSsInclude('vendor/mottie/tablesorter/dist/css/jquery.tablesorter.pager.min.css');
 			}
+
 			// sb admin template CSS
 			if ($sbadmintemplate === true)
 			{
@@ -125,8 +167,13 @@ function _generateAddonDataStorageObject()
 			// --------------------------------------------------------------------------------------------------------
 			// Javascripts
 
+			// Generates the global object to pass useful parms to the other javascripts
+			// NOTE: must be called before any other JS include
+			_generateJSDataStorageObject($calledPath, $calledMethod);
+
 			// JQuery V3
 			if ($jquery === true) _generateJSsInclude('vendor/components/jquery/jquery.min.js');
+
 			// JQuery UI
 			if ($jqueryui === true)
 			{
@@ -134,8 +181,10 @@ function _generateAddonDataStorageObject()
 				//datepicker german language file
 				_generateJSsInclude('vendor/components/jqueryui/ui/i18n/datepicker-de.js');
 			}
+
 			// bootstrap JS
 			if ($bootstrap === true) _generateJSsInclude('vendor/twbs/bootstrap/dist/js/bootstrap.min.js');
+
 			// Table sorter JS
 			if ($tablesorter === true)
 			{
@@ -143,6 +192,7 @@ function _generateAddonDataStorageObject()
 				_generateJSsInclude('vendor/mottie/tablesorter/dist/js/jquery.tablesorter.widgets.min.js');
 				_generateJSsInclude('vendor/mottie/tablesorter/dist/js/extras/jquery.tablesorter.pager.min.js');
 			}
+
 			//tinymce JS
 			if($tinymce === true) _generateJSsInclude('vendor/tinymce/tinymce/tinymce.min.js') ;
 
@@ -153,27 +203,8 @@ function _generateAddonDataStorageObject()
 				_generateJSsInclude('vendor/BlackrockDigital/startbootstrap-sb-admin-2/dist/js/sb-admin-2.min.js');
 			}
 
-			// load addon hooks JS
-			if ($addons === true)
-			{
-				_generateAddonDataStorageObject();
-
-				$aktive_addons = array_filter(explode(";", ACTIVE_ADDONS));
-				$called_from = $this->router->directory.$this->router->class.'/'.$this->router->method;
-				foreach ($aktive_addons as $addon)
-				{
-					$hookfile = DOC_ROOT.'addons/'.$addon.'/hooks.config.inc.php';
-					if (file_exists($hookfile))
-					{
-						include($hookfile);
-						if (key_exists($called_from, $js_hooks))
-						{
-							foreach ($js_hooks[$called_from] as $js_file)
-								_generateJSsInclude('addons/'.$addon.'/'.$js_file);
-						}
-					}
-				}
-			}
+			// Load addon hooks JS
+			if ($addons === true) _generateAddonsJSsInclude($calledPath.'/'.$calledMethod);
 
 			// Eventually required JS
 			_generateJSsInclude($customJSs);

application/views/templates/mailtemplates/interessentFreigabe.php

@@ -8,42 +8,63 @@
 	<br><br>
 	<table style="font-size:small">
 		<tbody>
-		<tr>
-			<td><b>Studiengang</b></td>
-			<td>{studiengangbez}&nbsp;{studiengangtypbez} {orgform} {sprache}</td>
-		</tr>
-		<tr>
-			<td><b>Studiensemester</b></td>
-			<td>{studiensemester}</td>
-		</tr>
-		<tr>
-			<td><b>Geschlecht</b></td>
-			<td>{geschlecht}</td>
-		</tr>
-		<tr>
-			<td><b>Vorname</b></td>
-			<td>{vorname}</td>
-		</tr>
-		<tr>
-			<td><b>Nachname</b></td>
-			<td>{nachname}</td>
-		</tr>
-		<tr>
-			<td><b>Geburtsdatum</b></td>
-			<td>{gebdatum}</td>
-		</tr>
-		<tr>
-			<td><b>E-Mail Adresse</b></td>
-			<td>{mailadresse}</td>
-		</tr>
-		<tr>
-			<td><b>Prestudent ID</b></td>
-			<td>{prestudentid}</td>
-		</tr>
-		<tr>
-			<td valign="top"><b>Anmerkungen zur Bewerbung</b></td>
-			<td>{notizentext}</td>
-		</tr>
+			<tr>
+				<td><b>Studiengang</b></td>
+				<td>{studiengangbez}&nbsp;{studiengangtypbez} {orgform} {sprache}</td>
+			</tr>
+			<tr>
+				<td><b>Studiensemester</b></td>
+				<td>{studiensemester}</td>
+			</tr>
+			<tr>
+				<td><b>Geschlecht</b></td>
+				<td>{geschlecht}</td>
+			</tr>
+			<tr>
+				<td><b>Vorname</b></td>
+				<td>{vorname}</td>
+			</tr>
+			<tr>
+				<td><b>Nachname</b></td>
+				<td>{nachname}</td>
+			</tr>
+			<tr>
+				<td><b>Geburtsdatum</b></td>
+				<td>{gebdatum}</td>
+			</tr>
+			<tr>
+				<td><b>E-Mail Adresse</b></td>
+				<td>{mailadresse}</td>
+			</tr>
+			<tr>
+				<td><b>Prestudent ID</b></td>
+				<td>{prestudentid}</td>
+			</tr>
+			<tr>
+				<td><b>Zugangsvoraussetzung</b></td>
+				<td>{zgvbez}{zgvort}{zgvnation}{zgvdatum}</td>
+			</tr>
+			<tr>
+				<td valign="top"><b>Erbrachte Dokumente</b></td>
+				<td>
+					{dokumente}
+					{dokument_bezeichnung}
+					{/dokumente}
+				</td>
+			</tr>
+			<tr>
+				<td valign="top"><b>Nachzureichende Dokumente</b></td>
+				<td>
+					{dokumente_nachgereicht}
+					{dokument_bezeichnung}{anmerkung}{nachgereicht_am}
+					<br>
+					{/dokumente_nachgereicht}
+				</td>
+			</tr>
+			<tr>
+				<td valign="top"><b>Anmerkungen zur Bewerbung</b></td>
+				<td>{notizentext}</td>
+			</tr>
 		</tbody>
 	</table>
 	<br>

application/views/widgets/filter/filter.php

@@ -1,5 +1,11 @@
 <style>
 
+	.filter-options-span {
+		display: inline-block;
+		width: 130px;
+		font-weight: bold;
+	}
+
 	.filter-name-title {
 		font-family: inherit;
 		font-size: 16px;
@@ -69,26 +75,37 @@
 
 	.select-filter-option {
 		display: inline;
-		width: 90px;
+		width: 100px;
 	}
 
-	#addField {
+	#addField, #customFilterDescription, #addFilter {
 		display: inline;
-		width: 400px;
-	}
-
-	#addFilter {
-		display: inline;
-		width: 400px;
+		width: 535px;
 	}
 
 	#selectedFilters {
 		margin-bottom: 20px;
 	}
 
-	#customFilterDescription {
-		display: inline;
-		width: 400px;
+	#applyFilter, #saveCustomFilterButton, .remove-selected-filter {
+		font-weight: bold;
+	}
+
+	#applyFilter, #saveCustomFilterButton {
+		width: 100px;
+	}
+
+	.remove-selected-filter {
+		padding-bottom: 3px;
+	}
+
+	.panel-title {
+		font-weight: bold;
+		padding-top: 3px;
+	}
+
+	.remove-field {
+		font-weight: bold;
 	}
 
 </style>
@@ -97,7 +114,7 @@
 	function refreshSideMenu()
 	{
 		$.ajax({
-			url: "<?php echo base_url('index.ci.php/system/infocenter/InfoCenter/setNavigationMenuArray'); ?>",
+			url: "<?php echo site_url('system/infocenter/InfoCenter/setNavigationMenuArray'); ?>",
 			method: "GET",
 			data: {}
 		})
@@ -115,7 +132,7 @@
 		$(".remove-filter").click(function() {
 
 			$.ajax({
-				url: "<?php echo base_url('index.ci.php/system/Filters/deleteCustomFilter'); ?>",
+				url: "<?php echo site_url('system/Filters/deleteCustomFilter'); ?>",
 				method: "POST",
 				data: {
 					filter_id: $(this).attr('value')

application/views/widgets/filter/saveFilter.php

@@ -6,7 +6,7 @@
 			if ($("#customFilterDescription").val() != '')
 			{
 				$.ajax({
-					url: "<?php echo base_url('index.ci.php/system/Filters/saveFilter'); ?>",
+					url: "<?php echo site_url('system/Filters/saveFilter'); ?>",
 					method: "POST",
 					data: {
 						customFilterDescription: $("#customFilterDescription").val()
@@ -30,12 +30,19 @@
 
 </script>
 
+<br>
+
 <div>
+	<span class="filter-options-span">
+		Filter description:
+	</span>
 	<span>
-		Filter description: <input type="text" id="customFilterDescription" value="">
+		<input type="text" id="customFilterDescription" value="">
 	</span>
 
 	<span>
 		<input type="button" id="saveCustomFilterButton" value="Save filter">
 	</span>
 </div>
+
+<br>

application/views/widgets/filter/selectFields.php

@@ -74,7 +74,7 @@
 				});
 
 				$.ajax({
-					url: "<?php echo base_url('index.ci.php/system/Filters/sortSelectedFields'); ?>",
+					url: "<?php echo site_url('system/Filters/sortSelectedFields'); ?>",
 					method: "POST",
 					data: {
 						selectedFieldsLst: arrayDndId
@@ -106,7 +106,7 @@
 		$("#addField").change(function(event) {
 
 			$.ajax({
-				url: "<?php echo base_url('index.ci.php/system/Filters/addSelectedFields'); ?>",
+				url: "<?php echo site_url('system/Filters/addSelectedFields'); ?>",
 				method: "POST",
 				data: {
 					fieldName: $(this).val()
@@ -128,7 +128,7 @@
 		$(".remove-field").click(function(event) {
 
 			$.ajax({
-				url: "<?php echo base_url('index.ci.php/system/Filters/removeSelectedFields'); ?>",
+				url: "<?php echo site_url('system/Filters/removeSelectedFields'); ?>",
 				method: "POST",
 				data: {
 					fieldName: $(this).attr('fieldToRemove')
@@ -151,7 +151,7 @@
 	function renderSelectedFields()
 	{
 		$.ajax({
-			url: "<?php echo base_url('index.ci.php/system/Filters/selectFields'); ?>",
+			url: "<?php echo site_url('system/Filters/selectFields'); ?>",
 			method: "GET",
 			data: {},
 		    dataType: "json"
@@ -232,7 +232,7 @@
 	<div id="filterSelectFieldsDnd" class="filter-select-fields-dnd-div"></div>
 
 	<div>
-		<span>
+		<span class="filter-options-span">
 			Add field:
 		</span>
 

application/views/widgets/filter/selectFilters.php

@@ -10,7 +10,7 @@
 		$("#addFilter").change(function(event) {
 
 			$.ajax({
-				url: "<?php echo base_url('index.ci.php/system/Filters/addSelectedFilters'); ?>",
+				url: "<?php echo site_url('system/Filters/addSelectedFilters'); ?>",
 				method: "POST",
 				data: {
 					fieldName: $(this).val()
@@ -29,28 +29,6 @@
 
 		});
 
-		$(".remove-filter").click(function(event) {
-
-			$.ajax({
-				url: "<?php echo base_url('index.ci.php/system/Filters/removeSelectedFilters'); ?>",
-				method: "POST",
-				data: {
-					fieldName: $(this).attr('filterToRemove')
-				}
-			})
-			.done(function(data, textStatus, jqXHR) {
-
-				resetSelectedFilters();
-				renderSelectedFilters();
-
-				renderTableDataset();
-
-			}).fail(function(jqXHR, textStatus, errorThrown) {
-				alert(textStatus);
-			});
-
-		});
-
 		$(".select-filter-operation").change(function() {
 
 			if ($(this).val() == "set" || $(this).val() == "nset")
@@ -92,7 +70,7 @@
 			});
 
 			$.ajax({
-				url: "<?php echo base_url('index.ci.php/system/Filters/applyFilter'); ?>",
+				url: "<?php echo site_url('system/Filters/applyFilter'); ?>",
 				method: "POST",
 				data: {
 					filterNames: selectFilterName,
@@ -116,6 +94,23 @@
 			});
 
 		});
+
+		$(".remove-selected-filter").click(function(event) {
+			$.ajax({
+				url: "<?php echo site_url('system/Filters/removeSelectedFilters'); ?>",
+				method: "POST",
+				data: {
+					fieldName: $(this).attr('filterToRemove')
+				}
+			})
+			.done(function(data, textStatus, jqXHR) {
+				resetSelectedFilters();
+				renderSelectedFilters();
+			}).fail(function(jqXHR, textStatus, errorThrown) {
+				alert(textStatus);
+			});
+		});
+
 	}
 
 	function renderSelectedFilterFields(metaData, activeFilters, activeFiltersOperation, activeFiltersOption)
@@ -125,7 +120,7 @@
 		if (metaData.type.toLowerCase().indexOf("int") >= 0)
 		{
 			html = '<span>';
-			html += '	<select class="select-filter-operation form-control">';
+			html += '	<select class="form-control select-filter-operation">';
 			html += '		<option value="equal" ' + (activeFiltersOperation == "equal" ? "selected" : "") + '>equal</option>';
 			html += '		<option value="nequal" ' + (activeFiltersOperation == "nqual" ? "selected" : "") + '>not equal</option>';
 			html += '		<option value="gt" ' + (activeFiltersOperation == "gt" ? "selected" : "") + '>greater than</option>';
@@ -133,37 +128,37 @@
 			html += '	</select>';
 			html += '</span>';
 			html += '<span>';
-			html += '	<input type="number" value="' + activeFilters + '" class="select-filter-operation-value form-control">';
+			html += '	<input type="number" value="' + activeFilters + '" class="form-control select-filter-operation-value">';
 			html += '</span>';
 		}
-		if (metaData.type.toLowerCase().indexOf('varchar') >= 0)
+		if (metaData.type.toLowerCase().indexOf('varchar') >= 0 || metaData.type.toLowerCase() == 'text')
 		{
 			html = '<span>';
-			html += '	<select class="select-filter-operation form-control">';
+			html += '	<select class="form-control select-filter-operation">';
 			html += '		<option value="contains" ' + (activeFiltersOperation == "contains" ? "selected" : "") + '>contains</option>';
 			html += '		<option value="ncontains" ' + (activeFiltersOperation == "ncontains" ? "selected" : "") + '>does not contain</option>';
 			html += '	</select>';
 			html += '</span>';
 			html += '<span>';
-			html += '	<input type="text" value="' + activeFilters + '" class="select-filter-operation-value form-control">';
+			html += '	<input type="text" value="' + activeFilters + '" class="form-control select-filter-operation-value">';
 			html += '</span>';
 		}
 		if (metaData.type.toLowerCase().indexOf('bool') >= 0)
 		{
 			html = '<span>';
-			html += '	<select class="select-filter-operation form-control">';
+			html += '	<select class="form-control select-filter-operation">';
 			html += '		<option value="true" ' + (activeFiltersOperation == "true" ? "selected" : "") + '>is true</option>';
 			html += '		<option value="false" ' + (activeFiltersOperation == "false" ? "selected" : "") + '>is false</option>';
 			html += '	</select>';
 			html += '</span>';
 			html += '<span>';
-			html += '	<input type="hidden" value="' + activeFilters + '" class="select-filter-operation-value form-control">';
+			html += '	<input type="hidden" value="' + activeFilters + '" class="form-control select-filter-operation-value">';
 			html += '</span>';
 		}
 		if (metaData.type.toLowerCase().indexOf('timestamp') >= 0 || metaData.type.toLowerCase().indexOf('date') >= 0)
 		{
-			var classOperation = 'select-filter-operation-value form-control';
-			var classOption = 'select-filter-option form-control';
+			var classOperation = 'form-control select-filter-operation-value';
+			var classOption = 'form-control select-filter-option';
 			var disabled = "";
 
 			if (activeFiltersOperation == "set" || activeFiltersOperation == "nset")
@@ -174,7 +169,7 @@
 			}
 
 			html = '<span>';
-			html += '	<select class="select-filter-operation form-control">';
+			html += '	<select class="form-control select-filter-operation">';
 			html += '		<option value="lt" ' + (activeFiltersOperation == "lt" ? "selected" : "") + '>less than</option>';
 			html += '		<option value="gt" ' + (activeFiltersOperation == "gt" ? "selected" : "") + '>greater than</option>';
 			html += '		<option value="set" ' + (activeFiltersOperation == "set" ? "selected" : "") + '>is set</option>';
@@ -202,7 +197,7 @@
 	function renderSelectedFilters()
 	{
 		$.ajax({
-			url: "<?php echo base_url('index.ci.php/system/Filters/selectFilters'); ?>",
+			url: "<?php echo site_url('system/Filters/selectFilters'); ?>",
 			method: "GET",
 			data: {},
 			dataType: "json"
@@ -220,7 +215,7 @@
 				{
 					var selectedFilters = '<div>';
 
-					selectedFilters += '<span>';
+					selectedFilters += '<span class="filter-options-span">';
 					selectedFilters += data.selectedFiltersAliases[i];
 					selectedFilters += '</span>';
 
@@ -232,7 +227,7 @@
 					);
 
 					selectedFilters += '<span>';
-					selectedFilters += '<input type="button" value="X" class="remove-filter btn btn-default" filterToRemove="' + data.selectedFilters[i] + '">';
+					selectedFilters += '<input type="button" value="X" class="remove-selected-filter btn btn-default" filterToRemove="' + data.selectedFilters[i] + '">';
 					selectedFilters += '</span>';
 
 					selectedFilters += '</div>';
@@ -277,10 +272,12 @@
 
 </script>
 
+<br>
+
 <div id="selectedFilters"></div>
 
 <div>
-	<span>
+	<span class="filter-options-span">
 		Add filter:
 	</span>
 
@@ -289,6 +286,6 @@
 	</span>
 
 	<span>
-		<input id="applyFilter" type="button" value="Apply">
+		<input id="applyFilter" type="button" value="Apply filter">
 	</span>
 </div>

application/views/widgets/filter/tableDataset.php

@@ -19,7 +19,7 @@
 	function renderTableDataset()
 	{
 		$.ajax({
-			url: "<?php echo base_url('index.ci.php/system/Filters/tableDataset'); ?>",
+			url: "<?php echo site_url('system/Filters/tableDataset'); ?>",
 			method: "GET",
 			data: {},
 		    dataType: "json"

application/views/widgets/navigationHeader.php

@@ -3,7 +3,7 @@
 	$(document).ready(function() {
 
 		$.ajax({
-			url: "<?php echo base_url('index.ci.php/system/Navigation/header'); ?>",
+			url: "<?php echo site_url('system/Navigation/header'); ?>",
 			method: "GET",
 			data: {
 				navigation_widget_called: "<?php echo $this->router->directory.$this->router->class.'/'.$this->router->method; ?>"

application/views/widgets/navigationMenu.php

@@ -102,7 +102,7 @@
 	function renderSideMenu()
 	{
 		$.ajax({
-			url: "<?php echo base_url('index.ci.php/system/Navigation/menu'); ?>",
+			url: "<?php echo site_url('system/Navigation/menu'); ?>",
 			method: "GET",
 			data: {
 				navigation_widget_called: "<?php echo $this->router->directory.$this->router->class.'/'.$this->router->method; ?>"
@@ -114,13 +114,13 @@
 			{
 				var strMenu = '';
 
-				$("#side-menu").html('<li id="collapseicon" class="text-right" style="cursor: pointer; color: #337ab7"><i class="fa fa-angle-double-left fa-fw"></i></li>');
+				printCollapseIcon();
 
 				jQuery.each(data, function(i, e) {
 					strMenu += printNavItem(e);
 				});
 
-				$("#side-menu").append(strMenu);
+				$("#side-menu").html(strMenu);
 				$("#side-menu").metisMenu();
 			}
 
@@ -134,23 +134,31 @@
 		});
 	}
 
-	$(document).ready(function() {
-
-		renderSideMenu();
 
+	function printCollapseIcon()
+	{
 		// Hiding/showing navigation menu - works only with sb admin 2 template!!
+		if(!$("#collapseicon").length)
+			$("#side-menu").parent().append('<div id="collapseicon" title="hide Menu" class="text-right" style="cursor: pointer; color: #337ab7"><i class="fa fa-angle-double-left fa-fw"></i></div>');
 
 		$("#collapseicon").click(function() {
 			$("#page-wrapper").css('margin-left', '0px');
 			$("#side-menu").hide();
+			$("#collapseicon").hide();
 			$("#collapseinicon").show();
 		});
 
 		$("#collapseinicon").click(function() {
 			$("#page-wrapper").css('margin-left', '250px');
 			$("#side-menu").show();
+			$("#collapseicon").show();
 			$("#collapseinicon").hide();
 		});
+	}
+
+	$(document).ready(function() {
+
+		renderSideMenu();
 
 	});
 
@@ -160,5 +168,5 @@
 	<div class="sidebar-nav navbar-collapse">
 		<ul class="nav" id="side-menu"></ul>
 	</div>
-	<i id="collapseinicon" class="fa fa-angle-double-right fa-fw"></i>
+	<i id="collapseinicon" title="show Menu" class="fa fa-angle-double-right fa-fw"></i>
 </div>