Index: core/admin_templates/forms/form_field_edit.tpl
===================================================================
--- core/admin_templates/forms/form_field_edit.tpl	(revision 14184)
+++ core/admin_templates/forms/form_field_edit.tpl	(working copy)
@@ -64,11 +64,15 @@
 			<inp2:m_RenderElement name="inp_edit_box" prefix="formflds" field="FieldName" title="la_prompt_FieldName" size="40"/>
 			<inp2:m_RenderElement name="inp_edit_box" prefix="formflds" field="FieldLabel" title="la_prompt_FieldLabel" size="40"/>
 
-		<inp2:m_RenderElement name="subsection" prefix="formflds" fields="Prompt,ElementType,Validation,ValueList,DefaultValue,Priority,Required,DisplayInGrid,Visibility,EmailCommunicationRole" title="la_tab_AdminUI"/>
+		<inp2:m_RenderElement name="subsection" prefix="formflds" fields="Prompt,ElementType,Validation,UploadExtensions,UploadMaxSize,ValueList,DefaultValue,Priority,Required,DisplayInGrid,Visibility,EmailCommunicationRole" title="la_tab_AdminUI"/>
 			<!--<inp2:m_RenderElement name="inp_edit_box" prefix="formflds" field="Heading" title="la_prompt_heading" size="40"/>-->
 			<inp2:m_RenderElement name="inp_edit_box" prefix="formflds" field="Prompt" title="la_prompt_FieldPrompt" size="40"/>
 			<inp2:m_RenderElement name="inp_edit_options" prefix="formflds" field="ElementType" title="la_prompt_InputType" has_empty="1"/>
 			<inp2:m_RenderElement name="inp_edit_options" prefix="formflds" field="Validation" title="la_prompt_validation"/>
+
+			<inp2:m_RenderElement name="inp_edit_box" prefix="formflds" field="UploadExtensions" title="la_fld_UploadExtensions" hint_label="la_hint_UploadExtensions" style="width: 200px;"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="formflds" field="UploadMaxSize" title="la_fld_UploadMaxSize" hint_label="la_hint_UploadMaxSize" style="width: 200px;"/>
+
 			<inp2:m_RenderElement name="inp_edit_textarea" prefix="formflds" field="ValueList" title="la_prompt_ValueList" allow_html="0" cols="40" rows="5"/>
 			<inp2:m_RenderElement name="inp_edit_box" prefix="formflds" field="DefaultValue" title="la_prompt_DefaultValue" size="40"/>
 			<inp2:m_RenderElement name="inp_edit_box" prefix="formflds" field="Priority" title="la_field_Priority" size="10"/>
@@ -88,4 +92,29 @@
 	</table>
 </div>
 
+<inp2:m_if check="formflds_FieldsVisible" fields="UploadExtensions,UploadMaxSize">
+	<script type="text/javascript">
+		var $field_mask = '<inp2:formflds_InputName field="#FIELD_NAME#" js_escape="1"/>';
+
+		function syncUploadSettings() {
+			if ( $( get_control($field_mask, 'ElementType') ).val() == 'upload' ) {
+				$( get_control($field_mask, 'UploadExtensions', 'row') ).show();
+				$( get_control($field_mask, 'UploadMaxSize', 'row') ).show();
+			}
+			else {
+				$( get_control($field_mask, 'UploadExtensions', 'row') ).hide();
+				$( get_control($field_mask, 'UploadMaxSize', 'row') ).hide();
+			}
+		}
+
+		$(document).ready(
+			function () {
+				$( get_control($field_mask, 'ElementType') ).change(syncUploadSettings);
+			}
+		);
+
+		syncUploadSettings();
+	</script>
+</inp2:m_if>
+
 <inp2:m_include t="incs/footer"/>
\ No newline at end of file
Index: core/admin_templates/forms/forms_edit.tpl
===================================================================
--- core/admin_templates/forms/forms_edit.tpl	(revision 14184)
+++ core/admin_templates/forms/forms_edit.tpl	(working copy)
@@ -62,6 +62,7 @@
 		<inp2:m_RenderElement name="inp_edit_box" prefix="form" field="Title" title="la_fld_Title" size="100"/>
 		<inp2:m_RenderElement name="inp_edit_checkbox" prefix="form" field="RequireLogin" title="la_fld_RequireLogin" onclick="reflectSecurutyImage();"/>
 		<inp2:m_RenderElement name="inp_edit_checkbox" prefix="form" field="UseSecurityImage" title="la_fld_UseSecurityImage"/>
