fix deprecated call. valueFromFormData

diff --git a/ipf/form.php b/ipf/form.php
index 29f9f61e66173027bffbd71a1097ecd78a2273d0..ee23ca7db352a7a02417ecd77fd923446cabdbdf 100644 (file)
--- a/ipf/form.php
+++ b/ipf/form.php
@@ -62,7 +62,7 @@ class IPF_Form implements Iterator
         $form_methods = get_class_methods($this);
 
         foreach ($this->fields as $name=>$field) {
-            $value = $field->widget->valueFromFormData($this->addPrefix($name), &$this->data);
+            $value = $field->widget->valueFromFormData($this->addPrefix($name), $this->data);
             try {
                 $value = $field->clean($value);
                 $this->cleaned_data[$name] = $value;

diff --git a/ipf/form/extra/widget/checkboxinput.php b/ipf/form/extra/widget/checkboxinput.php
index 79a0a2655f422021a074c105ff904f41d312fbc0..7ecd19f783ca0806e434d60d837e106ed80ba979 100644 (file)
--- a/ipf/form/extra/widget/checkboxinput.php
+++ b/ipf/form/extra/widget/checkboxinput.php
@@ -11,8 +11,8 @@ class IPF_Form_Extra_Widget_CheckboxInput extends IPF_Form_Widget_Input
         return parent::render($name, '', $extra_attrs);
     }
 
-    public function valueFromFormData($name, $data)
+    public function valueFromFormData($name, &$data)
     {
         return (!isset($data[$name]) || false === $data[$name] || (string)$data[$name] === '0' || (string)$data[$name] === 'off') ? false : true;
     }
-}
\ No newline at end of file
+}

diff --git a/ipf/form/widget.php b/ipf/form/widget.php
index aff7a07ae5870977f831030dda32687d70d0d39a..587093818c96645e6ad003a6633c58cb62eb631f 100644 (file)
--- a/ipf/form/widget.php
+++ b/ipf/form/widget.php
@@ -22,7 +22,7 @@ class IPF_Form_Widget
         return array_merge($this->attrs, $attrs, $extra_attrs);
     }
 
-    public function valueFromFormData($name, $data)
+    public function valueFromFormData($name, &$data)
     {
         if (isset($data[$name])) {
             return $data[$name];
@@ -51,4 +51,4 @@ function IPF_Form_Widget_Attrs($attrs)
         $_tmp[] = $attr.'="'.$val.'"';
     }
     return ' '.implode(' ', $_tmp);
-}
\ No newline at end of file
+}

diff --git a/ipf/form/widget/checkboxinput.php b/ipf/form/widget/checkboxinput.php
index 3905ba2059049513943b8f4d512dcbe04b8a7033..4b55f2c134510333568226b88b7a2aa315d34b92 100644 (file)
--- a/ipf/form/widget/checkboxinput.php
+++ b/ipf/form/widget/checkboxinput.php
@@ -13,11 +13,11 @@ class IPF_Form_Widget_CheckboxInput extends IPF_Form_Widget_Input
         return parent::render($name, '', $extra_attrs);
     }
 
-    public function valueFromFormData($name, $data)
+    public function valueFromFormData($name, &$data)
     {
         if (!isset($data[$name]) or false === $data[$name] or (string)$data[$name] === '0' or (string)$data[$name] === 'off') {
             return false;
         }
         return true;
     }
-}
\ No newline at end of file
+}

diff --git a/ipf/form/widget/fileinput.php b/ipf/form/widget/fileinput.php
index edecf4c0ed4d578ae12b3fcf1592279f622f612d..f3e54de22fa2900c44a655b5e75d6acd569d95ec 100644 (file)
--- a/ipf/form/widget/fileinput.php
+++ b/ipf/form/widget/fileinput.php
@@ -29,7 +29,7 @@ class IPF_Form_Widget_FileInput extends IPF_Form_Widget_Input
         return $sim.parent::render($name, $value, $extra_attrs);
     }
 
-    public function valueFromFormData($name, $data){
+    public function valueFromFormData($name, &$data){
         if (isset($data[$name])) {
             $remove = false;
             if (isset($data[$name.'_remove']))
@@ -56,4 +56,4 @@ class IPF_Form_Widget_FileInput extends IPF_Form_Widget_Input
         }
         return null;
     }
-}
\ No newline at end of file
+}

