diff --git a/admin/Evoauth.pl b/admin/Evoauth.pl
index 9a76b05..bcde219 100644
--- a/admin/Evoauth.pl
+++ b/admin/Evoauth.pl
@@ -13,7 +13,8 @@ use Evoauth::Iptables;
$SIG{INT} = $SIG{TERM} = $SIG{KILL} = "";
-&Access();
+# Evoauth doit être activé
+if (&Access() != 0) { exit; };
# choix des options
my %options=();
@@ -21,6 +22,8 @@ getopts("icsrd:a:",\%options);
if (defined $options{a})
{ &Evoauth::Iptables::Alter(1, $options{a}); }
+elsif (defined $options{A})
+ { &Access(); }
elsif (defined $options{d})
{ &Evoauth::Iptables::Alter(3, $options{d});}
elsif (defined $options{c})
@@ -51,6 +54,7 @@ AVERT
sub Usage() {
print "\nusage :\n";
+ print "-A : verification de l'activation\n";
print "-i : initialisation du logiciel\n";
print "-s : arrêt du logiciel\n";
print "-r : redémarrage du logiciel\n";
diff --git a/htdocs/activation.php b/htdocs/activation.php
index 44d3259..3f4994e 100755
--- a/htdocs/activation.php
+++ b/htdocs/activation.php
@@ -40,8 +40,7 @@ else
function loadrules()
{
// activation des règles de firewall
- // system("sudo /usr/local/evoauth/bin/evoauth_fw.pl -a ".$_SESSION['ip']." -m".$_SESSION['mac']);
- system("sudo /usr/local/evoauth/bin/evoauth_fw.pl -a ".$_SESSION['ip']);
+ system("/usr/bin/sudo /usr/local/share/Evoauth.pl -a ".$_SESSION['ip']);
// verrouillage
update_statut($_SESSION['login'], "1");
diff --git a/htdocs/edit.php b/htdocs/edit.php
index cd68dab..ab3a345 100644
--- a/htdocs/edit.php
+++ b/htdocs/edit.php
@@ -276,7 +276,7 @@ if (isset($_SESSION['login']))
$ip = current($resultat);
// désactivation de l'utilisateur dans le firewall
- system("/usr/bin/sudo /usr/local/evoauth/bin/evoauth_fw.pl -d $ip");
+ system("/usr/bin/sudo /usr/local/share/evoauth/Evoauth.pl -d $ip");
// variable nécessaire pour interdir le prochain refresh
setkick($ip, "1");
diff --git a/htdocs/fin.php b/htdocs/fin.php
index f61d389..e5c295d 100644
--- a/htdocs/fin.php
+++ b/htdocs/fin.php
@@ -11,7 +11,7 @@ delrules();
function delrules()
{
// suppression des règles de firewall
- system("sudo /usr/local/evoauth/bin/evoauth_fw.pl -d ".$_SESSION['ip']." > /dev/null");
+ system("/usr/bin/sudo /usr/local/share/evoauth/Evoauth.pl -d ".$_SESSION['ip']." > /dev/null");
update_statut($_SESSION['login'], "0");
}
diff --git a/htdocs/index.php b/htdocs/index.php
index 1e8d189..7d8af70 100644
--- a/htdocs/index.php
+++ b/htdocs/index.php
@@ -8,6 +8,9 @@ session_start();
// destruction de la session
session_unset(EVOAUTH_PHPSESSION);
session_destroy();
+
+$Access = system("/usr/bin/sudo /usr/local/share/evoauth/Evoauth.pl
+-A ".$_SESSION['ip']." > /dev/null");
?>
@@ -31,6 +34,11 @@ session_destroy();
| |
+
+
+
| Login |
|
@@ -43,6 +51,11 @@ session_destroy();
|
|
+
+
+
diff --git a/htdocs/popup_fin.php b/htdocs/popup_fin.php
index b8e016e..a057c08 100644
--- a/htdocs/popup_fin.php
+++ b/htdocs/popup_fin.php
@@ -11,7 +11,7 @@ delrules();
function delrules()
{
// suppression des règles de firewall
- system("sudo /usr/local/evoauth/bin/evoauth_fw.pl -d ".$_SESSION['ip']."> /dev/null");
+ system("/usr/bin/sudo /usr/local/share/evoauth/Evoauth.pl -d ".$_SESSION['ip']."> /dev/null");
update_statut($_SESSION['login'], "0");
}