make metaform tarballs come with install doc

[wfpl.git] / metaform.php

diff --git a/metaform.php b/metaform.php
index b2d3c21..3e8c380 100644 (file)
--- a/metaform.php
+++ b/metaform.php
@@ -46,12 +46,11 @@ $GLOBALS['types'] = array(
        'html' =>       array('html',        'unix',       'text'),
        'pulldown' =>   array('pulldown',    'options',    'varchar(100)'),
        'radio' =>      array('radio',       'oneline',    'varchar(200)'),
-       'checkbox' =>   array('leftcheck',   'bool',       'int(1)'),
-       'rightcheck' => array('checkbox',    'bool',       'int(1)'),
-       'rightyesno' => array('checkbox',    'yesno',      'varchar(3)'),
-       'yesno' =>      array('leftcheck',   'yesno',      'varchar(3)'),
+       'checkbox' =>   array('checkbox',    'bool',       'int(1)'),
+       'yesno' =>      array('checkbox',    'yesno',      'varchar(3)'),
        'delete' =>     array('checkbox',    'yesno',      'n/a'),
-       'image' =>      array('image',       'oneline',    'varchar(200)'),
+       'image' =>      array('image',       'oneline',    'varchar(120)'),
+       'thumb' =>      array('image',       'oneline',    'varchar(240)'),
        'submit' =>     array('submit',      'oneline',    'n/a')
 );
 
