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

diff --git a/metaform.php b/metaform.php
index c4d83a0..66cb824 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.
@@ -49,9 +46,10 @@ $GLOBALS['types'] = array(
 	'html' =>       array('html',        'unix',       'text'),
 	'pulldown' =>   array('pulldown',    'options',    'varchar(100)'),
 	'radio' =>      array('radio',       'oneline',    'varchar(200)'),
-	'leftcheck' =>  array('leftcheck',   'yesno',      'varchar(3)'),
-	'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')
@@ -170,7 +168,7 @@ 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"');
@@ -321,10 +319,8 @@ function make_php() {
 	if($GLOBALS['opt_listing'] == 'Yes') {
 		$tem->show('opt_listing_1');
 		$tem->show('opt_listing_2');
-		$tem->show('opt_listing_3');
 		$tem->show('opt_listing_4');
 	} else {
-		$tem->show('opt_listing_3_else');
 		$tem->show('opt_listing_4_else');
 	}
 	if($GLOBALS['opt_db'] == 'Yes') {
@@ -372,6 +368,8 @@ function make_email() {
 		$tem->set('caption', $name); # fixme
 		if($type == 'textarea') {
 			$tem->show('multi_line');
+		} elseif($type == 'checkbox') {
+			$tem->show('checkbox');
 		} else {
 			$tem->show('normal');
 		}
@@ -410,6 +408,7 @@ function preview() {
 	}
 	$preview = $preview_tem->run();
 	unset($preview_tem);
+	$preview = ereg_replace('type="submit"', 'type="submit" disabled="disabled"', $preview);
 	tem_set('preview', $preview);
 	set_form_action();
 	tem_output();
@@ -429,7 +428,7 @@ function download_tar() {
 	if($GLOBALS['opt_email'] == 'Yes') {
 		$data["$name.email.txt"] = make_email();
 	}
-	make_wfpl_tar($name, $data);
+	make_tar($name, $data);
 }