From fba8387cc55f40f31b5abc8a66d61684b987293a Mon Sep 17 00:00:00 2001 From: Chuck Scott Date: Tue, 23 Jan 2018 14:35:24 -0500 Subject: [PATCH] Fixed problems various tabs now showing in "Settings" and other fixes. Added filters to commonHooks to say whether members and/or counties are enabled. Applied those filters in the admin/settings/header.html file instead of view parameters. Removed code that added $enable_members and $enable_counties view parameters from a number of files. Added info on new hooks to hooksHelp.html --- .gitignore | 3 +++ models/admin/settings/amenities.php | 2 -- models/admin/settings/categories.php | 2 -- models/admin/settings/cities.php | 10 ++++------ models/admin/settings/counties.php | 2 -- models/admin/settings/index.php | 2 -- models/admin/settings/regions.php | 2 -- setup/commonHooks.php | 29 +++++++++++++++++++++++++--- setup/frontHooks.php | 4 +++- setup/hooksHelp.html | 22 +++++++++++++++++++++ views/admin/settings/header.html | 13 +++++++------ 11 files changed, 65 insertions(+), 26 deletions(-) diff --git a/.gitignore b/.gitignore index 53f75f14..c6ac75e9 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,6 @@ misc/smarty/** media/images/** .project node_modules +.buildpath +.settings + diff --git a/models/admin/settings/amenities.php b/models/admin/settings/amenities.php index 0cb2183c..e0a8abc5 100644 --- a/models/admin/settings/amenities.php +++ b/models/admin/settings/amenities.php @@ -107,7 +107,6 @@ class GlmMembersAdmin_settings_amenities extends GlmDataAmenities $error = false; $option2 = ''; $newAmenity = $this->newEntry(); - $enable_members = $this->config['settings']['enable_members']; // Check if a category ID is supplied $id = 0; @@ -256,7 +255,6 @@ class GlmMembersAdmin_settings_amenities extends GlmDataAmenities // Compile template data $templateData = array( - 'enable_members' => $enable_members, 'haveAmenities' => $haveAmenities, 'haveGroups' => $haveGroups, 'amenities' => $amenities, diff --git a/models/admin/settings/categories.php b/models/admin/settings/categories.php index 7c670df8..5574e3c1 100644 --- a/models/admin/settings/categories.php +++ b/models/admin/settings/categories.php @@ -103,7 +103,6 @@ class GlmMembersAdmin_settings_categories extends GlmDataCategories $haveCategories = false; $categories = false; $error = false; - $enable_members = $this->config['settings']['enable_members']; // Check if a category ID is supplied $id = 0; @@ -176,7 +175,6 @@ class GlmMembersAdmin_settings_categories extends GlmDataCategories // Compile template data $templateData = array( - 'enable_members' => $enable_members, 'haveCategories' => $haveCategories, 'categories' => $categories ); diff --git a/models/admin/settings/cities.php b/models/admin/settings/cities.php index b4dfb566..2c9378cf 100644 --- a/models/admin/settings/cities.php +++ b/models/admin/settings/cities.php @@ -103,7 +103,6 @@ class GlmMembersAdmin_settings_cities extends GlmDataCities $haveCities = false; $cities = false; $error = false; - $enable_members = $this->config['settings']['enable_members']; // Check if a city ID is supplied $id = 0; @@ -151,7 +150,7 @@ class GlmMembersAdmin_settings_cities extends GlmDataCities $haveCities = true; } } - + // Get a list of all members by city, used in the Settings > Cities list to limit city deletion require_once GLM_MEMBERS_PLUGIN_CLASS_PATH.'/data/dataMemberInfo.php'; $MemberInfo = new GlmDataMemberInfo($this->wpdb, $this->config); @@ -162,7 +161,7 @@ class GlmMembersAdmin_settings_cities extends GlmDataCities //echo var_dump(addSlashes($memberForCity["member_name"])); $citiesWithMembers[$city["id"]][$memberForCity["id"]] = $memberForCity["member_name"]; } - + } // If we had a fatal error, redirect to the error page @@ -178,11 +177,10 @@ class GlmMembersAdmin_settings_cities extends GlmDataCities // $citiesWithMembersJSON = htmlspecialchars(json_encode($citiesWithMembers), ENT_QUOTES, 'UTF-8'); $citiesWithMembersJSON = json_encode($citiesWithMembers); $citiesWithMembersJSON = str_replace("'", "\'", $citiesWithMembersJSON); - - + + // Compile template data $templateData = array( - 'enable_members' => $enable_members, 'haveCities' => $haveCities, 'cities' => $cities, 'citiesWithMembers' => $citiesWithMembers, diff --git a/models/admin/settings/counties.php b/models/admin/settings/counties.php index 65430de8..be4853a0 100644 --- a/models/admin/settings/counties.php +++ b/models/admin/settings/counties.php @@ -103,7 +103,6 @@ class GlmMembersAdmin_settings_counties extends GlmDataCounties $haveCounties = false; $counties = false; $error = false; - $enable_members = $this->config['settings']['enable_members']; // Check for county id $id = 0; @@ -165,7 +164,6 @@ class GlmMembersAdmin_settings_counties extends GlmDataCounties // Compile template data $templateData = array( - 'enable_members' => $enable_members, 'haveCounties' => $haveCounties, 'counties' => $counties ); diff --git a/models/admin/settings/index.php b/models/admin/settings/index.php index 59a93e1f..0babce52 100644 --- a/models/admin/settings/index.php +++ b/models/admin/settings/index.php @@ -104,7 +104,6 @@ class GlmMembersAdmin_settings_index extends GlmDataMemberTypes $memberTypes = false; $couldNotDelete = false; $error = false; - $enable_members = $this->config['settings']['enable_members']; // Check for member type id $id = 0; @@ -178,7 +177,6 @@ class GlmMembersAdmin_settings_index extends GlmDataMemberTypes // Compile template data $templateData = array( - 'enable_members' => $enable_members, 'haveMemberTypes' => $haveMemberTypes, 'memberTypes' => $memberTypes, 'couldNotDelete' => $couldNotDelete diff --git a/models/admin/settings/regions.php b/models/admin/settings/regions.php index 89ecc28a..a53072e6 100644 --- a/models/admin/settings/regions.php +++ b/models/admin/settings/regions.php @@ -103,7 +103,6 @@ class GlmMembersAdmin_settings_regions extends GlmDataRegions $haveRegions = false; $regions = false; $error = false; - $enable_members = $this->config['settings']['enable_members']; // Check for region id $id = 0; @@ -165,7 +164,6 @@ class GlmMembersAdmin_settings_regions extends GlmDataRegions // Compile template data $templateData = array( - 'enable_members' => $enable_members, 'haveRegions' => $haveRegions, 'regions' => $regions ); diff --git a/setup/commonHooks.php b/setup/commonHooks.php index 76c044a9..9019ddf8 100644 --- a/setup/commonHooks.php +++ b/setup/commonHooks.php @@ -15,7 +15,7 @@ */ /* - * Place Misc Hooks and Filters that should be available to both admin and front processes here. + * Place Misc Hooks and Filters that should be available to both admin and front processes here. * If this file exists, it will be included by the main plugin script. * * Note that filter and hook callback functions must be included in-line as shown below... @@ -24,6 +24,29 @@ * // Function code * }); * - * Also note that parameters will be in the context of the main admin controller constructor. - */ + * Also note that parameters will be in the context of either the Front or Admin controller, + * depending on where the hook is called from. + */ + +// Return TRUE if Members are enabled +add_filter('glm-member-db-common-members-enabled', function($enabled) { + + $enabled = $this->config['settings']['enable_members']; + + return $enabled; +}, +10, +2 +); + +// Return TRUE if Counties are enabled +add_filter('glm-member-db-common-counties-enabled', function($enabled) { + + $enabled = $this->config['settings']['enable_counties']; + + return $enabled; +}, +10, +2 +); diff --git a/setup/frontHooks.php b/setup/frontHooks.php index 4e6de1df..39bfa4a1 100644 --- a/setup/frontHooks.php +++ b/setup/frontHooks.php @@ -43,7 +43,9 @@ add_action('wp_loaded', function() { if (!is_admin()) { $rules = get_option('rewrite_rules'); if ( ! isset( $rules[GLM_MEMBERS_REWRITE_RULE] ) ) { - trigger_error('Doing rewrite flush - Member detail page', E_USER_NOTICE); // Logging that this is happening so we can track when that happens. + if (GLM_MEMBERS_PLUGIN_FRONT_DEBUG_VERBOSE) { + trigger_error('Doing rewrite flush - Member detail page', E_USER_NOTICE); // Logging that this is happening so we can track when that happens. + } global $wp_rewrite; $wp_rewrite->flush_rules(); } diff --git a/setup/hooksHelp.html b/setup/hooksHelp.html index d4a299ab..404ac483 100644 --- a/setup/hooksHelp.html +++ b/setup/hooksHelp.html @@ -2,7 +2,29 @@

