X-Git-Url: http://git.roojs.org/?p=web.mtrack;a=blobdiff_plain;f=MTrackWeb.php;h=27a511ae2f058cbea1d945b315c9d0afe0b9ed84;hp=e8e1e939329e17eeb9f83f71030272fc20d23727;hb=HEAD;hpb=94bbb80714f1d86bc8844b3f73afdd593a4c5fcb

diff --git a/MTrackWeb.php b/MTrackWeb.php
index e8e1e939..03e3c3c2 100644
--- a/MTrackWeb.php
+++ b/MTrackWeb.php
@@ -10,6 +10,8 @@ class MTrackWeb extends HTML_FlexyFramework_Page
     var $priorities = array();
     var $severities = array();
     var $link = false; // the link handler..
+    var $authUser;
+    var $currentProject;
     
     function hasPerm($what, $cando) {
         // our whole perm logic sits in here....
@@ -36,7 +38,7 @@ class MTrackWeb extends HTML_FlexyFramework_Page
         if (!$project_id) {
             return false;
         }
-        $p = DB_DataObject::factory('Projects');
+        $p = DB_DataObject::factory('core_project');
         $p->get($project_id);
         if (!$this->authUser) {
             if ($p->code != '*PUBLIC') {
@@ -111,7 +113,7 @@ class MTrackWeb extends HTML_FlexyFramework_Page
         
         
         $ar = $this->userProjects();
-        //print_r($ar);
+         
         if (!isset($ar[$currentProject])) {
             $currentProject = false;
             $_SESSION[__CLASS__]['active_project_id'] = false;
@@ -126,7 +128,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) {
@@ -150,22 +152,26 @@ class MTrackWeb extends HTML_FlexyFramework_Page
     function userProjects()
     {
         
-        $p = DB_DataObject::factory('Projects');
+        $p = DB_DataObject::factory('core_project');
         if (!$this->authUser) {
             $p->code = '*PUBLIC';
            
             $ar = $p->fetchAll('id', 'name');
         } else {
-            //DB_DAtaObject::debugLevel(1);
-            $p->applyFilters(array(), $this->authUser);
+            
+           // DB_DAtaObject::debugLevel(1);
+            $p->applyFilters(array(), $this->authUser, $this);
             if (!$this->authUser->hasPerm('Core.Projects_All', 'S')) { 
                 $p->whereAdd("Projects.id in (SELECT ProjectDirectory.project_id FROM ProjectDirectory WHERE
                         person_id = ". $this->authUser->id . " and role != '')");
             }
+            /*
+             * SOME PROJECTS MIGHT NOT HAVE REPO's...
             $p->whereAdd('id in (SELECT distinct(project_id) FROM mtrack_repos)');
+            */
             // $pd->whereAdd("role != ''");
             
-            $p->orderBy('Projects.name ASC');
+            $p->orderBy('core_project.name ASC');
             unset($p->client_id); // default projects serach enforces this..
             $ar = $p->fetchAll('id', 'name');
         }
@@ -192,7 +198,7 @@ class MTrackWeb extends HTML_FlexyFramework_Page
     
     function getAuthUser()
     {
-        $u = DB_DataObject::factory('Person');
+        $u = DB_DataObject::factory('core_person');
         if (!$u->isAuth()) {
             return false;
         }
@@ -219,12 +225,12 @@ class MTrackWeb extends HTML_FlexyFramework_Page
         
         //MTrackConfig::boot(); // eak.. .remove me...
       
-        $this->authUser = DB_DataObject::factory('Person')->getAuthUser();
+        $this->authUser = DB_DataObject::factory('core_person')->getAuthUser();
         
         $this->loadProjectList();
         
         
-        $p = DB_DataObject::factory('Projects');
+        $p = DB_DataObject::factory('core_project');
         $p->get($this->currentProject());
         $this->currentProject = $p; /// mix up?
         
@@ -254,7 +260,8 @@ class MTrackWeb extends HTML_FlexyFramework_Page
         // 
         
         
-        
+        HTML_FlexyFramework::get()->generateDataobjectsCache();
+
         
         if (!empty($loc)) {
             die ("invalid location". htmlspecialchars($loc));
@@ -271,7 +278,7 @@ class MTrackWeb extends HTML_FlexyFramework_Page
         return HTML_FlexyFramework::run('Wiki/Today'); 
  
     }
-    function post()
+    function post($request)
     {
         header("Status: 404 Not Found");
         die("invalid post request? ");
@@ -301,42 +308,10 @@ class MTrackWeb extends HTML_FlexyFramework_Page
         // require_once 'MTrack/Wiki/HTMLFormatter.php';
         require_once 'MTrackWeb/LinkHandler.php';
         $this->link = new MTrackWeb_LinkHandler();
-        MTrack_Wiki_HTMLFormatter::registerLinkHandler($this->link);
+        //MTrack_Wiki_HTMLFormatter::registerLinkHandler($this->link);
  
         return;
-    /*
-        $r = DB_DataObject::factory('mtrack_repos');
-        $r->loadFromPath('default/wiki');
-        MTrack_Wiki_Item::$repo = $r->impl();
-        
-        
-        
-        //MTrack_Wiki::register_macro('MilestoneSummary', array('MTrack_Milestone', 'macro_MilestoneSummary'));
-       // MTrack_Wiki::register_macro('BurnDown', array('MTrack_Milestone', 'macro_BurnDown'));
-        //MTrack_Wiki::register_macro('RunReport', array('MTrack_Report', 'macro_RunReport')); << fixme how are we to hanlde this..
-        //MTrack_Wiki::register_macro('TicketQuery', array('MTrack_Report', 'macro_TicketQuery'));
-        MTrack_Wiki::register_macro('IncludeWikiPage', array('MTrack_Wiki', 'macro_IncludeWiki'));
-        MTrack_Wiki::register_macro('IncludeHelpPage', array('MTrack_Wiki', 'macro_IncludeHelp'));
-        MTrack_Wiki::register_macro('Comment', array('MTrack_Wiki', 'macro_comment'));
-        MTrack_Wiki::register_processor('comment', array('MTrack_Wiki', 'processor_comment'));
-        MTrack_Wiki::register_processor('html', array('MTrack_Wiki', 'processor_html'));
-        MTrack_Wiki::register_processor('dataset', array('MTrack_Wiki', 'processor_dataset'));
-
  
-        //MTrackSearchDB::register_indexer('ticket', array('MTrackIssue', 'index_issue'));
-        //MTrackSearchDB::register_indexer('wiki', array('MTrack_Wiki_Item', 'index_item'));
-
-
-
-        //MTrackWatch::registerEventTypes('ticket', array( 'ticket' => 'Tickets' ));
-        //MTrackWatch::registerEventTypes('milestone', array( 'ticket' => 'Tickets', 'changeset' => 'Code changes' ));
-        //MTrackWatch::registerEventTypes('repo', array( 'ticket' => 'Tickets', 'changeset' => 'Code changes' ));
-
-        // should this get registered here??
-        //MTrackCommitChecker::addCheck('Wiki');
-        */
-        
-        
    }
     
     function favicon()