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

Merge branch 'bug-56209/is_valid_date_vs_isValidDate'

Browse Source
This commit is contained in:
Andreas Österreicher
2026-03-03 11:29:29 +01:00
parent ea19ba099e bcd8f11f35
commit d1928d4151
3 changed files with 8 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/controllers/api/frontend/v1/studstatus/Unterbrechung.php
+3 -12
View File
@@ -127,9 +127,9 @@ class Unterbrechung extends FHCAPI_Controller
$this->form_validation->set_rules( $this->form_validation->set_rules(
'datum_wiedereinstieg', 'datum_wiedereinstieg',
'Datum Wiedereinstieg', 'Datum Wiedereinstieg',
'required|callback_isValidDate|callback_isDateInFuture', 'required|is_valid_date|callback_isDateInFuture',
[ [
'isValidDate' => $this->p->t('ui', 'error_invalid_date'), 'is_valid_date' => $this->p->t('ui', 'error_invalid_date'),
'isDateInFuture' => $this->p->t('ui', 'error_invalid_date') 'isDateInFuture' => $this->p->t('ui', 'error_invalid_date')
] ]
); );
@@ -209,18 +209,9 @@ class Unterbrechung extends FHCAPI_Controller
$this->terminateWithSuccess(getData($result)); $this->terminateWithSuccess(getData($result));
} }
public function isValidDate($date)
{
try {
new DateTime($date);
} catch (Exception $e) {
return false;
}
return true;
}
public function isDateInFuture($date) public function isDateInFuture($date)
{ {
return new DateTime() < new DateTime($date); return new DateTime() < new DateTime($date);
} }
} }
application/controllers/api/frontend/v1/stv/Student.php
+3 -2
View File
@@ -542,6 +542,7 @@ class Student extends FHCAPI_Controller
$this->_validate(); $this->_validate();
// TODO(chris): This should be in a library
$this->load->model('crm/Student_model', 'StudentModel'); $this->load->model('crm/Student_model', 'StudentModel');
$this->load->model('crm/Prestudent_model', 'PrestudentModel'); $this->load->model('crm/Prestudent_model', 'PrestudentModel');
$this->load->model('crm/Prestudentstatus_model', 'PrestudentstatusModel'); $this->load->model('crm/Prestudentstatus_model', 'PrestudentstatusModel');
@@ -793,8 +794,8 @@ class Student extends FHCAPI_Controller
$this->form_validation->set_rules('geschlecht', 'Geschlecht', 'callback_requiredIfNotPersonId', [ $this->form_validation->set_rules('geschlecht', 'Geschlecht', 'callback_requiredIfNotPersonId', [
'requiredIfNotPersonId' => $this->p->t('ui', 'error_fieldRequired', ['field' => $this->p->t('person', 'geschlecht')]) 'requiredIfNotPersonId' => $this->p->t('ui', 'error_fieldRequired', ['field' => $this->p->t('person', 'geschlecht')])
]); ]);
$this->form_validation->set_rules('gebdatum', 'Geburtsdatum', ['isValidDate', function($value) { return isValidDate($value); }], [ $this->form_validation->set_rules('gebdatum', 'Geburtsdatum', 'is_valid_date', [
'isValidDate' => $this->p->t('ui', 'error_invalid_date') 'is_valid_date' => $this->p->t('ui', 'error_invalid_date')
]); ]);
//$this->form_validation->set_rules('address[checked]', 'Address', 'required'); //$this->form_validation->set_rules('address[checked]', 'Address', 'required');
$this->form_validation->set_rules('address[plz]', 'PLZ', 'callback_requiredIfAddressFunc', [ $this->form_validation->set_rules('address[plz]', 'PLZ', 'callback_requiredIfAddressFunc', [
application/helpers/hlp_common_helper.php
+2 -17
View File
@@ -408,22 +408,6 @@ function findResource($path, $resource, $subdir = false, $extraDir = null)
return null; return null;
} }
/**
* check if String can be converted to a date
*/
function isValidDate($dateString)
{
try
{
return (new DateTime($dateString)) !== false;
}
catch(Exception $e)
{
return false;
}
}
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------
// PHP functions that don't exist in older versions // PHP functions that don't exist in older versions
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------
@@ -446,7 +430,8 @@ if (!function_exists('array_is_list')) {
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------
/** /**
* check if string can be converted to a date * Check if the provided parameter is a string containing a valid date
* NOTE: the name is in the "snake case" format because othewise the CI form validation _cannot_ use it
*/ */
function is_valid_date($dateString) function is_valid_date($dateString)
{ {