syntax errors from jonhurlock#2 and output buffering fix

output buffering is not required, use the return transfer flag instead
also merged changes from jonhurlock#2 while I was at it to avoid merge conflicts

Author: soulseekah

Oauth.php

@@ -41,19 +41,17 @@ function get_bearer_token(){
 	curl_setopt($ch, CURLOPT_URL,$url);  // set url to send to
 	curl_setopt($ch, CURLOPT_HTTPHEADER, $headers); // set custom headers
 	curl_setopt($ch, CURLOPT_POST, 1); // send as post
+	curl_setopt($ch, CURLOPT_RETURNTRANSFER, true); // return output
 	curl_setopt($ch, CURLOPT_POSTFIELDS, "grant_type=client_credentials"); // post body/fields to be sent
 	$header = curl_setopt($ch, CURLOPT_HEADER, 1); // send custom headers
 	$httpcode = curl_getinfo($ch, CURLINFO_HTTP_CODE);
-	ob_start();  // start ouput buffering
-	curl_exec ($ch); // execute the curl
-	$retrievedhtml = ob_get_contents(); // grab the retreived html
-	ob_end_clean(); //End buffering and clean output 
+	$retrievedhtml = curl_exec ($ch); // execute the curl
 	curl_close($ch); // close the curl
 	$output = explode("\n", $retrievedhtml);
 	$bearer_token = '';
 	foreach($output as $line)
 	{
-		if($pos === false)
+		if($line === false)
 		{
 			// there was no bearer token
 		}else{
@@ -90,13 +88,11 @@ function invalidate_bearer_token($bearer_token){
 	curl_setopt($ch, CURLOPT_URL,$url);  // set url to send to
 	curl_setopt($ch, CURLOPT_HTTPHEADER, $headers); // set custom headers
 	curl_setopt($ch, CURLOPT_POST, 1); // send as post
+	curl_setopt($ch, CURLOPT_RETURNTRANSFER, true); // return output
 	curl_setopt($ch, CURLOPT_POSTFIELDS, "access_token=".$bearer_token.""); // post body/fields to be sent
 	$header = curl_setopt($ch, CURLOPT_HEADER, 1); // send custom headers
 	$httpcode = curl_getinfo($ch, CURLINFO_HTTP_CODE);
-	ob_start();  // start ouput buffering
-	curl_exec ($ch); // execute the curl
-	$retrievedhtml = ob_get_contents(); // grab the retreived html
-	ob_end_clean(); //End buffering and clean output 
+	$retrievedhtml = curl_exec ($ch); // execute the curl
 	curl_close($ch); // close the curl
 	return $retrievedhtml;
 }
@@ -106,14 +102,14 @@ function invalidate_bearer_token($bearer_token){
 * Basic Search of the Search API
 * Based on https://dev.twitter.com/docs/api/1/get/search
 */
-function search_for_a_term($bearer_token, $query, $result_type='mixed' $rpp='15'){
+function search_for_a_term($bearer_token, $query, $result_type='mixed', $rpp='15'){
 	$url = "https://api.twitter.com/1.1/search/tweets.json"; // base url
 	$q = $query; // query term
 
 	$formed_url ='?q='.$q; // fully formed url
 	if($result_type!='mixed'){$formed_url = $formed_url.'&result_type='.$result_type;} // result type - mixed(default), recent, popular
 	if($rpp!='15'){$formed_url = $formed_url.'&rpp='.$rpp;} // results per page - defaulted to 15
-	$formed_url = $formed_url.'&include_entities=true' // makes sure the entities are included, note @mentions are not included see documentation
+	$formed_url = $formed_url.'&include_entities=true'; // makes sure the entities are included, note @mentions are not included see documentation
 	$headers = array( 
 		"GET /1.1/search/tweets.json".$formed_url." HTTP/1.1", 
 		"Host: api.twitter.com", 
@@ -123,10 +119,8 @@ function search_for_a_term($bearer_token, $query, $result_type='mixed' $rpp='15'
 	$ch = curl_init();  // setup a curl
 	curl_setopt($ch, CURLOPT_URL,$url.$formed_url);  // set url to send to
 	curl_setopt($ch, CURLOPT_HTTPHEADER, $headers); // set custom headers
-	ob_start();  // start ouput buffering
-	$output = curl_exec ($ch); // execute the curl
-	$retrievedhtml = ob_get_contents(); // grab the retreived html
-	ob_end_clean(); //End buffering and clean output 
+	curl_setopt($ch, CURLOPT_RETURNTRANSFER, true); // return output
+	$retrievedhtml = curl_exec ($ch); // execute the curl
 	curl_close($ch); // close the curl
 	return $retrievedhtml;
 }
@@ -135,4 +129,4 @@ function search_for_a_term($bearer_token, $query, $result_type='mixed' $rpp='15'
 $bearer_token = get_bearer_token(); // get the bearer token
 print search_for_a_term($bearer_token, "test"); //  search for the work 'test'
 invalidate_bearer_token($bearer_token); // invalidate the token
-?>
+?>