Pman.php

diff --git a/Pman.php b/Pman.php
index cb50a41..47df5bf 100644 (file)
--- a/Pman.php
+++ b/Pman.php
@@ -81,7 +81,7 @@ class Pman extends HTML_FlexyFramework_Page
         }
         $this->_hasInit = true;
          // move away from doing this ... you can access bootLoader.XXXXXX in the master template..
-        $boot = HTML_FlexyFramework2::get();
+        $boot = HTML_FlexyFramework::get();
         // echo'<PRE>';print_R($boot);exit;
         $this->appName= $boot->appName;
         $this->appNameShort= $boot->appNameShort;
@@ -155,7 +155,7 @@ class Pman extends HTML_FlexyFramework_Page
          
         $au = $this->getAuthUser();
         if ($au) {
-            $ff= HTML_FlexyFramework2::get();
+            $ff= HTML_FlexyFramework::get();
            
             if (!empty($ff->Pman['auth_comptype']) && $au->id > 0 &&
                 ( !$au->company_id || ($ff->Pman['auth_comptype'] != $au->company()->comptype))) {
@@ -180,7 +180,7 @@ class Pman extends HTML_FlexyFramework_Page
          //var_dump($this->isDev);
         // force regeneration on load for development enviroments..
         
-        HTML_FlexyFramework2::get()->generateDataobjectsCache($this->isDev);
+        HTML_FlexyFramework::get()->generateDataobjectsCache($this->isDev);
         
         //header('Content-type: application/xhtml+xml; charset=utf-8');
         
@@ -236,7 +236,7 @@ class Pman extends HTML_FlexyFramework_Page
         if (!empty($this->authUser)) {
             return $this->authUser;
         }
-         $ff = HTML_FlexyFramework2::get();
+         $ff = HTML_FlexyFramework::get();
         $tbl = empty($ff->Pman['authTable']) ? 'core_person' : $ff->Pman['authTable'];
         
         $u = DB_DataObject::factory( $tbl );
@@ -270,7 +270,7 @@ class Pman extends HTML_FlexyFramework_Page
      */
     function modulesList()
     {
-        $boot = HTML_FlexyFramework2::get();
+        $boot = HTML_FlexyFramework::get();
         // echo'<PRE>';print_R($boot);exit;
          
          
@@ -349,7 +349,7 @@ class Pman extends HTML_FlexyFramework_Page
     
     function tempName($ext)
     {
-        $x = tempnam(ini_get('session.save_path'), HTML_FlexyFramework2::get()->appNameShort.'TMP');
+        $x = tempnam(ini_get('session.save_path'), HTML_FlexyFramework::get()->appNameShort.'TMP');
         unlink($x);
         return $x .'.'. $ext;
     }
@@ -437,7 +437,7 @@ class Pman extends HTML_FlexyFramework_Page
             $this->addEvent($type, false, $str);
         }
          
-        $cli = HTML_FlexyFramework2::get()->cli;
+        $cli = HTML_FlexyFramework::get()->cli;
         if ($cli) {
             echo "ERROR: " .$str . "\n";
             exit(1); // cli --- exit code to stop shell execution if necessary.
@@ -513,7 +513,7 @@ class Pman extends HTML_FlexyFramework_Page
     }
     function jok($str)
     {
-        $cli = HTML_FlexyFramework2::get()->cli;
+        $cli = HTML_FlexyFramework::get()->cli;
         if ($cli) {
             echo "OK: " .$str . "\n";
             exit;
@@ -654,7 +654,7 @@ class Pman extends HTML_FlexyFramework_Page
     function outputJavascriptIncludes()  
     {
         // BC support - currently 1 project still relies on this.. (MO portal) 
-        $o = HTML_FlexyFramework2::get()->Pman_Core;
+        $o = HTML_FlexyFramework::get()->Pman_Core;
         if (isset($o['packseed'])) {
             return $this->outputJavascriptIncludesBC();
         }
@@ -761,7 +761,7 @@ class Pman extends HTML_FlexyFramework_Page
         }
         
         
-        $ff = HTML_FlexyFramework2::get();
+        $ff = HTML_FlexyFramework::get();
         
         $base = dirname($_SERVER['SCRIPT_FILENAME']);
         $dir =   $this->rootDir.'/Pman/'. $mod;
@@ -975,7 +975,7 @@ class Pman extends HTML_FlexyFramework_Page
     
     function addEventOnce($act, $obj = false, $remarks = '') 
     {
-        if (!empty(HTML_FlexyFramework2::get()->Pman['disable_events'])) {
+        if (!empty(HTML_FlexyFramework::get()->Pman['disable_events'])) {
             return;
         }
         $e = DB_DataObject::factory('Events');
@@ -998,7 +998,7 @@ class Pman extends HTML_FlexyFramework_Page
     function addEvent($act, $obj = false, $remarks = '') 
     {
         
-        if (!empty(HTML_FlexyFramework2::get()->Pman['disable_events'])) {
+        if (!empty(HTML_FlexyFramework::get()->Pman['disable_events'])) {
             return;
         }
         $au = $this->getAuthUser();