Update for config checks on adminHook and shortcode
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 1 Dec 2016 15:31:39 +0000 (10:31 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 1 Dec 2016 15:31:39 +0000 (10:31 -0500)
Use $config instead of $this->config.
Was getting error messages about undefined indexes when activating the
member plugin.

setup/adminHooks.php
setup/shortcodes.php

index 36b06a0..7a5aa07 100644 (file)
@@ -128,7 +128,7 @@ function glmRemoveDashboard () {
 }
 add_action('admin_menu', 'glmRemoveDashboard');
 
-if ( $this->config['settings']['enable_members'] ) {
+if ( isset( $config ) && isset( $config['settings'] ) && $config['settings']['enable_members'] ) {
     add_filter(
         'glm-member-db-dashboard-member-widgets',
         function ( $member = null ) {
index 9f5926b..743a8b8 100644 (file)
  * )
  *
  */
-$config = $GLOBALS['config'];
-if ( $config['settings']['enable_members'] ) {
-$glmMembersShortcodes = array(
-    'glm-members-list' => array(
-        'plugin'       => GLM_MEMBERS_PLUGIN_SLUG,
-        'menu'         => 'members',
-        'action'       => 'list',
-        'table'        => GLM_MEMBERS_PLUGIN_DB_PREFIX.'settings_general',
-        'attributes'   => array(
-            'category'              => false,
-            'category-name'         => false,
-            'category-search'       => false,
-            'text-search'           => false,
-            'amenity-search'        => false,
-            'region-search'         => false,
-            'alpha'                 => false,
-            'blank-start'           => false,
-            'show'                  => false,
-            'view'                  => false,
-            'map'                   => 'list_show_map',
-            'map-opened'            => 'list_map_show_opened',
-            'map-name-link'         => 'list_map_show_detaillink',
-            'map-logo'              => 'list_map_show_logo',
-            'map-description'       => 'list_map_show_descr',
-            'map-short-description' => 'list_map_show_short_descr',
-            'map-address'           => 'list_map_show_address',
-            'map-street'            => 'list_map_show_street',
-            'map-city-state-zip'    => 'list_map_show_citystatezip',
-            'map-country'           => 'list_map_show_country',
-            'map-region'            => 'list_map_show_region',
-            'map-phone'             => 'list_map_show_phone',
-            'map-toll-free'         => 'list_map_show_tollfree',
-            'map-url'               => 'list_map_show_url',
-            'map-url-new-target'    => 'list_map_show_url_newtarget',
-            'map-email'             => 'list_map_show_email',
-            'map-categories'        => 'list_map_show_categories',
-            'map-credit-cards'      => 'list_map_show_creditcards',
-            'map-amenities'         => 'list_map_show_amenities',
-            'search'                => 'list_show_search',
-            'search-filters-opened' => 'list_show_search_filters_opened',
-            'search-text'           => 'list_show_search_text',
-            'search-categories'     => 'list_show_search_category',
-            'search-amenities'      => 'list_show_search_amenities',
-            'search-alpha'          => 'list_show_search_alpha',
-            'list'                  => 'list_show_list',
-            'name-link'             => 'list_show_detail_link',
-            'logo'                  => 'list_show_logo',
-            'logo-filler'           => 'list_show_logo_filler',
-            'address'               => 'list_show_address',
-            'street'                => 'list_show_street',
-            'city-state-zip'        => 'list_show_citystatezip',
-            'country'               => 'list_show_country',
-            'region'                => 'list_show_region',
-            'description'           => 'list_show_descr',
-            'short-description'     => 'list_show_short_descr',
-            'phone'                 => 'list_show_phone',
-            'toll-free'             => 'list_show_tollfree',
-            'url'                   => 'list_show_url',
-            'url-new-target'        => 'list_show_url_newtarget',
-            'email'                 => 'list_show_email',
-            'categories'            => 'list_show_categroies',
-            'credit-cards'          => 'list_show_creditcards',
-            'amenities'             => 'list_show_amenities',
-            'amenity-groups'        => 'amenity-groups',
-            'packages'              => 'list_show_packages',
-            'packages-link'         => 'list_show_packages_link',
+//$config = $GLOBALS['config'];
+if ( isset( $config['settings'] ) && $config['settings']['enable_members'] ) {
+    $glmMembersShortcodes = array(
+        'glm-members-list' => array(
+            'plugin'       => GLM_MEMBERS_PLUGIN_SLUG,
+            'menu'         => 'members',
+            'action'       => 'list',
+            'table'        => GLM_MEMBERS_PLUGIN_DB_PREFIX.'settings_general',
+            'attributes'   => array(
+                'category'              => false,
+                'category-name'         => false,
+                'category-search'       => false,
+                'text-search'           => false,
+                'amenity-search'        => false,
+                'region-search'         => false,
+                'alpha'                 => false,
+                'blank-start'           => false,
+                'show'                  => false,
+                'view'                  => false,
+                'map'                   => 'list_show_map',
+                'map-opened'            => 'list_map_show_opened',
+                'map-name-link'         => 'list_map_show_detaillink',
+                'map-logo'              => 'list_map_show_logo',
+                'map-description'       => 'list_map_show_descr',
+                'map-short-description' => 'list_map_show_short_descr',
+                'map-address'           => 'list_map_show_address',
+                'map-street'            => 'list_map_show_street',
+                'map-city-state-zip'    => 'list_map_show_citystatezip',
+                'map-country'           => 'list_map_show_country',
+                'map-region'            => 'list_map_show_region',
+                'map-phone'             => 'list_map_show_phone',
+                'map-toll-free'         => 'list_map_show_tollfree',
+                'map-url'               => 'list_map_show_url',
+                'map-url-new-target'    => 'list_map_show_url_newtarget',
+                'map-email'             => 'list_map_show_email',
+                'map-categories'        => 'list_map_show_categories',
+                'map-credit-cards'      => 'list_map_show_creditcards',
+                'map-amenities'         => 'list_map_show_amenities',
+                'search'                => 'list_show_search',
+                'search-filters-opened' => 'list_show_search_filters_opened',
+                'search-text'           => 'list_show_search_text',
+                'search-categories'     => 'list_show_search_category',
+                'search-amenities'      => 'list_show_search_amenities',
+                'search-alpha'          => 'list_show_search_alpha',
+                'list'                  => 'list_show_list',
+                'name-link'             => 'list_show_detail_link',
+                'logo'                  => 'list_show_logo',
+                'logo-filler'           => 'list_show_logo_filler',
+                'address'               => 'list_show_address',
+                'street'                => 'list_show_street',
+                'city-state-zip'        => 'list_show_citystatezip',
+                'country'               => 'list_show_country',
+                'region'                => 'list_show_region',
+                'description'           => 'list_show_descr',
+                'short-description'     => 'list_show_short_descr',
+                'phone'                 => 'list_show_phone',
+                'toll-free'             => 'list_show_tollfree',
+                'url'                   => 'list_show_url',
+                'url-new-target'        => 'list_show_url_newtarget',
+                'email'                 => 'list_show_email',
+                'categories'            => 'list_show_categroies',
+                'credit-cards'          => 'list_show_creditcards',
+                'amenities'             => 'list_show_amenities',
+                'amenity-groups'        => 'amenity-groups',
+                'packages'              => 'list_show_packages',
+                'packages-link'         => 'list_show_packages_link',
+            )
+        ),
+        'glm-member-detail' => array(
+            'plugin'     => GLM_MEMBERS_PLUGIN_SLUG,
+            'menu'       => 'members',
+            'action'     => 'detail',
+            'table'      => GLM_MEMBERS_PLUGIN_DB_PREFIX.'settings_general',
+            'attributes' => array(
+                'id'                    => false,
+                'show'                  => false,
+                'map'                   => 'detail_show_map',
+                'map-logo'              => 'detail_map_show_logo',
+                'map-description'       => 'detail_map_show_descr',
+                'map-short-description' => 'detail_map_show_short_descr',
+                'map-address'           => 'detail_map_show_address',
+                'map-street'            => 'detail_map_show_street',
+                'map-city-state-zip'    => 'detail_map_show_citystatezip',
+                'map-country'           => 'detail_map_show_country',
+                'map-region'            => 'detail_map_show_region',
+                'map-phone'             => 'detail_map_show_phone',
+                'map-toll-free'         => 'detail_map_show_tollfree',
+                'map-url'               => 'detail_map_show_url',
+                'map-url-new-target'    => 'detail_map_show_url_newtarget',
+                'map-email'             => 'detail_map_show_email',
+                'map-categories'        => 'detail_map_show_categories',
+                'map-credit-cards'      => 'detail_map_show_creditcards',
+                'map-amenities'         => 'detail_map_show_amenities',
+                'logo'                  => 'detail_show_logo',
+                'address'               => 'detail_show_address',
+                'street'                => 'detail_show_street',
+                'city-state-zip'        => 'detail_show_citystatezip',
+                'country'               => 'detail_show_country',
+                'region'                => 'detail_show_region',
+                'description'           => 'detail_show_descr',
+                'short-description'     => 'detail_show_short_descr',
+                'phone'                 => 'detail_show_phone',
+                'toll-free'             => 'detail_show_tollfree',
+                'url'                   => 'detail_show_url',
+                'url-new-target'        => 'detail_show_url_newtarget',
+                'email'                 => 'detail_show_email',
+                'categories'            => 'detail_show_categories',
+                'credit-cards'          => 'detail_show_creditcards',
+                'amenities'             => 'detail_show_amenities'
+            )
+        ),
+        'glm-member-featured' => array(
+            'plugin'     => GLM_MEMBERS_PLUGIN_SLUG,
+            'menu'       => 'members',
+            'action'     => 'featured',
+            'table'      => GLM_MEMBERS_PLUGIN_DB_PREFIX.'settings_general',
+            'attributes' => array (
+                'number'                => 1
+            )
         )
-    ),
-    'glm-member-detail' => array(
-        'plugin'     => GLM_MEMBERS_PLUGIN_SLUG,
-        'menu'       => 'members',
-        'action'     => 'detail',
-        'table'      => GLM_MEMBERS_PLUGIN_DB_PREFIX.'settings_general',
-        'attributes' => array(
-            'id'                    => false,
-            'show'                  => false,
-            'map'                   => 'detail_show_map',
-            'map-logo'              => 'detail_map_show_logo',
-            'map-description'       => 'detail_map_show_descr',
-            'map-short-description' => 'detail_map_show_short_descr',
-            'map-address'           => 'detail_map_show_address',
-            'map-street'            => 'detail_map_show_street',
-            'map-city-state-zip'    => 'detail_map_show_citystatezip',
-            'map-country'           => 'detail_map_show_country',
-            'map-region'            => 'detail_map_show_region',
-            'map-phone'             => 'detail_map_show_phone',
-            'map-toll-free'         => 'detail_map_show_tollfree',
-            'map-url'               => 'detail_map_show_url',
-            'map-url-new-target'    => 'detail_map_show_url_newtarget',
-            'map-email'             => 'detail_map_show_email',
-            'map-categories'        => 'detail_map_show_categories',
-            'map-credit-cards'      => 'detail_map_show_creditcards',
-            'map-amenities'         => 'detail_map_show_amenities',
-            'logo'                  => 'detail_show_logo',
-            'address'               => 'detail_show_address',
-            'street'                => 'detail_show_street',
-            'city-state-zip'        => 'detail_show_citystatezip',
-            'country'               => 'detail_show_country',
-            'region'                => 'detail_show_region',
-            'description'           => 'detail_show_descr',
-            'short-description'     => 'detail_show_short_descr',
-            'phone'                 => 'detail_show_phone',
-            'toll-free'             => 'detail_show_tollfree',
-            'url'                   => 'detail_show_url',
-            'url-new-target'        => 'detail_show_url_newtarget',
-            'email'                 => 'detail_show_email',
-            'categories'            => 'detail_show_categories',
-            'credit-cards'          => 'detail_show_creditcards',
-            'amenities'             => 'detail_show_amenities'
-        )
-    ),
-    'glm-member-featured' => array(
-        'plugin'     => GLM_MEMBERS_PLUGIN_SLUG,
-        'menu'       => 'members',
-        'action'     => 'featured',
-        'table'      => GLM_MEMBERS_PLUGIN_DB_PREFIX.'settings_general',
-        'attributes' => array (
-            'number'                => 1
-        )
-    )
-);
+    );
 
-$glmMembersShortcodesDescription = '
-    <tr><th>Shortcode</th><th>Attribute</th><th>Description</th></tr>
-    <tr>
-        <th>[glm-members-list]</th>
-        <td>&nbsp;</td>
-        <td width="50%">
-            Displays a list of members and a map with markers for each member. Optionally,
-            the attributes below may used to modify the display of this page.
-        </td>
-    </tr>
-    <tr>
-        <td>&nbsp;</td>
-        <th>
-            category="{ category ID(s) }"
-        </th>
-        <td>
-            The "category" attribute is used to set the default display of members
-            to only those mnembers in a specific category or categories by specifying
-            the category IDs. To select multiple categories, separate the categories with a ",".
-            Categories are specified by ID number. The ID for each category is
-            shown in the Member Categories list. The selection of which members
-            to display may be overridded by the "category-search" parameter although
-            these categories will always show in the list of categories that may be
-            selected in the search filter form.
-        </td>
-    </tr>
-    <tr>
-        <td>&nbsp;</td>
-        <th>
-            category-name="{ category name(s) }"
-        </th>
-        <td>
-            The "category-name" attribute is used to set the default display of members
-            to only those mnembers in a specific category or categories by specifying
-            the category names. To select multiple categories, separate the category
-            names with a ",". Category names must match the name of a
-            category exactly to be selected. Category names must be enclosed in quotes.
-            The selection of which members to display may be overridded by the "category-search"
-            parameter although these categories will always show in the list of categories that may be
-            selected in the search filter form.
-        </td>
-    </tr>
-    <tr>
-        <td>&nbsp;</td>
-        <th>
-            category-search="{ a single category ID }"
-        </th>
-        <td>
-            The "category-search" attribute is used display only members in a specific category.
-            The ID for each category is
-            shown in the Member Categories list. This may be overridden by a "categorySearch"
-            URL parameter. This parameter does not override the categories that show in the
-            category selection list of the search filter form set by either "category" or
-            "category-name" above.
-        </td>
-    </tr>
-    <tr>
-        <td>&nbsp;</td>
-        <th>
-            text-search="{ text to search for }"
-        </th>
-        <td>
-            The "text-search" attribute is used to filter results by a specified text
-            string. If a string is provided, the results will only include members with
-            this text in their name, description, short description or street address.
-            This may be overridden by a "testSearch" URL parameter.
-        </td>
-    </tr>
-    <tr>
-        <td>&nbsp;</td>
-        <th>
-            amenity-search="{ amenity ID }"
-        </th>
-        <td>
-            The "amenity-search" attribute selects members who have the specified amenity.
-            The amenity is specified by ID rather than name. This may be overridden by an
-            "amenitySearch" URL parameter.
-        </td>
-    </tr>
-    <tr>
-        <td>&nbsp;</td>
-        <th>
-            region-search="{ region ID }"
-        </th>
-        <td>
-            The "region-search" attribute selects members who are listed in the specified
-            region. The region is specified by ID rather than name. This may be overridden by
-            a "regionSearch" URL parameter.
-        </td>
-    </tr>
+    $glmMembersShortcodesDescription = '
+        <tr><th>Shortcode</th><th>Attribute</th><th>Description</th></tr>
         <tr>
-        <td>&nbsp;</td>
-        <th>
-            alpha="{ initial letter of members }"
-        </th>
-        <td>
-            The "alpha" attribute selects members with names that start with that letter/number
-            to be listed. This only affects the selection of what is currently displayed, not
-            the overall results so the full list of all letters for which there are results are
-            still displayed. This may be overridden by an "alpha" URL parameter.
-        </td>
-    </tr>
-    <tr>
-        <td></td>
-        <th>amenity-groups="1,2"</th>
-        <td>
-            The "amenity-groups" attribute is used to display only the amenities that are in specific groups or a group.
-            Separate the groups with a ","
-        </td>
-    </tr>
+            <th>[glm-members-list]</th>
+            <td>&nbsp;</td>
+            <td width="50%">
+                Displays a list of members and a map with markers for each member. Optionally,
+                the attributes below may used to modify the display of this page.
+            </td>
+        </tr>
         <tr>
-        <td>&nbsp;</td>
-        <th>
-            blank-start="{True/False}"
-        </th>
-        <td>
-            The "blank-start" attribute tells the page whether or not to display the list of members
-            when the user first hits the page. When "blank-start" is "True", the page first displays
-            with the member search form but without any list of members. When the user submits their
-            first search, the page is re-displayed with the member list resuts. Subsequent submissions
-            of the page also display any results found by the search as does selection of the alpha
-            (letter) links.
-        </td>
-    </tr>
-    <tr>
-        <td>&nbsp;</td>
-        <th>
-            show="{ content to show }"
-        </th>
-        <td>
-            The "show" attribute is used control what content should be displayed in the
-            member list. The default is to show the content selected in the "Management",
-            "General Settings" page under "Member List Page Options".
-            <p>
-            Content to show or not show is specified by a comma separated list of the
-            items listed below. Each item must be preceded by either a "+" or a "-" to
-            indicate whether the that content should or should not be shown.
-            </p>
-            <p>
-            There are two special items "all" and "none". These should not have a "+" or
-            "-" in front of them and should be the first item in the comma separated
-            list. These can be used to turn all content on or turn all content off. Any
-            items listed after this will add or remove those items from being displayed.
-            </p>
-            <p>
-            The only content that may not be disabled is the member name. This will always
-            show regardless of any settings, although there is a setting to show this as a
-            link or not as a link.
-            </p>
-            <p class="shortcode-option-list">
-                <span class="shortcode-option-list-title">Global Options</span><br>
-                    <span>all</span>
-                    <span>none</span>
-            </p>
-            <p class="shortcode-option-list">
-                <span class="shortcode-option-list-title">Map Options</span><br>
-                    <span>map</span>
-                    <span>map-name-link</span>
-                    <span>map-logo</span>
-                    <span>map-opened</span>
-                    <span>map-description</span>
-                    <span>map-short-description</span>
-                    <span>map-street</span>
-                    <span>map-city-state-zip</span>
-                    <span>map-address</span>
-                    <span>map-region</span>
-                    <span>map-phone</span>
-                    <span>map-country</span>
-                    <span>map-url</span>
-                    <span>map-url-new-target</span>
-                    <span>map-toll-free</span>
-                    <span>map-categories</span>
-                    <span>map-credit-cards</span>
-                    <span>map-email</span>
+            <td>&nbsp;</td>
+            <th>
+                category="{ category ID(s) }"
+            </th>
+            <td>
+                The "category" attribute is used to set the default display of members
+                to only those mnembers in a specific category or categories by specifying
+                the category IDs. To select multiple categories, separate the categories with a ",".
+                Categories are specified by ID number. The ID for each category is
+                shown in the Member Categories list. The selection of which members
+                to display may be overridded by the "category-search" parameter although
+                these categories will always show in the list of categories that may be
+                selected in the search filter form.
+            </td>
+        </tr>
+        <tr>
+            <td>&nbsp;</td>
+            <th>
+                category-name="{ category name(s) }"
+            </th>
+            <td>
+                The "category-name" attribute is used to set the default display of members
+                to only those mnembers in a specific category or categories by specifying
+                the category names. To select multiple categories, separate the category
+                names with a ",". Category names must match the name of a
+                category exactly to be selected. Category names must be enclosed in quotes.
+                The selection of which members to display may be overridded by the "category-search"
+                parameter although these categories will always show in the list of categories that may be
+                selected in the search filter form.
+            </td>
+        </tr>
+        <tr>
+            <td>&nbsp;</td>
+            <th>
+                category-search="{ a single category ID }"
+            </th>
+            <td>
+                The "category-search" attribute is used display only members in a specific category.
+                The ID for each category is
+                shown in the Member Categories list. This may be overridden by a "categorySearch"
+                URL parameter. This parameter does not override the categories that show in the
+                category selection list of the search filter form set by either "category" or
+                "category-name" above.
+            </td>
+        </tr>
+        <tr>
+            <td>&nbsp;</td>
+            <th>
+                text-search="{ text to search for }"
+            </th>
+            <td>
+                The "text-search" attribute is used to filter results by a specified text
+                string. If a string is provided, the results will only include members with
+                this text in their name, description, short description or street address.
+                This may be overridden by a "testSearch" URL parameter.
+            </td>
+        </tr>
+        <tr>
+            <td>&nbsp;</td>
+            <th>
+                amenity-search="{ amenity ID }"
+            </th>
+            <td>
+                The "amenity-search" attribute selects members who have the specified amenity.
+                The amenity is specified by ID rather than name. This may be overridden by an
+                "amenitySearch" URL parameter.
+            </td>
+        </tr>
+        <tr>
+            <td>&nbsp;</td>
+            <th>
+                region-search="{ region ID }"
+            </th>
+            <td>
+                The "region-search" attribute selects members who are listed in the specified
+                region. The region is specified by ID rather than name. This may be overridden by
+                a "regionSearch" URL parameter.
+            </td>
+        </tr>
+            <tr>
+            <td>&nbsp;</td>
+            <th>
+                alpha="{ initial letter of members }"
+            </th>
+            <td>
+                The "alpha" attribute selects members with names that start with that letter/number
+                to be listed. This only affects the selection of what is currently displayed, not
+                the overall results so the full list of all letters for which there are results are
+                still displayed. This may be overridden by an "alpha" URL parameter.
+            </td>
+        </tr>
+        <tr>
+            <td></td>
+            <th>amenity-groups="1,2"</th>
+            <td>
+                The "amenity-groups" attribute is used to display only the amenities that are in specific groups or a group.
+                Separate the groups with a ","
+            </td>
+        </tr>
+            <tr>
+            <td>&nbsp;</td>
+            <th>
+                blank-start="{True/False}"
+            </th>
+            <td>
+                The "blank-start" attribute tells the page whether or not to display the list of members
+                when the user first hits the page. When "blank-start" is "True", the page first displays
+                with the member search form but without any list of members. When the user submits their
+                first search, the page is re-displayed with the member list resuts. Subsequent submissions
+                of the page also display any results found by the search as does selection of the alpha
+                (letter) links.
+            </td>
+        </tr>
+        <tr>
+            <td>&nbsp;</td>
+            <th>
+                show="{ content to show }"
+            </th>
+            <td>
+                The "show" attribute is used control what content should be displayed in the
+                member list. The default is to show the content selected in the "Management",
+                "General Settings" page under "Member List Page Options".
+                <p>
+                Content to show or not show is specified by a comma separated list of the
+                items listed below. Each item must be preceded by either a "+" or a "-" to
+                indicate whether the that content should or should not be shown.
+                </p>
+                <p>
+                There are two special items "all" and "none". These should not have a "+" or
+                "-" in front of them and should be the first item in the comma separated
+                list. These can be used to turn all content on or turn all content off. Any
+                items listed after this will add or remove those items from being displayed.
+                </p>
+                <p>
+                The only content that may not be disabled is the member name. This will always
+                show regardless of any settings, although there is a setting to show this as a
+                link or not as a link.
+                </p>
+                <p class="shortcode-option-list">
+                    <span class="shortcode-option-list-title">Global Options</span><br>
+                        <span>all</span>
+                        <span>none</span>
+                </p>
+                <p class="shortcode-option-list">
+                    <span class="shortcode-option-list-title">Map Options</span><br>
+                        <span>map</span>
+                        <span>map-name-link</span>
+                        <span>map-logo</span>
+                        <span>map-opened</span>
+                        <span>map-description</span>
+                        <span>map-short-description</span>
+                        <span>map-street</span>
+                        <span>map-city-state-zip</span>
+                        <span>map-address</span>
+                        <span>map-region</span>
+                        <span>map-phone</span>
+                        <span>map-country</span>
+                        <span>map-url</span>
+                        <span>map-url-new-target</span>
+                        <span>map-toll-free</span>
+                        <span>map-categories</span>
+                        <span>map-credit-cards</span>
+                        <span>map-email</span>
+                </p>
+                <p class="shortcode-option-list">
+                    <span class="shortcode-option-list-title">Search Form Options</span><br>
+                        <span>search</span>
+                        <span>search-text</span>
+                        <span>search-categories</span>
+                        <span>search-amenities</span>
+                        <span>search-alpha</span>
+                        <span>search-filters-opened</span>
+                        <span>logo-filler</span>
             </p>
-            <p class="shortcode-option-list">
-                <span class="shortcode-option-list-title">Search Form Options</span><br>
-                    <span>search</span>
-                    <span>search-text</span>
-                    <span>search-categories</span>
-                    <span>search-amenities</span>
-                    <span>search-alpha</span>
-                    <span>search-filters-opened</span>
-                    <span>logo-filler</span>
-        </p>
-            <p class="shortcode-option-list">
-                <span class="shortcode-option-list-title">Member List Options</span><br>
-                    <span>list</span>
-                    <span>name-link</span>
-                    <span>logo</span>
-                    <span>address</span>
-                    <span>street</span>
-                    <span>city-state-zip</span>
-                    <span>country</span>
-                    <span>region</span>
-                    <span>description</span>
-                    <span>short-description</span>
-                    <span>phone</span>
-                    <span>toll-free</span>
-                    <span>url</span>
-                    <span>url-new-target</span>
-                    <span>email</span>
-                    <span>categories</span>
-                    <span>credit-cards</span>
-                    <span>amenities</span>
-                    <span>packages</span>
-                    <span>packages-link</span>
-        </p>
-        </td>
-    </tr>
-    <tr>
-        <td>&nbsp;</td>
-        <th>
-            view="{ view to use }"
-        </th>
-        <td>
-            Current options available are: list (default), grid
-            <p>
-            The "view" attribute tells the page which view file to use. The "list" value will display
-            by default, and features a succession of page-wide rows containing an image, member contact
-            info, and the short description. The "grid" value will display a three-columned series of
-            rows showing the featured image or logo, and below it simply the name and a few links.
+                <p class="shortcode-option-list">
+                    <span class="shortcode-option-list-title">Member List Options</span><br>
+                        <span>list</span>
+                        <span>name-link</span>
+                        <span>logo</span>
+                        <span>address</span>
+                        <span>street</span>
+                        <span>city-state-zip</span>
+                        <span>country</span>
+                        <span>region</span>
+                        <span>description</span>
+                        <span>short-description</span>
+                        <span>phone</span>
+                        <span>toll-free</span>
+                        <span>url</span>
+                        <span>url-new-target</span>
+                        <span>email</span>
+                        <span>categories</span>
+                        <span>credit-cards</span>
+                        <span>amenities</span>
+                        <span>packages</span>
+                        <span>packages-link</span>
             </p>
-        </td>
-    </tr>
+            </td>
+        </tr>
+        <tr>
+            <td>&nbsp;</td>
+            <th>
+                view="{ view to use }"
+            </th>
+            <td>
+                Current options available are: list (default), grid
+                <p>
+                The "view" attribute tells the page which view file to use. The "list" value will display
+                by default, and features a succession of page-wide rows containing an image, member contact
+                info, and the short description. The "grid" value will display a three-columned series of
+                rows showing the featured image or logo, and below it simply the name and a few links.
+                </p>
+            </td>
+        </tr>
 
-<!-- glm-member-detail -->
+    <!-- glm-member-detail -->
 
-    <tr>
-        <th>[glm-member-detail]</th>
-        <td>&nbsp;</td>
-        <td>
-            Displays details for a specific member along with a map showing their location. The
-            "id" attribute below is required to specify which member to display.
-        </td>
-    </tr>
-     <tr>
-        <td>&nbsp;</td>
-        <th>
-            id="{ member ID }"
-        </th>
-        <td>
-            This is an optional attribute for [glm-member-detail] that specifies the ID of
-            the desired member. The ID for a member is displayed both in the left column
-            of the member list and at the top of the Member Dashboard. Only one ID may
-            be specified. If this attribute is not supplied, the page will look for a
-            member name slug as the last part of the path in the URL and try to locate
-            an active member information record with "Name for URLs" set to the same
-            string.
-        </td>
-    </tr>
-    <tr>
-        <td>&nbsp;</td>
-        <th>
-            show="{ content to show }"
-        </th>
-        <td>
-            The "show" attribute is used control what content should be displayed in
-            member detail. The default is to show the content selected in the "Management",
-            "General Settings" page under "Member Detail Page Options".
-            <p>
-            Content to show or not show is specified by a comma separated list of the
-            items listed below. Each item must be preceded by either a "+" or a "-" to
-            indicate whether the that content should or should not be shown.
-            </p>
-            <p>
-            There are two special items "all" and "none". These should not have a "+" or
-            "-" in front of them and should be the first item in the comma separated
-            list. These can be used to turn all content on or turn all content off. Any
-            items listed after this will add or remove those items from being displayed.
-            </p>
-            <p>
-            The only content that may not be disabled is the member name. This will always
-            show regardless of any settings, although there is a setting to show this as a
-            link or not as a link.
-            </p>
-            <p class="shortcode-option-list">
-                <span class="shortcode-option-list-title">Global Options</span><br>
-                    <span>all</span>
-                    <span>none</span>
-            </p>
-            <p class="shortcode-option-list">
-                <span class="shortcode-option-list-title">Map Options</span><br>
-                    <span>map</span>
-                    <span>map-logo</span>
-                    <span>map-description</span>
-                    <span>map-short-description</span>
-                    <span>map-address</span>
-                    <span>map-street</span>
-                    <span>map-city-state-zip</span>
-                    <span>map-country</span>
-                    <span>map-region</span>
-                    <span>map-phone</span>
-                    <span>map-toll-free</span>
-                    <span>map-url</span>
-                    <span>map-url-new-target</span>
-                    <span>map-email</span>
-                    <span>map-categories</span>
-                    <span>map-credit-cards</span>
-                    <span>map-amenities</span>
-            </p>
-            <p class="shortcode-option-list">
-                <span class="shortcode-option-list-title">Directions Options</span><br>
-                    <span>directions</span>
-            </p>
-            <p class="shortcode-option-list">
-                <span class="shortcode-option-list-title">Member Detail Options</span><br>
-                    <span>logo</span>
-                    <span>address</span>
-                    <span>street</span>
-                    <span>city-state-zip</span>
-                    <span>country</span>
-                    <span>region</span>
-                    <span>description</span>
-                    <span>short-description</span>
-                    <span>phone</span>
-                    <span>toll-free</span>
-                    <span>url</span>
-                    <span>url-new-target</span>
-                    <span>email</span>
-                    <span>categories</span>
-                    <span>credit-cards</span>
-                    <span>amenities</span>
-                </table>
-            </p>
-        </td>
-    </tr>
-';
+        <tr>
+            <th>[glm-member-detail]</th>
+            <td>&nbsp;</td>
+            <td>
+                Displays details for a specific member along with a map showing their location. The
+                "id" attribute below is required to specify which member to display.
+            </td>
+        </tr>
+         <tr>
+            <td>&nbsp;</td>
+            <th>
+                id="{ member ID }"
+            </th>
+            <td>
+                This is an optional attribute for [glm-member-detail] that specifies the ID of
+                the desired member. The ID for a member is displayed both in the left column
+                of the member list and at the top of the Member Dashboard. Only one ID may
+                be specified. If this attribute is not supplied, the page will look for a
+                member name slug as the last part of the path in the URL and try to locate
+                an active member information record with "Name for URLs" set to the same
+                string.
+            </td>
+        </tr>
+        <tr>
+            <td>&nbsp;</td>
+            <th>
+                show="{ content to show }"
+            </th>
+            <td>
+                The "show" attribute is used control what content should be displayed in
+                member detail. The default is to show the content selected in the "Management",
+                "General Settings" page under "Member Detail Page Options".
+                <p>
+                Content to show or not show is specified by a comma separated list of the
+                items listed below. Each item must be preceded by either a "+" or a "-" to
+                indicate whether the that content should or should not be shown.
+                </p>
+                <p>
+                There are two special items "all" and "none". These should not have a "+" or
+                "-" in front of them and should be the first item in the comma separated
+                list. These can be used to turn all content on or turn all content off. Any
+                items listed after this will add or remove those items from being displayed.
+                </p>
+                <p>
+                The only content that may not be disabled is the member name. This will always
+                show regardless of any settings, although there is a setting to show this as a
+                link or not as a link.
+                </p>
+                <p class="shortcode-option-list">
+                    <span class="shortcode-option-list-title">Global Options</span><br>
+                        <span>all</span>
+                        <span>none</span>
+                </p>
+                <p class="shortcode-option-list">
+                    <span class="shortcode-option-list-title">Map Options</span><br>
+                        <span>map</span>
+                        <span>map-logo</span>
+                        <span>map-description</span>
+                        <span>map-short-description</span>
+                        <span>map-address</span>
+                        <span>map-street</span>
+                        <span>map-city-state-zip</span>
+                        <span>map-country</span>
+                        <span>map-region</span>
+                        <span>map-phone</span>
+                        <span>map-toll-free</span>
+                        <span>map-url</span>
+                        <span>map-url-new-target</span>
+                        <span>map-email</span>
+                        <span>map-categories</span>
+                        <span>map-credit-cards</span>
+                        <span>map-amenities</span>
+                </p>
+                <p class="shortcode-option-list">
+                    <span class="shortcode-option-list-title">Directions Options</span><br>
+                        <span>directions</span>
+                </p>
+                <p class="shortcode-option-list">
+                    <span class="shortcode-option-list-title">Member Detail Options</span><br>
+                        <span>logo</span>
+                        <span>address</span>
+                        <span>street</span>
+                        <span>city-state-zip</span>
+                        <span>country</span>
+                        <span>region</span>
+                        <span>description</span>
+                        <span>short-description</span>
+                        <span>phone</span>
+                        <span>toll-free</span>
+                        <span>url</span>
+                        <span>url-new-target</span>
+                        <span>email</span>
+                        <span>categories</span>
+                        <span>credit-cards</span>
+                        <span>amenities</span>
+                    </table>
+                </p>
+            </td>
+        </tr>
+    ';
 } else {
     $glmMembersShortcodes = array();
     $glmMembersShortcodesDescription = '';