X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=metaform.php;h=fdd1ad39eb66a734a3b6d2b375c064a4ed03c797;hb=4109b1932d56b8a509d746c25dfeaf6e8a5f6537;hp=a556f1abbfb6fd6c39e609d7e3139a803d41c20c;hpb=c63498c465bec640bbd8a521216aa37ba178b821;p=wfpl.git

diff --git a/metaform.php b/metaform.php
index a556f1a..fdd1ad3 100644
--- a/metaform.php
+++ b/metaform.php
@@ -46,12 +46,12 @@ $GLOBALS['types'] = array(
 	'html' =>       array('html',        'unix',       'text'),
 	'pulldown' =>   array('pulldown',    'options',    'varchar(100)'),
 	'radio' =>      array('radio',       'oneline',    'varchar(200)'),
-	'checkbox' =>   array('leftcheck',   'bool',       'int(1)'),
-	'rightcheck' => array('checkbox',    'bool',       'int(1)'),
-	'rightyesno' => array('checkbox',    'yesno',      'varchar(3)'),
-	'yesno' =>      array('leftcheck',   'yesno',      'varchar(3)'),
+	'checkbox' =>   array('checkbox',    'bool',       'int(1)'),
+	'yesno' =>      array('checkbox',    'yesno',      'varchar(3)'),
 	'delete' =>     array('checkbox',    'yesno',      'n/a'),
-	'image' =>      array('image',       'oneline',    'varchar(200)'),
+	'image' =>      array('image',       'oneline',    'varchar(120)'),
+	'thumb' =>      array('image',       'oneline',    'varchar(240)'),
+	'file' =>       array('file',        'oneline',    'varchar(100)'),
 	'submit' =>     array('submit',      'oneline',    'n/a')
 );
 
@@ -65,31 +65,48 @@ function list_available_types() {
 }
 
 
