diff --git a/e107_handlers/hybridauth/Hybrid/Auth.php b/e107_handlers/hybridauth/Hybrid/Auth.php
index b62238694..a388ccfb4 100644
--- a/e107_handlers/hybridauth/Hybrid/Auth.php
+++ b/e107_handlers/hybridauth/Hybrid/Auth.php
@@ -1,67 +1,84 @@
 <?php
+
 /**
-* HybridAuth
-* http://hybridauth.sourceforge.net | http://github.com/hybridauth/hybridauth
-* (c) 2009-2014, HybridAuth authors | http://hybridauth.sourceforge.net/licenses.html
-*/
+ * HybridAuth
+ * http://hybridauth.sourceforge.net | http://github.com/hybridauth/hybridauth
+ * (c) 2009-2015, HybridAuth authors | http://hybridauth.sourceforge.net/licenses.html
+ */
 
 /**
  * Hybrid_Auth class
- * 
+ *
  * Hybrid_Auth class provide a simple way to authenticate users via OpenID and OAuth.
- * 
+ *
  * Generally, Hybrid_Auth is the only class you should instanciate and use throughout your application.
  */
-class Hybrid_Auth 
-{
-	public static $version = "2.3.0";
+class Hybrid_Auth {
 
-	public static $config  = array();
-
-	public static $store   = NULL;
-
-	public static $error   = NULL;
-
-	public static $logger  = NULL;
-
-	// --------------------------------------------------------------------
+	public static $version = "2.6.0";
 
 	/**
-	* Try to start a new session of none then initialize Hybrid_Auth
-	* 
-	* Hybrid_Auth constructor will require either a valid config array or
-	* a path for a configuration file as parameter. To know more please 
-	* refer to the Configuration section:
-	* http://hybridauth.sourceforge.net/userguide/Configuration.html
-	*/
-	function __construct( $config )
-	{ 
-		Hybrid_Auth::initialize( $config ); 
+	 * Configuration array
+	 * @var array
+	 */
+	public static $config = array();
+
+	/**
+	 * Auth cache
+	 * @var Hybrid_Storage
+	 */
+	public static $store = null;
+
+	/**
+	 * Error pool
+	 * @var Hybrid_Error
+	 */
+	public static $error = null;
+
+	/**
+	 * Logger
+	 * @var Hybrid_Logger
+	 */
+	public static $logger = null;
+
+	/**
+	 * Try to start a new session of none then initialize Hybrid_Auth
+	 *
+	 * Hybrid_Auth constructor will require either a valid config array or
+	 * a path for a configuration file as parameter. To know more please
+	 * refer to the Configuration section:
+	 * http://hybridauth.sourceforge.net/userguide/Configuration.html
+	 *
+	 * @param array $config Configuration array or path to a configratuion file
+	 */
+	function __construct($config) {
+		Hybrid_Auth::initialize($config);
 	}
 
-	// --------------------------------------------------------------------
-
 	/**
-	* Try to initialize Hybrid_Auth with given $config hash or file
-	*/
-	public static function initialize( $config )
-	{
-		if( ! is_array( $config ) && ! file_exists( $config ) ){
-			throw new Exception( "Hybriauth config does not exist on the given path.", 1 );
+	 * Try to initialize Hybrid_Auth with given $config hash or file
+	 *
+	 * @param array $config Configuration array or path to a configratuion file
+	 * @return void
+	 * @throws Exception
+	 */
+	public static function initialize($config) {
+		if (!is_array($config) && !file_exists($config)) {
+			throw new Exception("Hybriauth config does not exist on the given path.", 1);
 		}
 
-		if( ! is_array( $config ) ){
+		if (!is_array($config)) {
 			$config = include $config;
 		}
 
 		// build some need'd paths
-		$config["path_base"]        = realpath( dirname( __FILE__ ) )  . "/"; 
-		$config["path_libraries"]   = $config["path_base"] . "thirdparty/";
-		$config["path_resources"]   = $config["path_base"] . "resources/";
-		$config["path_providers"]   = $config["path_base"] . "Providers/";
+		$config["path_base"] = realpath(dirname(__FILE__)) . "/";
+		$config["path_libraries"] = $config["path_base"] . "thirdparty/";
+		$config["path_resources"] = $config["path_base"] . "resources/";
+		$config["path_providers"] = $config["path_base"] . "Providers/";
 
 		// reset debug mode
-		if( ! isset( $config["debug_mode"] ) ){
+		if (!isset($config["debug_mode"])) {
 			$config["debug_mode"] = false;
 			$config["debug_file"] = null;
 		}
@@ -83,9 +100,9 @@ class Hybrid_Auth
 		require_once $config["path_base"] . "User_Contact.php";
 		require_once $config["path_base"] . "User_Activity.php";
 
-		if ( ! class_exists("Hybrid_Storage", false) ){
+		if (!class_exists("Hybrid_Storage", false)) {
 			require_once $config["path_base"] . "Storage.php";
-        	}
+		}
 
 		// hash given config
 		Hybrid_Auth::$config = $config;
@@ -99,203 +116,187 @@ class Hybrid_Auth
 		// start session storage mng
 		Hybrid_Auth::$store = new Hybrid_Storage();
 
-		Hybrid_Logger::info( "Enter Hybrid_Auth::initialize()"); 
-		Hybrid_Logger::info( "Hybrid_Auth::initialize(). PHP version: " . PHP_VERSION ); 
-		Hybrid_Logger::info( "Hybrid_Auth::initialize(). Hybrid_Auth version: " . Hybrid_Auth::$version ); 
-		Hybrid_Logger::info( "Hybrid_Auth::initialize(). Hybrid_Auth called from: " . Hybrid_Auth::getCurrentUrl() ); 
+		Hybrid_Logger::info("Enter Hybrid_Auth::initialize()");
+		Hybrid_Logger::info("Hybrid_Auth::initialize(). PHP version: " . PHP_VERSION);
+		Hybrid_Logger::info("Hybrid_Auth::initialize(). Hybrid_Auth version: " . Hybrid_Auth::$version);
+		Hybrid_Logger::info("Hybrid_Auth::initialize(). Hybrid_Auth called from: " . Hybrid_Auth::getCurrentUrl());
 
 		// PHP Curl extension [http://www.php.net/manual/en/intro.curl.php]
-		if ( ! function_exists('curl_init') ) {
+		if (!function_exists('curl_init')) {
 			Hybrid_Logger::error('Hybridauth Library needs the CURL PHP extension.');
 			throw new Exception('Hybridauth Library needs the CURL PHP extension.');
 		}
 
 		// PHP JSON extension [http://php.net/manual/en/book.json.php]
-		if ( ! function_exists('json_decode') ) {
+		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.');
-		} 
+		}
 
 		// session.name
-		if( session_name() != "PHPSESSID" ){
+		if (session_name() != "PHPSESSID") {
 			Hybrid_Logger::info('PHP session.name diff from default PHPSESSID. http://php.net/manual/en/session.configuration.php#ini.session.name.');
 		}
 
 		// safe_mode is on
-		if( ini_get('safe_mode') ){
+		if (ini_get('safe_mode')) {
 			Hybrid_Logger::info('PHP safe_mode is on. http://php.net/safe-mode.');
 		}
 
 		// open basedir is on
-		if( ini_get('open_basedir') ){
+		if (ini_get('open_basedir')) {
 			Hybrid_Logger::info('PHP open_basedir is on. http://php.net/open-basedir.');
 		}
 
-		Hybrid_Logger::debug( "Hybrid_Auth initialize. dump used config: ", serialize( $config ) );
-		Hybrid_Logger::debug( "Hybrid_Auth initialize. dump current session: ", Hybrid_Auth::storage()->getSessionData() ); 
-		Hybrid_Logger::info( "Hybrid_Auth initialize: check if any error is stored on the endpoint..." );
+		Hybrid_Logger::debug("Hybrid_Auth initialize. dump used config: ", serialize($config));
+		Hybrid_Logger::debug("Hybrid_Auth initialize. dump current session: ", Hybrid_Auth::storage()->getSessionData());
+		Hybrid_Logger::info("Hybrid_Auth initialize: check if any error is stored on the endpoint...");
 
-		if( Hybrid_Error::hasError() ){ 
+		if (Hybrid_Error::hasError()) {
 			$m = Hybrid_Error::getErrorMessage();
 			$c = Hybrid_Error::getErrorCode();
 			$p = Hybrid_Error::getErrorPrevious();
 
-			Hybrid_Logger::error( "Hybrid_Auth initialize: A stored Error found, Throw an new Exception and delete it from the store: Error#$c, '$m'" );
+			Hybrid_Logger::error("Hybrid_Auth initialize: A stored Error found, Throw an new Exception and delete it from the store: Error#$c, '$m'");
 
 			Hybrid_Error::clearError();
 
 			// try to provide the previous if any
 			// Exception::getPrevious (PHP 5 >= 5.3.0) http://php.net/manual/en/exception.getprevious.php
-			if ( version_compare( PHP_VERSION, '5.3.0', '>=' ) && ($p instanceof Exception) ) { 
-				throw new Exception( $m, $c, $p );
-			}
-			else{
-				throw new Exception( $m, $c );
+			if (version_compare(PHP_VERSION, '5.3.0', '>=') && ($p instanceof Exception)) {
+				throw new Exception($m, $c, $p);
+			} else {
+				throw new Exception($m, $c);
 			}
 		}
 
-		Hybrid_Logger::info( "Hybrid_Auth initialize: no error found. initialization succeed." );
-
-		// Endof initialize 
+		Hybrid_Logger::info("Hybrid_Auth initialize: no error found. initialization succeed.");
 	}
 
-	// --------------------------------------------------------------------
-
 	/**
-	* Hybrid storage system accessor
-	*
-	* Users sessions are stored using HybridAuth storage system ( HybridAuth 2.0 handle PHP Session only) and can be accessed directly by
-	* Hybrid_Auth::storage()->get($key) to retrieves the data for the given key, or calling
-	* Hybrid_Auth::storage()->set($key, $value) to store the key => $value set.
-	*/
-	public static function storage()
-	{
+	 * Hybrid storage system accessor
+	 *
+	 * Users sessions are stored using HybridAuth storage system ( HybridAuth 2.0 handle PHP Session only) and can be accessed directly by
+	 * Hybrid_Auth::storage()->get($key) to retrieves the data for the given key, or calling
+	 * Hybrid_Auth::storage()->set($key, $value) to store the key => $value set.
+	 *
+	 * @return Hybrid_Storage
+	 */
+	public static function storage() {
 		return Hybrid_Auth::$store;
 	}
 
-	// --------------------------------------------------------------------
-
 	/**
-	* Get hybridauth session data. 
-	*/
-	function getSessionData()
-	{ 
+	 * Get hybridauth session data
+	 * @return string|null
+	 */
+	function getSessionData() {
 		return Hybrid_Auth::storage()->getSessionData();
 	}
 
-	// --------------------------------------------------------------------
-
 	/**
-	* restore hybridauth session data. 
-	*/
-	function restoreSessionData( $sessiondata = NULL )
-	{ 
-		Hybrid_Auth::storage()->restoreSessionData( $sessiondata );
+	 * Restore hybridauth session data
+	 *
+	 * @param string $sessiondata Serialized session data
+	 * @retun void
+	 */
+	function restoreSessionData($sessiondata = null) {
+		Hybrid_Auth::storage()->restoreSessionData($sessiondata);
 	}
 
-	// --------------------------------------------------------------------
-
 	/**
-	* Try to authenticate the user with a given provider. 
-	*
-	* If the user is already connected we just return and instance of provider adapter,
-	* ELSE, try to authenticate and authorize the user with the provider. 
-	*
-	* $params is generally an array with required info in order for this provider and HybridAuth to work,
-	*  like :
-	*          hauth_return_to: URL to call back after authentication is done
-	*        openid_identifier: The OpenID identity provider identifier
-	*           google_service: can be "Users" for Google user accounts service or "Apps" for Google hosted Apps
-	*/
-	public static function authenticate( $providerId, $params = NULL )
-	{
-		Hybrid_Logger::info( "Enter Hybrid_Auth::authenticate( $providerId )" );
-
-		// if user not connected to $providerId then try setup a new adapter and start the login process for this provider
-		if( ! Hybrid_Auth::storage()->get( "hauth_session.$providerId.is_logged_in" ) ){ 
-			Hybrid_Logger::info( "Hybrid_Auth::authenticate( $providerId ), User not connected to the provider. Try to authenticate.." );
-
-			$provider_adapter = Hybrid_Auth::setup( $providerId, $params );
+	 * Try to authenticate the user with a given provider.
+	 *
+	 * If the user is already connected we just return and instance of provider adapter,
+	 * ELSE, try to authenticate and authorize the user with the provider.
+	 *
+	 * $params is generally an array with required info in order for this provider and HybridAuth to work,
+	 *  like :
+	 *          hauth_return_to: URL to call back after authentication is done
+	 *        openid_identifier: The OpenID identity provider identifier
+	 *           google_service: can be "Users" for Google user accounts service or "Apps" for Google hosted Apps
+	 *
+	 * @param string $providerId ID of the provider
+	 * @param array  $params      Params
+	 * @return
+	 */
+	public static function authenticate($providerId, $params = null) {
+		Hybrid_Logger::info("Enter Hybrid_Auth::authenticate( $providerId )");
 
+		if (!Hybrid_Auth::storage()->get("hauth_session.$providerId.is_logged_in")) {
+			// if user not connected to $providerId then try setup a new adapter and start the login process for this provider
+			Hybrid_Logger::info("Hybrid_Auth::authenticate( $providerId ), User not connected to the provider. Try to authenticate..");
+			$provider_adapter = Hybrid_Auth::setup($providerId, $params);
 			$provider_adapter->login();
-		}
-
-		// else, then return the adapter instance for the given provider
-		else{
-			Hybrid_Logger::info( "Hybrid_Auth::authenticate( $providerId ), User is already connected to this provider. Return the adapter instance." );
-
-			return Hybrid_Auth::getAdapter( $providerId );
+		} else {
+			// else, then return the adapter instance for the given provider
+			Hybrid_Logger::info("Hybrid_Auth::authenticate( $providerId ), User is already connected to this provider. Return the adapter instance.");
+			return Hybrid_Auth::getAdapter($providerId);
 		}
 	}
 
-	// --------------------------------------------------------------------
-
 	/**
-	* Return the adapter instance for an authenticated provider
-	*/ 
-	public static function getAdapter( $providerId = NULL )
-	{
-		Hybrid_Logger::info( "Enter Hybrid_Auth::getAdapter( $providerId )" );
-
-		return Hybrid_Auth::setup( $providerId );
+	 * Return the adapter instance for an authenticated provider
+	 *
+	 * @param string $providerId ID of the provider
+	 * @return Hybrid_Provider_Adapter
+	 */
+	public static function getAdapter($providerId = null) {
+		Hybrid_Logger::info("Enter Hybrid_Auth::getAdapter( $providerId )");
+		return Hybrid_Auth::setup($providerId);
 	}
 
-	// --------------------------------------------------------------------
-
 	/**
-	* Setup an adapter for a given provider
-	*/ 
-	public static function setup( $providerId, $params = NULL )
-	{
-		Hybrid_Logger::debug( "Enter Hybrid_Auth::setup( $providerId )", $params );
+	 * Setup an adapter for a given provider
+	 *
+	 * @param string $providerId ID of the provider
+	 * @param array  $params     Adapter params
+	 * @return Hybrid_Provider_Adapter
+	 */
+	public static function setup($providerId, $params = null) {
+		Hybrid_Logger::debug("Enter Hybrid_Auth::setup( $providerId )", $params);
 
-		if( ! $params ){ 
-			$params = Hybrid_Auth::storage()->get( "hauth_session.$providerId.id_provider_params" );
-			
-			Hybrid_Logger::debug( "Hybrid_Auth::setup( $providerId ), no params given. Trying to get the stored for this provider.", $params );
+		if (!$params) {
+			$params = Hybrid_Auth::storage()->get("hauth_session.$providerId.id_provider_params");
+
+			Hybrid_Logger::debug("Hybrid_Auth::setup( $providerId ), no params given. Trying to get the stored for this provider.", $params);
 		}
 
-		if( ! $params ){ 
-			$params = ARRAY();
-			
-			Hybrid_Logger::info( "Hybrid_Auth::setup( $providerId ), no stored params found for this provider. Initialize a new one for new session" );
+		if (!$params) {
+			$params = array();
+			Hybrid_Logger::info("Hybrid_Auth::setup( $providerId ), no stored params found for this provider. Initialize a new one for new session");
 		}
 
-		if( is_array($params) && ! isset( $params["hauth_return_to"] ) ){
-			$params["hauth_return_to"] = Hybrid_Auth::getCurrentUrl(); 
-
-			Hybrid_Logger::debug( "Hybrid_Auth::setup( $providerId ). HybridAuth Callback URL set to: ", $params["hauth_return_to"] );
+		if (is_array($params) && !isset($params["hauth_return_to"])) {
+			$params["hauth_return_to"] = Hybrid_Auth::getCurrentUrl();
+			Hybrid_Logger::debug("Hybrid_Auth::setup( $providerId ). HybridAuth Callback URL set to: ", $params["hauth_return_to"]);
 		}
 
 		# instantiate a new IDProvider Adapter
-		$provider   = new Hybrid_Provider_Adapter();
-
-		$provider->factory( $providerId, $params );
-
+		$provider = new Hybrid_Provider_Adapter();
+		$provider->factory($providerId, $params);
 		return $provider;
-	} 
-
-	// --------------------------------------------------------------------
-
-	/**
-	* Check if the current user is connected to a given provider
-	*/
-	public static function isConnectedWith( $providerId )
-	{
-		return (bool) Hybrid_Auth::storage()->get( "hauth_session.{$providerId}.is_logged_in" );
 	}
 
-	// --------------------------------------------------------------------
+	/**
+	 * Check if the current user is connected to a given provider
+	 *
+	 * @param string $providerId ID of the provider
+	 * @return bool
+	 */
+	public static function isConnectedWith($providerId) {
+		return (bool) Hybrid_Auth::storage()->get("hauth_session.{$providerId}.is_logged_in");
+	}
 
 	/**
-	* Return array listing all authenticated providers
-	*/ 
-	public static function getConnectedProviders()
-	{
+	 * Return array listing all authenticated providers
+	 * @return array
+	 */
+	public static function getConnectedProviders() {
 		$idps = array();
 
-		foreach( Hybrid_Auth::$config["providers"] as $idpid => $params ){
-			if( Hybrid_Auth::isConnectedWith( $idpid ) ){
+		foreach (Hybrid_Auth::$config["providers"] as $idpid => $params) {
+			if (Hybrid_Auth::isConnectedWith($idpid)) {
 				$idps[] = $idpid;
 			}
 		}
@@ -303,20 +304,26 @@ class Hybrid_Auth
 		return $idps;
 	}
 
-	// --------------------------------------------------------------------
-
 	/**
-	* Return array listing all enabled providers as well as a flag if you are connected.
-	*/ 
-	public static function getProviders()
-	{
+	 * Return array listing all enabled providers as well as a flag if you are connected
+	 *
+	 * <code>
+	 * array(
+	 *   'Facebook' => array(
+	 *     'connected' => true
+	 *   )
+	 * )
+	 * </code>
+	 * @return array
+	 */
+	public static function getProviders() {
 		$idps = array();
 
-		foreach( Hybrid_Auth::$config["providers"] as $idpid => $params ){
-			if($params['enabled']) {
-				$idps[$idpid] = array( 'connected' => false );
+		foreach (Hybrid_Auth::$config["providers"] as $idpid => $params) {
+			if ($params['enabled']) {
+				$idps[$idpid] = array('connected' => false);
 
-				if( Hybrid_Auth::isConnectedWith( $idpid ) ){
+				if (Hybrid_Auth::isConnectedWith($idpid)) {
 					$idps[$idpid]['connected'] = true;
 				}
 			}
@@ -325,35 +332,36 @@ class Hybrid_Auth
 		return $idps;
 	}
 
-	// --------------------------------------------------------------------
-
 	/**
-	* A generic function to logout all connected provider at once 
-	*/ 
-	public static function logoutAllProviders()
-	{
+	 * A generic function to logout all connected provider at once
+	 * @return void
+	 */
+	public static function logoutAllProviders() {
 		$idps = Hybrid_Auth::getConnectedProviders();
 
-		foreach( $idps as $idp ){
-			$adapter = Hybrid_Auth::getAdapter( $idp );
-
+		foreach ($idps as $idp) {
+			$adapter = Hybrid_Auth::getAdapter($idp);
 			$adapter->logout();
 		}
 	}
 
-	// --------------------------------------------------------------------
-
 	/**
-	* Utility function, redirect to a given URL with php header or using javascript location.href
-	*/
-	public static function redirect( $url, $mode = "PHP" )
-	{
-		Hybrid_Logger::info( "Enter Hybrid_Auth::redirect( $url, $mode )" );
+	 * Utility function, redirect to a given URL with php header or using javascript location.href
+	 *
+	 * @param string $url  URL to redirect to
+	 * @param string $mode PHP|JS
+	 */
+	public static function redirect($url, $mode = "PHP") {
+		Hybrid_Logger::info("Enter Hybrid_Auth::redirect( $url, $mode )");
 
-		if( $mode == "PHP" ){
-			header( "Location: $url" ) ;
+		// Ensure session is saved before sending response, see https://github.com/symfony/symfony/pull/12341
+		if ((PHP_VERSION_ID >= 50400 && PHP_SESSION_ACTIVE === session_status()) || (PHP_VERSION_ID < 50400 && isset($_SESSION) && session_id())) {
+			session_write_close();
 		}
-		elseif( $mode == "JS" ){
+
+		if ($mode == "PHP") {
+			header("Location: $url");
+		} elseif ($mode == "JS") {
 			echo '<html>';
 			echo '<head>';
 			echo '<script type="text/javascript">';
@@ -363,39 +371,41 @@ class Hybrid_Auth
 			echo '<body onload="redirect()">';
 			echo 'Redirecting, please wait...';
 			echo '</body>';
-			echo '</html>'; 
+			echo '</html>';
 		}
 
 		die();
 	}
 
-	// --------------------------------------------------------------------
-
 	/**
-	* Utility function, return the current url. TRUE to get $_SERVER['REQUEST_URI'], FALSE for $_SERVER['PHP_SELF']
-	*/
-	public static function getCurrentUrl( $request_uri = true ) 
-	{
-		if(
-			isset( $_SERVER['HTTPS'] ) && ( $_SERVER['HTTPS'] == 'on' || $_SERVER['HTTPS'] == 1 )
-		|| 	isset( $_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https'
-		){
-			$protocol = 'https://';
+	 * Utility function, return the current url
+	 *
+	 * @param bool $request_uri true to get $_SERVER['REQUEST_URI'], false for $_SERVER['PHP_SELF']
+	 * @return string
+	 */
+	public static function getCurrentUrl($request_uri = true) {
+		if (php_sapi_name() == 'cli') {
+			return '';
 		}
-		else {
-			$protocol = 'http://';
+
+		$protocol = 'http://';
+
+		if ((isset($_SERVER['HTTPS']) && ( $_SERVER['HTTPS'] == 'on' || $_SERVER['HTTPS'] == 1 ))
+				|| (isset($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https'))
+		{
+			$protocol = 'https://';
 		}
 
 		$url = $protocol . $_SERVER['HTTP_HOST'];
 
-		if( $request_uri ){
+		if ($request_uri) {
 			$url .= $_SERVER['REQUEST_URI'];
-		}
-		else{
+		} else {
 			$url .= $_SERVER['PHP_SELF'];
 		}
 
 		// return current url
 		return $url;
 	}
+
 }
diff --git a/e107_handlers/hybridauth/Hybrid/Endpoint.php b/e107_handlers/hybridauth/Hybrid/Endpoint.php
index d59824ce2..fbb1a40a7 100644
--- a/e107_handlers/hybridauth/Hybrid/Endpoint.php
+++ b/e107_handlers/hybridauth/Hybrid/Endpoint.php
@@ -1,145 +1,146 @@
 <?php
+
 /**
-* HybridAuth
-* http://hybridauth.sourceforge.net | http://github.com/hybridauth/hybridauth
-* (c) 2009-2014, HybridAuth authors | http://hybridauth.sourceforge.net/licenses.html
-*/
+ * HybridAuth
+ * http://hybridauth.sourceforge.net | http://github.com/hybridauth/hybridauth
+ * (c) 2009-2015, HybridAuth authors | http://hybridauth.sourceforge.net/licenses.html
+ */
 
 /**
  * Hybrid_Endpoint class
- * 
- * Hybrid_Endpoint class provides a simple way to handle the OpenID and OAuth endpoint.
+ *
+ * Provides a simple way to handle the OpenID and OAuth endpoint
  */
 class Hybrid_Endpoint {
-	public static $request = NULL;
-	public static $initDone = FALSE;
+
+	protected $request = null;
+	protected $initDone = false;
 
 	/**
-	* Process the current request
-	*
-	* $request - The current request parameters. Leave as NULL to default to use $_REQUEST.
-	*/
-	public static function process( $request = NULL )
-	{
-		// Setup request variable
-		Hybrid_Endpoint::$request = $request;
-
-		if ( is_null(Hybrid_Endpoint::$request) ){
+	 * Process the current request
+	 *
+	 * @param array $request The current request parameters. Leave as null to default to use $_REQUEST.
+	 */
+	public function __construct($request = null) {
+		if (is_null($request)) {
 			// Fix a strange behavior when some provider call back ha endpoint
-			// with /index.php?hauth.done={provider}?{args}... 
-			// >here we need to recreate the $_REQUEST
-			if ( strrpos( $_SERVER["QUERY_STRING"], '?' ) ) {
-				$_SERVER["QUERY_STRING"] = str_replace( "?", "&", $_SERVER["QUERY_STRING"] );
-
-				parse_str( $_SERVER["QUERY_STRING"], $_REQUEST );
+			// with /index.php?hauth.done={provider}?{args}...
+			// >here we need to parse $_SERVER[QUERY_STRING]
+			$request = $_REQUEST;
+			if (strrpos($_SERVER["QUERY_STRING"], '?')) {
+				$_SERVER["QUERY_STRING"] = str_replace("?", "&", $_SERVER["QUERY_STRING"]);
+				parse_str($_SERVER["QUERY_STRING"], $request);
 			}
-
-			Hybrid_Endpoint::$request = $_REQUEST;
 		}
 
+		// Setup request variable
+		$this->request = $request;
+
 		// If openid_policy requested, we return our policy document
-		if ( isset( Hybrid_Endpoint::$request["get"] ) && Hybrid_Endpoint::$request["get"] == "openid_policy" ) {
-			Hybrid_Endpoint::processOpenidPolicy();
+		if (isset($this->request["get"]) && $this->request["get"] == "openid_policy") {
+			$this->processOpenidPolicy();
 		}
 
 		// If openid_xrds requested, we return our XRDS document
-		if ( isset( Hybrid_Endpoint::$request["get"] ) && Hybrid_Endpoint::$request["get"] == "openid_xrds" ) {
-			Hybrid_Endpoint::processOpenidXRDS();
+		if (isset($this->request["get"]) && $this->request["get"] == "openid_xrds") {
+			$this->processOpenidXRDS();
 		}
 
 		// If we get a hauth.start
-		if ( isset( Hybrid_Endpoint::$request["hauth_start"] ) && Hybrid_Endpoint::$request["hauth_start"] ) {
-			Hybrid_Endpoint::processAuthStart();
+		if (isset($this->request["hauth_start"]) && $this->request["hauth_start"]) {
+			$this->processAuthStart();
 		}
 		// Else if hauth.done
-		elseif ( isset( Hybrid_Endpoint::$request["hauth_done"] ) && Hybrid_Endpoint::$request["hauth_done"] ) {
-			Hybrid_Endpoint::processAuthDone();
+		elseif (isset($this->request["hauth_done"]) && $this->request["hauth_done"]) {
+			$this->processAuthDone();
 		}
 		// Else we advertise our XRDS document, something supposed to be done from the Realm URL page
 		else {
-			Hybrid_Endpoint::processOpenidRealm();
+			$this->processOpenidRealm();
 		}
 	}
 
 	/**
-	* Process OpenID policy request
-	*/
-	public static function processOpenidPolicy()
-	{
-		$output = file_get_contents( dirname(__FILE__) . "/resources/openid_policy.html" ); 
+	 * Process the current request
+	 *
+	 * @param array $request The current request parameters. Leave as null to default to use $_REQUEST.
+	 * @return Hybrid_Endpoint
+	 */
+	public static function process($request = null) {
+		// Trick for PHP 5.2, because it doesn't support late static binding
+		$class = function_exists('get_called_class') ? get_called_class() : __CLASS__;
+		new $class($request);
+	}
+
+	/**
+	 * Process OpenID policy request
+	 * @return void
+	 */
+	protected function processOpenidPolicy() {
+		$output = file_get_contents(dirname(__FILE__) . "/resources/openid_policy.html");
 		print $output;
 		die();
 	}
 
 	/**
-	* Process OpenID XRDS request
-	*/
-	public static function processOpenidXRDS()
-	{
+	 * Process OpenID XRDS request
+	 * @return void
+	 */
+	protected function processOpenidXRDS() {
 		header("Content-Type: application/xrds+xml");
 
-		$output = str_replace
-		(
-			"{RETURN_TO_URL}",
-			str_replace(
-				array("<", ">", "\"", "'", "&"), array("&lt;", "&gt;", "&quot;", "&apos;", "&amp;"), 
-				Hybrid_Auth::getCurrentUrl( false )
-			),
-			file_get_contents( dirname(__FILE__) . "/resources/openid_xrds.xml" )
-		);
+		$output = str_replace("{RETURN_TO_URL}", str_replace(
+						array("<", ">", "\"", "'", "&"), array("&lt;", "&gt;", "&quot;", "&apos;", "&amp;"), Hybrid_Auth::getCurrentUrl(false)
+				), file_get_contents(dirname(__FILE__) . "/resources/openid_xrds.xml"));
 		print $output;
 		die();
 	}
 
 	/**
-	* Process OpenID realm request
-	*/
-	public static function processOpenidRealm()
-	{
-		$output = str_replace
-		(
-			"{X_XRDS_LOCATION}",
-			htmlentities( Hybrid_Auth::getCurrentUrl( false ), ENT_QUOTES, 'UTF-8' ) . "?get=openid_xrds&v=" . Hybrid_Auth::$version,
-			file_get_contents( dirname(__FILE__) . "/resources/openid_realm.html" )
-		); 
+	 * Process OpenID realm request
+	 * @return void
+	 */
+	protected function processOpenidRealm() {
+		$output = str_replace("{X_XRDS_LOCATION}", htmlentities(Hybrid_Auth::getCurrentUrl(false), ENT_QUOTES, 'UTF-8')
+				. "?get=openid_xrds&v="
+				. Hybrid_Auth::$version, file_get_contents(dirname(__FILE__) . "/resources/openid_realm.html"));
 		print $output;
 		die();
 	}
 
 	/**
-	* define:endpoint step 3.
-	*/
-	public static function processAuthStart()
-	{
-		Hybrid_Endpoint::authInit();
+	 * Define: endpoint step 3
+	 * @return void
+	 * @throws Hybrid_Exception
+	 */
+	protected function processAuthStart() {
+		$this->authInit();
 
-		$provider_id = trim( strip_tags( Hybrid_Endpoint::$request["hauth_start"] ) );
+		$provider_id = trim(strip_tags($this->request["hauth_start"]));
 
-		# check if page accessed directly
-		if( ! Hybrid_Auth::storage()->get( "hauth_session.$provider_id.hauth_endpoint" ) ) {
-			Hybrid_Logger::error( "Endpoint: hauth_endpoint parameter is not defined on hauth_start, halt login process!" );
+		// check if page accessed directly
+		if (!Hybrid_Auth::storage()->get("hauth_session.$provider_id.hauth_endpoint")) {
+			Hybrid_Logger::error("Endpoint: hauth_endpoint parameter is not defined on hauth_start, halt login process!");
 
-			throw new Hybrid_Exception( "You cannot access this page directly." );
+			throw new Hybrid_Exception("You cannot access this page directly.");
 		}
 
-		# define:hybrid.endpoint.php step 2.
-		$hauth = Hybrid_Auth::setup( $provider_id );
+		// define:hybrid.endpoint.php step 2.
+		$hauth = Hybrid_Auth::setup($provider_id);
 
-		# if REQUESTed hauth_idprovider is wrong, session not created, etc. 
-		if( ! $hauth ) {
-			Hybrid_Logger::error( "Endpoint: Invalid parameter on hauth_start!" );
-
-			throw new Hybrid_Exception( "Invalid parameter! Please return to the login page and try again." );
+		// if REQUESTed hauth_idprovider is wrong, session not created, etc.
+		if (!$hauth) {
+			Hybrid_Logger::error("Endpoint: Invalid parameter on hauth_start!");
+			throw new Hybrid_Exception("Invalid parameter! Please return to the login page and try again.");
 		}
 
 		try {
-			Hybrid_Logger::info( "Endpoint: call adapter [{$provider_id}] loginBegin()" );
+			Hybrid_Logger::info("Endpoint: call adapter [{$provider_id}] loginBegin()");
 
 			$hauth->adapter->loginBegin();
-		}
-		catch ( Exception $e ) {
-			Hybrid_Logger::error( "Exception:" . $e->getMessage(), $e );
-			Hybrid_Error::setError( $e->getMessage(), $e->getCode(), $e->getTraceAsString(), $e->getPrevious() );
+		} catch (Exception $e) {
+			Hybrid_Logger::error("Exception:" . $e->getMessage(), $e);
+			Hybrid_Error::setError($e->getMessage(), $e->getCode(), $e->getTraceAsString(), $e->getPrevious());
 
 			$hauth->returnToCallbackUrl();
 		}
@@ -148,69 +149,74 @@ class Hybrid_Endpoint {
 	}
 
 	/**
-	* define:endpoint step 3.1 and 3.2
-	*/
-	public static function processAuthDone()
-	{
-		Hybrid_Endpoint::authInit();
+	 * Define: endpoint step 3.1 and 3.2
+	 * @return void
+	 * @throws Hybrid_Exception
+	 */
+	protected function processAuthDone() {
+		$this->authInit();
 
-		$provider_id = trim( strip_tags( Hybrid_Endpoint::$request["hauth_done"] ) );
+		$provider_id = trim(strip_tags($this->request["hauth_done"]));
 
-		$hauth = Hybrid_Auth::setup( $provider_id );
+		$hauth = Hybrid_Auth::setup($provider_id);
 
-		if( ! $hauth ) {
-			Hybrid_Logger::error( "Endpoint: Invalid parameter on hauth_done!" ); 
+		if (!$hauth) {
+			Hybrid_Logger::error("Endpoint: Invalid parameter on hauth_done!");
 
 			$hauth->adapter->setUserUnconnected();
 
-			throw new Hybrid_Exception( "Invalid parameter! Please return to the login page and try again." );
+			throw new Hybrid_Exception("Invalid parameter! Please return to the login page and try again.");
 		}
 
 		try {
-			Hybrid_Logger::info( "Endpoint: call adapter [{$provider_id}] loginFinish() " );
+			Hybrid_Logger::info("Endpoint: call adapter [{$provider_id}] loginFinish() ");
+			$hauth->adapter->loginFinish();
+		} catch (Exception $e) {
+			Hybrid_Logger::error("Exception:" . $e->getMessage(), $e);
+			Hybrid_Error::setError($e->getMessage(), $e->getCode(), $e->getTraceAsString(), $e->getPrevious());
 
-			$hauth->adapter->loginFinish(); 
-		}
-		catch( Exception $e ){
-			Hybrid_Logger::error( "Exception:" . $e->getMessage(), $e );
-			Hybrid_Error::setError( $e->getMessage(), $e->getCode(), $e->getTraceAsString(), $e->getPrevious());
-
-			$hauth->adapter->setUserUnconnected(); 
+			$hauth->adapter->setUserUnconnected();
 		}
 
-		Hybrid_Logger::info( "Endpoint: job done. retrun to callback url." );
+		Hybrid_Logger::info("Endpoint: job done. return to callback url.");
 
 		$hauth->returnToCallbackUrl();
 		die();
 	}
 
-	public static function authInit()
-	{
-		if ( ! Hybrid_Endpoint::$initDone) {
-			Hybrid_Endpoint::$initDone = TRUE;
+	/**
+	 * Initializes authentication
+	 * @throws Hybrid_Exception
+	 */
+	protected function authInit() {
+		if (!$this->initDone) {
+			$this->initDone = true;
 
-			# Init Hybrid_Auth
+			// Init Hybrid_Auth
 			try {
-                if(!class_exists("Hybrid_Storage")){
-                    require_once realpath( dirname( __FILE__ ) )  . "/Storage.php";
-                }
-				
-				$storage = new Hybrid_Storage(); 
-
-				// Check if Hybrid_Auth session already exist
-				if ( ! $storage->config( "CONFIG" ) ) {
-                                        Hybrid_Logger::error( "Endpoint: Config storage not found when trying to init Hyrid_Auth. " );
-
-					throw new Hybrid_Exception( "You cannot access this page directly." );
+				if (!class_exists("Hybrid_Storage", false)) {
+					require_once realpath(dirname(__FILE__)) . "/Storage.php";
+				}
+				if (!class_exists("Hybrid_Exception", false)) {
+					require_once realpath(dirname(__FILE__)) . "/Exception.php";
+				}
+				if (!class_exists("Hybrid_Logger", false)) {
+					require_once realpath(dirname(__FILE__)) . "/Logger.php";
 				}
 
-				Hybrid_Auth::initialize( $storage->config( "CONFIG" ) ); 
-			}
-			catch ( Exception $e ){
-				Hybrid_Logger::error( "Endpoint: Error while trying to init Hybrid_Auth: " . $e->getMessage()); 
+				$storage = new Hybrid_Storage();
 
-				throw new Hybrid_Exception( "Oophs. Error!" );
+				// Check if Hybrid_Auth session already exist
+				if (!$storage->config("CONFIG")) {
+					throw new Hybrid_Exception("You cannot access this page directly.");
+				}
+
+				Hybrid_Auth::initialize($storage->config("CONFIG"));
+			} catch (Exception $e) {
+				Hybrid_Logger::error("Endpoint: Error while trying to init Hybrid_Auth: " . $e->getMessage());
+				throw new Hybrid_Exception( "Endpoint: Error while trying to init Hybrid_Auth: " . $e->getMessage(), $e->getCode(), $e );
 			}
 		}
 	}
+
 }
diff --git a/e107_handlers/hybridauth/Hybrid/Error.php b/e107_handlers/hybridauth/Hybrid/Error.php
index eac09ce94..7013b4976 100644
--- a/e107_handlers/hybridauth/Hybrid/Error.php
+++ b/e107_handlers/hybridauth/Hybrid/Error.php
@@ -1,89 +1,88 @@
 <?php
+
 /**
-* HybridAuth
-* http://hybridauth.sourceforge.net | http://github.com/hybridauth/hybridauth
-* (c) 2009-2014, HybridAuth authors | http://hybridauth.sourceforge.net/licenses.html
-*/
+ * HybridAuth
+ * http://hybridauth.sourceforge.net | http://github.com/hybridauth/hybridauth
+ * (c) 2009-2015, HybridAuth authors | http://hybridauth.sourceforge.net/licenses.html
+ */
 
 /**
  * Errors manager
- * 
- * HybridAuth errors are stored in Hybrid::storage() and not displayed directly to the end user 
+ *
+ * HybridAuth errors are stored in Hybrid::storage() and not displayed directly to the end user
  */
-class Hybrid_Error
-{
-	/**
-	* Store error in session
-	*
-	* @param String $message
-	* @param Number $code
-	* @param String $trace
-	* @param String $previous
-	*/
-	public static function setError( $message, $code = NULL, $trace = NULL, $previous = NULL )
-	{
-		Hybrid_Logger::info( "Enter Hybrid_Error::setError( $message )" );
+class Hybrid_Error {
 
-		Hybrid_Auth::storage()->set( "hauth_session.error.status"  , 1         );
-		Hybrid_Auth::storage()->set( "hauth_session.error.message" , $message  );
-		Hybrid_Auth::storage()->set( "hauth_session.error.code"    , $code     );
-		Hybrid_Auth::storage()->set( "hauth_session.error.trace"   , $trace    );
-		Hybrid_Auth::storage()->set( "hauth_session.error.previous", $previous );
+	/**
+	 * Store error in session
+	 *
+	 * @param string $message  Error message
+	 * @param int    $code     Error code
+	 * @param string $trace    Back trace
+	 * @param string $previous Previous exception
+	 */
+	public static function setError($message, $code = null, $trace = null, $previous = null) {
+		Hybrid_Logger::info("Enter Hybrid_Error::setError( $message )");
+
+		Hybrid_Auth::storage()->set("hauth_session.error.status", 1);
+		Hybrid_Auth::storage()->set("hauth_session.error.message", $message);
+		Hybrid_Auth::storage()->set("hauth_session.error.code", $code);
+		Hybrid_Auth::storage()->set("hauth_session.error.trace", $trace);
+		Hybrid_Auth::storage()->set("hauth_session.error.previous", $previous);
 	}
 
 	/**
-	* Clear the last error
-	*/
-	public static function clearError()
-	{ 
-		Hybrid_Logger::info( "Enter Hybrid_Error::clearError()" );
+	 * Clear the last error
+	 * @return void
+	 */
+	public static function clearError() {
+		Hybrid_Logger::info("Enter Hybrid_Error::clearError()");
 
-		Hybrid_Auth::storage()->delete( "hauth_session.error.status"   );
-		Hybrid_Auth::storage()->delete( "hauth_session.error.message"  );
-		Hybrid_Auth::storage()->delete( "hauth_session.error.code"     );
-		Hybrid_Auth::storage()->delete( "hauth_session.error.trace"    );
-		Hybrid_Auth::storage()->delete( "hauth_session.error.previous" );
+		Hybrid_Auth::storage()->delete("hauth_session.error.status");
+		Hybrid_Auth::storage()->delete("hauth_session.error.message");
+		Hybrid_Auth::storage()->delete("hauth_session.error.code");
+		Hybrid_Auth::storage()->delete("hauth_session.error.trace");
+		Hybrid_Auth::storage()->delete("hauth_session.error.previous");
 	}
 
 	/**
-	* Checks to see if there is a an error. 
-	* 
-	* @return boolean True if there is an error.
-	*/
-	public static function hasError()
-	{ 
-		return (bool) Hybrid_Auth::storage()->get( "hauth_session.error.status" );
+	 * Checks to see if there is a an error.
+	 * @return boolean true if there is an error.
+	 */
+	public static function hasError() {
+		return (bool) Hybrid_Auth::storage()->get("hauth_session.error.status");
 	}
 
 	/**
-	* return error message 
-	*/
-	public static function getErrorMessage()
-	{ 
-		return Hybrid_Auth::storage()->get( "hauth_session.error.message" );
+	 * Return error message
+	 * @return string
+	 */
+	public static function getErrorMessage() {
+		return Hybrid_Auth::storage()->get("hauth_session.error.message");
 	}
 
 	/**
-	* return error code  
-	*/
-	public static function getErrorCode()
-	{ 
-		return Hybrid_Auth::storage()->get( "hauth_session.error.code" );
+	 * Return error code
+	 * @return int
+	 */
+	public static function getErrorCode() {
+		return Hybrid_Auth::storage()->get("hauth_session.error.code");
 	}
 
 	/**
-	* return string detailed error backtrace as string.
-	*/
-	public static function getErrorTrace()
-	{ 
-		return Hybrid_Auth::storage()->get( "hauth_session.error.trace" );
+	 * Return string detailed error backtrace as string
+	 * @return string
+	 */
+	public static function getErrorTrace() {
+		return Hybrid_Auth::storage()->get("hauth_session.error.trace");
 	}
 
 	/**
-	* @return string detailed error backtrace as string.
-	*/
-	public static function getErrorPrevious()
-	{ 
-		return Hybrid_Auth::storage()->get( "hauth_session.error.previous" );
+	 * Detailed error backtrace as string
+	 * @return string
+	 */
+	public static function getErrorPrevious() {
+		return Hybrid_Auth::storage()->get("hauth_session.error.previous");
 	}
+
 }
diff --git a/e107_handlers/hybridauth/Hybrid/Exception.php b/e107_handlers/hybridauth/Hybrid/Exception.php
index 9476899b4..8c8c2d1fa 100644
--- a/e107_handlers/hybridauth/Hybrid/Exception.php
+++ b/e107_handlers/hybridauth/Hybrid/Exception.php
@@ -1,16 +1,17 @@
 <?php
-/*!
-* HybridAuth
-* http://hybridauth.sourceforge.net | http://github.com/hybridauth/hybridauth
-* (c) 2009-2012, HybridAuth authors | http://hybridauth.sourceforge.net/licenses.html
-*/
+
+/* !
+ * HybridAuth
+ * http://hybridauth.sourceforge.net | http://github.com/hybridauth/hybridauth
+ * (c) 2009-2015, HybridAuth authors | http://hybridauth.sourceforge.net/licenses.html
+ */
 
 /**
  * Exception implementation
- * 
+ *
  * The base Exception is extended to allow applications to handle exceptions from hybrid auth
  * separately from general exceptions.
  */
-class Hybrid_Exception extends Exception
-{
+class Hybrid_Exception extends Exception {
+
 }
diff --git a/e107_handlers/hybridauth/Hybrid/Logger.php b/e107_handlers/hybridauth/Hybrid/Logger.php
index ccf4ba442..f948913da 100644
--- a/e107_handlers/hybridauth/Hybrid/Logger.php
+++ b/e107_handlers/hybridauth/Hybrid/Logger.php
@@ -1,89 +1,102 @@
 <?php
+
 /**
-* HybridAuth
-* http://hybridauth.sourceforge.net | http://github.com/hybridauth/hybridauth
-* (c) 2009-2014, HybridAuth authors | http://hybridauth.sourceforge.net/licenses.html
-*/
- 
+ * HybridAuth
+ * http://hybridauth.sourceforge.net | http://github.com/hybridauth/hybridauth
+ * (c) 2009-2015, HybridAuth authors | http://hybridauth.sourceforge.net/licenses.html
+ */
+
 /**
  * Debugging and Logging manager
  */
-class Hybrid_Logger
-{
+class Hybrid_Logger {
+
 	/**
 	 * Constructor
 	 */
-	function __construct()
-	{
- 		// if debug mode is set to true, then check for the writable log file
- 		if ( Hybrid_Auth::$config["debug_mode"] ){
-                        if ( ! isset(Hybrid_Auth::$config["debug_file"]) ) {
-                            throw new Exception( "'debug_mode' is set to 'true' but no log file path 'debug_file' is set.", 1 );
-                        }
- 			elseif ( ! file_exists( Hybrid_Auth::$config["debug_file"] ) && ! is_writable( Hybrid_Auth::$config["debug_file"]) ){
-                                if ( ! touch( Hybrid_Auth::$config["debug_file"] ) ){
-                                        throw new Exception( "'debug_mode' is set to 'true', but the file " . Hybrid_Auth::$config['debug_file'] . " in 'debug_file' can not be created.", 1 );
-                                }
+	function __construct() {
+		// if debug mode is set to true, then check for the writable log file
+		if (Hybrid_Auth::$config["debug_mode"]) {
+			if (!isset(Hybrid_Auth::$config["debug_file"])) {
+				throw new Exception("'debug_mode' is set to 'true' but no log file path 'debug_file' is set.", 1);
+			} elseif (!file_exists(Hybrid_Auth::$config["debug_file"]) && !is_writable(Hybrid_Auth::$config["debug_file"])) {
+				if (!touch(Hybrid_Auth::$config["debug_file"])) {
+					throw new Exception("'debug_mode' is set to 'true', but the file " . Hybrid_Auth::$config['debug_file'] . " in 'debug_file' can not be created.", 1);
+				}
+			} elseif (!is_writable(Hybrid_Auth::$config["debug_file"])) {
+				throw new Exception("'debug_mode' is set to 'true', but the given log file path 'debug_file' is not a writable file.", 1);
 			}
-			elseif ( ! is_writable( Hybrid_Auth::$config["debug_file"] ) ){
-				throw new Exception( "'debug_mode' is set to 'true', but the given log file path 'debug_file' is not a writable file.", 1 );
-			}
-		} 
+		}
 	}
-	
-	/**
-	 * Debug
-	 * @param String $message
-	 * @param Object $object
-	 */
-	public static function debug( $message, $object = NULL )
-	{
-		if( Hybrid_Auth::$config["debug_mode"] ){
-			$datetime = new DateTime();
-			$datetime =  $datetime->format(DATE_ATOM);
 
-			file_put_contents( 
-				Hybrid_Auth::$config["debug_file"], 
-				"DEBUG -- " . $_SERVER['REMOTE_ADDR'] . " -- " . $datetime . " -- " . $message . " -- " . print_r($object, true) . "\n", 
-				FILE_APPEND
+	/**
+	 * Logs a debug message with an object dump
+	 *
+	 * @param string   $message Debug message
+	 * @param stdClass $object  Object being debugged
+	 * @return void
+	 */
+	public static function debug($message, $object = null) {
+		if (Hybrid_Auth::$config["debug_mode"] === true) {
+      $dt = new DateTime('now', new DateTimeZone( 'UTC' ));
+			file_put_contents(Hybrid_Auth::$config["debug_file"], implode(' -- ', array(
+				"DEBUG",
+				$_SERVER['REMOTE_ADDR'],
+				$dt->format(DATE_ATOM),
+				$message,
+				print_r($object, true) . PHP_EOL,
+					)), FILE_APPEND
 			);
 		}
 	}
-	
-	/**
-	 * Info
-	 * @param String $message
-	 */
-	public static function info( $message )
-	{ 
-		if( in_array(Hybrid_Auth::$config["debug_mode"], array(true, 'info'), true) ){
-			$datetime = new DateTime();
-			$datetime =  $datetime->format(DATE_ATOM);
 
-			file_put_contents( 
-				Hybrid_Auth::$config["debug_file"], 
-				"INFO -- " . $_SERVER['REMOTE_ADDR'] . " -- " . $datetime . " -- " . $message . "\n", 
-				FILE_APPEND
-			);
+	/**
+	 * Logs an info message
+	 *
+	 * @param string $message Info message
+	 * @return void
+	 */
+	public static function info($message) {
+		if (in_array(Hybrid_Auth::$config["debug_mode"], array(true, 'info'), true)) {
+      $dt = new DateTime('now', new DateTimeZone( 'UTC' ));
+			file_put_contents(Hybrid_Auth::$config["debug_file"], implode(' -- ', array(
+				"INFO",
+				$_SERVER['REMOTE_ADDR'],
+				$dt->format(DATE_ATOM),
+				$message . PHP_EOL,
+					)), FILE_APPEND);
 		}
 	}
-	
-	/**
-	 * Error
-	 * @param String $message Error message
-	 * @param Object $object
-	 */
-	public static function error($message, $object = NULL)
-	{ 
-		if(isset(Hybrid_Auth::$config["debug_mode"]) && in_array(Hybrid_Auth::$config["debug_mode"], array(true, 'info', 'error'), true) ){
-			$datetime = new DateTime();
-			$datetime =  $datetime->format(DATE_ATOM);
 
-			file_put_contents( 
-				Hybrid_Auth::$config["debug_file"], 
-				"ERROR -- " . $_SERVER['REMOTE_ADDR'] . " -- " . $datetime . " -- " . $message . " -- " . print_r($object, true) . "\n", 
-				FILE_APPEND
-			);
+	/**
+	 * Logs an error message with an object dump
+	 *
+	 * @param string   $message Error message
+	 * @param stdClass $object  Object being debugged
+	 * @return void
+	 */
+	public static function error($message, $object = null) {
+		if (isset(Hybrid_Auth::$config["debug_mode"]) && in_array(Hybrid_Auth::$config["debug_mode"], array(true, 'info', 'error'), true)) {
+      $dt = new DateTime('now', new DateTimeZone( 'UTC' ));
+			file_put_contents(Hybrid_Auth::$config["debug_file"], implode(' -- ', array(
+				'ERROR',
+				$_SERVER['REMOTE_ADDR'],
+				$dt->format(DATE_ATOM),
+				$message,
+				print_r($object, true) . PHP_EOL
+					)), FILE_APPEND);
 		}
 	}
+
+    /**
+     * Dumps the data in the way suitable to be output in log files for debug purposes
+     *
+     * @param mixed $data
+     *
+     * @return string
+     */
+    public static function dumpData($data) {
+		return var_export($data, true);
+	}
+
 }
diff --git a/e107_handlers/hybridauth/Hybrid/Provider_Adapter.php b/e107_handlers/hybridauth/Hybrid/Provider_Adapter.php
index 038d99d82..7809f6a82 100644
--- a/e107_handlers/hybridauth/Hybrid/Provider_Adapter.php
+++ b/e107_handlers/hybridauth/Hybrid/Provider_Adapter.php
@@ -1,128 +1,126 @@
 <?php
+
 /**
-* HybridAuth
-* http://hybridauth.sourceforge.net | http://github.com/hybridauth/hybridauth
-* (c) 2009-2014, HybridAuth authors | http://hybridauth.sourceforge.net/licenses.html
-*/
+ * HybridAuth
+ * http://hybridauth.sourceforge.net | http://github.com/hybridauth/hybridauth
+ * (c) 2009-2015, HybridAuth authors | http://hybridauth.sourceforge.net/licenses.html
+ */
 
 /**
  * Hybrid_Provider_Adapter is the basic class which Hybrid_Auth will use
- * to connect users to a given provider. 
- * 
+ * to connect users to a given provider.
+ *
  * Basically Hybrid_Provider_Adapter will create a bridge from your php
  * application to the provider api.
- * 
+ *
  * Hybrid_Auth will automatically load Hybrid_Provider_Adapter and create
  * an instance of it for each authenticated provider.
  */
-class Hybrid_Provider_Adapter
-{
+class Hybrid_Provider_Adapter {
+
 	/**
 	 * Provider ID (or unique name)
-	 * @var Numeric/String
+	 * @var mixed
 	 */
-	public $id       = NULL ;
+	public $id = null;
 
 	/**
 	 * Provider adapter specific config
-	 * @var Array
+	 * @var array
 	 */
-	public $config   = NULL ;
+	public $config = null;
 
 	/**
 	 * Provider adapter extra parameters
 	 * @var array
 	 */
-	public $params   = array() ; 
+	public $params = array();
 
 	/**
 	 * Provider adapter wrapper path
-	 * @var String
+	 * @var string
 	 */
-	public $wrapper  = NULL ;
+	public $wrapper = null;
 
 	/**
 	 * Provider adapter instance
-	 * @var object
+	 * @var Hybrid_Provider_Model
 	 */
-	public $adapter  = NULL ;
-
-	// --------------------------------------------------------------------
+	public $adapter = null;
 
 	/**
-	* create a new adapter switch IDp name or ID
-	*
-	* @param string  $id      The id or name of the IDp
-	* @param array   $params  (optional) required parameters by the adapter 
-	*/
-	function factory( $id, $params = array() )
-	{
-		Hybrid_Logger::info( "Enter Hybrid_Provider_Adapter::factory( $id )" );
+	 * Create a new adapter switch IDp name or ID
+	 *
+	 * @param string $id     The id or name of the IDp
+	 * @param array  $params (optional) required parameters by the adapter
+	 * @return Hybrid_Provider_Adapter
+	 * @throws Exception
+	 */
+	function factory($id, $params = array()) {
+		Hybrid_Logger::info("Enter Hybrid_Provider_Adapter::factory( $id )");
 
 		# init the adapter config and params
-		$this->id     = $id;
+		$this->id = $id;
 		$this->params = $params;
-		$this->id     = $this->getProviderCiId( $this->id );
-		$this->config = $this->getConfigById( $this->id );
+		$this->id = $this->getProviderCiId($this->id);
+		$this->config = $this->getConfigById($this->id);
 
 		# check the IDp id
-		if( ! $this->id ){
-			throw new Exception( "No provider ID specified.", 2 ); 
+		if (!$this->id) {
+			throw new Exception("No provider ID specified.", 2);
 		}
 
 		# check the IDp config
-		if( ! $this->config ){
-			throw new Exception( "Unknown Provider ID, check your configuration file.", 3 ); 
+		if (!$this->config) {
+			throw new Exception("Unknown Provider ID, check your configuration file.", 3);
 		}
 
 		# check the IDp adapter is enabled
-		if( ! $this->config["enabled"] ){
-			throw new Exception( "The provider '{$this->id}' is not enabled.", 3 );
+		if (!$this->config["enabled"]) {
+			throw new Exception("The provider '{$this->id}' is not enabled.", 3);
 		}
 
 		# include the adapter wrapper
-		if( isset( $this->config["wrapper"] ) && is_array( $this->config["wrapper"] ) ){
-			if (isset( $this->config["wrapper"]["path"] )) {
+		if (isset($this->config["wrapper"]) && is_array($this->config["wrapper"])) {
+			if (isset($this->config["wrapper"]["path"])) {
 				require_once $this->config["wrapper"]["path"];
 			}
 
-			if( ! class_exists( $this->config["wrapper"]["class"] ) ){
-				throw new Exception( "Unable to load the adapter class.", 3 );
+			if (!class_exists($this->config["wrapper"]["class"])) {
+				throw new Exception("Unable to load the adapter class.", 3);
 			}
 
 			$this->wrapper = $this->config["wrapper"]["class"];
-		}
-		else{ 
-			require_once Hybrid_Auth::$config["path_providers"] . $this->id . ".php" ;
+		} else {
+			require_once Hybrid_Auth::$config["path_providers"] . $this->id . ".php";
 
-			$this->wrapper = "Hybrid_Providers_" . $this->id; 
+			$this->wrapper = "Hybrid_Providers_" . $this->id;
 		}
 
 		# create the adapter instance, and pass the current params and config
-		$this->adapter = new $this->wrapper( $this->id, $this->config, $this->params );
+		$this->adapter = new $this->wrapper($this->id, $this->config, $this->params);
 
 		return $this;
 	}
 
-	// --------------------------------------------------------------------
-
 	/**
-	* Hybrid_Provider_Adapter::login(), prepare the user session and the authentication request
-	* for index.php
-	*/
-	function login()
-	{
-		Hybrid_Logger::info( "Enter Hybrid_Provider_Adapter::login( {$this->id} ) " );
+	 * Hybrid_Provider_Adapter::login(), prepare the user session and the authentication request
+	 * for index.php
+	 * @return void
+	 * @throw Exception
+	 */
+	function login() {
+		Hybrid_Logger::info("Enter Hybrid_Provider_Adapter::login( {$this->id} ) ");
 
-		if( ! $this->adapter ){
-			throw new Exception( "Hybrid_Provider_Adapter::login() should not directly used." );
+		if (!$this->adapter) {
+			throw new Exception("Hybrid_Provider_Adapter::login() should not directly used.");
 		}
 
 		// clear all unneeded params
-		foreach( Hybrid_Auth::$config["providers"] as $idpid => $params ){
-			Hybrid_Auth::storage()->delete( "hauth_session.{$idpid}.hauth_return_to"    );
-			Hybrid_Auth::storage()->delete( "hauth_session.{$idpid}.hauth_endpoint"     );
-			Hybrid_Auth::storage()->delete( "hauth_session.{$idpid}.id_provider_params" );
+		foreach (Hybrid_Auth::$config["providers"] as $idpid => $params) {
+			Hybrid_Auth::storage()->delete("hauth_session.{$idpid}.hauth_return_to");
+			Hybrid_Auth::storage()->delete("hauth_session.{$idpid}.hauth_endpoint");
+			Hybrid_Auth::storage()->delete("hauth_session.{$idpid}.id_provider_params");
 		}
 
 		// make a fresh start
@@ -130,9 +128,9 @@ class Hybrid_Provider_Adapter
 
 		# get hybridauth base url
 		if (empty(Hybrid_Auth::$config["base_url"])) {
-	        // the base url wasn't provide, so we must use the current
-	        // url (which makes sense actually)
-			$url  = empty($_SERVER['HTTPS']) || $_SERVER['HTTPS'] == 'off' ? 'http' : 'https';
+			// the base url wasn't provide, so we must use the current
+			// url (which makes sense actually)
+			$url = empty($_SERVER['HTTPS']) || $_SERVER['HTTPS'] == 'off' ? 'http' : 'https';
 			$url .= '://' . $_SERVER['HTTP_HOST'];
 			$url .= $_SERVER['REQUEST_URI'];
 			$HYBRID_AUTH_URL_BASE = $url;
@@ -140,183 +138,184 @@ class Hybrid_Provider_Adapter
 			$HYBRID_AUTH_URL_BASE = Hybrid_Auth::$config["base_url"];
 		}
 
-        // make sure params is array
-        if( !is_array( $this->params ) ){
-            $this->params = array();
-        }
+		// make sure params is array
+		if (!is_array($this->params)) {
+			$this->params = array();
+		}
 
 		# we make use of session_id() as storage hash to identify the current user
 		# using session_regenerate_id() will be a problem, but ..
 		$this->params["hauth_token"] = session_id();
 
 		# set request timestamp
-		$this->params["hauth_time"]  = time();
+		$this->params["hauth_time"] = time();
 
 		# for default HybridAuth endpoint url hauth_login_start_url
 		# 	auth.start  required  the IDp ID
 		# 	auth.time   optional  login request timestamp
-		$this->params["login_start"] = $HYBRID_AUTH_URL_BASE . ( strpos( $HYBRID_AUTH_URL_BASE, '?' ) ? '&' : '?' ) . "hauth.start={$this->id}&hauth.time={$this->params["hauth_time"]}";
+		$this->params["login_start"] = $HYBRID_AUTH_URL_BASE . ( strpos($HYBRID_AUTH_URL_BASE, '?') ? '&' : '?' ) . "hauth.start={$this->id}&hauth.time={$this->params["hauth_time"]}";
 
 		# for default HybridAuth endpoint url hauth_login_done_url
 		# 	auth.done   required  the IDp ID
-		$this->params["login_done"]  = $HYBRID_AUTH_URL_BASE . ( strpos( $HYBRID_AUTH_URL_BASE, '?' ) ? '&' : '?' ) . "hauth.done={$this->id}";
+		$this->params["login_done"] = $HYBRID_AUTH_URL_BASE . ( strpos($HYBRID_AUTH_URL_BASE, '?') ? '&' : '?' ) . "hauth.done={$this->id}";
 
-        if( isset( $this->params["hauth_return_to"] ) ){
-            Hybrid_Auth::storage()->set( "hauth_session.{$this->id}.hauth_return_to", $this->params["hauth_return_to"] );
-        }
-        if( isset( $this->params["login_done"] ) ){
-            Hybrid_Auth::storage()->set( "hauth_session.{$this->id}.hauth_endpoint" , $this->params["login_done"] ); 
-        }
-        Hybrid_Auth::storage()->set( "hauth_session.{$this->id}.id_provider_params" , $this->params );
+		if (isset($this->params["hauth_return_to"])) {
+			Hybrid_Auth::storage()->set("hauth_session.{$this->id}.hauth_return_to", $this->params["hauth_return_to"]);
+		}
+		if (isset($this->params["login_done"])) {
+			Hybrid_Auth::storage()->set("hauth_session.{$this->id}.hauth_endpoint", $this->params["login_done"]);
+		}
+		Hybrid_Auth::storage()->set("hauth_session.{$this->id}.id_provider_params", $this->params);
 
-		// store config to be used by the end point 
-		Hybrid_Auth::storage()->config( "CONFIG", Hybrid_Auth::$config );
+		// store config to be used by the end point
+		Hybrid_Auth::storage()->config("CONFIG", Hybrid_Auth::$config);
 
 		// move on
-		Hybrid_Logger::debug( "Hybrid_Provider_Adapter::login( {$this->id} ), redirect the user to login_start URL." );
+		Hybrid_Logger::debug("Hybrid_Provider_Adapter::login( {$this->id} ), redirect the user to login_start URL.");
 
-		Hybrid_Auth::redirect( $this->params["login_start"] );
+		Hybrid_Auth::redirect($this->params["login_start"]);
 	}
 
-	// --------------------------------------------------------------------
-
 	/**
-	* let hybridauth forget all about the user for the current provider
-	*/
-	function logout()
-	{
+	 * Let hybridauth forget all about the user for the current provider
+	 * @return bool
+	 */
+	function logout() {
 		$this->adapter->logout();
 	}
 
 	// --------------------------------------------------------------------
 
 	/**
-	* return true if the user is connected to the current provider
-	*/ 
-	public function isUserConnected()
-	{
+	 * Return true if the user is connected to the current provider
+	 * @return bool
+	 */
+	public function isUserConnected() {
 		return $this->adapter->isUserConnected();
 	}
 
 	// --------------------------------------------------------------------
 
 	/**
-	* handle :
-	*   getUserProfile()
-	*   getUserContacts()
-	*   getUserActivity() 
-	*   setUserStatus() 
-	*/ 
-	public function __call( $name, $arguments ) 
-	{
-		Hybrid_Logger::info( "Enter Hybrid_Provider_Adapter::$name(), Provider: {$this->id}" );
+	 * Call adapter methods defined in the adapter model:
+	 *   getUserProfile()
+	 *   getUserContacts()
+	 *   getUserActivity()
+	 *   setUserStatus()
+	 *
+	 * @param string $name      Method name
+	 * @param array  $arguments Call arguments
+	 * @return mixed
+	 * @throws Exception
+	 */
+	public function __call($name, $arguments) {
+		Hybrid_Logger::info("Enter Hybrid_Provider_Adapter::$name(), Provider: {$this->id}");
 
-		if ( ! $this->isUserConnected() ){
-			throw new Exception( "User not connected to the provider {$this->id}.", 7 );
-		} 
-
-		if ( ! method_exists( $this->adapter, $name ) ){
-			throw new Exception( "Call to undefined function Hybrid_Providers_{$this->id}::$name()." );
+		if (!$this->isUserConnected()) {
+			throw new Exception("User not connected to the provider {$this->id}.", 7);
 		}
 
-        $counter = count( $arguments );
-        if( $counter == 1 ){
-            return $this->adapter->$name( $arguments[0] ); 
-        }
-        elseif( $counter == 2 ){
-            return $this->adapter->$name( $arguments[0], $arguments[1] ); 
-        }
-        else{
-            return $this->adapter->$name(); 
-        }
+		if (!method_exists($this->adapter, $name)) {
+			throw new Exception("Call to undefined function Hybrid_Providers_{$this->id}::$name().");
+		}
+
+		$counter = count($arguments);
+		if ($counter == 1) {
+			return $this->adapter->$name($arguments[0]);
+		} elseif ($counter == 2) {
+			return $this->adapter->$name($arguments[0], $arguments[1]);
+		} else {
+			return $this->adapter->$name();
+		}
 	}
 
-	// --------------------------------------------------------------------
-
 	/**
-	* If the user is connected, then return the access_token and access_token_secret
-	* if the provider api use oauth
-	*/
-	public function getAccessToken()
-	{
-		if( ! $this->adapter->isUserConnected() ){
-			Hybrid_Logger::error( "User not connected to the provider." );
-
-			throw new Exception( "User not connected to the provider.", 7 );
+	 * If the user is connected, then return the access_token and access_token_secret
+	 * if the provider api use oauth
+	 *
+	 * <code>
+	 * array(
+	 *   'access_token' => '',
+	 *   'access_token_secret' => '',
+	 *   'refresh_token' => '',
+	 *   'expires_in' => '',
+	 *   'expires_at' => '',
+	 * )
+	 * </code>
+	 * @return array
+	 */
+	public function getAccessToken() {
+		if (!$this->adapter->isUserConnected()) {
+			Hybrid_Logger::error("User not connected to the provider.");
+			throw new Exception("User not connected to the provider.", 7);
 		}
 
-		return
-			ARRAY(
-				"access_token"        => $this->adapter->token( "access_token" )       , // OAuth access token
-				"access_token_secret" => $this->adapter->token( "access_token_secret" ), // OAuth access token secret
-				"refresh_token"       => $this->adapter->token( "refresh_token" )      , // OAuth refresh token
-				"expires_in"          => $this->adapter->token( "expires_in" )         , // OPTIONAL. The duration in seconds of the access token lifetime
-				"expires_at"          => $this->adapter->token( "expires_at" )         , // OPTIONAL. Timestamp when the access_token expire. if not provided by the social api, then it should be calculated: expires_at = now + expires_in
-			);
+		return array(
+			"access_token" => $this->adapter->token("access_token"), // OAuth access token
+			"access_token_secret" => $this->adapter->token("access_token_secret"), // OAuth access token secret
+			"refresh_token" => $this->adapter->token("refresh_token"), // OAuth refresh token
+			"expires_in" => $this->adapter->token("expires_in"), // OPTIONAL. The duration in seconds of the access token lifetime
+			"expires_at" => $this->adapter->token("expires_at"), // OPTIONAL. Timestamp when the access_token expire. if not provided by the social api, then it should be calculated: expires_at = now + expires_in
+		);
 	}
 
-	// --------------------------------------------------------------------
-
 	/**
-	* Naive getter of the current connected IDp API client
-	*/
-	function api()
-	{
-		if( ! $this->adapter->isUserConnected() ){
-			Hybrid_Logger::error( "User not connected to the provider." );
+	 * Naive getter of the current connected IDp API client
+	 * @return stdClass
+	 * @throws Exception
+	 */
+	function api() {
+		if (!$this->adapter->isUserConnected()) {
+			Hybrid_Logger::error("User not connected to the provider.");
 
-			throw new Exception( "User not connected to the provider.", 7 );
+			throw new Exception("User not connected to the provider.", 7);
 		}
-
 		return $this->adapter->api;
 	}
 
-	// --------------------------------------------------------------------
-
 	/**
-	* redirect the user to hauth_return_to (the callback url)
-	*/
-	function returnToCallbackUrl()
-	{ 
+	 * Redirect the user to hauth_return_to (the callback url)
+	 * @return void
+	 */
+	function returnToCallbackUrl() {
 		// get the stored callback url
-		$callback_url = Hybrid_Auth::storage()->get( "hauth_session.{$this->id}.hauth_return_to" );
+		$callback_url = Hybrid_Auth::storage()->get("hauth_session.{$this->id}.hauth_return_to");
 
 		// remove some unneeded stored data
-		Hybrid_Auth::storage()->delete( "hauth_session.{$this->id}.hauth_return_to"    );
-		Hybrid_Auth::storage()->delete( "hauth_session.{$this->id}.hauth_endpoint"     );
-		Hybrid_Auth::storage()->delete( "hauth_session.{$this->id}.id_provider_params" );
+		Hybrid_Auth::storage()->delete("hauth_session.{$this->id}.hauth_return_to");
+		Hybrid_Auth::storage()->delete("hauth_session.{$this->id}.hauth_endpoint");
+		Hybrid_Auth::storage()->delete("hauth_session.{$this->id}.id_provider_params");
 
 		// back to home
-		Hybrid_Auth::redirect( $callback_url );
+		Hybrid_Auth::redirect($callback_url);
 	}
 
-	// --------------------------------------------------------------------
-
 	/**
-	* return the provider config by id
-	*/
-	function getConfigById( $id )
-	{ 
-		if( isset( Hybrid_Auth::$config["providers"][$id] ) ){
+	 * Return the provider config by id
+	 *
+	 * @param string $id Config key
+	 * @return mixed
+	 */
+	function getConfigById($id) {
+		if (isset(Hybrid_Auth::$config["providers"][$id])) {
 			return Hybrid_Auth::$config["providers"][$id];
 		}
-
-		return NULL;
+		return null;
 	}
 
-	// --------------------------------------------------------------------
-
 	/**
-	* return the provider config by id; insensitive
-	*/
-	function getProviderCiId( $id )
-	{
-		foreach( Hybrid_Auth::$config["providers"] as $idpid => $params ){
-			if( strtolower( $idpid ) == strtolower( $id ) ){
+	 * Return the provider config by id; case insensitive
+	 *
+	 * @param string $id Provider id
+	 * @return mixed
+	 */
+	function getProviderCiId($id) {
+		foreach (Hybrid_Auth::$config["providers"] as $idpid => $params) {
+			if (strtolower($idpid) == strtolower($id)) {
 				return $idpid;
 			}
 		}
-
-		return NULL;
+		return null;
 	}
+
 }
diff --git a/e107_handlers/hybridauth/Hybrid/Provider_Model.php b/e107_handlers/hybridauth/Hybrid/Provider_Model.php
index f3fb347d8..d044bd540 100644
--- a/e107_handlers/hybridauth/Hybrid/Provider_Model.php
+++ b/e107_handlers/hybridauth/Hybrid/Provider_Model.php
@@ -1,9 +1,10 @@
 <?php
+
 /**
-* HybridAuth
-* http://hybridauth.sourceforge.net | http://github.com/hybridauth/hybridauth
-* (c) 2009-2014, HybridAuth authors | http://hybridauth.sourceforge.net/licenses.html 
-*/
+ * HybridAuth
+ * http://hybridauth.sourceforge.net | http://github.com/hybridauth/hybridauth
+ * (c) 2009-2015, HybridAuth authors | http://hybridauth.sourceforge.net/licenses.html
+ */
 
 /**
  * Hybrid_Provider_Model provide a common interface for supported IDps on HybridAuth.
@@ -19,245 +20,225 @@
  *   Class Hybrid_Provider_Model_OAuth1 for providers that uses the OAuth 1 protocol.
  *   Class Hybrid_Provider_Model_OAuth2 for providers that uses the OAuth 2 protocol.
  */
-abstract class Hybrid_Provider_Model
-{
-	/**
-	 * IDp ID (or unique name)
-	 * @var Numeric/String
-	 */
-	public $providerId = NULL;
+abstract class Hybrid_Provider_Model {
 
-	/**
-	 * specific provider adapter config
-	 * @var array
-	 */
-	public $config     = NULL;
+  /**
+   * IDp ID (or unique name)
+   * @var mixed
+   */
+  public $providerId = null;
 
-   	/**
-	 * provider extra parameters
-	 * @var array
-	 */
-	public $params     = NULL;
+  /**
+   * Specific provider adapter config
+   * @var array
+   */
+  public $config = null;
 
-	/**
-	 * Endpoint URL for that provider
-	 * @var String
-	 */
-	public $endpoint   = NULL; 
+  /**
+   * Provider extra parameters
+   * @var array
+   */
+  public $params = null;
 
-	/**
-	 * Hybrid_User obj, represents the current loggedin user
-	 * @var object
-	 */
-	public $user       = NULL;
+  /**
+   * Endpoint URL for that provider
+   * @var string
+   */
+  public $endpoint = null;
 
-	/**
-	 * the provider api client (optional)
-	 * @var String
-	 */
-	public $api        = NULL; 
+  /**
+   * Hybrid_User obj, represents the current loggedin user
+   * @var Hybrid_User
+   */
+  public $user = null;
 
-	/**
-	 * Common providers adapter constructor
-	 * @param Numeric/String $providerId
-	 * @param Array $config
-	 * @param Array $params
-	 */
-	function __construct( $providerId, $config, $params = NULL )
-	{
-		# init the IDp adapter parameters, get them from the cache if possible
-		if( ! $params ){
-			$this->params = Hybrid_Auth::storage()->get( "hauth_session.$providerId.id_provider_params" );
-		}
-		else{
-			$this->params = $params;
-		}
+  /**
+   * The provider api client (optional)
+   * @var stdClass
+   */
+  public $api = null;
 
-		// idp id
-		$this->providerId = $providerId;
+  /**
+   * Model should use "gzip,deflate" for CURLOPT_ENCODING
+   * @var stdClass
+   */
+  public $compressed = false;
 
-		// set HybridAuth endpoint for this provider
-		$this->endpoint = Hybrid_Auth::storage()->get( "hauth_session.$providerId.hauth_endpoint" );
+  /**
+   * Common providers adapter constructor
+   *
+   * @param mixed $providerId Provider ID
+   * @param array $config     Provider adapter config
+   * @param array $params     Provider extra params
+   */
+  function __construct($providerId, $config, $params = null) {
+    # init the IDp adapter parameters, get them from the cache if possible
+    if (!$params) {
+      $this->params = Hybrid_Auth::storage()->get("hauth_session.$providerId.id_provider_params");
+    } else {
+      $this->params = $params;
+    }
 
-		// idp config
-		$this->config = $config;
+    // idp id
+    $this->providerId = $providerId;
 
-		// new user instance
-		$this->user = new Hybrid_User();
-		$this->user->providerId = $providerId;
+    // set HybridAuth endpoint for this provider
+    $this->endpoint = Hybrid_Auth::storage()->get("hauth_session.$providerId.hauth_endpoint");
 
-		// initialize the current provider adapter
-		$this->initialize(); 
+    // idp config
+    $this->config = $config;
 
-		Hybrid_Logger::debug( "Hybrid_Provider_Model::__construct( $providerId ) initialized. dump current adapter instance: ", serialize( $this ) );
-	}
+    // new user instance
+    $this->user = new Hybrid_User();
+    $this->user->providerId = $providerId;
 
-	// --------------------------------------------------------------------
+    // initialize the current provider adapter
+    $this->initialize();
 
-	/**
-	* IDp wrappers initializer
-	*
-	* The main job of wrappers initializer is to performs (depend on the IDp api client it self): 
-	*     - include some libs needed by this provider,
-	*     - check IDp key and secret,
-	*     - set some needed parameters (stored in $this->params) by this IDp api client
-	*     - create and setup an instance of the IDp api client on $this->api 
-	*/
-	abstract protected function initialize(); 
+    Hybrid_Logger::debug("Hybrid_Provider_Model::__construct( $providerId ) initialized. dump current adapter instance: ", serialize($this));
+  }
 
-	// --------------------------------------------------------------------
+  /**
+   * IDp wrappers initializer
+   *
+   * The main job of wrappers initializer is to performs (depend on the IDp api client it self):
+   *     - include some libs needed by this provider,
+   *     - check IDp key and secret,
+   *     - set some needed parameters (stored in $this->params) by this IDp api client
+   *     - create and setup an instance of the IDp api client on $this->api
+   *
+   * @return void
+   * @throws Exception
+   */
+  abstract protected function initialize();
 
-	/**
-	* begin login 
-	*/
-	abstract protected function loginBegin();
+  /**
+   * Begin login
+   *
+   * @return void
+   * @throws Exception
+   */
+  abstract protected function loginBegin();
 
-	// --------------------------------------------------------------------
+  /**
+   * Finish login
+   * @return void
+   * @throws Exception
+   */
+  abstract protected function loginFinish();
 
-	/**
-	* finish login
-	*/
-	abstract protected function loginFinish();
+  /**
+   * Generic logout, just erase current provider adapter stored data to let Hybrid_Auth all forget about it
+   * @return bool
+   */
+  function logout() {
+    Hybrid_Logger::info("Enter [{$this->providerId}]::logout()");
+    $this->clearTokens();
+    return true;
+  }
 
-	// --------------------------------------------------------------------
+  /**
+   * Grab the user profile from the IDp api client
+   * @return Hybrid_User_Profile
+   * @throw Exception
+   */
+  function getUserProfile() {
+    Hybrid_Logger::error("HybridAuth do not provide users contacts list for {$this->providerId} yet.");
+    throw new Exception("Provider does not support this feature.", 8);
+  }
 
-   	/**
-	* generic logout, just erase current provider adapter stored data to let Hybrid_Auth all forget about it
-	*/
-	function logout()
-	{
-		Hybrid_Logger::info( "Enter [{$this->providerId}]::logout()" );
+  /**
+   * Load the current logged in user contacts list from the IDp api client
+   * @return Hybrid_User_Contact[]
+   * @throws Exception
+   */
+  function getUserContacts() {
+    Hybrid_Logger::error("HybridAuth do not provide users contacts list for {$this->providerId} yet.");
+    throw new Exception("Provider does not support this feature.", 8);
+  }
 
-		$this->clearTokens();
+  /**
+   * Return the user activity stream
+   * @return Hybrid_User_Activity[]
+   * @throws Exception
+   */
+  function getUserActivity($stream) {
+    Hybrid_Logger::error("HybridAuth do not provide user's activity stream for {$this->providerId} yet.");
+    throw new Exception("Provider does not support this feature.", 8);
+  }
 
-		return TRUE;
-	}
+  /**
+   * Set user status
+   * @return mixed Provider response
+   * @throws Exception
+   */
+  function setUserStatus($status) {
+    Hybrid_Logger::error("HybridAuth do not provide user's activity stream for {$this->providerId} yet.");
+    throw new Exception("Provider does not support this feature.", 8);
+  }
 
-	// --------------------------------------------------------------------
+  /**
+   * Return the user status
+   * @return mixed Provider response
+   * @throws Exception
+   */
+  function getUserStatus($statusid) {
+    Hybrid_Logger::error("HybridAuth do not provide user's status for {$this->providerId} yet.");
+    throw new Exception("Provider does not support this feature.", 8);
+  }
 
-	/**
-	* grab the user profile from the IDp api client
-	*/
-	function getUserProfile()
-	{
-		Hybrid_Logger::error( "HybridAuth do not provide users contacts list for {$this->providerId} yet." );
-		
-		throw new Exception( "Provider does not support this feature.", 8 ); 
-	}
+  /**
+   * Return true if the user is connected to the current provider
+   * @return bool
+   */
+  public function isUserConnected() {
+    return (bool) Hybrid_Auth::storage()->get("hauth_session.{$this->providerId}.is_logged_in");
+  }
 
-	// --------------------------------------------------------------------
+  /**
+   * Set user to connected
+   * @return void
+   */
+  public function setUserConnected() {
+    Hybrid_Logger::info("Enter [{$this->providerId}]::setUserConnected()");
+    Hybrid_Auth::storage()->set("hauth_session.{$this->providerId}.is_logged_in", 1);
+  }
 
-	/**
-	* load the current logged in user contacts list from the IDp api client  
-	*/
-	function getUserContacts() 
-	{
-		Hybrid_Logger::error( "HybridAuth do not provide users contacts list for {$this->providerId} yet." );
-		
-		throw new Exception( "Provider does not support this feature.", 8 ); 
-	}
+  /**
+   * Set user to unconnected
+   * @return void
+   */
+  public function setUserUnconnected() {
+    Hybrid_Logger::info("Enter [{$this->providerId}]::setUserUnconnected()");
+    Hybrid_Auth::storage()->set("hauth_session.{$this->providerId}.is_logged_in", 0);
+  }
 
-	// --------------------------------------------------------------------
+  /**
+   * Get or set a token
+   * @return string
+   */
+  public function token($token, $value = null) {
+    if ($value === null) {
+      return Hybrid_Auth::storage()->get("hauth_session.{$this->providerId}.token.$token");
+    } else {
+      Hybrid_Auth::storage()->set("hauth_session.{$this->providerId}.token.$token", $value);
+    }
+  }
 
-	/**
-	* return the user activity stream  
-	*/
-	function getUserActivity( $stream ) 
-	{
-		Hybrid_Logger::error( "HybridAuth do not provide user's activity stream for {$this->providerId} yet." ); 
-		
-		throw new Exception( "Provider does not support this feature.", 8 ); 
-	}
+  /**
+   * Delete a stored token
+   * @return void
+   */
+  public function deleteToken($token) {
+    Hybrid_Auth::storage()->delete("hauth_session.{$this->providerId}.token.$token");
+  }
 
-	// --------------------------------------------------------------------
+  /**
+   * Clear all existent tokens for this provider
+   * @return void
+   */
+  public function clearTokens() {
+    Hybrid_Auth::storage()->deleteMatch("hauth_session.{$this->providerId}.");
+  }
 
-	/**
-	* set user status
-	*/ 
-	function setUserStatus( $status )
-	{
-		Hybrid_Logger::error( "HybridAuth do not provide user's activity stream for {$this->providerId} yet." ); 
-		
-		throw new Exception( "Provider does not support this feature.", 8 ); 
-	}
-
-
-	/**
-	* return the user status
-	*/ 
-	function getUserStatus( $statusid )
-	{
-		Hybrid_Logger::error( "HybridAuth do not provide user's status for {$this->providerId} yet." ); 
-		
-		throw new Exception( "Provider does not support this feature.", 8 ); 
-	}
-
-	// --------------------------------------------------------------------
-
-	/**
-	* return true if the user is connected to the current provider
-	*/ 
-	public function isUserConnected()
-	{
-		return (bool) Hybrid_Auth::storage()->get( "hauth_session.{$this->providerId}.is_logged_in" );
-	}
-
-	// --------------------------------------------------------------------
-
-	/**
-	* set user to connected 
-	*/ 
-	public function setUserConnected()
-	{
-		Hybrid_Logger::info( "Enter [{$this->providerId}]::setUserConnected()" );
-		
-		Hybrid_Auth::storage()->set( "hauth_session.{$this->providerId}.is_logged_in", 1 );
-	}
-
-	// --------------------------------------------------------------------
-
-	/**
-	* set user to unconnected 
-	*/ 
-	public function setUserUnconnected()
-	{
-		Hybrid_Logger::info( "Enter [{$this->providerId}]::setUserUnconnected()" );
-		
-		Hybrid_Auth::storage()->set( "hauth_session.{$this->providerId}.is_logged_in", 0 ); 
-	}
-
-	// --------------------------------------------------------------------
-
-	/**
-	* get or set a token 
-	*/ 
-	public function token( $token, $value = NULL )
-	{
-		if( $value === NULL ){
-			return Hybrid_Auth::storage()->get( "hauth_session.{$this->providerId}.token.$token" );
-		}
-		else{
-			Hybrid_Auth::storage()->set( "hauth_session.{$this->providerId}.token.$token", $value );
-		}
-	}
-
-	// --------------------------------------------------------------------
-
-	/**
-	* delete a stored token 
-	*/ 
-	public function deleteToken( $token )
-	{
-		Hybrid_Auth::storage()->delete( "hauth_session.{$this->providerId}.token.$token" );
-	}
-
-	// --------------------------------------------------------------------
-
-	/**
-	* clear all existent tokens for this provider
-	*/ 
-	public function clearTokens()
-	{ 
-		Hybrid_Auth::storage()->deleteMatch( "hauth_session.{$this->providerId}." );
-	}
 }
diff --git a/e107_handlers/hybridauth/Hybrid/Provider_Model_OAuth1.php b/e107_handlers/hybridauth/Hybrid/Provider_Model_OAuth1.php
index 4b245cbf3..23fd2d38d 100644
--- a/e107_handlers/hybridauth/Hybrid/Provider_Model_OAuth1.php
+++ b/e107_handlers/hybridauth/Hybrid/Provider_Model_OAuth1.php
@@ -1,14 +1,15 @@
 <?php
+
 /**
-* HybridAuth
-* http://hybridauth.sourceforge.net | http://github.com/hybridauth/hybridauth
-* (c) 2009-2014, HybridAuth authors | http://hybridauth.sourceforge.net/licenses.html 
-*/
+ * HybridAuth
+ * http://hybridauth.sourceforge.net | http://github.com/hybridauth/hybridauth
+ * (c) 2009-2015, HybridAuth authors | http://hybridauth.sourceforge.net/licenses.html
+ */
 
 /**
  * To implement an OAuth 1 based service provider, Hybrid_Provider_Model_OAuth1
- * can be used to save the hassle of the authentication flow. 
- * 
+ * can be used to save the hassle of the authentication flow.
+ *
  * Each class that inherit from Hybrid_Provider_Model_OAuth1 have to implement
  * at least 2 methods:
  *   Hybrid_Providers_{provider_name}::initialize()     to setup the provider api end-points urls
@@ -17,155 +18,157 @@
  * Hybrid_Provider_Model_OAuth1 use OAuth1Client v0.1 which can be found on
  * Hybrid/thirdparty/OAuth/OAuth1Client.php
  */
-class Hybrid_Provider_Model_OAuth1 extends Hybrid_Provider_Model
-{
+class Hybrid_Provider_Model_OAuth1 extends Hybrid_Provider_Model {
+
 	/**
-	 * request_tokens as received from provider
-	 * @var object
+	 * Provider API client
+	 * @var OAuth1Client 
+	 */
+	public $api = null;
+
+	/**
+	 * Request_tokens as received from provider
+	 * @var stdClas
 	 */
 	public $request_tokens_raw = null;
-	
+
 	/**
-	 * access_tokens as received from provider
-	 * @var object
+	 * Access_tokens as received from provider
+	 * @var stdClass
 	 */
-	public $access_tokens_raw  = null;
-	
+	public $access_tokens_raw = null;
+
 	/**
-	* Try to get the error message from provider api
-	* @param Numeric $code
-	*/ 
-	function errorMessageByStatus( $code = null ) { 
-		$http_status_codes = ARRAY(
+	 * Try to get the error message from provider api
+	 *
+	 * @param int $code Error code
+	 * @return string
+	 */
+	function errorMessageByStatus($code = null) {
+		$http_status_codes = array(
 			200 => "OK: Success!",
 			304 => "Not Modified: There was no new data to return.",
 			400 => "Bad Request: The request was invalid.",
 			401 => "Unauthorized.",
 			403 => "Forbidden: The request is understood, but it has been refused.",
 			404 => "Not Found: The URI requested is invalid or the resource requested does not exists.",
-			406 => "Not Acceptable.", 
+			406 => "Not Acceptable.",
 			500 => "Internal Server Error: Something is broken.",
 			502 => "Bad Gateway.",
 			503 => "Service Unavailable."
 		);
 
-		if( ! $code && $this->api ) 
+		if (!$code && $this->api) {
 			$code = $this->api->http_code;
+		}
 
-		if( isset( $http_status_codes[ $code ] ) )
-			return $code . " " . $http_status_codes[ $code ];
+		if (isset($http_status_codes[$code])) {
+			return $code . " " . $http_status_codes[$code];
+		}
 	}
 
-	// --------------------------------------------------------------------
-
 	/**
-	* adapter initializer 
-	*/
-	function initialize()
-	{
+	 * {@inheritdoc}
+	 */
+	function initialize() {
 		// 1 - check application credentials
-		if ( ! $this->config["keys"]["key"] || ! $this->config["keys"]["secret"] ){
-			throw new Exception( "Your application key and secret are required in order to connect to {$this->providerId}.", 4 );
+		if (!$this->config["keys"]["key"] || !$this->config["keys"]["secret"]) {
+			throw new Exception("Your application key and secret are required in order to connect to {$this->providerId}.", 4);
 		}
 
 		// 2 - include OAuth lib and client
-		require_once Hybrid_Auth::$config["path_libraries"] . "OAuth/OAuth.php";
-		require_once Hybrid_Auth::$config["path_libraries"] . "OAuth/OAuth1Client.php";
+		if (! class_exists('OAuthConsumer') ) {
+          		require_once Hybrid_Auth::$config["path_libraries"] . "OAuth/OAuth.php";
+		}	
+        	require_once Hybrid_Auth::$config["path_libraries"] . "OAuth/OAuth1Client.php";
 
 		// 3.1 - setup access_token if any stored
-		if( $this->token( "access_token" ) ){
-			$this->api = new OAuth1Client( 
-				$this->config["keys"]["key"], $this->config["keys"]["secret"],
-				$this->token( "access_token" ), $this->token( "access_token_secret" ) 
+		if ($this->token("access_token")) {
+			$this->api = new OAuth1Client(
+					$this->config["keys"]["key"], $this->config["keys"]["secret"], $this->token("access_token"), $this->token("access_token_secret")
 			);
 		}
 
 		// 3.2 - setup request_token if any stored, in order to exchange with an access token
-		elseif( $this->token( "request_token" ) ){
-			$this->api = new OAuth1Client( 
-				$this->config["keys"]["key"], $this->config["keys"]["secret"], 
-				$this->token( "request_token" ), $this->token( "request_token_secret" ) 
+		elseif ($this->token("request_token")) {
+			$this->api = new OAuth1Client(
+					$this->config["keys"]["key"], $this->config["keys"]["secret"], $this->token("request_token"), $this->token("request_token_secret")
 			);
 		}
 
 		// 3.3 - instanciate OAuth client with client credentials
-		else{
-			$this->api = new OAuth1Client( $this->config["keys"]["key"], $this->config["keys"]["secret"] );
+		else {
+			$this->api = new OAuth1Client($this->config["keys"]["key"], $this->config["keys"]["secret"]);
 		}
 
 		// Set curl proxy if exist
-		if( isset( Hybrid_Auth::$config["proxy"] ) ){
+		if (isset(Hybrid_Auth::$config["proxy"])) {
 			$this->api->curl_proxy = Hybrid_Auth::$config["proxy"];
 		}
 	}
 
-	// --------------------------------------------------------------------
-
 	/**
-	* begin login step 
-	*/
-	function loginBegin()
-	{
-		$tokens = $this->api->requestToken( $this->endpoint ); 
+	 * {@inheritdoc}
+	 */
+	function loginBegin() {
+		$tokens = $this->api->requestToken($this->endpoint);
 
 		// request tokens as received from provider
 		$this->request_tokens_raw = $tokens;
-		
+
 		// check the last HTTP status code returned
-		if ( $this->api->http_code != 200 ){
-			throw new Exception( "Authentication failed! {$this->providerId} returned an error. " . $this->errorMessageByStatus( $this->api->http_code ), 5 );
+		if ($this->api->http_code != 200) {
+			throw new Exception("Authentication failed! {$this->providerId} returned an error. " . $this->errorMessageByStatus($this->api->http_code), 5);
 		}
 
-		if ( ! isset( $tokens["oauth_token"] ) ){
-			throw new Exception( "Authentication failed! {$this->providerId} returned an invalid oauth token.", 5 );
+		if (!isset($tokens["oauth_token"])) {
+			throw new Exception("Authentication failed! {$this->providerId} returned an invalid oauth token.", 5);
 		}
 
-		$this->token( "request_token"       , $tokens["oauth_token"] ); 
-		$this->token( "request_token_secret", $tokens["oauth_token_secret"] ); 
+		$this->token("request_token", $tokens["oauth_token"]);
+		$this->token("request_token_secret", $tokens["oauth_token_secret"]);
 
 		# redirect the user to the provider authentication url
-		Hybrid_Auth::redirect( $this->api->authorizeUrl( $tokens ) );
+		Hybrid_Auth::redirect($this->api->authorizeUrl($tokens));
 	}
 
-	// --------------------------------------------------------------------
-
 	/**
-	* finish login step 
-	*/ 
-	function loginFinish()
-	{
-		$oauth_token    = (array_key_exists('oauth_token',$_REQUEST))?$_REQUEST['oauth_token']:"";
-		$oauth_verifier = (array_key_exists('oauth_verifier',$_REQUEST))?$_REQUEST['oauth_verifier']:"";
+	 * {@inheritdoc}
+	 */
+	function loginFinish() {
+		$oauth_token = (array_key_exists('oauth_token', $_REQUEST)) ? $_REQUEST['oauth_token'] : "";
+		$oauth_verifier = (array_key_exists('oauth_verifier', $_REQUEST)) ? $_REQUEST['oauth_verifier'] : "";
 
-		if ( ! $oauth_token || ! $oauth_verifier ){
-			throw new Exception( "Authentication failed! {$this->providerId} returned an invalid oauth verifier.", 5 );
+		if (!$oauth_token || !$oauth_verifier) {
+			throw new Exception("Authentication failed! {$this->providerId} returned an invalid oauth verifier.", 5);
 		}
 
 		// request an access token
-		$tokens = $this->api->accessToken( $oauth_verifier );
+		$tokens = $this->api->accessToken($oauth_verifier);
 
 		// access tokens as received from provider
 		$this->access_tokens_raw = $tokens;
 
 		// check the last HTTP status code returned
-		if ( $this->api->http_code != 200 ){
-			throw new Exception( "Authentication failed! {$this->providerId} returned an error. " . $this->errorMessageByStatus( $this->api->http_code ), 5 );
+		if ($this->api->http_code != 200) {
+			throw new Exception("Authentication failed! {$this->providerId} returned an error. " . $this->errorMessageByStatus($this->api->http_code), 5);
 		}
 
 		// we should have an access_token, or else, something has gone wrong
-		if ( ! isset( $tokens["oauth_token"] ) ){
-			throw new Exception( "Authentication failed! {$this->providerId} returned an invalid access token.", 5 );
+		if (!isset($tokens["oauth_token"])) {
+			throw new Exception("Authentication failed! {$this->providerId} returned an invalid access token.", 5);
 		}
 
 		// we no more need to store request tokens
-		$this->deleteToken( "request_token"        );
-		$this->deleteToken( "request_token_secret" );
+		$this->deleteToken("request_token");
+		$this->deleteToken("request_token_secret");
 
 		// store access_token for later user
-		$this->token( "access_token"        , $tokens['oauth_token'] );
-		$this->token( "access_token_secret" , $tokens['oauth_token_secret'] ); 
+		$this->token("access_token", $tokens['oauth_token']);
+		$this->token("access_token_secret", $tokens['oauth_token_secret']);
 
 		// set user as logged in to the current provider
-		$this->setUserConnected(); 
+		$this->setUserConnected();
 	}
+
 }
diff --git a/e107_handlers/hybridauth/Hybrid/Provider_Model_OAuth2.php b/e107_handlers/hybridauth/Hybrid/Provider_Model_OAuth2.php
index fc35a24b8..6159b8616 100644
--- a/e107_handlers/hybridauth/Hybrid/Provider_Model_OAuth2.php
+++ b/e107_handlers/hybridauth/Hybrid/Provider_Model_OAuth2.php
@@ -1,14 +1,15 @@
 <?php
+
 /**
-* HybridAuth
-* http://hybridauth.sourceforge.net | http://github.com/hybridauth/hybridauth
-* (c) 2009-2014, HybridAuth authors | http://hybridauth.sourceforge.net/licenses.html 
-*/
+ * HybridAuth
+ * http://hybridauth.sourceforge.net | http://github.com/hybridauth/hybridauth
+ * (c) 2009-2015, HybridAuth authors | http://hybridauth.sourceforge.net/licenses.html
+ */
 
 /**
  * To implement an OAuth 2 based service provider, Hybrid_Provider_Model_OAuth2
- * can be used to save the hassle of the authentication flow. 
- * 
+ * can be used to save the hassle of the authentication flow.
+ *
  * Each class that inherit from Hybrid_Provider_Model_OAuth2 have to implement
  * at least 2 methods:
  *   Hybrid_Providers_{provider_name}::initialize()     to setup the provider api end-points urls
@@ -17,164 +18,167 @@
  * Hybrid_Provider_Model_OAuth2 use OAuth2Client v0.1 which can be found on
  * Hybrid/thirdparty/OAuth/OAuth2Client.php
  */
-class Hybrid_Provider_Model_OAuth2 extends Hybrid_Provider_Model
-{ 
-	/**
-	 * default permissions
-	 * @var string
-	 */
-	public $scope = "";
+class Hybrid_Provider_Model_OAuth2 extends Hybrid_Provider_Model {
 
-	/**
-	* Try to get the error message from provider api
-	* @param Numeric $code
-	*/ 
-	function errorMessageByStatus( $code = null ) { 
-		$http_status_codes = ARRAY(
-			200 => "OK: Success!",
-			304 => "Not Modified: There was no new data to return.",
-			400 => "Bad Request: The request was invalid.",
-			401 => "Unauthorized.",
-			403 => "Forbidden: The request is understood, but it has been refused.",
-			404 => "Not Found: The URI requested is invalid or the resource requested does not exists.",
-			406 => "Not Acceptable.", 
-			500 => "Internal Server Error: Something is broken.",
-			502 => "Bad Gateway.",
-			503 => "Service Unavailable."
-		);
+  /**
+   * Default permissions
+   * @var string
+   */
+  public $scope = "";
 
-		if( ! $code && $this->api ) 
-			$code = $this->api->http_code;
+  /**
+   * Provider API wrapper
+   * @var OAuth2Client 
+   */
+  public $api = null;
 
-		if( isset( $http_status_codes[ $code ] ) )
-			return $code . " " . $http_status_codes[ $code ];
-	}
+  /**
+   * Try to get the error message from provider api
+   *
+   * @param int $code Error code
+   * @return string
+   */
+  function errorMessageByStatus($code = null) {
+    $http_status_codes = array(
+      200 => "OK: Success!",
+      304 => "Not Modified: There was no new data to return.",
+      400 => "Bad Request: The request was invalid.",
+      401 => "Unauthorized.",
+      403 => "Forbidden: The request is understood, but it has been refused.",
+      404 => "Not Found: The URI requested is invalid or the resource requested does not exists.",
+      406 => "Not Acceptable.",
+      500 => "Internal Server Error: Something is broken.",
+      502 => "Bad Gateway.",
+      503 => "Service Unavailable."
+    );
 
-	// --------------------------------------------------------------------
+    if (!$code && $this->api) {
+      $code = $this->api->http_code;
+    }
 
-	/**
-	* adapter initializer 
-	*/
-	function initialize() 
-	{
-		if ( ! $this->config["keys"]["id"] || ! $this->config["keys"]["secret"] ){
-			throw new Exception( "Your application id and secret are required in order to connect to {$this->providerId}.", 4 );
-		}
+    if (isset($http_status_codes[$code])) {
+      return $code . " " . $http_status_codes[$code];
+    }
+  }
 
- 		// override requested scope
-		if( isset( $this->config["scope"] ) && ! empty( $this->config["scope"] ) ){
-			$this->scope = $this->config["scope"];
-		}
+  /**
+   * Adapter initializer
+   */
+  function initialize() {
+    if (!$this->config["keys"]["id"] || !$this->config["keys"]["secret"]) {
+      throw new Exception("Your application id and secret are required in order to connect to {$this->providerId}.", 4);
+    }
 
-		// include OAuth2 client
-		require_once Hybrid_Auth::$config["path_libraries"] . "OAuth/OAuth2Client.php";
+    // override requested scope
+    if (isset($this->config["scope"]) && !empty($this->config["scope"])) {
+      $this->scope = $this->config["scope"];
+    }
 
-		// create a new OAuth2 client instance
-		$this->api = new OAuth2Client( $this->config["keys"]["id"], $this->config["keys"]["secret"], $this->endpoint );
+    // include OAuth2 client
+    require_once Hybrid_Auth::$config["path_libraries"] . "OAuth/OAuth2Client.php";
 
-		// If we have an access token, set it
-		if( $this->token( "access_token" ) ){
-			$this->api->access_token            = $this->token( "access_token" );
-			$this->api->refresh_token           = $this->token( "refresh_token" );
-			$this->api->access_token_expires_in = $this->token( "expires_in" );
-			$this->api->access_token_expires_at = $this->token( "expires_at" ); 
-		}
+    // create a new OAuth2 client instance
+    $this->api = new OAuth2Client($this->config["keys"]["id"], $this->config["keys"]["secret"], $this->endpoint, $this->compressed);
 
-		// Set curl proxy if exist
-		if( isset( Hybrid_Auth::$config["proxy"] ) ){
-			$this->api->curl_proxy = Hybrid_Auth::$config["proxy"];
-		}
-	}
+    // If we have an access token, set it
+    if ($this->token("access_token")) {
+      $this->api->access_token = $this->token("access_token");
+      $this->api->refresh_token = $this->token("refresh_token");
+      $this->api->access_token_expires_in = $this->token("expires_in");
+      $this->api->access_token_expires_at = $this->token("expires_at");
+    }
 
-	// --------------------------------------------------------------------
+    // Set curl proxy if exist
+    if (isset(Hybrid_Auth::$config["proxy"])) {
+      $this->api->curl_proxy = Hybrid_Auth::$config["proxy"];
+    }
+  }
 
-	/**
-	* begin login step 
-	*/
-	function loginBegin()
-	{
-		// redirect the user to the provider authentication url
-		Hybrid_Auth::redirect( $this->api->authorizeUrl( array( "scope" => $this->scope ) ) ); 
-	}
+  /**
+   * {@inheritdoc}
+   */
+  function loginBegin() {
+    // redirect the user to the provider authentication url
+    Hybrid_Auth::redirect($this->api->authorizeUrl(array("scope" => $this->scope)));
+  }
 
-	// --------------------------------------------------------------------
+  /**
+   * {@inheritdoc}
+   */
+  function loginFinish() {
+    $error = (array_key_exists('error', $_REQUEST)) ? $_REQUEST['error'] : "";
 
-	/**
-	* finish login step 
-	*/
-	function loginFinish()
-	{
-		$error = (array_key_exists('error',$_REQUEST))?$_REQUEST['error']:"";
+    // check for errors
+    if ($error) {
+      throw new Exception("Authentication failed! {$this->providerId} returned an error: $error", 5);
+    }
 
-		// check for errors
-		if ( $error ){ 
-			throw new Exception( "Authentication failed! {$this->providerId} returned an error: $error", 5 );
-		}
+    // try to authenticate user
+    $code = (array_key_exists('code', $_REQUEST)) ? $_REQUEST['code'] : "";
 
-		// try to authenticate user
-		$code = (array_key_exists('code',$_REQUEST))?$_REQUEST['code']:"";
+    try {
+      $this->api->authenticate($code);
+    } catch (Exception $e) {
+      throw new Exception("User profile request failed! {$this->providerId} returned an error: $e", 6);
+    }
 
-		try{
-			$this->api->authenticate( $code ); 
-		}
-		catch( Exception $e ){
-			throw new Exception( "User profile request failed! {$this->providerId} returned an error: $e", 6 );
-		}
+    // check if authenticated
+    if (!$this->api->access_token) {
+      throw new Exception("Authentication failed! {$this->providerId} returned an invalid access token.", 5);
+    }
 
-		// check if authenticated
-		if ( ! $this->api->access_token ){ 
-			throw new Exception( "Authentication failed! {$this->providerId} returned an invalid access token.", 5 );
-		}
+    // store tokens
+    $this->token("access_token", $this->api->access_token);
+    $this->token("refresh_token", $this->api->refresh_token);
+    $this->token("expires_in", $this->api->access_token_expires_in);
+    $this->token("expires_at", $this->api->access_token_expires_at);
 
-		// store tokens
-		$this->token( "access_token" , $this->api->access_token  );
-		$this->token( "refresh_token", $this->api->refresh_token );
-		$this->token( "expires_in"   , $this->api->access_token_expires_in );
-		$this->token( "expires_at"   , $this->api->access_token_expires_at );
+    // set user connected locally
+    $this->setUserConnected();
+  }
 
-		// set user connected locally
-		$this->setUserConnected();
-	}
-	
-	function refreshToken()
-	{
-		// have an access token?
-		if( $this->api->access_token ){
+  /**
+   * {@inheritdoc}
+   */
+  function refreshToken() {
+    // have an access token?
+    if ($this->api->access_token) {
 
-			// have to refresh?
-			if( $this->api->refresh_token && $this->api->access_token_expires_at ){
+      // have to refresh?
+      if ($this->api->refresh_token && $this->api->access_token_expires_at) {
 
-				// expired?
-				if( $this->api->access_token_expires_at <= time() ){ 
-					$response = $this->api->refreshToken( array( "refresh_token" => $this->api->refresh_token ) );
+        // expired?
+        if ($this->api->access_token_expires_at <= time()) {
+          $response = $this->api->refreshToken(array("refresh_token" => $this->api->refresh_token));
 
-					if( ! isset( $response->access_token ) || ! $response->access_token ){
-						// set the user as disconnected at this point and throw an exception
-						$this->setUserUnconnected();
+          if (!isset($response->access_token) || !$response->access_token) {
+            // set the user as disconnected at this point and throw an exception
+            $this->setUserUnconnected();
 
-						throw new Exception( "The Authorization Service has return an invalid response while requesting a new access token. " . (string) $response->error ); 
-					}
+            throw new Exception("The Authorization Service has return an invalid response while requesting a new access token. " . (string) $response->error);
+          }
 
-					// set new access_token
-					$this->api->access_token = $response->access_token;
+          // set new access_token
+          $this->api->access_token = $response->access_token;
 
-					if( isset( $response->refresh_token ) ) 
-					$this->api->refresh_token = $response->refresh_token; 
+          if (isset($response->refresh_token))
+            $this->api->refresh_token = $response->refresh_token;
 
-					if( isset( $response->expires_in ) ){
-						$this->api->access_token_expires_in = $response->expires_in;
+          if (isset($response->expires_in)) {
+            $this->api->access_token_expires_in = $response->expires_in;
 
-						// even given by some idp, we should calculate this
-						$this->api->access_token_expires_at = time() + $response->expires_in; 
-					}
-				}
-			}
+            // even given by some idp, we should calculate this
+            $this->api->access_token_expires_at = time() + $response->expires_in;
+          }
+        }
+      }
+
+      // re store tokens
+      $this->token("access_token", $this->api->access_token);
+      $this->token("refresh_token", $this->api->refresh_token);
+      $this->token("expires_in", $this->api->access_token_expires_in);
+      $this->token("expires_at", $this->api->access_token_expires_at);
+    }
+  }
 
-			// re store tokens
-			$this->token( "access_token" , $this->api->access_token  );
-			$this->token( "refresh_token", $this->api->refresh_token );
-			$this->token( "expires_in"   , $this->api->access_token_expires_in );
-			$this->token( "expires_at"   , $this->api->access_token_expires_at );
-		}
-	}
 }
diff --git a/e107_handlers/hybridauth/Hybrid/Provider_Model_OpenID.php b/e107_handlers/hybridauth/Hybrid/Provider_Model_OpenID.php
index 39dd3b3cb..08fa36cad 100644
--- a/e107_handlers/hybridauth/Hybrid/Provider_Model_OpenID.php
+++ b/e107_handlers/hybridauth/Hybrid/Provider_Model_OpenID.php
@@ -1,9 +1,10 @@
 <?php
+
 /**
-* HybridAuth
-* http://hybridauth.sourceforge.net | http://github.com/hybridauth/hybridauth
-* (c) 2009-2014, HybridAuth authors | http://hybridauth.sourceforge.net/licenses.html
-*/
+ * HybridAuth
+ * http://hybridauth.sourceforge.net | http://github.com/hybridauth/hybridauth
+ * (c) 2009-2015, HybridAuth authors | http://hybridauth.sourceforge.net/licenses.html
+ */
 
 /**
  * To implement an OpenID based service provider, Hybrid_Provider_Model_OpenID
@@ -15,22 +16,25 @@
  * Hybrid_Provider_Model_OpenID use LightOpenID lib which can be found on
  * Hybrid/thirdparty/OpenID/LightOpenID.php
  */
-class Hybrid_Provider_Model_OpenID extends Hybrid_Provider_Model
-{
+class Hybrid_Provider_Model_OpenID extends Hybrid_Provider_Model {
+
+	/**
+	 * Provider API client
+	 * @var LightOpenID
+	 */
+	public $api = null;
+
 	/**
 	 * Openid provider identifier
 	 * @var string
 	 */
 	public $openidIdentifier = "";
 
-	// --------------------------------------------------------------------
-
 	/**
-	* adapter initializer
-	*/
-	function initialize()
-	{
-		if( isset( $this->params["openid_identifier"] ) ){
+	 * {@inheritdoc}
+	 */
+	function initialize() {
+		if (isset($this->params["openid_identifier"])) {
 			$this->openidIdentifier = $this->params["openid_identifier"];
 		}
 
@@ -38,117 +42,106 @@ class Hybrid_Provider_Model_OpenID extends Hybrid_Provider_Model
 		require_once Hybrid_Auth::$config["path_libraries"] . "OpenID/LightOpenID.php";
 
 		// An error was occurring when proxy wasn't set. Not sure where proxy was meant to be set/initialized.
-		Hybrid_Auth::$config['proxy'] = isset(Hybrid_Auth::$config['proxy'])?Hybrid_Auth::$config['proxy']:'';
+		Hybrid_Auth::$config['proxy'] = isset(Hybrid_Auth::$config['proxy']) ? Hybrid_Auth::$config['proxy'] : '';
 
-		$hostPort = parse_url( Hybrid_Auth::$config["base_url"], PHP_URL_PORT);
-		$hostUrl = parse_url( Hybrid_Auth::$config["base_url"], PHP_URL_HOST);
+		$hostPort = parse_url(Hybrid_Auth::$config["base_url"], PHP_URL_PORT);
+		$hostUrl = parse_url(Hybrid_Auth::$config["base_url"], PHP_URL_HOST);
 
 		// Check for port on url
-		if($hostPort) {
-			$hostUrl .= ':'.$hostPort;
+		if ($hostPort) {
+			$hostUrl .= ':' . $hostPort;
 		}
 
-		$this->api = new LightOpenID( $hostUrl, Hybrid_Auth::$config["proxy"] );
+		$this->api = new LightOpenID($hostUrl, Hybrid_Auth::$config["proxy"]);
 	}
 
-	// --------------------------------------------------------------------
-
 	/**
-	* begin login step
-	*/
-	function loginBegin()
-	{
-		if( empty( $this->openidIdentifier ) ){
-			throw new Exception( "OpenID adapter require the identity provider identifier 'openid_identifier' as an extra parameter.", 4 );
+	 * {@inheritdoc}
+	 */
+	function loginBegin() {
+		if (empty($this->openidIdentifier)) {
+			throw new Exception("OpenID adapter require the identity provider identifier 'openid_identifier' as an extra parameter.", 4);
 		}
 
-		$this->api->identity  = $this->openidIdentifier;
+		$this->api->identity = $this->openidIdentifier;
 		$this->api->returnUrl = $this->endpoint;
-		$this->api->required  = ARRAY(
-			'namePerson/first'       ,
-			'namePerson/last'        ,
-			'namePerson/friendly'    ,
-			'namePerson'             ,
-
-			'contact/email'          ,
-
-			'birthDate'              ,
-			'birthDate/birthDay'     ,
-			'birthDate/birthMonth'   ,
-			'birthDate/birthYear'    ,
-
-			'person/gender'          ,
-			'pref/language'          ,
-
+		$this->api->required = array(
+			'namePerson/first',
+			'namePerson/last',
+			'namePerson/friendly',
+			'namePerson',
+			'contact/email',
+			'birthDate',
+			'birthDate/birthDay',
+			'birthDate/birthMonth',
+			'birthDate/birthYear',
+			'person/gender',
+			'pref/language',
 			'contact/postalCode/home',
-			'contact/city/home'      ,
-			'contact/country/home'   ,
-
-			'media/image/default'    ,
+			'contact/city/home',
+			'contact/country/home',
+			'media/image/default',
 		);
 
 		# redirect the user to the provider authentication url
-		Hybrid_Auth::redirect( $this->api->authUrl() );
+		Hybrid_Auth::redirect($this->api->authUrl());
 	}
 
-	// --------------------------------------------------------------------
-
 	/**
-	* finish login step
-	*/
-	function loginFinish()
-	{
+	 * {@inheritdoc}
+	 */
+	function loginFinish() {
 		# if user don't grant access of their data to your site, halt with an Exception
-		if( $this->api->mode == 'cancel'){
-			throw new Exception( "Authentication failed! User has canceled authentication!", 5 );
+		if ($this->api->mode == 'cancel') {
+			throw new Exception("Authentication failed! User has canceled authentication!", 5);
 		}
 
 		# if something goes wrong
-		if( ! $this->api->validate() ){
-			throw new Exception( "Authentication failed. Invalid request received!", 5 );
+		if (!$this->api->validate()) {
+			throw new Exception("Authentication failed. Invalid request received!", 5);
 		}
 
 		# fetch received user data
 		$response = $this->api->getAttributes();
 
 		# store the user profile
-		$this->user->profile->identifier  = $this->api->identity;
+		$this->user->profile->identifier = $this->api->identity;
 
-		$this->user->profile->firstName   = (array_key_exists("namePerson/first",$response))?$response["namePerson/first"]:"";
-		$this->user->profile->lastName    = (array_key_exists("namePerson/last",$response))?$response["namePerson/last"]:"";
-		$this->user->profile->displayName = (array_key_exists("namePerson",$response))?$response["namePerson"]:"";
-		$this->user->profile->email       = (array_key_exists("contact/email",$response))?$response["contact/email"]:"";
-		$this->user->profile->language    = (array_key_exists("pref/language",$response))?$response["pref/language"]:"";
-		$this->user->profile->country     = (array_key_exists("contact/country/home",$response))?$response["contact/country/home"]:"";
-		$this->user->profile->zip         = (array_key_exists("contact/postalCode/home",$response))?$response["contact/postalCode/home"]:"";
-		$this->user->profile->gender      = (array_key_exists("person/gender",$response))?$response["person/gender"]:"";
-		$this->user->profile->photoURL    = (array_key_exists("media/image/default",$response))?$response["media/image/default"]:"";
+		$this->user->profile->firstName = (array_key_exists("namePerson/first", $response)) ? $response["namePerson/first"] : "";
+		$this->user->profile->lastName = (array_key_exists("namePerson/last", $response)) ? $response["namePerson/last"] : "";
+		$this->user->profile->displayName = (array_key_exists("namePerson", $response)) ? $response["namePerson"] : "";
+		$this->user->profile->email = (array_key_exists("contact/email", $response)) ? $response["contact/email"] : "";
+		$this->user->profile->language = (array_key_exists("pref/language", $response)) ? $response["pref/language"] : "";
+		$this->user->profile->country = (array_key_exists("contact/country/home", $response)) ? $response["contact/country/home"] : "";
+		$this->user->profile->zip = (array_key_exists("contact/postalCode/home", $response)) ? $response["contact/postalCode/home"] : "";
+		$this->user->profile->gender = (array_key_exists("person/gender", $response)) ? $response["person/gender"] : "";
+		$this->user->profile->photoURL = (array_key_exists("media/image/default", $response)) ? $response["media/image/default"] : "";
 
-		$this->user->profile->birthDay    = (array_key_exists("birthDate/birthDay",$response))?$response["birthDate/birthDay"]:"";
-		$this->user->profile->birthMonth  = (array_key_exists("birthDate/birthMonth",$response))?$response["birthDate/birthMonth"]:"";
-		$this->user->profile->birthYear   = (array_key_exists("birthDate/birthDate",$response))?$response["birthDate/birthDate"]:"";
+		$this->user->profile->birthDay = (array_key_exists("birthDate/birthDay", $response)) ? $response["birthDate/birthDay"] : "";
+		$this->user->profile->birthMonth = (array_key_exists("birthDate/birthMonth", $response)) ? $response["birthDate/birthMonth"] : "";
+		$this->user->profile->birthYear = (array_key_exists("birthDate/birthDate", $response)) ? $response["birthDate/birthDate"] : "";
 
-		if( isset( $response['namePerson/friendly'] ) && ! empty( $response['namePerson/friendly'] ) && ! $this->user->profile->displayName ) {
+		if (isset($response['namePerson/friendly']) && !empty($response['namePerson/friendly']) && !$this->user->profile->displayName) {
 			$this->user->profile->displayName = $response["namePerson/friendly"];
 		}
 
-		if( isset( $response['birthDate'] ) && ! empty( $response['birthDate'] ) && ! $this->user->profile->birthDay ) {
+		if (isset($response['birthDate']) && !empty($response['birthDate']) && !$this->user->profile->birthDay) {
 			list( $birthday_year, $birthday_month, $birthday_day ) = $response['birthDate'];
 
-			$this->user->profile->birthDay      = (int) $birthday_day;
-			$this->user->profile->birthMonth    = (int) $birthday_month;
-			$this->user->profile->birthYear     = (int) $birthday_year;
+			$this->user->profile->birthDay = (int) $birthday_day;
+			$this->user->profile->birthMonth = (int) $birthday_month;
+			$this->user->profile->birthYear = (int) $birthday_year;
 		}
 
-		if( ! $this->user->profile->displayName ){
-			$this->user->profile->displayName = trim( $this->user->profile->firstName . " " . $this->user->profile->lastName );
+		if (!$this->user->profile->displayName) {
+			$this->user->profile->displayName = trim($this->user->profile->firstName . " " . $this->user->profile->lastName);
 		}
 
-		if( $this->user->profile->gender == "f" ){
+		if ($this->user->profile->gender == "f") {
 			$this->user->profile->gender = "female";
 		}
 
-		if( $this->user->profile->gender == "m" ){
+		if ($this->user->profile->gender == "m") {
 			$this->user->profile->gender = "male";
 		}
 
@@ -156,24 +149,22 @@ class Hybrid_Provider_Model_OpenID extends Hybrid_Provider_Model
 		$this->setUserConnected();
 
 		// with openid providers we get the user profile only once, so store it
-		Hybrid_Auth::storage()->set( "hauth_session.{$this->providerId}.user", $this->user );
+		Hybrid_Auth::storage()->set("hauth_session.{$this->providerId}.user", $this->user);
 	}
 
-	// --------------------------------------------------------------------
-
 	/**
-	* load the user profile from the IDp api client
-	*/
-	function getUserProfile()
-	{
+	 * {@inheritdoc}
+	 */
+	function getUserProfile() {
 		// try to get the user profile from stored data
-		$this->user = Hybrid_Auth::storage()->get( "hauth_session.{$this->providerId}.user" ) ;
+		$this->user = Hybrid_Auth::storage()->get("hauth_session.{$this->providerId}.user");
 
 		// if not found
-		if ( ! is_object( $this->user ) ){
-			throw new Exception( "User profile request failed! User is not connected to {$this->providerId} or his session has expired.", 6 );
+		if (!is_object($this->user)) {
+			throw new Exception("User profile request failed! User is not connected to {$this->providerId} or his session has expired.", 6);
 		}
 
 		return $this->user->profile;
 	}
+
 }
diff --git a/e107_handlers/hybridauth/Hybrid/Providers/AOL.php b/e107_handlers/hybridauth/Hybrid/Providers/AOL.php
index f8e7d709c..19028c09a 100644
--- a/e107_handlers/hybridauth/Hybrid/Providers/AOL.php
+++ b/e107_handlers/hybridauth/Hybrid/Providers/AOL.php
@@ -1,16 +1,18 @@
 <?php
-/*!
-* HybridAuth
-* http://hybridauth.sourceforge.net | http://github.com/hybridauth/hybridauth
-* (c) 2009-2012, HybridAuth authors | http://hybridauth.sourceforge.net/licenses.html 
-*/
+
+/* !
+ * HybridAuth
+ * http://hybridauth.sourceforge.net | http://github.com/hybridauth/hybridauth
+ * (c) 2009-2012, HybridAuth authors | http://hybridauth.sourceforge.net/licenses.html
+ */
 
 /**
  * Hybrid_Providers_AOL provider adapter based on OpenID protocol
  * 
  * http://hybridauth.sourceforge.net/userguide/IDProvider_info_AOL.html
  */
-class Hybrid_Providers_AOL extends Hybrid_Provider_Model_OpenID
-{
+class Hybrid_Providers_AOL extends Hybrid_Provider_Model_OpenID {
+
 	var $openidIdentifier = "http://openid.aol.com/";
+
 }
diff --git a/e107_handlers/hybridauth/Hybrid/Providers/Facebook.php b/e107_handlers/hybridauth/Hybrid/Providers/Facebook.php
index 6faed9264..bd05baeeb 100644
--- a/e107_handlers/hybridauth/Hybrid/Providers/Facebook.php
+++ b/e107_handlers/hybridauth/Hybrid/Providers/Facebook.php
@@ -1,433 +1,431 @@
 <?php
-/*!
-* HybridAuth
-* http://hybridauth.sourceforge.net | http://github.com/hybridauth/hybridauth
-* (c) 2009-2012, HybridAuth authors | http://hybridauth.sourceforge.net/licenses.html 
-*/
+
+/* !
+ * HybridAuth
+ * http://hybridauth.sourceforge.net | http://github.com/hybridauth/hybridauth
+ * (c) 2009-2012, HybridAuth authors | http://hybridauth.sourceforge.net/licenses.html
+ */
 
 /**
  * Hybrid_Providers_Facebook provider adapter based on OAuth2 protocol
- * 
+ *
  * Hybrid_Providers_Facebook use the Facebook PHP SDK created by Facebook
- * 
+ *
  * http://hybridauth.sourceforge.net/userguide/IDProvider_info_Facebook.html
  */
-class Hybrid_Providers_Facebook extends Hybrid_Provider_Model
-{
-	// default permissions, and a lot of them. You can change them from the configuration by setting the scope to what you want/need
-	public $scope = "email, user_about_me, user_birthday, user_hometown, user_website, read_stream, publish_actions, read_friendlists";
+class Hybrid_Providers_Facebook extends Hybrid_Provider_Model {
 
 	/**
-	* IDp wrappers initializer 
-	*/
-	function initialize() 
-	{
-		if ( ! $this->config["keys"]["id"] || ! $this->config["keys"]["secret"] ){
-			throw new Exception( "Your application id and secret are required in order to connect to {$this->providerId}.", 4 );
+	 * default permissions, and a lot of them. You can change them from the configuration by setting the scope to what you want/need
+	 * {@inheritdoc}
+	 */
+	public $scope = "email, user_about_me, user_birthday, user_hometown, user_location, user_website, publish_actions, read_custom_friendlists";
+
+	/**
+	 * Provider API client
+	 * @var Facebook
+	 */
+	public $api;
+
+	/**
+	 * {@inheritdoc}
+	 */
+	function initialize() {
+		if (!$this->config["keys"]["id"] || !$this->config["keys"]["secret"]) {
+			throw new Exception("Your application id and secret are required in order to connect to {$this->providerId}.", 4);
 		}
 
-		if ( ! class_exists('FacebookApiException', false) ) {
+		if (!class_exists('FacebookApiException', false)) {
 			require_once Hybrid_Auth::$config["path_libraries"] . "Facebook/base_facebook.php";
 			require_once Hybrid_Auth::$config["path_libraries"] . "Facebook/facebook.php";
 		}
-		
-		if ( isset ( Hybrid_Auth::$config["proxy"] ) ) {
+
+		if (isset(Hybrid_Auth::$config["proxy"])) {
 			BaseFacebook::$CURL_OPTS[CURLOPT_PROXY] = Hybrid_Auth::$config["proxy"];
 		}
 
-		$trustForwarded = isset( $this->config['trustForwarded'] ) ? (bool) $this->config['trustForwarded'] : false;
-		$this->api = new Facebook( ARRAY( 'appId' => $this->config["keys"]["id"], 'secret' => $this->config["keys"]["secret"], 'trustForwarded' => $trustForwarded ) );
+		$trustForwarded = isset($this->config['trustForwarded']) ? (bool) $this->config['trustForwarded'] : false;
+		$this->api = new Facebook(array('appId' => $this->config["keys"]["id"], 'secret' => $this->config["keys"]["secret"], 'trustForwarded' => $trustForwarded));
 
-		if ( $this->token("access_token") ) {
-			$this->api->setAccessToken( $this->token("access_token") );
+		if ($this->token("access_token")) {
+			$this->api->setAccessToken($this->token("access_token"));
 			$this->api->setExtendedAccessToken();
 			$access_token = $this->api->getAccessToken();
 
-			if( $access_token ){
-				$this->token("access_token", $access_token );
-				$this->api->setAccessToken( $access_token );
+			if ($access_token) {
+				$this->token("access_token", $access_token);
+				$this->api->setAccessToken($access_token);
 			}
 
-			$this->api->setAccessToken( $this->token("access_token") );
+			$this->api->setAccessToken($this->token("access_token"));
 		}
 
 		$this->api->getUser();
 	}
 
 	/**
-	* begin login step
-	* 
-	* simply call Facebook::require_login(). 
-	*/
-	function loginBegin()
-	{
+	 * {@inheritdoc}
+	 */
+	function loginBegin() {
 		$parameters = array("scope" => $this->scope, "redirect_uri" => $this->endpoint, "display" => "page");
-		$optionals  = array("scope", "redirect_uri", "display", "auth_type");
+		$optionals = array("scope", "redirect_uri", "display", "auth_type");
 
-		foreach ($optionals as $parameter){
-			if( isset( $this->config[$parameter] ) && ! empty( $this->config[$parameter] ) ){
+		foreach ($optionals as $parameter) {
+			if (isset($this->config[$parameter]) && !empty($this->config[$parameter])) {
 				$parameters[$parameter] = $this->config[$parameter];
-				
+
 				//If the auth_type parameter is used, we need to generate a nonce and include it as a parameter
-				if($parameter == "auth_type"){
+				if ($parameter == "auth_type") {
 					$nonce = md5(uniqid(mt_rand(), true));
 					$parameters['auth_nonce'] = $nonce;
-					
+
 					Hybrid_Auth::storage()->set('fb_auth_nonce', $nonce);
 				}
 			}
 		}
 
-        if( isset( $this->config[ 'force' ] ) && $this->config[ 'force' ] === true ){
-            $parameters[ 'auth_type' ]  = 'reauthenticate';
-            $parameters[ 'auth_nonce' ] = md5( uniqid( mt_rand(), true ) );
+		if (isset($this->config['force']) && $this->config['force'] === true) {
+			$parameters['auth_type'] = 'reauthenticate';
+			$parameters['auth_nonce'] = md5(uniqid(mt_rand(), true));
 
-            Hybrid_Auth::storage()->set( 'fb_auth_nonce', $parameters[ 'auth_nonce' ] );
-        }
+			Hybrid_Auth::storage()->set('fb_auth_nonce', $parameters['auth_nonce']);
+		}
 
-		// get the login url 
-		$url = $this->api->getLoginUrl( $parameters );
+		// get the login url
+		$url = $this->api->getLoginUrl($parameters);
 
 		// redirect to facebook
-		Hybrid_Auth::redirect( $url );
+		Hybrid_Auth::redirect($url);
 	}
 
 	/**
-	* finish login step 
-	*/
-	function loginFinish()
-	{ 
+	 * {@inheritdoc}
+	 */
+	function loginFinish() {
 		// in case we get error_reason=user_denied&error=access_denied
-		if ( isset( $_REQUEST['error'] ) && $_REQUEST['error'] == "access_denied" ){ 
-			throw new Exception( "Authentication failed! The user denied your request.", 5 );
+		if (isset($_REQUEST['error']) && $_REQUEST['error'] == "access_denied") {
+			throw new Exception("Authentication failed! The user denied your request.", 5);
 		}
 
 		// in case we are using iOS/Facebook reverse authentication
-		if(isset($_REQUEST['access_token'])){
-			$this->token("access_token",  $_REQUEST['access_token'] );
-			$this->api->setAccessToken( $this->token("access_token") );
+		if (isset($_REQUEST['access_token'])) {
+			$this->token("access_token", $_REQUEST['access_token']);
+			$this->api->setAccessToken($this->token("access_token"));
 			$this->api->setExtendedAccessToken();
 			$access_token = $this->api->getAccessToken();
 
-			if( $access_token ){
-				$this->token("access_token", $access_token );
-				$this->api->setAccessToken( $access_token );
+			if ($access_token) {
+				$this->token("access_token", $access_token);
+				$this->api->setAccessToken($access_token);
 			}
 
-			$this->api->setAccessToken( $this->token("access_token") );
+			$this->api->setAccessToken($this->token("access_token"));
 		}
 
-		
+
 		// if auth_type is used, then an auth_nonce is passed back, and we need to check it.
-		if(isset($_REQUEST['auth_nonce'])){
-			
+		if (isset($_REQUEST['auth_nonce'])) {
+
 			$nonce = Hybrid_Auth::storage()->get('fb_auth_nonce');
-			
+
 			//Delete the nonce
 			Hybrid_Auth::storage()->delete('fb_auth_nonce');
-			
-			if($_REQUEST['auth_nonce'] != $nonce){
-				throw new Exception( "Authentication failed! Invalid nonce used for reauthentication.", 5 );
+
+			if ($_REQUEST['auth_nonce'] != $nonce) {
+				throw new Exception("Authentication failed! Invalid nonce used for reauthentication.", 5);
 			}
 		}
 
-		// try to get the UID of the connected user from fb, should be > 0 
-		if ( ! $this->api->getUser() ){
-			throw new Exception( "Authentication failed! {$this->providerId} returned an invalid user id.", 5 );
+		// try to get the UID of the connected user from fb, should be > 0
+		if (!$this->api->getUser()) {
+			throw new Exception("Authentication failed! {$this->providerId} returned an invalid user id.", 5);
 		}
 
 		// set user as logged in
 		$this->setUserConnected();
 
-		// store facebook access token 
-		$this->token( "access_token", $this->api->getAccessToken() );
+		// store facebook access token
+		$this->token("access_token", $this->api->getAccessToken());
 	}
 
 	/**
-	* logout
-	*/
-	function logout()
-	{ 
+	 * {@inheritdoc}
+	 */
+	function logout() {
 		$this->api->destroySession();
-
 		parent::logout();
 	}
 
 	/**
-	* load the user profile from the IDp api client
-	*/
-	function getUserProfile()
-	{
+	 * {@inheritdoc}
+	 */
+	function getUserProfile() {
 		// request user profile from fb api
-		try{ 
-			$data = $this->api->api('/me'); 
+		try {
+            $fields = array(
+                'id', 'name', 'first_name', 'last_name', 'link', 'website',
+                'gender', 'locale', 'about', 'email', 'hometown', 'location',
+								'birthday'
+            );
+
+			$data = $this->api->api('/me?fields=' . implode(',', $fields));
+		} catch (FacebookApiException $e) {
+			throw new Exception("User profile request failed! {$this->providerId} returned an error: {$e->getMessage()}", 6, $e);
 		}
-		catch( FacebookApiException $e ){
-			throw new Exception( "User profile request failed! {$this->providerId} returned an error: $e", 6 );
-		} 
 
 		// if the provider identifier is not received, we assume the auth has failed
-		if ( ! isset( $data["id"] ) ){ 
-			throw new Exception( "User profile request failed! {$this->providerId} api returned an invalid response.", 6 );
+		if (!isset($data["id"])) {
+			throw new Exception("User profile request failed! {$this->providerId} api returned an invalid response: " . Hybrid_Logger::dumpData( $data ), 6);
 		}
 
 		# store the user profile.
-		$this->user->profile->identifier    = (array_key_exists('id',$data))?$data['id']:"";
-		$this->user->profile->username      = (array_key_exists('username',$data))?$data['username']:"";
-		$this->user->profile->displayName   = (array_key_exists('name',$data))?$data['name']:"";
-		$this->user->profile->firstName     = (array_key_exists('first_name',$data))?$data['first_name']:"";
-		$this->user->profile->lastName      = (array_key_exists('last_name',$data))?$data['last_name']:"";
-		$this->user->profile->photoURL      = "https://graph.facebook.com/" . $this->user->profile->identifier . "/picture?width=150&height=150";
-		$this->user->profile->coverInfoURL  = "https://graph.facebook.com/" . $this->user->profile->identifier . "?fields=cover";
-		$this->user->profile->profileURL    = (array_key_exists('link',$data))?$data['link']:""; 
-		$this->user->profile->webSiteURL    = (array_key_exists('website',$data))?$data['website']:""; 
-		$this->user->profile->gender        = (array_key_exists('gender',$data))?$data['gender']:"";
-        	$this->user->profile->language      = (array_key_exists('locale',$data))?$data['locale']:"";
-		$this->user->profile->description   = (array_key_exists('about',$data))?$data['about']:"";
-		$this->user->profile->email         = (array_key_exists('email',$data))?$data['email']:"";
-		$this->user->profile->emailVerified = (array_key_exists('email',$data))?$data['email']:"";
-		$this->user->profile->region        = (array_key_exists("hometown",$data)&&array_key_exists("name",$data['hometown']))?$data['hometown']["name"]:"";
-		
-		if(!empty($this->user->profile->region )){
-			$regionArr = explode(',',$this->user->profile->region );
-			if(count($regionArr) > 1){
+		$this->user->profile->identifier = (array_key_exists('id', $data)) ? $data['id'] : "";
+		$this->user->profile->username = (array_key_exists('username', $data)) ? $data['username'] : "";
+		$this->user->profile->displayName = (array_key_exists('name', $data)) ? $data['name'] : "";
+		$this->user->profile->firstName = (array_key_exists('first_name', $data)) ? $data['first_name'] : "";
+		$this->user->profile->lastName = (array_key_exists('last_name', $data)) ? $data['last_name'] : "";
+		$this->user->profile->photoURL = "https://graph.facebook.com/" . $this->user->profile->identifier . "/picture?width=150&height=150";
+		$this->user->profile->coverInfoURL = "https://graph.facebook.com/" . $this->user->profile->identifier . "?fields=cover&access_token=" . $this->api->getAccessToken();
+		$this->user->profile->profileURL = (array_key_exists('link', $data)) ? $data['link'] : "";
+		$this->user->profile->webSiteURL = (array_key_exists('website', $data)) ? $data['website'] : "";
+		$this->user->profile->gender = (array_key_exists('gender', $data)) ? $data['gender'] : "";
+		$this->user->profile->language = (array_key_exists('locale', $data)) ? $data['locale'] : "";
+		$this->user->profile->description = (array_key_exists('about', $data)) ? $data['about'] : "";
+		$this->user->profile->email = (array_key_exists('email', $data)) ? $data['email'] : "";
+		$this->user->profile->emailVerified = (array_key_exists('email', $data)) ? $data['email'] : "";
+		$this->user->profile->region = (array_key_exists("location", $data) && array_key_exists("name", $data['location'])) ? $data['location']["name"] : "";
+
+		if (!empty($this->user->profile->region)) {
+			$regionArr = explode(',', $this->user->profile->region);
+			if (count($regionArr) > 1) {
 				$this->user->profile->city = trim($regionArr[0]);
 				$this->user->profile->country = trim($regionArr[1]);
 			}
 		}
-		
-		if( array_key_exists('birthday',$data) ) {
-			list($birthday_month, $birthday_day, $birthday_year) = explode( "/", $data['birthday'] );
 
-			$this->user->profile->birthDay   = (int) $birthday_day;
+		if (array_key_exists('birthday', $data)) {
+			list($birthday_month, $birthday_day, $birthday_year) = explode("/", $data['birthday']);
+
+			$this->user->profile->birthDay = (int) $birthday_day;
 			$this->user->profile->birthMonth = (int) $birthday_month;
-			$this->user->profile->birthYear  = (int) $birthday_year;
+			$this->user->profile->birthYear = (int) $birthday_year;
 		}
 
 		return $this->user->profile;
- 	}
+	}
 
 	/**
-	* Attempt to retrieve the url to the cover image given the coverInfoURL
-	*
-	* @param  string $coverInfoURL   coverInfoURL variable
-	* @retval string                 url to the cover image OR blank string
-	*/
-	function getCoverURL($coverInfoURL)
-	{
+	 * Attempt to retrieve the url to the cover image given the coverInfoURL
+	 *
+	 * @param  string $coverInfoURL coverInfoURL variable
+	 * @return string               url to the cover image OR blank string
+	 */
+	function getCoverURL($coverInfoURL) {
 		try {
 			$headers = get_headers($coverInfoURL);
-			if(substr($headers[0], 9, 3) != "404") {
+			if (substr($headers[0], 9, 3) != "404") {
 				$coverOBJ = json_decode(file_get_contents($coverInfoURL));
-				if(array_key_exists('cover', $coverOBJ)) {
+				if (array_key_exists('cover', $coverOBJ)) {
 					return $coverOBJ->cover->source;
 				}
 			}
-		} catch (Exception $e) { }
+		} catch (Exception $e) {
+
+		}
 
 		return "";
 	}
-	
+
 	/**
-	* load the user contacts
-	*/
-	function getUserContacts()
-	{
+	 * {@inheritdoc}
+	 */
+	function getUserContacts() {
 		$apiCall = '?fields=link,name';
 		$returnedContacts = array();
 		$pagedList = false;
 
 		do {
-			try{ 
-				$response = $this->api->api('/me/friends' . $apiCall); 
+			try {
+				$response = $this->api->api('/me/friends' . $apiCall);
+			} catch (FacebookApiException $e) {
+				throw new Exception("User contacts request failed! {$this->providerId} returned an error {$e->getMessage()}", 0, $e);
 			}
-			catch( FacebookApiException $e ){
-				throw new Exception( 'User contacts request failed! {$this->providerId} returned an error: $e' );
-			} 
 
 			// Prepare the next call if paging links have been returned
 			if (array_key_exists('paging', $response) && array_key_exists('next', $response['paging'])) {
 				$pagedList = true;
-			        $next_page = explode('friends', $response['paging']['next']);
-			        $apiCall = $next_page[1];
-			}
-			else{
+				$next_page = explode('friends', $response['paging']['next']);
+				$apiCall = $next_page[1];
+			} else {
 				$pagedList = false;
 			}
 
 			// Add the new page contacts
 			$returnedContacts = array_merge($returnedContacts, $response['data']);
-		}
-		while ($pagedList == true);
+		} while ($pagedList == true);
+
+		$contacts = array();
+
+		foreach ($returnedContacts as $item) {
 
-		$contacts = ARRAY();
- 
-		foreach( $returnedContacts as $item ){
 			$uc = new Hybrid_User_Contact();
-
-			$uc->identifier  = (array_key_exists("id",$item))?$item["id"]:"";
-			$uc->displayName = (array_key_exists("name",$item))?$item["name"]:"";
-			$uc->profileURL  = (array_key_exists("link",$item))?$item["link"]:"https://www.facebook.com/profile.php?id=" . $uc->identifier;
-			$uc->photoURL    = "https://graph.facebook.com/" . $uc->identifier . "/picture?width=150&height=150";
+			$uc->identifier = (array_key_exists("id", $item)) ? $item["id"] : "";
+			$uc->displayName = (array_key_exists("name", $item)) ? $item["name"] : "";
+			$uc->profileURL = (array_key_exists("link", $item)) ? $item["link"] : "https://www.facebook.com/profile.php?id=" . $uc->identifier;
+			$uc->photoURL = "https://graph.facebook.com/" . $uc->identifier . "/picture?width=150&height=150";
 
 			$contacts[] = $uc;
 		}
 
 		return $contacts;
- 	}
-
-    /**
-    * update user status
-	*
-	* @param  string $pageid   (optional) User page id
-    */
-    function setUserStatus( $status, $pageid = null )
-    {
-        if( !is_array( $status ) ){
-            $status = array( 'message' => $status );
-        }
-
-        if( is_null( $pageid ) ){
-            $pageid = 'me';
-
-        // if post on page, get access_token page
-        }else{
-            $access_token = null;
-            foreach( $this->getUserPages( true ) as $p ){
-                if( isset( $p[ 'id' ] ) && intval( $p['id'] ) == intval( $pageid ) ){
-                    $access_token = $p[ 'access_token' ];
-                    break;
-                }
-            }
-
-            if( is_null( $access_token ) ){
-                throw new Exception( "Update user page failed, page not found or not writable!" );
-            }
-
-            $status[ 'access_token' ] = $access_token;
-        }
-
-        try{ 
-            $response = $this->api->api( '/' . $pageid . '/feed', 'post', $status );
-        }
-        catch( FacebookApiException $e ){
-            throw new Exception( "Update user status failed! {$this->providerId} returned an error: $e" );
-        }
-
-        return $response;
-    }
-
+	}
 
 	/**
-	* get user status
-	*/
-    function getUserStatus( $postid )
-    {
-		try{
-            $postinfo = $this->api->api( "/" . $postid );
-        }
-		catch( FacebookApiException $e ){
-			throw new Exception( "Cannot retrieve user status! {$this->providerId} returned an error: $e" );
+	 * Update user status
+	 *
+	 * @param mixed  $status An array describing the status, or string
+	 * @param string $pageid (optional) User page id
+	 * @return array
+	 * @throw Exception
+	 */
+	function setUserStatus($status, $pageid = null) {
+		if (!is_array($status)) {
+			$status = array('message' => $status);
 		}
 
-        return $postinfo;
-    }
+		if (is_null($pageid)) {
+			$pageid = 'me';
 
-
-	/**
-	* get user pages
-	*/
-    function getUserPages( $writableonly = false )
-    {
-        if( ( isset( $this->config[ 'scope' ] ) && strpos( $this->config[ 'scope' ], 'manage_pages' ) === false ) || ( !isset( $this->config[ 'scope' ] ) && strpos( $this->scope, 'manage_pages' ) === false ) )
-            throw new Exception( "User status requires manage_page permission!" );            
-
-        try{
-            $pages = $this->api->api( "/me/accounts", 'get' );
-        }
-        catch( FacebookApiException $e ){
-            throw new Exception( "Cannot retrieve user pages! {$this->providerId} returned an error: $e" );
-        }
-
-        if( !isset( $pages[ 'data' ] ) ){
-            return array();
-        }
-
-        if( !$writableonly ){
-            return $pages[ 'data' ];
-        }
-
-        $wrpages = array();
-        foreach( $pages[ 'data' ] as $p ){
-            if( isset( $p[ 'perms' ] ) && in_array( 'CREATE_CONTENT', $p[ 'perms' ] ) ){
-                $wrpages[] = $p;
-            }
-        }
-
-        return $wrpages;
-    }
-
-	/**
-	* load the user latest activity  
-	*    - timeline : all the stream
-	*    - me       : the user activity only  
-	*/
-	function getUserActivity( $stream )
-	{
-		try{
-			if( $stream == "me" ){
-				$response = $this->api->api( '/me/feed' ); 
+			// if post on page, get access_token page
+		} else {
+			$access_token = null;
+			foreach ($this->getUserPages(true) as $p) {
+				if (isset($p['id']) && intval($p['id']) == intval($pageid)) {
+					$access_token = $p['access_token'];
+					break;
+				}
 			}
-			else{
-				$response = $this->api->api('/me/home'); 
+
+			if (is_null($access_token)) {
+				throw new Exception("Update user page failed, page not found or not writable!");
+			}
+
+			$status['access_token'] = $access_token;
+		}
+
+		try {
+			$response = $this->api->api('/' . $pageid . '/feed', 'post', $status);
+		} catch (FacebookApiException $e) {
+			throw new Exception("Update user status failed! {$this->providerId} returned an error {$e->getMessage()}", 0, $e);
+		}
+
+		return $response;
+	}
+
+	/**
+	 * {@inheridoc}
+	 */
+	function getUserStatus($postid) {
+		try {
+			$postinfo = $this->api->api("/" . $postid);
+		} catch (FacebookApiException $e) {
+			throw new Exception("Cannot retrieve user status! {$this->providerId} returned an error: {$e->getMessage()}", 0, $e);
+		}
+
+		return $postinfo;
+	}
+
+	/**
+	 * {@inheridoc}
+	 */
+	function getUserPages($writableonly = false) {
+		if (( isset($this->config['scope']) && strpos($this->config['scope'], 'manage_pages') === false ) || (!isset($this->config['scope']) && strpos($this->scope, 'manage_pages') === false ))
+			throw new Exception("User status requires manage_page permission!");
+
+		try {
+			$pages = $this->api->api("/me/accounts", 'get');
+		} catch (FacebookApiException $e) {
+			throw new Exception("Cannot retrieve user pages! {$this->providerId} returned an error: {$e->getMessage()}", 0, $e);
+		}
+
+		if (!isset($pages['data'])) {
+			return array();
+		}
+
+		if (!$writableonly) {
+			return $pages['data'];
+		}
+
+		$wrpages = array();
+		foreach ($pages['data'] as $p) {
+			if (isset($p['perms']) && in_array('CREATE_CONTENT', $p['perms'])) {
+				$wrpages[] = $p;
 			}
 		}
-		catch( FacebookApiException $e ){
-			throw new Exception( "User activity stream request failed! {$this->providerId} returned an error: $e" );
-		} 
 
-		if( ! $response || ! count(  $response['data'] ) ){
-			return ARRAY();
+		return $wrpages;
+	}
+
+	/**
+	 * load the user latest activity
+	 *    - timeline : all the stream
+	 *    - me       : the user activity only
+	 * {@inheritdoc}
+	 */
+	function getUserActivity($stream) {
+		try {
+			if ($stream == "me") {
+				$response = $this->api->api('/me/feed');
+			} else {
+				$response = $this->api->api('/me/home');
+			}
+		} catch (FacebookApiException $e) {
+			throw new Exception("User activity stream request failed! {$this->providerId} returned an error: {$e->getMessage()}", 0, $e);
 		}
 
-		$activities = ARRAY();
+		if (!$response || !count($response['data'])) {
+			return array();
+		}
 
-		foreach( $response['data'] as $item ){
-			if( $stream == "me" && $item["from"]["id"] != $this->api->getUser() ){
+		$activities = array();
+
+		foreach ($response['data'] as $item) {
+			if ($stream == "me" && $item["from"]["id"] != $this->api->getUser()) {
 				continue;
 			}
 
 			$ua = new Hybrid_User_Activity();
 
-			$ua->id                 = (array_key_exists("id",$item))?$item["id"]:"";
-			$ua->date               = (array_key_exists("created_time",$item))?strtotime($item["created_time"]):"";
+			$ua->id = (array_key_exists("id", $item)) ? $item["id"] : "";
+			$ua->date = (array_key_exists("created_time", $item)) ? strtotime($item["created_time"]) : "";
 
-			if( $item["type"] == "video" ){
-				$ua->text           = (array_key_exists("link",$item))?$item["link"]:"";
+			if ($item["type"] == "video") {
+				$ua->text = (array_key_exists("link", $item)) ? $item["link"] : "";
 			}
 
-			if( $item["type"] == "link" ){
-				$ua->text           = (array_key_exists("link",$item))?$item["link"]:"";
+			if ($item["type"] == "link") {
+				$ua->text = (array_key_exists("link", $item)) ? $item["link"] : "";
 			}
 
-			if( empty( $ua->text ) && isset( $item["story"] ) ){
-				$ua->text           = (array_key_exists("link",$item))?$item["link"]:"";
+			if (empty($ua->text) && isset($item["story"])) {
+				$ua->text = (array_key_exists("link", $item)) ? $item["link"] : "";
 			}
 
-			if( empty( $ua->text ) && isset( $item["message"] ) ){
-				$ua->text           = (array_key_exists("message",$item))?$item["message"]:"";
+			if (empty($ua->text) && isset($item["message"])) {
+				$ua->text = (array_key_exists("message", $item)) ? $item["message"] : "";
 			}
 
-			if( ! empty( $ua->text ) ){
-				$ua->user->identifier   = (array_key_exists("id",$item["from"]))?$item["from"]["id"]:"";
-				$ua->user->displayName  = (array_key_exists("name",$item["from"]))?$item["from"]["name"]:"";
-				$ua->user->profileURL   = "https://www.facebook.com/profile.php?id=" . $ua->user->identifier;
-				$ua->user->photoURL     = "https://graph.facebook.com/" . $ua->user->identifier . "/picture?type=square";
+			if (!empty($ua->text)) {
+				$ua->user->identifier = (array_key_exists("id", $item["from"])) ? $item["from"]["id"] : "";
+				$ua->user->displayName = (array_key_exists("name", $item["from"])) ? $item["from"]["name"] : "";
+				$ua->user->profileURL = "https://www.facebook.com/profile.php?id=" . $ua->user->identifier;
+				$ua->user->photoURL = "https://graph.facebook.com/" . $ua->user->identifier . "/picture?type=square";
 
 				$activities[] = $ua;
 			}
 		}
 
 		return $activities;
- 	}
+	}
+
 }
diff --git a/e107_handlers/hybridauth/Hybrid/Providers/Foursquare.php b/e107_handlers/hybridauth/Hybrid/Providers/Foursquare.php
index 45ae1e42e..cfbe65730 100644
--- a/e107_handlers/hybridauth/Hybrid/Providers/Foursquare.php
+++ b/e107_handlers/hybridauth/Hybrid/Providers/Foursquare.php
@@ -1,74 +1,121 @@
 <?php
-/*!
-* HybridAuth
-* http://hybridauth.sourceforge.net | http://github.com/hybridauth/hybridauth
-* (c) 2009-2012, HybridAuth authors | http://hybridauth.sourceforge.net/licenses.html 
-*/
+
+/* !
+ * HybridAuth
+ * http://hybridauth.sourceforge.net | http://github.com/hybridauth/hybridauth
+ * (c) 2009-2015, HybridAuth authors | http://hybridauth.sourceforge.net/licenses.html
+ */
 
 /**
  * Hybrid_Providers_Foursquare provider adapter based on OAuth2 protocol
- * 
+ *
  * http://hybridauth.sourceforge.net/userguide/IDProvider_info_Foursquare.html
  */
 
 /**
  * Howto define profile photo size:
- * - add params key into hybridauth config 
- * ... 
+ * - add params key into hybridauth config
+ * ...
  *    "Foursquare" => array (
  *       "enabled" => true,
  *       "keys"    => ...,
  *       "params" => array( "photo_size" => "16x16" )
  *   	),
- * ... 
+ * ...
  * - list of valid photo_size values is described here https://developer.foursquare.com/docs/responses/photo.html
  * - default photo_size is 100x100
  */
+class Hybrid_Providers_Foursquare extends Hybrid_Provider_Model_OAuth2 {
+
+	private static $apiVersion = array("v" => "20120610");
+	private static $defPhotoSize = "100x100";
 
-class Hybrid_Providers_Foursquare extends Hybrid_Provider_Model_OAuth2
-{ 
 	/**
-	* IDp wrappers initializer 
-	*/
-	function initialize() 
-	{
+	 * {@inheritdoc}
+	 */
+	function initialize() {
 		parent::initialize();
 
 		// Provider apis end-points
-		$this->api->api_base_url  = "https://api.foursquare.com/v2/";
+		$this->api->api_base_url = "https://api.foursquare.com/v2/";
 		$this->api->authorize_url = "https://foursquare.com/oauth2/authenticate";
-		$this->api->token_url     = "https://foursquare.com/oauth2/access_token"; 
+		$this->api->token_url = "https://foursquare.com/oauth2/access_token";
 
 		$this->api->sign_token_name = "oauth_token";
 	}
 
 	/**
-	* load the user profile from the IDp api client
-	*/
-	function getUserProfile()
-	{
-		$data = $this->api->api( "users/self", "GET", array( "v" => "20120610" ) ); 
+	 * {@inheritdoc}
+	 */
+	function getUserProfile() {
+		$data = $this->api->api("users/self", "GET", Hybrid_Providers_Foursquare::$apiVersion);
 
-		if ( ! isset( $data->response->user->id ) ){
-			throw new Exception( "User profile request failed! {$this->providerId} returned an invalid response.", 6 );
+		if (!isset($data->response->user->id)) {
+			throw new Exception("User profile request failed! {$this->providerId} returned an invalid response:" . Hybrid_Logger::dumpData( $data ), 6);
 		}
 
 		$data = $data->response->user;
 
-		// get profile photo size from config
-		$photoSize = ((isset($this->config["params"]["photo_size"]))?($this->config["params"]["photo_size"]):("100x100"));
-
-		$this->user->profile->identifier    = $data->id;
-		$this->user->profile->firstName     = $data->firstName;
-		$this->user->profile->lastName      = $data->lastName;
-		$this->user->profile->displayName   = trim( $this->user->profile->firstName . " " . $this->user->profile->lastName );
-		$this->user->profile->photoURL      = $data->photo->prefix.$photoSize.$data->photo->suffix;
-		$this->user->profile->profileURL    = "https://www.foursquare.com/user/" . $data->id;
-		$this->user->profile->gender        = $data->gender;
-		$this->user->profile->city          = $data->homeCity;
-		$this->user->profile->email         = $data->contact->email;
+		$this->user->profile->identifier = $data->id;
+		$this->user->profile->firstName = $data->firstName;
+		$this->user->profile->lastName = $data->lastName;
+		$this->user->profile->displayName = $this->buildDisplayName($this->user->profile->firstName, $this->user->profile->lastName);
+		$this->user->profile->photoURL = $this->buildPhotoURL($data->photo->prefix, $data->photo->suffix);
+		$this->user->profile->profileURL = "https://www.foursquare.com/user/" . $data->id;
+		$this->user->profile->gender = $data->gender;
+		$this->user->profile->city = $data->homeCity;
+		$this->user->profile->email = $data->contact->email;
 		$this->user->profile->emailVerified = $data->contact->email;
 
 		return $this->user->profile;
 	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	function getUserContacts() {
+		// refresh tokens if needed
+		$this->refreshToken();
+
+		//
+		$response = array();
+		$contacts = array();
+		try {
+			$response = $this->api->api("users/self/friends", "GET", Hybrid_Providers_Foursquare::$apiVersion);
+		} catch (LinkedInException $e) {
+			throw new Exception("User contacts request failed! {$this->providerId} returned an error: {$e->getMessage()}", 0, $e);
+		}
+
+		if (isset($response) && $response->meta->code == 200) {
+			foreach ($response->response->friends->items as $contact) {
+				$uc = new Hybrid_User_Contact();
+				//
+				$uc->identifier = $contact->id;
+				//$uc->profileURL		= ;
+				//$uc->webSiteURL		= ;
+				$uc->photoURL = $this->buildPhotoURL($contact->photo->prefix, $contact->photo->suffix);
+				$uc->displayName = $this->buildDisplayName((isset($contact->firstName) ? ($contact->firstName) : ("")), (isset($contact->lastName) ? ($contact->lastName) : ("")));
+				//$uc->description	= ;
+				$uc->email = (isset($contact->contact->email) ? ($contact->contact->email) : (""));
+				//
+				$contacts[] = $uc;
+			}
+		}
+		return $contacts;
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	private function buildDisplayName($firstName, $lastName) {
+		return trim($firstName . " " . $lastName);
+	}
+
+	private function buildPhotoURL($prefix, $suffix) {
+		if (isset($prefix) && isset($suffix)) {
+			return $prefix . ((isset($this->config["params"]["photo_size"])) ? ($this->config["params"]["photo_size"]) : (Hybrid_Providers_Foursquare::$defPhotoSize)) . $suffix;
+		}
+		return ("");
+	}
+
 }
diff --git a/e107_handlers/hybridauth/Hybrid/Providers/Github.php b/e107_handlers/hybridauth/Hybrid/Providers/Github.php
index 00b35f2a9..c20fc1e2a 100644
--- a/e107_handlers/hybridauth/Hybrid/Providers/Github.php
+++ b/e107_handlers/hybridauth/Hybrid/Providers/Github.php
@@ -6,18 +6,18 @@
 */
 
 /**
- * Hybrid_Providers_GitHub 
+ * Hybrid_Providers_GitHub
  */
 class Hybrid_Providers_GitHub extends Hybrid_Provider_Model_OAuth2
-{ 
-	// default permissions  
+{
+	// default permissions
 	// (no scope) => public read-only access (includes public user profile info, public repo info, and gists).
 	public $scope = "";
 
 	/**
-	* IDp wrappers initializer 
+	* IDp wrappers initializer
 	*/
-	function initialize() 
+	function initialize()
 	{
 		parent::initialize();
 
@@ -32,17 +32,17 @@ class Hybrid_Providers_GitHub extends Hybrid_Provider_Model_OAuth2
 	*/
 	function getUserProfile()
 	{
-		$data = $this->api->api( "user" ); 
+		$data = $this->api->api( "user" );
 
 		if ( ! isset( $data->id ) ){
 			throw new Exception( "User profile request failed! {$this->providerId} returned an invalid response.", 6 );
 		}
 
-		$this->user->profile->identifier  = @ $data->id; 
+		$this->user->profile->identifier  = @ $data->id;
 		$this->user->profile->displayName = @ $data->name;
 		$this->user->profile->description = @ $data->bio;
 		$this->user->profile->photoURL    = @ $data->avatar_url;
-		$this->user->profile->profileURL  = @ $data->html_url; 
+		$this->user->profile->profileURL  = @ $data->html_url;
 		$this->user->profile->email       = @ $data->email;
 		$this->user->profile->webSiteURL  = @ $data->blog;
 		$this->user->profile->region      = @ $data->location;
@@ -60,9 +60,9 @@ class Hybrid_Providers_GitHub extends Hybrid_Provider_Model_OAuth2
 				if (is_array($emails)) {
 					foreach ($emails as $email) {
 						if ($email instanceof stdClass
-							&& property_exists('primary', $email)
+							&& property_exists($email, 'primary')
 							&& true === $email->primary
-							&& property_exists('email', $email)
+							&& property_exists($email, 'email')
 						) {
 							$this->user->profile->email = $email->email;
 							break;
@@ -77,4 +77,43 @@ class Hybrid_Providers_GitHub extends Hybrid_Provider_Model_OAuth2
 
 		return $this->user->profile;
 	}
+	/**
+	*
+	*/
+	function getUserContacts() {
+		// refresh tokens if needed
+		$this->refreshToken();
+
+		//
+		$response = array();
+		$contacts = array();
+		try {
+            $response = $this->api->api( "user/followers" );
+        } catch (LinkedInException $e) {
+            throw new Exception("User contacts request failed! {$this->providerId} returned an error: $e");
+        }
+        //
+		if ( isset( $response ) ) {
+			foreach ($response as $contact) {
+                try {
+                    $contactInfo = $this->api->api( "users/".$contact->login );
+                } catch (LinkedInException $e) {
+                    throw new Exception("Contact info request failed for user {$contact->login}! {$this->providerId} returned an error: $e");
+                }
+                //
+				$uc = new Hybrid_User_Contact();
+				//
+				$uc->identifier     = $contact->id;
+				$uc->profileURL     = @$contact->html_url;
+				$uc->webSiteURL     = @$contact->blog;
+				$uc->photoURL       = @$contact->avatar_url;
+				$uc->displayName    = ( isset( $contactInfo->name )?( $contactInfo->name ):( $contact->login ) );
+				//$uc->description	= ;
+				$uc->email          = @$contactInfo->email;
+				//
+				$contacts[] = $uc;
+			}
+		}
+		return $contacts;
+	}
 }
diff --git a/e107_handlers/hybridauth/Hybrid/Providers/Google.php b/e107_handlers/hybridauth/Hybrid/Providers/Google.php
index 313b0b6ad..dd0127006 100644
--- a/e107_handlers/hybridauth/Hybrid/Providers/Google.php
+++ b/e107_handlers/hybridauth/Hybrid/Providers/Google.php
@@ -1,103 +1,106 @@
 <?php
-/*!
-* HybridAuth
-* http://hybridauth.sourceforge.net | http://github.com/hybridauth/hybridauth
-* (c) 2009-2014, HybridAuth authors | http://hybridauth.sourceforge.net/licenses.html 
-*/
+
+/* !
+ * HybridAuth
+ * http://hybridauth.sourceforge.net | http://github.com/hybridauth/hybridauth
+ * (c) 2009-2015, HybridAuth authors | http://hybridauth.sourceforge.net/licenses.html
+ */
 
 /**
  * Hybrid_Providers_Google provider adapter based on OAuth2 protocol
- * 
+ *
  * http://hybridauth.sourceforge.net/userguide/IDProvider_info_Google.html
  */
-class Hybrid_Providers_Google extends Hybrid_Provider_Model_OAuth2
-{
-    // > more infos on google APIs: http://developer.google.com (official site)
-	// or here: http://discovery-check.appspot.com/ (unofficial but up to date)
+class Hybrid_Providers_Google extends Hybrid_Provider_Model_OAuth2 {
 
-	// default permissions 
+	/**
+	 * > more infos on google APIs: http://developer.google.com (official site)
+	 * or here: http://discovery-check.appspot.com/ (unofficial but up to date)
+	 * default permissions
+	 * {@inheritdoc}
+	 */
 	public $scope = "https://www.googleapis.com/auth/plus.login https://www.googleapis.com/auth/plus.profile.emails.read https://www.google.com/m8/feeds/";
 
 	/**
-	* IDp wrappers initializer 
-	*/
-	function initialize() 
-	{
+	 * {@inheritdoc}
+	 */
+	function initialize() {
 		parent::initialize();
 
 		// Provider api end-points
-		$this->api->authorize_url  = "https://accounts.google.com/o/oauth2/auth";
-		$this->api->token_url      = "https://accounts.google.com/o/oauth2/token";
+		$this->api->authorize_url = "https://accounts.google.com/o/oauth2/auth";
+		$this->api->token_url = "https://accounts.google.com/o/oauth2/token";
 		$this->api->token_info_url = "https://www.googleapis.com/oauth2/v2/tokeninfo";
-        
+
+		// Google POST methods require an access_token in the header
+		$this->api->curl_header = array("Authorization: OAuth " . $this->api->access_token);
+
 		// Override the redirect uri when it's set in the config parameters. This way we prevent
 		// redirect uri mismatches when authenticating with Google.
-		if( isset( $this->config['redirect_uri'] ) && ! empty( $this->config['redirect_uri'] ) ){
+		if (isset($this->config['redirect_uri']) && !empty($this->config['redirect_uri'])) {
 			$this->api->redirect_uri = $this->config['redirect_uri'];
 		}
 	}
 
 	/**
-	* begin login step 
-	*/
-	function loginBegin()
-	{
+	 * {@inheritdoc}
+	 */
+	function loginBegin() {
 		$parameters = array("scope" => $this->scope, "access_type" => "offline");
-		$optionals  = array("scope", "access_type", "redirect_uri", "approval_prompt", "hd", "state");
+		$optionals = array("scope", "access_type", "redirect_uri", "approval_prompt", "hd", "state");
 
-		foreach ($optionals as $parameter){
-			if( isset( $this->config[$parameter] ) && ! empty( $this->config[$parameter] ) ){
+		foreach ($optionals as $parameter) {
+			if (isset($this->config[$parameter]) && !empty($this->config[$parameter])) {
 				$parameters[$parameter] = $this->config[$parameter];
 			}
-			if( isset( $this->config["scope"] ) && ! empty( $this->config["scope"] ) ){
+			if (isset($this->config["scope"]) && !empty($this->config["scope"])) {
 				$this->scope = $this->config["scope"];
 			}
 		}
 
-        if( isset( $this->config[ 'force' ] ) && $this->config[ 'force' ] === true ){
-            $parameters[ 'approval_prompt' ] = 'force';
-        }
+		if (isset($this->config['force']) && $this->config['force'] === true) {
+			$parameters['approval_prompt'] = 'force';
+		}
 
-		Hybrid_Auth::redirect( $this->api->authorizeUrl( $parameters ) ); 
+		Hybrid_Auth::redirect($this->api->authorizeUrl($parameters));
 	}
 
 	/**
-	* load the user profile from the IDp api client
-	*/
-	function getUserProfile()
-	{
-		// refresh tokens if needed 
+	 * {@inheritdoc}
+	 */
+	function getUserProfile() {
+		// refresh tokens if needed
 		$this->refreshToken();
 
 		// ask google api for user infos
 		if (strpos($this->scope, '/auth/plus.profile.emails.read') !== false) {
-			$verified = $this->api->api( "https://www.googleapis.com/plus/v1/people/me" );
+			$verified = $this->api->api("https://www.googleapis.com/plus/v1/people/me");
 
-			if ( ! isset( $verified->id ) || isset( $verified->error ) )
+			if (!isset($verified->id) || isset($verified->error))
 				$verified = new stdClass();
 		} else {
-			$verified = $this->api->api( "https://www.googleapis.com/plus/v1/people/me/openIdConnect" );
+			$verified = $this->api->api("https://www.googleapis.com/plus/v1/people/me/openIdConnect");
 
-			if ( ! isset( $verified->sub ) || isset( $verified->error ) )
+			if (!isset($verified->sub) || isset($verified->error))
 				$verified = new stdClass();
 		}
 
-		$response = $this->api->api( "https://www.googleapis.com/plus/v1/people/me" );
-		if ( ! isset( $response->id ) || isset( $response->error ) ){
-			throw new Exception( "User profile request failed! {$this->providerId} returned an invalid response.", 6 );
+		$response = $this->api->api("https://www.googleapis.com/plus/v1/people/me");
+		if (!isset($response->id) || isset($response->error)) {
+			throw new Exception("User profile request failed! {$this->providerId} returned an invalid response:" . Hybrid_Logger::dumpData( $response ), 6);
 		}
 
-		$this->user->profile->identifier    = (property_exists($verified,'id'))?$verified->id:((property_exists($response,'id'))?$response->id:"");
-		$this->user->profile->firstName     = (property_exists($response,'name'))?$response->name->givenName:"";
-		$this->user->profile->lastName      = (property_exists($response,'name'))?$response->name->familyName:"";
-		$this->user->profile->displayName   = (property_exists($response,'displayName'))?$response->displayName:"";
-		$this->user->profile->photoURL      = (property_exists($response,'image'))?((property_exists($response->image,'url'))?substr($response->image->url, 0, -2)."200":''):'';
-		$this->user->profile->profileURL    = (property_exists($response,'url'))?$response->url:"";
-		$this->user->profile->description   = (property_exists($response,'aboutMe'))?$response->aboutMe:"";
-		$this->user->profile->gender        = (property_exists($response,'gender'))?$response->gender:""; 
-		$this->user->profile->language      = (property_exists($response,'locale'))?$response->locale:((property_exists($verified,'locale'))?$verified->locale:"");
-		$this->user->profile->email         = (property_exists($response,'email'))?$response->email:((property_exists($verified,'email'))?$verified->email:"");
-		$this->user->profile->emailVerified = (property_exists($verified,'email'))?$verified->email:"";
+		$this->user->profile->identifier = (property_exists($verified, 'id')) ? $verified->id : ((property_exists($response, 'id')) ? $response->id : "");
+		$this->user->profile->firstName = (property_exists($response, 'name')) ? $response->name->givenName : "";
+		$this->user->profile->lastName = (property_exists($response, 'name')) ? $response->name->familyName : "";
+		$this->user->profile->displayName = (property_exists($response, 'displayName')) ? $response->displayName : "";
+		$this->user->profile->photoURL = (property_exists($response, 'image')) ? ((property_exists($response->image, 'url')) ? substr($response->image->url, 0, -2) . "200" : '') : '';
+		$this->user->profile->profileURL = (property_exists($response, 'url')) ? $response->url : "";
+		$this->user->profile->description = (property_exists($response, 'aboutMe')) ? $response->aboutMe : "";
+		$this->user->profile->gender = (property_exists($response, 'gender')) ? $response->gender : "";
+		$this->user->profile->language = (property_exists($response, 'locale')) ? $response->locale : ((property_exists($verified, 'locale')) ? $verified->locale : "");
+		$this->user->profile->email = (property_exists($response, 'email')) ? $response->email : ((property_exists($verified, 'email')) ? $verified->email : "");
+		$this->user->profile->emailVerified = (property_exists($verified, 'email')) ? $verified->email : "";
 		if (property_exists($response, 'emails')) {
 			if (count($response->emails) == 1) {
 				$this->user->profile->email = $response->emails[0]->value;
@@ -109,103 +112,116 @@ class Hybrid_Providers_Google extends Hybrid_Provider_Model_OAuth2
 					}
 				}
 			}
-		}
-		$this->user->profile->phone 		= (property_exists($response,'phone'))?$response->phone:"";
-		$this->user->profile->country 		= (property_exists($response,'country'))?$response->country:"";
-		$this->user->profile->region 		= (property_exists($response,'region'))?$response->region:"";
-		$this->user->profile->zip	 		= (property_exists($response,'zip'))?$response->zip:"";
-		if( property_exists($response,'placesLived') ){
-			$this->user->profile->city 	= ""; 
-			$this->user->profile->address	= ""; 
-			foreach($response->placesLived as $c){
-				if(property_exists($c,'primary')){
-					if($c->primary == true){ 
-						$this->user->profile->address 	= $c->value;
-						$this->user->profile->city 	= $c->value;
-						break;
+			if (property_exists($verified, 'emails')) {
+				if (count($verified->emails) == 1) {
+					$this->user->profile->emailVerified = $verified->emails[0]->value;
+				} else {
+					foreach ($verified->emails as $email) {
+						if ($email->type == 'account') {
+							$this->user->profile->emailVerified = $email->value;
+							break;
+						}
 					}
-				}else{
-					if(property_exists($c,'value')){
-						$this->user->profile->address 	= $c->value;
-						$this->user->profile->city 	= $c->value;
-					}	
 				}
 			}
 		}
-		
-		// google API returns multiple urls, but a "website" only if it is verified 
+		$this->user->profile->phone = (property_exists($response, 'phone')) ? $response->phone : "";
+		$this->user->profile->country = (property_exists($response, 'country')) ? $response->country : "";
+		$this->user->profile->region = (property_exists($response, 'region')) ? $response->region : "";
+		$this->user->profile->zip = (property_exists($response, 'zip')) ? $response->zip : "";
+		if (property_exists($response, 'placesLived')) {
+			$this->user->profile->city = "";
+			$this->user->profile->address = "";
+			foreach ($response->placesLived as $c) {
+				if (property_exists($c, 'primary')) {
+					if ($c->primary == true) {
+						$this->user->profile->address = $c->value;
+						$this->user->profile->city = $c->value;
+						break;
+					}
+				} else {
+					if (property_exists($c, 'value')) {
+						$this->user->profile->address = $c->value;
+						$this->user->profile->city = $c->value;
+					}
+				}
+			}
+		}
+
+		// google API returns multiple urls, but a "website" only if it is verified
 		// see http://support.google.com/plus/answer/1713826?hl=en
-		if( property_exists($response,'urls') ){
-			foreach($response->urls as $u){
-				if(property_exists($u, 'primary') && $u->primary == true) $this->user->profile->webSiteURL = $u->value;
+		if (property_exists($response, 'urls')) {
+			foreach ($response->urls as $u) {
+				if (property_exists($u, 'primary') && $u->primary == true)
+					$this->user->profile->webSiteURL = $u->value;
 			}
 		} else {
 			$this->user->profile->webSiteURL = '';
 		}
 		// google API returns age ranges or min. age only (with plus.login scope)
-		if( property_exists($response,'ageRange') ){
-			if( property_exists($response->ageRange,'min') && property_exists($response->ageRange,'max') ){
-				$this->user->profile->age 	= $response->ageRange->min.' - '.$response->ageRange->max;
+		if (property_exists($response, 'ageRange')) {
+			if (property_exists($response->ageRange, 'min') && property_exists($response->ageRange, 'max')) {
+				$this->user->profile->age = $response->ageRange->min . ' - ' . $response->ageRange->max;
 			} else {
-				$this->user->profile->age 	= '> '.$response->ageRange->min;
+				$this->user->profile->age = '> ' . $response->ageRange->min;
 			}
 		} else {
 			$this->user->profile->age = '';
 		}
 		// google API returns birthdays only if a user set 'show in my account'
-		if( property_exists($response,'birthday') ){ 
-			list($birthday_year, $birthday_month, $birthday_day) = explode( '-', $response->birthday );
+		if (property_exists($response, 'birthday')) {
+			list($birthday_year, $birthday_month, $birthday_day) = explode('-', $response->birthday);
 
-			$this->user->profile->birthDay   = (int) $birthday_day;
+			$this->user->profile->birthDay = (int) $birthday_day;
 			$this->user->profile->birthMonth = (int) $birthday_month;
-			$this->user->profile->birthYear  = (int) $birthday_year;
+			$this->user->profile->birthYear = (int) $birthday_year;
 		} else {
-			$this->user->profile->birthDay=0;$this->user->profile->birthMonth=0;$this->user->profile->birthYear=0;
+			$this->user->profile->birthDay = 0;
+			$this->user->profile->birthMonth = 0;
+			$this->user->profile->birthYear = 0;
 		}
-                
+
 		return $this->user->profile;
 	}
 
 	/**
-	* load the user (Gmail and google plus) contacts 
-	*  ..toComplete
-	*/
-	function getUserContacts()
-	{ 
-		// refresh tokens if needed 
-		$this->refreshToken();  
+	 * {@inheritdoc}
+	 */
+	function getUserContacts() {
+		// refresh tokens if needed
+		$this->refreshToken();
 
-		$contacts = array(); 
-		if( ! isset( $this->config['contacts_param'] ) ){
-			$this->config['contacts_param'] = array( "max-results" => 500 );
+		$contacts = array();
+		if (!isset($this->config['contacts_param'])) {
+			$this->config['contacts_param'] = array("max-results" => 500);
 		}
-		
+
 		// Google Gmail and Android contacts
 		if (strpos($this->scope, '/m8/feeds/') !== false) {
-	
-			$response = $this->api->api( "https://www.google.com/m8/feeds/contacts/default/full?" 
-						. http_build_query( array_merge( array('alt' => 'json', 'v' => '3.0'), $this->config['contacts_param'] ) ) ); 
-	
-			if( ! $response ){
-				return ARRAY();
+
+			$response = $this->api->api("https://www.google.com/m8/feeds/contacts/default/full?"
+					. http_build_query(array_merge(array('alt' => 'json', 'v' => '3.0'), $this->config['contacts_param'])));
+
+			if (!$response) {
+				return array();
 			}
 
 			if (isset($response->feed->entry)) {
-				foreach( $response->feed->entry as $idx => $entry ){
+				foreach ($response->feed->entry as $idx => $entry) {
 					$uc = new Hybrid_User_Contact();
-					$uc->email 			= isset($entry->{'gd$email'}[0]->address) ? (string) $entry->{'gd$email'}[0]->address : '';
-					$uc->displayName 	= isset($entry->title->{'$t'}) ? (string) $entry->title->{'$t'} : '';
-					$uc->identifier		= ($uc->email!='')?$uc->email:'';
-					$uc->description 	= '';
-					if( property_exists($entry,'link') ){
+					$uc->email = isset($entry->{'gd$email'}[0]->address) ? (string) $entry->{'gd$email'}[0]->address : '';
+					$uc->displayName = isset($entry->title->{'$t'}) ? (string) $entry->title->{'$t'} : '';
+					$uc->identifier = ($uc->email != '') ? $uc->email : '';
+					$uc->description = '';
+					if (property_exists($entry, 'link')) {
 						/**
 						 * sign links with access_token
 						 */
-						if(is_array($entry->link)){
-							foreach($entry->link as $l){
-								if( property_exists($l,'gd$etag') && $l->type=="image/*"){
+						if (is_array($entry->link)) {
+							foreach ($entry->link as $l) {
+								if (property_exists($l, 'gd$etag') && $l->type == "image/*") {
 									$uc->photoURL = $this->addUrlParam($l->href, array('access_token' => $this->api->access_token));
-								} else if($l->type=="self"){
+								} else if ($l->type == "self") {
 									$uc->profileURL = $this->addUrlParam($l->href, array('access_token' => $this->api->access_token));
 								}
 							}
@@ -213,10 +229,11 @@ class Hybrid_Providers_Google extends Hybrid_Provider_Model_OAuth2
 					} else {
 						$uc->profileURL = '';
 					}
-					if( property_exists($response,'website') ){
-						if(is_array($response->website)){
-							foreach($response->website as $w){
-								if($w->primary == true) $uc->webSiteURL = $w->value;
+					if (property_exists($response, 'website')) {
+						if (is_array($response->website)) {
+							foreach ($response->website as $w) {
+								if ($w->primary == true)
+									$uc->webSiteURL = $w->value;
 							}
 						} else {
 							$uc->webSiteURL = $response->website->value;
@@ -229,52 +246,52 @@ class Hybrid_Providers_Google extends Hybrid_Provider_Model_OAuth2
 				}
 			}
 		}
-		
+
 		// Google social contacts
 		if (strpos($this->scope, '/auth/plus.login') !== false) {
-			
-			$response = $this->api->api( "https://www.googleapis.com/plus/v1/people/me/people/visible?" 
-						. http_build_query( $this->config['contacts_param'] ) ); 
-	
-			if( ! $response ){
-				return ARRAY();
+
+			$response = $this->api->api("https://www.googleapis.com/plus/v1/people/me/people/visible?"
+					. http_build_query($this->config['contacts_param']));
+
+			if (!$response) {
+				return array();
 			}
-			
-			foreach( $response->items as $idx => $item ){
+
+			foreach ($response->items as $idx => $item) {
 				$uc = new Hybrid_User_Contact();
-				$uc->email 			= (property_exists($item,'email'))?$item->email:'';   
-				$uc->displayName 	= (property_exists($item,'displayName'))?$item->displayName:'';  
-				$uc->identifier 	= (property_exists($item,'id'))?$item->id:'';
-				
-				$uc->description 	= (property_exists($item,'objectType'))?$item->objectType:'';
-				$uc->photoURL 		= (property_exists($item,'image'))?((property_exists($item->image,'url'))?$item->image->url:''):'';
-				$uc->profileURL 	= (property_exists($item,'url'))?$item->url:'';
-				$uc->webSiteURL 	= '';
-				
+				$uc->email = (property_exists($item, 'email')) ? $item->email : '';
+				$uc->displayName = (property_exists($item, 'displayName')) ? $item->displayName : '';
+				$uc->identifier = (property_exists($item, 'id')) ? $item->id : '';
+
+				$uc->description = (property_exists($item, 'objectType')) ? $item->objectType : '';
+				$uc->photoURL = (property_exists($item, 'image')) ? ((property_exists($item->image, 'url')) ? $item->image->url : '') : '';
+				$uc->profileURL = (property_exists($item, 'url')) ? $item->url : '';
+				$uc->webSiteURL = '';
+
 				$contacts[] = $uc;
 			}
-			
 		}
-		
+
 		return $contacts;
- 	}
+	}
 
 	/**
-	 * Add to the $url new parameters
-	 * @param string $url
-	 * @param array $params
+	 * Add query parameters to the $url
+	 *
+	 * @param string $url    URL
+	 * @param array  $params Parameters to add
 	 * @return string
 	 */
-	function addUrlParam($url, array $params)
-	{
+	function addUrlParam($url, array $params) {
 		$query = parse_url($url, PHP_URL_QUERY);
 
 		// Returns the URL string with new parameters
-		if( $query ) {
-			$url .= '&' . http_build_query( $params );
+		if ($query) {
+			$url .= '&' . http_build_query($params);
 		} else {
-			$url .= '?' . http_build_query( $params );
+			$url .= '?' . http_build_query($params);
 		}
 		return $url;
 	}
+
 }
diff --git a/e107_handlers/hybridauth/Hybrid/Providers/LinkedIn.php b/e107_handlers/hybridauth/Hybrid/Providers/LinkedIn.php
index 28b5bd757..73467edb4 100644
--- a/e107_handlers/hybridauth/Hybrid/Providers/LinkedIn.php
+++ b/e107_handlers/hybridauth/Hybrid/Providers/LinkedIn.php
@@ -1,168 +1,169 @@
 <?php
-/*!
-* HybridAuth
-* http://hybridauth.sourceforge.net | http://github.com/hybridauth/hybridauth
-* (c) 2009-2012, HybridAuth authors | http://hybridauth.sourceforge.net/licenses.html
-*/
+
+/* !
+ * HybridAuth
+ * http://hybridauth.sourceforge.net | http://github.com/hybridauth/hybridauth
+ * (c) 2009-2015, HybridAuth authors | http://hybridauth.sourceforge.net/licenses.html
+ */
 
 /**
  * Hybrid_Providers_LinkedIn provider adapter based on OAuth1 protocol
- * 
+ *
  * Hybrid_Providers_LinkedIn use linkedinPHP library created by fiftyMission Inc.
- * 
+ *
  * http://hybridauth.sourceforge.net/userguide/IDProvider_info_LinkedIn.html
  */
-class Hybrid_Providers_LinkedIn extends Hybrid_Provider_Model
-{ 
+class Hybrid_Providers_LinkedIn extends Hybrid_Provider_Model {
+
 	/**
-	* IDp wrappers initializer
-	*/
-	function initialize()
-	{
-		if ( ! $this->config["keys"]["key"] || ! $this->config["keys"]["secret"] ){
-			throw new Exception( "Your application key and secret are required in order to connect to {$this->providerId}.", 4 );
+	 * Provider API Wrapper
+	 * @var LinkedIn 
+	 */
+	public $api;
+
+	/**
+	 * {@inheritdoc}
+	 */
+	function initialize() {
+		if (!$this->config["keys"]["key"] || !$this->config["keys"]["secret"]) {
+			throw new Exception("Your application key and secret are required in order to connect to {$this->providerId}.", 4);
 		}
-		if ( ! class_exists('OAuthConsumer') ) {
+		if (!class_exists('OAuthConsumer', false)) {
 			require_once Hybrid_Auth::$config["path_libraries"] . "OAuth/OAuth.php";
 		}
 		require_once Hybrid_Auth::$config["path_libraries"] . "LinkedIn/LinkedIn.php";
 
-		$this->api = new LinkedIn( array( 'appKey' => $this->config["keys"]["key"], 'appSecret' => $this->config["keys"]["secret"], 'callbackUrl' => $this->endpoint ) );
+		$this->api = new LinkedIn(array('appKey' => $this->config["keys"]["key"], 'appSecret' => $this->config["keys"]["secret"], 'callbackUrl' => $this->endpoint));
 
-		if( $this->token( "access_token_linkedin" ) ){
-			$this->api->setTokenAccess( $this->token( "access_token_linkedin" ) );
+		if ($this->token("access_token_linkedin")) {
+			$this->api->setTokenAccess($this->token("access_token_linkedin"));
 		}
 	}
 
 	/**
-	* begin login step
-	*/
-	function loginBegin()
-	{
+	 * {@inheritdoc}
+	 */
+	function loginBegin() {
 		// send a request for a LinkedIn access token
 		$response = $this->api->retrieveTokenRequest();
 
-		if( isset( $response['success'] ) && $response['success'] === TRUE ){
-			$this->token( "oauth_token",        $response['linkedin']['oauth_token'] );
-			$this->token( "oauth_token_secret", $response['linkedin']['oauth_token_secret'] );
+		if (isset($response['success']) && $response['success'] === true) {
+			$this->token("oauth_token", $response['linkedin']['oauth_token']);
+			$this->token("oauth_token_secret", $response['linkedin']['oauth_token_secret']);
 
 			# redirect user to LinkedIn authorisation web page
-			Hybrid_Auth::redirect( LINKEDIN::_URL_AUTH . $response['linkedin']['oauth_token'] );
-		}
-		else{
-			throw new Exception( "Authentication failed! {$this->providerId} returned an invalid Token.", 5 );
+			Hybrid_Auth::redirect(LINKEDIN::_URL_AUTH . $response['linkedin']['oauth_token']);
+		} else {
+			throw new Exception("Authentication failed! {$this->providerId} returned an invalid Token in response: " . Hybrid_Logger::dumpData( $response ), 5);
 		}
 	}
 
 	/**
-	* finish login step
-	*/
-	function loginFinish()
-	{
-		$oauth_token    = $_REQUEST['oauth_token'];
-		$oauth_verifier = $_REQUEST['oauth_verifier'];
+	 * {@inheritdoc}
+	 */
+	function loginFinish() {
+        // in case we get oauth_problem=user_refused
+        if (isset($_REQUEST['oauth_problem']) && $_REQUEST['oauth_problem'] == "user_refused") {
+            throw new Exception("Authentication failed! The user denied your request.", 5);
+        }
 
-		if ( ! $oauth_verifier ){
-			throw new Exception( "Authentication failed! {$this->providerId} returned an invalid Token.", 5 );
+		$oauth_token = isset($_REQUEST['oauth_token']) ? $_REQUEST['oauth_token'] : null;
+		$oauth_verifier = isset($_REQUEST['oauth_verifier']) ? $_REQUEST['oauth_verifier'] : null;
+
+		if (!$oauth_token || !$oauth_verifier) {
+			throw new Exception("Authentication failed! {$this->providerId} returned an invalid Token.", 5);
 		}
 
-		$response = $this->api->retrieveTokenAccess( $oauth_token, $this->token( "oauth_token_secret" ), $oauth_verifier );
+		$response = $this->api->retrieveTokenAccess($oauth_token, $this->token("oauth_token_secret"), $oauth_verifier);
 
-		if( isset( $response['success'] ) && $response['success'] === TRUE ){
-			$this->deleteToken( "oauth_token"        );
-			$this->deleteToken( "oauth_token_secret" );
+		if (isset($response['success']) && $response['success'] === true) {
+			$this->deleteToken("oauth_token");
+			$this->deleteToken("oauth_token_secret");
 
-			$this->token( "access_token_linkedin", $response['linkedin'] );
-			$this->token( "access_token"         , $response['linkedin']['oauth_token'] );
-			$this->token( "access_token_secret"  , $response['linkedin']['oauth_token_secret'] );
+			$this->token("access_token_linkedin", $response['linkedin']);
+			$this->token("access_token", $response['linkedin']['oauth_token']);
+			$this->token("access_token_secret", $response['linkedin']['oauth_token_secret']);
 
 			// set user as logged in
 			$this->setUserConnected();
-		}
-		else{
-			throw new Exception( "Authentication failed! {$this->providerId} returned an invalid Token.", 5 );
+		} else {
+			throw new Exception("Authentication failed! {$this->providerId} returned an invalid Token in response: " . Hybrid_Logger::dumpData( $response ), 5);
 		}
 	}
 
 	/**
-	* load the user profile from the IDp api client
-	*/
-	function getUserProfile()
-	{
-		try{
+	 * {@inheritdoc}
+	 */
+	function getUserProfile() {
+		try {
 			// http://developer.linkedin.com/docs/DOC-1061
 			$response = $this->api->profile('~:(id,first-name,last-name,public-profile-url,picture-url,email-address,date-of-birth,phone-numbers,summary)');
-		}
-		catch( LinkedInException $e ){
-			throw new Exception( "User profile request failed! {$this->providerId} returned an error: $e", 6 );
+		} catch (LinkedInException $e) {
+			throw new Exception("User profile request failed! {$this->providerId} returned an error: {$e->getMessage()}", 6, $e);
 		}
 
-		if( isset( $response['success'] ) && $response['success'] === TRUE ){
-			$data = @ new SimpleXMLElement( $response['linkedin'] );
+		if (isset($response['success']) && $response['success'] === true) {
+			$data = @ new SimpleXMLElement($response['linkedin']);
 
-			if ( ! is_object( $data ) ){
-				throw new Exception( "User profile request failed! {$this->providerId} returned an invalid xml data.", 6 );
+			if (!is_object($data)) {
+				throw new Exception("User profile request failed! {$this->providerId} returned an invalid xml data: " . Hybrid_Logger::dumpData( $data ), 6);
 			}
 
-			$this->user->profile->identifier  = (string) $data->{'id'};
-			$this->user->profile->firstName   = (string) $data->{'first-name'};
-			$this->user->profile->lastName    = (string) $data->{'last-name'};
-			$this->user->profile->displayName = trim( $this->user->profile->firstName . " " . $this->user->profile->lastName );
+			$this->user->profile->identifier = (string) $data->{'id'};
+			$this->user->profile->firstName = (string) $data->{'first-name'};
+			$this->user->profile->lastName = (string) $data->{'last-name'};
+			$this->user->profile->displayName = trim($this->user->profile->firstName . " " . $this->user->profile->lastName);
 
-			$this->user->profile->email         = (string) $data->{'email-address'};
+			$this->user->profile->email = (string) $data->{'email-address'};
 			$this->user->profile->emailVerified = (string) $data->{'email-address'};
 
-			$this->user->profile->photoURL    = (string) $data->{'picture-url'};
-			$this->user->profile->profileURL  = (string) $data->{'public-profile-url'};
+			$this->user->profile->photoURL = (string) $data->{'picture-url'};
+			$this->user->profile->profileURL = (string) $data->{'public-profile-url'};
 			$this->user->profile->description = (string) $data->{'summary'};
 
-			if( $data->{'phone-numbers'} && $data->{'phone-numbers'}->{'phone-number'} ){
+			if ($data->{'phone-numbers'} && $data->{'phone-numbers'}->{'phone-number'}) {
 				$this->user->profile->phone = (string) $data->{'phone-numbers'}->{'phone-number'}->{'phone-number'};
-			}
-			else{
+			} else {
 				$this->user->profile->phone = null;
 			}
 
-			if( $data->{'date-of-birth'} ){
-				$this->user->profile->birthDay   = (string) $data->{'date-of-birth'}->day;
+			if ($data->{'date-of-birth'}) {
+				$this->user->profile->birthDay = (string) $data->{'date-of-birth'}->day;
 				$this->user->profile->birthMonth = (string) $data->{'date-of-birth'}->month;
-				$this->user->profile->birthYear  = (string) $data->{'date-of-birth'}->year;
+				$this->user->profile->birthYear = (string) $data->{'date-of-birth'}->year;
 			}
 
 			return $this->user->profile;
-		}
-		else{
-			throw new Exception( "User profile request failed! {$this->providerId} returned an invalid response.", 6 );
+		} else {
+			throw new Exception("User profile request failed! {$this->providerId} returned an invalid response: " . Hybrid_Logger::dumpData( $response ), 6);
 		}
 	}
 
 	/**
-	* load the user contacts
-	*/
-	function getUserContacts()
-	{
-		try{
+	 * {@inheritdoc}
+	 */
+	function getUserContacts() {
+		try {
 			$response = $this->api->profile('~/connections:(id,first-name,last-name,picture-url,public-profile-url,summary)');
-		}
-		catch( LinkedInException $e ){
-			throw new Exception( "User contacts request failed! {$this->providerId} returned an error: $e" );
+		} catch (LinkedInException $e) {
+			throw new Exception("User contacts request failed! {$this->providerId} returned an error: {$e->getMessage()}", 0, $e);
 		}
 
-		if( ! $response || ! $response['success'] ){
-			return ARRAY();
+		if (!$response || !$response['success']) {
+			return array();
 		}
 
-		$connections = new SimpleXMLElement( $response['linkedin'] );
-		
-		$contacts = ARRAY();
+		$connections = new SimpleXMLElement($response['linkedin']);
 
-		foreach( $connections->person as $connection ) {
+		$contacts = array();
+
+		foreach ($connections->person as $connection) {
 			$uc = new Hybrid_User_Contact();
 
-			$uc->identifier  = (string) $connection->id;
+			$uc->identifier = (string) $connection->id;
 			$uc->displayName = (string) $connection->{'last-name'} . " " . $connection->{'first-name'};
-			$uc->profileURL  = (string) $connection->{'public-profile-url'};
-			$uc->photoURL    = (string) $connection->{'picture-url'};
+			$uc->profileURL = (string) $connection->{'public-profile-url'};
+			$uc->photoURL = (string) $connection->{'picture-url'};
 			$uc->description = (string) $connection->{'summary'};
 
 			$contacts[] = $uc;
@@ -172,84 +173,85 @@ class Hybrid_Providers_LinkedIn extends Hybrid_Provider_Model
 	}
 
 	/**
-	* update user status
-	*/
-	function setUserStatus( $status )
-	{
+	 * {@inheritdoc}
+	 */
+	function setUserStatus($status) {
 		$parameters = array();
-		$private    = true; // share with your connections only
+		$private = true; // share with your connections only
 
-		if( is_array( $status ) ){
-			if( isset( $status[0] ) && ! empty( $status[0] ) ) $parameters["title"]               = $status[0]; // post title
-			if( isset( $status[1] ) && ! empty( $status[1] ) ) $parameters["comment"]             = $status[1]; // post comment
-			if( isset( $status[2] ) && ! empty( $status[2] ) ) $parameters["submitted-url"]       = $status[2]; // post url
-			if( isset( $status[3] ) && ! empty( $status[3] ) ) $parameters["submitted-image-url"] = $status[3]; // post picture url
-			if( isset( $status[4] ) && ! empty( $status[4] ) ) $private                           = $status[4]; // true or false
+		if (is_array($status)) {
+			if (isset($status[0]) && !empty($status[0]))
+				$parameters["title"] = $status[0]; // post title
+			if (isset($status[1]) && !empty($status[1]))
+				$parameters["comment"] = $status[1]; // post comment
+			if (isset($status[2]) && !empty($status[2]))
+				$parameters["submitted-url"] = $status[2]; // post url
+			if (isset($status[3]) && !empty($status[3]))
+				$parameters["submitted-image-url"] = $status[3]; // post picture url
+			if (isset($status[4]) && !empty($status[4]))
+				$private = $status[4]; // true or false
 		}
-		else{
+		else {
 			$parameters["comment"] = $status;
 		}
 
-		try{
-			$response  = $this->api->share( 'new', $parameters, $private );
-		}
-		catch( LinkedInException $e ){
-			throw new Exception( "Update user status update failed!  {$this->providerId} returned an error: $e" );
+		try {
+			$response = $this->api->share('new', $parameters, $private);
+		} catch (LinkedInException $e) {
+			throw new Exception("Update user status update failed!  {$this->providerId} returned an error: {$e->getMessage()}", 0, $e);
 		}
 
-		if ( ! $response || ! $response['success'] )
-		{
-			throw new Exception( "Update user status update failed! {$this->providerId} returned an error." );
+		if (!$response || !$response['success']) {
+			throw new Exception("Update user status update failed! {$this->providerId} returned an error in response: " . Hybrid_Logger::dumpData( $response ));
 		}
 
-        return $response;
+		return $response;
 	}
 
 	/**
-	* load the user latest activity
-	*    - timeline : all the stream
-	*    - me       : the user activity only
-	*/
-	function getUserActivity( $stream )
-	{
-		try{
-			if( $stream == "me" ){
-				$response  = $this->api->updates( '?type=SHAR&scope=self&count=25' );
+	 * load the user latest activity
+	 *    - timeline : all the stream
+	 *    - me       : the user activity only
+	 * {@inheritdoc}
+	 */
+	function getUserActivity($stream) {
+		try {
+			if ($stream == "me") {
+				$response = $this->api->updates('?type=SHAR&scope=self&count=25');
+			} else {
+				$response = $this->api->updates('?type=SHAR&count=25');
 			}
-			else{
-				$response  = $this->api->updates( '?type=SHAR&count=25' );
-			}
-		}
-		catch( LinkedInException $e ){
-			throw new Exception( "User activity stream request failed! {$this->providerId} returned an error: $e" );
+		} catch (LinkedInException $e) {
+			throw new Exception("User activity stream request failed! {$this->providerId} returned an error: {$e->getMessage()}", 0, $e);
 		}
 
-		if( ! $response || ! $response['success'] ){
-			return ARRAY();
+		if (!$response || !$response['success']) {
+			return array();
 		}
 
-		$updates = new SimpleXMLElement( $response['linkedin'] );
+		$updates = new SimpleXMLElement($response['linkedin']);
 
-		$activities = ARRAY(); 
+		$activities = array();
 
-		foreach( $updates->update as $update ) {
+		foreach ($updates->update as $update) {
 			$person = $update->{'update-content'}->person;
-			$share  = $update->{'update-content'}->person->{'current-share'};
+			$share = $update->{'update-content'}->person->{'current-share'};
 
 			$ua = new Hybrid_User_Activity();
 
-			$ua->id                 = (string) $update->id;
-			$ua->date               = (string) $update->timestamp;
-			$ua->text               = (string) $share->{'comment'};
+			$ua->id = (string) $update->id;
+			$ua->date = (string) $update->timestamp;
+			$ua->text = (string) $share->{'comment'};
+
+			$ua->user->identifier = (string) $person->id;
+			$ua->user->displayName = (string) $person->{'first-name'} . ' ' . $person->{'last-name'};
+			$ua->user->profileURL = (string) $person->{'site-standard-profile-request'}->url;
+			$ua->user->photoURL = null;
 
-			$ua->user->identifier   = (string) $person->id;
-			$ua->user->displayName  = (string) $person->{'first-name'} . ' ' . $person->{'last-name'};
-			$ua->user->profileURL   = (string) $person->{'site-standard-profile-request'}->url;
-			$ua->user->photoURL     = NULL;
-			
 			$activities[] = $ua;
 		}
 
 		return $activities;
 	}
+
 }
diff --git a/e107_handlers/hybridauth/Hybrid/Providers/Live.php b/e107_handlers/hybridauth/Hybrid/Providers/Live.php
index 47e9e8126..8468a20e5 100644
--- a/e107_handlers/hybridauth/Hybrid/Providers/Live.php
+++ b/e107_handlers/hybridauth/Hybrid/Providers/Live.php
@@ -1,106 +1,102 @@
 <?php
-/*!
-* HybridAuth
-* http://hybridauth.sourceforge.net | http://github.com/hybridauth/hybridauth
-* (c) 2009-2012, HybridAuth authors | http://hybridauth.sourceforge.net/licenses.html 
-*/
 
-/** 
+/* !
+ * HybridAuth
+ * http://hybridauth.sourceforge.net | http://github.com/hybridauth/hybridauth
+ * (c) 2009-2012, HybridAuth authors | http://hybridauth.sourceforge.net/licenses.html
+ */
+
+/**
  * Windows Live OAuth2 Class
  * 
  * @package             HybridAuth providers package 
  * @author              Lukasz Koprowski <azram19@gmail.com>
  * @version             0.2
  * @license             BSD License
- */ 
+ */
 
 /**
  * Hybrid_Providers_Live - Windows Live provider adapter based on OAuth2 protocol
  */
-class Hybrid_Providers_Live extends Hybrid_Provider_Model_OAuth2
-{
-	// default permissions 
+class Hybrid_Providers_Live extends Hybrid_Provider_Model_OAuth2 {
+
+	/**
+	 * {@inheritdoc}
+	 */
 	public $scope = "wl.basic wl.contacts_emails wl.emails wl.signin wl.share wl.birthday";
 
-	
 	/**
-	* IDp wrappers initializer 
-	*/
-	function initialize() 
-	{
+	 * {@inheritdoc}
+	 */
+	function initialize() {
 		parent::initialize();
 
 		// Provider api end-points
-		$this->api->api_base_url  = 'https://apis.live.net/v5.0/';
+		$this->api->api_base_url = 'https://apis.live.net/v5.0/';
 		$this->api->authorize_url = 'https://login.live.com/oauth20_authorize.srf';
-		$this->api->token_url     = 'https://login.live.com/oauth20_token.srf';
+		$this->api->token_url = 'https://login.live.com/oauth20_token.srf';
 
-		$this->api->curl_authenticate_method  = "GET";
+		$this->api->curl_authenticate_method = "GET";
 	}
 
 	/**
-	* grab the user profile from the api client
-	*/
-	function getUserProfile()
-	{
-		$data = $this->api->get( "me" ); 
+	 * {@inheritdoc}
+	 */
+	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 );
+		if (!isset($data->id)) {
+			throw new Exception("User profile request failed! {$this->providerId} returned an invalid response: " . Hybrid_Logger::dumpData( $data ), 6);
 		}
 
-		$this->user->profile->identifier    = (property_exists($data,'id'))?$data->id:"";
-		$this->user->profile->firstName     = (property_exists($data,'first_name'))?$data->first_name:"";
-		$this->user->profile->lastName      = (property_exists($data,'last_name'))?$data->last_name:"";
-		$this->user->profile->displayName   = (property_exists($data,'name'))?trim( $data->name ):"";
-		$this->user->profile->gender        = (property_exists($data,'gender'))?$data->gender:"";
+		$this->user->profile->identifier = (property_exists($data, 'id')) ? $data->id : "";
+		$this->user->profile->firstName = (property_exists($data, 'first_name')) ? $data->first_name : "";
+		$this->user->profile->lastName = (property_exists($data, 'last_name')) ? $data->last_name : "";
+		$this->user->profile->displayName = (property_exists($data, 'name')) ? trim($data->name) : "";
+		$this->user->profile->gender = (property_exists($data, 'gender')) ? $data->gender : "";
 
 		//wl.basic
-		$this->user->profile->profileURL    = (property_exists($data,'link'))?$data->link:"";
+		$this->user->profile->profileURL = (property_exists($data, 'link')) ? $data->link : "";
 
 		//wl.emails
-		$this->user->profile->email         = (property_exists($data,'emails'))?$data->emails->account:"";
-		$this->user->profile->emailVerified = (property_exists($data,'emails'))?$data->emails->account:"";
+		$this->user->profile->email = (property_exists($data, 'emails')) ? $data->emails->account : "";
+		$this->user->profile->emailVerified = (property_exists($data, 'emails')) ? $data->emails->account : "";
 
 		//wl.birthday
-		$this->user->profile->birthDay      = (property_exists($data,'birth_day'))?$data->birth_day:"";
-		$this->user->profile->birthMonth    = (property_exists($data,'birth_month'))?$data->birth_month:"";
-		$this->user->profile->birthYear     = (property_exists($data,'birth_year'))?$data->birth_year:"";
+		$this->user->profile->birthDay = (property_exists($data, 'birth_day')) ? $data->birth_day : "";
+		$this->user->profile->birthMonth = (property_exists($data, 'birth_month')) ? $data->birth_month : "";
+		$this->user->profile->birthYear = (property_exists($data, 'birth_year')) ? $data->birth_year : "";
 
 		return $this->user->profile;
 	}
 
-
 	/**
-	* load the current logged in user contacts list from the IDp api client  
-	*/
+	 * Windows Live api does not support retrieval of email addresses (only hashes :/)
+	 * {@inheritdoc}
+	 */
+	function getUserContacts() {
+		$response = $this->api->get('me/contacts');
 
-	/* Windows Live api does not support retrieval of email addresses (only hashes :/) */
-	function getUserContacts() 
-	{
-		$response = $this->api->get( 'me/contacts' );
-
-		if ( $this->api->http_code != 200 )
-		{
-			throw new Exception( 'User contacts request failed! ' . $this->providerId . ' returned an error: ' . $this->errorMessageByStatus( $this->api->http_code ) );
+		if ($this->api->http_code != 200) {
+			throw new Exception('User contacts request failed! ' . $this->providerId . ' returned an error: ' . $this->errorMessageByStatus($this->api->http_code));
 		}
 
-		if ( !isset($response->data) || ( isset($response->errcode) &&  $response->errcode != 0 ) )
-		{
+		if (!isset($response->data) || ( isset($response->errcode) && $response->errcode != 0 )) {
 			return array();
 		}
-		
+
 		$contacts = array();
 
-		foreach( $response->data as $item ) {
+		foreach ($response->data as $item) {
 			$uc = new Hybrid_User_Contact();
 
-			$uc->identifier   = (property_exists($item,'id'))?$item->id:"";
-			$uc->displayName  = (property_exists($item,'name'))?$item->name:"";
-			$uc->email        = (property_exists($item,'emails'))?$item->emails->preferred:"";
+			$uc->identifier = (property_exists($item, 'id')) ? $item->id : "";
+			$uc->displayName = (property_exists($item, 'name')) ? $item->name : "";
+			$uc->email = (property_exists($item, 'emails')) ? $item->emails->preferred : "";
 			$contacts[] = $uc;
 		}
-		
+
 		return $contacts;
 	}
+
 }
diff --git a/e107_handlers/hybridauth/Hybrid/Providers/OpenID.php b/e107_handlers/hybridauth/Hybrid/Providers/OpenID.php
index af5ec1e2d..8f7903c78 100644
--- a/e107_handlers/hybridauth/Hybrid/Providers/OpenID.php
+++ b/e107_handlers/hybridauth/Hybrid/Providers/OpenID.php
@@ -1,15 +1,16 @@
 <?php
-/*!
-* HybridAuth
-* http://hybridauth.sourceforge.net | http://github.com/hybridauth/hybridauth
-* (c) 2009-2012, HybridAuth authors | http://hybridauth.sourceforge.net/licenses.html 
-*/
+
+/* !
+ * HybridAuth
+ * http://hybridauth.sourceforge.net | http://github.com/hybridauth/hybridauth
+ * (c) 2009-2012, HybridAuth authors | http://hybridauth.sourceforge.net/licenses.html
+ */
 
 /**
  * Hybrid_Providers_OpenID provider adapter for any idp openid based 
  * 
  * http://hybridauth.sourceforge.net/userguide/IDProvider_info_OpenID.html
  */
-class Hybrid_Providers_OpenID extends Hybrid_Provider_Model_OpenID
-{
+class Hybrid_Providers_OpenID extends Hybrid_Provider_Model_OpenID {
+
 }
diff --git a/e107_handlers/hybridauth/Hybrid/Providers/Twitter.php b/e107_handlers/hybridauth/Hybrid/Providers/Twitter.php
index 8089f53bc..dad718f3f 100644
--- a/e107_handlers/hybridauth/Hybrid/Providers/Twitter.php
+++ b/e107_handlers/hybridauth/Hybrid/Providers/Twitter.php
@@ -1,270 +1,263 @@
 <?php
-/*!
-* HybridAuth
-* http://hybridauth.sourceforge.net | http://github.com/hybridauth/hybridauth
-* (c) 2009-2012, HybridAuth authors | http://hybridauth.sourceforge.net/licenses.html 
-*/
+
+/* !
+ * HybridAuth
+ * http://hybridauth.sourceforge.net | http://github.com/hybridauth/hybridauth
+ * (c) 2009-2012, HybridAuth authors | http://hybridauth.sourceforge.net/licenses.html
+ */
 
 /**
-* Hybrid_Providers_Twitter provider adapter based on OAuth1 protocol
-*/
-class Hybrid_Providers_Twitter extends Hybrid_Provider_Model_OAuth1
-{
+ * Hybrid_Providers_Twitter provider adapter based on OAuth1 protocol
+ */
+class Hybrid_Providers_Twitter extends Hybrid_Provider_Model_OAuth1 {
+
 	/**
-	* IDp wrappers initializer 
-	*/
-	function initialize()
-	{
+	 * {@inheritdoc}
+	 */
+	function initialize() {
 		parent::initialize();
 
 		// Provider api end-points 
-		$this->api->api_base_url      = "https://api.twitter.com/1.1/";
-		$this->api->authorize_url     = "https://api.twitter.com/oauth/authenticate";
+		$this->api->api_base_url = "https://api.twitter.com/1.1/";
+		$this->api->authorize_url = "https://api.twitter.com/oauth/authenticate";
 		$this->api->request_token_url = "https://api.twitter.com/oauth/request_token";
-		$this->api->access_token_url  = "https://api.twitter.com/oauth/access_token";
+		$this->api->access_token_url = "https://api.twitter.com/oauth/access_token";
 
-		if ( isset( $this->config['api_version'] ) && $this->config['api_version'] ){
-			$this->api->api_base_url  = "https://api.twitter.com/{$this->config['api_version']}/";
+		if (isset($this->config['api_version']) && $this->config['api_version']) {
+			$this->api->api_base_url = "https://api.twitter.com/{$this->config['api_version']}/";
 		}
- 
-		if ( isset( $this->config['authorize'] ) && $this->config['authorize'] ){
+
+		if (isset($this->config['authorize']) && $this->config['authorize']) {
 			$this->api->authorize_url = "https://api.twitter.com/oauth/authorize";
 		}
 
-		$this->api->curl_auth_header  = false;
+		$this->api->curl_auth_header = false;
 	}
 
- 	/**
- 	 * begin login step
- 	 */
- 	function loginBegin()
- 	{
+	/**
+	 * {@inheritdoc}
+	 */
+	function loginBegin() {
 		// Initiate the Reverse Auth flow; cf. https://dev.twitter.com/docs/ios/using-reverse-auth
-		if (isset($_REQUEST['reverse_auth']) && ($_REQUEST['reverse_auth'] == 'yes')){
-			$stage1 = $this->api->signedRequest( $this->api->request_token_url, 'POST', array( 'x_auth_mode' => 'reverse_auth' ) ); 
-			if ( $this->api->http_code != 200 ){
-				throw new Exception( "Authentication failed! {$this->providerId} returned an error. " . $this->errorMessageByStatus( $this->api->http_code ), 5 );
+		if (isset($_REQUEST['reverse_auth']) && ($_REQUEST['reverse_auth'] == 'yes')) {
+			$stage1 = $this->api->signedRequest($this->api->request_token_url, 'POST', array('x_auth_mode' => 'reverse_auth'));
+			if ($this->api->http_code != 200) {
+				throw new Exception("Authentication failed! {$this->providerId} returned an error. " . $this->errorMessageByStatus($this->api->http_code), 5);
 			}
-			$responseObj = array( 'x_reverse_auth_parameters' => $stage1, 'x_reverse_auth_target' => $this->config["keys"]["key"] );
+			$responseObj = array('x_reverse_auth_parameters' => $stage1, 'x_reverse_auth_target' => $this->config["keys"]["key"]);
 			$response = json_encode($responseObj);
-			header( "Content-Type: application/json", true, 200 ) ;
+			header("Content-Type: application/json", true, 200);
 			echo $response;
 			die();
 		}
- 		$tokens = $this->api->requestToken( $this->endpoint );
- 	
- 		// request tokens as received from provider
- 		$this->request_tokens_raw = $tokens;
- 	
- 		// check the last HTTP status code returned
- 		if ( $this->api->http_code != 200 ){
- 			throw new Exception( "Authentication failed! {$this->providerId} returned an error. " . $this->errorMessageByStatus( $this->api->http_code ), 5 );
- 		}
- 	
- 		if ( ! isset( $tokens["oauth_token"] ) ){
- 			throw new Exception( "Authentication failed! {$this->providerId} returned an invalid oauth token.", 5 );
- 		}
- 	
- 		$this->token( "request_token"       , $tokens["oauth_token"] );
- 		$this->token( "request_token_secret", $tokens["oauth_token_secret"] );
- 	
+		$tokens = $this->api->requestToken($this->endpoint);
+
+		// request tokens as received from provider
+		$this->request_tokens_raw = $tokens;
+
+		// check the last HTTP status code returned
+		if ($this->api->http_code != 200) {
+			throw new Exception("Authentication failed! {$this->providerId} returned an error. " . $this->errorMessageByStatus($this->api->http_code), 5);
+		}
+
+		if (!isset($tokens["oauth_token"])) {
+			throw new Exception("Authentication failed! {$this->providerId} returned an invalid oauth token.", 5);
+		}
+
+		$this->token("request_token", $tokens["oauth_token"]);
+		$this->token("request_token_secret", $tokens["oauth_token_secret"]);
+
 		// redirect the user to the provider authentication url with force_login
- 		if ( ( isset( $this->config['force_login'] ) && $this->config['force_login'] ) || ( isset( $this->config[ 'force' ] ) && $this->config[ 'force' ] === true ) ){
- 			Hybrid_Auth::redirect( $this->api->authorizeUrl( $tokens, array( 'force_login' => true ) ) );
- 		}
+		if (( isset($this->config['force_login']) && $this->config['force_login'] ) || ( isset($this->config['force']) && $this->config['force'] === true )) {
+			Hybrid_Auth::redirect($this->api->authorizeUrl($tokens, array('force_login' => true)));
+		}
 
 		// else, redirect the user to the provider authentication url
- 		Hybrid_Auth::redirect( $this->api->authorizeUrl( $tokens ) );
- 	}
+		Hybrid_Auth::redirect($this->api->authorizeUrl($tokens));
+	}
 
 	/**
-	* finish login step 
-	*/ 
-	function loginFinish()
-	{
+	 * {@inheritdoc}
+	 */
+	function loginFinish() {
 		// in case we are completing a Reverse Auth flow; cf. https://dev.twitter.com/docs/ios/using-reverse-auth
-		if(isset($_REQUEST['oauth_token_secret'])){
+		if (isset($_REQUEST['oauth_token_secret'])) {
 			$tokens = $_REQUEST;
 			$this->access_tokens_raw = $tokens;
 
 			// we should have an access_token unless something has gone wrong
-			if ( ! isset( $tokens["oauth_token"] ) ){
-				throw new Exception( "Authentication failed! {$this->providerId} returned an invalid access token.", 5 );
+			if (!isset($tokens["oauth_token"])) {
+				throw new Exception("Authentication failed! {$this->providerId} returned an invalid access token.", 5);
 			}
 
 			// Get rid of tokens we don't need
-			$this->deleteToken( "request_token"        );
-			$this->deleteToken( "request_token_secret" );
+			$this->deleteToken("request_token");
+			$this->deleteToken("request_token_secret");
 
 			// Store access_token and secret for later use
-			$this->token( "access_token"        , $tokens['oauth_token'] );
-			$this->token( "access_token_secret" , $tokens['oauth_token_secret'] ); 
+			$this->token("access_token", $tokens['oauth_token']);
+			$this->token("access_token_secret", $tokens['oauth_token_secret']);
 
 			// set user as logged in to the current provider
-			$this->setUserConnected(); 
+			$this->setUserConnected();
 			return;
 		}
 		parent::loginFinish();
 	}
-	
 
 	/**
-	* load the user profile from the IDp api client
-	*/
-	function getUserProfile()
-	{
-		$response = $this->api->get( 'account/verify_credentials.json' );
+	 * {@inheritdoc}
+	 */
+	function getUserProfile() {
+		$includeEmail = isset($this->config['includeEmail']) ? (bool) $this->config['includeEmail'] : false;
+		$response = $this->api->get('account/verify_credentials.json'. ($includeEmail ? '?include_email=true' : ''));
 
 		// check the last HTTP status code returned
-		if ( $this->api->http_code != 200 ){
-			throw new Exception( "User profile request failed! {$this->providerId} returned an error. " . $this->errorMessageByStatus( $this->api->http_code ), 6 );
+		if ($this->api->http_code != 200) {
+			throw new Exception("User profile request failed! {$this->providerId} returned an error. " . $this->errorMessageByStatus($this->api->http_code), 6);
 		}
 
-		if ( ! is_object( $response ) || ! isset( $response->id ) ){
-			throw new Exception( "User profile request failed! {$this->providerId} api returned an invalid response.", 6 );
+		if (!is_object($response) || !isset($response->id)) {
+			throw new Exception("User profile request failed! {$this->providerId} api returned an invalid response: " . Hybrid_Logger::dumpData( $response ), 6);
 		}
 
 		# store the user profile.  
-		$this->user->profile->identifier  = (property_exists($response,'id'))?$response->id:"";
-		$this->user->profile->displayName = (property_exists($response,'screen_name'))?$response->screen_name:"";
-		$this->user->profile->description = (property_exists($response,'description'))?$response->description:"";
-		$this->user->profile->firstName   = (property_exists($response,'name'))?$response->name:""; 
-		$this->user->profile->photoURL    = (property_exists($response,'profile_image_url'))?(str_replace('_normal', '', $response->profile_image_url)):"";
-		$this->user->profile->profileURL  = (property_exists($response,'screen_name'))?("http://twitter.com/".$response->screen_name):"";
-		$this->user->profile->webSiteURL  = (property_exists($response,'url'))?$response->url:""; 
-		$this->user->profile->region      = (property_exists($response,'location'))?$response->location:"";
+		$this->user->profile->identifier = (property_exists($response, 'id')) ? $response->id : "";
+		$this->user->profile->displayName = (property_exists($response, 'screen_name')) ? $response->screen_name : "";
+		$this->user->profile->description = (property_exists($response, 'description')) ? $response->description : "";
+		$this->user->profile->firstName = (property_exists($response, 'name')) ? $response->name : "";
+		$this->user->profile->photoURL = (property_exists($response, 'profile_image_url')) ? (str_replace('_normal', '', $response->profile_image_url)) : "";
+		$this->user->profile->profileURL = (property_exists($response, 'screen_name')) ? ("http://twitter.com/" . $response->screen_name) : "";
+		$this->user->profile->webSiteURL = (property_exists($response, 'url')) ? $response->url : "";
+		$this->user->profile->region = (property_exists($response, 'location')) ? $response->location : "";
+		if($includeEmail) $this->user->profile->email = (property_exists($response, 'email')) ? $response->email : "";
 
 		return $this->user->profile;
- 	}
+	}
 
 	/**
-	* load the user contacts
-	*/
-	function getUserContacts()
-	{
-		$parameters = array( 'cursor' => '-1' ); 
-		$response  = $this->api->get( 'friends/ids.json', $parameters ); 
+	 * {@inheritdoc}
+	 */
+	function getUserContacts() {
+		$parameters = array('cursor' => '-1');
+		$response = $this->api->get('friends/ids.json', $parameters);
 
 		// check the last HTTP status code returned
-		if ( $this->api->http_code != 200 ){
-			throw new Exception( "User contacts request failed! {$this->providerId} returned an error. " . $this->errorMessageByStatus( $this->api->http_code ) );
+		if ($this->api->http_code != 200) {
+			throw new Exception("User contacts request failed! {$this->providerId} returned an error. " . $this->errorMessageByStatus($this->api->http_code));
 		}
 
-		if( ! $response || ! count( $response->ids ) ){
-			return ARRAY();
+		if (!$response || !count($response->ids)) {
+			return array();
 		}
 
 		// 75 id per time should be okey
-		$contactsids = array_chunk ( $response->ids, 75 );
+		$contactsids = array_chunk($response->ids, 75);
 
-		$contacts    = ARRAY(); 
+		$contacts = array();
 
-		foreach( $contactsids as $chunk ){ 
-			$parameters = array( 'user_id' => implode( ",", $chunk ) ); 
-			$response   = $this->api->get( 'users/lookup.json', $parameters ); 
+		foreach ($contactsids as $chunk) {
+			$parameters = array('user_id' => implode(",", $chunk));
+			$response = $this->api->get('users/lookup.json', $parameters);
 
 			// check the last HTTP status code returned
-			if ( $this->api->http_code != 200 ){
-				throw new Exception( "User contacts request failed! {$this->providerId} returned an error. " . $this->errorMessageByStatus( $this->api->http_code ) );
+			if ($this->api->http_code != 200) {
+				throw new Exception("User contacts request failed! {$this->providerId} returned an error. " . $this->errorMessageByStatus($this->api->http_code));
 			}
 
-			if( $response && count( $response ) ){
-				foreach( $response as $item ){ 
+			if ($response && count($response)) {
+				foreach ($response as $item) {
 					$uc = new Hybrid_User_Contact();
 
-					$uc->identifier   = (property_exists($item,'id'))?$item->id:"";
-					$uc->displayName  = (property_exists($item,'name'))?$item->name:"";
-					$uc->profileURL   = (property_exists($item,'screen_name'))?("http://twitter.com/".$item->screen_name):"";
-					$uc->photoURL     = (property_exists($item,'profile_image_url'))?$item->profile_image_url:"";
-					$uc->description  = (property_exists($item,'description'))?$item->description:""; 
+					$uc->identifier = (property_exists($item, 'id')) ? $item->id : "";
+					$uc->displayName = (property_exists($item, 'name')) ? $item->name : "";
+					$uc->profileURL = (property_exists($item, 'screen_name')) ? ("http://twitter.com/" . $item->screen_name) : "";
+					$uc->photoURL = (property_exists($item, 'profile_image_url')) ? $item->profile_image_url : "";
+					$uc->description = (property_exists($item, 'description')) ? $item->description : "";
 
 					$contacts[] = $uc;
-				} 
-			} 
+				}
+			}
 		}
 
 		return $contacts;
- 	}
-
-    /**
-    * update user status
-    */ 
-    function setUserStatus( $status )
-    {
-
-        if( is_array( $status ) && isset( $status[ 'message' ] ) && isset( $status[ 'picture' ] ) ){
-            $response = $this->api->post( 'statuses/update_with_media.json', array( 'status' => $status[ 'message' ], 'media[]' => file_get_contents( $status[ 'picture' ] ) ), null, null, true );
-        }else{
-            $response = $this->api->post( 'statuses/update.json', array( 'status' => $status ) ); 
-        }
-
-        // check the last HTTP status code returned
-        if ( $this->api->http_code != 200 ){
-            throw new Exception( "Update user status failed! {$this->providerId} returned an error. " . $this->errorMessageByStatus( $this->api->http_code ) );
-        }
-
-        return $response;
-    }
-
+	}
 
 	/**
-	* get user status
-	*/
-    function getUserStatus( $tweetid )
-    {
-        $info = $this->api->get( 'statuses/show.json?id=' . $tweetid . '&include_entities=true' );
+	 * {@inheritdoc}
+	 */
+	function setUserStatus($status) {
 
-        // check the last HTTP status code returned
-        if ( $this->api->http_code != 200 || !isset( $info->id ) ){
-			throw new Exception( "Cannot retrieve user status! {$this->providerId} returned an error. " . $this->errorMessageByStatus( $this->api->http_code ) );
-        }
-
-        return $info;
-    }
-
-
-	/**
-	* load the user latest activity  
-	*    - timeline : all the stream
-	*    - me       : the user activity only  
-	*
-	* by default return the timeline
-	*/ 
-	function getUserActivity( $stream )
-	{
-		if( $stream == "me" ){
-			$response  = $this->api->get( 'statuses/user_timeline.json' ); 
-		}                                                          
-		else{
-			$response  = $this->api->get( 'statuses/home_timeline.json' ); 
+		if (is_array($status) && isset($status['message']) && isset($status['picture'])) {
+			$response = $this->api->post('statuses/update_with_media.json', array('status' => $status['message'], 'media[]' => file_get_contents($status['picture'])), null, null, true);
+		} else {
+			$response = $this->api->post('statuses/update.json', array('status' => $status));
 		}
 
 		// check the last HTTP status code returned
-		if ( $this->api->http_code != 200 ){
-			throw new Exception( "User activity stream request failed! {$this->providerId} returned an error. " . $this->errorMessageByStatus( $this->api->http_code ) );
+		if ($this->api->http_code != 200) {
+			throw new Exception("Update user status failed! {$this->providerId} returned an error. " . $this->errorMessageByStatus($this->api->http_code));
 		}
 
-		if( ! $response ){
-			return ARRAY();
+		return $response;
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	function getUserStatus($tweetid) {
+		$info = $this->api->get('statuses/show.json?id=' . $tweetid . '&include_entities=true');
+
+		// check the last HTTP status code returned
+		if ($this->api->http_code != 200 || !isset($info->id)) {
+			throw new Exception("Cannot retrieve user status! {$this->providerId} returned an error. " . $this->errorMessageByStatus($this->api->http_code));
 		}
 
-		$activities = ARRAY();
+		return $info;
+	}
 
-		foreach( $response as $item ){
+	/**
+	 * load the user latest activity
+	 *    - timeline : all the stream
+	 *    - me       : the user activity only
+	 *
+	 * by default return the timeline
+	 * {@inheritdoc}
+	 */
+	function getUserActivity($stream) {
+		if ($stream == "me") {
+			$response = $this->api->get('statuses/user_timeline.json');
+		} else {
+			$response = $this->api->get('statuses/home_timeline.json');
+		}
+
+		// check the last HTTP status code returned
+		if ($this->api->http_code != 200) {
+			throw new Exception("User activity stream request failed! {$this->providerId} returned an error. " . $this->errorMessageByStatus($this->api->http_code));
+		}
+
+		if (!$response) {
+			return array();
+		}
+
+		$activities = array();
+
+		foreach ($response as $item) {
 			$ua = new Hybrid_User_Activity();
 
-			$ua->id                 = (property_exists($item,'id'))?$item->id:"";
-			$ua->date               = (property_exists($item,'created_at'))?strtotime($item->created_at):"";
-			$ua->text               = (property_exists($item,'text'))?$item->text:"";
+			$ua->id = (property_exists($item, 'id')) ? $item->id : "";
+			$ua->date = (property_exists($item, 'created_at')) ? strtotime($item->created_at) : "";
+			$ua->text = (property_exists($item, 'text')) ? $item->text : "";
+
+			$ua->user->identifier = (property_exists($item->user, 'id')) ? $item->user->id : "";
+			$ua->user->displayName = (property_exists($item->user, 'name')) ? $item->user->name : "";
+			$ua->user->profileURL = (property_exists($item->user, 'screen_name')) ? ("http://twitter.com/" . $item->user->screen_name) : "";
+			$ua->user->photoURL = (property_exists($item->user, 'profile_image_url')) ? $item->user->profile_image_url : "";
 
-			$ua->user->identifier   = (property_exists($item->user,'id'))?$item->user->id:"";
-			$ua->user->displayName  = (property_exists($item->user,'name'))?$item->user->name:""; 
-			$ua->user->profileURL   = (property_exists($item->user,'screen_name'))?("http://twitter.com/".$item->user->screen_name):"";
-			$ua->user->photoURL     = (property_exists($item->user,'profile_image_url'))?$item->user->profile_image_url:"";
-			
 			$activities[] = $ua;
 		}
 
 		return $activities;
- 	}
+	}
+
 }
diff --git a/e107_handlers/hybridauth/Hybrid/Providers/Yahoo.php b/e107_handlers/hybridauth/Hybrid/Providers/Yahoo.php
index 3f4b9bb75..35911c297 100644
--- a/e107_handlers/hybridauth/Hybrid/Providers/Yahoo.php
+++ b/e107_handlers/hybridauth/Hybrid/Providers/Yahoo.php
@@ -1,168 +1,168 @@
 <?php
-/*!
-* HybridAuth
-* http://hybridauth.sourceforge.net | http://github.com/hybridauth/hybridauth
-* (c) 2009-2012, HybridAuth authors | http://hybridauth.sourceforge.net/licenses.html 
-*/
 
-/** 
+/* !
+ * HybridAuth
+ * http://hybridauth.sourceforge.net | http://github.com/hybridauth/hybridauth
+ * (c) 2009-2012, HybridAuth authors | http://hybridauth.sourceforge.net/licenses.html
+ */
+
+/**
  * Yahoo OAuth Class
  * 
  * @package             HybridAuth providers package 
  * @author              Lukasz Koprowski <azram19@gmail.com>
  * @version             0.2
  * @license             BSD License
- */ 
+ */
 
 /**
  * Hybrid_Providers_Yahoo - Yahoo provider adapter based on OAuth1 protocol
  */
-class Hybrid_Providers_Yahoo extends Hybrid_Provider_Model_OAuth1
-{
-	function initialize() 
-	{
+class Hybrid_Providers_Yahoo extends Hybrid_Provider_Model_OAuth1 {
+
+	/**
+	 * {@inheritdoc}
+	 */
+	function initialize() {
 		parent::initialize();
 
 		// Provider api end-points
-		$this->api->api_base_url      = 'https://social.yahooapis.com/v1/';
-		$this->api->authorize_url     = 'https://api.login.yahoo.com/oauth/v2/request_auth';
+		$this->api->api_base_url = 'https://social.yahooapis.com/v1/';
+		$this->api->authorize_url = 'https://api.login.yahoo.com/oauth/v2/request_auth';
 		$this->api->request_token_url = 'https://api.login.yahoo.com/oauth/v2/get_request_token';
-		$this->api->access_token_url  = 'https://api.login.yahoo.com/oauth/v2/get_token';
+		$this->api->access_token_url = 'https://api.login.yahoo.com/oauth/v2/get_token';
 	}
 
-	function getUserProfile()
-	{
+	/**
+	 * {@inheritdoc}
+	 */
+	function getUserProfile() {
 		$userId = $this->getCurrentUserId();
 
 		$parameters = array();
-		$parameters['format']	= 'json';
+		$parameters['format'] = 'json';
 
-		$response = $this->api->get( 'user/' . $userId . '/profile', $parameters ); 
+		$response = $this->api->get('user/' . $userId . '/profile', $parameters);
 
-		if ( ! isset( $response->profile ) ){
-			throw new Exception( "User profile request failed! {$this->providerId} returned an invalid response.", 6 );
+		if (!isset($response->profile)) {
+			throw new Exception("User profile request failed! {$this->providerId} returned an invalid response: " . Hybrid_Logger::dumpData( $response ), 6);
 		}
 
 		$data = $response->profile;
 
-		$this->user->profile->identifier    = (property_exists($data,'guid'))?$data->guid:"";
-		$this->user->profile->firstName     = (property_exists($data,'givenName'))?$data->givenName:"";
-		$this->user->profile->lastName      = (property_exists($data,'familyName'))?$data->familyName:"";
-		$this->user->profile->displayName   = (property_exists($data,'nickname'))?trim( $data->nickname ):"";
-		$this->user->profile->profileURL    = (property_exists($data,'profileUrl'))?$data->profileUrl:"";
-		$this->user->profile->gender        = (property_exists($data,'gender'))?$data->gender:"";
+		$this->user->profile->identifier = (property_exists($data, 'guid')) ? $data->guid : "";
+		$this->user->profile->firstName = (property_exists($data, 'givenName')) ? $data->givenName : "";
+		$this->user->profile->lastName = (property_exists($data, 'familyName')) ? $data->familyName : "";
+		$this->user->profile->displayName = (property_exists($data, 'nickname')) ? trim($data->nickname) : "";
+		$this->user->profile->profileURL = (property_exists($data, 'profileUrl')) ? $data->profileUrl : "";
+		$this->user->profile->gender = (property_exists($data, 'gender')) ? $data->gender : "";
 
-		if( $this->user->profile->gender == "F" ){
+		if ($this->user->profile->gender == "F") {
 			$this->user->profile->gender = "female";
 		}
 
-		if( $this->user->profile->gender == "M" ){
+		if ($this->user->profile->gender == "M") {
 			$this->user->profile->gender = "male";
-		} 
+		}
 
-		if( isset($data->emails) ){
+		if (isset($data->emails)) {
 			$email = "";
-			foreach( $data->emails as $v ){
-				if( isset($v->primary) && $v->primary ) {
-					$email = (property_exists($v,'handle'))?$v->handle:"";
+			foreach ($data->emails as $v) {
+				if (isset($v->primary) && $v->primary) {
+					$email = (property_exists($v, 'handle')) ? $v->handle : "";
 
 					break;
 				}
 			}
 
-			$this->user->profile->email         = $email;
+			$this->user->profile->email = $email;
 			$this->user->profile->emailVerified = $email;
 		}
-		
-		$this->user->profile->age           = (property_exists($data,'displayAge'))?$data->displayAge:"";
-		$this->user->profile->photoURL      = (property_exists($data,'image'))?$data->image->imageUrl:"";
 
-		$this->user->profile->address       = (property_exists($data,'location'))?$data->location:"";
-		$this->user->profile->language      = (property_exists($data,'lang'))?$data->lang:"";
+		$this->user->profile->age = (property_exists($data, 'displayAge')) ? $data->displayAge : "";
+		$this->user->profile->photoURL = (property_exists($data, 'image')) ? $data->image->imageUrl : "";
+
+		$this->user->profile->address = (property_exists($data, 'location')) ? $data->location : "";
+		$this->user->profile->language = (property_exists($data, 'lang')) ? $data->lang : "";
 
 		return $this->user->profile;
 	}
 
 	/**
-	 * load the user contacts
+	 * {@inheritdoc}
 	 */
-	function getUserContacts()
-	{
+	function getUserContacts() {
 		$userId = $this->getCurrentUserId();
 
 		$parameters = array();
-		$parameters['format']	= 'json';
+		$parameters['format'] = 'json';
 		$parameters['count'] = 'max';
-		
+
 		$response = $this->api->get('user/' . $userId . '/contacts', $parameters);
 
-		if ( $this->api->http_code != 200 )
-		{
-			throw new Exception( 'User contacts request failed! ' . $this->providerId . ' returned an error: ' . $this->errorMessageByStatus( $this->api->http_code ) );
+		if ($this->api->http_code != 200) {
+			throw new Exception('User contacts request failed! ' . $this->providerId . ' returned an error: ' . $this->errorMessageByStatus($this->api->http_code));
 		}
 
-		if ( !isset($response->contacts) || !isset($response->contacts->contact) || ( isset($response->errcode) &&  $response->errcode != 0 ) )
-		{
+		if (!isset($response->contacts) || !isset($response->contacts->contact) || ( isset($response->errcode) && $response->errcode != 0 )) {
 			return array();
 		}
 
 		$contacts = array();
 
-		foreach( $response->contacts->contact as $item ) {
+		foreach ($response->contacts->contact as $item) {
 			$uc = new Hybrid_User_Contact();
 
-			$uc->identifier   = $this->selectGUID( $item );
-			$uc->email        = $this->selectEmail( $item->fields );
-			$uc->displayName  = $this->selectName( $item->fields );
-			$uc->photoURL     = $this->selectPhoto( $item->fields );
+			$uc->identifier = $this->selectGUID($item);
+			$uc->email = $this->selectEmail($item->fields);
+			$uc->displayName = $this->selectName($item->fields);
+			$uc->photoURL = $this->selectPhoto($item->fields);
 
 			$contacts[] = $uc;
 		}
-		
+
 		return $contacts;
 	}
 
 	/**
-	* return the user activity stream  
-	*/
-	function getUserActivity( $stream ) 
-	{
+	 * {@inheritdoc}
+	 */
+	function getUserActivity($stream) {
 		$userId = $this->getCurrentUserId();
 
 		$parameters = array();
-		$parameters['format']	= 'json';
-		$parameters['count']	= 'max';
-		
+		$parameters['format'] = 'json';
+		$parameters['count'] = 'max';
+
 		$response = $this->api->get('user/' . $userId . '/updates', $parameters);
 
-		if( ! $response->updates || $this->api->http_code != 200 )
-		{
-			throw new Exception( 'User activity request failed! ' . $this->providerId . ' returned an error: ' . $this->errorMessageByStatus( $this->api->http_code ) );
+		if (!$response->updates || $this->api->http_code != 200) {
+			throw new Exception('User activity request failed! ' . $this->providerId . ' returned an error: ' . $this->errorMessageByStatus($this->api->http_code));
 		}
 
 		$activities = array();
 
-		foreach( $response->updates as $item ){
+		foreach ($response->updates as $item) {
 			$ua = new Hybrid_User_Activity();
 
-			$ua->id = (property_exists($item,'collectionID'))?$item->collectionID:"";
-			$ua->date = (property_exists($item,'lastUpdated'))?$item->lastUpdated:"";
-			$ua->text = (property_exists($item,'loc_longForm'))?$item->loc_longForm:"";
+			$ua->id = (property_exists($item, 'collectionID')) ? $item->collectionID : "";
+			$ua->date = (property_exists($item, 'lastUpdated')) ? $item->lastUpdated : "";
+			$ua->text = (property_exists($item, 'loc_longForm')) ? $item->loc_longForm : "";
 
-			$ua->user->identifier  = (property_exists($item,'profile_guid'))?$item->profile_guid:"";
-			$ua->user->displayName = (property_exists($item,'profile_nickname'))?$item->profile_nickname:"";
-			$ua->user->profileURL  = (property_exists($item,'profile_profileUrl'))?$item->profile_profileUrl:"";
-			$ua->user->photoURL    = (property_exists($item,'profile_displayImage'))?$item->profile_displayImage:""; 
+			$ua->user->identifier = (property_exists($item, 'profile_guid')) ? $item->profile_guid : "";
+			$ua->user->displayName = (property_exists($item, 'profile_nickname')) ? $item->profile_nickname : "";
+			$ua->user->profileURL = (property_exists($item, 'profile_profileUrl')) ? $item->profile_profileUrl : "";
+			$ua->user->photoURL = (property_exists($item, 'profile_displayImage')) ? $item->profile_displayImage : "";
 
 			$activities[] = $ua;
 		}
 
-		if( $stream == "me" ){
+		if ($stream == "me") {
 			$userId = $this->getCurrentUserId();
 			$my_activities = array();
 
-			foreach( $activities as $a ){
-				if( $a->user->identifier == $userId ){
+			foreach ($activities as $a) {
+				if ($a->user->identifier == $userId) {
 					$my_activities[] = $a;
 				}
 			}
@@ -173,70 +173,104 @@ class Hybrid_Providers_Yahoo extends Hybrid_Provider_Model_OAuth1
 		return $activities;
 	}
 
-	//--
-
-	function select($vs, $t)
-	{
-		foreach( $vs as $v ){
-			if( $v->type == $t ) {
+	/**
+	 * Utility function for returning values from XML-like objects
+	 *
+	 * @param stdClass $vs Object
+	 * @param string   $t  Property name
+	 * @return mixed
+	 */
+	function select($vs, $t) {
+		foreach ($vs as $v) {
+			if ($v->type == $t) {
 				return $v;
 			}
 		}
-
-		return NULL;
+		return null;
 	}
 
-	function selectGUID( $v )
-	{
-		return (property_exists($v,'id'))?$v->id:"";
+	/**
+	 * Parses guid
+	 *
+	 * @param stdClass $v Object
+	 * @return string
+	 */
+	function selectGUID($v) {
+		return (property_exists($v, 'id')) ? $v->id : "";
 	}
 
-	function selectName( $v )
-	{
+	/**
+	 * Parses user name
+	 *
+	 * @param stdClass $v Object
+	 * @return string
+	 */
+	function selectName($v) {
 		$s = $this->select($v, 'name');
-		
-		if( ! $s ){
+
+		if (!$s) {
 			$s = $this->select($v, 'nickname');
-			return ($s)?$s->value:"";
+			return ($s) ? $s->value : "";
 		} else {
-			return ($s)?$s->value->givenName . " " . $s->value->familyName:"";
+			return ($s) ? $s->value->givenName . " " . $s->value->familyName : "";
 		}
 	}
 
-	function selectNickame( $v )
-	{
+	/**
+	 * Parses nickname
+	 *
+	 * @param stdClass $v Object
+	 * @return string
+	 */
+	function selectNickame($v) {
 		$s = $this->select($v, 'nickname');
-		return ($s)?$s:"";
+		return ($s) ? $s : "";
 	}
 
-	function selectPhoto( $v )
-	{
+	/**
+	 * Parses photo URL
+	 *
+	 * @param stdClass $v Object
+	 * @return string
+	 */
+	function selectPhoto($v) {
 		$s = $this->select($v, 'guid');
-		return ($s)?(property_exists($s,'image')):"";
+		return ($s) ? (property_exists($s, 'image')) : "";
 	}
 
-	function selectEmail( $v )
-	{
+	/**
+	 * Parses email
+	 *
+	 * @param stdClass $v Object
+	 * @return string
+	 */
+	function selectEmail($v) {
 		$s = $this->select($v, 'email');
-		if(empty($s)){
+		if (empty($s)) {
 			$s = $this->select($v, 'yahooid');
-			if(!empty($s) && isset($s->value) && strpos($s->value,"@")===FALSE)
+			if (!empty($s) && isset($s->value) && strpos($s->value, "@") === false)
 				$s->value .= "@yahoo.com";
 		}
-		return ($s)?$s->value:"";
+		return ($s) ? $s->value : "";
 	}
 
-	public function getCurrentUserId()
-	{
+	/**
+	 * Returns current user id
+	 *
+	 * @return int
+	 * @throws Exception
+	 */
+	public function getCurrentUserId() {
 		$parameters = array();
-		$parameters['format']	= 'json';
+		$parameters['format'] = 'json';
 
-		$response = $this->api->get( 'me/guid', $parameters );
+		$response = $this->api->get('me/guid', $parameters);
 
-		if ( ! isset( $response->guid->value ) ){
-			throw new Exception( "User id request failed! {$this->providerId} returned an invalid response." );
+		if (!isset($response->guid->value)) {
+			throw new Exception("User id request failed! {$this->providerId} returned an invalid response: " . Hybrid_Logger::dumpData( $response ));
 		}
 
 		return $response->guid->value;
 	}
+
 }
diff --git a/e107_handlers/hybridauth/Hybrid/Storage.php b/e107_handlers/hybridauth/Hybrid/Storage.php
index 9f5e3f8ca..d82b4af9b 100644
--- a/e107_handlers/hybridauth/Hybrid/Storage.php
+++ b/e107_handlers/hybridauth/Hybrid/Storage.php
@@ -1,140 +1,141 @@
 <?php
-/**
-* HybridAuth
-* http://hybridauth.sourceforge.net | http://github.com/hybridauth/hybridauth
-* (c) 2009-2014, HybridAuth authors | http://hybridauth.sourceforge.net/licenses.html 
-*/
 
-require_once realpath( dirname( __FILE__ ) )  . "/StorageInterface.php";
+/**
+ * HybridAuth
+ * http://hybridauth.sourceforge.net | http://github.com/hybridauth/hybridauth
+ * (c) 2009-2015, HybridAuth authors | http://hybridauth.sourceforge.net/licenses.html 
+ */
+require_once realpath(dirname(__FILE__)) . "/StorageInterface.php";
 
 /**
  * HybridAuth storage manager
  */
-class Hybrid_Storage implements Hybrid_Storage_Interface
-{
+class Hybrid_Storage implements Hybrid_Storage_Interface {
+
 	/**
 	 * Constructor
 	 */
-	function __construct()
-	{ 
-		if ( ! session_id() ){
-			if( ! session_start() ){
-				throw new Exception( "Hybridauth requires the use of 'session_start()' at the start of your script, which appears to be disabled.", 1 );
+	function __construct() {
+		if (!session_id()) {
+			if (!session_start()) {
+				throw new Exception("Hybridauth requires the use of 'session_start()' at the start of your script, which appears to be disabled.", 1);
 			}
 		}
 
-		$this->config( "php_session_id", session_id() );
-		$this->config( "version", Hybrid_Auth::$version );
+		$this->config("php_session_id", session_id());
+		$this->config("version", Hybrid_Auth::$version);
 	}
-	
-	/**
-	 * Config
-	 * @param String $key
-	 * @param String $value
-	 */
-	public function config($key, $value = null) 
-	{
-		$key = strtolower( $key );  
 
-		if( $value ){
-			$_SESSION["HA::CONFIG"][$key] = serialize( $value ); 
+	/**
+	 * Saves a value in the config storage, or returns config if value is null
+	 *
+	 * @param string $key   Config name
+	 * @param string $value Config value
+	 * @return array|null
+	 */
+	public function config($key, $value = null) {
+		$key = strtolower($key);
+
+		if ($value) {
+			$_SESSION["HA::CONFIG"][$key] = serialize($value);
+		} elseif (isset($_SESSION["HA::CONFIG"][$key])) {
+			return unserialize($_SESSION["HA::CONFIG"][$key]);
 		}
-		elseif( isset( $_SESSION["HA::CONFIG"][$key] ) ){ 
-			return unserialize( $_SESSION["HA::CONFIG"][$key] );  
+		
+		return null;
+	}
+
+	/**
+	 * Returns value from session storage
+	 *
+	 * @param string $key Key
+	 * @return string|null
+	 */
+	public function get($key) {
+		$key = strtolower($key);
+
+		if (isset($_SESSION["HA::STORE"], $_SESSION["HA::STORE"][$key])) {
+			return unserialize($_SESSION["HA::STORE"][$key]);
 		}
 
-		return NULL; 
+		return null;
 	}
-	
+
 	/**
-	 * Get a key
-	 * @param String $key
+	 * Saves a key value pair to the session storage
+	 *
+	 * @param string $key   Key
+	 * @param string $value Value
+	 * @return void
 	 */
-	public function get($key) 
-	{
-		$key = strtolower( $key );  
-
-		if( isset( $_SESSION["HA::STORE"], $_SESSION["HA::STORE"][$key] ) ){ 
-			return unserialize( $_SESSION["HA::STORE"][$key] );  
-		}
-
-		return NULL; 
+	public function set($key, $value) {
+		$key = strtolower($key);
+		$_SESSION["HA::STORE"][$key] = serialize($value);
 	}
-	
-	/**
-	 * GEt a set of key and value
-	 * @param String $key
-	 * @param String $value
-	 */
-	public function set( $key, $value )
-	{
-		$key = strtolower( $key );
 
-		$_SESSION["HA::STORE"][$key] = serialize( $value );
-	}
-	
 	/**
 	 * Clear session storage
+	 * @return void
 	 */
-	function clear()
-	{ 
-		$_SESSION["HA::STORE"] = ARRAY(); 
+	function clear() {
+		$_SESSION["HA::STORE"] = array();
 	}
-	
-	/**
-	 * Delete a specific key
-	 * @param String $key
-	 */
-	function delete($key)
-	{
-		$key = strtolower( $key );  
 
-		if( isset( $_SESSION["HA::STORE"], $_SESSION["HA::STORE"][$key] ) ){
-		    $f = $_SESSION['HA::STORE'];
-		    unset($f[$key]);
-		    $_SESSION["HA::STORE"] = $f;
-		} 
+	/**
+	 * Delete a specific key from session storage
+	 *
+	 * @param string $key Key
+	 * @return void
+	 */
+	function delete($key) {
+		$key = strtolower($key);
+
+		if (isset($_SESSION["HA::STORE"], $_SESSION["HA::STORE"][$key])) {
+			$f = $_SESSION['HA::STORE'];
+			unset($f[$key]);
+			$_SESSION["HA::STORE"] = $f;
+		}
 	}
-	
-	/**
-	 * Delete a set
-	 * @param String $key
-	 */
-	function deleteMatch($key)
-	{
-		$key = strtolower( $key ); 
 
-		if( isset( $_SESSION["HA::STORE"] ) && count( $_SESSION["HA::STORE"] ) ) {
-		    $f = $_SESSION['HA::STORE'];
-		    foreach( $f as $k => $v ){ 
-				if( strstr( $k, $key ) ){
-					unset( $f[ $k ] ); 
+	/**
+	 * Delete all keys recursively from session storage
+	 *
+	 * @param string $key Key
+	 * @retun void
+	 */
+	function deleteMatch($key) {
+		$key = strtolower($key);
+
+		if (isset($_SESSION["HA::STORE"]) && count($_SESSION["HA::STORE"])) {
+			$f = $_SESSION['HA::STORE'];
+			foreach ($f as $k => $v) {
+				if (strstr($k, $key)) {
+					unset($f[$k]);
 				}
 			}
 			$_SESSION["HA::STORE"] = $f;
-			
 		}
 	}
-	
-	/**
-	 * Get the storage session data into an array
-	 * @return Array
-	 */
-	function getSessionData()
-	{
-		if( isset( $_SESSION["HA::STORE"] ) ){ 
-			return serialize( $_SESSION["HA::STORE"] ); 
-		}
 
-		return NULL; 
-	}
-	
 	/**
-	 * Restore the storage back into session from an array
-	 * @param Array $sessiondata
+	 * Returns session storage as a serialized string
+	 * @return string|null
 	 */
-	function restoreSessionData( $sessiondata = NULL )
-	{ 
-		$_SESSION["HA::STORE"] = unserialize( $sessiondata );
-	} 
+	function getSessionData() {
+		if (isset($_SESSION["HA::STORE"])) {
+			return serialize($_SESSION["HA::STORE"]);
+		}
+		return null;
+	}
+
+	/**
+	 * Restores the session from serialized session data
+	 * 
+	 * @param string $sessiondata Serialized session data
+	 * @return void
+	 */
+	function restoreSessionData($sessiondata = null) {
+		$_SESSION["HA::STORE"] = unserialize($sessiondata);
+	}
+
 }
diff --git a/e107_handlers/hybridauth/Hybrid/StorageInterface.php b/e107_handlers/hybridauth/Hybrid/StorageInterface.php
index d80c1c1c1..5b171ec3a 100644
--- a/e107_handlers/hybridauth/Hybrid/StorageInterface.php
+++ b/e107_handlers/hybridauth/Hybrid/StorageInterface.php
@@ -1,28 +1,29 @@
 <?php
+
 /**
-* HybridAuth
-* http://hybridauth.sourceforge.net | http://github.com/hybridauth/hybridauth
-* (c) 2009-2014, HybridAuth authors | http://hybridauth.sourceforge.net/licenses.html
-*/
+ * HybridAuth
+ * http://hybridauth.sourceforge.net | http://github.com/hybridauth/hybridauth
+ * (c) 2009-2015, HybridAuth authors | http://hybridauth.sourceforge.net/licenses.html
+ */
 
 /**
  * HybridAuth storage manager interface
  */
-interface Hybrid_Storage_Interface
-{
-    public function config($key, $value);
+interface Hybrid_Storage_Interface {
 
-    public function get($key);
+	public function config($key, $value = null);
 
-    public function set( $key, $value );
+	public function get($key);
 
-    function clear();
+	public function set($key, $value);
 
-    function delete($key);
+	function clear();
 
-    function deleteMatch($key);
+	function delete($key);
 
-    function getSessionData();
+	function deleteMatch($key);
 
-    function restoreSessionData( $sessiondata);
+	function getSessionData();
+
+	function restoreSessionData($sessiondata = null);
 }
diff --git a/e107_handlers/hybridauth/Hybrid/User.php b/e107_handlers/hybridauth/Hybrid/User.php
index 02c5c4832..6461671a8 100644
--- a/e107_handlers/hybridauth/Hybrid/User.php
+++ b/e107_handlers/hybridauth/Hybrid/User.php
@@ -1,40 +1,40 @@
 <?php
-/**
-* HybridAuth
-* http://hybridauth.sourceforge.net | http://github.com/hybridauth/hybridauth
-* (c) 2009-2014, HybridAuth authors | http://hybridauth.sourceforge.net/licenses.html 
-*/
 
 /**
- * The Hybrid_User class represents the current logged in user 
+ * HybridAuth
+ * http://hybridauth.sourceforge.net | http://github.com/hybridauth/hybridauth
+ * (c) 2009-2015, HybridAuth authors | http://hybridauth.sourceforge.net/licenses.html
  */
-class Hybrid_User 
-{
+
+/**
+ * The Hybrid_User class represents the current logged in user
+ */
+class Hybrid_User {
+
 	/**
 	 * The ID (name) of the connected provider
-	 * @var Numeric/String
+	 * @var mixed
 	 */
-	public $providerId = NULL;
+	public $providerId = null;
 
 	/**
-	 * timestamp connection to the provider
-	 * @var timestamp
+	 * Timestamp connection to the provider
+	 * @var int
 	 */
-	public $timestamp = NULL; 
+	public $timestamp = null;
 
 	/**
-	 * User profile, contains the list of fields available in the normalized user profile structure used by HybridAuth.
-	 * @var object
+	 * User profile, contains the list of fields available in the normalized user profile structure used by HybridAuth
+	 * @var Hybrid_User_Profile
 	 */
-	public $profile = NULL;
+	public $profile = null;
 
 	/**
-	* Initialize the user object.
-	*/
-	function __construct()
-	{
-		$this->timestamp = time(); 
-
-		$this->profile   = new Hybrid_User_Profile(); 
+	 * Initialize the user object
+	 */
+	function __construct() {
+		$this->timestamp = time();
+		$this->profile = new Hybrid_User_Profile();
 	}
+
 }
diff --git a/e107_handlers/hybridauth/Hybrid/User_Activity.php b/e107_handlers/hybridauth/Hybrid/User_Activity.php
index a0ae5fbe3..4a57e1623 100644
--- a/e107_handlers/hybridauth/Hybrid/User_Activity.php
+++ b/e107_handlers/hybridauth/Hybrid/User_Activity.php
@@ -1,54 +1,55 @@
 <?php
-/**
-* HybridAuth
-* http://hybridauth.sourceforge.net | http://github.com/hybridauth/hybridauth
-* (c) 2009-2014, HybridAuth authors | http://hybridauth.sourceforge.net/licenses.html 
-*/
 
 /**
- * Hybrid_User_Activity 
- * 
+ * HybridAuth
+ * http://hybridauth.sourceforge.net | http://github.com/hybridauth/hybridauth
+ * (c) 2009-2015, HybridAuth authors | http://hybridauth.sourceforge.net/licenses.html
+ */
+
+/**
+ * Hybrid_User_Activity
+ *
  * used to provider the connected user activity stream on a standardized structure across supported social apis.
- * 
+ *
  * http://hybridauth.sourceforge.net/userguide/Profile_Data_User_Activity.html
  */
-class Hybrid_User_Activity
-{
-	/**
-	 * activity id on the provider side, usually given as integer
-	 * @var Numeric/String
-	 */
-	public $id = NULL;
+class Hybrid_User_Activity {
 
 	/**
-	 * activity date of creation
-	 * @var timestamp
+	 * Activity id on the provider side, usually given as integer
+	 * @var mixed
 	 */
-	public $date = NULL;
+	public $id = null;
 
 	/**
-	 * activity content as a string
-	 * @var String
+	 * Activity date of creation
+	 * @var int
 	 */
-	public $text = NULL;
+	public $date = null;
 
 	/**
-	 * user who created the activity
-	 * @var object
+	 * Activity content as a string
+	 * @var string
 	 */
-	public $user = NULL;
-	
+	public $text = null;
+
+	/**
+	 * User who created the activity
+	 * @var stdClass
+	 */
+	public $user = null;
+
 	/**
 	 * Constructor
 	 */
-	public function __construct()
-	{
+	public function __construct() {
 		$this->user = new stdClass();
 
 		// typically, we should have a few information about the user who created the event from social apis
-		$this->user->identifier  = NULL;
-		$this->user->displayName = NULL;
-		$this->user->profileURL  = NULL;
-		$this->user->photoURL    = NULL; 
+		$this->user->identifier = null;
+		$this->user->displayName = null;
+		$this->user->profileURL = null;
+		$this->user->photoURL = null;
 	}
+
 }
diff --git a/e107_handlers/hybridauth/Hybrid/User_Contact.php b/e107_handlers/hybridauth/Hybrid/User_Contact.php
index 9ee405d12..facbfc464 100644
--- a/e107_handlers/hybridauth/Hybrid/User_Contact.php
+++ b/e107_handlers/hybridauth/Hybrid/User_Contact.php
@@ -1,58 +1,60 @@
 <?php
-/**
-* HybridAuth
-* http://hybridauth.sourceforge.net | http://github.com/hybridauth/hybridauth
-* (c) 2009-2014, HybridAuth authors | http://hybridauth.sourceforge.net/licenses.html 
-*/
 
 /**
- * Hybrid_User_Contact 
- * 
+ * HybridAuth
+ * http://hybridauth.sourceforge.net | http://github.com/hybridauth/hybridauth
+ * (c) 2009-2015, HybridAuth authors | http://hybridauth.sourceforge.net/licenses.html
+ */
+
+/**
+ * Hybrid_User_Contact
+ *
  * used to provider the connected user contacts list on a standardized structure across supported social apis.
- * 
+ *
  * http://hybridauth.sourceforge.net/userguide/Profile_Data_User_Contacts.html
  */
-class Hybrid_User_Contact
-{
-	/**
-         * The Unique contact user ID
-         * @var Numeric
-         */
-	public $identifier = NULL;
+class Hybrid_User_Contact {
 
 	/**
-         * User website, blog, web page
-         * @var String
-         */ 
-	public $webSiteURL = NULL;
+	 * The Unique contact user ID
+	 * @var mixed
+	 */
+	public $identifier = null;
 
 	/**
-         * URL link to profile page on the IDp web site
-         * @var String
-         */
-	public $profileURL = NULL;
+	 * User website, blog, web page
+	 * @var string
+	 */
+	public $webSiteURL = null;
 
 	/**
-         * URL link to user photo or avatar
-         * @var String
-         */
-	public $photoURL = NULL;
+	 * URL link to profile page on the IDp web site
+	 * @var string
+	 */
+	public $profileURL = null;
 
 	/**
-         * User displayName provided by the IDp or a concatenation of first and last name
-         * @var String
-         */
-        public $displayName = NULL;
-
-        /**
-         * A short about_me
-         * @var String
-         */
-	public $description = NULL;
+	 * URL link to user photo or avatar
+	 * @var string
+	 */
+	public $photoURL = null;
 
 	/**
-         * User email. Not all of IDp grant access to the user email
-         * @var String
-         */
-        public $email = NULL;
+	 * User displayName provided by the IDp or a concatenation of first and last name
+	 * @var string
+	 */
+	public $displayName = null;
+
+	/**
+	 * A short about_me
+	 * @var string
+	 */
+	public $description = null;
+
+	/**
+	 * User email. Not all of IDp grant access to the user email
+	 * @var string
+	 */
+	public $email = null;
+
 }
diff --git a/e107_handlers/hybridauth/Hybrid/User_Profile.php b/e107_handlers/hybridauth/Hybrid/User_Profile.php
index 6e74fb10e..6a4070cd6 100644
--- a/e107_handlers/hybridauth/Hybrid/User_Profile.php
+++ b/e107_handlers/hybridauth/Hybrid/User_Profile.php
@@ -1,150 +1,152 @@
 <?php
-/**
-* HybridAuth
-* http://hybridauth.sourceforge.net | http://github.com/hybridauth/hybridauth
-* (c) 2009-2014, HybridAuth authors | http://hybridauth.sourceforge.net/licenses.html 
-*/
 
 /**
- * Hybrid_User_Profile object represents the current logged in user profile. 
- * The list of fields available in the normalized user profile structure used by HybridAuth.  
+ * HybridAuth
+ * http://hybridauth.sourceforge.net | http://github.com/hybridauth/hybridauth
+ * (c) 2009-2015, HybridAuth authors | http://hybridauth.sourceforge.net/licenses.html
+ */
+
+/**
+ * Hybrid_User_Profile object represents the current logged in user profile.
+ * The list of fields available in the normalized user profile structure used by HybridAuth.
  *
- * The Hybrid_User_Profile object is populated with as much information about the user as 
+ * The Hybrid_User_Profile object is populated with as much information about the user as
  * HybridAuth was able to pull from the given API or authentication provider.
- * 
+ *
  * http://hybridauth.sourceforge.net/userguide/Profile_Data_User_Profile.html
  */
-class Hybrid_User_Profile
-{
-	/**
-         * The Unique user's ID on the connected provider
-         * @var Numeric
-         */
-        public $identifier = NULL;
+class Hybrid_User_Profile {
 
 	/**
-         * User website, blog, web page
-         * @var String
-         */
-        public $webSiteURL = NULL;
+	 * The Unique user's ID on the connected provider
+	 * @var mixed
+	 */
+	public $identifier = null;
 
 	/**
-         * URL link to profile page on the IDp web site
-         * @var String
-         */
-        public $profileURL = NULL;
+	 * User website, blog, web page
+	 * @var string
+	 */
+	public $webSiteURL = null;
 
 	/**
-         * URL link to user photo or avatar
-         * @var String
-         */
-        public $photoURL = NULL;
+	 * URL link to profile page on the IDp web site
+	 * @var string
+	 */
+	public $profileURL = null;
 
 	/**
-         * User displayName provided by the IDp or a concatenation of first and last name.
-         * @var String
-         */
-        public $displayName = NULL;
+	 * URL link to user photo or avatar
+	 * @var string
+	 */
+	public $photoURL = null;
 
 	/**
-         * A short about_me
-         * @var String
-         */
-        public $description = NULL;
+	 * User displayName provided by the IDp or a concatenation of first and last name.
+	 * @var string
+	 */
+	public $displayName = null;
 
 	/**
-         * User's first name
-         * @var String
-         */
-        public $firstName = NULL;
+	 * A short about_me
+	 * @var string
+	 */
+	public $description = null;
 
 	/**
-         * User's last name
-         * @var String
-         */
-        public $lastName = NULL;
+	 * User's first name
+	 * @var string
+	 */
+	public $firstName = null;
 
 	/**
-         * male or female
-         * @var String
-         */
-        public $gender = NULL;
+	 * User's last name
+	 * @var string
+	 */
+	public $lastName = null;
 
 	/**
-         * Language
-         * @var String
-         */
-        public $language = NULL;
+	 * Male or female
+	 * @var string
+	 */
+	public $gender = null;
 
 	/**
-         * User age, we don't calculate it. we return it as is if the IDp provide it.
-         * @var Numeric
-         */
-        public $age = NULL;
-
-        /**
-         * User birth Day
-         * @var Numeric
-         */
-	public $birthDay = NULL;
-
-        /**
-         * User birth Month
-         * @var Numeric/String
-         */
-	public $birthMonth = NULL;
-
-        /**
-         * User birth Year
-         * @var Numeric
-         */
-	public $birthYear = NULL;
-
-        /**
-         * User email. Note: not all of IDp grant access to the user email
-         * @var String
-         */
-	public $email = NULL;
-	
-	/**
-         * Verified user email. Note: not all of IDp grant access to verified user email
-         * @var String
-         */
-        public $emailVerified = NULL;
+	 * Language
+	 * @var string
+	 */
+	public $language = null;
 
 	/**
-         * Phone number
-         * @var String
-         */
-        public $phone = NULL;
+	 * User age, we don't calculate it. we return it as is if the IDp provide it.
+	 * @var int
+	 */
+	public $age = null;
 
 	/**
-         * Complete user address
-         * @var String
-         */
-        public $address = NULL;
+	 * User birth Day
+	 * @var int
+	 */
+	public $birthDay = null;
 
 	/**
-         * User country
-         * @var String
-         */
-        public $country = NULL;
+	 * User birth Month
+	 * @var int
+	 */
+	public $birthMonth = null;
 
 	/**
-         * Region
-         * @var String
-         */
-        public $region = NULL;
+	 * User birth Year
+	 * @var int
+	 */
+	public $birthYear = null;
 
 	/**
-         * City
-         * @var String
-         */
-        public $city = NULL;
+	 * User email. Note: not all of IDp grant access to the user email
+	 * @var string
+	 */
+	public $email = null;
 
 	/**
-         * Postal code
-         * @var String
-         */
-        public $zip = NULL;
+	 * Verified user email. Note: not all of IDp grant access to verified user email
+	 * @var string
+	 */
+	public $emailVerified = null;
+
+	/**
+	 * Phone number
+	 * @var string
+	 */
+	public $phone = null;
+
+	/**
+	 * Complete user address
+	 * @var string
+	 */
+	public $address = null;
+
+	/**
+	 * User country
+	 * @var string
+	 */
+	public $country = null;
+
+	/**
+	 * Region
+	 * @var string
+	 */
+	public $region = null;
+
+	/**
+	 * City
+	 * @var string
+	 */
+	public $city = null;
+
+	/**
+	 * Postal code
+	 * @var string
+	 */
+	public $zip = null;
+
 }
diff --git a/e107_handlers/hybridauth/Hybrid/thirdparty/Facebook/base_facebook.php b/e107_handlers/hybridauth/Hybrid/thirdparty/Facebook/base_facebook.php
index b9d403efb..b0d9ef939 100644
--- a/e107_handlers/hybridauth/Hybrid/thirdparty/Facebook/base_facebook.php
+++ b/e107_handlers/hybridauth/Hybrid/thirdparty/Facebook/base_facebook.php
@@ -170,6 +170,13 @@ abstract class BaseFacebook
     'www'         => 'https://www.facebook.com/',
   );
 
+  /**
+   * The decoded response object.
+   *
+   * @var mixed
+   */
+  protected $response;
+
   /**
    * The Application ID.
    *
@@ -451,6 +458,16 @@ abstract class BaseFacebook
     return $this->accessToken;
   }
 
+  /**
+   * Return the response object afer the fact
+   *
+   * @return mixed
+   */
+  public function getResponse()
+  {
+      return $this->response;
+  }
+
   /**
    * Determines and returns the user access token, first using
    * the signed request if present, and then falling back on
@@ -721,7 +738,7 @@ abstract class BaseFacebook
    *               code could not be determined.
    */
   protected function getCode() {
-    if (!isset($_REQUEST['code']) || !isset($_REQUEST['state'])) {
+    if (!isset($_REQUEST['code']) || !isset($_REQUEST['state']) || $this->state === null) {
       return false;
     }
     if ($this->state === $_REQUEST['state']) {
@@ -913,7 +930,7 @@ abstract class BaseFacebook
     }
     // @codeCoverageIgnoreEnd
 
-    return $result;
+    return $this->response = $result;
   }
 
   /**
@@ -1471,7 +1488,7 @@ abstract class BaseFacebook
    * @param string $big   The value to be checked against $small
    * @param string $small The input string
    *
-   * @return boolean Returns TRUE if $big matches $small
+   * @return boolean Returns true if $big matches $small
    */
   protected static function isAllowedDomain($big, $small) {
     if ($big === $small) {
@@ -1486,7 +1503,7 @@ abstract class BaseFacebook
    * @param string $big   The value to be checked against $small
    * @param string $small The input string
    *
-   * @return boolean TRUE if $big ends with $small
+   * @return boolean true if $big ends with $small
    */
   protected static function endsWith($big, $small) {
     $len = strlen($small);
diff --git a/e107_handlers/hybridauth/Hybrid/thirdparty/LinkedIn/LinkedIn.php b/e107_handlers/hybridauth/Hybrid/thirdparty/LinkedIn/LinkedIn.php
index 2fdaf2df3..1f469cea4 100644
--- a/e107_handlers/hybridauth/Hybrid/thirdparty/LinkedIn/LinkedIn.php
+++ b/e107_handlers/hybridauth/Hybrid/thirdparty/LinkedIn/LinkedIn.php
@@ -2,78 +2,78 @@
 // http://code.google.com/p/simple-linkedinphp/
 // 3.2.0 - November 29, 2011
 // hacked into the code to handel new scope (r_basicprofile+r_emailaddress) - until Paul update linkedinphp library!
-// Facyla note 20131219 : this in fact should not be hacked, as Linkedin lets developpers define the wanted scope 
+// Facyla note 20131219 : this in fact should not be hacked, as Linkedin lets developpers define the wanted scope
 //   in Linkedin application settings, when creating the (required) application and API access
 
 /**
- * This file defines the 'LinkedIn' class. This class is designed to be a 
+ * This file defines the 'LinkedIn' class. This class is designed to be a
  * simple, stand-alone implementation of the LinkedIn API functions.
- * 
+ *
  * COPYRIGHT:
- *   
+ *
  * Copyright (C) 2011, fiftyMission Inc.
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a 
- * copy of this software and associated documentation files (the "Software"), 
- * to deal in the Software without restriction, including without limitation 
- * the rights to use, copy, modify, merge, publish, distribute, sublicense, 
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
  * and/or sell copies of the Software, and to permit persons to whom the
  * Software is furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included in 
- * all copies or substantial portions of the Software.  
  *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE 
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS 
- * IN THE SOFTWARE.  
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
  *
  * SOURCE CODE LOCATION:
- * 
+ *
  * http://code.google.com/p/simple-linkedinphp/
- *    
+ *
  * REQUIREMENTS:
- * 
+ *
  * 1. You must have cURL installed on the server and available to PHP.
- * 2. You must be running PHP 5+.  
- *  
+ * 2. You must be running PHP 5+.
+ *
  * QUICK START:
- * 
+ *
  * There are two files needed to enable LinkedIn API functionality from PHP; the
- * stand-alone OAuth library, and this LinkedIn class. The latest version of 
+ * stand-alone OAuth library, and this LinkedIn class. The latest version of
  * the stand-alone OAuth library can be found on Google Code:
- * 
+ *
  * http://code.google.com/p/oauth/
- *   
- * Install these two files on your server in a location that is accessible to 
- * the scripts you wish to use them in. Make sure to change the file 
+ *
+ * Install these two files on your server in a location that is accessible to
+ * the scripts you wish to use them in. Make sure to change the file
  * permissions such that your web server can read the files.
- * 
- * Next, make sure the path to the OAuth library is correct (you can change this 
+ *
+ * Next, make sure the path to the OAuth library is correct (you can change this
  * as needed, depending on your file organization scheme, etc).
- * 
- * Finally, test the class by attempting to connect to LinkedIn using the 
+ *
+ * Finally, test the class by attempting to connect to LinkedIn using the
  * associated demo.php page, also located at the Google Code location
- * referenced above.                   
- *   
+ * referenced above.
+ *
  * RESOURCES:
- *    
+ *
  * REST API Documentation: http://developer.linkedin.com/rest
- *    
+ *
  * @version 3.2.0 - November 8, 2011
  * @author Paul Mennega <paul@fiftymission.net>
- * @copyright Copyright 2011, fiftyMission Inc. 
- * @license http://www.opensource.org/licenses/mit-license.php The MIT License 
+ * @copyright Copyright 2011, fiftyMission Inc.
+ * @license http://www.opensource.org/licenses/mit-license.php The MIT License
  */
 
 /**
  * 'LinkedInException' class declaration.
- *  
+ *
  * This class extends the base 'Exception' class.
- * 
+ *
  * @access public
  * @package classpackage
  */
@@ -81,9 +81,9 @@ class LinkedInException extends Exception {}
 
 /**
  * 'LinkedIn' class declaration.
- *  
+ *
  * This class provides generalized LinkedIn oauth functionality.
- * 
+ *
  * @access public
  * @package classpackage
  */
@@ -91,73 +91,73 @@ class LinkedIn {
   // api/oauth settings
   const _API_OAUTH_REALM             = 'http://api.linkedin.com';
   const _API_OAUTH_VERSION           = '1.0';
-  
+
   // the default response format from LinkedIn
   const _DEFAULT_RESPONSE_FORMAT     = 'xml';
-    
+
   // helper constants used to standardize LinkedIn <-> API communication.  See demo page for usage.
   const _GET_RESPONSE                = 'lResponse';
   const _GET_TYPE                    = 'lType';
-  
+
   // Invitation API constants.
   const _INV_SUBJECT                 = 'Invitation to connect';
   const _INV_BODY_LENGTH             = 200;
-  
+
   // API methods
   const _METHOD_TOKENS               = 'POST';
-  
+
   // Network API constants.
   const _NETWORK_LENGTH              = 1000;
   const _NETWORK_HTML                = '<a>';
-  
+
   // response format type constants, see http://developer.linkedin.com/docs/DOC-1203
   const _RESPONSE_JSON               = 'JSON';
   const _RESPONSE_JSONP              = 'JSONP';
   const _RESPONSE_XML                = 'XML';
-  
+
   // Share API constants
   const _SHARE_COMMENT_LENGTH        = 700;
   const _SHARE_CONTENT_TITLE_LENGTH  = 200;
   const _SHARE_CONTENT_DESC_LENGTH   = 400;
-  
+
   // LinkedIn API end-points
 	const _URL_ACCESS                  = 'https://api.linkedin.com/uas/oauth/accessToken';
 	const _URL_API                     = 'https://api.linkedin.com';
 	const _URL_AUTH                    = 'https://www.linkedin.com/uas/oauth/authenticate?oauth_token=';
 	const _URL_REQUEST                 = 'https://api.linkedin.com/uas/oauth/requestToken';
-	// const _URL_REQUEST                 = 'https://api.linkedin.com/uas/oauth/requestToken?scope=r_basicprofile+r_emailaddress+rw_nus+r_network'; 
+	// const _URL_REQUEST                 = 'https://api.linkedin.com/uas/oauth/requestToken?scope=r_basicprofile+r_emailaddress+rw_nus+r_network';
 	const _URL_REVOKE                  = 'https://api.linkedin.com/uas/oauth/invalidateToken';
-	
+
 	// Library version
 	const _VERSION                     = '3.2.0';
-  
+
   // oauth properties
   protected $callback;
-  protected $token                   = NULL;
-  
+  protected $token                   = null;
+
   // application properties
-  protected $application_key, 
+  protected $application_key,
             $application_secret;
-  
+
   // the format of the data to return
   protected $response_format         = self::_DEFAULT_RESPONSE_FORMAT;
 
   // last request fields
-  public $last_request_headers, 
+  public $last_request_headers,
          $last_request_url;
 
 	/**
-	 * Create a LinkedIn object, used for OAuth-based authentication and 
-	 * communication with the LinkedIn API.	 
-	 * 
+	 * Create a LinkedIn object, used for OAuth-based authentication and
+	 * communication with the LinkedIn API.
+	 *
 	 * @param arr $config
 	 *    The 'start-up' object properties:
 	 *           - appKey       => The application's API key
 	 *           - appSecret    => The application's secret key
 	 *           - callbackUrl  => [OPTIONAL] the callback URL
-	 *                 	 
+	 *
 	 * @return obj
-	 *    A new LinkedIn object.	 
+	 *    A new LinkedIn object.
 	 */
 	public function __construct($config) {
     if(!is_array($config)) {
@@ -168,29 +168,29 @@ class LinkedIn {
 	  $this->setApplicationSecret($config['appSecret']);
 	  $this->setCallbackUrl($config['callbackUrl']);
 	}
-	
+
 	/**
    * The class destructor.
-   * 
+   *
    * Explicitly clears LinkedIn object from memory upon destruction.
 	 */
   public function __destruct() {
     unset($this);
 	}
-	
+
 	/**
 	 * Bookmark a job.
-	 * 
-	 * Calling this method causes the current user to add a bookmark for the 
+	 *
+	 * Calling this method causes the current user to add a bookmark for the
 	 * specified job:
-	 * 
+	 *
 	 *   http://developer.linkedin.com/docs/DOC-1323
-	 * 
+	 *
 	 * @param str $jid
 	 *    Job ID you want to bookmark.
-	 *         	 
+	 *
 	 * @return arr
-	 *    Array containing retrieval success, LinkedIn response.
+	 *    array containing retrieval success, LinkedIn response.
 	 */
 	public function bookmarkJob($jid) {
 	  // check passed data
@@ -198,40 +198,40 @@ class LinkedIn {
 	    // bad data passed
 		  throw new LinkedInException('LinkedIn->bookmarkJob(): bad data passed, $jid must be of type string.');
 	  }
-	  
+
 	  // construct and send the request
 	  $query    = self::_URL_API . '/v1/people/~/job-bookmarks';
 	  $response = $this->fetch('POST', $query, '<job-bookmark><job><id>' . trim($jid) . '</id></job></job-bookmark>');
-	  
+
 	  /**
-	   * Check for successful request (a 201 response from LinkedIn server) 
+	   * Check for successful request (a 201 response from LinkedIn server)
 	   * per the documentation linked in method comments above.
 	   */
 		return $this->checkResponse(201, $response);
 	}
-	
+
 	/**
 	 * Get list of jobs you have bookmarked.
-	 * 
+	 *
 	 * Returns a list of jobs the current user has bookmarked, per:
-	 * 
-	 *   http://developer.linkedin.com/docs/DOC-1323   
-	 * 	
+	 *
+	 *   http://developer.linkedin.com/docs/DOC-1323
+	 *
 	 * @return arr
-	 *         Array containing retrieval success, LinkedIn response.
+	 *         array containing retrieval success, LinkedIn response.
 	 */
-	public function bookmarkedJobs() {	
-    // construct and send the request  
+	public function bookmarkedJobs() {
+    // construct and send the request
 	  $query    = self::_URL_API . '/v1/people/~/job-bookmarks';
 	  $response = $this->fetch('GET', $query);
-	  
+
 	  /**
-	   * Check for successful request (a 200 response from LinkedIn server) 
+	   * Check for successful request (a 200 response from LinkedIn server)
 	   * per the documentation linked in method comments above.
 	   */
 		return $this->checkResponse(200, $response);
 	}
-	
+
 	/**
 	 * Custom addition to make code compatible with PHP 5.2
 	 */
@@ -240,19 +240,19 @@ class LinkedIn {
 			throw new LinkedInException('LinkedIn->checkResponse(): $http_code_required must be an integer or an array of integer values');
 		}
     }
-	
+
 	/**
-	 * Used to check whether a response LinkedIn object has the required http_code or not and 
+	 * Used to check whether a response LinkedIn object has the required http_code or not and
 	 * returns an appropriate LinkedIn object.
-	 * 
+	 *
 	 * @param var $http_code_required
-	 * 		The required http response from LinkedIn, passed in either as an integer, 
-	 * 		or an array of integers representing the expected values.	 
-	 * @param arr $response 
+	 * 		The required http response from LinkedIn, passed in either as an integer,
+	 * 		or an array of integers representing the expected values.
+	 * @param arr $response
 	 *    An array containing a LinkedIn response.
-	 * 
+	 *
 	 * @return boolean
-	 * 	  TRUE or FALSE depending on if the passed LinkedIn response matches the expected response.
+	 * 	  true or false depending on if the passed LinkedIn response matches the expected response.
 	 */
 	private function checkResponse($http_code_required, $response) {
 		// check passed data
@@ -267,32 +267,32 @@ class LinkedIn {
 		}
 		if(!is_array($response)) {
 			throw new LinkedInException('LinkedIn->checkResponse(): $response must be an array');
-		}		
-		
+		}
+
 		// check for a match
 		if(in_array($response['info']['http_code'], $http_code_required)) {
 		  // response found
-		  $response['success'] = TRUE;
+		  $response['success'] = true;
 		} else {
 			// response not found
-			$response['success'] = FALSE;
+			$response['success'] = false;
 			$response['error']   = 'HTTP response from LinkedIn end-point was not code ' . implode(', ', $http_code_required);
 		}
 		return $response;
 	}
-	
+
 	/**
 	 * Close a job.
-	 * 
+	 *
 	 * Calling this method causes the passed job to be closed, per:
-	 * 
-	 *   http://developer.linkedin.com/docs/DOC-1151   
-	 * 
+	 *
+	 *   http://developer.linkedin.com/docs/DOC-1151
+	 *
 	 * @param str $jid
 	 *    Job ID you want to close.
-	 *            	
+	 *
 	 * @return arr
-	 *    Array containing retrieval success, LinkedIn response.
+	 *    array containing retrieval success, LinkedIn response.
 	 */
 	public function closeJob($jid) {
 	  // check passed data
@@ -300,33 +300,33 @@ class LinkedIn {
 	    // bad data passed
 		  throw new LinkedInException('LinkedIn->closeJob(): bad data passed, $jid must be of string value.');
 	  }
-	  
+
 	  // construct and send the request
 	  $query    = self::_URL_API . '/v1/jobs/partner-job-id=' . trim($jid);
 	  $response = $this->fetch('DELETE', $query);
-	  
+
 	  /**
-	   * Check for successful request (a 204 response from LinkedIn server) 
+	   * Check for successful request (a 204 response from LinkedIn server)
 	   * per the documentation linked in method comments above.
 	   */
 	  return $this->checkResponse(204, $response);
 	}
-	
+
 	/**
 	 * Share comment posting method.
-	 * 
+	 *
 	 * Post a comment on an existing connections shared content. API details can
-	 * be found here: 
-	 * 
-	 * http://developer.linkedin.com/docs/DOC-1043 
-	 * 
-	 * @param str $uid 
-	 *    The LinkedIn update ID.   	 
-	 * @param str $comment 
+	 * be found here:
+	 *
+	 * http://developer.linkedin.com/docs/DOC-1043
+	 *
+	 * @param str $uid
+	 *    The LinkedIn update ID.
+	 * @param str $comment
 	 *    The share comment to be posted.
-	 *            	 
-	 * @return arr 
-	 *    Array containing retrieval success, LinkedIn response.       	 
+	 *
+	 * @return arr
+	 *    array containing retrieval success, LinkedIn response.
 	 */
 	public function comment($uid, $comment) {
 	  // check passed data
@@ -338,12 +338,12 @@ class LinkedIn {
       // nothing/non-string passed, raise an exception
 		  throw new LinkedInException('LinkedIn->comment(): bad data passed, $comment must be a non-zero length string.');
     }
-    
+
     /**
      * Share comment rules:
-     * 
+     *
      * 1) No HTML permitted.
-     * 2) Comment cannot be longer than 700 characters.     
+     * 2) Comment cannot be longer than 700 characters.
      */
     $comment = substr(trim(htmlspecialchars(strip_tags($comment))), 0, self::_SHARE_COMMENT_LENGTH);
 		$data    = '<?xml version="1.0" encoding="UTF-8"?>
@@ -354,26 +354,26 @@ class LinkedIn {
     // construct and send the request
     $query    = self::_URL_API . '/v1/people/~/network/updates/key=' . $uid . '/update-comments';
     $response = $this->fetch('POST', $query, $data);
-    
+
     /**
-	   * Check for successful request (a 201 response from LinkedIn server) 
+	   * Check for successful request (a 201 response from LinkedIn server)
 	   * per the documentation linked in method comments above.
-	   */ 
+	   */
     return $this->checkResponse(201, $response);
 	}
-	
+
 	/**
 	 * Share comment retrieval.
-	 *     
+	 *
 	 * Return all comments associated with a given network update:
-	 * 	 
+	 *
 	 *   http://developer.linkedin.com/docs/DOC-1043
-	 * 
+	 *
 	 * @param str $uid
 	 *    The LinkedIn update ID.
-	 *                     	 
-	 * @return arr 
-	 *    Array containing retrieval success, LinkedIn response.                  
+	 *
+	 * @return arr
+	 *    array containing retrieval success, LinkedIn response.
 	 */
 	public function comments($uid) {
 	  // check passed data
@@ -381,37 +381,37 @@ class LinkedIn {
 	    // bad data passed
 		  throw new LinkedInException('LinkedIn->comments(): bad data passed, $uid must be of type string.');
 	  }
-		
+
 		// construct and send the request
     $query    = self::_URL_API . '/v1/people/~/network/updates/key=' . $uid . '/update-comments';
     $response = $this->fetch('GET', $query);
-    
+
   	/**
-	   * Check for successful request (a 200 response from LinkedIn server) 
+	   * Check for successful request (a 200 response from LinkedIn server)
 	   * per the documentation linked in method comments above.
-	   */ 
+	   */
     return $this->checkResponse(200, $response);
 	}
-	
+
 	/**
 	 * Company profile retrieval function.
-	 * 
-	 * Takes a string of parameters as input and requests company profile data 
-	 * from the LinkedIn Company Profile API. See the official documentation for 
+	 *
+	 * Takes a string of parameters as input and requests company profile data
+	 * from the LinkedIn Company Profile API. See the official documentation for
 	 * $options 'field selector' formatting:
-	 * 
+	 *
 	 *   http://developer.linkedin.com/docs/DOC-1014
-	 *   http://developer.linkedin.com/docs/DOC-1259   
-	 * 
+	 *   http://developer.linkedin.com/docs/DOC-1259
+	 *
 	 * @param str $options
-	 *    Data retrieval options.	
+	 *    Data retrieval options.
 	 * @param	bool $by_email
 	 *    [OPTIONAL] Search by email domain?
-	 * 	 
-	 * @return arr 
-	 *    Array containing retrieval success, LinkedIn response.
+	 *
+	 * @return arr
+	 *    array containing retrieval success, LinkedIn response.
 	 */
-	public function company($options, $by_email = FALSE) {
+	public function company($options, $by_email = false) {
 	  // check passed data
 	  if(!is_string($options)) {
 	    // bad data passed
@@ -421,34 +421,34 @@ class LinkedIn {
 	    // bad data passed
 		  throw new LinkedInException('LinkedIn->company(): bad data passed, $by_email must be of type boolean.');
 	  }
-	  
+
 	  // construct and send the request
 	  $query    = self::_URL_API . '/v1/companies' . ($by_email ? '' : '/') . trim($options);
 	  $response = $this->fetch('GET', $query);
-	  
+
 	  /**
-	   * Check for successful request (a 200 response from LinkedIn server) 
+	   * Check for successful request (a 200 response from LinkedIn server)
 	   * per the documentation linked in method comments above.
 	   */
 	  return $this->checkResponse(200, $response);
 	}
-	
+
   /**
 	 * Company products and their associated recommendations.
-	 * 
-	 * The product data type contains details about a company's product or 
-	 * service, including recommendations from LinkedIn members, and replies from 
+	 *
+	 * The product data type contains details about a company's product or
+	 * service, including recommendations from LinkedIn members, and replies from
 	 * company representatives.
-	 * 
-	 *   http://developer.linkedin.com/docs/DOC-1327   
-	 * 
+	 *
+	 *   http://developer.linkedin.com/docs/DOC-1327
+	 *
 	 * @param str $cid
 	 *    Company ID you want the product for.
 	 * @param str $options
 	 *    [OPTIONAL] Data retrieval options.
-	 *            	
+	 *
 	 * @return arr
-	 *    Array containing retrieval success, LinkedIn response.
+	 *    array containing retrieval success, LinkedIn response.
 	 */
 	public function companyProducts($cid, $options = '') {
 	  // check passed data
@@ -460,32 +460,32 @@ class LinkedIn {
 	    // bad data passed
 		  throw new LinkedInException('LinkedIn->companyProducts(): bad data passed, $options must be of type string.');
 	  }
-	  
+
 	  // construct and send the request
 	  $query    = self::_URL_API . '/v1/companies/' . trim($cid) . '/products' . trim($options);
 	  $response = $this->fetch('GET', $query);
-	  
+
 	  /**
-	   * Check for successful request (a 200 response from LinkedIn server) 
+	   * Check for successful request (a 200 response from LinkedIn server)
 	   * per the documentation linked in method comments above.
 	   */
 	  return $this->checkResponse(200, $response);
 	}
-  	
+
 	/**
 	 * Connection retrieval function.
-	 * 
-	 * Takes a string of parameters as input and requests connection-related data 
-	 * from the Linkedin Connections API. See the official documentation for 
+	 *
+	 * Takes a string of parameters as input and requests connection-related data
+	 * from the Linkedin Connections API. See the official documentation for
 	 * $options 'field selector' formatting:
-	 * 
-	 *   http://developer.linkedin.com/docs/DOC-1014      	 
-	 * 
-	 * @param str $options 
+	 *
+	 *   http://developer.linkedin.com/docs/DOC-1014
+	 *
+	 * @param str $options
 	 *    [OPTIONAL] Data retrieval options.
-	 *            	 
-	 * @return arr 
-	 *    Array containing retrieval success, LinkedIn response.
+	 *
+	 * @return arr
+	 *    array containing retrieval success, LinkedIn response.
 	 */
 	public function connections($options = '~/connections') {
 	  // check passed data
@@ -493,32 +493,32 @@ class LinkedIn {
 	    // bad data passed
 		  throw new LinkedInException('LinkedIn->connections(): bad data passed, $options must be of type string.');
 	  }
-	  
+
 	  // construct and send the request
 	  $query    = self::_URL_API . '/v1/people/' . trim($options);
 	  $response = $this->fetch('GET', $query);
-	  
+
 	  /**
-	   * Check for successful request (a 200 response from LinkedIn server) 
+	   * Check for successful request (a 200 response from LinkedIn server)
 	   * per the documentation linked in method comments above.
 	   */
 	  return $this->checkResponse(200, $response);
 	}
-	
+
 	/**
 	 * This creates a post in the specified group with the specified title and specified summary.
-	 * 
+	 *
 	 *   http://developer.linkedin.com/documents/groups-api
-	 * 
+	 *
 	 * @param str $gid
 	 * 		The group id.
 	 * @param str $title
 	 * 		The title of the post. This must be non-empty.
 	 * @param str $summary
 	 * 		[OPTIONAL] The content or summary of the post. This can be empty.
-	 * 
+	 *
 	 * @return arr
-	 * 		Array containing retrieval success, LinkedIn response.
+	 * 		array containing retrieval success, LinkedIn response.
 	 */
 	public function createPost($gid, $title, $summary = '') {
 		if(!is_string($gid)) {
@@ -530,69 +530,69 @@ class LinkedIn {
 		if(!is_string($summary)) {
 			throw new LinkedInException('LinkedIn->createPost(): bad data passed, $summary must be of type string.');
 		}
-		
+
 		// construct the XML
 		$data = '<?xml version="1.0" encoding="UTF-8"?>
     				 <post>
     					 <title>'. $title . '</title>
     					 <summary>' . $summary . '</summary>
     				 </post>';
-		
+
  		// construct and send the request
 		$query    = self::_URL_API . '/v1/groups/' . trim($gid) . '/posts';
 		$response = $this->fetch('POST', $query, $data);
-		
+
 	  /**
-	   * Check for successful request (a 201 response from LinkedIn server) 
+	   * Check for successful request (a 201 response from LinkedIn server)
 	   * per the documentation linked in method comments above.
 	   */
 		return $this->checkResponse(201, $response);
 	}
-	
+
 	/**
 	 * This deletes the specified post if you are the owner or moderator that post.
 	 * Otherwise, it just flags the post as inappropriate.
-	 * 
+	 *
 	 * https://developer.linkedin.com/documents/groups-api
-	 * 
+	 *
 	 * @param str $pid
 	 * 		The post id.
-	 * 
+	 *
 	 * @return arr
-	 * 		Array containing retrieval success, LinkedIn response.
+	 * 		array containing retrieval success, LinkedIn response.
 	 */
 	public function deletePost($pid) {
 		if(!is_string($pid)) {
 			throw new LinkedInException('LinkedIn->deletePost(): bad data passed, $pid must be of type string');
 		}
-		
+
 		// construct and send the request
 		$query    = self::_URL_API . '/v1/posts/' . trim($pid);
 		$response = $this->fetch('DELETE', $query);
-		
+
     /**
-     * Check for successful request (a 204 response from LinkedIn server) 
+     * Check for successful request (a 204 response from LinkedIn server)
 	   * per the documentation linked in method comments above.
 	   */
 		return $this->checkResponse(204, $response);
 	}
-	
+
 	/**
 	 * Edit a job.
-	 * 
+	 *
 	 * Calling this method causes the passed job to be edited, with the passed
 	 * XML instructing which fields to change, per:
-	 * 
+	 *
 	 *   http://developer.linkedin.com/docs/DOC-1154
-	 *   http://developer.linkedin.com/docs/DOC-1142      
-	 * 
+	 *   http://developer.linkedin.com/docs/DOC-1142
+	 *
 	 * @param str $jid
 	 *    Job ID you want to renew.
 	 * @param str $xml
-	 *    The XML containing the job fields to edit.	 
-	 *            	
+	 *    The XML containing the job fields to edit.
+	 *
 	 * @return arr
-	 *    Array containing retrieval success, LinkedIn response.
+	 *    array containing retrieval success, LinkedIn response.
 	 */
 	public function editJob($jid, $xml) {
 	  // check passed data
@@ -606,77 +606,81 @@ class LinkedIn {
 	    // bad data passed
 		  throw new LinkedInException('LinkedIn->editJob(): bad data passed, $xml must be of string value.');
 	  }
-               
+
 	  // construct and send the request
 	  $query    = self::_URL_API . '/v1/jobs/partner-job-id=' . trim($jid);
 	  $response = $this->fetch('PUT', $query, $xml);
-	  
+
 	  /**
-	   * Check for successful request (a 200 response from LinkedIn server) 
+	   * Check for successful request (a 200 response from LinkedIn server)
 	   * per the documentation linked in method comments above.
 	   */
 	  return $this->checkResponse(200, $response);
 	}
-	
+
 	/**
 	 * General data send/request method.
-	 * 
-	 * @param str $method 
-	 *    The data communication method.	 
-	 * @param str $url 
+	 *
+	 * @param str $method
+	 *    The data communication method.
+	 * @param str $url
 	 *    The Linkedin API endpoint to connect with.
 	 * @param str $data
 	 *    [OPTIONAL] The data to send to LinkedIn.
-	 * @param arr $parameters 
+	 * @param arr $parameters
 	 *    [OPTIONAL] Addition OAuth parameters to send to LinkedIn.
-	 *        
-	 * @return arr 
-	 *    Array containing:
-	 * 
+	 *
+	 * @return arr
+	 *    array containing:
+	 *
 	 *           array(
 	 *             'info'      =>	Connection information,
-	 *             'linkedin'  => LinkedIn response,  
-	 *             'oauth'     => The OAuth request string that was sent to LinkedIn	 
-	 *           )	 
+	 *             'linkedin'  => LinkedIn response,
+	 *             'oauth'     => The OAuth request string that was sent to LinkedIn
+	 *           )
 	 */
-	protected function fetch($method, $url, $data = NULL, $parameters = array()) {
+	protected function fetch($method, $url, $data = null, $parameters = array()) {
 	  // check for cURL
 	  if(!extension_loaded('curl')) {
 	    // cURL not present
       throw new LinkedInException('LinkedIn->fetch(): PHP cURL extension does not appear to be loaded/present.');
 	  }
-	  
+
     try {
 	    // generate OAuth values
 	    $oauth_consumer  = new OAuthConsumer($this->getApplicationKey(), $this->getApplicationSecret(), $this->getCallbackUrl());
 	    $oauth_token     = $this->getToken();
-	    $oauth_token     = (!is_null($oauth_token)) ? new OAuthToken($oauth_token['oauth_token'], $oauth_token['oauth_token_secret']) : NULL;
+	    $oauth_token     = (!is_null($oauth_token)) ? new OAuthToken($oauth_token['oauth_token'], $oauth_token['oauth_token_secret']) : null;
       $defaults        = array(
         'oauth_version' => self::_API_OAUTH_VERSION
       );
 	    $parameters    = array_merge($defaults, $parameters);
-	    
+
 	    // generate OAuth request
   		$oauth_req = OAuthRequest::from_consumer_and_token($oauth_consumer, $oauth_token, $method, $url, $parameters);
       $oauth_req->sign_request(new OAuthSignatureMethod_HMAC_SHA1(), $oauth_consumer, $oauth_token);
-      
+
       // start cURL, checking for a successful initiation
       if(!$handle = curl_init()) {
          // cURL failed to start
         throw new LinkedInException('LinkedIn->fetch(): cURL did not initialize properly.');
       }
-      
+
       // set cURL options, based on parameters passed
 	    curl_setopt($handle, CURLOPT_CUSTOMREQUEST, $method);
-      curl_setopt($handle, CURLOPT_RETURNTRANSFER, TRUE);
-      curl_setopt($handle, CURLOPT_SSL_VERIFYPEER, FALSE);
+      curl_setopt($handle, CURLOPT_RETURNTRANSFER, true);
+      curl_setopt($handle, CURLOPT_SSL_VERIFYPEER, false);
       curl_setopt($handle, CURLOPT_URL, $url);
-      curl_setopt($handle, CURLOPT_VERBOSE, FALSE);
+      curl_setopt($handle, CURLOPT_VERBOSE, false);
+
+      // Restrict the request timeout to 5 seconds. Linkedin is sometimes very
+      // slow and we don't want to trigger a PHP timeout on our end.
+      curl_setopt($handle, CURLOPT_TIMEOUT, 5);
 
       if ( isset ( Hybrid_Auth::$config["proxy"] ) ) {
       	curl_setopt($handle, CURLOPT_PROXY, Hybrid_Auth::$config["proxy"]);
       }
-      
+
       // configure the header we are sending to LinkedIn - http://developer.linkedin.com/docs/DOC-1203
       $header = array($oauth_req->to_header(self::_API_OAUTH_REALM));
       if(is_null($data)) {
@@ -695,30 +699,30 @@ class LinkedIn {
         curl_setopt($handle, CURLOPT_POSTFIELDS, $data);
       }
       curl_setopt($handle, CURLOPT_HTTPHEADER, $header);
-    
+
       // set the last url, headers
       $this->last_request_url = $url;
       $this->last_request_headers = $header;
-      
+
       // gather the response
       $return_data['linkedin']        = curl_exec($handle);
-      if( $return_data['linkedin'] === FALSE ) {
-          Hybrid_Logger::error( "LinkedIn::fetch(). curl_exec error: ", curl_error($ch) );
+      if( $return_data['linkedin'] === false ) {
+          Hybrid_Logger::error( "LinkedIn::fetch(). curl_exec error: ", curl_error($handle) );
       }
       $return_data['info']            = curl_getinfo($handle);
       $return_data['oauth']['header'] = $oauth_req->to_header(self::_API_OAUTH_REALM);
       $return_data['oauth']['string'] = $oauth_req->base_string;
-            
+
       // check for throttling
       if(self::isThrottled($return_data['linkedin'])) {
         throw new LinkedInException('LinkedIn->fetch(): throttling limit for this user/application has been reached for LinkedIn resource - ' . $url);
       }
-      
+
       //TODO - add check for NO response (http_code = 0) from cURL
-      
+
       // close cURL connection
       curl_close($handle);
-      
+
       // no exceptions thrown, return the data
       return $return_data;
     } catch(OAuthException $e) {
@@ -726,19 +730,19 @@ class LinkedIn {
       throw new LinkedInException('OAuth exception caught: ' . $e->getMessage());
     }
 	}
-	
+
 	/**
 	 * This flags a specified post as specified by type.
-	 * 
+	 *
 	 *   http://developer.linkedin.com/documents/groups-api
-	 * 
+	 *
 	 * @param str $pid
 	 * 		The post id.
 	 * @param str $type
 	 * 		The type to flag the post as.
-	 * 
+	 *
 	 * @return arr
-	 * 		Array containing retrieval success, LinkedIn response.
+	 * 		array containing retrieval success, LinkedIn response.
 	 */
 	public function flagPost($pid, $type) {
 		if(!is_string($pid)) {
@@ -756,35 +760,35 @@ class LinkedIn {
 			case 'job':
 				$data .= '<code>job</code>';
 				break;
-			default: 
+			default:
 				throw new LinkedInException('LinkedIn->flagPost(): invalid value for $type, must be one of: "promotion", "job"');
-				break;	
+				break;
 		}
-		
+
 		// construct and send the request
 		$query    = self::_URL_API . '/v1/posts/' . $pid . '/category/code';
 		$response = $this->fetch('PUT', $query, $data);
-		  
+
   	/**
-     * Check for successful request (a 204 response from LinkedIn server) 
+     * Check for successful request (a 204 response from LinkedIn server)
 	   * per the documentation linked in method comments above.
 	   */
 		return $this->checkResponse(204, $response);
 	}
-	
+
 	/**
 	 * Follow a company.
-	 * 
-	 * Calling this method causes the current user to start following the 
+	 *
+	 * Calling this method causes the current user to start following the
 	 * specified company, per:
-	 * 
+	 *
 	 *   http://developer.linkedin.com/docs/DOC-1324
-	 * 
+	 *
 	 * @param str $cid
 	 *    Company ID you want to follow.
-	 *         	 
+	 *
 	 * @return arr
-	 *    Array containing retrieval success, LinkedIn response.
+	 *    array containing retrieval success, LinkedIn response.
 	 */
 	public function followCompany($cid) {
 	  // check passed data
@@ -792,153 +796,153 @@ class LinkedIn {
 	    // bad data passed
 		  throw new LinkedInException('LinkedIn->followCompany(): bad data passed, $cid must be of type string.');
 	  }
-	  
+
 	  // construct and send the request
 	  $query    = self::_URL_API . '/v1/people/~/following/companies';
 	  $response = $this->fetch('POST', $query, '<company><id>' . trim($cid) . '</id></company>');
-	  
+
 	  /**
-	   * Check for successful request (a 201 response from LinkedIn server) 
+	   * Check for successful request (a 201 response from LinkedIn server)
 	   * per the documentation linked in method comments above.
 	   */
 	  return $this->checkResponse(201, $response);
 	}
-	
+
 	/**
 	 * Follows/Unfollows the specified post.
-	 * 
+	 *
 	 * https://developer.linkedin.com/documents/groups-api
-	 * 
+	 *
 	 * @param str $pid
 	 * 		The post id.
 	 * @param bool $follow
-	 * 		Determines whether to follow or unfollow the post. TRUE = follow, FALSE = unfollow
-	 * 
+	 * 		Determines whether to follow or unfollow the post. true = follow, false = unfollow
+	 *
 	 * @return arr
-	 * 		Array containing retrieval success, LinkedIn response.
+	 * 		array containing retrieval success, LinkedIn response.
 	 */
-	
+
 	public function followPost($pid, $follow) {
 		if(!is_string($pid)) {
 			throw new LinkedInException('LinkedIn->followPost(): bad data passed, $pid must be of type string');
 		}
-		if(!($follow === TRUE || $follow === FALSE)) {
+		if(!($follow === true || $follow === false)) {
 			throw new LinkedInException('LinkedIn->followPost(): bad data passed, $follow must be of type boolean');
 		}
-		
+
 		// construct the XML
 		$data = '<?xml version="1.0" encoding="UTF-8"?>
 				     <is-following>'. (($follow) ? 'true' : 'false'). '</is-following>';
-		
+
 		// construct and send the request
 		$query    = self::_URL_API . '/v1/posts/' . trim($pid) . '/relation-to-viewer/is-following';
 		$response = $this->fetch('PUT', $query, $data);
-		
+
 		/**
-	   * Check for successful request (a 204 response from LinkedIn server) 
+	   * Check for successful request (a 204 response from LinkedIn server)
 	   * per the documentation linked in method comments above.
 	   */
 		return $this->checkResponse(204, $response);
 	}
-	
+
 	/**
 	 * Get list of companies you follow.
-	 * 
+	 *
 	 * Returns a list of companies the current user is currently following, per:
-	 * 
-	 *   http://developer.linkedin.com/docs/DOC-1324   
-	 * 	
+	 *
+	 *   http://developer.linkedin.com/docs/DOC-1324
+	 *
 	 * @return arr
-	 *    Array containing retrieval success, LinkedIn response.
+	 *    array containing retrieval success, LinkedIn response.
 	 */
-	public function followedCompanies() {	  
+	public function followedCompanies() {
 	  // construct and send the request
     $query    = self::_URL_API . '/v1/people/~/following/companies';
 	  $response = $this->fetch('GET', $query);
-	  
+
 	  /**
-	   * Check for successful request (a 200 response from LinkedIn server) 
+	   * Check for successful request (a 200 response from LinkedIn server)
 	   * per the documentation linked in method comments above.
 	   */
 	  return $this->checkResponse(200, $response);
 	}
-	
+
 	/**
 	 * Get the application_key property.
-	 * 
-	 * @return str 
-	 *    The application key.       	 
+	 *
+	 * @return str
+	 *    The application key.
 	 */
 	public function getApplicationKey() {
 	  return $this->application_key;
 	}
-	
+
 	/**
 	 * Get the application_secret property.
-	 * 
-	 * @return str 
-	 *    The application secret.       	 
+	 *
+	 * @return str
+	 *    The application secret.
 	 */
 	public function getApplicationSecret() {
 	  return $this->application_secret;
 	}
-	
+
 	/**
 	 * Get the callback property.
-	 * 
-	 * @return str 
-	 *    The callback url.       	 
+	 *
+	 * @return str
+	 *    The callback url.
 	 */
 	public function getCallbackUrl() {
 	  return $this->callback;
 	}
-  
+
   /**
 	 * Get the response_format property.
-	 * 
-	 * @return str 
-	 *    The response format.       	 
+	 *
+	 * @return str
+	 *    The response format.
 	 */
 	public function getResponseFormat() {
 	  return $this->response_format;
 	}
-	
+
 	/**
 	 * Get the token_access property.
-	 * 
-	 * @return arr 
-	 *    The access token.       	 
+	 *
+	 * @return arr
+	 *    The access token.
 	 */
 	public function getToken() {
 	  return $this->token;
 	}
-	
+
 	/**
 	 * [DEPRECATED] Get the token_access property.
-	 * 
-	 * @return arr 
-	 *    The access token.       	 
+	 *
+	 * @return arr
+	 *    The access token.
 	 */
 	public function getTokenAccess() {
 	  return $this->getToken();
 	}
-	
+
 	/**
-	 * 
+	 *
 	 * Get information about a specific group.
-	 * 
+	 *
 	 *   http://developer.linkedin.com/documents/groups-api
-	 * 
+	 *
 	 * @param str $gid
 	 * 	 	The group id.
-	 *  
+	 *
 	 * @param str $options
 	 * 		[OPTIONAL] Field selectors for the group.
-	 * 
+	 *
 	 * @return arr
-	 * 		Array containing retrieval success, LinkedIn response.
+	 * 		array containing retrieval success, LinkedIn response.
 	 */
-	
+
 	public function group($gid, $options = '') {
 		if(!is_string($gid)){
 			throw new LinkedInException('LinkedIn->group(): bad data passed, $gid must be of type string.');
@@ -946,57 +950,57 @@ class LinkedIn {
 		if(!is_string($options)) {
 			throw new LinkedInException('LinkedIn->group(): bad data passed, $options must be of type string');
 		}
-	
+
 		// construct and send the request
-		$query    = self::_URL_API . '/v1/groups/' . trim($gid) . trim($options); 
+		$query    = self::_URL_API . '/v1/groups/' . trim($gid) . trim($options);
 		$response = $this->fetch('GET', $query);
-		
+
 		/**
-	   * Check for successful request (a 200 response from LinkedIn server) 
+	   * Check for successful request (a 200 response from LinkedIn server)
 	   * per the documentation linked in method comments above.
 	   */
 		return $this->checkResponse(200, $response);
 	}
-	
+
 	/**
 	 * This returns all the groups the user is a member of.
-	 * 
+	 *
 	 *   http://developer.linkedin.com/documents/groups-api
-	 * 
+	 *
 	 * @param str $options
 	 * 		[OPTIONAL] Field selectors for the groups.
-	 * 
+	 *
 	 * @return arr
-	 * 		Array containing retrieval success, LinkedIn response.
+	 * 		array containing retrieval success, LinkedIn response.
 	 */
 	public function groupMemberships($options = '') {
 		if(!is_string($options)) {
 			throw new LinkedInException('LinkedIn->groupMemberships(): bad data passed, $options must be of type string');
 		}
-		
+
 		// construct and send the request
 		$query    = self::_URL_API . '/v1/people/~/group-memberships' . trim($options) . '?membership-state=member';
 		$response = $this->fetch('GET', $query);
-		
+
 		/**
-	   * Check for successful request (a 200 response from LinkedIn server) 
+	   * Check for successful request (a 200 response from LinkedIn server)
 	   * per the documentation linked in method comments above.
 	   */
 		return $this->checkResponse(200, $response);
 	}
-	
+
 	/**
 	 * This gets a specified post made within a group.
-	 * 
+	 *
 	 *   http://developer.linkedin.com/documents/groups-api
-	 * 
+	 *
 	 * @param str $pid
 	 * 		The post id.
 	 * @param str $options
 	 * 		[OPTIONAL] Field selectors for the post.
-	 * 
+	 *
 	 * @return arr
-	 * 		Array containing retrieval success, LinkedIn response.
+	 * 		array containing retrieval success, LinkedIn response.
 	 */
 	public function groupPost($pid, $options = '') {
 		if(!is_string($pid)) {
@@ -1005,60 +1009,60 @@ class LinkedIn {
 		if(!is_string($options)) {
 			throw new LinkedInException('LinkedIn->groupPost(): bad data passed, $options must be of type string.');
 		}
-		
+
 		// construct and send the request
 		$query    = self::_URL_API . '/v1/posts/' . trim($pid) . trim($options);
 		$response = $this->fetch('GET', $query);
-		
+
 		/**
-	   * Check for successful request (a 200 response from LinkedIn server) 
+	   * Check for successful request (a 200 response from LinkedIn server)
 	   * per the documentation linked in method comments above.
 	   */
 		return $this->checkResponse(200, $response);
 	}
-	
+
 	/**
 	 * This returns all the comments made on the specified post within a group.
-	 * 
+	 *
 	 *   http://developer.linkedin.com/documents/groups-api
-	 * 
+	 *
 	 * @param str $pid
 	 * 		The post id.
 	 * @param str $options
 	 * 		[OPTIONAL] Field selectors for the post comments.
-	 * 
+	 *
 	 * @return arr
-	 * 		Array containing retrieval success, LinkedIn response.
+	 * 		array containing retrieval success, LinkedIn response.
 	 */
-	public function groupPostComments($pid, $options = ''){ 
+	public function groupPostComments($pid, $options = ''){
 		if(!is_string($pid)){
 			throw new LinkedInException('LinkedIn->groupPostComments(): bad data passed, $pid must be of type string.');
 		}
 		if(!is_string($options)) {
 			throw new LinkedInException('LinkedIn->groupPostComments(): bad data passed, $options must be of type string.');
-		}		
-		
+		}
+
 		// construct and send the request
 		$query    = self::_URL_API . '/v1/posts/' . trim($pid) . '/comments' . trim($options);
 		$response = $this->fetch('GET', $query);
 
 		/**
-	   * Check for successful request (a 200 response from LinkedIn server) 
+	   * Check for successful request (a 200 response from LinkedIn server)
 	   * per the documentation linked in method comments above.
 	   */
 		return $this->checkResponse(200, $response);
 	}
-	
+
 	/**
 	 * This returns all the posts within a group.
-	 * 
+	 *
 	 *   http://developer.linkedin.com/documents/groups-api
-	 * 
+	 *
 	 * @param str $gid
 	 * 		The group id.
-	 * 
+	 *
 	 * @return arr
-	 * 		Array containing retrieval success, LinkedIn response.
+	 * 		array containing retrieval success, LinkedIn response.
 	 */
 	public function groupPosts($gid, $options = '') {
 		if(!is_string($gid)){
@@ -1067,30 +1071,30 @@ class LinkedIn {
 		if(!is_string($options)){
 			throw new LinkedInException('LinkedIn->groupPosts(): bad data passed, $options must be of type string');
 		}
-		
+
 		// construct and send the request
 		$query    = self::_URL_API . '/v1/groups/' . trim($gid)  .'/posts' . trim($options);
 		$response = $this->fetch('GET', $query);
-		
+
 		/**
-	   * Check for successful request (a 200 response from LinkedIn server) 
+	   * Check for successful request (a 200 response from LinkedIn server)
 	   * per the documentation linked in method comments above.
 	   */
 		return $this->checkResponse(200, $response);
 	}
-	
+
 	/**
 	 * This returns the group settings of the specified group
-	 * 
+	 *
 	 *   http://developer.linkedin.com/documents/groups-api
-	 * 
+	 *
 	 * @param str $gid
 	 * 		The group id.
 	 * @param str $options
 	 * 		[OPTIONAL] Field selectors for the group.
-	 * 
+	 *
 	 * @return arr
-	 * 		Array containing retrieval success, LinkedIn response.
+	 * 		array containing retrieval success, LinkedIn response.
 	 */
 	public function groupSettings($gid, $options = '') {
 		if(!is_string($gid)) {
@@ -1099,48 +1103,48 @@ class LinkedIn {
 		if(!is_string($options)) {
 			throw new LinkedInException('LinkedIn->groupSettings(): bad data passed, $options must be of type string');
 		}
-		
+
 		// construct and send the request
 		$query    = self::_URL_API . '/v1/people/~/group-memberships/' . trim($gid) . trim($options);
 		$response = $this->fetch('GET', $query);
-		
+
 		/**
-	   * Check for successful request (a 200 response from LinkedIn server) 
+	   * Check for successful request (a 200 response from LinkedIn server)
 	   * per the documentation linked in method comments above.
 	   */
 		return $this->checkResponse(200, $response);
 	}
-	
+
 	/**
 	 * Send connection invitations.
-	 *     
-	 * Send an invitation to connect to your network, either by email address or 
-	 * by LinkedIn ID. Details on the API here: 
-	 * 
+	 *
+	 * Send an invitation to connect to your network, either by email address or
+	 * by LinkedIn ID. Details on the API here:
+	 *
 	 *   http://developer.linkedin.com/docs/DOC-1012
-	 * 
-	 * @param str $method 
-	 *    The invitation method to process.	 
-	 * @param str $recipient 
-	 *    The email/id to send the invitation to.	 	 
-	 * @param str $subject 
+	 *
+	 * @param str $method
+	 *    The invitation method to process.
+	 * @param str $recipient
+	 *    The email/id to send the invitation to.
+	 * @param str $subject
 	 *    The subject of the invitation to send.
-	 * @param str $body 
+	 * @param str $body
 	 *    The body of the invitation to send.
-	 * @param str $type 
+	 * @param str $type
 	 *    [OPTIONAL] The invitation request type (only friend is supported at this time by the Invite API).
-	 * 
-	 * @return arr 
-	 *    Array containing retrieval success, LinkedIn response.  	 
+	 *
+	 * @return arr
+	 *    array containing retrieval success, LinkedIn response.
 	 */
 	public function invite($method, $recipient, $subject, $body, $type = 'friend') {
     /**
      * Clean up the passed data per these rules:
-     * 
+     *
      * 1) Message must be sent to one recipient (only a single recipient permitted for the Invitation API)
      * 2) No HTML permitted
      * 3) 200 characters max in the invitation subject
-     * 4) Only able to connect as a friend at this point     
+     * 4) Only able to connect as a friend at this point
      */
     // check passed data
     if(empty($recipient)) {
@@ -1186,7 +1190,7 @@ class LinkedIn {
         throw new LinkedInException('LinkedIn->invite(): bad invitation type, must be one of: friend.');
         break;
     }
-    
+
     // construct the xml data
 		$data   = '<?xml version="1.0" encoding="UTF-8"?>
 		           <mailbox-item>
@@ -1224,52 +1228,52 @@ class LinkedIn {
                          $query                 = 'id=' . $recipient . ':(api-standard-profile-request)';
                          $response              = self::profile($query);
                          if($response['info']['http_code'] == 200) {
-                           $response['linkedin'] = self::xmlToArray($response['linkedin']);
-                           if($response['linkedin'] === FALSE) {
+                           $response['linkedin'] = self::xmlToarray($response['linkedin']);
+                           if($response['linkedin'] === false) {
                              // bad XML data
                              throw new LinkedInException('LinkedIn->invite(): LinkedIn returned bad XML data.');
                            }
                            $authentication = explode(':', $response['linkedin']['person']['children']['api-standard-profile-request']['children']['headers']['children']['http-header']['children']['value']['content']);
-                           
-                           // complete the xml        
+
+                           // complete the xml
                            $data .= '<authorization>
                                        <name>' . $authentication[0] . '</name>
                                        <value>' . $authentication[1] . '</value>
                                      </authorization>';
                          } else {
                            // bad response from the profile request, not a valid ID?
-                           throw new LinkedInException('LinkedIn->invite(): could not send invitation, LinkedIn says: ' . print_r($response['linkedin'], TRUE));
+                           throw new LinkedInException('LinkedIn->invite(): could not send invitation, LinkedIn says: ' . print_r($response['linkedin'], true));
                          }
                          break;
                      }
     $data  .= '    </invitation-request>
                  </item-content>
                </mailbox-item>';
-    
+
     // send request
     $query    = self::_URL_API . '/v1/people/~/mailbox';
     $response = $this->fetch('POST', $query, $data);
-		
+
 		/**
-	   * Check for successful request (a 201 response from LinkedIn server) 
+	   * Check for successful request (a 201 response from LinkedIn server)
 	   * per the documentation linked in method comments above.
-	   */ 
+	   */
     return $this->checkResponse(201, $response);
 	}
-	
+
 	/**
 	 * LinkedIn ID validation.
-	 *	 
-	 * Checks the passed string $id to see if it has a valid LinkedIn ID format, 
+	 *
+	 * Checks the passed string $id to see if it has a valid LinkedIn ID format,
 	 * which is, as of October 15th, 2010:
-	 * 
-	 *   10 alpha-numeric mixed-case characters, plus underscores and dashes.          	 
-	 * 
-	 * @param str $id 
-	 *    A possible LinkedIn ID.         	 
-	 * 
-	 * @return bool 
-	 *    TRUE/FALSE depending on valid ID format determination.                  
+	 *
+	 *   10 alpha-numeric mixed-case characters, plus underscores and dashes.
+	 *
+	 * @param str $id
+	 *    A possible LinkedIn ID.
+	 *
+	 * @return bool
+	 *    true/false depending on valid ID format determination.
 	 */
 	public static function isId($id) {
 	  // check passed data
@@ -1277,69 +1281,69 @@ class LinkedIn {
 	    // bad data passed
 	    throw new LinkedInException('LinkedIn->isId(): bad data passed, $id must be of type string.');
 	  }
-	  
+
 	  $pattern = '/^[a-z0-9_\-]{10}$/i';
 	  if($match = preg_match($pattern, $id)) {
 	    // we have a match
-	    $return_data = TRUE;
+	    $return_data = true;
 	  } else {
 	    // no match
-	    $return_data = FALSE;
+	    $return_data = false;
 	  }
 	  return $return_data;
 	}
-	
+
 	/**
 	 * Throttling check.
-	 * 
-	 * Checks the passed LinkedIn response to see if we have hit a throttling 
+	 *
+	 * Checks the passed LinkedIn response to see if we have hit a throttling
 	 * limit:
-	 * 
+	 *
 	 * http://developer.linkedin.com/docs/DOC-1112
-	 * 
-	 * @param arr $response 
+	 *
+	 * @param arr $response
 	 *    The LinkedIn response.
-	 *                     	 
+	 *
 	 * @return bool
-	 *    TRUE/FALSE depending on content of response.                  
+	 *    true/false depending on content of response.
 	 */
 	public static function isThrottled($response) {
-	  $return_data = FALSE;
-    
+	  $return_data = false;
+
     // check the variable
 	  if(!empty($response) && is_string($response)) {
 	    // we have an array and have a properly formatted LinkedIn response
-	       
+
       // store the response in a temp variable
-      $temp_response = self::xmlToArray($response);
-  	  if($temp_response !== FALSE) {
+      $temp_response = self::xmlToarray($response);
+  	  if($temp_response !== false) {
     	  // check to see if we have an error
     	  if(array_key_exists('error', $temp_response) && ($temp_response['error']['children']['status']['content'] == 403) && preg_match('/throttle/i', $temp_response['error']['children']['message']['content'])) {
     	    // we have an error, it is 403 and we have hit a throttle limit
-  	      $return_data = TRUE;
+  	      $return_data = true;
     	  }
   	  }
   	}
   	return $return_data;
 	}
-	
+
 	/**
 	 * Job posting detail info retrieval function.
-	 * 
-	 * The Jobs API returns detailed information about job postings on LinkedIn. 
-	 * Find the job summary, description, location, and apply our professional graph 
-	 * to present the relationship between the current member and the job poster or 
+	 *
+	 * The Jobs API returns detailed information about job postings on LinkedIn.
+	 * Find the job summary, description, location, and apply our professional graph
+	 * to present the relationship between the current member and the job poster or
 	 * hiring manager.
-	 * 
-	 *   http://developer.linkedin.com/docs/DOC-1322  
-	 * 
-	 * @param	str $jid 
+	 *
+	 *   http://developer.linkedin.com/docs/DOC-1322
+	 *
+	 * @param	str $jid
 	 *    ID of the job you want to look up.
-	 * @param str $options 
+	 * @param str $options
 	 *    [OPTIONAL] Data retrieval options.
-	 *            	
-	 * @return arr 
-	 *    Array containing retrieval success, LinkedIn response.
+	 *
+	 * @return arr
+	 *    array containing retrieval success, LinkedIn response.
 	 */
 	public function job($jid, $options = '') {
 	  // check passed data
@@ -1351,34 +1355,34 @@ class LinkedIn {
 	    // bad data passed
 		  throw new LinkedInException('LinkedIn->job(): bad data passed, $options must be of type string.');
 	  }
-	  
+
 	  // construct and send the request
 	  $query    = self::_URL_API . '/v1/jobs/' . trim($jid) . trim($options);
 	  $response = $this->fetch('GET', $query);
-	  
+
 	  /**
-	   * Check for successful request (a 200 response from LinkedIn server) 
+	   * Check for successful request (a 200 response from LinkedIn server)
 	   * per the documentation linked in method comments above.
 	   */
 	  return $this->checkResponse(200, $response);
 	}
-	
+
 	/**
-	 * Join the specified group, per: 
-	 * 
+	 * Join the specified group, per:
+	 *
 	 *   http://developer.linkedin.com/documents/groups-api
-	 * 
+	 *
 	 * @param str $gid
 	 * 		The group id.
-	 * 
+	 *
 	 * @return arr
-	 * 		Array containing retrieval success, LinkedIn response.   	 
+	 * 		array containing retrieval success, LinkedIn response.
 	 */
 	public function joinGroup($gid) {
 		if(!is_string($gid)) {
 			throw new LinkedInException('LinkedIn->joinGroup(): bad data passed, $gid must be of type string.');
 		}
-		
+
 		// constructing the XML
 		$data = '<?xml version="1.0" encoding="UTF-8"?>
   				   <group-membership>
@@ -1386,77 +1390,77 @@ class LinkedIn {
   				  	 	 <code>member</code>
   				  	 </membership-state>
   				   </group-membership>';
-		
+
 		// construct and send the request
 		$query    = self::_URL_API . '/v1/people/~/group-memberships/' . trim($gid);
 		$response = $this->fetch('PUT', $query, $data);
-		
+
 		/**
-	   * Check for successful request (a 200 or 201 response from LinkedIn server) 
+	   * Check for successful request (a 200 or 201 response from LinkedIn server)
 	   * per the documentation linked in method comments above.
 	   */
 		return $this->checkResponse(array(200, 201), $response);
 	}
-	
+
 	/**
-	 * Returns the last request header from the previous call to the 
+	 * Returns the last request header from the previous call to the
 	 * LinkedIn API.
-	 * 
+	 *
 	 * @returns str
 	 *    The header, in string format.
-	 */            	
+	 */
 	public function lastRequestHeader() {
 	   return $this->last_request_headers;
 	}
-	
+
 	/**
-	 * Returns the last request url from the previous call to the 
+	 * Returns the last request url from the previous call to the
 	 * LinkedIn API.
-	 * 
+	 *
 	 * @returns str
 	 *    The url, in string format.
-	 */            	
+	 */
 	public function lastRequestUrl() {
 	   return $this->last_request_url;
 	}
-	
+
 	/**
 	 * Leave the specified group, per:.
-	 * 
+	 *
 	 *   http://developer.linkedin.com/documents/groups-api
-	 * 
+	 *
 	 * @param str $gid
 	 * 		The group id.
-	 * 
+	 *
 	 * @return arr
-	 * 		Array containing retrieval success, LinkedIn response.
+	 * 		array containing retrieval success, LinkedIn response.
 	 */
 	public function leaveGroup($gid){
 		if(!is_string($gid)) {
 			throw new LinkedInException('LinkedIn->leaveGroup(): bad data passed, $gid must be of type string');
 		}
-		
+
 		// construct and send the request
 		$query    = self::_URL_API . '/v1/people/~/group-memberships/'  .trim($gid);
 		$response = $this->fetch('DELETE', $query);
-		
+
 		/**
-	   * Check for successful request (a 204 response from LinkedIn server) 
+	   * Check for successful request (a 204 response from LinkedIn server)
 	   * per the documentation linked in method comments above.
-	   */ 
+	   */
 		return $this->checkResponse(204, $response);
 	}
-	
+
 	/**
 	 * Like another user's network update, per:
-	 * 
+	 *
 	 *   http://developer.linkedin.com/docs/DOC-1043
-	 * 
+	 *
 	 * @param str $uid
 	 *    The LinkedIn update ID.
-	 *                     	 
+	 *
 	 * @return arr
-	 *    Array containing retrieval success, LinkedIn response.                  
+	 *    array containing retrieval success, LinkedIn response.
 	 */
 	public function like($uid) {
 	  // check passed data
@@ -1464,70 +1468,70 @@ class LinkedIn {
 	    // bad data passed
 		  throw new LinkedInException('LinkedIn->like(): bad data passed, $uid must be of type string.');
 	  }
-    
+
     // construct the XML
 		$data = '<?xml version="1.0" encoding="UTF-8"?>
 		         <is-liked>true</is-liked>';
-		
+
 		// construct and send the request
     $query    = self::_URL_API . '/v1/people/~/network/updates/key=' . $uid . '/is-liked';
     $response = $this->fetch('PUT', $query, $data);
-    
+
   	/**
-	   * Check for successful request (a 201 response from LinkedIn server) 
+	   * Check for successful request (a 201 response from LinkedIn server)
 	   * per the documentation linked in method comments above.
-	   */ 
+	   */
     return $this->checkResponse(201, $response);
 	}
-	
+
 	/**
 	 * Likes/unlikes the specified post, per:
-	 * 
+	 *
 	 *   http://developer.linkedin.com/documents/groups-api
-	 * 
+	 *
 	 * @param str $pid
 	 * 		The post id.
 	 * @param bool $like
-	 * 		Determines whether to like or unlike. TRUE = like, FALSE = unlike.
-	 * 
+	 * 		Determines whether to like or unlike. true = like, false = unlike.
+	 *
 	 * @return arr
-	 * 		Array containing retrieval success, LinkedIn response.
+	 * 		array containing retrieval success, LinkedIn response.
 	 */
 	public function likePost($pid, $like) {
 		if(!is_string($pid)) {
 			throw new LinkedInException ('LinkedIn->likePost(): bad data passed, $pid must be of type string');
 		}
-		if(!($like === TRUE || $like === FALSE)) {
+		if(!($like === true || $like === false)) {
 			throw new LinkedInException('LinkedIn->likePost(): bad data passed, $like must be of type boolean');
 		}
-		
+
 		// construct the XML
 		$data = '<?xml version="1.0" encoding="UTF-8"?>
 		         <is-liked>'.(($like) ? 'true': 'false').'</is-liked>';
-		
+
 		// construct and send the request
 		$query    = self::_URL_API . '/v1/posts/' . trim($pid) . '/relation-to-viewer/is-liked';
 		$response = $this->fetch('PUT', $query, $data);
-		
+
 		/**
-	   * Check for successful request (a 204 response from LinkedIn server) 
+	   * Check for successful request (a 204 response from LinkedIn server)
 	   * per the documentation linked in method comments above.
-	   */ 
+	   */
 		return $this->checkResponse(204, $response);
 	}
-	
+
 	/**
 	 * Retrieve network update likes.
-	 *    
+	 *
 	 * Return all likes associated with a given network update:
-	 * 
+	 *
 	 * http://developer.linkedin.com/docs/DOC-1043
-	 * 
+	 *
 	 * @param str $uid
 	 *    The LinkedIn update ID.
-	 *                     	 
-	 * @return arr 
-	 *    Array containing retrieval success, LinkedIn response.                  
+	 *
+	 * @return arr
+	 *    array containing retrieval success, LinkedIn response.
 	 */
 	public function likes($uid) {
 	  // check passed data
@@ -1535,42 +1539,42 @@ class LinkedIn {
 	    // bad data passed
 		  throw new LinkedInException('LinkedIn->likes(): bad data passed, $uid must be of type string.');
 	  }
-		
+
 		// construct and send the request
     $query    = self::_URL_API . '/v1/people/~/network/updates/key=' . $uid . '/likes';
     $response = $this->fetch('GET', $query);
-    
+
   	/**
-	   * Check for successful request (a 200 response from LinkedIn server) 
+	   * Check for successful request (a 200 response from LinkedIn server)
 	   * per the documentation linked in method comments above.
-	   */ 
+	   */
     return $this->checkResponse(200, $response);
 	}
-	
+
 	/**
 	 * Connection messaging method.
-	 * 	 
-	 * Send a message to your network connection(s), optionally copying yourself.  
-	 * Full details from LinkedIn on this functionality can be found here: 
-	 * 
+	 *
+	 * Send a message to your network connection(s), optionally copying yourself.
+	 * Full details from LinkedIn on this functionality can be found here:
+	 *
 	 *   http://developer.linkedin.com/docs/DOC-1044
-	 * 
-	 * @param arr $recipients 
-	 *    The connection(s) to send the message to.	 	 
-	 * @param str $subject 
+	 *
+	 * @param arr $recipients
+	 *    The connection(s) to send the message to.
+	 * @param str $subject
 	 *    The subject of the message to send.
-	 * @param str $body 
+	 * @param str $body
 	 *    The body of the message to send.
-	 * @param bool $copy_self 
+	 * @param bool $copy_self
 	 *    [OPTIONAL] Also update the teathered Twitter account.
-	 *    	 
-	 * @return arr 
-	 *    Array containing retrieval success, LinkedIn response.      	 
+	 *
+	 * @return arr
+	 *    array containing retrieval success, LinkedIn response.
 	 */
-	public function message($recipients, $subject, $body, $copy_self = FALSE) {
+	public function message($recipients, $subject, $body, $copy_self = false) {
     /**
      * Clean up the passed data per these rules:
-     * 
+     *
      * 1) Message must be sent to at least one recipient
      * 2) No HTML permitted
      */
@@ -1588,7 +1592,7 @@ class LinkedIn {
       // no recipients, and/or bad data
       throw new LinkedInException('LinkedIn->message(): at least one message recipient required.');
     }
-    
+
     // construct the xml data
 		$data   = '<?xml version="1.0" encoding="UTF-8"?>
 		           <mailbox-item>
@@ -1605,31 +1609,31 @@ class LinkedIn {
                  <subject>' . htmlspecialchars($subject) . '</subject>
                  <body>' . htmlspecialchars($body) . '</body>
                </mailbox-item>';
-    
+
     // send request
     $query    = self::_URL_API . '/v1/people/~/mailbox';
     $response = $this->fetch('POST', $query, $data);
-		
+
 		/**
-	   * Check for successful request (a 201 response from LinkedIn server) 
+	   * Check for successful request (a 201 response from LinkedIn server)
 	   * per the documentation linked in method comments above.
-	   */ 
+	   */
     return $this->checkResponse(201, $response);
 	}
-	
+
 	/**
 	 * Job posting method.
-	 * 	 
-	 * Post a job to LinkedIn, assuming that you have access to this feature. 
-	 * Full details from LinkedIn on this functionality can be found here: 
-	 * 
+	 *
+	 * Post a job to LinkedIn, assuming that you have access to this feature.
+	 * Full details from LinkedIn on this functionality can be found here:
+	 *
 	 *   http://developer.linkedin.com/community/jobs?view=documents
-	 * 
-	 * @param str $xml 
-	 *    The XML defining a job to post.	 	 
-	 *    	 
-	 * @return arr 
-	 *    Array containing retrieval success, LinkedIn response.      	 
+	 *
+	 * @param str $xml
+	 *    The XML defining a job to post.
+	 *
+	 * @return arr
+	 *    array containing retrieval success, LinkedIn response.
 	 */
 	public function postJob($xml) {
     // check passed data
@@ -1638,33 +1642,33 @@ class LinkedIn {
     } else {
       throw new LinkedInException('LinkedIn->postJob(): bad data passed, $xml must be of type string.');
     }
-   
+
     // construct and send the request
     $query    = self::_URL_API . '/v1/jobs';
     $response = $this->fetch('POST', $query, $xml);
-		
+
 		/**
-	   * Check for successful request (a 201 response from LinkedIn server) 
+	   * Check for successful request (a 201 response from LinkedIn server)
 	   * per the documentation linked in method comments above.
-	   */ 
+	   */
     return $this->checkResponse(201, $response);
 	}
-	
+
 	/**
 	 * General profile retrieval function.
-	 * 
-	 * Takes a string of parameters as input and requests profile data from the 
+	 *
+	 * Takes a string of parameters as input and requests profile data from the
 	 * Linkedin Profile API. See the official documentation for $options
 	 * 'field selector' formatting:
-	 * 
+	 *
 	 *   http://developer.linkedin.com/docs/DOC-1014
-	 *   http://developer.linkedin.com/docs/DOC-1002    
-	 * 
-	 * @param str $options 
+	 *   http://developer.linkedin.com/docs/DOC-1002
+	 *
+	 * @param str $options
 	 *    [OPTIONAL] Data retrieval options.
-	 *            	 
-	 * @return arr 
-	 *    Array containing retrieval success, LinkedIn response.
+	 *
+	 * @return arr
+	 *    array containing retrieval success, LinkedIn response.
 	 */
 	public function profile($options = '~') {
 	  // check passed data
@@ -1672,36 +1676,107 @@ class LinkedIn {
 	    // bad data passed
 		  throw new LinkedInException('LinkedIn->profile(): bad data passed, $options must be of type string.');
 	  }
-	  
+
 	  // construct and send the request
 	  $query    = self::_URL_API . '/v1/people/' . trim($options);
 	  $response = $this->fetch('GET', $query);
-	  
+
 	  /**
-	   * Check for successful request (a 200 response from LinkedIn server) 
+	   * Check for successful request (a 200 response from LinkedIn server)
 	   * per the documentation linked in method comments above.
 	   */
 	  return $this->checkResponse(200, $response);
 	}
-	
+
+  /**
+   * Send a message
+   *
+   * Send a message to another member or members
+   *
+   * @author @timersys
+   *
+   * @param array $recipients
+   *    The id or ids to send the message to.
+   * @param str $subject
+   *    The subject of the invitation to send.
+   * @param str $body
+   *    The body of the invitation to send.
+   *
+   * @return arr array
+   *    Containing retrieval success, LinkedIn response.
+   */
+   public function send_msg($recipients, $subject, $body) {
+     /**
+     	* Clean up the passed data per these rules:
+     	*
+     	* 1) No HTML permitted
+     	* 2) 200 characters max in the invitation subject
+     	* 3) Only able to connect as a friend at this point
+     	*/
+
+        // check passed data
+        if(empty($recipients)) {
+          throw new LinkedInException('LinkedIn->send_msg(): you must provide an invitation recipient.');
+        }
+        if(!empty($subject)) {
+          $subject = trim(htmlspecialchars(strip_tags(stripslashes($subject))));
+        } else {
+          throw new LinkedInException('LinkedIn->send_msg(): message subject is empty.');
+        }
+        if(!empty($body)) {
+          $body = trim(htmlspecialchars(strip_tags(stripslashes($body))));
+
+          if(strlen($body) > self::_INV_BODY_LENGTH) {
+           throw new LinkedInException('LinkedIn->send_msg(): message body length is too long - max length is ' . self::_INV_BODY_LENGTH . ' characters.');
+          }
+        } else {
+          throw new LinkedInException('LinkedIn->send_msg(): message body is empty.');
+        }
+
+       // construct the xml data
+       $data = '<?xml version="1.0" encoding="UTF-8"?>
+       <mailbox-item>
+       <recipients>';
+
+       foreach( $recipients as $recipient )
+       {
+         $data .= '<recipient>';
+         $data .= '<person path="/people/'. $recipient . '"/>';
+         $data .= '</recipient>';
+       }
+       $data .= ' </recipients>
+           <subject>' . $subject . '</subject>
+           <body>' . $body . '</body>
+           </mailbox-item>';
+      // send request
+      $query = self::_URL_API . '/v1/people/~/mailbox';
+      $response = $this->fetch('POST', $query, $data);
+
+     	/**
+     	 * Check for successful request (a 201 response from LinkedIn server)
+     	 * per the documentation linked in method comments above.
+       */
+      return $this->checkResponse(201, $response);
+  }
+
 	/**
 	 * Manual API call method, allowing for support for un-implemented API
 	 * functionality to be supported.
-	 * 
-	 * @param str $method 
-	 *    The data communication method.	 
-	 * @param str $url 
-	 *    The Linkedin API endpoint to connect with - should NOT include the 
+	 *
+	 * @param str $method
+	 *    The data communication method.
+	 * @param str $url
+	 *    The Linkedin API endpoint to connect with - should NOT include the
 	 *    leading https://api.linkedin.com/v1.
 	 * @param str $body
 	 *    [OPTIONAL] The URL-encoded body data to send to LinkedIn with the request.
-	 * 
+	 *
 	 * @return arr
-	 * 		Array containing retrieval information, LinkedIn response. Note that you
-	 * 		must manually check the return code and compare this to the expected 
+	 * 		array containing retrieval information, LinkedIn response. Note that you
+	 * 		must manually check the return code and compare this to the expected
 	 * 		API response to determine  if the raw call was successful.
 	 */
-	public function raw($method, $url, $body = NULL) {
+	public function raw($method, $url, $body = null) {
 	  if(!is_string($method)) {
 	    // bad data passed
 		  throw new LinkedInException('LinkedIn->raw(): bad data passed, $method must be of string value.');
@@ -1714,53 +1789,53 @@ class LinkedIn {
 	    // bad data passed
 		  throw new LinkedInException('LinkedIn->raw(): bad data passed, $body must be of string value.');
 	  }
-    
+
     // construct and send the request
 	  $query = self::_URL_API . '/v1' . trim($url);
 	  return $this->fetch($method, $query, $body);
 	}
-	
+
 	/**
 	 * This removes the specified group from the group suggestions, per:
-	 * 
+	 *
 	 *   http://developer.linkedin.com/documents/groups-api
-	 * 
+	 *
 	 * @param str $gid
 	 * 		The group id.
-	 * 
+	 *
 	 * @return arr
-	 * 		Array containing retrieval success, LinkedIn response.
+	 * 		array containing retrieval success, LinkedIn response.
 	 */
 	public function removeSuggestedGroup($gid) {
 		if(!is_string($gid)) {
 			throw new LinkedInException('LinkedIn->removeSuggestedGroup(): bad data passed, $gid must be of type string');
-		} 
-		
+		}
+
 		// construct and send the request
 		$query    = self::_URL_API . '/v1/people/~/suggestions/groups/'  .trim($gid);
 		$response = $this->fetch('DELETE', $query);
-		
+
 		/**
-	   * Check for successful request (a 204 response from LinkedIn server) 
+	   * Check for successful request (a 204 response from LinkedIn server)
 	   * per the documentation linked in method comments above.
 	   */
 		return $this->checkResponse(204, $response);
 	}
-	
+
 	/**
 	 * Renew a job.
-	 * 
+	 *
 	 * Calling this method causes the passed job to be renewed, per:
-	 * 
-	 *   http://developer.linkedin.com/docs/DOC-1154   
-	 * 
+	 *
+	 *   http://developer.linkedin.com/docs/DOC-1154
+	 *
 	 * @param str $jid
 	 *    Job ID you want to renew.
 	 * @param str $cid
-	 *    Contract ID that covers the passed Job ID.	 
-	 *            	
+	 *    Contract ID that covers the passed Job ID.
+	 *
 	 * @return arr
-	 *    Array containing retrieval success, LinkedIn response.
+	 *    array containing retrieval success, LinkedIn response.
 	 */
 	public function renewJob($jid, $cid) {
 	  // check passed data
@@ -1772,39 +1847,39 @@ class LinkedIn {
 	    // bad data passed
 		  throw new LinkedInException('LinkedIn->renewJob(): bad data passed, $cid must be of string value.');
 	  }
-	  
+
 	  // construct the xml data
 		$data   = '<?xml version="1.0" encoding="UTF-8"?>
 		           <job>
 		             <contract-id>' . trim($cid) . '</contract-id>
                  <renewal/>
                </job>';
-               
+
 	  // construct and send the request
 	  $query    = self::_URL_API . '/v1/jobs/partner-job-id=' . trim($jid);
 	  $response = $this->fetch('PUT', $query, $data);
-	  
+
 	  /**
-	   * Check for successful request (a 200 response from LinkedIn server) 
+	   * Check for successful request (a 200 response from LinkedIn server)
 	   * per the documentation linked in method comments above.
 	   */
 	  return $this->checkResponse(200, $response);
 	}
-	
+
   /**
 	 * Access token retrieval.
 	 *
 	 * Request the user's access token from the Linkedin API.
-	 * 
+	 *
 	 * @param str $token
 	 *    The token returned from the user authorization stage.
 	 * @param str $secret
 	 *    The secret returned from the request token stage.
 	 * @param str $verifier
 	 *    The verification value from LinkedIn.
-	 *    	 
-	 * @return arr 
-	 *    The Linkedin OAuth/http response, in array format.      	 
+	 *
+	 * @return arr
+	 *    The Linkedin OAuth/http response, in array format.
 	 */
 	public function retrieveTokenAccess($token, $secret, $verifier) {
 	  // check passed data
@@ -1812,68 +1887,68 @@ class LinkedIn {
       // nothing passed, raise an exception
 		  throw new LinkedInException('LinkedIn->retrieveTokenAccess(): bad data passed, string type is required for $token, $secret and $verifier.');
     }
-    
+
     // start retrieval process
 	  $this->setToken(array('oauth_token' => $token, 'oauth_token_secret' => $secret));
     $parameters = array(
       'oauth_verifier' => $verifier
     );
-    $response = $this->fetch(self::_METHOD_TOKENS, self::_URL_ACCESS, NULL, $parameters);
+    $response = $this->fetch(self::_METHOD_TOKENS, self::_URL_ACCESS, null, $parameters);
     parse_str($response['linkedin'], $response['linkedin']);
-    
+
     /**
-	   * Check for successful request (a 200 response from LinkedIn server) 
+	   * Check for successful request (a 200 response from LinkedIn server)
 	   * per the documentation linked in method comments above.
 	   */
     if($response['info']['http_code'] == 200) {
       // tokens retrieved
       $this->setToken($response['linkedin']);
-      
+
       // set the response
       $return_data            = $response;
-      $return_data['success'] = TRUE;
+      $return_data['success'] = true;
     } else {
       // error getting the request tokens
-       $this->setToken(NULL);
-       
+       $this->setToken(null);
+
       // set the response
       $return_data            = $response;
       $return_data['error']   = 'HTTP response from LinkedIn end-point was not code 200';
-      $return_data['success'] = FALSE;
+      $return_data['success'] = false;
     }
     return $return_data;
 	}
-	
+
 	/**
 	 * Request token retrieval.
-	 * 
+	 *
 	 * Get the request token from the Linkedin API.
-	 * 
+	 *
 	 * @return arr
-	 *    The Linkedin OAuth/http response, in array format.      	 
+	 *    The Linkedin OAuth/http response, in array format.
 	 */
 	public function retrieveTokenRequest() {
     $parameters = array(
       'oauth_callback' => $this->getCallbackUrl()
     );
-    $response = $this->fetch(self::_METHOD_TOKENS, self::_URL_REQUEST, NULL, $parameters);
+    $response = $this->fetch(self::_METHOD_TOKENS, self::_URL_REQUEST, null, $parameters);
     parse_str($response['linkedin'], $response['linkedin']);
-    
+
     /**
-	   * Check for successful request (a 200 response from LinkedIn server) 
+	   * Check for successful request (a 200 response from LinkedIn server)
 	   * per the documentation linked in method comments above.
 	   */
     if(($response['info']['http_code'] == 200) && (array_key_exists('oauth_callback_confirmed', $response['linkedin'])) && ($response['linkedin']['oauth_callback_confirmed'] == 'true')) {
       // tokens retrieved
       $this->setToken($response['linkedin']);
-      
+
       // set the response
       $return_data            = $response;
-      $return_data['success'] = TRUE;        
+      $return_data['success'] = true;
     } else {
       // error getting the request tokens
-      $this->setToken(NULL);
-      
+      $this->setToken(null);
+
       // set the response
       $return_data = $response;
       if((array_key_exists('oauth_callback_confirmed', $response['linkedin'])) && ($response['linkedin']['oauth_callback_confirmed'] == 'true')) {
@@ -1881,66 +1956,66 @@ class LinkedIn {
       } else {
         $return_data['error'] = 'OAuth callback URL was not confirmed by the LinkedIn end-point';
       }
-      $return_data['success'] = FALSE;
+      $return_data['success'] = false;
     }
     return $return_data;
 	}
-	
+
 	/**
 	 * User authorization revocation.
-	 * 
-	 * Revoke the current user's access token, clear the access token's from 
-	 * current LinkedIn object. The current documentation for this feature is 
+	 *
+	 * Revoke the current user's access token, clear the access token's from
+	 * current LinkedIn object. The current documentation for this feature is
 	 * found in a blog entry from April 29th, 2010:
-	 * 
-	 *   http://developer.linkedin.com/community/apis/blog/2010/04/29/oauth--now-for-authentication	 
-	 * 
-	 * @return arr 
-	 *    Array containing retrieval success, LinkedIn response.   	 
+	 *
+	 *   http://developer.linkedin.com/community/apis/blog/2010/04/29/oauth--now-for-authentication
+	 *
+	 * @return arr
+	 *    array containing retrieval success, LinkedIn response.
 	 */
 	public function revoke() {
 	  // construct and send the request
 	  $response = $this->fetch('GET', self::_URL_REVOKE);
 
 	  /**
-	   * Check for successful request (a 200 response from LinkedIn server) 
+	   * Check for successful request (a 200 response from LinkedIn server)
 	   * per the documentation linked in method comments above.
-	   */                	  
+	   */
     return $this->checkResponse(200, $response);
 	}
-	
+
 	/**
 	 * [DEPRECATED] General people search function.
-	 * 
-	 * Takes a string of parameters as input and requests profile data from the 
+	 *
+	 * Takes a string of parameters as input and requests profile data from the
 	 * Linkedin People Search API.  See the official documentation for $options
 	 * querystring formatting:
-	 * 
-	 *   http://developer.linkedin.com/docs/DOC-1191 
-	 * 
-	 * @param str $options 
+	 *
+	 *   http://developer.linkedin.com/docs/DOC-1191
+	 *
+	 * @param str $options
 	 *    [OPTIONAL] Data retrieval options.
-	 *            	 
-	 * @return arr 
-	 *    Array containing retrieval success, LinkedIn response.
+	 *
+	 * @return arr
+	 *    array containing retrieval success, LinkedIn response.
 	 */
-	public function search($options = NULL) {
+	public function search($options = null) {
 		return searchPeople($options);
 	}
-	
+
 	/**
 	 * Company search.
-	 * 
-	 * Uses the Company Search API to find companies using keywords, industry, 
-	 * location, or some other criteria. It returns a collection of matching 
+	 *
+	 * Uses the Company Search API to find companies using keywords, industry,
+	 * location, or some other criteria. It returns a collection of matching
 	 * companies.
-	 * 
-	 *   http://developer.linkedin.com/docs/DOC-1325  
-	 * 
+	 *
+	 *   http://developer.linkedin.com/docs/DOC-1325
+	 *
 	 * @param str $options
-	 *    [OPTIONAL] Search options.	
-	 * @return arr 
-	 *    Array containing retrieval success, LinkedIn response.
+	 *    [OPTIONAL] Search options.
+	 * @return arr
+	 *    array containing retrieval success, LinkedIn response.
 	 */
 	public function searchCompanies($options = '') {
 	  // check passed data
@@ -1948,32 +2023,32 @@ class LinkedIn {
 	    // bad data passed
 		  throw new LinkedInException('LinkedIn->searchCompanies(): bad data passed, $options must be of type string.');
 	  }
-	  
+
 	  // construct and send the request
 	  $query    = self::_URL_API . '/v1/company-search' . trim($options);
 	  $response = $this->fetch('GET', $query);
-	  
+
 	  /**
-	   * Check for successful request (a 200 response from LinkedIn server) 
+	   * Check for successful request (a 200 response from LinkedIn server)
 	   * per the documentation linked in method comments above.
 	   */
 	  return $this->checkResponse(200, $response);
 	}
-	
+
 	/**
 	 * Jobs search.
-	 * 
-	 * Use the Job Search API to find jobs using keywords, company, location, 
-	 * or some other criteria. It returns a collection of matching jobs. Each 
+	 *
+	 * Use the Job Search API to find jobs using keywords, company, location,
+	 * or some other criteria. It returns a collection of matching jobs. Each
 	 * entry can contain much of the information available on the job listing.
-	 * 
-	 *   http://developer.linkedin.com/docs/DOC-1321  
-	 * 
-	 * @param str $options 
+	 *
+	 *   http://developer.linkedin.com/docs/DOC-1321
+	 *
+	 * @param str $options
 	 *    [OPTIONAL] Data retrieval options.
-	 *            	
-	 * @return arr 
-	 *    Array containing retrieval success, LinkedIn response.
+	 *
+	 * @return arr
+	 *    array containing retrieval success, LinkedIn response.
 	 */
 	public function searchJobs($options = '') {
 	  // check passed data
@@ -1981,86 +2056,86 @@ class LinkedIn {
 	    // bad data passed
 		  throw new LinkedInException('LinkedIn->jobsSearch(): bad data passed, $options must be of type string.');
 	  }
-	  
+
 	  // construct and send the request
 	  $query    = self::_URL_API . '/v1/job-search' . trim($options);
 	  $response = $this->fetch('GET', $query);
-	  
+
 	  /**
-	   * Check for successful request (a 200 response from LinkedIn server) 
+	   * Check for successful request (a 200 response from LinkedIn server)
 	   * per the documentation linked in method comments above.
 	   */
 	  return $this->checkResponse(200, $response);
 	}
-	
+
 	/**
 	 * General people search function.
-	 * 
-	 * Takes a string of parameters as input and requests profile data from the 
+	 *
+	 * Takes a string of parameters as input and requests profile data from the
 	 * Linkedin People Search API.  See the official documentation for $options
 	 * querystring formatting:
-	 * 
-	 *   http://developer.linkedin.com/docs/DOC-1191 
-	 * 
-	 * @param str $options 
+	 *
+	 *   http://developer.linkedin.com/docs/DOC-1191
+	 *
+	 * @param str $options
 	 *    [OPTIONAL] Data retrieval options.
-	 *            	 
-	 * @return arr 
-	 *    Array containing retrieval success, LinkedIn response.
+	 *
+	 * @return arr
+	 *    array containing retrieval success, LinkedIn response.
 	 */
-	public function searchPeople($options = NULL) {
+	public function searchPeople($options = null) {
 	  // check passed data
     if(!is_null($options) && !is_string($options)) {
 	    // bad data passed
 		  throw new LinkedInException('LinkedIn->search(): bad data passed, $options must be of type string.');
 	  }
-	  
+
 	  // construct and send the request
     $query    = self::_URL_API . '/v1/people-search' . trim($options);
 		$response = $this->fetch('GET', $query);
-		
+
 		/**
-	   * Check for successful request (a 200 response from LinkedIn server) 
+	   * Check for successful request (a 200 response from LinkedIn server)
 	   * per the documentation linked in method comments above.
 	   */
 		return $this->checkResponse(200, $response);
 	}
-	
+
 	/**
 	 * Set the application_key property.
-	 * 
-	 * @param str $key 
-	 *    The application key.       	 
+	 *
+	 * @param str $key
+	 *    The application key.
 	 */
 	public function setApplicationKey($key) {
 	  $this->application_key = $key;
 	}
-	
+
 	/**
 	 * Set the application_secret property.
-	 * 
-	 * @param str $secret 
-	 *    The application secret.       	 
+	 *
+	 * @param str $secret
+	 *    The application secret.
 	 */
 	public function setApplicationSecret($secret) {
 	  $this->application_secret = $secret;
 	}
-	
+
 	/**
 	 * Set the callback property.
-	 * 
-	 * @param str $url 
-	 *    The callback url.       	 
+	 *
+	 * @param str $url
+	 *    The callback url.
 	 */
 	public function setCallbackUrl($url) {
 	  $this->callback = $url;
 	}
-	
+
 	/**
 	 * This sets the group settings of the specified group.
-	 * 
+	 *
 	 *   http://developer.linkedin.com/documents/groups-api
-	 * 
+	 *
 	 * @param str $gid
 	 * 		The group id.
 	 * @param str $xml
@@ -2071,9 +2146,9 @@ class LinkedIn {
 	 * 		  -<email-announcements-from-managers>
 	 * 		  -<allow-messages-from-members>
 	 * 		  -<email-for-every-new-post>
-	 * 
+	 *
 	 * @return arr
-	 * 		Array containing retrieval success, LinkedIn response.
+	 * 		array containing retrieval success, LinkedIn response.
 	 */
 	public function setGroupSettings($gid, $xml) {
 		if(!is_string ($gid)) {
@@ -2082,32 +2157,32 @@ class LinkedIn {
 		if(!is_string ($xml)) {
       throw new LinkedInException('LinkedIn->setGroupSettings(): bad data passed, $token_access should be in array format.');
 		}
-		
+
 		// construct and send the request
 		$query    = self::_URL_API . '/v1/people/~/group-memberships/' . trim($gid);
 		$response = $this->fetch('PUT', $query, $xml);
-		
+
 	  /**
-	   * Check for successful request (a 200 response from LinkedIn server) 
+	   * Check for successful request (a 200 response from LinkedIn server)
 	   * per the documentation linked in method comments above.
-	   */ 
+	   */
 		return $this->checkResponse(200, $response);
 	}
-	
+
 	/**
 	 * Set the response_format property.
-	 * 
-	 * @param str $format 
-	 *    [OPTIONAL] The response format to specify to LinkedIn.       	 
+	 *
+	 * @param str $format
+	 *    [OPTIONAL] The response format to specify to LinkedIn.
 	 */
 	public function setResponseFormat($format = self::_DEFAULT_RESPONSE_FORMAT) {
 	  $this->response_format = $format;
 	}
-	
+
 	/**
 	 * Set the token property.
-	 * 
-	 * @return arr $token 
+	 *
+	 * @return arr $token
 	 *    The LinkedIn OAuth token.
 	 */
 	public function setToken($token) {
@@ -2116,65 +2191,65 @@ class LinkedIn {
       // bad data passed
       throw new LinkedInException('LinkedIn->setToken(): bad data passed, $token_access should be in array format.');
     }
-    
+
     // set token
     $this->token = $token;
 	}
-	
+
 	/**
 	 * [DEPRECATED] Set the token_access property.
-	 * 
-	 * @return arr $token_access 
+	 *
+	 * @return arr $token_access
 	 *    [OPTIONAL] The LinkedIn OAuth access token.
 	 */
 	public function setTokenAccess($token_access) {
     $this->setToken($token_access);
 	}
-	
+
 	/**
-	 * Post a share. 
-	 * 
-	 * Create a new or reshare another user's shared content. Full details from 
-	 * LinkedIn on this functionality can be found here: 
-	 * 
-	 *   http://developer.linkedin.com/docs/DOC-1212 
-	 * 
-	 *   $action values: ('new', 'reshare')      	 
-	 *   $content format: 
+	 * Post a share.
+	 *
+	 * Create a new or reshare another user's shared content. Full details from
+	 * LinkedIn on this functionality can be found here:
+	 *
+	 *   http://developer.linkedin.com/docs/DOC-1212
+	 *
+	 *   $action values: ('new', 'reshare')
+	 *   $content format:
 	 *     $action = 'new'; $content => ('comment' => 'xxx', 'title' => 'xxx', 'submitted-url' => 'xxx', 'submitted-image-url' => 'xxx', 'description' => 'xxx')
-	 *     $action = 'reshare'; $content => ('comment' => 'xxx', 'id' => 'xxx')	 
-	 * 
+	 *     $action = 'reshare'; $content => ('comment' => 'xxx', 'id' => 'xxx')
+	 *
 	 * @param str $action
-	 *    The sharing action to perform.	 
+	 *    The sharing action to perform.
 	 * @param str $content
 	 *    The share content.
-	 * @param bool $private 
-	 *    [OPTIONAL] Should we restrict this shared item to connections only?	 
-	 * @param bool $twitter 
+	 * @param bool $private
+	 *    [OPTIONAL] Should we restrict this shared item to connections only?
+	 * @param bool $twitter
 	 *    [OPTIONAL] Also update the teathered Twitter account.
-	 *    	 
-	 * @return arr 
-	 *    Array containing retrieval success, LinkedIn response.      	 
+	 *
+	 * @return arr
+	 *    array containing retrieval success, LinkedIn response.
 	 */
-	public function share($action, $content, $private = TRUE, $twitter = FALSE) {
+	public function share($action, $content, $private = true, $twitter = false) {
 	  // check the status itself
     if(!empty($action) && !empty($content)) {
       /**
        * Status is not empty, wrap a cleaned version of it in xml.  Status
        * rules:
-       * 
+       *
        * 1) Comments are 700 chars max (if this changes, change _SHARE_COMMENT_LENGTH constant)
        * 2) Content/title 200 chars max (if this changes, change _SHARE_CONTENT_TITLE_LENGTH constant)
        * 3) Content/description 400 chars max (if this changes, change _SHARE_CONTENT_DESC_LENGTH constant)
        * 4a) New shares must contain a comment and/or (content/title and content/submitted-url)
        * 4b) Reshared content must contain an attribution id.
-       * 4c) Reshared content must contain actual content, not just a comment.             
+       * 4c) Reshared content must contain actual content, not just a comment.
        * 5) No HTML permitted in comment, content/title, content/description.
        */
 
       // prepare the share data per the rules above
-      $share_flag   = FALSE;
-      $content_xml  = NULL;
+      $share_flag   = false;
+      $content_xml  = null;
       switch($action) {
         case 'new':
           // share can be an article
@@ -2198,10 +2273,10 @@ class LinkedIn {
               $content_xml .= '<description>' . $content_desc . '</description>';
             }
             $content_xml .= '</content>';
-            
-            $share_flag = TRUE;
+
+            $share_flag = true;
           }
-          
+
           // share can be just a comment
           if(array_key_exists('comment', $content)) {
           	// comment located
@@ -2210,8 +2285,8 @@ class LinkedIn {
               throw new LinkedInException('LinkedIn->share(): comment length is too long - max length is ' . self::_SHARE_COMMENT_LENGTH . ' characters.');
             }
             $content_xml .= '<comment>' . $comment . '</comment>';
-          	
-          	$share_flag = TRUE; 
+
+          	$share_flag = true;
       	  }
           break;
         case 'reshare':
@@ -2222,7 +2297,7 @@ class LinkedIn {
                                  <id>' . trim($content['id']) . '</id>
                                </share>
                              </attribution>';
-            
+
             // optional additional comment
             if(array_key_exists('comment', $content)) {
             	// comment located
@@ -2232,8 +2307,8 @@ class LinkedIn {
               }
               $content_xml .= '<comment>' . $comment . '</comment>';
         	  }
-        	  
-        	  $share_flag = TRUE;
+
+        	  $share_flag = true;
           }
           break;
         default:
@@ -2241,7 +2316,7 @@ class LinkedIn {
           throw new LinkedInException('LinkedIn->share(): share action is an invalid value, must be one of: share, reshare.');
           break;
       }
-      
+
       // should we proceed?
       if($share_flag) {
         // put all of the xml together
@@ -2253,14 +2328,14 @@ class LinkedIn {
                            <code>' . $visibility . '</code>
                          </visibility>
                        </share>';
-        
+
         // create the proper url
         $share_url = self::_URL_API . '/v1/people/~/shares';
   		  if($twitter) {
   			  // update twitter as well
           $share_url .= '?twitter-post=true';
   			}
-        
+
         // send request
         $response = $this->fetch('POST', $share_url, $data);
   		} else {
@@ -2271,74 +2346,74 @@ class LinkedIn {
       // data missing, raise an exception
 		  throw new LinkedInException('LinkedIn->share(): sharing action or shared content is missing.');
     }
-    
+
     /**
-	   * Check for successful request (a 201 response from LinkedIn server) 
+	   * Check for successful request (a 201 response from LinkedIn server)
 	   * per the documentation linked in method comments above.
-	   */ 
+	   */
     return $this->checkResponse(201, $response);
 	}
-	
+
 	/**
 	 * Network statistics.
-	 * 
-	 * General network statistics retrieval function, returns the number of connections, 
+	 *
+	 * General network statistics retrieval function, returns the number of connections,
 	 * second-connections an authenticated user has. More information here:
-	 * 
+	 *
 	 *   http://developer.linkedin.com/docs/DOC-1006
-	 * 
-	 * @return arr 
-	 *    Array containing retrieval success, LinkedIn response.
+	 *
+	 * @return arr
+	 *    array containing retrieval success, LinkedIn response.
 	 */
 	public function statistics() {
 	  // construct and send the request
     $query    = self::_URL_API . '/v1/people/~/network/network-stats';
 		$response = $this->fetch('GET', $query);
-		
+
 		/**
-	   * Check for successful request (a 200 response from LinkedIn server) 
+	   * Check for successful request (a 200 response from LinkedIn server)
 	   * per the documentation linked in method comments above.
 	   */
 		return $this->checkResponse(200, $response);
 	}
-	
+
 	/**
 	 * Companies you may want to follow.
-	 * 
+	 *
 	 * Returns a list of companies the current user may want to follow, per:
-	 * 
-	 *   http://developer.linkedin.com/docs/DOC-1324   
-	 * 
+	 *
+	 *   http://developer.linkedin.com/docs/DOC-1324
+	 *
 	 * @return arr
-	 *    Array containing retrieval success, LinkedIn response.
+	 *    array containing retrieval success, LinkedIn response.
 	 */
 	public function suggestedCompanies() {
 	  // construct and send the request
     $query    = self::_URL_API . '/v1/people/~/suggestions/to-follow/companies';
 	  $response = $this->fetch('GET', $query);
-	  
+
 	  /**
-	   * Check for successful request (a 200 response from LinkedIn server) 
+	   * Check for successful request (a 200 response from LinkedIn server)
 	   * per the documentation linked in method comments above.
 	   */
 	  return $this->checkResponse(200, $response);
 	}
-	
+
 	/**
 	 * Retrieves suggested groups for the user, per:
-	 * 
+	 *
 	 *   http://developer.linkedin.com/documents/groups-api
-	 * 
+	 *
 	 * @return arr
-	 * 		Array containing retrieval success, LinkedIn response.
+	 * 		array containing retrieval success, LinkedIn response.
 	 */
 	public function suggestedGroups() {
 		// construct and send the request
 		$query    = self::_URL_API . '/v1/people/~/suggestions/groups:(id,name,is-open-to-non-members)';
 		$response = $this->fetch('GET', $query);
-		
+
 		/**
-	   * Check for successful request (a 200 response from LinkedIn server) 
+	   * Check for successful request (a 200 response from LinkedIn server)
 	   * per the documentation linked in method comments above.
 	   */
 		return $this->checkResponse (200, $response);
@@ -2346,16 +2421,16 @@ class LinkedIn {
 
 	/**
 	 * Jobs you may be interested in.
-	 * 
+	 *
 	 * Returns a list of jobs the current user may be interested in, per:
-	 * 
-	 *   http://developer.linkedin.com/docs/DOC-1323   
-	 * 
+	 *
+	 *   http://developer.linkedin.com/docs/DOC-1323
+	 *
  	 * @param str $options
- 	 *    [OPTIONAL] Data retrieval options.	
- 	 *          	 
+ 	 *    [OPTIONAL] Data retrieval options.
+ 	 *
 	 * @return arr
-	 *    Array containing retrieval success, LinkedIn response.
+	 *    array containing retrieval success, LinkedIn response.
 	 */
 	public function suggestedJobs($options = ':(jobs)') {
 	  // check passed data
@@ -2363,31 +2438,31 @@ class LinkedIn {
 	    // bad data passed
 		  throw new LinkedInException('LinkedIn->suggestedJobs(): bad data passed, $options must be of type string.');
 	  }
-	
+
 	  // construct and send the request
 	  $query    = self::_URL_API . '/v1/people/~/suggestions/job-suggestions' . trim($options);
 	  $response = $this->fetch('GET', $query);
-	  
+
 	  /**
-	   * Check for successful request (a 200 response from LinkedIn server) 
+	   * Check for successful request (a 200 response from LinkedIn server)
 	   * per the documentation linked in method comments above.
 	   */
 	  return $this->checkResponse(200, $response);
 	}
-	
+
 	/**
 	 * Unbookmark a job.
-	 * 
-	 * Calling this method causes the current user to remove a bookmark for the 
+	 *
+	 * Calling this method causes the current user to remove a bookmark for the
 	 * specified job:
-	 * 
-	 *   http://developer.linkedin.com/docs/DOC-1323   
-	 * 
+	 *
+	 *   http://developer.linkedin.com/docs/DOC-1323
+	 *
 	 * @param str $jid
 	 *    Job ID you want to unbookmark.
-	 *            	
+	 *
 	 * @return arr
-	 *    Array containing retrieval success, LinkedIn response.
+	 *    array containing retrieval success, LinkedIn response.
 	 */
 	public function unbookmarkJob($jid) {
 	  // check passed data
@@ -2395,31 +2470,31 @@ class LinkedIn {
 	    // bad data passed
 		  throw new LinkedInException('LinkedIn->unbookmarkJob(): bad data passed, $jid must be of type string.');
 	  }
-	  
+
 	  // construct and send the request
 	  $query    = self::_URL_API . '/v1/people/~/job-bookmarks/' . trim($jid);
 	  $response = $this->fetch('DELETE', $query);
-	  
+
 	  /**
-	   * Check for successful request (a 204 response from LinkedIn server) 
+	   * Check for successful request (a 204 response from LinkedIn server)
 	   * per the documentation linked in method comments above.
 	   */
 	  return $this->checkResponse(204, $response);
 	}
-	
+
 	/**
 	 * Unfollow a company.
-	 * 
-	 * Calling this method causes the current user to stop following the specified 
+	 *
+	 * Calling this method causes the current user to stop following the specified
 	 * company, per:
-	 * 
-	 *   http://developer.linkedin.com/docs/DOC-1324   
-	 * 
+	 *
+	 *   http://developer.linkedin.com/docs/DOC-1324
+	 *
 	 * @param str $cid
-	 *    Company ID you want to unfollow.	
-	 *         	 
+	 *    Company ID you want to unfollow.
+	 *
 	 * @return arr
-	 *    Array containing retrieval success, LinkedIn response.
+	 *    array containing retrieval success, LinkedIn response.
 	 */
 	public function unfollowCompany($cid) {
 	  // check passed data
@@ -2427,30 +2502,30 @@ class LinkedIn {
 	    // bad data passed
 		  throw new LinkedInException('LinkedIn->unfollowCompany(): bad data passed, $cid must be of string value.');
 	  }
-	  
+
 	  // construct and send the request
 	  $query    = self::_URL_API . '/v1/people/~/following/companies/id=' . trim($cid);
 	  $response = $this->fetch('DELETE', $query);
-	  
+
 	  /**
-	   * Check for successful request (a 204 response from LinkedIn server) 
+	   * Check for successful request (a 204 response from LinkedIn server)
 	   * per the documentation linked in method comments above.
 	   */
 	  return $this->checkResponse(204, $response);
 	}
-	
+
 	/**
 	 * Unlike a network update.
-	 *     
+	 *
 	 * Unlike another user's network update:
-	 * 
+	 *
 	 *   http://developer.linkedin.com/docs/DOC-1043
-	 * 
-	 * @param str $uid 
+	 *
+	 * @param str $uid
 	 *    The LinkedIn update ID.
-	 *                     	 
+	 *
 	 * @return arr
-	 *    Array containing retrieval success, LinkedIn response.                  
+	 *    array containing retrieval success, LinkedIn response.
 	 */
 	public function unlike($uid) {
 	  // check passed data
@@ -2458,36 +2533,36 @@ class LinkedIn {
 	    // bad data passed
 		  throw new LinkedInException('LinkedIn->unlike(): bad data passed, $uid must be of type string.');
 	  }
-    
+
     // construct the xml data
 		$data = '<?xml version="1.0" encoding="UTF-8"?>
 		         <is-liked>false</is-liked>';
-		
+
 		// send request
     $query    = self::_URL_API . '/v1/people/~/network/updates/key=' . $uid . '/is-liked';
     $response = $this->fetch('PUT', $query, $data);
-    
+
   	/**
-	   * Check for successful request (a 201 response from LinkedIn server) 
+	   * Check for successful request (a 201 response from LinkedIn server)
 	   * per the documentation linked in method comments above.
-	   */ 
+	   */
     return $this->checkResponse(201, $response);
 	}
-	
+
 	/**
 	 * Post network update.
-	 * 
-	 * Update the user's Linkedin network status. Full details from LinkedIn 
-	 * on this functionality can be found here: 
-	 * 
+	 *
+	 * Update the user's Linkedin network status. Full details from LinkedIn
+	 * on this functionality can be found here:
+	 *
 	 *   http://developer.linkedin.com/docs/DOC-1009
-	 *   http://developer.linkedin.com/docs/DOC-1009#comment-1077 
-	 * 
+	 *   http://developer.linkedin.com/docs/DOC-1009#comment-1077
+	 *
 	 * @param str $update
-	 *    The network update.	 
-	 * 
-	 * @return arr 
-	 *    Array containing retrieval success, LinkedIn response.       	 
+	 *    The network update.
+	 *
+	 * @return arr
+	 *    array containing retrieval success, LinkedIn response.
 	 */
 	public function updateNetwork($update) {
 	  // check passed data
@@ -2495,35 +2570,35 @@ class LinkedIn {
       // nothing/non-string passed, raise an exception
 		  throw new LinkedInException('LinkedIn->updateNetwork(): bad data passed, $update must be a non-zero length string.');
     }
-    
+
     /**
-     * Network update is not empty, wrap a cleaned version of it in xml.  
+     * Network update is not empty, wrap a cleaned version of it in xml.
      * Network update rules:
-     * 
+     *
      * 1) No HTML permitted except those found in _NETWORK_HTML constant
-     * 2) Update cannot be longer than 140 characters.     
+     * 2) Update cannot be longer than 140 characters.
      */
     // get the user data
     $response = self::profile('~:(first-name,last-name,site-standard-profile-request)');
-    if($response['success'] === TRUE) {
-      /** 
+    if($response['success'] === true) {
+      /**
        * We are converting response to usable data.  I'd use SimpleXML here, but
        * to keep the class self-contained, we will use a portable XML parsing
-       * routine, self::xmlToArray.       
+       * routine, self::xmlToarray.
        */
-      $person = self::xmlToArray($response['linkedin']);
-      if($person === FALSE) {
+      $person = self::xmlToarray($response['linkedin']);
+      if($person === false) {
         // bad xml data
         throw new LinkedInException('LinkedIn->updateNetwork(): LinkedIn returned bad XML data.');
       }
   		$fields = $person['person']['children'];
-  
+
   		// prepare user data
   		$first_name   = trim($fields['first-name']['content']);
   		$last_name    = trim($fields['last-name']['content']);
   		$profile_url  = trim($fields['site-standard-profile-request']['children']['url']['content']);
-  
-      // create the network update 
+
+      // create the network update
       $update = trim(htmlspecialchars(strip_tags($update, self::_NETWORK_HTML)));
       if(strlen($update) > self::_NETWORK_LENGTH) {
         throw new LinkedInException('LinkedIn->share(): update length is too long - max length is ' . self::_NETWORK_LENGTH . ' characters.');
@@ -2533,44 +2608,44 @@ class LinkedIn {
     				       <content-type>linkedin-html</content-type>
     				       <body>' . $user . ' ' . $update . '</body>
     				     </activity>';
-  
+
       // send request
       $query    = self::_URL_API . '/v1/people/~/person-activities';
       $response = $this->fetch('POST', $query, $data);
-      
+
       /**
-  	   * Check for successful request (a 201 response from LinkedIn server) 
+  	   * Check for successful request (a 201 response from LinkedIn server)
   	   * per the documentation linked in method comments above.
-  	   */ 
+  	   */
       return $this->checkResponse(201, $response);
     } else {
       // profile retrieval failed
       throw new LinkedInException('LinkedIn->updateNetwork(): profile data could not be retrieved.');
     }
 	}
-	
+
   /**
 	 * General network update retrieval function.
-	 * 
-	 * Takes a string of parameters as input and requests update-related data 
-	 * from the Linkedin Network Updates API. See the official documentation for 
+	 *
+	 * Takes a string of parameters as input and requests update-related data
+	 * from the Linkedin Network Updates API. See the official documentation for
 	 * $options parameter formatting:
-	 * 
+	 *
 	 *   http://developer.linkedin.com/docs/DOC-1006
-	 * 
+	 *
 	 * For getting more comments, likes, etc, see here:
-	 * 
-	 *   http://developer.linkedin.com/docs/DOC-1043         	 
-	 * 
-	 * @param str $options 
+	 *
+	 *   http://developer.linkedin.com/docs/DOC-1043
+	 *
+	 * @param str $options
 	 *    [OPTIONAL] Data retrieval options.
-	 * @param str $id 
+	 * @param str $id
 	 *    [OPTIONAL] The LinkedIn ID to restrict the updates for.
-	 *               	 
+	 *
 	 * @return arr
-	 *    Array containing retrieval success, LinkedIn response.
+	 *    array containing retrieval success, LinkedIn response.
 	 */
-	public function updates($options = NULL, $id = NULL) {
+	public function updates($options = null, $id = null) {
 	  // check passed data
     if(!is_null($options) && !is_string($options)) {
 	    // bad data passed
@@ -2580,7 +2655,7 @@ class LinkedIn {
 	    // bad data passed
 		  throw new LinkedInException('LinkedIn->updates(): bad data passed, $id must be of type string.');
 	  }
-	  
+
 	  // construct and send the request
 	  if(!is_null($id) && self::isId($id)) {
 	    $query = self::_URL_API . '/v1/people/' . $id . '/network/updates' . trim($options);
@@ -2588,32 +2663,32 @@ class LinkedIn {
       $query = self::_URL_API . '/v1/people/~/network/updates' . trim($options);
     }
 	  $response = $this->fetch('GET', $query);
-	  
+
 	  /**
-	   * Check for successful request (a 200 response from LinkedIn server) 
+	   * Check for successful request (a 200 response from LinkedIn server)
 	   * per the documentation linked in method comments above.
 	   */
 	  return $this->checkResponse(200, $response);
 	}
-	
+
 	/**
 	 * Converts passed XML data to an array.
-	 * 
-	 * @param str $xml 
+	 *
+	 * @param str $xml
 	 *    The XML to convert to an array.
-	 *            	 
-	 * @return arr 
-	 *    Array containing the XML data.     
-	 * @return bool 
-	 *    FALSE if passed data cannot be parsed to an array.     	 
+	 *
+	 * @return arr
+	 *    array containing the XML data.
+	 * @return bool
+	 *    false if passed data cannot be parsed to an array.
 	 */
-	public static function xmlToArray($xml) {
+	public static function xmlToarray($xml) {
 	  // check passed data
     if(!is_string($xml)) {
 	    // bad data passed
-      throw new LinkedInException('LinkedIn->xmlToArray(): bad data passed, $xml must be a non-zero length string.');
+      throw new LinkedInException('LinkedIn->xmlToarray(): bad data passed, $xml must be a non-zero length string.');
 	  }
-	  
+
 	  $parser = xml_parser_create();
 	  xml_parser_set_option($parser, XML_OPTION_CASE_FOLDING, 0);
     xml_parser_set_option($parser, XML_OPTION_SKIP_WHITE, 1);
@@ -2624,8 +2699,8 @@ class LinkedIn {
         $index = count($elements);
         if($tag['type'] == 'complete' || $tag['type'] == 'open') {
           $elements[$tag['tag']]               = array();
-          $elements[$tag['tag']]['attributes'] = (array_key_exists('attributes', $tag)) ? $tag['attributes'] : NULL;
-          $elements[$tag['tag']]['content']    = (array_key_exists('value', $tag)) ? $tag['value'] : NULL;
+          $elements[$tag['tag']]['attributes'] = (array_key_exists('attributes', $tag)) ? $tag['attributes'] : null;
+          $elements[$tag['tag']]['content']    = (array_key_exists('value', $tag)) ? $tag['value'] : null;
           if($tag['type'] == 'open') {
             $elements[$tag['tag']]['children'] = array();
             $stack[count($stack)] = &$elements;
@@ -2640,7 +2715,7 @@ class LinkedIn {
       $return_data = $elements;
 	  } else {
 	    // not valid xml data
-	    $return_data = FALSE;
+	    $return_data = false;
 	  }
 	  xml_parser_free($parser);
     return $return_data;
diff --git a/e107_handlers/hybridauth/Hybrid/thirdparty/OAuth/OAuth.php b/e107_handlers/hybridauth/Hybrid/thirdparty/OAuth/OAuth.php
index c97b61139..e09d77c6d 100644
--- a/e107_handlers/hybridauth/Hybrid/thirdparty/OAuth/OAuth.php
+++ b/e107_handlers/hybridauth/Hybrid/thirdparty/OAuth/OAuth.php
@@ -6,7 +6,7 @@
 
 /* Generic exception class
  */
-if (!class_exists('OAuthException')) {
+if (!class_exists('OAuthException', false)) {
   class OAuthException extends Exception {
     // pass
   }
@@ -16,7 +16,7 @@ class OAuthConsumer {
   public $key;
   public $secret;
 
-  function __construct($key, $secret, $callback_url=NULL) {
+  function __construct($key, $secret, $callback_url=null) {
     $this->key = $key;
     $this->secret = $secret;
     $this->callback_url = $callback_url;
@@ -247,7 +247,7 @@ class OAuthRequest {
   public static $version = '1.0';
   public static $POST_INPUT = 'php://input';
 
-  function __construct($http_method, $http_url, $parameters=NULL) {
+  function __construct($http_method, $http_url, $parameters=null) {
     $parameters = ($parameters) ? $parameters : array();
     $parameters = array_merge( OAuthUtil::parse_parameters(parse_url($http_url, PHP_URL_QUERY)), $parameters);
     $this->parameters = $parameters;
@@ -259,7 +259,7 @@ class OAuthRequest {
   /**
    * attempt to build up a request from what was passed to the server
    */
-  public static function from_request($http_method=NULL, $http_url=NULL, $parameters=NULL) {
+  public static function from_request($http_method=null, $http_url=null, $parameters=null) {
     $scheme = (!isset($_SERVER['HTTPS']) || $_SERVER['HTTPS'] != "on")
               ? 'http'
               : 'https';
@@ -314,7 +314,7 @@ class OAuthRequest {
   /**
    * pretty much a helper function to set up the request
    */
-  public static function from_consumer_and_token($consumer, $token, $http_method, $http_url, $parameters=NULL) {
+  public static function from_consumer_and_token($consumer, $token, $http_method, $http_url, $parameters=null) {
     $parameters = ($parameters) ?  $parameters : array();
     $defaults = array("oauth_version" => OAuthRequest::$version,
                       "oauth_nonce" => OAuthRequest::generate_nonce(),
@@ -451,7 +451,7 @@ class OAuthRequest {
     foreach ($this->parameters as $k => $v) {
       if (substr($k, 0, 5) != "oauth") continue;
       if (is_array($v)) {
-        throw new OAuthException('Arrays not supported in headers');
+        throw new OAuthException('arrays not supported in headers');
       }
       $out .= ($first) ? ' ' : ',';
       $out .= OAuthUtil::urlencode_rfc3986($k) .
@@ -529,7 +529,7 @@ class OAuthServer {
     $consumer = $this->get_consumer($request);
 
     // no token required for the initial token request
-    $token = NULL;
+    $token = null;
 
     $this->check_signature($request, $consumer, $token);
 
@@ -595,7 +595,7 @@ class OAuthServer {
   private function get_signature_method($request) {
     $signature_method = $request instanceof OAuthRequest 
         ? $request->get_parameter("oauth_signature_method")
-        : NULL;
+        : null;
 
     if (!$signature_method) {
       // According to chapter 7 ("Accessing Protected Ressources") the signature-method
@@ -620,7 +620,7 @@ class OAuthServer {
   private function get_consumer($request) {
     $consumer_key = $request instanceof OAuthRequest 
         ? $request->get_parameter("oauth_consumer_key")
-        : NULL;
+        : null;
 
     if (!$consumer_key) {
       throw new OAuthException("Invalid consumer key");
@@ -640,7 +640,7 @@ class OAuthServer {
   private function get_token($request, $consumer, $token_type="access") {
     $token_field = $request instanceof OAuthRequest
          ? $request->get_parameter('oauth_token')
-         : NULL;
+         : null;
 
     $token = $this->data_store->lookup_token(
       $consumer, $token_type, $token_field
@@ -659,10 +659,10 @@ class OAuthServer {
     // this should probably be in a different method
     $timestamp = $request instanceof OAuthRequest
         ? $request->get_parameter('oauth_timestamp')
-        : NULL;
+        : null;
     $nonce = $request instanceof OAuthRequest
         ? $request->get_parameter('oauth_nonce')
-        : NULL;
+        : null;
 
     $this->check_timestamp($timestamp);
     $this->check_nonce($consumer, $token, $nonce, $timestamp);
diff --git a/e107_handlers/hybridauth/Hybrid/thirdparty/OAuth/OAuth1Client.php b/e107_handlers/hybridauth/Hybrid/thirdparty/OAuth/OAuth1Client.php
index bd9567d9f..64c03c87d 100644
--- a/e107_handlers/hybridauth/Hybrid/thirdparty/OAuth/OAuth1Client.php
+++ b/e107_handlers/hybridauth/Hybrid/thirdparty/OAuth/OAuth1Client.php
@@ -1,253 +1,264 @@
-<?php
-/**
-* HybridAuth
-* http://hybridauth.sourceforge.net | http://github.com/hybridauth/hybridauth
-* (c) 2009-2014, HybridAuth authors | http://hybridauth.sourceforge.net/licenses.html 
-*/
-
-// A service client for the OAuth 1/1.0a flow.
-// v0.1
-class OAuth1Client{
-	public $api_base_url          = "";
-	public $authorize_url         = "";
-	public $authenticate_url      = "";
-	public $request_token_url     = "";
-	public $access_token_url      = "";
-	
-	public $request_token_method  = "GET";
-	public $access_token_method   = "GET";
-
-	public $redirect_uri          = "";
-
-	public $decode_json           = true;
-	public $curl_time_out         = 30;
-	public $curl_connect_time_out = 30;
-	public $curl_ssl_verifypeer   = false;
-	public $curl_auth_header      = true;
-	public $curl_useragent        = "OAuth/1 Simple PHP Client v0.1; HybridAuth http://hybridauth.sourceforge.net/";
-	public $curl_proxy            = null;
-
-	//--
-
-	public $http_code             = "";
-	public $http_info             = "";
-
-	/** 
-	* OAuth client constructor
-	*/ 
-	function __construct( $consumer_key, $consumer_secret, $oauth_token = null, $oauth_token_secret = null )
-	{
-		$this->sha1_method = new OAuthSignatureMethod_HMAC_SHA1();
-		$this->consumer    = new OAuthConsumer( $consumer_key, $consumer_secret );
-		$this->token       = null;
-
-		if ( $oauth_token && $oauth_token_secret ){
-			$this->token = new OAuthConsumer( $oauth_token, $oauth_token_secret );
-		} 
-	}
-
-	/** 
-	* Build authorize url
-	* 
-	* @return string 
-	*/ 
-	function authorizeUrl( $token, $extras =array() )
-	{
-		if ( is_array( $token ) ){
-			$token = $token['oauth_token'];
-		}
-
-		$parameters = array( "oauth_token" => $token );
-
-		if( count($extras) )
-			foreach( $extras as $k=>$v )
-				$parameters[$k] = $v;
-
-		return $this->authorize_url . "?" . http_build_query( $parameters );
-    }
-
-	/**
-	* Get a request_token from provider
-	* 
-	* @return array a key/value array containing oauth_token and oauth_token_secret 
-	*/
-	function requestToken( $callback = null )
-	{
-		$parameters = array(); 
-
-		if ( $callback ) {
-			$this->redirect_uri = $parameters['oauth_callback'] = $callback; 
-		}
-
-		$request     = $this->signedRequest( $this->request_token_url, $this->request_token_method, $parameters ); 
-		$token       = OAuthUtil::parse_parameters( $request );
-		$this->token = new OAuthConsumer( $token['oauth_token'], $token['oauth_token_secret'] ); 
-
-		return $token; 
-	} 
-
-	/** 
-	* Exchange the request token and secret for an access token and secret, to sign API calls. 
-	* 
-	* @return array array('oauth_token' => the access token, 'oauth_token_secret' => the access secret) 
-	*/
-	function accessToken( $oauth_verifier = false, $oauth_token = false )
-	{
-		$parameters = array();
-
-		// 1.0a
-		if ( $oauth_verifier ) {
-			$parameters['oauth_verifier'] = $oauth_verifier; 
-		}
-
-		$request     = $this->signedRequest( $this->access_token_url, $this->access_token_method, $parameters ); 
-		$token       = OAuthUtil::parse_parameters( $request ); 
-		$this->token = new OAuthConsumer( $token['oauth_token'], $token['oauth_token_secret'] ); 
-
-		return $token;
-	}
-
-	/** 
-	* GET wrapper for provider apis request
-	*/
-	function get($url, $parameters = array(), $content_type = NULL)
-	{
-		return $this->api($url, 'GET', $parameters, NULL, $content_type);
-	} 
-
-	/** 
-	* POST wrapper for provider apis request
-	*/
-	function post($url, $parameters = array(), $body = NULL, $content_type = NULL, $multipart = false)
-	{
-		return $this->api($url, 'POST', $parameters, $body, $content_type, $multipart );
-	}
-
-	/** 
-	* Format and sign an oauth for provider api 
-	*/ 
-	function api( $url, $method = 'GET', $parameters = array(), $body = NULL, $content_type = NULL, $multipart = false )
-	{
-		if ( strrpos($url, 'http://') !== 0 && strrpos($url, 'https://') !== 0 ) {
-			$url = $this->api_base_url . $url;
-		}
-
-		$response = $this->signedRequest( $url, $method, $parameters, $body, $content_type, $multipart );
-
-		if( $this->decode_json ){
-			$response = json_decode( $response );
-		}
-
-		return $response; 
-	} 
-
-	/** 
-	* Make signed request  
-	*/ 
-	function signedRequest( $url, $method, $parameters, $body = NULL, $content_type = NULL, $multipart = false )
-	{
-
-        $signature_parameters = array();
-
-        // when making a multipart request, use only oauth_* keys for signature
-        foreach( $parameters AS $key => $value ){
-            if( !$multipart || strpos( $key, 'oauth_' ) === 0 ){
-                $signature_parameters[$key] = $value;
-            }
-        }
-
-		$request = OAuthRequest::from_consumer_and_token($this->consumer, $this->token, $method, $url, $signature_parameters);
-		$request->sign_request($this->sha1_method, $this->consumer, $this->token);
-		switch ($method) {
-			case 'GET': return $this->request( $request->to_url(), 'GET', NULL, NULL, $content_type );
-			default   :
-		if ($body)
-			return $this->request( $request->to_url(), $method, $body, $request->to_header(), $content_type );
-		else
-			return $this->request( $request->get_normalized_http_url(), $method, ($multipart ? $parameters : $request->to_postdata()), $request->to_header(), $content_type, $multipart ) ;
-		}
-	}
-	
-	/** 
-	* Make http request  
-	*/ 
-	function request( $url, $method, $postfields = NULL, $auth_header = NULL, $content_type = NULL, $multipart = false )
-	{
-		Hybrid_Logger::info( "Enter OAuth1Client::request( $method, $url )" );
-		Hybrid_Logger::debug( "OAuth1Client::request(). dump post fields: ", serialize( $postfields ) ); 
-
-		$this->http_info = array();
-		$ci = curl_init();
-
-		/* Curl settings */
-		curl_setopt( $ci, CURLOPT_USERAGENT     , $this->curl_useragent );
-		curl_setopt( $ci, CURLOPT_CONNECTTIMEOUT, $this->curl_connect_time_out );
-		curl_setopt( $ci, CURLOPT_TIMEOUT       , $this->curl_time_out );
-		curl_setopt( $ci, CURLOPT_RETURNTRANSFER, TRUE );
-		curl_setopt( $ci, CURLOPT_HTTPHEADER    , array('Expect:') );
-		curl_setopt( $ci, CURLOPT_SSL_VERIFYPEER, $this->curl_ssl_verifypeer );
-		curl_setopt( $ci, CURLOPT_HEADERFUNCTION, array($this, 'getHeader') );
-		curl_setopt( $ci, CURLOPT_HEADER        , FALSE );
-
-        if( $multipart ){
-            curl_setopt( $ci, CURLOPT_HTTPHEADER, array( 'Expect:', $auth_header ) );
-
-        }elseif ($content_type)
-			curl_setopt( $ci, CURLOPT_HTTPHEADER, array('Expect:', "Content-Type: $content_type") );
-		
-		if($this->curl_proxy){
-			curl_setopt( $ci, CURLOPT_PROXY        , $this->curl_proxy);
-		}
- 
-		switch ($method){
-			case 'POST':
-				curl_setopt( $ci, CURLOPT_POST, TRUE );
-
-				if ( !empty($postfields) ){
-					curl_setopt( $ci, CURLOPT_POSTFIELDS, $postfields );
-				}
-
-				if ( !empty($auth_header) && $this->curl_auth_header && !$multipart ){
-					curl_setopt( $ci, CURLOPT_HTTPHEADER, array( 'Content-Type: application/atom+xml', $auth_header ) );
-				}
-				break;
-			case 'DELETE':
-				curl_setopt( $ci, CURLOPT_CUSTOMREQUEST, 'DELETE' );
-				if ( !empty($postfields) ){
-				  $url = "{$url}?{$postfields}";
-				}
-		}
-
-		curl_setopt($ci, CURLOPT_URL, $url);
-		$response = curl_exec($ci);
-		if( $response === FALSE ) {
-				Hybrid_Logger::error( "OAuth1Client::request(). curl_exec error: ", curl_error($ci) );
-		}
-
-
-		Hybrid_Logger::debug( "OAuth1Client::request(). dump request info: ", serialize( curl_getinfo($ci) ) );
-		Hybrid_Logger::debug( "OAuth1Client::request(). dump request result: ", serialize( $response ) );
-
-		$this->http_code = curl_getinfo($ci, CURLINFO_HTTP_CODE);
-		$this->http_info = array_merge($this->http_info, curl_getinfo($ci));
-
-		curl_close ($ci);
-
-		return $response; 
-	}
-
-	/**
-	* Get the header info to store.
-	*/
-	function getHeader($ch, $header) {
-		$i = strpos($header, ':');
-
-		if ( !empty($i) ){
-			$key = str_replace('-', '_', strtolower(substr($header, 0, $i)));
-			$value = trim(substr($header, $i + 2));
-			$this->http_header[$key] = $value;
-		}
-
-		return strlen($header);
-	} 
-} 
+<?php
+/**
+* HybridAuth
+* http://hybridauth.sourceforge.net | http://github.com/hybridauth/hybridauth
+* (c) 2009-2014, HybridAuth authors | http://hybridauth.sourceforge.net/licenses.html
+*/
+
+// A service client for the OAuth 1/1.0a flow.
+// v0.1
+class OAuth1Client{
+	public $api_base_url          = "";
+	public $authorize_url         = "";
+	public $authenticate_url      = "";
+	public $request_token_url     = "";
+	public $access_token_url      = "";
+
+	public $request_token_method  = "GET";
+	public $access_token_method   = "GET";
+
+	public $redirect_uri          = "";
+
+	public $decode_json           = true;
+	public $curl_time_out         = 30;
+	public $curl_connect_time_out = 30;
+	public $curl_ssl_verifypeer   = false;
+	public $curl_auth_header      = true;
+	public $curl_useragent        = "OAuth/1 Simple PHP Client v0.1; HybridAuth http://hybridauth.sourceforge.net/";
+	public $curl_proxy            = null;
+
+	//--
+
+	public $http_code             = "";
+	public $http_info             = "";
+	protected $response           = null;
+
+	/**
+	* OAuth client constructor
+	*/
+	function __construct( $consumer_key, $consumer_secret, $oauth_token = null, $oauth_token_secret = null )
+	{
+		$this->sha1_method = new OAuthSignatureMethod_HMAC_SHA1();
+		$this->consumer    = new OAuthConsumer( $consumer_key, $consumer_secret );
+		$this->token       = null;
+
+		if ( $oauth_token && $oauth_token_secret ){
+			$this->token = new OAuthConsumer( $oauth_token, $oauth_token_secret );
+		}
+	}
+
+	/**
+	* Build authorize url
+	*
+	* @return string
+	*/
+	function authorizeUrl( $token, $extras =array() )
+	{
+		if ( is_array( $token ) ){
+			$token = $token['oauth_token'];
+		}
+
+		$parameters = array( "oauth_token" => $token );
+
+		if( count($extras) )
+			foreach( $extras as $k=>$v )
+				$parameters[$k] = $v;
+
+		return $this->authorize_url . "?" . http_build_query( $parameters );
+    }
+
+	/**
+	* Get a request_token from provider
+	*
+	* @return array a key/value array containing oauth_token and oauth_token_secret
+	*/
+	function requestToken( $callback = null )
+	{
+		$parameters = array();
+
+		if ( $callback ) {
+			$this->redirect_uri = $parameters['oauth_callback'] = $callback;
+		}
+
+		$request     = $this->signedRequest( $this->request_token_url, $this->request_token_method, $parameters );
+		$token       = OAuthUtil::parse_parameters( $request );
+		$this->token = new OAuthConsumer( $token['oauth_token'], $token['oauth_token_secret'] );
+
+		return $token;
+	}
+
+	/**
+	* Exchange the request token and secret for an access token and secret, to sign API calls.
+	*
+	* @return array array('oauth_token' => the access token, 'oauth_token_secret' => the access secret)
+	*/
+	function accessToken( $oauth_verifier = false, $oauth_token = false )
+	{
+		$parameters = array();
+
+		// 1.0a
+		if ( $oauth_verifier ) {
+			$parameters['oauth_verifier'] = $oauth_verifier;
+		}
+
+		$request     = $this->signedRequest( $this->access_token_url, $this->access_token_method, $parameters );
+		$token       = OAuthUtil::parse_parameters( $request );
+		$this->token = new OAuthConsumer( $token['oauth_token'], $token['oauth_token_secret'] );
+
+		return $token;
+	}
+
+	/**
+	* GET wrapper for provider apis request
+	*/
+	function get($url, $parameters = array(), $content_type = null)
+	{
+		return $this->api($url, 'GET', $parameters, null, $content_type);
+	}
+
+	/**
+	* POST wrapper for provider apis request
+	*/
+	function post($url, $parameters = array(), $body = null, $content_type = null, $multipart = false)
+	{
+		return $this->api($url, 'POST', $parameters, $body, $content_type, $multipart );
+	}
+
+	/**
+	* Format and sign an oauth for provider api
+	*/
+	function api( $url, $method = 'GET', $parameters = array(), $body = null, $content_type = null, $multipart = false )
+	{
+		if ( strrpos($url, 'http://') !== 0 && strrpos($url, 'https://') !== 0 ) {
+			$url = $this->api_base_url . $url;
+		}
+
+		$response = $this->signedRequest( $url, $method, $parameters, $body, $content_type, $multipart );
+
+		if( $this->decode_json ){
+			$response = json_decode( $response );
+		}
+
+		return $this->response = $response;
+	}
+
+	/**
+	 * Return the response object afer the fact
+	 *
+	 * @return mixed
+	 */
+	public function getResponse()
+	{
+	    return $this->response;
+	}
+
+	/**
+	* Make signed request
+	*/
+	function signedRequest( $url, $method, $parameters, $body = null, $content_type = null, $multipart = false )
+	{
+
+        $signature_parameters = array();
+
+        // when making a multipart request, use only oauth_* keys for signature
+        foreach( $parameters AS $key => $value ){
+            if( !$multipart || strpos( $key, 'oauth_' ) === 0 ){
+                $signature_parameters[$key] = $value;
+            }
+        }
+
+		$request = OAuthRequest::from_consumer_and_token($this->consumer, $this->token, $method, $url, $signature_parameters);
+		$request->sign_request($this->sha1_method, $this->consumer, $this->token);
+		switch ($method) {
+			case 'GET': return $this->request( $request->to_url(), 'GET', null, null, $content_type );
+			default   :
+		if ($body)
+			return $this->request( $request->to_url(), $method, $body, $request->to_header(), $content_type );
+		else
+			return $this->request( $request->get_normalized_http_url(), $method, ($multipart ? $parameters : $request->to_postdata()), $request->to_header(), $content_type, $multipart ) ;
+		}
+	}
+
+	/**
+	* Make http request
+	*/
+	function request( $url, $method, $postfields = null, $auth_header = null, $content_type = null, $multipart = false )
+	{
+		Hybrid_Logger::info( "Enter OAuth1Client::request( $method, $url )" );
+		Hybrid_Logger::debug( "OAuth1Client::request(). dump post fields: ", serialize( $postfields ) );
+
+		$this->http_info = array();
+		$ci = curl_init();
+
+		/* Curl settings */
+		curl_setopt( $ci, CURLOPT_USERAGENT     , $this->curl_useragent );
+		curl_setopt( $ci, CURLOPT_CONNECTTIMEOUT, $this->curl_connect_time_out );
+		curl_setopt( $ci, CURLOPT_TIMEOUT       , $this->curl_time_out );
+		curl_setopt( $ci, CURLOPT_RETURNTRANSFER, true );
+		curl_setopt( $ci, CURLOPT_HTTPHEADER    , array('Expect:') );
+		curl_setopt( $ci, CURLOPT_SSL_VERIFYPEER, $this->curl_ssl_verifypeer );
+		curl_setopt( $ci, CURLOPT_HEADERFUNCTION, array($this, 'getHeader') );
+		curl_setopt( $ci, CURLOPT_HEADER        , false );
+
+        if( $multipart ){
+            curl_setopt( $ci, CURLOPT_HTTPHEADER, array( 'Expect:', $auth_header ) );
+
+        }elseif ($content_type)
+			curl_setopt( $ci, CURLOPT_HTTPHEADER, array('Expect:', "Content-Type: $content_type") );
+
+		if($this->curl_proxy){
+			curl_setopt( $ci, CURLOPT_PROXY        , $this->curl_proxy);
+		}
+
+		switch ($method){
+			case 'POST':
+				curl_setopt( $ci, CURLOPT_POST, true );
+
+				if ( !empty($postfields) ){
+					curl_setopt( $ci, CURLOPT_POSTFIELDS, $postfields );
+				}
+
+				if ( !empty($auth_header) && $this->curl_auth_header && !$multipart ){
+					curl_setopt( $ci, CURLOPT_HTTPHEADER, array( 'Content-Type: application/atom+xml', $auth_header ) );
+				}
+				break;
+			case 'DELETE':
+				curl_setopt( $ci, CURLOPT_CUSTOMREQUEST, 'DELETE' );
+				if ( !empty($postfields) ){
+				  $url = "{$url}?{$postfields}";
+				}
+		}
+
+		curl_setopt($ci, CURLOPT_URL, $url);
+		$response = curl_exec($ci);
+		if( $response === false ) {
+				Hybrid_Logger::error( "OAuth1Client::request(). curl_exec error: ", curl_error($ci) );
+		}
+
+
+		Hybrid_Logger::debug( "OAuth1Client::request(). dump request info: ", serialize( curl_getinfo($ci) ) );
+		Hybrid_Logger::debug( "OAuth1Client::request(). dump request result: ", serialize( $response ) );
+
+		$this->http_code = curl_getinfo($ci, CURLINFO_HTTP_CODE);
+		$this->http_info = array_merge($this->http_info, curl_getinfo($ci));
+
+		curl_close ($ci);
+
+		return $response;
+	}
+
+	/**
+	* Get the header info to store.
+	*/
+	function getHeader($ch, $header) {
+		$i = strpos($header, ':');
+
+		if ( !empty($i) ){
+			$key = str_replace('-', '_', strtolower(substr($header, 0, $i)));
+			$value = trim(substr($header, $i + 2));
+			$this->http_header[$key] = $value;
+		}
+
+		return strlen($header);
+	}
+}
diff --git a/e107_handlers/hybridauth/Hybrid/thirdparty/OAuth/OAuth2Client.php b/e107_handlers/hybridauth/Hybrid/thirdparty/OAuth/OAuth2Client.php
index e7f80edb4..ceb42f3ef 100644
--- a/e107_handlers/hybridauth/Hybrid/thirdparty/OAuth/OAuth2Client.php
+++ b/e107_handlers/hybridauth/Hybrid/thirdparty/OAuth/OAuth2Client.php
@@ -1,250 +1,266 @@
-<?php
-/**
-* HybridAuth
-* http://hybridauth.sourceforge.net | http://github.com/hybridauth/hybridauth
-* (c) 2009-2015, HybridAuth authors | http://hybridauth.sourceforge.net/licenses.html
-*/
-
-// A service client for the OAuth 2 flow.
-// v0.1
-class OAuth2Client
-{
-	public $api_base_url     = "";
-	public $authorize_url    = "";
-	public $token_url        = "";
-	public $token_info_url   = "";
-
-	public $client_id        = "" ;
-	public $client_secret    = "" ;
-	public $redirect_uri     = "" ;
-	public $access_token     = "" ;
-	public $refresh_token    = "" ;
-
-	public $access_token_expires_in = "" ;
-	public $access_token_expires_at = "" ;
-
-	//--
-
-	public $sign_token_name          = "access_token";
-	public $decode_json              = true;
-	public $curl_time_out            = 30;
-	public $curl_connect_time_out    = 30;
-	public $curl_ssl_verifypeer      = false;
-	public $curl_ssl_verifyhost      = false;
-	public $curl_header              = array();
-	public $curl_useragent           = "OAuth/2 Simple PHP Client v0.1; HybridAuth http://hybridauth.sourceforge.net/";
-	public $curl_authenticate_method = "POST";
-        public $curl_proxy               = null;
-
-	//--
-
-	public $http_code             = "";
-	public $http_info             = "";
-
-	//--
-
-	public function __construct( $client_id = false, $client_secret = false, $redirect_uri='' )
-	{
-		$this->client_id     = $client_id;
-		$this->client_secret = $client_secret;
-		$this->redirect_uri  = $redirect_uri;
-	}
-
-	public function authorizeUrl( $extras = array() )
-	{
-		$params = array(
-			"client_id"     => $this->client_id,
-			"redirect_uri"  => $this->redirect_uri,
-			"response_type" => "code"
-		);
-
-		if( count($extras) )
-			foreach( $extras as $k=>$v )
-				$params[$k] = $v;
-
-		return $this->authorize_url . "?" . http_build_query($params, '', '&');
-	}
-
-	public function authenticate( $code )
-	{
-		$params = array(
-			"client_id"     => $this->client_id,
-			"client_secret" => $this->client_secret,
-			"grant_type"    => "authorization_code",
-			"redirect_uri"  => $this->redirect_uri,
-			"code"          => $code
-		);
-
-		$response = $this->request( $this->token_url, $params, $this->curl_authenticate_method );
-
-		$response = $this->parseRequestResult( $response );
-
-		if( ! $response || ! isset( $response->access_token ) ){
-			throw new Exception( "The Authorization Service has return: " . $response->error );
-		}
-
-		if( isset( $response->access_token  ) )  $this->access_token           = $response->access_token;
-		if( isset( $response->refresh_token ) ) $this->refresh_token           = $response->refresh_token;
-		if( isset( $response->expires_in    ) ) $this->access_token_expires_in = $response->expires_in;
-
-		// calculate when the access token expire
-		if( isset($response->expires_in)) {
-			$this->access_token_expires_at = time() + $response->expires_in;
-		}
-
-		return $response;
-	}
-
-	public function authenticated()
-	{
-		if ( $this->access_token ){
-			if ( $this->token_info_url && $this->refresh_token ){
-				// check if this access token has expired,
-				$tokeninfo = $this->tokenInfo( $this->access_token );
-
-				// if yes, access_token has expired, then ask for a new one
-				if( $tokeninfo && isset( $tokeninfo->error ) ){
-					$response = $this->refreshToken( $this->refresh_token );
-
-					// if wrong response
-					if( ! isset( $response->access_token ) || ! $response->access_token ){
-						throw new Exception( "The Authorization Service has return an invalid response while requesting a new access token. given up!" );
-					}
-
-					// set new access_token
-					$this->access_token = $response->access_token;
-				}
-			}
-
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	* Format and sign an oauth for provider api
-	*/
-	public function api( $url, $method = "GET", $parameters = array() )
-	{
-		if ( strrpos($url, 'http://') !== 0 && strrpos($url, 'https://') !== 0 ) {
-			$url = $this->api_base_url . $url;
-		}
-
-		$parameters[$this->sign_token_name] = $this->access_token;
-		$response = null;
-
-		switch( $method ){
-			case 'GET'  : $response = $this->request( $url, $parameters, "GET"  ); break;
-			case 'POST' : $response = $this->request( $url, $parameters, "POST" ); break;
-		}
-
-		if( $response && $this->decode_json ){
-			$response = json_decode( $response );
-		}
-
-		return $response;
-	}
-
-	/**
-	* GET wrapper for provider apis request
-	*/
-	function get( $url, $parameters = array() )
-	{
-		return $this->api( $url, 'GET', $parameters );
-	}
-
-	/**
-	* POST wrapper for provider apis request
-	*/
-	function post( $url, $parameters = array() )
-	{
-		return $this->api( $url, 'POST', $parameters );
-	}
-
-	// -- tokens
-
-	public function tokenInfo($accesstoken)
-	{
-		$params['access_token'] = $this->access_token;
-		$response = $this->request( $this->token_info_url, $params );
-		return $this->parseRequestResult( $response );
-	}
-
-	public function refreshToken( $parameters = array() )
-	{
-		$params = array(
-			"client_id"     => $this->client_id,
-			"client_secret" => $this->client_secret,
-			"grant_type"    => "refresh_token"
-		);
-
-		foreach($parameters as $k=>$v ){
-			$params[$k] = $v;
-		}
-
-		$response = $this->request( $this->token_url, $params, "POST" );
-		return $this->parseRequestResult( $response );
-	}
-
-	// -- utilities
-
-	private function request( $url, $params=false, $type="GET" )
-	{
-		Hybrid_Logger::info( "Enter OAuth2Client::request( $url )" );
-		Hybrid_Logger::debug( "OAuth2Client::request(). dump request params: ", serialize( $params ) );
-
-		if( $type == "GET" ){
-			$url = $url . ( strpos( $url, '?' ) ? '&' : '?' ) . http_build_query($params, '', '&');
-		}
-
-		$this->http_info = array();
-		$ch = curl_init();
-
-		curl_setopt($ch, CURLOPT_URL            , $url );
-		curl_setopt($ch, CURLOPT_RETURNTRANSFER , 1 );
-		curl_setopt($ch, CURLOPT_TIMEOUT        , $this->curl_time_out );
-		curl_setopt($ch, CURLOPT_USERAGENT      , $this->curl_useragent );
-		curl_setopt($ch, CURLOPT_CONNECTTIMEOUT , $this->curl_connect_time_out );
-		curl_setopt($ch, CURLOPT_SSL_VERIFYPEER , $this->curl_ssl_verifypeer );
-		curl_setopt($ch, CURLOPT_SSL_VERIFYHOST , $this->curl_ssl_verifyhost );
-		curl_setopt($ch, CURLOPT_HTTPHEADER     , $this->curl_header );
-
-		if($this->curl_proxy){
-			curl_setopt( $ch, CURLOPT_PROXY        , $this->curl_proxy);
-		}
-
-		if( $type == "POST" ){
-			curl_setopt($ch, CURLOPT_POST, 1);
-			if($params) curl_setopt( $ch, CURLOPT_POSTFIELDS, http_build_query($params, '', '&') );
-		}
-
-		$response = curl_exec($ch);
-		if( $response === FALSE ) {
-				Hybrid_Logger::error( "OAuth2Client::request(). curl_exec error: ", curl_error($ch) );
-		}
-		Hybrid_Logger::debug( "OAuth2Client::request(). dump request info: ", serialize( curl_getinfo($ch) ) );
-		Hybrid_Logger::debug( "OAuth2Client::request(). dump request result: ", serialize( $response ) );
-
-		$this->http_code = curl_getinfo($ch, CURLINFO_HTTP_CODE);
-		$this->http_info = array_merge($this->http_info, curl_getinfo($ch));
-
-		curl_close ($ch);
-
-		return $response;
-	}
-
-	private function parseRequestResult( $result )
-	{
-		if( json_decode( $result ) ) return json_decode( $result );
-
-		parse_str( $result, $output );
-
-		$result = new StdClass();
-
-		foreach( $output as $k => $v )
-			$result->$k = $v;
-
-		return $result;
-	}
-}
+<?php
+/**
+* HybridAuth
+* http://hybridauth.sourceforge.net | http://github.com/hybridauth/hybridauth
+* (c) 2009-2015, HybridAuth authors | http://hybridauth.sourceforge.net/licenses.html
+*/
+
+// A service client for the OAuth 2 flow.
+// v0.1.1
+class OAuth2Client
+{
+  public $api_base_url     = "";
+  public $authorize_url    = "";
+  public $token_url        = "";
+  public $token_info_url   = "";
+
+  public $client_id        = "" ;
+  public $client_secret    = "" ;
+  public $redirect_uri     = "" ;
+  public $access_token     = "" ;
+  public $refresh_token    = "" ;
+
+  public $access_token_expires_in = "" ;
+  public $access_token_expires_at = "" ;
+
+  //--
+
+  public $sign_token_name          = "access_token";
+  public $decode_json              = true;
+  public $curl_time_out            = 30;
+  public $curl_connect_time_out    = 30;
+  public $curl_ssl_verifypeer      = false;
+  public $curl_ssl_verifyhost      = false;
+  public $curl_header              = array();
+  public $curl_useragent           = "OAuth/2 Simple PHP Client v0.1.1; HybridAuth http://hybridauth.sourceforge.net/";
+  public $curl_authenticate_method = "POST";
+  public $curl_proxy               = null;
+  public $curl_compressed          = false;
+  //--
+
+  public $http_code             = "";
+  public $http_info             = "";
+  protected $response           = null;
+
+  //--
+
+  public function __construct( $client_id = false, $client_secret = false, $redirect_uri='', $compressed = false )
+  {
+    $this->client_id       = $client_id;
+    $this->client_secret   = $client_secret;
+    $this->redirect_uri    = $redirect_uri;
+    $this->curl_compressed = $compressed;
+  }
+
+  public function authorizeUrl( $extras = array() )
+  {
+    $params = array(
+      "client_id"     => $this->client_id,
+      "redirect_uri"  => $this->redirect_uri,
+      "response_type" => "code"
+    );
+
+    if( count($extras) )
+      foreach( $extras as $k=>$v )
+        $params[$k] = $v;
+
+    return $this->authorize_url . "?" . http_build_query($params, '', '&');
+  }
+
+  public function authenticate( $code )
+  {
+    $params = array(
+      "client_id"     => $this->client_id,
+      "client_secret" => $this->client_secret,
+      "grant_type"    => "authorization_code",
+      "redirect_uri"  => $this->redirect_uri,
+      "code"          => $code
+    );
+
+    $response = $this->request( $this->token_url, $params, $this->curl_authenticate_method );
+
+    $response = $this->parseRequestResult( $response );
+
+    if( ! $response || ! isset( $response->access_token ) ){
+      throw new Exception( "The Authorization Service has return: " . $response->error );
+    }
+
+    if( isset( $response->access_token  ) )  $this->access_token           = $response->access_token;
+    if( isset( $response->refresh_token ) ) $this->refresh_token           = $response->refresh_token;
+    if( isset( $response->expires_in    ) ) $this->access_token_expires_in = $response->expires_in;
+
+    // calculate when the access token expire
+    if( isset($response->expires_in)) {
+      $this->access_token_expires_at = time() + $response->expires_in;
+    }
+
+    return $response;
+  }
+
+  public function authenticated()
+  {
+    if ( $this->access_token ){
+      if ( $this->token_info_url && $this->refresh_token ){
+        // check if this access token has expired,
+        $tokeninfo = $this->tokenInfo( $this->access_token );
+
+        // if yes, access_token has expired, then ask for a new one
+        if( $tokeninfo && isset( $tokeninfo->error ) ){
+          $response = $this->refreshToken( $this->refresh_token );
+
+          // if wrong response
+          if( ! isset( $response->access_token ) || ! $response->access_token ){
+            throw new Exception( "The Authorization Service has return an invalid response while requesting a new access token. given up!" );
+          }
+
+          // set new access_token
+          $this->access_token = $response->access_token;
+        }
+      }
+
+      return true;
+    }
+
+    return false;
+  }
+
+  /**
+  * Format and sign an oauth for provider api
+  */
+  public function api( $url, $method = "GET", $parameters = array() )
+  {
+    if ( strrpos($url, 'http://') !== 0 && strrpos($url, 'https://') !== 0 ) {
+      $url = $this->api_base_url . $url;
+    }
+
+    $parameters[$this->sign_token_name] = $this->access_token;
+    $response = null;
+
+    switch( $method ){
+      case 'GET'  : $response = $this->request( $url, $parameters, "GET"  ); break;
+      case 'POST' : $response = $this->request( $url, $parameters, "POST" ); break;
+    }
+
+    if( $response && $this->decode_json ){
+      return $this->response = json_decode( $response );
+    }
+
+    return $this->response = $response;
+  }
+
+  /**
+   * Return the response object afer the fact
+   *
+   * @return mixed
+   */
+  public function getResponse()
+  {
+      return $this->response;
+  }
+
+  /**
+  * GET wrapper for provider apis request
+  */
+  function get( $url, $parameters = array() )
+  {
+    return $this->api( $url, 'GET', $parameters );
+  }
+
+  /**
+  * POST wrapper for provider apis request
+  */
+  function post( $url, $parameters = array() )
+  {
+    return $this->api( $url, 'POST', $parameters );
+  }
+
+  // -- tokens
+
+  public function tokenInfo($accesstoken)
+  {
+    $params['access_token'] = $this->access_token;
+    $response = $this->request( $this->token_info_url, $params );
+    return $this->parseRequestResult( $response );
+  }
+
+  public function refreshToken( $parameters = array() )
+  {
+    $params = array(
+      "client_id"     => $this->client_id,
+      "client_secret" => $this->client_secret,
+      "grant_type"    => "refresh_token"
+    );
+
+    foreach($parameters as $k=>$v ){
+      $params[$k] = $v;
+    }
+
+    $response = $this->request( $this->token_url, $params, "POST" );
+    return $this->parseRequestResult( $response );
+  }
+
+  // -- utilities
+
+  private function request( $url, $params=false, $type="GET" )
+  {
+    Hybrid_Logger::info( "Enter OAuth2Client::request( $url )" );
+    Hybrid_Logger::debug( "OAuth2Client::request(). dump request params: ", serialize( $params ) );
+
+    if( $type == "GET" ){
+      $url = $url . ( strpos( $url, '?' ) ? '&' : '?' ) . http_build_query($params, '', '&');
+    }
+
+    $this->http_info = array();
+    $ch = curl_init();
+
+    curl_setopt($ch, CURLOPT_URL            , $url );
+    curl_setopt($ch, CURLOPT_RETURNTRANSFER , 1 );
+    curl_setopt($ch, CURLOPT_TIMEOUT        , $this->curl_time_out );
+    curl_setopt($ch, CURLOPT_USERAGENT      , $this->curl_useragent );
+    curl_setopt($ch, CURLOPT_CONNECTTIMEOUT , $this->curl_connect_time_out );
+    curl_setopt($ch, CURLOPT_SSL_VERIFYPEER , $this->curl_ssl_verifypeer );
+    curl_setopt($ch, CURLOPT_SSL_VERIFYHOST , $this->curl_ssl_verifyhost );
+    curl_setopt($ch, CURLOPT_HTTPHEADER     , $this->curl_header );
+
+    if ($this->curl_compressed){
+      curl_setopt($ch, CURLOPT_ENCODING, "gzip,deflate");
+    }
+
+    if($this->curl_proxy){
+      curl_setopt( $ch, CURLOPT_PROXY        , $this->curl_proxy);
+    }
+
+    if( $type == "POST" ){
+      curl_setopt($ch, CURLOPT_POST, 1);
+      if($params) curl_setopt( $ch, CURLOPT_POSTFIELDS, $params );
+    }
+
+    $response = curl_exec($ch);
+    if( $response === false ) {
+        Hybrid_Logger::error( "OAuth2Client::request(). curl_exec error: ", curl_error($ch) );
+    }
+    Hybrid_Logger::debug( "OAuth2Client::request(). dump request info: ", serialize( curl_getinfo($ch) ) );
+    Hybrid_Logger::debug( "OAuth2Client::request(). dump request result: ", serialize( $response ) );
+
+    $this->http_code = curl_getinfo($ch, CURLINFO_HTTP_CODE);
+    $this->http_info = array_merge($this->http_info, curl_getinfo($ch));
+
+    curl_close ($ch);
+
+    return $response;
+  }
+
+  private function parseRequestResult( $result )
+  {
+    if( json_decode( $result ) ) return json_decode( $result );
+
+    parse_str( $result, $output );
+
+    $result = new StdClass();
+
+    foreach( $output as $k => $v )
+      $result->$k = $v;
+
+    return $result;
+  }
+}
diff --git a/e107_handlers/hybridauth/Hybrid/thirdparty/OpenID/LightOpenID.php b/e107_handlers/hybridauth/Hybrid/thirdparty/OpenID/LightOpenID.php
index a43cb1cba..b1cb41bb3 100644
--- a/e107_handlers/hybridauth/Hybrid/thirdparty/OpenID/LightOpenID.php
+++ b/e107_handlers/hybridauth/Hybrid/thirdparty/OpenID/LightOpenID.php
@@ -1,17 +1,15 @@
 <?php
-// https://github.com/iignatov/LightOpenID
-
 /**
  * This class provides a simple interface for OpenID 1.1/2.0 authentication.
- * 
+ *
  * It requires PHP >= 5.1.2 with cURL or HTTP/HTTPS stream wrappers enabled.
  *
- * @version v1.1.2 2013-01-15
- * @link http://gitorious.org/lightopenid Official Repo
- * @link http://github.com/iignatov/LightOpenID GitHub Clone
- * @author Mewp
- * @copyright Copyright (c) 2010, Mewp
- * @license http://www.opensource.org/licenses/mit-license.php MIT License
+ * @version     v1.2.0 (2014-01-14)
+ * @link        https://code.google.com/p/lightopenid/          Project URL
+ * @link        https://github.com/iignatov/LightOpenID         GitHub Repo
+ * @author      Mewp <mewp151 at gmail dot com>
+ * @copyright   Copyright (c) 2013 Mewp
+ * @license     http://opensource.org/licenses/mit-license.php  MIT License
  */
 class LightOpenID
 {
@@ -21,11 +19,15 @@ class LightOpenID
          , $verify_peer = null
          , $capath = null
          , $cainfo = null
+         , $cnmatch = null
          , $data
-         , $oauth = array();
+         , $oauth = array()
+         , $curl_time_out = 30
+         , $curl_connect_time_out = 30;
     private $identity, $claimed_id;
     protected $server, $version, $trustRoot, $aliases, $identifier_select = false
-            , $ax = false, $sreg = false, $setup_url = null, $headers = array(), $proxy = null
+            , $ax = false, $sreg = false, $setup_url = null, $headers = array()
+            , $proxy = null, $user_agent = 'LightOpenID'
             , $xrds_override_pattern = null, $xrds_override_replacement = null;
     static protected $ax_to_sreg = array(
         'namePerson/friendly'     => 'nickname',
@@ -41,18 +43,7 @@ class LightOpenID
 
     function __construct($host, $proxy = null)
     {
-        $this->trustRoot = (strpos($host, '://') ? $host : 'http://' . $host);
-        if ((!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] != 'off')
-            || (isset($_SERVER['HTTP_X_FORWARDED_PROTO'])
-            && $_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https')
-        ) {
-            $this->trustRoot = (strpos($host, '://') ? $host : 'https://' . $host);
-        }
-
-        if(strlen($this->trustRoot >= 8) && ($host_end = strpos($this->trustRoot, '/', 8)) !== false) {
-            $this->trustRoot = substr($this->trustRoot, 0, $host_end);
-        }
-        
+        $this->set_realm($host);
         $this->set_proxy($proxy);
 
         $uri = rtrim(preg_replace('#((?<=\?)|&)openid\.[^&]+#', '', $_SERVER['REQUEST_URI']), '?');
@@ -65,6 +56,11 @@ class LightOpenID
         }
     }
 
+    function __isset($name)
+    {
+        return in_array($name, array('identity', 'trustRoot', 'realm', 'xrdsOverride', 'mode'));
+    }
+
     function __set($name, $value)
     {
         switch ($name) {
@@ -112,7 +108,7 @@ class LightOpenID
             return empty($this->data['openid_mode']) ? null : $this->data['openid_mode'];
         }
     }
-    
+
     function set_proxy($proxy)
     {
         if (!empty($proxy)) {
@@ -120,7 +116,7 @@ class LightOpenID
             if (!is_array($proxy)) {
                 $proxy = parse_url($proxy);
             }
-            
+
             // Check if $proxy is valid after the parsing.
             if ($proxy && !empty($proxy['host'])) {
                 // Make sure that a valid port number is specified.
@@ -128,12 +124,12 @@ class LightOpenID
                     if (!is_int($proxy['port'])) {
                         $proxy['port'] = is_numeric($proxy['port']) ? intval($proxy['port']) : 0;
                     }
-                    
+
                     if ($proxy['port'] <= 0) {
                         throw new ErrorException('The specified proxy port number is invalid.');
                     }
                 }
-                
+
                 $this->proxy = $proxy;
             }
         }
@@ -160,25 +156,63 @@ class LightOpenID
         return !!gethostbynamel($server);
     }
 
+    protected function set_realm($uri)
+    {
+        $realm = '';
+
+        # Set a protocol, if not specified.
+        $realm .= (($offset = strpos($uri, '://')) === false) ? $this->get_realm_protocol() : '';
+
+        # Set the offset properly.
+        $offset = (($offset !== false) ? $offset + 3 : 0);
+
+        # Get only the root, without the path.
+        $realm .= (($end = strpos($uri, '/', $offset)) === false) ? $uri : substr($uri, 0, $end);
+
+        $this->trustRoot = $realm;
+    }
+
+    protected function get_realm_protocol()
+    {
+        if (!empty($_SERVER['HTTPS'])) {
+            $use_secure_protocol = ($_SERVER['HTTPS'] != 'off');
+        } else if (isset($_SERVER['HTTP_X_FORWARDED_PROTO'])) {
+            $use_secure_protocol = ($_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https');
+        } else {
+            $use_secure_protocol = false;
+        }
+
+        return $use_secure_protocol ? 'https://' : 'http://';
+    }
+
     protected function request_curl($url, $method='GET', $params=array(), $update_claimed_id)
     {
         $params = http_build_query($params, '', '&');
         $curl = curl_init($url . ($method == 'GET' && $params ? '?' . $params : ''));
         curl_setopt($curl, CURLOPT_FOLLOWLOCATION, true);
         curl_setopt($curl, CURLOPT_HEADER, false);
+        curl_setopt($curl, CURLOPT_USERAGENT, $this->user_agent);
         curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, false);
         curl_setopt($curl, CURLOPT_RETURNTRANSFER, true);
-        curl_setopt($curl, CURLOPT_HTTPHEADER, array('Accept: application/xrds+xml, */*'));
-        
+        curl_setopt($curl, CURLOPT_TIMEOUT, $this->curl_time_out);
+        curl_setopt($curl, CURLOPT_CONNECTTIMEOUT , $this->curl_connect_time_out);
+
+
+        if ($method == 'POST') {
+            curl_setopt($curl, CURLOPT_HTTPHEADER, array('Content-type: application/x-www-form-urlencoded'));
+        } else {
+            curl_setopt($curl, CURLOPT_HTTPHEADER, array('Accept: application/xrds+xml, */*'));
+        }
+
         if (!empty($this->proxy)) {
             curl_setopt($curl, CURLOPT_PROXY, $this->proxy['host']);
-            
+
             if (!empty($this->proxy['port'])) {
                 curl_setopt($curl, CURLOPT_PROXYPORT, $this->proxy['port']);
             }
-            
+
             if (!empty($this->proxy['user'])) {
-                curl_setopt($curl, CURLOPT_PROXYUSERPWD, $this->proxy['user'] . ':' . $this->proxy['pass']);            
+                curl_setopt($curl, CURLOPT_PROXYUSERPWD, $this->proxy['user'] . ':' . $this->proxy['pass']);
             }
         }
 
@@ -204,9 +238,6 @@ class LightOpenID
             curl_setopt($curl, CURLOPT_HTTPGET, true);
         }
         $response = curl_exec($curl);
-        if( $response === FALSE ) {
-            Hybrid_Logger::error( "LightOpenID::request_curl(). curl_exec error: ", curl_error($curl) );
-        }
 
         if($method == 'HEAD' && curl_getinfo($curl, CURLINFO_HTTP_CODE) == 405) {
             curl_setopt($curl, CURLOPT_HTTPGET, true);
@@ -232,9 +263,10 @@ class LightOpenID
             }
 
             if($update_claimed_id) {
-                # Updating claimed_id in case of redirections.
+                # Update the claimed_id value in case of redirections.
                 $effective_url = curl_getinfo($curl, CURLINFO_EFFECTIVE_URL);
-                if($effective_url != $url) {
+                # Ignore the fragment (some cURL versions don't handle it well).
+                if (strtok($effective_url, '#') != strtok($url, '#')) {
                     $this->identity = $this->claimed_id = $effective_url;
                 }
             }
@@ -289,6 +321,10 @@ class LightOpenID
             throw new ErrorException("Could not connect to $url.", 404);
         }
 
+        if (empty($this->cnmatch)) {
+            $this->cnmatch = parse_url($url, PHP_URL_HOST);
+        }
+
         $params = http_build_query($params, '', '&');
         switch($method) {
         case 'GET':
@@ -296,10 +332,12 @@ class LightOpenID
                 'http' => array(
                     'method' => 'GET',
                     'header' => 'Accept: application/xrds+xml, */*',
+                    'user_agent' => $this->user_agent,
                     'ignore_errors' => true,
-                ), 'ssl' => array(
-                    'CN_match' => parse_url($url, PHP_URL_HOST),
                 ),
+                'ssl' => array(
+                    'CN_match' => $this->cnmatch
+                )
             );
             $url = $url . ($params ? '?' . $params : '');
             if (!empty($this->proxy)) {
@@ -311,21 +349,23 @@ class LightOpenID
                 'http' => array(
                     'method' => 'POST',
                     'header'  => 'Content-type: application/x-www-form-urlencoded',
+                    'user_agent' => $this->user_agent,
                     'content' => $params,
                     'ignore_errors' => true,
-                ), 'ssl' => array(
-                    'CN_match' => parse_url($url, PHP_URL_HOST),
                 ),
+                'ssl' => array(
+                    'CN_match' => $this->cnmatch
+                )
             );
             if (!empty($this->proxy)) {
                 $opts['http']['proxy'] = $this->proxy_url();
             }
             break;
         case 'HEAD':
-            // We want to send a HEAD request, but since get_headers() doesn't 
+            // We want to send a HEAD request, but since get_headers() doesn't
             // accept $context parameter, we have to change the defaults.
             $default = stream_context_get_options(stream_context_get_default());
-            
+
             // PHP does not reset all options. Instead, it just sets the options
             // available in the passed array, therefore set the defaults manually.
             $default += array(
@@ -335,23 +375,25 @@ class LightOpenID
             $default['http'] += array(
                 'method' => 'GET',
                 'header' => '',
+                'user_agent' => '',
                 'ignore_errors' => false
             );
             $default['ssl'] += array(
                 'CN_match' => ''
             );
-            
+
             $opts = array(
                 'http' => array(
                     'method' => 'HEAD',
                     'header' => 'Accept: application/xrds+xml, */*',
+                    'user_agent' => $this->user_agent,
                     'ignore_errors' => true,
                 ),
                 'ssl' => array(
-                    'CN_match' => parse_url($url, PHP_URL_HOST)
+                    'CN_match' => $this->cnmatch
                 )
             );
-            
+
             // Enable validation of the SSL certificates.
             if ($this->verify_peer) {
                 $default['ssl'] += array(
@@ -365,15 +407,15 @@ class LightOpenID
                     'cafile' => $this->cainfo
                 );
             }
-            
+
             // Change the stream context options.
             stream_context_get_default($opts);
-            
+
             $headers = get_headers($url . ($params ? '?' . $params : ''));
-            
+
             // Restore the stream context options.
             stream_context_get_default($default);
-            
+
             if (!empty($headers)) {
                 if (intval(substr($headers[0], strlen('HTTP/1.1 '))) == 405) {
                     // The server doesn't support HEAD - emulate it with a GET.
@@ -387,7 +429,7 @@ class LightOpenID
             } else {
                 $headers = array();
             }
-            
+
             return $headers;
         }
 
@@ -412,32 +454,49 @@ class LightOpenID
 
     protected function request($url, $method='GET', $params=array(), $update_claimed_id=false)
     {
-        if (function_exists('curl_init')
-            && (!in_array('https', stream_get_wrappers()) || !ini_get('safe_mode') && !ini_get('open_basedir'))
-        ) {
-            return $this->request_curl($url, $method, $params, $update_claimed_id);
+        $use_curl = false;
+
+        if (function_exists('curl_init')) {
+            if (!$use_curl) {
+                # When allow_url_fopen is disabled, PHP streams will not work.
+                $use_curl = !ini_get('allow_url_fopen');
+            }
+
+            if (!$use_curl) {
+                # When there is no HTTPS wrapper, PHP streams cannott be used.
+                $use_curl = !in_array('https', stream_get_wrappers());
+            }
+
+            if (!$use_curl) {
+                # With open_basedir or safe_mode set, cURL can't follow redirects.
+                $use_curl = !(ini_get('safe_mode') || ini_get('open_basedir'));
+            }
         }
-        return $this->request_streams($url, $method, $params, $update_claimed_id);
+
+        return
+            $use_curl
+                ? $this->request_curl($url, $method, $params, $update_claimed_id)
+                : $this->request_streams($url, $method, $params, $update_claimed_id);
     }
-    
+
     protected function proxy_url()
     {
         $result = '';
-        
+
         if (!empty($this->proxy)) {
             $result = $this->proxy['host'];
-            
+
             if (!empty($this->proxy['port'])) {
                 $result = $result . ':' . $this->proxy['port'];
             }
-            
+
             if (!empty($this->proxy['user'])) {
                 $result = $this->proxy['user'] . ':' . $this->proxy['pass'] . '@' . $result;
             }
-            
+
             $result = 'http://' . $result;
         }
-        
+
         return $result;
     }
 
@@ -494,7 +553,7 @@ class LightOpenID
 
         # A flag to disable yadis discovery in case of failure in headers.
         $yadis = true;
-        
+
         # Allows optional regex replacement of the URL, e.g. to use Google Apps
         # as an OpenID provider without setting up XRDS on the domain hosting.
         if (!is_null($this->xrds_override_pattern) && !is_null($this->xrds_override_replacement)) {
@@ -512,14 +571,7 @@ class LightOpenID
                     $next = true;
                 }
 
-                if (isset($headers['content-type'])
-                    && (strpos($headers['content-type'], 'application/xrds+xml') !== false
-                        || strpos($headers['content-type'], 'text/xml') !== false)
-                ) {
-                    # Apparently, some providers return XRDS documents as text/html.
-                    # While it is against the spec, allowing this here shouldn't break
-                    # compatibility with anything.
-                    # ---
+                if (isset($headers['content-type']) && $this->is_allowed_type($headers['content-type'])) {
                     # Found an XRDS document, now let's find the server, and optionally delegate.
                     $content = $this->request($url, 'GET');
 
@@ -625,11 +677,26 @@ class LightOpenID
         throw new ErrorException('Endless redirection!', 500);
     }
 
+    protected function is_allowed_type($content_type) {
+        # Apparently, some providers return XRDS documents as text/html.
+        # While it is against the spec, allowing this here shouldn't break
+        # compatibility with anything.
+        $allowed_types = array('application/xrds+xml', 'text/html', 'text/xml');
+
+        foreach ($allowed_types as $type) {
+            if (strpos($content_type, $type) !== false) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
     protected function sregParams()
     {
         $params = array();
         # We always use SREG 1.1, even if the server is advertising only support for 1.0.
-        # That's because it's fully backwards compatible with 1.0, and some providers
+        # That's because it's fully backwards compatibile with 1.0, and some providers
         # advertise 1.0 even if they accept only 1.1. One such provider is myopenid.com
         $params['openid.ns.sreg'] = 'http://openid.net/extensions/sreg/1.1';
         if ($this->required) {
@@ -679,7 +746,7 @@ class LightOpenID
                 $params['openid.ax.count.' . $alias] = $count;
             }
 
-            # Don't send empty ax.required and ax.if_available.
+            # Don't send empty ax.requied and ax.if_available.
             # Google and possibly other providers refuse to support ax when one of these is empty.
             if($required) {
                 $params['openid.ax.required'] = implode(',', $required);
@@ -720,15 +787,15 @@ class LightOpenID
             'openid.return_to'   => $this->returnUrl,
             'openid.realm'       => $this->trustRoot,
         );
-        
+
         if ($this->ax) {
             $params += $this->axParams();
         }
-        
+
         if ($this->sreg) {
             $params += $this->sregParams();
         }
-        
+
         if (!$this->ax && !$this->sreg) {
             # If OP doesn't advertise either SREG, nor AX, let's send them both
             # in worst case we don't get anything in return.
@@ -812,7 +879,7 @@ class LightOpenID
 
         if ($this->data['openid_return_to'] != $this->returnUrl) {
             # The return_to url must match the url of current request.
-            # I'm assuming that no one will set the returnUrl to something that doesn't make sense.
+            # I'm assuing that noone will set the returnUrl to something that doesn't make sense.
             return false;
         }
 
@@ -821,7 +888,7 @@ class LightOpenID
         foreach (explode(',', $this->data['openid_signed']) as $item) {
             # Checking whether magic_quotes_gpc is turned on, because
             # the function may fail if it is. For example, when fetching
-            # AX namePerson, it might contain an apostrophe, which will be escaped.
+            # AX namePerson, it might containg an apostrophe, which will be escaped.
             # In such case, validation would fail, since we'd send different data than OP
             # wants to verify. stripslashes() should solve that problem, but we can't
             # use it when magic_quotes is off.
@@ -840,36 +907,36 @@ class LightOpenID
     protected function getAxAttributes()
     {
         $result = array();
-        
+
         if ($alias = $this->getNamespaceAlias('http://openid.net/srv/ax/1.0', 'ax')) {
             $prefix = 'openid_' . $alias;
             $length = strlen('http://axschema.org/');
-            
+
             foreach (explode(',', $this->data['openid_signed']) as $key) {
                 $keyMatch = $alias . '.type.';
-                
+
                 if (strncmp($key, $keyMatch, strlen($keyMatch)) !== 0) {
                     continue;
                 }
-                
+
                 $key = substr($key, strlen($keyMatch));
                 $idv = $prefix . '_value_' . $key;
                 $idc = $prefix . '_count_' . $key;
                 $key = substr($this->getItem($prefix . '_type_' . $key), $length);
-                
+
                 if (!empty($key)) {
                     if (($count = intval($this->getItem($idc))) > 0) {
                         $value = array();
-                        
+
                         for ($i = 1; $i <= $count; $i++) {
                             $value[] = $this->getItem($idv . '_' . $i);
                         }
-                        
+
                         $value = ($count == 1) ? reset($value) : $value;
                     } else {
                         $value = $this->getItem($idv);
                     }
-                    
+
                     if (!is_null($value)) {
                         $result[$key] = $value;
                     }
@@ -879,7 +946,7 @@ class LightOpenID
             // No alias for the AX schema has been found,
             // so there is no AX data in the OP's response.
         }
-        
+
         return $result;
     }
 
@@ -903,7 +970,7 @@ class LightOpenID
     }
 
     /**
-     * Gets AX/SREG attributes provided by OP. should be used only after successful validation.
+     * Gets AX/SREG attributes provided by OP. should be used only after successful validaton.
      * Note that it does not guarantee that any of the required/optional parameters will be present,
      * or that there will be no other attributes besides those specified.
      * In other words. OP may provide whatever information it wants to.
@@ -928,19 +995,19 @@ class LightOpenID
      * In order to use the OpenID+OAuth hybrid protocol, you need to add at least one
      * scope to the $openid->oauth array before you get the call to getAuthUrl(), e.g.:
      * $openid->oauth[] = 'https://www.googleapis.com/auth/plus.me';
-     * 
-     * Furthermore the registered consumer name must fit the OpenID realm. 
+     *
+     * Furthermore the registered consumer name must fit the OpenID realm.
      * To register an OpenID consumer at Google use: https://www.google.com/accounts/ManageDomains
-     * 
+     *
      * @return string|bool OAuth request token on success, FALSE if no token was provided.
      */
     function getOAuthRequestToken()
     {
         $alias = $this->getNamespaceAlias('http://specs.openid.net/extensions/oauth/1.0');
-        
+
         return !empty($alias) ? $this->data['openid_' . $alias . '_request_token'] : false;
     }
-    
+
     /**
      * Gets the alias for the specified namespace, if it's present.
      *
@@ -951,13 +1018,13 @@ class LightOpenID
     private function getNamespaceAlias($namespace, $hint = null)
     {
         $result = null;
-        
+
         if (empty($hint) || $this->getItem('openid_ns_' . $hint) != $namespace) {
             // The common alias is either undefined or points to
             // some other extension - search for another alias..
             $prefix = 'openid_ns_';
             $length = strlen($prefix);
-            
+
             foreach ($this->data as $key => $val) {
                 if (strncmp($key, $prefix, $length) === 0 && $val === $namespace) {
                     $result = trim(substr($key, $length));
@@ -967,10 +1034,10 @@ class LightOpenID
         } else {
             $result = $hint;
         }
-        
+
         return $result;
     }
-    
+
     /**
      * Gets an item from the $data array by the specified id.
      *
@@ -979,6 +1046,6 @@ class LightOpenID
      */
     private function getItem($id)
     {
-        return isset($this->data[$id]) ? $this->data[$id] : null; 
+        return isset($this->data[$id]) ? $this->data[$id] : null;
     }
 }