From d4cacfabef510ace099a96c71a5443e45de97e7b Mon Sep 17 00:00:00 2001
From: Steve Sutton <steve@gaslightmedia.com>
Date: Fri, 13 May 2016 17:08:06 -0400
Subject: [PATCH] Updates for the table changes

Need more testing
---
 classes/data/dataSocials.php   |  4 ++--
 models/admin/member/social.php | 33 ++++++++++++++++++---------------
 views/admin/member/social.html |  4 ++--
 3 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/classes/data/dataSocials.php b/classes/data/dataSocials.php
index dc6d5f0..49276b4 100644
--- a/classes/data/dataSocials.php
+++ b/classes/data/dataSocials.php
@@ -132,7 +132,7 @@ class GlmDataSocials extends GlmDataAbstract
 
             // Base 64 Image Icon
             'b64icon' => array (
-                'field' => 'xpos',
+                'field' => 'b64icon',
                 'type' => 'integer',
                 'view_only' => true,
                 'use' => 'a'
@@ -178,4 +178,4 @@ class GlmDataSocials extends GlmDataAbstract
 
 }
 
-?>
\ No newline at end of file
+?>
diff --git a/models/admin/member/social.php b/models/admin/member/social.php
index 6cf0131..e439e82 100644
--- a/models/admin/member/social.php
+++ b/models/admin/member/social.php
@@ -52,6 +52,8 @@ class GlmMembersAdmin_member_social extends GlmDataSocialUrls
      * @access public
      */
     public $memberID = false;
+
+    public $socialUrlTableName;
     /*
      * Constructor
      *
@@ -70,6 +72,7 @@ class GlmMembersAdmin_member_social extends GlmDataSocialUrls
         // Save plugin configuration object
         $this->config = $config;
 
+        $this->socialUrlTableName = GLM_MEMBERS_SOCIAL_PLUGIN_DB_PREFIX . 'social_urls';
         // Run constructor for social data class
         parent::__construct(false, false);
 
@@ -97,18 +100,17 @@ class GlmMembersAdmin_member_social extends GlmDataSocialUrls
         $haveMember    = true;
         $socialError   = false;
         $option        = false;
-        $debug         = false;
+        $debug         = true;
         $statusMessage = "Update complete";
 
-        require_once(GLM_MEMBERS_SOCIAL_PLUGIN_CLASS_PATH.'/data/dataUrls.php');
-        $Urls     = new GlmDataUrls($this->wpdb, $this->config);
+        require_once(GLM_MEMBERS_SOCIAL_PLUGIN_CLASS_PATH.'/data/dataSocialUrls.php');
+        $Urls     = new GlmDataSocialUrls($this->wpdb, $this->config);
         $urlStats = $Urls->getStats();
         $haveUrls = ($urlStats > 0);
         if ($urlStats && $urlStats > 0) {
             $haveUrls = true;
         }
-        $urlList = $Urls->getList("member_id = " . $memberID);
-        //$urlList = $Urls->getList();
+        $urlList = $Urls->getList("ref_dest = " . $memberID . " AND ref_type = " . $this->config['ref_type_numb']['Member']);
 
         require_once(GLM_MEMBERS_SOCIAL_PLUGIN_CLASS_PATH.'/data/dataSocials.php');
         $Socials    = new GlmDataSocials($this->wpdb, $this->config);
@@ -134,12 +136,12 @@ class GlmMembersAdmin_member_social extends GlmDataSocialUrls
                     $convertedNameList   = array();
                     if (!empty($urlList)) {
                         foreach ($urlList as $url) {
-                            $mediumName = strtolower($url['medium']);
-                            $convertedNameList[$mediumName] = $url['medium'];
+                            $mediumName = strtolower($url['social']);
+                            $convertedNameList[$mediumName] = $url['social'];
                             if (!isset($_REQUEST[$mediumName]) || $_REQUEST[$mediumName] == '') {
                                 // delete record here
                                 $this->wpdb->delete(
-                                    GLM_MEMBERS_SOCIAL_PLUGIN_DB_PREFIX . 'urls',
+                                    $this->socialUrlTableName,
                                     array( 'id' => $url['id']),
                                     array( '%d' )
                                 );
@@ -157,22 +159,22 @@ class GlmMembersAdmin_member_social extends GlmDataSocialUrls
                                 $urlData = array('url' =>  $_REQUEST[$socialName]);
                                 $urlDataFormat = array('%s');
                                 $this->wpdb->update(
-                                    GLM_MEMBERS_SOCIAL_PLUGIN_DB_PREFIX . 'urls',
+                                    $this->socialUrlTableName,
                                     $urlData,
-                                    array( 'member_id' => $memberID, 'medium' => $socialData['name']),
+                                    array( 'ref_dest' => $memberID, 'social' => $socialData['name']),
                                     $urlDataFormat,
                                     array('%d', '%s' )
                                 );
                             } else {
                                 // add record here
                                 $urlData = array(
-                                    'url'       => $_REQUEST[$socialName],
-                                    'member_id' => $memberID,
-                                    'medium'    => $socialData['name']
+                                    'url'      => $_REQUEST[$socialName],
+                                    'ref_dest' => $memberID,
+                                    'social'   => $socialData['name']
                                 );
                                 $urlDataFormat = array( '%s', '%d', '%s' );
                                 $newId = $this->wpdb->insert(
-                                    GLM_MEMBERS_SOCIAL_PLUGIN_DB_PREFIX . 'urls',
+                                    $this->socialUrlTableName,
                                     $urlData,
                                     $urlDataFormat
                                 );
@@ -184,7 +186,8 @@ class GlmMembersAdmin_member_social extends GlmDataSocialUrls
                 //$Urls->updateEntry($memberID);
                 //$urlUpdated  = true;
                 $statusMessage = "Social Media URLs Updated";
-                $urlList       = $Urls->getList("member_id    = " . $memberID);
+                //$urlList       = $Urls->getList("ref_dest    = " . $memberID);
+                $urlList = $Urls->getList("ref_dest = " . $memberID . " AND ref_type = " . $this->config['ref_type_numb']['Member']);
                 break;
             case "social";
             default:
diff --git a/views/admin/member/social.html b/views/admin/member/social.html
index c4ac193..830a29d 100644
--- a/views/admin/member/social.html
+++ b/views/admin/member/social.html
@@ -18,7 +18,7 @@
                 <tr>
                     <th>Icon:</th>
                     <td>
-                        <div id="glm-member-db-admin-social-{$socialItem.name|lower}" title="{$socialItem.name}" class="glm-member-db-social-icon" style="background: url('{$assetsUrl}/social-few-full-sprite.jpg') repeat scroll {$socialItem.xpos}px {$socialItem.ypos}px;height:33px;width:33px;display:block;">
+                        <div id="glm-member-db-admin-social-{$socialItem.name|lower}" title="{$socialItem.name}" class="glm-member-db-social-icon">
                         </div>
                     </td>
                 </tr>
@@ -49,7 +49,7 @@
                             
 
 
-                            <div id="glm-member-db-admin-social-{$socialItem.name|lower}" title="{$socialItem.name}" class="glm-member-db-social-icon" style="background: url('{$assetsUrl}/social-few-full-sprite.jpg') repeat scroll {$socialItem.xpos}px {$socialItem.ypos}px;height:33px;width:33px;display:block;">
+                            <div id="glm-member-db-admin-social-{$socialItem.name|lower}" title="{$socialItem.name}" class="glm-member-db-social-icon">
                             </div>
                             <a class="editMemberType" data-memberTypeID="{$socialItem.id}">{$socialItem.name}</a>
                         </th>
-- 
2.17.1