Changeset 10 for trunk/bin/module_maker/skel/admin.php

Timestamp:

Sep 12, 2005 1:02:01 AM (19 years ago)

Author:

scdev

Message:

update module_maker to print module variables instead of writing files

File:

• trunk/bin/module_maker/skel/admin.php (modified) (2 diffs)

trunk/bin/module_maker/skel/admin.php

@@ -186 +186 @@
         %SET_VALUES_DEFAULT%,
         'new_op' => 'insert',
-        'submit_buttons' = array(
-            'submit'   => _("Add %ITEM_TITLE%"),
-            'repeat'   => _("Add & repeat"),
-            'cancel'   => _("Cancel")
+        'submit_buttons' => array(
+            'submit' => _("Add %ITEM_TITLE%"),
+            'repeat' => _("Add & repeat"),
+            'cancel' => _("Cancel"),
         ),
     );
@@ -202 +202 @@
     if ($lock->isLocked() && !$lock->isMine()) {
         $lock->dieErrorPage();
-    } else {
-        // Get the information for the form.
-        $qid = DB::query("
-            SELECT * 
-            FROM %DB_TBL%
-            WHERE %PRIMARY_KEY% = '" . addslashes($id) . "'
-        ");
-        if (!$frm = mysql_fetch_assoc($qid)) {
-            App::logMsg('Could not find record with %PRIMARY_KEY%: ' . $id, LOG_WARNING, __FILE__, __LINE__);
-            App::raiseMsg(sprintf(_("The requested record %s could not be found"), $id), MSG_ERR, __FILE__, __LINE__);
-            App::dieBoomerangURL();
-        }
-    
-        // Lock this record.
-        $lock->set('%DB_TBL%', '%PRIMARY_KEY%', $id, $frm['address']);
-        
-        // Set misc values for the form.
-        $frm['new_op'] = 'update';
-        $frm['submit_caption'] = _("Save changes");
-        $frm['repeat_caption'] = _("Save & edit next");
-        $frm['reset_caption']  = _("Reset");
-        $frm['cancel_caption'] = _("Cancel");
-        $frm['%PRIMARY_KEY%'] = $id;
-    
-        return $frm;
-    }
+    }
+
+    // Get the information for the form.
+    $qid = DB::query("
+        SELECT * 
+        FROM %DB_TBL%
+        WHERE %PRIMARY_KEY% = '" . addslashes($id) . "'
+    ");
+    if (!$frm = mysql_fetch_assoc($qid)) {
+        App::logMsg('Could not find record with %PRIMARY_KEY%: ' . $id, LOG_WARNING, __FILE__, __LINE__);
+        App::raiseMsg(sprintf(_("The requested record %s could not be found"), $id), MSG_ERR, __FILE__, __LINE__);
+        App::dieBoomerangURL();
+    }
+
+    // Lock this record.
+    $lock->set('%DB_TBL%', '%PRIMARY_KEY%', $id, $frm['address']);
+    
+    // Set misc values for the form.
+    $frm = array_merge(array(
+        %SET_VALUES_DEFAULT%,
+        'new_op' => 'update',
+        'submit_buttons' => array(
+            'submit' => _("Save changes"),
+            'repeat' => _("Save & edit next"),
+            'reset' => _("Reset"),
+            'cancel' => _("Cancel"),
+        ),
+    ), $frm);
+
+    return $frm;
 }