From: Steve Sutton <steve@gaslightmedia.com>
Date: Tue, 15 Nov 2016 20:05:42 +0000 (-0500)
Subject: Updates for yoast seo, preview link and detail page.
X-Git-Tag: v1.2.2^2~1
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=1684311492bb42ddd55ca651c90e9babd6a72ec4;p=WP-Plugins%2Fglm-member-db-packaging.git

Updates for yoast seo, preview link and detail page.

Preview links now goto the correct canonical url (package-detail).
Yoast Seo filters are now used to redo the og and twitter title and
descriptions.
Detail page undefined variable removed from template.
---

diff --git a/setup/frontHooks.php b/setup/frontHooks.php
index e7f5ad4..bcc1f19 100644
--- a/setup/frontHooks.php
+++ b/setup/frontHooks.php
@@ -77,12 +77,31 @@ if (strpos(GLM_MEMBERS_PLUGIN_CURRENT_URL, $this->config['settings']['canonical_
 
     // Get the package name for use in the page title
     global $wpdb;
-    $GLOBALS['glmPackageName'] = $wpdb->get_var( "SELECT title FROM ".GLM_MEMBERS_PACKAGING_PLUGIN_DB_PREFIX . "packages WHERE package_slug = '".$GLOBALS['glmDetailSlug']."'" );
+    $packageData = $wpdb->get_row(
+        "SELECT title,short_descr
+           FROM ".GLM_MEMBERS_PACKAGING_PLUGIN_DB_PREFIX . "packages
+          WHERE package_slug = '".$GLOBALS['glmDetailSlug']."'",
+        ARRAY_A
+    );
+    $GLOBALS['glmPackageName']  = $packageData['title'];
+    $GLOBALS['glmPackageIntro'] = $packageData['short_descr'];
 
     // Set the page title to the event name - Using low priority so it's the last to set the title!
     add_filter('wp_title', function($title) {
         return $GLOBALS['glmPackageName'];
     }, 99, 1);
+    add_filter( 'wpseo_opengraph_title', function($tag){
+        return $GLOBALS['glmPackageName'];
+    }, 99, 1 );
+    add_filter( 'wpseo_opengraph_desc', function($tag){
+        return $GLOBALS['glmPackageIntro'];
+    }, 99, 1 );
+    add_filter( 'wpseo_twitter_title', function($tag){
+        return $GLOBALS['glmPackageName'];
+    }, 99, 1 );
+    add_filter( 'wpseo_twitter_description', function($tag){
+        return $GLOBALS['glmPackageIntro'];
+    }, 99, 1 );
 
 }
 
@@ -140,4 +159,4 @@ if (isset($this->config['addOns']['glm-member-db'])) {
 
 }
 
-?>
\ No newline at end of file
+?>
diff --git a/views/admin/packaging/index.html b/views/admin/packaging/index.html
index dce6620..56b471a 100644
--- a/views/admin/packaging/index.html
+++ b/views/admin/packaging/index.html
@@ -305,7 +305,7 @@
                     {$p.expire_date.date}
                 </td>
                 <td>
-                    <a href="{$siteBaseUrl}{$settings.canonical_member_page}/{$p.package_slug}/" target="_blank">View Package</a>
+                    <a href="{$siteBaseUrl}{$settings.canonical_package_page}/{$p.package_slug}/" target="_blank">View Package</a>
                 </td>
             </tr>
     {/foreach}
@@ -316,7 +316,6 @@
     </table>
 
 {/if}
-
     <script type="text/javascript">
         jQuery(document).ready(function($) {
 
diff --git a/views/front/packaging/detail.html b/views/front/packaging/detail.html
index 81088d2..c7d2134 100644
--- a/views/front/packaging/detail.html
+++ b/views/front/packaging/detail.html
@@ -1,17 +1,17 @@
 {include file='front/packaging/header.html'}
 
-<!-- 
+<!--
     NOTE: Image sizes for member db are typically large, medium, small, thumb.
     These may be modified or added to by entries in the glm-member-db/config/plugin.ini file
 -->
 
-<!-- Package Detail Container -->    
+<!-- Package Detail Container -->
 <div class="glm-member-package-detail-wrapper">
 
 {if $havePackage}
-    
+
 <a id="topAnchor"></a>
-    
+
 <!--    <h3>{$terms.term_member_cap} Detail</h3>-->
     <div class="row">
         <script>//document.write('<a id="glm-member-detail-takeback-mini" class="button glm-member-button" href="' + document.referrer + '"><span>Back to listing</span></a>');</script>
@@ -19,23 +19,21 @@
         <div id="glm-member-detail-container" class="small-12 columns glm-member-container">
 
             <div id="glm-member-detail-side-box" class="small-12 medium-4 columns">
-                
-                
-                
+
+
+
                     <div class="glm-member-detail-logo-wrapper">
                         {if $settings.package_detail_show_image && $package.image}
                             <img class="glm-member-list-image-left" src="{$glmPluginMediaUrl}/images/medium/{$package.image}">
-                        {else if $settings.package_detail_show_member_image && $package.member.logo}
-                            <img class="glm-member-list-image-left" src="{$glmPluginMediaUrl}/images/{$settings.detail_logo_size}/{$package.member.logo}">
                         {/if}
                     </div>
-                
-                
+
+
                 {if $settings.package_detail_show_offsite_url && $package.offsite_url}
                     <a id="glm-member-detail-website-link" class="small-12 button glm-button" href="{$package.offsite_url}"{if $settings.package_detail_show_offsite_url_newtarget} target="_blank"{/if}>Find More Packages</a>
-                {/if}          
+                {/if}
                 <div id="glm-member-detail-contact-info">
-    <!-- Member name, address, and basic information -->  
+    <!-- Member name, address, and basic information -->
                     <div id="glm-package-detail-member-name">
                         {if $package.member.member && $settings.package_detail_show_member_link}
                             <a class="glm-member-list-image-wrapper" href="{$siteBaseUrl}{$settings.canonical_member_page}/{$package.member.member_slug}/"{if $settings.package_detail_show_member_link_newtarget} target="_blank"{/if}><h3>{$package.member.member}</h3></a>
@@ -45,7 +43,7 @@
                     </div>
                     {if $settings.package_detail_show_member_address}
                         <div class="glm-member-detail-address-wrapper">
-                            
+
                             <small>Address</small>
                             {apply_filters('glm-member-db-front-members-detail-addressTop', '', $package.member.id)}
                             {if $settings.package_detail_show_member_street}
@@ -61,17 +59,17 @@
                                     {if $package.member.state.value}
                                         <span>{$package.member.state.value}</span>
                                     {/if}
-                                    {if $package.member.zip} 
+                                    {if $package.member.zip}
                                         {$package.member.zip}
                                     {/if}
                                 </div>
-                            {/if} 
+                            {/if}
                             {if $package.member.country.name && $settings.package_detail_show_member_country}
                                 <div>{$package.member.country.name}</div>
                             {/if}
                             {apply_filters('glm-member-db-front-members-detail-addressBottom', '', $package.member.id)}
                         </div>
-                    {/if}        
+                    {/if}
                     {apply_filters('glm-member-db-front-members-detail-otherDetailTop', '', $package.member.id)}
                     {if $package.member.region && $settings.package_detail_show_member_region}
                         <div>
@@ -99,9 +97,9 @@
 <!--                        {if $settings.package_detail_show_member_coupons && $coupons}<a href="#glm-member-detail-coupons">Coupons</a>{/if}-->
                         {apply_filters('glm-member-db-front-package-detail-linksBottom', '', $package.member.id)}
                     </div>
-    
+
                 </div>
-                
+
             </div>
                         <!-- Container for package information -->
         <div class="glm-member-db-package small-12 medium-8 columns">