From 31829840802dd8433fdb278c8b014c45c7ef39c8 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@prodromou.name>
Date: Tue, 3 Jun 2008 07:43:17 -0400
Subject: [PATCH] fix service discovery (I think)

darcs-hash:20080603114317-84dde-04fe2734003fa8023708b6dbda6243d9fd15e9d8.gz
---
 actions/remotesubscribe.php | 6 +++---
 lib/omb.php                 | 4 ++++
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/actions/remotesubscribe.php b/actions/remotesubscribe.php
index 16c991fe89..964aa45a20 100644
--- a/actions/remotesubscribe.php
+++ b/actions/remotesubscribe.php
@@ -131,7 +131,7 @@ class RemotesubscribeAction extends Action {
 
 		common_debug('remotesubscribe.php - looking for oauth discovery service');
 
-		$oauth_services = $xrds->services(omb_service_filter(OAUTH_DISCOVERY));
+		$oauth_services = omb_get_services($xrds, OAUTH_DISCOVERY);
 
 		if (!$oauth_services) {
 			common_debug('remotesubscribe.php - failed to find oauth discovery service');
@@ -158,7 +158,7 @@ class RemotesubscribeAction extends Action {
 
 		common_debug('remotesubscribe.php - looking for OMB discovery service');
 
-		$omb_services = $xrds->services(omb_service_filter(OMB_NAMESPACE));
+		$omb_services = omb_get_services($xrds, OMB_NAMESPACE);
 
 		if (!$omb_services) {
 			common_debug('remotesubscribe.php - failed to find OMB discovery service');
@@ -224,7 +224,7 @@ class RemotesubscribeAction extends Action {
 
 	function addServices($xrd, $types, &$omb) {
 		foreach ($types as $type) {
-			$matches = $xrd->services(omb_service_filter($type));
+			$matches = omb_get_services($xrd, $type);
 			common_debug('remotesubscribe.php - ' . count($matches) . ' matches for "'.$type.'"');
 			if ($matches) {
 				foreach ($matches as $match) {
diff --git a/lib/omb.php b/lib/omb.php
index 9d4a327a92..c75fb79037 100644
--- a/lib/omb.php
+++ b/lib/omb.php
@@ -66,6 +66,10 @@ function omb_hmac_sha1() {
 	return $hmac_method;
 }
 
+function omb_get_services($xrd, $type) {
+	return $xrd->services(array(omb_service_filter($type)));
+}
+
 function omb_service_filter($type) {
 	return create_function('$s', 
 						   'return omb_match_service($s, \''.$type.'\');');