Merge remote-tracking branch 'origin/master'

application/config/message.php

@@ -7,8 +7,8 @@ $config['send_immediately'] = false;
 
 $config['msg_delivery'] = true; // Default true
 $config['system_person_id'] = 1; // Dummy sender, used for sending messages from the system
-$config['redirect_view_message_url'] = 'index.ci.php/Redirect/redirectByToken/'; // 
-$config['message_html_view_url'] = 'index.ci.php/ViewMessage/toHTML/';
+$config['redirect_view_message_url'] = site_url('Redirect/redirectByToken/'); //
+$config['message_html_view_url'] = site_url('ViewMessage/toHTML/');
 $config['message_server'] = 'http://www.fhcomplete.org/';
 $config['assistent_function'] = 'ass';
 
@@ -65,4 +65,4 @@ define('MSG_ERR_INVALID_RECIPIENTS',	105);
 define('MSG_ERR_INVALID_RECEIVER_ID',	106);
 define('MSG_ERR_INVALID_OU',			107);
 define('MSG_ERR_INVALID_TEMPLATE',		108);
-define('MSG_ERR_INVALID_TOKEN',			109);
+define('MSG_ERR_INVALID_TOKEN',			109);

application/config/navigation.php

@@ -3,7 +3,7 @@
 $config['navigation_header'] = array(
 	'*' => array(
 		'FH-Complete' => site_url(''),
-		'Vilesci' => base_url('/vilesci'),
+		'Vilesci' => base_url('vilesci'),
 		'CIS' => CIS_ROOT
 	)
 );
