Adding a commonHooks.php file

Placing the add_filter that may be used in data classes into common
hooks file so they get called in both the front and admin.

diff --git a/setup/adminHooks.php b/setup/adminHooks.php
index 3896b8b..cc6ba39 100644 (file)
--- a/setup/adminHooks.php
+++ b/setup/adminHooks.php
@@ -61,30 +61,6 @@ add_filter( 'glm-member-db-events-get-events', function( $output ){
     return $events;
 } );
 
-// Add hook to return base event data for a specific event ID
-add_filter( 'glm-member-db-events-get-event', function( $eventID ){
-
-    // Check for positive integer event ID
-    $eventId = ($eventID-0);
-    if ($eventId == 0) {
-        return $eventID;
-    }
-
-    // Call dedicated model to get event base data
-    require_once GLM_MEMBERS_EVENTS_PLUGIN_CLASS_PATH.'/data/dataEvents.php';
-    $EventData = new GlmDataEvents($this->wpdb, $this->config);
-    $eventData = $EventData->getEntry($eventId);
-
-    // If we got good event base data, return that
-    if ($eventData) {
-        return $eventData;
-    }
-
-    // Otherwise pass on the event ID
-    return $eventId;
-
-} );
-
 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
     $memberEventsAllowed = isset( $this->config['settings']['member_events_allowed'] )
@@ -116,32 +92,32 @@ if ( $memberEventsAllowed ) {
 
 // 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 ){
-    
+
     // Check for positive integer event ID
     $eventId = ($eventID-0);
     if ($eventId == 0) {
         return $eventID;
     }
-    
+
     // Call dedicated model to get event base data
     require_once GLM_MEMBERS_EVENTS_PLUGIN_CLASS_PATH.'/data/dataEvents.php';
     $EventData = new GlmDataEvents($this->wpdb, $this->config);
     $eventData = $EventData->getEntry($eventId);
-    
+
     // If we didn't get a good event, just pass on supplied data
     if (!$eventData) {
         return $eventId;
     }
- 
+
     // Get any schedules and times for this event
     require_once GLM_MEMBERS_EVENTS_PLUGIN_CLASS_PATH.'/data/dataRecurrences.php';
     $RecurrenceData = new GlmDataEventsRecurrences($this->wpdb, $this->config);
     $recurrences = $RecurrenceData->getRecurWithTimes($eventId);
-   
+
     return $recurrences;
-    
+
 } );
-    
+
 
 
 

diff --git a/setup/commonHooks.php b/setup/commonHooks.php
new file mode 100644 (file)
index 0000000..d08c3b1
--- /dev/null
+++ b/setup/commonHooks.php
@@ -0,0 +1,29 @@
+<?php
+// Place any filters that are being called from the data classes here.
+// This hooks files gets called in for both admin and front.
+
+// Add hook to return base event data for a specific event ID
+add_filter( 'glm-member-db-events-get-event', function( $eventID ){
+
+    // Check for positive integer event ID
+    $eventId = ($eventID-0);
+    if ($eventId == 0) {
+        return $eventID;
+    }
+
+    // Call dedicated model to get event base data
+    require_once GLM_MEMBERS_EVENTS_PLUGIN_CLASS_PATH.'/data/dataEvents.php';
+    $EventData = new GlmDataEvents($this->wpdb, $this->config);
+    $eventData = $EventData->getEntry($eventId);
+
+    // If we got good event base data, return that
+    if ($eventData) {
+        return $eventData;
+    }
+
+    // Otherwise pass on the event ID
+    return $eventId;
+
+} );
+
+