Index: branches/5.2.x/core/units/forms/form_submissions/form_submissions_eh.php
===================================================================
diff -u -N -r13840 -r14095
--- branches/5.2.x/core/units/forms/form_submissions/form_submissions_eh.php	(.../form_submissions_eh.php)	(revision 13840)
+++ branches/5.2.x/core/units/forms/form_submissions/form_submissions_eh.php	(.../form_submissions_eh.php)	(revision 14095)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: form_submissions_eh.php 13824 2010-07-12 18:43:05Z alex $
+* @version	$Id: form_submissions_eh.php 14095 2010-12-28 17:37:07Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -91,7 +91,7 @@
 			$check_visibility = $this->Application->LoggedIn() && !$this->Application->isAdminUser;
 
 			foreach ($fields as $field_id => $options) {
-				$field_visible = $check_visibility ? $options['Visibility'] == FORM_FIELD_EVERYONE : true;
+				$field_visible = $check_visibility ? $options['Visibility'] == SubmissionFormField::VISIBILITY_EVERYONE : true;
 				$field_options = Array('type' => 'string', 'default' => $options['DefaultValue']);
 
 				if ($options['Required'] && $field_visible) {
@@ -183,7 +183,7 @@
 		{
 			parent::OnCreate($event);
 
-			if ($event->status != erSUCCESS) {
+			if ($event->status != kEvent::erSUCCESS) {
 				return ;
 			}
 
@@ -267,7 +267,7 @@
 		{
 			parent::OnPreSaveAndGo($event);
 
-			if ($event->status == erSUCCESS) {
+			if ($event->status == kEvent::erSUCCESS) {
 				$event->SetRedirectParam('pass', 'm,form,formsubs');
 			}
 		}
@@ -282,7 +282,7 @@
 		{
 			parent::OnPreSaveAndGoToTab($event);
 
-			if ($event->status == erSUCCESS) {
+			if ($event->status == kEvent::erSUCCESS) {
 				$event->SetRedirectParam('pass', 'm,form,formsubs');
 			}
 		}
@@ -328,7 +328,7 @@
 			/* @var $object kDBItem */
 
 			$form_id = $object->GetDBField('FormId');
-			$email_field = $this->getFieldByRole($form_id, EMAIL_COMMUNICATION_ROLE_EMAIL);
+			$email_field = $this->getFieldByRole($form_id, SubmissionFormField::COMMUNICATION_ROLE_EMAIL);
 
 			if (!$email_field) {
 				return ;
@@ -349,8 +349,8 @@
 
 			$options = Array ();
 
-			$name_field = $this->getFieldByRole($form_id, EMAIL_COMMUNICATION_ROLE_NAME);
-			$subject_field = $this->getFieldByRole($form_id, EMAIL_COMMUNICATION_ROLE_SUBJECT);
+			$name_field = $this->getFieldByRole($form_id, SubmissionFormField::COMMUNICATION_ROLE_NAME);
+			$subject_field = $this->getFieldByRole($form_id, SubmissionFormField::COMMUNICATION_ROLE_SUBJECT);
 
 			$language =& $this->Application->recallObject('lang.current');
 			/* @var $language kDBItem */
@@ -417,7 +417,7 @@
 		{
 			parent::OnUpdate($event);
 
-			if ($event->status == erSUCCESS) {
+			if ($event->status == kEvent::erSUCCESS) {
 				$object =& $event->getObject();
 				/* @var $object kDBItem */
 
@@ -437,9 +437,9 @@
 				$reply =& $this->Application->recallObject('submission-log.merge', null, Array ('skip_autoload' => true));
 				/* @var $reply kDBItem */
 
-				$email_field = $this->getFieldByRole($form_id, EMAIL_COMMUNICATION_ROLE_EMAIL);
-				$subject_field = $this->getFieldByRole($form_id, EMAIL_COMMUNICATION_ROLE_SUBJECT);
-				$body_field = $this->getFieldByRole($form_id, EMAIL_COMMUNICATION_ROLE_BODY);
+				$email_field = $this->getFieldByRole($form_id, SubmissionFormField::COMMUNICATION_ROLE_EMAIL);
+				$subject_field = $this->getFieldByRole($form_id, SubmissionFormField::COMMUNICATION_ROLE_SUBJECT);
+				$body_field = $this->getFieldByRole($form_id, SubmissionFormField::COMMUNICATION_ROLE_BODY);
 
 				$reply->SetDBField('FormSubmissionId', $merge_to);