From 4b9139cab62a17bccb38e4df0730f580065b8f7f Mon Sep 17 00:00:00 2001
From: Steve Sutton <steve@gaslightmedia.com>
Date: Wed, 20 Mar 2019 10:42:34 -0400
Subject: [PATCH] Add new fields to the member export

Adding:
lat lon
profile image url
reservation url
video url
short description
---
 models/admin/ajax/membersListExport.php           | 15 ++++++++++-----
 views/admin/ajax/membersListExport.html           | 14 ++++++++++++++
 views/admin/ajax/membersListExportCsv.html        | 11 ++++++++++-
 .../member/memberInfo/editProfileDescription.html |  2 +-
 views/admin/members/list.html                     |  9 +++++++--
 5 files changed, 42 insertions(+), 9 deletions(-)

diff --git a/models/admin/ajax/membersListExport.php b/models/admin/ajax/membersListExport.php
index e4f40b59..e03c449c 100644
--- a/models/admin/ajax/membersListExport.php
+++ b/models/admin/ajax/membersListExport.php
@@ -124,9 +124,14 @@ class GlmMembersAdmin_ajax_membersListExport extends GlmDataMemberInfo
             'exportPriContactName'  => $this->checkFlag('exportPriContactName'),
             'exportPriContactEmail' => $this->checkFlag('exportPriContactEmail'),
             'exportUrl'             => $this->checkFlag('exportUrl'),
+            'exportLatLon'          => $this->checkFlag('exportLatLon'),
+            'exportReservationUrl'  => $this->checkFlag('exportReservationUrl'),
+            'exportProfileImageUrl' => $this->checkFlag('exportProfileImageUrl'),
+            'exportVideoUrl'        => $this->checkFlag('exportVideoUrl'),
+            'exportShortDescr'      => $this->checkFlag('exportShortDescr'),
             'exportCategories'      => $this->checkFlag('exportCategories'),
             'exportClicks'          => $this->checkFlag('exportClicks'),
-            'exportViews'           => $this->checkFlag('exportViews')
+            'exportViews'           => $this->checkFlag('exportViews'),
         );
 
         // Check for selection of Custom Fields
