Index: branches/5.2.x/core/kernel/constants.php
===================================================================
diff -u -N -r14092 -r14095
--- branches/5.2.x/core/kernel/constants.php	(.../constants.php)	(revision 14092)
+++ branches/5.2.x/core/kernel/constants.php	(.../constants.php)	(revision 14095)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: constants.php 14092 2010-11-26 22:43:15Z alex $
+* @version	$Id: constants.php 14095 2010-12-28 17:37:07Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -14,22 +14,6 @@
 
 	defined('FULL_PATH') or die('restricted access!');
 
-	// kDBList filter types (then, types are divided into classes)
-	define('HAVING_FILTER', 1);
-	define('WHERE_FILTER', 2);
-	define('AGGREGATE_FILTER', 3);
-
-	// kDBList filter classes
-	define('FLT_SYSTEM',	1);	// System Having/Where filter [AND]
-	define('FLT_NORMAL',	2);	// User Having/Where filter [OR]
-	define('FLT_SEARCH',	3);	// User "Search" Having/Where filter [OR]
-	define('FLT_VIEW',		4);	// User "View Menu" Having/Where filter [AND]
-	define('FLT_CUSTOM',	5); // Custom fields (above) grid columns [AND]
-
-	// kMultipleFilter types
-	define('FLT_TYPE_AND',	'AND');
-	define('FLT_TYPE_OR',	'OR');
-
 	// item statuses
 	define('STATUS_DISABLED', 0);
 	define('STATUS_ACTIVE', 1);
@@ -40,21 +24,15 @@
 	define('stTREE', 1);
 	define('stTAB', 2);
 
-	// event statuses
-	define('erSUCCESS',		0);		// event finished working succsessfully
-	define('erFAIL',		-1);	// event finished working, but result is unsuccsessfull
-	define('erFATAL',		-2);	// event experienced FATAL error - no hooks should continue!
-	define('erPERM_FAIL',	-3);	// event failed on internal permission checking (user has not permission)
-	define('erSTOP',		-4);	// event requested to stop processing (don't parse templates)
+	define('smHIDE', 0); // always hide section from tree
+	define('smNORMAL', 1); // show section even, if they were marked as smDEBUG or smSUPER_ADMIN before
+	define('smDEBUG', 2); // show section in debug mode only
+	define('smSUPER_ADMIN', 4); // show section in super admin & debug mode
 
 	// permission types
 	define('ptCATEGORY', 	0);
 	define('ptSYSTEM', 		1);
 
-	// email event types
-	define('EVENT_TYPE_FRONTEND', 0);
-	define('EVENT_TYPE_ADMIN', 1);
-
 	define('EDIT_MARK', '&|edit|&'); // replace this sequence inside filters to SID[_main_wid]
 
 	$application =& kApplication::Instance();
@@ -63,27 +41,20 @@
 
 	if (!$application->isAdmin) {
 		// don't show debugger buttons on front (if not overrided in "debug.php")
-		safeDefine('DBG_TOOLBAR_BUTTONS', 0);
+		kUtil::safeDefine('DBG_TOOLBAR_BUTTONS', 0);
 	}
 
-	define('smHIDE', 0); // always hide section from tree
-	define('smNORMAL', 1); // show section even, if they were marked as smDEBUG or smSUPER_ADMIN before
-	define('smDEBUG', 2); // show section in debug mode only
-	define('smSUPER_ADMIN', 4); // show section in super admin & debug mode
-
 	// common usage regular expressions
 	define('REGEX_EMAIL_USER', '[-a-zA-Z0-9!\#$%&*+\/=?^_`{|}~.]+');
 	define('REGEX_EMAIL_DOMAIN', '[a-zA-Z0-9]{1}[-.a-zA-Z0-9_]*\.[a-zA-Z]{2,6}');
 	define('ALLOW_DEFAULT_SETTINGS', '_USE_DEFAULT_USER_DATA_'); //Allow persistent vars to take data from default user's persistent data
 
-	define('XML_NO_TEXT_NODES', 1); // Normal mode for XMLHelper
-	define('XML_WITH_TEXT_NODES', 2); // Will create text nodes for every char-data (used in kPDFHelper)
+	class ChangeLog {
+		const CREATE = 1;
+		const UPDATE = 2;
+		const DELETE = 3;
+	}
 
-	// ChangeLog actions
-	define('clCREATE', 1);
-	define('clUPDATE', 2);
-	define('clDELETE', 3);
-
 	// Separator for ValueList fields
 	define('VALUE_LIST_SEPARATOR', '||');
 
@@ -92,23 +63,24 @@
 	define('EDITING_MODE_CONTENT', 2); // content blocks + phrase editing
 	define('EDITING_MODE_DESIGN', 3); // all other blocks
 
