Merge pull request #95 from zupert/master

Fixed some variable declarations and exception messages

modules/aselect/lib/Auth/Source/aselect.php

@@ -150,7 +150,7 @@ class sspmod_aselect_Auth_Source_aselect extends SimpleSAML_Auth_Source {
 		curl_close($curl);
 
 		if($str === false)
-			throw new SimpleSAML_Error_Exception("Unable to retrieve URL: $error");
+			throw new SimpleSAML_Error_Exception("Unable to retrieve URL: $err");
 
 		parse_str($str, $res);
 

modules/oauth/lib/Consumer.php

@@ -78,7 +78,7 @@ class sspmod_oauth_Consumer {
 		parse_str($response_req, $responseParsed);
 		
 		if(array_key_exists('error', $responseParsed))
-			throw new Exception('Error getting request token: ') . $responseParsed['error'];
+			throw new Exception('Error getting request token: ' . $responseParsed['error']);
 			
 		$requestToken = $responseParsed['oauth_token'];
 		$requestTokenSecret = $responseParsed['oauth_token_secret'];
@@ -114,7 +114,7 @@ class sspmod_oauth_Consumer {
 		parse_str($response_acc, $accessResponseParsed);
 		
 		if(array_key_exists('error', $accessResponseParsed))
-			throw new Exception('Error getting request token: ') . $accessResponseParsed['error'];
+			throw new Exception('Error getting request token: ' . $accessResponseParsed['error']);
 		
 		$accessToken = $accessResponseParsed['oauth_token'];
 		$accessTokenSecret = $accessResponseParsed['oauth_token_secret'];
@@ -144,7 +144,7 @@ class sspmod_oauth_Consumer {
 		$context = stream_context_create($opts);
 		$response = file_get_contents($url, FALSE, $context);
 		if ($response === FALSE) {
-			throw new SimpleSAML_Error_Exception('Failed to push definition file to ' . $pushURL);
+			throw new SimpleSAML_Error_Exception('Failed to push definition file to ' . $url);
 		}
 		return $response;
 	}