Adding clear options to file and photos

Adding a clear data option to the photo and file parts.

diff --git a/models/admin/import/index.php b/models/admin/import/index.php
index 350fac7..d2cb752 100644 (file)
--- a/models/admin/import/index.php
+++ b/models/admin/import/index.php
@@ -485,6 +485,7 @@ class GlmMembersAdmin_import_index
             // Set the view file
             $view = 'photosValidate.html';
             $fileData = '<pre>$_FILES: ' . print_r( $_FILES, true ) . '</pre>';
+            $clearData = ( filter_var( $_REQUEST['clear_data'], FILTER_VALIDATE_BOOLEAN ) );
 
             break;
 
@@ -504,10 +505,16 @@ class GlmMembersAdmin_import_index
             // Set the view file
             $view = 'filesValidate.html';
             $fileData = '<pre>$_FILES: ' . print_r( $_FILES, true ) . '</pre>';
+            $clearData = ( filter_var( $_REQUEST['clear_data'], FILTER_VALIDATE_BOOLEAN ) );
 
             break;
 
         case 'photosProcess':
+            if ( $clearData ) {
+                // Empty the tables for the member data.
+                // Not including the management options.
+                $this->wpdb->query('DELETE FROM ' . GLM_MEMBERS_PLUGIN_DB_PREFIX . 'images');
+            }
             // Setup the image processing
             require_once GLM_MEMBERS_PLUGIN_PATH . '/models/admin/ajax/imageUpload.php';
             $ImageUpload = new GlmMembersAdmin_ajax_imageUpload($this->wpdb, $this->config);
@@ -591,6 +598,11 @@ class GlmMembersAdmin_import_index
             break;
 
         case 'filesProcess':
+            if ( $clearData ) {
+                // Empty the tables for the member data.
+                // Not including the management options.
+                $this->wpdb->query('DELETE FROM ' .  GLM_MEMBERS_PLUGIN_DB_PREFIX . 'files');
+            }
             // Setup the file processing
             require_once GLM_MEMBERS_PLUGIN_PATH . '/models/admin/ajax/fileUpload.php';
             $FileUpload = new GlmMembersAdmin_ajax_fileUpload($this->wpdb, $this->config);

diff --git a/views/admin/import/files.html b/views/admin/import/files.html
index 87e11ce..d46a081 100644 (file)
--- a/views/admin/import/files.html
+++ b/views/admin/import/files.html
@@ -36,6 +36,13 @@
             </td>
             {/foreach}
             </tr>
+            <tr>
+                <td>Clear Data</td>
+                <td colspan="4">
+                    <input type="hidden" name="clear_data" value="0">
+                    <input type="checkbox" name="clear_data" value="1" checked>
+                </td>
+            </tr>
 
         </table>
 

diff --git a/views/admin/import/filesValidate.html b/views/admin/import/filesValidate.html
index a340f3e..04670fb 100644 (file)
--- a/views/admin/import/filesValidate.html
+++ b/views/admin/import/filesValidate.html
@@ -18,10 +18,24 @@
             {/if}
         </td>
     </tr>
+
+        {if $clearData}
+        <tr>
+            <td colspan="2">
+                All Member Files Data will be cleared before importing any files.
+            </td>
+        </tr>
+        {else}
+        <tr>
+            <td colspan="2">
+                No Member Files Data will not be cleared before importing any files. No attempts will be made to prevent duplication of members.
+            </td>
+        </tr>
+        {/if}
         {if $readyToProcess}
         <tr>
             <td colspan="2">
-                <a href="{$thisUrl}?page={$thisPage}&glm_action=index&option=filesProcess" class="button">Process Files</a>
+                <a href="{$thisUrl}?page={$thisPage}&glm_action=index&option=filesProcess{if $clearData}&clear_data=1{/if}" class="button">Process Files</a>
             </td>
         </tr>
         {/if}

diff --git a/views/admin/import/photos.html b/views/admin/import/photos.html
index 7963d81..4e27a83 100644 (file)
--- a/views/admin/import/photos.html
+++ b/views/admin/import/photos.html
@@ -36,6 +36,13 @@
             </td>
             {/foreach}
             </tr>
+            <tr>
+                <td>Clear Data</td>
+                <td colspan="4">
+                    <input type="hidden" name="clear_data" value="0">
+                    <input type="checkbox" name="clear_data" value="1" checked>
+                </td>
+            </tr>
 
         </table>
 

diff --git a/views/admin/import/photosValidate.html b/views/admin/import/photosValidate.html
index e8c03e4..21e8b2d 100644 (file)
--- a/views/admin/import/photosValidate.html
+++ b/views/admin/import/photosValidate.html
@@ -18,10 +18,25 @@
             {/if}
         </td>
     </tr>
+
+        {if $clearData}
+        <tr>
+            <td colspan="2">
+                All Member Photo Data will be cleared before importing any files.
+            </td>
+        </tr>
+        {else}
+        <tr>
+            <td colspan="2">
+                No Member Photo Data will not be cleared before importing any files. No attempts will be made to prevent duplication of members.
+            </td>
+        </tr>
+        {/if}
+
         {if $readyToProcess}
         <tr>
             <td colspan="2">
-                <a href="{$thisUrl}?page={$thisPage}&glm_action=index&option=photosProcess" class="button">Process Photos</a>
+                <a href="{$thisUrl}?page={$thisPage}&glm_action=index&option=photosProcess{if $clearData}&clear_data=1{/if}" class="button">Process Photos</a>
             </td>
         </tr>
         {/if}