Index: branches/RC/core/units/sections/sections_config.php
===================================================================
diff -u -N -r11612 -r11623
--- branches/RC/core/units/sections/sections_config.php	(.../sections_config.php)	(revision 11612)
+++ branches/RC/core/units/sections/sections_config.php	(.../sections_config.php)	(revision 11623)
@@ -2,29 +2,31 @@
 
 	$config = Array (
 		'Prefix' => 'core-sections',
-		'EventHandlerClass' => Array ('class' => 'kEventHandler', 'file' => '', 'build_event' => 'OnBuild'),
+		'EventHandlerClass' => Array ('class' => 'SiteConfigEventHandler', 'file' => 'site_config_eh.php', 'build_event' => 'OnBuild'),
 		'TagProcessorClass' => Array ('class' => 'kDBTagProcessor', 'file' => '', 'build_event' => 'OnBuild'),
 
-//		'SectionPrefix' => 'u',
-		'Sections' => Array (
-			/*'in-portal:root' => Array (
-				'parent'		=>	null,
-				'icon'			=>	'site',
-				'label'			=>	$this->Application->ConfigValue('Site_Name'),
-				'url'			=>	Array ('t' => 'sections_list', 'pass' => 'm', 'pass_section' => true, 'no_amp' => 1),
-				'permissions'	=>	Array ('advanced:admin_login', 'advanced:front_login'),
-				'priority'		=>	0,
-				'type'			=>	stTREE,
-				'SectionPrefix' => 'adm',
-			),*/
+		'Hooks' => Array (
+			Array (
+				'Mode' => hBEFORE,
+				'Conditional' => false,
+				'HookToPrefix' => '*',
+				'HookToSpecial' => '*',
+				'HookToEvent' => Array ('OnAfterConfigRead'),
+				'DoPrefix' => '',
+				'DoSpecial' => '*',
+				'DoEvent' => 'OnApplySiteConfigChanges',
+			),
+		),
 
+		'Sections' => Array (
 			'in-portal:site' => Array (
 				'parent'		=>	'in-portal:root',
 				'icon'			=>	'struct',
 				'label'			=>	'la_tab_Site_Structure',
-				'url'			=>	Array ('t' => 'sections_list', 'pass_section' => true, 'pass' => 'm'),
+				'url'			=>	Array ('t' => 'index', 'pass_section' => true, 'pass' => 'm'),
 				'permissions'	=>	Array ('view'),
 				'priority'		=>	1,
+				'container'		=>	true,
 				'type'			=>	stTREE,
 				'SectionPrefix' => 'c',
 			),
@@ -51,16 +53,6 @@
 				'type'			=>	stTREE,
 			),
 
-			'in-portal:configemail'	=>	Array(
-				'parent'		=>	'in-portal:site',
-				'icon'			=>	'core:e-mail',
-				'label'			=>	'la_tab_E-mails',
-				'url'			=>	Array('t' => 'config/email_events', 'pass_section' => true, 'pass' => 'm'),
-				'permissions'	=>	Array('view', 'edit'),
-				'priority'		=>	6,
-				'type'			=>	stTREE,
-			),
-
 			'in-portal:reviews' => Array (
 				'parent'		=>	'in-portal:users',
 				'icon'			=>	'reviews',
@@ -75,9 +67,10 @@
 				'parent'		=>	'in-portal:root',
 				'icon'			=>	'community',
 				'label'			=>	'la_tab_Community',
-				'url'			=>	Array ('t' => 'sections_list', 'pass_section' => true, 'pass' => 'm'),
+				'url'			=>	Array ('t' => 'index', 'pass_section' => true, 'pass' => 'm'),
 				'permissions'	=>	Array ('view'),
 				'priority'		=>	3,
+				'container'		=>	true,
 				'type'			=>	stTREE,
 				'SectionPrefix' => 'u',
 			),
@@ -109,9 +102,10 @@
 				'parent'		=>	'in-portal:root',
 				'icon'			=>	'summary_logs',
 				'label'			=>	'la_tab_Reports',
-				'url'			=>	Array ('t' => 'sections_list', 'pass_section' => true, 'pass' => 'm'),
+				'url'			=>	Array ('t' => 'index', 'pass_section' => true, 'pass' => 'm'),
 				'permissions'	=>	Array ('view'),
 				'priority'		=>	4,
+				'container'		=>	true,
 				'type'			=>	stTREE,
 				'SectionPrefix' => 'adm',
 			),
@@ -131,9 +125,10 @@
 				'parent'		=>	'in-portal:root',
 				'icon'			=>	'conf',
 				'label'			=>	'la_tab_Sys_Config',
-				'url'			=>	Array ('t' => 'sections_list', 'pass_section' => true, 'pass' => 'm'),
+				'url'			=>	Array ('t' => 'index', 'pass_section' => true, 'pass' => 'm'),
 				'permissions'	=>	Array ('view'),
 				'priority'		=>	5,
+				'container'		=>	true,
 				'type'			=>	stTREE,
 				'SectionPrefix' => 'adm',
 			),
@@ -142,36 +137,43 @@
 				'parent'		=>	'in-portal:system',
 				'icon'			=>	'conf',
 				'label'			=>	'la_title_Website',
-				'url'			=>	Array ('t' => 'sections_list', 'pass_section' => true, 'pass' => 'm'),
+				'url'			=>	Array ('t' => 'index', 'pass_section' => true, 'pass' => 'm'),
 				'permissions'	=>	Array ('view'),
 				'priority'		=>	1,
+				'container'		=>	true,
 				'type'			=>	stTREE,
 				'SectionPrefix' => 'adm',
 			),
 
-
-
-
-
-
 			'in-portal:configure_general' => Array (
 				'parent'		=>	'in-portal:website_setting_folder',
 				'icon'			=>	'conf_general',
 				'label'			=>	'la_tab_General',
-				'url'			=>	Array ('t' => 'config/config_universal', 'pass_section' => true, 'module' => 'In-Portal', 'pass' => 'm'),
+				'url'			=>	Array ('t' => 'config/config_universal', 'pass_section' => true, 'pass' => 'm'),
 				'permissions'	=>	Array ('view', 'edit'),
 				'priority'		=>	1,
 				'type'			=>	stTREE,
 			),
 
+			'in-portal:configure_advanced' => Array (
+				'parent'		=>	'in-portal:website_setting_folder',
+				'icon'			=>	'settings_general',
+				'label'			=>	'la_title_Advanced',
+				'url'			=>	Array ('t' => 'config/config_universal', 'pass_section' => true, 'pass' => 'm'),
+				'permissions'	=>	Array ('view', 'edit'),
+				'priority'		=>	2,
+				'type'			=>	stTREE,
+			),
+
 			// "Tools" section
 			'in-portal:tools' => Array (
 				'parent'		=>	'in-portal:root',
 				'icon'			=>	'tools',
 				'label'			=>	'la_tab_Tools',
-				'url'			=>	Array ('t' => 'sections_list', 'pass_section' => true, 'pass' => 'm'),
+				'url'			=>	Array ('t' => 'index', 'pass_section' => true, 'pass' => 'm'),
 				'permissions'	=>	Array ('view'),
 				'priority'		=>	6,
+				'container'		=>	true,
 				'type'			=>	stTREE,
 				'SectionPrefix' => 'adm',
 			),