X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=metaform%2Ftemplate.php;h=aed60548f9fc19dcfaa23bf4653909e94f46647b;hb=75be750e3413ca96736f78adcfdc8fcf7db9f91e;hp=9742f4ef73e8078e1b7656fd262ea5547a2c9501;hpb=ece89d7b32c6eb58bf3704ea360b9b292c551c7f;p=wfpl.git

diff --git a/metaform/template.php b/metaform/template.php
index 9742f4e..aed6054 100644
--- a/metaform/template.php
+++ b/metaform/template.php
@@ -9,10 +9,10 @@
 
 
 # SETUP
-<!--~opt_email_1 start~-->
+<!--~opt_email_1 {~-->
 # To send results by e-mail, all you have to do is set your e-mail address here:
 $GLOBALS['~file_name~_form_recipient'] = "fixme@example.com";
-<!--~end~--><!--~opt_db_1 start~-->
+<!--~}~--><!--~opt_db_1 {~-->
 # To save results to a database, you'll need to create the ~table_name~ table
 # (the file ~file_name~.sql should help with this), and create the file
 # 'code/db_connect.php' which calls db_connect() see:
@@ -20,55 +20,55 @@ $GLOBALS['~file_name~_form_recipient'] = "fixme@example.com";
 #
 # if you rename any of the database fields, you'll need to update this:
 
-define('~file_name.upper~_DB_FIELDS', '~db_fields~');
-<!--~end~--><!--~upload_settings start~-->
+define('~file_name upper~_DB_FIELDS', '~db_fields~');
+<!--~}~--><!--~upload_settings {~-->
 # Set this to the path to your uploads directory. It can be relative to the
 # location of this script. IT MUST END WITH A SLASH
 $GLOBALS['upload_directory'] = 'uploads/';
-<!--~end~--><!--~image_settings start~-->
+<!--~}~--><!--~image_settings {~-->
 $GLOBALS['~name~_max_width'] = '400';
-$GLOBALS['~name~_max_height'] = '400';<!--~thumb_settings start~-->
+$GLOBALS['~name~_max_height'] = '400';<!--~thumb_settings {~-->
 $GLOBALS['~name~_thumb_max_width'] = '70';
 $GLOBALS['~name~_thumb_max_height'] = '70';
 $GLOBALS['~name~_file_name'] = uniqid() . getmypid() . '.jpg'; # comment this out to use uploader's filename
-<!--~end~--><!--~end~--><!--~opt_http_pass_1 start~-->
+<!--~}~--><!--~}~--><!--~opt_http_pass_1 {~-->
 # Define the username and password required to view this form:
 define('AUTH_REALM', '~file_name~ administration area');
 define('AUTH_USER', 'fixme');
 define('AUTH_PASS', 'fixme');
-<!--~end~-->
+<!--~}~-->
 
 require_once('code/wfpl/template.php');
 require_once('code/wfpl/format.php');
 require_once('code/wfpl/messages.php');
-require_once('code/wfpl/email.php');<!--~opt_db_2 start~-->
-require_once('code/db_connect.php');<!--~end~--><!--~image_include start~-->
-require_once('code/wfpl/upload.php');<!--~end~-->
+require_once('code/wfpl/email.php');<!--~opt_db_2 {~-->
+require_once('code/db_connect.php');<!--~}~--><!--~image_include {~-->
+require_once('code/wfpl/upload.php');<!--~}~-->
 
-function ~file_name~_get_fields() {<!--~formats start~-->
-	$~name~ = format_~format~($_REQUEST['~name~']<!--~pulldown_format_extra start~-->, '~name~'<!--~end~-->);<!--~end~--><!--~image_upload start~-->
+function ~file_name~_get_fields() {<!--~formats {~-->
+	$~name~ = format_~format~($_REQUEST['~name~']<!--~pulldown_format_extra {~-->, '~name~'<!--~}~-->);<!--~}~--><!--~image_upload {~-->
 	if($_FILES['~name~'] && $_FILES['~name~']['error'] == 0) {
-		$~name~ = convert_uploaded_image('~name~', $GLOBALS['upload_directory'] . $GLOBALS['~name~_file_name'], $GLOBALS['~name~_max_width'], $GLOBALS['~name~_max_height']<!--~thumb_upload_params start~-->, $GLOBALS['~name~_thumb_max_width'], $GLOBALS['~name~_thumb_max_height']<!--~end~-->);
+		$~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['delete_~name~'] == 'Yes') {
 			$~name~ = '';
 		} else {
-			$~name~ = format_image_w_h<!--~thumb_w_h start~-->_thumb_w_h<!--~end~-->($_REQUEST['old_~name~']);
+			$~name~ = format_image_w_h<!--~thumb_w_h {~-->_thumb_w_h<!--~}~-->($_REQUEST['old_~name~']);
 		}
-	}<!--~end~-->
+	}<!--~}~-->
 
 	~file_name~_tem_sets(~php_fields~);
 
 	return array(~php_fields~);
 }
 
