#114 only list members as formers if they have no active role

Admidio · Sep 12, 2015 · 88e3d3c · 88e3d3c
1 parent 9c15655
commit 88e3d3c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/adm_program/modules/messages/messages_write.php b/adm_program/modules/messages/messages_write.php
@@ -353,11 +353,11 @@
         // select Users
 
         $sql   = 'SELECT usr_id, first_name.usd_value as first_name, last_name.usd_value as last_name,
-                                 email.usd_value as email, (SELECT count(1)
+                                 email.usd_value as email, (SELECT DISTINCT 1
                          FROM '.TBL_MEMBERS.' as temp
                         WHERE mem_usr_id = usr_id
-                         AND (  mem_begin > \''.DATE_NOW.'\'
-                        OR mem_end   < \''.DATE_NOW.'\')) as former
+                         AND mem_begin <= \''.DATE_NOW.'\'
+                         AND mem_end   >= \''.DATE_NOW.'\') as active
                     FROM '. TBL_MEMBERS. ', '. TBL_USERS. '
                     JOIN '. TBL_USER_DATA. ' as email
                       ON email.usd_usr_id = usr_id
@@ -375,15 +375,17 @@
                      AND usr_id <> '.$gCurrentUser->getValue('usr_id').'
                      AND usr_valid   = 1
                    GROUP BY usr_id, first_name.usd_value, last_name.usd_value, email.usd_value
-                   ORDER BY former, last_name, first_name';
+                   ORDER BY active DESC, last_name ASC, first_name ASC';
 
         $result = $gDb->query($sql);
 
         $next = true;
         $active = $gL10n->get('LST_ACTIVE_MEMBERS');
 
-        while ($row = $gDb->fetch_array($result)) {
-            if ($row['former'] == 1 && $next == true)
+        while ($row = $gDb->fetch_array($result)) 
+        {
+            // if former members were found then change the string for the group title
+            if ($row['active'] != 1 && $next == true)
             {
                 $active = $gL10n->get('MSG_FORMER_MEMBERS');
                 $next = false;

diff --git a/adm_program/system/constants.php b/adm_program/system/constants.php
@@ -18,7 +18,7 @@
 
 define('ADMIDIO_VERSION_MAIN', 3);
 define('ADMIDIO_VERSION_MINOR', 0);
-define('ADMIDIO_VERSION_PATCH', 1);
+define('ADMIDIO_VERSION_PATCH', 2);
 define('ADMIDIO_VERSION_BETA', 0);
 define('ADMIDIO_VERSION', ADMIDIO_VERSION_MAIN . '.' . ADMIDIO_VERSION_MINOR . '.' . ADMIDIO_VERSION_PATCH);