From bd4c5e41db9824dc3f5e4dfc56edc9933ce053bb Mon Sep 17 00:00:00 2001
From: Sam White <webmaster@ycra.org.uk>
Date: Sun, 25 Feb 2024 06:34:12 -0700
Subject: [PATCH] Update members page after fixing duplicate database records.

---
 public_html/members.php | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/public_html/members.php b/public_html/members.php
index 0cd3f49..e2ef47c 100644
--- a/public_html/members.php
+++ b/public_html/members.php
@@ -14,22 +14,23 @@ function content() {
   if (!check_logged_in()) {?>
     <h1>Restricted access page</h1><?php
     return;
-  }?>
+  }
+
+  # Count number of members in database.
+  $result = run_sql('SELECT COUNT(id) FROM members');
+  $num_members = mysqli_fetch_row($result)[0];?>
 
   <h1>YCRA Members</h1>
 
-  <p>Below is a list of members, listed in order of newest first. If the member
-  tried to submit the membership form more than once (with the same email
-  address), only the latest submitted information is shown.</p>
+  <p>Below is a list of members, listed in order of newest first. We currently
+  have the details for <?php esc($num_members);?> members.</p>
 
   <p>Click <a <?php href('members.php?csv=emails');?>>here</a> to download a CSV
   file containing the email addresses of all members.</p>
 
-  <p>Please note this is a work in progress and the membership records will be
-  fully reconciled at some point.</p><?php
+  <p>Please note this is a work in progress.</p><?php
 
-  $result = run_sql('SELECT * FROM members GROUP BY(email_address) ORDER BY id DESC');
-  $members_num = 0;?>
+  $result = run_sql('SELECT * FROM members ORDER BY id DESC');?>
 
   <table>
     <tr>
@@ -41,8 +42,7 @@ function content() {
       <th>Address</th>
       <th>PayPal?</th>
     </tr><?php
-    while ($member = mysqli_fetch_array($result, MYSQLI_ASSOC)) {
-      $members_num++;?>
+    while ($member = mysqli_fetch_array($result, MYSQLI_ASSOC)) {?>
       <tr>
         <td><?php esc($member['id']);?></td>
         <td><?php esc($member['first_name'] . ' ' . $member['surname']);?></td>
@@ -67,12 +67,10 @@ function content() {
       </tr><?php
     }?>
   </table><?php
-
-  esc('Total number of members: ' . $members_num);
 }
 
 if (!empty($_GET['csv']) && $_GET['csv'] == 'emails' && check_logged_in()) {
-  $result = run_sql('SELECT * FROM members GROUP BY(email_address) ORDER BY id DESC');
+  $result = run_sql('SELECT email_address FROM members GROUP BY(email_address) ORDER BY id DESC');
 
   header('Content-Type: text/csv');
   header('Content-Disposition: inline; filename="ycra-member-emails.csv"');
-- 
2.25.1