diff --git a/application/config/routes.php b/application/config/routes.php index f872dc145..bb3337b23 100644 --- a/application/config/routes.php +++ b/application/config/routes.php @@ -61,7 +61,6 @@ $route['api/v1/organisation/[O|o]rganisationseinheit/(:any)'] = 'api/v1/organisa $route['api/v1/ressource/[B|b]etriebsmittelperson/(:any)'] = 'api/v1/ressource/betriebsmittelperson2/$1'; $route['api/v1/system/[S|s]prache/(:any)'] = 'api/v1/system/sprache2/$1'; -$route['CisHtml'] = 'CisHtml/dashboard'; $route['CisVue'] = 'CisVue/dashboard'; // load routes from extensions diff --git a/application/controllers/CisHtml/Cms.php b/application/controllers/CisHtml/Cms.php deleted file mode 100644 index c128ec81b..000000000 --- a/application/controllers/CisHtml/Cms.php +++ /dev/null @@ -1,80 +0,0 @@ - 'basis/cis:r', - 'news' => 'basis/cis:r', - ) - ); - - // Loads Libraries - $this->load->library('CmsLib'); - - // Loads phrases system - $this->loadPhrases([ - 'global' - ]); - - } - - // ----------------------------------------------------------------------------------------------------------------- - // Public methods - - /** - * @param int $content_id - * @param int $version - * @param string $sprache - * @param boolean $sichtbar - * - * @return void - */ - public function content($content_id, $version = null, $sprache = null, $sichtbar = true) - { - // return early if the content_id for the content is missing - if(!isset($content_id)) - $this->terminateWithError("content_id is missing"); - - $content = $this->ContentModel->load($content_id); - if (isError($content)) - $this->terminateWithError(getError($content)); - - $content = getData($content); - if(NULL === $content) - $this->terminateWithError("Content not found"); - - $content = current($content); - - $this->load->view('CisHtml/Cms/Content', ['content_id' => $content_id, 'template_kurzbz'=>$content->template_kurzbz , 'version' => $version, 'sprache' => $sprache, 'sichtbar' => $sichtbar]); - } - - /** - * @param boolean $infoscreen - * @param string | null $studiengang_kz - * @param int | null $semester - * @param boolean $mischen - * @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) - { - $this->load->view('CisHtml/Cms/Content', ['infoscreen' => $infoscreen, 'studiengang_kz' => $studiengang_kz, 'semester' => $semester, 'mischen' => $mischen, 'titel' => $titel, 'edit' => $edit, 'sichtbar' => $sichtbar, "template_kurzbz"=>"news"]); - } - -} diff --git a/application/controllers/CisHtml/Dashboard.php b/application/controllers/CisHtml/Dashboard.php deleted file mode 100644 index bce24e9b8..000000000 --- a/application/controllers/CisHtml/Dashboard.php +++ /dev/null @@ -1,33 +0,0 @@ - 'dashboard/benutzer:r' - ) - ); - - } - - // ----------------------------------------------------------------------------------------------------------------- - // Public methods - - /** - * @return void - */ - public function index() - { - $this->load->view('CisHtml/Dashboard.php'); - } -} diff --git a/application/views/Cis/ProfilUpdate.php b/application/views/Cis/ProfilUpdate.php index ff303b159..e797d436f 100644 --- a/application/views/Cis/ProfilUpdate.php +++ b/application/views/Cis/ProfilUpdate.php @@ -1,16 +1,49 @@ 'Profil Änderungen', - 'customJSModules'=> ['public/js/apps/Cis/ProfilUpdateRequests.js'], - 'tabulator5'=> true, - 'customCSSs'=>['public/css/components/FilterComponent.css','public/css/components/FormUnderline.css'], - ]; +$includesArray = array( + 'title' => 'Profil Änderungen', + 'vue3' => true, + 'bootstrap5' => true, + 'fontawesome6'=> true, + 'axios027' => true, + 'tabulator5' => true, + 'customJSModules' => array( + 'public/js/apps/Cis/ProfilUpdateRequests.js' + ), + 'customCSSs' => array( + 'public/css/components/FilterComponent.css','public/css/components/FormUnderline.css' + ) +); -$this->load->view('templates/CISHTML-Header',$includesArray); +if(defined("CIS4")) +{ + $this->load->view( + 'templates/CISVUE-Header', + $includesArray + ); +} +else +{ + $this->load->view( + 'templates/FHC-Header', + $includesArray + ); +} ?> -
-load->view('templates/CISHTML-Footer',$includesArray); ?> \ No newline at end of file +load->view( + 'templates/CISVUE-Footer', + $includesArray + ); +} else { + $this->load->view( + 'templates/FHC-Footer', + $includesArray + ); +} +?> \ No newline at end of file diff --git a/application/views/CisHtml/Cms/Content.php b/application/views/CisHtml/Cms/Content.php deleted file mode 100644 index b22a212dc..000000000 --- a/application/views/CisHtml/Cms/Content.php +++ /dev/null @@ -1,34 +0,0 @@ - ['public/js/apps/Cis/Cms.js'], - 'primevue3'=>true, - 'customCSSs' => [ - 'public/css/Cis4/Cms.css', - #'skin/style.css.php' - ] -); - -if(isset($template_kurzbz)){ - switch($template_kurzbz){ - case 'raum_contentmittitel': - $includesArray['tabulator5'] = true; - break; - } -} - -$this->load->view('templates/CISHTML-Header', $includesArray); -?> - -News -
"; -}?> - -
-' : ''); ?> - -
- -load->view('templates/CISHTML-Footer', $includesArray); ?> - diff --git a/application/views/CisHtml/Dashboard.php b/application/views/CisHtml/Dashboard.php deleted file mode 100644 index 1eddba454..000000000 --- a/application/views/CisHtml/Dashboard.php +++ /dev/null @@ -1,21 +0,0 @@ - 'Dashboard', - 'tabulator5'=>true, - 'customJSModules' => ['public/js/apps/Dashboard/Fhc.js'], - 'customCSSs' => [ - 'public/css/components/dashboard.css' - ], -); - -$this->load->view('templates/CISHTML-Header', $includesArray); -?> - -
-

