Subversion Repositories ALCASAR

Compare Revisions

Ignore whitespace Rev 736 → Rev 737

/web/intercept.php
11,7 → 11,7
# notice and this permission notice is included in all copies or
# substantial portions of the software.
 
$organisme = "";
$organisme = "etrs-ssic";
# Redirects from CoovaChilli (chilli daemon) :
# Response to login:
# success : if login successful
22,7 → 22,7
# Default : it was not a form request -> client go to login form
 
# Shared secret used to encrypt challenge with radius.
$uamsecret = "";
$uamsecret = "E4tJqG9I";
 
# URL loaded after success authenticates (let blank for browser defaults)
$adminurl = "";
317,7 → 317,7
 
function popUp(URL) {
if (self.name != \"alcasar_popup\") {
alcasar_popup = window.open(URL, 'alcasar_popup', 'width=500,height=400,directories=no,resizable=no,scrollbars=yes,location=no,toolbar=no,statusbar=no,menubar=no');
alcasar_popup = window.open(URL, 'alcasar_popup', 'width=500,height=460,directories=no,resizable=no,scrollbars=yes,location=no,toolbar=no,statusbar=no,menubar=no');
}
}
 
/web/css/status.css
63,14 → 63,16
margin: 10px auto 10px auto;
}
 
#auth_reussi {
#auth_reussi, #errorTable, #statusTable, #waitTable, #disconnectTable {
width: 450px;
margin-top: 12px;
padding-top: 5px;
padding-left: 10px;
padding-right: 10px;
padding-bottom: 0px;
}
#auth_reussi {
margin-top: 12px;
}
.text_auth {
font-size: 20px;
}
77,18 → 79,18
.text_auth_welcom {
font-size: 16px;
}
.text_auth, .text_auth_welcom {
.text_auth, .text_auth_welcom, .alert {
font-weight: bold;
}
.text_auth, .text_auth_welcom, .alert, .text_warn, #conHistoryLabel, .lien_deco, .log_out {
text-align: center;
}
.lien_deco {
text-align: center;
font-size: 18px;
margin-bottom: 15px;
}
.log_out {
font-size: 24px;
text-align: center;
margin-top: 30px;
}
 
97,16 → 99,7
*/
#errorTable, #statusTable, #waitTable, #disconnectTable {
BACKGROUND-COLOR: #ffffff;
}
#errorTable, #statusTable, #waitTable, #disconnectTable {
width: 450px;
margin: 1px;
padding-top: 5px;
padding-left: 10px;
padding-right: 10px;
padding-bottom: 0px;
}
#errorTable, #statusTable, #waitTable, #disconnectTable {
border: 1px #efefef solid;
 
/* ombrage css3*/
116,17 → 109,10
box-shadow: 0px 0px 6px #000;
}
.chilliLabel {
/* A DEFINIR*/
/*
text-align: right;
padding-right: 5px;
*/
font-weight: bold;
width: 192px;
}
.chilliValue {
/* A DEFINIR*/
width: 236px;
}
.wait {
height: 16px;
135,12 → 121,25
Fin Ajout stephane weber
*/
#conHistoryLabel {
text-align: center;
padding-top: 4px;
padding-bottom: 3px;
padding-top: 6px;
padding-bottom: 5px;
}
#conHistory ul {
list-style-type: none;
padding-left: 100px;
text-align: left;
padding-left: 80px;
}
.alert {
font-size: 14px;
color: red;
margin-top: 5px;
height: 40px;
}
.link_logout {
padding-top: 20px;
padding-bottom: 20px;
}
.text_warn {
margin: 0px;
font-size: 9px;
}
/web/status.php
3,7 → 3,7
# status.php for Alcasar captive portal
# by steweb57
#
$organisme = "";
$organisme = "etrs-ssic";
$remote_ip = ($_SERVER['REMOTE_ADDR']);
$connection_history = "";
$nb_connection_history = 3;
54,7 → 54,9
$l_error = "error"; //à traduire
$l_welcome = "Welcome"; //à traduire
$l_conn_history = "Your last $nb_connection_history connections"; //à traduire
$l_connected = "logged"; //à traduire
$l_connected = "logged"; //à traduire
$l_a_connection = "Active connection detected on LAN"; //à traduire
$l_a_connection_time = "time(s)"; //à traduire
}
else if($Language == 'de'){
$l_login1 = "Erfolgreiche Authentifizierung";
79,6 → 81,8
$l_welcome = "Welcome"; //à traduire
$l_conn_history = "Your last $nb_connection_history connections"; //à traduire
$l_connected = "logged"; //à traduire
$l_a_connection = "Active connection detected on LAN"; //à traduire
$l_a_connection_time = "time(s)"; //à traduire
}
else if($Language == 'nl'){
$l_login1 = "Succesvolle authenticatie";
103,6 → 107,8
$l_welcome = "Welcome"; //à traduire
$l_conn_history = "Your last $nb_connection_history connections"; //à traduire
$l_connected = "logged"; //à traduire
$l_a_connection = "Active connection detected on LAN"; //à traduire
$l_a_connection_time = "time(s)"; //à traduire
}
else if($Language == 'fr'){
$l_login1 = "Authentification réussie";
126,7 → 132,9
$l_error = "erreur";
$l_welcome = "Bienvenue";
$l_conn_history = "Vos $nb_connection_history dernières connexions";
$l_connected = "connecté";
$l_connected = "session active";
$l_a_connection = "Vous êtes déjà connecté sur le réseau";
$l_a_connection_time = "fois";
}
else {
$l_login1 = "Successful authentication.";
151,6 → 159,8
$l_welcome = "Welcome";
$l_conn_history = "Your last $nb_connection_history connections";
$l_connected = "logged";
$l_a_connection = "Active connection detected on LAN";
$l_a_connection_time = "time(s)";
}
 
