no dashes in filenames, improved image uploading, make_thumbnail()

[wfpl.git] / metaform.php

diff --git a/metaform.php b/metaform.php
index 9d6f4dd..88dd437 100644 (file)
--- a/metaform.php
+++ b/metaform.php
@@ -34,6 +34,7 @@ $GLOBALS['types'] = array(
        'bigint' =>     array('textbox',     'int',        'varchar(100)'), # up to 100 digits, stored as a string
        'email' =>      array('textbox',     'email',      'varchar(100)'),
        'phone' =>      array('textbox',     'phone',      'varchar(32)'),
+       'state' =>      array('states',      'oneline',    'varchar(2)'),
        'money' =>      array('textbox',     'money',      'varchar(32)'),
        'dollars' =>    array('textbox',     'dollars',    'varchar(32)'),
        'url' =>        array('textbox',     'url',        'varchar(200)'),
@@ -41,6 +42,7 @@ $GLOBALS['types'] = array(
        'password' =>   array('password',    'oneline',    'varchar(200)'),
        'textarea' =>   array('textarea',    'unix',       'text'),
        'pulldown' =>   array('pulldown',    'options',    'int'),
+       'radio' =>      array('radio',       'oneline',    'varchar(200)'),
        'checkbox' =>   array('checkbox',    'yesno',      'varchar(3)'),
        'yesno' =>      array('checkbox',    'yesno',      'varchar(3)'),
        'delete' =>     array('checkbox',    'yesno',      'n/a'),
@@ -222,8 +224,8 @@ function make_php() {
                                }
                        } else {
                                $tem->sub('formats');
-                               $tem->sub('tem_sets');
                        }
+                       $tem->sub('tem_sets');
                        if(!$always_field and $input != 'checkbox' and $input != 'radio') {
                                $always_field = $name;
                        }
@@ -261,7 +263,11 @@ function make_email() {
                list($name, $type, $input, $format, $sql) = $field;
                $tem->set('name', $name);
                $tem->set('caption', $name); # fixme
-               $tem->sub('fields');
+               if($type == 'textarea') {
+                       $tem->sub('multi_line');
+               } else {
+                       $tem->sub('fields');
+               }
        }
        return $tem->run();
 }