From 302cc24055cb4db39429b11d042db792adf70bf1 Mon Sep 17 00:00:00 2001 From: Chuck Scott Date: Fri, 9 Sep 2016 16:32:26 -0400 Subject: [PATCH] Cleaned up include/require parens. --- activate.php | 2 +- index.php | 4 ++-- models/front/hooked/detail.php | 2 +- models/front/hooked/memberList.php | 2 +- models/front/packaging/detail.php | 4 ++-- models/front/packaging/list.php | 4 ++-- setup/shortcodeBuilder.php | 24 ++++++++++++------------ 7 files changed, 21 insertions(+), 21 deletions(-) diff --git a/activate.php b/activate.php index 8d3aeca..f58b240 100644 --- a/activate.php +++ b/activate.php @@ -71,7 +71,7 @@ class glmMembersPackagingPluginActivate update_option('glmMembersDatabasePackagingPluginVersion', GLM_MEMBERS_PACKAGING_PLUGIN_VERSION); // Set Roles and Capabilities for this plugin - require_once(GLM_MEMBERS_PACKAGING_PLUGIN_SETUP_PATH.'/rolesAndCapabilities.php'); + require_once GLM_MEMBERS_PACKAGING_PLUGIN_SETUP_PATH.'/rolesAndCapabilities.php'; } /* diff --git a/index.php b/index.php index 3fd51b7..a719e39 100644 --- a/index.php +++ b/index.php @@ -78,10 +78,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 diff --git a/models/front/hooked/detail.php b/models/front/hooked/detail.php index e3773d6..5a1a359 100644 --- a/models/front/hooked/detail.php +++ b/models/front/hooked/detail.php @@ -13,7 +13,7 @@ */ // Load packages data abstract -require_once(GLM_MEMBERS_PACKAGING_PLUGIN_CLASS_PATH.'/data/dataPackages.php'); +require_once GLM_MEMBERS_PACKAGING_PLUGIN_CLASS_PATH.'/data/dataPackages.php; /* * This class performs the work for displaying members packages. diff --git a/models/front/hooked/memberList.php b/models/front/hooked/memberList.php index 60bf860..31fb4cf 100644 --- a/models/front/hooked/memberList.php +++ b/models/front/hooked/memberList.php @@ -13,7 +13,7 @@ */ // Load packages data abstract -require_once(GLM_MEMBERS_PACKAGING_PLUGIN_CLASS_PATH.'/data/dataPackages.php'); +require_once GLM_MEMBERS_PACKAGING_PLUGIN_CLASS_PATH.'/data/dataPackages.php'; /* * This class performs the work for displaying members packages. diff --git a/models/front/packaging/detail.php b/models/front/packaging/detail.php index b3e3a9b..2c9d890 100644 --- a/models/front/packaging/detail.php +++ b/models/front/packaging/detail.php @@ -13,7 +13,7 @@ */ // Load packages data abstract -require_once(GLM_MEMBERS_PACKAGING_PLUGIN_CLASS_PATH.'/data/dataPackages.php'); +require_once GLM_MEMBERS_PACKAGING_PLUGIN_CLASS_PATH.'/data/dataPackages.php'; /* * This class performs the work for displaying members packages. @@ -140,7 +140,7 @@ class GlmMembersFront_packaging_detail extends GlmDataPackages 'packageID' => $packageID, 'package' => $package ); - + // Return status, suggested view, and data to controller - also return any modified settings return array( 'status' => $status, diff --git a/models/front/packaging/list.php b/models/front/packaging/list.php index f89c91c..b065c9a 100644 --- a/models/front/packaging/list.php +++ b/models/front/packaging/list.php @@ -13,7 +13,7 @@ */ // Load packages data abstract -require_once(GLM_MEMBERS_PACKAGING_PLUGIN_CLASS_PATH.'/data/dataPackages.php'); +require_once GLM_MEMBERS_PACKAGING_PLUGIN_CLASS_PATH.'/data/dataPackages.php'; /* * This class performs the work for displaying members packages. @@ -252,7 +252,7 @@ class GlmMembersFront_packaging_list extends GlmDataPackages $view = 'list.html'; break; } - + // Compile template data $templateData = array( 'siteBaseUrl' => GLM_MEMBERS_SITE_BASE_URL, diff --git a/setup/shortcodeBuilder.php b/setup/shortcodeBuilder.php index 8fa97d9..9aed0fa 100644 --- a/setup/shortcodeBuilder.php +++ b/setup/shortcodeBuilder.php @@ -2,10 +2,10 @@ /* * Packages Shortcode Attributes */ - - require_once(GLM_MEMBERS_PACKAGING_PLUGIN_CLASS_PATH.'/data/dataPackages.php'); - require_once(GLM_MEMBERS_PLUGIN_CLASS_PATH. '/data/dataMembers.php'); - + + require_once GLM_MEMBERS_PACKAGING_PLUGIN_CLASS_PATH.'/data/dataPackages.php'; + require_once GLM_MEMBERS_PLUGIN_CLASS_PATH.'/data/dataMembers.php'; + $members = new GlmDataMembers($this->wpdb, $this->config); $membersList = $members->getIdName(); @@ -23,14 +23,14 @@ $packageListId[] = $value['id']; } } - + // loop through packaging list shortcode attributes foreach($packageListAttr as $key=>$value){ $listAttributes[] = $key; $values[] = $value; } - + echo ''; echo ''; - + echo ''; - + echo ''; - + echo ''; echo ''; - - /* IDs are used as placeholders currently until the attributes and their values are + + /* IDs are used as placeholders currently until the attributes and their values are figured out - + dropdown for package list 'type' attr */ // Package 'ID' attr -- 2.17.1