From cb050427f34cb8b64aa0d96a8a058bf0e757cfa0 Mon Sep 17 00:00:00 2001
From: Anthony Talarico <talarico@gaslightmedia.com>
Date: Thu, 2 Nov 2017 14:52:14 -0400
Subject: [PATCH] adding db schema input option for import

adding db schema option for database imports
---
 models/admin/management/contacts.php | 9 ++++++---
 views/admin/management/contacts.html | 4 ++++
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/models/admin/management/contacts.php b/models/admin/management/contacts.php
index 10594bc..993d439 100644
--- a/models/admin/management/contacts.php
+++ b/models/admin/management/contacts.php
@@ -118,6 +118,7 @@ class GlmMembersAdmin_management_contacts extends GlmDataContacts
         $db_name            = false;
         $db_user            = false;
         $db_password        = false;
+        $db_schema          = false;
         $content            = '';
         $thisOption         = '';
         $requestedView      = 'contacts.html';
@@ -161,6 +162,7 @@ class GlmMembersAdmin_management_contacts extends GlmDataContacts
                 $db_name      = filter_var( $_REQUEST['db_name'], FILTER_SANITIZE_STRING );
                 $db_user      = filter_var( $_REQUEST['db_user'], FILTER_SANITIZE_STRING );
                 $db_password  = filter_var( $_REQUEST['db_password'], FILTER_SANITIZE_STRING );
+                $db_schema    = isset($_REQUEST['db_schema']) ? filter_var( $_REQUEST['db_schema'], FILTER_SANITIZE_STRING ) : 'members';
 
                 // Connect to the database, if false, we failed, so redisplay form and error message
                 $error = $this->connectPostgresDb($db_host, $db_name, $db_user, $db_password);
@@ -174,7 +176,7 @@ class GlmMembersAdmin_management_contacts extends GlmDataContacts
                 $this->checkContactDelete();
 
                 // Do contact import
-                $importResult = $this->importContacts();
+                $importResult = $this->importContacts($db_schema);
 
                 // Check status and error message
                 if ($importResult['status'] == false) {
@@ -241,6 +243,7 @@ class GlmMembersAdmin_management_contacts extends GlmDataContacts
             'db_name'           => $db_name,
             'db_user'           => $db_user,
             'db_password'       => $db_password,
+            'db_schema'         => $db_schema,
             'content'           => $content,
             'thisOption'        => $thisOption
         );
@@ -481,7 +484,7 @@ class GlmMembersAdmin_management_contacts extends GlmDataContacts
      * @return array Results or false if no contacts to import
      *
      */
-    public function importContacts()
+    public function importContacts($schema)
     {
 
         // Initialize our return status/data array
@@ -498,7 +501,7 @@ class GlmMembersAdmin_management_contacts extends GlmDataContacts
         $sql = "
             SELECT member_id, member_name, member_login, member_passwd, process_email,
                    primary_contact, primary_contact_fname, primary_contact_lname
-              FROM members.member
+              FROM $schema.member
              WHERE member_login != '';
         ";
         try {
diff --git a/views/admin/management/contacts.html b/views/admin/management/contacts.html
index f02f013..5435e55 100644
--- a/views/admin/management/contacts.html
+++ b/views/admin/management/contacts.html
@@ -82,6 +82,10 @@
                 <th>Password:</th>
                 <td><input type="text" name="db_password" value="{$db_password}"></td>
             </tr>
+            <tr>
+                <th>Schema</th>
+                <td><input type="text" name="db_schema" value="{$db_schema}"></td>
+            </tr>
             <tr>
                 <th>&nbsp;</th>
                 <td><input type="submit" value="Import Contacts"></td>
-- 
2.17.1