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

diff --git a/metaform/template.php b/metaform/template.php
index aea7bd6..c35534c 100644
--- a/metaform/template.php
+++ b/metaform/template.php
@@ -42,89 +42,120 @@ require_once('code/wfpl/upload.php');<!--~}~-->
 function ~file_name~_get_fields() {
 	$data = array();
 <!--~formats {~-->
-	$data['~name~'] = format_~format~($_REQUEST['~name~']<!--~pulldown_format_extra {~-->, '~name~'<!--~}~-->);<!--~}~--><!--~image_upload {~-->
+	$data['~name~'] = format_~format~(_REQUEST_cut('~name~')<!--~pulldown_format_extra {~-->, '~name~'<!--~}~-->);<!--~}~--><!--~image_upload {~-->
+
 	if($_FILES['~name~'] && $_FILES['~name~']['error'] == 0) {
 		$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') {
+		if(_REQUEST_cut('delete_~name~') == 'Yes') {
 			$data['~name~'] = '';
 		} else {
-			$data['~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_cut('old_~name~'));
 		}
-	}<!--~}~--><!--~file_upload {~-->
+	}
+	unset($_FILES['~name~']);<!--~}~--><!--~file_upload {~-->
+
 	$~name~_filename_tmp = $GLOBALS['~name~_file_name'];
 	if(!$~name~_filename_tmp) {
-		$~name~_filename_tmp = format_filename($_REQUEST['~name~']);
+		$~name~_filename_tmp = format_filename(_REQUEST_cut('~name~'));
 	}
 	if($_FILES['~name~'] && $_FILES['~name~']['error'] == 0) {
 		$data['~name~'] = save_uploaded_file('~name~', $GLOBALS['upload_directory'] . $~name~_filename_tmp);
 	} else {
-		if($_REQUEST['delete_~name~'] == 'Yes') {
+		if(_REQUEST_cut('delete_~name~') == 'Yes') {
 			$data['~name~'] = '';
 		} else {
-			$data['~name~'] = format_path($_REQUEST['old_~name~']);
+			$data['~name~'] = format_path(_REQUEST_cut('old_~name~'));
 		}
-	}<!--~}~-->
+	}
+	unset($_FILES['~name~']);<!--~}~-->
 
 	return $data;
