diff --git a/lib/LatestMapWidget.class.php b/lib/LatestMapWidget.class.php index 65b7940..d81d1ff 100644 --- a/lib/LatestMapWidget.class.php +++ b/lib/LatestMapWidget.class.php @@ -17,6 +17,8 @@ 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' ); + $all_tokens = WPStrava::get_instance()->settings->get_all_tokens(); + $athlete_token = isset( $instance['athlete_token'] ) ? esc_attr( $instance['athlete_token'] ) : WPStrava::get_instance()->settings->get_default_token(); $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'] ) : ''; @@ -28,6 +30,14 @@ class WPStrava_LatestMapWidget extends WP_Widget {

+

+ + +

@@ -43,6 +53,7 @@ class WPStrava_LatestMapWidget extends WP_Widget { // processes widget options to be saved from the admin $instance = $old_instance; $instance['title'] = strip_tags( $new_instance['title'] ); + $instance['athlete_token'] = strip_tags( $new_instance['athlete_token'] ); $instance['strava_club_id'] = strip_tags( $new_instance['strava_club_id'] ); $instance['distance_min'] = strip_tags( $new_instance['distance_min'] ); return $instance; @@ -52,19 +63,20 @@ class WPStrava_LatestMapWidget extends WP_Widget { extract( $args ); $title = apply_filters( 'widget_title', empty( $instance['title'] ) ? __( 'Latest Activity', 'wp-strava' ) : $instance['title'] ); + $athlete_token = isset( $instance['athlete_token'] ) ? $instance['athlete_token'] : WPStrava::get_instance()->settings->get_default_token(); $distance_min = $instance['distance_min']; $strava_club_id = empty( $instance['strava_club_id'] ) ? null : $instance['strava_club_id']; $build_new = false; // Try our transient first. - $ride_transient = get_transient( 'strava_latest_map_ride' ); - $ride_option = get_option( 'strava_latest_map_ride' ); + $ride_transient = get_transient( 'strava_latest_map_activity_' . $athlete_token ); + $ride_option = get_option( 'strava_latest_map_activity_' . $athlete_token ); $ride = $ride_transient ?: null; if ( ! $ride ) { $strava_rides = WPStrava::get_instance()->rides; - $rides = $strava_rides->getRides( $strava_club_id ); + $rides = $strava_rides->getRides( $athlete_token, $strava_club_id ); if ( is_wp_error( $rides ) ) { echo $before_widget; @@ -86,14 +98,16 @@ class WPStrava_LatestMapWidget extends WP_Widget { $ride = current( $rides ); - //update transients & options + // 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 ) { $build_new = true; - update_option( 'strava_latest_map_ride', $ride ); + $this->update_activity( $athlete_token, $ride ); } + // Update the transient if it needs updating. if ( empty( $ride_transient->id ) || $ride->id != $ride_transient->id ) { - set_transient( 'strava_latest_map_ride', $ride, HOUR_IN_SECONDS ); + $this->update_activity_transient( $athlete_token, $ride ); } } } @@ -102,22 +116,81 @@ class WPStrava_LatestMapWidget extends WP_Widget { echo $before_widget; if ( $title ) echo $before_title . $title . $after_title; ?>getStaticImage( $ride->id, $build_new ); + echo $this->getStaticImage( $athlete_token, $ride, $build_new ); ?>rides->getRide( $ride_id ); $img = WPStrava_StaticMap::get_image_tag( $ride ); - update_option( 'strava_latest_map', $img ); + $this->update_map( $athlete_token, $img ); } return $img; } + + /** + * Update map in option to cache. + * + * @author Justin Foell + * @since 1.2.0 + * + * @param string $athlete_token Token for athelete. + * @param string $img Image tag. + */ + private function update_map( $athlete_token, $img ) { + // Remove old (pre 1.2.0) cached maps. + if ( get_option( 'strava_latest_map' ) ) { + delete_option( 'strava_latest_map' ); + } + update_option( 'strava_latest_map_' . $athlete_token, $img ); + } + + /** + * Update activity in option to cache. + * + * @author Justin Foell + * @since 1.2.0 + * + * @param string $athlete_token Token for athelete. + * @param object $activity stdClass Strava activity object. + */ + private function update_activity( $athlete_token, $activity ) { + // Remove old (pre 1.2.0) option. + if ( get_option( 'strava_latest_map_ride' ) ) { + delete_option( 'strava_latest_map_ride' ); + } + update_option( 'strava_latest_map_activity_' . $athlete_token, $activity ); + } + + /** + * Update activity in transient to cache. + * + * @author Justin Foell + * @since 1.2.0 + * + * @param string $athlete_token Token for athelete. + * @param object $activity stdClass Strava activity object. + */ + private function update_activity_transient( $athlete_token, $activity ) { + // Remove old (pre 1.2.0) transient. + if ( get_transient( 'strava_latest_map_ride' ) ) { + delete_transient( 'strava_latest_map_ride' ); + } + set_transient( 'strava_latest_map_activity_' . $athlete_token, $activity, HOUR_IN_SECONDS ); + } } diff --git a/lib/LatestRidesWidget.class.php b/lib/LatestRidesWidget.class.php index bcbaf42..32f95e0 100644 --- a/lib/LatestRidesWidget.class.php +++ b/lib/LatestRidesWidget.class.php @@ -23,14 +23,14 @@ class WPStrava_LatestRidesWidget extends WP_Widget { //$widget_id = $args['widget_id']; $title = apply_filters( 'widget_title', empty( $instance['title'] ) ? __( 'Rides', 'wp-strava' ) : $instance['title'] ); + $athlete_token = isset( $instance['athlete_token'] ) ? $instance['athlete_token'] : WPStrava::get_instance()->settings->get_default_token(); $strava_club_id = empty( $instance['strava_club_id'] ) ? '' : $instance['strava_club_id']; $quantity = empty( $instance['quantity'] ) ? '5' : $instance['quantity']; - $this->som = WPStrava_SOM::get_som(); ?> - strava_request_handler( $strava_club_id, $quantity ); ?> + strava_request_handler( $athlete_token, $strava_club_id, $quantity ); ?> settings->get_all_tokens(); + $athlete_token = isset( $instance['athlete_token'] ) ? esc_attr( $instance['athlete_token'] ) : WPStrava::get_instance()->settings->get_default_token(); $strava_club_id = isset( $instance['strava_club_id'] ) ? esc_attr( $instance['strava_club_id'] ) : ''; $quantity = isset( $instance['quantity'] ) ? absint( $instance['quantity'] ) : 5; @@ -57,7 +60,15 @@ class WPStrava_LatestRidesWidget extends WP_Widget {

- + + +

+

+

@@ -69,11 +80,12 @@ class WPStrava_LatestRidesWidget extends WP_Widget { // The handler to the ajax call, we will avoid this if Strava support jsonp request and we can do it // the parsing directly on the jQuery ajax call, the returned text will be enclosed in the $response variable. - private function strava_request_handler( $strava_club_id, $quantity ) { + private function strava_request_handler( $athlete_token, $strava_club_id, $quantity ) { + $som = WPStrava_SOM::get_som(); $strava_rides = WPStrava::get_instance()->rides; - $rides = $strava_rides->getRides( $strava_club_id, $quantity ); + $rides = $strava_rides->getRides( $athlete_token, $strava_club_id, $quantity ); if ( is_wp_error( $rides ) ) return $rides->get_error_message(); @@ -89,9 +101,9 @@ class WPStrava_LatestRidesWidget extends WP_Widget { $response .= " " . $ride->athlete_name . ''; } - $response .= sprintf( __( ' rode %s %s', 'wp-strava' ), $this->som->distance( $ride->distance ), $this->som->get_distance_label() ); - $response .= sprintf( __( ' during %s %s', 'wp-strava' ), $this->som->time( $ride->elapsed_time ), $this->som->get_time_label() ); - $response .= sprintf( __( ' climbing %s %s', 'wp-strava' ), $this->som->elevation( $ride->total_elevation_gain ), $this->som->get_elevation_label() ); + $response .= sprintf( __( ' rode %s %s', 'wp-strava' ), $som->distance( $ride->distance ), $som->get_distance_label() ); + $response .= sprintf( __( ' during %s %s', 'wp-strava' ), $som->time( $ride->elapsed_time ), $som->get_time_label() ); + $response .= sprintf( __( ' climbing %s %s', 'wp-strava' ), $som->elevation( $ride->total_elevation_gain ), $som->get_elevation_label() ); $response .= ""; $response .= ""; } diff --git a/lib/Rides.class.php b/lib/Rides.class.php index 4b237ff..0fb5bd1 100755 --- a/lib/Rides.class.php +++ b/lib/Rides.class.php @@ -7,12 +7,30 @@ class WPStrava_Rides { const RIDES_URL = 'http://app.strava.com/rides/'; const ATHLETES_URL = 'http://app.strava.com/athletes/'; - public function getRide( $rideId ) { - return WPStrava::get_instance()->api->get( "activities/{$rideId}" ); + /** + * Get single activity by ID. + * + * @param string $athlete_token Token of athlete to retrieve for + * @param int $activity_id ID of activity to retrieve. + * @return object stdClass representing this activty. + * @author Justin Foell + */ + public function getRide( $athlete_token, $activity_id ) { + return WPStrava::get_instance()->get_api( $athlete_token )->get( "activities/{$activity_id}" ); } // getRideDetails - public function getRides( $club_id = null, $quantity = null ) { - $api = WPStrava::get_instance()->api; + /** + * Get activity list from Strava API. + * + * @author Justin Foell + * + * @param string $athlete_token Token of athlete to retrieve for + * @param int $club_id Club ID of all club riders (optional). + * @param int|null $quantity Number of records to retrieve (optional). + * @return array|WP_Error Array of rides or WP_Error. + */ + public function getRides( $athlete_token, $club_id = null, $quantity = null ) { + $api = WPStrava::get_instance()->get_api( $athlete_token ); $data = null; @@ -25,11 +43,13 @@ class WPStrava_Rides { $data = $api->get( 'athlete/activities', $args ); } - if ( is_wp_error( $data ) ) + if ( is_wp_error( $data ) ) { return $data; + } - if ( is_array( $data ) ) + if ( is_array( $data ) ) { return $data; + } return array(); diff --git a/lib/Settings.class.php b/lib/Settings.class.php index b5d5042..c311c89 100644 --- a/lib/Settings.class.php +++ b/lib/Settings.class.php @@ -77,7 +77,7 @@ class WPStrava_Settings { //only update when redirected back from strava if ( ! isset( $_GET['settings-updated'] ) && isset( $_GET['page'] ) && $_GET['page'] == $this->page_name ) { if ( isset( $_GET['code'] ) ) { - $token = $this->get_token( $_GET['code'] ); + $token = $this->fetch_token( $_GET['code'] ); if ( $token ) { add_settings_error( 'strava_token', 'strava_token', sprintf( __( 'New Strava token retrieved. %s', 'wp-strava' ), $this->feedback ) , 'updated' ); $this->add_token( $token ); @@ -194,18 +194,15 @@ class WPStrava_Settings { } public function print_nickname_input() { - $nickname = $this->tokens_empty( $this->tokens ) ? __( 'default', 'wp-strava' ) : ''; + $nickname = $this->tokens_empty( $this->tokens ) ? __( 'Default', 'wp-strava' ) : ''; ?>nickname; - foreach ( $this->get_tokens() as $index => $token ) { + foreach ( $this->get_all_tokens() as $token => $nickname ) { ?> - - - +
adding_athlete ) { - // Reemove last (blank) entry if not trying to add an additional athlete. - $last = array_pop( $nicknames ); - $second2last = end( $nicknames ); + + $last = end( $nicknames ); + $second2last = prev( $nicknames ); $token_index = count( $nicknames ) - 1; - if ( $last === '' && $second2last === '' && + if ( $last === '' && $second2last !== '' && empty( $_POST['strava_token'][ $token_index ] ) ) { - // Remove one more + // Remove last (blank) entry if not trying to add an additional athlete. array_pop( $nicknames ); } } @@ -263,7 +260,7 @@ class WPStrava_Settings { return $token; } - private function get_token( $code ) { + private function fetch_token( $code ) { $client_id = $this->client_id; $client_secret = $this->client_secret; @@ -322,10 +319,17 @@ class WPStrava_Settings { public function sanitize_cache_clear( $checked ) { if ( 'on' === $checked ) { - // Clear these values: + // Clear these (pre 1.2.0) values: delete_transient( 'strava_latest_map_ride' ); delete_option( 'strava_latest_map_ride' ); delete_option( 'strava_latest_map' ); + + // Remove activity transients and options. + foreach ( $this->get_tokens() as $token ) { + delete_transient( 'strava_latest_map_activity_' . $token ); + delete_option( 'strava_latest_map_activity_' . $token ); + delete_option( 'strava_latest_map_' . $token ); + } } return null; } @@ -335,7 +339,7 @@ class WPStrava_Settings { * * @return array * @author Justin Foell - * @since NEXT + * @since 1.2.0 */ public function get_tokens() { $tokens = get_option( 'strava_token' ); @@ -352,11 +356,60 @@ class WPStrava_Settings { return $tokens; } + /** + * Returns first (default) token saved. + * + * @return string|null + * @author Justin Foell + * @since 1.2.0 + */ + public function get_default_token() { + $tokens = $this->get_tokens(); + return isset( $tokens[0] ) ? $tokens[0] : null; + } + + /** + * Get all tokens and their nicknames in one array. + * + * @return void + * @author Justin Foell + * @since 1.2.0 + */ + public function get_all_tokens() { + $tokens = $this->get_tokens(); + $nicknames = $this->nickname; + $all = array(); + $number = 1; + foreach ( $tokens as $index => $token ) { + if ( ! empty( $nicknames[ $index ] ) ) { + $all[ $token ] = $nicknames[ $index ]; + } else { + $all[ $token ] = $this->get_default_nickname( $number ); + } + $number++; + } + return $all; + } + + /** + * Returns default nickname 'Default' / 'Athlete n'. + * + * @author Justin Foell + * @since 1.2.0 + * + * @param integer $number + * @return string + */ + private function get_default_nickname( $number = 1 ) { + // Translators: Athelete number if no nickname present. + return ( 1 == $number ) ? __( 'Default', 'wp-strava' ) : sprintf( __( 'Athlete %s', 'wp-strava' ), $number ); + } + /** * Checks for valid tokens. * * @author Justin Foell - * @since NEXT + * @since 1.2.0 * * @param string|array Single token or array of tokens. * @return boolean True if empty. @@ -383,7 +436,7 @@ class WPStrava_Settings { * @param string $token * * @author Justin Foell - * @since NEXT + * @since 1.2.0 */ public function add_token( $token ) { if ( false === array_search( $token, $this->tokens ) ) { diff --git a/lib/StaticMap.class.php b/lib/StaticMap.class.php index bb214c9..38a9e29 100644 --- a/lib/StaticMap.class.php +++ b/lib/StaticMap.class.php @@ -27,7 +27,7 @@ class WPStrava_StaticMap { if ( ! empty( $ride->map->polyline ) && ( $url_len + strlen( $ride->map->polyline ) < $max_chars ) ) { $url .= $ride->map->polyline; - } else { + } elseif ( ! empty( $ride->map->summary_polyline ) ) { $url .= $ride->map->summary_polyline; } diff --git a/lib/Strava.class.php b/lib/Strava.class.php index bf1a3e6..b0fb7e3 100644 --- a/lib/Strava.class.php +++ b/lib/Strava.class.php @@ -49,13 +49,17 @@ class WPStrava { return null; } - public function get_api( $id = '0' ) { - if ( ! $this->api[$id] ) { - require_once WPSTRAVA_PLUGIN_DIR . 'lib/API.class.php'; - $this->api[$id] = new WPStrava_API( $this->settings->get_setting( 'strava_token', $id ) ); + public function get_api( $token = null ) { + if ( ! $token ) { + $token = $this->settings->get_default_token(); } - return $this->api[$id]; + if ( empty( $this->api[ $token ] ) ) { + require_once WPSTRAVA_PLUGIN_DIR . 'lib/API.class.php'; + $this->api[$token] = new WPStrava_API( $token ); + } + + return $this->api[$token]; } public function get_rides() { diff --git a/readme.txt b/readme.txt index 69f308f..1e330ed 100755 --- a/readme.txt +++ b/readme.txt @@ -32,6 +32,9 @@ latest map to activities of a certain minimum distance == Changelog == += 1.2.0 = +Added multi-athlete configuration + = 1.1.1 = Changes to better support translations through https://translate.wordpress.org Cleaned up formatting diff --git a/wp-strava.php b/wp-strava.php index 622caa1..6341ef6 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.1.1 + * Version: 1.2.0-beta1 * Author: Carlos Santa Cruz, Justin Foell, Lance Willet * License: GPL2 * Text Domain: wp-strava