-	// agent types
-	define('AGENT_TYPE_USER', 1);
-	define('AGENT_TYPE_SYSTEM', 2);
+	class Agent {
+		const AGENT_TYPE_USER = 1;
+		const AGENT_TYPE_SYSTEM =  2;
 
-	// agent last run statuses
-	define('AGENT_LAST_RUN_SUCCEDED', 1);
-	define('AGENT_LAST_RUN_FAILED', 0);
-	define('AGENT_LAST_RUN_RUNNING', 2);
+		const LAST_RUN_SUCCEDED = 1;
+		const LAST_RUN_FAILED = 0;
+		const LAST_RUN_RUNNING = 2;
+	}
 
 	// place for product file uploads (sort of "/system/images" but for all other files)
 	define('ITEM_FILES_PATH', WRITEBALE_BASE . '/downloads/');
 
-	// mailing list statuses
-	define('MAILING_LIST_NOT_PROCESSED', 1);
-	define('MAILING_LIST_PARTIALLY_PROCESSED', 2);
-	define('MAILING_LIST_PROCESSED', 3);
-	define('MAILING_LIST_CANCELLED', 4);
+	class MailingList {
+		const NOT_PROCESSED = 1;
+		const PARTIALLY_PROCESSED = 2;
+		const PROCESSED = 3;
+		const CANCELLED = 4;
+	}
 
 	// theme file statuses (related to structure creation process)
 	define('SMS_MODE_AUTO', 1);
@@ -124,24 +96,26 @@
 	define('SESSION_LOG_LOGGED_OUT', 1);
 	define('SESSION_LOG_EXPIRED', 2);
 
-	define('LOGIN_RESULT_OK', 0);
-	define('LOGIN_RESULT_INVALID_LOGIN', 1);
-	define('LOGIN_RESULT_INVALID_PASSWORD', 2);
-	define('LOGIN_RESULT_BANNED', 3);
-	define('LOGIN_RESULT_NO_PERMISSION', 4);
+	class LoginResult {
+		const OK = 0;
+		const INVALID_LOGIN = 1;
+		const INVALID_PASSWORD = 2;
+		const BANNED = 3;
+		const NO_PERMISSION = 4;
+	}
 
 	define('DESTINATION_TYPE_COUNTRY', 1);
 	define('DESTINATION_TYPE_STATE', 2);
 
-	// form field visibility
-	define('FORM_FIELD_EVERYONE', 1);
-	define('FORM_FIELD_UNREGISTERED', 2);
+	class SubmissionFormField {
+		const VISIBILITY_EVERYONE = 1;
+		const VISIBILITY_UNREGISTERED = 2;
 
-	// form field e-mail communication roles
-	define('EMAIL_COMMUNICATION_ROLE_NAME', 1);
-	define('EMAIL_COMMUNICATION_ROLE_EMAIL', 2);
-	define('EMAIL_COMMUNICATION_ROLE_SUBJECT', 3);
-	define('EMAIL_COMMUNICATION_ROLE_BODY', 4);
+		const COMMUNICATION_ROLE_NAME = 1;
+		const COMMUNICATION_ROLE_EMAIL = 2;
+		const COMMUNICATION_ROLE_SUBJECT = 3;
+		const COMMUNICATION_ROLE_BODY = 4;
+	}
 
 	// form submission statuses
 	define('SUBMISSION_REPLIED', 1);		// submission was replied by admin
@@ -162,17 +136,18 @@
 	define('SITE_DOMAIN_REDIRECT_CURRENT', 1);
 	define('SITE_DOMAIN_REDIRECT_EXTERNAL', 2);
 
-	define ('KG_TO_POUND', 2.20462262);
-	define ('POUND_TO_KG', 0.45359237);
+	class EmailEvent {
+		const EVENT_TYPE_FRONTEND = 0;
+		const EVENT_TYPE_ADMIN = 1;
 
-	// email event address types
-	define('ADDRESS_TYPE_EMAIL', 1);
-	define('ADDRESS_TYPE_USER', 2);
-	define('ADDRESS_TYPE_GROUP', 3);
+		const ADDRESS_TYPE_EMAIL = 1;
+		const ADDRESS_TYPE_USER = 2;
+		const ADDRESS_TYPE_GROUP = 3;
 
-	define('RECIPIENT_TYPE_TO', 1);
-	define('RECIPIENT_TYPE_CC', 2);
-	define('RECIPIENT_TYPE_BCC', 3);
+		const RECIPIENT_TYPE_TO = 1;
+		const RECIPIENT_TYPE_CC = 2;
+		const RECIPIENT_TYPE_BCC = 3;
+	}
 
 	define('PAGE_TYPE_VIRTUAL', 1);
 	define('PAGE_TYPE_TEMPLATE', 2);
\ No newline at end of file