sync

[web.mtrack] / MTrackWeb / Project.php

diff --git a/MTrackWeb/Project.php b/MTrackWeb/Project.php
index 22e810b..a45ba48 100644 (file)
--- a/MTrackWeb/Project.php
+++ b/MTrackWeb/Project.php
@@ -18,7 +18,7 @@ class MTrackWeb_Project extends MTrackWeb
         }
         $this->masterTemplate = 'project.html';
          
-        $p = DB_DataObject::factory('Projects');
+        $p = DB_DataObject::factory('core_project');
         $p->get( $this->currentProject());
         $this->project = $p;
         
@@ -37,7 +37,7 @@ class MTrackWeb_Project extends MTrackWeb
         }
         ///DB_DataObject::debugLevel(1);
         // fetch permissions.
-        $gr = DB_DataObject::factory('Group_Rights');
+        $gr = DB_DataObject::factory('core_group_right');
         $ar = $gr->defaultPermData();
         //echo '<PRE>';print_r($ar);
         $perms = array();
@@ -48,7 +48,7 @@ class MTrackWeb_Project extends MTrackWeb
             $perms[] = $nm; 
                 
         }
-        $gr = DB_DataObject::factory('Group_Rights');
+        $gr = DB_DataObject::factory('core_group_right');
         $gr->whereAddIn('rightname', $perms, 'string');
         $gr->selectAdd();
         
@@ -57,7 +57,7 @@ class MTrackWeb_Project extends MTrackWeb
         $gids = $gr->fetchAll('group_id');
         //print_R($gids);
         
-        $g = DB_DataObject::Factory('groups');
+        $g = DB_DataObject::factory('core_group');
         $g->whereAddIn('id',$gids, 'int');
         $this->groups = $g->fetchAll( );
         
@@ -83,7 +83,7 @@ class MTrackWeb_Project extends MTrackWeb
             $pd->person = $pd->person();
             $pd->person->perms = $pd->person->getPerms();
             
-            $g = DB_DataObject::Factory('Group_Members');
+            $g = DB_DataObject::factory('core_group_member');
             $pd->person->groups  = $g->listGroupMembership($pd->person);
             
              
@@ -132,11 +132,11 @@ class MTrackWeb_Project extends MTrackWeb
                     $this->jerr("permission denied");
                 }
                 
-                $p = DB_DataObject::factory('Person');
+                $p = DB_DataObject::factory('core_person');
                 if (empty($_POST['uid']) || !$p->get($_POST['uid'])) {
                     $this->jerr("invalid user");
                 }
-                $g = DB_DataObject::factory('Groups');
+                $g = DB_DataObject::factory('core_group');
                 if (empty($_POST['gid']) || !$g->get($_POST['gid'])) {
                     $this->jerr("invalid group");
                 }
@@ -144,7 +144,7 @@ class MTrackWeb_Project extends MTrackWeb
                 
                 
                 $state = empty($_POST['value']) ? 0 : 1;
-                $gm = DB_DataObject::factory('Group_Members');
+                $gm = DB_DataObject::factory('core_group_member');
                 $gm->change($p, $g, $state);
                 $this->jok("updated");