diff --git a/src/Application/Controller/Admin/d3force_2fa.php b/src/Application/Controller/Admin/d3force_2fa.php index 3ff40fe..8b9ea95 100644 --- a/src/Application/Controller/Admin/d3force_2fa.php +++ b/src/Application/Controller/Admin/d3force_2fa.php @@ -13,7 +13,7 @@ class d3force_2fa extends d3user_totp { $this->addTplParam('force2FA', true); - $userID = $this->d3GetSessionObject()->getVariable("auth"); + $userID = $this->d3TotpGetSessionObject()->getVariable("auth"); $this->_sEditObjectId = $userID; return parent::render(); @@ -22,7 +22,7 @@ class d3force_2fa extends d3user_totp protected function _authorize() { - $userID = $this->d3GetSessionObject()->getVariable("auth"); + $userID = $this->d3TotpGetSessionObject()->getVariable("auth"); return ($this->d3IsAdminForce2FA() && !empty($userID)); } @@ -30,7 +30,7 @@ class d3force_2fa extends d3user_totp /** * @return Session */ - private function d3GetSessionObject() + private function d3TotpGetSessionObject() { return Registry::getSession(); } diff --git a/src/Application/Model/d3backupcode.php b/src/Application/Model/d3backupcode.php index 30c5336..5308943 100644 --- a/src/Application/Model/d3backupcode.php +++ b/src/Application/Model/d3backupcode.php @@ -57,7 +57,7 @@ class d3backupcode extends BaseModel public function d3EncodeBC($code, $sUserId) { $oDb = DatabaseProvider::getDb(); - $oUser = $this->d3GetUserObject(); + $oUser = $this->d3TotpGetUserObject(); $oUser->load($sUserId); $salt = $oUser->getFieldData('oxpasssalt'); $sSelect = "SELECT BINARY MD5( CONCAT( " . $oDb->quote($code) . ", UNHEX( ".$oDb->quote($salt)." ) ) )"; @@ -83,7 +83,7 @@ class d3backupcode extends BaseModel /** * @return User */ - public function d3GetUserObject() + public function d3TotpGetUserObject() { return oxNew(User::class); } diff --git a/src/Application/views/tpl/d3totplogin.tpl b/src/Application/views/tpl/d3totplogin.tpl index d230730..49bfa75 100644 --- a/src/Application/views/tpl/d3totplogin.tpl +++ b/src/Application/views/tpl/d3totplogin.tpl @@ -11,7 +11,7 @@