X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=metaform%2Ftemplate.php;h=aea7bd6d50c5642c28eefdda6237b5515876c3b4;hb=7da703686e6dd157999a52aa021a4dde6417a4ea;hp=d8f663bd1d2e9cf69780dc798872a1aabd94804b;hpb=7ed4e19f49230c9ac8c0d1eb5a80cbae46d6c61b;p=wfpl.git

diff --git a/metaform/template.php b/metaform/template.php
index d8f663b..aea7bd6 100644
--- a/metaform/template.php
+++ b/metaform/template.php
@@ -69,27 +69,7 @@ function ~file_name~_get_fields() {
 	return $data;
 }
 
-<!--~opt_listing {~-->
-# 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()) {
 		$_REQUEST['url'] = this_url();
@@ -110,24 +90,23 @@ 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~', ~pulldown_options~);
-<!--~}~--><!--~opt_db {~-->
+	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']);
@@ -141,11 +120,12 @@ function ~file_name~_edit_main() {<!--~}~--><!--~pulldowns {~-->
 
 	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~'])) {
@@ -203,7 +183,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');<!--~}~-->
 }
 
 ?>