Index: branches/5.0.x/core/units/visits/visits_event_handler.php
===================================================================
diff -u -r12299 -r12366
--- branches/5.0.x/core/units/visits/visits_event_handler.php	(.../visits_event_handler.php)	(revision 12299)
+++ branches/5.0.x/core/units/visits/visits_event_handler.php	(.../visits_event_handler.php)	(revision 12366)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: visits_event_handler.php 12299 2009-08-17 01:51:27Z dmitrya $
+* @version	$Id: visits_event_handler.php 12366 2009-08-23 15:59:48Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -37,20 +37,22 @@
 		 */
 		function OnRegisterVisit(&$event)
 		{
-			if ($this->Application->IsAdmin()) {
+			if ($this->Application->IsAdmin() || !$this->Application->ConfigValue('UseVisitorTracking')) {
 				// admin logins are not registred in visits list
 				return true;
 			}
+
 			if ($this->Application->RecallVar('visit_id')) {
 				return true;
 			}
-			$object =& $event->getObject( Array('skip_autoload'=>true) );
+
+			$object =& $event->getObject( Array('skip_autoload' => true) );
 			$object->SetDBField('VisitDate_date', adodb_mktime() );
 			$object->SetDBField('VisitDate_time', adodb_mktime() );
 			$object->SetDBField('Referer', getArrayValue($_SERVER, 'HTTP_REFERER') );
 			$object->SetDBField('IPAddress', $_SERVER['REMOTE_ADDR'] );
-			if( $object->Create() )
-			{
+
+			if ($object->Create()) {
 				$this->Application->StoreVar('visit_id', $object->GetID() );
 				$this->Application->SetVar('visits_id', $object->GetID() );
 			}
Index: branches/5.0.x/core/kernel/application.php
===================================================================
diff -u -r12356 -r12366
--- branches/5.0.x/core/kernel/application.php	(.../application.php)	(revision 12356)
+++ branches/5.0.x/core/kernel/application.php	(.../application.php)	(revision 12366)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: application.php 12356 2009-08-19 20:24:20Z dmitrya $
+* @version	$Id: application.php 12366 2009-08-23 15:59:48Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -2604,9 +2604,18 @@
 	 */
 	function setVisitField($field, $value)
 	{
-		$visit =& $this->recallObject('visits');
-		$visit->SetDBField($field, $value);
-		$visit->Update();
+		if ($this->IsAdmin() || !$this->ConfigValue('UseVisitorTracking')) {
+			// admin logins are not registred in visits list
+			return ;
+		}
+
+		$visit =& $this->recallObject('visits', null, Array ('raise_warnings' => 0));
+		/* @var $visit kDBItem */
+
+		if ($visit->isLoaded()) {
+			$visit->SetDBField($field, $value);
+			$visit->Update();
+		}
 	}
 
 	/**
Index: branches/5.0.x/core/kernel/utility/unit_config_reader.php
===================================================================
diff -u -r12365 -r12366
--- branches/5.0.x/core/kernel/utility/unit_config_reader.php	(.../unit_config_reader.php)	(revision 12365)
+++ branches/5.0.x/core/kernel/utility/unit_config_reader.php	(.../unit_config_reader.php)	(revision 12366)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: unit_config_reader.php 12365 2009-08-22 19:11:51Z alex $
+* @version	$Id: unit_config_reader.php 12366 2009-08-23 15:59:48Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -86,6 +86,7 @@
 			'Config_Server_Time',
 			'Config_Site_Time',
 			'UseChangeLog',
+			'UseVisitorTracking',
 		);
 
 		foreach ($config_vars as $var) {
Index: branches/5.0.x/core/install/upgrades.sql
===================================================================
diff -u -r12320 -r12366
--- branches/5.0.x/core/install/upgrades.sql	(.../upgrades.sql)	(revision 12320)
+++ branches/5.0.x/core/install/upgrades.sql	(.../upgrades.sql)	(revision 12366)
@@ -1451,4 +1451,7 @@
 UPDATE ConfigurationAdmin SET element_type = 'select', ValueList = '0=la_opt_SameWindow,1=la_opt_PopupWindow,2=la_opt_ModalWindow' WHERE VariableName = 'UsePopups';
 UPDATE Phrase SET Translation = 'Editing Window Style' WHERE Phrase = 'la_config_UsePopups';
 
+INSERT INTO ConfigurationAdmin VALUES ('UseVisitorTracking', 'la_section_SettingsWebsite', 'la_config_UseVisitorTracking', 'checkbox', '', '', 10.09, 0, 0);
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'UseVisitorTracking', '0', 'In-Portal', 'in-portal:configure_advanced');
+
 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/install/english.lang
===================================================================
diff -u -r12335 -r12366
--- branches/5.0.x/core/install/english.lang	(.../english.lang)	(revision 12335)
+++ branches/5.0.x/core/install/english.lang	(.../english.lang)	(revision 12366)
@@ -222,6 +222,7 @@
 			<PHRASE Label="la_config_UseSmallHeader" Module="Core" Type="1">VXNlIFNtYWxsIFNlY3Rpb24gSGVhZGVycw==</PHRASE>
 			<PHRASE Label="la_config_UseTemplateCompression" Module="Core" Type="1">Q29tcHJlc3MgQ29tcGlsZWQgUEhQIFRlbXBsYXRlcw==</PHRASE>
 			<PHRASE Label="la_config_UseToolbarLabels" Module="Core" Type="1">VXNlIFRvb2xiYXIgTGFiZWxz</PHRASE>
+			<PHRASE Label="la_config_UseVisitorTracking" Module="Core" Type="1">VXNlIFZpc2l0b3IgVHJhY2tpbmc=</PHRASE>
 			<PHRASE Label="la_config_use_js_redirect" Module="Core" Type="1">VXNlIEphdmFTY3JpcHQgcmVkaXJlY3Rpb24gYWZ0ZXIgbG9naW4vbG9nb3V0IChmb3IgSUlTKQ==</PHRASE>
 			<PHRASE Label="la_config_use_modrewrite" Module="Core" Type="1">VXNlIE1PRCBSRVdSSVRF</PHRASE>
 			<PHRASE Label="la_config_use_modrewrite_with_ssl" Module="Core" Type="1">RW5hYmxlIE1PRF9SRVdSSVRFIGZvciBTU0w=</PHRASE>
Index: branches/5.0.x/core/install/install_data.sql
===================================================================
diff -u -r12320 -r12366
--- branches/5.0.x/core/install/install_data.sql	(.../install_data.sql)	(revision 12320)
+++ branches/5.0.x/core/install/install_data.sql	(.../install_data.sql)	(revision 12366)
@@ -72,6 +72,8 @@
 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.08, 0, 0);
 INSERT INTO ConfigurationValues VALUES (DEFAULT, 'CheckStopWords', '0', 'In-Portal', 'in-portal:configure_advanced');
+INSERT INTO ConfigurationAdmin VALUES ('UseVisitorTracking', 'la_section_SettingsWebsite', 'la_config_UseVisitorTracking', 'checkbox', '', '', 10.09, 0, 0);
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'UseVisitorTracking', '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);