Index: admin/system_presets/simple/users_u.php
===================================================================
--- admin/system_presets/simple/users_u.php (revision 14705)
+++ admin/system_presets/simple/users_u.php (working copy)
@@ -69,7 +69,7 @@
// fields to hide
$hidden_fields = Array (
- /* 'PortalUserId', 'Login', 'Password', 'FirstName','LastName', 'Company', 'Email', 'CreatedOn',
+ /* 'PortalUserId', 'Username', 'Password', 'FirstName','LastName', 'Company', 'Email', 'CreatedOn',
'Phone', 'Fax', 'Street', 'Street2', 'City', 'State' , 'Zip', 'Country', 'ResourceId', 'Status',
'Modified', 'dob', 'tz',*/ 'IPAddress', /*'IsBanned', 'PwResetConfirm', 'PwRequestTime',*/ 'IPRestrictions',
);
@@ -81,7 +81,7 @@
// fields to make required
$required_fields = Array (
- /*'PortalUserId',*/ 'Login', /*'Password', 'FirstName', 'LastName', 'Company', */'Email', /*'CreatedOn',
+ /*'PortalUserId',*/ 'Username', /*'Password', 'FirstName', 'LastName', 'Company', */'Email', /*'CreatedOn',
'Phone', 'Fax', 'Street', 'Street2', 'City', 'State' , 'Zip', 'Country', 'ResourceId', 'Status',
'Modified', 'dob', 'tz', 'IPAddress', 'IsBanned', 'PwResetConfirm', 'PwRequestTime',*/
);
@@ -106,14 +106,14 @@
// hide columns in grids
$hide_columns = Array (
// currently not in user
-// 'Default' => Array ('Login', 'LastName', 'FirstName', 'Email', 'PrimaryGroup', 'CreatedOn', 'Modified'),
+// 'Default' => Array ('Username', 'LastName', 'FirstName', 'Email', 'PrimaryGroup', 'CreatedOn', 'Modified'),
// user selector
-// 'UserSelector' => Array ('Login', 'LastName', 'FirstName', 'Email', 'PrimaryGroup', 'CreatedOn', 'Modified'),
+// 'UserSelector' => Array ('Username', 'LastName', 'FirstName', 'Email', 'PrimaryGroup', 'CreatedOn', 'Modified'),
// admins list; section: Users Management -> Administrators
-// 'Admins' => Array ('PortalUserId', 'Login', 'FirstName', 'LastName', 'Email'),
+// 'Admins' => Array ('PortalUserId', 'Username', 'FirstName', 'LastName', 'Email'),
// users list; section: Users Management -> Users
- 'RegularUsers' => Array (/*'PortalUserId', 'Login', 'FirstName', 'LastName', 'Email',*/ 'PrimaryGroup', 'CreatedOn', 'Modified', /* 'Status',*/ 'IPAddress'),
+ 'RegularUsers' => Array (/*'PortalUserId', 'Username', 'FirstName', 'LastName', 'Email',*/ 'PrimaryGroup', 'CreatedOn', 'Modified', /* 'Status',*/ 'IPAddress'),
);
Index: core/admin_templates/logs/change_logs/change_log_edit.tpl
===================================================================
--- core/admin_templates/logs/change_logs/change_log_edit.tpl (revision 14705)
+++ core/admin_templates/logs/change_logs/change_log_edit.tpl (working copy)
@@ -67,7 +67,7 @@
Login / E-mail: | +Username / E-mail: | Index: core/install/upgrades.sql =================================================================== --- core/install/upgrades.sql (revision 14705) +++ core/install/upgrades.sql (working copy) @@ -2193,3 +2193,31 @@ UPDATE ConfigurationValues SET DisplayOrder = DisplayOrder + 0.01 WHERE `Section` = 'in-portal:configure_advanced' AND Heading = 'la_section_SettingsWebsite'; + + +UPDATE ItemTypes +SET TitleField = 'Username' +WHERE SourceTable = 'PortalUser' AND TitleField = 'Login'; + +UPDATE SearchConfig +SET FieldName = 'Username' +WHERE TableName = 'PortalUser' AND FieldName = 'Login'; + +ALTER TABLE PortalUser DROP INDEX Login; +ALTER TABLE PortalUser CHANGE Login Username VARCHAR(255) NOT NULL; +ALTER TABLE PortalUser ADD INDEX Username (Username); + +UPDATE Events +SET + l<%PRIMARY_LANGUAGE%>_Subject = REPLACE(l<%PRIMARY_LANGUAGE%>_Subject, 'name="Login"', 'name="Username"'), + l<%PRIMARY_LANGUAGE%>_Body = REPLACE(l<%PRIMARY_LANGUAGE%>_Body, 'name="Login"', 'name="Username"'); + +DELETE FROM PersistantSessionData +WHERE (VariableName LIKE 'u%]columns_.') OR (VariableName LIKE 'u%_sort%'); + +DELETE FROM Phrase +WHERE Phrase = 'LU_FLD_LOGIN'; + +UPDATE BanRules +SET ItemField = 'Username' +WHERE ItemField = 'Login'; \ No newline at end of file Index: core/kernel/db/cat_event_handler.php =================================================================== --- core/kernel/db/cat_event_handler.php (revision 14719) +++ core/kernel/db/cat_event_handler.php (working copy) @@ -2156,7 +2156,7 @@ $id_field = $this->Application->getUnitOption('u', 'IDField'); $table_name = $this->Application->getUnitOption('u', 'TableName'); - $sql = 'SELECT Login + $sql = 'SELECT Username FROM ' . $table_name . ' WHERE ' . $id_field . ' = ' . $user_id; $object->SetDBField($cached_field, $this->Conn->GetOne($sql)); Index: core/kernel/db/db_event_handler.php =================================================================== --- core/kernel/db/db_event_handler.php (revision 14714) +++ core/kernel/db/db_event_handler.php (working copy) @@ -2268,8 +2268,10 @@ * Occurs after successful item validation * * @param kEvent $event + * @return void + * @access protected */ - function OnAfterItemValidate(&$event) + protected function OnAfterItemValidate(kEvent &$event) { } Index: core/kernel/utility/temp_handler.php =================================================================== --- core/kernel/utility/temp_handler.php (revision 14705) +++ core/kernel/utility/temp_handler.php (working copy) @@ -1016,7 +1016,7 @@ $sql = 'SELECT CONCAT(IF (s.PortalUserId = ' . USER_ROOT . ', \'root\', IF (s.PortalUserId = ' . USER_GUEST . ', \'Guest\', - CONCAT(FirstName, \' \', LastName, \' (\', Login, \')\') + CONCAT(u.FirstName, \' \', u.LastName, \' (\', u.Username, \')\') ) ), \' IP: \', s.IpAddress, \'\') FROM ' . TABLE_PREFIX . 'UserSession AS s LEFT JOIN ' . TABLE_PREFIX . 'PortalUser AS u Index: core/units/ban_rules/ban_rules_config.php =================================================================== --- core/units/ban_rules/ban_rules_config.php (revision 14705) +++ core/units/ban_rules/ban_rules_config.php (working copy) @@ -90,7 +90,7 @@ 'type' => 'string', 'max_len' => 255, 'formatter'=>'kOptionsFormatter', 'options' => Array( 'ip' => 'la_opt_IP_Address', - 'Login' => 'la_opt_Username', + 'Username' => 'la_opt_Username', 'Email' => 'la_opt_Email', 'FirstName' => 'la_opt_FirstName', 'LastName' => 'la_opt_LastName', Index: core/units/categories/categories_config.php =================================================================== --- core/units/categories/categories_config.php (revision 14705) +++ core/units/categories/categories_config.php (working copy) @@ -326,7 +326,7 @@ 'MetaKeywords' => Array ('type' => 'string', 'formatter' => 'kFormatter', 'using_fck' => 1, 'default' => null), 'CachedDescendantCatsQty' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0), 'CachedNavbar' => Array ('type' => 'string', 'formatter' => 'kMultiLanguage', 'default' => null), - 'CreatedById' => Array ('type' => 'int', 'formatter' => 'kLEFTFormatter', 'error_msgs' => Array ('invalid_option' => '!la_error_UserNotFound!'), 'options' => Array (USER_ROOT => 'root', USER_GUEST => 'Guest'),'left_sql'=>'SELECT %s FROM '.TABLE_PREFIX.'PortalUser WHERE `%s` = \'%s\'', 'left_key_field' => 'PortalUserId', 'left_title_field' => 'Login', 'default' => NULL), + 'CreatedById' => Array ('type' => 'int', 'formatter' => 'kLEFTFormatter', 'error_msgs' => Array ('invalid_option' => '!la_error_UserNotFound!'), 'options' => Array (USER_ROOT => 'root', USER_GUEST => 'Guest'),'left_sql'=>'SELECT %s FROM '.TABLE_PREFIX.'PortalUser WHERE `%s` = \'%s\'', 'left_key_field' => 'PortalUserId', 'left_title_field' => 'Username', 'default' => NULL), 'ResourceId' => Array ('type' => 'int', 'default' => null), 'ParentPath' => Array ('type' => 'string', 'default' => null), 'TreeLeft' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0), @@ -337,7 +337,7 @@ 'NewItem' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (2 => 'la_Auto', 1 => 'la_Always', 0 => 'la_Never'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 2), 'PopItem' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (2 => 'la_Auto', 1 => 'la_Always', 0 => 'la_Never'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 2), 'Modified' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => '#NOW#'), - 'ModifiedById' => Array ('type' => 'int', 'formatter' => 'kLEFTFormatter', 'error_msgs' => Array ('invalid_option' => '!la_error_UserNotFound!'), 'options' => Array (USER_ROOT => 'root', USER_GUEST => 'Guest'),'left_sql'=>'SELECT %s FROM '.TABLE_PREFIX.'PortalUser WHERE `%s` = \'%s\'', 'left_key_field' => 'PortalUserId', 'left_title_field' => 'Login', 'default' => NULL), + 'ModifiedById' => Array ('type' => 'int', 'formatter' => 'kLEFTFormatter', 'error_msgs' => Array ('invalid_option' => '!la_error_UserNotFound!'), 'options' => Array (USER_ROOT => 'root', USER_GUEST => 'Guest'),'left_sql'=>'SELECT %s FROM '.TABLE_PREFIX.'PortalUser WHERE `%s` = \'%s\'', 'left_key_field' => 'PortalUserId', 'left_title_field' => 'Username', 'default' => NULL), 'CachedTemplate' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''), Index: core/units/email_events/email_events_event_handler.php =================================================================== --- core/units/email_events/email_events_event_handler.php (revision 14705) +++ core/units/email_events/email_events_event_handler.php (working copy) @@ -244,7 +244,7 @@ case EmailEvent::ADDRESS_TYPE_USER: $sql = 'SELECT FirstName, LastName, Email, PortalUserId FROM ' . TABLE_PREFIX . 'PortalUser - WHERE Login = ' . $this->Conn->qstr($address); + WHERE Username = ' . $this->Conn->qstr($address); $user_info = $this->Conn->GetRow($sql); if ($user_info) { @@ -416,7 +416,7 @@ case EmailEvent::ADDRESS_TYPE_USER: $sql = 'SELECT FirstName, LastName, Email FROM ' . TABLE_PREFIX . 'PortalUser - WHERE Login = ' . $this->Conn->qstr($address); + WHERE Username = ' . $this->Conn->qstr($address); $user_info = $this->Conn->GetRow($sql); if ($user_info) { @@ -506,7 +506,7 @@ // 2. replace tags if needed $default_replacement_tags = Array ( ' |