-}
+}<!--~opt_public_something {~-->
 
 
-function ~file_name~_main() {<!--~opt_pass {~-->
-	if(!logged_in_as_admin()) {
+function ~public_file_name~_main() {<!--~opt_public_display {~-->
+	$id = _REQUEST_cut('~public_file_name~_id');
+	if($id) {
+		return ~file_name~_main_display($id);<!--~opt_public_form unset {~-->
+	} else {
+		message("Error: Broken Link (~singular cap~ #$id not found)");
+		return './'; # FIXME where should this go?<!--~}~-->
+	}<!--~}~--><!--~opt_public_form {~-->
+	return ~file_name~_main_form();<!--~}~-->
+}<!--~}~-->
+
+
+function ~file_name~_main(<!--~opt_display unset {~--><!--~opt_public_form {~-->$new_only = false<!--~}~--><!--~}~-->) {<!--~opt_pass {~-->
+	if(logged_in_as_admin()) {
+		tem_set('admin_privs');
+	} else {
 		$_REQUEST['url'] = this_url();
 		return 'admin_login';
 	}
-<!--~}~--><!--~opt_display {~-->
-	if(isset($_REQUEST['~file_name~_id'])) {
-		return ~file_name~_display_main();
-	} else {
-		return ~file_name~_edit_main();
+<!--~}~--><!--~opt_db {~-->
+	$id = _REQUEST_cut('~file_name~_edit_id');
+	if($id) {
+		return ~file_name~_main_form($id);
 	}
-}
 
-function ~file_name~_display_main() {
-	$id = format_int($_REQUEST['~file_name~_id']);
-	unset($_REQUEST['~file_name~_id']);
-	if(!$id) {
-		message('Error: Broken link');
-		return './~file_name~';
+	$id = _REQUEST_cut('~file_name~_delete_id');
+	if($id) {
+		return ~file_name~_main_delete($id);
+	}
+
+	if(_REQUEST_cut('~file_name~_new')) {
+		return ~file_name~_main_form();
+	}
+<!--~}~--><!--~opt_listing {~-->
+	if(_REQUEST_cut('~file_name~_list')) {
+		return ~file_name~_main_listing();
+	}
+<!--~}~--><!--~opt_display {~-->
+	$id = _REQUEST_cut('~file_name~_id');
+	if($id) {
+		return ~file_name~_main_display($id);
 	}
+<!--~}~--><!--~opt_listing {~-->
+	if(isset($_POST['~always_field~'])) {
+		return ~file_name~_main_form();
+	}
+
+	# default action:
+	return ~file_name~_main_listing();<!--~}~--><!--~opt_listing unset {~-->
+	return ~file_name~_main_form();<!--~}~-->
+}<!--~opt_display {~-->
+
+function ~file_name~_main_display($id) {
 	$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~';
+		message("Error: Broken Link (~singular cap~ #$id not found)");<!--~opt_public_something {~-->
+		return './' . $GLOBALS['wfpl_basename'];<!--~}~--><!--~opt_public_something unset {~-->
+		return './~file_name~';<!--~}~-->
 	}
 	tem_set('display', $data);
-}
+}<!--~}~--><!--~opt_db {~-->
 
-function ~file_name~_edit_main() {<!--~}~--><!--~pulldowns {~-->
-	pulldown('~name~', ~pulldown_options~);<!--~}~--><!--~opt_db {~-->
-	$edit_id = format_int($_REQUEST['~file_name~_edit_id']);
-	unset($_REQUEST['~file_name~_edit_id']);
-	if($edit_id) {
+function ~file_name~_main_delete($id) {
+	db_delete('~table_name~', 'where id=%i', $id);
+	message('~singular cap~ deleted.');
+	return './~file_name~';
+}<!--~}~--><!--~opt_listing {~-->
+
+function ~file_name~_main_listing() {
+	$listing_rows = db_get_assocs('~table_name~', 'id<!--~listing_fields_1 {~-->,~name~<!--~}~-->', 'order by ~always_field~ limit 100');
+	tem_set('listings', $listing_rows);
+}<!--~}~-->
+
+function ~file_name~_main_form($id = false) {<!--~pulldowns {~-->
+	pulldown('~name~', ~pulldown_options~);<!--~}~--><!--~pulldowns once_if {~-->
+<!--~}~--><!--~opt_db {~-->
+	if($id) {
 		# add hidden field for database id of row we're editing
-		tem_set('~file_name~_edit_id', $edit_id);
+		tem_set('~file_name~_edit_id', $id);
 		tem_set('editing');
 		tem_set('edit_msg');
-	}
-
-	$delete_id = format_int($_REQUEST['~file_name~_delete_id']);
-	unset($_REQUEST['~file_name~_delete_id']);
-	if($delete_id) {
-		db_delete('~table_name~', 'where id=%i', $delete_id);
-		message('~singular cap~ deleted.');
-
-		return './~file_name~';
-	}
-
-	if(!$edit_id) {<!--~opt_listing {~-->
-		if(!isset($_REQUEST['~file_name~_new']) && !isset($_REQUEST['~always_field~'])) {
-			$listing_rows = db_get_assocs('~table_name~', 'id<!--~listing_fields_1 {~-->,~name~<!--~}~-->', 'order by ~always_field~ limit 100');
-			tem_set('listings', $listing_rows);
-			return;
-		}
-<!--~}~-->
+	} else {
 		tem_set('new_msg');
 	}
 <!--~}~-->
@@ -132,8 +163,8 @@ function ~file_name~_edit_main() {<!--~}~--><!--~pulldowns {~-->
 		$data = ~file_name~_get_fields();
 
 		if("you're happy with the POSTed values") {<!--~opt_db {~-->
-			if($edit_id) {
-				db_update_assoc('~table_name~', $data, 'where id=%i', $edit_id);
+			if($id) {
+				db_update_assoc('~table_name~', $data, 'where id=%i', $id);
 				message('~singular cap~ updated.');
 			} else {
 				db_insert_assoc('~table_name~', $data);
@@ -163,17 +194,24 @@ function ~file_name~_edit_main() {<!--~}~--><!--~pulldowns {~-->
 					message('Message sent');
 				}
 			}<!--~}~-->
-			if($error !== true) {
-				return './~file_name~'; # FIXME is this the page you want to go to after successful form submission?
+			if($error !== true) {<!--~opt_public_something {~-->
+				if($GLOBALS['wfpl_basename'] == '~file_name~') {
+					return './~file_name~';
+				} else {
+					# FIXME create this page or change this to go elsewhere
+					return './~public_file_name~_thanks';
+				}<!--~}~--><!--~opt_public_something unset {~--><!--~opt_db unset {~-->
+				# FIXME create this page or change this to go elsewhere<!--~}~-->
+				return './~file_name~<!--~opt_db unset {~-->_thanks<!--~}~-->';<!--~}~-->
 			}
 		}
 		# 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 {~-->
-	} elseif($edit_id) {
+	} elseif($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);<!--~}~-->
+		$data = db_get_assoc('~table_name~', ~file_name upper~_DB_FIELDS, 'where id=%i', $id);<!--~}~-->
 	} else {
 		# form not submitted, you can set default values like so:
 		#$data = array('~always_field~' => 'Yes');
@@ -185,5 +223,3 @@ function ~file_name~_edit_main() {<!--~}~--><!--~pulldowns {~-->
 	tem_set('form', $data);<!--~show_extra_headers {~-->
 	tem_set('extra_headers');<!--~}~-->
 }
-
-?>