From 4dd692aa9de66c406ec114aa5df103a193872567 Mon Sep 17 00:00:00 2001
From: Sam White <webmaster@ycra.org.uk>
Date: Sat, 9 Apr 2022 12:57:59 +0000
Subject: [PATCH] Add initial version of Spring event sign up form.

---
 public_html/events.php          |  17 +++--
 public_html/includes/forms.php  |   6 +-
 public_html/includes/navbar.php |   6 +-
 public_html/winter-event.php    | 111 --------------------------------
 4 files changed, 19 insertions(+), 121 deletions(-)
 delete mode 100644 public_html/winter-event.php

diff --git a/public_html/events.php b/public_html/events.php
index f70ae0f..7bfbbe2 100644
--- a/public_html/events.php
+++ b/public_html/events.php
@@ -30,8 +30,17 @@ function content() {?>
 
   <p>Below is a list of the events we currently have planned.</p>
 
-  <p>Keep checking back here for updates on what we are up to.</p>
+  <h3 id="spring-event-2022">Spring event: 23rd April 2022</h3>
 
+  <p><a <?php href("spring-event.php");?>>Join us</a> in Bristol on Saturday, 23rd
+  April for our Spring event.</p>
+
+  <h3>Summer event: September 2022</h3>
+
+  <p>Come and join us in Nottingham for our YCRA Summer event. More details to
+  follow!</p> <p>Keep checking back here for updates on what we are up to.</p>
+
+  <h2>Past events</h2>
   <h3 id="winter-event-2022">Winter event: 15th January 2022</h3>
   <p>The inaugural YCRA event! Come and join us in Birmingham for chance to ring
   with other young ringers at iconic towers such as St Martin's in the
@@ -83,11 +92,7 @@ function content() {?>
 
   <p>We would like to thank Clare McArdle for her help in organising this event. 
   We look forward to seeing you all there.</p>
-
-  <h3>Summer event: September 2022</h3>
-
-  <p>Come and join us in Nottingham for our YCRA Summer event. More details to
-  follow!</p><?php
+<?php
 }
 
 include_once('includes/template.php');
diff --git a/public_html/includes/forms.php b/public_html/includes/forms.php
index 19e37a1..3aa65a7 100644
--- a/public_html/includes/forms.php
+++ b/public_html/includes/forms.php
@@ -9,7 +9,11 @@ function confirm_sent_form_data($data, $keys) {?>
         if (!empty($data[$key])) {?>
           <tr>
             <th><?php esc(key_to_human_text($key));?>:</th>
-            <td><?php esc($data[$key]);?></td>
+            <td><?php
+                if ($key == 'consent_form_completed')
+                  esc($data[$key] ? 'Yes' : 'No');
+                else esc($data[$key]);?>
+            </td>
           </tr><?php
           hidden_field($key, $data[$key]);
         }
diff --git a/public_html/includes/navbar.php b/public_html/includes/navbar.php
index a020d79..9454e5a 100644
--- a/public_html/includes/navbar.php
+++ b/public_html/includes/navbar.php
@@ -25,9 +25,9 @@ function get_menu_pages() {
                 'name' => 'Events',
                 'path' => 'events.php'
               ],
-    'winter-event' => [
-                'name' => 'Winter event sign up',
-                'path' => 'winter-event.php'
+    'spring-event' => [
+                'name' => 'Spring event sign up',
+                'path' => 'spring-event.php'
               ],/*
     'links' => [ 'name' => 'Useful Links',
                 'path' => '#'
diff --git a/public_html/winter-event.php b/public_html/winter-event.php
deleted file mode 100644
index 54464c1..0000000
--- a/public_html/winter-event.php
+++ /dev/null
@@ -1,111 +0,0 @@
-<?php
-require_once('includes/utils.php');
-require_once('includes/html-templating.php');
-require_once('includes/fields.php');
-require_once('includes/forms.php');
-require_once('includes/form-validation.php');
-require_once('includes/database.php');
-
-function validate_submission(&$errors, $data) {
-  if (validate_email_address($errors, $data['email_address'])) {
-    if (!record_exists('members', simple_where('email_address', $data['email_address'])))
-      $errors[] = 'Please enter the email address you used to sign up for membership. '
-                . 'If you have forgotten this email address, please contact us at events@ycra.org.uk so we can assist you.';
-  }
-  if (empty($data['consent']) && !array_key_exists('confirm', $data))
-    $errors[] = 'You must give your consent for us to process your data.';
-
-  return empty($errors);
-}
-
-function page_title() {
-  return 'Winter Event Tickets';
-}
-
-function additional_stylesheets() {
-  stylesheet('fields');
-}
-
-function content() {?>
-  <h1>Winter event tickets</h1>
-
-  <?php
-  /*
-  $errors = $params = [];
-
-  if (array_key_exists('ticket', $_POST)) {
-    if (validate_submission($errors, $_POST)) {
-      confirm_sent_form_data($_POST, ['email_address', 'accompanying_adults', 'dietary_requirements']);
-      return;
-    }
-  }
-
-  if (array_key_exists('confirm', $_POST) && validate_submission($errors, $_POST)) {
-    $record = fetch_record('members', 'id', simple_where('email_address', $_POST['email_address'])
-                           . ' ORDER BY id DESC LIMIT 1');
-    $id = $record['id'];
-
-    if (record_exists('event_tickets', simple_where('member_id', $id) . ' AND event_id=1')) {?>
-      <p>You have already signed up to this event.</p>
-
-      <p>If you would like to amend the information you previously submitted,
-         please email us at <a href="mailto:events@ycra.org.uk">events@ycra.org.uk</a>.</p><?php
-      return;
-    }
-    foreach (['accompanying_adults', 'dietary_requirements'] as $key)
-      if (!empty($_POST[$key])) $details[$key] = $_POST[$key];
-      else $details[$key] = null;
-
-    insert_array('event_tickets',
-                 ['event_id'=>'1','member_id'=>$id,'date_added'=>date('Y-m-d H:i:s'),
-                  'details'=>json_encode($details)]);?>
-    <p>Your details have been submitted successfully.</p>
-    <p>We will email you with more details about the event soon.</p><?php
-    return;
-  }
-
-  if ($_POST) $params = $_POST;*/?>
-
-  <p>We will be holding our inaugural ringing event in Birmingham on Saturday,
-  15 January 2022. There will be the opportunity to ring at some great towers in
-  Birmingham, including the 16 at the bullring!</p>
-
-  <p>Please see the <a <?php href('events.php#winter-event-2022');?>>events page</a>
-  for the itinerary and more information about this event. We would like to thank
-  Clare McArdle for her help in organising this event.</p>
-
-  <p>Please use the form below to book your place at this event. It will be free
-  for YCRA members to attend this event.</p>
-
-  <p><b>Sign ups for this event have now closed. We look forward to seeing many of you there.</b></p>
-
-  <?php show_error_list($errors);?>
-
-  <!--form method="post" action=""><?php
-    /*
-    email_field($params, 'email_address',
-                'Email address used for membership sign-up', ['required'=>'']);
-
-    textarea($params, 'accompanying_adults',
-            'Please enter the full names of any adults who will be accompanying you',
-            ['rows'=>'2']);
-
-    textarea($params, 'dietary_requirements', 'Do you have any dietary requirements?');*/?>
-
-    <div class="field">
-      <input type="checkbox" name="consent" id="consent" value="1" />
-      <label for="consent">
-        I agree for the data I submit with this form to be processed in
-        accordance with the
-        <a target="_blank" <?php document_href('privacy-policy-v2.pdf');?>>YCRA privacy policy</a>.
-      </label>
-    </div>
-
-    <input type="submit" name="ticket" value="Request ticket" />
-  </form--><?php
-
-}
-
-
-require_once('includes/template.php');
-?>
-- 
2.25.1