remove basename prefix from url args

diff --git a/metaform/template.html b/metaform/template.html
index 8827bfe..186472a 100644 (file)
--- a/metaform/template.html
+++ b/metaform/template.html
@@ -23,11 +23,11 @@
                <h2>~singular cap~ details</h2>
 
                <!--~~admin_privs {~~--><!--~opt_listing {~-->
-                       <p><a href="~file_name~?~file_name~_new=1">Add another ~singular attr~</a></p>
+                       <p><a href="~file_name~?new=1">Add another ~singular attr~</a></p>
 
                        <p><a href="~file_name~">Back to ~plural attr~</a></p>
 <!--~}~-->
-                       <p><a href="~file_name~?~file_name~_edit_id=~~id attr~~">Edit</a></p>
+                       <p><a href="~file_name~?edit_id=~~id attr~~">Edit</a></p>
                <!--~~}~~-->
 
                <table border="0" cellpadding="3" cellspacing="0" summary="">
@@ -50,14 +50,14 @@
                <!--~~admin_privs {~~--><!--~opt_listing {~-->
                        <p><a href="~file_name~">Back to ~plural attr~</a></p>
 <!--~}~-->
-                       <p><a href="~file_name~?~file_name~_edit_id=~~id attr~~">Edit</a></p>
+                       <p><a href="~file_name~?edit_id=~~id attr~~">Edit</a></p>
                <!--~~}~~-->
        <!--~~}~~--><!--~}~-->
 
        <!--~~form {~~--><!--~form {~-->
                <h2><!--~opt_db {~--><!--~~new_msg {~~-->Add a new ~singular~<!--~~}~~--><!--~~edit_msg {~~-->Edit ~singular~ "~~~always_field~ html~~"<!--~~}~~--><!--~}~--><!--~opt_db unset {~-->Submit a ~singular~<!--~}~--></h2>
 
-               <form action="~~wfpl_basename~~" method="post~enctype_attr~"><!--~opt_db {~--><!--~~editing {~~--><div style="display: none"><input type="hidden" name="~file_name~_edit_id" value="~~~file_name~_edit_id attr~~"></div><!--~~}~~--><!--~}~--><!--~uploads {~--><input type="hidden" name="MAX_FILE_SIZE" value="~~upload_max_filesize~~"><!--~}~--><!--~hidden_fields {~--><!--~ first {~-->
+               <form action="~~wfpl_basename~~" method="post~enctype_attr~"><!--~opt_db {~--><!--~~editing {~~--><div style="display: none"><input type="hidden" name="edit_id" value="~~id attr~~"></div><!--~~}~~--><!--~}~--><!--~uploads {~--><input type="hidden" name="MAX_FILE_SIZE" value="~~upload_max_filesize~~"><!--~}~--><!--~hidden_fields {~--><!--~ first {~-->
                        <div style="display: none"><!--~}~--><input type="hidden" name="~name~" value="~~~name~ attr~~"><!--~ last {~--></div><!--~}~--><!--~}~-->
 <!--~visible_fields {~--><!--~fieldset {~-->
                        <fieldset><legend>~caption html~</legend><!--~}~--><!--~end_fieldset {~-->
@@ -100,19 +100,19 @@
                </form><!--~opt_listing {~-->
 
                <div class="caption">&nbsp;</div>
-               <div class="field"><!--~~~file_name attr~_edit_id {~~--><a href="~file_name attr~?~file_name attr~_id=~~~file_name attr~_edit_id~~"><!--~~}~~--><!--~~~file_name attr~_edit_id unset {~~--><a href="~file_name attr~"><!--~~}~~-->Cancel</a></div><!--~}~-->
+               <div class="field"><!--~~id {~~--><a href="~file_name attr~?id=~~id~~">Cancel</a><!--~~}~~--><!--~~id unset {~~--><a href="~file_name attr~">Cancel</a><!--~~}~~--></div><!--~}~-->
        <!--~}~--><!--~~}~~--><!--~opt_listing {~-->
 
        <!--~~listings once {~~-->
                <h2>~plural cap~ Listing</h2>
 
                <!--~~listings once_if {~~-->
-                       <p><a href="~file_name~?~file_name~_new=1">[Add a new ~singular~]</a></p>
+                       <p><a href="~file_name~?new=1">[Add a new ~singular~]</a></p>
 
                        <table cellspacing="0" cellpadding="4" border="1" summary="">
                                <tr><!--~listing_headers {~--><th>~caption~</th><!--~}~--><th>&nbsp;</th></tr><!--~~listings {~~-->
                                <tr><!--~listing_fields {~-->
-                                       <td class="listing"><a href="~file_name~?~file_name~_<!--~opt_display unset {~-->edit_<!--~}~-->id=~~id~~"><!--~enc {~-->~~~name~ ~enc~~~<!--~~~name~ empty {~~--><em>(blank)</em><!--~~}~~--><!--~}~--><!--~thumb {~--><!--~~~name~ nonempty {~~--><img src="~~~name~ thumb_src~~" width="~~~name~ thumb_width~~" height="~~~name~ thumb_height~~" alt=""><!--~~}~~--><!--~}~--></a></td><!--~}~-->
+                                       <td class="listing"><a href="~file_name~?~opt_display unset {~edit_~}~id=~~id~~"><!--~enc {~-->~~~name~ ~enc~~~<!--~~~name~ empty {~~--><em>(blank)</em><!--~~}~~--><!--~}~--><!--~thumb {~--><!--~~~name~ nonempty {~~--><img src="~~~name~ thumb_src~~" width="~~~name~ thumb_width~~" height="~~~name~ thumb_height~~" alt=""><!--~~}~~--><!--~}~--></a></td><!--~}~-->
                                        <td><a href="~file_name~?~file_name~_delete_id=~~id~~" onclick="return confirm('Permanently delete?')">[delete this ~singular~]</a></td>
                                </tr><!--~~}~~-->
 
@@ -122,7 +122,7 @@
                        <p>No ~plural~ in database.</p>
                <!--~~}~~-->
 
-               <p><a href="~file_name~?~file_name~_new=1">[Add a new ~singular~]</a></p>
+               <p><a href="~file_name~?new=1">[Add a new ~singular~]</a></p>
        <!--~~}~~--><!--~}~-->
 
 <!--~~}~~-->

diff --git a/metaform/template.php b/metaform/template.php
index d7fd3da..34ac04d 100644 (file)
--- a/metaform/template.php
+++ b/metaform/template.php
@@ -75,7 +75,7 @@ function ~file_name~_get_fields() {
 
 
 function ~public_file_name~_main() {~opt_public_display {~
-       $id = _REQUEST_cut('~public_file_name~_id');
+       $id = _REQUEST_cut('id');
        if($id) {
                return ~file_name~_main_display($id);~opt_public_form unset {~
        } else {
@@ -94,7 +94,7 @@ function ~file_name~_main(~opt_display unset {~~opt_public_form {~$new_only = fa
                return 'admin_login';
        }
 ~}~~opt_db {~
-       $id = _REQUEST_cut('~file_name~_edit_id');
+       $id = _REQUEST_cut('edit_id');
        if($id) {
                return ~file_name~_main_form($id);
        }
@@ -104,15 +104,15 @@ function ~file_name~_main(~opt_display unset {~~opt_public_form {~$new_only = fa
                return ~file_name~_main_delete($id);
        }
 
-       if(_REQUEST_cut('~file_name~_new')) {
+       if(_REQUEST_cut('new')) {
                return ~file_name~_main_form();
        }
 ~}~~opt_listing {~
-       if(_REQUEST_cut('~file_name~_list')) {
+       if(_REQUEST_cut('list')) {
                return ~file_name~_main_listing();
        }
 ~}~~opt_display {~
-       $id = _REQUEST_cut('~file_name~_id');
+       $id = _REQUEST_cut('id');
        if($id) {
                return ~file_name~_main_display($id);
        }
@@ -152,7 +152,7 @@ function ~file_name~_main_form($id = false) {~pulldowns {~
 ~}~~opt_db {~
        if($id) {
                # add hidden field for database id of row we're editing
-               tem_set('~file_name~_edit_id', $id);
+               tem_set('id', $id);
                tem_set('editing');
                tem_set('edit_msg');
        } else {