+		<inp2:m_RenderElement name="inp_edit_box" prefix="form" field="SubmitNotifyEmail" title="la_fld_SubmitNotifyEmail" hint_label="la_hint_SubmitNotifyEmail"/>
 		<inp2:m_RenderElement name="inp_edit_textarea" prefix="form" field="Description" title="la_fld_Description" cols="60" rows="5"/>
 		<inp2:m_RenderElement name="inp_edit_filler"/>
 	</table>
Index: core/admin_templates/submissions/submission_view.tpl
===================================================================
--- core/admin_templates/submissions/submission_view.tpl	(revision 14184)
+++ core/admin_templates/submissions/submission_view.tpl	(working copy)
@@ -109,6 +109,15 @@
 	<inp2:SubmissionTag tag="PredefinedOptions" field="$field" block="form_radio_item" selected="checked"/>
 </inp2:m_DefineElement>
 
+<inp2:m_DefineElement name="form_field_upload">
+	<input type="file" name="<inp2:CustomInputName/>" id="<inp2:CustomInputName/>" <inp2:m_param name="field_params" />/>
+	<inp2:m_ifnot check="SubmissionTag" tag='Field' equals_to="" db="db">
+		(<a href="<inp2:SubmissionTag tag='Field' format='full_url'/>" target="_blank"><inp2:SubmissionTag tag="Field"/></a>)
+	</inp2:m_ifnot>
+
+	<input type="hidden" name="<inp2:CustomInputName/>[upload]" id="<inp2:CustomInputName/>[upload]" value="<inp2:SubmissionTag tag='Field'/>"/>
+</inp2:m_DefineElement>
+
 <inp2:formsubs_SaveWarning name="grid_save_warning"/>
 <inp2:formsubs_ErrorWarning name="form_error_warning"/>
 
Index: core/admin_templates/submissions/submissions_list.tpl
===================================================================
--- core/admin_templates/submissions/submissions_list.tpl	(revision 14184)
+++ core/admin_templates/submissions/submissions_list.tpl	(working copy)
@@ -53,6 +53,12 @@
 	<a href="mailto:<inp2:Field field="$field" />"><inp2:Field field="$field"/></a>
 </inp2:m_DefineElement>
 
+<inp2:m_DefineElement name="grid_upload_td">
+	<inp2:m_if check="Field" name="$field" db="db">
+		<a href="<inp2:Field field='$field' format='full_url'/>" target="_blank"><inp2:Field field="$field"/></a>
+	</inp2:m_if>
+</inp2:m_DefineElement>
+
 <inp2:m_RenderElement name="grid" PrefixSpecial="formsubs" IdField="FormSubmissionId" grid="Default"/>
 <script type="text/javascript">
 	Grids['formsubs'].SetDependantToolbarButtons( new Array('edit','delete') );
Index: core/install/install_schema.sql
===================================================================
--- core/install/install_schema.sql	(revision 14184)
+++ core/install/install_schema.sql	(working copy)
@@ -1073,6 +1073,8 @@
   DisplayInGrid tinyint(1) NOT NULL DEFAULT '1',
   DefaultValue text,
   Validation tinyint(4) NOT NULL DEFAULT '0',
+  UploadExtensions varchar(255) NOT NULL DEFAULT '',
+  UploadMaxSize int(11) DEFAULT NULL,
   Visibility tinyint(4) NOT NULL DEFAULT '1',
   EmailCommunicationRole tinyint(4) NOT NULL DEFAULT '0',
   PRIMARY KEY (FormFieldId),
@@ -1152,6 +1154,7 @@
   Description text,
   RequireLogin tinyint(4) NOT NULL DEFAULT '0',
   UseSecurityImage tinyint(4) NOT NULL DEFAULT '0',
+  SubmitNotifyEmail varchar(255) NOT NULL DEFAULT '',
   EnableEmailCommunication tinyint(4) NOT NULL DEFAULT '0',
   ProcessUnmatchedEmails tinyint(4) NOT NULL DEFAULT '0',
   ReplyFromName varchar(255) NOT NULL DEFAULT '',
