From c71a6fe5c5bc690a9caa1381b8b27db76df3288a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Mon, 22 Oct 2007 00:29:08 +0000
Subject: [PATCH] =?UTF-8?q?Dissocie=20adh=E9rent=20valide=20=E0=20jour=20d?=
 =?UTF-8?q?e=20non=20=E0=20jour=20dans=20liste=20emailings?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/mailings/fraise.modules.php         | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/htdocs/includes/modules/mailings/fraise.modules.php b/htdocs/includes/modules/mailings/fraise.modules.php
index 4d109537097..e29eb089272 100644
--- a/htdocs/includes/modules/mailings/fraise.modules.php
+++ b/htdocs/includes/modules/mailings/fraise.modules.php
@@ -72,8 +72,11 @@ class mailing_fraise extends MailingTargets
         global $langs;
         $langs->load("members");
 
+		// Array for requests for statistics board
 	    $statssql=array();
-        $statssql[0]="SELECT '".addslashes($langs->trans("FundationMembers"))."' as label, count(*) as nb FROM ".MAIN_DB_PREFIX."adherent where statut = 1";
+
+        $statssql[0] ="SELECT '".addslashes($langs->trans("FundationMembers"))."' as label, count(*) as nb";
+		$statssql[0].=" FROM ".MAIN_DB_PREFIX."adherent where statut = 1";
 
 		return $statssql;
 	}
@@ -109,8 +112,9 @@ class mailing_fraise extends MailingTargets
         
         $s='';
         $s.='<select name="filter" class="flat">';
-        $s.='<option value="-1">'.$langs->trans("MemberStatusDraftShort").'</option>';
-        $s.='<option value="1" selected="true">'.$langs->trans("MemberStatusActiveShort").'</option>';
+        $s.='<option value="-1">'.$langs->trans("MemberStatusDraft").'</option>';
+        $s.='<option value="1a">'.$langs->trans("MemberStatusActiveShort").' ('.$langs->trans("MemberStatusPayedShort").')</option>';
+        $s.='<option value="1b">'.$langs->trans("MemberStatusActiveShort").' ('.$langs->trans("MemberStatusActiveLateShort").')</option>';
         $s.='<option value="0">'.$langs->trans("MemberStatusResiliatedShort").'</option>';
         $s.='</select>';
         return $s;
@@ -143,9 +147,10 @@ class mailing_fraise extends MailingTargets
         $sql.= " WHERE a.email IS NOT NULL";
         foreach($filtersarray as $key)
         {
-            if ($key == -1) $sql.= " AND a.statut=-1";
-            if ($key == 0)  $sql.= " AND a.statut=0";
-            if ($key == 1)  $sql.= " AND a.statut=1";
+            if ($key == '-1') $sql.= " AND a.statut=-1";
+            if ($key == '1a')  $sql.= " AND a.statut=1 AND datefin >= sysdate()";
+            if ($key == '1b')  $sql.= " AND a.statut=1 AND datefin < sysdate()";
+            if ($key == '0')  $sql.= " AND a.statut=0";
         }
         $sql.= " ORDER BY a.email";