From: Chuck Scott Date: Fri, 9 Sep 2016 20:34:15 +0000 (-0400) Subject: Cleaned up include/require parens. X-Git-Tag: v1.0.2^2~1 X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=433c1568d0c0f7864e3fccf1f780a26e706c9569;p=WP-Plugins%2Fglm-member-db-social.git Cleaned up include/require parens. --- diff --git a/activate.php b/activate.php index 7e41212..b62c275 100644 --- a/activate.php +++ b/activate.php @@ -83,7 +83,7 @@ class glmMembersSocialPluginActivate update_option('glmMembersDatabaseSocialPluginVersion', GLM_MEMBERS_SOCIAL_PLUGIN_VERSION); // Set Roles and Capabilities for this plugin - require_once(GLM_MEMBERS_SOCIAL_PLUGIN_SETUP_PATH.'/rolesAndCapabilities.php'); + require_once GLM_MEMBERS_SOCIAL_PLUGIN_SETUP_PATH.'/rolesAndCapabilities.php'; } /* diff --git a/index.php b/index.php index 109311b..4905ee7 100644 --- a/index.php +++ b/index.php @@ -92,10 +92,10 @@ if (!defined('ABSPATH')) { */ // Get standard defined parameters -require_once('defines.php'); +require_once 'defines.php'; // Required to be able to get user capabilities when being called as a filter from the main plugin -require_once(ABSPATH . 'wp-includes/pluggable.php'); +require_once ABSPATH.'wp-includes/pluggable.php'; /* * Do some checks to make sure the main GLM Member DB is active and of a recceint enough version @@ -114,7 +114,7 @@ function glmMembersSocialPluginRequired() { /* * Check installation, activation, and version of main Member DB plugin */ -include_once( ABSPATH . 'wp-admin/includes/plugin.php' ); +include_once ABSPATH.'wp-admin/includes/plugin.php'; $plugin_name = 'glm-member-db/index.php'; $is_active = is_plugin_active($plugin_name); @@ -149,11 +149,11 @@ if (version_compare($glmMembersDatabasePluginVersion, GLM_MEMBERS_SOCIAL_PLUGIN_ /* * Register this add-on with the main GLM Member DB plugin and get information on all add-ons loaded. */ -require_once(GLM_MEMBERS_SOCIAL_PLUGIN_SETUP_PATH.'/validActions.php'); -require_once(GLM_MEMBERS_SOCIAL_PLUGIN_SETUP_PATH.'/shortcodes.php'); +require_once GLM_MEMBERS_SOCIAL_PLUGIN_SETUP_PATH.'/validActions.php'; +require_once GLM_MEMBERS_SOCIAL_PLUGIN_SETUP_PATH.'/shortcodes.php'; $havePluginDatabase = false; if (is_file(GLM_MEMBERS_SOCIAL_PLUGIN_DB_SCRIPTS.'/dbVersions.php')) { - require_once(GLM_MEMBERS_SOCIAL_PLUGIN_DB_SCRIPTS.'/dbVersions.php'); + require_once GLM_MEMBERS_SOCIAL_PLUGIN_DB_SCRIPTS.'/dbVersions.php'; $havePluginDatabase = true; } @@ -206,7 +206,7 @@ add_filter('glm-member-db-register-addon','glmMembersRegisterSocial', 10, 1); function glmMembersSocialPluginActivate () { global $wpdb, $config; - require_once (GLM_MEMBERS_SOCIAL_PLUGIN_PATH . '/activate.php'); + require_once GLM_MEMBERS_SOCIAL_PLUGIN_PATH.'/activate.php'; new glmMembersSocialPluginActivate($wpdb, $config); } register_activation_hook(__FILE__, 'glmMembersSocialPluginActivate'); @@ -215,7 +215,7 @@ add_filter('glm-member-db-register-addon','glmMembersRegisterSocial', 10, 1); function glmMembersSocialPluginDeactivate () { global $wpdb, $config; - require_once (GLM_MEMBERS_SOCIAL_PLUGIN_PATH . '/deactivate.php'); + require_once GLM_MEMBERS_SOCIAL_PLUGIN_PATH . '/deactivate.php'; $x = new glmMembersSocialPluginDeactivate($wpdb, $config); return false; } @@ -224,5 +224,5 @@ add_filter('glm-member-db-register-addon','glmMembersRegisterSocial', 10, 1); /* * Hooks for testing capabilities provided by this add-on */ -require_once(GLM_MEMBERS_SOCIAL_PLUGIN_SETUP_PATH.'/permissions.php'); +require_once GLM_MEMBERS_SOCIAL_PLUGIN_SETUP_PATH.'/permissions.php'; diff --git a/models/admin/management/social.php b/models/admin/management/social.php index 6f76543..9f60c5b 100644 --- a/models/admin/management/social.php +++ b/models/admin/management/social.php @@ -185,7 +185,7 @@ class GlmMembersAdmin_management_social extends GlmDataSocials public function importSocial() { $this->wpdb->query( "DELETE FROM " . GLM_MEMBERS_SOCIAL_PLUGIN_DB_PREFIX . "social_urls" ); - require_once(GLM_MEMBERS_SOCIAL_PLUGIN_CLASS_PATH.'/data/dataSocialUrls.php'); + require_once GLM_MEMBERS_SOCIAL_PLUGIN_CLASS_PATH.'/data/dataSocialUrls.php'; $socialUrl = new GlmDataSocialUrls($this->wpdb, $this->config); $oldMemberDataSql = " @@ -200,7 +200,7 @@ class GlmMembersAdmin_management_social extends GlmDataSocials foreach ($oldMemberData as $member) { // get the correct member id from old one $memberID = $this->wpdb->get_var( - "SELECT id + "SELECT id FROM " . GLM_MEMBERS_PLUGIN_DB_PREFIX . "members WHERE old_member_id = {$member['member_id']}" ); diff --git a/models/admin/social/index.php b/models/admin/social/index.php index d0f4bf4..e132a03 100644 --- a/models/admin/social/index.php +++ b/models/admin/social/index.php @@ -120,7 +120,7 @@ class GlmMembersAdmin_social_index extends GlmDataSocialUrls $socialWhere = 'ref_type = '.$this->config['ref_type_numb']['MemberInfo'].' AND ref_dest = '.$memberID; // Get the base member data - require_once(GLM_MEMBERS_PLUGIN_CLASS_PATH.'/data/dataMembers.php'); + require_once GLM_MEMBERS_PLUGIN_CLASS_PATH.'/data/dataMembers.php'; $Members = new GlmDataMembers($this->wpdb, $this->config); $memberData = $Members->getEntry($memberID); $memberName = $memberData['name']; @@ -132,7 +132,7 @@ class GlmMembersAdmin_social_index extends GlmDataSocialUrls } // Get list of all available social media types - require_once(GLM_MEMBERS_SOCIAL_PLUGIN_CLASS_PATH.'/data/dataSocials.php'); + require_once GLM_MEMBERS_SOCIAL_PLUGIN_CLASS_PATH.'/data/dataSocials.php'; $Socials = new GlmDataSocials($this->wpdb, $this->config); $socialsList = $Socials->getList(); diff --git a/models/front/social/list.php b/models/front/social/list.php index 655915c..29dd832 100644 --- a/models/front/social/list.php +++ b/models/front/social/list.php @@ -1,10 +1,10 @@ - $urlList,