Index: branches/5.3.x/core/units/email_templates/email_template_eh.php
===================================================================
diff -u -N -r15677 -r15698
--- branches/5.3.x/core/units/email_templates/email_template_eh.php	(.../email_template_eh.php)	(revision 15677)
+++ branches/5.3.x/core/units/email_templates/email_template_eh.php	(.../email_template_eh.php)	(revision 15698)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: email_template_eh.php 15608 2012-11-06 17:21:28Z alex $
+* @version	$Id: email_template_eh.php 15698 2013-02-19 11:33:17Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -70,7 +70,7 @@
 					$exceptions = Array ('Category' => 'c', 'Users' => 'u');
 					$main_prefix = $exceptions[$module[1]];
 				}
-				$section = $this->Application->getUnitOption($main_prefix . '.email', 'PermSection');
+				$section = $this->Application->getUnitConfig($main_prefix)->getPermSectionByName('email');
 
 				$event->setEventParam('PermSection', $section);
 			}
@@ -162,12 +162,11 @@
 				return;
 			}
 
-			$id_field = $this->Application->getUnitOption($event->Prefix, 'IDField');
-			$table_name = $this->Application->getUnitOption($event->Prefix, 'TableName');
+			$config = $event->getUnitConfig();
 
-			$sql = 'UPDATE ' . $table_name . '
+			$sql = 'UPDATE ' . $config->getTableName() . '
 					SET FrontEndOnly = 1
-					WHERE ' . $id_field . ' IN (' . implode(',', $this->StoreSelectedIDs($event)) . ')';
+					WHERE ' . $config->getIDField() . ' IN (' . implode(',', $this->StoreSelectedIDs($event)) . ')';
 			$this->Conn->Query($sql);
 
 			$this->clearSelectedIDs($event);
@@ -196,13 +195,12 @@
 			if ( $items_info ) {
 				list ($user_id, ) = each($items_info);
 
+				$config = $event->getUnitConfig();
 				$ids = $this->Application->RecallVar($event->getPrefixSpecial() . '_selected_ids');
-				$id_field = $this->Application->getUnitOption($event->Prefix, 'IDField');
-				$table_name = $this->Application->getUnitOption($event->Prefix, 'TableName');
 
-				$sql = 'UPDATE ' . $table_name . '
+				$sql = 'UPDATE ' . $config->getTableName() . '
 						SET ' . $this->Application->RecallVar('dst_field') . ' = ' . $user_id . '
-						WHERE ' . $id_field . ' IN (' . $ids . ')';
+						WHERE ' . $config->getIDField() . ' IN (' . $ids . ')';
 				$this->Conn->Query($sql);
 			}
 
@@ -306,12 +304,14 @@
 				$options[$module_name] = $module_name;
 			}
 
-			$fields = $this->Application->getUnitOption($event->Prefix, 'Fields');
+			$config = $event->getUnitConfig();
+
+			$fields = $config->getFields();
 			$fields['Module']['options'] = $options;
-			$this->Application->setUnitOption($event->Prefix, 'Fields', $fields);
+			$config->setFields($fields);
 
 			if ( $this->Application->GetVar('regional') ) {
-				$this->Application->setUnitOption($event->Prefix, 'PopulateMlFields', true);
+				$config->setPopulateMlFields(true);
 			}
 		}
 
@@ -683,7 +683,7 @@
 				return;
 			}
 
-			$this->Application->setUnitOption('phrases', 'AutoLoad', false);
+			$this->Application->getUnitConfig('phrases')->setAutoLoad(false);
 
 			$this->StoreSelectedIDs($event);
 			$this->Application->StoreVar('export_language_ids', $this->Application->GetVar('m_lang'));