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

Code Quality

Browse Source
This commit is contained in:
cgfhtw
2023-03-10 09:28:04 +01:00
parent 555b8f4e6b
commit f9975eb530
7 changed files with 46 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/controllers/CisHmvc.php
+5 -3
View File
@@ -2,6 +2,8 @@
if (! defined('BASEPATH')) exit('No direct script access allowed');
use \DOMDocument as DOMDocument;
/**
*
*/
@@ -220,8 +222,8 @@ class CisHmvc extends FHC_Controller
if ($xml->getElementsByTagName('url')->item(0))
$url = $xml->getElementsByTagName('url')->item(0)->nodeValue;
// TODO(chris): get params
if (strpos($url, '$') !== FALSE)
var_dump($url);
/*if (strpos($url, '$') !== FALSE)
var_dump($url);*/
if (isset($params) && is_array($params))
foreach ($params as $key=>$value)
$url = str_replace('$' . $key, addslashes($value), $url);
@@ -302,7 +304,7 @@ class CisHmvc extends FHC_Controller
'Õ'=>'O', 'Ö'=>'Oe', 'Ø'=>'O', 'Ù'=>'U', 'Ú'=>'U', 'Û'=>'U', 'Ü'=>'Ue', 'Ý'=>'Y', 'Þ'=>'B', 'ß'=>'Ss',
'à'=>'a', 'á'=>'a', 'â'=>'a', 'ã'=>'a', 'ä'=>'ae', 'å'=>'a', 'æ'=>'a', 'ç'=>'c', 'è'=>'e', 'é'=>'e',
'ê'=>'e', 'ë'=>'e', 'ì'=>'i', 'í'=>'i', 'î'=>'i', 'ï'=>'i', 'ð'=>'o', 'ñ'=>'n', 'ò'=>'o', 'ó'=>'o',
'ô'=>'o', 'õ'=>'o', 'ö'=>'oe', 'ø'=>'o', 'ù'=>'u', 'ú'=>'u', 'û'=>'u', 'ü'=>'ue', 'ý'=>'y', 'ý'=>'y', 'þ'=>'b',
'ô'=>'o', 'õ'=>'o', 'ö'=>'oe', 'ø'=>'o', 'ù'=>'u', 'ú'=>'u', 'û'=>'u', 'ü'=>'ue', /*'ý'=>'y', duplicate? => see quality check*/'ý'=>'y', 'þ'=>'b',
'ÿ'=>'y', 'Ŕ'=>'R', 'ŕ'=>'r', '/' => '-', ' ' => '-'
];
$text = preg_replace(['/\s{2,}/', '/[\t\n]/'], ' ', $text);
application/controllers/CisHmvc/Cms.php
-1
View File
@@ -55,7 +55,6 @@ class Cms extends Auth_Controller
*/
public function legacy($url)
{
$msg = $url;
$this->load->view('CisHmvc/Cms/Legacy', ['url' => $url]);
}
application/controllers/components/Cis/Mylv.php
+3 -1
View File
@@ -149,7 +149,9 @@ class Mylv extends Auth_Controller
$key = $set->lvinfo_set_kurzbz;
if (!isset($lvi->data[$key]))
continue;
$info['header'] = $set->lvinfo_set_bezeichnung[$lvi->sprache];
$info = [
'header' => $set->lvinfo_set_bezeichnung[$lvi->sprache]
];
if (isset($set->einleitungstext[$lvi->sprache]))
$info['subheader'] = $set->einleitungstext[$lvi->sprache];
switch ($set->lvinfo_set_typ)
application/libraries/CmsLib.php
+11 -7
View File
@@ -2,6 +2,10 @@
if (! defined('BASEPATH')) exit('No direct script access allowed');
use \DateTime as DateTime;
use \DOMDocument as DOMDocument;
use \XSLTProcessor as XSLTProcessor;
/**
* TODO(chris): NEWS: edit & delete button links and confirm
* TODO(chris): NEWS: news_infoscreen xlst
@@ -97,14 +101,14 @@ class CmsLib
return $template;
$template = current(getData($template));
$XML = new \DOMDocument();
$XML = new DOMDocument();
$XML->loadXML($content->content);
$xsltemplate = new \DOMDocument();
$xsltemplate = new DOMDocument();
$xsltemplate->loadXML($template->xslt_xhtml_c4);
//Transformation
$processor = new \XSLTProcessor();
$processor = new XSLTProcessor();
$processor->importStylesheet($xsltemplate);
$content = $processor->transformToXML($XML);
@@ -214,7 +218,7 @@ class CmsLib
foreach ($news as $newsobj) {
if ($studiengang_kz && $edit && !$newsobj->studiengang_kz)
continue;
$date = new \DateTime($newsobj->datum);
$date = new DateTime($newsobj->datum);
$datum = '<datum><![CDATA[' . $date->format('d.m.Y') . ']]></datum>';
$datum .= '<datumdetail><![CDATA[' . $date->format('Y-m-d H:i') . ']]></datumdetail>';
$id = $edit ? '<news_id><![CDATA[' . $newsobj->news_id . ']]></news_id>' : '';
@@ -254,14 +258,14 @@ class CmsLib
return $template;
$template = current(getData($template));
$XML = new \DOMDocument();
$XML = new DOMDocument();
$XML->loadXML($xml);
$xsltemplate = new \DOMDocument();
$xsltemplate = new DOMDocument();
$xsltemplate->loadXML($template->xslt_xhtml_c4);
//Transformation
$processor = new \XSLTProcessor();
$processor = new XSLTProcessor();
$processor->importStylesheet($xsltemplate);
$content = $processor->transformToDoc($XML);
application/views/templates/CISHTML-Menu/EntryBase.php
+19 -5
View File
@@ -1,25 +1,39 @@
<?php if ($entry->childs) { ?>
<?php if (substr($link, 0, 1) == '#') { ?>
<a href="#<?= $menu_id; ?>" data-bs-toggle="collapse" aria-expanded="<?= $entry->menu_open ? 'true' : 'false'; ?>" class="btn btn-default rounded-0 w-100 text-start dropdown-toggle btn-level-<?= substr_count($menu_id, '-'); ?><?= $entry->menu_open ? '' : ' collapsed'; ?>">
<a
href="#<?= $menu_id; ?>"
data-bs-toggle="collapse"
aria-expanded="<?= $entry->menu_open ? 'true' : 'false'; ?>"
class="btn btn-default rounded-0 w-100 text-start dropdown-toggle btn-level-<?= substr_count($menu_id, '-'); ?><?= $entry->menu_open ? '' : ' collapsed'; ?>">
<span><?= htmlspecialchars($entry->titel); ?></span>
</a>
<?php } else { ?>
<div class="btn-group w-100">
<a<?= $link ? ' href="' . $link . '"' : ''; ?><?= $target ? ' target="' . $target . '"' : ''; ?> class="btn btn-default rounded-0 text-start btn-level-<?= substr_count($menu_id, '-'); ?>">
<a
class="btn btn-default rounded-0 text-start btn-level-<?= substr_count($menu_id, '-'); ?>"
<?= $link ? ' href="' . $link . '"' : ''; ?>
<?= $target ? ' target="' . $target . '"' : ''; ?>>
<?= htmlspecialchars($entry->titel); ?>
</a>
<a href="#<?= $menu_id; ?>" data-bs-toggle="collapse" aria-expanded="<?= $entry->menu_open ? 'true' : 'false'; ?>"class="btn btn-default rounded-0 dropdown-toggle dropdown-toggle-split flex-grow-0<?= $entry->menu_open ? '' : ' collapsed'; ?>" >
<a
href="#<?= $menu_id; ?>"
data-bs-toggle="collapse"
aria-expanded="<?= $entry->menu_open ? 'true' : 'false'; ?>"
class="btn btn-default rounded-0 dropdown-toggle dropdown-toggle-split flex-grow-0<?= $entry->menu_open ? '' : ' collapsed'; ?>">
<span class="visually-hidden">Toggle Dropdown</span>
</a>
</div>
<?php } ?>
<ul id="<?= $menu_id; ?>" class="nav w-100 collapse<?= $entry->menu_open ? ' show' : ''; ?>">
<?php foreach ($entry->childs as $child)
<?php foreach ($entry->childs as $child)
$this->load->view('templates/CISHTML-Menu/Entry', ['entry' => $child, 'menu_id' => $menu_id]);
?>
</ul>
<?php } else { ?>
<a<?= $link ? ' href="' . $link . '"' : ''; ?><?= $target ? ' target="' . $target . '"' : ''; ?> class="btn btn-default rounded-0 w-100 text-start btn-level-<?= substr_count($menu_id, '-'); ?>">
<a
class="btn btn-default rounded-0 w-100 text-start btn-level-<?= substr_count($menu_id, '-'); ?>"
<?= $link ? ' href="' . $link . '"' : ''; ?>
<?= $target ? ' target="' . $target . '"' : ''; ?>>
<?= htmlspecialchars($entry->titel); ?>
</a>
<?php } ?>
application/views/templates/CISVUE-Footer.php
+1 -1
View File
@@ -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/CISVUE-Header.php
+7 -1
View File
@@ -18,6 +18,12 @@ $this->load->view('templates/FHC-Header', $includesArray);
?>
<header id="cis-header" class="navbar-dark">
<cis-menu root-url="<?= site_url('CisVue'); ?>" logo-url="<?= base_url('/public/images/logo-300x160.png'); ?>" avatar-url="<?= base_url('/cis/public/bild.php?src=person&person_id=' . getAuthPersonId()); ?>" logout-url="<?= site_url('Cis/Auth/logout'); ?>" :searchbaroptions="searchbaroptions" :searchfunction="searchfunction" />
<cis-menu
root-url="<?= site_url('CisVue'); ?>"
logo-url="<?= base_url('/public/images/logo-300x160.png'); ?>"
avatar-url="<?= base_url('/cis/public/bild.php?src=person&person_id=' . getAuthPersonId()); ?>"
logout-url="<?= site_url('Cis/Auth/logout'); ?>"
:searchbaroptions="searchbaroptions"
:searchfunction="searchfunction" />
</header>
<main id="cis-main" class="flex-grow-1 overflow-scroll p-4">