Code Quality

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');
 	}
-
 }

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'),

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');
 	}
-
 }

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;
 				}
-
 			}
 		}
 

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');
 	}
-
 }

application/controllers/Cis4.php

@@ -3,7 +3,7 @@
 if (! defined('BASEPATH')) exit('No direct script access allowed');
 
 /**
- * 
+ *
  */
 class Cis4 extends FHC_Controller
 {

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);
 	}
-
 }

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)

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');
 	}
-
 }

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)

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');
 	}
-
-	
-
 }

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)

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');
 	}
-
-	
-
 }

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);
 	}
-
 }

application/views/templates/CISHMVC-Header.php

@@ -1,10 +1,10 @@
 <?php
-	if (!isset($menu)) {
-		$menu = [];
-		if (property_exists($this->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;
 	}
+}
 ?>
 
 <script type="text/javascript">
@@ -42,9 +42,9 @@
 				<div id="nav-main-menu" class="collapse collapse-horizontal show">
 					<div>
 						<?php
-								foreach ($menu as $entry) {
-									$this->load->view('templates/CISHMVC-Menu/Entry', ['entry' => $entry, 'menu_id' => 'menu']);
-								}
+						foreach ($menu as $entry) {
+							$this->load->view('templates/CISHMVC-Menu/Entry', ['entry' => $entry, 'menu_id' => 'menu']);
+						}
 						?>
 					</div>
 				</div>

application/views/templates/CISHMVC-Menu/Entry.php

@@ -46,7 +46,7 @@ if (property_exists($entry, 'path')) {
 		</div>
 	<?php } ?>
 	<ul id="<?= $menu_id; ?>" class="nav w-100 collapse<?= $menu_open ? ' show' : ''; ?>">
-		<?php foreach ($entry->children as $id => $child) 
+		<?php foreach ($entry->children as $id => $child)
 			$this->load->view('templates/CISHMVC-Menu/Entry', ['content_id' => $id, 'entry' => $child, 'menu_id' => $menu_id, 'path' => $path]);
 		?>
 	</ul>

application/views/templates/CISHTML-Footer.php

@@ -16,4 +16,4 @@ $includesArray = array(
 
 </main>
 
-<?php $this->load->view('templates/FHC-Footer', $includesArray); ?>
+<?php $this->load->view('templates/FHC-Footer', $includesArray); ?>

application/views/templates/CISHTML-Menu/Entry.php

@@ -4,7 +4,7 @@ if (is_array($entry) && isset($entry['content_id']))
 $menu_id .= '-' . $entry->content_id;
 
 switch ($entry->template_kurzbz) {
-	case 'redirect': {
+	case 'redirect':
 		$url = '';
 		$target = '';
 		$xml = new DOMDocument();
@@ -15,7 +15,7 @@ switch ($entry->template_kurzbz) {
 				$url = $xml->getElementsByTagName('url')->item(0)->nodeValue;
 			// TODO(chris): get params
 			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;
@@ -30,14 +30,15 @@ switch ($entry->template_kurzbz) {
 
 		$this->load->view('templates/CISHTML-Menu/EntryBase', ['entry' => $entry, 'menu_id' => $menu_id, 'link' => $url, 'target' => $target]);
 		break;
-	}
-	case 'include': {
+	case 'include':
 		$this->load->view('templates/CISHTML-Menu/EntryInclude', ['entry' => $entry, 'menu_id' => $menu_id]);
 		break;
-	}
-	default: {
-		$this->load->view('templates/CISHTML-Menu/EntryBase', ['entry' => $entry, 'menu_id' => $menu_id, 'link' => site_url('/CisHtml/Cms/content/' . $entry->content_id)]);
+	default:
+		$this->load->view('templates/CISHTML-Menu/EntryBase', [
+			'entry' => $entry,
+			'menu_id' => $menu_id,
+			'link' => site_url('/CisHtml/Cms/content/' . $entry->content_id)
+		]);
 		break;
-	}
 }
 ?>