@@ -69,7 +68,7 @@ function metaform() {
        if(isset($_REQUEST['singular'])) {
                $GLOBALS['file_name'] = format_varname($_REQUEST['file_name']);
                $GLOBALS['table_name'] = format_varname($_REQUEST['table_name']);
-               $GLOBALS['plural'] = format_varname($_REQUEST['plural']);
+               $GLOBALS['plural'] = format_oneline($_REQUEST['plural']);
                # backwards compatibility:
                if(isset($_REQUEST['form_name'])) {
                        $GLOBALS['file_name'] = $GLOBALS['table_name'] = $GLOBALS['plural'] = format_varname($_REQUEST['form_name']);
@@ -78,7 +77,7 @@ function metaform() {
                tem_set('table_name', $GLOBALS['table_name']);
                tem_set('plural', $GLOBALS['plural']);
 
-               $GLOBALS['singular'] = format_varname($_REQUEST['singular']);
+               $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']);
@@ -88,8 +87,8 @@ function metaform() {
                tem_set('opt_listing', $GLOBALS['opt_listing']);
                $GLOBALS['opt_display'] = format_yesno($_REQUEST['opt_display']);
                tem_set('opt_display', $GLOBALS['opt_display']);
-               $GLOBALS['opt_http_pass'] = format_yesno($_REQUEST['opt_http_pass']);
-               tem_set('opt_http_pass', $GLOBALS['opt_http_pass']);
+               $GLOBALS['opt_pass'] = format_yesno($_REQUEST['opt_pass']);
+               tem_set('opt_pass', $GLOBALS['opt_pass']);
        }
 
        if(isset($_REQUEST['fields'])) {
@@ -201,7 +200,7 @@ function view_sql() {
 function find_always_field($fields) {
        foreach($fields as $field) {
                list($name, $type, $input, $format, $sql) = $field;
-               if($input != 'submit' && $input != 'checkbox' && $input != 'radio') {
+               if($input != 'submit' && $input != 'image' && $input != 'checkbox' && $input != 'radio') {
                        return $name;
                }
        }
@@ -244,8 +243,10 @@ function make_html($whole_file = true) {
 
                if($GLOBALS['opt_display'] == 'Yes') {
                        switch($input) {
+                               case 'image':
+                                       $tem->show('display_image');
+                               break;
                                case 'checkbox':
-                               case 'leftcheck':
                                        $tem->show('display_yesno');
                                break;
                                case 'date':
@@ -264,16 +265,22 @@ function make_html($whole_file = true) {
                }
 
                if($GLOBALS['opt_listing'] == 'Yes') {
-                       if($GLOBALS['opt_display'] != 'Yes') {
-                               $tem->show('opt_display_a_else');
-                       }
                        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');
@@ -294,7 +301,6 @@ function make_html($whole_file = true) {
 
        if($GLOBALS['opt_display'] == 'Yes') {
                $tem->show('opt_display_1');
-               $tem->show('opt_display_2');
        }
 
        if($GLOBALS['opt_email'] == 'Yes' && $GLOBALS['opt_db'] != 'Yes') {
@@ -333,13 +339,16 @@ function show_in_listing($type, $input, $format, $sql) {
                case 'textarea':
                case 'html':
                        return false;
-               default:
-                       return true;
        }
-}
+       if($type == 'image') {
+               return false;
+       }
 
+       return true;
+}
 
 function make_php() {
+       $has_html_editors = false;
        $tem = new tem();
        $tem->load('code/wfpl/metaform/template.php');
        $tem->set('file_name', $GLOBALS['file_name']);
@@ -348,7 +357,6 @@ function make_php() {
        $tem->set('plural', $GLOBALS['plural']);
        $fields = get_fields();
        $db_fields = '';
-       $php_fields = '';
        $always_field = find_always_field($fields);
        $image_included_yet = false;
        foreach($fields as $field) {
@@ -360,12 +368,15 @@ 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') {
+                                       $tem->show('thumb_settings');
+                                       $tem->show('thumb_upload_params');
+                                       $tem->show('thumb_w_h');
+                               }
+                               $tem->show('image_settings');
                                $tem->show('image_upload');
-                               $tem->show('image_db');
                                if(!$image_included_yet) {
                                        $tem->show('image_include');
                                        $tem->show('upload_max');
@@ -373,13 +384,14 @@ function make_php() {
                                        $image_included_yet = true;
                                }
                        } else {
-                               if($input == 'pulldown') {
+                               if($input == 'html') {
+                                       $has_html_editors = true;
+                               } elseif($input == 'pulldown') {
                                        $tem->show('pulldowns');
                                        $tem->show('pulldown_format_extra');
                                }
                                $tem->show('formats');
                        }
-                       $tem->show('tem_sets');
                }
 
                if($GLOBALS['opt_listing'] == 'Yes') {
@@ -390,9 +402,12 @@ function make_php() {
                }
        }
 
+       if($has_html_editors) {
+               $tem->show('show_extra_headers');
+       }
+
        $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');
@@ -403,7 +418,6 @@ function make_php() {
                $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');
@@ -413,12 +427,16 @@ function make_php() {
                $tem->show('opt_db_5');
        }
        if($GLOBALS['opt_email'] == 'Yes') {
+               $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);
                $tem->show('opt_email_1');
                $tem->show('opt_email_2');
        }
-       if($GLOBALS['opt_http_pass'] == 'Yes') {
-               $tem->show('opt_http_pass_1');
-               $tem->show('opt_http_pass_2');
+       if($GLOBALS['opt_pass'] == 'Yes') {
+               $tem->show('opt_pass');
        }
        return $tem->run();
 }
@@ -438,7 +456,6 @@ function view_php() {
        echo make_php();
 }
 
-
 function make_email() {
        $tem = new tem();
        $tem->load('code/wfpl/metaform/template.email.txt');
@@ -450,7 +467,7 @@ function make_email() {
        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') {
@@ -474,7 +491,6 @@ function view_email() {
        echo make_email();
 }
 
-
 function preview() {
        tem_load('code/wfpl/metaform/preview.html');
        tem_set('file_name', $GLOBALS['file_name']);
@@ -506,8 +522,9 @@ 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',
+               #"run.php ->" => 'code/wfpl/run.php',
                "style.css" => read_whole_file('code/wfpl/metaform/style.css'),
                "$name.html" => make_html(),
                "$name.php" => make_php());
@@ -523,5 +540,3 @@ function download_tar() {
 
 metaform();
 exit();
-
-?>