Changeset 7124

Timestamp:

01/21/08 14:42:38 (9 months ago)

Author:

fabien

Message:

fixed setDefaults() when CSRFProtection is enabled

Files:

• branches/1.1/lib/form/sfForm.class.php (modified) (1 diff)
• branches/1.1/test/unit/form/sfFormTest.php (modified) (3 diffs)

branches/1.1/lib/form/sfForm.class.php

@@ -402 +402 @@
-    $this->defaults = $defaults;
-
+    if (self::$CSRFProtection)
+    {
+      $this->setDefault(self::$CSRFFieldName, $this->getCSRFToken(self::$CSRFSecret));
+    }
+
-    $this->resetFormFields();
-  }

branches/1.1/test/unit/form/sfFormTest.php

@@ -11 +11 @@
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
-
-3
+4
-
-class FormTest extends sfForm
@@ -64 +64 @@
-$t->is($f->getDefault('first_name'), 'Fabien', 'getDefault() returns a default value for a given field');
-$t->is($f->getDefault('name'), null, 'getDefault() returns null if the form does not have a default value for a given field');
+
+sfForm::enableCSRFProtection('*mygreatsecret*');
+$f = new FormTest();
+$f->setDefaults(array('first_name' => 'Fabien'));
+$t->is($f->getDefault('_csrf_token'), $f->getCSRFToken('*mygreatsecret*'), '->getDefaults() keeps the CSRF token default value');
+sfForm::disableCSRFProtection();
-
-// ::enableCSRFProtection() ::disableCSRFProtection() ->isCSRFProtected()
@@ -78 +84 @@
-
-$f = new FormTest(array(), array(), false);
-
+ 
-
-sfForm::enableCSRFProtection('mygreatsecret');