Subversion Repositories ALCASAR

Compare Revisions

Ignore whitespace Rev 1376 → Rev 1377

/web/acc/admin/bl_categories_help.php
5,6 → 5,7
<?
$bl_dir="/etc/dansguardian/lists/blacklists/";
$bl_iptables_dir="/usr/local/share/iptables-bl/";
$wl_iptables_dir="/usr/local/share/iptables-wl/";
$bl_dnsmasq_dir="/usr/local/share/dnsmasq-bl/";
$wl_dnsmasq_dir="/usr/local/share/dnsmasq-wl/";
# Choice of language
76,14 → 77,25
else
{
$wl_categorie_domain_file = $wl_dnsmasq_dir.$categorie.".conf";
$wl_categorie_url_file = "";
$wl_categorie_ip_file = "";
if (file_exists($wl_categorie_domain_file))
$nb_domains = exec("wc -l $wl_categorie_domain_file | cut -d ' ' -f1");
$wl_categorie_ip_file = $wl_iptables_dir.$categorie;
if(isset($_GET['nb_domains']) && isset($_GET['nb_ip']))
{
$nb_domains = $_GET['nb_domains'];
$nb_urls = 0;
$nb_ip = $_GET['nb_ip'];
}
else
$nb_domains = $l_error_open_file." ".$wl_categorie_domain_file;
$nb_urls = 0;
$nb_ip = 0;
{
if (file_exists($wl_categorie_domain_file))
$nb_domains = exec("wc -l $wl_categorie_domain_file | cut -d ' ' -f1");
else
$nb_domains = $l_error_open_file." ".$wl_categorie_domain_file;
$nb_urls = 0;
if(file_exists($wl_categorie_ip_file))
$nb_ip = exec("wc -l $wl_categorie_ip_file | cut -d ' ' -f1");
else
$nb_ip = $l_error_open_file." ".$wl_categorie_ip_file;
}
}
$global_usage = file($bl_dir."global_usage");
$langue = strtoupper($Language);
/web/acc/admin/bl_filter.php
42,11 → 42,6
$Langue = explode(",",$_SERVER['HTTP_ACCEPT_LANGUAGE']);
$Language = strtolower(substr(chop($Langue[0]),0,2)); }
if($Language == 'fr'){
$l_title1="Filtrage de noms de domaine et d'URL";
$l_dnsfilter_on="Le filtrage de noms de domaine et d'URL est actuellement activé";
$l_dnsfilter_off="Le filtrage de noms de domaine et d'URL est actuellement désactivé";
$l_switch_filtering_on="Activer le filtrage";
$l_switch_filtering_off="Désactiver le filtrage";
$l_bl="Liste noire";
$l_wl="Liste blanche";
$l_list_version="Version de la liste : ";
90,13 → 85,13
$l_remove="Supprimer";
$l_submit="Envoyer";
$l_nb_ip="Nombre d'IP";
$l_update_ip="Mettre à jour les IP";
$l_update_ip_info="(Temps estimé : 3 min 30 sec)";
$l_nbDomainNames="Noms de domaine :";
$l_nbUrl="Url :";
$l_nbIp="Ip :";
}
else {
$l_title1="Domain names and URL filtering";
$l_dnsfilter_on="Actually, the Domain name and URL filter is on";
$l_dnsfilter_off="Actually, the Domain name and URL filter is off";
$l_switch_filtering_on="Switch the Filter on";
$l_switch_filtering_off="Switch the Filter off";
$l_bl="BlackList";
$l_wl="WhiteList";
$l_list_version="List version : ";
125,7 → 120,7
$l_rehabilitated_ip_explain="Enter here IP that are blocked by the blacklist <BR> and you want to rehabilitate.";
$l_one_ip="Enter one IP per row (example : 123.123.123.123)";
$l_record="Save changes";
$l_wait="Once validated, 10 seconds is necessary to compute your modifications";
$l_wait="Once validated, 10 seconds are necessary to compute your modifications";
$l_ip_filtering="Filtering URLs that contain an IP address instead of a domain name (ie: http://25.56.58.59/index.htm)";
$l_safe_searching="Enabling school/parental control for the search engines google, yahoo, bing, metacrawler and Youtube.";
$l_safe_youtube="For Youtube, enter your ID here : ";
140,11 → 135,16
$l_remove="Delete";
$l_submit="Submit";
$l_nb_ip="Number of IP";
$l_update_ip="Update IPs";
$l_update_ip_info="(Estimated time : 3 min 30 sec)";
$l_nbDomainNames="Domain names :";
$l_nbUrl="Url :";
$l_nbIp="Ip :";
}
$dir_etc="/usr/local/etc/";
$dir_dg="/etc/dansguardian/lists/";
$dir_bl_ip="/usr/local/share/iptables-bl/";
$file_wl_ip="/usr/local/share/ossi_wl";
$file_wl_ip="/usr/local/share/ossi-ip-wl";
$bl_categories=$dir_etc."alcasar-bl-categories";
$bl_categories_enabled=$dir_etc."alcasar-bl-categories-enabled";
$wl_categories=$dir_etc."alcasar-wl-categories";
164,7 → 164,6
foreach ($tab as $line)
{
$field=explode("=", $line);
if ($field[0] == "DNS_FILTERING") {$DNS_FILTERING=trim($field[1]);}
if ($field[0] == "YOUTUBE_ID") {$YOUTUBE_ID=trim($field[1]);}
}
}
173,14 → 172,6
if (isset($_POST['choix'])){ $choix=$_POST['choix']; } else { $choix=""; }
switch ($choix)
{
case 'BL_On' :
exec ("sudo /usr/local/sbin/alcasar-bl.sh --on");
$DNS_FILTERING="on";
break;
case 'BL_Off' :
exec ("sudo /usr/local/sbin/alcasar-bl.sh --off");
$DNS_FILTERING="off";
break;
case 'Download_list' :
exec ("sudo /usr/local/sbin/alcasar-bl.sh --download");
break;
187,6 → 178,7
case 'Active_list' :
exec ("sudo /usr/local/sbin/alcasar-bl.sh --adapt");
exec ("sudo /usr/local/sbin/alcasar-bl.sh --reload");
shell_exec ("nohup nice -n 10 sudo /usr/local/sbin/alcasar-bl.sh --ip_retrieving > /dev/null 2>/dev/null &");
break;
case 'Reject_list' :
unlink ("$dir_tmp/blacklists.tar.gz"); unlink ("$dir_tmp/md5sum");
249,6 → 241,7
fputs($fichier, form_filter_ip($_POST['OSSI_wl_ip'], "white"));
fclose($fichier);
unset($_POST['OSSI_wl_ip']);
exec ("sudo /usr/local/sbin/alcasar-bl.sh --ip_retrieving_ossi");
exec ("sudo /usr/local/sbin/alcasar-bl.sh --reload");
break;
case 'Specific_filtering' :
294,33 → 287,14
}
exec ("sudo /usr/local/bin/alcasar-iptables.sh");
break;
case 'Update_IP_WL' :
shell_exec ("nohup nice -n 10 sudo /usr/local/sbin/alcasar-bl.sh --ip_retrieving > /dev/null 2>/dev/null &");
exec ("sudo /usr/local/sbin/alcasar-bl.sh --reload");
break;
}
?>
<TABLE width="100%" border=0 cellspacing=0 cellpadding=0>
<tr><th><?php echo "$l_title1"; ?></th></tr>
<tr bgcolor="#FFCC66"><td><img src="/images/pix.gif" width=1 height=2></td></tr>
</TABLE>
<TABLE width="100%" border=1 cellspacing=0 cellpadding=0>
<tr><td valign="middle" align="left">
<?php
if ($DNS_FILTERING == "on")
{
echo "<CENTER><H3>$l_dnsfilter_on</H3></CENTER>";
echo "<FORM action='$_SERVER[PHP_SELF]' method=POST>";
echo "<input type=hidden name='choix' value=\"BL_Off\">";
echo "<input type=submit value=\"$l_switch_filtering_off\">";
}
else
{
echo "<CENTER><H3>$l_dnsfilter_off</H3></CENTER>";
echo "<FORM action='$_SERVER[PHP_SELF]' method=POST>";
echo "<input type=hidden name='choix' value=\"BL_On\">";
echo "<input type=submit value=\"$l_switch_filtering_on\">";
}
echo "</FORM>";
echo "</td></tr>";
echo "</TABLE>";
if ($DNS_FILTERING == "on") require ('bl_filter2.php');
require ('bl_filter2.php');
?>
</BODY>
</HTML>
/web/acc/admin/bl_filter2.php
64,7 → 64,12
<FORM action='bl_filter.php' method=POST>
<input type='hidden' name='choix' value='MAJ_cat_bl'>
<?php
echo "<center>$l_bl_categories</center></td></tr>";
echo "<center>";
$nbDomainNames = exec ("wc -l /usr/local/share/dnsmasq-bl/* | tail -n 1 | awk '{print $1}'");
$nbUrl = exec ("for file in `find /etc/dansguardian/lists/blacklists/ -name 'urls'`; do nb=$((nb+$(wc -l \$file | awk '{print $1}'))); done; echo \$nb");
$nbIp = exec ("wc -l /usr/local/share/iptables-bl/* | tail -n 1 | awk '{print $1}'");
echo "<b>$l_nbDomainNames</b> $nbDomainNames, <b>$l_nbUrl</b> $nbUrl, <b>$l_nbIp</b> $nbIp<br/>";
echo "$l_bl_categories</center></td></tr>";
//on lit et on interprete le fichier de catégories
$cols=1;
if (file_exists($bl_categories))
160,7 → 165,12
<FORM action='bl_filter.php' method=POST>
<input type='hidden' name='choix' value='MAJ_cat_wl'>
<?php
echo "<center>$l_wl_categories</center></td></tr>";
echo "<center>";
$nbDomainNames = exec ("wc -l /usr/local/share/dnsmasq-wl/* | tail -n 1 | awk '{print $1}'");
$nbUrl = 0;
$nbIp = exec ("wc -l /usr/local/share/iptables-wl/* | tail -n 1 | awk '{print $1}'");
echo "<b>$l_nbDomainNames</b> $nbDomainNames, <b>$l_nbUrl</b> $nbUrl, <b>$l_nbIp</b> $nbIp<br/>";
echo "$l_wl_categories</center></td></tr>";
//on lit et on interprete le fichier de catégories
$cols=1;
if (file_exists($wl_categories))
200,12 → 210,10
echo "<td width=50% colspan=5 align=center>";
echo "<H3>$l_allowed_ip</H3>$l_forbidden_ip_explain<BR>";
echo "<textarea name='OSSI_wl_ip' rows=3 cols=40>";
echo_file ($dir_dg."blacklists/ossi/urls_wl");
echo "</textarea></td></tr><tr><td colspan=10>";
echo "<input type='submit' value='$l_record' disabled>";
echo "</form> (Wait for a next version of ALCASAR !)";
echo_ip_file ($file_wl_ip);
echo "</textarea></td></tr><tr><td colspan=5>";
echo "<input type='submit' value='$l_record'></form></td><form action='bl_filter.php' method='POST'><td valign='middle' align='left' colspan=5><input type='hidden' name='choix' value='Update_IP_WL'><input type='submit' value='$l_update_ip'> $l_update_ip_info</form></td></tr>";
?>
</td></tr>
</TABLE><br/>
<table width="100%" border="0" cellspacing="0" cellpadding="0">
<tr><th><?php echo $l_specific_filtering; ?></th></tr>
/web/acc/admin/net_filter.php
14,11 → 14,6
$Langue = explode(",",$_SERVER['HTTP_ACCEPT_LANGUAGE']);
$Language = strtolower(substr(chop($Langue[0]),0,2)); }
if($Language == 'fr'){
$l_title_antivir = "Antivirus de flux WEB";
$l_antivir_on="L'antivirus de flux WEB est actuellement activ&eacute;";
$l_antivir_off="L'antivirus de flux WEB est actuellement désactiv&eacute;";
$l_switch_antivir_on="Activer l'antivirus";
$l_switch_antivir_off="D&eacute;sactiver l'antivirus";
$l_remove="Retirer de la liste";
$l_title_proto = "Filtrage de protocoles r&eacute;seau";
$l_netfilter_on="Le filtrage de protocoles r&eacute;seau est actuellement activ&eacute;";
36,11 → 31,6
$l_save="Enregistrer les modifications";
}
else {
$l_title_antivir = "WEB antivirus";
$l_antivir_on="Actually, the WEB antivirus is on";
$l_antivir_off="Actually, the WEB antivirus is off";
$l_switch_antivir_on="Switch the antivirus on";
$l_switch_antivir_off="Switch the antivirus off";
$l_remove="Remove from list";
$l_title_proto = "Network protocols filter";
$l_netfilter_on="Actually, the network protocols filter is enable";
89,12 → 79,6
if (isset($_POST['choix'])){$choix=$_POST['choix'];} else {$choix="";}
switch ($choix)
{
case 'AV_On' :
exec ("sudo /usr/local/sbin/alcasar-havp.sh -on");
break;
case 'AV_Off' :
exec ("sudo /usr/local/sbin/alcasar-havp.sh -off");
break;
case 'NF_On' :
exec ("sudo /usr/local/sbin/alcasar-nf.sh -on");
break;
178,35 → 162,10
{
$field=explode("=", $line);
if ($field[0] == "PROTOCOLS_FILTERING") {$PROTOCOLS_FILTERING=trim($field[1]);}
if ($field[0] == "WEB_ANTIVIRUS") {$WEB_ANTIVIRUS=trim($field[1]);}
}
}
}
echo "<tr><th>$l_title_antivir</th></tr>";
?>
<tr bgcolor=#FFCC66><td><img src=/images/pix.gif width=1 height=2></td></tr>
</TABLE>
<TABLE width="100%" border=1 cellspacing=0 cellpadding=0>
<tr><td valign="middle" align="left">
<?php
if ($WEB_ANTIVIRUS == "on")
{
echo "<CENTER><H3>$l_antivir_on</H3></CENTER>";
echo "<FORM action='$_SERVER[PHP_SELF]' method=POST>";
echo "<input type=hidden name='choix' value=\"AV_Off\">";
echo "<input type=submit value=\"$l_switch_antivir_off\">";
}
else
{
echo "<CENTER><H3>$l_antivir_off</H3></CENTER>";
echo "<FORM action='$_SERVER[PHP_SELF]' method=POST>";
echo "<input type=hidden name='choix' value=\"AV_On\">";
echo "<input type=submit value=\"$l_switch_antivir_on\">";
}
?>
</FORM>
</td></tr>
</table>
<TABLE width="100%" border=0 cellspacing=0 cellpadding=0>
<tr><th><?echo "$l_title_proto";?></th></tr>
<tr bgcolor="#FFCC66"><td><img src="/images/pix.gif" width="1" height="2"></td></tr>
/web/acc/filtering.php
1,10 → 1,8
<?
$select[0]="$l_blacklist";
$select[1]=$l_network;
$select[2]="Exceptions";
$fich[0]="admin/bl_filter.php";
$fich[1]="admin/net_filter.php";
$fich[2]="admin/filter_exceptions.php";
$j=0;
$nb=count($select);
while ($j != $nb)
/web/acc/manager/htdocs/group_new.php
3,12 → 3,7
//Gestion de la langue
if (is_file("../lib/langues.php"))
include("../lib/langues.php");
require('/etc/freeradius-web/config.php');
if ($show == 1){
header("Location: group_admin.php?login=$login");
exit;
}
 
