Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x

[quix0rs-gnu-social.git] / plugins / Comet / bayeux.class.inc.php

diff --git a/plugins/Comet/bayeux.class.inc.php b/plugins/Comet/bayeux.class.inc.php
index 785d3e3935add458a7e730fdd44be10a06ae6afa..39ad8a8fc6aa15c0d6b130df382f444fbeb9c97e 100644 (file)
--- 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();
     }