DataObjects/Core_group.php

[Pman.Core] / DataObjects / Core_person.php

diff --git a/DataObjects/Core_person.php b/DataObjects/Core_person.php
index 6ebd725..3fbf656 100644 (file)
--- a/DataObjects/Core_person.php
+++ b/DataObjects/Core_person.php
@@ -254,7 +254,6 @@ class Pman_Core_DataObjects_Core_person extends DB_DataObject
     //   ---------------- authentication / passwords and keys stuff  ----------------
     function isAuth()
     {
-        
         @session_start();
        
         $ff= HTML_FlexyFramework::get();
@@ -855,8 +854,6 @@ class Pman_Core_DataObjects_Core_person extends DB_DataObject
                         $tn_g.name = '{$v}'
                 )"
             );
-            
-            $this->jdata();
         }
         
         // #2307 Search Country!!
@@ -1185,6 +1182,7 @@ class Pman_Core_DataObjects_Core_person extends DB_DataObject
         }
         $c = DB_DataObject::Factory('core_company');
         $tc = $c->count();
+        
         if (!$tc || $tc> 1) {
             $roo->jerr("can not create initial user as multiple companies already exist");
         }
@@ -1349,7 +1347,7 @@ class Pman_Core_DataObjects_Core_person extends DB_DataObject
                 $roo->jerr('Fail to generate QR Code');
             }
             
-            $roo->jdata($qrcode);
+            $roo->jok($qrcode);
         }
     }