sync

[web.mtrack] / MTrackWeb / Login.php

diff --git a/MTrackWeb/Login.php b/MTrackWeb/Login.php
index c7cb124..b7f0e59 100644 (file)
--- a/MTrackWeb/Login.php
+++ b/MTrackWeb/Login.php
@@ -43,7 +43,7 @@ class MTrackWeb_Login extends MTrackWeb
             $this->jok("refreshed");
         }
         
-        $u = DB_DataObject::factory('Person');
+        $u = DB_DataObject::factory('core_person');
         //$u->active = 1;
         $u->whereAdd('LENGTH(passwd) > 1');
         //$u->company_id = $this->company->id;
@@ -73,12 +73,11 @@ class MTrackWeb_Login extends MTrackWeb
             //}
              // log it..
              
-             
-            $p = DB_DataObject::factory('Projects');
+            $this->authUser= $u;
+            $p = DB_DataObject::factory('core_project');
             $p->get($this->currentProject());
             $ret = $u->toArray();
-            //$ret['project_id'] = $p->id;
-            //$ret['project_name'] = $p->name;
+            $ret['project'] = $p->toArray();
             $this->jok($ret);