rename module methods in extended OXID classes to prevent conflicts with other modules
Dieser Commit ist enthalten in:
Ursprung
4c29245ddb
Commit
deb598bbe5
@ -42,7 +42,7 @@ trait checkoutGetUserTrait
|
||||
$webauthn = $this->d3GetWebauthnObject();
|
||||
|
||||
if ($webauthn->isActive($user->getId())
|
||||
&& !$this->d3GetSessionObject()->getVariable(WebauthnConf::WEBAUTHN_SESSION_AUTH)
|
||||
&& !$this->d3WebauthnGetSessionObject()->getVariable(WebauthnConf::WEBAUTHN_SESSION_AUTH)
|
||||
) {
|
||||
return false;
|
||||
}
|
||||
@ -62,7 +62,7 @@ trait checkoutGetUserTrait
|
||||
/**
|
||||
* @return Session
|
||||
*/
|
||||
public function d3GetSessionObject(): Session
|
||||
public function d3WebauthnGetSessionObject(): Session
|
||||
{
|
||||
return Registry::getSession();
|
||||
}
|
||||
|
@ -49,7 +49,7 @@ class d3_LoginController_Webauthn extends d3_LoginController_Webauthn_parent
|
||||
$password = Registry::getRequest()->getRequestParameter('pwd');
|
||||
|
||||
/** @var d3_User_Webauthn $user */
|
||||
$user = $this->d3GetUserObject();
|
||||
$user = $this->d3WebauthnGetUserObject();
|
||||
$userId = $user->d3GetLoginUserId($lgn_user, 'malladmin');
|
||||
|
||||
if ($lgn_user && $userId &&
|
||||
@ -86,14 +86,14 @@ class d3_LoginController_Webauthn extends d3_LoginController_Webauthn_parent
|
||||
*/
|
||||
public function d3WebauthnCancelLogin(): void
|
||||
{
|
||||
$oUser = $this->d3GetUserObject();
|
||||
$oUser = $this->d3WebauthnGetUserObject();
|
||||
$oUser->logout();
|
||||
}
|
||||
|
||||
/**
|
||||
* @return User
|
||||
*/
|
||||
public function d3GetUserObject(): User
|
||||
public function d3WebauthnGetUserObject(): User
|
||||
{
|
||||
return oxNew(User::class);
|
||||
}
|
||||
|
Laden…
In neuem Issue referenzieren
Einen Benutzer sperren