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

Merge branch 'feature-62018/C4_Weiterleiten_zu_CIS4_nach_CIS_Login_unter_bestimmten_Bedingungen' into rc1_FHC4_C4

Browse Source
This commit is contained in:
Harald Bamberger
2025-08-04 10:54:37 +02:00
parent 9cbb612c8f 53f2776efe
commit 384dcd8411
5 changed files with 62 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cis/index.html
+1
View File
@@ -2,6 +2,7 @@
<html>
<head>
<title>CIS</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta charset="utf-8">
<link href="../skin/style.css.php" rel="stylesheet" type="text/css">
<link rel="shortcut icon" href="../favicon.ico" type="image/x-icon">
cis/index_login.php
+22 -1
View File
@@ -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');
}
}
}
config/cis.config-default.inc.php
+2
View File
@@ -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);
?>
skin/styles/mobile.css
+32 -1
View File
@@ -935,4 +935,35 @@ table.hoverbox
border-style:solid;
border-color:grey;
}
*/
*/
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;
}
skin/styles/tw.css
+5 -2
View File
@@ -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;
}