X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=metaform.php;h=f89e720f356e426a11513fc5a983143290ac87a9;hb=1ad4ac7890228dfd78064f5ef8925e325e9aba29;hp=7bfa9f7778af2b604ed90f5436069f3befbd74a8;hpb=030f09ab36a49e16a65163e8a537a7ccdb3061e4;p=wfpl.git

diff --git a/metaform.php b/metaform.php
index 7bfa9f7..f89e720 100644
--- a/metaform.php
+++ b/metaform.php
@@ -2,21 +2,18 @@
 
 #  Copyright (C) 2006 Jason Woofenden
 #
-#  This file is part of wfpl.
-#
-#  wfpl is free software; you can redistribute it and/or modify it under the
-#  terms of the GNU Lesser General Public License as published by the Free
-#  Software Foundation; either version 2.1 of the License, or (at your option)
-#  any later version.
-#
-#  wfpl is distributed in the hope that it will be useful, but WITHOUT ANY
-#  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-#  FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
-#  more details.
-#
-#  You should have received a copy of the GNU Lesser General Public License
-#  along with wfpl; if not, write to the Free Software Foundation, Inc., 51
-#  Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+#  This program is free software: you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation, either version 3 of the License, or
+#  (at your option) any later version.
+#  
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#  
+#  You should have received a copy of the GNU General Public License
+#  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
 # This file writes the code for you (sql, php, html, email) to handle a form.
@@ -29,48 +26,60 @@ require_once('code/wfpl/format.php');
 # see code/wfpl/metaform/template.html for the html templates for these elements
 $GLOBALS['types'] = array(
 #    type                  input          format        sql     
+	'varname' =>    array('textbox',     'varname',    'varchar(50)'),
 	'name' =>       array('textbox',     'oneline',    'varchar(200)'),
 	'textbox' =>    array('textbox',     'oneline',    'varchar(200)'),
 	'int' =>        array('textbox',     'int',        'int'),
+	'decimal' =>    array('textbox',     'decimal',    'decimal(12,12)'),
 	'bigint' =>     array('textbox',     'int',        'varchar(100)'), # up to 100 digits, stored as a string
+	'zip' =>        array('textbox',     'zip',        'varchar(20)'),
 	'email' =>      array('textbox',     'email',      'varchar(100)'),
 	'phone' =>      array('textbox',     'phone',      'varchar(32)'),
 	'state' =>      array('states',      'oneline',    'varchar(2)'),
 	'money' =>      array('textbox',     'money',      'varchar(32)'),
+	'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)'),
 	'password' =>   array('password',    'oneline',    'varchar(200)'),
 	'textarea' =>   array('textarea',    'unix',       'text'),
 	'html' =>       array('html',        'unix',       'text'),
-	'pulldown' =>   array('pulldown',    'options',    'int'),
+	'pulldown' =>   array('pulldown',    'options',    'varchar(100)'),
 	'radio' =>      array('radio',       'oneline',    'varchar(200)'),
-	'checkbox' =>   array('checkbox',    'yesno',      'varchar(3)'),
-	'yesno' =>      array('checkbox',    'yesno',      'varchar(3)'),
+	'checkbox' =>   array('leftcheck',   'bool',       'int(1)'),
+	'rightcheck' => array('checkbox',    'bool',       'int(1)'),
+	'rightyesno' => array('checkbox',    'yesno',      'varchar(3)'),
+	'yesno' =>      array('leftcheck',   'yesno',      'varchar(3)'),
 	'delete' =>     array('checkbox',    'yesno',      'n/a'),
 	'image' =>      array('image',       'oneline',    'varchar(200)'),
 	'submit' =>     array('submit',      'oneline',    'n/a')
 );
 
 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']);
 		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';
 	}
@@ -105,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();
 }
 
 
