no dashes in filenames, improved image uploading, make_thumbnail()

[wfpl.git] / metaform / template.php

diff --git a/metaform/template.php b/metaform/template.php
index adf4803..754b710 100644 (file)
--- a/metaform/template.php
+++ b/metaform/template.php
@@ -32,10 +32,13 @@ require_once('code/wfpl/db.php');<!--~image_include start~-->
 require_once('code/wfpl/upload.php');<!--~end~-->
 
 function ~form_name~_get_fields() {
-       $fields = array();
        <!--~formats start~-->
        $~name~ = format_~format~($_REQUEST['~name~']);<!--~end~--><!--~image_upload start~-->
-       $~name~ = save_uploaded_image('~name~', $GLOBALS['upload_directory']);<!--~end~-->
+       if($_FILE['~name~'] && $_FILE['~name~']['error'] == 0) {
+               $~name~ = substr(save_uploaded_image('~name~', $GLOBALS['upload_directory']), strlen($GLOBALS['upload_directory']));
+       } else {
+               $~name~ = format_filename($_REQUEST['old_~name~']);
+       }<!--~end~-->
        <!--~tem_sets start~-->
        tem_set('~name~', $~name~);<!--~end~-->
 
@@ -72,8 +75,12 @@ function ~form_name~() {
                if("you're happy with the POSTed values") {
                        # to enable saving to a database, create a file called 'db_connect.php'
                        # see: code/wfpl/examples/db_connect.php
-                       if(file_exists('db_connect.php')) {
-                               require_once('db_connect.php');
+                       if(file_exists('db_connect.php') || file_exists('code/db_connect.php')) {
+                               if(file_exists('db_connect.php') {
+                                       require_once('db_connect.php');
+                               } else {
+                                       require_once('code/db_connect.php');
+                               }
                                if($edit_id) {<!--~image_db start~-->
                                        # uploading nothing means leaving it as is.
                                        if(!$~name~ && $delete_~name~ != 'Yes') {