From 7899cba95e391533443727b63e6a49939a476fec Mon Sep 17 00:00:00 2001 From: Chuck Scott Date: Mon, 29 Aug 2016 13:44:12 -0400 Subject: [PATCH] Cleaned up parentheses in require and include statements. * Fixed member search on members dashboard page. Checked for other similar issues. * Removed old form content from member edit template. No longer used. * Comented out editing of credit cards and front-end display of credit cards. Management fields related to credit cards still remain. * Added ability to set a minimum value for the top of the Y axis on graphs. * Set a minimum Y axis top for bandwidth a click-through/detail views graphs. * Removed mouseover effects for images in the member info edit page. Could not get I.E. to behave with this. --- activate.php | 4 +- classes/glmMemberInfoClone.php | 4 +- controllers/admin.php | 10 +-- controllers/front.php | 43 +++++------ deactivate.php | 2 +- index.php | 28 +++---- js/imageUpload/imageUpload.js | 32 +++----- lib/phpgraphlib-master/phpgraphlib.php | 10 +++ lib/smartyTemplateSupport.php | 2 +- models/admin/ajax/memberClickThrough.php | 2 +- models/admin/ajax/memberDetailClick.php | 2 +- models/admin/ajax/memberGraphs.php | 5 +- models/admin/ajax/membersListExport.php | 2 +- models/admin/dashboardWidget/index.php | 14 ++-- models/admin/management/development.php | 4 +- models/admin/management/import.php.OLD | 2 +- .../admin/management/import/memberImages.php | 2 +- models/admin/management/index.php | 28 +++---- models/admin/management/terms.php | 2 +- models/admin/management/theme.php | 2 +- models/admin/management/videos.php | 18 ++--- models/admin/member/index.php | 8 +- models/admin/member/memberEdit.php | 4 +- models/admin/member/memberInfo.php | 22 +++--- models/admin/members/index.php | 14 ++-- models/admin/members/list.php | 6 +- models/admin/pages/shortcode.php | 2 +- models/admin/settings/categories.php | 2 +- models/admin/settings/cities.php | 2 +- models/admin/settings/index.php | 2 +- models/admin/settings/regions.php | 2 +- models/front/members/detail.php | 4 +- setup/frontHooks.php | 2 +- uninstall.php | 2 +- views/admin/error/badAction.html | 25 ++++++- views/admin/error/index.html | 19 ++++- views/admin/member/memberEdit.html | 73 ------------------- views/admin/member/memberInfo.html | 13 ++-- views/admin/members/index.html | 2 +- views/front/error/badAction.html | 20 ++++- views/front/error/index.html | 19 ++++- views/front/members/detail.html | 4 +- views/front/members/list.html | 2 + 43 files changed, 228 insertions(+), 239 deletions(-) diff --git a/activate.php b/activate.php index b58c0946..3a0069e8 100644 --- a/activate.php +++ b/activate.php @@ -20,7 +20,7 @@ if (!defined('ABSPATH')) { } // Load glmPluginSupport class -require_once (GLM_MEMBERS_PLUGIN_PATH . '/classes/glmPluginSupport.php'); +require_once GLM_MEMBERS_PLUGIN_PATH . '/classes/glmPluginSupport.php'; /* * This class performs all necessary additional work when this @@ -82,7 +82,7 @@ class glmMembersPluginActivate extends glmPluginSupport $this->checkUploadsDir(); // Set Roles and Capabilities for this plugin - require_once(GLM_MEMBERS_PLUGIN_SETUP_PATH.'/rolesAndCapabilities.php'); + require_once GLM_MEMBERS_PLUGIN_SETUP_PATH.'/rolesAndCapabilities.php'; // Set current plugin version update_option('glmMembersDatabasePluginVersion', GLM_MEMBERS_PLUGIN_VERSION); diff --git a/classes/glmMemberInfoClone.php b/classes/glmMemberInfoClone.php index 9c909fb2..c2c1ebd2 100644 --- a/classes/glmMemberInfoClone.php +++ b/classes/glmMemberInfoClone.php @@ -74,7 +74,7 @@ class GlmMemberInfoClone { // Load Member Info Data Class and get info data for later use - require_once(GLM_MEMBERS_PLUGIN_CLASS_PATH.'/data/dataMemberInfo.php'); + require_once GLM_MEMBERS_PLUGIN_CLASS_PATH.'/data/dataMemberInfo.php'; $MemberInfo = new GlmDataMemberInfo($this->wpdb, $this->config); $memberInfo = $MemberInfo->getEntry($id); @@ -106,7 +106,7 @@ class GlmMemberInfoClone $this->wpdb->query($sql); // Load image gallery class - require_once(GLM_MEMBERS_PLUGIN_CLASS_PATH.'/data/dataImages.php'); + require_once GLM_MEMBERS_PLUGIN_CLASS_PATH.'/data/dataImages.php'; $Images = new GlmDataImages($this->wpdb, $this->config); // Get the refType for the member_info table and use if for both src and dst diff --git a/controllers/admin.php b/controllers/admin.php index 78cdcd29..e3176213 100644 --- a/controllers/admin.php +++ b/controllers/admin.php @@ -219,7 +219,7 @@ class glmMembersAdmin extends GlmPluginSupport // If setup/frontMisc.php exists include that now - Can be used for additional filters and hooks $miscFile = GLM_MEMBERS_WORDPRESS_PLUGIN_PATH.$a['slug'].'/setup/adminHooks.php'; if (is_file($miscFile)) { - require_once($miscFile); + require_once $miscFile; } } @@ -270,7 +270,7 @@ class glmMembersAdmin extends GlmPluginSupport } // Load the model file - require_once ($modelName); + require_once $modelName; // check for an invalid model class name if (!class_exists($className)) { @@ -558,10 +558,10 @@ class glmMembersAdmin extends GlmPluginSupport // For each add-on, read in their menu additions - These are optional files foreach ($this->config['addOns'] as $a) { if (is_file(GLM_MEMBERS_WORDPRESS_PLUGIN_PATH.$a['slug'].'/setup/adminMenus.php')) { - require_once(GLM_MEMBERS_WORDPRESS_PLUGIN_PATH.$a['slug'].'/setup/adminMenus.php'); + require_once GLM_MEMBERS_WORDPRESS_PLUGIN_PATH.$a['slug'].'/setup/adminMenus.php'; } if (is_file(GLM_MEMBERS_WORDPRESS_PLUGIN_PATH.$a['slug'].'/setup/adminTabs.php')) { - require_once(GLM_MEMBERS_WORDPRESS_PLUGIN_PATH.$a['slug'].'/setup/adminTabs.php'); + require_once GLM_MEMBERS_WORDPRESS_PLUGIN_PATH.$a['slug'].'/setup/adminTabs.php'; } } @@ -818,7 +818,7 @@ class glmMembersAdmin extends GlmPluginSupport } else { // Load the model file - require_once ($modelName); + require_once $modelName; // check for an invalid model class name if (!class_exists($className)) { diff --git a/controllers/front.php b/controllers/front.php index 17fc4fe8..03b8dc1c 100644 --- a/controllers/front.php +++ b/controllers/front.php @@ -80,7 +80,7 @@ class glmMembersFront extends GlmPluginSupport // If setup/frontMisc.php exists include that now - Can be used for additional filters and hooks $miscFile = GLM_MEMBERS_WORDPRESS_PLUGIN_PATH.$a['slug'].'/setup/frontHooks.php'; if (is_file($miscFile)) { - require_once($miscFile); + require_once $miscFile; } } @@ -389,7 +389,7 @@ class glmMembersFront extends GlmPluginSupport // Load the model file, if it hasn't already if (!class_exists($className)) { - require_once ($modelName); + require_once $modelName; } // check for an invalid model class name @@ -486,26 +486,23 @@ class glmMembersFront extends GlmPluginSupport } // if errorMsg // If there was an error - if ($errorMsg != '') { - $mailMsg = " -

