From: Chuck Scott Date: Mon, 29 Aug 2016 18:21:27 +0000 (-0400) Subject: Removed all parens from require and include statements. X-Git-Tag: v1.0.15^2~4 X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=fa49e3779715073d2b0c89017b1d147d6854b2d7;p=WP-Plugins%2Fglm-member-db-contacts.git Removed all parens from require and include statements. --- diff --git a/activate.php b/activate.php index c60ae1b..775cbd5 100644 --- a/activate.php +++ b/activate.php @@ -71,7 +71,7 @@ class glmMembersContactsPluginActivate update_option('glmMembersDatabaseContactsPluginVersion', GLM_MEMBERS_CONTACTS_PLUGIN_VERSION); // Set Roles and Capabilities for this plugin - require_once(GLM_MEMBERS_CONTACTS_PLUGIN_SETUP_PATH.'/rolesAndCapabilities.php'); + require_once GLM_MEMBERS_CONTACTS_PLUGIN_SETUP_PATH.'/rolesAndCapabilities.php'; } /* diff --git a/index.php b/index.php index f7f12d9..513446c 100644 --- a/index.php +++ b/index.php @@ -70,10 +70,10 @@ if (!defined('ABSPATH')) { $startupNotices = ''; // 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 @@ -92,7 +92,7 @@ function glmMembersPluginRequired() { /* * 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); @@ -126,8 +126,8 @@ if (version_compare($glmMembersDatabasePluginVersion, GLM_MEMBERS_CONTACTS_PLUGI /* * Register this add-on with the main GLM Member DB plugin and get information on all add-ons loaded. */ -require_once(GLM_MEMBERS_CONTACTS_PLUGIN_SETUP_PATH.'/validActions.php'); -require_once(GLM_MEMBERS_CONTACTS_PLUGIN_DB_SCRIPTS.'/dbVersions.php'); +require_once GLM_MEMBERS_CONTACTS_PLUGIN_SETUP_PATH.'/validActions.php'; +require_once GLM_MEMBERS_CONTACTS_PLUGIN_DB_SCRIPTS.'/dbVersions.php'; function glmMembersRegisterContacts($addOns) { // Add this add-on to the add-ons array @@ -161,7 +161,7 @@ add_filter('glm-member-db-register-addon','glmMembersRegisterContacts', 10, 1); function glmMembersContactsPluginActivate () { global $wpdb, $config; - require_once (GLM_MEMBERS_CONTACTS_PLUGIN_PATH . '/activate.php'); + require_once GLM_MEMBERS_CONTACTS_PLUGIN_PATH . '/activate.php'; new glmMembersContactsPluginActivate($wpdb, $config); } register_activation_hook(__FILE__, 'glmMembersContactsPluginActivate'); @@ -170,7 +170,7 @@ add_filter('glm-member-db-register-addon','glmMembersRegisterContacts', 10, 1); function glmMembersContactsPluginDeactivate () { global $wpdb, $config; - require_once (GLM_MEMBERS_CONTACTS_PLUGIN_PATH . '/deactivate.php'); + require_once GLM_MEMBERS_CONTACTS_PLUGIN_PATH . '/deactivate.php'; $x = new glmMembersContactsPluginDeactivate($wpdb, $config); return false; } @@ -179,7 +179,7 @@ add_filter('glm-member-db-register-addon','glmMembersRegisterContacts', 10, 1); /* * Hooks for testing capabilities provided by this add-on */ -require_once(GLM_MEMBERS_CONTACTS_PLUGIN_SETUP_PATH.'/permissions.php'); +require_once GLM_MEMBERS_CONTACTS_PLUGIN_SETUP_PATH.'/permissions.php'; /* * Login Checks and Messages diff --git a/models/admin/contacts/index.php b/models/admin/contacts/index.php index 077bc84..ff16e43 100644 --- a/models/admin/contacts/index.php +++ b/models/admin/contacts/index.php @@ -15,7 +15,7 @@ */ // Load Contacts data abstract -require_once(GLM_MEMBERS_CONTACTS_PLUGIN_CLASS_PATH.'/data/dataContacts.php'); +require_once GLM_MEMBERS_CONTACTS_PLUGIN_CLASS_PATH.'/data/dataContacts.php'; /* * This model is called when the "Shortcodes" menu is selected @@ -170,7 +170,7 @@ class GlmMembersAdmin_contacts_index extends GlmDataContacts } // Load members data class - 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); // If we have a member ID - Get Member information @@ -200,7 +200,7 @@ class GlmMembersAdmin_contacts_index extends GlmDataContacts $contactInfo = $this->newEntry(); - require_once(GLM_MEMBERS_CONTACTS_PLUGIN_LIB_PATH.'/EasyPassword/EasyPassword.php'); + require_once GLM_MEMBERS_CONTACTS_PLUGIN_LIB_PATH.'/EasyPassword/EasyPassword.php'; $EasyPassword = new EasyPassword(); $contactInfo['fieldData']['password'] = $EasyPassword->generateEasyPassword('firstlast'); @@ -696,7 +696,7 @@ class GlmMembersAdmin_contacts_index extends GlmDataContacts $cName = trim(filter_var($_REQUEST['newCityName'])); // Try to add the city - require_once(GLM_MEMBERS_PLUGIN_CLASS_PATH.'/data/dataCities.php'); + require_once GLM_MEMBERS_PLUGIN_CLASS_PATH.'/data/dataCities.php'; $Cities = new GlmDataCities($this->wpdb, $this->config); $cID = $Cities->addCity($cName); diff --git a/models/admin/management/contacts.php b/models/admin/management/contacts.php index eda38b4..76b0997 100644 --- a/models/admin/management/contacts.php +++ b/models/admin/management/contacts.php @@ -13,7 +13,7 @@ * @link http://dev.gaslightmedia.com/ */ -require_once(GLM_MEMBERS_CONTACTS_PLUGIN_CLASS_PATH.'/data/dataContacts.php'); +require_once GLM_MEMBERS_CONTACTS_PLUGIN_CLASS_PATH.'/data/dataContacts.php'; /** * GlmMembersAdmin_management_contacts diff --git a/models/admin/profile/index.php b/models/admin/profile/index.php index 26ab246..3ef07ed 100644 --- a/models/admin/profile/index.php +++ b/models/admin/profile/index.php @@ -14,7 +14,7 @@ */ // Load Contacts data abstract -require_once(GLM_MEMBERS_CONTACTS_PLUGIN_CLASS_PATH.'/data/dataContacts.php'); +require_once GLM_MEMBERS_CONTACTS_PLUGIN_CLASS_PATH.'/data/dataContacts.php'; class GlmMembersAdmin_profile_index extends GlmDataContacts { @@ -213,7 +213,7 @@ class GlmMembersAdmin_profile_index extends GlmDataContacts $cName = trim(filter_var($_REQUEST['newCityName'])); // Try to add the city - require_once(GLM_MEMBERS_CONTACTS_PLUGIN_CLASS_PATH.'/data/dataCities.php'); + require_once GLM_MEMBERS_CONTACTS_PLUGIN_CLASS_PATH.'/data/dataCities.php'; $Cities = new GlmDataCities($this->wpdb, $this->config); $cID = $Cities->addCity($cName); diff --git a/setup/permissions.php b/setup/permissions.php index 0b180f1..5247085 100644 --- a/setup/permissions.php +++ b/setup/permissions.php @@ -42,7 +42,7 @@ add_filter('glm_members_current_logged_in_user', // Try to get the matching contact data $contactInfo = $wpdb->get_row("SELECT * FROM ".GLM_MEMBERS_CONTACTS_PLUGIN_DB_PREFIX . "contacts WHERE id = $contactID;"); - require_once(GLM_MEMBERS_CONTACTS_PLUGIN_CLASS_PATH.'/data/dataContacts.php'); + require_once GLM_MEMBERS_CONTACTS_PLUGIN_CLASS_PATH.'/data/dataContacts.php'; $ContactInfo = new GlmDataContacts($wpdb, $config); $contactInfo = $ContactInfo->getEntry($contactID);