Changeset 354 for tags

Timestamp:

02/26/06 20:11:16 (3 years ago)

Author:

gerd

Message:

Fixed Bugs #208 and #209

• implemented "maxsize" attribute
  
• fixed validation check for non required files
  

Files:

• tags/RELEASE_0_9_0B2/examples/example_element_file.php (modified) (4 diffs)
• tags/RELEASE_0_9_0B2/patForms/Element/File.php (modified) (28 diffs)

tags/RELEASE_0_9_0B2/examples/example_element_file.php

@@ -49 +49 @@
-                'uploaddir'     =>  './fileupload',
-                'overwrite'     =>  'no',
-no
-//'maxsize'        =>  2
+yes
+'maxsize'      =>  90
-                //'tempdir'     =>  '/tmp_does:not:exist'
-                //'permissions' =>  0666,
-                //'replacename' =>  'i/[^a-z0-9]\./_',
-//
+
-            ),
-        ),
@@ -68 +68 @@
-                'default'       =>  'x',
-                'maxlength'     =>  '15',
-4
+2
-            ),
-        ),
@@ -87 +87 @@
-    // serialize the elements
-    $elements   =   $form->renderForm();
-
-
+
-    // ERROR DISPLAY ------------------------------------------------------
-    // ask the form if it has been submitted and display errors. For
@@ -102 +101 @@
-    displayForm( $form, $elements ); // see patExampleGen/customFunctions.php
-
-
-    
-    

tags/RELEASE_0_9_0B2/patForms/Element/File.php

