X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=metaform%2Ftemplate.php;h=6479fc59831f501b9b73d6096a251f5a0aa2e452;hb=13a97f336442e480856147ae463b726b831332fb;hp=4db9dad8df3b14cdb7609d659f6cc1f508136f06;hpb=96eb63cbbc2873d0f64979422a323e174a7d5f12;p=wfpl.git

diff --git a/metaform/template.php b/metaform/template.php
index 4db9dad..6479fc5 100644
--- a/metaform/template.php
+++ b/metaform/template.php
@@ -143,20 +143,29 @@ function ~file_name~_main_delete($id) {
 }~}~~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);
+	$data = array();
+	$desc = '';
+	$sort = _REQUEST_cut('sort');
+	if($sort && substr($sort, 0, 1) === '-') {
+		$sort = substr($sort, 1);
+		$desc = ' DESC ';
+	} else {
+		$data["sorting-by-$sort"] = '-';
+	}
+	$legal_sorts = explode(',', ~file_name upper~_DB_FIELDS);
+	if(!$sort || !in_array($sort, $legal_sorts)) {
+		$sort = '~always_field~';
+	}
+
+	$data['rows'] = db_get_assocs('~table_name~', 'id~listing_fields_1 {~,~name~~}~', "order by $sort $desc limit 1000");
+	tem_set('listings', $data);
 }~}~
 
 function ~file_name~_main_form($id = false) {~pulldowns {~
 	pulldown('~name~', ~pulldown_options~);~}~~has_pulldowns {~
 ~}~~opt_db {~
 	if($id) {
-		# add hidden field for database id of row we're editing
 		tem_set('id', $id);
-		tem_set('editing');
-		tem_set('edit_msg');
-	} else {
-		tem_set('new_msg');
 	}
 ~}~
 	if(isset($_POST['~always_field~'])) {
@@ -174,10 +183,10 @@ function ~file_name~_main_form($id = false) {~pulldowns {~
 				$to = $GLOBALS['~file_name~_form_recipient'];
 				$from = 'noreply@~this_domain~';
 				$reply_to = $to;
-				if(isset($_REQUEST['email']) and valid_email($_REQUEST['email'])) {
-					$reply_to = $_REQUEST['email'];
-					if($_REQUEST['name'] and ereg('^[a-zA-Z0-9_\' -]*$', $_REQUEST['name']) !== false) {
-						$reply_to = "$_REQUEST[name] <$reply_to>";
+				if(isset($data['email']) and valid_email($data['email'])) {
+					$reply_to = $data['email'];
+					if($data['name'] and ereg('^[a-zA-Z0-9_\' -]*$', $data['name']) !== false) {
+						$reply_to = "$data[name] <$reply_to>";
 					}
 				}
 				$subject = '~plural cap~ form submitted';
@@ -205,10 +214,10 @@ function ~file_name~_main_form($id = false) {~pulldowns {~
 				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 {~
+		# otherwise, we display the form again. We've got the form field
+		# values in $data and will put those back in the filds below. You
+		# should add some message asking people to fix their entry in
+		# whatever way you require.~opt_db {~
 	} 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', $id);~}~
@@ -218,7 +227,7 @@ function ~file_name~_main_form($id = false) {~pulldowns {~
 		$data = array();
 	}~upload_max {~
 
-	tem_set('upload_max_filesize', upload_max_filesize());~}~
+	tem_set('$upload_max_filesize', upload_max_filesize());~}~
 
 	tem_set('form', $data);~show_extra_headers {~
 	tem_set('$head');~}~