Skip to content

Commit

Permalink
start hybridauth 2.1.0
Browse files Browse the repository at this point in the history
  • Loading branch information
hybridauth committed Apr 3, 2012
1 parent 66da27a commit 90dd7fb
Show file tree
Hide file tree
Showing 33 changed files with 187 additions and 506 deletions.
2 changes: 1 addition & 1 deletion README.html
View file
Expand Up @@ -63,7 +63,7 @@
<body>

<div id="container">
<h1>Welcome to Hybridauth Library <small>2.0.11</small></h1>
<h1>Welcome to Hybridauth Library <small>2.1.0-dev</small></h1>

<div id="body">
<p>
Expand Down
4 changes: 2 additions & 2 deletions README.md
View file
@@ -1,4 +1,4 @@
# HybridAuth 2.0.11-dev
# HybridAuth 2.1.0-dev

HybridAuth enables developers to easily build social applications and tools
to engage websites vistors and customers on a social level by implementing
Expand Down Expand Up @@ -37,7 +37,7 @@ HybridAuth repository is made up of several projects:
MySpace, Google, Yahoo, Windows Live, Foursquare and AOL.
- **The additional providers project** contains many others services
which you may want to use,
- **Examples and demos** contains three working examples for you to test,
- **Examples and demos** contains five working examples for you to test,

## Getting Started

Expand Down
65 changes: 17 additions & 48 deletions hybridauth/Hybrid/Auth.php
View file
@@ -1,8 +1,8 @@
<?php
/*!
* HybridAuth
* http://hybridauth.sourceforge.net | https://github.com/hybridauth/hybridauth
* (c) 2009-2011 HybridAuth authors | hybridauth.sourceforge.net/licenses.html
* http://hybridauth.sourceforge.net | http://github.com/hybridauth/hybridauth
* (c) 2009-2012, HybridAuth authors | http://hybridauth.sourceforge.net/licenses.html
*/

/**
Expand All @@ -14,7 +14,7 @@
*/
class Hybrid_Auth
{
public static $version = "2.0.11-dev";
public static $version = "2.1.0-dev";

public static $config = array();

Expand All @@ -35,30 +35,7 @@ class Hybrid_Auth
* http://hybridauth.sourceforge.net/userguide/Configuration.html
*/
function __construct( $config )
{
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 );
}
}

#{{{ well, should we check this each time? ..
// PHP Curl extension [http://www.php.net/manual/en/intro.curl.php]
if ( ! function_exists('curl_init') ) {
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') ) {
throw new Exception('Hybridauth Library needs the JSON PHP extension.');
}

// OAuth PECL extension is not compatible with this library
if( extension_loaded('oauth') ) {
throw new Exception('Hybridauth Library not compatible with installed PECL OAuth extension. Please disable it.');
}
#}}}

{
Hybrid_Auth::initialize( $config );
}

Expand All @@ -69,17 +46,13 @@ function __construct( $config )
*/
public static function initialize( $config )
{
if ( ! session_id() ){
throw new Exception( "Hybriauth require the use of 'session_start()' at the start of your script.", 1 );
}

if( ! is_array( $config ) && ! file_exists( $config ) ){
throw new Exception( "Hybriauth config does not exist on the given path.", 1 );
}

if( ! is_array( $config ) ){
$config = include $config;
}
}

// build some need'd paths
$config["path_base"] = realpath( dirname( __FILE__ ) ) . "/";
Expand All @@ -94,45 +67,41 @@ public static function initialize( $config )
}

# load hybridauth required files, a autoload is on the way...
require_once $config["path_base"] . "Error.php";
require_once $config["path_base"] . "Logger.php";
require_once $config["path_base"] . "Error.php";
require_once $config["path_base"] . "Logger.php";

require_once $config["path_base"] . "Storage.php";
require_once $config["path_base"] . "Storage.php";