if ($config[general_lib_type] != 'sql'){
echo <<<EOM
64,7 → 59,7
<TABLE width="100%" border=0 cellspacing=0 cellpadding=2>
<tr><td valign="middle" align="left">
<center>
<table border=0 width=550 cellpadding=1 cellspacing=1>
<table border=0 width=750 cellpadding=1 cellspacing=1>
<tr valign=top>
<td width=340></td>
<td bgcolor="black" width=200>
94,6 → 89,7
include("../lib/$config[general_lib_type]/group_info.php");
}
}
if ($create == 0){
?>
<form name="newgroup" method=post>
<input type=hidden name=create value="0">
128,7 → 124,7
<td class="etiquette" colspan=$colspan>
$l_group_members
</td><td>
<textarea name=members cols="15" wrap="PHYSICAL" rows=5></textarea>
<textarea name=members cols="50" wrap="PHYSICAL" rows=5></textarea>
</td>
</tr>
207,6 → 203,11
$help_link="help/wispr_redirection_url_help.html";
$desc=$l_wispr_redirection;
break;
case 'Filter-Id' :
$advanced=1;
$help_link="help/filtering_help.html";
$desc=$l_filtering;
break;
default:
$advanced=1;
break;
236,6 → 237,9
case 'Expiration' :
echo "<td><select name=$oper_name><option $selected[$op_eq] value=\":=\">:=";
break;
case 'Filter-Id' :
echo "<td><select name=$oper_name><option $selected[$op_eq] value=\":=\">:=";
break;
case 'Session-Timeout' :
case 'ChilliSpot-Max-Input-Octets' :
case 'ChilliSpot-Max-Output-Octets' :
268,6 → 272,7
break;
}
}
/*
Ajout du choix d'unité (pour les durées limites de session, journée et de mois)
et d'un calendrier pour la date d'expiration
297,20 → 302,26
/*Ajout du calendrier pour choisir la date*/
echo"<input id=\"popup_container\" type=text name=\"$name\" value=\"$val\" size=35>";
break;
case 'Filter-Id' :
echo "<select name='Filter-Id'>";
echo "<option>$l_filtering_none</option>";
echo "<option value=\"00000001\">$l_filtering_havp</option>";
echo "<option value=\"00000011\">$l_filtering_havp_bl</option>";
echo "<option value=\"00000101\">$l_filtering_havp_wl</option>";
echo "</select>";
break;
default :
if ($advanced) echo"<input type=text name=\"$name\" value=\"$val\" size=35>";
break;
}
}else{
/*Pas de gestion de remplissage lors de la visualisation*/
if ($advanced) echo"<input type=text name=\"$name\" value=\"$val\" size=35>";
}
/*fin Ajout*/
}
echo "</table><BR>";
}
if ($create == 1)
echo "<input type=submit class=button value=\"$l_show_profile\" OnClick=\"this.form.show.value=1\">";
else
echo "<br/><center><a href=\"group_admin.php?login=$login\">$l_show_profile</a></center>";
else
echo "<input type=submit class=button value=\"$l_create\" OnClick=\"return formControl('newgroup');\">";
?>
<br><br>
/web/acc/manager/htdocs/help/filtering_help.html
0,0 → 1,33
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<HTML><!-- written by Rexy -->
<HEAD>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>Help Page</title>
<link rel="stylesheet" href="/css/style.css" type="text/css">
</HEAD>
<body>
<center>
<TABLE width="100%" border="0" cellspacing="0" cellpadding="0">
<tr><th>Filtrage - Filtering</th></tr>
<tr bgcolor="#FFCC66"><td><img src="/images/pix.gif" width="1" height="2"></td></tr>
</TABLE>
<TABLE width="100%" border=1 cellspacing=0 cellpadding=1>
<tr><td valign="middle" align="left">
Cet attribut définit le niveau de filtrage d'un usager :<br/>
- Aucun : aucun filtrage<br/>
- Antivirus : antivirus activé<br/>
- Antivirus + Blacklist : antivirus activé + filtrage par la blacklist<br/>
- Antivirus + Whitelist : antivirus activé + filtrage par la whitelist
<HR>
This attribute defines the filtering level for a user :<br/>
- None : no filtering<br/>
- Antivirus : antivirus activated<br/>
- Antivirus + Blacklist : antivirus activated + blacklist filtering<br/>
- Antivirus + Whitelist : antivirus activated + whitelist filtering
</td></tr>
</table>
<br>
<a href="javascript:window.close();"><b>Close / Fermer</b></a>
</center>
</body>
</html>
/web/acc/manager/htdocs/user_edit.php
105,10 → 105,20
include("../lib/sql/group_change.php");
include("../lib/defaults.php");
}
# Disconnecting user for re-authentication
$mac=exec("sudo /usr/sbin/chilli_query list | grep \" $login \" | awk '{print $1}'");
exec("sudo /usr/sbin/chilli_query logout $mac");
}
else{
if (is_file("../lib/$config[general_lib_type]/group_info.php"))
include("../lib/$config[general_lib_type]/group_info.php");
# Disconnecting all users from the selected group for re-authentication
if (isset($group_members)){
foreach ($group_members as $g_member => $member){
$mac=exec("sudo /usr/sbin/chilli_query list | grep \" $member \" | awk '{print $1}'");
exec("sudo /usr/sbin/chilli_query logout $mac");
}
}
}
}
else if ($badusers == 1){
257,6 → 267,11
$help_link="help/wispr_redirection_url_help.html";
$desc=$l_wispr_redirection;
break;
case 'Filter-Id' :
$advanced=1;
$help_link="help/filtering_help.html";
$desc=$l_filtering;
break;
default:
$advanced=1;
break;
311,6 → 326,23
case 'WISPr-Redirection-URL' :
echo "<td><select name=$oper_name><option $selected[$op_eq] value=\"=\">=</td><td><input type=text name=\"$name1\" value=\"$val\" size=20></td>";
break;
case 'Filter-Id' :
switch($val)
{
case "00000001":
echo "<td><select name=$oper_name><option $selected[$op_eq] value=\"=\">=</td><td><select name=\"$name1\"><option>$l_filtering_none</option><option value=\"00000001\" selected=\"selected\">$l_filtering_havp</option><option value=\"00000011\">$l_filtering_havp_bl</option><option value=\"00000101\">$l_filtering_havp_wl</option></select></td>";
break;
case "00000011":
echo "<td><select name=$oper_name><option $selected[$op_eq] value=\"=\">=</td><td><select name=\"$name1\"><option>$l_filtering_none</option><option value=\"00000001\">$l_filtering_havp</option><option value=\"00000011\" selected=\"selected\">$l_filtering_havp_bl</option><option value=\"00000101\">$l_filtering_havp_wl</option></select></td>";
break;
case "00000101":
echo "<td><select name=$oper_name><option $selected[$op_eq] value=\"=\">=</td><td><select name=\"$name1\"><option>$l_filtering_none</option><option value=\"00000001\">$l_filtering_havp</option><option value=\"00000011\">$l_filtering_havp_bl</option><option value=\"00000101\" selected=\"selected\">$l_filtering_havp_wl</option></select></td>";
break;
default :
echo "<td><select name=$oper_name><option $selected[$op_eq] value=\"=\">=</td><td><select name=\"$name1\"><option selected=\"selected\">$l_filtering_none</option><option value=\"00000001\">$l_filtering_havp</option><option value=\"00000011\">$l_filtering_havp_bl</option><option value=\"00000101\">$l_filtering_havp_wl</option></select></td>";
break;
}
break;
default :
print <<<EOM
<td>
/web/acc/manager/htdocs/user_new.php
5,10 → 5,6
include("../lib/langues.php");
 
require('/etc/freeradius-web/config.php');
if ($show == 1){
header("Location: user_admin.php?login=$login");
exit;
}
if($show == 2)
{
header("Location: user_new2.php");
37,26 → 33,6
window.onload = function () {
dp_cal = new Epoch('epoch_popup','popup',document.getElementById('popup_container'));
};
/*Fin calendrier*/
function createTickets(arg){
var nbtickets = prompt("Saisissez le nombre d'utilisateurs à créer", "");
// On test la pression sur le boutton "annuler"
if (nbtickets===null){
alert('nbtickets===null');
return false;
}
// On test la valeur saisie n'est pas un nombre
if (isNaN(nbtickets)===true){
return false;
}
// Conversion en entier de nbtickets
nbtickets = parseInt(nbtickets)
// Configuration et envoie du formulaire
arg.nbtickets.value = nbtickets
arg.action = "ticket_voucher.php";
arg.submit();
return true;
}
</script>
</head>
<body>
105,7 → 81,7
include("../lib/$config[general_lib_type]/user_info.php");
if ($user_exists != "no"){
echo <<<EOM
<b><i>$login</i> $l_user_exist</b>
<b><i>$login</i> $l_user_exists</b>
EOM;
}
else{
164,6 → 140,7
<input type=hidden name=langue_imp value='fr'>
<table border=1 bordercolordark=#ffffe0 bordercolorlight=#000000 width=100% cellpadding=2 cellspacing=0 bgcolor="#ffffe0" valign=top>
<?php
if($create==0){
echo <<<EOM
<tr>
<td class="etiquette" colspan=$colspan>
260,6 → 237,11
$help_link="help/expiration_help.html";
$desc=$l_expiration;
break;
case 'Filter-Id' :
$advanced=1;
$help_link="help/filtering_help.html";
$desc=$l_filtering;
break;
default:
$advanced=1;
break;
281,6 → 263,9
case 'Expiration' :
echo "<input type=\"hidden\" name=$oper_name value=\":=\">";
break;
case 'Filter-Id' :
echo "<input type=\"hidden\" name=$oper_name value=\":=\">";
break;
case 'Session-Timeout' :
case 'ChilliSpot-Max-Input-Octets' :
case 'ChilliSpot-Max-Output-Octets' :
360,18 → 345,20
/*Ajout du calendrier pour choisir la date*/
echo"<input id=\"popup_container\" type=text name=\"$name\" value=\"$val\" size=20>";
break;
case 'Filter-Id' :
echo "<select name='Filter-Id'>";
echo "<option>$l_filtering_none</option>";
echo "<option value=\"00000001\">$l_filtering_havp</option>";
echo "<option value=\"00000011\">$l_filtering_havp_bl</option>";
echo "<option value=\"00000101\">$l_filtering_havp_wl</option>";
echo "</select>";
break;
default :
if ($advanced) echo"<input type=text name=\"$name\" value=\"$val\" size=20>";
break;
}
}else{
/*Pas de gestion de remplissage lors de la visualisation*/
if ($advanced) echo"<input type=text name=\"$name\" value=\"$val\" size=20>";
/*fin Ajout*/
}
}
if ($create==0){
print <<<EOM
<tr>
<td class="etiquette" colspan=$colspan>
389,12 → 376,12
<option value=\"it\" >Italiano</option>
<option value=\"pt\" >Portugês</option>
</select></td></tr>";
}
echo "</table><BR>";
}
echo "</table>";
if($create == 1)
{
echo "<a href=\"ticket.pdf\">Ticket</a><br>";
echo "<input type=submit class=button value=\"$l_show_profile\" OnClick=\"this.form.show.value=1\">";
echo "<a href=\"ticket.pdf\">Ticket</a><br/><br/>";
echo "<center><a href=\"user_admin.php?login=$login\">$l_show_profile</a></center>";
}
else
{
402,7 → 389,7
echo "<input type='hidden' name='nbtickets' value=''>";
echo "<input type=submit class=button value=\"$l_advanced_menu\" style=\"float: right;\" OnClick=\"this.form.show.value=2\">";
echo "<br>$l_or :<br>";
echo "<input type=button class=button value=\"$l_create_multiple\" OnClick=\"return createTickets(this.form);\">";
echo "<input type=button class=button value=\"$l_create_multiple\" OnClick=\"return createTickets(this.form, '$l_createTicketsMSG');\">";
echo $l_create_multiple_comment;
}
?>
/web/acc/manager/htdocs/user_new2.php
4,10 → 4,6
if (is_file("../lib/langues.php"))
include("../lib/langues.php");
require('/etc/freeradius-web/config.php');
if ($show == 1){
header("Location: user_admin.php?login=$login");
exit;
}
if($show == 2)
{
header("Location: user_new.php");
147,6 → 143,7
<input type=hidden name=langue_imp value='fr'>
<table border=1 bordercolordark=#ffffe0 bordercolorlight=#000000 width=100% cellpadding=2 cellspacing=0 bgcolor="#ffffe0" valign=top>
<?php
if($create==0){
echo <<<EOM
<tr>
<td class="etiquette" colspan=$colspan>
278,6 → 275,11
$help_link="help/wispr_redirection_url_help.html";
$desc=$l_wispr_redirection;
break;
case 'Filter-Id' :
$advanced=1;
$help_link="help/filtering_help.html";
$desc=$l_filtering;
break;
default:
$advanced=1;
break;
299,6 → 301,9
case 'Expiration' :
echo "<td><select name=$oper_name><option $selected[$op_eq] value=\":=\">:=";
break;
case 'Filter-Id' :
echo "<td><select name=$oper_name><option $selected[$op_eq] value=\":=\">:=";
break;
case 'Session-Timeout' :
case 'ChilliSpot-Max-Input-Octets' :
case 'ChilliSpot-Max-Output-Octets' :
370,18 → 375,20
/*Ajout du calendrier pour choisir la date*/
echo"<input id=\"popup_container\" type=text name=\"$name\" value=\"$val\" size=20>";
break;
case 'Filter-Id' :
echo "<select name='Filter-Id'>";
echo "<option>$l_filtering_none</option>";
echo "<option value=\"00000001\">$l_filtering_havp</option>";
echo "<option value=\"00000011\">$l_filtering_havp_bl</option>";
echo "<option value=\"00000101\">$l_filtering_havp_wl</option>";
echo "</select>";
break;
default :
if ($advanced) echo"<input type=text name=\"$name\" value=\"$val\" size=20>";
break;
}
}else{
/*Pas de gestion de remplissage lors de la visualisation*/
if ($advanced) echo"<input type=text name=\"$name\" value=\"$val\" size=20>";
/*fin Ajout*/
}
}
if (create==0){
print <<<EOM
<tr>
<td class="etiquette" colspan=$colspan>
404,7 → 411,7
if($create == 1)
{
echo "<a href=\"ticket.pdf\">Ticket</a><br>";
echo "<input type=submit class=button value=\"$l_show_profile\" OnClick=\"this.form.show.value=1\">";
echo "<center><a href=\"user_admin.php?login=$login\">$l_show_profile</a></center>";
}
else
{
/web/acc/manager/lib/langues.php
109,6 → 109,12
$l_spoofing = "Adresse(s) MAC usurpée(s) (Watchdog)";
$l_virus = "Virus bloqué(s) (HAVP)";
$l_fail2ban = "Adresse(s) IP bloquée(s) (Fail2Ban)";
$l_filtering = "Filtrage";
$l_filtering_none = "Aucun";
$l_filtering_havp = "Antivirus";
$l_filtering_havp_bl = "Antivirus + Blacklist";
$l_filtering_havp_wl = "Antivirus + Whitelist";
$l_user_exists = "existe déjà !";
break;
default :
//English
211,6 → 217,12
$l_spoofing = "MAC address spoofed (Watchdog)";
$l_virus = "Virus blocked (HAVP)";
$l_fail2ban = "IP address blocked (Fail2Ban)";
$l_filtering = "Filtering";
$l_filtering_none = "None";
$l_filtering_havp = "Antivirus";
$l_filtering_havp_bl = "Antivirus + Blacklist";
$l_filtering_havp_wl = "Antivirus + Whitelist";
$l_user_exists = "already exists !";
break;
}
?>
/web/acc/manager/lib/sql/create_group.php
48,6 → 48,8
foreach($show_attrs as $key => $attr){
if ($attrmap["$key"] == 'none')
continue;
if ($key == "Filter-Id" && $$attrmap["$key"] == "None")
continue;
if ($attrmap["$key"] == ''){
$attrmap["$key"] = $key;
$attr_type["$key"] = 'replyItem';
/web/acc/manager/lib/sql/create_user.php
79,6 → 79,8
foreach($show_attrs as $key => $attr){
if ($attrmap["$key"] == 'none')
continue;
if ($key == "Filter-Id" && $$attrmap["$key"] == "None")
continue;
if ($attrmap["$key"] == ''){
$attrmap["$key"] = $key;
$attr_type["$key"] = 'replyItem';
/web/acc/menu.php
28,7 → 28,7
$l_statistics = "STATISTIQUES";
$l_backup = "SAUVEGARDES";
$l_activity = "Activité";
$l_blacklist = "Noms de domaine";
$l_blacklist = "Noms de domaine et ip";
$l_ldap = "Ldap/A.D.";
$l_access_nb = "Accès au centre";
$l_create_user = "Créer un usager";
55,7 → 55,7
$l_statistics = "STATISTICS";
$l_backup = "BACKUPS";
$l_activity = "Activity";
$l_blacklist = "Domain names";
$l_blacklist = "Domain names and ip";
$l_ldap = "Ldap/A.D.";
$l_access_nb = "Access to center";
$l_create_user = "Create a user";
/web/js/fonctions.js
80,7 → 80,7
nbtickets = parseInt(nbtickets)
// Configuration et envoie du formulaire
formulaire.nbtickets.value = nbtickets
formulaire.action = "vouchers_new.php";
formulaire.action = "ticket_voucher.php";
formulaire.submit();
return true;