From 9514c3d276ae943d1335d9e75b9ae79ea392e554 Mon Sep 17 00:00:00 2001
From: cmanon <cmanon@gmail.com>
Date: Tue, 12 Jun 2012 19:48:07 -0500
Subject: [PATCH] Version 0.62:  - Refactor some code.  - Add feature request
 from Tom Bammann.  - Fixed a bug also reported by Tom.

---
 rides.class.php | 21 ++++++++++++---------
 wp-strava.php   |  3 +++
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/rides.class.php b/rides.class.php
index 39d165b..4a1b583 100755
--- a/rides.class.php
+++ b/rides.class.php
@@ -13,6 +13,7 @@ class Rides {
 	private $rideMapDetailsUrlV2 = "http://www.strava.com/api/v2/rides/:id/map_details";
 	
 	public $ridesLinkUrl = "http://app.strava.com/rides/";
+	public $athletesLinkUrl = "http://app.strava.com/athletes/";
 	public $stravaRides;
 	public $feedback;
 	
@@ -21,43 +22,45 @@ class Rides {
 	} // __construct
 	
 	public function getRideDetails($rideId, $systemOfMeasurement) {
-		$url = preg_replace('/:id/', $rideId, $this->rideUrlV2);
+		$url = preg_replace('/:id/', $rideId, $this->rideUrl);
 		$json = file_get_contents($url);
 
 		if($json) {
 			$strava_ride = json_decode($json);
 			
 			//Transform data to a ready to be displayed format
-			$startDate = date("F j, Y - H:i a", strtotime($strava_ride->ride->start_date_local));
-			$elapsedTime = date("H:i:s", mktime(0, 0, $strava_ride->ride->elapsed_time));
-			$movingTime = date("H:i:s", mktime(0, 0, $strava_ride->ride->moving_time));
+			$startDate = date("F j, Y - H:i a", strtotime($strava_ride->ride->startDateLocal));
+			$elapsedTime = date("H:i:s", mktime(0, 0, $strava_ride->ride->elapsedTime));
+			$movingTime = date("H:i:s", mktime(0, 0, $strava_ride->ride->movingTime));
 			
 			if ($systemOfMeasurement == "metric") {
 				//To km
 				$distance = number_format($strava_ride->ride->distance/1000, 2);
 				//To km/h
-				$averageSpeed = number_format($strava_ride->ride->average_speed * 3.6, 2);
+				$averageSpeed = number_format($strava_ride->ride->averageSpeed * 3.6, 2);
 				//To km/h
 				// Removed on version 2 of the Strava API
 				//$maximumSpeed = number_format($strava_ride->ride->maximumSpeed/1000, 2);
 				//It is already in meters
-				$elevationGain = number_format($strava_ride->ride->elevation_gain, 2);
+				$elevationGain = number_format($strava_ride->ride->elevationGain, 2);
 			} elseif ($systemOfMeasurement == "english") {
 				//To miles
 				$distance = number_format($strava_ride->ride->distance/1609.34, 2);
 				//To miles/h
-				$averageSpeed = number_format($strava_ride->ride->average_speed * 2.2369, 2);
+				$averageSpeed = number_format($strava_ride->ride->averageSpeed * 2.2369, 2);
 				//To miles/h
 				// Removed on version 2 of the Strava API
 				//$maximumSpeed = number_format($strava_ride->ride->maximumSpeed/1609.34, 2);
 				//To foot
-				$elevationGain = number_format($strava_ride->ride->elevation_gain/0.3048, 2);
+				$elevationGain = number_format($strava_ride->ride->elevationGain/0.3048, 2);
 			}
 			
 			$ride_details = array(
 				'id' => $rideId,
 				'name' => $strava_ride->ride->name,
-				//'description' => $stravaRide->rides->description,
+				'athleteId' => $strava_ride->ride->athlete->id,
+				'athleteName' => $strava_ride->ride->athlete->name,
+				'athleteUserName' => $strava_ride->ride->athlete->username,
 				'startDate' => $startDate,
 				'elapsedTime' => $elapsedTime,
 				'movingTime' => $movingTime,
diff --git a/wp-strava.php b/wp-strava.php
index 13efab4..ddaabf6 100755
--- a/wp-strava.php
+++ b/wp-strava.php
@@ -248,6 +248,9 @@ function strava_request_handler($strava_search_option, $strava_search_id, $strav
 			$response .= "<a href='" . $strava_rides->ridesLinkUrl . $ride['id'] . "' >" . $ride['name'] . "</a>";
 			$response .= "<div class='ride-item'>";
 				$response .= __("On ", "wp-strava") . $ride['startDate'];
+				if ($strava_search_option == "club") {
+					$response .= " <a href='" . $strava_rides->athletesLinkUrl . $ride['athleteId'] . "'>" . $ride['athleteName'] . "</a>";
+				}
 				$response .= __(" rode ", "wp-strava") . $ride['distance'] . " " . $units['distance'];
 				$response .= __(" during ", "wp-strava") . $ride['elapsedTime'] . " " . $units['elapsedTime'];
 				$response .= __(" climbing ", "wp-strava") . $ride['elevationGain'] . " " . $units['elevationGain'] . ".";