Merge branch 'master' of http://private.akbkhome.com/Pman.Base

[Pman.Base] / Pman.php

diff --git a/Pman.php b/Pman.php
index 315454f..f16ee9b 100644 (file)
--- a/Pman.php
+++ b/Pman.php
@@ -34,6 +34,8 @@ class Pman extends HTML_FlexyFramework_Page
     var $appModules = '';
     
     
+    var $authUser; // always contains the authenticated user..
+    
    
     
     /**
@@ -174,17 +176,20 @@ class Pman extends HTML_FlexyFramework_Page
     {
         // appModules/appDisable contain a comma limited list of
         // both modules and components that can be enabled/disabled..
-        
+         $boot = HTML_FlexyFramework::get();
+
         // the modules call just lists the modules
         $enabled =  array('Core' => true);
-        $am = !empty($this->appModules) ? explode(',',  $this->appModules) : array();
+         $am = !empty($boot->enable) ? explode(',',  $boot->enable) : array();
         foreach($am as $k) {
             if (strpos( $k ,'.') ) {
                 continue;
             }
             $enabled[$k] = true;
         }
-        $disabled =  !empty($this->appDisable) ?  explode(',', $this->appDisable) : array();
+        
+        
+        $disabled =  !empty($boot->disable) ?  explode(',', $boot->disable) : array();
         foreach($disabled as $k) {
             if ( strpos( $k ,'.') ) {
                 continue;
@@ -193,6 +198,8 @@ class Pman extends HTML_FlexyFramework_Page
                 unset($enabled[$k]);
             }   
         }
+         //echo '<PRE>';       var_Dump($enabled);
+
         return array_keys($enabled); 
     }