X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=metaform.php;h=ebd1f998810842e30882cc030978680996ad6e66;hb=37e83a7d771b652435ae2a57efb0aeb988484642;hp=06bb7dd78ad89c1e6895f7218b9dd6e3dae60cd7;hpb=6b038bb1556e1b9790a49834817d0bdef530bfde;p=wfpl.git

diff --git a/metaform.php b/metaform.php
index 06bb7dd..ebd1f99 100644
--- a/metaform.php
+++ b/metaform.php
@@ -51,7 +51,8 @@ $GLOBALS['types'] = array(
 	'rightyesno' => array('checkbox',    'yesno',      'varchar(3)'),
 	'yesno' =>      array('leftcheck',   '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)'),
 	'submit' =>     array('submit',      'oneline',    'n/a')
 );
 
@@ -66,8 +67,18 @@ function list_available_types() {
 
 
 function metaform() {
-	if(isset($_REQUEST['form_name'])) {
-		$GLOBALS['form_name'] = format_varname($_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']);
@@ -80,8 +91,6 @@ function metaform() {
 		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'])) {
@@ -105,7 +114,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");
@@ -164,7 +172,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;
@@ -210,8 +218,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) {
@@ -235,6 +245,9 @@ 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');
@@ -259,6 +272,18 @@ function make_html($whole_file = true) {
 				$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');
 			}
@@ -317,17 +342,22 @@ 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('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 = '';
@@ -346,8 +376,13 @@ function make_php() {
 				$php_fields .= '$' . $name;
 			}
 			if($input == 'image') {
+				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');
-				$tem->show('image_db');
 				if(!$image_included_yet) {
 					$tem->show('image_include');
 					$tem->show('upload_max');
@@ -355,7 +390,9 @@ function make_php() {
 					$image_included_yet = true;
 				}
 			} else {
-				if($input == 'pulldown') {
+				if($input == 'html') {
+					$has_html_editors = true;
+				} elseif($input == 'pulldown') {
 					$tem->show('pulldowns');
 					$tem->show('pulldown_format_extra');
 				}
@@ -372,6 +409,10 @@ function make_php() {
 		}
 	}
 
+	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);
@@ -420,11 +461,13 @@ function view_php() {
 	echo make_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;
@@ -444,7 +487,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');
 }
 
@@ -453,10 +496,12 @@ function view_email() {
 	echo make_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));
@@ -480,7 +525,7 @@ function preview() {
 }
 
 function download_tar() {
-	$name = $GLOBALS['form_name'];
+	$name = $GLOBALS['file_name'];
 	$data = array(
 		".htaccess" => make_htaccess(),
 		"run.php ->" => 'code/wfpl/run.php',
@@ -499,5 +544,3 @@ function download_tar() {
 
 metaform();
 exit();
-
-?>