X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=metaform%2Ftemplate.php;h=945942edeedcee7045023e593670ef4aea6fe3aa;hb=7b2c07787abcab33f2e38f1662fc2287befb2794;hp=086c642f5139fe4524ad4dbbee4a2eec25ff9fc9;hpb=d3416270f26f08e34ff1748e1ee1fef7a15e79db;p=wfpl.git

diff --git a/metaform/template.php b/metaform/template.php
index 086c642..945942e 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();
@@ -119,7 +99,7 @@ function ~file_name~_display_main() {
 }
 
 function ~file_name~_edit_main() {<!--~}~--><!--~pulldowns {~-->
-	pulldown('~name~', array(array('op1', 'Option One'), array('op2', 'Option Two'), 'n/a'));
+	pulldown('~name~', ~pulldown_options~);
 <!--~}~--><!--~opt_db {~-->
 	$edit_id = format_int($_REQUEST['~file_name~_edit_id']);
 	unset($_REQUEST['~file_name~_edit_id']);
@@ -141,7 +121,8 @@ 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;
 		}
 <!--~}~-->