From 7dee77a6af72f9a94cc490e44d85c7fc7eaafdb1 Mon Sep 17 00:00:00 2001 From: cgfhtw Date: Thu, 27 Jul 2023 11:42:03 +0200 Subject: [PATCH] Code Quality --- application/controllers/Cis/Auth.php | 3 +- application/controllers/Cis/Documents.php | 18 ++++-- application/controllers/Cis/MyLv.php | 3 +- application/controllers/Cis/Pub.php | 6 +- application/controllers/Cis/Stundenplan.php | 3 +- application/controllers/Cis4.php | 2 +- application/controllers/CisHmvc.php | 30 +++++----- application/controllers/CisHmvc/Cms.php | 10 ++-- application/controllers/CisHmvc/Dashboard.php | 3 +- application/controllers/CisHtml/Cms.php | 6 +- application/controllers/CisHtml/Dashboard.php | 5 +- application/controllers/CisVue/Cms.php | 6 +- application/controllers/CisVue/Dashboard.php | 5 +- application/models/content/Content_model.php | 55 ++++++++++++++++--- .../views/templates/CISHMVC-Header.php | 16 +++--- .../views/templates/CISHMVC-Menu/Entry.php | 2 +- .../views/templates/CISHTML-Footer.php | 2 +- .../views/templates/CISHTML-Menu/Entry.php | 17 +++--- 18 files changed, 113 insertions(+), 79 deletions(-) diff --git a/application/controllers/Cis/Auth.php b/application/controllers/Cis/Auth.php index e2308cab2..59dab1568 100644 --- a/application/controllers/Cis/Auth.php +++ b/application/controllers/Cis/Auth.php @@ -3,7 +3,7 @@ if (! defined('BASEPATH')) exit('No direct script access allowed'); /** - * + * */ class Auth extends FHC_Controller { @@ -74,5 +74,4 @@ class Auth extends FHC_Controller $this->authlib->logout(); redirect('/Cis/Auth/login', 'refresh'); } - } diff --git a/application/controllers/Cis/Documents.php b/application/controllers/Cis/Documents.php index 094ade296..31f441634 100644 --- a/application/controllers/Cis/Documents.php +++ b/application/controllers/Cis/Documents.php @@ -2,8 +2,10 @@ if (! defined('BASEPATH')) exit('No direct script access allowed'); +use \stdClass as stdClass; + /** - * + * */ class Documents extends Auth_Controller { @@ -55,8 +57,6 @@ class Documents extends Auth_Controller $this->load->model('crm/Konto_model', 'KontoModel'); $this->load->model('organisation/Studiengang_model', 'StudiengangModel'); - $studiengaenge = []; - $stati = $this->PrestudentstatusModel->loadWhereUid($uid, null, true); if (isError($stati)) return $this->load->view('errors/html/error_db.php', [ @@ -82,7 +82,7 @@ class Documents extends Auth_Controller return $this->load->view('errors/html/error_db.php', [ 'heading' => 'Database Error', 'message' => getError($stg) - ]); + ]); $stg = getData($stg); if (!$stg) return $this->load->view('errors/html/error_db.php', [ @@ -94,7 +94,13 @@ class Documents extends Auth_Controller } if (!isset($stgs[$status->studiengang_kz]->studiensemester[$status->studiensemester_kurzbz])) { $stgs[$status->studiengang_kz]->studiensemester[$status->studiensemester_kurzbz] = new stdClass(); - $stgs[$status->studiengang_kz]->studiensemester[$status->studiensemester_kurzbz]->inskriptionsbestaetigung = (boolean) getData($this->KontoModel->checkStudienbeitragFromPrestudent($status->prestudent_id, $status->studiensemester_kurzbz, $buchungstypen)); + $stgs[$status->studiengang_kz]->studiensemester[$status->studiensemester_kurzbz]->inskriptionsbestaetigung = (boolean)getData( + $this->KontoModel->checkStudienbeitragFromPrestudent( + $status->prestudent_id, + $status->studiensemester_kurzbz, + $buchungstypen + ) + ); } } $person_ids = array_unique($person_ids); @@ -166,7 +172,7 @@ class Documents extends Auth_Controller $this->load->model('system/Webservicelog_model', 'WebservicelogModel'); $this->WebservicelogModel->insert([ 'webservicetyp_kurzbz' => 'content', - 'request_id' => (isset($akte->akte_id) && !empty($akte->akte_id)) ? $akte->akte_id : NULL, + 'request_id' => (isset($akte->akte_id) && !empty($akte->akte_id)) ? $akte->akte_id : null, 'beschreibung' => 'Bescheidbestaetigungsdownload', 'request_data' => $_SERVER['QUERY_STRING'], 'execute_time' => date('c'), diff --git a/application/controllers/Cis/MyLv.php b/application/controllers/Cis/MyLv.php index fe7eb298c..f815f26f8 100644 --- a/application/controllers/Cis/MyLv.php +++ b/application/controllers/Cis/MyLv.php @@ -3,7 +3,7 @@ if (! defined('BASEPATH')) exit('No direct script access allowed'); /** - * + * */ class MyLv extends Auth_Controller { @@ -27,5 +27,4 @@ class MyLv extends Auth_Controller { $this->load->view('Cis/MyLv'); } - } diff --git a/application/controllers/Cis/Pub.php b/application/controllers/Cis/Pub.php index 34a71b85d..099d093f7 100644 --- a/application/controllers/Cis/Pub.php +++ b/application/controllers/Cis/Pub.php @@ -3,7 +3,7 @@ if (! defined('BASEPATH')) exit('No direct script access allowed'); /** - * + * */ class Pub extends FHC_Controller { @@ -128,7 +128,8 @@ class Pub extends FHC_Controller ]); if (file_exists($filename)) { - if ($handle = fopen($filename, "r")) { + $handle = fopen($filename, "r"); + if ($handle) { while (!feof($handle)) { $akte->inhalt .= fread($handle, 8192); } @@ -144,7 +145,6 @@ class Pub extends FHC_Controller if ($akte->inhalt && !$foto_gesperrt) { $cTmpHEX = $akte->inhalt; } - } } diff --git a/application/controllers/Cis/Stundenplan.php b/application/controllers/Cis/Stundenplan.php index 1f1eca42e..80fb2130a 100644 --- a/application/controllers/Cis/Stundenplan.php +++ b/application/controllers/Cis/Stundenplan.php @@ -3,7 +3,7 @@ if (! defined('BASEPATH')) exit('No direct script access allowed'); /** - * + * */ class Stundenplan extends Auth_Controller { @@ -27,5 +27,4 @@ class Stundenplan extends Auth_Controller { $this->load->view('Cis/Stundenplan'); } - } diff --git a/application/controllers/Cis4.php b/application/controllers/Cis4.php index 2f2ad6604..68ab1c60d 100644 --- a/application/controllers/Cis4.php +++ b/application/controllers/Cis4.php @@ -3,7 +3,7 @@ if (! defined('BASEPATH')) exit('No direct script access allowed'); /** - * + * */ class Cis4 extends FHC_Controller { diff --git a/application/controllers/CisHmvc.php b/application/controllers/CisHmvc.php index a4a370997..640f7f640 100644 --- a/application/controllers/CisHmvc.php +++ b/application/controllers/CisHmvc.php @@ -5,7 +5,7 @@ if (! defined('BASEPATH')) exit('No direct script access allowed'); use \DOMDocument as DOMDocument; /** - * + * */ class CisHmvc extends FHC_Controller { @@ -26,7 +26,7 @@ class CisHmvc extends FHC_Controller /** * @param string $method - * + * * @return void */ public function _remap($method) @@ -74,7 +74,7 @@ class CisHmvc extends FHC_Controller else { switch ($current['orig']->template_kurzbz) { - case 'redirect': { + case 'redirect': list ($url, $target) = $this->getRedirectUrlAndTarget($current['orig']->content); if (substr($url, 0, 1) == '#') { @@ -136,20 +136,17 @@ class CisHmvc extends FHC_Controller $action = 'debug'; array_unshift($params, $current['orig']); break; - } case 'contentohnetitel': - case 'contentmittitel': { + case 'contentmittitel': $controller = 'CisHmvc/Cms'; $action = 'content'; array_unshift($params, $current['orig']->content_id); break; - } - default: { + default: $controller = 'CisHmvc/Cms'; $action = 'debug'; array_unshift($params, $current['orig']); break; - } } } @@ -187,7 +184,7 @@ class CisHmvc extends FHC_Controller /** * @param uri_string $url - * + * * @return void */ public function redirect($url) @@ -199,7 +196,8 @@ class CisHmvc extends FHC_Controller // ----------------------------------------------------------------------------------------------------------------- // Protected methods (move to lib?) - protected function getControllerMethodAndParamsFromUrl($url) { + protected function getControllerMethodAndParamsFromUrl($url) + { $segments = explode('/', $url); $path = ''; while ($possibleController = array_shift($segments)) { @@ -210,7 +208,8 @@ class CisHmvc extends FHC_Controller return [null, null, null]; } - protected function getRedirectUrlAndTarget($content) { + protected function getRedirectUrlAndTarget($content) + { if (!$content) return ['#', '']; @@ -225,7 +224,7 @@ class CisHmvc extends FHC_Controller /*if (strpos($url, '$') !== FALSE) var_dump($url);*/ if (isset($params) && is_array($params)) - foreach ($params as $key=>$value) + foreach ($params as $key => $value) $url = str_replace('$' . $key, addslashes($value), $url); if ($xml->getElementsByTagName('target')->item(0)) $target = $xml->getElementsByTagName('target')->item(0)->nodeValue; @@ -242,7 +241,8 @@ class CisHmvc extends FHC_Controller return [$url, $target]; } - protected function convertMenu($items, $path, $path_prefix) { + protected function convertMenu($items, $path, $path_prefix) + { $menu = []; $current_path = array_shift($path); foreach ($items as $item) @@ -296,7 +296,8 @@ class CisHmvc extends FHC_Controller * * @return string the resulting slug. */ - protected function createSlug($text) { + protected function createSlug($text) + { $table = [ 'Š'=>'S', 'š'=>'s', 'Đ'=>'Dj', 'đ'=>'dj', 'Ž'=>'Z', 'ž'=>'z', 'Č'=>'C', 'č'=>'c', 'Ć'=>'C', 'ć'=>'c', 'À'=>'A', 'Á'=>'A', 'Â'=>'A', 'Ã'=>'A', 'Ä'=>'Ae', 'Å'=>'A', 'Æ'=>'A', 'Ç'=>'C', 'È'=>'E', 'É'=>'E', @@ -313,5 +314,4 @@ class CisHmvc extends FHC_Controller $text = preg_replace('~^[^a-z]~i', '', $text); return strtolower($text); } - } diff --git a/application/controllers/CisHmvc/Cms.php b/application/controllers/CisHmvc/Cms.php index 44dc6cdb4..7f2a03a0f 100644 --- a/application/controllers/CisHmvc/Cms.php +++ b/application/controllers/CisHmvc/Cms.php @@ -3,7 +3,7 @@ if (! defined('BASEPATH')) exit('No direct script access allowed'); /** - * + * */ class Cms extends Auth_Controller { @@ -36,7 +36,7 @@ class Cms extends Auth_Controller /** * @param stdClass $content - * + * * @return void */ public function debug($content) @@ -50,7 +50,7 @@ class Cms extends Auth_Controller /** * @param string $url - * + * * @return void */ public function legacy($url) @@ -63,7 +63,7 @@ class Cms extends Auth_Controller * @param int $version * @param string $sprache * @param boolean $sichtbar - * + * * @return void */ public function content($content_id, $version = null, $sprache = null, $sichtbar = true) @@ -84,7 +84,7 @@ class Cms extends Auth_Controller * @param string $titel * @param boolean $edit * @param boolean $sichtbar - * + * * @return void */ public function news($infoscreen = false, $studiengang_kz = null, $semester = null, $mischen = true, $titel = '', $edit = false, $sichtbar = true) diff --git a/application/controllers/CisHmvc/Dashboard.php b/application/controllers/CisHmvc/Dashboard.php index f188cc2e2..2d95fb652 100644 --- a/application/controllers/CisHmvc/Dashboard.php +++ b/application/controllers/CisHmvc/Dashboard.php @@ -3,7 +3,7 @@ if (! defined('BASEPATH')) exit('No direct script access allowed'); /** - * + * */ class Dashboard extends Auth_Controller { @@ -29,5 +29,4 @@ class Dashboard extends Auth_Controller { $this->load->view('CisHmvc/Dashboard.php'); } - } diff --git a/application/controllers/CisHtml/Cms.php b/application/controllers/CisHtml/Cms.php index fa6f0e980..96057559f 100644 --- a/application/controllers/CisHtml/Cms.php +++ b/application/controllers/CisHtml/Cms.php @@ -3,7 +3,7 @@ if (! defined('BASEPATH')) exit('No direct script access allowed'); /** - * + * */ class Cms extends FHC_Controller { @@ -33,7 +33,7 @@ class Cms extends FHC_Controller * @param int $version * @param string $sprache * @param boolean $sichtbar - * + * * @return void */ public function content($content_id, $version = null, $sprache = null, $sichtbar = true) @@ -54,7 +54,7 @@ class Cms extends FHC_Controller * @param string $titel * @param boolean $edit * @param boolean $sichtbar - * + * * @return void */ public function news($infoscreen = false, $studiengang_kz = null, $semester = null, $mischen = true, $titel = '', $edit = false, $sichtbar = true) diff --git a/application/controllers/CisHtml/Dashboard.php b/application/controllers/CisHtml/Dashboard.php index aa2d45a7d..243f16e1e 100644 --- a/application/controllers/CisHtml/Dashboard.php +++ b/application/controllers/CisHtml/Dashboard.php @@ -3,7 +3,7 @@ if (! defined('BASEPATH')) exit('No direct script access allowed'); /** - * + * */ class Dashboard extends Auth_Controller { @@ -29,7 +29,4 @@ class Dashboard extends Auth_Controller { $this->load->view('CisHtml/Dashboard.php'); } - - - } diff --git a/application/controllers/CisVue/Cms.php b/application/controllers/CisVue/Cms.php index fa6f0e980..96057559f 100644 --- a/application/controllers/CisVue/Cms.php +++ b/application/controllers/CisVue/Cms.php @@ -3,7 +3,7 @@ if (! defined('BASEPATH')) exit('No direct script access allowed'); /** - * + * */ class Cms extends FHC_Controller { @@ -33,7 +33,7 @@ class Cms extends FHC_Controller * @param int $version * @param string $sprache * @param boolean $sichtbar - * + * * @return void */ public function content($content_id, $version = null, $sprache = null, $sichtbar = true) @@ -54,7 +54,7 @@ class Cms extends FHC_Controller * @param string $titel * @param boolean $edit * @param boolean $sichtbar - * + * * @return void */ public function news($infoscreen = false, $studiengang_kz = null, $semester = null, $mischen = true, $titel = '', $edit = false, $sichtbar = true) diff --git a/application/controllers/CisVue/Dashboard.php b/application/controllers/CisVue/Dashboard.php index 0b964fe21..ec58c6735 100644 --- a/application/controllers/CisVue/Dashboard.php +++ b/application/controllers/CisVue/Dashboard.php @@ -3,7 +3,7 @@ if (! defined('BASEPATH')) exit('No direct script access allowed'); /** - * + * */ class Dashboard extends Auth_Controller { @@ -29,7 +29,4 @@ class Dashboard extends Auth_Controller { $this->load->view('CisVue/Dashboard.php'); } - - - } diff --git a/application/models/content/Content_model.php b/application/models/content/Content_model.php index e83cffa2f..9bc3ab03d 100644 --- a/application/models/content/Content_model.php +++ b/application/models/content/Content_model.php @@ -15,15 +15,15 @@ class Content_model extends DB_Model /** * Laedt den Content in der angegebenen Sprache * Sollte der Content in dieser Sprache nicht vorhanden sein, wird der Content in der Default Sprache geladen - * + * * @param integer $content_id * @param string $sprache optional * @param integer $version optional * @param boolean | null $sichtbar optional - * + * * @return stdClass */ - public function getContent($content_id, $sprache=DEFAULT_LANGUAGE, $version=null, $sichtbar=null, $load_default_language=false) + public function getContent($content_id, $sprache = DEFAULT_LANGUAGE, $version = null, $sichtbar = null, $load_default_language = false) { $this->load->model('content/Contentsprache_model', 'ContentspracheModel'); $spracheExists = $this->ContentspracheModel->exists($content_id, $sprache, $version, $sichtbar); @@ -45,7 +45,13 @@ class Content_model extends DB_Model if ($version) $condition['version'] = $version; - $this->addSelect(['*', 'tbl_contentsprache.insertamum', 'tbl_contentsprache.insertvon', 'tbl_contentsprache.updateamum', 'tbl_contentsprache.updatevon']); + $this->addSelect([ + '*', + 'tbl_contentsprache.insertamum', + 'tbl_contentsprache.insertvon', + 'tbl_contentsprache.updateamum', + 'tbl_contentsprache.updatevon' + ]); $this->addJoin('campus.tbl_contentsprache', 'content_id'); $this->addOrder('version', 'DESC'); $this->addLimit(1); @@ -63,14 +69,14 @@ class Content_model extends DB_Model /** * Laedt alle Content Eintraege unterhalb eines Contents * (Ohne Newseintraege) - * + * * @param integer $root_content_id * @param string $uid * @param string $sprache optional - * + * * @return stdClass on success an array with menu objects */ - public function getMenu($root_content_id, $uid, $sprache=DEFAULT_LANGUAGE) + public function getMenu($root_content_id, $uid, $sprache = DEFAULT_LANGUAGE) { if ($root_content_id === null) { $res = json_decode('{ @@ -154,7 +160,39 @@ class Content_model extends DB_Model s.contentsprache_id FROM campus.tbl_content c - JOIN (SELECT s5.content_id, s5.contentsprache_id FROM (SELECT content_id, sprache, MAX(version) AS version FROM (SELECT c1.content_id, COALESCE(s1.sprache, ?) AS sprache FROM campus.tbl_content c1 LEFT JOIN campus.tbl_contentsprache s1 ON c1.content_id=s1.content_id AND s1.sprache=? WHERE sichtbar=true) s2 LEFT JOIN campus.tbl_contentsprache s3 USING(content_id, sprache) WHERE sichtbar=true GROUP BY content_id, sprache) s4 LEFT JOIN campus.tbl_contentsprache s5 USING(content_id, sprache, version) WHERE version IS NOT NULL) t USING (content_id) + JOIN ( + SELECT + s5.content_id, + s5.contentsprache_id + FROM ( + SELECT + content_id, + sprache, + MAX(version) AS version + FROM ( + SELECT + c1.content_id, + COALESCE(s1.sprache, ?) AS sprache + FROM + campus.tbl_content c1 + LEFT JOIN + campus.tbl_contentsprache s1 ON c1.content_id=s1.content_id AND s1.sprache=? + WHERE + sichtbar=true + ) s2 + LEFT JOIN + campus.tbl_contentsprache s3 USING(content_id, sprache) + WHERE + sichtbar=true + GROUP BY + content_id, + sprache + ) s4 + LEFT JOIN + campus.tbl_contentsprache s5 USING(content_id, sprache, version) + WHERE + version IS NOT NULL + ) t USING (content_id) JOIN campus.tbl_contentsprache s USING (contentsprache_id) WHERE @@ -227,5 +265,4 @@ class Content_model extends DB_Model return success(isset($result[$root_content_id]) ? $result[$root_content_id] : null); } - } diff --git a/application/views/templates/CISHMVC-Header.php b/application/views/templates/CISHMVC-Header.php index 7e4b8cea3..cb454d77e 100644 --- a/application/views/templates/CISHMVC-Header.php +++ b/application/views/templates/CISHMVC-Header.php @@ -1,10 +1,10 @@ router, 'menu') && $this->router->menu && property_exists($this->router->menu, 'children')) { - $menu = $this->router->menu->children; - } +if (!isset($menu)) { + $menu = []; + if (property_exists($this->router, 'menu') && $this->router->menu && property_exists($this->router->menu, 'children')) { + $menu = $this->router->menu->children; } +} ?>