@@ -13 +13 @@
- *    Though the user may not upload a file twice of validation of other form elements faile
- *  - tempdir: The place to store uploaded file until finalization
+ *  - maxsize: maximum size of upload file in bytes (consider your web server's and PHP settings!)
- *  - mimetype: Defines as many allowed filetype as you want. Supports asterisk for groups like: 'image/*'
- *  - replacechars: use Perl-Regular expression for filename-translation
@@ -205 +206 @@
-                                        "outputFormats" =>  array(),
-                                    ),
+            "maxsize"       =>  array(  "required"      =>  false,
+                                        "format"        =>  "int",
+                                        "outputFormats" =>  array(),
+                                    ),
-            "mimetype"      =>  array(  "required"      =>  false,
-                                        "format"        =>  "array",
@@ -324 +329 @@
-            }
-            
-
-
+
-                return patErrorManager::raiseError( PATFORMS_FILE_ERROR_TEMPDIR_NOT_VALID,
-                                                'Session support is on but cannot work',
@@ -362 +366 @@
-
-        // editable or not?
-
-
+
-            return $this->serializeHtmlReadonly( $value );
-        }
@@ -369 +372 @@
-        // create element
-        $this->attributes['name']   =   $nameUpload;
+        $this->attributes['id']     =   $nameUpload;
-        $element = $this->toHtml();
-
-
+
-            return $element;
-        }
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-        // and return to sender...
-hidden
+valueElement
-    }
-
@@ -413 +428 @@
-        $empty      =   false;
-        $mime       =   false;
+        $uploade    =   false;      
-
-        $error      =   UPLOAD_ERR_NO_FILE;
-        $restored   =   false;
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-        // file was just uploaded
-
-
-
+
+
-                $uploadFile =   $files[$nameUpload]['tmp_name'];
-                $error      =   $files[$nameUpload]['error'];
@@ -440 +459 @@
-
-            // see if the value comes from "setValue()" instead
-
-
-
-
+
+
-                    // already stored in session
-                    $state      =   $this->getSessionValue( 'state' );
-
-
+
-                        return true;
-                    }
+                    $this->setSessionValue( 'state', 'finalized' );
+                    return true;
-                }
-
-                /*
-                $dir    =   $this->attributes['uploaddir'];
-                $mime   =   mime_content_type( $dir . '/' . $this->value );
-                if( !$this->_checkMimeType( $mime ) )
-                {
-                    return false;
-                }
-                */
-
-                if( $this->useSession() )
-                {
-                    $this->setSessionValue( 'state', 'finalized' );
-                }
-                return true;
-            }
-
-            // don't allow empty files
-
-
+
-                $this->addValidationError( 6 );
-                return false;
@@ -476 +478 @@
-
-            // new file -> must be valid
-
-
+
-                $this->setSessionValue( 'state', 'invalid' );
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-                return false;
-            }
-
-            // validate file-type
-
-
+
-                return false;
-            }
+            
+            if( $size > $this->attributes['maxsize'] ) {
+                $this->addValidationError( 3, array( 'maxsize' => $this->attributes['maxsize'] ) );
+                return false;
+            }
-        }
-        // see if file was uploaded during this session
@@ -505 +508 @@
-            $mime       =   $this->getSessionValue( 'mime' );
-
-
-
+
-                $value  =   $sessValue;
-            }
-
-            // all done, skip the rest
-
-
+
-                $this->value        =   $value;
-                return true;
@@ -518 +519 @@
-
-            $exists =   $this->_fileExists( $value );
-
-
+
-                return $exists;
-            }
-
-
-
+
-                return true;
-            }
-
-
-
+
-                $restored   =   true;
-                $error      =   UPLOAD_ERR_OK;
-            }
-
-
-
+
-                return false;
-            }
@@ -543 +540 @@
-        {
-            $exists =   $this->_fileExists( $value );
-
-
+
-                return $exists;
-            }
-
-
+
-                return true;
-            }
@@ -554 +549 @@
-
-        // not required
-
-
+
-            return true;
-        }
-
-        $checkDir   =   $this->_checkDestination();
-
-
+
-            return $checkDir;
-        }
@@ -567 +560 @@
-        // check if file exists
-        $dir    =   $this->attributes['uploaddir'];
-
-
-
-
+
+
-                $this->addValidationError( 2 );
-                return false;
@@ -577 +568 @@
-
-        // keep uploaded file
-
-
+
-            $tempfile   =   tempnam( $this->tempdir, $name . '_' );
-
-
+
+if( !move_uploaded_file( $uploadFile, $tempfile ) ) 
-                return patErrorManager::raiseError( PATFORMS_FILE_ERROR_CANNOT_MOVE_UPLOAD_FILE,
-                            "Cannot upload file",
@@ -613 +603 @@
-        $dir        =   $this->attributes["uploaddir"];
-
-        $files = $_FILES;
-        if (($namespace = $this->getNamespace()) && isset($files[$namespace])) {
-            $files = $files[$namespace];
-        }
-
-        $uploadFile =   false;
-
-
+
-            // check if this upload was finalized
-            $state  =   $this->getSessionValue( "state" );
-
-
+
-                return true;
-            }
@@ -633 +616 @@
-            $this->setSessionValue( "state", "finalized" );
-        }
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-
-        // if file does not exist and is not required, function will just return
-
-
+
-            return true;
-        }
-
-        // cannot use 'move_upload_file()' in case of usage of sessions
-
-
+
-            return patErrorManager::raiseError( PATFORMS_FILE_ERROR_CANNOT_MOVE_UPLOAD_FILE,
-                        "Cannot upload file",
@@ -688 +674 @@
-            // no file send
-            case    UPLOAD_ERR_NO_FILE:
-
-
+
-                    $this->addValidationError( 1 );
-                    return false;
@@ -714 +699 @@
-    function _checkMimeType( $type )
-    {
-
-
+
+
+
+
+
+
-            return true;
-        }
-
-        // check for exact match
-
-
+
-            return true;
-        }
@@ -727 +715 @@
-        // check for *-pattern like image/*
-        list( $major )  =   explode( "/", $type );
-
-
+
-            $m =    explode( "/", $m );
-
-
+
-                return true;
-            }
@@ -751 +737 @@
-        $preg   =   explode( "/", $this->attributes["replacename"] );
-
-
-
+
-            return patErrorManager::raiseError( PATFORMS_FILE_ERROR_REPLACE_PREG_INVALID,
-                        "Attribute 'replace' is not a valid PREG",
@@ -770 +755 @@
-    {
-        // check destination
-
-
+
-                return patErrorManager::raiseError(  PATFORMS_FILE_ERROR_NO_FILE_UPLOAD_DIR,
-                                "Cannot upload file",
@@ -778 +762 @@
-
-        $dir    =   $this->attributes["uploaddir"];
-
-
+
-            return patErrorManager::raiseError(  PATFORMS_FILE_ERROR_NO_FILE_UPLOAD_DIR,
-                            "Cannot upload file",
@@ -785 +768 @@
-        }
-
-
-
+
-            return patErrorManager::raiseError( PATFORMS_FILE_ERROR_UPLOAD_DIR_NOT_WRITEABLE,
-                            "Cannot upload file",
@@ -804 +786 @@
-    function _fileExists( $file )
-    {
-
-
+
-            return false;
-        }
-
-        $result =   $this->_checkDestination();
-
-
+
-            return $result;
-        }
-
-        $dir    =   $this->attributes["uploaddir"];
-
-
+
-            return true;
-        }
@@ -831 +810 @@
-    function _getPermission()
-    {
-
-
+
-            return $this->permission;
-        }
@@ -839 +817 @@
-
-        // permission string must be contain four letters, e.g. 0644
-
-
+
-            patErrorManager::raiseError(    PATFORMS_FILE_ERROR_PERMISSION_ATTRIBUTE_NOT_VALID,
-                                            "Wrong format of attribute 'permissions'",
@@ -847 +824 @@
-        }
-
-
-
+
-            patErrorManager::raiseError(    PATFORMS_FILE_ERROR_PERMISSION_ATTRIBUTE_NOT_VALID,
-                                            "Wrong format of attribute 'permissions'",
@@ -855 +831 @@
-        }
-
-
-
+
-            patErrorManager::raiseError(    PATFORMS_FILE_ERROR_PERMISSION_ATTRIBUTE_NOT_VALID,
-                                            "Wrong format of attribute 'permissions'",