Replacing direct access to a member configuration setting with a filter.

diff --git a/models/admin/events/list.php b/models/admin/events/list.php
index 615a701..01f0ae8 100644 (file)
--- a/models/admin/events/list.php
+++ b/models/admin/events/list.php
@@ -141,7 +141,6 @@ class GlmMembersAdmin_events_list extends GlmDataEvents
         $start            = 1;
         $limit            = 20;        // Set to the number of listings per page
         $namesList        = false;
-        $enable_members   = $this->config['settings']['enable_members'];
         $old_event_status = false;
 
         // Load Notifications from the helper classes
@@ -956,7 +955,6 @@ class GlmMembersAdmin_events_list extends GlmDataEvents
             $this->config['settings']['event_default_state'] = $this->config['settings']['default_state'];
         }
         $templateData = array(
-            'enable_members'    => $enable_members,
             'lockedToMember'    => $lockedToMember,
             'isModerated'       => $isModerated,
             'option'            => $option,

diff --git a/models/admin/settings/emailNotifications.php b/models/admin/settings/emailNotifications.php
index 1cdefe0..dbd6164 100644 (file)
--- a/models/admin/settings/emailNotifications.php
+++ b/models/admin/settings/emailNotifications.php
@@ -100,7 +100,6 @@ class GlmMembersAdmin_settings_emailNotifications extends GlmDataEmailNotificati
 
         $success        = true;
         $error          = false;
-        $enable_members = $this->config['settings']['enable_members'];
         $email_settings = false;
 
         $email_settings = $this->getSettings();
@@ -135,7 +134,6 @@ class GlmMembersAdmin_settings_emailNotifications extends GlmDataEmailNotificati
 
         // Compile template data
         $templateData = array(
-            'enable_members'    => $enable_members,
             'email_settings'    => $email_settings
         );
 

diff --git a/models/admin/settings/eventAmenities.php b/models/admin/settings/eventAmenities.php
index 6bd88ed..78ab854 100644 (file)
--- a/models/admin/settings/eventAmenities.php
+++ b/models/admin/settings/eventAmenities.php
@@ -105,7 +105,6 @@ class GlmMembersAdmin_settings_eventAmenities extends GlmDataEventsAmenities
         $error          = false;
         $option2        = '';
         $newAmenity     = $this->newEntry();
-        $enable_members = $this->config['settings']['enable_members'];
 
         // Check if a category ID is supplied
         $id = 0;
@@ -236,7 +235,6 @@ class GlmMembersAdmin_settings_eventAmenities extends GlmDataEventsAmenities
 
         // Compile template data
         $templateData = array(
-            'enable_members' => $enable_members,
             'haveAmenities'  => $haveAmenities,
             'haveGroups'     => $haveGroups,
             'amenities'      => $amenities,

diff --git a/models/admin/settings/eventCategories.php b/models/admin/settings/eventCategories.php
index 1c7c2a1..f58e3c0 100644 (file)
--- a/models/admin/settings/eventCategories.php
+++ b/models/admin/settings/eventCategories.php
@@ -102,7 +102,6 @@ class GlmMembersAdmin_settings_eventCategories extends GlmDataEventsCategories
         $haveCategories = false;
         $categories     = false;
         $error          = false;
-        $enable_members = $this->config['settings']['enable_members'];
 
         // Check if a category ID is supplied
         $id = 0;
@@ -175,7 +174,6 @@ class GlmMembersAdmin_settings_eventCategories extends GlmDataEventsCategories
 
         // Compile template data
         $templateData = array(
-            'enable_members' => $enable_members,
             'haveCategories' => $haveCategories,
             'categories'     => $categories
         );

diff --git a/views/admin/events/editStatus.html b/views/admin/events/editStatus.html
index 16148c8..4ba8933 100644 (file)
--- a/views/admin/events/editStatus.html
+++ b/views/admin/events/editStatus.html
@@ -17,7 +17,7 @@
                 {if $event.fieldFail.name}<p>{$event.fieldFail.name}</p>{/if}<br>
             </td>
         </tr>
-    {if $enable_members}
+    {if apply_filters('glm-member-db-common-members-enabled', false)}
         {if $event.fieldData.ref_dest.list|@count > 1}
             <tr>
                 <th>{$terms.term_member_cap}:</th>