sync

diff --git a/MTrackWeb/Attachment.php b/MTrackWeb/Attachment.php
index 844d89a..32e8088 100644 (file)
--- a/MTrackWeb/Attachment.php
+++ b/MTrackWeb/Attachment.php
@@ -1,7 +1,7 @@
 <?php # vim:ts=2:sw=2:et:
 /* For licensing and copyright terms, see the file named LICENSE */
 
-require_once 'MtrackWeb.php';
+require_once 'MTrackWeb.php';
 
 class MTrackWeb_Attachment extends MTrackWeb
 {
@@ -62,4 +62,4 @@ class MTrackWeb_Attachment extends MTrackWeb
     }
     
 }
- 
\ No newline at end of file
+ 

diff --git a/MTrackWeb/Hook/Git/Bridge.php b/MTrackWeb/Hook/Git/Bridge.php
index 9f13e1d..026258c 100644 (file)
--- a/MTrackWeb/Hook/Git/Bridge.php
+++ b/MTrackWeb/Hook/Git/Bridge.php
@@ -2,6 +2,8 @@
 
 
 // needs to be run from git-recieve (and it has to be the only thing run.
+/*
+require_once 'MTrackWeb/Hook/Bridge.php';
 
 class MTrackWeb_Hook_Git_Bridge extends  MTrackWeb_Hook_Bridge
 {
@@ -15,7 +17,7 @@ class MTrackWeb_Hook_Git_Bridge extends  MTrackWeb_Hook_Bridge
     
     /**
     * fills up repo, files, log, commits by running log on the STDIN
-    */
+    * /
     function __construct($repo) 
     {
         
@@ -110,4 +112,6 @@ class MTrackWeb_Hook_Git_Bridge extends  MTrackWeb_Hook_Bridge
         }
         return join(", ", $cs);
     }
-}
\ No newline at end of file
+}
+
+*/

diff --git a/Pman.CoreBC b/Pman.CoreBC
new file mode 120000 (symlink)
index 0000000..3d3851e
--- /dev/null
+++ b/Pman.CoreBC
@@ -0,0 +1 @@
+../Pman.CoreBC
\ No newline at end of file

diff --git a/Pman/CoreBC b/Pman/CoreBC
new file mode 120000 (symlink)
index 0000000..3d3851e
--- /dev/null
+++ b/Pman/CoreBC
@@ -0,0 +1 @@
+../Pman.CoreBC
\ No newline at end of file

diff --git a/admin.php b/admin.php
index a809793..1723db0 100644 (file)
--- a/admin.php
+++ b/admin.php
@@ -19,7 +19,7 @@ new HTML_FlexyFramework( array(
     'project'=> 'Pman',
     'debug' => 0,
     'version' => '1.9a',
-    'enable' => 'Core,MTrack,Admin',
+    'enable' => 'CoreBC,Core,MTrack,Admin',
     
     'appNameShort' => "MTrack",
     'appName' => "MTrack",

diff --git a/index.php b/index.php
index b90cdb0..ae71865 100644 (file)
--- a/index.php
+++ b/index.php
@@ -17,24 +17,20 @@ ini_set('display_errors', true);
 new HTML_FlexyFramework(array(
        
     'project' => 'MTrackWeb',
-    'enable' => 'MTrack,Core,Admin', // enable permissions from Pman 
+    'enable' => 'MTrack,CoreBC,Core,Admin', // enable permissions from Pman 
     'database'        => 'mysql://root:@localhost/pman',
     'version' => '2.0',
-    
     'DB_DataObject' => array(
-       //  'debug' => 5,
+//         'debug' => 5,
+
         '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_Core_DataObjects_:',
+        'class_prefix' => 'Pman_MTrack_DataObjects_:Pman_CoreBC_DataObjects_:Pman_Core_DataObjects_:',
         
-        'ini_mtrack' => implode(PATH_SEPARATOR, array(
-                dirname(__FILE__). '/Pman/MTrack/DataObjects/pman.ini',
-                dirname(__FILE__). '/Pman/Core/DataObjects/pman.ini',
-                
-        )),
          'table_alias' => array(
             'core_person' => 'Person',
             'core_company' => 'Companies',
@@ -60,7 +56,7 @@ new HTML_FlexyFramework(array(
          'useroo' => true,
     ),
      'Pman_Core' => array(
-        'jspacker' => '/home/alan/gitlive/gnome.introspection-doc-generator',
+        'jspacker' => '/home/gitlive/gnome.introspection-doc-generator',
         'cssminify' => dirname(__FILE__).'/roojs1/buildSDK/cssminify.js',
     )
 ));

diff --git a/roo.php b/roo.php
index ddfeb9b..6a9103e 100644 (file)
--- a/roo.php
+++ b/roo.php
@@ -18,21 +18,23 @@ ini_set('display_errors', true);
 new HTML_FlexyFramework(array(
        
     'project' => 'MTrackWeb',
-    'enable' => 'MTrack,Core,Admin', // enable permissions from Pman 
+    'enable' => 'MTrack,CoreBC,Core,Admin', // enable permissions from Pman 
     'database'        => 'mysql://root:@localhost/pman',
     'DB_DataObject' => 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_Core_DataObjects_:',
+        'class_prefix' => 'Pman_MTrack_DataObjects_:Pman_CoreBC_DataObjects_:Pman_Core_DataObjects_:',
         
         'ini_mtrack' => implode(PATH_SEPARATOR, array(
-                dirname(__FILE__). '/PmanMTrack/DataObjects/pman.ini',
+                dirname(__FILE__). '/Pman/CoreBC/DataObjects/pman.ini',
                 dirname(__FILE__). '/Pman/Core/DataObjects/pman.ini',
+                dirname(__FILE__). '/PmanMTrack/DataObjects/pman.ini',
                 
         )),
     ),