require_once $config["path_base"] . "Provider_Adapter.php";
require_once $config["path_base"] . "Provider_Adapter.php";

require_once $config["path_base"] . "Provider_Model.php";
require_once $config["path_base"] . "Provider_Model_OpenID.php";
require_once $config["path_base"] . "Provider_Model_OAuth1.php";
require_once $config["path_base"] . "Provider_Model_OAuth2.php";
require_once $config["path_base"] . "Provider_Model_OAuth2.php";

require_once $config["path_base"] . "User.php";
require_once $config["path_base"] . "User.php";
require_once $config["path_base"] . "User_Profile.php";
require_once $config["path_base"] . "User_Contact.php";
require_once $config["path_base"] . "User_Activity.php";

// hash given config
Hybrid_Auth::$config = $config;

// start session storage mng
Hybrid_Auth::$store = new Hybrid_Storage();

// instace of errors mng
Hybrid_Auth::$error = new Hybrid_Error();

// instace of log mng
Hybrid_Auth::$logger = new Hybrid_Logger();

// store php session and version..
$_SESSION["HA::PHP_SESSION_ID"] = session_id();
$_SESSION["HA::VERSION"] = Hybrid_Auth::$version;
// instace of errors mng
Hybrid_Auth::$error = new Hybrid_Error();

// start session storage mng
Hybrid_Auth::$store = new Hybrid_Storage();

