DataObjects/Core_person.php

[Pman.Core] / DataObjects / Core_person.php

diff --git a/DataObjects/Core_person.php b/DataObjects/Core_person.php
index 9a57da0..ea39252 100644 (file)
--- a/DataObjects/Core_person.php
+++ b/DataObjects/Core_person.php
@@ -327,7 +327,7 @@ class Pman_Core_DataObjects_Core_person extends DB_DataObject
         }
         
         
-        if (empty($_SERVER['PATH_INFO']) || preg_match('#^(/Login$|/PasswordReset)#/', $_SERVER['PATH_INFO']) {
+        if (empty($_SERVER['PATH_INFO']) ||  $_SERVER['PATH_INFO'] == '/Login') {
             $auto_auth_allow  = false;
         }
         //var_dump($auto_auth_allow);
@@ -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'])) {
@@ -1470,9 +1473,9 @@ class Pman_Core_DataObjects_Core_person extends DB_DataObject
         ){
             return false;
         }
+        $pg= HTML_FlexyFramework::get()->page;
         
-        $issuer = (empty($this->name)) ? 
-            rawurlencode('ROOJS') : rawurlencode($this->name);
+        $issuer = (empty($pg->company->name)) ?  rawurlencode('ROOJS') : rawurlencode($pg->company->name);
         
         $uri = "otpauth://totp/{$issuer}:{$this->email}?secret={$hash}&issuer={$issuer}&algorithm=SHA1&digits=6&period=30";