Moved more features to FieldDefinition class.

prep_form.php

@@ -10,44 +10,16 @@ if (!isset($action)) {
 $skey   = 'form_' . $action;
 
 $fd = new FieldDefinition($action);
-$field_data = $fd->getFieldData();
+
+$placeholders = array(
+    'USER_NAME'  => $data['user']['name_first'] . ' ' . $data['user']['name_last'],
+    'USER_EMAIL' => $data['user']['email'],
+);
+
+$fd->addFieldValues($_SESSION[$skey], $placeholders);
+
 $by_group = $fd->getGroups();
 
-// Assign fields to groups, fill in (default) values
-foreach ($field_data['fields'] as $key=>$meta) {
-    $meta['field_id'] = $key;
-    $group_name = $field_data['groups'][$meta['group']];
-    $meta['group_name'] = $group_name;
-
-    // Assign session value if set, or use default if set
-    if (isset($_SESSION[$skey][$key])) {
-        $meta['value'] = $_SESSION[$skey][$key];
-    } elseif (isset($meta['default'])) {
-        switch ($meta['default']) {
-            case 'USER_NAME':
-                $meta['value'] = $data['user']['name_first'] . ' ' . $data['user']['name_last'];
-                break;
-            case 'USER_EMAIL':
-                $meta['value'] = $data['user']['email'];
-                break;
-            default:
-                $meta['value'] = $meta['default'];
-                break;
-        }
-    }
-
-    // Field type marker for Mustache
-    $meta['fieldtype_' . $meta['type']] = true;
-
-    // Add useful default values for some types
-    if ($meta['type'] == 'datetime') {
-        $meta['min'] = date('Y-m-d');
-    }
-
-    // Add to fieldlist
-    $by_group[$group_name]['fields'][] = $meta;
-}
-
 // Convert hash to list for Mustache compatibility
 $by_group = array_values($by_group);