From: Steve Sutton <steve@gaslightmedia.com>
Date: Fri, 30 Jun 2017 13:00:24 +0000 (-0400)
Subject: Last minute updates
X-Git-Tag: v2.10.0^2~11^2~1
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=50e884d1e3fd121d035332980190367cc5e3721d;p=WP-Plugins%2Fglm-member-db.git

Last minute updates

correct wording for not clearing member data.
---

diff --git a/models/admin/import/index.php b/models/admin/import/index.php
index 35ceb2b7..350fac77 100644
--- a/models/admin/import/index.php
+++ b/models/admin/import/index.php
@@ -251,6 +251,13 @@ class GlmMembersAdmin_import_index
         if ( isset( $_REQUEST['filesProcessed'] ) ) {
             $this->filesProcessed = filter_var( $_REQUEST['filesProcessed'], FILTER_VALIDATE_INT );
         }
+        // Setup which additional plugins will be doing imports
+        $addOnTabsAllowed = array(
+            'contacts',
+            'social',
+        );
+        //echo '<pre>$this->config: ' . print_r( $this->config, true ) . '</pre>';
+
         // $fileData - The main files needed for the member import
         // - field:    input field name
         // - name:     file name
@@ -720,6 +727,7 @@ class GlmMembersAdmin_import_index
 
         // Setup the template data array
         $templateData = array(
+            //'addOnTabs'       => $addOnTabs,
             'fileExists'      => $fileExists,
             'option'          => $option,
             'errors'          => $this->errors,
diff --git a/views/admin/import/header.html b/views/admin/import/header.html
index 4e38c07c..0de87f73 100644
--- a/views/admin/import/header.html
+++ b/views/admin/import/header.html
@@ -13,6 +13,10 @@
             href="{$thisUrl}?page={$thisPage}&glm_action=index&option=files"
             class="nav-tab{if $option==files or $option===filesValidate} nav-tab-active{/if}">Import Files</a>
         {/if}
+
+        {foreach $addOnTabs as $a}
+            <a href="{$thisUrl}?page={$thisPage}&glm_action={$a.action}{if isset($a.option)}&option={$a.option}{/if}" class="nav-tab{if $thisAction==$a.action} nav-tab-active{/if}">{$a.text}</a>
+        {/foreach}
     </h2>
     <div id="glm-admin-content-container">
 
diff --git a/views/admin/import/validate.html b/views/admin/import/validate.html
index 8672dd65..2719ae78 100644
--- a/views/admin/import/validate.html
+++ b/views/admin/import/validate.html
@@ -29,7 +29,7 @@
         {else}
         <tr>
             <td colspan="2">
-                No Member Data will be cleared before importing any files. No attempts will be made to prevent duplication of members.
+                No Member Data will not be cleared before importing any files. No attempts will be made to prevent duplication of members.
             </td>
         </tr>
         {/if}