@@ -29,7 +29,7 @@ $config['navigation_menu']['Vilesci/index'] = array(
 				'expand' => true
 			),
 			'Infocenter' => array(
-				'link' => site_url('/system/infocenter/InfoCenter'),
+				'link' => site_url('system/infocenter/InfoCenter'),
 				'icon' => 'info',
 				'description' => 'Infocenter',
 				'expand' => true
@@ -43,13 +43,13 @@ $config['navigation_menu']['Vilesci/index'] = array(
 		'expand' => false,
 		'children'=> array(
 			'Vilesci' => array(
-				'link' => base_url('vilesci/'),
+				'link' => base_url('vilesci'),
 				'icon' => '',
 				'description' => 'Vilesci',
 				'expand' => true
 			),
 			'Extensions' => array(
-				'link' => site_url('/system/extensions/Manager'),
+				'link' => site_url('system/extensions/Manager'),
 				'icon' => 'cubes',
 				'description' => 'Extensions Manager',
 				'expand' => true
@@ -60,16 +60,16 @@ $config['navigation_menu']['Vilesci/index'] = array(
 
 
 $config['navigation_menu']['system/infocenter/InfoCenter/index'] = array(
-	'Freigegeben' => array(
-		'link' => base_url('index.ci.php/system/infocenter/InfoCenter/freigegeben'),
+	'freigegeben' => array(
+		'link' => site_url('system/infocenter/InfoCenter/freigegeben'),
 		'description' => 'Freigegeben',
 		'icon' => 'thumbs-up'
 	)
 );
 
 $config['navigation_menu']['system/infocenter/InfoCenter/freigegeben'] = array(
-	'Zurück' => array(
-		'link' => base_url('index.ci.php/system/infocenter/InfoCenter/index'),
+	'back' => array(
+		'link' => site_url('system/infocenter/InfoCenter/index'),
 		'description' => 'Home',
 		'icon' => 'angle-left'
 	)

application/controllers/jobs/Prestudentstatus.php

@@ -39,7 +39,7 @@ class Prestudentstatus extends FHC_Controller
 	public function index()
 	{
 		$result = "The following are the available command line interface commands\n\n";
-		$result .= "php index.ci.php jobs/Prestudentstatus CorrectStudienplan";
+		$result .= "php ".$this->config->item('index_page')." jobs/Prestudentstatus CorrectStudienplan";
 
 		echo $result.PHP_EOL;
 	}

application/controllers/system/infocenter/InfoCenter.php

@@ -12,12 +12,18 @@ class InfoCenter extends FHC_Controller
 	const APP = 'infocenter';
 	const TAETIGKEIT = 'bewerbung';
 
-	const URL_PREFIX = '/system/infocenter/InfoCenter'; // URL prefix for this controller
+	const INFOCENTER_URI = 'system/infocenter/InfoCenter'; // URL prefix for this controller
+	const INDEX_PAGE = 'index';
+	const FREIGEGEBEN_PAGE = 'freigegeben';
+	const SHOW_DETAILS_PAGE = 'showDetails';
+
+	const NAVIGATION_PAGE = 'navigation_page';
+	const ORIGIN_PAGE = 'origin_page';
 
 	private $_uid; // contains the UID of the logged user
 
 	// Used to log with PersonLogLib
-	private $logparams = array(
+	private $_logparams = array(
 		'saveformalgep' => array(
 			'logtype' => 'Action',
 			'name' => 'Document formally checked',
@@ -100,29 +106,33 @@ class InfoCenter extends FHC_Controller
 	// Public methods
 
 	/**
-	 * Default
+	 * Main page of the InfoCenter tool
 	 */
 	public function index()
 	{
-		$this->setNavigationMenuIndex(); // define the navigation menu for this page
+		$this->_setNavigationMenuIndex(); // define the navigation menu for this page
 
 		$this->load->view('system/infocenter/infocenter.php');
 	}
 
+	/**
+	 * Freigegeben page of the InfoCenter tool
+	 */
 	public function freigegeben()
 	{
-		$this->setNavigationMenuFreigegeben(); // define the navigation menu for this page
+		$this->_setNavigationMenuFreigegeben(); // define the navigation menu for this page
 
 		$this->load->view('system/infocenter/infocenterFreigegeben.php');
 	}
 
 	/**
+	 * Personal details page of the InfoCenter tool
 	 * Initialization function, gets person and prestudent data and loads the view with the data
 	 * @param $person_id
 	 */
 	public function showDetails()
 	{
-		$this->setNavigationMenuShowDetails();
+		$this->_setNavigationMenuShowDetails();
 
 		$person_id = $this->input->get('person_id');
 
@@ -137,8 +147,8 @@ class InfoCenter extends FHC_Controller
 		if (empty($personexists->retval))
 			show_error('person does not exist!');
 
-		$origin_page = $this->input->get('origin_page');
-		if ($origin_page == 'index')
+		$origin_page = $this->input->get(self::ORIGIN_PAGE);
+		if ($origin_page == self::INDEX_PAGE)
 		{
 			// mark person as locked for editing
 			$result = $this->PersonLockModel->lockPerson($person_id, $this->_uid, self::APP);
@@ -155,8 +165,8 @@ class InfoCenter extends FHC_Controller
 			$prestudentdata
 		);
 
-		$data['fhc_controller_id'] = $this->getControllerId();
-		$data['origin_page'] = $origin_page;
+		$data[self::FHC_CONTROLLER_ID] = $this->getControllerId();
+		$data[self::ORIGIN_PAGE] = $origin_page;
 
 		$this->load->view('system/infocenter/infocenterDetails.php', $data);
 	}
@@ -172,7 +182,7 @@ class InfoCenter extends FHC_Controller
 		if (isError($result))
 			show_error($result->retval);
 
-		redirect(self::URL_PREFIX.'?fhc_controller_id='.$this->getControllerId());
+		redirect('/'.self::INFOCENTER_URI.'?'.self::FHC_CONTROLLER_ID.'='.$this->getControllerId());
 	}
 
 	/**
@@ -211,9 +221,7 @@ class InfoCenter extends FHC_Controller
 			}
 		}
 
-		$this->output
-			->set_content_type('application/json')
-			->set_output(json_encode($json));
+		$this->output->set_content_type('application/json')->set_output(json_encode($json));
 	}
 
 	/**
@@ -224,9 +232,7 @@ class InfoCenter extends FHC_Controller
 	{
 		$prestudent = $this->PrestudentModel->getLastPrestudent($person_id, true);
 
-		$this->output
-			->set_content_type('application/json')
-			->set_output(json_encode($prestudent));
+		$this->output->set_content_type('application/json')->set_output(json_encode($prestudent));
 	}
 
 	/**
@@ -305,9 +311,7 @@ class InfoCenter extends FHC_Controller
 				$this->_log($logdata['person_id'], 'savezgv', array($logdata['studiengang_kurzbz'], $prestudent_id));
 			}
 		}
-		$this->output
-			->set_content_type('application/json')
-			->set_output(json_encode($result));
+		$this->output->set_content_type('application/json')->set_output(json_encode($result));
 	}
 
 	/**
@@ -460,9 +464,7 @@ class InfoCenter extends FHC_Controller
 			$this->_log($person_id, 'savenotiz', array($titel));
 		}
 
-		$this->output
-			->set_content_type('application/json')
-			->set_output(json_encode($result));
+		$this->output->set_content_type('application/json')->set_output(json_encode($result));
 	}
 
 	/**
@@ -493,9 +495,7 @@ class InfoCenter extends FHC_Controller
 			$this->_log($person_id, 'updatenotiz', array($titel));
 		}
 
-		$this->output
-			->set_content_type('application/json')
-			->set_output(json_encode($result));
+		$this->output->set_content_type('application/json')->set_output(json_encode($result));
 	}
 
 	/**
@@ -562,9 +562,7 @@ class InfoCenter extends FHC_Controller
 	{
 		$result = $this->personloglib->getParkedDate($person_id);
 
-		$this->output
-			->set_content_type('application/json')
-			->set_output(json_encode($result));
+		$this->output->set_content_type('application/json')->set_output(json_encode($result));
 	}
 
 	/**
@@ -577,9 +575,7 @@ class InfoCenter extends FHC_Controller
 
 		$result = $this->personloglib->park($person_id, date_format(date_create($date), 'Y-m-d'), self::TAETIGKEIT, self::APP, null, $this->_uid);
 
-		$this->output
-			->set_content_type('application/json')
-			->set_output(json_encode($result));
+		$this->output->set_content_type('application/json')->set_output(json_encode($result));
 	}
 
 	/**
@@ -591,9 +587,7 @@ class InfoCenter extends FHC_Controller
 
 		$result = $this->personloglib->unPark($person_id);
 
-		$this->output
-			->set_content_type('application/json')
-			->set_output(json_encode($result));
+		$this->output->set_content_type('application/json')->set_output(json_encode($result));
 	}
 
 	/**
@@ -612,9 +606,26 @@ class InfoCenter extends FHC_Controller
 			$json = $result->retval[0]->ende;
 		}
 
-		$this->output
-			->set_content_type('application/json')
-			->set_output(json_encode($json));
+		$this->output->set_content_type('application/json')->set_output(json_encode($json));
+	}
+
+	/**
+	 * Wrapper for setNavigationMenu, returns JSON message
+	 */
+	public function setNavigationMenuArrayJson()
+	{
+		$navigation_page = $this->input->get(self::NAVIGATION_PAGE);
+
+		if (strpos($navigation_page, self::INDEX_PAGE) !== false)
+		{
+			$this->_setNavigationMenuIndex();
+		}
+		else
+		{
+			$this->_setNavigationMenuFreigegeben();
+		}
+
+		$this->outputJsonSuccess('success');
 	}
 
 	// -----------------------------------------------------------------------------------------------------------------
@@ -633,9 +644,9 @@ class InfoCenter extends FHC_Controller
 	/**
 	 *  Define the navigation menu for the index page
 	 */
-	public function setNavigationMenuIndex()
+	private function _setNavigationMenuIndex()
 	{
-		$this->load->library('NavigationLib', array('navigation_page' => 'system/infocenter/InfoCenter/index'));
+		$this->load->library('NavigationLib', array(self::NAVIGATION_PAGE => self::INFOCENTER_URI.'/'.self::INDEX_PAGE));
 
 		$listFiltersSent = array();
 		$listFiltersNotSent = array();
@@ -724,16 +735,16 @@ class InfoCenter extends FHC_Controller
 	/**
 	 *  Define the navigation menu for the showDetails page
 	 */
-	public function setNavigationMenuShowDetails()
+	private function _setNavigationMenuShowDetails()
 	{
-		$this->load->library('NavigationLib', array('navigation_page' => 'system/infocenter/InfoCenter/showDetails'));
+		$this->load->library('NavigationLib', array(self::NAVIGATION_PAGE => self::INFOCENTER_URI.'/'.self::SHOW_DETAILS_PAGE));
 
-		$origin_page = $this->input->get('origin_page');
+		$origin_page = $this->input->get(self::ORIGIN_PAGE);
 
-		$link = base_url('index.ci.php/system/infocenter/InfoCenter/index');
-		if ($origin_page == 'freigegeben')
+		$link = site_url(self::INFOCENTER_URI.'/'.self::INDEX_PAGE);
+		if ($origin_page == self::FREIGEGEBEN_PAGE)
 		{
-			$link = base_url('index.ci.php/system/infocenter/InfoCenter/freigegeben');
+			$link = site_url(self::INFOCENTER_URI.'/'.self::FREIGEGEBEN_PAGE);
 		}
 
 		$this->navigationlib->setSessionMenu(
@@ -752,9 +763,9 @@ class InfoCenter extends FHC_Controller
 	/**
 	 *  Define the navigation menu for the freigegeben page
 	 */
-	public function setNavigationMenuFreigegeben()
+	private function _setNavigationMenuFreigegeben()
 	{
-		$this->load->library('NavigationLib', array('navigation_page' => 'system/infocenter/InfoCenter/freigegeben'));
+		$this->load->library('NavigationLib', array(self::NAVIGATION_PAGE => self::INFOCENTER_URI.'/'.self::FREIGEGEBEN_PAGE));
 
 		$listFilters = array();
 		$listCustomFilters = array();
@@ -782,6 +793,7 @@ class InfoCenter extends FHC_Controller
 		}
 
 		$filtersArray = array();
+		$filtersArray['children'] = array();
 
 		$this->_fillFiltersFreigegeben($listFilters, $filtersArray);
 
@@ -812,24 +824,8 @@ class InfoCenter extends FHC_Controller
 	}
 
 	/**
-	 * Wrapper for setNavigationMenu, returns JSON message
+	 * Utility method used to fill elements of the InfoCenter left menu of the main InfoCenter page
 	 */
-	public function setNavigationMenuArrayJson()
-	{
-		$navigation_page = $this->input->get('navigation_page');
-
-		if (strpos($navigation_page, 'index') !== false)
-		{
-			$this->setNavigationMenuIndex();
-		}
-		else
-		{
-			$this->setNavigationMenuFreigegeben();
-		}
-
-		$this->outputJsonSuccess('success');
-	}
-
 	private function _fillFilters($filters, &$tofill)
 	{
 		$toPrint = "%s?%s=%s&%s=%s";
@@ -839,7 +835,7 @@ class InfoCenter extends FHC_Controller
 			$tofill['children'][] = array(
 				'link' => sprintf(
 					$toPrint,
-					site_url('system/infocenter/InfoCenter'), 'filter_id', $filterId,
+					site_url(self::INFOCENTER_URI), 'filter_id', $filterId,
 					FHC_Controller::FHC_CONTROLLER_ID,
 					$this->getControllerId()
 				),
@@ -848,6 +844,9 @@ class InfoCenter extends FHC_Controller
 		}
 	}
 
+	/**
+	 * Utility method used to fill elements of the InfoCenter left menu of the freigegeben InfoCenter page
+	 */
 	private function _fillFiltersFreigegeben($filters, &$tofill)
 	{
 		$toPrint = "%s?%s=%s&%s=%s";
@@ -857,7 +856,7 @@ class InfoCenter extends FHC_Controller
 			$tofill['children'][] = array(
 				'link' => sprintf(
 					$toPrint,
-					site_url('system/infocenter/InfoCenter/freigegeben'), 'filter_id', $filterId,
+					site_url(self::INFOCENTER_URI.'/'.self::FREIGEGEBEN_PAGE), 'filter_id', $filterId,
 					FHC_Controller::FHC_CONTROLLER_ID,
 					$this->getControllerId()
 				),
@@ -866,6 +865,10 @@ class InfoCenter extends FHC_Controller
 		}
 	}
 
+	/**
+	 * Utility method used to fill elements of the InfoCenter left menu
+	 * with the list of the custom filter of the authenticated user
+	 */
 	private function _fillCustomFilters($filters, &$tofill)
 	{
 		$toPrint = "%s?%s=%s&%s=%s";
@@ -875,7 +878,7 @@ class InfoCenter extends FHC_Controller
 			$tofill['children'][] = array(
 				'link' => sprintf(
 					$toPrint,
-					site_url('system/infocenter/InfoCenter'), 'filter_id', $filterId,
+					site_url(self::INFOCENTER_URI), 'filter_id', $filterId,
 					FHC_Controller::FHC_CONTROLLER_ID,
 					$this->getControllerId()
 				),
@@ -1069,7 +1072,18 @@ class InfoCenter extends FHC_Controller
 		$this->PrestudentModel->addSelect('person_id');
 		$person_id = $this->PrestudentModel->load($prestudent_id)->retval[0]->person_id;
 
-		redirect(self::URL_PREFIX.'/showDetails?person_id='.$person_id.'&fhc_controller_id='.$this->getControllerId().'#'.$section);
+		redirect(
+			sprintf(
+				'/%s/%s?%s=%s&%s=%s#%s',
+				self::INFOCENTER_URI,
+				self::SHOW_DETAILS_PAGE,
+				'person_id',
+				$person_id,
+				self::FHC_CONTROLLER_ID,
+				$this->getControllerId(),
+				$section
+			)
+		);
 	}
 
 	/**
@@ -1101,7 +1115,7 @@ class InfoCenter extends FHC_Controller
 	 */
 	private function _log($person_id, $logname, $messageparams)
 	{
-		$logdata = $this->logparams[$logname];
+		$logdata = $this->_logparams[$logname];
 
 		$datatolog = array(
 			'name' => $logdata['name']

application/views/crm/statusgrundEdit.php

@@ -7,7 +7,7 @@
 		<div class="row">
 			<div class="span4">
 				<h2>Statusgrund: <?php echo $sg->status_kurzbz; ?></h2>
-				<form method="post" action="<?php echo APP_ROOT . "index.ci.php/crm/Statusgrund/saveGrund";?>">
+				<form method="post" action="<?php echo site_url("crm/Statusgrund/saveGrund"); ?>">
 					<table>
 						<tr>
 							<td colspan="2">
@@ -104,4 +104,4 @@
 		}
 	?>
 
-</html>
+</html>

application/views/crm/statusgrundNew.php

@@ -5,7 +5,7 @@
 		<div class="row">
 			<div class="span4">
 				<h2>Neuer Statusgrund</h2>
-				<form method="post" action="<?php echo APP_ROOT . "index.ci.php/crm/Statusgrund/insGrund";?>">
+				<form method="post" action="<?php echo site_url("crm/Statusgrund/insGrund"); ?>">
 					<table>
 						<tr>
 							<td colspan="2">

application/views/organisation/studienjahrEdit.php

@@ -7,7 +7,7 @@ $this->load->view('templates/header', array('title' => 'StudienjahrEdit', 'jquer
 	<div class="row">
 		<div class="span4">
 			<h2>Studienjahr bearbeiten: <?php echo $jahr->studienjahr_kurzbz; ?></h2>
-			<form method="post" action="<?php echo APP_ROOT."index.ci.php/organisation/studienjahr/saveStudienjahr" ?>">
+			<form method="post" action="<?php echo site_url("organisation/studienjahr/saveStudienjahr"); ?>">
 
 				<table>
 					<?php include('studienjahrForm.php'); ?>
@@ -17,4 +17,4 @@ $this->load->view('templates/header', array('title' => 'StudienjahrEdit', 'jquer
 	</div>
 </div>
 </body>
-</html>
+</html>

application/views/organisation/studienjahrNew.php

@@ -8,7 +8,7 @@ $this->load->view('templates/header', array('title' => 'StudienjahrNew', 'jquery
 		<div class="span4">
 			<h2>Neues Studienjahr anlegen</h2>
 			<form method="post"
-				  action="<?php echo APP_ROOT."index.ci.php/organisation/studienjahr/insStudienjahr"; ?>"
+				  action="<?php echo site_url("organisation/studienjahr/insStudienjahr"); ?>"
 				  id="newStudienjahrForm">
 				<table>
 					<tr>

application/views/organisation/studiensemesterEdit.php

@@ -8,7 +8,7 @@ $this->load->view('templates/header', array('title' => 'StudiensemesterEdit', 'd
 		<div class="span4">
 			<h2>Studiensemester bearbeiten: <?php echo $sem->studiensemester_kurzbz; ?></h2>
 			<form method="post"
-				  action="<?php echo APP_ROOT."index.ci.php/organisation/studiensemester/saveStudiensemester" ?>">
+				  action="<?php echo site_url("organisation/studiensemester/saveStudiensemester") ?>">
 				<table>
 					<?php include('studiensemesterForm.php'); ?>
 					<input type="hidden" name="semkurzbz" value="<?php echo $sem->studiensemester_kurzbz; ?>"/>

application/views/organisation/studiensemesterNew.php

@@ -7,9 +7,7 @@ $this->load->view('templates/header', array('title' => 'StudiensemesterNew', 'jq
 	<div class="row">
 		<div class="span4">
 			<h2>Neues Studiensemester anlegen</h2>
-			<form method="post"
-				  action="<?php echo APP_ROOT."index.ci.php/organisation/studiensemester/insStudiensemester"; ?>"
-				  id="newSemesterForm">
+			<form method="post" action="<?php echo site_url("organisation/studiensemester/insStudiensemester"); ?>" id="newSemesterForm">
 				<table>
 					<tr>
 						<td colspan="2">

application/views/system/messageList.php

@@ -84,7 +84,7 @@ $widthColumn = $msgExists === true ? 8 : 12;
 		$.ajax(
 			{
 				dataType: "json",
-				url: "<?php echo base_url("/index.ci.php/system/Messages/getMessageFromIds/") ?>" + msgid + "/" + recid,
+				url: "<?php echo site_url("system/Messages/getMessageFromIds/") ?>" + msgid + "/" + recid,
 				success: function (data, textStatus, jqXHR)
 				{
 					$("#msgsubject").text(data[0].subject);
@@ -97,4 +97,4 @@ $widthColumn = $msgExists === true ? 8 : 12;
 			}
 		)
 	}
-</script>
+</script>

application/views/system/udf.php

@@ -47,7 +47,7 @@
 		}
 	}
 ?>
-		<form action="<?php echo APP_ROOT; ?>index.ci.php/system/UDF/saveUDF" method="POST">
+		<form action="<?php echo site_url('system/UDF/saveUDF'); ?>" method="POST">
 
 			<div class="div-table">
 				<div class="div-row">

application/views/templates/FHC-Header.php

@@ -2,8 +2,9 @@
 
 if (! defined('BASEPATH')) exit('No direct script access allowed');
 
-// Retrives the URL path of the called controller + called controller method
+// Retrives the name of the index page, the URL path of the called controller and the called controller
 // NOTE: placed here because it doesn't work inside functions
+$indexPage = $this->config->item('index_page');
 $calledPath = $this->router->directory.$this->router->class;
 $calledMethod = $this->router->method;
 
@@ -67,14 +68,14 @@ function _generateCSSsInclude($CSSs)
 /**
  * Generates global JS-Object to pass parms to other javascripts
  */
-function _generateJSDataStorageObject($calledPath, $calledMethod)
+function _generateJSDataStorageObject($indexPage, $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",
+			ci_router: "'.$indexPage.'",
 			called_path: "'.$calledPath.'",
 			called_method: "'.$calledMethod.'"
 		};';
@@ -202,7 +203,7 @@ function _generateAddonsJSsInclude($calledFrom)
 
 			// Generates the global object to pass useful parameters to other javascripts
 			// NOTE: must be called before any other JS include
-			_generateJSDataStorageObject($calledPath, $calledMethod);
+			_generateJSDataStorageObject($indexPage, $calledPath, $calledMethod);
 
 			// Generates the global object to pass phrases to javascripts
 			// NOTE: must be called before including the PhrasesLib.js