diff --git a/ipf/form/widget/selectmultipleinput.php b/ipf/form/widget/selectmultipleinput.php
index 35e38fd00b2e8c2534b6a65db341aee075a5b5d9..86b39b01b546dbb272cc6933bd502900e2ea9f23 100644 (file)
--- a/ipf/form/widget/selectmultipleinput.php
+++ b/ipf/form/widget/selectmultipleinput.php
@@ -38,7 +38,7 @@ class IPF_Form_Widget_SelectMultipleInput extends IPF_Form_Widget
         return new IPF_Template_SafeString(implode("\n", $output), true);
     }
 
-    public function valueFromFormData($name, $data)
+    public function valueFromFormData($name, &$data)
     {
         if (isset($data[$name]) and is_array($data[$name])) {
             return $data[$name];
@@ -46,4 +46,4 @@ class IPF_Form_Widget_SelectMultipleInput extends IPF_Form_Widget
         return null;
     }
 
-}
\ No newline at end of file
+}

diff --git a/ipf/form/widget/treeselectinput.php b/ipf/form/widget/treeselectinput.php
index 399130308e770cdda53269bb4278213a7f998116..a04438a7bcd3b1be0608210df804219d51f2dfb6 100644 (file)
--- a/ipf/form/widget/treeselectinput.php
+++ b/ipf/form/widget/treeselectinput.php
@@ -2,41 +2,41 @@
 
 class IPF_Form_Widget_TreeSelectInput extends IPF_Form_Widget_SelectInput
 {
-       protected $_levels = null;
+    protected $_levels = null;
 
-       public function setLevels($levels){
-           $this->_levels = $levels;
-       }
+    public function setLevels($levels){
+        $this->_levels = $levels;
+    }
 
     public function valueToFormData($name, $data)
     {
-       $val = null;
-       foreach($this->_levels as $l){
-               if ( (!isset($data[$l])) || ($data[$l]=='')){
-                       return $val;
-               }
-               if ($val==null)
-                       $val = '';
-               else
-                       $val .= '.';
-                       $val .= $data[$l];
-       }
+        $val = null;
+        foreach($this->_levels as $l){
+            if ( (!isset($data[$l])) || ($data[$l]=='')){
+                return $val;
+            }
+            if ($val==null)
+                $val = '';
+            else
+                $val .= '.';
+            $val .= $data[$l];
+        }
         return $val;
     }
 
-       public function valueFromFormData($name, $data)
+    public function valueFromFormData($name, &$data)
     {
         if (isset($data[$name])) {
-               $vals = explode(".",(string)$data[$name]);
-               for($i=0; $i<count($this->_levels); $i++){
-                       if ( ($i<count($vals)) && ($data[$name]!='')){
-                               $data[$this->_levels[$i]] = $vals[$i];
-                       }
-                       else
-                               $data[$this->_levels[$i]] = null;
-               }
+            $vals = explode(".",(string)$data[$name]);
+            for($i=0; $i<count($this->_levels); $i++){
+                if ( ($i<count($vals)) && ($data[$name]!=''))
+                    $data[$this->_levels[$i]] = $vals[$i];
+                else
+                    $data[$this->_levels[$i]] = null;
+            }
             return $data[$name];
         }
         return null;
     }
-}
\ No newline at end of file
+}
+

diff --git a/ipf/form/widget/tupleinput.php b/ipf/form/widget/tupleinput.php
index e82e484f0e2af8cf24c7a7fb20979cfbededaaa8..2c13aab3410781816b32f9d833f07c6ad978dddd 100644 (file)
--- a/ipf/form/widget/tupleinput.php
+++ b/ipf/form/widget/tupleinput.php
@@ -52,7 +52,7 @@ class IPF_Form_Widget_TupleInput extends IPF_Form_Widget
         return new IPF_Template_SafeString($s,true);
     }
 
-    public function valueFromFormData($name, $data)
+    public function valueFromFormData($name, &$data)
     {
         $s = '';
         for ($i=0; $i<$this->rows; $i++){