@@ -115,8 +125,13 @@ function field_format($type) { return $GLOBALS['types'][$type][1]; }
 function field_sql($type)    { return $GLOBALS['types'][$type][2]; }
 
 function get_fields() {
+	# no sense in doing all this so many times
+	if(isset($GLOBALS['gotten_fields'])) {
+		return $GLOBALS['gotten_fields'];
+	}
+
 	$fields_str = unix_newlines($_REQUEST['fields']);
-	$ret = array();
+	$GLOBALS['gotten_fields'] = array();
 	$fields_str = rtrim($fields_str);
 	$fields = split("\n", $fields_str);
 	foreach($fields as $field) {
@@ -126,9 +141,9 @@ function get_fields() {
 		$input = field_input($type);
 		$format = field_format($type);
 		$sql = field_sql($type);
-		$ret[] = array($name, $type, $input, $format, $sql, $options);
+		$GLOBALS['gotten_fields'][] = array($name, $type, $input, $format, $sql, $options);
 	}
-	return $ret;
+	return $GLOBALS['gotten_fields'];
 }
 
 # this one, that you're using to create forms
@@ -156,12 +171,14 @@ function make_sql() {
 		if($sql != 'n/a') {
 			$tem->set('name', $name);
 			$tem->set('type', $sql);
-			if($sql == 'int') {
+			if(substr($sql, 0, 3) == 'int' || substr($sql, 0, 7) == 'decimal') {
 				$tem->set('default', '0');
+			} elseif($format == 'yesno') {
+				$tem->set('default', '"No"');
 			} else {
 				$tem->set('default', '""');
 			}
-			$tem->sub('column');
+			$tem->show('column');
 		}
 	}
 	view_headers();
@@ -172,6 +189,19 @@ function view_sql() {
 	view_headers();
 	echo make_sql();
 }
+
+# always_field is a form field that always submits (unlike say, checkboxes). It's used to detect if the form has submitted or not.
+function find_always_field($fields) {
+	foreach($fields as $field) {
+		list($name, $type, $input, $format, $sql) = $field;
+		if($input != 'submit' && $input != 'checkbox' && $input != 'radio') {
+			return $name;
+		}
+	}
+
+	return false;
+}
+	
 	
 
 # pass false if you want to exclude the <head> and <body> tag etc.
@@ -181,39 +211,81 @@ 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) {
 		list($name, $type, $input, $format, $sql) = $field;
 		$tem->set('name', $name);
-		$tem->set('caption', $name); # fixme
-		$tem->sub($input);
+		$tem->set('caption', format_caption($name));
+		$tem->show($input);
 		if($input != 'hidden') {
-			$tem->sub('row');
+			$tem->show('row');
 		}
 		if($input == 'image' && !$uploads_output_already) {
-			$tem->sub('uploads');
+			$tem->show('uploads');
 			$tem->set('enctype_attr', '" enctype="multipart/form-data');
 			$uploads_output_already = true;
 		} elseif($input == 'html') {
 			$has_html_editors = true;
 			$tem->set('html_field_name', $name);
-			$tem->sub('replace_textarea');
+			$tem->show('replace_textarea');
+		}
+		if($GLOBALS['opt_display']) {
+			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_db'] == 'Yes') {
-		$tem->sub('opt_db_1');
+		$tem->show('opt_db_1');
+		$tem->show('opt_db_2');
 	} else {
-		$tem->sub('opt_db_1_else');
+		$tem->show('opt_db_1_else');
 	}
-	$tem->set('name', 'save');
-	$tem->set('caption', 'Save');
-	$tem->sub('submit');
-	$tem->sub('row');
-	$tem->sub('form');
+
+	if($GLOBALS['opt_listing'] == 'Yes') {
+		if($GLOBALS['opt_display'] != 'Yes') {
+			$tem->show('opt_display_a_else');
+		}
+		$tem->show('opt_listing_1');
+	}
+
+	if($GLOBALS['opt_display'] == 'Yes') {
+		$tem->show('opt_display_1');
+		$tem->show('opt_display_2');
+	}
+
+	if($GLOBALS['opt_email'] == 'Yes' && $GLOBALS['opt_db'] != 'Yes') {
+		$tem->set('name', 'send');
+		$tem->set('caption', 'Send');
+	} else {
+		$tem->set('name', 'save');
+		$tem->set('caption', 'Save');
+	}
+	$tem->show('submit');
+	$tem->show('row');
+
+	$tem->show('form');
 
 	if($has_html_editors) {
-		$tem->sub('html_editor_headers');
+		$tem->show('html_editor_headers');
 	}
 
 	if($whole_file) {
@@ -233,10 +305,11 @@ 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 = '';
-	$always_field = false;
+	$always_field = find_always_field($fields);
 	$image_included_yet = false;
 	foreach($fields as $field) {
 		list($name, $type, $input, $format, $sql) = $field;
@@ -251,38 +324,54 @@ function make_php() {
 				$php_fields .= '$' . $name;
 			}
 			if($input == 'image') {
-				$tem->sub('image_upload');
-				$tem->sub('image_db');
+				$tem->show('image_upload');
+				$tem->show('image_db');
 				if(!$image_included_yet) {
-					$tem->sub('image_include');
-					$tem->sub('upload_max');
-					$tem->sub('upload_settings');
+					$tem->show('image_include');
+					$tem->show('upload_max');
+					$tem->show('upload_settings');
 					$image_included_yet = true;
 				}
 			} else {
-				$tem->sub('formats');
-			}
-			$tem->sub('tem_sets');
-			if(!$always_field and $input != 'checkbox' and $input != 'radio') {
-				$always_field = $name;
+				if($input == 'pulldown') {
+					$tem->show('pulldowns');
+					$tem->show('pulldown_format_extra');
+				}
+				$tem->show('formats');
 			}
+			$tem->show('tem_sets');
 		}
 	}
-	# always_field is a form field that always submits (unlike say, checkboxes). It's used to detect if the form has submitted or not.
+
 	$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');
+		$tem->show('opt_listing_2');
+	}
+	if($GLOBALS['opt_display'] == 'Yes') {
+		$tem->show('opt_display_1');
+		$tem->show('opt_display_2');
+	} else {
+		$tem->show('opt_display_1_else');
+		$tem->show('opt_display_2_else');
+	}
 	if($GLOBALS['opt_db'] == 'Yes') {
-		$tem->sub('opt_db_1');
-		$tem->sub('opt_db_2');
-		$tem->sub('opt_db_3');
-		$tem->sub('opt_db_4');
-		$tem->sub('opt_db_5');
+		$tem->show('opt_db_1');
+		$tem->show('opt_db_2');
+		$tem->show('opt_db_3');
+		$tem->show('opt_db_4');
+		$tem->show('opt_db_5');
 	}
 	if($GLOBALS['opt_email'] == 'Yes') {
-		$tem->sub('opt_email_1');
-		$tem->sub('opt_email_2');
+		$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');
 	}
 	return $tem->run();
 }