// almost done, check for errors then move on
Hybrid_Logger::info( "Enter Hybrid_Auth::initialize()");
Hybrid_Logger::info( "Hybrid_Auth::initialize(). Hybrid_Auth used version: " . Hybrid_Auth::$version );
Hybrid_Logger::info( "Hybrid_Auth::initialize(). Hybrid_Auth called from: " . Hybrid_Auth::getCurrentUrl() );
Hybrid_Logger::debug( "Hybrid_Auth initialize. dump used config: ", serialize( $config ) );
Hybrid_Logger::debug( "Hybrid_Auth initialize. dump current session: ", serialize( $_SESSION ) );
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() ){
Expand Down
32 changes: 8 additions & 24 deletions hybridauth/Hybrid/Endpoint.php
View file
@@ -1,8 +1,8 @@
<?php
/*!
* HybridAuth
* http://hybridauth.sourceforge.net | https://github.com/hybridauth/hybridauth
* (c) 2009-2011 HybridAuth authors | hybridauth.sourceforge.net/licenses.html
* http://hybridauth.sourceforge.net | http://github.com/hybridauth/hybridauth
* (c) 2009-2012, HybridAuth authors | http://hybridauth.sourceforge.net/licenses.html
*/

/**
Expand Down Expand Up @@ -37,11 +37,6 @@ public static function process( $request = NULL )
Hybrid_Endpoint::$request = $_REQUEST;
}

// If windows_live_channel requested, we return our windows_live WRAP_CHANNEL_URL
if ( isset( Hybrid_Endpoint::$request["get"] ) && Hybrid_Endpoint::$request["get"] == "windows_live_channel" ) {
Hybrid_Endpoint::processWindowsLiveChannel();
}

// If openid_policy requested, we return our policy document
if ( isset( Hybrid_Endpoint::$request["get"] ) && Hybrid_Endpoint::$request["get"] == "openid_policy" ) {
Hybrid_Endpoint::processOpenidPolicy();
Expand All @@ -66,16 +61,6 @@ public static function process( $request = NULL )
}
}

/**
* Process Windows Live channel request
*/
public static function processWindowsLiveChannel()
{
$output = file_get_contents( dirname(__FILE__) . "/resources/windows_live_channel.html" );
print $output;
die();
}

/**
* Process OpenID policy request
*/
Expand Down Expand Up @@ -207,20 +192,19 @@ public static function authInit()
if ( ! Hybrid_Endpoint::$initDone) {
Hybrid_Endpoint::$initDone = TRUE;

// Start a new session
if ( ! session_id() ){
session_start();
}

# Init Hybrid_Auth
try {
require_once realpath( dirname( __FILE__ ) ) . "/Storage.php";

$storage = new Hybrid_Storage();

// Check if Hybrid_Auth session already exist
if ( ! isset( $_SESSION["HA::CONFIG"] ) ) {
if ( ! $storage->config( "CONFIG" ) ) {
header( "HTTP/1.0 404 Not Found" );
die( "You cannot access this page directly." );
}

Hybrid_Auth::initialize( unserialize( $_SESSION["HA::CONFIG"] ) );
Hybrid_Auth::initialize( $storage->config( "CONFIG" ) );
}
catch ( Exception $e ){
Hybrid_Logger::error( "Endpoint: Error while trying to init Hybrid_Auth" );
Expand Down
4 changes: 2 additions & 2 deletions hybridauth/Hybrid/Error.php
View file
@@ -1,8 +1,8 @@
<?php
/*!
* HybridAuth
* http://hybridauth.sourceforge.net | https://github.com/hybridauth/hybridauth
* (c) 2009-2011 HybridAuth authors | hybridauth.sourceforge.net/licenses.html
* http://hybridauth.sourceforge.net | http://github.com/hybridauth/hybridauth
* (c) 2009-2012, HybridAuth authors | http://hybridauth.sourceforge.net/licenses.html
*/

/**
Expand Down
4 changes: 2 additions & 2 deletions hybridauth/Hybrid/Logger.php
View file
@@ -1,8 +1,8 @@
<?php
/*!
* HybridAuth
* http://hybridauth.sourceforge.net | https://github.com/hybridauth/hybridauth
* (c) 2009-2011 HybridAuth authors | hybridauth.sourceforge.net/licenses.html
* http://hybridauth.sourceforge.net | http://github.com/hybridauth/hybridauth
* (c) 2009-2012, HybridAuth authors | http://hybridauth.sourceforge.net/licenses.html
*/

/**
Expand Down
8 changes: 4 additions & 4 deletions hybridauth/Hybrid/Provider_Adapter.php
View file
@@ -1,8 +1,8 @@
<?php
/*!
* HybridAuth
* http://hybridauth.sourceforge.net | https://github.com/hybridauth/hybridauth
* (c) 2009-2011 HybridAuth authors | hybridauth.sourceforge.net/licenses.html
* http://hybridauth.sourceforge.net | http://github.com/hybridauth/hybridauth
* (c) 2009-2012, HybridAuth authors | http://hybridauth.sourceforge.net/licenses.html
*/

/**
Expand Down Expand Up @@ -134,8 +134,8 @@ function login()
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
$_SESSION["HA::CONFIG"] = serialize( 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.", $this->params );
Expand Down
4 changes: 2 additions & 2 deletions hybridauth/Hybrid/Provider_Model.php
View file
@@ -1,8 +1,8 @@
<?php
/*!
* HybridAuth
* http://hybridauth.sourceforge.net | https://github.com/hybridauth/hybridauth
* (c) 2009-2011 HybridAuth authors | hybridauth.sourceforge.net/licenses.html
* http://hybridauth.sourceforge.net | http://github.com/hybridauth/hybridauth
* (c) 2009-2012, HybridAuth authors | http://hybridauth.sourceforge.net/licenses.html
*/

/**
Expand Down
4 changes: 2 additions & 2 deletions hybridauth/Hybrid/Provider_Model_OAuth1.php
View file
@@ -1,8 +1,8 @@
<?php
/*!
* HybridAuth
* http://hybridauth.sourceforge.net | https://github.com/hybridauth/hybridauth
* (c) 2009-2011 HybridAuth authors | hybridauth.sourceforge.net/licenses.html
* http://hybridauth.sourceforge.net | http://github.com/hybridauth/hybridauth
* (c) 2009-2012, HybridAuth authors | http://hybridauth.sourceforge.net/licenses.html
*/

/**
Expand Down
4 changes: 2 additions & 2 deletions hybridauth/Hybrid/Provider_Model_OAuth2.php
View file
@@ -1,8 +1,8 @@
<?php
/*!
* HybridAuth
* http://hybridauth.sourceforge.net | https://github.com/hybridauth/hybridauth
* (c) 2009-2011 HybridAuth authors | hybridauth.sourceforge.net/licenses.html
* http://hybridauth.sourceforge.net | http://github.com/hybridauth/hybridauth
* (c) 2009-2012, HybridAuth authors | http://hybridauth.sourceforge.net/licenses.html
*/

/**
Expand Down
4 changes: 2 additions & 2 deletions hybridauth/Hybrid/Provider_Model_OpenID.php
View file
@@ -1,8 +1,8 @@
<?php
/*!
* HybridAuth
* http://hybridauth.sourceforge.net | https://github.com/hybridauth/hybridauth
* (c) 2009-2011 HybridAuth authors | hybridauth.sourceforge.net/licenses.html
* http://hybridauth.sourceforge.net | http://github.com/hybridauth/hybridauth
* (c) 2009-2012, HybridAuth authors | http://hybridauth.sourceforge.net/licenses.html
*/

/**
Expand Down
4 changes: 2 additions & 2 deletions hybridauth/Hybrid/Providers/AOL.php
View file
@@ -1,8 +1,8 @@
<?php
/*!
* HybridAuth
* http://hybridauth.sourceforge.net | https://github.com/hybridauth/hybridauth
* (c) 2009-2011 HybridAuth authors | hybridauth.sourceforge.net/licenses.html
* http://hybridauth.sourceforge.net | http://github.com/hybridauth/hybridauth
* (c) 2009-2012, HybridAuth authors | http://hybridauth.sourceforge.net/licenses.html
*/

/**
Expand Down
4 changes: 2 additions & 2 deletions hybridauth/Hybrid/Providers/Facebook.php
View file
@@ -1,8 +1,8 @@
<?php
/*!
* HybridAuth
* http://hybridauth.sourceforge.net | https://github.com/hybridauth/hybridauth
* (c) 2009-2011 HybridAuth authors | hybridauth.sourceforge.net/licenses.html
* http://hybridauth.sourceforge.net | http://github.com/hybridauth/hybridauth
* (c) 2009-2012, HybridAuth authors | http://hybridauth.sourceforge.net/licenses.html
*/

/**
Expand Down
4 changes: 2 additions & 2 deletions hybridauth/Hybrid/Providers/Foursquare.php
View file
@@ -1,8 +1,8 @@
<?php
/*!
* HybridAuth
* http://hybridauth.sourceforge.net | https://github.com/hybridauth/hybridauth
* (c) 2009-2011 HybridAuth authors | hybridauth.sourceforge.net/licenses.html
* http://hybridauth.sourceforge.net | http://github.com/hybridauth/hybridauth
* (c) 2009-2012, HybridAuth authors | http://hybridauth.sourceforge.net/licenses.html
*/

/**
Expand Down
4 changes: 2 additions & 2 deletions hybridauth/Hybrid/Providers/Google.php
View file
@@ -1,8 +1,8 @@
<?php
/*!
* HybridAuth
* http://hybridauth.sourceforge.net | https://github.com/hybridauth/hybridauth
* (c) 2009-2011 HybridAuth authors | hybridauth.sourceforge.net/licenses.html
* http://hybridauth.sourceforge.net | http://github.com/hybridauth/hybridauth
* (c) 2009-2012, HybridAuth authors | http://hybridauth.sourceforge.net/licenses.html
*/

/**
Expand Down
40 changes: 0 additions & 40 deletions hybridauth/Hybrid/Providers/GoogleOpenID.php
View file

This file was deleted.

0 comments on commit 90dd7fb

Please sign in to comment.