From 53f2776efe2303277787c64054bff2f16e29500e Mon Sep 17 00:00:00 2001 From: Harald Bamberger Date: Wed, 14 May 2025 15:16:18 +0200 Subject: [PATCH] add CIS_REDIRECT_TO_CIS4 to cis config, add viewport meta tag and alter tw.css and mobile.css to improve layout of index.html and rendering of logos on mobile devices, add logic to redirect users to cis4 after login --- cis/index.html | 1 + cis/index_login.php | 23 ++++++++++++++++++++- config/cis.config-default.inc.php | 2 ++ skin/styles/mobile.css | 33 ++++++++++++++++++++++++++++++- skin/styles/tw.css | 7 +++++-- 5 files changed, 62 insertions(+), 4 deletions(-) diff --git a/cis/index.html b/cis/index.html index 2a3809f6f..074107e57 100644 --- a/cis/index.html +++ b/cis/index.html @@ -2,6 +2,7 @@ CIS + diff --git a/cis/index_login.php b/cis/index_login.php index 74c87f649..4040a9304 100644 --- a/cis/index_login.php +++ b/cis/index_login.php @@ -22,6 +22,8 @@ */ require_once('../config/cis.config.inc.php'); require_once('../include/functions.inc.php'); +require_once('../include/benutzerberechtigung.class.php'); +require_once('../include/student.class.php'); if(isset($_GET['login'])) { @@ -35,7 +37,26 @@ if(isset($_GET['login'])) if($uid!='') { - header('Location: '.APP_ROOT.'cis/index.php'); + $benutzerberechtigung = new benutzerberechtigung(); + $benutzerberechtigung->getBerechtigungen($uid); + $student = new student(); + $student->load($uid); + + $redirectToCisneu = (defined('CIS_REDIRECT_TO_CIS4') && (true === CIS_REDIRECT_TO_CIS4)); + $isBerechtigtCisneu = ($benutzerberechtigung->isBerechtigt('basis/cis') + && $benutzerberechtigung->isBerechtigt('dashboard/benutzer')); + $isValidStudent = $student->checkIfValidStudentUID($uid); + + if( $redirectToCisneu && $isBerechtigtCisneu && $isValidStudent ) + { + http_response_code(303); + header('Location: ' . APP_ROOT . 'cis.php'); + exit(); + } + else + { + header('Location: '.APP_ROOT.'cis/index.php'); + } } } diff --git a/config/cis.config-default.inc.php b/config/cis.config-default.inc.php index b61ce9869..4f6745ce7 100644 --- a/config/cis.config-default.inc.php +++ b/config/cis.config-default.inc.php @@ -296,4 +296,6 @@ define ('DEFAULT_ALLIN_DIENSTVERTRAG',[111]); //Echter Dienstvertrag define ('DEFAULT_ECHTER_DIENSTVERTRAG',[103,111]); +// Weiterleiten zu CIS neu (wenn Rechte vorhanden) +define('CIS_REDIRECT_TO_CIS4', false); ?> diff --git a/skin/styles/mobile.css b/skin/styles/mobile.css index 186774433..3b691488c 100644 --- a/skin/styles/mobile.css +++ b/skin/styles/mobile.css @@ -935,4 +935,35 @@ table.hoverbox border-style:solid; border-color:grey; } -*/ \ No newline at end of file +*/ +div.header_logo +{ + position: absolute; + left: 16px; + top: 3%; + z-index: 5000; + + background-image:url(styles/tw/logo_250x130.png); + background-repeat: no-repeat; + width:170px; + height:51px; + background-size: contain; +} + +td.headerbar +{ + background-image: url(styles/tw/header.png); + background-position: top; + background-repeat: repeat-x; +} + +div.cis_logo +{ + background-image:url(styles/tw/cis_logo_text_400x78.png); + background-repeat: no-repeat; + max-width: 400px; + height: 78px; + background-size: 100%; + width: 90%; + background-position: center; +} \ No newline at end of file diff --git a/skin/styles/tw.css b/skin/styles/tw.css index fd39adc3c..1caf01132 100644 --- a/skin/styles/tw.css +++ b/skin/styles/tw.css @@ -1185,13 +1185,16 @@ td.headerbar { background-image: url(styles/tw/header.png); background-position: top; - background-repeat: repeat-x;" + background-repeat: repeat-x; } div.cis_logo { background-image:url(styles/tw/cis_logo_text_400x78.png); background-repeat: no-repeat; - width: 400px; + max-width: 400px; height: 78px; + background-size: 100%; + width: 90%; + background-position: center; }