Subversion Repositories ALCASAR

Compare Revisions

Ignore whitespace Rev 130 → Rev 131

/alcasar.sh
718,14 → 718,7
param_web_radius ()
{
# copie de l'interface d'origine dans la structure Alcasar
# mdv 2009.0 et 2009.1
if [ -d /var/www/freeradius-web ]
then
cp -rf /var/www/freeradius-web/* $DIR_WEB/manager/
chmod a-x /var/www/freeradius-web
else # mdv 2010.0
[ -d /usr/share/freeradius-web ] && cp -rf /usr/share/freeradius-web/* $DIR_WEB/manager/
fi
# copie des fichiers modifiés et suppression des fichiers inutiles
cp -rf $DIR_GESTION/manager/* $DIR_WEB/manager/
rm -f $DIR_WEB/manager/index.html $DIR_WEB/manager/readme
741,7 → 734,7
$SED "s?^sql_password_attribute:.*?sql_password_attribute: Crypt-Password?g" /etc/freeradius-web/admin.conf
$SED "s?^general_finger_type.*?# general_finger_type: snmp?g" /etc/freeradius-web/admin.conf
$SED "s?^general_stats_use_totacct.*?general_stats_use_totacct: yes?g" /etc/freeradius-web/admin.conf
cat <<EOF >> /etc/freeradius-web/naslist.conf
cat <<EOF > /etc/freeradius-web/naslist.conf
nas1_name: alcasar.%{general_domain}
nas1_model: Portail captif
nas1_ip: $PRIVATE_IP
825,7 → 818,7
$SED "s?^HS_PROVIDER_LINK.*?HS_PROVIDER_LINK=https://\$HS_UAMSERVER/?g" /etc/chilli/config
echo "HS_COAPORT=3799" >> /etc/chilli/config
echo "HS_ADMINTERVAL=0" >> /etc/chilli/config
cat <<EOF > /etc/chilli/config
cat <<EOF >> /etc/chilli/config
# Usage d'un DHCPD externe a coova (dhcpd local ou extérieur)
HS_USE_DHCPD_EXT="on"
HS_DHCP_GATEWAY_IP=127.0.0.1
1306,8 → 1299,11
IFS="$old"
if [ ! "$version" = "$MDV_NEEDED" ]
then
echo "Vous devez installer une des versions suivantes de Linux Mandriva ($MDV_NEEDED)"
echo "'/tmp'alcasar-conf.tar.gz' est le fichier de configuration de la version actuelle d'ALCASAR. Récupérez ce fichier et recopiez-le dans le répertoire '/tmp' après installation du nouveau système"
echo "Vous devez installer une des versions suivantes de Linux Mandriva ($MDV_NEEDED). Pour cela, vous pouvez suivre la procédure suivante :"
echo "- copiez sur clé USB le fichier de configuration de la version actuelle d'ALCASAR ('/tmp'alcasar-conf.tar.gz');"
echo "- installez le nouveau système 'Linux Mandriva';"
echo "- copiez le fichier de configuration d'ALCASAR dans le répertoire '/tmp';"
echo "- installez la nouvelle version d'ALCASAR."
exit 0
fi
if [ -e /tmp/alcasar-conf.tar.gz ]
/conf/user_edit.attrs
5,7 → 5,7
#
#
#Auth-Type <a href="help/auth_type_help.html" target=su_help onclick=window.open("help/auth_type_help.html","su_help","width=560,height=230,toolbar=no,scrollbars=no,resizable=yes") title="Auth-Type Help Page"><font color="blue">Auth-Type</font></a>
Simultaneous-Use <a href="help/simultaneous_use_help.html" target=su_help onclick=window.open("help/simultaneous_use_help.html","su_help","width=560,height=170,toolbar=no,scrollbars=no,resizable=yes") title="Simultaneous Use Help Page"><font color="blue">Nombre de session simultan&eacute;e</font></a>
Simultaneous-Use <a href="help/simultaneous_use_help.html" target=su_help onclick=window.open("help/simultaneous_use_help.html","su_help","width=600,height=250,toolbar=no,scrollbars=no,resizable=yes") title="Simultaneous Use Help Page"><font color="blue">Nombre de session simultan&eacute;e</font></a>
#Framed-Protocol <a href="help/framed_protocol_help.html" target=fpr_help onclick=window.open("help/framed_protocol_help.htlml","fpr_help","width=560,height=230,toolbar=no,scrollbars=no,resizable=yes") title="Framed-Protocol Help PPage"><font color="blue">Protocol</font></a>
#Framed-IP-Address <a href="help/framed_ip_address_help.html" target=fia_help onclick=window.open("help/framed_ip_address_help.html","fia_help","width=560,height=230,toolbar=no,scrollbars=no,resizable=yes") title="Framed-IP-Address Help Page"><font color="blue">IP Address</font></a>
#Framed-IP-Netmask IP Netmask
55,4 → 55,4
ChilliSpot-Max-Total-Octets <a href="help/chillispot_max_total_octets_help.html" target=st_help onclick=window.open("help/chillispot_max_total_octets_help.html","st_help","width=600,height=250,toolbar=no,scrollbars=no,resizable=yes") title="ChilliSpot Max Total Octets Help Page"><font color="blue">Nombre d'octets max. total transmit</font></a><BR>(en octets)
ChilliSpot-Bandwidth-Max-Up <a href="help/chillispot_bandwidth_max_up_help.html" target=st_help onclick=window.open("help/chillispot_bandwidth_max_up_help.html","st_help","width=600,height=250,toolbar=no,scrollbars=no,resizable=yes") title="ChilliSpot Bandwidth Max Up Help Page"><font color="blue">Bande passante montante max.</font></a><BR>(en kbits/seconde)
ChilliSpot-Bandwidth-Max-Down <a href="help/chillispot_bandwidth_max_down_help.html" target=st_help onclick=window.open("help/chillispot_bandwidth_max_down_help.html","st_help","width=600,height=250,toolbar=no,scrollbars=no,resizable=yes") title="ChilliSpot Bandwidth Max Down Help Page"><font color="blue">Bande passante descendante max.</font></a><BR>(en kbits/seconde)
#WISPr-Redirection-URL <a href="help/wispr_redirection_url_help.html" target=st_help onclick=window.open("help/wispr_redirection_url_help.html","st_help","width=600,height=250,toolbar=no,scrollbars=no,resizable=yes") title="ChilliSpot Bandwidth Max Down Help Page"><font color="blue">URL de redirection</font></a><BR>
#WISPr-Redirection-URL <a href="help/wispr_redirection_url_help.html" target=st_help onclick=window.open("help/wispr_redirection_url_help.html","st_help","width=600,height=250,toolbar=no,scrollbars=no,resizable=yes") title="ChilliSpot Bandwidth Max Down Help Page"><font color="blue">URL de redirection</font></a><BR>
/gestion/admin/network.php
257,17 → 257,17
<?php foreach( $serviceStatus as $serviceName => $statusOK ) { ?>
<tr>
<?php if ($statusOK) { ?>
<td><img src="/images/state_ok.gif" width="15" height="15" alt="<?php echo $l_service_status_img_ok; ?>"></td>
<td><?php echo $serviceName ;?></td>
<td width="30" align="center">---</td>
<td width="30" align="center"><a href="<?php echo $_SERVER['PHP_SELF']."?action=stop&service=$serviceName\"> $l_service_stop";?></a></td>
<td width="30" align="center"><a href="<?php echo $_SERVER['PHP_SELF']."?action=restart&service=$serviceName\"> $l_service_restart";?></a></td>
<td align="center"><img src="/images/state_ok.gif" width="15" height="15" alt="<?php echo $l_service_status_img_ok; ?>"></td>
<td align="left"><?php echo $serviceName ;?> </td>
<td width="80" align="center">---</td>
<td width="80" align="center"><a href="<?php echo $_SERVER['PHP_SELF']."?action=stop&service=$serviceName\"> $l_service_stop";?></a></td>
<td width="80" align="center"><a href="<?php echo $_SERVER['PHP_SELF']."?action=restart&service=$serviceName\"> $l_service_restart";?></a></td>
<?php } else { ?>
<td><img src="/images/state_error.gif" width="15" height="15" alt="<?php echo $l_service_status_img_ko ?>"></td>
<td align="center"><img src="/images/state_error.gif" width="15" height="15" alt="<?php echo $l_service_status_img_ko ?>"></td>
<td><?php echo $serviceName ;?></td>
<td width="30" align="center"><a href="<?php echo $_SERVER['PHP_SELF']."?action=start&service=$serviceName\"> $l_service_start";?></a></td>
<td width="30" align="center">---</td>
<td width="30" align="center">---</td>
<td width="80" align="center"><a href="<?php echo $_SERVER['PHP_SELF']."?action=start&service=$serviceName\"> $l_service_start";?></a></td>
<td width="80" align="center">---</td>
<td width="80" align="center">---</td>
<?php } ?>
</tr>
<?php } ?>
/gestion/css/style.css
1,11 → 1,13
 
H1 {
font-size: 20pt;
font-family:"DejaVu Sans";
font-size: 15pt;
text-align: left;
color: #666666;
}
 
H2 {
font-family:"DejaVu Sans";
font-size: 15pt;
text-align: center;
color: #666666;
12,11 → 14,13
}
 
:link, :visited, :link:hover, :visited:hover {
font-family:"DejaVu Sans";
font-size: small;
color: #666666;
}
 
body, p, ul, li {
font-family:"DejaVu Sans";
font-size: small;
color: #666666;
background-color: #EFEFEF;
24,6 → 28,7
}
 
th {
font-family:"DejaVu Sans";
font-size: small;
text-align: center;
color: #EFEFEF;
31,6 → 36,7
}
 
table {
font-family:"DejaVu Sans";
font-size: small;
color: #666666;
background-color: #EFEFEF;
/gestion/menu.php
34,6 → 34,7
$l_stat_daily ="usage journalier";
$l_stat_web ="traffic WEB";
$l_firewall ="parefeu";
$l_menu="Menu";
}
else {
$l_home = "HOME";
57,13 → 58,14
$l_stat_daily ="daily use";
$l_stat_web ="WEB traffic";
$l_firewall ="firewall";
$l_menu="Main";
}
echo "
<TABLE width=150 border=0 cellspacing=0 cellpadding=0>
<tr><th>Menu</th></tr>
<TABLE width=168 border=0 cellspacing=0 cellpadding=0>
<tr><th>$l_menu</th></tr>
<tr bgcolor=\"#FFCC66\"><td><img src=\"/images/pix.gif\" width=1 height=2></td></tr>
</TABLE>
<TABLE width=150 border=1 cellspacing=0 cellpadding=0>
<TABLE width=168 border=1 cellspacing=0 cellpadding=0>
<tr bgcolor=\"#666666\"><td>
<TABLE width=\"100%\" border=0 cellspacing=0 cellpadding=2>
<tr><td valign=\"middle\" align=\"left\">
142,7 → 144,7
fputs($fp, "$nb\n");
fclose($fp);
?>
<br>depuis le 99/99/9999<br></center></td></tr>
<br>depuis le 17/05/2010<br></center></td></tr>
</TABLE>
</td></tr>
</TABLE>
/gestion/manager/htdocs/help/chilliSpot_max_input_octets_help.html
File deleted
/gestion/manager/htdocs/help/chilliSpot_max_output_octets_help.html
File deleted
/gestion/manager/htdocs/help/chilliSpot_bandwidth_max_down_help.html
File deleted
/gestion/manager/htdocs/help/chilliSpot_bandwidth_max_up_help.html
File deleted
/gestion/manager/htdocs/help/chilliSpot_max_total_octets_help.html
File deleted
/gestion/manager/htdocs/help/chillispot_bandwidth_max_up_help.html
0,0 → 1,36
<html>
<head>
<title>Max Upload Bandwidth Help Page</title>
<link rel="stylesheet" href="../style.css">
</head>
<body bgcolor="#80a040" background="../images/greenlines1.gif" link="black" alink="black">
<center>
<table border=0 width=540 cellpadding=1 cellspacing=1>
<tr valign=top>
<td width=340></td>
<td bgcolor="black" width=400>
<table border=0 width=100% cellpadding=2 cellspacing=0>
<tr bgcolor="#907030" align=right valign=top><th><font color="white">Page d'aide : bande passante (&eacute;mission)</font>&nbsp;</th></tr>
</table>
</td></tr>
<tr bgcolor="black" valign=top><td colspan=2>
<table border=0 width=100% cellpadding=12 cellspacing=0 bgcolor="#ffffd0" valign=top>
<tr><td>
<br>
<center>
<pre>
Cet attribut d&eacute;finit la bande passante maximum en &eacute;mission
d'un usager ou groupe d'usagers (non renseign&eacute; = infini).
This attribute defines the maximum upload bandwidth
for a user or group (nothing = unlimited).
</pre>
</td></tr>
<tr><td align=center>
<a href="javascript:window.close();"><b>Close Window</b></a>
</td></tr>
</center>
</table>
</tr>
</table>
</body>
</html>
/gestion/manager/htdocs/help/chillispot_max_input_octets_help.html
0,0 → 1,36
<html>
<head>
<title>Max Input Octet Help Page</title>
<link rel="stylesheet" href="../style.css">
</head>
<body bgcolor="#80a040" background="../images/greenlines1.gif" link="black" alink="black">
<center>
<table border=0 width=540 cellpadding=1 cellspacing=1>
<tr valign=top>
<td width=340></td>
<td bgcolor="black" width=400>
<table border=0 width=100% cellpadding=2 cellspacing=0>
<tr bgcolor="#907030" align=right valign=top><th><font color="white">Page d'aide : octets maximum &eacute;mis autoris&eacute;</font>&nbsp;</th></tr>
</table>
</td></tr>
<tr bgcolor="black" valign=top><td colspan=2>
<table border=0 width=100% cellpadding=12 cellspacing=0 bgcolor="#ffffd0" valign=top>
<tr><td>
<br>
<center>
<pre>
Cet attribut d&eacute;finit le nombre d'octets maximum que l'usager est
autoris&eacute; &agrave; &eacute;mettre. Apr&egrave;s cette limite l'usager est d&eacuteconnect&eacute;.
This attribute defines the maximum number of octets the user is allowed to
transmit. After this limit has been reached the user will be disconnected.
</pre>
</td></tr>
<tr><td align=center>
<a href="javascript:window.close();"><b>Close Window</b></a>
</td></tr>
</center>
</table>
</tr>
</table>
</body>
</html>
/gestion/manager/htdocs/help/chillispot_max_output_octets_help.html
0,0 → 1,36
<html>
<head>
<title>Max Output Octet Help Page</title>
<link rel="stylesheet" href="../style.css">
</head>
<body bgcolor="#80a040" background="../images/greenlines1.gif" link="black" alink="black">
<center>
<table border=0 width=540 cellpadding=1 cellspacing=1>
<tr valign=top>
<td width=340></td>
<td bgcolor="black" width=400>
<table border=0 width=100% cellpadding=2 cellspacing=0>
<tr bgcolor="#907030" align=right valign=top><th><font color="white">Page d'aide : octets maximum re&ccedil;u autoris&eacute;.</font>&nbsp;</th></tr>
</table>
</td></tr>
<tr bgcolor="black" valign=top><td colspan=2>
<table border=0 width=100% cellpadding=12 cellspacing=0 bgcolor="#ffffd0" valign=top>
<tr><td>
<br>
<center>
<pre>
Cet attribut d&eacute;finit le nombre d'octets maximum que l'usager est
autoris&eacute; &agrave; recevoir. Apr&egrave;s cette limite l'usager est d&eacuteconnect&eacute;.
This attribute defines the maximum number of octets the user is allowed to
receive. After this limit has been reached the user will be disconnected.
</pre>
</td></tr>
<tr><td align=center>
<a href="javascript:window.close();"><b>Close Window</b></a>
</td></tr>
</center>
</table>
</tr>
</table>
</body>
</html>
/gestion/manager/htdocs/help/chillispot_bandwidth_max_down_help.html
0,0 → 1,36
<html>
<head>
<title>Max Download Bandwidth Help Page</title>
<link rel="stylesheet" href="../style.css">
</head>
<body bgcolor="#80a040" background="../images/greenlines1.gif" link="black" alink="black">
<center>
<table border=0 width=540 cellpadding=1 cellspacing=1>
<tr valign=top>
<td width=340></td>
<td bgcolor="black" width=400>
<table border=0 width=100% cellpadding=2 cellspacing=0>
<tr bgcolor="#907030" align=right valign=top><th><font color="white">Page d'aide : bande passante (t&eacute;l&eacute;chargement)</font>&nbsp;</th></tr>
</table>
</td></tr>
<tr bgcolor="black" valign=top><td colspan=2>
<table border=0 width=100% cellpadding=12 cellspacing=0 bgcolor="#ffffd0" valign=top>
<tr><td>
<br>
<center>
<pre>
Cet attribut d&eacute;finit la bande passante maximum en t&eacute;l&eacute;chargement
d'un usager ou groupe d'usagers (non renseign&eacute; = infini).
This attribute defines the maximum download bandwidth
for a user or group (nothing = unlimited).
</pre>
</td></tr>
<tr><td align=center>
<a href="javascript:window.close();"><b>Close Window</b></a>
</td></tr>
</center>
</table>
</tr>
</table>
</body>
</html>
/gestion/manager/htdocs/help/chillispot_max_total_octets_help.html
0,0 → 1,38
<html>
<head>
<title>Max Total Octet Help Page</title>
<link rel="stylesheet" href="../style.css">
</head>
<body bgcolor="#80a040" background="../images/greenlines1.gif" link="black" alink="black">
<center>
<table border=0 width=540 cellpadding=1 cellspacing=1>
<tr valign=top>
<td width=340></td>
<td bgcolor="black" width=400>
<table border=0 width=100% cellpadding=2 cellspacing=0>
<tr bgcolor="#907030" align=right valign=top><th><font color="white">Page d'aide : octets maximum total autoris&eacute;.</font>&nbsp;</th></tr>
</table>
</td></tr>
<tr bgcolor="black" valign=top><td colspan=2>
<table border=0 width=100% cellpadding=12 cellspacing=0 bgcolor="#ffffd0" valign=top>
<tr><td>
<br>
<center>
<pre>
Cet attribut d&eacute;finit le nombre d'octets maximum que l'usager est
autoris&eacute; &agrave; transf&eacute;rer (somme des octets émis et re&ccedil;us).
Apr&egrave;s cette limite l'usager est déconnect&eacute;.
This attribute defines the maximum number of octets the user is
allowed to transfer (sum of octets transmitted and received).
After this limit has been reached the user will be disconnected.
</pre>
</td></tr>
<tr><td align=center>
<a href="javascript:window.close();"><b>Close Window</b></a>
</td></tr>
</center>
</table>
</tr>
</table>
</body>
</html>
/gestion/manager/htdocs/user_edit.php
215,9 → 215,7
echo "$desc\n";
else
echo "$desc ($i)\n";
print <<<EOM
</td>
EOM;
echo "</td>";
if ($show_ops){
switch ($key)
{
289,27 → 287,6
EOM;
}
}
?>
<!--
<tr>
<td align=right colspan=<?php print $colspan ?> bgcolor="#d0ddb0">
Ajouter un attribut
</td>
<td>
<select name="add_attr" OnChange="this.form.add.value=1;this.form.submit()">
<?php
foreach ($show_attrs as $key => $desc){
$name = $attrmap["$key"];
print <<<EOM
<option value="$name">$desc
EOM;
}
?>
</select>
</td>
</tr>
-->
<?php
if ($user_type != 'group'){
echo <<<EOM
<tr>