+function tem_set_globals(&$tem) {
+	$vars = array(
+		'file_name',
+		'table_name',
+		'plural',
+		'singular');
+	foreach($vars as $var) {
+		$tem->set($var, $GLOBALS[$var]);
+	}
+
+	$bools = array(
+		'opt_email',
+		'opt_db',
+		'opt_listing',
+		'opt_display',
+		'opt_pass');
+	foreach($bools as $bool) {
+		if(format_bool($GLOBALS[$bool])) {
+			$tem->set($bool);
+		}
+	}
+}
+
 function metaform() {
 	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']);
+		$GLOBALS['plural'] = format_oneline($_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['singular'] = format_oneline($_REQUEST['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']);
+		$GLOBALS['opt_pass'] = format_yesno($_REQUEST['opt_pass']);
+
+		tem_init();
+		tem_set_globals($GLOBALS['wfpl_template']);
 	}
 
 	if(isset($_REQUEST['fields'])) {
@@ -171,7 +188,7 @@ function view_headers() {
 function make_sql() {
 	$tem = new tem();
 	$tem->load('code/wfpl/metaform/template.sql');
-	$tem->set('table_name', $GLOBALS['table_name']);
+	tem_set_globals($tem);
 	$fields = get_fields();
 	foreach($fields as $field) {
 		list($name, $type, $input, $format, $sql) = $field;
@@ -201,7 +218,7 @@ function view_sql() {
 function find_always_field($fields) {
 	foreach($fields as $field) {
 		list($name, $type, $input, $format, $sql) = $field;
-		if($input != 'submit' && $input != 'checkbox' && $input != 'radio') {
+		if($input != 'submit' && $input != 'image' && $input != 'file' && $input != 'checkbox' && $input != 'radio') {
 			return $name;
 		}
 	}
@@ -217,10 +234,7 @@ function make_html($whole_file = true) {
 	$has_html_editors = false;
 	$tem = new tem();
 	$tem->load('code/wfpl/metaform/template.html');
-	$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_globals($tem);
 	$fields = get_fields();
 	$tem->set('always_field', find_always_field($fields));
 	foreach($fields as $field) {
@@ -232,7 +246,7 @@ function make_html($whole_file = true) {
 			$tem->show('row');
 		}
 
-		if($input == 'image' && !$uploads_output_already) {
+		if(($input == 'image' || $input == 'file') && !$uploads_output_already) {
 			$tem->show('uploads');
 			$tem->set('enctype_attr', '" enctype="multipart/form-data');
 			$uploads_output_already = true;
@@ -244,8 +258,10 @@ function make_html($whole_file = true) {
 
 		if($GLOBALS['opt_display'] == 'Yes') {
 			switch($input) {
+				case 'image':
+					$tem->show('display_image');
+				break;
 				case 'checkbox':
-				case 'leftcheck':
 					$tem->show('display_yesno');
 				break;
 				case 'date':
@@ -264,37 +280,26 @@ function make_html($whole_file = true) {
 		}
 
 		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');
+					$tem->show('listing_value_enc');
 				} elseif($input == 'date') {
 					$tem->set('listing_enc', 'mmddyyyy');
+					$tem->show('listing_value_enc');
+				} elseif($type == 'thumb') {
+					$tem->show('listing_value_thumb');
+				} else {
+					$tem->set('listing_enc', 'html');
+					$tem->show('listing_value_enc');
 				}
+
 				$tem->show('listing_head_col');
 				$tem->show('listing_row_col');
 			}
 		}
 	}
 
-	if($GLOBALS['opt_db'] == 'Yes') {
-		$tem->show('opt_db_1');
-		$tem->show('opt_db_2');
-	} else {
-		$tem->show('opt_db_1_else');
-	}
-
-	if($GLOBALS['opt_listing'] == 'Yes') {
-		$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');
@@ -331,22 +336,21 @@ function show_in_listing($type, $input, $format, $sql) {
 		case 'textarea':
 		case 'html':
 			return false;
-		default:
-			return true;
 	}
-}
+	if($type == 'image') {
+		return false;
+	}
 
+	return true;
+}
 
 function make_php() {
+	$has_html_editors = false;
 	$tem = new tem();
 	$tem->load('code/wfpl/metaform/template.php');
-	$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_globals($tem);
 	$fields = get_fields();
 	$db_fields = '';
-	$php_fields = '';
 	$always_field = find_always_field($fields);
 	$image_included_yet = false;
 	foreach($fields as $field) {
@@ -358,26 +362,29 @@ function make_php() {
 			if($sql != 'n/a') {
 				if($db_fields != '') $db_fields .= ',';
 				$db_fields .= $name;
-				if($php_fields != '') $php_fields .= ', ';
-				$php_fields .= '$' . $name;
 			}
 			if($input == 'image') {
-				$tem->show('image_upload');
-				$tem->show('image_db');
-				if(!$image_included_yet) {
-					$tem->show('image_include');
-					$tem->show('upload_max');
-					$tem->show('upload_settings');
-					$image_included_yet = true;
+				if($type == 'thumb') {
+					$tem->show('thumb_settings');
+					$tem->show('thumb_upload_params');
+					$tem->show('thumb_w_h');
 				}
+				$tem->show('image_settings');
+				$tem->show('image_upload');
+				$has_uploads = true;
+			} else if($input == 'file') {
+				$tem->show('file_settings');
+				$tem->show('file_upload');
+				$has_uploads = true;
 			} else {
-				if($input == 'pulldown') {
+				if($input == 'html') {
+					$has_html_editors = true;
+				} elseif($input == 'pulldown') {
 					$tem->show('pulldowns');
 					$tem->show('pulldown_format_extra');
 				}
 				$tem->show('formats');
 			}
-			$tem->show('tem_sets');
 		}
 
 		if($GLOBALS['opt_listing'] == 'Yes') {
@@ -387,36 +394,26 @@ function make_php() {
 			}
 		}
 	}
+	if($has_uploads) {
+		$tem->show('uploads_include');
+		$tem->show('upload_max');
+		$tem->show('upload_settings');
+		$image_included_yet = true;
+	}
+
+	if($has_html_editors) {
+		$tem->show('show_extra_headers');
+	}
 
 	$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->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->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');
+		$this_domain = $_SERVER['HTTP_HOST'];
+		if(substr($this_domain, -2) == '.l') {
+			$this_domain = substr($this_domain, 0, -1) . 'com';
+		}
+		$tem->set('this_domain', $this_domain);
 	}
 	return $tem->run();
 }
@@ -436,19 +433,15 @@ function view_php() {
 	echo make_php();
 }
 
-
 function make_email() {
 	$tem = new tem();
 	$tem->load('code/wfpl/metaform/template.email.txt');
-	$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_globals($tem);
 	$fields = get_fields();
 	foreach($fields as $field) {
 		list($name, $type, $input, $format, $sql) = $field;
 		$tem->set('name', $name);
-		$tem->set('caption', $name); # fixme
+		$tem->set('caption', format_caption($name));
 		if($type == 'textarea') {
 			$tem->show('multi_line');
 		} elseif($type == 'checkbox') {
@@ -472,13 +465,9 @@ function view_email() {
 	echo make_email();
 }
 
-
 function preview() {
 	tem_load('code/wfpl/metaform/preview.html');
-	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_globals($GLOBALS['wfpl_template']);
 	tem_set('fields', $_REQUEST['fields']);
 	$preview_tem = new tem();
 	$preview_tem->load_str(make_html(false));
@@ -504,8 +493,9 @@ function preview() {
 function download_tar() {
 	$name = $GLOBALS['file_name'];
 	$data = array(
+		"INSTALL" => read_whole_file('code/wfpl/metaform/INSTALL'),
 		".htaccess" => make_htaccess(),
-		"run.php ->" => 'code/wfpl/run.php',
+		#"run.php ->" => 'code/wfpl/run.php',
 		"style.css" => read_whole_file('code/wfpl/metaform/style.css'),
 		"$name.html" => make_html(),
 		"$name.php" => make_php());
@@ -521,5 +511,3 @@ function download_tar() {
 
 metaform();
 exit();
-
-?>