Index: core/install/upgrades.sql
===================================================================
--- core/install/upgrades.sql	(revision 14184)
+++ core/install/upgrades.sql	(working copy)
@@ -1998,4 +1998,12 @@
 # ===== v 5.1.2-B1 =====
 DROP TABLE EmailSubscribers;
 DROP TABLE IgnoreKeywords;
-ALTER TABLE PermissionConfig DROP ErrorMessage;	
\ No newline at end of file
+ALTER TABLE PermissionConfig DROP ErrorMessage;	
+
+# ===== v 5.1.2-B2 =====
+ALTER TABLE Forms
+	ADD SubmitNotifyEmail VARCHAR(255) NOT NULL DEFAULT '' AFTER UseSecurityImage;
+
+ALTER TABLE FormFields
+	ADD UploadExtensions VARCHAR(255) NOT NULL DEFAULT '' AFTER  Validation,
+	ADD UploadMaxSize INT NULL AFTER UploadExtensions;
\ No newline at end of file
Index: core/kernel/db/db_tag_processor.php
===================================================================
--- core/kernel/db/db_tag_processor.php	(revision 14184)
+++ core/kernel/db/db_tag_processor.php	(working copy)
@@ -1939,6 +1939,7 @@
 
 			case 'text':
 			case 'textarea':
+			case 'upload':
 				$params['field_params'] = $helper->ParseConfigSQL($object->GetDBField($params['value_list_field']));
 				break;
 
Index: core/units/forms/form_fields/form_fields_config.php
===================================================================
--- core/units/forms/form_fields/form_fields_config.php	(revision 14184)
+++ core/units/forms/form_fields/form_fields_config.php	(working copy)
@@ -67,7 +67,7 @@
 			            'Prompt' => Array('type' => 'string', 'default' => null, 'required' => 1),
 			            'ElementType' => Array(
 			            	'type' => 'string',
-			            	'formatter' => 'kOptionsFormatter', 'options' => Array ('text' => 'la_type_text', 'select' => 'la_type_select', 'radio' => 'la_type_radio', 'checkbox' => 'la_type_SingleCheckbox', 'password' => 'la_type_password', 'textarea' => 'la_type_textarea', 'label' => 'la_type_label'), 'use_phrases' => 1,
+			            	'formatter' => 'kOptionsFormatter', 'options' => Array ('text' => 'la_type_text', 'select' => 'la_type_select', 'radio' => 'la_type_radio', 'checkbox' => 'la_type_SingleCheckbox', 'password' => 'la_type_password', 'textarea' => 'la_type_textarea', 'upload' => 'la_type_upload', 'label' => 'la_type_label'), 'use_phrases' => 1,
 			            	'required' => 1, 'not_null' => 1, 'default' => '',
 			            ),
 			            'ValueList' => Array('type' => 'string','default' => null),
@@ -77,6 +77,8 @@
 			            'DisplayInGrid' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array(0 => 'la_No', 1 => 'la_Yes'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 1),
 			            'DefaultValue' => Array('type' => 'string', 'default' => NULL),
 			            'Validation' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array(0 => 'la_None', 1 => 'la_ValidationEmail'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 0),
+						'UploadExtensions' => Array ('type' => 'string', 'max_len' => 255, 'not_null' => 1, 'default' => ''),
+						'UploadMaxSize' => Array ('type' => 'int', 'default' => NULL),
 			            'Visibility' => Array (
 							'type' => 'int',
 							'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_opt_Everyone', 2 => 'la_opt_GuestsOnly'), 'use_phrases' => 1,
Index: core/units/forms/form_submissions/form_submissions_eh.php
===================================================================
--- core/units/forms/form_submissions/form_submissions_eh.php	(revision 14184)
+++ core/units/forms/form_submissions/form_submissions_eh.php	(working copy)
@@ -65,6 +65,7 @@
 				'password' => 'grid_like_filter',
 				'textarea' => 'grid_like_filter',
 				'label' => 'grid_like_filter',
+				'upload' => 'grid_empty_filter',
 			);
 
 			return $mapping[$element_type];
@@ -116,6 +117,10 @@
 						'filter_block' => $this->_getFilterBlock($options['ElementType'])
 					);
 