Main Member DB Plugin

+

Misc. Settings Hooks

+ + + glm-member-db-common-members-enabled + Filter + + + Returns TRUE if members are enabled in the Misc. Settings Management page. + This is a "Common" filter that may be called from either Admin or Front. + + + + glm-member-db-common-counties-enabled + Filter + + + Returns TRUE if Member Counties are enabled in the Misc. Settings Management page. + This is a "Common" filter that may be called from either Admin or Front. + + +

Add-On Registration Hooks

+ glm-member-db-register-addon Filter diff --git a/views/admin/settings/header.html b/views/admin/settings/header.html index 8e509ee4..713b88aa 100644 --- a/views/admin/settings/header.html +++ b/views/admin/settings/header.html @@ -3,18 +3,19 @@

{$glmPluginName} Settings

- {if $enable_members} +{if apply_filters('glm-member-db-common-members-enabled', false)} + {$terms.term_member_cap} Types {$terms.term_member_cap} Categories Amenities - {/if} +{/if} Cities - {if $enable_members} +{if apply_filters('glm-member-db-common-members-enabled', false)} Regions - {if $settings.enable_counties} + {if apply_filters('glm-member-db-common-counties-enabled', false)} {$terms.term_admin_menu_configure_counties} - {/if} - {/if} + {/if} +{/if} {foreach $addOnTabs as $a} {$a.text} {/foreach} -- 2.17.1