Index: branches/5.3.x/core/kernel/constants.php
===================================================================
diff -u -r15584 -r15677
--- branches/5.3.x/core/kernel/constants.php	(.../constants.php)	(revision 15584)
+++ branches/5.3.x/core/kernel/constants.php	(.../constants.php)	(revision 15677)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: constants.php 15584 2012-10-17 10:50:12Z alex $
+* @version	$Id: constants.php 15677 2013-01-17 18:52:50Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -131,14 +131,15 @@
 	define('SUBMISSION_LOG_ATTACHMENT_PATH', WRITEBALE_BASE . '/user_files/submission_log/');
 
 	define('TIMENOW', adodb_mktime()); // for faster message processing
+	define('USER_TITLE_FIELD', 'IF(Email = "", Username, Email)');
 
 	// site domains
 	define('SITE_DOMAIN_REDIRECT_CURRENT', 1);
 	define('SITE_DOMAIN_REDIRECT_EXTERNAL', 2);
 
-	class EmailEvent {
-		const EVENT_TYPE_FRONTEND = 0;
-		const EVENT_TYPE_ADMIN = 1;
+	class EmailTemplate {
+		const TEMPLATE_TYPE_FRONTEND = 0;
+		const TEMPLATE_TYPE_ADMIN = 1;
 
 		const ADDRESS_TYPE_EMAIL = 1;
 		const ADDRESS_TYPE_USER = 2;
@@ -163,6 +164,13 @@
 		const ADMIN = 1;
 	}
 
+	class PasswordHashingMethod {
+		const NONE = 0;
+		const MD5 = 1;
+		const MD5_AND_PHPPASS = 2;
+		const PHPPASS = 3;
+	}
+
 	// selectors
 	define('STYLE_BASE', 1);
 	define('STYLE_BLOCK', 2);