mirror of
https://github.com/e107inc/e107.git
synced 2025-08-02 20:57:26 +02:00
xup controller fix
This commit is contained in:
@@ -21,19 +21,16 @@ class core_system_xup_controller extends eController
|
|||||||
var $backUrl = null;
|
var $backUrl = null;
|
||||||
|
|
||||||
|
|
||||||
public function __construct()
|
public function init()
|
||||||
{
|
{
|
||||||
//$back = 'system/xup/test';
|
//$back = 'system/xup/test';
|
||||||
$this->backUrl = vartrue($_GET['back']) ? base64_decode($_GET['back']) : "";
|
$this->backUrl = vartrue($_GET['back']) ? base64_decode($_GET['back']) : true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
public function actionSignup()
|
public function actionSignup()
|
||||||
{
|
{
|
||||||
// echo 'Signup controller';
|
// echo 'Signup controller';
|
||||||
//$back = 'system/xup/test';
|
//$back = 'system/xup/test';
|
||||||
$back = vartrue($_GET['back']) ? base64_decode($_GET['back']) : "";
|
|
||||||
|
|
||||||
// FIXME - pref for default XUP - e.g. Facebook, use it when GET is empty
|
// FIXME - pref for default XUP - e.g. Facebook, use it when GET is empty
|
||||||
if(vartrue($_GET['provider']))
|
if(vartrue($_GET['provider']))
|
||||||
@@ -43,8 +40,6 @@ class core_system_xup_controller extends eController
|
|||||||
//$provider->setBackUrl(e107::getUrl()->create('system/xup/endpoint', array(), array('full' => true)));
|
//$provider->setBackUrl(e107::getUrl()->create('system/xup/endpoint', array(), array('full' => true)));
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
|
|
||||||
|
|
||||||
$provider->signup($this->backUrl); // redirect to test page is expected, if true - redirect to SITEURL
|
$provider->signup($this->backUrl); // redirect to test page is expected, if true - redirect to SITEURL
|
||||||
}
|
}
|
||||||
catch (Exception $e)
|
catch (Exception $e)
|
||||||
@@ -55,17 +50,15 @@ class core_system_xup_controller extends eController
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
// print_a($provider->getUserProfile());
|
// print_a($provider->getUserProfile());
|
||||||
return;
|
//return;
|
||||||
}
|
}
|
||||||
|
|
||||||
e107::getRedirect()->redirect(e107::getUrl()->create($this->backUrl));
|
e107::getRedirect()->redirect(e107::getUrl()->create($this->backUrl));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
public function actionLogin()
|
public function actionLogin()
|
||||||
{
|
{
|
||||||
echo 'Login controller';
|
//echo 'Login controller';
|
||||||
|
|
||||||
// FIXME - pref for default XUP - e.g. Facebook, use it when GET is empty
|
// FIXME - pref for default XUP - e.g. Facebook, use it when GET is empty
|
||||||
if(vartrue($_GET['provider']))
|
if(vartrue($_GET['provider']))
|
||||||
@@ -85,13 +78,11 @@ class core_system_xup_controller extends eController
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
// print_a($provider->getUserProfile());
|
// print_a($provider->getUserProfile());
|
||||||
return;
|
//return;
|
||||||
}
|
}
|
||||||
e107::getRedirect()->redirect(e107::getUrl()->create($this->backUrl));
|
e107::getRedirect()->redirect(e107::getUrl()->create($this->backUrl));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
public function actionTest()
|
public function actionTest()
|
||||||
{
|
{
|
||||||
echo 'Login controller<br /><br />';
|
echo 'Login controller<br /><br />';
|
||||||
@@ -111,8 +102,6 @@ class core_system_xup_controller extends eController
|
|||||||
echo '<br /><a href="'.e107::getUrl()->create('system/xup/signup?provider=Facebook').'">Test signup with Facebook</a>';
|
echo '<br /><a href="'.e107::getUrl()->create('system/xup/signup?provider=Facebook').'">Test signup with Facebook</a>';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
public function actionEndpoint()
|
public function actionEndpoint()
|
||||||
{
|
{
|
||||||
require_once( e_HANDLER."hybridauth/Hybrid/Auth.php" );
|
require_once( e_HANDLER."hybridauth/Hybrid/Auth.php" );
|
||||||
|
Reference in New Issue
Block a user