@@ -293,6 +382,7 @@ function edit_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 = str_replace('jasonwoof.l', 'jasonwoof.com', $url); # so that code generated on Jason's home computer will display a publically accessible link.
 	return $url;
 }
 
@@ -312,10 +402,13 @@ function make_email() {
 		$tem->set('name', $name);
 		$tem->set('caption', $name); # fixme
 		if($type == 'textarea') {
-			$tem->sub('multi_line');
+			$tem->show('multi_line');
+		} elseif($type == 'checkbox') {
+			$tem->show('checkbox');
 		} else {
-			$tem->sub('fields');
+			$tem->show('normal');
 		}
+		$tem->show('fields');
 	}
 	return $tem->run();
 }
@@ -323,7 +416,7 @@ function make_email() {
 function make_htaccess() {
 	$tem = new tem();
 	$tem->set('form', $GLOBALS['form_name']);
-	return $tem->run('code/wfpl/metaform/template.htaccess');
+	return $tem->run('code/wfpl/metaform/htaccess');
 }
 
 function view_email() {
@@ -337,9 +430,22 @@ function preview() {
 	tem_set('form_name', $GLOBALS['form_name']);
 	tem_set('fields', $_REQUEST['fields']);
 	$preview_tem = new tem();
-	$preview = $preview_tem->run(make_html(false));
+	$preview_tem->load_str(make_html(false));
+	if($GLOBALS['opt_db'] == 'Yes') {
+		$preview_tem->show('new_msg');
+	}
+	$fields = get_fields();
+	foreach($fields as $field) {
+		list($name, $type, $input, $format, $sql) = $field;
+		if($type == 'pulldown') {
+			pulldown($name, array('option 1', 'option 2', 'option 3'));
+		}
+	}
+	$preview = $preview_tem->run();
 	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();
 }
@@ -349,13 +455,16 @@ function download_tar() {
 	$data = array(
 		".htaccess" => make_htaccess(),
 		"run.php ->" => 'code/wfpl/run.php',
+		"style.css" => read_whole_file('code/wfpl/metaform/style.css'),
 		"$name.html" => make_html(),
-		"$name.sql" => make_sql(),
 		"$name.php" => make_php());
+	if($GLOBALS['opt_db'] == 'Yes') {
+		$data["$name.sql"] = make_sql();
+	}
 	if($GLOBALS['opt_email'] == 'Yes') {
 		$data["$name.email.txt"] = make_email();
 	}
-	make_wfpl_tar($name, $data);
+	make_tar($name, $data);
 }