CHECK CHANGELOG 2.1.1

hybridauth · Dec 29, 2012 · 74ccef2 · 74ccef2
1 parent afee09d
commit 74ccef2
Show file tree

Hide file tree

Showing 13 changed files with 237 additions and 110 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,15 +1,28 @@
 Hybridauth Change log
 =====================
 
+2.1.1 - 29 dec 2012 
+	Remove OAuth PECL conflict with OAuth PHP Library (https://github.com/hybridauth/hybridauth/issues/59)
+	Update Facebook PHP SDK (v.3.2.2) (https://github.com/hybridauth/hybridauth/pull/70)
+	Minor change to fix getCurrentUrl() (https://github.com/hybridauth/hybridauth/issues/63)
+	Fix misspellings of "authentication" and "valid"; me english bad ; (https://github.com/hybridauth/hybridauth/pull/73) 
+	Minor change to remove PHP Notices (https://github.com/hybridauth/hybridauth/pull/71;https://github.com/hybridauth/hybridauth/pull/48;https://github.com/hybridauth/hybridauth/pull/62) 
+	Composer Require CURL (https://github.com/hybridauth/hybridauth/pull/57) 
+	Proper handling of LinkedIn user profiles with no telephone numbers (https://github.com/hybridauth/hybridauth/pull/53) 
+	Allow restricting google provider to specific domain (https://github.com/hybridauth/hybridauth/pull/64) 
+	Update Windows Live endpoint URLs (https://github.com/hybridauth/hybridauth/pull/64;http://msdn.microsoft.com/en-us/library/live/hh243647.aspx) 
+	...
+
+
+
 2.1.0 - 04 aug 2012 
 	Yahoo! provider adapter is now based on OAuth1 protocol (by Lukasz Koprowski)
 	Windows Live provider adapter is now based on OAuth2 protocol (by Lukasz Koprowski)
 	Yahoo! and Google openid based are now part of the "additional providers package"
 	Add proxy config for providers API (by fedetorre)
 	Fix Hybrid_Providers_Google::getUserContacts()
 	Fix Twitter user's profile url
-	Fix the user profile url on Hybrid_Providers_Facebook::getUserActivity()
-	...
+	Fix the user profile url on Hybrid_Providers_Facebook::getUserActivity() 
 
 
 

diff --git a/README.html b/README.html
@@ -63,7 +63,7 @@
 <body>
 
 <div id="container">
-	<h1>Welcome to Hybridauth Library <small>2.1.0-dev</small></h1>
+	<h1>Welcome to Hybridauth Library <small>2.1.1-dev</small></h1>
 
 	<div id="body">
 		<p>

diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# HybridAuth 2.1.0-dev
+# HybridAuth 2.1.1-dev
 
 HybridAuth enables developers to easily build social applications and tools 
 to engage websites vistors and customers on a social level by implementing 

diff --git a/examples/index.html b/examples/index.html
@@ -131,70 +131,158 @@ <h3>Available examples and demos</h3>
 
 		<h3>Third-party Plugins</h3> 
 		<p>
-			Plugins and Addons available for serval CMS platforms using HybridAuth Library :
+			Plugins and Addons available for serval CMS platforms and PHP frameworks using HybridAuth Library. The open source plugins and addons are contributed by members of the community.
 		</p>
 		<center>
-		<table width="85%" border="0" cellspacing="10"  style="border: 1px solid #DDDDDD;">
-			<tbody>  
-				<tr> 
-					<td align="center" width="50"><img src="http://hybridauth.sourceforge.net/imgs/wordpress.png" style="border:0; margin0; padding:0;" /></td> 
-					<td width="120"><b>WordPress</b></td>  
-					<td>WordPress Social Login</td>
-					<td align="center" width="80"><span class="label success">Open Source</span></td>
-					<td align="center" width="80"><a target="_blank" href="http://wordpress.org/extend/plugins/wordpress-social-login/" class="btn">Download</a></td>
-				</tr> 
-				<tr> 
-					<td align="center"><img src="http://hybridauth.sourceforge.net/imgs/elgg.png" style="border:0; margin0; padding:0;" /></td> 
-					<td><b>Elgg</b></td>  
-					<td>Social Login for Elgg 1.8</td>
-					<td align="center"><span class="label success">Open Source</span></td>
-					<td align="center"><a target="_blank" href="http://community.elgg.org/pg/plugins/project/822077/developer/miled/social-login-for-elgg-18" class="btn">Download</a></td>
-				</tr> 
-				<tr> 
-					<td align="center"><img src="http://hybridauth.sourceforge.net/imgs/drupal.png" style="border:0; margin0; padding:0;" /></td> 
-					<td><b>Drupal</b></td>  
-					<td>HybridAuth Social Sign-on</td>
-					<td align="center"><span class="label success">Open Source</span></td>
-					<td align="center"><a target="_blank" href="http://drupal.org/project/hybridauth" class="btn">Download</a></td>
-				</tr> 
-				<tr> 
-					<td align="center"><img src="http://hybridauth.sourceforge.net/imgs/opencart.png" style="border:0; margin0; padding:0;" /></td> 
-					<td><b>Opencart</b></td>  
-					<td>Third-Party Login / Sing in</td>
-					<td align="center"><span class="label important">Commercial</span></td>
-					<td align="center"><a target="_blank" href="http://www.opencart.com/index.php?route=extension/extension/info&extension_id=4131" class="btn">Download</a></td>
-				</tr> 
-				<tr> 
-					<td align="center"><img src="http://hybridauth.sourceforge.net/imgs/c5.png" style="border:0; margin0; padding:0;" /></td>  
-					<td><b>Concrete5</b></td>  
-					<td>Social Package</td>
-					<td><span class="label success">Open Source</span></td>
-					<td align="center"><a target="_blank" href="https://github.com/spadin/social" class="btn">Download</a></td>
-				</tr> 
-				<tr> 
-					<td align="center"><img src="http://hybridauth.sourceforge.net/imgs/c5.png" style="border:0; margin0; padding:0;" /></td>  
-					<td><b>Concrete5</b></td> 
-					<td>Social Login</td>							
-					<td align="center"><span class="label important">Commercial</span></td>							
-					<td align="center"><a target="_blank" href="http://www.concrete5.org/marketplace/addons/social-login/" class="btn">Download</a></td>
-				</tr> 
-				<tr> 
-					<td align="center"><img src="http://hybridauth.sourceforge.net/imgs/ee.png" style="border:0; margin0; padding:0;" /></td> 
-					<td><b>Expression Engine</b></td>  
-					<td>Social Sign On</td>  
-					<td align="center"><span class="label important">Commercial</span></td>  
-					<td align="center"><a target="_blank" href="http://devot-ee.com/add-ons/social-sign-on" class="btn">Download</a></td>
-				</tr>  
-				<tr> 
-					<td align="center"><img src="http://hybridauth.sourceforge.net/imgs/cakephp.png" style="border:0; margin0; padding:0;" /></td> 
-					<td><b>CakePHP</b></td>  
-					<td>HybridAuth Library Integration</td>  
-					<td><span class="label success">Open Source</span></td>
-					<td align="center"><a target="_blank" href="http://hybridauth.sourceforge.net/donwloads/CakePHP-HybridAuth.zip" class="btn">Download</a></td>
-				</tr>  
-			</tbody> 
-		</table>   
-
+		<table width="85%" border="0" cellspacing="10"  style="border: 1px solid #DDDDDD;"> 
+					<tbody>   
+						<tr> 
+							<td align="center" width="50"><img src="http://hybridauth.sourceforge.net/imgs/codeigniter.png" style="border:0; margin0; padding:0;" /></td> 
+							<td width="120"><b>CodeIgniter</b></td>  
+							<td>CodeIgniter HybridAuth Library Integration</td>  
+							<td align="center" width="80"><span class="label success">Open Source</span></td>
+							<td align="center" width="80"><a target="_blank" href="https://github.com/andacata/HybridIgniter" class="btn">Download</a></td>
+						</tr>  
+						<tr> 
+							<td align="center"><img src="http://hybridauth.sourceforge.net/imgs/cakephp.png" style="border:0; margin0; padding:0;" /></td> 
+							<td><b>CakePHP</b></td>  
+							<td>CakePHP HybridAuth Library Integration</td>  
+							<td><span class="label success">Open Source</span></td>
+							<td align="center"><a target="_blank" href="http://hybridauth.sourceforge.net/donwloads/CakePHP-HybridAuth.zip" class="btn">Download</a></td>
+						</tr>  
+						<tr> 
+							<td align="center"><img src="http://hybridauth.sourceforge.net/imgs/zf.png" style="border:0; margin0; padding:0;" /></td> 
+							<td><b>Zend Framework 2</b></td>  
+							<td>ZF2 HybridAuth Library Integration</td>  
+							<td><span class="label success">Open Source</span></td>
+							<td align="center"><a target="_blank" href="https://github.com/SocalNick/ScnSocialAuth" class="btn">Download</a></td>
+						</tr>   
+						<tr> 
+							<td align="center"><img src="http://hybridauth.sourceforge.net/imgs/symfony.png" style="border:0; margin0; padding:0;" /></td> 
+							<td><b>Symfony2</b></td>  
+							<td>Bundle for connecton via HybridAuth library</td>  
+							<td><span class="label success">Open Source</span></td>
+							<td align="center"><a target="_blank" href="https://github.com/Soullivaneuh/SLLHHybridAuthBundle" class="btn">Download</a></td>
+						</tr>   
+						<tr> 
+							<td align="center"><img src="http://hybridauth.sourceforge.net/imgs/yii.png" style="border:0; margin0; padding:0;" /></td> 
+							<td><b>YII</b></td>  
+							<td>Yii Implementation of HybridAuth for social (Facebook, Yahoo etc) logins</td>
+							<td align="center"><span class="label success">Open Source</span></td>
+							<td align="center"><a target="_blank" href="http://www.yiiframework.com/extension/hybridauth/" class="btn">Download</a></td>
+						</tr>  
+						<tr> 
+							<td align="center"><img src="http://hybridauth.sourceforge.net/imgs/yii.png" style="border:0; margin0; padding:0;" /></td> 
+							<td><b>YII</b></td>  
+							<td>Yiiauth, A hybridauth module for the Yii php framework</td>
+							<td align="center"><span class="label success">Open Source</span></td>
+							<td align="center"><a target="_blank" href="http://www.yiiframework.com/extension/yiiauth/" class="btn">Download</a></td>
+						</tr> 
+					</tbody> 
+				</table>  
+				<br />
+		<table width="85%" border="0" cellspacing="10"  style="border: 1px solid #DDDDDD;"> 
+					<tbody>  
+						<tr> 
+							<td align="center" width="50"><img src="http://hybridauth.sourceforge.net/imgs/wordpress.png" style="border:0; margin0; padding:0;" /></td> 
+							<td width="120"><b>WordPress</b></td>  
+							<td>WordPress Social Login</td>
+							<td align="center" width="80"><span class="label success">Open Source</span></td>
+							<td align="center" width="80"><a target="_blank" href="http://wordpress.org/extend/plugins/wordpress-social-login/" class="btn">Download</a></td>
+						</tr> 
+						<tr> 
+							<td align="center" width="50"><img src="http://hybridauth.sourceforge.net/imgs/wordpress.png" style="border:0; margin0; padding:0;" /></td> 
+							<td width="120"><b>WordPress</b></td>  
+							<td>SocialAuth-WP</td>
+							<td align="center" width="80"><span class="label success">Open Source</span></td>
+							<td align="center" width="80"><a target="_blank" href="http://wordpress.org/extend/plugins/socialauth-wp/" class="btn">Download</a></td>
+						</tr> 
+						<tr> 
+							<td align="center"><img src="http://hybridauth.sourceforge.net/imgs/elgg.png" style="border:0; margin0; padding:0;" /></td> 
+							<td><b>Elgg</b></td>  
+							<td>Social Connect for Elgg 1.8</td>
+							<td align="center"><span class="label success">Open Source</span></td>
+							<td align="center"><a target="_blank" href="http://community.elgg.org/plugins/1116977/1.0/social-connect" class="btn">Download</a></td>
+						</tr> 
+						<tr> 
+							<td align="center"><img src="http://hybridauth.sourceforge.net/imgs/elgg.png" style="border:0; margin0; padding:0;" /></td> 
+							<td><b>Elgg</b></td>  
+							<td>Social Login for Elgg 1.8</td>
+							<td align="center"><span class="label success">Open Source</span></td>
+							<td align="center"><a target="_blank" href="http://community.elgg.org/pg/plugins/project/822077/developer/miled/social-login-for-elgg-18" class="btn">Download</a></td>
+						</tr> 
+						<tr> 
+							<td align="center"><img src="http://hybridauth.sourceforge.net/imgs/drupal.png" style="border:0; margin0; padding:0;" /></td> 
+							<td><b>Drupal</b></td>  
+							<td>HybridAuth Social Sign-on</td>
+							<td align="center"><span class="label success">Open Source</span></td>
+							<td align="center"><a target="_blank" href="http://drupal.org/project/hybridauth" class="btn">Download</a></td>
+						</tr>  
+						<tr> 
+							<td align="center"><img src="http://hybridauth.sourceforge.net/imgs/opencart.png" style="border:0; margin0; padding:0;" /></td> 
+							<td><b>Opencart</b></td>  
+							<td>Third-Party Login / Sing in</td>
+							<td align="center"><span class="label important">Commercial</span></td>
+							<td align="center"><a target="_blank" href="http://www.opencart.com/index.php?route=extension/extension/info&extension_id=4131" class="btn">Download</a></td>
+						</tr> 
+						<tr> 
+							<td align="center"><img src="http://hybridauth.sourceforge.net/imgs/joomla.png" style="border:0; margin0; padding:0;" /></td>  
+							<td><b>Joomla</b></td>  
+							<td>HybridAuth Extension</td>
+							<td align="center"><span class="label important">Commercial</span></td>			
+							<td align="center"><a target="_blank" href="https://extensions.joomla.org/extensions/access-a-security/site-access/authentication-cloud-based/21006" class="btn">Download</a></td>
+						</tr> 
+						<tr> 
+							<td align="center"><img src="http://hybridauth.sourceforge.net/imgs/c5.png" style="border:0; margin0; padding:0;" /></td>  
+							<td><b>Concrete5</b></td>  
+							<td>Social Package</td>
+							<td><span class="label success">Open Source</span></td>
+							<td align="center"><a target="_blank" href="https://github.com/spadin/social" class="btn">Download</a></td>
+						</tr> 
+						<tr> 
+							<td align="center"><img src="http://hybridauth.sourceforge.net/imgs/c5.png" style="border:0; margin0; padding:0;" /></td>  
+							<td><b>Concrete5</b></td> 
+							<td>Social Login</td>							
+							<td align="center"><span class="label important">Commercial</span></td>							
+							<td align="center"><a target="_blank" href="http://www.concrete5.org/marketplace/addons/social-login/" class="btn">Download</a></td>
+						</tr> 
+						<tr> 
+							<td align="center"><img src="http://hybridauth.sourceforge.net/imgs/ee.png" style="border:0; margin0; padding:0;" /></td> 
+							<td><b>Expression Engine</b></td>  
+							<td>Social Sign On</td>  
+							<td align="center"><span class="label important">Commercial</span></td>  
+							<td align="center"><a target="_blank" href="http://devot-ee.com/add-ons/social-sign-on" class="btn">Download</a></td>
+						</tr>  
+						<tr> 
+							<td align="center"><img src="http://hybridauth.sourceforge.net/imgs/babygekko.png" style="border:0; margin0; padding:0;" /></td> 
+							<td><b>BabyGekko</b></td>  
+							<td>OpenUsers Plugin</td>  
+							<td><span class="label success">FREE</span></td>
+							<td align="center"><a target="_blank" href="http://www.babygekko.com/site/extensions/administration/openusers_facebook_google_yahoo_live_linkedin_.html" class="btn">Download</a></td>
+						</tr>  
+						<tr> 
+							<td align="center"><img src="http://hybridauth.sourceforge.net/imgs/eccube.jpeg" style="border:0; margin0; padding:0;" /></td> 
+							<td><b>EC-Cube</b></td>  
+							<td>Social Login</td>  
+							<td><span class="label success">Open Source</span></td>
+							<td align="center"><a target="_blank" href="https://www.ec-cube.net/products/detail.php?product_id=416" class="btn">Download</a></td>
+						</tr>  
+						<tr> 
+							<td align="center"><img src="http://hybridauth.sourceforge.net/imgs/modx.jpg" style="border:0; margin0; padding:0;" /></td> 
+							<td><b>MODX</b></td>  
+							<td>HybridAuth</td>  
+							<td><span class="label success">Open Source</span></td>
+							<td align="center"><a target="_blank" href="http://modx.com/extras/package/hybridauth" class="btn">Download</a></td>
+						</tr>  
+						<tr> 
+							<td align="center"><img src="http://hybridauth.sourceforge.net/imgs/cotonti.png" style="border:0; margin0; padding:0;" /></td> 
+							<td><b>Cotonti</b></td>  
+							<td>HybridAuth Extension</td>  
+							<td><span class="label success">Open Source</span></td>
+							<td align="center"><a target="_blank" href="http://www.cotonti.com/extensions/security-authentication/hybridauth" class="btn">Download</a></td>
+						</tr>  
+					</tbody> 
+				</table> 
 		</center> 
 
 		<hr />

diff --git a/hybridauth/Hybrid/Auth.php b/hybridauth/Hybrid/Auth.php
@@ -14,7 +14,7 @@
  */
 class Hybrid_Auth 
 {
-	public static $version = "2.1.0-dev";
+	public static $version = "2.1.1-dev";
 
 	public static $config  = array();
 
@@ -111,13 +111,7 @@ public static function initialize( $config )
 		if ( ! function_exists('json_decode') ) {
 			Hybrid_Logger::error('Hybridauth Library needs the JSON PHP extension.');
 			throw new Exception('Hybridauth Library needs the JSON PHP extension.');
-		}
-
-		// OAuth PECL extension is not compatible with this library
-		if( extension_loaded('oauth') ) {
-			Hybrid_Logger::error('Hybridauth Library not compatible with installed PECL OAuth extension. Please disable it.');
-			throw new Exception('Hybridauth Library not compatible with installed PECL OAuth extension. Please disable it.');
-		}
+		} 
 
 		// session.name
 		if( session_name() != "PHPSESSID" ){
@@ -389,7 +383,7 @@ public static function getCurrentUrl( $request_uri = true )
 			$protocol = 'http://';
 		}
 
-		$url = $protocol . $_SERVER['SERVER_NAME'];
+		$url = $protocol . $_SERVER['HTTP_HOST'];
 
 		// use port if non default
 		$url .= 

diff --git a/hybridauth/Hybrid/Providers/LinkedIn.php b/hybridauth/Hybrid/Providers/LinkedIn.php
diff --git a/hybridauth/Hybrid/Providers/Live.php b/hybridauth/Hybrid/Providers/Live.php
@@ -46,7 +46,7 @@ function getUserProfile()
 		$data = $this->api->get( "me" ); 
 
 		if ( ! isset( $data->id ) ){
-			throw new Exception( "User profile request failed! {$this->providerId} returned an invalid response.", 6 );
+			throw new Exception( "User profile request failed! {$this->providerId} returned an invalide response.", 6 );
 		}
 
 		$this->user->profile->identifier    = (property_exists($data,'id'))?$data->id:"";

diff --git a/hybridauth/Hybrid/resources/config.php.tpl b/hybridauth/Hybrid/resources/config.php.tpl
@@ -25,7 +25,7 @@ return
 
 			"Yahoo" => array ( 
 				"enabled" => #YAHOO_ADAPTER_STATUS#,
-				"keys"    => array ( "key" => "#YAHOO_APPLICATION_KEY#", "secret" => "#YAHOO_APPLICATION_SECRET#" )
+				"keys"    => array ( "id" => "#YAHOO_APPLICATION_APP_ID#", "secret" => "#YAHOO_APPLICATION_SECRET#" )
 			),
 
 			"Google" => array ( 

diff --git a/hybridauth/Hybrid/thirdparty/LinkedIn/LinkedIn.php b/hybridauth/Hybrid/thirdparty/LinkedIn/LinkedIn.php
@@ -2637,5 +2637,3 @@ public static function xmlToArray($xml) {
     return $return_data;
   }
 }
-
-?>