From a728d20b70610d38a70c8f66a163242c646936d6 Mon Sep 17 00:00:00 2001 From: ma0068 Date: Tue, 6 Aug 2024 08:42:20 +0200 Subject: [PATCH] codesniff Models --- application/models/crm/Prestudent_model.php | 3 +- .../models/crm/Prestudentstatus_model.php | 8 ++-- application/models/crm/Status_model.php | 1 - application/models/crm/Student_model.php | 48 ++++++++++++------- application/models/person/Benutzer_model.php | 14 +++--- 5 files changed, 43 insertions(+), 31 deletions(-) diff --git a/application/models/crm/Prestudent_model.php b/application/models/crm/Prestudent_model.php index 9721e473f..be5337162 100644 --- a/application/models/crm/Prestudent_model.php +++ b/application/models/crm/Prestudent_model.php @@ -708,7 +708,8 @@ class Prestudent_model extends DB_Model public function getHistoryPrestudents($person_id) { $query = " - SELECT ps.studiensemester_kurzbz, p.priorisierung, p.studiengang_kz, sg.kurzbzlang, sg.orgform_kurzbz, ps.status_kurzbz, s.student_uid, sp.bezeichnung, ps.ausbildungssemester, + SELECT ps.studiensemester_kurzbz, p.priorisierung, p.studiengang_kz, sg.kurzbzlang, sg.orgform_kurzbz, + ps.status_kurzbz, s.student_uid, sp.bezeichnung, ps.ausbildungssemester, CONCAT(ps.status_kurzbz, ' (', ps.ausbildungssemester, '. Semester)') as status, p.prestudent_id FROM public.tbl_prestudent p JOIN ( diff --git a/application/models/crm/Prestudentstatus_model.php b/application/models/crm/Prestudentstatus_model.php index 96380a6c0..aa2a8a3b0 100644 --- a/application/models/crm/Prestudentstatus_model.php +++ b/application/models/crm/Prestudentstatus_model.php @@ -404,7 +404,7 @@ class Prestudentstatus_model extends DB_Model } else { - return success("1", $this->p->t('lehre','error_rolleBereitsVorhandenMitNamen', ['name' => $studentName])); + return success("1", $this->p->t('lehre', 'error_rolleBereitsVorhandenMitNamen', ['name' => $studentName])); } } @@ -442,7 +442,7 @@ class Prestudentstatus_model extends DB_Model } elseif (!hasData($result)) { - return success("0", $this->p->t('lehre','error_keinBewerber', ['name' => $studentName])); + return success("0", $this->p->t('lehre', 'error_keinBewerber', ['name' => $studentName])); } else { @@ -450,7 +450,7 @@ class Prestudentstatus_model extends DB_Model } } - /** + /** * Check if Rolle there is an existing Aufgenommenerstatus * @param integer $prestudent_id * @return error if no status Aufgenommener, success if existing @@ -484,7 +484,7 @@ class Prestudentstatus_model extends DB_Model } elseif (!hasData($result)) { - return success("0", $this->p->t('lehre','error_keinAufgenommener', ['name' => $studentName])); + return success("0", $this->p->t('lehre', 'error_keinAufgenommener', ['name' => $studentName])); } else { diff --git a/application/models/crm/Status_model.php b/application/models/crm/Status_model.php index 6133b64e2..1ee2a5199 100644 --- a/application/models/crm/Status_model.php +++ b/application/models/crm/Status_model.php @@ -27,6 +27,5 @@ class Status_model extends DB_Model return $this->loadWhere([ 'aktiv'=> true, ]); - } } diff --git a/application/models/crm/Student_model.php b/application/models/crm/Student_model.php index 1bc77420c..023751f7c 100644 --- a/application/models/crm/Student_model.php +++ b/application/models/crm/Student_model.php @@ -73,9 +73,15 @@ class Student_model extends DB_Model //Lehrgang switch($art) { - case 'WS': $art = '3'; break; - case 'SS': $art = '4'; break; - default: $art = '0'; break; + case 'WS': + $art = '3'; + break; + case 'SS': + $art = '4'; + break; + default: + $art = '0'; + break; } } else @@ -83,9 +89,15 @@ class Student_model extends DB_Model //Studiengang switch($art) { - case 'WS': $art = '1'; break; - case 'SS': $art = '2'; break; - default: $art = '0'; break; + case 'WS': + $art = '1'; + break; + case 'SS': + $art = '2'; + break; + default: + $art = '0'; + break; } } if($art=='2' || $art=='4') @@ -95,11 +107,11 @@ class Student_model extends DB_Model //(AO sind normal 9+erhalter Nummer, matrikelnr/personenkz wird auch im DVUH Extension berücksichtigt) if ($studiengang_kz >= 90010 && $studiengang_kz <= 90019) { - $matrikelnummer = sprintf("%02d",$jahr).$art.substr($studiengang_kz, 0, 4); + $matrikelnummer = sprintf("%02d", $jahr).$art.substr($studiengang_kz, 0, 4); } else { - $matrikelnummer = sprintf("%02d",$jahr).$art.sprintf("%04d",$studiengang_kz); + $matrikelnummer = sprintf("%02d", $jahr).$art.sprintf("%04d", $studiengang_kz); } $qry = "SELECT matrikelnr FROM public.tbl_student WHERE matrikelnr LIKE ? ORDER BY matrikelnr DESC LIMIT 1"; @@ -109,12 +121,12 @@ class Student_model extends DB_Model if ($matrikelnrres && hasData($matrikelnrres)) { $max = mb_substr($matrikelnrres->retval[0]->matrikelnr, 7); if (!is_numeric($max)) { - $max = (int) $max; + $max = (int)$max; } } $max += 1; - return success ($matrikelnummer.sprintf("%03d", $max)); + return success($matrikelnummer.sprintf("%03d", $max)); } // **** @@ -127,7 +139,7 @@ class Student_model extends DB_Model // * 001 = Laufende Nummer Wenn StSem==SS dann wird zur Nummer 500 dazugezaehlt // * Bei Incoming im Masterstudiengang wird auch 500 dazugezaehlt // **** - function generateUID($stgkzl, $jahr, $stgtyp, $matrikelnummer) + public function generateUID($stgkzl, $jahr, $stgtyp, $matrikelnummer) { $art = mb_substr($matrikelnummer, 2, 1); $nr = mb_substr($matrikelnummer, mb_strlen(trim($matrikelnummer))-3); @@ -139,7 +151,7 @@ class Student_model extends DB_Model $nr = $nr+500; - return success (mb_strtolower($stgkzl.$jahr.($art!='0'?$stgtyp:'x').$nr)); + return success(mb_strtolower($stgkzl.$jahr.($art!='0'?$stgtyp:'x').$nr)); } @@ -179,18 +191,17 @@ class Student_model extends DB_Model if(isError($result)) { - return error( "Error while checking student_uid"); + return error("Error while checking student_uid"); } if (!hasData($result)) { - return success("0","Keine Student_uid vorhanden"); + return success("0", "Keine Student_uid vorhanden"); } $student_uid = $result->retval[0]->student_uid; - return success ($student_uid); - + return success($student_uid); } public function searchStudent($filter) @@ -204,7 +215,8 @@ class Student_model extends DB_Model OR lower(person.nachname) like ".$this->db->escape('%'.$filter.'%')." OR lower(person.vorname) like ".$this->db->escape('%'.$filter.'%')." OR lower(person.nachname || ' ' || person.vorname) like ".$this->db->escape('%'.$filter.'%')." - OR lower(person.vorname || ' ' || person.nachname) like ".$this->db->escape('%'.$filter.'%')); + OR lower(person.vorname || ' ' || person.nachname) like ".$this->db->escape('%'.$filter.'%') + ); return $result; } @@ -245,7 +257,7 @@ class Student_model extends DB_Model $resultObject = current(getData($result)); if (property_exists($resultObject, 'anzahl')) { - $resultValue = (int) $resultObject->anzahl; + $resultValue = (int)$resultObject->anzahl; if ($resultValue > 0) { diff --git a/application/models/person/Benutzer_model.php b/application/models/person/Benutzer_model.php index ed275c52c..0c1a6fddf 100644 --- a/application/models/person/Benutzer_model.php +++ b/application/models/person/Benutzer_model.php @@ -133,20 +133,20 @@ class Benutzer_model extends DB_Model private function _sanitizeAliasName($str) { $str = sanitizeProblemChars($str); - return mb_strtolower(str_replace(' ','_', $str)); + return mb_strtolower(str_replace(' ', '_', $str)); } /** * Generiert einen Aktivierungscode */ - function generateActivationKey() + public function generateActivationKey() { $keyvalues=array('0','1','2','3','4','5','6','7','8','9','A','B','C','D','E','F'); $key=''; - for($i=0;$i<32;$i++) - $key.=$keyvalues[mt_rand(0,15)]; + for($i=0; $i<32; $i++) + $key.=$keyvalues[mt_rand(0, 15)]; - return success(md5(encryptData(uniqid(mt_rand(), true),$key))); + return success(md5(encryptData(uniqid(mt_rand(), true), $key))); } /** @@ -174,7 +174,7 @@ class Benutzer_model extends DB_Model if (property_exists($resultObject, 'anzahl')) { - $resultValue = (int) $resultObject->anzahl; + $resultValue = (int)$resultObject->anzahl; if ($resultValue > 0) { @@ -184,6 +184,6 @@ class Benutzer_model extends DB_Model { return success("0"); } - } + } } }