From d08c9a5298aa4f39790b2efd85d083421bfd9bd8 Mon Sep 17 00:00:00 2001
From: Alexandre Anriot <aanriot@evolix.fr>
Date: Tue, 13 Sep 2005 14:02:17 +0000
Subject: [PATCH] typos.

---
 admin/Evoauth.pl               |  9 +++++++++
 admin/lib/Evoauth/Functions.pm |  5 +++--
 admin/lib/Evoauth/Iptables.pm  | 21 +++++++++------------
 3 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/admin/Evoauth.pl b/admin/Evoauth.pl
index f3fbac7..56811e7 100644
--- a/admin/Evoauth.pl
+++ b/admin/Evoauth.pl
@@ -5,6 +5,7 @@ package main;
 use strict;
 use warnings;
 use Getopt::Std;
+use Config::Tiny;
 
 use Evoauth::Admin;
 use Evoauth::Functions;
@@ -12,6 +13,14 @@ use Evoauth::Iptables;
 
 $SIG{INT} = $SIG{TERM} = $SIG{KILL} = "";
 
+my $Config = Config::Tiny->read( '/etc/evoauth/evoauth.conf' );
+if ($Config->{control}->{enable} != 1) {
+print <<AVERT;
+enable doit etre egal a 1 dans /etc/evoauth/evoauth.conf avant 
+de continuer".
+AVERT
+}
+
 # choix des options
 my %options=();
 getopts("icsrd:a:",\%options);
diff --git a/admin/lib/Evoauth/Functions.pm b/admin/lib/Evoauth/Functions.pm
index 34a1cce..eb17b00 100644
--- a/admin/lib/Evoauth/Functions.pm
+++ b/admin/lib/Evoauth/Functions.pm
@@ -45,9 +45,10 @@ sub Mail() {
 	my $msg = new MIME::Lite 
 		From    => 'evoauth@shaktiware.fr',
 		To      => 'aanriot@nerim.net',
-		Subject => $event de $login,
+		CC      => '',
+		Subject => '$event de $login',
 		Type    => 'TEXT',
-		Data    => "$temps : $event de $login ($ip).";
+		Data    => '$temps : $event de $login ($ip)';
 
 	$msg -> send && &Log("Un mail a été envoyé.");
 	$dbh->disconnect();
diff --git a/admin/lib/Evoauth/Iptables.pm b/admin/lib/Evoauth/Iptables.pm
index 9217043..97700ed 100644
--- a/admin/lib/Evoauth/Iptables.pm
+++ b/admin/lib/Evoauth/Iptables.pm
@@ -55,7 +55,7 @@ sub Alter() {
 			$sth->execute() &&
 			$sth->finish() &&
 			&Evoauth::Functions::Log("$ip [supprimee]") &&
-			&Evoauth::Functions::Mail("Déconnexion", $ip);
+			&Evoauth::Functions::Mail("Deconnexion", $ip);
 	}
 
 	return 0;
@@ -75,8 +75,7 @@ sub check_iptables() {
 	@ips = <IPS>;
 	close(IPS);
 
-	foreach $ip (@ips)
-	{
+	foreach $ip (@ips) {
 		chomp $ip;
 
 		my $sql = "SELECT statut FROM users where ip = '".$ip."'";
@@ -115,24 +114,22 @@ sub check_timestamp() {
 
 	&Evoauth::Functions::Log("Vérification de la base.");
 
-	my $cpt;     #compteur
-	while ($sth->fetch() && $sth != 0)
-	{
-		if ($statut == 1)
-		{
+	# compteur
+	my $cpt;
+
+	while ($sth->fetch() && $sth != 0) {
+		if ($statut == 1) {
 			$newtime = time();
 			$oldtime = $lastupdate;
 
 			my $timestamp = $newtime - $oldtime;
-			if ($timestamp > $conf{timetorem})
-			{
+			if ($timestamp > $conf{timetorem}) {
 				# dernière connexion est < 1 min -> suppresion
 				&delet($ip) && &Evoauth::Functions::Log("$ip [supprimée]") &&
 					&Evoauth::Functions::Mail("Suppression", $ip);
 			}
 
-			else
-			{
+			else {
 				# sinon conservation
 				&Evoauth::Functions::Log("$ip [conservée]");
 			}