From: Laury GvR <laury@gaslightmedia.com>
Date: Mon, 12 Nov 2018 15:38:27 +0000 (-0500)
Subject: Merge from develop
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=5cdcdb90a4745fb46bcf0610c366615e472881fc;p=WP-Plugins%2Fglm-member-db.git

Merge from develop
---

5cdcdb90a4745fb46bcf0610c366615e472881fc
diff --cc controllers/admin.php
index 1053cd87,46100ca0..87141fe8
--- a/controllers/admin.php
+++ b/controllers/admin.php
@@@ -726,10 -726,10 +726,10 @@@ class glmMembersAdmin extends GlmPlugin
       * @return void
       * @access public
       */
 -    public function controller( $menuItem, $action = false, $actionData = false, $returnOutput = false, $forceAction = false )
 +    public function controller( $menuItem, $action = false, $actionData = false, $returnOutput = false, $forceAction = false)
      {
  
-         if (GLM_MEMBERS_PLUGIN_ADMIN_DEBUG) {
+         if (GLM_MEMBERS_PLUGIN_ADMIN_DEBUG_VERBOSE) {
              trigger_error(glmAssociateMemoryUsage()." - Start Admin Controller, Menu = $menuItem, Action = $action",E_USER_NOTICE);
              trigger_error(glmAssociateTimeTracker()." - Start Admin Controller",E_USER_NOTICE);
          }
diff --cc setup/adminHooks.php
index 4e080f54,2f167d2d..68ce4257
--- a/setup/adminHooks.php
+++ b/setup/adminHooks.php
@@@ -108,9 -106,10 +108,9 @@@ if( !$menuExists && defined( 'GLM_MEMBE
  }
  
  $locations = get_theme_mod( 'nav_menu_locations' );
 -if(!empty($locations))
 -{
 +if(!empty($locations)){
      $menu = get_term_by('name', $menuName, 'nav_menu');
-     if($menu){
+     if ( $menu ) {
          $locations[$menuSlug] = $menu->term_id;
          set_theme_mod('nav_menu_locations', $locations);
      }
diff --cc setup/validActions.php
index 537214f1,ef985fca..c58859e7
--- a/setup/validActions.php
+++ b/setup/validActions.php
@@@ -33,36 -33,31 +33,39 @@@
  $glmMembersValidActions = array(
      'adminActions' => array(
          'ajax' => array(
 -            'imageUpload'         => 'glm-member-db',
 -            'fileUpload'          => 'glm-member-db',
 -            'newOldMemberIdsCsv'  => 'glm-member-db',
 -            'membersListExport'   => 'glm-member-db',
 -            'memberClickThrough'  => 'glm-member-db',
 -            'memberDetailClick'   => 'glm-member-db',
 -            'memberGraphs'        => 'glm-member-db',
 -            'fileLibraryUpload'   => 'glm-member-db',
 -            'fileLibraryDownload' => 'glm-member-db',
 -            'fileLibraryDelete'   => 'glm-member-db',
 -            'fileLibraryUpdate'   => 'glm-member-db',
 -            'glmCron'             => 'glm-member-db',
 +            'imageUpload'           => 'glm-member-db',
 +            'fileUpload'            => 'glm-member-db',
 +            'newOldMemberIdsCsv'    => 'glm-member-db',
 +            'membersListExport'     => 'glm-member-db',
 +            'memberClickThrough'    => 'glm-member-db',
 +            'memberDetailClick'     => 'glm-member-db',
 +            'memberGraphs'          => 'glm-member-db',
 +            'fileLibraryUpload'     => 'glm-member-db',
 +            'fileLibraryDownload'   => 'glm-member-db',
 +            'fileLibraryDelete'     => 'glm-member-db',
 +            'fileLibraryUpdate'     => 'glm-member-db',
 +            'glmCron'               => 'glm-member-db',
+             'membersMapData'      => 'glm-member-db',
+             'citiesMapData'       => 'glm-member-db',
+             'countiesMapData'     => 'glm-member-db',
 +            'glmTextSearch'         => 'glm-member-db',
 +            'adminSearch'           => 'glm-member-db',
 +        ),
 +        'manageDashboard' => array(
 +            'members' => 'glm-member-db',
          ),
          'dashboard' => array(
              'index'   => 'glm-member-db',
-             'members' => 'glm-member-db'
+             'members' => 'glm-member-db',
          ),
          'dashboardWidget' => array(
-             'index' => 'glm-member-db'
+             'index' => 'glm-member-db',
          ),
 +        'newDashboard' => array (
 +            'index' => 'glm-member-db'
 +        ),
          'fileLibrary' => array(
-             'index' => 'glm-member-db'
+             'index' => 'glm-member-db',
          ),
          'members' => array(
              'index'   => 'glm-member-db',            // member list
@@@ -100,18 -95,14 +103,18 @@@
          ),
          'error' => array(
              'index'     => 'glm-member-db',
-             'badAction' => 'glm-member-db'
+             'badAction' => 'glm-member-db',
          ),
          'pages' => array(
-             'shortcode' => 'glm-member-db'
+             'shortcode' => 'glm-member-db',
          ),
          'import' => array(
 +            'index' => 'glm-member-db'
 +        ),
 +        'export' => array(
-             'index' => 'glm-member-db'
+             'index' => 'glm-member-db',
          )
 +
      ),
      'frontActions' => array(
          'members' => array(