Subversion Repositories ALCASAR

Compare Revisions

No changes between revisions

Ignore whitespace Rev 1565 → Rev 1566

/CHANGELOG
10,7 → 10,7
- Add the SMS auto-registration system
- Add whitelist filtering (domains and related IP addreses)
- Add IP addresses of the Toulouse blacklist in the firewall targets
- Add whitelist/blacklist filtering by users/groups
- Add whitelist/blacklist/antivirus filtering by users/groups
- Add surfmap plugin (nfsen)
- Store user password in SHA256 instead of MD5 (Thanks to Olivier HOUSSENBAY) and use a random SALT (not same hash for two same passwords)
- Add Network tool statistic : Vnstat
/alcasar.sh
1673,9 → 1673,9
# Archive des logs et de la base de données (tous les lundi à 5h35)
35 5 * * 1 root $DIR_DEST_BIN/alcasar-archive.sh --now
EOF
cat << EOF > /etc/cron.d/alcasar-clean_import
# suppression des fichiers de mots de passe lors d'imports massifs par fichier de plus de 24h
30 * * * * root $DIR_DEST_BIN/alcasar-import-clean.sh
cat << EOF > /etc/cron.d/alcasar-ticket-clean
# suppression des fichiers de mots de passe (imports massifs par fichier) et des ticket PDF d'utilisateur
30 * * * * root $DIR_DEST_BIN/alcasar-ticket-clean.sh
EOF
cat << EOF > /etc/cron.d/alcasar-distrib-updates
# mise à jour automatique de la distribution tous les jours 3h30
/readme.txt
7,9 → 7,9
--> Follow the installation documentation.
- Update an earlier version
--> Run the installation of the new version and follow the instructions
if you current version is not compatible, the update process will stop after the creation of a configuration file
if you current version is not compatible, the update process will stop after creating a configuration file
--> 1 - Retrieve this configuration file (/tmp/alcasar-conf.tar.gz)
--> 2 - Install Linux-Mageia2 (cf. installation doc)
--> 2 - Install the new system Linux-Mageia4.1 (cf. installation doc)
--> 3 - Copy the file 'alcasar-conf.tar.gz' in the folder '/tmp' before launching the installation of the new version of ALCASAR
 
*********** Français ********
20,5 → 20,5
--> Lancez l'installation de la nouvelle version et suivez les instructions
si la version actuelle n'est pas compatible, le processus de mise à jour s'arrétera après avoir créé un fichier de configuration
--> 1 - Récupérez ce fichier de configuration (/tmp/alcasar-conf.tar.gz)
--> 2 - Installez Linux-Mageia2 (cf. doc d'installation)
--> 2 - Installez Linux-Mageia4.1 (cf. doc d'installation)
--> 3 - copiez le fichier 'alcasar-conf.tar.gz' dans le répertoire '/tmp' avant de lancez l'installation de la nouvelle version d'ALCASAR
/scripts/alcasar-import-clean.sh
File deleted
Property changes:
Deleted: svn:eol-style
-LF
\ No newline at end of property
Deleted: svn:executable
-*
\ No newline at end of property
Deleted: svn:keywords
-Id Author Date
\ No newline at end of property
/scripts/alcasar-ticket-clean.sh
0,0 → 1,14
#!/bin/bash
 
# alcasar-ticket-clean.sh
# by Franck BOUIJOUX & Rexy
# This script is distributed under the Gnu General Public License (GPL)
 
# nettoyage des fichiers de mots de passe générés après l'import d'une liste de noms.
# nettoyage des ticket PDF généré lors de la création d'usager
# delete password files generated during the importation of a list of names
# delete PDF ticket generated when creating new account
 
find /tmp -name '*.pwd' -exec rm -f {} \;
find /var/www/html/acc/manager/htdocs -name '*.pdf' -exec rm -f {} \;
exit 0
Property changes:
Added: svn:eol-style
+native
\ No newline at end of property
Added: svn:executable
+*
\ No newline at end of property
/web/acc/manager/htdocs/group_new.php
304,7 → 304,7
break;
case 'Filter-Id' :
echo "<select name='Filter-Id'>";
echo "<option>$l_filtering_none</option>";
echo "<option value=\"\">$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>";
/web/acc/manager/htdocs/ticket_user.php
49,6 → 49,6
 
// envoie du document au navigateur
$ticket_name="ticket_".$log_imp.".pdf";
$pdf->Output("ticket.pdf");
header ('Location: ticket.pdf');
$pdf->Output($ticket_name);
header ('Location: '.$ticket_name);
?>
/web/acc/manager/htdocs/user_edit.php
48,6 → 48,15
document.edituser.pwdgene.value=pass
}
</script>
<script type="text/javascript" src="/js/epoch_classes.js"></script>
<script language="javascript" type="text/javascript">
/*Insertion du calendrier */
var dp_cal;
window.onload = function () {
dp_cal = new Epoch('epoch_popup','popup',document.getElementById('popup_container'));
};
</script>
 
</head>
<body>
<TABLE width="100%" border="0" cellspacing="0" cellpadding="0">
294,7 → 303,7
if($login == "sms" && $user_type == 'group'){
echo "<td><select name=$oper_name><option $selected[$op_eq] value=\":=\">:=</td><td><input type=text name=\"$name1\" value=\"$val\" size=20 disabled></td>";
} else {
echo "<td><select name=$oper_name><option $selected[$op_eq] value=\":=\">:=</td><td><input type=text name=\"$name1\" value=\"$val\" size=20></td>";
echo "<td><select name=$oper_name><option $selected[$op_eq] value=\":=\">:=</td><td><input id=\"popup_container\" type=text name=\"$name1\" value=\"$val\" size=20></td>";
}
break;
case 'Max-All-Session' :
334,16 → 343,16
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>";
echo "<td><select name=$oper_name><option $selected[$op_eq] value=\"=\">=</td><td><select name=\"$name1\"><option value=\"\">$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>";
echo "<td><select name=$oper_name><option $selected[$op_eq] value=\"=\">=</td><td><select name=\"$name1\"><option value=\"\">$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>";
echo "<td><select name=$oper_name><option $selected[$op_eq] value=\"=\">=</td><td><select name=\"$name1\"><option value=\"\">$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>";
echo "<td><select name=$oper_name><option $selected[$op_eq] value=\"=\">=</td><td><select name=\"$name1\"><option value=\"\" 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;
/web/acc/manager/htdocs/user_new.php
339,7 → 339,7
<option value=\"J\" >J</option>
</select>";
break;
case 'Expiration' :
case 'Expiration' :
/*Pré-remplissage avec la date du lendemain*/
/* $val=date("d F Y",strtotime("+1 day"));//<--en commentant cette ligne la valeur n'est plus pré-remplie
/*Ajout du calendrier pour choisir la date*/
347,7 → 347,7
break;
case 'Filter-Id' :
echo "<select name='Filter-Id'>";
echo "<option>$l_filtering_none</option>";
echo "<option value=\"\">$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>";
380,7 → 380,8
echo "</table>";
if($create == 1)
{
echo "<a href=\"ticket.pdf\">Ticket</a><br/><br/>";
$ticket_name="ticket_".$login.".pdf";
echo "<a href=\"$ticket_name\">Ticket</a><br/><br/>";
echo "<center><a href=\"user_admin.php?login=$login\">$l_show_profile</a></center>";
}
else
/web/acc/manager/htdocs/user_new2.php
377,7 → 377,7
break;
case 'Filter-Id' :
echo "<select name='Filter-Id'>";
echo "<option>$l_filtering_none</option>";
echo "<option value=\"\">$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>";