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

add multi lang support; Detect user that is logged in

parent bacc4bc2
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
config.php.dist
+ 8
− 2
View file @ d6bfa00a
...@@ -5,18 +5,23 @@ return [ ...@@ -5,18 +5,23 @@ return [
'mode' => 'boxes', 'mode' => 'boxes',
// 'mode' => 'wayf', // 'mode' => 'wayf',
// -- language to fetch texts in discofeed // --- language for ui
'lang' => 'en', 'lang' => 'en',
// 'text-info' => '+++ Hinweis +++ Hinweis +++ Hinweis +++ Hinweis +++', // 'text-info' => '+++ Hinweis +++ Hinweis +++ Hinweis +++ Hinweis +++',
'text-before' => '<p>Studierende und Dozenten nutzen in der Regel das nachfolgende "Anmelden":</p>', 'text-before' => '<h2>AAI Login</h2>
<p>
Studierende und Dozenten nutzen in der Regel das Anmelden &uuml;ber ihre Organisation:
</p>',
'text-after' => '<br><br><h2>Anmeldung ohne AAI</h2> 'text-after' => '<br><br><h2>Anmeldung ohne AAI</h2>
<p> <p>
Klicken Sie auf: <br /> Klicken Sie auf: <br />
<a href="/login.php" onclick="">Gast-Zugang</a> <a href="/login.php" onclick="">Gast-Zugang</a>
</p>', </p>',
// --- list of IDPs to show
'idps' => [ 'idps' => [
"https://aai-idp.unibe.ch/idp/shibboleth", "https://aai-idp.unibe.ch/idp/shibboleth",
"https://aai.insel.ch/idp/shibboleth", "https://aai.insel.ch/idp/shibboleth",
...@@ -24,6 +29,7 @@ return [ ...@@ -24,6 +29,7 @@ return [
"https://aai-logon.unibas.ch/idp/shibboleth", "https://aai-logon.unibas.ch/idp/shibboleth",
], ],
// -- return URL after AAI login
'return-url' => '/shib_login.php' 'return-url' => '/shib_login.php'
// -- cache for discofeed // -- cache for discofeed
......
functions.js
+ 94
− 6
View file @ d6bfa00a
...@@ -13,10 +13,14 @@ ...@@ -13,10 +13,14 @@
// VARS // VARS
// ---------------------------------------------------------------------- // ----------------------------------------------------------------------
// for development without local shibboleth - set to true
var bShowLoginOnError = true;
var oFilter = document.getElementById('filterbox'); var oFilter = document.getElementById('filterbox');
var sLang = document.getElementById('lang').value;
var aLang={};
var sLsvar = 'aailogin-q'; var sLsvar = 'aailogin-q';
// ---------------------------------------------------------------------- // ----------------------------------------------------------------------
// FUNCTIONS // FUNCTIONS
// ---------------------------------------------------------------------- // ----------------------------------------------------------------------
...@@ -94,11 +98,12 @@ function showFilterBox() { ...@@ -94,11 +98,12 @@ function showFilterBox() {
q = ''; q = '';
} }
oFilter.style.display = 'block'; oFilter.style.display = 'block';
oFilter.innerHTML = '<input type="text" id="filter" placeholder="" onchange="applyfilter()" onkeydown="applyfilter()" onkeyup="applyfilter()" value=""/>' oFilter.innerHTML = ''
+ '<a id="resetfilter" onclick="resetFilter(); return false;"> X </a><br>' // + t('filter-idps-label') + '<br>'
+ '<input type="text" id="filter" placeholder="'+t('filter-idps-placeholder')+'" onchange="applyfilter()" onkeydown="applyfilter()" onkeyup="applyfilter()" value=""/>'
+ '<a href="#" id="resetfilter" onclick="resetFilter(); return false;" title="'+t('resetfilter-title')+'"> X </a><br>'
; ;
setFilter(q); setFilter(q);
...@@ -110,9 +115,92 @@ function showFilterBox() { ...@@ -110,9 +115,92 @@ function showFilterBox() {
}; };
// ---------------------------------------------------------------------- // ----------------------------------------------------------------------
// INIT
/**
* Get translated text by a given keyword
* @param {string} sKeyword key of the translation text
* @returns
*/
function t(sKeyword) {
if (aLang[sKeyword]) {
return aLang[sKeyword];
} else {
return "MISS: [" + sKeyword + "] in [" + sLang + '.json]';
}
}
// ---------------------------------------------------------------------- // ----------------------------------------------------------------------
/**
* Show error message
* @param {string} $sMessage message text
*/
function showError($sMessage){
document.getElementById('errorbox').innerHTML = $sMessage;
document.getElementById('errorbox').style.display = 'block';
}
/**
* Check if user is logged in in shibboleth
* It shows an error, ib shibboleth is not available.
* It detects if a user is logged in.
*/
async function checkSession() {
const url = "/Shibboleth.sso/Session";
if(!bShowLoginOnError) {
document.getElementById('shib-select-idp').style.display = 'none';
}
try {
const response = await fetch(url);
if (!response.ok) {
showError(
t('shib-check-failed') + " " + response.status + '<br>'
+ t('shib-hide-login')
);
if(bShowLoginOnError) {
showFilterBox();
}
throw new Error(`Response status: ${response.status}`);
}
const body = await response.text();
if (body.indexOf("was not found") > 0) {
// console.log("Not logged in");
// We show the login to idp selection
showFilterBox(); showFilterBox();
} else {
// console.log("Logged in already");
document.getElementById('sshib-check-logged-in').style.display = 'block';
}
// ...
} catch (error) {
console.error(error.message);
}
}
async function init(){
fetch('lang/' + sLang + '.json')
.then(response => response.json())
.then(aLang => {
initStep2(aLang)
})
.catch(error => console.log(error))
;
}
async function initStep2(langArray) {
aLang = langArray;
checkSession();
}
// ----------------------------------------------------------------------
// INIT
// ----------------------------------------------------------------------
init();
// ---------------------------------------------------------------------- // ----------------------------------------------------------------------
inc_functions.php
+ 3
− 0
View file @ d6bfa00a
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
// ---------------------------------------------------------------------- // ----------------------------------------------------------------------
require 'classes/shibd_discofeed.class.php'; require 'classes/shibd_discofeed.class.php';
require 'classes/lang.class.php';
// get the user config // get the user config
if (!file_exists('config.php')) { if (!file_exists('config.php')) {
...@@ -24,9 +25,11 @@ if (!file_exists('config.php')) { ...@@ -24,9 +25,11 @@ if (!file_exists('config.php')) {
$aConfig = require 'config.php'; $aConfig = require 'config.php';
$SELFURL = isset($_SERVER['SERVER_NAME']) ? "https://" . $_SERVER['SERVER_NAME'] : ''; $SELFURL = isset($_SERVER['SERVER_NAME']) ? "https://" . $_SERVER['SERVER_NAME'] : '';
$oDiscofeed = new shibd_discofeed($aConfig, $SELFURL); $oDiscofeed = new shibd_discofeed($aConfig, $SELFURL);
$aIdplist = $oDiscofeed->getIdps(); $aIdplist = $oDiscofeed->getIdps();
$L = new lang($aConfig['lang'] ?? 'en');
// ---------------------------------------------------------------------- // ----------------------------------------------------------------------
// functions // functions
......
inc_mode_boxes.php
+ 3
− 3
View file @ d6bfa00a
...@@ -23,7 +23,7 @@ if (is_array($aIdplist) && count($aIdplist)) { ...@@ -23,7 +23,7 @@ if (is_array($aIdplist) && count($aIdplist)) {
title="' . strip_tags($aEntry['_description']) . '" title="' . strip_tags($aEntry['_description']) . '"
> >
<span>' . htmlentities($aEntry['_label']) . '</span><br> <span>' . htmlentities($aEntry['_label']) . '</span><br>
<span class="hidden"> .'. $aEntry['_tld'] . '</span> <span class="hidden">#'. $aEntry['_tld'] . '</span>
<img src="' . $aEntry['_image'] . '"><br> <img src="' . $aEntry['_image'] . '"><br>
</a> </a>
' '
...@@ -35,7 +35,7 @@ if (is_array($aIdplist) && count($aIdplist)) { ...@@ -35,7 +35,7 @@ if (is_array($aIdplist) && count($aIdplist)) {
ksort($aTld); ksort($aTld);
foreach(array_keys($aTld) as $sTld) { foreach(array_keys($aTld) as $sTld) {
$sId='filterbtn-dot-'.str_replace('.', '', $sTld); $sId='filterbtn-dot-'.str_replace('.', '', $sTld);
$sDomainFilter.='<a href="#" id="'.$sId.'" class="filterbutton" onclick="setFilter(\'.'.$sTld.' \'); return false;">.'.$sTld.'</a> '; $sDomainFilter.='<a href="#" id="'.$sId.'" class="filterbutton" onclick="setFilter(\'#'.$sTld.' \'); return false;">.'.$sTld.'</a> ';
} }
$sDomainFilter = '<div id="filterByDomain">'. $sDomainFilter . '</div>'; $sDomainFilter = '<div id="filterByDomain">'. $sDomainFilter . '</div>';
} }
......
index.php
+ 23
− 5
View file @ d6bfa00a
...@@ -32,7 +32,6 @@ ...@@ -32,7 +32,6 @@
<body> <body>
<div id="head"> <div id="head">
<h1><?php echo $aConfig['title'] ?? 'AAI Login'; ?></h1> <h1><?php echo $aConfig['title'] ?? 'AAI Login'; ?></h1>
</div> </div>
...@@ -41,19 +40,38 @@ ...@@ -41,19 +40,38 @@
<?php <?php
// --- set language for js script
echo '<input type="hdden" id="lang" value="'.($aConfig['lang'] ?? 'en').'">';
// --- messages // --- messages
echo $SELFURL ? '' : showMessage('error', 'SELFURL is not set. $_SERVER[\'SERVER_NAME\'] is not available.'); echo $SELFURL ? '' : showMessage('error', 'SELFURL is not set. $_SERVER[\'SERVER_NAME\'] is not available.');
echo $aConfig['text-info'] ? showMessage('info', $aConfig['text-info']) : ''; echo $aConfig['text-info'] ? showMessage('info', $aConfig['text-info']) : '';
// --- id "errorbox" is used for javascript
echo '<div id="errorbox" class="msg error hidden"></div>';
// --- text block if the user is logged in already
echo '<div id="shib-check-logged-in" class="hidden_">
<h2>'.$L->t('logged-in-already-title').'</h2>
<p>
'.$L->t('logged-in-already-text').'<br>
<a href="/">'.$L->t('home').'</a>
</p>
</div>';
echo '<div id="shib-select-idp">';
// --- Text before // --- Text before
echo $aConfig['text-before'] ?? '' ; echo $aConfig['text-before'] ?? '' ;
// --- show possible logins // --- show possible logins
include "inc_mode_".$aConfig['mode'].".php"; include "inc_mode_".$aConfig['mode'].".php";
echo '</div>';
// --- finishing text // --- finishing text
echo $aConfig['text-after'] ?? ''; echo $aConfig['text-after'] ?? '';
?> ?>
</div> </div>
......
login_aai.css
+ 20
− 12
View file @ d6bfa00a
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
--content-shadow: 0.5em 0.5em 2em #fff; --content-shadow: 0.5em 0.5em 2em #fff;
--error-bg: #faa; --error-bg: #faa;
--error-color: #400; --error-color: #800;
--info-bg: #fc3; --info-bg: #fc3;
--info-color: #650; --info-color: #650;
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
/** ---------- mode boxes */ /** ---------- mode boxes */
--idp-border: 1px solid #cde; --idp-border: 1px solid #cde;
--idp-color: #46c; --idp-color: #45c;
--idp-shadow: 0 0 2em #eee inset; --idp-shadow: 0 0 2em #eee inset;
--idp-hover-shadow: 0 0 2em #eee; --idp-hover-shadow: 0 0 2em #eee;
...@@ -32,9 +32,13 @@ ...@@ -32,9 +32,13 @@
--btn-bg:#f8f8f8; --btn-bg:#f8f8f8;
--btn-color: #888; --btn-color: #888;
--resetfilter-border: 2px solid #dcc; --filterbtn-ative-border: 2px solid #eee;
--resetfilter-bg:#edd; --filterbtn-ative-bg:#fff;
--resetfilter-color: #800; --filterbtn-ative-color: #45c;
--resetfilter-border: 2px solid #ddd;
--resetfilter-bg: #f8f8f8;
--resetfilter-color: #888;
} }
...@@ -69,7 +73,7 @@ div.content { ...@@ -69,7 +73,7 @@ div.content {
} }
div.msg{ div.msg{
border-radius: 1em; border-radius: 1em;
border: 1px solid; border: 2px solid;
padding: 1em; padding: 1em;
margin-bottom: 1em; margin-bottom: 1em;
} }
...@@ -89,6 +93,10 @@ footer{ ...@@ -89,6 +93,10 @@ footer{
text-align: right; text-align: right;
} }
.hidden{
display: none;
}
/** ---------- mode boxes: filterbar on top */ /** ---------- mode boxes: filterbar on top */
div#filterbox{ div#filterbox{
...@@ -104,29 +112,29 @@ a.filterbutton, a#resetfilter{ ...@@ -104,29 +112,29 @@ a.filterbutton, a#resetfilter{
border: var(--btn-border); border: var(--btn-border);
border-radius: 0.2em; border-radius: 0.2em;
color: var(--btn-color); color: var(--btn-color);
font-size: 130%; font-size: 110%;
margin: 0 0.3em 0 0; margin: 0 0.3em 0 0;
opacity: 1; opacity: 1;
padding: 0.5em; padding: 0.5em;
text-decoration: none; text-decoration: none;
} }
a.filterbutton.active{ a.filterbutton.active{
background: #fff; background: var(--filterbtn-ative-bg);
border-top-color: #68a; border-top-color: var(--filterbtn-ative-border);
color: var(--filterbtn-ative-color);
} }
input#filter{ input#filter{
border: var(--inputfilter-border); border: var(--inputfilter-border);
padding: 0.5em; padding: 0.5em;
color:var(--inputfilter-color); color:var(--inputfilter-color);
font-size: 130%; font-size: 110%;
width: 70%; width: 20em;
} }
a#resetfilter{ a#resetfilter{
background:var(--resetfilter-bg); background:var(--resetfilter-bg);
border: var(--resetfilter-border); border: var(--resetfilter-border);
color: var(--resetfilter-color); color: var(--resetfilter-color);
font-weight: bold; font-weight: bold;
float: right;
margin: 0 0 0 0.3em; margin: 0 0 0 0.3em;
padding: 0.5em 2em; padding: 0.5em 2em;
} }
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment