Index: branches/5.3.x/core/units/forms/form_submissions/form_submissions_eh.php
===================================================================
diff -u -N -r15483 -r15677
--- branches/5.3.x/core/units/forms/form_submissions/form_submissions_eh.php	(.../form_submissions_eh.php)	(revision 15483)
+++ branches/5.3.x/core/units/forms/form_submissions/form_submissions_eh.php	(.../form_submissions_eh.php)	(revision 15677)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: form_submissions_eh.php 15314 2012-04-20 12:30:48Z alex $
+* @version	$Id: form_submissions_eh.php 15677 2013-01-17 18:52:50Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -149,7 +149,7 @@
 
 				if ($options['ElementType'] == 'password') {
 					$field_options['formatter'] = 'kPasswordFormatter';
-					$field_options['encryption_method'] = 'plain';
+					$field_options['hashing_method'] = PasswordHashingMethod::NONE;
 					$field_options['verify_field'] = 'fld_' . $field_id . '_verify';
 				}
 
@@ -248,13 +248,13 @@
 					'to_email' => $notify_email,
 				);
 
-				$this->Application->EmailEventAdmin('FORM.SUBMITTED', null, $send_params);
+				$this->Application->emailAdmin('FORM.SUBMITTED', null, $send_params);
 			}
 			else {
-				$this->Application->EmailEventAdmin('FORM.SUBMITTED');
+				$this->Application->emailAdmin('FORM.SUBMITTED');
 			}
 
-//			$this->Application->EmailEventUser('FORM.SUBMITTED', null, 'to_email' => '');
+//			$this->Application->emailUser('FORM.SUBMITTED', null, Array ('to_email' => ''));
 
 			$event->SetRedirectParam('opener', 's');
 			$event->SetRedirectParam('m_cat_id', 0);
@@ -282,7 +282,7 @@
 			$object = $event->getObject();
 			/* @var $object kDBItem */
 
-			$object->SetDBField('IPAddress', $_SERVER['REMOTE_ADDR']);
+			$object->SetDBField('IPAddress', $this->Application->getClientIp());
 
 			if ( !$object->GetDBField('ReferrerURL') ) {
 				$referrer = $this->Application->GetVar('original_referrer');