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.=''; 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";