eliseuamaro/gnu-social
1
0
Fork 0
forked from GNUsocial/gnu-social
Code Issues Pull Requests Releases Wiki Activity

add some debugging stuff for problems with remote subscribe

Browse Source 
darcs-hash:20080602181254-84dde-ac7f4a362754a66facfb06a7b41f9160a0eb5caf.gz
This commit is contained in:
Evan Prodromou 2008-06-02 14:12:54 -04:00
parent 74bec95032
commit 3b9f0e3867
2 changed files with 37 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
actions/remotesubscribe.php
View File

@ -129,23 +129,55 @@ class RemotesubscribeAction extends Action {
# XXX: the following code could probably be refactored to eliminate dupes # XXX: the following code could probably be refactored to eliminate dupes
common_debug('remotesubscribe.php - looking for oauth discovery service');
$oauth_service = $xrds->services(omb_service_filter(OAUTH_DISCOVERY)); $oauth_service = $xrds->services(omb_service_filter(OAUTH_DISCOVERY));
if (!$oauth_service) { if (!$oauth_service) {
common_debug('remotesubscribe.php - failed to find oauth discovery service');
return NULL; return NULL;
} }
common_debug('remotesubscribe.php - looking for oauth discovery XRD');
$xrd = $this->getXRD($oauth_service, $xrds); $xrd = $this->getXRD($oauth_service, $xrds);
$this->addServices($xrd, $oauth_endpoints, $omb);
if (!$xrd) {
common_debug('remotesubscribe.php - failed to find oauth discovery XRD');
return NULL;
}
common_debug('remotesubscribe.php - adding OAuth services from XRD');
if (!$this->addServices($xrd, $oauth_endpoints, $omb)) {
common_debug('remotesubscribe.php - failed to add OAuth services');
return NULL;
}
common_debug('remotesubscribe.php - looking for OMB discovery service');
$omb_service = $xrds->services(omb_service_filter(OMB_NAMESPACE)); $omb_service = $xrds->services(omb_service_filter(OMB_NAMESPACE));
if (!$omb_service) { if (!$omb_service) {
common_debug('remotesubscribe.php - failed to find OMB discovery service');
return NULL; return NULL;
} }
common_debug('remotesubscribe.php - looking for OMB discovery XRD');
$xrd = $this->getXRD($omb_service, $xrds); $xrd = $this->getXRD($omb_service, $xrds);
$this->addServices($xrd, $omb_endpoints, $omb);
if (!$xrd) {
common_debug('remotesubscribe.php - failed to find OMB discovery XRD');
return NULL;
}
common_debug('remotesubscribe.php - adding OMB services from XRD');
if (!$this->addServices($xrd, $omb_endpoints, $omb)) {
common_debug('remotesubscribe.php - failed to add OMB services');
return NULL;
}
# XXX: check that we got all the services we needed # XXX: check that we got all the services we needed

3
lib/omb.php
View File

@ -75,6 +75,9 @@ function omb_match_service($service, $type) {
} }
function omb_service_uri($service) { function omb_service_uri($service) {
if (!$service) {
return NULL;
}
$uris = $service->getURIs(); $uris = $service->getURIs();
if (!$uris) { if (!$uris) {
return NULL; return NULL;