blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-07-20 00:12:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update response/error handling

Browse Source
This commit is contained in:
ma0068
2024-01-18 07:45:08 +01:00
parent 364c3f0518
commit bd4bbe0b7a
5 changed files with 27 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/controllers/components/stv/Notiz.php
+7 -4
View File
@@ -100,7 +100,8 @@ class Notiz extends FHC_Controller
}
}
//Überprüfung ob type übergeben wurde (entweder Funktions- oder Postparameter)
//Überprüfung ob type übergeben wurde (via Funktions- oder Postparameter)
$type = null;
if ($paramTyp)
$type = $paramTyp;
if(isset($_POST['typeId']))
@@ -108,8 +109,10 @@ class Notiz extends FHC_Controller
if(!$type)
{
//Todo(manu) return error
var_dump("ERROR no type");
$result = error('kein Type für ID vorhanden', EXIT_ERROR);
$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
return $this->outputJson(getError($result));
}
//Form Validation
@@ -126,7 +129,7 @@ class Notiz extends FHC_Controller
$erledigt = $this->input->post('erledigt');
$verfasser_uid = isset($_POST['verfasser_uid']) ? $_POST['verfasser_uid'] : $uid;
$bearbeiter_uid = isset($_POST['bearbeiter']) ? $_POST['bearbeiter'] : null;
//$type = $this->input->post('typeId');
$type = $this->input->post('typeId');
$start = $this->input->post('von');
$ende = $this->input->post('bis');
application/models/person/Notiz_model.php
+9 -2
View File
@@ -156,14 +156,21 @@ class Notiz_model extends DB_Model
$this->load->model('person/Notizzuordnung_model', 'NotizzuordnungModel');
//check if valid type
$isValidType = $this->NotizzuordnungModel->isValidType($type);
$result = $this->NotizzuordnungModel->isValidType($type);
if (isError($result))
{
$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
$result = error($result->retval, EXIT_ERROR);
return $result;
}
/*
if(!$isValidType)
{
//Todo manu (correct return to controller)
$msg = "datatype " . $type . " not implemented for notes";
return error($msg, EXIT_ERROR);
}
}*/
// Start DB transaction
$this->db->trans_start(false);
application/models/person/Notizzuordnung_model.php
+6 -6
View File
@@ -14,7 +14,6 @@ class Notizzuordnung_model extends DB_Model
public function isValidType($type)
{
//var_dump($type);
$validTypes = [];
$qry = "
@@ -22,24 +21,25 @@ class Notizzuordnung_model extends DB_Model
FROM information_schema.columns
WHERE table_schema = 'public'
AND table_name = 'tbl_notizzuordnung'
AND column_name not in ('notizzuordnung_id', 'notiz_id')
";
$type_arr = $this->execQuery($qry);
$type_arr = $type_arr->retval;
foreach ($type_arr as $t) {
foreach ($type_arr as $t)
{
$validTypes[] = $t->column_name;
}
if (in_array($type, $validTypes))
{
// var_dump($type . " is IN ARRAY");
return true;
$result = success('Type of Id is valid');
}
else
{
//var_dump($type . " is NOT IN ARRAY");
return false;
$result = error('Type of Id is not valid');
}
return $result;
}
}