-function ~file_name~_tem_sets(~php_fields~) {<!--~tem_sets start~-->
-	tem_set('~name~', $~name~);<!--~end~-->
+function ~file_name~_tem_sets(~php_fields~) {<!--~tem_sets {~-->
+	tem_set('~name~', $~name~);<!--~}~-->
 }
-<!--~opt_listing_2 start~-->
+<!--~opt_listing_2 {~-->
 # You may pass a "where clause" for the db query.
 function ~file_name~_display_listing($where = 'order by ~always_field~ limit 100') {
-	$rows = db_get_rows('~table_name~', 'id<!--~listing_fields_1 start~-->,~name~<!--~end~-->', $where);
+	$rows = db_get_rows('~table_name~', 'id<!--~listing_fields_1 {~-->,~name~<!--~}~-->', $where);
 	if($rows == false || count($rows) == 0) {
 		tem_show('empty_listing');
 		tem_show('listings');
@@ -76,7 +76,7 @@ function ~file_name~_display_listing($where = 'order by ~always_field~ limit 100
 	}
 
 	foreach($rows as $row) {
-		list($id<!--~listing_fields_2 start~-->, $~name~<!--~end~-->) = $row;
+		list($id<!--~listing_fields_2 {~-->, $~name~<!--~}~-->) = $row;
 		tem_set('id', $id);
 		if($~always_field~ == '') {
 			$~always_field~ = '--';
@@ -88,8 +88,8 @@ function ~file_name~_display_listing($where = 'order by ~always_field~ limit 100
 	tem_show('listings');
 	return true;
 }
-<!--~end~-->
-function ~file_name~_main() {<!--~opt_display_1 start~-->
+<!--~}~-->
+function ~file_name~_main() {<!--~opt_display_1 {~-->
 	if(isset($_REQUEST['~file_name~_id'])) {
 		$ret = ~file_name~_display_main();
 		if($ret) {
@@ -103,15 +103,15 @@ function ~file_name~_main() {<!--~opt_display_1 start~-->
 		}
 		tem_show('edit_body');
 	}
-<!--~end~--><!--~opt_display_1_else start~-->
+<!--~}~--><!--~opt_display_1_else {~-->
 	$ret = _~file_name~_main();
 	if($ret) {
 		return $ret;
 	}
-<!--~end~-->
+<!--~}~-->
 	# sections displayed with tem_show() will be coppied to the main template if you have one.
 	tem_show('main_body');
-}<!--~opt_display_2 start~-->
+}<!--~opt_display_2 {~-->
 
 function ~file_name~_display_main() {
 	$id = format_int($_REQUEST['~file_name~_id']);
@@ -120,9 +120,9 @@ function ~file_name~_display_main() {
 		message('Error: Broken link');
 		return './~file_name~';
 	}
-	$row = db_get_row('~table_name~', ~file_name.upper~_DB_FIELDS, 'where id=%i', $id);
+	$row = db_get_row('~table_name~', ~file_name upper~_DB_FIELDS, 'where id=%i', $id);
 	if(!$row) {
-		message('Error: ~singular.cap~ not found');
+		message('Error: ~singular cap~ not found');
 		return './~file_name~';
 	}
 	list(~php_fields~) = $row;
@@ -130,10 +130,10 @@ function ~file_name~_display_main() {
 	tem_set('id', $id);
 }
 
-function ~file_name~_edit_main() {<!--~end~--><!--~opt_display_2_else start~-->
+function ~file_name~_edit_main() {<!--~}~--><!--~opt_display_2_else {~-->
 
 
-function _~file_name~_main() {<!--~end~--><!--~opt_http_pass_2 start~-->
+function _~file_name~_main() {<!--~}~--><!--~opt_http_pass_2 {~-->
 	# To remove password protection, just delete this block:
 	if (!isset($_SERVER['PHP_AUTH_USER']) || $_SERVER['PHP_AUTH_USER'] != AUTH_USER || $_SERVER['PHP_AUTH_PW'] != AUTH_PASS) {
 		header('WWW-Authenticate: Basic realm="' . AUTH_REALM . '"');
@@ -141,9 +141,9 @@ function _~file_name~_main() {<!--~end~--><!--~opt_http_pass_2 start~-->
 		echo '401 Unauthorized';
 		exit;
 	}
-<!--~end~--><!--~pulldowns start~-->
+<!--~}~--><!--~pulldowns {~-->
 	pulldown('~name~', array('option 1', 'option 2', 'option 3'));
-<!--~end~--><!--~opt_db_3 start~-->
+<!--~}~--><!--~opt_db_3 {~-->
 	$edit_id = format_int($_REQUEST['~file_name~_edit_id']);
 	unset($_REQUEST['~file_name~_edit_id']);
 	if($edit_id) {
@@ -156,31 +156,31 @@ function _~file_name~_main() {<!--~end~--><!--~opt_http_pass_2 start~-->
 	unset($_REQUEST['~file_name~_delete_id']);
 	if($delete_id) {
 		db_delete('~table_name~', 'where id=%i', $delete_id);
-		message('~singular.cap~ deleted.');
+		message('~singular cap~ deleted.');
 
 		return './~file_name~';
 	}
 
-	if(!$edit_id) {<!--~opt_listing_1 start~-->
+	if(!$edit_id) {<!--~opt_listing_1 {~-->
 		if(!isset($_REQUEST['~file_name~_new']) && !isset($_REQUEST['~always_field~'])) {
 			~file_name~_display_listing();
 			return;
 		}
-<!--~end~-->
+<!--~}~-->
 		tem_show('new_msg');
-	}<!--~end~-->
+	}<!--~}~-->
 
 	if(isset($_POST['~always_field~'])) {
 		list(~php_fields~) = ~file_name~_get_fields();
 
-		if("you're happy with the POSTed values") {<!--~opt_db_4 start~-->
+		if("you're happy with the POSTed values") {<!--~opt_db_4 {~-->
 			if($edit_id) {
-				db_update('~table_name~', ~file_name.upper~_DB_FIELDS, ~php_fields~, 'where id=%i', $edit_id);
-				message('~singular.cap~ updated.');
+				db_update('~table_name~', ~file_name upper~_DB_FIELDS, ~php_fields~, 'where id=%i', $edit_id);
+				message('~singular cap~ updated.');
 			} else {
-				db_insert('~table_name~', ~file_name.upper~_DB_FIELDS, ~php_fields~);
-				message('~singular.cap~ saved.');
-			}<!--~end~--><!--~opt_email_2 start~-->
+				db_insert('~table_name~', ~file_name upper~_DB_FIELDS, ~php_fields~);
+				message('~singular cap~ saved.');
+			}<!--~}~--><!--~opt_email_2 {~-->
 			if($GLOBALS['~file_name~_form_recipient'] != "fixme@example.com") {
 				$to = $GLOBALS['~file_name~_form_recipient'];
 				$from = $to;
@@ -191,7 +191,7 @@ function _~file_name~_main() {<!--~end~--><!--~opt_http_pass_2 start~-->
 						$reply_to = "$_REQUEST[name] <$reply_to>";
 					}
 				}
-				$subject = '~plural.cap~ form submitted';
+				$subject = '~plural cap~ form submitted';
 				$message = tem_run('~file_name~.email.txt');
 				$cc = '';
 				$bcc = '';
@@ -201,7 +201,7 @@ function _~file_name~_main() {<!--~end~--><!--~opt_http_pass_2 start~-->
 				} else {
 					message('Message sent');
 				}
-			}<!--~end~-->
+			}<!--~}~-->
 			if($error !== true) {
 				return './~file_name~'; # FIXME is this the page you want to go to after successful form submission?
 			}
@@ -209,25 +209,25 @@ function _~file_name~_main() {<!--~end~--><!--~opt_http_pass_2 start~-->
 		# otherwise, we display the form again. ~file_name~_get_fields() has
 		# already put the posted values back into the template engine, so they will
 		# show up in the form fields. You should add some message asking people to
-		# fix their entry in whatever way you require.<!--~opt_db_5 start~-->
+		# fix their entry in whatever way you require.<!--~opt_db_5 {~-->
 	} elseif($edit_id) {
 		# we've recieved an edit id, but no data. So we grab the values to be edited from the database
-		list(~php_fields~) = db_get_row('~table_name~', ~file_name.upper~_DB_FIELDS, 'where id=%i', $edit_id);
-		~file_name~_tem_sets(~php_fields~);<!--~end~-->
+		list(~php_fields~) = db_get_row('~table_name~', ~file_name upper~_DB_FIELDS, 'where id=%i', $edit_id);
+		~file_name~_tem_sets(~php_fields~);<!--~}~-->
 	} else {
 		# form not submitted, you can set default values like so:
 		#tem_set('~always_field~', 'Yes');
-	}<!--~upload_max start~-->
+	}<!--~upload_max {~-->
 
-	tem_set('upload_max_filesize', upload_max_filesize());<!--~end~-->
+	tem_set('upload_max_filesize', upload_max_filesize());<!--~}~-->
 
 	# this has to be later in the file because it requres that ~always_field~ be set already
 	if($edit_id) {
 		tem_show('edit_msg');
 	}
 
-	tem_show('form');<!--~show_extra_headers start~-->
-	tem_show('extra_headers');<!--~end~-->
+	tem_show('form');<!--~show_extra_headers {~-->
+	tem_show('extra_headers');<!--~}~-->
 }
 
 ?>