Index: branches/5.2.x/core/kernel/utility/formatters/upload_formatter.php
===================================================================
diff -u -N -r14611 -r14628
--- branches/5.2.x/core/kernel/utility/formatters/upload_formatter.php	(.../upload_formatter.php)	(revision 14611)
+++ branches/5.2.x/core/kernel/utility/formatters/upload_formatter.php	(.../upload_formatter.php)	(revision 14628)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: upload_formatter.php 14611 2011-10-03 15:37:02Z alex $
+* @version	$Id: upload_formatter.php 14628 2011-10-04 09:36:30Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -124,47 +124,56 @@
 			if (is_array($value) && $value['error'] === UPLOAD_ERR_OK) {
 				$max_filesize = isset($options['max_size']) ? $options['max_size'] : MAX_UPLOAD_SIZE;
 
+				// we can get mime type based on file content and no use one, provided by the client
+//				$value['type'] = kUtil::mimeContentType($value['tmp_name']);
+
 				if ( getArrayValue($options, 'file_types') && !$this->extensionMatch($value['name'], $options['file_types']) ) {
 					// match by file extensions
 					$error_params = Array (
 						'file_name' => $value['name'],
 						'file_types' => $options['file_types'],
 					);
+
 					$object->SetError($field_name, 'bad_file_format', 'la_error_InvalidFileFormat', $error_params);
 				}
-				elseif (getArrayValue($options, 'allowed_types') && !in_array($value['type'], $options['allowed_types'])) {
+				elseif ( getArrayValue($options, 'allowed_types') && !in_array($value['type'], $options['allowed_types']) ) {
 					// match by mime type provided by web-browser
 					$error_params = Array (
 						'file_type' => $value['type'],
 						'allowed_types' => $options['allowed_types'],
 					);
+
 					$object->SetError($field_name, 'bad_file_format', 'la_error_InvalidFileFormat', $error_params);
 				}
-				elseif ($value['size'] > $max_filesize) {
+				elseif ( $value['size'] > $max_filesize ) {
 					$object->SetError($field_name, 'bad_file_size', 'la_error_FileTooLarge');
 				}
-				elseif (!is_writable($this->FullPath)) {
+				elseif ( !is_writable($this->FullPath) ) {
 					$object->SetError($field_name, 'cant_save_file', 'la_error_cant_save_file');
 				}
 				else {
 					$real_name = $this->_ensureUniqueFilename($this->FullPath, $value['name']);
-					$file_name = $this->FullPath.$real_name;
-					if (!move_uploaded_file($value['tmp_name'], $file_name)) {
+					$file_name = $this->FullPath . $real_name;
+					if ( !move_uploaded_file($value['tmp_name'], $file_name) ) {
 						$object->SetError($field_name, 'cant_save_file', 'la_error_cant_save_file');
 					}
 					else {
 						@chmod($file_name, 0666);
-						if (getArrayValue($options, 'size_field')) {
+
+						if ( getArrayValue($options, 'size_field') ) {
 							$object->SetDBField($options['size_field'], $value['size']);
 						}
-						if (getArrayValue($options, 'orig_name_field')) {
+
+						if ( getArrayValue($options, 'orig_name_field') ) {
 							$object->SetDBField($options['orig_name_field'], $value['name']);
 						}
-						if (getArrayValue($options, 'content_type_field')) {
+
+						if ( getArrayValue($options, 'content_type_field') ) {
 							$object->SetDBField($options['content_type_field'], $value['type']);
 						}
-						$ret = getArrayValue($options, 'upload_dir') ? $real_name : $this->DestinationPath.$real_name;
 
+						$ret = getArrayValue($options, 'upload_dir') ? $real_name : $this->DestinationPath . $real_name;
+
 						// delete previous file, when new file is uploaded under same field
 						/*$previous_file = isset($value['upload']) ? $value['upload'] : false;
 						if ($previous_file && file_exists($this->FullPath.$previous_file)) {
@@ -178,7 +187,7 @@
 			}
 		}
 
-		if ((count($value) > 1) && $value['error'] && ($value['error'] != UPLOAD_ERR_NO_FILE)) {
+		if ( (count($value) > 1) && $value['error'] && ($value['error'] != UPLOAD_ERR_NO_FILE) ) {
 			$object->SetError($field_name, 'cant_save_file', 'la_error_cant_save_file', $value);
 		}