From aecdc0fa4c9747401c7bbc48d14c419684ad4d73 Mon Sep 17 00:00:00 2001
From: David <david@mercereau.info>
Date: Sun, 18 Mar 2018 12:05:13 +0100
Subject: [PATCH] #3 Modification de l'ordre dans le fichier virtual

---
 .gitignore          | 1 +
 lib/ep_function.php | 2 +-
 var/aliasdeny.txt   | 0
 var/blacklist.txt   | 5 ++++-
 4 files changed, 6 insertions(+), 2 deletions(-)
 mode change 100644 => 100755 var/aliasdeny.txt
 mode change 100644 => 100755 var/blacklist.txt

diff --git a/.gitignore b/.gitignore
index 64d1398..719f2d8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ checkupdate
 conf.php
 test*
 var/database*
+var/.htaccess
diff --git a/lib/ep_function.php b/lib/ep_function.php
index fb0dd78..c07ddb9 100644
--- a/lib/ep_function.php
+++ b/lib/ep_function.php
@@ -31,7 +31,7 @@ function UpdateVirtualDB() {
 		$selectcmd = $dbco->prepare("SELECT status, alias, email
 									FROM ".DBTABLEPREFIX."alias 
 									WHERE status > 0
-									ORDER BY id ASC");
+									ORDER BY alias ASC");
 		$selectcmd->execute();
 	} catch ( PDOException $e ) {
 		echo "DB error :  ", $e->getMessage();
diff --git a/var/aliasdeny.txt b/var/aliasdeny.txt
old mode 100644
new mode 100755
diff --git a/var/blacklist.txt b/var/blacklist.txt
old mode 100644
new mode 100755
index 2221216..407e9a0
--- a/var/blacklist.txt
+++ b/var/blacklist.txt
@@ -1,4 +1,7 @@
 /^exemple@exemple.com$/
 /.pl$/
 /^exemple[1-9]+@toto.fr$/
-
+/@yopmail.com$/
+/^harou/
+/@gmx.com$/
+/^sportnet/