Code Quality

This commit is contained in:
cgfhtw
2023-07-27 11:42:03 +02:00
parent ace3bd6736
commit 7dee77a6af
18 changed files with 113 additions and 79 deletions
+1 -2
View File
@@ -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');
}
}
+12 -6
View File
@@ -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'),
+1 -2
View File
@@ -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');
}
}
+3 -3
View File
@@ -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;
}
}
}
+1 -2
View File
@@ -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');
}
}
+1 -1
View File
@@ -3,7 +3,7 @@
if (! defined('BASEPATH')) exit('No direct script access allowed');
/**
*
*
*/
class Cis4 extends FHC_Controller
{
+15 -15
View File
@@ -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);
}
}
+5 -5
View File
@@ -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)
@@ -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');
}
}
+3 -3
View File
@@ -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)
@@ -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');
}
}
+3 -3
View File
@@ -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)
+1 -4
View File
@@ -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');
}
}