Changeset 1905943
- Timestamp:
- 07/08/2018 12:57:55 PM (8 years ago)
- Location:
- easy-facebook-feed
- Files:
-
- 38 added
- 3 edited
-
tags/3.0.24 (added)
-
tags/3.0.24/css (added)
-
tags/3.0.24/css/eff_style.css (added)
-
tags/3.0.24/css/eff_style.css.map (added)
-
tags/3.0.24/easy-facebook-feed.php (added)
-
tags/3.0.24/includes (added)
-
tags/3.0.24/includes/class.eff-admin.php (added)
-
tags/3.0.24/includes/class.eff-connect.php (added)
-
tags/3.0.24/includes/class.eff-error.php (added)
-
tags/3.0.24/includes/class.eff-language.php (added)
-
tags/3.0.24/includes/class.eff-post.php (added)
-
tags/3.0.24/includes/class.eff-server-requirements.php (added)
-
tags/3.0.24/includes/class.eff-template.php (added)
-
tags/3.0.24/includes/class.eff-widget.php (added)
-
tags/3.0.24/includes/class.eff.php (added)
-
tags/3.0.24/languages (added)
-
tags/3.0.24/languages/easy-facebook-feed-cs_CZ.po (added)
-
tags/3.0.24/languages/easy-facebook-feed-da_DK.mo (added)
-
tags/3.0.24/languages/easy-facebook-feed-da_DK.po (added)
-
tags/3.0.24/languages/easy-facebook-feed-de_DE.mo (added)
-
tags/3.0.24/languages/easy-facebook-feed-de_DE.po (added)
-
tags/3.0.24/languages/easy-facebook-feed-nl_NL.mo (added)
-
tags/3.0.24/languages/easy-facebook-feed-nl_NL.po (added)
-
tags/3.0.24/languages/easy-facebook-feed.pot (added)
-
tags/3.0.24/readme.txt (added)
-
tags/3.0.24/scss (added)
-
tags/3.0.24/scss/eff_style.scss (added)
-
tags/3.0.24/templates (added)
-
tags/3.0.24/templates/eff-error.html (added)
-
tags/3.0.24/templates/eff-event-cover.html (added)
-
tags/3.0.24/templates/eff-event-ticket-link.html (added)
-
tags/3.0.24/templates/eff-event.html (added)
-
tags/3.0.24/templates/eff-link-picture.html (added)
-
tags/3.0.24/templates/eff-link.html (added)
-
tags/3.0.24/templates/eff-message.html (added)
-
tags/3.0.24/templates/eff-photo.html (added)
-
tags/3.0.24/templates/eff-post.html (added)
-
tags/3.0.24/templates/eff-video.html (added)
-
trunk/easy-facebook-feed.php (modified) (1 diff)
-
trunk/includes/class.eff-post.php (modified) (5 diffs)
-
trunk/readme.txt (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
easy-facebook-feed/trunk/easy-facebook-feed.php
r1900038 r1905943 4 4 * Plugin URI: http://shop.stage16.nl 5 5 * Description: Easy Facebook Feed shows your Facebook feed in an easy way! 6 * Version: 3.0.2 36 * Version: 3.0.24 7 7 * Author: timwass 8 8 * Text Domain: easy-facebook-feed -
easy-facebook-feed/trunk/includes/class.eff-post.php
r1782913 r1905943 49 49 { 50 50 // added akamaihd to the cdns 51 if ( strpos($data->source, 'fbcdn') || strpos($data->source, 'akamaihd')) {51 if (isset($data->source) && (strpos($data->source, 'fbcdn') || strpos($data->source, 'akamaihd'))) { 52 52 // proposition: WP supports embeding of facebook videos. We can use it by default and use the html5 <video> as a fallback 53 $embed = wp_oembed_get( $data->link);54 if ( $embed) return $embed;53 $embed = wp_oembed_get($data->link); 54 if ($embed) return $embed; 55 55 $template = new Template('eff-video.html'); 56 56 $template->set('data-source', $data->source); 57 57 $template->set('data-picture', $data->full_picture); 58 58 $template->set('data-link', $data->link); 59 } elseif ( strpos($data->source, 'youtube.com')) {59 } elseif (isset($data->source) && strpos($data->source, 'youtube.com')) { 60 60 // oembed youtube videos, or fallback to picture + link. could add other providers 61 $embed = wp_oembed_get( $data->link);62 if ( ! $embed ){61 $embed = wp_oembed_get($data->link); 62 if (!$embed) { 63 63 $template = new Template('eff-photo.html'); 64 $template->set('image-url', $data->full_picture); 65 } else { 64 $template->set('image-url', $data->full_picture); 65 } else { 66 66 return $embed; 67 67 } … … 78 78 * @return mixed 79 79 */ 80 public function eff_makeEvent($data, $eventDetails)80 public function eff_makeEvent($data, $eventDetails) 81 81 { 82 82 $template = new Template('eff-event.html'); … … 84 84 $template->set('data-name', $data->name); 85 85 // event date 86 $date = strtotime( $eventDetails->start_time);87 $template->set('data-month', strftime( '%b' ,$date ));88 $template->set('data-day', strftime( '%d' ,$date ));89 86 $date = strtotime($eventDetails->start_time); 87 $template->set('data-month', strftime('%b', $date)); 88 $template->set('data-day', strftime('%d', $date)); 89 90 90 //$template->set('data-description', nl2br($data->description)); 91 91 // if event has a tickets link 92 92 if (isset($eventDetails->ticket_uri)) { 93 $template_ticket_link = new Template( 'eff-event-ticket-link.html');94 $template_ticket_link->set('data-link', $eventDetails->ticket_uri );95 $domain = $this->get_domain( $eventDetails->ticket_uri);96 if (!$domain) {93 $template_ticket_link = new Template('eff-event-ticket-link.html'); 94 $template_ticket_link->set('data-link', $eventDetails->ticket_uri); 95 $domain = $this->get_domain($eventDetails->ticket_uri); 96 if (!$domain) { 97 97 $domain = $eventDetails->ticket_uri; 98 98 } 99 $template_ticket_link->set('data-name', sprintf( __('Get your tickets on %1$s','easy-facebook-feed'), $domain ));99 $template_ticket_link->set('data-name', sprintf(__('Get your tickets on %1$s', 'easy-facebook-feed'), $domain)); 100 100 $template_ticket_link = $template_ticket_link->output(); 101 101 $template->set('data-ticket', $template_ticket_link); 102 102 } else { 103 $template->remove('data-ticket'); 103 $template->remove('data-ticket'); 104 104 } 105 105 // if event has a cover picture … … 107 107 $template2 = new Template('eff-event-cover.html'); 108 108 $template2->set('data-picture', $eventDetails->cover->source); 109 $margin = isset( $eventDetails->cover->offset_y ) ? '-'. $eventDetails->cover->offset_y : 0;109 $margin = isset($eventDetails->cover->offset_y) ? '-' . $eventDetails->cover->offset_y : 0; 110 110 $template2->set('data-margin', $margin); 111 $template = Template::merge($template->output(), $template2->output());111 $template = Template::merge($template->output(), $template2->output()); 112 112 } else { 113 113 $template->remove('data-content'); … … 202 202 return $message; 203 203 } 204 204 205 // utility function to get domain name 205 private function get_domain( $url ) { 206 $url = parse_url( $url ); 207 if( $url && isset( $url['host'] ) ) { 206 private function get_domain($url) 207 { 208 $url = parse_url($url); 209 if ($url && isset($url['host'])) { 208 210 return $url['host']; 209 } 211 } 210 212 return false; 211 } 213 } 212 214 213 215 } -
easy-facebook-feed/trunk/readme.txt
r1901347 r1905943 5 5 Requires at least: 3.0.1 6 6 Tested up to: 4.9 7 Stable tag: 3.0.2 38 Version: 3.0.2 37 Stable tag: 3.0.24 8 Version: 3.0.24 9 9 License: GPLv2 or later 10 10 License URI: http://www.gnu.org/licenses/gpl-2.0.html … … 105 105 == Changelog == 106 106 107 = 3.0.24 = 108 * Fixed some debug warnings 109 107 110 = 3.0.22 = 108 111 * Added shortcode to exclude post types
Note: See TracChangeset
for help on using the changeset viewer.