From: Jason Woofenden <jason@jasonwoof.com>
Date: Tue, 28 Oct 2014 15:28:05 +0000 (-0400)
Subject: metaform: spaces between "if" and "(" in generated code
X-Git-Url: https://jasonwoof.com/gitweb/?p=wfpl.git;a=commitdiff_plain;h=5dfdf5fa2c160a1223f6872b0219fab8c21dabf5

metaform: spaces between "if" and "(" in generated code
---

diff --git a/metaform/template.php b/metaform/template.php
index 49e6b74..041b857 100644
--- a/metaform/template.php
+++ b/metaform/template.php
@@ -45,10 +45,10 @@ function ~file_name~_get_fields() {
 ~formats {~
 	$data['~name~'] = format_~format~(_REQUEST_cut('~name~')~pulldown_format_extra {~, '~name~'~}~);~}~~image_upload {~
 
-	if($_FILES['~name~'] && $_FILES['~name~']['error'] == 0) {
+	if ($_FILES['~name~'] && $_FILES['~name~']['error'] == 0) {
 		$data['~name~'] = convert_uploaded_image('~name~', $GLOBALS['upload_directory'] . $GLOBALS['~name~_file_name'], $GLOBALS['~name~_max_width'], $GLOBALS['~name~_max_height']~thumb_upload_params {~, $GLOBALS['~name~_thumb_max_width'], $GLOBALS['~name~_thumb_max_height']~}~);
 	} else {
-		if(_REQUEST_cut('delete_~name~') == 'Yes') {
+		if (_REQUEST_cut('delete_~name~') == 'Yes') {
 			$data['~name~'] = '';
 		} else {
 			$data['~name~'] = format_image_w_h~thumb_w_h {~_thumb_w_h~}~(_REQUEST_cut('old_~name~'));
@@ -57,13 +57,13 @@ function ~file_name~_get_fields() {
 	unset($_FILES['~name~']);~}~~file_upload {~
 
 	$~name~_filename_tmp = $GLOBALS['~name~_file_name'];
-	if(!$~name~_filename_tmp) {
+	if (!$~name~_filename_tmp) {
 		$~name~_filename_tmp = format_filename(_REQUEST_cut('~name~'));
 	}
-	if($_FILES['~name~'] && $_FILES['~name~']['error'] == 0) {
+	if ($_FILES['~name~'] && $_FILES['~name~']['error'] == 0) {
 		$data['~name~'] = save_uploaded_file('~name~', $GLOBALS['upload_directory'] . $~name~_filename_tmp);
 	} else {
-		if(_REQUEST_cut('delete_~name~') == 'Yes') {
+		if (_REQUEST_cut('delete_~name~') == 'Yes') {
 			$data['~name~'] = '';
 		} else {
 			$data['~name~'] = format_path(_REQUEST_cut('old_~name~'));
@@ -77,7 +77,7 @@ function ~file_name~_get_fields() {
 
 function ~public_file_name~_main() {~opt_public_display {~
 	$id = _REQUEST_cut('id');
-	if($id) {
+	if ($id) {
 		return ~file_name~_main_display($id);~opt_public_form unset {~
 	} else {
 		message("Error: Broken Link (~singular cap~ #$id not found)");
@@ -88,7 +88,7 @@ function ~public_file_name~_main() {~opt_public_display {~
 
 
 function ~file_name~_main() {~opt_pass {~
-	if(logged_in_as_admin()) {
+	if (logged_in_as_admin()) {
 		tem_set('admin_privs');
 	} else {
 		$_REQUEST['url'] = this_url();
@@ -96,33 +96,33 @@ function ~file_name~_main() {~opt_pass {~
 	}
 ~}~~opt_db {~
 	$id = _REQUEST_cut('edit_id');
-	if($id) {
+	if ($id) {
 		return ~file_name~_main_form($id);
 	}
 
 	$id = _REQUEST_cut('~file_name~_delete_id');
-	if($id) {
+	if ($id) {
 		return ~file_name~_main_delete($id);
 	}
 
-	if(_REQUEST_cut('new')) {
+	if (_REQUEST_cut('new')) {
 		return ~file_name~_main_form();
 	}
 ~}~~opt_listing {~
-	if(_REQUEST_cut('list')) {
+	if (_REQUEST_cut('list')) {
 		return ~file_name~_main_listing();
 	}
 ~}~~opt_display {~
 	$id = _REQUEST_cut('id');
-	if($id) {
+	if ($id) {
 		return ~file_name~_main_display($id);
 	}
 ~}~~opt_listing {~
-	if(_REQUEST_cut('download_csv')) {
+	if (_REQUEST_cut('download_csv')) {
 		return ~file_name~_csv_download();
 	}
 
-	if(isset($_POST['~always_field~'])) {
+	if (isset($_POST['~always_field~'])) {
 		return ~file_name~_main_form();
 	}
 
@@ -133,7 +133,7 @@ function ~file_name~_main() {~opt_pass {~
 
 function ~file_name~_main_display($id) {
 	$data = db_get_assoc('~table_name~', 'id,'.~file_name upper~_DB_FIELDS, 'where id=%i', $id);
-	if(!$data) {
+	if (!$data) {
 		message("Error: Broken Link (~singular cap~ #$id not found)");~opt_public_something {~
 		return './' . $GLOBALS['wfpl_basename'];~}~~opt_public_something unset {~
 		return './~file_name~';~}~
@@ -167,14 +167,14 @@ function ~file_name~_main_listing() {
 	$data = array();
 	$desc = '';
 	$sort = _REQUEST_cut('sort');
-	if($sort && substr($sort, 0, 1) === '-') {
+	if ($sort && substr($sort, 0, 1) === '-') {
 		$sort = substr($sort, 1);
 		$desc = ' DESC ';
 	} else {
 		$data["sorting-by-$sort"] = '-';
 	}
 	$legal_sorts = explode(',', ~file_name upper~_DB_FIELDS);
-	if(!$sort || !in_array($sort, $legal_sorts)) {
+	if (!$sort || !in_array($sort, $legal_sorts)) {
 		$sort = '~always_field~';
 	}
 
@@ -185,28 +185,28 @@ function ~file_name~_main_listing() {
 function ~file_name~_main_form($id = false) {~pulldowns {~
 	pulldown('~name~', ~pulldown_options~);~}~~has_pulldowns {~
 ~}~~opt_db {~
-	if($id) {
+	if ($id) {
 		tem_set('id', $id);
 	}
 ~}~
-	if(isset($_POST['~always_field~'])) {
+	if (isset($_POST['~always_field~'])) {
 		$data = ~file_name~_get_fields();
 
-		if("you're happy with the POSTed values") {~opt_db {~
-			if($id) {
+		if ("you're happy with the POSTed values") {~opt_db {~
+			if ($id) {
 				db_update_assoc('~table_name~', $data, 'where id=%i', $id);
 				message('~singular cap~ updated.');
 			} else {
 				db_insert_assoc('~table_name~', $data);
 				message('~singular cap~ saved.');
 			}~}~~opt_email {~
-			if($GLOBALS['~file_name~_form_recipient'] != 'fixme@example.com') {
+			if ($GLOBALS['~file_name~_form_recipient'] != 'fixme@example.com') {
 				$to = $GLOBALS['~file_name~_form_recipient'];
 				$from = 'noreply@~this_domain~';
 				$reply_to = $to;
-				if(isset($data['email']) and valid_email($data['email'])) {
+				if (isset($data['email']) and valid_email($data['email'])) {
 					$reply_to = $data['email'];
-					if($data['name'] and ereg('^[a-zA-Z0-9_\' -]*$', $data['name']) !== false) {
+					if ($data['name'] and ereg('^[a-zA-Z0-9_\' -]*$', $data['name']) !== false) {
 						$reply_to = "$data[name] <$reply_to>";
 					}
 				}
@@ -217,15 +217,15 @@ function ~file_name~_main_form($id = false) {~pulldowns {~
 				$message = $email_template->run();
 				$cc = '';
 				$bcc = '';
-				if(email($from, $to, $subject, $message, $reply_to, $cc, $bcc)) {
+				if (email($from, $to, $subject, $message, $reply_to, $cc, $bcc)) {
 					message('Due to an internal error, your message could not be sent. Please try again later.');
 					$error = true;
 				} else {
 					message('Message sent');
 				}
 			}~}~
-			if($error !== true) {~opt_public_something {~
-				if($GLOBALS['wfpl_basename'] == '~file_name~') {
+			if ($error !== true) {~opt_public_something {~
+				if ($GLOBALS['wfpl_basename'] == '~file_name~') {
 					return './~file_name~';
 				} else {
 					# FIXME create this page or change this to go elsewhere
@@ -239,7 +239,7 @@ function ~file_name~_main_form($id = false) {~pulldowns {~
 		# values in $data and will put those back in the filds below. You
 		# should add some message asking people to fix their entry in
 		# whatever way you require.~opt_db {~
-	} elseif($id) {
+	} elseif ($id) {
 		# we've recieved an edit id, but no data. So we grab the values to be edited from the database
 		$data = db_get_assoc('~table_name~', ~file_name upper~_DB_FIELDS, 'where id=%i', $id);~}~
 	} else {