An error occurred while running the request below.

- - 
-                
-                
-                
-                
-                
-                
-                
-                
-                
-                
-                
-                
-                
Error Msg: $errorMsg
Server: ".$_SERVER['SERVER_NAME']."
Method: ".$_SERVER['REQUEST_METHOD']."
Time: ".date('r', $_SERVER['REQUEST_TIME'])."
Query: ".$_SERVER['QUERY_STRING']."
Referer: ".$_SERVER['HTTP_REFERER']."
User Agent: ".$_SERVER['HTTP_USER_AGENT']."
Remote Addr: ".$_SERVER['REMOTE_ADDR']."
Filename: ".$_SERVER['SCRIPT_FILENAME']."
URL: http://".$_SERVER['SERVER_NAME'].$_SERVER['REQUEST_URI']."
Request Data: ".print_r($_REQUEST,1)."

-
- "; + if ($errorMsg != '' && isset($_SERVER['HTTP_REFERER'])) { + $mailMsg = +" +An error occurred while running the request below. + +Error Msg: $errorMsg +Server: ".$_SERVER['SERVER_NAME']." +Method: ".$_SERVER['REQUEST_METHOD']." +Time: ".date('r', $_SERVER['REQUEST_TIME'])." +Query: ".$_SERVER['QUERY_STRING']." +Referrer: ".$_SERVER['HTTP_REFERER']." +User Agent: ".$_SERVER['HTTP_USER_AGENT']." +Remote Addr: ".$_SERVER['REMOTE_ADDR']." +Filename: ".$_SERVER['SCRIPT_FILENAME']." +URL: http://".$_SERVER['SERVER_NAME'].$_SERVER['REQUEST_URI']." +Request Data: ".print_r($_REQUEST,1)." +"; mail ( 'errors@gaslightmedia.com', 'Front-End GLM Associate Error', @@ -513,7 +510,7 @@ class glmMembersFront extends GlmPluginSupport ); $viewPath = GLM_MEMBERS_WORDPRESS_PLUGIN_PATH.GLM_MEMBERS_PLUGIN_SLUG.'/views'; $viewFile = 'front/error/index.html'; - require_once (GLM_MEMBERS_WORDPRESS_PLUGIN_PATH.GLM_MEMBERS_PLUGIN_SLUG.'/models/front/error/index.php'); + require_once GLM_MEMBERS_WORDPRESS_PLUGIN_PATH.GLM_MEMBERS_PLUGIN_SLUG.'/models/front/error/index.php'; $model = new GlmMembersFront_error_index($this->wpdb, $this->config); $results = $model->modelAction($actionData); } diff --git a/deactivate.php b/deactivate.php index dd5e3ecb..d0397b08 100644 --- a/deactivate.php +++ b/deactivate.php @@ -20,7 +20,7 @@ if (!defined('ABSPATH')) { } // Load glmPluginSupport class -require_once (GLM_MEMBERS_PLUGIN_PATH . '/classes/glmPluginSupport.php'); +require_once GLM_MEMBERS_PLUGIN_PATH . '/classes/glmPluginSupport.php'; /* * This class performs all necessary additional work when this diff --git a/index.php b/index.php index bd8b1af6..cfc94e15 100644 --- a/index.php +++ b/index.php @@ -209,10 +209,10 @@ add_option('glmMembersDatabaseDbVersion', false); $glmMembersDatabaseDbVersion = get_option('glmMembersDatabaseDbVersion'); // Get standard defined parameters -require_once('defines.php'); +require_once 'defines.php'; // Get configuration -require_once('config.php'); +require_once 'config.php'; /* * @@ -271,10 +271,10 @@ require_once('config.php'); * Also note that the default array includes information on the main member db plugin. This is * done for consistency, particularly for database maintenance */ -require_once(GLM_MEMBERS_PLUGIN_SETUP_PATH.'/validActions.php'); -require_once(GLM_MEMBERS_PLUGIN_SETUP_PATH.'/shortcodes.php'); +require_once GLM_MEMBERS_PLUGIN_SETUP_PATH.'/validActions.php'; +require_once GLM_MEMBERS_PLUGIN_SETUP_PATH.'/shortcodes.php'; require_once GLM_MEMBERS_PLUGIN_SETUP_PATH.'/requiredPages.php'; -require_once(GLM_MEMBERS_PLUGIN_DB_SCRIPTS.'/dbVersions.php'); +require_once GLM_MEMBERS_PLUGIN_DB_SCRIPTS.'/dbVersions.php'; $config['addOns'] = array(); // Register the main member db plugin as an add-on - Will be more normal when members are pulled from main plugin @@ -352,7 +352,7 @@ if (glmCheckDatabase('install')) { function glmMembersPluginActivate () { global $wpdb, $config; - require_once (GLM_MEMBERS_PLUGIN_PATH . '/activate.php'); + require_once GLM_MEMBERS_PLUGIN_PATH . '/activate.php'; new glmMembersPluginActivate($wpdb, $config); } register_activation_hook(__FILE__, 'glmMembersPluginActivate'); @@ -361,7 +361,7 @@ if (glmCheckDatabase('install')) { function glmMembersPluginDeactivate () { global $wpdb, $config; - require_once (GLM_MEMBERS_PLUGIN_PATH . '/deactivate.php'); + require_once GLM_MEMBERS_PLUGIN_PATH . '/deactivate.php'; $x = new glmMembersPluginDeactivate($wpdb, $config); return false; } @@ -374,13 +374,13 @@ if (glmCheckDatabase('install')) { */ // Load data abstract - require_once(GLM_MEMBERS_PLUGIN_LIB_PATH.'/GlmDataAbstract/DataAbstract.php'); + require_once GLM_MEMBERS_PLUGIN_LIB_PATH.'/GlmDataAbstract/DataAbstract.php'; // Load glmPluginSupport class - require_once (GLM_MEMBERS_PLUGIN_PATH . '/classes/glmPluginSupport.php'); + require_once GLM_MEMBERS_PLUGIN_PATH . '/classes/glmPluginSupport.php'; // Load Smarty Template Support - require_once (GLM_MEMBERS_PLUGIN_PATH . '/lib/smartyTemplateSupport.php'); + require_once GLM_MEMBERS_PLUGIN_PATH . '/lib/smartyTemplateSupport.php'; /* * Hook through which an add-on may supply additional logged in user information and @@ -427,10 +427,10 @@ if ($glmMembersDatabaseDbVersion) { // Otherwise select appropriate controller if (is_admin()) { - require_once (GLM_MEMBERS_PLUGIN_PATH . '/controllers/admin.php'); + require_once GLM_MEMBERS_PLUGIN_PATH . '/controllers/admin.php'; new glmMembersAdmin($wpdb, $config); } else { - require_once (GLM_MEMBERS_PLUGIN_PATH . '/controllers/front.php'); + require_once GLM_MEMBERS_PLUGIN_PATH . '/controllers/front.php'; new glmMembersFront($wpdb, $config); } @@ -649,7 +649,7 @@ function glmCheckDatabase () // Check for PHP script to update database $phpScript = $a['database']['dbScriptPath'].'/update_database_V'.$ver.'.php'; if (is_file($phpScript)) { - require_once ($phpScript); + require_once $phpScript; } // If there were no errors @@ -702,7 +702,7 @@ function glmCheckDatabase () // If there was any serious error with the database for this add-on if ($db_error) { // Deactivate this add-on - include_once( ABSPATH . 'wp-admin/includes/plugin.php' ); + include_once ABSPATH . 'wp-admin/includes/plugin.php'; deactivate_plugins($a['slug'].'/index.php'); $startupNotices .= '

