From 20edb299a76ecadd6daa12dda7c0227a94d7e72e Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Mon, 15 Jan 2024 14:05:34 +0100
Subject: [PATCH] Form validation

---
 .../controllers/components/stv/Notiz.php      | 47 +++++++++----------
 1 file changed, 22 insertions(+), 25 deletions(-)

diff --git a/application/controllers/components/stv/Notiz.php b/application/controllers/components/stv/Notiz.php
index 494b1fdbf..197ec06d3 100644
--- a/application/controllers/components/stv/Notiz.php
+++ b/application/controllers/components/stv/Notiz.php
@@ -82,17 +82,8 @@ class Notiz extends FHC_Controller
 		$this->load->model('person/Notiz_model', 'NotizModel');
 
 		$this->load->library('DmsLib');
+		$this->load->library('form_validation');
 
-		//$this->load->library('form_validation');
-		//$_POST = json_decode($this->input->raw_input_stream, true);
-
-		//TODO(Manu) Validation
-
-/*		$this->form_validation->set_rules('titel', 'titel', 'required');
-		$this->form_validation->set_rules('text', 'Text', 'required');*/
-
-		//TODO(Manu) form validation - schon für type hier?
-		//Speichern der Notiz und Notizzuordnung
 		$uid = getAuthUID();
 
 		if (isset($_POST['data']))
@@ -104,6 +95,15 @@ class Notiz extends FHC_Controller
 			}
 		}
 
+		//Form Validation
+		$this->form_validation->set_rules('titel', 'titel', 'required');
+		$this->form_validation->set_rules('text', 'Text', 'required');
+
+		if ($this->form_validation->run() == false)
+		{
+			return $this->outputJsonError($this->form_validation->error_array());
+		}
+
 		$titel = $this->input->post('titel');
 		$text = $this->input->post('text');
 		$erledigt = $this->input->post('erledigt');
@@ -113,6 +113,7 @@ class Notiz extends FHC_Controller
 		$start = $this->input->post('von');
 		$ende = $this->input->post('bis');
 
+		//Speichern der Notiz und Notizzuordnung
 		$result = $this->NotizModel->addNotizForType($type, $id, $titel, $text, $uid, $start, $ende, $erledigt, $verfasser_uid, $bearbeiter_uid);
 		if (isError($result))
 		{
@@ -222,23 +223,11 @@ class Notiz extends FHC_Controller
 
 	public function updateNotiz($notiz_id)
 	{
-		var_dump("in function updateNotiz " . $notiz_id);
-		//Loads Libraries
-		$this->load->library('form_validation');
-		$this->load->library('DmsLib');
-
-		// Loads models
 		$this->load->model('person/Notiz_model', 'NotizModel');
 		$this->load->model('person/Notizdokument_model', 'NotizdokumentModel');
 
-		//$_POST = json_decode($this->input->raw_input_stream, true);
-	/*	$this->form_validation->set_rules('titel', 'titel', 'required');
-		$this->form_validation->set_rules('text', 'Text', 'required');
-
-		if ($this->form_validation->run() == false)
-		{
-			return $this->outputJsonError($this->form_validation->error_array());
-		}*/
+		$this->load->library('form_validation');
+		$this->load->library('DmsLib');
 
 		if (isset($_POST['data']))
 		{
@@ -254,6 +243,15 @@ class Notiz extends FHC_Controller
 			return $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
 		}
 
+		//Form Validation
+		$this->form_validation->set_rules('titel', 'titel', 'required');
+		$this->form_validation->set_rules('text', 'Text', 'required');
+
+		if ($this->form_validation->run() == false)
+		{
+			return $this->outputJsonError($this->form_validation->error_array());
+		}
+
 		//update Notiz
 		$uid = getAuthUID();
 		$titel = $this->input->post('titel');
@@ -288,7 +286,6 @@ class Notiz extends FHC_Controller
 		}
 
 		//neue Files speichern
-		//Todo(manu) check, welche files neu sind..
 		foreach ($_FILES as $k => $file)
 		{
 			$dms = array(