From f56faf5d2a085145f7906e7cc3633fd92c3cf573 Mon Sep 17 00:00:00 2001 From: Chuck Scott Date: Tue, 17 May 2016 12:27:54 -0400 Subject: [PATCH] Fixed access by logged in member --- models/admin/packaging/index.php | 20 ++++++++++++++++++-- views/admin/packaging/index.html | 9 ++++++++- 2 files changed, 26 insertions(+), 3 deletions(-) diff --git a/models/admin/packaging/index.php b/models/admin/packaging/index.php index fcb6563..8cf7f01 100644 --- a/models/admin/packaging/index.php +++ b/models/admin/packaging/index.php @@ -82,6 +82,11 @@ class GlmMembersAdmin_packaging_index extends GlmDataPackages { $success = true; + $lockedToMember = false; + $lockedWhereT = 'true'; + $memberWhere = 'true'; + $lockedWhereT = 'true'; + $lockedWhere = 'true'; $havePackages = false; $packages = false; $filterPackageType = false; @@ -96,6 +101,16 @@ class GlmMembersAdmin_packaging_index extends GlmDataPackages $option = false; $error = false; + // Check if there's a logged in user who is locked to their own entity + $lockedToMember = apply_filters('glm_members_locked_to_member_id', false); + if ($lockedToMember) { + $memberID = $lockedToMember; + $lockedToMember = $memberID; + $memberWhere = "T.id = $memberID"; + $lockedWhereT = 'T.ref_type = '.$this->config['ref_type_numb']['Member'].' AND T.ref_dest = '.$memberID; + $lockedWhere = 'ref_type = '.$this->config['ref_type_numb']['Member'].' AND ref_dest = '.$memberID; + } + // If there's an action option $option = 'list'; if (isset($_REQUEST['option'])) { @@ -112,7 +127,7 @@ class GlmMembersAdmin_packaging_index extends GlmDataPackages // Get simple member list require_once(GLM_MEMBERS_PLUGIN_CLASS_PATH.'/data/dataMembers.php'); $Members = new GlmDataMembers($this->wpdb, $this->config); - $membersList = $Members->getSimpleMembersList(); + $membersList = $Members->getSimpleMembersList($memberWhere); } /* @@ -247,7 +262,7 @@ class GlmMembersAdmin_packaging_index extends GlmDataPackages } // Get the list of packages - $packages = $this->getList($where); + $packages = $this->getList($lockedWhereT.$where); // If we have some, tell the template if ($packages && count($packages) > 0) { @@ -295,6 +310,7 @@ class GlmMembersAdmin_packaging_index extends GlmDataPackages // Compile template data $templateData = array( + 'lockedToMember' => $lockedToMember, 'havePackages' => $havePackages, 'packages' => $packages, 'filterPackageType' => $filterPackageType, diff --git a/views/admin/packaging/index.html b/views/admin/packaging/index.html index 939f267..212c5d9 100644 --- a/views/admin/packaging/index.html +++ b/views/admin/packaging/index.html @@ -215,7 +215,14 @@ Active:{$packageInfo.fieldData.active.name} Description:{$packageInfo.fieldData.descr} Short Description:{$packageInfo.fieldData.short_descr} - Image: + + Image: + + {if $packageInfo.fieldData.image} + + {/if} + + Start Date:{$packageInfo.fieldData.start_date.date} End Date:{$packageInfo.fieldData.end_date.date} Expiration Date:{$packageInfo.fieldData.expire_date.date} -- 2.17.1