diff --git a/application/controllers/CisHmvc.php b/application/controllers/CisHmvc.php index a704e8952..a4a370997 100644 --- a/application/controllers/CisHmvc.php +++ b/application/controllers/CisHmvc.php @@ -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); diff --git a/application/controllers/CisHmvc/Cms.php b/application/controllers/CisHmvc/Cms.php index 267543908..44dc6cdb4 100644 --- a/application/controllers/CisHmvc/Cms.php +++ b/application/controllers/CisHmvc/Cms.php @@ -55,7 +55,6 @@ class Cms extends Auth_Controller */ public function legacy($url) { - $msg = $url; $this->load->view('CisHmvc/Cms/Legacy', ['url' => $url]); } diff --git a/application/controllers/components/Cis/Mylv.php b/application/controllers/components/Cis/Mylv.php index 60203a37c..a8baee753 100644 --- a/application/controllers/components/Cis/Mylv.php +++ b/application/controllers/components/Cis/Mylv.php @@ -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) diff --git a/application/libraries/CmsLib.php b/application/libraries/CmsLib.php index 896b15a1b..4e27b94af 100644 --- a/application/libraries/CmsLib.php +++ b/application/libraries/CmsLib.php @@ -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 = 'format('d.m.Y') . ']]>'; $datum .= 'format('Y-m-d H:i') . ']]>'; $id = $edit ? '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); diff --git a/application/views/templates/CISHTML-Menu/EntryBase.php b/application/views/templates/CISHTML-Menu/EntryBase.php index 16caa4c78..de6dcaf95 100644 --- a/application/views/templates/CISHTML-Menu/EntryBase.php +++ b/application/views/templates/CISHTML-Menu/EntryBase.php @@ -1,25 +1,39 @@ childs) { ?> - + titel); ?>
- class="btn btn-default rounded-0 text-start btn-level-"> + + > titel); ?> - +
- class="btn btn-default rounded-0 w-100 text-start btn-level-"> + + > titel); ?> diff --git a/application/views/templates/CISVUE-Footer.php b/application/views/templates/CISVUE-Footer.php index e36b7ddcd..d7c1de24c 100644 --- a/application/views/templates/CISVUE-Footer.php +++ b/application/views/templates/CISVUE-Footer.php @@ -16,4 +16,4 @@ $includesArray = array( -load->view('templates/FHC-Footer', $includesArray); ?> \ No newline at end of file +load->view('templates/FHC-Footer', $includesArray); ?> diff --git a/application/views/templates/CISVUE-Header.php b/application/views/templates/CISVUE-Header.php index 9d66914d7..bd4afa012 100644 --- a/application/views/templates/CISVUE-Header.php +++ b/application/views/templates/CISVUE-Header.php @@ -18,6 +18,12 @@ $this->load->view('templates/FHC-Header', $includesArray); ?>