JasonWoof Got questions, comments, patches, etc.? Contact Jason Woofenden
metaform: revamp codegen, fix hidden fields
[wfpl.git] / metaform.php
index 47ce7fe..a9d3956 100644 (file)
@@ -51,6 +51,7 @@ $GLOBALS['types'] = array(
        'delete' =>     array('checkbox',    'yesno',      'n/a'),
        'image' =>      array('image',       'oneline',    'varchar(120)'),
        'thumb' =>      array('image',       'oneline',    'varchar(240)'),
+       'file' =>       array('file',        'oneline',    'varchar(100)'),
        'submit' =>     array('submit',      'oneline',    'n/a')
 );
 
@@ -64,6 +65,29 @@ function list_available_types() {
 }
 
 
+function tem_set_globals(&$tem) {
+       $vars = array(
+               'file_name',
+               'table_name',
+               'plural',
+               'singular');
+       foreach($vars as $var) {
+               $tem->set($var, $GLOBALS[$var]);
+       }
+
+       $bools = array(
+               'opt_email',
+               'opt_db',
+               'opt_listing',
+               'opt_display',
+               'opt_pass');
+       foreach($bools as $bool) {
+               if(format_bool($GLOBALS[$bool])) {
+                       $tem->set($bool);
+               }
+       }
+}
+
 function metaform() {
        if(isset($_REQUEST['singular'])) {
                $GLOBALS['file_name'] = format_varname($_REQUEST['file_name']);
@@ -73,22 +97,16 @@ function metaform() {
                if(isset($_REQUEST['form_name'])) {
                        $GLOBALS['file_name'] = $GLOBALS['table_name'] = $GLOBALS['plural'] = format_varname($_REQUEST['form_name']);
                }
-               tem_set('file_name', $GLOBALS['file_name']);
-               tem_set('table_name', $GLOBALS['table_name']);
-               tem_set('plural', $GLOBALS['plural']);
 
                $GLOBALS['singular'] = format_oneline($_REQUEST['singular']);
-               tem_set('singular', $GLOBALS['singular']);
                $GLOBALS['opt_email'] = format_yesno($_REQUEST['opt_email']);
-               tem_set('opt_email', $GLOBALS['opt_email']);
                $GLOBALS['opt_db'] = format_yesno($_REQUEST['opt_db']);
-               tem_set('opt_db', $GLOBALS['opt_db']);
                $GLOBALS['opt_listing'] = format_yesno($_REQUEST['opt_listing']);
-               tem_set('opt_listing', $GLOBALS['opt_listing']);
                $GLOBALS['opt_display'] = format_yesno($_REQUEST['opt_display']);
-               tem_set('opt_display', $GLOBALS['opt_display']);
                $GLOBALS['opt_pass'] = format_yesno($_REQUEST['opt_pass']);
-               tem_set('opt_pass', $GLOBALS['opt_pass']);
+
+               tem_init();
+               tem_set_globals($GLOBALS['wfpl_template']);
        }
 
        if(isset($_REQUEST['fields'])) {
@@ -170,7 +188,7 @@ function view_headers() {
 function make_sql() {
        $tem = new tem();
        $tem->load('code/wfpl/metaform/template.sql');
-       $tem->set('table_name', $GLOBALS['table_name']);
+       tem_set_globals($tem);
        $fields = get_fields();
        foreach($fields as $field) {
                list($name, $type, $input, $format, $sql) = $field;
@@ -200,7 +218,7 @@ function view_sql() {
 function find_always_field($fields) {
        foreach($fields as $field) {
                list($name, $type, $input, $format, $sql) = $field;
-               if($input != 'submit' && $input != 'image' && $input != 'checkbox' && $input != 'radio') {
+               if($input != 'submit' && $input != 'image' && $input != 'file' && $input != 'checkbox' && $input != 'radio') {
                        return $name;
                }
        }
@@ -212,118 +230,98 @@ function find_always_field($fields) {
 
 # pass false if you want to exclude the <head> and <body> tag etc.
 function make_html($whole_file = true) {
-       $uploads_output_already = false;
        $has_html_editors = false;
        $tem = new tem();
        $tem->load('code/wfpl/metaform/template.html');
-       $tem->set('file_name', $GLOBALS['file_name']);
-       $tem->set('table_name', $GLOBALS['table_name']);
-       $tem->set('singular', $GLOBALS['singular']);
-       $tem->set('plural', $GLOBALS['plural']);
+       tem_set_globals($tem);
        $fields = get_fields();
        $tem->set('always_field', find_always_field($fields));
+       $hidden_fields = array();
+       $visible_fields = array();
+       $display_fields = array();
+       $listing_headers = array();
+       $listing_fields = array();
        foreach($fields as $field) {
                list($name, $type, $input, $format, $sql) = $field;
-               $tem->set('name', $name);
-               $tem->set('caption', format_caption($name));
-               $tem->show($input);
-               if($input != 'hidden') {
-                       $tem->show('row');
+               if($input == 'hidden') {
+                       $hidden_fields[] = array('name' => $name);
+               } else {
+                       $visible_fields[] = array($input => array(
+                               'name' => $name,
+                               'caption' => format_caption($name)));
                }
 
-               if($input == 'image' && !$uploads_output_already) {
-                       $tem->show('uploads');
+               if($input == 'image' || $input == 'file') {
+                       $tem->set('uploads');
                        $tem->set('enctype_attr', '" enctype="multipart/form-data');
-                       $uploads_output_already = true;
                } elseif($input == 'html') {
                        $has_html_editors = true;
                        $tem->set('html_field_name', $name);
-                       $tem->show('replace_textarea');
+                       $tem->set('replace_textarea');
                }
 
-               if($GLOBALS['opt_display'] == 'Yes') {
-                       switch($input) {
-                               case 'image':
-                                       $tem->show('display_image');
-                               break;
-                               case 'checkbox':
-                                       $tem->show('display_yesno');
-                               break;
-                               case 'date':
-                                       $tem->show('display_date');
-                               break;
-                               case 'textarea':
-                                       $tem->show('display_multiline');
-                               break;
-                               case 'html':
-                                       $tem->show('display_html');
-                               break;
-                               default:
-                                       $tem->show('display_short');
-                       }
-                       $tem->show('display_row');
+               switch($input) {
+                       case 'image':
+                       case 'checkbox':
+                       case 'date':
+                       case 'textarea':
+                       case 'html':
+                               $display_type = $input;
+                       break;
+                       default:
+                               $display_type = 'short';
                }
-
-               if($GLOBALS['opt_listing'] == 'Yes') {
-                       if(show_in_listing($type, $input, $format, $sql)) {
-                               if($format == 'bool' || $format == 'yesno') {
-                                       $tem->set('listing_enc', 'yesno');
-                                       $tem->show('listing_value_enc');
-                               } elseif($input == 'date') {
-                                       $tem->set('listing_enc', 'mmddyyyy');
-                                       $tem->show('listing_value_enc');
-                               } elseif($type == 'thumb') {
-                                       $tem->show('listing_value_thumb');
-                               } else {
-                                       $tem->set('listing_enc', 'html');
-                                       $tem->show('listing_value_enc');
-                               }
-
-                               if($GLOBALS['opt_display'] != 'Yes') {
-                                       $tem->show('opt_display_a_else');
-                               }
-                               $tem->show('listing_head_col');
-                               $tem->show('listing_row_col');
+               $display_fields[] = array($display_type => array(
+                       'name' => $name, 'caption' => format_caption($name)));
+
+               if(show_in_listing($type, $input, $format, $sql)) {
+                       $listing_headers[] = array('caption' => format_caption($name));
+                       $listing_field = array('name' => $name);
+                       if($format == 'bool' || $format == 'yesno') {
+                               $listing_field['enc'] = 'yesno';
+                       } elseif($input == 'date') {
+                               $listing_field['enc'] = 'mmddyyyy';
+                       } elseif($type == 'thumb') {
+                               $listing_field['thumb'] = true;
+                       } else {
+                               $listing_field['enc'] = 'html';
                        }
+                       $listing_fields[] = $listing_field;
                }
        }
 
-       if($GLOBALS['opt_db'] == 'Yes') {
-               $tem->show('opt_db_1');
-               $tem->show('opt_db_2');
+       # Submit/Send button
+       if($GLOBALS['opt_email'] == 'Yes' && $GLOBALS['opt_db'] != 'Yes') {
+               $visible_fields[] = array('submit' => array(
+                       'name' => 'send',
+                       'caption' => 'Send'));
        } else {
-               $tem->show('opt_db_1_else');
+               $visible_fields[] = array('submit' => array(
+                       'name' => 'save',
+                       'caption' => 'Save'));
        }
 
-       if($GLOBALS['opt_listing'] == 'Yes') {
-               $tem->show('opt_listing_1');
-       }
+       $tem->set('form', array(
+               'visible_fields' => $visible_fields,
+               'hidden_fields' => $hidden_fields));
 
-       if($GLOBALS['opt_display'] == 'Yes') {
-               $tem->show('opt_display_1');
-               $tem->show('opt_display_2');
-       }
+       # opt_display and opt_listing control whether these are actually displayed
+       $tem->set('display_fields', $display_fields);
+       $tem->set('listing_headers', $listing_headers);
+       $tem->set('listing_fields', $listing_fields);
 
-       if($GLOBALS['opt_email'] == 'Yes' && $GLOBALS['opt_db'] != 'Yes') {
-               $tem->set('name', 'send');
-               $tem->set('caption', 'Send');
-       } else {
-               $tem->set('name', 'save');
-               $tem->set('caption', 'Save');
-       }
-       $tem->show('submit');
-       $tem->show('row');
-
-       $tem->show('form');
 
        if($has_html_editors) {
-               $tem->show('html_editor_headers');
+               $tem->set('html_editor_headers');
        }
 
        if($whole_file) {
                return $tem->run();
        } else {
-               return $tem->get('form');
+               $tem2 = new tem();
+               $tem2->load_str('<!--~form~-->');
+               $tem2->merge($tem);
+               return $tem2->run();
        }
 }
 
@@ -352,13 +350,9 @@ function make_php() {
        $has_html_editors = false;
        $tem = new tem();
        $tem->load('code/wfpl/metaform/template.php');
-       $tem->set('file_name', $GLOBALS['file_name']);
-       $tem->set('table_name', $GLOBALS['table_name']);
-       $tem->set('singular', $GLOBALS['singular']);
-       $tem->set('plural', $GLOBALS['plural']);
+       tem_set_globals($tem);
        $fields = get_fields();
        $db_fields = '';
-       $php_fields = '';
        $always_field = find_always_field($fields);
        $image_included_yet = false;
        foreach($fields as $field) {
@@ -370,8 +364,6 @@ function make_php() {
                        if($sql != 'n/a') {
                                if($db_fields != '') $db_fields .= ',';
                                $db_fields .= $name;
-                               if($php_fields != '') $php_fields .= ', ';
-                               $php_fields .= '$' . $name;
                        }
                        if($input == 'image') {
                                if($type == 'thumb') {
@@ -381,12 +373,11 @@ function make_php() {
                                }
                                $tem->show('image_settings');
                                $tem->show('image_upload');
-                               if(!$image_included_yet) {
-                                       $tem->show('image_include');
-                                       $tem->show('upload_max');
-                                       $tem->show('upload_settings');
-                                       $image_included_yet = true;
-                               }
+                               $has_uploads = true;
+                       } else if($input == 'file') {
+                               $tem->show('file_settings');
+                               $tem->show('file_upload');
+                               $has_uploads = true;
                        } else {
                                if($input == 'html') {
                                        $has_html_editors = true;
@@ -396,7 +387,6 @@ function make_php() {
                                }
                                $tem->show('formats');
                        }
-                       $tem->show('tem_sets');
                }
 
                if($GLOBALS['opt_listing'] == 'Yes') {
@@ -406,6 +396,12 @@ function make_php() {
                        }
                }
        }
+       if($has_uploads) {
+               $tem->show('uploads_include');
+               $tem->show('upload_max');
+               $tem->show('upload_settings');
+               $image_included_yet = true;
+       }
 
        if($has_html_editors) {
                $tem->show('show_extra_headers');
@@ -413,32 +409,13 @@ function make_php() {
 
        $tem->set('always_field', $always_field);
        $tem->set('db_fields', $db_fields);
-       $tem->set('php_fields', $php_fields);
        $tem->set('metaform_url', edit_url());
-       if($GLOBALS['opt_listing'] == 'Yes') {
-               $tem->show('opt_listing_1');
-               $tem->show('opt_listing_2');
-       }
-       if($GLOBALS['opt_display'] == 'Yes') {
-               $tem->show('opt_display_1');
-               $tem->show('opt_display_2');
-       } else {
-               $tem->show('opt_display_1_else');
-               $tem->show('opt_display_2_else');
-       }
-       if($GLOBALS['opt_db'] == 'Yes') {
-               $tem->show('opt_db_1');
-               $tem->show('opt_db_2');
-               $tem->show('opt_db_3');
-               $tem->show('opt_db_4');
-               $tem->show('opt_db_5');
-       }
        if($GLOBALS['opt_email'] == 'Yes') {
-               $tem->show('opt_email_1');
-               $tem->show('opt_email_2');
-       }
-       if($GLOBALS['opt_pass'] == 'Yes') {
-               $tem->show('opt_pass');
+               $this_domain = $_SERVER['HTTP_HOST'];
+               if(substr($this_domain, -2) == '.l') {
+                       $this_domain = substr($this_domain, 0, -1) . 'com';
+               }
+               $tem->set('this_domain', $this_domain);
        }
        return $tem->run();
 }
@@ -461,15 +438,12 @@ function view_php() {
 function make_email() {
        $tem = new tem();
        $tem->load('code/wfpl/metaform/template.email.txt');
-       $tem->set('file_name', $GLOBALS['file_name']);
-       $tem->set('table_name', $GLOBALS['table_name']);
-       $tem->set('singular', $GLOBALS['singular']);
-       $tem->set('plural', $GLOBALS['plural']);
+       tem_set_globals($tem);
        $fields = get_fields();
        foreach($fields as $field) {
                list($name, $type, $input, $format, $sql) = $field;
                $tem->set('name', $name);
-               $tem->set('caption', $name); # fixme
+               $tem->set('caption', format_caption($name));
                if($type == 'textarea') {
                        $tem->show('multi_line');
                } elseif($type == 'checkbox') {
@@ -495,10 +469,7 @@ function view_email() {
 
 function preview() {
        tem_load('code/wfpl/metaform/preview.html');
-       tem_set('file_name', $GLOBALS['file_name']);
-       tem_set('table_name', $GLOBALS['table_name']);
-       tem_set('singular', $GLOBALS['singular']);
-       tem_set('plural', $GLOBALS['plural']);
+       tem_set_globals($GLOBALS['wfpl_template']);
        tem_set('fields', $_REQUEST['fields']);
        $preview_tem = new tem();
        $preview_tem->load_str(make_html(false));
@@ -524,6 +495,7 @@ function preview() {
 function download_tar() {
        $name = $GLOBALS['file_name'];
        $data = array(
+               "INSTALL" => read_whole_file('code/wfpl/metaform/INSTALL'),
                ".htaccess" => make_htaccess(),
                #"run.php ->" => 'code/wfpl/run.php',
                "style.css" => read_whole_file('code/wfpl/metaform/style.css'),