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

Fix: code quality checks

Browse Source
This commit is contained in:
Paolo
2023-04-20 15:05:45 +02:00
parent a128d57c60
commit 82c2652148
6 changed files with 120 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/config/constants.php
+28 -28
View File
@@ -10,26 +10,26 @@ if (!defined('BASEPATH')) exit('No direct script access allowed');
| Used to indicate the conditions under which the script is exit()ing.
|
*/
define('EXIT_SUCCESS', 0); // no errors
define('EXIT_ERROR', 1); // generic error
define('EXIT_MODEL', 2); // model error
define('EXIT_CONFIG', 3); // configuration error
define('EXIT_UNKNOWN_FILE', 4); // file not found
define('EXIT_UNKNOWN_CLASS', 5); // unknown class
define('EXIT_UNKNOWN_METHOD', 6); // unknown class method
define('EXIT_USER_INPUT', 7); // invalid user input
define('EXIT_DATABASE', 8); // database error
define('EXIT_VALIDATION_UDF', 10); // UDF validation has been failed
define('EXIT_SUCCESS', 0); // no errors
define('EXIT_ERROR', 1); // generic error
define('EXIT_MODEL', 2); // model error
define('EXIT_CONFIG', 3); // configuration error
define('EXIT_UNKNOWN_FILE', 4); // file not found
define('EXIT_UNKNOWN_CLASS', 5); // unknown class
define('EXIT_UNKNOWN_METHOD', 6); // unknown class method
define('EXIT_USER_INPUT', 7); // invalid user input
define('EXIT_DATABASE', 8); // database error
define('EXIT_VALIDATION_UDF', 10); // UDF validation has been failed
define('EXIT_VALIDATION_UDF_MIN_VALUE', 11); // UDF validation has been failed -> MIN VALUE
define('EXIT_VALIDATION_UDF_MAX_VALUE', 12); // UDF validation has been failed -> MAX VALUE
define('EXIT_VALIDATION_UDF_MIN_LENGTH', 13); // UDF validation has been failed -> MIN LENGTH
define('EXIT_VALIDATION_UDF_MAX_LENGTH', 14); // UDF validation has been failed -> MAX LENGTH
define('EXIT_VALIDATION_UDF_REGEX', 15); // UDF validation has been failed -> REGEX
define('EXIT_VALIDATION_UDF_REGEX', 15); // UDF validation has been failed -> REGEX
define('EXIT_VALIDATION_UDF_REQUIRED', 16); // UDF validation has been failed -> REQUIRED
define('EXIT_VALIDATION_UDF_NOT_VALID_VAL', 17); // UDF validation has been failed -> Not valid value, object or array
define('EXIT_AUTO_MIN', 1000); // lowest automatically-assigned error code
define('EXIT_AUTO_MAX', 2000); // highest automatically-assigned error code
define('EXIT_AUTO_MIN', 1000); // lowest automatically-assigned error code
define('EXIT_AUTO_MAX', 2000); // highest automatically-assigned error code
/*
|--------------------------------------------------------------------------
@@ -45,7 +45,7 @@ define('BEGINNING_OF_TIME', '1970-01-01');
*/
// Foreign authentication methods
define('AUTH_HBALDAP', 'httpBasicAuthLDAP');
define('AUTH_BT', 'bewerbung');
define('AUTH_BT', 'bewerbung');
// Login methods
define('AUTH_LDAP', 'ldap');
@@ -53,7 +53,7 @@ define('AUTH_DB', 'database');
define('AUTH_SSO', 'sso');
// Authentication return codes
define('AUTH_SUCCESS', 0);
define('AUTH_SUCCESS', 0);
define('AUTH_NOT_AUTHENTICATED', 1);
define('AUTH_INVALID_CREDENTIALS', 2);
@@ -112,7 +112,7 @@ define('FOPEN_READ_WRITE_CREATE_STRICT', 'x+b');
| of this setting
|
*/
define('SHOW_DEBUG_BACKTRACE', TRUE);
define('SHOW_DEBUG_BACKTRACE', true);
/*
|--------------------------------------------------------------------------
@@ -127,25 +127,25 @@ define('EMAIL_CONFIG_INDEX', 'mail');
|--------------------------------------------------------------------------
*/
// Message statuses
define('MSG_STATUS_UNREAD', 0);
define('MSG_STATUS_READ', 1);
define('MSG_STATUS_UNREAD', 0);
define('MSG_STATUS_READ', 1);
define('MSG_STATUS_ARCHIVED', 2);
define('MSG_STATUS_DELETED', 3);
// Message priorities
define('MSG_PRIORITY_LOW', 1);
define('MSG_PRIORITY_LOW', 1);
define('MSG_PRIORITY_NORMAL', 2);
define('MSG_PRIORITY_HIGH', 3);
define('MSG_PRIORITY_HIGH', 3);
define('MSG_PRIORITY_URGENT', 4);
// Message error status
define('MSG_ERR_INVALID_SUBJECT', 40);
define('MSG_ERR_INVALID_BODY', 41);
define('MSG_ERR_INVALID_TEMPLATE', 42);
define('MSG_ERR_INVALID_MSG_ID', 43);
define('MSG_ERR_INVALID_STATUS_ID', 44);
define('MSG_ERR_INVALID_SENDER', 45);
define('MSG_ERR_INVALID_SUBJECT', 40);
define('MSG_ERR_INVALID_BODY', 41);
define('MSG_ERR_INVALID_TEMPLATE', 42);
define('MSG_ERR_INVALID_MSG_ID', 43);
define('MSG_ERR_INVALID_STATUS_ID', 44);
define('MSG_ERR_INVALID_SENDER', 45);
define('MSG_ERR_INVALID_RECIPIENTS', 46);
define('MSG_ERR_INVALID_OU', 47);
define('MSG_ERR_INVALID_TOKEN', 48);
define('MSG_ERR_INVALID_OU', 47);
define('MSG_ERR_INVALID_TOKEN', 48);
application/controllers/jobs/ReihungstestJob.php
+6 -2
View File
@@ -462,7 +462,8 @@ class ReihungstestJob extends JOB_Controller
$mailcontent_data_arr['rt_raum'] = $applicant->planbezeichnung;
if ($applicant->lageplan == '')
{
$mailcontent_data_arr['wegbeschreibung'] = 'Für diesen Raum liegt noch keine Wegbeschreibung vor.<br><br>No directions were found for this room';
$mailcontent_data_arr['wegbeschreibung'] = 'Für diesen Raum liegt noch keine Wegbeschreibung vor.
<br><br>No directions were found for this room';
}
else
{
@@ -931,7 +932,10 @@ class ReihungstestJob extends JOB_Controller
JOIN PUBLIC.tbl_studiengang ON (tbl_prestudent.studiengang_kz = tbl_studiengang.studiengang_kz)
WHERE tbl_prestudent.person_id = ".$row_ps->person_id."
AND tbl_prestudent.prestudent_id != ".$row_ps->prestudent_id."
AND get_rolle_prestudent (tbl_prestudent.prestudent_id, '".$row_ps->studiensemester_kurzbz."') IN ('Aufgenommener','Bewerber','Wartender')
AND get_rolle_prestudent(
tbl_prestudent.prestudent_id,
'".$row_ps->studiensemester_kurzbz."'
) IN ('Aufgenommener','Bewerber','Wartender')
AND studiensemester_kurzbz = '".$row_ps->studiensemester_kurzbz."'
AND tbl_studiengang.typ IN ('b', 'm')
AND priorisierung > ".$row_ps->priorisierung."
application/controllers/system/infocenter/InfoCenter.php
+54 -25
View File
@@ -110,7 +110,7 @@ class InfoCenter extends Auth_Controller
*/
public function __construct()
{
parent::__construct(
parent::__construct(
array(
'index' => 'infocenter:r',
'freigegeben' => 'infocenter:r',
@@ -407,7 +407,7 @@ class InfoCenter extends Auth_Controller
'saveformalgep',
array(
isEmptyString($akte->retval[0]->titel) ? $akte->retval[0]->bezeichnung : $akte->retval[0]->titel,
is_null($timestamp) ? 'NULL' : $timestamp
is_null($timestamp) ? 'null' : $timestamp
)
);
}
@@ -608,7 +608,8 @@ class InfoCenter extends Auth_Controller
/**
* Sendet bei einer neuen ZGV Prüfung die Mail raus an den Studiengang
*/
private function sendZgvMail($mail, $typ, $person){
private function sendZgvMail($mail, $typ, $person)
{
$data = array(
'vorname' => $person->vorname,
'nachname' => $person->nachname,
@@ -692,7 +693,6 @@ class InfoCenter extends Auth_Controller
'openZgv' => $openZgv
)
);
}
/**
@@ -866,7 +866,7 @@ class InfoCenter extends Auth_Controller
$person_id = $logdata['person_id'];
$akteresult = $this->AkteModel->loadWhere(array('person_id' => $person_id, 'formal_geprueft_amum !=' => NULL));
$akteresult = $this->AkteModel->loadWhere(array('person_id' => $person_id, 'formal_geprueft_amum !=' => null));
if (hasData($lastStatus) && isSuccess($akteresult))
{
@@ -1243,7 +1243,9 @@ class InfoCenter extends Auth_Controller
$person_id = $this->input->post('person_id');
$date = $this->input->post('onholddate');
$result = $this->personloglib->setOnHold($person_id, date_format(date_create($date), 'Y-m-d'), self::TAETIGKEIT, self::APP, null, $this->_uid);
$result = $this->personloglib->setOnHold(
$person_id, date_format(date_create($date), 'Y-m-d'), self::TAETIGKEIT, self::APP, null, $this->_uid
);
$this->outputJson($result);
}
@@ -1454,7 +1456,6 @@ class InfoCenter extends Auth_Controller
if (isError($update))
$this->terminateWithJsonError($this->p->t('ui', 'fehlerBeimSpeichern'));
}
}
}
@@ -1464,7 +1465,7 @@ class InfoCenter extends Auth_Controller
public function saveNachreichung($person_id)
{
$nachreichungAm = $this->input->post('nachreichungAm');
$nachreichungAnmerkung = empty($this->input->post('nachreichungAnmerkung')) ? NULL : $this->input->post('nachreichungAnmerkung');
$nachreichungAnmerkung = empty($this->input->post('nachreichungAnmerkung')) ? null : $this->input->post('nachreichungAnmerkung');
$typ = $this->input->post('typ');
$allowedTypes = [
@@ -1521,14 +1522,14 @@ class InfoCenter extends Auth_Controller
array(
'dokument_kurzbz' => $allowedTypes[$typ],
'person_id' => $person_id,
'erstelltam' => NULL,
'erstelltam' => null,
'gedruckt' => false,
'anmerkung' => $nachreichungAnmerkung,
'updateamum' => $today,
'updatevon' => get_uid(),
'insertamum' => $today,
'insertvon' => get_uid(),
'uid' => NULL,
'uid' => null,
'nachgereicht' => true,
'nachgereicht_am' => $nachreichungAm
)
@@ -2098,14 +2099,19 @@ class InfoCenter extends Auth_Controller
//get orgform for german and english
if (isset($zgvpruefung->prestudentstatus->bezeichnung_orgform) && is_array($zgvpruefung->prestudentstatus->bezeichnung_orgform))
{
$zgvpruefung->prestudentstatus->bezeichnung_orgform_german = getPhraseByLanguage($zgvpruefung->prestudentstatus->bezeichnung_orgform, 'German');
$zgvpruefung->prestudentstatus->bezeichnung_orgform_english = getPhraseByLanguage($zgvpruefung->prestudentstatus->bezeichnung_orgform, 'English');
$zgvpruefung->prestudentstatus->bezeichnung_orgform_german = getPhraseByLanguage(
$zgvpruefung->prestudentstatus->bezeichnung_orgform, 'German'
);
$zgvpruefung->prestudentstatus->bezeichnung_orgform_english = getPhraseByLanguage(
$zgvpruefung->prestudentstatus->bezeichnung_orgform, 'English'
);
}
$position = strpos($zgvpruefung->prestudentstatus->anmerkung, 'Alt:');
//parse Anmerkung for Alternative (Prio is given in orgform and sprache anyway)
$zgvpruefung->prestudentstatus->alternative = is_numeric($position) ? substr($zgvpruefung->prestudentstatus->anmerkung, $position) : null;
$zgvpruefung->prestudentstatus->alternative = is_numeric($position) ?
substr($zgvpruefung->prestudentstatus->anmerkung, $position) : null;
}
//if prestudent is not interessent or is already bestaetigt, then show only as information, non-editable
@@ -2124,7 +2130,9 @@ class InfoCenter extends Auth_Controller
$isFreigegeben = null;
if (isset($zgvpruefung->prestudentstatus->studiensemester_kurzbz))
{
$this->PrestudentstatusModel->addSelect('bestaetigtam, statusgrund_id, tbl_status_grund.bezeichnung_mehrsprachig AS bezeichnung_statusgrund');
$this->PrestudentstatusModel->addSelect(
'bestaetigtam, statusgrund_id, tbl_status_grund.bezeichnung_mehrsprachig AS bezeichnung_statusgrund'
);
$this->PrestudentstatusModel->addJoin('public.tbl_status_grund', 'statusgrund_id', 'LEFT');
$isFreigegeben = $this->PrestudentstatusModel->loadWhere(array(
'studiensemester_kurzbz' => $zgvpruefung->prestudentstatus->studiensemester_kurzbz,
@@ -2139,11 +2147,14 @@ class InfoCenter extends Auth_Controller
{
if (isset($prestudentstatus->bestaetigtam))
{
//if statusgrund set - freigegeben for Studiengang, otherwise freigegeben for RT
// If statusgrund set - freigegeben for Studiengang, otherwise freigegeben for RT
if (isset($prestudentstatus->statusgrund_id))
{
if (isset($prestudentstatus->bezeichnung_statusgrund[0])
&& in_array($prestudentstatus->bezeichnung_statusgrund[0], $this->_statusgruendeNoStgFreigabeMessage))
&& in_array(
$prestudentstatus->bezeichnung_statusgrund[0],
$this->_statusgruendeNoStgFreigabeMessage)
)
$zgvpruefung->sendStgFreigabeMsg = false;
else
$zgvpruefung->isStgFreigegeben = true;
@@ -2160,7 +2171,8 @@ class InfoCenter extends Auth_Controller
$zgvpruefung->changedown = false;
$zgvpruefung->hasBewerber = false;
if (isset($zgvpruefung->prestudentstatus->status_kurzbz) && $zgvpruefung->prestudentstatus->status_kurzbz == self::INTERESSENTSTATUS)
if (isset($zgvpruefung->prestudentstatus->status_kurzbz)
&& $zgvpruefung->prestudentstatus->status_kurzbz == self::INTERESSENTSTATUS)
{
if (isset($zgvpruefung->prestudentstatus->studiensemester_kurzbz))
{
@@ -2178,8 +2190,12 @@ class InfoCenter extends Auth_Controller
}
}
$zgvpruefung->changeup = $this->PrestudentModel->checkPrioChange($zgvpruefung->prestudent_id, $studiensemester, -1);
$zgvpruefung->changedown = $this->PrestudentModel->checkPrioChange($zgvpruefung->prestudent_id, $studiensemester, 1);
$zgvpruefung->changeup = $this->PrestudentModel->checkPrioChange(
$zgvpruefung->prestudent_id, $studiensemester, -1
);
$zgvpruefung->changedown = $this->PrestudentModel->checkPrioChange(
$zgvpruefung->prestudent_id, $studiensemester, 1
);
}
}
$zgvExist = $this->ZGVPruefungModel->loadWhere(array('prestudent_id' => $zgvpruefung->prestudent_id));
@@ -2189,7 +2205,11 @@ class InfoCenter extends Auth_Controller
$this->ZGVPruefungStatusModel->addOrder('datum', 'DESC');
$this->ZGVPruefungStatusModel->addLimit(1);
$statusZGV = $this->ZGVPruefungStatusModel->loadWhere(array('zgvpruefung_id' => $zgvExist->retval[0]->zgvpruefung_id));
$statusZGV = $this->ZGVPruefungStatusModel->loadWhere(
array(
'zgvpruefung_id' => $zgvExist->retval[0]->zgvpruefung_id
)
);
if (isSuccess($statusZGV) && hasData($statusZGV))
$zgvpruefung->statusZGV = $statusZGV->retval[0]->status;
@@ -2220,7 +2240,7 @@ class InfoCenter extends Auth_Controller
$this->GeschlechtModel->addOrder('sort');
$allGenders = getData($this->GeschlechtModel->load());
$data = array (
$data = array(
'zgvpruefungen' => $zgvpruefungen,
'abwstatusgruende' => $abwstatusgruende,
'intstatusgruende' => $intstatusgruende,
@@ -2243,7 +2263,7 @@ class InfoCenter extends Auth_Controller
{
$this->load->model('organisation/studiensemester_model', 'StudiensemesterModel');
@usort($zgvpruefungen, function ($a, $b) {
@usort($zgvpruefungen, function($a, $b) {
//sort:
// 1: Studiensemester
if (isset($a->prestudentstatus->studiensemester_kurzbz) || isset($b->prestudentstatus->studiensemester_kurzbz))
@@ -2426,8 +2446,13 @@ class InfoCenter extends Auth_Controller
foreach ($dokumenteNachzureichen as $dokument)
{
$anmerkung = !isEmptyString($dokument->anmerkung) ? ' | Anmerkung: '.$dokument->anmerkung : '';
$nachgereichtam = !isEmptyString($dokument->nachgereicht_am) ? ' | wird nachgereicht bis '.date_format(date_create($dokument->nachgereicht_am), 'd.m.Y') : '';
$dokumenteNachzureichenMail[] = array('dokument_bezeichnung' => $dokument->dokument_bezeichnung, 'anmerkung' => $anmerkung, 'nachgereicht_am' => $nachgereichtam);
$nachgereichtam = !isEmptyString($dokument->nachgereicht_am) ?
' | wird nachgereicht bis '.date_format(date_create($dokument->nachgereicht_am), 'd.m.Y') : '';
$dokumenteNachzureichenMail[] = array(
'dokument_bezeichnung' => $dokument->dokument_bezeichnung,
'anmerkung' => $anmerkung,
'nachgereicht_am' => $nachgereichtam
);
}
$notizenBewerbung = $this->NotizModel->getNotizByTitel($person_id, 'Anmerkung zur Bewerbung')->retval;
@@ -2465,7 +2490,11 @@ class InfoCenter extends Auth_Controller
$this->load->library('LogLib');
$this->load->helper('hlp_sancho');
$subject = ($person->geschlecht == 'm' ? 'Interessent ' : 'Interessentin ').$person->vorname.' '.$person->nachname.' für '.$prestudentstatus->studiengangbezeichnung.$orgform.' freigegeben';
$subject = ($person->geschlecht == 'm' ? 'Interessent ' : 'Interessentin ').
$person->vorname.' '.
$person->nachname.' für '.
$prestudentstatus->studiengangbezeichnung.
$orgform.' freigegeben';
$receiver = $prestudent->studiengangmail;
application/models/system/Message_model.php
+1 -1
View File
@@ -1,6 +1,6 @@
<?php
if ( ! defined('BASEPATH')) exit('No direct script access allowed');
if (!defined('BASEPATH')) exit('No direct script access allowed');
class Message_model extends DB_Model
{
application/models/system/Recipient_model.php
+29 -5
View File
@@ -127,7 +127,11 @@ class Recipient_model extends DB_Model
else
{
array_push($parametersArray, $person_id, $person_id);
$sql = sprintf($sql, 'WHERE person_id = ? AND message_id NOT IN (SELECT message_id FROM public.tbl_msg_status WHERE status >= 3 AND person_id = ?)');
$sql = sprintf(
$sql,
'WHERE person_id = ?
AND message_id NOT IN (SELECT message_id FROM public.tbl_msg_status WHERE status >= 3 AND person_id = ?)'
);
}
if ($oe_kurzbz != null)
@@ -410,8 +414,18 @@ class Recipient_model extends DB_Model
ps.person_id AS "senderPersonId",
ps.vorname AS "senderName",
ps.nachname AS "senderSurname",
(SELECT MAX(status) FROM public.tbl_msg_status WHERE message_id = mm.message_id AND person_id = mr.person_id) AS "lastStatus",
(SELECT MAX(insertamum) FROM public.tbl_msg_status WHERE message_id = mm.message_id AND person_id = mr.person_id) AS "lastStatusDate",
(
SELECT MAX(status)
FROM public.tbl_msg_status
WHERE message_id = mm.message_id
AND person_id = mr.person_id
) AS "lastStatus",
(
SELECT MAX(insertamum)
FROM public.tbl_msg_status
WHERE message_id = mm.message_id
AND person_id = mr.person_id
) AS "lastStatusDate",
oe.oe_kurzbz AS "oeId",
COALESCE(sg.bezeichnung, oe.bezeichnung) AS oe,
mr.token
@@ -451,8 +465,18 @@ class Recipient_model extends DB_Model
ps.person_id AS "senderPersonId",
ps.vorname AS "senderName",
ps.nachname AS "senderSurname",
(SELECT MAX(status) FROM public.tbl_msg_status WHERE message_id = mrou.message_id AND person_id = mrou.person_id) AS "lastStatus",
(SELECT MAX(insertamum) FROM public.tbl_msg_status WHERE message_id = mrou.message_id AND person_id = mrou.person_id) AS "lastStatusDate",
(
SELECT MAX(status)
FROM public.tbl_msg_status
WHERE message_id = mrou.message_id
AND person_id = mrou.person_id
) AS "lastStatus",
(
SELECT MAX(insertamum)
FROM public.tbl_msg_status
WHERE message_id = mrou.message_id
AND person_id = mrou.person_id
) AS "lastStatusDate",
oe.oe_kurzbz AS "oeId",
COALESCE(sg.bezeichnung, oe.bezeichnung) AS oe,
mrou.token
application/views/system/infocenter/messageList.php
+2 -2
View File
@@ -17,11 +17,11 @@ $widthColumn = $msgExists === true ? 8 : 12;
<?php foreach ($messages as $message): ?>
<tr id="<?php echo $message->message_id.'_'.$message->recipientPersonId ?>" style="cursor: pointer">
<td><?php echo isset($message->sent) ? date_format(date_create($message->sent), 'd.m.Y H:i:s') : '' ?></td>
<td><?php
<td><?php
echo $message->senderPersonId == $this->config->item(MessageLib::CFG_SYSTEM_PERSON_ID) && isset($message->oeId) ?
$message->oe : $message->senderName.' '.$message->senderSurname;
?></td>
<td><?php
<td><?php
echo $message->recipientPersonId == $this->config->item(MessageLib::CFG_SYSTEM_PERSON_ID) && isset($message->oeId) ?
$message->oe : $message->recipientName.' '.$message->recipientSurname;
?></td>