X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=metaform%2Ftemplate.php;h=bb85036cb2a4b374e22a584f53da7d472607a61d;hb=d3d84ba460022c2e929dd622f4418af97e73d91e;hp=071728ffbda8a60ce7b0ae49cd887281280d1d9f;hpb=4fbc22c5aa1f313ed5851ade9fad988f0646266a;p=wfpl.git

diff --git a/metaform/template.php b/metaform/template.php
index 071728f..bb85036 100644
--- a/metaform/template.php
+++ b/metaform/template.php
@@ -9,10 +9,10 @@
 
 
 # SETUP
-<!--~opt_email_1 {~-->
+<!--~opt_email {~-->
 # 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';
-<!--~}~--><!--~opt_db_1 {~-->
+<!--~}~--><!--~opt_db {~-->
 # 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:
@@ -35,11 +35,8 @@ $GLOBALS['~name~_thumb_max_height'] = '70';
 $GLOBALS['~name~_file_name'] = uniqid() . getmypid() . '.jpg'; # comment this out to use uploader's filename
 <!--~}~--><!--~}~-->
 
-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 {~-->
-require_once('code/db_connect.php');<!--~}~--><!--~uploads_include {~-->
+require_once('code/wfpl/email.php');<!--~uploads_include {~-->
 require_once('code/wfpl/upload.php');<!--~}~-->
 
 function ~file_name~_get_fields() {
@@ -72,33 +69,13 @@ function ~file_name~_get_fields() {
 	return $data;
 }
 
-<!--~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_assocs('~table_name~', 'id<!--~listing_fields_1 {~-->,~name~<!--~}~-->', $where);
-	if($rows == false || count($rows) == 0) {
-		tem_set('listings', array('empty_listing' => true));
-		return;
-	}
 
-	# make sure there's something clickable
-	foreach($rows as &$row) {
-		if($row['~always_field~'] == '') {
-			$row['~always_field~'] = '--';
-		}
-	}
-	tem_set('listings', array(
-		'populated_listing' => true,
-		'rows' => $rows));
-	return true;
-}
-<!--~}~-->
 function ~file_name~_main() {<!--~opt_pass {~-->
 	if(!logged_in_as_admin()) {
-		$GLOBALS['url'] = this_url();
+		$_REQUEST['url'] = this_url();
 		return 'admin_login';
 	}
-<!--~}~--><!--~opt_display_1 {~-->
+<!--~}~--><!--~opt_display {~-->
 	if(isset($_REQUEST['~file_name~_id'])) {
 		return ~file_name~_display_main();
 	} else {
@@ -113,24 +90,24 @@ function ~file_name~_display_main() {
 		message('Error: Broken link');
 		return './~file_name~';
 	}
-	$row = db_get_assoc('~table_name~', 'id,'.~file_name upper~_DB_FIELDS, 'where id=%i', $id);
-	if(!$row) {
+	$data = db_get_assoc('~table_name~', 'id,'.~file_name upper~_DB_FIELDS, 'where id=%i', $id);
+	if(!$data) {
 		message('Error: ~singular cap~ not found');
 		return './~file_name~';
 	}
-	tem_set('display', $row);
+	tem_set('display', $data);
 }
 
 function ~file_name~_edit_main() {<!--~}~--><!--~pulldowns {~-->
-	pulldown('~name~', array('option 1', 'option 2', 'option 3'));
-<!--~}~--><!--~opt_db_3 {~-->
+	pulldown('~name~', ~pulldown_options~);
+<!--~}~--><!--~opt_db {~-->
 	$edit_id = format_int($_REQUEST['~file_name~_edit_id']);
 	unset($_REQUEST['~file_name~_edit_id']);
 	if($edit_id) {
 		# add hidden field for database id of row we're editing
 		tem_set('~file_name~_edit_id', $edit_id);
-		tem_set('editing', 'show');
-		tem_set('edit_msg', 'show');
+		tem_set('editing');
+		tem_set('edit_msg');
 	}
 
 	$delete_id = format_int($_REQUEST['~file_name~_delete_id']);
@@ -142,26 +119,27 @@ function ~file_name~_edit_main() {<!--~}~--><!--~pulldowns {~-->
 		return './~file_name~';
 	}
 
-	if(!$edit_id) {<!--~opt_listing_1 {~-->
+	if(!$edit_id) {<!--~opt_listing {~-->
 		if(!isset($_REQUEST['~file_name~_new']) && !isset($_REQUEST['~always_field~'])) {
-			~file_name~_display_listing();
+			$listing_rows = db_get_assocs('~table_name~', 'id<!--~listing_fields_1 {~-->,~name~<!--~}~-->', 'order by ~always_field~ limit 100');
+			tem_set('listings', $listing_rows);
 			return;
 		}
 <!--~}~-->
-		tem_set('new_msg', 'show');
+		tem_set('new_msg');
 	}
 <!--~}~-->
 	if(isset($_POST['~always_field~'])) {
 		$data = ~file_name~_get_fields();
 
-		if("you're happy with the POSTed values") {<!--~opt_db_4 {~-->
+		if("you're happy with the POSTed values") {<!--~opt_db {~-->
 			if($edit_id) {
 				db_update_assoc('~table_name~', $data, 'where id=%i', $edit_id);
 				message('~singular cap~ updated.');
 			} else {
 				db_insert_assoc('~table_name~', $data);
 				message('~singular cap~ saved.');
-			}<!--~}~--><!--~opt_email_2 {~-->
+			}<!--~}~--><!--~opt_email {~-->
 			if($GLOBALS['~file_name~_form_recipient'] != 'fixme@example.com') {
 				$to = $GLOBALS['~file_name~_form_recipient'];
 				$from = 'noreply@~this_domain~';
@@ -193,7 +171,7 @@ function ~file_name~_edit_main() {<!--~}~--><!--~pulldowns {~-->
 		# 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 {~-->
+		# fix their entry in whatever way you require.<!--~opt_db {~-->
 	} elseif($edit_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', $edit_id);<!--~}~-->
@@ -206,7 +184,7 @@ function ~file_name~_edit_main() {<!--~}~--><!--~pulldowns {~-->
 	tem_set('upload_max_filesize', upload_max_filesize());<!--~}~-->
 
 	tem_set('form', $data);<!--~show_extra_headers {~-->
-	tem_set('extra_headers', 'show');<!--~}~-->
+	tem_set('extra_headers');<!--~}~-->
 }
 
 ?>