Dashboard

-
- -
- -load->view('templates/CISHTML-Footer', $includesArray); ?> - diff --git a/application/views/CisHtml/Error.php b/application/views/CisHtml/Error.php deleted file mode 100644 index 7b6a6beb2..000000000 --- a/application/views/CisHtml/Error.php +++ /dev/null @@ -1,18 +0,0 @@ - 'FH-Complete', - 'bootstrap5' => true, - 'fontawesome6' => true, - ); - - $this->load->view('templates/FHC-Header', $includesArray); -?> - -
- -
- -load->view('templates/FHC-Footer', $includesArray); ?> - diff --git a/application/views/templates/CISHTML-Footer.php b/application/views/templates/CISHTML-Footer.php deleted file mode 100644 index d7c1de24c..000000000 --- a/application/views/templates/CISHTML-Footer.php +++ /dev/null @@ -1,19 +0,0 @@ - $title ?? 'FH-Complete', - 'vue3' => true, - 'bootstrap5' => true, - 'fontawesome6' => true, - 'axios027' => true, - 'customJSModules' => array_merge([ - 'public/js/apps/Cis.js' - ], $customJSModules ?? []), - 'customCSSs' => array_merge([ - 'public/css/Cis4/Cis.css' - ], $customCSSs ?? []) -); -?> - - - -load->view('templates/FHC-Footer', $includesArray); ?> diff --git a/application/views/templates/CISHTML-Header.php b/application/views/templates/CISHTML-Header.php deleted file mode 100644 index 8e69c0366..000000000 --- a/application/views/templates/CISHTML-Header.php +++ /dev/null @@ -1,67 +0,0 @@ - $title ?? 'FH-Complete', - 'vue3' => true, - 'bootstrap5' => true, - 'fontawesome6' => true, - 'axios027' => true, - 'customJSModules' => array_merge([ - 'public/js/apps/Cis.js' - ], $customJSModules ?? []), - 'customCSSs' => array_merge([ - 'public/css/Cis4/Cis.css' - ], $customCSSs ?? []) -); - -$this->load->view('templates/FHC-Header', $includesArray); - -if (!isset($menu)) { - $ci =& get_instance(); // get CI instance - $ci->load->model('content/Content_model', 'ContentModel'); - $result = $ci->ContentModel->getMenu(null, getAuthUID()); - $menu = getData($result) ?? (object)['childs' => []]; -} -?> - - - - -
\ No newline at end of file diff --git a/application/views/templates/CISHTML-Menu/Entry.php b/application/views/templates/CISHTML-Menu/Entry.php deleted file mode 100644 index 522d8008d..000000000 --- a/application/views/templates/CISHTML-Menu/Entry.php +++ /dev/null @@ -1,47 +0,0 @@ -content_id; - -switch ($entry->template_kurzbz) { - case 'redirect': - $url = ''; - $target = ''; - $xml = new DOMDocument(); - if($entry->content != '') - { - $xml->loadXML($entry->content); - if ($xml->getElementsByTagName('url')->item(0)) - $url = $xml->getElementsByTagName('url')->item(0)->nodeValue; - // TODO(chris): get params - if (isset($params) && is_array($params)) - 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; - - if (strpos($url, '../cms/news.php') === 0) - $url = site_url('/CisHtml/Cms/news' . substr($url, 15)); - if (strpos($url, '../index.ci.php') === 0) - $url = site_url() . str_replace("../index.ci.php","",$url); - if (strpos($url, '../') === 0) - $url = APP_ROOT . substr($url, 3); - } - if ($target == 'content') - $target = ''; - - $this->load->view('templates/CISHTML-Menu/EntryBase', ['entry' => $entry, 'menu_id' => $menu_id, 'link' => $url, 'target' => $target]); - break; - 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), - 'target' => '' - ]); - break; -} -?> diff --git a/application/views/templates/CISHTML-Menu/EntryBase.php b/application/views/templates/CISHTML-Menu/EntryBase.php deleted file mode 100644 index de6dcaf95..000000000 --- a/application/views/templates/CISHTML-Menu/EntryBase.php +++ /dev/null @@ -1,39 +0,0 @@ -childs) { ?> - - - titel); ?> - - -
- - > - titel); ?> - - - - -
- - - - - > - titel); ?> - - diff --git a/application/views/templates/CISHTML-Menu/EntryInclude.php b/application/views/templates/CISHTML-Menu/EntryInclude.php deleted file mode 100644 index 0fd9f7b16..000000000 --- a/application/views/templates/CISHTML-Menu/EntryInclude.php +++ /dev/null @@ -1,4 +0,0 @@ - -
- INCLUDE -