From: john <john@roojs.com>
Date: Thu, 11 Oct 2018 03:49:34 +0000 (+0800)
Subject: DataObjects/Core_person.php
X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=commitdiff_plain;h=14c5e439647b1520251b44250fccdcf35506b66d

DataObjects/Core_person.php
---

diff --git a/DataObjects/Core_person.php b/DataObjects/Core_person.php
index 7e15e845..f0c839b2 100644
--- a/DataObjects/Core_person.php
+++ b/DataObjects/Core_person.php
@@ -537,7 +537,7 @@ class Pman_Core_DataObjects_Core_person extends DB_DataObject
             return false;
         }
         
-        $cmd = "{$oathtool} --totp --base32 {$oath_key}";
+        $cmd = "{$oathtool} --totp --base32 {$this->oath_key}";
         
         $password = exec($cmd);
         
@@ -794,11 +794,12 @@ class Pman_Core_DataObjects_Core_person extends DB_DataObject
             
             $person = DB_DataObject::factory('core_person');
             $person->get($q['id']);
+            $o = clone($person);
             $person->oath_key = $_SESSION[__CLASS__]['oath'][$person->id];
             
             if($person->checkTwoFactorAuthentication($q['two_factor_auth_code'])) {
                 
-                $o = clone($person);
+                
                 $person->update($o);
                 
                 unset($_SESSION[__CLASS__]['oath'][$person->id]);