";
- $unixtime = strtotime( $ride->start_date_local );
+ $response = "
";
+ foreach ( $activities as $activity ) {
+ $response .= "- ";
+ $response .= "" . $activity->name . '';
+ $response .= "
";
+ $unixtime = strtotime( $activity->start_date_local );
// Translators: Shows something like "On
<[went 10 miles] [during 2 hours] [climbing 100 feet]>."
$response .= sprintf( __( 'On %1$s %2$s', 'wp-strava' ), date_i18n( get_option( 'date_format' ), $unixtime ), date_i18n( get_option( 'time_format' ), $unixtime ) );
if ( is_numeric( $args['strava_club_id'] ) ) {
- $response .= " " . $ride->athlete_name . '';
+ $response .= " " . $activity->athlete_name . '';
}
// Translators: "went 10 miles"
- $response .= sprintf( __( ' went %1$s %2$s', 'wp-strava' ), $som->distance( $ride->distance ), $som->get_distance_label() );
+ $response .= sprintf( __( ' went %1$s %2$s', 'wp-strava' ), $som->distance( $activity->distance ), $som->get_distance_label() );
// Translators: "during 2 hours"
- $response .= sprintf( __( ' during %1$s %2$s', 'wp-strava' ), $som->time( $ride->elapsed_time ), $som->get_time_label() );
+ $response .= sprintf( __( ' during %1$s %2$s', 'wp-strava' ), $som->time( $activity->elapsed_time ), $som->get_time_label() );
// Translators: "climbing 100 ft."
- $response .= sprintf( __( ' climbing %1$s %2$s', 'wp-strava' ), $som->elevation( $ride->total_elevation_gain ), $som->get_elevation_label() );
+ $response .= sprintf( __( ' climbing %1$s %2$s', 'wp-strava' ), $som->elevation( $activity->total_elevation_gain ), $som->get_elevation_label() );
$response .= ' ';
}
$response .= '
';
diff --git a/lib/LatestActivitiesWidget.class.php b/lib/LatestActivitiesWidget.class.php
index 9aea37e..573c167 100644
--- a/lib/LatestActivitiesWidget.class.php
+++ b/lib/LatestActivitiesWidget.class.php
@@ -10,7 +10,7 @@ class WPStrava_LatestActivitiesWidget extends WP_Widget {
public function __construct() {
$widget_ops = array(
'classname' => 'LatestActivitiesWidget',
- 'description' => __( 'Will publish your latest activities from strava.com.', 'wp-strava' ),
+ 'description' => __( 'Will show your latest activities from strava.com.', 'wp-strava' ),
);
parent::__construct( 'wp-strava', __( 'Strava Latest Activities List', 'wp-strava' ), $widget_ops );
add_action( 'wp_enqueue_scripts', array( $this, 'maybe_enqueue' ) );
diff --git a/lib/LatestMapWidget.class.php b/lib/LatestMapWidget.class.php
index 49be244..843bdcd 100644
--- a/lib/LatestMapWidget.class.php
+++ b/lib/LatestMapWidget.class.php
@@ -56,8 +56,13 @@ class WPStrava_LatestMapWidget extends WP_Widget {
return $instance;
}
+ /**
+ * Method to render the widget on the front end.
+ *
+ * @param array $args Arguments from the widget settings.
+ * @param array $instance Settings for this particular widget.
+ */
public function widget( $args, $instance ) {
- extract( $args );
$title = apply_filters( 'widget_title', empty( $instance['title'] ) ? __( 'Latest Activity Map', 'wp-strava' ) : $instance['title'] );
$athlete_token = isset( $instance['athlete_token'] ) ? $instance['athlete_token'] : WPStrava::get_instance()->settings->get_default_token();
@@ -66,82 +71,82 @@ class WPStrava_LatestMapWidget extends WP_Widget {
$build_new = false;
// Try our transient first.
- $ride_transient = get_transient( 'strava_latest_map_activity_' . $athlete_token );
- $ride_option = get_option( 'strava_latest_map_activity_' . $athlete_token );
+ $activity_transient = get_transient( 'strava_latest_map_activity_' . $athlete_token );
+ $activity_option = get_option( 'strava_latest_map_activity_' . $athlete_token );
- $ride = $ride_transient ? $ride_transient : null;
+ $activity = $activity_transient ? $activity_transient : null;
- if ( ! $ride ) {
- $strava_rides = WPStrava::get_instance()->rides;
- $rides = $strava_rides->getRides( $athlete_token, $strava_club_id );
+ if ( ! $activity ) {
+ $strava_activity = WPStrava::get_instance()->activity;
+ $activities = $strava_activity->get_activities( $athlete_token, $strava_club_id );
- if ( is_wp_error( $rides ) ) {
- echo $before_widget;
+ if ( is_wp_error( $activities ) ) {
+ echo $args['before_widget'];
if ( $title ) {
- echo $before_title . $title . $after_title;
+ echo $args['$before_title'] . $title . $args['$after_title'];
}
if ( WPSTRAVA_DEBUG ) {
echo '
';
- print_r( $rides ); // @codingStandardsIgnoreLine
+ print_r( $activities ); // @codingStandardsIgnoreLine
echo '
';
} else {
- echo $rides->get_error_message();
+ echo $activities->get_error_message();
}
- echo $after_widget;
+ echo $args['$after_widget'];
return;
}
- if ( ! empty( $rides ) ) {
+ if ( ! empty( $activities ) ) {
if ( ! empty( $distance_min ) ) {
- $rides = $strava_rides->getRidesLongerThan( $rides, $distance_min );
+ $activities = $strava_activity->get_activities_longer_than( $activities, $distance_min );
}
- $ride = current( $rides );
+ $activity = current( $activities );
// Compare transient (temporary storage) to option (more permenant).
// If the option isn't set or the transient is different, update the option.
- if ( empty( $ride_option->id ) || $ride->id != $ride_option->id ) {
+ if ( empty( $activity_option->id ) || $activity->id != $activity_option->id ) {
$build_new = true;
- $this->update_activity( $athlete_token, $ride );
+ $this->update_activity( $athlete_token, $activity );
}
// Update the transient if it needs updating.
- if ( empty( $ride_transient->id ) || $ride->id != $ride_transient->id ) {
- $this->update_activity_transient( $athlete_token, $ride );
+ if ( empty( $activity_transient->id ) || $activity->id != $activity_transient->id ) {
+ $this->update_activity_transient( $athlete_token, $activity );
}
}
}
- if ( $ride ) {
- echo $before_widget;
+ if ( $activity ) {
+ echo $args['$before_widget'];
if ( $title ) {
- echo $before_title . $title . $after_title;
+ echo $args['$before_title'] . $title . $args['$after_title'];
}
- echo "
";
- echo $this->getStaticImage( $athlete_token, $ride, $build_new );
+ echo "";
+ echo $this->get_static_image( $athlete_token, $activity, $build_new );
echo '';
- echo $after_widget;
+ echo $args['$after_widget'];
}
}
/**
- * Get image for specific ride using Static Maps class.
+ * Get image for specific activity using Static Maps class.
*
* @author Justin Foell
*
* @param string $athlete_token Token for athelete.
- * @param int $ride_id Club ID (optional).
- * @param boolean $build_new Whether to refresh the image from cache.
- * @return string Image tag.
+ * @param object $activity Activity to get image for.
+ * @param boolean $build_new Whether to refresh the image from cache.
+ * @return string Image tag.
*/
- private function getStaticImage( $athlete_token, $ride, $build_new ) {
+ private function get_static_image( $athlete_token, $activity, $build_new ) {
$img = get_option( 'strava_latest_map_' . $athlete_token );
if ( $build_new || ! $img ) {
- $img = WPStrava_StaticMap::get_image_tag( $ride );
+ $img = WPStrava_StaticMap::get_image_tag( $activity );
$this->update_map( $athlete_token, $img );
}
diff --git a/lib/RouteShortcode.class.php b/lib/RouteShortcode.class.php
index 23cfc12..c7f848d 100644
--- a/lib/RouteShortcode.class.php
+++ b/lib/RouteShortcode.class.php
@@ -1,5 +1,11 @@
false,
);
- extract( shortcode_atts( $defaults, $atts ) );
+ $atts = shortcode_atts( $defaults, $atts );
- $strava_som = WPStrava_SOM::get_som( $som );
+ $strava_som = WPStrava_SOM::get_som( $atts['som'] );
$route = WPStrava::get_instance()->routes;
- $route_details = $route->get_route( $id );
+ $route_details = $route->get_route( $atts['id'] );
+
+ if ( is_wp_error( $route_details ) ) {
+ if ( WPSTRAVA_DEBUG ) {
+ return '
' . print_r( $route_details, true ) . '
'; // @codingStandardsIgnoreLine
+ } else {
+ return $route_details->get_error_message();
+ }
+ }
//sanitize width & height
- $map_width = str_replace( '%', '', $map_width );
- $map_height = str_replace( '%', '', $map_height );
+ $map_width = str_replace( '%', '', $atts['map_width'] );
+ $map_height = str_replace( '%', '', $atts['map_height'] );
$map_width = str_replace( 'px', '', $map_width );
$map_height = str_replace( 'px', '', $map_height );
if ( $route_details ) {
return '
- ';
} // End if( $route_details ).
- } // handler
+ }
public static function print_scripts() {
if ( self::$add_script ) {
diff --git a/lib/Routes.class.php b/lib/Routes.class.php
index 573030f..7ac9abe 100644
--- a/lib/Routes.class.php
+++ b/lib/Routes.class.php
@@ -1,10 +1,13 @@
settings->som;
if ( 'english' === $som ) {
require_once WPSTRAVA_PLUGIN_DIR . 'lib/SOMEnglish.class.php';
return new WPStrava_SOMEnglish();
- } else { // Default to metric.
- require_once WPSTRAVA_PLUGIN_DIR . 'lib/SOMMetric.class.php';
- return new WPStrava_SOMMetric();
}
-
+ // Default to metric.
+ require_once WPSTRAVA_PLUGIN_DIR . 'lib/SOMMetric.class.php';
+ return new WPStrava_SOMMetric();
}
abstract public function distance( $m );
diff --git a/lib/SOMEnglish.class.php b/lib/SOMEnglish.class.php
index 5b92367..33c48e1 100644
--- a/lib/SOMEnglish.class.php
+++ b/lib/SOMEnglish.class.php
@@ -1,47 +1,75 @@
Steps:
- - Create your free API Application/Connection here: %2\$s using the following information:
+ - Create your free API Application/Connection here: %2\$s using the following information:
- - App Icon: upload this image
+ - App Icon: upload this image
- Application Name: %4\$s
- Category: OK to leave at default 'other'
- Club: OK to leave blank
@@ -174,7 +173,7 @@ class WPStrava_Settings {
$maps_url = 'https://developers.google.com/maps/documentation/static-maps/';
printf( __( "Steps:
- - To use Google map images, you must create a Static Maps API Key. Create a free key by going here: %2\$s and clicking Get a Key
+ - To use Google map images, you must create a Static Maps API Key. Create a free key by going here: %2\$s and clicking Get a Key
- Once you've created your Google Static Maps API Key, enter the key below.
", 'wp-strava' ), $maps_url, $maps_url );
@@ -432,7 +431,7 @@ class WPStrava_Settings {
* @return string
*/
private function get_default_nickname( $number = 1 ) {
- // Translators: Athelete number if no nickname present.
+ // Translators: Athlete number if no nickname present.
return ( 1 === $number ) ? __( 'Default', 'wp-strava' ) : sprintf( __( 'Athlete %s', 'wp-strava' ), $number );
}
@@ -488,11 +487,4 @@ class WPStrava_Settings {
$links[] = $settings_link;
return $links;
}
-
- public function settings_scripts() {
- $screen = get_current_screen();
- if ( "settings_page_{$this->page_name}" === $screen->id ) {
- wp_enqueue_script( 'wp-strava-settings', WPSTRAVA_PLUGIN_URL . 'js/wp-strava-settings.js', array( 'jquery' ) );
- }
- }
}
diff --git a/lib/StaticMap.class.php b/lib/StaticMap.class.php
index cefe939..14b4894 100644
--- a/lib/StaticMap.class.php
+++ b/lib/StaticMap.class.php
@@ -9,17 +9,17 @@ class WPStrava_StaticMap {
*
* @static
* @access public
- * @param object $ride Ride object from strava.
- * @param int $height Height of map in pixels.
- * @param int $width Width of map in pixels.
- * @param bool $markers Display start and finish markers.
- * @return string HTML img tag with static map image.
+ * @param object $activity Activity object to get image tag for.
+ * @param int $height Height of map in pixels.
+ * @param int $width Width of map in pixels.
+ * @param bool $markers Display start and finish markers.
+ * @return string HTML img tag with static map image.
*/
- public static function get_image_tag( $ride, $height = 320, $width = 480, $markers = false ) {
+ public static function get_image_tag( $activity, $height = 320, $width = 480, $markers = false, $link = true ) {
$key = WPStrava::get_instance()->settings->gmaps_key;
- // Short circuit if missing key or ride object doesn't have the data we need.
- if ( empty( $key ) || empty( $ride->map ) ) {
+ // Short circuit if missing key or activity object doesn't have the data we need.
+ if ( empty( $key ) || empty( $activity->map ) ) {
return '';
}
@@ -28,10 +28,10 @@ class WPStrava_StaticMap {
$max_chars = 1865;
$polyline = '';
- if ( ! empty( $ride->map->polyline ) && ( $url_len + strlen( $ride->map->polyline ) < $max_chars ) ) {
- $polyline = $ride->map->polyline;
- } elseif ( ! empty( $ride->map->summary_polyline ) ) {
- $polyline = $ride->map->summary_polyline;
+ if ( ! empty( $activity->map->polyline ) && ( $url_len + strlen( $activity->map->polyline ) < $max_chars ) ) {
+ $polyline = $activity->map->polyline;
+ } elseif ( ! empty( $activity->map->summary_polyline ) ) {
+ $polyline = $activity->map->summary_polyline;
}
$url .= $polyline;
@@ -53,7 +53,17 @@ class WPStrava_StaticMap {
* @see https://developers.google.com/maps/documentation/utilities/polylinealgorithm
* @access private
* @param string $enc Encoded polyline.
- * @return array with indexes of start & finish containing lat/lon for each.
+ * @return array {
+ * Indexes of start & finish containing lat/lon for each.
+ * @type array $start {
+ * @type float $0 Latitude
+ * @type float $1 Longitude
+ * }
+ * @type array $finish {
+ * @type float $0 Latitude
+ * @type float $1 Longitude
+ * }
+ * }
*/
private static function decode_start_finish( $enc ) {
require_once WPSTRAVA_PLUGIN_DIR . 'lib/Polyline.php';
diff --git a/lib/Strava.class.php b/lib/Strava.class.php
index bad22ca..1ef33af 100644
--- a/lib/Strava.class.php
+++ b/lib/Strava.class.php
@@ -12,7 +12,7 @@ class WPStrava {
private static $instance = null;
private $settings = null;
private $api = array(); // Holds an array of APIs.
- private $rides = null;
+ private $activity = null;
private $routes = null;
private function __construct() {
@@ -38,8 +38,8 @@ class WPStrava {
public function __get( $name ) {
// On-demand classes.
- if ( 'rides' === $name ) {
- return $this->get_rides();
+ if ( 'activity' === $name ) {
+ return $this->get_activity();
}
if ( 'routes' === $name ) {
@@ -66,13 +66,13 @@ class WPStrava {
return $this->api[ $token ];
}
- public function get_rides() {
- if ( ! $this->rides ) {
- require_once WPSTRAVA_PLUGIN_DIR . 'lib/Rides.class.php';
- $this->rides = new WPStrava_Rides();
+ public function get_activity() {
+ if ( ! $this->activity ) {
+ require_once WPSTRAVA_PLUGIN_DIR . 'lib/Activity.class.php';
+ $this->activity = new WPStrava_Activity();
}
- return $this->rides;
+ return $this->activity;
}
public function get_routes() {
diff --git a/readme.txt b/readme.txt
index 09e81fc..2673e88 100755
--- a/readme.txt
+++ b/readme.txt
@@ -1,6 +1,6 @@
=== WP-Strava ===
-Contributors: cmanon, jrfoell, lancewillett
+Contributors: cmanon, jrfoell, lancewillett, dlintott
Tags: strava, activity, bicycle, cycling, biking, running, run, swimming, swim, gps, shortcode, widget, plugin
Requires at least: 4.6
Tested up to: 4.9
@@ -48,9 +48,44 @@ Strava Latest Activity List - shows a list of the last few activities.
Strava Latest Map - shows map of latest activity with option to limit latest map to activities of a certain minimum distance.
+== Frequently Asked Questions ==
+
+= Why am I getting "ERROR 401 Unauthorized"? =
+
+When you have multiple athletes saved, the first is considered to be the default athlete. If you use a shortcode to display activity from anyone other than the default athlete, you must add the athlete token to the shortcode, such as
+
+= Why is my Google Map not showing up? =
+
+If your key works with other Google Maps plugins but not WP Strava, you may need to enable the "Static Maps" functionality on your google account. This is especially true for people using G Suite accounts (not just a @gmail.com address). While logged into your G Suite email, visit https://console.developers.google.com/apis/library/static-maps-backend.googleapis.com/?q=static and make sure the "Static Maps API" is enabled. For more details see https://wordpress.org/support/topic/no-data-errors/
+
+== Screenshots ==
+
+1. WP Strava settings - this walks you through connecting the WP Strava plugin to your strava account. You can connect multiple accounts by authenticating each one here. Add your Google Maps key for map display here. You can also set the system of measurement (miles/kilometers) and clear any saved data.
+2. Latest Activities List Widget - shows a list of the most recent activities for the selected athlete.
+3. Latest Activities List Widget Settings - settings for the Latest Activities List Widget.
+4. Latest Map Widget - shows a map of your most recent activity.
+5. Latest Map Widget Settings - settings for the Latest Map Widget. You can limit your activity by minimum distance to show only longer efforts.
+6. Activity Shortcode - Shows a map of activity with some statistics.
+7. Activity Shortcode Settings - An example activity shortcode. The athlete_token parameter is only needed if your site is connected to multiple athlete accounts.
+8. Route Shortcode - Shows a map of a route.
+9. Route Shortcode Settings - An example route shortcode. Add markers=true to show green/red start stop points.
+10. Activities Shortcode - Shows latest athlete activity in a page or post.
+11. Activities Shortcode Settings - An example activities shortcode. The athlete_token parameter is only needed if your site is connected to multiple athlete accounts.
== Changelog ==
+= 1.4.0 =
+
+Added dlintott to contributors.
+Fixed non-existent settings js from being enqueued.
+Changed all 'ride' styles and functions to 'activity'.
+Added inline documentation.
+Updated coding standards to WordPress where possible.
+Added Screenshots.
+Removed target="_blank" from hrefs for accessibility best practices.
+Added links from activity and route shortcodes to respective strava page.
+Removed all instances of extract().
+
= 1.3.0 =
Added [route] shortcode and start/finish https://github.com/cmanon/wp-strava/pull/10/
diff --git a/wp-strava.php b/wp-strava.php
index 3c98d7d..1b907e0 100755
--- a/wp-strava.php
+++ b/wp-strava.php
@@ -3,7 +3,7 @@
* Plugin Name: WP Strava
* Plugin URI: https://wordpress.org/plugins/wp-strava/
* 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.3.0
+ * Version: 1.4.0-rc1
* Author: Carlos Santa Cruz, Justin Foell, Lance Willet
* License: GPL2
* Text Domain: wp-strava