cleanup

diff --git a/ipf/form/field/file.php b/ipf/form/field/file.php
index f2464b52233c083ee4e8c68c12ca8abf68e4b1a5..e8b5bf0ccab197fb8f8165b9ce85ebcf1d4c0fc1 100644 (file)
--- a/ipf/form/field/file.php
+++ b/ipf/form/field/file.php
@@ -47,7 +47,10 @@ class IPF_Form_Field_File extends IPF_Form_Field
         if ($oldname != $newname)
             return $this->renameFile($oldname, $newname);
 
-        if (UPLOAD_ERR_OK != ArrayTools::get($value['data'], 'error')) {
+        switch (ArrayTools::get($value['data'], 'error')) {
+        case UPLOAD_ERR_OK:
+            break;
+        default:
             if ($this->required && !$oldname)
                 throw new IPF_Exception_Form(__('This field is required.'));
             return $oldname;

diff --git a/ipf/form/field/modelmultiplechoice.php b/ipf/form/field/modelmultiplechoice.php
index 3a631a98f3225bd2224b68eb42c60cfab4f32570..f6844d7621f19aec19ca2b33a54fe6c0292f8d8f 100644 (file)
--- a/ipf/form/field/modelmultiplechoice.php
+++ b/ipf/form/field/modelmultiplechoice.php
@@ -2,14 +2,5 @@
 
 class IPF_Form_Field_ModelMultipleChoice extends IPF_Form_Field_MultipleChoice
 {
-    public $widget = 'IPF_Form_Widget_SelectMultipleInput';
-
-    protected $_model;
-
-    function __construct($params=array())
-    {
-        parent::__construct($params);
-        $this->_model = $params['model'];
-    }
 }
 

diff --git a/ipf/form/model.php b/ipf/form/model.php
index a63ae3d8839be196aad9ceed44e68b45132cae06..9ed750a58e2df9a9ec92402ac7c4891f6ea0eb12 100644 (file)
--- a/ipf/form/model.php
+++ b/ipf/form/model.php
@@ -145,13 +145,6 @@ class IPF_Form_Model extends IPF_Form
         else
             $col = array();
 
-        $defaults = array(
-            'blank'     => !isset($col['notblank']),
-            'help_text' => '',
-            'model'     => $relation->getClass(),
-            'verbose'   => isset($col['verbose']) ? $col['verbose'] : $name,
-        );
-
         $table = IPF_ORM::getTable($relation->getClass());
 
         $params = array(