Index: branches/5.0.x/core/install/upgrades.sql
===================================================================
diff -u -r12231 -r12238
--- branches/5.0.x/core/install/upgrades.sql	(.../upgrades.sql)	(revision 12231)
+++ branches/5.0.x/core/install/upgrades.sql	(.../upgrades.sql)	(revision 12238)
@@ -1405,5 +1405,16 @@
 UPDATE ConfigurationAdmin SET DisplayOrder = DisplayOrder + 0.01 WHERE VariableName IN ('ErrorTemplate', 'NoPermissionTemplate');
 
 UPDATE ConfigurationAdmin SET DisplayOrder = 10.15 WHERE VariableName = 'Search_MinKeyword_Length';
+UPDATE ConfigurationAdmin SET DisplayOrder = 10.01 WHERE VariableName = 'Site_Name';
+UPDATE ConfigurationAdmin SET DisplayOrder = 20.01 WHERE VariableName = 'FirstDayOfWeek';
+UPDATE ConfigurationAdmin SET DisplayOrder = 30.01 WHERE VariableName = 'Smtp_AdminMailFrom';
 
+UPDATE ConfigurationAdmin SET heading = 'la_Text_Date_Time_Settings', DisplayOrder = DisplayOrder + 9.98 WHERE VariableName IN ('Config_Server_Time', 'Config_Site_Time');
+UPDATE ConfigurationValues SET Section = 'in-portal:configure_general' WHERE VariableName IN ('Config_Server_Time', 'Config_Site_Time');
+UPDATE ConfigurationAdmin SET DisplayOrder = DisplayOrder - 0.02 WHERE VariableName IN ('cms_DefaultDesign', 'ErrorTemplate', 'NoPermissionTemplate', 'UsePageHitCounter', 'ForceImageMagickResize', 'CheckStopWords');
+
+UPDATE ConfigurationAdmin SET DisplayOrder = 40.01 WHERE VariableName = 'SessionTimeout';
+UPDATE ConfigurationValues SET Section = 'in-portal:configure_general' WHERE VariableName = 'SessionTimeout';
+UPDATE ConfigurationAdmin SET DisplayOrder = DisplayOrder - 0.01 WHERE VariableName IN ('KeepSessionOnBrowserClose', 'SessionReferrerCheck', 'UseJSRedirect');
+
 UPDATE Modules SET Version = '5.0.1', Loaded = 1 WHERE Name = 'In-Portal';
\ No newline at end of file
Index: branches/5.0.x/core/kernel/db/db_event_handler.php
===================================================================
diff -u -r12202 -r12238
--- branches/5.0.x/core/kernel/db/db_event_handler.php	(.../db_event_handler.php)	(revision 12202)
+++ branches/5.0.x/core/kernel/db/db_event_handler.php	(.../db_event_handler.php)	(revision 12238)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: db_event_handler.php 12202 2009-08-05 16:52:45Z dmitrya $
+* @version	$Id: db_event_handler.php 12238 2009-08-09 10:04:44Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -2405,6 +2405,11 @@
 			}
 
 			$path = str_replace('/', DIRECTORY_SEPARATOR, $path);
+
+			if (!file_exists($path)) {
+				exit;
+			}
+
 			$type = mime_content_type($path);
 
 			header('Content-Length: '.filesize($path));
Index: branches/5.0.x/core/install/install_data.sql
===================================================================
diff -u -r12232 -r12238
--- branches/5.0.x/core/install/install_data.sql	(.../install_data.sql)	(revision 12232)
+++ branches/5.0.x/core/install/install_data.sql	(.../install_data.sql)	(revision 12238)
@@ -39,12 +39,18 @@
 INSERT INTO ConfigurationValues VALUES (DEFAULT, 'Category_MetaDesc', '', 'In-Portal', 'in-portal:configure_categories');
 
 # Section "in-portal:configure_general":
-INSERT INTO ConfigurationAdmin VALUES ('Site_Name', 'la_section_SettingsWebsite', 'la_config_website_name', 'text', '', '', 10.02, 0, 1);
+INSERT INTO ConfigurationAdmin VALUES ('Site_Name', 'la_section_SettingsWebsite', 'la_config_website_name', 'text', '', '', 10.01, 0, 1);
 INSERT INTO ConfigurationValues VALUES (DEFAULT, 'Site_Name', 'In-Portal CMS', 'In-Portal', 'in-portal:configure_general');
