Cleaned up another merge conflict with dataTimes.php

Removed duplicate add_filter() calls in adminHooks.php and cleaned up conflicts in commonHooks.php
Added registrations filter to event edit page to show notices when editing and updating an event with registrations.

diff --git a/classes/data/dataTimes.php b/classes/data/dataTimes.php
index cd6433d..4e5b7e8 100644 (file)
--- a/classes/data/dataTimes.php
+++ b/classes/data/dataTimes.php
@@ -297,8 +297,8 @@ class GlmDataEventsTimes extends GlmDataAbstract
     public function getEventTimesByRecurrenceSimplified($recurrenceID = false, $startDate = false, $endDate = false)
     {
 
+        // Save fields and set simplified list of fields
         $savedFields = $this->fields;
-
         $this->fields = array(
             'id' => $savedFields['id'],
             'start_time' => $savedFields['start_time'],
@@ -306,29 +306,28 @@ class GlmDataEventsTimes extends GlmDataAbstract
             'all_day' => $savedFields['all_day']
         );
 
+
         $where = " T.recur_id = $recurrenceID ";
 
         // Only display times from startDate to endDate
         if (!$startDate) {
-
-            // With no start time supplied, only supply times from today forward.
             $startDate = date('Y-m-d H:i:s');
-
         }
         $where .= " AND T.start_time >= '$startDate' ";
         if ($endDate) {
             $where .= " AND T.start_time <= '$endDate' ";
         }
 
+        // Get the times list
         $timesSimplified = $this->getList($where, 'start_time');
 
+        // Restore the fields list
         $this->fields = $savedFields;
 
         return $timesSimplified;
 
     }
 
-
 }
 
 ?>

diff --git a/setup/adminHooks.php b/setup/adminHooks.php
index 6285f8f..b9dcb50 100644 (file)
--- a/setup/adminHooks.php
+++ b/setup/adminHooks.php
@@ -61,15 +61,24 @@ add_filter( 'glm-member-db-events-get-events', function( $output ){
     return $events;
 } );
 
+
+// If we have a logged in user
 if (isset($this->config['loggedInUser']) && isset($this->config['loggedInUser']['contactUser']) && $this->config['loggedInUser']['contactUser']) {
-    // check the settings to see if members are allow to manage events
+
+    // Check the settings to see if members are allow to manage events
     $memberEventsAllowed = isset( $this->config['settings']['member_events_allowed'] )
         ? $this->config['settings']['member_events_allowed']
         : true;
+
+// Otherwise this must be an administrator
 } else {
     $memberEventsAllowed = true;
 }
+
+// If allowed to manage events, add these two widget filters
 if ( $memberEventsAllowed ) {
+
+
     add_filter(
         'glm-member-db-dashboard-member-widgets',
         function ( $member = null ) {
@@ -79,6 +88,7 @@ if ( $memberEventsAllowed ) {
         12,
         1
     );
+
     add_filter(
         'glm-member-db-dashboard-member-admin-widgets',
         function ( $member = null ) {
@@ -88,9 +98,8 @@ if ( $memberEventsAllowed ) {
         12,
         1
     );
-}
-
 
+}
 
 /*
  * Provide basic event data by Lat/Lon search for use as map items.

diff --git a/setup/commonHooks.php b/setup/commonHooks.php
index fffcf98..0bf2fc4 100644 (file)
--- a/setup/commonHooks.php
+++ b/setup/commonHooks.php
@@ -5,6 +5,12 @@
 // Add hook to return base event data for a specific event ID
 add_filter( 'glm-member-db-events-get-event', function( $eventID ){
 
+    // Make sure we have an integer
+    If (!is_numeric($eventID)) {
+        trigger_error('Supplied value to this filter not numeric. Is there another add_filter with this name?', E_USER_WARNING);
+        return $eventID;
+    }
+
     // Check for positive integer event ID
     $eventId = ($eventID-0);
     if ($eventId == 0) {
@@ -33,6 +39,12 @@ add_filter( 'glm-member-db-events-get-event', function( $eventID ){
 // Add hook to return event recurrences and times data for a specific event ID
 add_filter( 'glm-member-db-events-get-event-times', function( $eventID ){
 
+    // Make sure we have an integer
+    If (!is_numeric($eventID)) {
+        trigger_error('Supplied value to this filter not numeric. Is there another add_filter with this name?', E_USER_WARNING);
+        return $eventID;
+    }
+
     // Check for positive integer event ID
     $eventId = ($eventID-0);
     if ($eventId == 0) {
@@ -57,3 +69,4 @@ add_filter( 'glm-member-db-events-get-event-times', function( $eventID ){
     return $recurrences;
 
 } );
+

diff --git a/views/admin/events/edit.html b/views/admin/events/edit.html
index 60858d5..7813c9a 100644 (file)
--- a/views/admin/events/edit.html
+++ b/views/admin/events/edit.html
@@ -25,6 +25,15 @@
         {if $eventAddError}<span class="glm-error glm-flash-updated">Event Add Error</span>{/if}
     </h2>
 
+  {if $option == 'edit' || $option == 'update'}
+    {$e_link = apply_filters('glm_members_add_link_to_event_list_entry', $event.fieldData.id)}
+    {if is_array($e_link)}
+    <div style="margin: 1em 0em 1em 0em;">
+        <div class="glm-strong-warning">{if $option == 'edit'}{$e_link.edit_warning}{else}{$e_link.update_warning}{/if}<p><a class="button button-secondary glm-button-small" href="{$e_link.url|escape:'string'}">{$e_link.warning_title}</a></p></div>
+       </div>
+    {/if}
+  {/if}
+  
   {if $eventUpdateError || $eventAddError}
     <h1 class="glm-error">NOTICE: Your event has not yet been submitted.<br>Please select the tabs indicating a problem, correct the indicated fields and resubmit.</h1>
   {else}