summaryrefslogtreecommitdiff
path: root/plugins/Comet
diff options
context:
space:
mode:
authorEvan Prodromou <evan@controlyourself.ca>2009-05-01 09:42:38 -0700
committerEvan Prodromou <evan@controlyourself.ca>2009-05-01 09:42:38 -0700
commitb12e72ae312488caf7cb1e1a396eb05dd38326a9 (patch)
treed6fc83a33ffa3701d43a2306af9d6ab55b3b6eaf /plugins/Comet
parent5affe093aba97a0e4ac559b685a240d568929ffb (diff)
optionally add a username/password on server side for Comet
Diffstat (limited to 'plugins/Comet')
-rw-r--r--plugins/Comet/CometPlugin.php8
-rw-r--r--plugins/Comet/bayeux.class.inc.php9
2 files changed, 13 insertions, 4 deletions
diff --git a/plugins/Comet/CometPlugin.php b/plugins/Comet/CometPlugin.php
index 0f2fcd701..45251c66f 100644
--- a/plugins/Comet/CometPlugin.php
+++ b/plugins/Comet/CometPlugin.php
@@ -45,9 +45,11 @@ class CometPlugin extends Plugin
{
var $server = null;
- function __construct($server=null)
+ function __construct($server=null, $username=null, $password=null)
{
- $this->server = $server;
+ $this->server = $server;
+ $this->username = $username;
+ $this->password = $password;
parent::__construct();
}
@@ -131,7 +133,7 @@ class CometPlugin extends Plugin
$json = $this->noticeAsJson($notice);
// Bayeux? Comet? Huh? These terms confuse me
- $bay = new Bayeux($this->server);
+ $bay = new Bayeux($this->server, $this->user, $this->password);
foreach ($timelines as $timeline) {
$this->log(LOG_INFO, "Posting notice $notice->id to '$timeline'.");
diff --git a/plugins/Comet/bayeux.class.inc.php b/plugins/Comet/bayeux.class.inc.php
index 785d3e393..39ad8a8fc 100644
--- a/plugins/Comet/bayeux.class.inc.php
+++ b/plugins/Comet/bayeux.class.inc.php
@@ -26,9 +26,12 @@ class Bayeux
private $oCurl = '';
private $nNextId = 0;
+ private $sUser = '';
+ private $sPassword = '';
+
public $sUrl = '';
- function __construct($sUrl)
+ function __construct($sUrl, $sUser='', $sPassword='')
{
$this->sUrl = $sUrl;
@@ -43,6 +46,10 @@ class Bayeux
curl_setopt($this->oCurl, CURLOPT_POST, 1);
curl_setopt($this->oCurl, CURLOPT_RETURNTRANSFER,1);
+ if (!is_null($sUser) && mb_strlen($sUser) > 0) {
+ curl_setopt($this->oCurl, CURLOPT_USERPWD,"$sUser:$sPassword");
+ }
+
$this->handShake();
}