Skip to content
Snippets Groups Projects
Commit 3afeec5a authored by Hahn Axel (hahn)'s avatar Hahn Axel (hahn)
Browse files

- overview - add headline;

- / redirects to /deployment/
- login page redirects to last page before login
parent fe268a44
Branches
No related tags found
No related merge requests found
...@@ -282,6 +282,7 @@ ...@@ -282,6 +282,7 @@
"versioncontrol": "Versionskontrolle", "versioncontrol": "Versionskontrolle",
"versions": "Versionen", "versions": "Versionen",
"warning": "WARNUNG", "warning": "WARNUNG",
"way-of-packages": "Weg der Pakete",
"onhold": "Queue", "onhold": "Queue",
"ready2install" : "Puppet", "ready2install" : "Puppet",
......
...@@ -284,6 +284,7 @@ ...@@ -284,6 +284,7 @@
"versioncontrol": "Version control", "versioncontrol": "Version control",
"versions": "Versions", "versions": "Versions",
"warning": "WARNING", "warning": "WARNING",
"way-of-packages": "Weg der Pakete",
"onhold": "Queue", "onhold": "Queue",
"ready2install" : "Puppet", "ready2install" : "Puppet",
......
...@@ -102,7 +102,7 @@ $sPhpOut = ' ...@@ -102,7 +102,7 @@ $sPhpOut = '
' . $sPhpOut . ' ' . $sPhpOut . '
</div> </div>
<div id="footer"> <div id="footer">
IML Deployment &copy; ' . date("Y") . ' <a href="https://gitlab.iml.unibe.ch/admins/imldeployment/tree/master" target="_blank">Institut f&uuml;r medizinische Lehre; Universit&auml;t Bern</a> IML Deployment &copy; 2015-' . date("Y") . ' <a href="https://gitlab.iml.unibe.ch/admins/imldeployment/tree/master" target="_blank">Institut f&uuml;r medizinische Lehre; Universit&auml;t Bern</a>
</div> </div>
'.$oCLog->render(); '.$oCLog->render();
......
...@@ -33,7 +33,13 @@ if (!$oUser->getUsername() && array_key_exists('user', $aParams)) { ...@@ -33,7 +33,13 @@ if (!$oUser->getUsername() && array_key_exists('user', $aParams)) {
// if user is logged in and credentials were sent: reload to remove post vars // if user is logged in and credentials were sent: reload to remove post vars
if ($oUser->getUsername() && array_key_exists('user', $aParams)) { if ($oUser->getUsername() && array_key_exists('user', $aParams)) {
header('Location: ?'); if (array_key_exists("goback", $_SESSION)){
$sUrl=$_SESSION["goback"];
unset($_SESSION["goback"]);
} else {
$sUrl='?';
}
header("location: $sUrl");
} }
// ---------------------------------------------------------------------- // ----------------------------------------------------------------------
...@@ -57,10 +63,19 @@ if ($oUser->getUsername()) { ...@@ -57,10 +63,19 @@ if ($oUser->getUsername()) {
. ' ' . aPrjHome() . ' ' . ' ' . aPrjHome() . ' '
. '<a href="?logoff=1" class="btn btn-default btn-danger"><span class="glyphicon glyphicon-off"></span> ' . t('logoff') . '</a>' . '<a href="?logoff=1" class="btn btn-default btn-danger"><span class="glyphicon glyphicon-off"></span> ' . t('logoff') . '</a>'
. '<br><br>INFO: <pre style="">roles:<br>' . print_r($oUser->getUserPermission(), true) . '</pre>' // . '<br><br>INFO: <pre style="">roles:<br>' . print_r($oUser->getUserPermission(), true) . '</pre>'
. '</p>' . '</p>'
. '</div>'; . '</div>';
} else { } else {
if (!array_key_exists("goback", $_SESSION) || true){
$sUrlback=$_SERVER["HTTP_REFERER"];
if(
strpos($sUrlback, $_SERVER["SERVER_NAME"])>0
&& !strpos($sUrlback, '/all/login/')
){
$_SESSION["goback"]=$sUrlback;
}
}
$i = 0; $i = 0;
require_once ("./classes/formgen.class.php"); require_once ("./classes/formgen.class.php");
......
...@@ -37,7 +37,7 @@ if (!array_key_exists("prj", $aParams)) { ...@@ -37,7 +37,7 @@ if (!array_key_exists("prj", $aParams)) {
$sListOfBranches.='<li title="'.$aBranch['revision'].'">'.$aBranch['label'] . '</li>'; $sListOfBranches.='<li title="'.$aBranch['revision'].'">'.$aBranch['label'] . '</li>';
} }
$sListOfBranches.='</ol>'; $sListOfBranches.='</ol>';
$sOut = ' $sOut = '<h3 id="h3visual">' . t("way-of-packages") . '</h3>
' . $oPrj->renderVisual() . ' ' . $oPrj->renderVisual() . '
<div style="clear: both;"></div> <div style="clear: both;"></div>
...@@ -68,5 +68,3 @@ if (!array_key_exists("prj", $aParams)) { ...@@ -68,5 +68,3 @@ if (!array_key_exists("prj", $aParams)) {
} }
// //
echo $sOut; echo $sOut;
\ No newline at end of file
?>
<?php <?php
echo '<h1>' . php_uname("n") . '</h1><hr>'; header("location: /deployment/");
// echo '<h1>' . php_uname("n") . '</h1><hr>';
?> ?>
<a href="http://www.iml.unibe.ch/">IML Startseite</a> | <a href="http://www.iml.unibe.ch/">IML Startseite</a> |
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment