DataObjects/Core_person.php

[Pman.Core] / DataObjects / Core_person.php

diff --git a/DataObjects/Core_person.php b/DataObjects/Core_person.php
index 006751a..3ef5e12 100644 (file)
--- a/DataObjects/Core_person.php
+++ b/DataObjects/Core_person.php
@@ -327,8 +327,7 @@ class Pman_Core_DataObjects_Core_person extends DB_DataObject
         }
         
         
-        if (empty($_SERVER['PATH_INFO']) || $_SERVER['PATH_INFO'] == '/Login' || $_SERVER['PATH_INFO'] == '/PasswordReset'
-        ) {
+        if (empty($_SERVER['PATH_INFO']) ||  $_SERVER['PATH_INFO'] == '/Login') {
             $auto_auth_allow  = false;
         }
         //var_dump($auto_auth_allow);
@@ -813,7 +812,11 @@ 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,
+                'issuer' => $person->issuer
+            ));
         }
         
         if(!empty($q['two_factor_auth_code'])) {
@@ -1472,8 +1475,8 @@ class Pman_Core_DataObjects_Core_person extends DB_DataObject
             return false;
         }
         
-        $issuer = (empty($this->name)) ? 
-            rawurlencode('ROOJS') : rawurlencode($this->name);
+        
+        $issuer = rawurlencode($this->issuer);
         
         $uri = "otpauth://totp/{$issuer}:{$this->email}?secret={$hash}&issuer={$issuer}&algorithm=SHA1&digits=6&period=30";
         
@@ -1493,6 +1496,15 @@ class Pman_Core_DataObjects_Core_person extends DB_DataObject
         return "data:image/png;base64,{$base64}";
     }
     
+    function qrCodeIssuer()
+    {
+        $pg= HTML_FlexyFramework::get()->page;
+        
+        $this->issuer = (empty($pg->company->name)) ?  'COBA KYC' : "{$pg->company->name} COBA KYC";
+        
+        return;
+    }
+    
     static function test_ADMIN_PASSWORD_RESET($pg, $to)
     {
         $ff = HTML_FlexyFramework::get();