Changeset 22 for trunk/bin/module_maker/module.cli.php

Timestamp:

Nov 23, 2005 9:29:33 PM (19 years ago)

Author:

scdev

Message:

More bugs and shifting things about.

File:

• trunk/bin/module_maker/module.cli.php (modified) (5 diffs)

trunk/bin/module_maker/module.cli.php

@@ -207 +207 @@
 $search['admin_upload_insert'] = '/%ADMIN_UPLOAD_INSERT%/';
 $replace['admin_upload_insert'] = '';
-$search['admin_upload_insert2'] = '/%ADMIN_UPLOAD_INSERT2%/';
-$replace['admin_upload_insert2'] = '';
 $search['admin_upload_update'] = '/%ADMIN_UPLOAD_UPDATE%/';
 $replace['admin_upload_update'] = '';
 
 if ($upload_file_capability) {
+    // Form arguments
     $replace['admin_form_tag_init'] = "<form enctype=\"multipart/form-data\" method=\"post\" action=\"<\x3fphp echo \$_SERVER['PHP_SELF']; \x3f>\">\n<input type=\"hidden\" name=\"MAX_FILE_SIZE\" value=\"<##>\" />";
-
+    
+    // Include statement.
     $replace['admin_upload_include'] = "require_once 'codebase/lib/Upload.inc.php';\n";
 
+    // Config
     $replace['admin_upload_config'] = <<<E_O_F
 
@@ -230 +231 @@
 E_O_F;
 
+    // Main init.
     $replace['admin_upload_init'] = <<<E_O_F
 
@@ -238 +240 @@
 E_O_F;
 
+    // Delete.
     $replace['admin_upload_del'] = <<<E_O_F
 
@@ -246 +249 @@
 E_O_F;
 
+    // Insert 1.
     $replace['admin_upload_insert'] = <<<E_O_F
 
-        // Upload file.
-        if (!\$new_files = \$upload->process('<##>')) {
-            // Upload failed. Reload form, displaying errors.
-            \$frm =& addRecordForm();
-            \$frm = array_merge(\$frm, getFormData());
-            \$nav->addPage(_("Add %ITEM_TITLE%"));
-            \$main_template = '%ADMIN_FORM_TEMPLATE%';
-            break;
+        // Upload files with prepended primary key.
+        \$new_file = \$upload->process('<##>',  \$%PRIMARY_KEY% . '_' . getFormData('<##>'));
+
+        // If file upload errors, redirect to edit operation for the inserted record.
+        if (\$upload->anyErrors() || false === \$new_file) {
+            App::dieURL(\$_SERVER['PHP_SELF'] . '?op=edit&%PRIMARY_KEY%=' . \$%PRIMARY_KEY%);
         }
 E_O_F;
 
-    $replace['admin_upload_insert2'] = <<<E_O_F
-
-        // Record inserted successfuly. Now we know the primary key, prepend to filename.
-        \$upload->moveFile(\$new_files[0]['name'], \$%PRIMARY_KEY% . '_' . \$new_files[0]['name']);
-E_O_F;
-
+    // Update.
     $replace['admin_upload_update'] = <<<E_O_F
 
-        // Upload new file.
+        // Upload new files.
         if (getFormData('<##>')) {
-            if (\$upload->process('<##>',  getFormData('%PRIMARY_KEY%') . '_' . getFormData('<##>'))) {
-                // Upload success. Delete old file.
-                if ('' != \$upload->getFilenameGlob(getFormData('%PRIMARY_KEY%') . '_*')) {
-                    \$upload->deleteFile(\$upload->getFilenameGlob(getFormData('%PRIMARY_KEY%') . '_*'));
-                }
-            } else {
-                // Upload failed. Reload form, displaying errors.
+            // Get old file names for deletion.
+            \$old_file = \$upload->getFilenameGlob(getFormData('%PRIMARY_KEY%') . '_*');
+            // Process new file upload with prepended primary key.
+            \$new_file = \$upload->process('<##>',  getFormData('%PRIMARY_KEY%') . '_' . getFormData('<##>'));
+            if (false === \$new_file || \$upload->anyErrors()) {
+                // Upload failed. Reload form. Display errors.
                 \$frm =& editRecordForm(getFormData('%PRIMARY_KEY%'));
                 \$frm = array_merge(\$frm, getFormData());
@@ -281 +277 @@
                 \$main_template = '%ADMIN_FORM_TEMPLATE%';
                 break;
-            }            
+            } else {
+                // Upload succeeded. Delete old files.
+                if ('' != \$old_file && \$old_file != \$new_file[0]['name']) {
+                    \$upload->deleteFile(\$old_file);
+                }
+            }
         }
 E_O_F;
-} // End if.
+} // End upload_file_capability.