X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=metaform.php;h=a556f1abbfb6fd6c39e609d7e3139a803d41c20c;hb=de71c4c4768f8f464ff61cfda3f8e31d20d2b0b0;hp=66cb824533f4477712a2c846adbd364c465f4935;hpb=1da28f9d8f7cbd147b91caa5772ec62c41dcc734;p=wfpl.git

diff --git a/metaform.php b/metaform.php
index 66cb824..a556f1a 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,30 +56,40 @@ $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']);
+	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']);
+		# backwards compatibility:
+		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_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']);
 		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_http_pass'] = format_yesno($_REQUEST['opt_http_pass']);
 		tem_set('opt_http_pass', $GLOBALS['opt_http_pass']);
-	} else {
-		$GLOBALS['form_name'] = 'some_form';
 	}
 
 	if(isset($_REQUEST['fields'])) {
@@ -103,7 +113,6 @@ function metaform() {
 			exit();
 		} elseif(isset($_REQUEST['edit'])) {
 			tem_set('fields', $_REQUEST['fields']);
-			tem_set('form_name', $GLOBALS['form_name']);
 			# fall through
 		} else {
 			die("Sorry... couldn't tell which button you pressed");
@@ -112,8 +121,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();
 }
 
 
@@ -161,7 +171,7 @@ function view_headers() {
 function make_sql() {
 	$tem = new tem();
 	$tem->load('code/wfpl/metaform/template.sql');
-	$tem->set('form_name', $GLOBALS['form_name']);
+	$tem->set('table_name', $GLOBALS['table_name']);
 	$fields = get_fields();
 	foreach($fields as $field) {
 		list($name, $type, $input, $format, $sql) = $field;
@@ -207,7 +217,10 @@ function make_html($whole_file = true) {
 	$has_html_editors = false;
 	$tem = new tem();
 	$tem->load('code/wfpl/metaform/template.html');
-	$tem->set('form_name', $GLOBALS['form_name']);
+	$tem->set('file_name', $GLOBALS['file_name']);
+	$tem->set('table_name', $GLOBALS['table_name']);
+	$tem->set('singular', $GLOBALS['singular']);
+	$tem->set('plural', $GLOBALS['plural']);
 	$fields = get_fields();
 	$tem->set('always_field', find_always_field($fields));
 	foreach($fields as $field) {
@@ -218,6 +231,7 @@ function make_html($whole_file = true) {
 		if($input != 'hidden') {
 			$tem->show('row');
 		}
+
 		if($input == 'image' && !$uploads_output_already) {
 			$tem->show('uploads');
 			$tem->set('enctype_attr', '" enctype="multipart/form-data');
@@ -227,6 +241,42 @@ function make_html($whole_file = true) {
 			$tem->set('html_field_name', $name);
 			$tem->show('replace_textarea');
 		}
+
+		if($GLOBALS['opt_display'] == 'Yes') {
+			switch($input) {
+				case 'checkbox':
+				case 'leftcheck':
+					$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');
+		}
+
+		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');
+				} elseif($input == 'date') {
+					$tem->set('listing_enc', 'mmddyyyy');
+				}
+				$tem->show('listing_head_col');
+				$tem->show('listing_row_col');
+			}
+		}
 	}
 
 	if($GLOBALS['opt_db'] == 'Yes') {
@@ -238,8 +288,11 @@ function make_html($whole_file = true) {
 
 	if($GLOBALS['opt_listing'] == 'Yes') {
 		$tem->show('opt_listing_1');
-	} else {
-		$tem->show('opt_listing_1_else');
+	}
+
+	if($GLOBALS['opt_display'] == 'Yes') {
+		$tem->show('opt_display_1');
+		$tem->show('opt_display_2');
 	}
 
 	if($GLOBALS['opt_email'] == 'Yes' && $GLOBALS['opt_db'] != 'Yes') {
@@ -270,11 +323,27 @@ function view_html() {
 	echo make_html();
 }
 
+function show_in_listing($type, $input, $format, $sql) {
+	switch($input) {
+		case 'submit':
+		case 'hidden':
+		case 'password':
+		case 'textarea':
+		case 'html':
+			return false;
+		default:
+			return true;
+	}
+}
+
 
 function make_php() {
 	$tem = new tem();
 	$tem->load('code/wfpl/metaform/template.php');
-	$tem->set('form_name', $GLOBALS['form_name']);
+	$tem->set('file_name', $GLOBALS['file_name']);
+	$tem->set('table_name', $GLOBALS['table_name']);
+	$tem->set('singular', $GLOBALS['singular']);
+	$tem->set('plural', $GLOBALS['plural']);
 	$fields = get_fields();
 	$db_fields = '';
 	$php_fields = '';
@@ -310,6 +379,13 @@ function make_php() {
 			}
 			$tem->show('tem_sets');
 		}
+
+		if($GLOBALS['opt_listing'] == 'Yes') {
+			if(show_in_listing($type, $input, $format, $sql)) {
+				$tem->show('listing_fields_1');
+				$tem->show('listing_fields_2');
+			}
+		}
 	}
 
 	$tem->set('always_field', $always_field);
@@ -319,9 +395,13 @@ function make_php() {
 	if($GLOBALS['opt_listing'] == 'Yes') {
 		$tem->show('opt_listing_1');
 		$tem->show('opt_listing_2');
-		$tem->show('opt_listing_4');
+	}
+	if($GLOBALS['opt_display'] == 'Yes') {
+		$tem->show('opt_display_1');
+		$tem->show('opt_display_2');
 	} else {
-		$tem->show('opt_listing_4_else');
+		$tem->show('opt_display_1_else');
+		$tem->show('opt_display_2_else');
 	}
 	if($GLOBALS['opt_db'] == 'Yes') {
 		$tem->show('opt_db_1');
@@ -360,7 +440,10 @@ function view_php() {
 function make_email() {
 	$tem = new tem();
 	$tem->load('code/wfpl/metaform/template.email.txt');
-	$tem->set('form_name', $GLOBALS['form_name']);
+	$tem->set('file_name', $GLOBALS['file_name']);
+	$tem->set('table_name', $GLOBALS['table_name']);
+	$tem->set('singular', $GLOBALS['singular']);
+	$tem->set('plural', $GLOBALS['plural']);
 	$fields = get_fields();
 	foreach($fields as $field) {
 		list($name, $type, $input, $format, $sql) = $field;
@@ -380,7 +463,7 @@ function make_email() {
 
 function make_htaccess() {
 	$tem = new tem();
-	$tem->set('form', $GLOBALS['form_name']);
+	$tem->set('form', $GLOBALS['file_name']);
 	return $tem->run('code/wfpl/metaform/htaccess');
 }
 
@@ -392,7 +475,10 @@ function view_email() {
 
 function preview() {
 	tem_load('code/wfpl/metaform/preview.html');
-	tem_set('form_name', $GLOBALS['form_name']);
+	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('fields', $_REQUEST['fields']);
 	$preview_tem = new tem();
 	$preview_tem->load_str(make_html(false));
@@ -410,12 +496,13 @@ 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();
 }
 
 function download_tar() {
-	$name = $GLOBALS['form_name'];
+	$name = $GLOBALS['file_name'];
 	$data = array(
 		".htaccess" => make_htaccess(),
 		"run.php ->" => 'code/wfpl/run.php',