X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=metaform.php;h=5ba0f44ffd2f2b43359451dbbc7a6205b3317d2d;hb=a679272cb862dd647da227cc720cd4d4853887c0;hp=b4f43ffb08510d8139f211811728931301174e21;hpb=0dda9bc7c95f95dabdde7921790879a9d81d3700;p=wfpl.git

diff --git a/metaform.php b/metaform.php
index b4f43ff..5ba0f44 100644
--- 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'),
@@ -242,7 +244,7 @@ function edit_url() {
 	$url = this_url();
 	$url = ereg_replace('view_php=[^&]*', 'edit=yes', $url);
 	$url = ereg_replace('download_tar=[^&]*', 'edit=yes', $url);
-	$url = ereg_replace('/[a-z0-9_.]*?', '/?', $url);
+	$url = ereg_replace('/[a-z0-9_.]*\?', '/?', $url);
 	return $url;
 }
 
@@ -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();
 }