trac750 linked in stylesheets for login and permissions prompt screens

[quix0rs-gnu-social.git] / lib / twitter.php

diff --git a/lib/twitter.php b/lib/twitter.php
index 1212875eab839ccef96b4169d4cbe8456ddb6fb2..5eb15005a6dcfdb50c774c26cf556d1a035886f8 100644 (file)
--- a/lib/twitter.php
+++ b/lib/twitter.php
@@ -19,7 +19,8 @@
 
 if (!defined('LACONICA')) { exit(1); }
 
-function get_twitter_data($uri, $screen_name, $password) {
+function get_twitter_data($uri, $screen_name, $password)
+{
 
     $options = array(
             CURLOPT_USERPWD => sprintf("%s:%s", $screen_name, $password),
@@ -27,9 +28,11 @@ function get_twitter_data($uri, $screen_name, $password) {
             CURLOPT_FAILONERROR        => true,
             CURLOPT_HEADER            => false,
             CURLOPT_FOLLOWLOCATION    => true,
-            // CURLOPT_USERAGENT        => "identi.ca",
+            # CURLOPT_USERAGENT        => "identi.ca",
             CURLOPT_CONNECTTIMEOUT    => 120,
-            CURLOPT_TIMEOUT            => 120
+            CURLOPT_TIMEOUT            => 120,
+            # Twitter is strict about accepting invalid "Expect" headers
+            CURLOPT_HTTPHEADER => array('Expect:')
     );
 
 
@@ -48,7 +51,8 @@ function get_twitter_data($uri, $screen_name, $password) {
     return $data;
 }
 
-function twitter_user_info($screen_name, $password) {
+function twitter_user_info($screen_name, $password)
+{
 
     $uri = "http://twitter.com/users/show/$screen_name.json";
     $data = get_twitter_data($uri, $screen_name, $password);
@@ -66,7 +70,8 @@ function twitter_user_info($screen_name, $password) {
     return $twit_user;
 }
 
-function update_twitter_user($fuser, $twitter_id, $screen_name) {
+function update_twitter_user($fuser, $twitter_id, $screen_name)
+{
 
     $original = clone($fuser);
     $fuser->nickname = $screen_name;
@@ -81,7 +86,8 @@ function update_twitter_user($fuser, $twitter_id, $screen_name) {
     return true;
 }
 
-function add_twitter_user($twitter_id, $screen_name) {
+function add_twitter_user($twitter_id, $screen_name)
+{
 
     // Otherwise, create a new Twitter user
     $fuser = DB_DataObject::factory('foreign_user');
@@ -105,7 +111,8 @@ function add_twitter_user($twitter_id, $screen_name) {
 }
 
 // Creates or Updates a Twitter user
-function save_twitter_user($twitter_id, $screen_name) {
+function save_twitter_user($twitter_id, $screen_name)
+{
 
     // Check to see whether the Twitter user is already in the system,
     // and update its screen name and uri if so.
@@ -129,7 +136,8 @@ function save_twitter_user($twitter_id, $screen_name) {
     return true;
 }
 
-function retreive_twitter_friends($twitter_id, $screen_name, $password) {
+function retreive_twitter_friends($twitter_id, $screen_name, $password)
+{
 
     $uri = "http://twitter.com/statuses/friends/$twitter_id.json?page=";
     $twitter_user = twitter_user_info($screen_name, $password);
@@ -163,7 +171,8 @@ function retreive_twitter_friends($twitter_id, $screen_name, $password) {
     return $friends;
 }
 
-function save_twitter_friends($user, $twitter_id, $screen_name, $password) {
+function save_twitter_friends($user, $twitter_id, $screen_name, $password)
+{
 
     $friends = retreive_twitter_friends($twitter_id, $screen_name, $password);