From b22fc5b74aecd505d4e2df01258171fc65d312cf Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Mon, 2 Nov 2009 06:56:31 -0800
Subject: Revert "Rebuilt HTTPClient class as an extension of PEAR
 HTTP_Request2 package, adding redirect handling and convenience functions."
 Going to restructure a little more before finalizing this...

This reverts commit fa37967858c3c29000797e510e5f98aca8ab558f.
---
 .../TwitterBridge/daemons/synctwitterfriends.php   |  4 +-
 .../TwitterBridge/daemons/twitterstatusfetcher.php | 45 +++++++++-------------
 2 files changed, 21 insertions(+), 28 deletions(-)

(limited to 'plugins/TwitterBridge/daemons')

diff --git a/plugins/TwitterBridge/daemons/synctwitterfriends.php b/plugins/TwitterBridge/daemons/synctwitterfriends.php
index 671e3c7af..ed2bf48a2 100755
--- a/plugins/TwitterBridge/daemons/synctwitterfriends.php
+++ b/plugins/TwitterBridge/daemons/synctwitterfriends.php
@@ -152,8 +152,8 @@ class SyncTwitterFriendsDaemon extends ParallelizingDaemon
             $friends_ids = $client->friendsIds();
         } catch (Exception $e) {
             common_log(LOG_WARNING, $this->name() .
-                       ' - error getting friend ids: ' .
-                       $e->getMessage());
+                       ' - cURL error getting friend ids ' .
+                       $e->getCode() . ' - ' . $e->getMessage());
             return $friends;
         }
 
diff --git a/plugins/TwitterBridge/daemons/twitterstatusfetcher.php b/plugins/TwitterBridge/daemons/twitterstatusfetcher.php
index 6c91b2860..81bbbc7c5 100755
--- a/plugins/TwitterBridge/daemons/twitterstatusfetcher.php
+++ b/plugins/TwitterBridge/daemons/twitterstatusfetcher.php
@@ -109,16 +109,12 @@ class TwitterStatusFetcher extends ParallelizingDaemon
         $flink->find();
 
         $flinks = array();
-        common_log(LOG_INFO, "hello");
 
         while ($flink->fetch()) {
 
             if (($flink->noticesync & FOREIGN_NOTICE_RECV) ==
                 FOREIGN_NOTICE_RECV) {
                 $flinks[] = clone($flink);
-                common_log(LOG_INFO, "sync: foreign id $flink->foreign_id");
-            } else {
-                common_log(LOG_INFO, "nothing to sync");
             }
         }
 
@@ -519,34 +515,31 @@ class TwitterStatusFetcher extends ParallelizingDaemon
         return $id;
     }
 
-    /**
-     * Fetch a remote avatar image and save to local storage.
-     *
-     * @param string $url avatar source URL
-     * @param string $filename bare local filename for download
-     * @return bool true on success, false on failure
-     */
     function fetchAvatar($url, $filename)
     {
-        common_debug($this->name() . " - Fetching Twitter avatar: $url");
+        $avatarfile = Avatar::path($filename);
 
-        $request = new HTTPClient($url, 'GET', array(
-            'follow_redirects' => true,
-        ));
-        $data = $request->get();
-        if ($data) {
-            $avatarfile = Avatar::path($filename);
-            $ok = file_put_contents($avatarfile, $data);
-            if (!$ok) {
-                common_log(LOG_WARNING, $this->name() .
-                           " - Couldn't open file $filename");
-                return false;
-            }
-        } else {
+        $out = fopen($avatarfile, 'wb');
+        if (!$out) {
+            common_log(LOG_WARNING, $this->name() .
+                       " - Couldn't open file $filename");
             return false;
         }
 
-        return true;
+        common_debug($this->name() . " - Fetching Twitter avatar: $url");
+
+        $ch = curl_init();
+        curl_setopt($ch, CURLOPT_URL, $url);
+        curl_setopt($ch, CURLOPT_FILE, $out);
+        curl_setopt($ch, CURLOPT_BINARYTRANSFER, true);
+        curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
+        curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 0);
+        $result = curl_exec($ch);
+        curl_close($ch);
+
+        fclose($out);
+
+        return $result;
     }
 }
 
-- 
cgit v1.2.3-54-g00ecf