Subversion Repositories ALCASAR

Compare Revisions

Ignore whitespace Rev 2934 → Rev 2935

/web/intercept.php
56,6 → 56,10
fclose($file_conf);
 
$organisme = $conf["ORGANISM"];
$service_SMS_status = ($conf['SMS'] === 'on');
$service_wifi4eu_status = ($conf['WIFI4EU'] === 'on');
$service_wifi4eu_code = $conf['WIFI4EU_CODE'];
$service_wifi4eu_server = 'https://collection.wifi4eu.ec.europa.eu/wifi4eu.min.js';
 
// Shared secret used to encrypt password with coova.
$uamsecret = "";
63,9 → 67,6
// URL loaded after success authenticates (let blank for browser defaults)
$adminurl = "";
 
// Check if the SMS service is enable
$service_SMS_status = ($conf['SMS'] === 'on');
 
// Our own path
$loginpath = htmlspecialchars($_SERVER['PHP_SELF']);
$useHTTPS = ((isset($_SERVER['HTTPS'])) && (!empty($_SERVER['HTTPS'])) && ($_SERVER['HTTPS'] !== 'off'));
508,7 → 509,19
<head>
<meta charset="utf-8">
<title><?= $l_loggingin ?></title>
<link rel="stylesheet" href="/css/bootstrap.min.css" type="text/css">
<link rel="stylesheet" href="/css/intercept.css" type="text/css">
<link rel="icon" href="/images/favicon-48.ico" type="image/ico">
<? if ($service_wifi4eu_status): ?>
<script type="text/javascript">
var wifi4euTimerStart = Date.now();
var wifi4euNetworkIdentifier = '<?= $service_wifi4eu_code ?>';
var wifi4euLanguage = '<?= $Language ?>';
//var selftestModus = true;
</script>
<script type="text/javascript" src="<?= $service_wifi4eu_server ?>"></script>
<? endif; ?>
<script type="text/javascript">
function doOnLoad(result, userurl, redirurl, adminurl, timeleft) {
if ((result === 1) || (result === 4)) { // success or already
var url;
537,9 → 550,6
}
}
</script>
<link rel="stylesheet" href="/css/bootstrap.min.css" type="text/css">
<link rel="stylesheet" href="/css/intercept.css" type="text/css">
<link rel="icon" href="/images/favicon-48.ico" type="image/ico">
</head>
<body onLoad="javascript:doOnLoad(<?= $result ?>,'<?= $userurl ?>','<?= $redirurl ?>','<?= $adminurl ?>','<?= $timeleft ?>')">
<div class="col-xs-12">
548,7 → 558,11
<div class="col-xs-12 col-sm-10 col-sm-offset-1">
<div class="row banner">
<div class="col-xs-8 col-xs-offset-2 col-sm-12 col-sm-offset-0">
<h1 class="organisme"><?= $organisme ?></h1>
<?php if ($service_wifi4eu_status): ?>
<img id="wifi4eubanner">
<?php else: ?>
<h1 class="organisme"><?= $organisme ?></h1>
<?php endif; ?>
</div>
</div>
<div class="row">
565,12 → 579,11
echo '<div id="authorized_domain">'.$l_uam_domain.'</div>';
echo '<ul>';
foreach ($tab as $line) {
if (trim($line) !== '') { // the line isn't empty
$domain_allowed = explode('#', $line);
if (trim($domain_allowed[1]) !== '') {
if (!empty(trim($line))) { // the line isn't empty
if (strpos ($line, '#')) { // the domain should be displayed
$domain_allowed = explode('#', $line);
$domain = explode('"', $domain_allowed[0]);
// remove every '.' from the beginning of domain
$domain[1] = ltrim($domain[1], '.');
$domain[1] = ltrim($domain[1], '.'); // remove every '.' from the beginning of domain
echo '<li><a href="http://'.trim($domain[1]).'">'.trim($domain_allowed[1]).'</a></li>';
}
}
678,12 → 691,11
echo '<div id="authorized_domain">'.$l_uam_domain.'</div>';
echo '<ul>';
foreach ($tab as $line) {
if (trim($line) !== '') { // the line isn't empty
$domain_allowed = explode('#', $line);
if (trim($domain_allowed[1]) !== '') {
if (!empty(trim($line))) { // the line isn't empty
if (strpos ($line, '#')) { // the domain should be displayed
$domain_allowed = explode('#', $line);
$domain = explode('"', $domain_allowed[0]);
// remove every '.' from the beginning of domain
$domain[1] = ltrim($domain[1], '.');
$domain[1] = ltrim($domain[1], '.'); // remove every '.' from the beginning of domain
echo '<li><a href="http://'.trim($domain[1]).'">'.trim($domain_allowed[1]).'</a></li>';
}
}