From 7ff42ae33fa7960dc73bd19097a757c91d0907e8 Mon Sep 17 00:00:00 2001
From: Laury GvR <laury@gaslightmedia.com>
Date: Fri, 9 Nov 2018 12:24:46 -0500
Subject: [PATCH] Valid actions and basic admin files added/renamed

---
 controllers/admin.php                                         | 3 +++
 .../{manageMembers/index.php => manageDashboard/members.php}  | 4 ++--
 models/admin/{manageMembers => manageDashboard}/search.php    | 0
 setup/adminMenus.php                                          | 4 ++--
 setup/validActions.php                                        | 4 ++--
 views/admin/common/manageDashboard/index.html                 | 2 +-
 .../adminSearch/searchHeader.html                             | 0
 7 files changed, 10 insertions(+), 7 deletions(-)
 rename models/admin/{manageMembers/index.php => manageDashboard/members.php} (99%)
 rename models/admin/{manageMembers => manageDashboard}/search.php (100%)
 rename views/admin/{manageMembers => manageDashboard}/adminSearch/searchHeader.html (100%)

diff --git a/controllers/admin.php b/controllers/admin.php
index 7e5bfc2a..a1ea526a 100755
--- a/controllers/admin.php
+++ b/controllers/admin.php
@@ -861,6 +861,9 @@ class glmMembersAdmin extends GlmPluginSupport
             $plugIn = $this->config['validActions']['adminActions'][$menuItem][$action];
 
             // Build model and path and class names
+            echo "menuItem: " . $menuitem . "+++<br>";
+            echo "plugin: " . var_dump($plugIn) . "+++<br>";
+            echo "action: " . $action . "+++<br><br>";
             $modelName = GLM_MEMBERS_WORDPRESS_PLUGIN_PATH . "$plugIn/models/admin/$menuItem/$action.php";
             $className = 'GlmMembersAdmin_' . $menuItem . '_' . $action;
             $loopTracking .= "<p>Loop: $loopCheck<br>Model: $modelName<br>Class: $className</p>";
diff --git a/models/admin/manageMembers/index.php b/models/admin/manageDashboard/members.php
similarity index 99%
rename from models/admin/manageMembers/index.php
rename to models/admin/manageDashboard/members.php
index f0046e22..2a811fa1 100644
--- a/models/admin/manageMembers/index.php
+++ b/models/admin/manageDashboard/members.php
@@ -21,7 +21,7 @@ require_once GLM_MEMBERS_PLUGIN_CLASS_PATH.'/data/dataMembers.php';
  * option, which is to display the members dashboard.
  *
  */
-class GlmMembersAdmin_manageMembers_index extends GlmDataMembers
+class GlmMembersAdmin_manageDashboard_members extends GlmDataMembers
 {
 
     /**
@@ -129,7 +129,7 @@ class GlmMembersAdmin_manageMembers_index extends GlmDataMembers
         wp_enqueue_style('admin-css', GLM_MEMBERS_PLUGIN_URL . 'css/glma-admin-sass.css');
         wp_enqueue_style('css-icons', "https://fonts.googleapis.com/icon?family=Material+Icons");
         
-        require_once GLM_MEMBERS_PLUGIN_PATH . '/models/admin/manageMembers/search.php';
+        require_once GLM_MEMBERS_PLUGIN_PATH . '/models/admin/manageDashboard/search.php';
         $where              = ' true ';
         $alphaWhere         = ' true ';
         $catSearchSelected  = false;
diff --git a/models/admin/manageMembers/search.php b/models/admin/manageDashboard/search.php
similarity index 100%
rename from models/admin/manageMembers/search.php
rename to models/admin/manageDashboard/search.php
diff --git a/setup/adminMenus.php b/setup/adminMenus.php
index 7c75ac9b..8079beba 100644
--- a/setup/adminMenus.php
+++ b/setup/adminMenus.php
@@ -83,11 +83,11 @@ if (current_user_can('glm_members_members')) {
 
         add_submenu_page(
             $mainMenuSlug,
-            $this->config['terms']['term_admin_menu_members'].'New Members',
+            $this->config['terms']['term_admin_menu_members'].' NewDashboard',
             'Manage Members',
             'glm_members_member',
             'glm-members-admin-menu-members-index',
-            function() {$this->controller('manageMembers', 'index');}
+            function() {$this->controller('manageDashboard', 'members');}
         );
 
         // Add a submenu for the "Member" section
diff --git a/setup/validActions.php b/setup/validActions.php
index a9af9678..537214f1 100644
--- a/setup/validActions.php
+++ b/setup/validActions.php
@@ -48,8 +48,8 @@ $glmMembersValidActions = array(
             'glmTextSearch'         => 'glm-member-db',
             'adminSearch'           => 'glm-member-db',
         ),
-        'manageMembers' => array(
-            'index' => 'glm-member-db'
+        'manageDashboard' => array(
+            'members' => 'glm-member-db',
         ),
         'dashboard' => array(
             'index'   => 'glm-member-db',
diff --git a/views/admin/common/manageDashboard/index.html b/views/admin/common/manageDashboard/index.html
index 4aaaa755..707c1cf5 100644
--- a/views/admin/common/manageDashboard/index.html
+++ b/views/admin/common/manageDashboard/index.html
@@ -1,6 +1,6 @@
 
 <div id="glm-manage-dashboard">
-    {include file='admin/manageMembers/adminSearch/searchHeader.html'}
+    {include file='admin/manageDashboard/adminSearch/searchHeader.html'}
     <div id="glm-manage-dashboard-searchForm" class="row">
         {foreach $searchFields.components as $component}
             
diff --git a/views/admin/manageMembers/adminSearch/searchHeader.html b/views/admin/manageDashboard/adminSearch/searchHeader.html
similarity index 100%
rename from views/admin/manageMembers/adminSearch/searchHeader.html
rename to views/admin/manageDashboard/adminSearch/searchHeader.html
-- 
2.17.1