fix tree filters

diff --git a/ipf/admin/model.php b/ipf/admin/model.php
index a9423e05a4cd221a5074a38111a29d7bf194cc92..ac44505df8ec10cb2a23641fb2729c621db897e0 100644 (file)
--- a/ipf/admin/model.php
+++ b/ipf/admin/model.php
@@ -110,7 +110,7 @@ class ListTreeFilter extends BaseListFilter{
                if (isset($request->GET[$param_name])){
                    $id = $request->GET[$param_name];
                    if ($this->IsChoice($id)){
-                       $l = explode("\.",$id);
+                       $l = explode(".",$id);
                        $wh = array();
                        for($i=0; $i<count($this->fields); $i++){
                                if ($i>=(count($l)))

diff --git a/ipf/admin/modelinline.php b/ipf/admin/modelinline.php
index 2bcd7a414774715f8ebdbffff99e18a8c04d3c79..d07a43832cd67a9bea014280f2eae6ab170f5bc8 100644 (file)
--- a/ipf/admin/modelinline.php
+++ b/ipf/admin/modelinline.php
@@ -160,7 +160,7 @@ abstract class IPF_Admin_ModelInline{
         $fk_local = $this->getFkLocal();
         foreach($this->formset as $form){
             if ($form->isValid()){
-                if ($form->isAdd){
+               if ($form->isAdd){
                     unset($form->cleaned_data[0]);
                     $form->cleaned_data[$fk_local] = $parent_obj->id;
                     $form->save();

diff --git a/ipf/form/field/file.php b/ipf/form/field/file.php
index c3c34623c20420e4a239f7c12475538788ac7ebc..45bfbea2e60d593047e0582e976dfb129d034e2c 100644 (file)
--- a/ipf/form/field/file.php
+++ b/ipf/form/field/file.php
@@ -11,7 +11,7 @@ class IPF_Form_Field_File extends IPF_Form_Field
 
     function clean($value)
     {
-        if ($value['remove']===true){
+       if (@$value['remove']===true){
             IPF::loadFunction($this->remove_function);
             return call_user_func($this->remove_function, $value['data']);
         }
@@ -19,9 +19,9 @@ class IPF_Form_Field_File extends IPF_Form_Field
             IPF::loadFunction($this->rename_function);
                return call_user_func($this->rename_function, &$value);
         }
-        $value = $value['data'];
+        $value = @$value['data'];
         
-        if ($value['name']=='')
+        if (@$value['name']=='')
             return '';
 
         parent::clean($value);

diff --git a/ipf/form/widget/treeselectinput.php b/ipf/form/widget/treeselectinput.php
index f22019311c8c12c6258384a978fac30961e8fa1b..399130308e770cdda53269bb4278213a7f998116 100644 (file)
--- a/ipf/form/widget/treeselectinput.php
+++ b/ipf/form/widget/treeselectinput.php
@@ -27,7 +27,7 @@ class IPF_Form_Widget_TreeSelectInput extends IPF_Form_Widget_SelectInput
        public function valueFromFormData($name, $data)
     {
         if (isset($data[$name])) {
-               $vals = explode("\.",(string)$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];