GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Revert "Rebuilt HTTPClient class as an extension of PEAR HTTP_Request2 package, adding redirect handling and convenience functions."

Browse Source 
Going to restructure a little more before finalizing this...

This reverts commit fa37967858.
This commit is contained in:
Brion Vibber
2009-11-02 06:56:31 -08:00
parent d8e2d76ba9
commit b22fc5b74a
29 changed files with 672 additions and 4244 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
scripts/enjitqueuehandler.php
View File

@@ -46,8 +46,8 @@ class EnjitQueueHandler extends QueueHandler
function start()
{
$this->log(LOG_INFO, "Starting EnjitQueueHandler");
$this->log(LOG_INFO, "Broadcasting to ".common_config('enjit', 'apiurl'));
$this->log(LOG_INFO, "Starting EnjitQueueHandler");
$this->log(LOG_INFO, "Broadcasting to ".common_config('enjit', 'apiurl'));
return true;
}
@@ -56,16 +56,16 @@ class EnjitQueueHandler extends QueueHandler
$profile = Profile::staticGet($notice->profile_id);
$this->log(LOG_INFO, "Posting Notice ".$notice->id." from ".$profile->nickname);
$this->log(LOG_INFO, "Posting Notice ".$notice->id." from ".$profile->nickname);
if ( ! $notice->is_local ) {
$this->log(LOG_INFO, "Skipping remote notice");
return "skipped";
}
if ( ! $notice->is_local ) {
$this->log(LOG_INFO, "Skipping remote notice");
return "skipped";
}
#
# Build an Atom message from the notice
#
#
# Build an Atom message from the notice
#
$noticeurl = common_local_url('shownotice', array('notice' => $notice->id));
$msg = $profile->nickname . ': ' . $notice->content;
@@ -86,20 +86,36 @@ class EnjitQueueHandler extends QueueHandler
$atom .= "<updated>".common_date_w3dtf($notice->modified)."</updated>\n";
$atom .= "</entry>\n";
$url = common_config('enjit', 'apiurl') . "/submit/". common_config('enjit','apikey');
$data = array(
'msg' => $atom,
);
$url = common_config('enjit', 'apiurl') . "/submit/". common_config('enjit','apikey');
$data = "msg=$atom";
#
# POST the message to $config['enjit']['apiurl']
#
$request = new HTTPClient($url, HTTP_Request2::METHOD_POST);
$request->addPostFields($data);
$response = $request->send();
// @fixme handle_notice() is supposed to return true/false. Somethin' funky?
return $response->getStatus();
#
# POST the message to $config['enjit']['apiurl']
#
$ch = curl_init();
curl_setopt($ch, CURLOPT_URL, $url);
curl_setopt($ch, CURLOPT_HEADER, 1);
curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
curl_setopt($ch, CURLOPT_POST, 1) ;
curl_setopt($ch, CURLOPT_POSTFIELDS, $data);
# SSL and Debugging options
#
# curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, 0);
# curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 0);
# curl_setopt($ch, CURLOPT_VERBOSE, 1);
$result = curl_exec($ch);
$code = curl_getinfo($ch, CURLINFO_HTTP_CODE );
$this->log(LOG_INFO, "Response Code: $code");
curl_close($ch);
return $code;
}
}