Changeset 1387

Timestamp:

05/25/06 17:24:49 (3 years ago)

Author:

fabien

Message:

added new skip_fields, check_types and excludes_types parameter to fillin filter (closes #573 - based on a patch from pookey)

Files:

• trunk/lib/filter/sfFillInFormFilter.class.php (modified) (2 diffs)

trunk/lib/filter/sfFillInFormFilter.class.php

@@ -44 +44 @@
-    }
-
+    $skip_fields = $this->getParameter('skip_fields', array());
+
+    $exclude_types = $this->getParameter('exclude_types', array('hidden', 'password'));
+    $check_types   = $this->getParameter('check_types',   array('text', 'checkbox', 'radio', 'password', 'hidden'));
+    $types = array_diff($check_types, $exclude_types);
+    $query = 'descendant::input[@name and (not(@type)';
+    foreach ($types as $type)
+    {
+      $query .= ' or @type="'.$type.'"';
+    }
+    $query .= ')] | descendant::textarea[@name] | descendant::select[@name]';
+
-    // find our form
-    $xpath_query = $this->getParameter('name') ? '//form[@name="'.$this->getParameter('name').'"]' : '//form';
-    if ($form = $xpath->query($xpath_query)->item(0))
-    {
-'descendant::input[@name and (not(@type) or @type="text" or @type="checkbox" or @type="radio")] | descendant::textarea[@name] | descendant::select[@name]'
+$query
-      {
+        // skip fields specified in the 'skip_fields' attribute
+        if ($request->hasParameter($element->getAttribute('name')) && in_array($element->getAttribute('name'), $skip_fields))
+        {
+          continue;
+        }
+
-        if ($element->nodeName == 'input')
-        {
-
-
-
-
-
-
-
-
-
-
+
-          {
-            // checkbox and radio
@@ -69 +78 @@
-            {
-              $element->setAttribute('checked', 'checked');
+            }
+          }
+          else
+          {
+            // text input
+            $element->removeAttribute('value');
+            if ($request->hasParameter($element->getAttribute('name')))
+            {
+              $element->setAttribute('value', $this->espaceRequestParameter($request, $element->getAttribute('name')));
-            }
-          }