-INSERT INTO ConfigurationAdmin VALUES ('FirstDayOfWeek', 'la_Text_Date_Time_Settings', 'la_config_first_day_of_week', 'select', '', '0=la_sunday,1=la_monday', 20.03, 0, 1);
+INSERT INTO ConfigurationAdmin VALUES ('FirstDayOfWeek', 'la_Text_Date_Time_Settings', 'la_config_first_day_of_week', 'select', '', '0=la_sunday,1=la_monday', 20.01, 0, 1);
 INSERT INTO ConfigurationValues VALUES (DEFAULT, 'FirstDayOfWeek', '1', 'In-Portal', 'in-portal:configure_general');
-INSERT INTO ConfigurationAdmin VALUES ('Smtp_AdminMailFrom', 'la_section_SettingsMailling', 'la_prompt_AdminMailFrom', 'text', NULL, 'size="40"', 30.07, 0, 1);
+INSERT INTO ConfigurationAdmin VALUES ('Config_Server_Time', 'la_Text_Date_Time_Settings', 'la_config_time_server', 'select', '', '1=la_m12,2=la_m11,3=la_m10,5=la_m9,6=la_m8,7=la_m7,8=la_m6,9=la_m5,10=la_m4,11=la_m3,12=la_m2,13=la_m1,14=la_m0,15=la_p1,16=la_p2,17=la_p3,18=la_p4,19=la_p5,20=la_p6,21=la_p7,22=la_p8,23=la_p9,24=la_p10,25=la_p11,26=la_p12,27=la_p13', 20.02, 0, 1);
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'Config_Server_Time', '14', 'In-Portal', 'in-portal:configure_general');
+INSERT INTO ConfigurationAdmin VALUES ('Config_Site_Time', 'la_Text_Date_Time_Settings', 'la_config_site_zone', 'select', '', '1=la_m12,2=la_m11,3=la_m10,5=la_m9,6=la_m8,7=la_m7,8=la_m6,9=la_m5,10=la_m4,11=la_m3,12=la_m2,13=la_m1,14=la_m0,15=la_p1,16=la_p2,17=la_p3,18=la_p4,19=la_p5,20=la_p6,21=la_p7,22=la_p8,23=la_p9,24=la_p10,25=la_p11,26=la_p12,27=la_p13', 20.03, 0, 1);
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'Config_Site_Time', '14', 'In-Portal', 'in-portal:configure_general');
+INSERT INTO ConfigurationAdmin VALUES ('Smtp_AdminMailFrom', 'la_section_SettingsMailling', 'la_prompt_AdminMailFrom', 'text', NULL, 'size="40"', 30.01, 0, 1);
 INSERT INTO ConfigurationValues VALUES (DEFAULT, 'Smtp_AdminMailFrom', 'portal@user.domain.name', 'In-Portal', 'in-portal:configure_general');
+INSERT INTO ConfigurationAdmin VALUES ('SessionTimeout', 'la_section_SettingsSession', 'la_prompt_session_timeout', 'text', '', '', 40.01, 0, 1);
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'SessionTimeout', '3600', 'In-Portal', 'in-portal:configure_general');
 
 # Section "in-portal:configure_advanced":
 INSERT INTO ConfigurationAdmin VALUES ('Site_Path', 'la_section_SettingsWebsite', 'la_config_PathToWebsite', 'text', '', '', 10.01, 0, 1);
@@ -53,34 +59,28 @@
 INSERT INTO ConfigurationValues VALUES (DEFAULT, 'SiteNameSubTitle', 'Content Management System', 'In-Portal', 'in-portal:configure_advanced');
 INSERT INTO ConfigurationAdmin VALUES ('UseModRewrite', 'la_section_SettingsWebsite', 'la_config_use_modrewrite', 'checkbox', '', '', 10.03, 0, 1);
 INSERT INTO ConfigurationValues VALUES (DEFAULT, 'UseModRewrite', '0', 'In-Portal', 'in-portal:configure_advanced');
