run.php can't run from wfpl directory because there's no way to find the real DOCUMEN...

[wfpl.git] / metaform.php

diff --git a/metaform.php b/metaform.php
index 74ec74f..d8cc07e 100644 (file)
--- a/metaform.php
+++ b/metaform.php
@@ -30,6 +30,7 @@ $GLOBALS['types'] = array(
 #    type                  input          format        sql     
        'name' =>       array('textbox',     'oneline',    'varchar(200)'),
        'textbox' =>    array('textbox',     'oneline',    'varchar(200)'),
+       'int' =>        array('textbox',     'int',        'varchar(100)'),
        'email' =>      array('textbox',     'email',      'varchar(100)'),
        'phone' =>      array('textbox',     'phone',      'varchar(32)'),
        'money' =>      array('textbox',     'money',      'varchar(32)'),
@@ -155,15 +156,17 @@ function make_template($whole_file = true) {
                $tem->set('name', $name);
                $tem->set('caption', $name); # fixme
                $tem->sub($input);
+               $tem->sub('row');
        }
        $tem->set('name', 'save');
        $tem->set('caption', 'Save');
        $tem->sub('submit');
-       $tem->sub('body');
+       $tem->sub('row');
+       $tem->sub('form');
        if($whole_file) {
                return $tem->run();
        } else {
-               return $tem->get('body');
+               return $tem->get('form');
        }
 }
 
@@ -234,7 +237,10 @@ function preview() {
        $tem->load('code/wfpl/metaform/preview.html');
        $tem->set('form_name', $GLOBALS['form_name']);
        $tem->set('fields', $_REQUEST['fields']);
-       $tem->set('preview', make_template(false));
+       $preview_tem = new tem();
+       $preview = $preview_tem->run(make_template(false));
+       unset($preview_tem);
+       $tem->set('preview', $preview);
        set_form_action();
        $tem->output();
 }