X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=metaform.php;h=62ef5069f8afd9c2eb6b25fe52e7e862ee87c99c;hb=4a25d3b6318f7f361df3adfac17366452fe3ed49;hp=734d8fc91b759a38128e1d283524871a675e320e;hpb=8ef1f36849dc9f50ad2d5c19bef126ab3c9e454b;p=wfpl.git

diff --git a/metaform.php b/metaform.php
index 734d8fc..62ef506 100644
--- a/metaform.php
+++ b/metaform.php
@@ -37,7 +37,7 @@ $GLOBALS['types'] = array(
 	'phone' =>      array('textbox',     'phone',      'varchar(32)'),
 	'state' =>      array('states',      'oneline',    'varchar(2)'),
 	'money' =>      array('textbox',     'money',      'varchar(32)'),
-	'date' =>       array('textbox',     'mdy_to_ymd', 'char(10)'),
+	'date' =>       array('date',        'mdy_to_ymd', 'char(10)'),
 	'dollars' =>    array('textbox',     'dollars',    'varchar(32)'),
 	'url' =>        array('textbox',     'url',        'varchar(200)'),
 	'hidden' =>     array('hidden',      'unix',       'varchar(200)'),
@@ -56,20 +56,20 @@ $GLOBALS['types'] = array(
 );
 
 function list_available_types() {
-	$types = '';
+	ksort($GLOBALS['types']);
 	foreach($GLOBALS['types'] as $key => $value) {
-		if($types) {
-			$types .= ', ';
-		}
-		$types .= $key;
+		tem_set('type', $key);
+		tem_show('types');
+		tem_show('types_sep');
 	}
-	tem_set('available_types', $types);
 }
 
 
 function metaform() {
 	if(isset($_REQUEST['form_name'])) {
-		$GLOBALS['form_name'] = ereg_replace('[^a-z0-9_-]', '', $_REQUEST['form_name']);
+		$GLOBALS['form_name'] = format_varname($_REQUEST['form_name']);
+		$GLOBALS['singular'] = format_varname($_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']);
@@ -114,8 +114,9 @@ function metaform() {
 
 
 	set_form_action();
+	tem_load('code/wfpl/metaform/main.html');
 	list_available_types();
-	tem_output('code/wfpl/metaform/main.html');
+	tem_output();
 }
 
 
@@ -210,6 +211,7 @@ function make_html($whole_file = true) {
 	$tem = new tem();
 	$tem->load('code/wfpl/metaform/template.html');
 	$tem->set('form_name', $GLOBALS['form_name']);
+	$tem->set('singular', $GLOBALS['singular']);
 	$fields = get_fields();
 	$tem->set('always_field', find_always_field($fields));
 	foreach($fields as $field) {
@@ -296,6 +298,7 @@ function make_php() {
 	$tem = new tem();
 	$tem->load('code/wfpl/metaform/template.php');
 	$tem->set('form_name', $GLOBALS['form_name']);
+	$tem->set('singular', $GLOBALS['singular']);
 	$fields = get_fields();
 	$db_fields = '';
 	$php_fields = '';
@@ -435,6 +438,7 @@ function preview() {
 	unset($preview_tem);
 	$preview = ereg_replace('type="submit"', 'type="submit" disabled="disabled"', $preview);
 	tem_set('preview', $preview);
+	tem_show('hiddens');
 	set_form_action();
 	tem_output();
 }