php7 fixes

[Pman.Builder] / Preview.php

diff --git a/Preview.php b/Preview.php
index a46d115..a636839 100644 (file)
--- a/Preview.php
+++ b/Preview.php
@@ -41,6 +41,13 @@ class Pman_Builder_Preview extends Pman_Cms_Preview
            die("invalid url");
         }
         header('Content-type: text/javascript');
+        // this should outpt the file if it's found.
+        if (file_exists($m->path . '/'. $p->name .'.js')) {
+            $fh = fopen($m->path . '/'. $p->name .'.js', 'r');
+            fpassthru($fh);
+            exit;
+        }
+        
         echo $p->jsource;
         exit;
     }
@@ -48,28 +55,47 @@ class Pman_Builder_Preview extends Pman_Cms_Preview
     function outputBody()
     {
         
+        if ($this->timer) {
+            $this->timer->setMarker(__CLASS__ . '::outputBody - start');
+        }
+        $ff = HTML_FlexyFramework::get();
+        
         
-        $proj = HTML_FlexyFramework::get()->project;
+        $proj = $ff->project;
         // DB_DataObject::debugLevel(1);
         $m = DB_DAtaObject::factory('Builder_modules');
         $m->get('name', $proj );
         
-        print_R($m->path);
-        var_dump($this->template);
+        //var_dump($m->path);exit;
         // needs to modify the template directory??
         // use the builder_module == app name
         // look for part with same name.
-        $template_engine = new HTML_Template_Flexy(array(
-            'templateDir' => $m->path
-        ));
+        if (empty($ff->Pman_Builder['from_filesystem'])) {
+            
+            $template_engine = new HTML_Template_Flexy(array(
+                'templateDir' => $m->path
+            ));
+        } else {
+            $template_engine = new HTML_Template_Flexy();
+        }
+        
+        $template_engine->debug = 1;
+        //print_R($template_engine);
+        
         $template_engine->compile($this->template);
         if ($this->elements) { /* BC crap! */
             $this->elements = HTML_Template_Flexy_Factory::setErrors($this->elements,$this->errors);
         }
         $template_engine->elements = $this->elements;
+        if ($this->timer) {
+            $this->timer->setMarker(__CLASS__ . '::outputBody - render template');
+        }
+        //DB_DataObject::debugLevel(1);
         $template_engine->outputObject($this,$this->elements);
         
-        
+        if ($this->timer) {
+            $this->timer->setMarker(__CLASS__ . '::outputBody - end');
+        }
         
     }
 }
\ No newline at end of file