From: Edward <edward@roojs.com>
Date: Wed, 19 Dec 2018 07:25:07 +0000 (+0800)
Subject: DataObjects/Core_person.php
X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=commitdiff_plain;h=c36c8685cfaa2e898b1c0e14e977fb5886ec932a

DataObjects/Core_person.php
---

diff --git a/DataObjects/Core_person.php b/DataObjects/Core_person.php
index db698427..ea392529 100644
--- a/DataObjects/Core_person.php
+++ b/DataObjects/Core_person.php
@@ -796,7 +796,7 @@ class Pman_Core_DataObjects_Core_person extends DB_DataObject
             }
             
             $hash = $this->generateOathKey();
-            print_r($hash);exit;
+            
             $_SESSION[__CLASS__] = 
                 isset($_SESSION[__CLASS__]) ? 
                     $_SESSION[__CLASS__] : array();
@@ -812,7 +812,10 @@ class Pman_Core_DataObjects_Core_person extends DB_DataObject
                 $roo->jerr('Fail to generate QR Code');
             }
             
-            $roo->jok($qrcode);
+            $roo->jdata(array(
+                'secret' => $hash,
+                'image' => $qrcode
+            ));
         }
         
         if(!empty($q['two_factor_auth_code'])) {