// si on a pas d'accès à la bdd, la page s'affiche quand même correctement
170,12 → 180,34
while(($row = @da_sql_fetch_array($res,$config))){
$connected = "";
$start_conn = date_create($row[acctstarttime]);
if ($row[acctstoptime] == "") $connected = " ($l_connected)";
$connection_history.="<li>".date_format($start_conn, 'd M Y - H:i:s')." - (".secondsToDuration($row[acctsessiontime]).") $connected</li>";
$connection_history.="<li>".date_format($start_conn, 'd M Y - H:i:s')." - (";
if ($row[acctstoptime] == "") {
$connected = $l_connected;
}else{
$connected = secondsToDuration($row[acctsessiontime]);
}
$connection_history.= "$connected)</li>";
// $connection_history.="<li>".date_format($start_conn, 'd M Y - H:i:s')." - (".secondsToDuration($row[acctsessiontime]).") $connected</li>";
}
$connection_history.="</ul>";
}
}
$sql_2 = "SELECT UserName, AcctStartTime, AcctStopTime, acctsessiontime FROM radacct WHERE UserName='$user[5]' AND AcctStopTime IS NULL ORDER BY AcctStartTime DESC";
$link_2 = @da_sql_pconnect($config); // on affiche pas les erreurs
if ($link_2){
$res_2 = @da_sql_query($link_2,$config,$sql_2); // on affiche pas les erreurs
$a_connection = "";
if ($res_2){
while(($row_2 = @da_sql_fetch_array($res_2,$config))){
$a_connected = 1;
if ($row_2[acctstoptime] == "") $a_connected = $a_connected + 1;
}
if ($a_connected > 1){
$a_connection = $l_a_connection." ".$a_connected." ".$l_a_connection_time;
}
}
}
}
}
?>
206,17 → 238,40
<div id="statusPage" class="c1">
<table border="0" id="statusTable">
<tr>
<td rowspan="2" valign="top"><img height="150" src="./images/logo-alcasar.png" alt="logo"></td>
<td>
<p class="text_auth_welcom"><?php echo $l_login1; ?></p>
<p class="text_auth"><?php echo $l_welcome; ?><br><span id="userName"></span></p>
<hr>
<?php echo $l_login2; ?>
<td colspan="2">
<table border="0" cellpadding="0" cellspacing="0" width="100%">
<tr>
<td valign="top" rowspan="4">
<img height="150" src="./images/logo-alcasar.png" alt="logo">
</td>
<td class="text_auth_welcom">
<?php echo $l_login1; ?>
</td>
</tr>
<tr>
<td class="text_auth">
<?php echo $l_welcome; ?>
<br><span id="userName"></span>
</td>
</tr>
<tr>
<td class="alert">
<?php echo $a_connection; ?>
</td>
</tr>
<tr>
<td class="text_warn">
<?php echo $l_login2; ?>
</td>
</tr>
<tr>
<td colspan="2" align="center" class="link_logout">
<a href="#" onclick="return logoutWithConfirmation('<?php echo $l_logout_question;?>');" class="lien_deco"><?php echo $l_logout; ?></a>
</td>
</tr>
</table>
</td>
</tr>
<tr>
<td align="center"><br><a href="#" onclick="return logoutWithConfirmation('<?php echo $l_logout_question;?>');" class="lien_deco"><?php echo $l_logout; ?></a><br><br></td>
</tr>
<!--tr id="connectRow">
<td id="statusMessageLabel" class="chilliLabel"><strong><?php echo $l_state_label; ?></strong></td>
<td id="statusMessage" class="chilliValue">Connected</td>