-INSERT INTO ConfigurationAdmin VALUES ('Config_Server_Time', 'la_section_SettingsWebsite', 'la_config_time_server', 'select', '', '1=la_m12,2=la_m11,3=la_m10,5=la_m9,6=la_m8,7=la_m7,8=la_m6,9=la_m5,10=la_m4,11=la_m3,12=la_m2,13=la_m1,14=la_m0,15=la_p1,16=la_p2,17=la_p3,18=la_p4,19=la_p5,20=la_p6,21=la_p7,22=la_p8,23=la_p9,24=la_p10,25=la_p11,26=la_p12,27=la_p13', 10.04, 0, 1);
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'Config_Server_Time', '14', 'In-Portal', 'in-portal:configure_advanced');
-INSERT INTO ConfigurationAdmin VALUES ('Config_Site_Time', 'la_section_SettingsWebsite', 'la_config_site_zone', 'select', '', '1=la_m12,2=la_m11,3=la_m10,5=la_m9,6=la_m8,7=la_m7,8=la_m6,9=la_m5,10=la_m4,11=la_m3,12=la_m2,13=la_m1,14=la_m0,15=la_p1,16=la_p2,17=la_p3,18=la_p4,19=la_p5,20=la_p6,21=la_p7,22=la_p8,23=la_p9,24=la_p10,25=la_p11,26=la_p12,27=la_p13', 10.05, 0, 1);
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'Config_Site_Time', '14', 'In-Portal', 'in-portal:configure_advanced');
-INSERT INTO ConfigurationAdmin VALUES ('cms_DefaultDesign', 'la_section_SettingsWebsite', 'la_config_DefaultDesignTemplate', 'text', NULL, NULL, 10.06, 0, 0);
+INSERT INTO ConfigurationAdmin VALUES ('cms_DefaultDesign', 'la_section_SettingsWebsite', 'la_config_DefaultDesignTemplate', 'text', NULL, NULL, 10.04, 0, 0);
 INSERT INTO ConfigurationValues VALUES (DEFAULT, 'cms_DefaultDesign', '/platform/designs/general', 'In-Portal', 'in-portal:configure_advanced');
-INSERT INTO ConfigurationAdmin VALUES ('ErrorTemplate', 'la_section_SettingsWebsite', 'la_config_error_template', 'text', '', '', 10.07, 0, 0);
+INSERT INTO ConfigurationAdmin VALUES ('ErrorTemplate', 'la_section_SettingsWebsite', 'la_config_error_template', 'text', '', '', 10.05, 0, 0);
 INSERT INTO ConfigurationValues VALUES (DEFAULT, 'ErrorTemplate', 'error_notfound', 'In-Portal', 'in-portal:configure_advanced');
-INSERT INTO ConfigurationAdmin VALUES ('NoPermissionTemplate', 'la_section_SettingsWebsite', 'la_config_nopermission_template', 'text', '', '', 10.08, 0, 0);
+INSERT INTO ConfigurationAdmin VALUES ('NoPermissionTemplate', 'la_section_SettingsWebsite', 'la_config_nopermission_template', 'text', '', '', 10.06, 0, 0);
 INSERT INTO ConfigurationValues VALUES (DEFAULT, 'NoPermissionTemplate', 'no_permission', 'In-Portal', 'in-portal:configure_advanced');
-INSERT INTO ConfigurationAdmin VALUES ('UsePageHitCounter', 'la_section_SettingsWebsite', 'la_config_UsePageHitCounter', 'checkbox', '', '', 10.09, 0, 0);
+INSERT INTO ConfigurationAdmin VALUES ('UsePageHitCounter', 'la_section_SettingsWebsite', 'la_config_UsePageHitCounter', 'checkbox', '', '', 10.07, 0, 0);
 INSERT INTO ConfigurationValues VALUES (DEFAULT, 'UsePageHitCounter', 0, 'In-Portal', 'in-portal:configure_advanced');
 INSERT INTO ConfigurationValues VALUES (DEFAULT, 'PageHitCounter', 0, 'In-Portal', 'in-portal:configure_advanced');
