From: Steve Sutton <steve@gaslightmedia.com>
Date: Tue, 10 Jan 2017 17:36:28 +0000 (-0500)
Subject: Update pdf for html encoded text.
X-Git-Tag: v1.6.2^2
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=c11c00cc9b08a19a924728cf62af23d7c4ebbdef;p=WP-Plugins%2Fglm-member-db-events.git

Update pdf for html encoded text.

Taking care of more html encoded text strings from event fields.
The data adstract is adding the html encoding tot text strings, so we
have to remove them before outputting them into the pdf.
---

diff --git a/index.php b/index.php
index ead1451..d9dd61e 100644
--- a/index.php
+++ b/index.php
@@ -3,7 +3,7 @@
  * Plugin Name: GLM Members Database Events
  * Plugin URI: http://www.gaslightmedia.com/
  * Description: Gaslight Media Members Database.
- * Version: 1.6.1
+ * Version: 1.6.2
  * Author: Chuck Scott
  * Author URI: http://www.gaslightmedia.com/
  * License: GPL2
@@ -20,7 +20,7 @@
  * @package glmMembersDatabaseEventsAddOn
  * @author Chuck Scott <cscott@gaslightmedia.com>
  * @license http://www.gaslightmedia.com Gaslightmedia
- * @version 1.6.1
+ * @version 1.6.2
  */
 
 /*
@@ -38,7 +38,7 @@
  *  so that we're sure the other add-ons see an up to date
  *  version from this plugin.
  */
-define('GLM_MEMBERS_EVENTS_PLUGIN_VERSION', '1.6.1');
+define('GLM_MEMBERS_EVENTS_PLUGIN_VERSION', '1.6.2');
 define('GLM_MEMBERS_EVENTS_PLUGIN_DB_VERSION', '0.1.1');
 
 // This is the minimum version of the GLM Members DB plugin require for this plugin.
diff --git a/models/front/events/list.php b/models/front/events/list.php
index 4689249..b5200d3 100644
--- a/models/front/events/list.php
+++ b/models/front/events/list.php
@@ -417,7 +417,7 @@ class GlmMembersFront_events_list extends GlmMembersFront_events_baseAction
 
                     // title
                     $title = new SetaPDF_Core_Text_Block( $boldFont, self::PDF_FONT_SIZE );
-                    $title->setText($event['name']);
+                    $title->setText(html_entity_decode( $event['name'], ENT_HTML5 ) );
                     //$title->setAlign('center');
                     $title->setWidth(self::PDF_WIDTH);
                     $lineCount = $title->getLineCount();
@@ -428,13 +428,13 @@ class GlmMembersFront_events_list extends GlmMembersFront_events_baseAction
                     if ( isset($event['locations']) && !empty($event['locations']) && $event['hide_address']['name'] == 'No' ) {
                         $address   = array();
                         if ( $event['locations']['name'] ) {
-                            $address[] = $event['locations']['name'];
+                            $address[] = html_entity_decode( $event['locations']['name'], ENT_HTML5 );
                         }
                         if ( $event['locations']['address'] ) {
-                            $address[] = $event['locations']['address'];
+                            $address[] = html_entity_decode( $event['locations']['address'], ENT_HTML5 );
                         }
                         if ( $event['locations']['city']['name'] ) {
-                            $address[] = $event['locations']['city']['name'];
+                            $address[] = html_entity_decode( $event['locations']['city']['name'], ENT_HTML5 );
                         }
                         if ( $event['locations']['state']['name'] ) {
                             $address[] = $event['locations']['state']['name'];
@@ -453,13 +453,13 @@ class GlmMembersFront_events_list extends GlmMembersFront_events_baseAction
                     ) {
                         $address   = array();
                         if ( $event['member']['member'] ) {
-                            $address[] = $event['member']['member'];
+                            $address[] = html_entity_decode( $event['member']['member'], ENT_HTML5 );
                         }
                         if ( $event['member']['addr1'] ) {
-                            $address[] = $event['member']['addr1'];
+                            $address[] = html_entity_decode( $event['member']['addr1'], ENT_HTML5 );
                         }
                         if ( $event['member']['city'] ) {
-                            $address[] = $event['member']['city'];
+                            $address[] = html_entity_decode( $event['member']['city'], ENT_HTML5 );
                         }
                         if ( $event['member']['state']['value'] ) {
                             $address[] = $event['member']['state']['value'];
@@ -474,7 +474,7 @@ class GlmMembersFront_events_list extends GlmMembersFront_events_baseAction
                         $pdfY -= self::LINE_HEIGHT;
                     } else if ( isset($event['locations']) && !empty($event['locations'])) {
                         $address = array();
-                        $address[] = $event['locations']['name'];
+                        $address[] = html_entity_decode( $event['locations']['name'], ENT_HTML5 );
                         $location = new SetaPDF_Core_Text_Block( $font, self::PDF_FONT_SIZE );
 
                         $location->setText(implode(', ', $address));
@@ -502,7 +502,7 @@ class GlmMembersFront_events_list extends GlmMembersFront_events_baseAction
 
                     if ( $event['cost'] && !$event['free']['value'] ) {
                         $cost = new SetaPDF_Core_Text_Block( $font, self::PDF_FONT_SIZE );
-                        $cost->setText( $event['cost'] );
+                        $cost->setText( html_entity_decode( $event['cost'], ENT_HTML5 ) );
                         $cost->draw( $page->getCanvas(), self::PDF_LFT_COL_X, $pdfY );
                         $pdfY -= self::LINE_HEIGHT;
                     } else if ( $event['free']['value'] ) {