From 349e8549472faf900c050374a2f1b270995d69eb Mon Sep 17 00:00:00 2001
From: Steve Sutton <steve@gaslightmedia.com>
Date: Wed, 27 Apr 2016 12:03:29 -0400
Subject: [PATCH] Copy the image button into main import screen

Also keep the options for the images and image url so they can be done
separately.
---
 models/admin/management/import.php              | 9 ++++++++-
 models/admin/management/import/memberImages.php | 4 ++--
 views/admin/management/import.html              | 8 ++++++++
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/models/admin/management/import.php b/models/admin/management/import.php
index 7fb2321e..a66442d2 100644
--- a/models/admin/management/import.php
+++ b/models/admin/management/import.php
@@ -93,7 +93,13 @@ class GlmMembersAdmin_management_import
     public function modelAction ($actionData = false)
     {
 
-        $templateData = array();
+        $templateData = array('haveImageArray' => false);
+
+        $imageBaseURL = get_option( 'glm-member-db-import-imageurl', false );
+        $image        = get_option( 'glm-member-db-import-image', false );
+        if ($imageBaseURL && $image ) {
+            $templateData['haveImageArray'] = true;
+        }
 
         $requestedView = false;
         $failure = false;
@@ -142,6 +148,7 @@ class GlmMembersAdmin_management_import
 
         }
 
+
         // Return status, suggested view, and data to controller
         return array(
             'status' => true,
diff --git a/models/admin/management/import/memberImages.php b/models/admin/management/import/memberImages.php
index 069beb18..e6ee3216 100644
--- a/models/admin/management/import/memberImages.php
+++ b/models/admin/management/import/memberImages.php
@@ -13,8 +13,8 @@ $refTable = $this->config['ref_type_table'][$refType];
 $imageBaseURL = get_option( 'glm-member-db-import-imageurl', false );
 $image = get_option( 'glm-member-db-import-image', false );
 
-delete_option( 'glm-member-db-import-imageurl', false );
-delete_option( 'glm-member-db-import-image', false );
+//delete_option( 'glm-member-db-import-imageurl', false );
+//delete_option( 'glm-member-db-import-image', false );
 
 // If we have image URLs
 if ($image != false) {
diff --git a/views/admin/management/import.html b/views/admin/management/import.html
index 79fe65da..27c31024 100644
--- a/views/admin/management/import.html
+++ b/views/admin/management/import.html
@@ -89,5 +89,13 @@
         
     </form>
             
+    {if $haveImageArray}
+    <form action="{$thisUrl}?page={$thisPage}" method="post" enctype="multipart/form-data">
+        <input type="hidden" name="glm_action" value="import">
+        <input type="hidden" name="option" value="images">
+        <p><span class="glm-notice">WARNING:</span> This process may take a very long time!<br>Do not interrupt or re-submit this page.</p>
+        <input type="submit" value="Import Images" class="button button-primary">
+    </form>
+    {/if}
     
 {include file='admin/footer.html'}
-- 
2.17.1