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

diff --git a/metaform/template.php b/metaform/template.php
index 7b278af..945942e 100644
--- a/metaform/template.php
+++ b/metaform/template.php
@@ -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 {~-->
-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,30 +69,10 @@ 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()) {
-		$GLOBALS['url'] = this_url();
+		$_REQUEST['url'] = this_url();
 		return 'admin_login';
 	}
 <!--~}~--><!--~opt_display {~-->
@@ -122,7 +99,7 @@ function ~file_name~_display_main() {
 }
 
 function ~file_name~_edit_main() {<!--~}~--><!--~pulldowns {~-->
-	pulldown('~name~', array('option 1', 'option 2', 'option 3'));
+	pulldown('~name~', ~pulldown_options~);
 <!--~}~--><!--~opt_db {~-->
 	$edit_id = format_int($_REQUEST['~file_name~_edit_id']);
 	unset($_REQUEST['~file_name~_edit_id']);
@@ -144,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;
 		}
 <!--~}~-->