-INSERT INTO ConfigurationAdmin VALUES ('ForceImageMagickResize', 'la_section_SettingsWebsite', 'la_config_ForceImageMagickResize', 'checkbox', '', '', 10.10, 0, 0);
+INSERT INTO ConfigurationAdmin VALUES ('ForceImageMagickResize', 'la_section_SettingsWebsite', 'la_config_ForceImageMagickResize', 'checkbox', '', '', 10.08, 0, 0);
 INSERT INTO ConfigurationValues VALUES (DEFAULT, 'ForceImageMagickResize', '0', 'In-Portal', 'in-portal:configure_advanced');
-INSERT INTO ConfigurationAdmin VALUES ('CheckStopWords', 'la_section_SettingsWebsite', 'la_config_CheckStopWords', 'checkbox', '', '', 10.11, 0, 0);
+INSERT INTO ConfigurationAdmin VALUES ('CheckStopWords', 'la_section_SettingsWebsite', 'la_config_CheckStopWords', 'checkbox', '', '', 10.09, 0, 0);
 INSERT INTO ConfigurationValues VALUES (DEFAULT, 'CheckStopWords', '0', 'In-Portal', 'in-portal:configure_advanced');
 INSERT INTO ConfigurationAdmin VALUES ('CookieSessions', 'la_section_SettingsSession', 'la_prompt_session_management', 'select', NULL, '0=lu_opt_QueryString,1=lu_opt_Cookies,2=lu_opt_AutoDetect', 20.01, 0, 1);
 INSERT INTO ConfigurationValues VALUES (DEFAULT, 'CookieSessions', '2', 'In-Portal', 'in-portal:configure_advanced');
 INSERT INTO ConfigurationAdmin VALUES ('SessionCookieName', 'la_section_SettingsSession', 'la_prompt_session_cookie_name', 'text', '', '', 20.02, 0, 1);
 INSERT INTO ConfigurationValues VALUES (DEFAULT, 'SessionCookieName', 'sid', 'In-Portal', 'in-portal:configure_advanced');
-INSERT INTO ConfigurationAdmin VALUES ('SessionTimeout', 'la_section_SettingsSession', 'la_prompt_session_timeout', 'text', '', '', 20.03, 0, 1);
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'SessionTimeout', '3600', 'In-Portal', 'in-portal:configure_advanced');
-INSERT INTO ConfigurationAdmin VALUES ('KeepSessionOnBrowserClose', 'la_section_SettingsSession', 'la_config_KeepSessionOnBrowserClose', 'checkbox', '', '', 20.04, 0, 0);
+INSERT INTO ConfigurationAdmin VALUES ('KeepSessionOnBrowserClose', 'la_section_SettingsSession', 'la_config_KeepSessionOnBrowserClose', 'checkbox', '', '', 20.03, 0, 0);
 INSERT INTO ConfigurationValues VALUES (DEFAULT, 'KeepSessionOnBrowserClose', '0', 'In-Portal', 'in-portal:configure_advanced');
-INSERT INTO ConfigurationAdmin VALUES ('SessionReferrerCheck', 'la_section_SettingsSession', 'la_promt_ReferrerCheck', 'checkbox', NULL, NULL, 20.05, 0, 1);
+INSERT INTO ConfigurationAdmin VALUES ('SessionReferrerCheck', 'la_section_SettingsSession', 'la_promt_ReferrerCheck', 'checkbox', NULL, NULL, 20.04, 0, 1);
 INSERT INTO ConfigurationValues VALUES (DEFAULT, 'SessionReferrerCheck', '1', 'In-Portal', 'in-portal:configure_advanced');
-INSERT INTO ConfigurationAdmin VALUES ('UseJSRedirect', 'la_section_SettingsSession', 'la_config_use_js_redirect', 'checkbox', '', '', 20.06, 0, 0);
+INSERT INTO ConfigurationAdmin VALUES ('UseJSRedirect', 'la_section_SettingsSession', 'la_config_use_js_redirect', 'checkbox', '', '', 20.05, 0, 0);
 INSERT INTO ConfigurationValues VALUES (DEFAULT, 'UseJSRedirect', '0', 'In-Portal', 'in-portal:configure_advanced');
 INSERT INTO ConfigurationAdmin VALUES ('SSL_URL', 'la_section_SettingsSSL', 'la_config_ssl_url', 'text', '', '', 30.01, 0, 1);
 INSERT INTO ConfigurationValues VALUES (DEFAULT, 'SSL_URL', '', 'In-Portal', 'in-portal:configure_advanced');