Fix #5774 - City / Province...

[Pman.Core] / DataObjects / Core_person.php

diff --git a/DataObjects/Core_person.php b/DataObjects/Core_person.php
index 3ef5e12..12a9793 100644 (file)
--- a/DataObjects/Core_person.php
+++ b/DataObjects/Core_person.php
@@ -815,7 +815,7 @@ class Pman_Core_DataObjects_Core_person extends DB_DataObject
             $roo->jdata(array(
                 'secret' => $hash,
                 'image' => $qrcode,
-                'issuer' => $person->issuer
+                'issuer' => $person->qrCodeIssuer()
             ));
         }
         
@@ -1475,8 +1475,7 @@ class Pman_Core_DataObjects_Core_person extends DB_DataObject
             return false;
         }
         
-        
-        $issuer = rawurlencode($this->issuer);
+        $issuer = rawurlencode($this->qrCodeIssuer());
         
         $uri = "otpauth://totp/{$issuer}:{$this->email}?secret={$hash}&issuer={$issuer}&algorithm=SHA1&digits=6&period=30";
         
@@ -1500,9 +1499,9 @@ class Pman_Core_DataObjects_Core_person extends DB_DataObject
     {
         $pg= HTML_FlexyFramework::get()->page;
         
-        $this->issuer = (empty($pg->company->name)) ?  'COBA KYC' : "{$pg->company->name} COBA KYC";
+        $issuer = (empty($pg->company->name)) ?  'ROOJS' : "{$pg->company->name}";
         
-        return;
+        return $issuer;
     }
     
     static function test_ADMIN_PASSWORD_RESET($pg, $to)