Index: activitystream_flickr/phpFlickr.php
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/activitystream/activitystream_flickr/phpFlickr.php,v
retrieving revision 1.1
diff -r1.1 phpFlickr.php
90c90,92
<         require_once dirname(__FILE__) . '/PEAR/HTTP/Request.php';
---
>         if ( !class_exists( 'HTTP_Request' ) ) {
>             require_once dirname(__FILE__) . '/PEAR/HTTP/Request.php';
>         }
161,165c163,167
< 				if ($this->php_version[0] > 4 || ($this->php_version[0] == 4 && $this->php_version[1] >= 3)) {
< 					return file_get_contents($file);
< 				} else {
< 					return implode('', file($file));
< 				}
---
>         if ($this->php_version[0] > 4 || ($this->php_version[0] == 4 && $this->php_version[1] >= 3)) {
>           return file_get_contents($file);
>         } else {
>           return implode('', file($file));
>         }
272c274
< 	/*
---
>   /*
276,292c278,294
< 		// Sets which service to connect to.  Currently supported services are
< 		// "flickr" and "23"
< 		if ($service == "23") {
< 			$this->service = "23";
< 			$this->REST = 'http://www.23hq.com/services/rest/';
< 			$this->Upload = 'http://www.23hq.com/services/upload/';
< 			$this->Replace = 'http://www.23hq.com/services/replace/';
< 		} elseif (strtolower($service) == "flickr") {
< 			$this->service = "flickr";
< 			$this->REST = 'http://api.flickr.com/services/rest/';
< 			$this->Upload = 'http://api.flickr.com/services/upload/';
< 			$this->Replace = 'http://api.flickr.com/services/replace/';
< 		} else {
< 			die ("You have entered a service that does not exist or is not supported at this time.");
< 		}
< 		
< 		return false;
---
>     // Sets which service to connect to.  Currently supported services are
>     // "flickr" and "23"
>     if ($service == "23") {
>       $this->service = "23";
>       $this->REST = 'http://www.23hq.com/services/rest/';
>       $this->Upload = 'http://www.23hq.com/services/upload/';
>       $this->Replace = 'http://www.23hq.com/services/replace/';
>     } elseif (strtolower($service) == "flickr") {
>       $this->service = "flickr";
>       $this->REST = 'http://api.flickr.com/services/rest/';
>       $this->Upload = 'http://api.flickr.com/services/upload/';
>       $this->Replace = 'http://api.flickr.com/services/replace/';
>     } else {
>       die ("You have entered a service that does not exist or is not supported at this time.");
>     }
>     
>     return false;
310,312c312,314
< 		// Returns the error code of the last call.  If the last call did not
< 		// return an error. This will return a false boolean.
< 		return $this->error_code;
---
>     // Returns the error code of the last call.  If the last call did not
>     // return an error. This will return a false boolean.
>     return $this->error_code;
317,319c319,321
< 		// Returns the error message of the last call.  If the last call did not
< 		// return an error. This will return a false boolean.
< 		return $this->error_msg;
---
>     // Returns the error message of the last call.  If the last call did not
>     // return an error. This will return a false boolean.
>     return $this->error_msg;
329,332c331,334
< 		if ($this->service == "23") {
< 			$url = "http://www.23hq.com/";
< 		} else {
< 			$url = "http://static.flickr.com/";
---
>     if ($this->service == "23") {
>       $url = "http://www.23hq.com/";
>     } else {
>       $url = "http://static.flickr.com/";
587,591c589,593
< 			if ($this->service == "23") {
< 				header("Location: http://www.23hq.com/services/auth/?api_key=" . $this->api_key . "&extra=" . $redirect . "&perms=" . $perms . "&api_sig=". $api_sig);
< 			} else {
< 				header("Location: http://www.flickr.com/services/auth/?api_key=" . $this->api_key . "&extra=" . $redirect . "&perms=" . $perms . "&api_sig=". $api_sig);
< 			}
---
>       if ($this->service == "23") {
>         header("Location: http://www.23hq.com/services/auth/?api_key=" . $this->api_key . "&extra=" . $redirect . "&perms=" . $perms . "&api_sig=". $api_sig);
>       } else {
>         header("Location: http://www.flickr.com/services/auth/?api_key=" . $this->api_key . "&extra=" . $redirect . "&perms=" . $perms . "&api_sig=". $api_sig);
>       }
737,740c739,742
< 	function groups_search ($text, $per_page=NULL, $page=NULL)
< 	{
< 		/* http://www.flickr.com/services/api/flickr.groups.search.html */
< 		$this->request("flickr.groups.search", array("text"=>$text,"per_page"=>$per_page,"page"=>$page));
---
>   function groups_search ($text, $per_page=NULL, $page=NULL)
>   {
>     /* http://www.flickr.com/services/api/flickr.groups.search.html */
>     $this->request("flickr.groups.search", array("text"=>$text,"per_page"=>$per_page,"page"=>$page));
742c744
< 	}
---
>   }
768c770
< 		/* http://www.flickr.com/services/api/flickr.groups.pools.getPhotos.html */
---
>     /* http://www.flickr.com/services/api/flickr.groups.pools.getPhotos.html */
784,785c786,787
< 	function interestingness_getList($date = NULL, $extras = NULL, $per_page = NULL, $page = NULL) 
< 	{
---
>   function interestingness_getList($date = NULL, $extras = NULL, $per_page = NULL, $page = NULL) 
>   {