From fca88020a5c47f8953d909090e56e8a9b65169ac Mon Sep 17 00:00:00 2001 From: Justin Foell Date: Mon, 11 May 2015 22:28:33 -0500 Subject: [PATCH] Updated version to 1.1 Added Lance Willet Tested WP 4.2 Check for WP error on Strava POST Fix static method in RideShortcode Add Title to Latest Map Widget --- lib/API.class.php | 3 +++ lib/LatestMapWidget.class.php | 12 ++++++++++-- lib/LatestRidesWidget.class.php | 9 ++------- lib/RideShortcode.class.php | 15 ++++++++------- readme.txt | 16 +++++++++++----- wp-strava.php | 16 ++++++++-------- 6 files changed, 42 insertions(+), 29 deletions(-) diff --git a/lib/API.class.php b/lib/API.class.php index 44dd657..5d87f9f 100755 --- a/lib/API.class.php +++ b/lib/API.class.php @@ -26,6 +26,9 @@ class WPStrava_API { $response = wp_remote_post( $url . $uri, $args ); + if ( is_wp_error( $response ) ) + return $response; + if ( $response['response']['code'] != 200 ) { //see if there's useful info in the body $body = json_decode( $response['body'] ); diff --git a/lib/LatestMapWidget.class.php b/lib/LatestMapWidget.class.php index ec40b16..0115c12 100644 --- a/lib/LatestMapWidget.class.php +++ b/lib/LatestMapWidget.class.php @@ -16,6 +16,7 @@ class WPStrava_LatestMapWidget extends WP_Widget { public function form( $instance ) { // outputs the options form on admin + $title = isset( $instance['title'] ) ? esc_attr( $instance['title'] ) : __( 'Latest Activity', 'wp-strava' ); $distance_min = isset( $instance['distance_min'] ) ? esc_attr( $instance['distance_min'] ) : ''; $strava_club_id = isset( $instance['strava_club_id'] ) ? esc_attr( $instance['strava_club_id'] ) : ''; @@ -23,6 +24,10 @@ class WPStrava_LatestMapWidget extends WP_Widget { //$ride_index_params = $ride_index_params ? $ride_index_params : 'athleteId=21'; ?> +

+ + +

@@ -37,6 +42,7 @@ class WPStrava_LatestMapWidget extends WP_Widget { public function update( $new_instance, $old_instance ) { // processes widget options to be saved from the admin $instance = $old_instance; + $instance['title'] = strip_tags( $new_instance['title'] ); $instance['strava_club_id'] = strip_tags( $new_instance['strava_club_id'] ); $instance['distance_min'] = strip_tags( $new_instance['distance_min'] ); return $instance; @@ -44,6 +50,8 @@ class WPStrava_LatestMapWidget extends WP_Widget { public function widget( $args, $instance ) { extract( $args ); + + $title = apply_filters( 'widget_title', empty( $instance['title'] ) ? __( 'Latest Activity', 'wp-strava' ) : $instance['title'] ); $distance_min = $instance['distance_min']; $strava_club_id = empty( $instance['strava_club_id'] ) ? NULL : $instance['strava_club_id']; $build_new = false; @@ -92,8 +100,8 @@ class WPStrava_LatestMapWidget extends WP_Widget { if ( $ride ): echo $before_widget; - ?>

Latest Ride

- getStaticImage( $ride->id, $build_new ); ?> - strava_request_handler( $strava_club_id, $strava_som_option, $quantity ); ?> + strava_request_handler( $strava_club_id, $quantity ); ?> rides; diff --git a/lib/RideShortcode.class.php b/lib/RideShortcode.class.php index 8113310..5353519 100644 --- a/lib/RideShortcode.class.php +++ b/lib/RideShortcode.class.php @@ -1,16 +1,17 @@ @@ -70,7 +71,7 @@ class WPStrava_RideShortcode { } } // handler - static function printScripts() { + public static function printScripts() { if (self::$add_script) { wp_enqueue_style('wp-strava-style'); diff --git a/readme.txt b/readme.txt index d42fe9e..2e49fbb 100755 --- a/readme.txt +++ b/readme.txt @@ -1,10 +1,10 @@ === Plugin Name === -Contributors: cmanon, jrfoell +Contributors: cmanon, jrfoell, lancewillett Donate link: http://cmanon.com/ Tags: strava, bicycle, cycling, biking, running, run, swimming, swim, gps, shortcode, widget, plugin -Requires at least: 3.0 -Tested up to: 4.0 -Stable tag: 1.0 +Requires at least: 4.0 +Tested up to: 4.2 +Stable tag: 1.1 License: GPLv2 or later Show your Strava activity on your WordPress site. @@ -17,7 +17,7 @@ widgets and shortcodes for showing maps and activity summaries. = Shortcodes = -[ride id=NUMBER] - add to any page or post. Also takes the following +[activity id=NUMBER] - add to any page or post. Also takes the following optional parameters: * som - english/metric (system of measure - override from default setting) @@ -33,6 +33,12 @@ latest map to activities of a certain minimum distance == Changelog == += 1.1 = +Added [activity] short code to deprecate [ride] in the future +Fixed static method call error in shortcode +Added title to Strava Latest Map Widget +Added Lance Willet to contributors + = 1.0 = Change to Strava API V3 Switch ride shortcode to use static map diff --git a/wp-strava.php b/wp-strava.php index 372f8cb..d52d441 100755 --- a/wp-strava.php +++ b/wp-strava.php @@ -1,13 +1,13 @@ -Author URI: http://cmanon.com -License: GPL2 -*/ + * Plugin Name: WP Strava + * Plugin URI: http://cmanon.com + * Description: Plugin to show your strava.com information in your wordpress blog. Some Icons are Copyright © Yusuke Kamiyamane. All rights reserved. Licensed under a Creative Commons Attribution 3.0 license. + * Version: 1.1 + * Author: Carlos Santa Cruz, Justin Foell, Lance Willet + * License: GPL2 + */ + /* Copyright 2011 Carlos Santa Cruz (email : cmanon at gmail dot com) This program is free software; you can redistribute it and/or modify