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
media/images/**
.project
node_modules
+.buildpath
+.settings
+
$error = false;
$option2 = '';
$newAmenity = $this->newEntry();
- $enable_members = $this->config['settings']['enable_members'];
// Check if a category ID is supplied
$id = 0;
// Compile template data
$templateData = array(
- 'enable_members' => $enable_members,
'haveAmenities' => $haveAmenities,
'haveGroups' => $haveGroups,
'amenities' => $amenities,
$haveCategories = false;
$categories = false;
$error = false;
- $enable_members = $this->config['settings']['enable_members'];
// Check if a category ID is supplied
$id = 0;
// Compile template data
$templateData = array(
- 'enable_members' => $enable_members,
'haveCategories' => $haveCategories,
'categories' => $categories
);
$haveCities = false;
$cities = false;
$error = false;
- $enable_members = $this->config['settings']['enable_members'];
// Check if a city ID is supplied
$id = 0;
$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);
//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
// $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,
$haveCounties = false;
$counties = false;
$error = false;
- $enable_members = $this->config['settings']['enable_members'];
// Check for county id
$id = 0;
// Compile template data
$templateData = array(
- 'enable_members' => $enable_members,
'haveCounties' => $haveCounties,
'counties' => $counties
);
$memberTypes = false;
$couldNotDelete = false;
$error = false;
- $enable_members = $this->config['settings']['enable_members'];
// Check for member type id
$id = 0;
// Compile template data
$templateData = array(
- 'enable_members' => $enable_members,
'haveMemberTypes' => $haveMemberTypes,
'memberTypes' => $memberTypes,
'couldNotDelete' => $couldNotDelete
$haveRegions = false;
$regions = false;
$error = false;
- $enable_members = $this->config['settings']['enable_members'];
// Check for region id
$id = 0;
// Compile template data
$templateData = array(
- 'enable_members' => $enable_members,
'haveRegions' => $haveRegions,
'regions' => $regions
);
*/
/*
- * 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...
* // 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
+);
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();
}
<tr><td colspan="3" class="glm-notice"><p><h1>Main Member DB Plugin</h1></p></td></tr>
+ <tr><th colspan="3"><h2>Misc. Settings Hooks</h2></td></tr>
+
+ <tr>
+ <td>glm-member-db-common-members-enabled</td>
+ <td>Filter</td>
+ <td></td>
+ <td>
+ 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.
+ </td>
+ </tr>
+ <tr>
+ <td>glm-member-db-common-counties-enabled</td>
+ <td>Filter</td>
+ <td></td>
+ <td>
+ 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.
+ </td>
+ </tr>
+
<tr><th colspan="3"><h2>Add-On Registration Hooks</h2></td></tr>
+
<tr>
<td>glm-member-db-register-addon</td>
<td>Filter</td>
<h2>{$glmPluginName} Settings</h2>
<h2 class="nav-tab-wrapper">
- {if $enable_members}
+{if apply_filters('glm-member-db-common-members-enabled', false)}
+
<a href="{$thisUrl}?page={$thisPage}&glm_action=index" class="nav-tab{if $thisAction==index} nav-tab-active{/if}">{$terms.term_member_cap} Types</a>
<a href="{$thisUrl}?page={$thisPage}&glm_action=categories" class="nav-tab{if $thisAction==categories} nav-tab-active{/if}">{$terms.term_member_cap} Categories</a>
<a href="{$thisUrl}?page={$thisPage}&glm_action=amenities" class="nav-tab{if $thisAction==amenities} nav-tab-active{/if}">Amenities</a>
- {/if}
+{/if}
<a href="{$thisUrl}?page={$thisPage}&glm_action=cities" class="nav-tab{if $thisAction==cities} nav-tab-active{/if}">Cities</a>
- {if $enable_members}
+{if apply_filters('glm-member-db-common-members-enabled', false)}
<a href="{$thisUrl}?page={$thisPage}&glm_action=regions" class="nav-tab{if $thisAction==regions} nav-tab-active{/if}">Regions</a>
- {if $settings.enable_counties}
+ {if apply_filters('glm-member-db-common-counties-enabled', false)}
<a href="{$thisUrl}?page={$thisPage}&glm_action=counties" class="nav-tab{if $thisAction==counties} nav-tab-active{/if}">{$terms.term_admin_menu_configure_counties}</a>
- {/if}
- {/if}
+ {/if}
+{/if}
{foreach $addOnTabs as $a}
<a href="{$thisUrl}?page={$thisPage}&glm_action={$a.action}" class="nav-tab{if $thisAction==$a.action} nav-tab-active{/if}">{$a.text}</a>
{/foreach}
projects / WP-Plugins / glm-member-db.git / commitdiff