Plugin '.$a['name'].' Deactivated.

'; diff --git a/js/imageUpload/imageUpload.js b/js/imageUpload/imageUpload.js index e32a4fb1..8a3308b6 100644 --- a/js/imageUpload/imageUpload.js +++ b/js/imageUpload/imageUpload.js @@ -366,17 +366,19 @@ jQuery(document).ready(function($) { */ function setupExpandedImageEvents() { - var holdImage = false; + var largeImageDisplayed = false; // Handle expanded images on hover for image gallery - $('.glm-galleryImage').on("mouseenter", function(){ - id = $(this).attr("data-id"); + $('.glm-galleryImage').on("click", function(){ - // If an image is being held, close it now and reset holdImage - if (holdImage) { - $('#glm-galleryImageLarger_' + holdImage).dialog("close"); - holdImage = false; + // If an image is currently displayed, close it now and reset the flag + if (largeImageDisplayed) { + $('#glm-galleryImageLarger_' + largeImageDisplayed).dialog("close"); + largeImageDisplayed = false; } + + id = $(this).attr("data-id"); + largeImageDisplayed = id; // Display the larger image var imgTitle = $("#galleryImage_caption_" + id).val(); @@ -386,28 +388,16 @@ jQuery(document).ready(function($) { autoOpen: true, resizable: false, width: 'auto', + modal: false, minWidth: 100, minHeight: 100, create: function() { - $(this).dialog('option', 'maxHeight', $(window).height() * .9); $(this).dialog('option', 'maxWidth', $(window).width() * .9); }, - position: { my: "left+10 top+10", at: "right top", of: $(this), collision: "fit" } + position: { my: "left+10 top+10", at: "right top", of: $(this) } }); }); - // If an image is clicked, then hold the larter image dialog box - $('.glm-galleryImage').on("click", function(){ - holdImage = $(this).attr("data-id"); - }); - $('.glm-galleryImage').on("mouseleave", function(){ - id = $(this).attr("data-id"); - - // If the image has not been clicked to keep it displayed, close it now - if (!holdImage) { - $('#glm-galleryImageLarger_' + id).dialog("close"); - } - }); // Make images sortable and store the list of IDs in a hidden input field when order has changed. if (enableDraggable) { diff --git a/lib/phpgraphlib-master/phpgraphlib.php b/lib/phpgraphlib-master/phpgraphlib.php index 15b22453..4adb30bd 100644 --- a/lib/phpgraphlib-master/phpgraphlib.php +++ b/lib/phpgraphlib-master/phpgraphlib.php @@ -102,6 +102,7 @@ class PHPGraphLib { protected $data_set_count = 0; protected $data_min = 0; protected $data_max = 0; + protected $minMaxYValue = false; protected $data_count = 0; protected $bool_data = false; protected $bool_bars_generate = true; @@ -327,6 +328,10 @@ class PHPGraphLib { //start at y value 0 or data min, whichever is less $graphBottomScale = ($this->data_min<0) ? $this->data_min : 0; $graphTopScale = ($this->data_max<0) ? 0 : $this->data_max ; + if ($this->minMaxYValue && $this->minMaxYValue > $graphTopScale) { + $graphTopScale = $this->minMaxYValue; + $this->data_max = $this->minMaxYValue; +} $graphScaleRange = $graphTopScale - $graphBottomScale; //all data identical @@ -1226,6 +1231,11 @@ class PHPGraphLib { } } + // Added by Chuck Scott - 8/26/16 - Option to set minimum value for the top of the Y axis + public function setMinMaxY($minMaxYValue) { + $this->minMaxYValue = $minMaxYValue; + } + public function setDataCurrency($currency_type = 'dollar') { switch (strtolower($currency_type)) { diff --git a/lib/smartyTemplateSupport.php b/lib/smartyTemplateSupport.php index 2f5ce808..ce0ea26a 100644 --- a/lib/smartyTemplateSupport.php +++ b/lib/smartyTemplateSupport.php @@ -54,7 +54,7 @@ class smartyTemplateSupport { /* * Load and instatiate Smarty Templates */ - require_once (GLM_MEMBERS_PLUGIN_PATH . '/lib/Smarty-3.1.21/libs/SmartyBC.class.php'); + require_once GLM_MEMBERS_PLUGIN_PATH.'/lib/Smarty-3.1.21/libs/SmartyBC.class.php'; $this->template = new SmartyBC (); /* diff --git a/models/admin/ajax/memberClickThrough.php b/models/admin/ajax/memberClickThrough.php index ba582ee1..5bb1e258 100644 --- a/models/admin/ajax/memberClickThrough.php +++ b/models/admin/ajax/memberClickThrough.php @@ -15,7 +15,7 @@ // Load Members Data Class -require_once(GLM_MEMBERS_PLUGIN_CLASS_PATH.'/data/dataMembers.php'); +require_once GLM_MEMBERS_PLUGIN_CLASS_PATH.'/data/dataMembers.php'; /* * This class exports the currently selected members list diff --git a/models/admin/ajax/memberDetailClick.php b/models/admin/ajax/memberDetailClick.php index 078b95bc..9e8d887b 100644 --- a/models/admin/ajax/memberDetailClick.php +++ b/models/admin/ajax/memberDetailClick.php @@ -15,7 +15,7 @@ // Load Members Data Class -require_once(GLM_MEMBERS_PLUGIN_CLASS_PATH.'/data/dataMembers.php'); +require_once GLM_MEMBERS_PLUGIN_CLASS_PATH.'/data/dataMembers.php'; /* * This class exports the currently selected members list diff --git a/models/admin/ajax/memberGraphs.php b/models/admin/ajax/memberGraphs.php index e898ec9b..5af18ef3 100644 --- a/models/admin/ajax/memberGraphs.php +++ b/models/admin/ajax/memberGraphs.php @@ -14,7 +14,7 @@ */ // Load Members data abstract -require_once(GLM_MEMBERS_PLUGIN_CLASS_PATH.'/data/dataMembers.php'); +require_once GLM_MEMBERS_PLUGIN_CLASS_PATH.'/data/dataMembers.php'; /* * This class exports the currently selected members list @@ -177,11 +177,12 @@ class GlmMembersAdmin_ajax_memberGraphs extends GlmDataMembers } // Load PHPGraphLib - require_once(GLM_MEMBERS_PLUGIN_LIB_PATH.'/phpgraphlib-master/phpgraphlib.php'); + require_once GLM_MEMBERS_PLUGIN_LIB_PATH.'/phpgraphlib-master/phpgraphlib.php'; // Create graph object $graph = new PHPGraphLib(600,300); $graph->addData($data); + $graph->setMinMaxY(10); // Set minimum top value to Y axis // $graph->setTitle($graphTitle); - In this case the graph title is on the pop-up dialog box. $graph->setTextColor("black"); $graph->setLineColor("blue"); diff --git a/models/admin/ajax/membersListExport.php b/models/admin/ajax/membersListExport.php index e2b6c251..e4c65bb0 100644 --- a/models/admin/ajax/membersListExport.php +++ b/models/admin/ajax/membersListExport.php @@ -15,7 +15,7 @@ // Load Member Info data abstract -require_once(GLM_MEMBERS_PLUGIN_CLASS_PATH.'/data/dataMemberInfo.php'); +require_once GLM_MEMBERS_PLUGIN_CLASS_PATH.'/data/dataMemberInfo.php'; /* * This class exports the currently selected members list diff --git a/models/admin/dashboardWidget/index.php b/models/admin/dashboardWidget/index.php index e8087564..df012d52 100644 --- a/models/admin/dashboardWidget/index.php +++ b/models/admin/dashboardWidget/index.php @@ -39,7 +39,7 @@ */ // Load Members data abstract -require_once(GLM_MEMBERS_PLUGIN_CLASS_PATH.'/data/dataMembers.php'); +require_once GLM_MEMBERS_PLUGIN_CLASS_PATH.'/data/dataMembers.php'; /* * This class performs the work for the default action of the "Members" menu @@ -133,37 +133,37 @@ class GlmMembersAdmin_dashboardWidget_index extends GlmDataMembers $membersList = $this->getSimpleMembersList(); // Check for required Member Types - require_once(GLM_MEMBERS_PLUGIN_CLASS_PATH.'/data/dataMemberTypes.php'); + require_once GLM_MEMBERS_PLUGIN_CLASS_PATH.'/data/dataMemberTypes.php'; $MemberTypes = new GlmDataMemberTypes($this->wpdb, $this->config); $memberTypesStats = $MemberTypes->getStats(); $haveMemberTypes = ($memberTypesStats > 0); // Check for required Categories - require_once(GLM_MEMBERS_PLUGIN_CLASS_PATH.'/data/dataCategories.php'); + require_once GLM_MEMBERS_PLUGIN_CLASS_PATH.'/data/dataCategories.php'; $Categories = new GlmDataCategories($this->wpdb, $this->config); $categoriesStats = $Categories->getStats(); $haveCategories = ($categoriesStats > 0); // Check for required Amenities - require_once(GLM_MEMBERS_PLUGIN_CLASS_PATH.'/data/dataAmenities.php'); + require_once GLM_MEMBERS_PLUGIN_CLASS_PATH.'/data/dataAmenities.php'; $Amenities = new GlmDataAmenities($this->wpdb, $this->config); $amenitiesStats = $Amenities->getStats(); $haveAmenities = ($amenitiesStats > 0); // Check for required Cities - 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); $citiesStats = $Cities->getStats(); $haveCities = ($citiesStats > 0); // Check for required Regions - require_once(GLM_MEMBERS_PLUGIN_CLASS_PATH.'/data/dataRegions.php'); + require_once GLM_MEMBERS_PLUGIN_CLASS_PATH.'/data/dataRegions.php'; $Regions = new GlmDataRegions($this->wpdb, $this->config); $regionsStats = $Regions->getStats(); $haveRegions = ($regionsStats > 0); // Get number of member information records with pending updates - require_once(GLM_MEMBERS_PLUGIN_CLASS_PATH.'/data/dataMemberInfo.php'); + require_once GLM_MEMBERS_PLUGIN_CLASS_PATH.'/data/dataMemberInfo.php'; $MemberInfo = new GlmDataMemberInfo($this->wpdb, $this->config); $membersPending = $MemberInfo->getStats('status = '.$this->config['status_numb']['Pending']); diff --git a/models/admin/management/development.php b/models/admin/management/development.php index c0f7b157..6452d5a1 100644 --- a/models/admin/management/development.php +++ b/models/admin/management/development.php @@ -106,7 +106,7 @@ class GlmMembersAdmin_management_development settype($dbVersion, 'string'); // Load database activation class to get access to database version information - require_once (GLM_MEMBERS_PLUGIN_PATH . '/activate.php'); + require_once GLM_MEMBERS_PLUGIN_PATH . '/activate.php'; $activate = new glmMembersPluginActivate($this->wpdb, $this->config, true); $option = ''; @@ -119,7 +119,7 @@ class GlmMembersAdmin_management_development case 'import_connections': // Load Member Info Data Class and get info data for later use - require_once(GLM_MEMBERS_PLUGIN_CLASS_PATH.'/glmMemberImportFromConnections.php'); + require_once GLM_MEMBERS_PLUGIN_CLASS_PATH.'/glmMemberImportFromConnections.php'; $Connections = new GlmMemberImportFromConnections($this->wpdb, $this->config); if (isset($_REQUEST['import']) && $_REQUEST['import'] == 'now') { diff --git a/models/admin/management/import.php.OLD b/models/admin/management/import.php.OLD index 03ebac10..6cad5c80 100644 --- a/models/admin/management/import.php.OLD +++ b/models/admin/management/import.php.OLD @@ -1116,7 +1116,7 @@ class GlmMembersAdmin_management_import case 'importImages': - require_once(GLM_MEMBERS_PLUGIN_PATH.'/models/admin/ajax/imageUpload.php'); + require_once GLM_MEMBERS_PLUGIN_PATH.'/models/admin/ajax/imageUpload.php'; $ImageUpload = new GlmMembersAdmin_ajax_imageUpload($this->wpdb, $this->config); $refType = $this->config['ref_type_numb']['MemberInfo']; diff --git a/models/admin/management/import/memberImages.php b/models/admin/management/import/memberImages.php index e6ee3216..95be6fe0 100644 --- a/models/admin/management/import/memberImages.php +++ b/models/admin/management/import/memberImages.php @@ -3,7 +3,7 @@ * Import Member Images */ -require_once(GLM_MEMBERS_PLUGIN_PATH.'/models/admin/ajax/imageUpload.php'); +require_once GLM_MEMBERS_PLUGIN_PATH.'/models/admin/ajax/imageUpload.php'; $ImageUpload = new GlmMembersAdmin_ajax_imageUpload($this->wpdb, $this->config); $refType = $this->config['ref_type_numb']['MemberInfo']; diff --git a/models/admin/management/index.php b/models/admin/management/index.php index db509a41..c0f7dfd7 100644 --- a/models/admin/management/index.php +++ b/models/admin/management/index.php @@ -14,7 +14,7 @@ */ // Load Members data abstract -require_once( GLM_MEMBERS_PLUGIN_CLASS_PATH.'/data/settings/dataSettingsGeneral.php' ); +require_once GLM_MEMBERS_PLUGIN_CLASS_PATH.'/data/settings/dataSettingsGeneral.php' ; /* * This class performs the work for the default action of the "Members" menu @@ -134,13 +134,13 @@ class GlmMembersAdmin_management_index extends GlmDataSettingsGeneral ) ); } - + // Check for submission option $option = ''; if ( isset( $_REQUEST[ 'option' ] ) && $_REQUEST[ 'option' ] == 'submit' ) { $option = $_REQUEST['option']; } - + $this->updateRequiredPages(); switch( $option ) { @@ -148,32 +148,32 @@ class GlmMembersAdmin_management_index extends GlmDataSettingsGeneral case 'submit': foreach ( $this->config[ 'addOns' ] as $a ) { if ( isset( $a[ 'requiredPages' ] ) ) { - foreach( $a[ 'requiredPages'] as $pageName => $pageData ) { - + foreach( $a[ 'requiredPages'] as $pageName => $pageData ) { + $current_page_id_value = get_option( GLM_MEMBERS_PLUGIN_OPTION_PREFIX.$pageData[ 'underscored_title' ] ); - + // the static slug name used to create unique form field names $page_title_field_name = 'glm_members_database_title_' . $this->requiredPages[ $a[ 'underscored_name'] ][ $pageName ][ 'static_name' ]; $page_id_field_name = 'glm_members_database_id_' . $this->requiredPages[ $a[ 'underscored_name' ] ][ $pageName ][ 'static_name' ]; - + // the slug used to update the options table $page_option_slug = GLM_MEMBERS_PLUGIN_OPTION_PREFIX.$pageData['underscored_title']; $current_page_title_value = $this->requiredPages[ $a[ 'underscored_name' ] ][ $pageName][ 'title' ]; - + if ( isset( $_POST[ $page_title_field_name ] ) && ! empty( $_POST[ $page_title_field_name ] ) ){ $new_page_title_value = filter_var( $_POST[ $page_title_field_name ], FILTER_SANITIZE_STRING); } else { $title_error = true; } - + // check to make sure the post value isn't empty and is numeric if ( isset( $_POST[ $page_id_field_name ] ) && ! empty( $_POST[ $page_id_field_name ] ) && is_numeric( $_POST[ $page_id_field_name ] ) ){ $new_page_id_value = filter_var( $_POST[ $page_id_field_name ], FILTER_SANITIZE_STRING ); } else { $id_error = true; } - + // if the current page title matches the posted value, no need to update if ( $current_page_title_value !== $new_page_title_value ){ $args = array ( @@ -182,17 +182,17 @@ class GlmMembersAdmin_management_index extends GlmDataSettingsGeneral ); wp_update_post( $args ); } - + // ensure the new page id exists and isn't already the same as the current page ID value if ( $current_page_id_value !== $new_page_id_value && get_post_status( $new_page_id_value ) ){ update_option( $page_option_slug, $new_page_id_value ); - } + } } } } - + $this->updateRequiredPages(); - + // Update all general setttings $generalSettings = $this->updateEntry( 1 ); if ( $generalSettings[ 'status' ] ) { diff --git a/models/admin/management/terms.php b/models/admin/management/terms.php index 42e37c00..1278a83a 100644 --- a/models/admin/management/terms.php +++ b/models/admin/management/terms.php @@ -14,7 +14,7 @@ */ // Load Members data abstract -require_once(GLM_MEMBERS_PLUGIN_CLASS_PATH.'/data/settings/dataSettingsTerms.php'); +require_once GLM_MEMBERS_PLUGIN_CLASS_PATH.'/data/settings/dataSettingsTerms.php'; /* * This class performs the work for the default action of the "Members" menu diff --git a/models/admin/management/theme.php b/models/admin/management/theme.php index c57a4ff6..bc38e8cc 100644 --- a/models/admin/management/theme.php +++ b/models/admin/management/theme.php @@ -14,7 +14,7 @@ */ // Load Members data abstract -require_once(GLM_MEMBERS_PLUGIN_CLASS_PATH.'/data/settings/dataSettingsTheme.php'); +require_once GLM_MEMBERS_PLUGIN_CLASS_PATH.'/data/settings/dataSettingsTheme.php'; /* * This class performs the work for the default action of the "Members" menu diff --git a/models/admin/management/videos.php b/models/admin/management/videos.php index 8dd48f8d..8d209981 100644 --- a/models/admin/management/videos.php +++ b/models/admin/management/videos.php @@ -55,7 +55,7 @@ class GlmMembersAdmin_management_videos $this->config = $config; } - + public function addScheme($url, $scheme = 'http://') { return parse_url($url, PHP_URL_SCHEME) === null ? @@ -112,23 +112,23 @@ class GlmMembersAdmin_management_videos settype($dbVersion, 'string'); // Load database activation class to get access to database version information - require_once (GLM_MEMBERS_PLUGIN_PATH . '/activate.php'); + require_once GLM_MEMBERS_PLUGIN_PATH . '/activate.php'; $activate = new glmMembersPluginActivate($this->wpdb, $this->config, true); $option = ''; if (isset($_REQUEST['option']) && $_REQUEST['option'] != '') { $option = $_REQUEST['option']; } - + switch($option) { case 'transfer_videos': - + $resultMessage = '
$_REQUEST: ' . print_r($_REQUEST, true) . '
'; $sql = " SELECT id,descr,video_url FROM " . GLM_MEMBERS_PLUGIN_DB_PREFIX . "member_info - WHERE descr like '%youtube.com/embed%' + WHERE descr like '%youtube.com/embed%' ORDER BY id"; $results = $this->wpdb->get_results( $sql, ARRAY_A ); //echo '
$results: ' . print_r($results, true) . '
'; @@ -144,22 +144,22 @@ class GlmMembersAdmin_management_videos echo "TEST". $this->addScheme($srcMatches[0])."TESTEND"; if ( preg_match( '%youtube.com/embed/([^?"]*)%', $matches[1], $srcMatches ) ) { echo '
$srcMatches: ' . print_r($srcMatches, true) . '
'; - + } $sqlUpdate = " UPDATE " . GLM_MEMBERS_PLUGIN_DB_PREFIX . "member_info SET video_url='" . $this->addScheme($srcMatches[0]) . "' WHERE id='" . $member['id'] . "'"; $this->wpdb->query($sqlUpdate); - + $filteredString = str_replace($iframeCode,"",$descr); - + $sqlDelete = " UPDATE " . GLM_MEMBERS_PLUGIN_DB_PREFIX . "member_info SET descr='" . $filteredString . "' WHERE id='" . $member['id'] . "'"; $this->wpdb->query($sqlDelete); - + //$resultMessage .= '
$matches: ' . print_r($matches, true) . '
'; } } diff --git a/models/admin/member/index.php b/models/admin/member/index.php index 0c5adeb2..3d05a0bf 100644 --- a/models/admin/member/index.php +++ b/models/admin/member/index.php @@ -14,7 +14,7 @@ */ // Load Members data abstract -require_once(GLM_MEMBERS_PLUGIN_CLASS_PATH.'/data/dataMembers.php'); +require_once GLM_MEMBERS_PLUGIN_CLASS_PATH.'/data/dataMembers.php'; /* * This class performs the work for the default action of the "Members" menu @@ -112,7 +112,7 @@ class GlmMembersAdmin_member_index extends GlmDataMembers $detailViewCounts = array('day' => 0, 'week' => 0, 'month' => 0); // Check for required Member Types - require_once(GLM_MEMBERS_PLUGIN_CLASS_PATH.'/data/dataMemberTypes.php'); + require_once GLM_MEMBERS_PLUGIN_CLASS_PATH.'/data/dataMemberTypes.php'; $MemberTypes = new GlmDataMemberTypes($this->wpdb, $this->config); $memberTypesStats = $MemberTypes->getStats(); $haveMemberTypes = ($memberTypesStats > 0); @@ -331,7 +331,7 @@ class GlmMembersAdmin_member_index extends GlmDataMembers $showArchived = true; } - require_once(GLM_MEMBERS_PLUGIN_CLASS_PATH.'/data/dataMemberInfo.php'); + require_once GLM_MEMBERS_PLUGIN_CLASS_PATH.'/data/dataMemberInfo.php'; $MemberInfo = new GlmDataMemberInfo($this->wpdb, $this->config); $memberInfoRecords = $MemberInfo->getList("T.member = $memberID".$hideArchived, 'T.status'); @@ -414,7 +414,7 @@ class GlmMembersAdmin_member_index extends GlmDataMembers ", ARRAY_A); } - + // End of - Get member view stats $thisDate = date('m/d/Y'); diff --git a/models/admin/member/memberEdit.php b/models/admin/member/memberEdit.php index 0d41452f..b84d11fd 100644 --- a/models/admin/member/memberEdit.php +++ b/models/admin/member/memberEdit.php @@ -14,7 +14,7 @@ */ // Load Members data abstract -require_once(GLM_MEMBERS_PLUGIN_CLASS_PATH.'/data/dataMembers.php'); +require_once GLM_MEMBERS_PLUGIN_CLASS_PATH.'/data/dataMembers.php'; /* * This class performs the work for the default action of the "Members" menu @@ -128,7 +128,7 @@ class GlmMembersAdmin_member_memberEdit extends GlmDataMembers */ // Check for required Member Types - require_once(GLM_MEMBERS_PLUGIN_CLASS_PATH.'/data/dataMemberTypes.php'); + require_once GLM_MEMBERS_PLUGIN_CLASS_PATH.'/data/dataMemberTypes.php'; $MemberTypes = new GlmDataMemberTypes($this->wpdb, $this->config); $memberTypesStats = $MemberTypes->getStats(); $haveMemberTypes = ($memberTypesStats > 0); diff --git a/models/admin/member/memberInfo.php b/models/admin/member/memberInfo.php index 32c55878..3c4bd493 100644 --- a/models/admin/member/memberInfo.php +++ b/models/admin/member/memberInfo.php @@ -14,7 +14,7 @@ */ // Load Members data abstract -require_once(GLM_MEMBERS_PLUGIN_CLASS_PATH.'/data/dataMemberInfo.php'); +require_once GLM_MEMBERS_PLUGIN_CLASS_PATH.'/data/dataMemberInfo.php'; /* * This class performs the work for the default action of the "Members" menu @@ -251,7 +251,7 @@ class GlmMembersAdmin_member_memberInfo extends GlmDataMemberInfo $this->isActive = $this->isActive(); // Get member base 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); $this->memberData = $Members->getEntry($this->memberID); $this->fields['logo']['i_prefix'] = 'memb_'.$this->memberID.'_'; @@ -273,7 +273,7 @@ class GlmMembersAdmin_member_memberInfo extends GlmDataMemberInfo * These will be sorted so sub-categories fall under their * respective category. */ - require_once(GLM_MEMBERS_PLUGIN_CLASS_PATH.'/data/dataCategories.php'); + require_once GLM_MEMBERS_PLUGIN_CLASS_PATH.'/data/dataCategories.php'; $Categories = new GlmDataCategories($this->wpdb, $this->config); $categories = $Categories->getListSortedParentChild(); @@ -307,7 +307,7 @@ class GlmMembersAdmin_member_memberInfo extends GlmDataMemberInfo $this->updateAmenities(); // Load Image data class - require_once(GLM_MEMBERS_PLUGIN_CLASS_PATH.'/data/dataImages.php'); + require_once GLM_MEMBERS_PLUGIN_CLASS_PATH.'/data/dataImages.php'; $Images = new GlmDataImages($this->wpdb, $this->config); // Update image gallery titles, descriptions, and image positions then return current image gallery @@ -374,7 +374,7 @@ class GlmMembersAdmin_member_memberInfo extends GlmDataMemberInfo case 'clone': // Load Member Info Clone Class - require_once(GLM_MEMBERS_PLUGIN_CLASS_PATH.'/glmMemberInfoClone.php'); + require_once GLM_MEMBERS_PLUGIN_CLASS_PATH.'/glmMemberInfoClone.php'; $CloneMemberInfo = new GlmMemberInfoClone($this->wpdb, $this->config); // Clone the current member info @@ -406,7 +406,7 @@ class GlmMembersAdmin_member_memberInfo extends GlmDataMemberInfo } // Get list of Available Member Amenities to use for picklists - require_once(GLM_MEMBERS_PLUGIN_CLASS_PATH.'/data/dataAmenities.php'); + require_once GLM_MEMBERS_PLUGIN_CLASS_PATH.'/data/dataAmenities.php'; $Amenities = new GlmDataAmenities($this->wpdb, $this->config); $this->amenities = $Amenities->getList("T.ref_type = ".$this->config['ref_type_numb']['MemberInfo']); @@ -444,7 +444,7 @@ class GlmMembersAdmin_member_memberInfo extends GlmDataMemberInfo // Also, if this is not a create, get any image gallery images if ($this->memberInfoID) { - require_once(GLM_MEMBERS_PLUGIN_CLASS_PATH.'/data/dataImages.php'); + require_once GLM_MEMBERS_PLUGIN_CLASS_PATH.'/data/dataImages.php'; $Images = new GlmDataImages($this->wpdb, $this->config); $this->imageGallery = $Images->getGallery($this->config['ref_type_numb']['MemberInfo'], $this->memberInfoID); $this->haveImageGallery = ($this->imageGallery != false); @@ -512,7 +512,7 @@ class GlmMembersAdmin_member_memberInfo extends GlmDataMemberInfo $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); @@ -543,11 +543,11 @@ class GlmMembersAdmin_member_memberInfo extends GlmDataMemberInfo { // Instatiate the dataCategories class - require_once(GLM_MEMBERS_PLUGIN_CLASS_PATH.'/data/dataCategories.php'); + require_once GLM_MEMBERS_PLUGIN_CLASS_PATH.'/data/dataCategories.php'; $Categories = new GlmDataCategories($this->wpdb, $this->config); // Instatiate categoryMemberInfo class - require_once(GLM_MEMBERS_PLUGIN_CLASS_PATH.'/data/dataCategoryMemberInfo.php'); + require_once GLM_MEMBERS_PLUGIN_CLASS_PATH.'/data/dataCategoryMemberInfo.php'; $CategoryMemberInfo = new GlmDataCategoryMemberInfo($this->wpdb, $this->config); // Get any selected categories @@ -693,7 +693,7 @@ class GlmMembersAdmin_member_memberInfo extends GlmDataMemberInfo { // Instantiate Amenities data class - require_once(GLM_MEMBERS_PLUGIN_CLASS_PATH.'/data/dataAmenities.php'); + require_once GLM_MEMBERS_PLUGIN_CLASS_PATH.'/data/dataAmenities.php'; $Amenities = new GlmDataAmenities($this->wpdb, $this->config); $selectedAmenities = array(); diff --git a/models/admin/members/index.php b/models/admin/members/index.php index 51da3377..d39298d2 100644 --- a/models/admin/members/index.php +++ b/models/admin/members/index.php @@ -14,7 +14,7 @@ */ // Load Members data abstract -require_once(GLM_MEMBERS_PLUGIN_CLASS_PATH.'/data/dataMembers.php'); +require_once GLM_MEMBERS_PLUGIN_CLASS_PATH.'/data/dataMembers.php'; /* * This class performs the work for the default action of the "Members" menu @@ -107,37 +107,37 @@ class GlmMembersAdmin_members_index extends GlmDataMembers $membersList = $this->getSimpleMembersList(); // Check for required Member Types - require_once(GLM_MEMBERS_PLUGIN_CLASS_PATH.'/data/dataMemberTypes.php'); + require_once GLM_MEMBERS_PLUGIN_CLASS_PATH.'/data/dataMemberTypes.php'; $MemberTypes = new GlmDataMemberTypes($this->wpdb, $this->config); $memberTypesStats = $MemberTypes->getStats(); $haveMemberTypes = ($memberTypesStats > 0); // Check for required Categories - require_once(GLM_MEMBERS_PLUGIN_CLASS_PATH.'/data/dataCategories.php'); + require_once GLM_MEMBERS_PLUGIN_CLASS_PATH.'/data/dataCategories.php'; $Categories = new GlmDataCategories($this->wpdb, $this->config); $categoriesStats = $Categories->getStats(); $haveCategories = ($categoriesStats > 0); // Check for required Amenities - require_once(GLM_MEMBERS_PLUGIN_CLASS_PATH.'/data/dataAmenities.php'); + require_once GLM_MEMBERS_PLUGIN_CLASS_PATH.'/data/dataAmenities.php'; $Amenities = new GlmDataAmenities($this->wpdb, $this->config); $amenitiesStats = $Amenities->getStats(); $haveAmenities = ($amenitiesStats > 0); // Check for required Cities - 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); $citiesStats = $Cities->getStats(); $haveCities = ($citiesStats > 0); // Check for required Regions - require_once(GLM_MEMBERS_PLUGIN_CLASS_PATH.'/data/dataRegions.php'); + require_once GLM_MEMBERS_PLUGIN_CLASS_PATH.'/data/dataRegions.php'; $Regions = new GlmDataRegions($this->wpdb, $this->config); $regionsStats = $Regions->getStats(); $haveRegions = ($regionsStats > 0); // Get number of member information records with pending updates - require_once(GLM_MEMBERS_PLUGIN_CLASS_PATH.'/data/dataMemberInfo.php'); + require_once GLM_MEMBERS_PLUGIN_CLASS_PATH.'/data/dataMemberInfo.php'; $MemberInfo = new GlmDataMemberInfo($this->wpdb, $this->config); $membersPending = $MemberInfo->getStats('status = '.$this->config['status_numb']['Pending']); diff --git a/models/admin/members/list.php b/models/admin/members/list.php index 9f5deb12..823e640d 100644 --- a/models/admin/members/list.php +++ b/models/admin/members/list.php @@ -14,7 +14,7 @@ */ // Load Members data abstract -require_once(GLM_MEMBERS_PLUGIN_CLASS_PATH.'/data/dataMembers.php'); +require_once GLM_MEMBERS_PLUGIN_CLASS_PATH.'/data/dataMembers.php'; /* * This class performs the work for the default action of the "Members" menu @@ -141,7 +141,7 @@ class GlmMembersAdmin_members_list extends GlmDataMembers } // Get a list of categories for filtering - require_once(GLM_MEMBERS_PLUGIN_CLASS_PATH.'/data/dataCategories.php'); + require_once GLM_MEMBERS_PLUGIN_CLASS_PATH.'/data/dataCategories.php'; $Categories = new GlmDataCategories($this->wpdb, $this->config); $categories = $Categories->getListSortedParentChild(false); @@ -203,7 +203,7 @@ class GlmMembersAdmin_members_list extends GlmDataMembers FROM ".GLM_MEMBERS_PLUGIN_DB_PREFIX."members I WHERE I.featured = 1 AND I.id = T.id - + )"; $filterFeatured = true; $haveFilter = true; diff --git a/models/admin/pages/shortcode.php b/models/admin/pages/shortcode.php index 7806b8a9..563bdd80 100644 --- a/models/admin/pages/shortcode.php +++ b/models/admin/pages/shortcode.php @@ -140,7 +140,7 @@ class GlmMembersAdmin_pages_shortcode } } - require_once(GLM_MEMBERS_PLUGIN_CLASS_PATH.'/data/dataCategories.php'); + require_once GLM_MEMBERS_PLUGIN_CLASS_PATH.'/data/dataCategories.php'; $listAttr = $this->config['addOns']['glm-member-db']['shortcodes']['glm-members-list']['attributes']; $detailAttr = $this->config['addOns']['glm-member-db']['shortcodes']['glm-member-detail']['attributes']; diff --git a/models/admin/settings/categories.php b/models/admin/settings/categories.php index 0e043314..6d62a069 100644 --- a/models/admin/settings/categories.php +++ b/models/admin/settings/categories.php @@ -14,7 +14,7 @@ */ // Load Member Types data abstract -require_once(GLM_MEMBERS_PLUGIN_CLASS_PATH.'/data/dataCategories.php'); +require_once GLM_MEMBERS_PLUGIN_CLASS_PATH.'/data/dataCategories.php'; /* * This class performs the work for the default action of the "Members" menu diff --git a/models/admin/settings/cities.php b/models/admin/settings/cities.php index e30e53ee..7d15eb66 100644 --- a/models/admin/settings/cities.php +++ b/models/admin/settings/cities.php @@ -14,7 +14,7 @@ */ // Load Member Types data abstract -require_once(GLM_MEMBERS_PLUGIN_CLASS_PATH.'/data/dataCities.php'); +require_once GLM_MEMBERS_PLUGIN_CLASS_PATH.'/data/dataCities.php'; /* * This class performs the work for the default action of the "Members" menu diff --git a/models/admin/settings/index.php b/models/admin/settings/index.php index cc2e273f..e8475518 100644 --- a/models/admin/settings/index.php +++ b/models/admin/settings/index.php @@ -14,7 +14,7 @@ */ // Load Member Types data abstract -require_once(GLM_MEMBERS_PLUGIN_CLASS_PATH.'/data/dataMemberTypes.php'); +require_once GLM_MEMBERS_PLUGIN_CLASS_PATH.'/data/dataMemberTypes.php'; /* * This class performs the work for the default action of the "Members" menu diff --git a/models/admin/settings/regions.php b/models/admin/settings/regions.php index d0e38080..16957981 100644 --- a/models/admin/settings/regions.php +++ b/models/admin/settings/regions.php @@ -14,7 +14,7 @@ */ // Load Member Types data abstract -require_once(GLM_MEMBERS_PLUGIN_CLASS_PATH.'/data/dataRegions.php'); +require_once GLM_MEMBERS_PLUGIN_CLASS_PATH.'/data/dataRegions.php'; /* * This class performs the work for the default action of the "Members" menu diff --git a/models/front/members/detail.php b/models/front/members/detail.php index be27f5d3..7a279644 100644 --- a/models/front/members/detail.php +++ b/models/front/members/detail.php @@ -52,7 +52,7 @@ $GLOBALS['showOpts'] = array( ); // Load Members data abstract -require_once(GLM_MEMBERS_PLUGIN_CLASS_PATH.'/data/dataMemberInfo.php'); +require_once GLM_MEMBERS_PLUGIN_CLASS_PATH.'/data/dataMemberInfo.php'; /* * This class performs the work for the default action of the "Members" menu @@ -274,7 +274,7 @@ class GlmMembersFront_members_detail extends GlmDataMemberInfo $haveMember = true; // Also get any image gallery images - require_once(GLM_MEMBERS_PLUGIN_CLASS_PATH.'/data/dataImages.php'); + require_once GLM_MEMBERS_PLUGIN_CLASS_PATH.'/data/dataImages.php'; $Images = new GlmDataImages($this->wpdb, $this->config); $imageGallery = $Images->getGallery($this->config['ref_type_numb']['MemberInfo'], $memberData['id']); diff --git a/setup/frontHooks.php b/setup/frontHooks.php index 07ded233..b52eed71 100644 --- a/setup/frontHooks.php +++ b/setup/frontHooks.php @@ -162,7 +162,7 @@ add_filter('query_vars', function($vars) { // Squash Bread Crumbs if using Breadcrumb NavXT plugin -- NEED TO CREATE A MANAGEMENT OPTION FOR THIS TO TURN IT ON/OFF $plugin_name = 'glm-member-db/glm-member-db.php'; -include_once( ABSPATH . 'wp-admin/includes/plugin.php' ); +include_once ABSPATH . 'wp-admin/includes/plugin.php'; if (is_plugin_active($plugin_name)) { add_action('bcn_after_fill', function($trail) { global $post; diff --git a/uninstall.php b/uninstall.php index 273e3782..876dcc5c 100644 --- a/uninstall.php +++ b/uninstall.php @@ -25,7 +25,7 @@ if (!defined('WP_UNINSTALL_PLUGIN')) { } // Get setup and configuration -require_once('defines.php'); +require_once 'defines.php'; // Delete options delete_option('glmMembersDatabasePluginVersion'); diff --git a/views/admin/error/badAction.html b/views/admin/error/badAction.html index 3d7b5bc4..7f5f6026 100644 --- a/views/admin/error/badAction.html +++ b/views/admin/error/badAction.html @@ -1,5 +1,6 @@ {include file='admin/error/header.html'} -
+ +

Aw shucks!

@@ -20,12 +21,28 @@ {/if}

- Please head back to the link below and try again. If you continue to get this error, - please call for assistance. + You may click your browser's "BACK" button or click on the link below to continue. If you + continue keep seeing this error, please call for assistance.

Return to Home Page

- + + + + {include file='admin/footer.html'} + diff --git a/views/admin/error/index.html b/views/admin/error/index.html index 687fdfd1..b16ea12a 100644 --- a/views/admin/error/index.html +++ b/views/admin/error/index.html @@ -1,5 +1,5 @@ {include file='admin/error/header.html'} -
+

Aw shucks!

@@ -27,6 +27,21 @@
- + + + + {include file='admin/footer.html'} diff --git a/views/admin/member/memberEdit.html b/views/admin/member/memberEdit.html index 6a8f22fb..d4defc49 100644 --- a/views/admin/member/memberEdit.html +++ b/views/admin/member/memberEdit.html @@ -96,79 +96,6 @@ {/if} - {else} - {if $haveMember} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{$terms.term_member_cap} Name:{$member.fieldData.name}
{$terms.term_member_cap} Display & Access:{$member.fieldData.access.name}
{$terms.term_member_cap} Type:{$member.fieldData.member_type.name}
Date created:{$member.fieldData.created.date}
  -

{$terms.term_member_cap} Address

-

The map below will display the likely location as you enter or edit the address.

-
Address: - {$member.fieldData.addr1}
- {if $member.fieldData.addr2 != ''}{$member.fieldData.addr2}
{/if} - {$member.fieldData.city.name}, {$member.fieldData.state.name} {$member.fieldData.zip}
- {$member.fieldData.country.name} -
Categories - {if isset($member.fieldData.categories) && $member.fieldData.categories} - {foreach from=$member.fieldData.categories item=c} -
- {if $c.parent_name != ''}{$c.parent_name}: {/if}{$c.name} - -
- {/foreach} - {/if} -
Region:{$member.fieldData.region.name}
Phone #:{$member.fieldData.phone}
Toll Free #:{$member.fieldData.toll_free}
Web Address (URL):{$member.fieldData.url}
E-Mail Address:{$member.fieldData.email}
Logo: - {if $member.fieldData.logo} -
- -
- - {/if} -
Credit Cards Accepted: - {foreach from=$member.fieldData.cc_type.bitmap item=v} - {$v.name}   - {/foreach} -
Notes:{$member.fieldData.notes}
- {else} -

No {$terms.term_member} information available.

- {/if} {/if} {else} diff --git a/views/admin/member/memberInfo.html b/views/admin/member/memberInfo.html index 8e303631..64b1d18c 100644 --- a/views/admin/member/memberInfo.html +++ b/views/admin/member/memberInfo.html @@ -15,7 +15,7 @@
Delete this {$terms.term_member_cap} Profile Version
{if $memberInfo.fieldData.status.value == 10} -

Cancel

+

Cancel

NOTE: This {$terms.term_member} profile is the currently active version! You may not delete an active profile version. To delete this version, please select another version to be active or change the "Profile Status" on this page to something @@ -98,7 +98,7 @@ Categories & Amenities Images Video - Credit Cards + {if $memberUpdated}{$terms.term_member_cap} Profile Updated{/if} {if $memberUpdateError}{$terms.term_member_cap} Profile Update Error{/if} @@ -425,7 +425,7 @@ - + -
Cancel Upload
+ @@ -531,7 +531,7 @@
- +
@@ -542,6 +542,7 @@
HTML5 file drag-and-drop not supported by your browser.
Use "Browse" button above to upload an image.
No Featured Image:
 
+
Click images to view full size.
    {if $haveImageGallery} @@ -618,7 +619,7 @@ Replace this video file: Delete Video File
    {else} - New file: + New file: {/if} diff --git a/views/admin/members/index.html b/views/admin/members/index.html index 217ac2ef..8ffc1f30 100644 --- a/views/admin/members/index.html +++ b/views/admin/members/index.html @@ -134,7 +134,7 @@ */ var availableTags = [ {foreach $membersList as $m} - { label: "{$m.name|unescape:'html'}", value: "{$m.name|unescape:'html'}", id: '{$m.id}' }, + { label: "{$m.name|unescape:'html'|replace:'"':''}", value: "{$m.name|unescape:'html'|replace:'"':''}", id: '{$m.id}' }, {/foreach} ]; $( "#glmMembersList" ).autocomplete({ diff --git a/views/front/error/badAction.html b/views/front/error/badAction.html index 4ed0162a..50c1f711 100644 --- a/views/front/error/badAction.html +++ b/views/front/error/badAction.html @@ -1,6 +1,5 @@ {include file='front/error/header.html'} -
    -
    +

    Aw shucks!

    We couldn't get you the page you wanted.

    @@ -26,6 +25,21 @@

    Return to Home Page

    - + + + {include file='front/footer.html'} + diff --git a/views/front/error/index.html b/views/front/error/index.html index 9914f318..5c41aadc 100644 --- a/views/front/error/index.html +++ b/views/front/error/index.html @@ -1,6 +1,5 @@ {include file='front/error/header.html'} -
    -
    +

    Aw shucks!

    We couldn't get you the page you wanted.

    @@ -22,7 +21,21 @@

    Return to Home Page

    - + + + {include file='front/footer.html'} diff --git a/views/front/members/detail.html b/views/front/members/detail.html index d9e92399..a6638d9a 100644 --- a/views/front/members/detail.html +++ b/views/front/members/detail.html @@ -234,12 +234,13 @@ {/if} {apply_filters('glm-member-db-front-members-detail-amenitiesAfter', '', $member.id)} + +
{foreach $member.cc_type.names as $c} {/foreach} @@ -251,6 +252,7 @@ {/if} {apply_filters('glm-member-db-front-members-detail-creditcardsAfter', '', $member.id)} +--> {apply_filters('glm-member-db-front-members-detail-categoriesBefore', '', $member.id)} {if $member.categories && $settings.detail_show_categories}
Categories
diff --git a/views/front/members/list.html b/views/front/members/list.html index 30fb714d..87704ad4 100644 --- a/views/front/members/list.html +++ b/views/front/members/list.html @@ -200,6 +200,7 @@ {/if} + {if $settings.list_map_show_amenities}
Amenities: -- 2.17.1
  

Best image size to provide is between 800 and 1000 pixels wide and stored as a JPG or JPEG file. @@ -487,7 +487,7 @@

Cancel Upload
 Name: { fileName }
Type: { fileType }
Credit Cards Accepted:
{$c}