Changeset 356

Timestamp:

03/20/06 14:17:48 (2 years ago)

Author:

argh

Message:

Fixed a notice in the File element when the maxsize attribute is not set.

Files:

• trunk/autopackage.php (modified) (1 diff)
• trunk/package.php (modified) (1 diff)
• trunk/patForms/Element/File.php (modified) (15 diffs)

trunk/autopackage.php

@@ -45 +45 @@
-  - File: determining the session's save path now correctly uses the php.ini setting if available (argh)
-  - File: improved error messages with useful information and error solving hints (argh)
+  - File: fixed the notice that occurrs when the maxsize attribute is not set (argh)
-
-* Rules

trunk/package.php

@@ -55 +55 @@
-  - File: determining the session's save path now correctly uses the php.ini setting if available (argh)
-  - File: improved error messages with useful information and error solving hints (argh)
+  - File: fixed the notice that occurrs when the maxsize attribute is not set (argh)
-
-* Rules

trunk/patForms/Element/File.php

@@ -308 +308 @@
-   /**
-    * initialze file elemente
- 
+
-    * - check temporary file upload dir required when sessions are used
-    * - check file upload in php.ini
- 
+
-    * @access   private
-    * @return   mixed   $success    True on success, a patError object otherwise
@@ -322 +322 @@
-                                                'php.ini doesn\'t allow file upload see: "file_uploads"' );
-        }
-
+
-        // require temporary directory if session-support is switched on
-        if( $this->useSession() )
@@ -328 +328 @@
-            // store the required flag for easy access
-            $tempdir    =   $this->attributes['tempdir'];
-
+
-            // use php.ini default
-            if( empty( $tempdir ) ) {
@@ -336 +336 @@
-                }
-            }
-
+
-            if( !is_dir( $tempdir ) && !is_writeable( $tempdir ) ) {
- 
+
-                    PATFORMS_FILE_ERROR_TEMPDIR_NOT_VALID,
-                    'Session support is on but cannot work',
@@ -346 +346 @@
-                    'is set to "'.$this->getAttribute( 'tempdir' ).'".'
-                );
-
+
-                return $error;
-            }
-
+
-            $this->tempdir  =   $tempdir;
-        }
@@ -359 +359 @@
-                                            'Destination folder "' . $this->attributes['uploaddir'] . '" does not exist or is not writeable!' );
-        }
-
+
-        return true;
-    }
@@ -393 +393 @@
-        }
-
-      
+
-        $valueElement =   $this->createHiddenTag( $this->attributes["value"] );
-        /*
@@ -443 +443 @@
-        $empty      =   false;
-        $mime       =   false;
-      
+
-
-        $error      =   UPLOAD_ERR_NO_FILE;
@@ -451 +451 @@
-        if( isset( $_FILES ) ) {
-            $files = $_FILES;
-
+
-            if( ( $namespace = $this->getNamespace() ) && isset( $files[$namespace] ) ) {
-                $files = $files[$namespace];
-            }
-        }
-
+
-        // file was just uploaded
-        if( !empty( $files ) && ( isset($files[$nameUpload] ) || isset( $files['name'][$nameUpload] ) ) ) {
@@ -499 +499 @@
-                if( $oldfile = $this->getSessionValue( 'uploadfile' ) ) {
-                    unlink( $oldfile );
-                
+
-            }
-
@@ -510 +510 @@
-                return false;
-            }
-
-
+
+
+
-                $this->addValidationError( 3, array( 'maxsize' => $this->attributes['maxsize'] ) );
-                return false;
@@ -585 +586 @@
-        if( $this->useSession() && !$restored ) {
-            $tempfile   =   tempnam( $this->tempdir, $name . '_' );
-
+
-            if( !move_uploaded_file( $uploadFile, $tempfile ) ) {
-                return patErrorManager::raiseError( PATFORMS_FILE_ERROR_CANNOT_MOVE_UPLOAD_FILE,
@@ -636 +637 @@
-                $files = $files[$namespace];
-            }
-
+
-            if( isset( $files[$nameUpload]["tmp_name"] ) ) {
-                $uploadFile =   $files[$nameUpload]["tmp_name"];
-      
+
-            else if( isset( $files["tmp_name"][$nameUpload] ) ) {
-                $uploadFile =   $files["tmp_name"][$nameUpload];
@@ -649 +650 @@
-            return true;
-        }
-
+
-        // cannot use 'move_upload_file()' in case of usage of sessions
-        if( !rename( $uploadFile, "$dir/$value" ) ) {
- 
+
-                PATFORMS_FILE_ERROR_CANNOT_MOVE_UPLOAD_FILE,
-                "Cannot upload file",
- 
+
-            );
-
+
-            return $error;
-        }
-
+
-        chmod( "$dir/$value", $this->_getPermission() );
-        return true;
@@ -723 +724 @@
-            return true;
-        }
-
+
-        if( empty( $this->attributes["mimetype"] ) ) {
-            return true;