From: jason Date: Thu, 29 May 2008 03:57:25 +0000 (-0400) Subject: metaform sets main_body for site-wide template integration, and defaults to 'empty... X-Git-Url: https://jasonwoof.com/gitweb/?p=wfpl.git;a=commitdiff_plain;h=702a6250f176b2e59ad0fe66a89cf72e570f8784 metaform sets main_body for site-wide template integration, and defaults to 'empty listing' message --- diff --git a/metaform.php b/metaform.php index c4d83a0..63c1c6e 100644 --- a/metaform.php +++ b/metaform.php @@ -321,10 +321,8 @@ function make_php() { if($GLOBALS['opt_listing'] == 'Yes') { $tem->show('opt_listing_1'); $tem->show('opt_listing_2'); - $tem->show('opt_listing_3'); $tem->show('opt_listing_4'); } else { - $tem->show('opt_listing_3_else'); $tem->show('opt_listing_4_else'); } if($GLOBALS['opt_db'] == 'Yes') { diff --git a/metaform/template.html b/metaform/template.html index b739c41..abd0a18 100644 --- a/metaform/template.html +++ b/metaform/template.html @@ -32,6 +32,8 @@ + +
@@ -56,15 +58,24 @@

~form_name~ Listing

+ +

[Add a new record]

+
~~~always_field~.html~~[delete this record]
+ + +

No ~~field_plural.html~~ in database.

+

[Add a new record]

Thank you for taking the time to fill out this form.

+ + diff --git a/metaform/template.php b/metaform/template.php index fcbbc36..e62b1d7 100644 --- a/metaform/template.php +++ b/metaform/template.php @@ -45,7 +45,7 @@ function ~form_name~_get_fields() { $~name~ = substr(save_uploaded_image('~name~', $GLOBALS['upload_directory']), strlen($GLOBALS['upload_directory'])); } else { if($_REQUEST['delete_~name~'] == 'Yes') { - $name = ''; + $~name~ = ''; } else { $~name~ = format_filename($_REQUEST['old_~name~']); } @@ -64,6 +64,8 @@ function ~form_name~_tem_sets(~php_fields~) { function ~form_name~_display_listing($where = 'order by ~always_field~ limit 100') { $rows = db_get_rows('~form_name~', 'id,~always_field~', $where); if($rows == false || count($rows) == 0) { + tem_show('empty_listing'); + tem_show('listings'); return false; } @@ -76,6 +78,7 @@ function ~form_name~_display_listing($where = 'order by ~always_field~ limit 100 tem_set('~always_field~', $~always_field~); tem_show('listing_row'); } + tem_show('populated_listing'); tem_show('listings'); return true; } @@ -85,7 +88,7 @@ function ~form_name~_main() { if($ret) { return $ret; } - display_messages(); + tem_show('main_body'); } function _~form_name~_main() { @@ -111,22 +114,15 @@ function _~form_name~_main() { unset($_REQUEST['~form_name~_delete_id']); if($delete_id) { db_delete('~form_name~', 'where id=%i', $delete_id); - message('Entry deleted.'); + message('Entry deleted.'); - if(~form_name~_display_listing()) { - return; - } - unset($delete_id); - - # FIXME: what to do after delete? - return; + return './~form_name~.html'; } if(!$edit_id) { if(!isset($_REQUEST['~form_name~_new']) && !isset($_REQUEST['~always_field~'])) { - if(~form_name~_display_listing()) { - return; - } + ~form_name~_display_listing(); + return; } tem_show('new_msg'); diff --git a/time.php b/time.php index a3bc761..007d4b9 100644 --- a/time.php +++ b/time.php @@ -73,7 +73,7 @@ function clean_ymd($year, $month, $day) { return array($year, $month, $day); } -# convert date string from mm/dd/yyyy to yyy-mm-dd +# convert date string from mm/dd/yyyy to yyyy-mm-dd function mdy_to_ymd($date) { $date = ereg_replace('[^0-9/-]', '', $date); $date = ereg_replace('-', '/', $date);