From 530fed50a5b08359fd7572c2d353496ad762d595 Mon Sep 17 00:00:00 2001 From: Alan Knowles Date: Wed, 12 Oct 2016 18:20:32 +0800 Subject: [PATCH] sync --- MTrackWeb.php | 2 +- MTrackWeb/Cron/Notify.php | 2 +- MTrackWeb/Gitlive.php | 2 +- MTrackWeb/Hook/git.php | 2 +- MTrackWeb/LinkHandler.php | 2 +- MTrackWeb/Login.php | 4 ++-- MTrackWeb/Project.php | 16 ++++++++-------- MTrackWeb/Ticket.php | 2 +- MTrackWeb/TicketEdit.php | 2 +- MTrackWeb/Timeline.php | 2 +- MTrackWeb/Wiki.php | 2 +- roo.php | 16 ++++++++++++---- 12 files changed, 31 insertions(+), 23 deletions(-) diff --git a/MTrackWeb.php b/MTrackWeb.php index 3d5294ed..d0e65e30 100644 --- a/MTrackWeb.php +++ b/MTrackWeb.php @@ -126,7 +126,7 @@ class MTrackWeb extends HTML_FlexyFramework_Page if (empty($currentProject)) { - //$p = DB_DataObject::factory('Projects'); + //$p = DB_DataObject::factory('core_project'); //$p->get('code', '*PUBLIC'); $id = 0; foreach($ar as $k=>$v) { diff --git a/MTrackWeb/Cron/Notify.php b/MTrackWeb/Cron/Notify.php index 810a9e6f..313352c5 100644 --- a/MTrackWeb/Cron/Notify.php +++ b/MTrackWeb/Cron/Notify.php @@ -74,7 +74,7 @@ class MTrackWeb_Cron_Notify extends MTrackWeb $cs->autoJoin(); $cache[implode(',', $ar)] = $cs->fetchAll(); } - $u = DB_DataObject::factory('Person'); + $u = DB_DataObject::factory('core_person'); $u->get($uid); $method = 'notify_'. $lr[0] ; if (method_exists($this,$method)) { diff --git a/MTrackWeb/Gitlive.php b/MTrackWeb/Gitlive.php index 6ec12c52..3db2ba24 100644 --- a/MTrackWeb/Gitlive.php +++ b/MTrackWeb/Gitlive.php @@ -18,7 +18,7 @@ class MTrackWeb_Gitlive extends MTrackWeb if (!isset($_SERVER['PHP_AUTH_USER'])) { $this->h401(); } - $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; diff --git a/MTrackWeb/Hook/git.php b/MTrackWeb/Hook/git.php index 28b10e31..0fb629b0 100755 --- a/MTrackWeb/Hook/git.php +++ b/MTrackWeb/Hook/git.php @@ -73,7 +73,7 @@ class MTrackWeb_Hook_git extends MTrackWeb $who = $revs[0]->changebyToEmail(); - $this->authUser = DB_DataObject::factory('Person'); + $this->authUser = DB_DataObject::factory('core_person'); $this->authUser->get('email', $who); $cfg = HTML_FlexyFramework::get()->MTrackWeb; diff --git a/MTrackWeb/LinkHandler.php b/MTrackWeb/LinkHandler.php index ebac15d3..ec777ffb 100644 --- a/MTrackWeb/LinkHandler.php +++ b/MTrackWeb/LinkHandler.php @@ -127,7 +127,7 @@ class MTrackWeb_LinkHandler //implements MTrack_Interface_WikiLinkHandler $person = $target; $target = $person->id; } else { - $person = DB_DataObject::factory('Person'); + $person = DB_DataObject::factory('core_person'); $person->get($target); } diff --git a/MTrackWeb/Login.php b/MTrackWeb/Login.php index 5797d55d..b7f0e592 100644 --- 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; @@ -74,7 +74,7 @@ class MTrackWeb_Login extends MTrackWeb // log it.. $this->authUser= $u; - $p = DB_DataObject::factory('Projects'); + $p = DB_DataObject::factory('core_project'); $p->get($this->currentProject()); $ret = $u->toArray(); $ret['project'] = $p->toArray(); diff --git a/MTrackWeb/Project.php b/MTrackWeb/Project.php index 22e810b9..a45ba48b 100644 --- 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 '
';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");
             
diff --git a/MTrackWeb/Ticket.php b/MTrackWeb/Ticket.php
index 7c038498..7170d200 100644
--- a/MTrackWeb/Ticket.php
+++ b/MTrackWeb/Ticket.php
@@ -272,7 +272,7 @@ class MTrackWeb_Ticket extends MTrackWeb
         $pd = DB_DataObject::factory('ProjectDirectory');
         $pd->project_id = $this->currentProject();
         $pd->whereAdd("ProjectDirectory.role != ''");
-        $pd->joinAdd(DB_DataObject::factory('Person'), 'LEFT');
+        $pd->joinAdd(DB_DataObject::factory('core_person'), 'LEFT');
         $pd->selectAdd();
         $pd->selectAdd("distinct(Person.id) as id ,  CONCAT(Person.name , '<', Person.email , '>') as name");
         $pd->groupBy('Person.id, Person.name');
diff --git a/MTrackWeb/TicketEdit.php b/MTrackWeb/TicketEdit.php
index e8914c6b..41e51760 100644
--- a/MTrackWeb/TicketEdit.php
+++ b/MTrackWeb/TicketEdit.php
@@ -380,7 +380,7 @@ class MTrackWeb_TicketEdit extends MTrackWeb
         $pd = DB_DataObject::factory('ProjectDirectory');
         $pd->project_id = $this->currentProject();
         $pd->whereAdd("ProjectDirectory.role != ''");
-        $pd->joinAdd(DB_DataObject::factory('Person'), 'LEFT');
+        $pd->joinAdd(DB_DataObject::factory('core_person'), 'LEFT');
         $pd->selectAdd();
         $pd->selectAdd("distinct(Person.id) as id ,  CONCAT(Person.name , '<', Person.email , '>') as name");
         $pd->groupBy('Person.id, Person.name');
diff --git a/MTrackWeb/Timeline.php b/MTrackWeb/Timeline.php
index 7be57230..80b5ebcd 100644
--- a/MTrackWeb/Timeline.php
+++ b/MTrackWeb/Timeline.php
@@ -60,7 +60,7 @@ class MTrackWeb_Timeline extends MTrackWeb
             $isSummary = true;
             $e->whereAdd("changedate >= '$start 00:00:00' AND changedate < '$start 00:00:00' + INTERVAL 1 MONTH");
             $e->selectAdd();
-            $e->joinAdd(DB_DataObject::factory('Person'), 'LEFT');
+            $e->joinAdd(DB_DataObject::factory('core_person'), 'LEFT');
             $e->selectAdd("
                      DATE_FORMAT(changedate, '%Y-%m-%d')  as changeday,
                      CONCAT(DATE_FORMAT(changedate, '%Y-%m-%d-') ,Person.id)  as id,
diff --git a/MTrackWeb/Wiki.php b/MTrackWeb/Wiki.php
index 120f97c5..a1b31f88 100644
--- a/MTrackWeb/Wiki.php
+++ b/MTrackWeb/Wiki.php
@@ -52,7 +52,7 @@ class MTrackWeb_Wiki extends MTrackWeb
             $px->project_id =  $this->currentProject();
             $px->orderBy('path');
             
-            $pr = DB_DataObject::factory('Projects');
+            $pr = DB_DataObject::factory('core_project');
             $pr->get($px->project_id);
             
             $ar = $px->fetchAll('path');
diff --git a/roo.php b/roo.php
index 6a9103ec..83d4d40b 100644
--- a/roo.php
+++ b/roo.php
@@ -25,18 +25,26 @@ new HTML_FlexyFramework(array(
 
         'class_location' => implode(PATH_SEPARATOR, array(
                 dirname(__FILE__). '/Pman/MTrack/DataObjects',
-                dirname(__FILE__). '/Pman/CoreBC/DataObjects',
                 dirname(__FILE__). '/Pman/Core/DataObjects',
                 
         )),
-        'class_prefix' => 'Pman_MTrack_DataObjects_:Pman_CoreBC_DataObjects_:Pman_Core_DataObjects_:',
+        'class_prefix' => 'Pman_MTrack_DataObjects_:Pman_Core_DataObjects_:',
         
         'ini_mtrack' => implode(PATH_SEPARATOR, array(
                 dirname(__FILE__). '/Pman/CoreBC/DataObjects/pman.ini',
-                dirname(__FILE__). '/Pman/Core/DataObjects/pman.ini',
                 dirname(__FILE__). '/PmanMTrack/DataObjects/pman.ini',
                 
         )),
+        'table_alias' => array(
+            'core_person' => 'Person',
+            'core_company' => 'Companies',
+            'core_group_member' => 'group_members',
+            'core_group_right' => 'group_rights',
+            'core_group' => 'Groups',
+            'core_office' => 'Office',
+            'core_project' => 'Projects',
+        )
+
     ),
     'MTrackWeb' => array(
         'working_dir' => '/var/lib/mtrack', // this needs to be writable by web user..
@@ -54,7 +62,7 @@ new HTML_FlexyFramework(array(
             'UnixLineBreak',
             //'Wiki', //?????
             
-        )
+        ), 
     ),
     'Pman' => array(
         // where the images go.
-- 
2.39.2