+					if ($options['ElementType'] == 'upload') {
+						$conf_grids['Default']['Fields']['fld_' . $field_id]['data_block'] = 'grid_upload_td';
+					}
+
 					if ($options['Validation'] == 1) {
 						$conf_grids['Default']['Fields']['fld_' . $field_id]['data_block'] = 'grid_email_td';
 					}
@@ -138,6 +143,19 @@
 					$field_options['verify_field'] = 'fld_' . $field_id . '_verify';
 				}
 
+				if ($options['ElementType'] == 'upload') {
+					$field_options['formatter'] = 'kUploadFormatter';
+					$field_options['upload_dir'] = WRITEBALE_BASE . DIRECTORY_SEPARATOR . 'user_files' . DIRECTORY_SEPARATOR . 'form_submissions';
+
+					if ( $options['UploadMaxSize'] ) {
+						$field_options['max_size'] = $options['UploadMaxSize'];
+					}
+
+					if ( $options['UploadExtensions'] ) {
+						$field_options['file_types'] = '*.' . implode(';*.', explode(',', $options['UploadExtensions']));
+					}
+				}
+
 				$conf_fields['fld_' . $field_id] = $field_options;
 			}
 
@@ -193,7 +211,25 @@
 			// allows user to view only it's last submission
 			$this->Application->StoreVar('last_submission_id', $object->GetID());
 
-			$this->Application->EmailEventAdmin('FORM.SUBMITTED');
+			$form_submission_helper =& $this->Application->recallObject('FormSubmissionHelper');
+			/* @var $form_submission_helper FormSubmissionHelper */
+
+			$form =& $form_submission_helper->getForm($object);
+
+			$notify_email = $form->GetDBField('SubmitNotifyEmail');
+
+			if ($notify_email) {
+				$send_params = Array (
+					'to_name' => $notify_email,
+					'to_email' => $notify_email,
+				);
+
+				$this->Application->EmailEventAdmin('FORM.SUBMITTED', null, $send_params);
+			}
+			else {
+				$this->Application->EmailEventAdmin('FORM.SUBMITTED');
+			}
+
 //			$this->Application->EmailEventUser('FORM.SUBMITTED', null, 'to_email' => '');
 
 			$event->SetRedirectParam('opener', 's');
@@ -202,7 +238,7 @@
 			$theme =& $this->Application->recallObject('theme.current');
 			/* @var $theme kDBItem */
 
-			$template = $this->Application->GetVar('success_template');
+			$template = unhtmlentities( $this->Application->GetVar('success_template') ); // kHTTPQuery do htmlspecialchars on everything
 			$alias_template = $theme->GetField('TemplateAliases', $template);
 
 			$event->redirect = $alias_template ? $alias_template : $template;
Index: core/units/forms/forms/forms_config.php
===================================================================
--- core/units/forms/forms/forms_config.php	(revision 14184)
+++ core/units/forms/forms/forms_config.php	(working copy)
@@ -146,6 +146,12 @@
 								'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Yes', 0 => 'la_No'), 'use_phrases' => 1,
 								'not_null' => 1, 'default' => 0
 							),
+							'SubmitNotifyEmail' => Array (
+								'type' => 'string', 'max_len' => 255,
+								'formatter' => 'kFormatter', 'regexp'=>'/^(' . REGEX_EMAIL_USER . '@' . REGEX_EMAIL_DOMAIN . ')$/i',
+								'sample_value' => 'email@domain.com', 'error_msgs' => Array ('invalid_format' => '!la_invalid_email!'),
+								'not_null' => 1, 'default' => ''
+							),
 							'EnableEmailCommunication' => Array (
 								'type' => 'int',
 								'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Yes', 0 => 'la_No'), 'use_phrases' => 1,
@@ -212,6 +218,7 @@
 								'RequireLogin' => Array ('title' => 'la_col_RequireLogin', 'filter_block' => 'grid_options_filter', 'width' => 80,),
       							'UseSecurityImage' => Array ('title' => 'la_col_UseSecurityImage', 'filter_block' => 'grid_options_filter', 'width' => 110,),
       							'EnableEmailCommunication' => Array ('title' => 'la_col_EnableEmailCommunication', 'filter_block' => 'grid_options_filter', 'width' => 120,),
+								'SubmitNotifyEmail' => Array ('title' => 'la_col_SubmitNotifyEmail', 'filter_block' => 'grid_like_filter'),
 							),
 						),
 					),