@@ -147,18 +152,18 @@ class GlmMembersAdmin_ajax_membersListExport extends GlmDataMemberInfo
 
         // Check if this is a request to show archived members
         if (isset($_REQUEST['filterArchived'])) {
-            // $where .= " AND T.status = ".$this->config['status_numb']['Archived'];
-            $where .= " AND T.member IN (
+            $where .= " AND (T.status = ".$this->config['status_numb']['Archived']."
+                OR T.member IN (
                 SELECT DISTINCT(id)
                   FROM " . GLM_MEMBERS_PLUGIN_DB_PREFIX . "members
                  WHERE access = " . $this->config['access_numb']['Archived'] .  "
-            )";
+            ))";
             $filterArchived = true;
             $haveFilter = true;
 
         // If not, don't show them
         } else {
-            // $where .= " AND T.status != ".$this->config['status_numb']['Archived'];
+            $where .= " AND T.status != ".$this->config['status_numb']['Archived'];
             $where .= " AND T.member IN (
                 SELECT DISTINCT(id)
                   FROM " . GLM_MEMBERS_PLUGIN_DB_PREFIX . "members
diff --git a/views/admin/ajax/membersListExport.html b/views/admin/ajax/membersListExport.html
index 8d39f4e8..0a887cf8 100644
--- a/views/admin/ajax/membersListExport.html
+++ b/views/admin/ajax/membersListExport.html
@@ -35,6 +35,13 @@
                     {if $select.exportPriContactName}<th align="left">Primary Contact</th>{/if}
                     {if $select.exportPriContactEmail}<th align="left">Primary Contact E-Mail</th>{/if}
                     {if $select.exportUrl}<th align="left">Web Address</th>{/if}
+
+                    {if $select.exportLatLon}<th align="left">Lat</th><th>Lon</th>{/if}
+                    {if $select.exportReservationUrl}<th align="left">Reservation URL</th>{/if}
+                    {if $select.exportProfileImageUrl}<th align="left">Profile Image URL</th>{/if}
+                    {if $select.exportVideoUrl}<th align="left">Video Url</th>{/if}
+                    {if $select.exportShortDescr}<th align="left">Short Description</th>{/if}
+
                     {if $CFHeaders}{foreach $CFHeaders as $cHead}<th align="left">{$cHead}</th>{/foreach}{/if}
                     {if $select.exportCategories}
                         {if $category_data}
@@ -73,6 +80,13 @@
                     {if $select.exportPriContactName}<td>{if $m.primary_contact}{$m.primary_contact.fname} {$m.primary_contact.lname}{/if}</td>{/if}
                     {if $select.exportPriContactEmail}<td>{if $m.primary_contact}{$m.primary_contact.email}{/if}</td>{/if}
                     {if $select.exportUrl}<td>{$m.url}</td>{/if}
+
+                    {if $select.exportLatLon}<td>{$m.lat}</td><td>{$m.lon}</td>{/if}
+                    {if $select.exportReservationUrl}<td>{$m.reservation_url}</td>{/if}
+                    {if $select.exportProfileImageUrl}<td>{if $m.logo}{$glmPluginMediaUrl}/images/original/{$m.logo}{/if}</td>{/if}
+                    {if $select.exportVideoUrl}<td>{$m.video_url}</td>{/if}
+                    {if $select.exportShortDescr}<td>{$m.short_descr}</td>{/if}
+
                     {if $CFHeaders}{foreach $CFHeaders as $cHead}<td>{$m[$cHead]}</td>{/foreach}{/if}
                     {if $select.exportCategories}
                         {if $category_data}
diff --git a/views/admin/ajax/membersListExportCsv.html b/views/admin/ajax/membersListExportCsv.html
index 250e208d..3df518fc 100644
--- a/views/admin/ajax/membersListExportCsv.html
+++ b/views/admin/ajax/membersListExportCsv.html
@@ -1,5 +1,4 @@
 {if $haveMembers}
-
 {if $select.exportId}"ID",{/if}
 {if $select.exportOldId}"Old ID",{/if}
 {if $select.exportMember}"{$terms.term_member_cap} Name",{/if}
@@ -24,6 +23,11 @@
 {if $select.exportPriContactName}"Pri Contact",{/if}
 {if $select.exportPriContactEmail}"Pri Contact E-Mail",{/if}
 {if $select.exportUrl}"Web Address",{/if}
+{if $select.exportLatLon}"Lat","Lon",{/if}
+{if $select.exportReservationUrl}"Reservation URL",{/if}
+{if $select.exportProfileImageUrl}"Profile Image URL",{/if}
+{if $select.exportVideoUrl}"Video URL",{/if}
+{if $select.exportShortDescr}"Short Description",{/if}
 {if $CFHeaders}{foreach $CFHeaders as $cHead}"{$cHead}",{/foreach}{/if}
 {if $select.exportCategories} {if $category_data} {foreach $category_data as $cat} "{if $cat.parent_name}{$cat.parent_name}:{/if}{$cat.name}" {if !$cat@last},{/if} {/foreach} {/if} {/if}
 
@@ -52,6 +56,11 @@
 {if $select.exportPriContactName}"{if $m.primary_contact}{$m.primary_contact.fname} {$m.primary_contact.lname}{/if}",{/if}
 {if $select.exportPriContactEmail}"{if $m.primary_contact}{$m.primary_contact.email}{/if}",{/if}
 {if $select.exportUrl}"{$m.url}",{/if}
+{if $select.exportLatLon}"{$m.lat}","{$m.lon}",{/if}
+{if $select.exportReservationUrl}"{$m.reservation_url}",{/if}
+{if $select.exportProfileImageUrl}"{if $m.logo}{$glmPluginMediaUrl}/images/original/{$m.logo}{/if}",{/if}
+{if $select.exportVideoUrl}"{$m.video_url}",{/if}
+{if $select.exportShortDescr}"{$m.short_descr|escape:quotes}",{/if}
 {if $CFHeaders}{foreach $CFHeaders as $cHead}"{$m[$cHead]}",{/foreach}{/if}
 {if $select.exportCategories} {if $category_data} {foreach $category_data as $cat} {$cat_exists='""'} {foreach $m.categories as $t} {if $t.id == $cat.id}{$cat_exists='"Yes"'}{/if} {/foreach} {$cat_exists} {if !$cat@last},{/if} {/foreach} {/if} {/if}
 
diff --git a/views/admin/member/memberInfo/editProfileDescription.html b/views/admin/member/memberInfo/editProfileDescription.html
index 20a5e5b5..f165392b 100644
--- a/views/admin/member/memberInfo/editProfileDescription.html
+++ b/views/admin/member/memberInfo/editProfileDescription.html
@@ -3,7 +3,7 @@
                         <div class="glm-row">
                             <h4 {if $memberInfo.fieldRequired.short_descr}class="glm-required"{/if}>Short Description:</h4>
                             <div {if $memberInfo.fieldFail.short_descr}class="glm-form-bad-input" data-tabid="glm-member-info-descr"{/if}>
-                                <input type="text" name="short_descr" value="{$memberInfo.fieldData.short_descr}" class="glm-form-text-input glm-char-count" data-msgArea="short-descr-msg"
+                                <input type="text" name="short_descr" value="{$memberInfo.fieldData.short_descr|escape}" class="glm-form-text-input glm-char-count" data-msgArea="short-descr-msg"
                                    maxlength="{if $settings.short_desc_char_limit}{$settings.short_desc_char_limit}{else}120{/if}" placeholder="A short, one line, description of the {$terms.term_member}."
                                    >
                                 <br><span id="short-descr-msg"></span>
diff --git a/views/admin/members/list.html b/views/admin/members/list.html
index fa55bf87..90480d31 100644
--- a/views/admin/members/list.html
+++ b/views/admin/members/list.html
@@ -171,11 +171,11 @@
                                     <input type="checkbox" name="exportZip" checked> ZIP/Postal Code<br>
                                     <input type="checkbox" name="exportCounty" checked> County <br>
                                     <input type="checkbox" name="exportRegion" checked> Region <br>
-                                </td>
-                                <td class="exportFieldsTd">
                                     <input type="checkbox" name="exportPhone" checked> Phone #<br>
                                     <input type="checkbox" name="exportTollFree" checked> Toll Free<br>
                                     <input type="checkbox" name="exportEmail" checked> Main E-Mail<br>
+                                </td>
+                                <td class="exportFieldsTd">
                                     <input type="checkbox" name="exportPriContactName" checked> Primary Contact Name<br>
                                     <input type="checkbox" name="exportPriContactEmail" checked> Primary Contact E-Mail<br>
                                     <input type="checkbox" name="exportUrl" checked> Web Address (URL)<br>
@@ -185,6 +185,11 @@
                                     <input type="checkbox" name="exportMailingCity" checked> Mailing City<br>
                                     <input type="checkbox" name="exportMailingState" checked> Mailing State<br>
                                     <input type="checkbox" name="exportMailingZip" checked> Mailing ZIP/Postal Code<br>
+                                    <input type="checkbox" name="exportLatLon"> Lat / Lon<br>
+                                    <input type="checkbox" name="exportReservationUrl"> Reservation URL<br>
+                                    <input type="checkbox" name="exportProfileImageUrl"> Profile Image URL<br>
+                                    <input type="checkbox" name="exportVideoUrl"> Video URL<br>
+                                    <input type="checkbox" name="exportShortDescr"> Short Description<br>
                                 </td>
                             </tr>
                         </table>
-- 
2.17.1