Merge branch 'feature-4998/FHC-IDAM_REST_Schnittstelle_zum_Setzen_des_Aktivierungscodes' into feature-5128/FHC-IDAM_account_activation

application/controllers/organisation/Studienjahr.php

@@ -20,7 +20,7 @@ class Studienjahr extends Auth_Controller
 				'editStudienjahr' => 'basis/studiensemester:rw',
 				'newStudienjahr' => 'basis/studiensemester:rw',
 				'insStudienjahr' => 'basis/studiensemester:rw',
-				'saveStudienjahr' => 'basis/studiensemester:rw',
+				'updateStudienjahr' => 'basis/studiensemester:rw',
 				'deleteStudienjahr' => 'basis/studiensemester:rw'
 			)
 		);
@@ -117,6 +117,10 @@ class Studienjahr extends Auth_Controller
 	public function insStudienjahr()
 	{
 		$data = $this->__retrieveStudienjahrData();
+		$studienjahr_exists = $this->StudienjahrModel->load($data['studienjahr_kurzbz']);
+		if (hasData($studienjahr_exists))
+			show_error("Studienjahr existiert bereits");
+
 		$studienjahr = $this->StudienjahrModel->insert($data);
 
 		if ($studienjahr->error)
@@ -177,7 +181,7 @@ class Studienjahr extends Auth_Controller
 	 * replaces slash in Kurzbezeichnung with underscore
 	 * saved=true is a GET parameter passed for showing save message
 	 */
-	public function saveStudienjahr()
+	public function updateStudienjahr()
 	{
 		$data = $this->__retrieveStudienjahrData();
 		$studienjahr = $this->StudienjahrModel->update($data['studienjahr_kurzbz'], $data);

application/controllers/organisation/Studiensemester.php

@@ -20,7 +20,7 @@ class Studiensemester extends Auth_Controller
 				'editStudiensemester' => 'basis/studiensemester:rw',
 				'newStudiensemester' => 'basis/studiensemester:rw',
 				'insStudiensemester' => 'basis/studiensemester:rw',
-				'saveStudiensemester' => 'basis/studiensemester:rw',
+				'updateStudiensemester' => 'basis/studiensemester:rw',
 				'deleteStudiensemester' => 'basis/studiensemester:rw'
 			)
 		);
@@ -108,6 +108,11 @@ class Studiensemester extends Auth_Controller
 	public function insStudiensemester()
 	{
 		$data = $this->__retrieveStudiensemesterData();
+
+		$studiensemester_exists = $this->StudiensemesterModel->load($data['studiensemester_kurzbz']);
+		if (hasData($studiensemester_exists))
+			show_error("Studiensemester existiert bereits");
+
 		$semester = $this->StudiensemesterModel->insert($data);
 
 		if ($semester->error)
@@ -185,7 +190,7 @@ class Studiensemester extends Auth_Controller
 	 * redirects to edit page after inserting
 	 * saved=true is a GET parameter passed for showing save message
 	 */
-	public function saveStudiensemester()
+	public function updateStudiensemester()
 	{
 		$data = $this->__retrieveStudiensemesterData();
 		$semester = $this->StudiensemesterModel->update($data['studiensemester_kurzbz'], $data);
@@ -214,5 +219,4 @@ class Studiensemester extends Auth_Controller
 
 		redirect("/organisation/studiensemester/listStudiensemester");
 	}
-
 }

application/libraries/CryptLib.php

@@ -0,0 +1,28 @@
+<?php
+
+if (!defined('BASEPATH')) exit('No direct script access allowed');
+
+use phpseclib\Crypt\Rijndael;
+
+/**
+ * Collection of different encryption/hashing algorithms
+ */
+class CryptLib
+{
+	/**
+	 * Encrypt using the Rijndael algorithm with a key length of 256 bits and the ECB mode
+	 * It is possible to disable the padding, enabled by default
+	 */
+	public static function RIJNDAEL_256_ECB($value, $key, $paddingDisabled = false)
+	{
+		if (isEmptyString($key) || strlen($value) % 32 != 0) return null;
+
+		$cipher = new Rijndael(Rijndael::MODE_ECB);
+		$cipher->setBlockLength(256);
+		$cipher->setKey($key);
+
+		if ($paddingDisabled === true) $cipher->disablePadding();
+
+		return $cipher->encrypt($value);
+	}
+}

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 site_url("organisation/studienjahr/saveStudienjahr"); ?>">
+			<form method="post" action="<?php echo site_url("organisation/studienjahr/updateStudienjahr"); ?>">
 
 				<table>
 					<?php include('studienjahrForm.php'); ?>

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 site_url("organisation/studiensemester/saveStudiensemester") ?>">
+				  action="<?php echo site_url("organisation/studiensemester/updateStudiensemester") ?>">
 				<table>
 					<?php include('studiensemesterForm.php'); ?>
 					<input type="hidden" name="semkurzbz" value="<?php echo $sem->studiensemester_kurzbz; ?>"/>

application/views/system/infocenter/infocenterData.php

@@ -394,7 +394,7 @@
 
 			if ($datasetRaw->OnholdDate != null)
 			{
-				$mark = "text-success";
+				$mark = "onhold";
 			}
 
 			// Parking has priority over locking

application/views/system/infocenter/infocenterFreigegebenData.php

@@ -206,6 +206,7 @@
 				  FROM public.tbl_prestudent ps
 				  JOIN public.tbl_studiengang sg USING(studiengang_kz)
 				WHERE ps.person_id = p.person_id
+				  AND ps.reihungstestangetreten = FALSE
 				  AND (sg.typ IN ('.$STUDIENGANG_TYP.')
 					   OR
 					   sg.studiengang_kz in('.$ADDITIONAL_STG.')