mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-18 04:12:00 +02:00
Code Issues Releases Wiki Activity

Code deduplication in signup_shortcodes for XUP login

Browse Source 
Also fixed variable passing weirdness in API of e_user_provider
This commit is contained in:
Nick Liu
2020-02-20 00:03:16 +01:00
parent bc4ade5a27
commit 616add5c93
2 changed files with 63 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
e107_handlers/user_handler.php
View File

@@ -1157,7 +1157,7 @@ class e_user_provider
public function setBackUrl($url, $action)
{
# system/xup/login by default
$this->_config['callback'] = $this->generateCallbackUrl($this->getProvider(), $action, $url);
$this->_config['callback'] = $this->generateCallbackUrl($action, $url);
$this->respawnHybridauth();
}
@@ -1519,12 +1519,12 @@ class e_user_provider
* @param string $backUrl
* @return string
*/
private function generateCallbackUrl($provider, $xupAction = "login", $backUrl = null)
public function generateCallbackUrl($xupAction = "login", $backUrl = null)
{
return e107::getUrl()->create(
"system/xup/$xupAction",
array(
'provider' => $provider,
'provider' => $this->getProvider(),
'back' => $backUrl,
),
array('full' => true, 'encode' => false)