X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=metaform%2Ftemplate.php;h=6ae0602f1a7f4cf0eacb8470de42c9ed04e04dd6;hb=67367ba59ba215d2c7bb1eccf01d68774b32039d;hp=520ca576098bbe16d0abac14a48864b31c8022da;hpb=c8c3188b38830c22f77de3bb6ae035b26c481077;p=wfpl.git

diff --git a/metaform/template.php b/metaform/template.php
index 520ca57..6ae0602 100644
--- a/metaform/template.php
+++ b/metaform/template.php
@@ -40,69 +40,57 @@ 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 {~-->
-	$~name~ = format_~format~($_REQUEST['~name~']<!--~pulldown_format_extra {~-->, '~name~'<!--~}~-->);<!--~}~--><!--~image_upload {~-->
+function ~file_name~_get_fields() {
+	$data = array();
+<!--~formats {~-->
+	$data['~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 {~-->, $GLOBALS['~name~_thumb_max_width'], $GLOBALS['~name~_thumb_max_height']<!--~}~-->);
+		$data['~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~ = '';
+			$data['~name~'] = '';
 		} else {
-			$~name~ = format_image_w_h<!--~thumb_w_h {~-->_thumb_w_h<!--~}~-->($_REQUEST['old_~name~']);
+			$data['~name~'] = format_image_w_h<!--~thumb_w_h {~-->_thumb_w_h<!--~}~-->($_REQUEST['old_~name~']);
 		}
 	}<!--~}~-->
 
-	~file_name~_tem_sets(~php_fields~);
-
-	return array(~php_fields~);
+	return $data;
 }
 
-function ~file_name~_tem_sets(~php_fields~) {<!--~tem_sets {~-->
-	tem_set('~name~', $~name~);<!--~}~-->
-}
 <!--~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 {~-->,~name~<!--~}~-->', $where);
+	$rows = db_get_assocs('~table_name~', 'id<!--~listing_fields_1 {~-->,~name~<!--~}~-->', $where);
 	if($rows == false || count($rows) == 0) {
-		tem_show('empty_listing');
-		tem_show('listings');
-		return false;
+		tem_set('listings', array('empty_listing' => true));
+		return;
 	}
 
-	foreach($rows as $row) {
-		list($id<!--~listing_fields_2 {~-->, $~name~<!--~}~-->) = $row;
-		tem_set('id', $id);
-		if($~always_field~ == '') {
-			$~always_field~ = '--';
+	# make sure there's something clickable
+	foreach($rows as &$row) {
+		if($row['~always_field~'] == '') {
+			$row['~always_field~'] = '--';
 		}
-		~file_name~_tem_sets(~php_fields~);
-		tem_show('listing_row');
 	}
-	tem_show('populated_listing');
-	tem_show('listings');
+	tem_set('listings', array(
+		'populated_listing' => true,
+		'rows' => $rows));
 	return true;
 }
 <!--~}~-->
-function ~file_name~_main() {<!--~opt_display_1 {~-->
+function ~file_name~_main() {<!--~opt_pass {~-->
+	if(!logged_in_as_admin()) {
+		$GLOBALS['url'] = this_url();
+		return 'admin_login';
+	}
+<!--~}~--><!--~opt_display_1 {~-->
 	if(isset($_REQUEST['~file_name~_id'])) {
-		$ret = ~file_name~_display_main();
-		if($ret) {
-			return $ret;
-		}
-		tem_show('display_body');
+		return ~file_name~_display_main();
 	} else {
-		$ret = ~file_name~_edit_main();
-		if($ret) {
-			return $ret;
-		}
-		tem_show('edit_body');
+		return ~file_name~_edit_main();
 	}
 <!--~}~--><!--~opt_display_1_else {~-->
-	$ret = _~file_name~_main();
-	if($ret) {
-		return $ret;
-	}
+	return ~file_name~_edit_main();
 <!--~}~-->
 }<!--~opt_display_2 {~-->
 
@@ -113,25 +101,15 @@ 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_assoc('~table_name~', 'id,'.~file_name upper~_DB_FIELDS, 'where id=%i', $id);
 	if(!$row) {
 		message('Error: ~singular cap~ not found');
 		return './~file_name~';
 	}
-	list(~php_fields~) = $row;
-	~file_name~_tem_sets(~php_fields~);
-	tem_set('id', $id);
-}
+	tem_set('display', $row);
+}<!--~}~-->
 
-function ~file_name~_edit_main() {<!--~}~--><!--~opt_display_2_else {~-->
-
-
-function _~file_name~_main() {<!--~}~--><!--~opt_pass {~-->
-	if(!logged_in_as_admin()) {
-		$GLOBALS['url'] = this_url();
-		return 'admin_login';
-	}
-<!--~}~--><!--~pulldowns {~-->
+function ~file_name~_edit_main() {<!--~pulldowns {~-->
 	pulldown('~name~', array('option 1', 'option 2', 'option 3'));
 <!--~}~--><!--~opt_db_3 {~-->
 	$edit_id = format_int($_REQUEST['~file_name~_edit_id']);
@@ -139,7 +117,8 @@ function _~file_name~_main() {<!--~}~--><!--~opt_pass {~-->
 	if($edit_id) {
 		# add hidden field for database id of row we're editing
 		tem_set('~file_name~_edit_id', $edit_id);
-		tem_show('editing');
+		tem_set('editing', 'show');
+		tem_set('edit_msg', 'show');
 	}
 
 	$delete_id = format_int($_REQUEST['~file_name~_delete_id']);
@@ -157,18 +136,18 @@ function _~file_name~_main() {<!--~}~--><!--~opt_pass {~-->
 			return;
 		}
 <!--~}~-->
-		tem_show('new_msg');
+		tem_set('new_msg', 'show');
 	}<!--~}~-->
 
 	if(isset($_POST['~always_field~'])) {
-		list(~php_fields~) = ~file_name~_get_fields();
+		$data = ~file_name~_get_fields();
 
 		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);
+				db_update_assoc('~table_name~', $data, 'where id=%i', $edit_id);
 				message('~singular cap~ updated.');
 			} else {
-				db_insert('~table_name~', ~file_name upper~_DB_FIELDS, ~php_fields~);
+				db_insert_assoc('~table_name~', $data);
 				message('~singular cap~ saved.');
 			}<!--~}~--><!--~opt_email_2 {~-->
 			if($GLOBALS['~file_name~_form_recipient'] != 'fixme@example.com') {
@@ -182,7 +161,10 @@ function _~file_name~_main() {<!--~}~--><!--~opt_pass {~-->
 					}
 				}
 				$subject = '~plural cap~ form submitted';
-				$message = tem_run('~file_name~.email.txt');
+				$email_template = new tem();
+				$email_template->load('~file_name~.email.txt');
+				$email_template->sets($data);
+				$message = $email_template->run();
 				$cc = '';
 				$bcc = '';
 				if(email($from, $to, $subject, $message, $reply_to, $cc, $bcc)) {
@@ -202,22 +184,17 @@ function _~file_name~_main() {<!--~}~--><!--~opt_pass {~-->
 		# 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~);<!--~}~-->
+		$data = db_get_assoc('~table_name~', ~file_name upper~_DB_FIELDS, 'where id=%i', $edit_id);<!--~}~-->
 	} else {
 		# form not submitted, you can set default values like so:
-		#tem_set('~always_field~', 'Yes');
+		#$data = array('~always_field~' => 'Yes');
+		$data = array();
 	}<!--~upload_max {~-->
 
 	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 {~-->
-	tem_show('extra_headers');<!--~}~-->
+	tem_set('form', $data);<!--~show_extra_headers {~-->
+	tem_set('extra_headers', 'show');<!--~}~-->
 }
 
 ?>