Attached Files |
login_to_username_core.patch [^] (55,995 bytes) 2011-11-03 03:36
[Show Content]
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 @@
<inp2:m_RenderElement name="subsection" title="la_section_Page"/>
<inp2:m_RenderElement name="inp_id_label" prefix="change-log" field="ChangeLogId" title="la_fld_Id"/>
- <inp2:m_RenderElement name="inp_label" prefix="change-log" field="UserLogin" title="la_fld_Login" style="width: 100px"/>
+ <inp2:m_RenderElement name="inp_label" prefix="change-log" field="UserLogin" title="la_fld_Username" style="width: 100px"/>
<inp2:m_RenderElement name="inp_label" prefix="change-log" field="UserFirstName" title="la_fld_FirstName" style="width: 100px"/>
<inp2:m_RenderElement name="inp_label" prefix="change-log" field="UserLastName" title="la_fld_LastName" style="width: 100px"/>
<inp2:m_RenderElement name="inp_label" prefix="change-log" field="SessionLogId" title="la_fld_SessionLogId" style="width: 100px"/>
Index: core/admin_templates/user_selector.tpl
===================================================================
--- core/admin_templates/user_selector.tpl (revision 14705)
+++ core/admin_templates/user_selector.tpl (working copy)
@@ -49,7 +49,7 @@
<inp2:Field field="$field" first_chars="$first_chars" nl2br="$nl2br" grid="$grid" no_special="$no_special" format="$format"/>
<script type="text/javascript">
- $user_logins[ <inp2:Field name="$IdField"/> ] = '<inp2:Field name="Login" js_escape="1"/>';
+ $user_logins[ <inp2:Field name="$IdField"/> ] = '<inp2:Field name="Username" js_escape="1"/>';
</script>
</inp2:m_DefineElement>
Index: core/admin_templates/users/admins_edit.tpl
===================================================================
--- core/admin_templates/users/admins_edit.tpl (revision 14705)
+++ core/admin_templates/users/admins_edit.tpl (working copy)
@@ -66,9 +66,9 @@
<div id="scroll_container">
<table class="edit-form">
- <inp2:m_RenderElement name="subsection" prefix="u" fields="PortalUserId,Login,Password,FirstName,LastName,Email" title="la_section_General"/>
+ <inp2:m_RenderElement name="subsection" prefix="u" fields="PortalUserId,Username,Password,FirstName,LastName,Email" title="la_section_General"/>
<inp2:m_RenderElement name="inp_id_label" prefix="u" field="PortalUserId" title="la_fld_Id"/>
- <inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Login" title="la_fld_Username"/>
+ <inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Username" title="la_fld_Username"/>
<inp2:m_RenderElement name="password_fields" />
<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="FirstName" title="la_fld_FirstName"/>
Index: core/admin_templates/users/user_edit_items.tpl
===================================================================
--- core/admin_templates/users/user_edit_items.tpl (revision 14705)
+++ core/admin_templates/users/user_edit_items.tpl (working copy)
@@ -129,9 +129,9 @@
<div id="scroll_container" mode="minimal">
<table class="edit-form">
- <inp2:m_RenderElement name="subsection" prefix="u" fields="PortalUserId,Login" title="la_section_General"/>
+ <inp2:m_RenderElement name="subsection" prefix="u" fields="PortalUserId,Username" title="la_section_General"/>
<inp2:m_RenderElement name="inp_id_label" prefix="u" field="PortalUserId" title="la_fld_Id"/>
- <inp2:m_RenderElement name="inp_label" prefix="u" field="Login" title="la_fld_Username"/>
+ <inp2:m_RenderElement name="inp_label" prefix="u" field="Username" title="la_fld_Username"/>
<inp2:m_RenderElement name="inp_edit_filler"/>
<inp2:m_RenderElement name="subsection" title="la_section_Items"/>
</table>
Index: core/admin_templates/users/user_edit_password.tpl
===================================================================
--- core/admin_templates/users/user_edit_password.tpl (revision 14705)
+++ core/admin_templates/users/user_edit_password.tpl (working copy)
@@ -31,7 +31,7 @@
<div id="scroll_container">
<table class="edit-form">
<inp2:m_RenderElement name="inp_id_label" prefix="u" field="PortalUserId" title="la_fld_Id"/>
- <inp2:m_RenderElement name="inp_label" prefix="u" field="Login" title="la_fld_Username"/>
+ <inp2:m_RenderElement name="inp_label" prefix="u" field="Username" title="la_fld_Username"/>
<inp2:m_RenderElement name="inp_edit_password" prefix="u" field="Password" title="la_fld_Password"/>
<inp2:m_RenderElement name="inp_edit_password" prefix="u" field="VerifyPassword" title="la_fld_VerifyPassword"/>
<inp2:m_RenderElement name="inp_label" prefix="u" field="FirstName" title="la_fld_FirstName"/>
Index: core/admin_templates/users/user_selector.tpl
===================================================================
--- core/admin_templates/users/user_selector.tpl (revision 14705)
+++ core/admin_templates/users/user_selector.tpl (working copy)
@@ -39,7 +39,7 @@
<inp2:m_DefineElement name="grid_login_td" format="" no_special="1" nl2br="" first_chars="" td_style="">
<inp2:Field field="$field" first_chars="$first_chars" nl2br="$nl2br" grid="$grid" no_special="$no_special" format="$format"/>
<script type="text/javascript">
- $user_logins[ <inp2:Field name="$IdField"/> ] = '<inp2:Field name="Login" js_ecape="1"/>';
+ $user_logins[ <inp2:Field name="$IdField"/> ] = '<inp2:Field name="Username" js_escape="1"/>';
</script>
</inp2:m_DefineElement>
Index: core/admin_templates/users/users_edit.tpl
===================================================================
--- core/admin_templates/users/users_edit.tpl (revision 14705)
+++ core/admin_templates/users/users_edit.tpl (working copy)
@@ -62,9 +62,9 @@
<div id="scroll_container">
<table class="edit-form">
- <inp2:m_RenderElement name="subsection" prefix="u" fields="PortalUserId,Login,Password" title="la_section_General"/>
+ <inp2:m_RenderElement name="subsection" prefix="u" fields="PortalUserId,Username,Password" title="la_section_General"/>
<inp2:m_RenderElement name="inp_id_label" prefix="u" field="PortalUserId" title="la_fld_Id"/>
- <inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Login" title="la_fld_Username"/>
+ <inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Username" title="la_fld_Username"/>
<inp2:m_RenderElement name="password_fields" />
<inp2:m_RenderElement name="subsection" prefix="u" fields="FirstName,LastName,Company,Email,dob,Phone,Fax,Street,Street2,City,State,Zip,Country" title="la_prompt_PersonalInfo"/> <!-- OLD PHRASE, la_section_PersonalInformation -->
Index: core/install/english.lang
===================================================================
--- core/install/english.lang (revision 14705)
+++ core/install/english.lang (working copy)
@@ -1536,20 +1536,21 @@
<EVENT MessageType="text" Event="FORM.SUBMISSION.REPLY.TO.USER" Type="1">U3ViamVjdDogPGlucDI6bV9QYXJhbSBuYW1lPSJzdWJqZWN0Ii8+ICN2ZXJpZnk8aW5wMjpzdWJtaXNzaW9uLWxvZ19GaWVsZCBuYW1lPSJWZXJpZnlDb2RlIi8+Cgo8aW5wMjptX1BhcmFtIG5hbWU9Im1lc3NhZ2UiLz4=</EVENT>
<EVENT MessageType="html" Event="FORM.SUBMITTED" Type="0">U3ViamVjdDogVGhhbmsgWW91IGZvciBDb250YWN0aW5nIFVzIQoKPHA+VGhhbmsgeW91IGZvciBjb250YWN0aW5nIHVzLiBXZSdsbCBiZSBpbiB0b3VjaCB3aXRoIHlvdSBzaG9ydGx5ITwvcD4=</EVENT>
<EVENT MessageType="html" Event="FORM.SUBMITTED" Type="1">U3ViamVjdDogTmV3IGZvcm0gc3VibWlzc2lvbgoKPHA+Rm9ybSBoYXMgYmVlbiBzdWJtaXR0ZWQuIFBsZWFzZSBwcm9jZWVkIHRvIHRoZSBBZG1pbiBDb25zb2xlIHRvIHJldmlldyB0aGUgc3VibWlzc2lvbiE8L3A+</EVENT>
+ <EVENT MessageType="html" Event="ROOT.RESET.PASSWORD" Type="1">U3ViamVjdDogUm9vdCBSZXNldCBQYXNzd29yZAoKWW91ciBuZXcgcGFzc3dvcmQgaXM6IDxpbnAyOm1fUGFyYW0gbmFtZT0icGFzc3dvcmQiLz4=</EVENT>
<EVENT MessageType="html" Event="USER.ADD" Type="0">U3ViamVjdDogSW4tcG9ydGFsIHJlZ2lzdHJhdGlvbgoKRGVhciA8aW5wMjp1X0ZpZWxkIG5hbWU9IkZpcnN0TmFtZSIgLz4gPGlucDI6dV9GaWVsZCBuYW1lPSJMYXN0TmFtZSIgLz4sDQoNClRoYW5rIHlvdSBmb3IgcmVnaXN0ZXJpbmcgb24gPGlucDI6bV9CYXNlVXJsLz4uIFlvdXIgcmVnaXN0cmF0aW9uIGlzIG5vdyBhY3RpdmUu</EVENT>
- <EVENT MessageType="html" Event="USER.ADD" Type="1">U3ViamVjdDogTmV3IFVzZXIgUmVnaXN0cmF0aW9uICg8aW5wMjp1X0ZpZWxkIG5hbWU9IkxvZ2luIi8+KQoKQSBuZXcgdXNlciAiPGlucDI6dV9GaWVsZCBuYW1lPSJMb2dpbiIvPiIgaGFzIGJlZW4gYWRkZWQu</EVENT>
- <EVENT MessageType="text" Event="USER.ADD.BYADMIN" Type="0">U3ViamVjdDogTmV3IHVzZXIgaGFzIGJlZW4gY3JlYXRlZAoKRGVhciA8aW5wMjp1X0ZpZWxkIG5hbWU9IkZpcnN0TmFtZSIvPiwNCg0KQSBuZXcgdXNlciBoYXMgYmVlbiBjcmVhdGVkIGFuZCBhc3NpZ25lZCB0byB5b3UNCg0KTm93IHlvdSBjYW4gbG9naW4gdXNpbmcgdGhlIGZvbGxvd2luZyBjcmVkZW50aWFsczoNCg0KPGlucDI6bV9pZiBjaGVjaz0idV9GaWVsZCIgbmFtZT0iTG9naW4iPlVzZXJuYW1lOiA8aW5wMjp1X0ZpZWxkIG5hbWU9IkxvZ2luIi8+PGlucDI6bV9lbHNlLz5FLW1haWw6IDxpbnAyOnVfRmllbGQgbmFtZT0iRW1haWwiLz48L2lucDI6bV9pZj4gDQpQYXNzd29yZDogPGlucDI6dV9GaWVsZCBuYW1lPSJQYXNzd29yZF9wbGFpbiIvPiANCg==</EVENT>
- <EVENT MessageType="html" Event="USER.ADD.PENDING" Type="0">U3ViamVjdDogTmV3IFVzZXIgUmVnaXN0cmF0aW9uICg8aW5wMjp1X0ZpZWxkIG5hbWU9IkxvZ2luIi8+PGlucDI6bV9pZiBjaGVjaz0ibV9HZXRDb25maWciIG5hbWU9IlVzZXJfQWxsb3dfTmV3IiBlcXVhbHNfdG89IjQiPiAtIEFjdGl2YXRpb24gRW1haWw8L2lucDI6bV9pZj4pCgpEZWFyIDxpbnAyOnVfRmllbGQgbmFtZT0iRmlyc3ROYW1lIiAvPiA8aW5wMjp1X0ZpZWxkIG5hbWU9Ikxhc3ROYW1lIiAvPiw8YnIgLz4NCjxiciAvPg0KPGlucDI6bV9pZiBjaGVjaz0ibV9HZXRDb25maWciIG5hbWU9IlVzZXJfQWxsb3dfTmV3IiBlcXVhbHNfdG89IjQiPiBUaGFuayB5b3UgZm9yIHJlZ2lzdGVyaW5nIG9uIDxpbnAyOm1fTGluayB0ZW1wbGF0ZT0iaW5kZXgiLz4gd2Vic2l0ZS4gVG8gYWN0aXZhdGUgeW91ciByZWdpc3RyYXRpb24gcGxlYXNlIGZvbGxvdyBsaW5rIGJlbG93LiA8aW5wMjp1X0FjdGl2YXRpb25MaW5rIHRlbXBsYXRlPSJwbGF0Zm9ybS9sb2dpbi9hY3RpdmF0ZV9jb25maXJtIi8+IDxpbnAyOm1fZWxzZS8+IFRoYW5rIHlvdSBmb3IgcmVnaXN0ZXJpbmcgb24gPGlucDI6bV9MaW5rIHRlbXBsYXRlPSJpbmRleCIvPiB3ZWJzaXRlLiBZb3VyIHJlZ2lzdHJhdGlvbiB3aWxsIGJlIGFjdGl2ZSBhZnRlciBhcHByb3ZhbC4gPC9pbnAyOm1faWY+</EVENT>
- <EVENT MessageType="html" Event="USER.ADD.PENDING" Type="1">U3ViamVjdDogTmV3IFVzZXIgUmVnaXN0ZXJlZAoKQSBuZXcgdXNlciAiPGlucDI6dV9GaWVsZCBuYW1lPSJMb2dpbiIvPiIgaGFzIHJlZ2lzdGVyZWQgYW5kIGlzIHBlbmRpbmcgYWRtaW5pc3RyYXRpdmUgYXBwcm92YWwu</EVENT>
- <EVENT MessageType="html" Event="USER.APPROVE" Type="0">U3ViamVjdDogWW91ciBBY2NvdW50IGlzIEFjdGl2ZQoKV2VsY29tZSB0byA8aW5wMjptX0Jhc2VVcmwvPiENCg0KWW91ciB1c2VyIHJlZ2lzdHJhdGlvbiBoYXMgYmVlbiBhcHByb3ZlZC4gWW91ciB1c2VyIG5hbWUgaXM6ICI8aW5wMjp1X0ZpZWxkIG5hbWU9IkxvZ2luIi8+Ii4=</EVENT>
- <EVENT MessageType="html" Event="USER.APPROVE" Type="1">U3ViamVjdDogTmV3IFVzZXIgQWNjb3VudCAiPGlucDI6dV9GaWVsZCBuYW1lPSJMb2dpbiIvPiIgd2FzIEFwcHJvdmVkCgpVc2VyICI8aW5wMjp1X0ZpZWxkIG5hbWU9IkxvZ2luIi8+IiBoYXMgYmVlbiBhcHByb3ZlZC4=</EVENT>
+ <EVENT MessageType="html" Event="USER.ADD" Type="1">U3ViamVjdDogTmV3IFVzZXIgUmVnaXN0cmF0aW9uICg8aW5wMjp1X0ZpZWxkIG5hbWU9IlVzZXJuYW1lIi8+KQoKQSBuZXcgdXNlciAiPGlucDI6dV9GaWVsZCBuYW1lPSJVc2VybmFtZSIvPiIgaGFzIGJlZW4gYWRkZWQu</EVENT>
+ <EVENT MessageType="text" Event="USER.ADD.BYADMIN" Type="0">U3ViamVjdDogTmV3IHVzZXIgaGFzIGJlZW4gY3JlYXRlZAoKRGVhciA8aW5wMjp1X0ZpZWxkIG5hbWU9IkZpcnN0TmFtZSIvPiwNCg0KQSBuZXcgdXNlciBoYXMgYmVlbiBjcmVhdGVkIGFuZCBhc3NpZ25lZCB0byB5b3UNCg0KTm93IHlvdSBjYW4gbG9naW4gdXNpbmcgdGhlIGZvbGxvd2luZyBjcmVkZW50aWFsczoNCg0KPGlucDI6bV9pZiBjaGVjaz0idV9GaWVsZCIgbmFtZT0iVXNlcm5hbWUiPlVzZXJuYW1lOiA8aW5wMjp1X0ZpZWxkIG5hbWU9IlVzZXJuYW1lIi8+PGlucDI6bV9lbHNlLz5FLW1haWw6IDxpbnAyOnVfRmllbGQgbmFtZT0iRW1haWwiLz48L2lucDI6bV9pZj4gDQpQYXNzd29yZDogPGlucDI6dV9GaWVsZCBuYW1lPSJQYXNzd29yZF9wbGFpbiIvPiANCg==</EVENT>
+ <EVENT MessageType="html" Event="USER.ADD.PENDING" Type="0">U3ViamVjdDogTmV3IFVzZXIgUmVnaXN0cmF0aW9uICg8aW5wMjp1X0ZpZWxkIG5hbWU9IlVzZXJuYW1lIi8+PGlucDI6bV9pZiBjaGVjaz0ibV9HZXRDb25maWciIG5hbWU9IlVzZXJfQWxsb3dfTmV3IiBlcXVhbHNfdG89IjQiPiAtIEFjdGl2YXRpb24gRW1haWw8L2lucDI6bV9pZj4pCgpEZWFyIDxpbnAyOnVfRmllbGQgbmFtZT0iRmlyc3ROYW1lIiAvPiA8aW5wMjp1X0ZpZWxkIG5hbWU9Ikxhc3ROYW1lIiAvPiw8YnIgLz4NCjxiciAvPg0KPGlucDI6bV9pZiBjaGVjaz0ibV9HZXRDb25maWciIG5hbWU9IlVzZXJfQWxsb3dfTmV3IiBlcXVhbHNfdG89IjQiPiBUaGFuayB5b3UgZm9yIHJlZ2lzdGVyaW5nIG9uIDxpbnAyOm1fTGluayB0ZW1wbGF0ZT0iaW5kZXgiLz4gd2Vic2l0ZS4gVG8gYWN0aXZhdGUgeW91ciByZWdpc3RyYXRpb24gcGxlYXNlIGZvbGxvdyBsaW5rIGJlbG93LiA8aW5wMjp1X0FjdGl2YXRpb25MaW5rIHRlbXBsYXRlPSJwbGF0Zm9ybS9sb2dpbi9hY3RpdmF0ZV9jb25maXJtIi8+IDxpbnAyOm1fZWxzZS8+IFRoYW5rIHlvdSBmb3IgcmVnaXN0ZXJpbmcgb24gPGlucDI6bV9MaW5rIHRlbXBsYXRlPSJpbmRleCIvPiB3ZWJzaXRlLiBZb3VyIHJlZ2lzdHJhdGlvbiB3aWxsIGJlIGFjdGl2ZSBhZnRlciBhcHByb3ZhbC4gPC9pbnAyOm1faWY+</EVENT>
+ <EVENT MessageType="html" Event="USER.ADD.PENDING" Type="1">U3ViamVjdDogTmV3IFVzZXIgUmVnaXN0ZXJlZAoKQSBuZXcgdXNlciAiPGlucDI6dV9GaWVsZCBuYW1lPSJVc2VybmFtZSIvPiIgaGFzIHJlZ2lzdGVyZWQgYW5kIGlzIHBlbmRpbmcgYWRtaW5pc3RyYXRpdmUgYXBwcm92YWwu</EVENT>
+ <EVENT MessageType="html" Event="USER.APPROVE" Type="0">U3ViamVjdDogWW91ciBBY2NvdW50IGlzIEFjdGl2ZQoKV2VsY29tZSB0byA8aW5wMjptX0Jhc2VVcmwvPiENCg0KWW91ciB1c2VyIHJlZ2lzdHJhdGlvbiBoYXMgYmVlbiBhcHByb3ZlZC4gWW91ciB1c2VyIG5hbWUgaXM6ICI8aW5wMjp1X0ZpZWxkIG5hbWU9IlVzZXJuYW1lIi8+Ii4=</EVENT>
+ <EVENT MessageType="html" Event="USER.APPROVE" Type="1">U3ViamVjdDogTmV3IFVzZXIgQWNjb3VudCAiPGlucDI6dV9GaWVsZCBuYW1lPSJVc2VybmFtZSIvPiIgd2FzIEFwcHJvdmVkCgpVc2VyICI8aW5wMjp1X0ZpZWxkIG5hbWU9IlVzZXJuYW1lIi8+IiBoYXMgYmVlbiBhcHByb3ZlZC4=</EVENT>
<EVENT MessageType="html" Event="USER.DENY" Type="0">U3ViamVjdDogWW91ciBSZWdpc3RyYXRpb24gaGFzIGJlZW4gRGVuaWVkCgpZb3VyIHJlZ2lzdHJhdGlvbiBvbiA8YSBocmVmPSI8aW5wMjptX0Jhc2VVcmwvPiI+PGlucDI6bV9CYXNlVXJsLz48L2E+IHdlYnNpdGUgaGFzIGJlZW4gZGVuaWVkLg==</EVENT>
- <EVENT MessageType="html" Event="USER.DENY" Type="1">U3ViamVjdDogVXNlciBSZWdpc3RyYXRpb24gZm9yICAiPGlucDI6dV9GaWVsZCBuYW1lPSJMb2dpbiIvPiIgaGFzIGJlZW4gRGVuaWVkCgpVc2VyICI8aW5wMjp1X0ZpZWxkIG5hbWU9IkxvZ2luIi8+IiBoYXMgYmVlbiBkZW5pZWQu</EVENT>
+ <EVENT MessageType="html" Event="USER.DENY" Type="1">U3ViamVjdDogVXNlciBSZWdpc3RyYXRpb24gZm9yICAiPGlucDI6dV9GaWVsZCBuYW1lPSJVc2VybmFtZSIvPiIgaGFzIGJlZW4gRGVuaWVkCgpVc2VyICI8aW5wMjp1X0ZpZWxkIG5hbWU9IlVzZXJuYW1lIi8+IiBoYXMgYmVlbiBkZW5pZWQu</EVENT>
<EVENT MessageType="html" Event="USER.MEMBERSHIP.EXPIRATION.NOTICE" Type="0">U3ViamVjdDogTWVtYmVyc2hpcCBFeHBpcmF0aW9uIE5vdGljZQoKWW91ciBtZW1iZXJzaGlwIG9uIDxpbnAyOm1fQmFzZVVybC8+IHdlYnNpdGUgd2lsbCBzb29uIGV4cGlyZS4=</EVENT>
- <EVENT MessageType="html" Event="USER.MEMBERSHIP.EXPIRATION.NOTICE" Type="1">U3ViamVjdDogTWVtYmVyc2hpcCBFeHBpcmF0aW9uIE5vdGljZSBmb3IgIjxpbnAyOnVfRmllbGQgbmFtZT0iTG9naW4iLz4iIFNlbnQKClVzZXIgPGlucDI6dV9GaWVsZCBuYW1lPSJMb2dpbiIvPiBtZW1iZXJzaGlwIHdpbGwgZXhwaXJlIHNvb24u</EVENT>
+ <EVENT MessageType="html" Event="USER.MEMBERSHIP.EXPIRATION.NOTICE" Type="1">U3ViamVjdDogTWVtYmVyc2hpcCBFeHBpcmF0aW9uIE5vdGljZSBmb3IgIjxpbnAyOnVfRmllbGQgbmFtZT0iVXNlcm5hbWUiLz4iIFNlbnQKClVzZXIgPGlucDI6dV9GaWVsZCBuYW1lPSJVc2VybmFtZSIvPiBtZW1iZXJzaGlwIHdpbGwgZXhwaXJlIHNvb24u</EVENT>
<EVENT MessageType="html" Event="USER.MEMBERSHIP.EXPIRED" Type="0">U3ViamVjdDogWW91ciBNZW1iZXJzaGlwIEV4cGlyZWQKCllvdXIgbWVtYmVyc2hpcCBvbiA8aW5wMjptX0Jhc2VVcmwvPiB3ZWJzaXRlIGhhcyBleHBpcmVkLg==</EVENT>
- <EVENT MessageType="html" Event="USER.MEMBERSHIP.EXPIRED" Type="1">U3ViamVjdDogVXNlcidzIE1lbWJlcnNoaXAgRXhwaXJlZCAgKCA8aW5wMjp1X0ZpZWxkIG5hbWU9IkxvZ2luIi8+KQoKVXNlcidzICg8aW5wMjp1X0ZpZWxkIG5hbWU9IkxvZ2luIi8+KSBtZW1iZXJzaGlwIG9uIDxpbnAyOm1fQmFzZVVybC8+IHdlYnNpdGUgaGFzIGV4cGlyZWQu</EVENT>
- <EVENT MessageType="text" Event="USER.NEW.PASSWORD" Type="0">U3ViamVjdDogTmV3IHBhc3N3b3JkIGdlbmVyYXRlZAoKRGVhciA8aW5wMjp1X0ZpZWxkIG5hbWU9IkZpcnN0TmFtZSIvPiwNCg0KQSBuZXcgcGFzc3dvcmQgaGFzIGJlZW4gZ2VuZXJhdGVkIGZvciB5b3VyIHVzZXIuDQoNCk5vdyB5b3UgY2FuIGxvZ2luIHVzaW5nIHRoZSBmb2xsb3dpbmcgY3JlZGVudGlhbHM6DQoNCjxpbnAyOm1faWYgY2hlY2s9InVfRmllbGQiIG5hbWU9IkxvZ2luIj5Vc2VybmFtZTogPGlucDI6dV9GaWVsZCBuYW1lPSJMb2dpbiIvPjxpbnAyOm1fZWxzZS8+RS1tYWlsOiA8aW5wMjp1X0ZpZWxkIG5hbWU9IkVtYWlsIi8+PC9pbnAyOm1faWY+IA0KUGFzc3dvcmQ6IDxpbnAyOnVfRmllbGQgbmFtZT0iUGFzc3dvcmRfcGxhaW4iLz4g</EVENT>
+ <EVENT MessageType="html" Event="USER.MEMBERSHIP.EXPIRED" Type="1">U3ViamVjdDogVXNlcidzIE1lbWJlcnNoaXAgRXhwaXJlZCAgKCA8aW5wMjp1X0ZpZWxkIG5hbWU9IlVzZXJuYW1lIi8+KQoKVXNlcidzICg8aW5wMjp1X0ZpZWxkIG5hbWU9IlVzZXJuYW1lIi8+KSBtZW1iZXJzaGlwIG9uIDxpbnAyOm1fQmFzZVVybC8+IHdlYnNpdGUgaGFzIGV4cGlyZWQu</EVENT>
+ <EVENT MessageType="text" Event="USER.NEW.PASSWORD" Type="0">U3ViamVjdDogTmV3IHBhc3N3b3JkIGdlbmVyYXRlZAoKRGVhciA8aW5wMjp1X0ZpZWxkIG5hbWU9IkZpcnN0TmFtZSIvPiwNCg0KQSBuZXcgcGFzc3dvcmQgaGFzIGJlZW4gZ2VuZXJhdGVkIGZvciB5b3VyIHVzZXIuDQoNCk5vdyB5b3UgY2FuIGxvZ2luIHVzaW5nIHRoZSBmb2xsb3dpbmcgY3JlZGVudGlhbHM6DQoNCjxpbnAyOm1faWYgY2hlY2s9InVfRmllbGQiIG5hbWU9IlVzZXJuYW1lIj5Vc2VybmFtZTogPGlucDI6dV9GaWVsZCBuYW1lPSJVc2VybmFtZSIvPjxpbnAyOm1fZWxzZS8+RS1tYWlsOiA8aW5wMjp1X0ZpZWxkIG5hbWU9IkVtYWlsIi8+PC9pbnAyOm1faWY+IA0KUGFzc3dvcmQ6IDxpbnAyOnVfRmllbGQgbmFtZT0iUGFzc3dvcmRfcGxhaW4iLz4g</EVENT>
<EVENT MessageType="html" Event="USER.PSWDC" Type="0">U3ViamVjdDogUmVzZXQgUGFzc3dvcmQgQ29uZmlybWF0aW9uCgpIZWxsbyw8YnIvPjxici8+DQoNCkl0IHNlZW1zIHRoYXQgeW91IGhhdmUgcmVxdWVzdGVkIGEgcGFzc3dvcmQgcmVzZXQgZm9yIHlvdXIgSW4tcG9ydGFsIGFjY291bnQuIElmIHlvdSB3b3VsZCBsaWtlIHRvIHByb2NlZWQgYW5kIGNoYW5nZSB0aGUgcGFzc3dvcmQsIHBsZWFzZSBjbGljayBvbiB0aGUgbGluayBiZWxvdzo8YnIvPjxici8+DQoNCjxhIGhyZWY9IjxpbnAyOnVfQ29uZmlybVBhc3N3b3JkTGluayBub19hbXA9IjEiLz4iPjxpbnAyOnVfQ29uZmlybVBhc3N3b3JkTGluayBub19hbXA9IjEiLz48L2E+PGJyLz48YnIvPg0KDQpZb3Ugd2lsbCByZWNlaXZlIGEgc2Vjb25kIGVtYWlsIHdpdGggeW91ciBuZXcgcGFzc3dvcmQgc2hvcnRseS48YnIvPjxici8+DQoNCklmIHlvdSBiZWxpZXZlIHlvdSBoYXZlIHJlY2VpdmVkIHRoaXMgZW1haWwgaW4gZXJyb3IsIHBsZWFzZSBpZ25vcmUgdGhpcyBlbWFpbC4gWW91ciBwYXNzd29yZCB3aWxsIG5vdCBiZSBjaGFuZ2VkIHVubGVzcyB5b3UgaGF2ZSBjbGlja2VkIG9uIHRoZSBhYm92ZSBsaW5rLg0K</EVENT>
<EVENT MessageType="html" Event="USER.SUBSCRIBE" Type="0">U3ViamVjdDogU3Vic2NyaWJlZCB0byBhIE1haWxpbmcgTGlzdCBvbiA8aW5wMjptX0Jhc2VVcmwvPgoKWW91IGhhdmUgc3Vic2NyaWJlZCB0byBhIG1haWxpbmcgbGlzdCBvbiA8aW5wMjptX0Jhc2VVcmwvPiB3ZWJzaXRlLg==</EVENT>
<EVENT MessageType="html" Event="USER.SUBSCRIBE" Type="1">U3ViamVjdDogTmV3IFVzZXIgaGFzIFN1YnNjcmliZWQgdG8gYSBNYWxsaW5nIExpc3QKCk5ldyB1c2VyIDxpbnAyOnVfRmllbGQgbmFtZT0iRW1haWwiLz4gaGFzIHN1YnNjcmliZWQgdG8gYSBtYWlsaW5nIGxpc3Qgb24gPGEgaHJlZj0iPGlucDI6bV9CYXNlVXJsLz4iPjxpbnAyOm1fQmFzZVVybC8+PC9hPiB3ZWJzaXRlLg==</EVENT>
@@ -1557,9 +1558,8 @@
<EVENT MessageType="html" Event="USER.SUGGEST" Type="1">U3ViamVjdDogV2Vic2l0ZSBTdWdnZXN0ZWQgdG8gYSBGcmllbmQKCkEgdmlzaXRvciBzdWdnZXN0ZWQgPGEgaHJlZj0iPGlucDI6bV9CYXNlVXJsLz4iPjxpbnAyOm1fQmFzZVVybC8+PC9hPiB3ZWJzaXRlIHRvIGEgZnJpZW5kLg==</EVENT>
<EVENT MessageType="html" Event="USER.UNSUBSCRIBE" Type="0">U3ViamVjdDogWW91IGhhdmUgYmVlbiB1bnN1YnNjcmliZWQKCllvdSBoYXZlIHN1Y2Nlc3NmdWxseSB1bnN1YnNjcmliZWQgZnJvbSB0aGUgbWFpbGluZyBsaXN0IG9uIDxhIGhyZWY9IjxpbnAyOm1fQmFzZVVybCAvPiI+PGlucDI6bV9CYXNlVXJsIC8+PC9hPiB3ZWJzaXRlLg==</EVENT>
<EVENT MessageType="html" Event="USER.UNSUBSCRIBE" Type="1">U3ViamVjdDogVXNlciBVbnN1YnNyaWJlZCBmcm9tIE1haWxpbmcgTGlzdAoKQSB1c2VyICI8aW5wMjp1X0ZpZWxkIG5hbWU9IkVtYWlsIi8+IiBoYXMgdW5zdWJzY3JpYmVkIGZyb20gdGhlIG1haWxpbmcgbGlzdCBvbiA8YSBocmVmPSI8aW5wMjptX0Jhc2VVcmwvPiI+PGlucDI6bV9CYXNlVXJsLz48L2E+Lg==</EVENT>
- <EVENT MessageType="html" Event="USER.VALIDATE" Type="0">U3ViamVjdDogVXNlciBSZWdpc3RyYXRpb24gaXMgVmFsaWRhdGVkCgpXZWxjb21lIHRvIEluLXBvcnRhbCE8YnIvPjxici8+DQoNCllvdXIgdXNlciByZWdpc3RyYXRpb24gaGFzIGJlZW4gYXBwcm92ZWQuIFlvdSBjYW4gbG9naW4gbm93IDxhIGhyZWY9IjxpbnAyOm1fQmFzZVVybC8+Ij48aW5wMjptX0Jhc2VVcmwvPjwvYT4gdXNpbmcgdGhlIGZvbGxvd2luZyBpbmZvcm1hdGlvbjo8YnIvPjxici8+DQoNCj09PT09PT09PT09PT09PT09PTxici8+DQpVc2VybmFtZTogIjxpbnAyOnVfRmllbGQgbmFtZT0iTG9naW4iLz4iPGJyLz4NClBhc3N3b3JkOiAiPGlucDI6dV9GaWVsZCBuYW1lPSJQYXNzd29yZF9wbGFpbiIvPiI8YnIvPg0KPT09PT09PT09PT09PT09PT09PGJyLz48YnIvPg0K</EVENT>
- <EVENT MessageType="html" Event="USER.VALIDATE" Type="1">U3ViamVjdDogTmV3IFVzZXIgUmVnaXN0cmF0aW9uIGlzIFZhbGlkYXRlZAoKVXNlciAiPGlucDI6dV9GaWVsZCBuYW1lPSJMb2dpbiIvPiIgaGFzIGJlZW4gdmFsaWRhdGVkLg==</EVENT>
- <EVENT MessageType="html" Event="ROOT.RESET.PASSWORD" Type="1">U3ViamVjdDogUm9vdCBSZXNldCBQYXNzd29yZAoKWW91ciBuZXcgcGFzc3dvcmQgaXM6IDxpbnAyOm1fUGFyYW0gbmFtZT0icGFzc3dvcmQiLz4=</EVENT>
+ <EVENT MessageType="html" Event="USER.VALIDATE" Type="0">U3ViamVjdDogVXNlciBSZWdpc3RyYXRpb24gaXMgVmFsaWRhdGVkCgpXZWxjb21lIHRvIEluLXBvcnRhbCE8YnIvPjxici8+DQoNCllvdXIgdXNlciByZWdpc3RyYXRpb24gaGFzIGJlZW4gYXBwcm92ZWQuIFlvdSBjYW4gbG9naW4gbm93IDxhIGhyZWY9IjxpbnAyOm1fQmFzZVVybC8+Ij48aW5wMjptX0Jhc2VVcmwvPjwvYT4gdXNpbmcgdGhlIGZvbGxvd2luZyBpbmZvcm1hdGlvbjo8YnIvPjxici8+DQoNCj09PT09PT09PT09PT09PT09PTxici8+DQpVc2VybmFtZTogIjxpbnAyOnVfRmllbGQgbmFtZT0iVXNlcm5hbWUiLz4iPGJyLz4NClBhc3N3b3JkOiAiPGlucDI6dV9GaWVsZCBuYW1lPSJQYXNzd29yZF9wbGFpbiIvPiI8YnIvPg0KPT09PT09PT09PT09PT09PT09PGJyLz48YnIvPg0K</EVENT>
+ <EVENT MessageType="html" Event="USER.VALIDATE" Type="1">U3ViamVjdDogTmV3IFVzZXIgUmVnaXN0cmF0aW9uIGlzIFZhbGlkYXRlZAoKVXNlciAiPGlucDI6dV9GaWVsZCBuYW1lPSJVc2VybmFtZSIvPiIgaGFzIGJlZW4gdmFsaWRhdGVkLg==</EVENT>
</EVENTS>
<COUNTRIES>
<COUNTRY Iso="ABW" Translation="QXJ1YmE="/>
Index: core/install/install_data.sql
===================================================================
--- core/install/install_data.sql (revision 14705)
+++ core/install/install_data.sql (working copy)
@@ -133,7 +133,7 @@
INSERT INTO ConfigurationValues VALUES(DEFAULT, 'CategoriesRebuildSerial', '0', 'In-Portal', '', '', '', '', NULL, NULL, 0, 0, 0, NULL);
INSERT INTO ItemTypes VALUES (1, 'In-Portal', 'c', 'Category', 'Name', 'CreatedById', NULL, NULL, 'la_ItemTab_Categories', 1, 'admin/category/addcategory.php', 'clsCategory', 'Category');
-INSERT INTO ItemTypes VALUES (6, 'In-Portal', 'u', 'PortalUser', 'Login', 'PortalUserId', NULL, NULL, '', 0, '', 'clsPortalUser', 'User');
+INSERT INTO ItemTypes VALUES (6, 'In-Portal', 'u', 'PortalUser', 'Username', 'PortalUserId', NULL, NULL, '', 0, '', 'clsPortalUser', 'User');
INSERT INTO Events (EventId, Event, ReplacementTags, Enabled, FrontEndOnly, Module, Description, Type, AllowChangingSender, AllowChangingRecipient) VALUES(DEFAULT, 'USER.ADD', NULL, 1, 0, 'Core', 'Add User', 0, 1, 1);
INSERT INTO Events (EventId, Event, ReplacementTags, Enabled, FrontEndOnly, Module, Description, Type, AllowChangingSender, AllowChangingRecipient) VALUES(DEFAULT, 'USER.ADD', NULL, 1, 1, 'Core', 'Add User', 1, 1, 1);
@@ -926,7 +926,7 @@
INSERT INTO SearchConfig VALUES ('Category', 'ModifiedById', 0, 1, 'lu_fielddesc_category_modifiedbyid', 'lu_field_modifiedbyid', 'In-Portal', 'la_text_category', 21, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
INSERT INTO SearchConfig VALUES ('PortalUser', 'PortalUserId', -1, 0, 'lu_fielddesc_user_portaluserid', 'lu_field_portaluserid', 'In-Portal', 'la_text_user', 0, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO SearchConfig VALUES ('PortalUser', 'Login', -1, 0, 'lu_fielddesc_user_login', 'lu_field_login', 'In-Portal', 'la_text_user', 1, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO SearchConfig VALUES ('PortalUser', 'Username', -1, 0, 'lu_fielddesc_user_login', 'lu_field_login', 'In-Portal', 'la_text_user', 1, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
INSERT INTO SearchConfig VALUES ('PortalUser', 'Password', -1, 0, 'lu_fielddesc_user_password', 'lu_field_password', 'In-Portal', 'la_text_user', 2, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
INSERT INTO SearchConfig VALUES ('PortalUser', 'tz', -1, 0, 'lu_fielddesc_user_tz', 'lu_field_tz', 'In-Portal', 'la_text_user', 17, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
INSERT INTO SearchConfig VALUES ('PortalUser', 'dob', -1, 0, 'lu_fielddesc_user_dob', 'lu_field_dob', 'In-Portal', 'la_text_user', 16, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
Index: core/install/install_schema.sql
===================================================================
--- core/install/install_schema.sql (revision 14705)
+++ core/install/install_schema.sql (working copy)
@@ -243,7 +243,7 @@
CREATE TABLE PortalUser (
PortalUserId int(11) NOT NULL AUTO_INCREMENT,
- Login varchar(255) NOT NULL,
+ Username varchar(255) NOT NULL,
`Password` varchar(255) DEFAULT 'd41d8cd98f00b204e9800998ecf8427e',
FirstName varchar(255) NOT NULL DEFAULT '',
LastName varchar(255) NOT NULL DEFAULT '',
@@ -282,7 +282,7 @@
KEY IsBanned (IsBanned),
KEY AdminLanguage (AdminLanguage),
KEY UserType (UserType),
- KEY Login (Login)
+ KEY Username (Username)
);
CREATE TABLE PortalUserCustomData (
Index: core/install/step_templates/download_license.tpl
===================================================================
--- core/install/step_templates/download_license.tpl (revision 14705)
+++ core/install/step_templates/download_license.tpl (working copy)
@@ -1,5 +1,5 @@
<tr class="table-color2">
- <td class="text"><strong>Login / E-mail:</strong></td>
+ <td class="text"><strong>Username / E-mail:</strong></td>
<td class="txt">
<input type="text" class="text" name="login" value="<?php echo $this->GetVar('login'); ?>">
</td>
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 (
'<inp:touser _Field="password"' => '<inp2:u_Field name="Password_plain"',
- '<inp:touser _Field="UserName"' => '<inp2:u_Field name="Login"',
+ '<inp:touser _Field="UserName"' => '<inp2:u_Field name="Username"',
'<inp:touser _Field' => '<inp2:u_Field name',
);
@@ -1000,7 +1000,7 @@
case EmailEvent::ADDRESS_TYPE_USER:
$sql = 'SELECT PortalUserId
FROM ' . TABLE_PREFIX . 'PortalUser
- WHERE Login = ' . $this->Conn->qstr($address);
+ WHERE Username = ' . $this->Conn->qstr($address);
if (!$this->Conn->GetOne($sql)) {
$object->SetError($field_prefix . 'Address', 'invalid_user');
}
@@ -1069,7 +1069,7 @@
break;
case EmailEvent::ADDRESS_TYPE_USER:
- $field = 'Login';
+ $field = 'Username';
$table_name = TABLE_PREFIX . 'PortalUser';
break;
Index: core/units/helpers/user_helper.php
===================================================================
--- core/units/helpers/user_helper.php (revision 14705)
+++ core/units/helpers/user_helper.php (working copy)
@@ -69,7 +69,7 @@
$user_id = USER_ROOT;
$object->Clear($user_id);
- $object->SetDBField('Login', 'root');
+ $object->SetDBField('Username', 'root');
if (!$dry_run) {
$this->loginUserById($user_id, $remember_login_cookie);
@@ -146,7 +146,7 @@
}
/**
- * Login username by it's PortalUserId
+ * Login user by it's id
*
* @param int $user_id
* @param bool $remember_login_cookie
@@ -323,7 +323,7 @@
$sql = 'SELECT PortalUserId
FROM ' . TABLE_PREFIX . 'PortalUser
- WHERE (Email = %1$s OR Login = %1$s) AND (Password = %2$s)';
+ WHERE (Email = %1$s OR Username = %1$s) AND (Password = %2$s)';
return $this->Conn->GetOne( sprintf($sql, $this->Conn->qstr($username), $this->Conn->qstr($password) ) );
}
Index: core/units/logs/change_logs/change_logs_config.php
===================================================================
--- core/units/logs/change_logs/change_logs_config.php (revision 14705)
+++ core/units/logs/change_logs/change_logs_config.php (working copy)
@@ -88,7 +88,7 @@
'CalculatedFields' => Array (
'' => Array (
- 'UserLogin' => 'IF(%1$s.PortalUserId = ' . USER_ROOT . ', \'root\', u.Login)',
+ 'UserLogin' => 'IF(%1$s.PortalUserId = ' . USER_ROOT . ', \'root\', u.Username)',
'UserFirstName' => 'u.FirstName',
'UserLastName' => 'u.LastName',
'UserEmail' => 'u.Email',
Index: core/units/logs/session_logs/session_logs_config.php
===================================================================
--- core/units/logs/session_logs/session_logs_config.php (revision 14705)
+++ core/units/logs/session_logs/session_logs_config.php (working copy)
@@ -99,7 +99,7 @@
'CalculatedFields' => Array(
'' => Array(
- 'UserLogin' => 'IF(%1$s.PortalUserId = ' . USER_ROOT . ', \'root\', u.Login)',
+ 'UserLogin' => 'IF(%1$s.PortalUserId = ' . USER_ROOT . ', \'root\', u.Username)',
'UserFirstName' => 'u.FirstName',
'UserLastName' => 'u.LastName',
'UserEmail' => 'u.Email',
Index: core/units/mailing_lists/mailing_lists_config.php
===================================================================
--- core/units/mailing_lists/mailing_lists_config.php (revision 14705)
+++ core/units/mailing_lists/mailing_lists_config.php (working copy)
@@ -98,7 +98,7 @@
'type' => 'int',
'formatter' => 'kLEFTFormatter',
'options' => Array (USER_ROOT => 'root'),
- 'left_sql' => 'SELECT %s FROM ' . TABLE_PREFIX . 'PortalUser WHERE `%s` = \'%s\'', 'left_key_field' => 'PortalUserId', 'left_title_field' => 'Login',
+ 'left_sql' => 'SELECT %s FROM ' . TABLE_PREFIX . 'PortalUser WHERE `%s` = \'%s\'', 'left_key_field' => 'PortalUserId', 'left_title_field' => 'Username',
'required' => 1, 'not_null' => 1, 'default' => USER_ROOT,
),
Index: core/units/reviews/reviews_config.php
===================================================================
--- core/units/reviews/reviews_config.php (revision 14705)
+++ core/units/reviews/reviews_config.php (working copy)
@@ -58,17 +58,17 @@
'CalculatedFields' => Array (
'' => Array (
- 'ReviewedBy' => 'IF( ISNULL(pu.Login), IF (%1$s.CreatedById = ' . USER_ROOT . ', \'root\', IF (%1$s.CreatedById = ' . USER_GUEST . ', \'Guest\', \'n/a\')), pu.Login )',
+ 'ReviewedBy' => 'IF( ISNULL(pu.Username), IF (%1$s.CreatedById = ' . USER_ROOT . ', \'root\', IF (%1$s.CreatedById = ' . USER_GUEST . ', \'Guest\', \'n/a\')), pu.Username )',
),
'products' => Array (
- 'ReviewedBy' => 'IF( ISNULL(pu.Login), IF (%1$s.CreatedById = ' . USER_ROOT . ', \'root\', IF (%1$s.CreatedById = ' . USER_GUEST . ', \'Guest\', \'n/a\')), pu.Login )',
+ 'ReviewedBy' => 'IF( ISNULL(pu.Username), IF (%1$s.CreatedById = ' . USER_ROOT . ', \'root\', IF (%1$s.CreatedById = ' . USER_GUEST . ', \'Guest\', \'n/a\')), pu.Username )',
'ItemName' => 'pr.l1_Name',
'ProductId' => 'pr.ProductId',
),
'product' => Array (
- 'ReviewedBy' => 'IF( ISNULL(pu.Login), IF (%1$s.CreatedById = ' . USER_ROOT . ', \'root\', IF (%1$s.CreatedById = ' . USER_GUEST . ', \'Guest\', \'n/a\')), pu.Login )',
+ 'ReviewedBy' => 'IF( ISNULL(pu.Username), IF (%1$s.CreatedById = ' . USER_ROOT . ', \'root\', IF (%1$s.CreatedById = ' . USER_GUEST . ', \'Guest\', \'n/a\')), pu.Username )',
'ItemName' => 'pr.l1_Name',
'ProductId' => 'pr.ProductId',
),
@@ -139,7 +139,7 @@
'left_sql' => 'SELECT %s FROM ' . TABLE_PREFIX . 'PortalUser
WHERE `%s` = \'%s\' ',
'left_key_field' => 'PortalUserId',
- 'left_title_field' => 'Login',
+ 'left_title_field' => 'Username',
'required' => 1, 'default' => NULL,
'error_msgs' => Array ('invalid_option' => '!la_error_UserNotFound!'),
),
Index: core/units/statistics/statistics_config.php
===================================================================
--- core/units/statistics/statistics_config.php (revision 14705)
+++ core/units/statistics/statistics_config.php (working copy)
@@ -68,7 +68,7 @@
'Default' => Array(
'Icons' => Array('default' => 'icon16_item.png'),
'Fields' => Array(
- 'Login' => Array('title' => 'column:la_fld_Username', 'data_block' => 'grid_checkbox_td'),
+ 'Username' => Array('data_block' => 'grid_checkbox_td'),
'LastName' => Array(),
'FirstName' => Array(),
),
Index: core/units/structure/structure_config.php
===================================================================
--- core/units/structure/structure_config.php (revision 14705)
+++ core/units/structure/structure_config.php (working copy)
@@ -140,7 +140,7 @@
'MetaKeywords' => Array('type' => 'string', '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', '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', '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),
@@ -151,7 +151,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', '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', '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/user_groups/user_groups_config.php
===================================================================
--- core/units/user_groups/user_groups_config.php (revision 14705)
+++ core/units/user_groups/user_groups_config.php (working copy)
@@ -37,7 +37,7 @@
'CalculatedFields' => Array (
'' => Array(
'UserName' => 'CONCAT(u.LastName, \' \', u.FirstName)',
- 'UserLogin' => 'u.Login',
+ 'UserLogin' => 'u.Username',
'PrimaryGroup' => 'IF(u.PrimaryGroupId = %1$s.GroupId, 1, 0)',
),
),
@@ -51,7 +51,7 @@
'Fields' => Array(
'PortalUserId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
'UserName' => Array ('title'=>'la_col_UserFirstLastName', 'width' => 200, ),
- 'UserLogin' => Array ('title'=>'column:la_fld_Login', 'width' => 100, ),
+ 'UserLogin' => Array ('title'=>'column:la_fld_Username', 'width' => 100, ),
'PrimaryGroup' => Array( 'title'=>'la_col_PrimaryGroup', 'filter_block' => 'grid_options_filter', 'width' => 100, ),
'MembershipExpires' => Array ('title' => 'la_col_MembershipExpires', 'data_block' => 'grid_membership_td', 'filter_block' => 'grid_date_range_filter', 'width' => 150, ),
),
Index: core/units/users/users_config.php
===================================================================
--- core/units/users/users_config.php (revision 14705)
+++ core/units/users/users_config.php (working copy)
@@ -101,7 +101,7 @@
'StatusField' => Array('Status'),
- 'TitleField' => 'Login',
+ 'TitleField' => 'Username',
'ItemType' => 6, // used for custom fields only (on user's case)
@@ -294,7 +294,7 @@
'ListSortings' => Array (
'' => Array (
- 'Sorting' => Array ('Login' => 'asc'),
+ 'Sorting' => Array ('Username' => 'asc'),
)
),
@@ -335,7 +335,7 @@
'default' => Array (
'Fields' => Array (
'PortalUserId' => Array ('default' => 0),
- 'Login' => Array (
+ 'Username' => Array (
'max_len' => 255,
'formatter' => 'kFormatter', 'regexp' => '/^[A-Z\d_\-\.]+$/i',
'error_msgs' => Array(
@@ -512,7 +512,7 @@
'Fields' => Array (
'PortalUserId' => Array ('type' => 'int', 'not_null' => 1),
- 'Login' => Array ('type' => 'string', 'not_null' => 1),
+ 'Username' => Array ('type' => 'string', 'not_null' => 1),
'Password' => Array ('type' => 'string', 'skip_empty' => 1),
'FirstName' => Array ('type' => 'string', 'not_null' => 1),
'LastName' => Array ('type' => 'string', 'not_null' => 1),
@@ -569,7 +569,7 @@
2 => 'icon16_user_pending.png'
),
'Fields' => Array(
- 'Login' => Array ('title' => 'column:la_fld_Username', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_like_filter'),
+ 'Username' => Array ('data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_like_filter'),
'LastName' => Array ('filter_block' => 'grid_like_filter'),
'FirstName' => Array ('filter_block' => 'grid_like_filter'),
'Email' => Array ('filter_block' => 'grid_like_filter'),
@@ -589,7 +589,7 @@
),
'Selector' => 'radio',
'Fields' => Array(
- 'Login' => Array ('title' => 'column:la_fld_Username', 'data_block' => 'grid_login_td', 'filter_block' => 'grid_like_filter', 'width' => 150, ),
+ 'Username' => Array ('data_block' => 'grid_login_td', 'filter_block' => 'grid_like_filter', 'width' => 150, ),
'FirstName' => Array ('filter_block' => 'grid_like_filter', 'width' => 150, ),
'LastName' => Array ('filter_block' => 'grid_like_filter', 'width' => 150, ),
'Email' => Array ('filter_block' => 'grid_like_filter', 'width' => 200, ),
@@ -609,7 +609,7 @@
),
'Fields' => Array (
'PortalUserId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 70),
- 'Login' => Array ('title' => 'column:la_fld_Username', 'filter_block' => 'grid_like_filter', 'width' => 150, ),
+ 'Username' => Array ('filter_block' => 'grid_like_filter', 'width' => 150, ),
'FirstName' => Array ('filter_block' => 'grid_like_filter', 'width' => 150, ),
'LastName' => Array ('filter_block' => 'grid_like_filter', 'width' => 150, ),
'Email' => Array ('filter_block' => 'grid_like_filter', 'width' => 200, ),
@@ -626,7 +626,7 @@
),
'Fields' => Array(
'PortalUserId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 70),
- 'Login' => Array ('title' => 'column:la_fld_Username', 'filter_block' => 'grid_like_filter', 'width' => 150, ),
+ 'Username' => Array ('filter_block' => 'grid_like_filter', 'width' => 150, ),
'FirstName' => Array ('filter_block' => 'grid_like_filter', 'width' => 150, ),
'LastName' => Array ('filter_block' => 'grid_like_filter', 'width' => 150, ),
'Email' => Array ('filter_block' => 'grid_like_filter', 'width' => 200, ),
Index: core/units/users/users_event_handler.php
===================================================================
--- core/units/users/users_event_handler.php (revision 14719)
+++ core/units/users/users_event_handler.php (working copy)
@@ -482,7 +482,7 @@
/* @var $user_helper UserHelper */
if ( !$user_helper->checkBanRules($object) ) {
- $object->SetError('Login', 'banned');
+ $object->SetError('Username', 'banned');
}
$object->SetDBField('IPAddress', $_SERVER['REMOTE_ADDR']);
@@ -718,8 +718,8 @@
$object->generatePassword();
$object->SetDBField('Email', $user_email);
- if ( $object->isRequired('Login') ) {
- $object->SetDBField('Login', $user_email);
+ if ( $object->isRequired('Username') ) {
+ $object->SetDBField('Username', $user_email);
}
$object->SetDBField('Status', STATUS_ACTIVE); // make user subscriber Active by default
@@ -789,7 +789,7 @@
$email = $object->GetDBField('ForgotEmail');
if ( strlen($username) ) {
- $user_object->Load($username, 'Login');
+ $user_object->Load($username, 'Username');
}
elseif ( strlen($email) ) {
$user_object->Load($email, 'Email');
@@ -1422,8 +1422,8 @@
}
$max_username = $this->Application->ConfigValue('MaxUserName');
- $fields['Login']['min_len'] = $this->Application->ConfigValue('Min_UserName');
- $fields['Login']['max_len'] = $max_username ? $max_username : 255;
+ $fields['Username']['min_len'] = $this->Application->ConfigValue('Min_UserName');
+ $fields['Username']['max_len'] = $max_username ? $max_username : 255;
// 2. set default user registration group
$form_fields['PrimaryGroupId']['default'] = $this->Application->ConfigValue('User_NewGroup');
@@ -1458,8 +1458,8 @@
}
if ( !$this->Application->ConfigValue('Email_As_Login') ) {
- // Login becomes required only, when it's used in registration process
- $form_fields['Login']['required'] = 1;
+ // Username becomes required only, when it's used in registration process
+ $form_fields['Username']['required'] = 1;
}
$this->Application->setUnitOption($event->Prefix, 'Forms', $forms);
Index: core/units/users/users_tag_processor.php
===================================================================
--- core/units/users/users_tag_processor.php (revision 14705)
+++ core/units/users/users_tag_processor.php (working copy)
@@ -175,7 +175,7 @@
$object =& $this->getObject($params);
/* @var $object UsersItem */
- return $object->GetID() != USER_ROOT ? $object->GetDBField('Login') : 'root';
+ return $object->GetID() != USER_ROOT ? $object->GetDBField('Username') : 'root';
}
function CookieUsername($params)
Index: core/units/visits/visits_config.php
===================================================================
--- core/units/visits/visits_config.php (revision 14705)
+++ core/units/visits/visits_config.php (working copy)
@@ -85,11 +85,11 @@
'CalculatedFields' => Array (
'' => Array (
- 'UserName' => 'IF( ISNULL(u.Login), IF (%1$s.PortalUserId = ' . USER_ROOT . ', \'root\', IF (%1$s.PortalUserId = ' . USER_GUEST . ', \'Guest\', \'n/a\')), u.Login)',
+ 'UserName' => 'IF( ISNULL(u.Username), IF (%1$s.PortalUserId = ' . USER_ROOT . ', \'root\', IF (%1$s.PortalUserId = ' . USER_GUEST . ', \'Guest\', \'n/a\')), u.Username)',
),
'incommerce' => Array (
- 'UserName' => 'IF( ISNULL(u.Login), IF (%1$s.PortalUserId = ' . USER_ROOT . ', \'root\', IF (%1$s.PortalUserId = ' . USER_GUEST . ', \'Guest\', \'n/a\')), u.Login)',
- 'AffiliateUser' => 'IF( LENGTH(au.Login),au.Login,\'!la_None!\')',
+ 'UserName' => 'IF( ISNULL(u.Username), IF (%1$s.PortalUserId = ' . USER_ROOT . ', \'root\', IF (%1$s.PortalUserId = ' . USER_GUEST . ', \'Guest\', \'n/a\')), u.Username)',
+ 'AffiliateUser' => 'IF( LENGTH(au.Username),au.Username,\'!la_None!\')',
'AffiliatePortalUserId' => 'af.PortalUserId',
'OrderTotalAmount' => 'IF(ord.Status = 4, ord.SubTotal+ord.ShippingCost+ord.VAT, 0)',
'OrderAffiliateCommission' => 'IF(ord.Status = 4, ord.AffiliateCommission, 0)',
@@ -133,7 +133,7 @@
'VisitDate' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'custom_filter' => 'date_range', 'default' => NULL),
'Referer' => Array ('type' => 'string','not_null' => '1','default' => ''),
'IPAddress' => Array ('type' => 'string','not_null' => '1','default' => ''),
- 'AffiliateId' => Array ('type' => 'int','formatter' => 'kLEFTFormatter', 'error_msgs' => Array ('invalid_option' => '!la_error_UserNotFound!'), 'options' => Array (0 => 'lu_None'), 'left_sql' => 'SELECT %s FROM '.TABLE_PREFIX.'Affiliates af LEFT JOIN '.TABLE_PREFIX.'PortalUser pu ON pu.PortalUserId = af.PortalUserId WHERE `%s` = \'%s\'','left_key_field' => 'AffiliateId','left_title_field' => 'Login','not_null'=>1,'default'=>0),
+ 'AffiliateId' => Array ('type' => 'int','formatter' => 'kLEFTFormatter', 'error_msgs' => Array ('invalid_option' => '!la_error_UserNotFound!'), 'options' => Array (0 => 'lu_None'), 'left_sql' => 'SELECT %s FROM '.TABLE_PREFIX.'Affiliates af LEFT JOIN '.TABLE_PREFIX.'PortalUser pu ON pu.PortalUserId = af.PortalUserId WHERE `%s` = \'%s\'','left_key_field' => 'AffiliateId','left_title_field' => 'Username','not_null'=>1,'default'=>0),
'PortalUserId' => Array ('type' => 'int','not_null' => '1','default' => USER_GUEST),
),
Index: tools/run_event.php
===================================================================
--- tools/run_event.php (revision 14705)
+++ tools/run_event.php (working copy)
@@ -14,7 +14,7 @@
die('Restrictred use!');
-$start = getmicrotime();
+$start = microtime(true);
define('CRON', 1);
define('ADMIN', 1);
@@ -40,10 +40,4 @@
$application->Done();
-$end = getmicrotime();
-
-function getmicrotime()
-{
- list($usec, $sec) = explode(" ", microtime());
- return ((float)$usec + (float)$sec);
-}
+$end = microtime(true);
\ No newline at end of file
login_to_username_modules.patch [^] (39,909 bytes) 2011-11-03 03:36
[Show Content]
Index: in-auction/install/english.lang
===================================================================
--- in-auction/install/english.lang (revision 14705)
+++ in-auction/install/english.lang (working copy)
@@ -275,8 +275,8 @@
</PHRASES>
<EVENTS>
<EVENT MessageType="html" Event="EBAYFEEDBACKNOTRECEIVED.NOTIFY" Type="0">U3ViamVjdDogRmVlZGJhY2sgbm90IHJlY2VpdmVkCgpIZWxsbywgPGlucDI6dS5pdGVtX0ZpZWxkIG5hbWU9IkViYXlMb2dpbiIgLz4hPGJyLz48YnIvPg0KDQpQbGVhc2Ugc2VuZCBmZWVkYmFjayBhYm91dCBlQmF5IEl0ZW0gIzxpbnAyOmwtZWJheS5pdGVtX0ZpZWxkIG5hbWU9ImVCYXlMaXN0aW5nSWQiLz48YnIvPjxici8+DQoNClByb2R1Y3QgSWQ6IDxpbnAyOnAuaXRlbV9GaWVsZCBuYW1lPSJQcm9kdWN0SWQiIC8+PGJyLz4NClByb2R1Y3QgTmFtZTogPGlucDI6cC5pdGVtX0ZpZWxkIG5hbWU9ImwxX05hbWUiIC8+PGJyLz4NClByb2R1Y3QgU0tVOiA8aW5wMjpwLml0ZW1fRmllbGQgbmFtZT0iU0tVIiAvPjxici8+DQoNCg==</EVENT>
- <EVENT MessageType="html" Event="EBAYNOTPAID.NOTIFY" Type="0">U3ViamVjdDogSXRlbSBpcyBOb3QgUGFpZCEKCkhlbGxvLCA8aW5wMjp1Lml0ZW1fRmllbGQgbmFtZT0iTG9naW4iIC8+ITxici8+PGJyLz4NCg0KZUJheSBJdGVtICM8aW5wMjptX1BhcmFtIG5hbWU9ImVCYXlMaXN0aW5nSWQiLz4gaW4gb3JkZXIgIzxpbnAyOm9yZC5pdGVtX0ZpZWxkIG5hbWU9Ik9yZGVyTnVtYmVyIi8+IGlzIG5vdCBwYWlkLjxici8+PGJyLz4NCg0KUGxlYXNlIGdvIHRvIHRoaXMgbGluayA8YSBocmVmPSI8aW5wMjptX1BhcmFtIG5hbWU9ImF1dG9sb2dpbl91cmwiLz4iPjxpbnAyOm1fUGFyYW0gbmFtZT0iYXV0b2xvZ2luX3VybCIvPjwvYT4gdG8gY29tcGxldGUgY2hlY2tvdXQuDQoNCg0K</EVENT>
- <EVENT MessageType="html" Event="EBAYNOTPAID.NOTIFY" Type="1">U3ViamVjdDogSXRlbSBub3QgcGFpZCBub3RpZmljYXRpb24gaXMgc2VudAoKSXRlbSBub3QgcGFpZCBub3RpZmljYXRpb24gaXMgc2VudCB0byB1c2VyIDxpbnAyOnUuaXRlbV9GaWVsZCBuYW1lPSJMb2dpbiIgLz4uPGJyLz48YnIvPg0KDQplQmF5IEl0ZW0gIzxpbnAyOm1fUGFyYW0gbmFtZT0iZUJheUxpc3RpbmdJZCIvPiBpbiBvcmRlciAjPGlucDI6b3JkLml0ZW1fRmllbGQgbmFtZT0iT3JkZXJOdW1iZXIiLz4gaXMgbm90IHBhaWQuDQo=</EVENT>
+ <EVENT MessageType="html" Event="EBAYNOTPAID.NOTIFY" Type="0">U3ViamVjdDogSXRlbSBpcyBOb3QgUGFpZCEKCkhlbGxvLCA8aW5wMjp1Lml0ZW1fRmllbGQgbmFtZT0iVXNlcm5hbWUiIC8+ITxici8+PGJyLz4NCg0KZUJheSBJdGVtICM8aW5wMjptX1BhcmFtIG5hbWU9ImVCYXlMaXN0aW5nSWQiLz4gaW4gb3JkZXIgIzxpbnAyOm9yZC5pdGVtX0ZpZWxkIG5hbWU9Ik9yZGVyTnVtYmVyIi8+IGlzIG5vdCBwYWlkLjxici8+PGJyLz4NCg0KUGxlYXNlIGdvIHRvIHRoaXMgbGluayA8YSBocmVmPSI8aW5wMjptX1BhcmFtIG5hbWU9ImF1dG9sb2dpbl91cmwiLz4iPjxpbnAyOm1fUGFyYW0gbmFtZT0iYXV0b2xvZ2luX3VybCIvPjwvYT4gdG8gY29tcGxldGUgY2hlY2tvdXQuDQoNCg0K</EVENT>
+ <EVENT MessageType="html" Event="EBAYNOTPAID.NOTIFY" Type="1">U3ViamVjdDogSXRlbSBub3QgcGFpZCBub3RpZmljYXRpb24gaXMgc2VudAoKSXRlbSBub3QgcGFpZCBub3RpZmljYXRpb24gaXMgc2VudCB0byB1c2VyIDxpbnAyOnUuaXRlbV9GaWVsZCBuYW1lPSJVc2VybmFtZSIgLz4uPGJyLz48YnIvPg0KDQplQmF5IEl0ZW0gIzxpbnAyOm1fUGFyYW0gbmFtZT0iZUJheUxpc3RpbmdJZCIvPiBpbiBvcmRlciAjPGlucDI6b3JkLml0ZW1fRmllbGQgbmFtZT0iT3JkZXJOdW1iZXIiLz4gaXMgbm90IHBhaWQuDQo=</EVENT>
<EVENT MessageType="html" Event="EBAYORDER.CREATE" Type="0">U3ViamVjdDogZUJheSBPcmRlciBDcmVhdGVkCgpIZWxsbywgPGlucDI6bV9QYXJhbSBuYW1lPSJ1c2VybmFtZSIgLz4hPGJyLz48YnIvPg0KDQplQmF5IG9yZGVyIG51bWJlciA8aW5wMjpvcmQuaXRlbV9GaWVsZCBuYW1lPSJPcmRlck51bWJlciIvPiBoYXMgYmVlbiBzdWNjZXNzZnVsbHkgY3JlYXRlZC48YnIvPjxici8+DQoNClBsZWFzZSBnbyB0byB0aGlzIGxpbmsgPGEgaHJlZj0iPGlucDI6bV9QYXJhbSBuYW1lPSJhdXRvbG9naW5fdXJsIi8+Ij48aW5wMjptX1BhcmFtIG5hbWU9ImF1dG9sb2dpbl91cmwiLz48L2E+IHRvIGNvbXBsZXRlIGNoZWNrb3V0Lg0KDQo=</EVENT>
</EVENTS>
</LANGUAGE>
Index: in-auction/units/listing/listing_config.php
===================================================================
--- in-auction/units/listing/listing_config.php (revision 14705)
+++ in-auction/units/listing/listing_config.php (working copy)
@@ -130,7 +130,7 @@
'ListingTitle' => 'IF(pl.ListingTitle IS NULL OR (pl.ListingTitle = ""), p.l1_Name, pl.ListingTitle)',
'SKU' => 'p.SKU',
'ListingDuration' => 'IF (%1$s.ListingType = '.EBAY_LISTING_TYPE_AUCTION.', %1$s.AuctionListingDuration, %1$s.StoreListingDuration)',
- 'WinnerLogin' => 'u.Login',
+ 'WinnerLogin' => 'u.Username',
'WinnerEmail' => 'u.Email',
),
Index: in-auction/units/sections/ebay_eh.php
===================================================================
--- in-auction/units/sections/ebay_eh.php (revision 14705)
+++ in-auction/units/sections/ebay_eh.php (working copy)
@@ -612,20 +612,19 @@
$User->SetDBField('ResourceId', '');
- // ensure unique Login
+ // ensure unique Username
$username = $Buyer->UserID;
- $sql = 'SELECT Login, SUBSTRING(Login, '.(strlen($username) + 1).') * 1 AS num
- FROM '.TABLE_PREFIX.'PortalUser
- WHERE Login LIKE '.($this->Conn->qstr($username.'%')).'
- ORDER BY num DESC
- ';
-
+ $sql = 'SELECT Username, SUBSTRING(Username, '.(strlen($username) + 1).') * 1 AS num
+ FROM '.TABLE_PREFIX.'PortalUser
+ WHERE Username LIKE '.($this->Conn->qstr($username.'%')).'
+ ORDER BY num DESC';
$a_logins = $this->Conn->Query($sql);
+
$new_login = count($a_logins) ? $username.$a_logins[0]['num'] : $username;
- $User->SetDBField('Login', $new_login);
+ $User->SetDBField('Username', $new_login);
$Address =& $Buyer->BuyerInfo->ShippingAddress;
@@ -1879,7 +1878,7 @@
$autologin_url = str_replace('/in-auction/', '/', $autologin_url);
$send_params = Array(
'autologin_url' => $autologin_url,
- 'username' => $User->GetDBField('Login'),
+ 'username' => $User->GetDBField('Username'),
);
$this->Application->EmailEvent('EBAYORDER.CREATE', 0, $User->GetID(), $send_params);
Index: in-bulletin/units/poll_comments/poll_comments_config.php
===================================================================
--- in-bulletin/units/poll_comments/poll_comments_config.php (revision 14705)
+++ in-bulletin/units/poll_comments/poll_comments_config.php (working copy)
@@ -63,7 +63,7 @@
'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',
+ 'left_key_field' => 'PortalUserId', 'left_title_field' => 'Username',
'required' => 1, 'default' => NULL),
'GuestName' => Array ('type' => 'string', 'max_len' => 255, 'not_null' => 1, 'default' => ''),
'GuestEmail' => Array('type' => 'string', 'max_len' => 255, 'formatter'=>'kFormatter', 'regexp'=>'/^(' . REGEX_EMAIL_USER . '@' . REGEX_EMAIL_DOMAIN . ')$/i', 'sample_value' => 'email@domain.com', 'not_null' => '1', 'default' => '', 'error_msgs' => Array('invalid_format'=>'!la_invalid_email!', 'unique'=>'!lu_email_already_exist!'),'required' => 0 ),
@@ -81,7 +81,7 @@
'CalculatedFields' => Array (
'' => Array (
- 'CommentedByUser' => 'IF( ISNULL(pu.Login), IF (%1$s.CreatedById = ' . USER_ROOT . ', \'root\', IF (%1$s.CreatedById = ' . USER_GUEST . ', \'Guest\', \'n/a\')), pu.Login )',
+ 'CommentedByUser' => 'IF( ISNULL(pu.Username), IF (%1$s.CreatedById = ' . USER_ROOT . ', \'root\', IF (%1$s.CreatedById = ' . USER_GUEST . ', \'Guest\', \'n/a\')), pu.Username )',
),
),
Index: in-bulletin/units/posts/post_eh.php
===================================================================
--- in-bulletin/units/posts/post_eh.php (revision 14705)
+++ in-bulletin/units/posts/post_eh.php (working copy)
@@ -61,7 +61,7 @@
$object->SetDBField('IPAddress', $_SERVER['REMOTE_ADDR']);
- $sql = 'SELECT Login
+ $sql = 'SELECT Username
FROM ' . TABLE_PREFIX . 'PortalUser
WHERE PortalUserId = ' . $user_id;
$object->SetDBField('PosterAlias', $this->Conn->GetOne($sql));
@@ -189,7 +189,7 @@
$options_map = $post_helper->getOptionsMap();
$post_options = $object->GetDBField('Options');
-
+
foreach ($options_map as $option_name => $field_name) {
$option_value = $post_helper->GetPostOption($option_name, $post_options);
$object->SetDBField($field_name, (int)$option_value);
@@ -251,7 +251,7 @@
// auto-lock topic after N number of posts (if option enabled)
$auto_lock = $this->Application->ConfigValue('AutoTopicLockPosts');
-
+
if ( (int)$auto_lock > 0 ) {
if ( $posts_count >= $auto_lock ) {
// user has unlocked topic after $auto_lock and posts again -> ensure that topic will be locked again
Index: in-bulletin/units/posts/posts_config.php
===================================================================
--- in-bulletin/units/posts/posts_config.php (revision 14705)
+++ in-bulletin/units/posts/posts_config.php (working copy)
@@ -64,7 +64,7 @@
'CalculatedFields' => Array (
'' => Array (
- 'UserName' => 'IF (ISNULL(u.Login), IF (%1$s.CreatedById = ' . USER_ROOT . ', "root", IF (%1$s.CreatedById = ' . USER_GUEST . ', "Guest", "n/a")), u.Login)',
+ 'UserName' => 'IF (ISNULL(u.Username), IF (%1$s.CreatedById = ' . USER_ROOT . ', "root", IF (%1$s.CreatedById = ' . USER_GUEST . ', "Guest", "n/a")), u.Username)',
'AltName' => 'img.AltName',
'SameImages' => 'img.SameImages',
@@ -87,8 +87,8 @@
'GraphicsUrl' => Array ('type' => 'string', 'max_len' => 255, 'default' => NULL),
'CreatedOn' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => '#NOW#'),
'Modified' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', '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' => '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' => '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),
+ '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),
'TopicId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
'ResourceId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
'ReplyTo' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
Index: in-bulletin/units/private_messages/private_messages_config.php
===================================================================
--- in-bulletin/units/private_messages/private_messages_config.php (revision 14705)
+++ in-bulletin/units/private_messages/private_messages_config.php (working copy)
@@ -76,8 +76,8 @@
'Body' => 'pmb.Body',
'Options' => 'pmb.Options',
- 'FromName' => 'IF (ISNULL(from_user.Login), IF (%1$s.FromId = ' . USER_ROOT . ', "root", IF (%1$s.FromId = ' . USER_GUEST . ', "Guest", "n/a")), from_user.Login)',
- 'ToName' => 'IF (ISNULL(to_user.Login), IF (%1$s.ToId = ' . USER_ROOT . ', "root", IF (%1$s.ToId = ' . USER_GUEST . ', "Guest", "n/a")), to_user.Login)',
+ 'FromName' => 'IF (ISNULL(from_user.Username), IF (%1$s.FromId = ' . USER_ROOT . ', "root", IF (%1$s.FromId = ' . USER_GUEST . ', "Guest", "n/a")), from_user.Username)',
+ 'ToName' => 'IF (ISNULL(to_user.Username), IF (%1$s.ToId = ' . USER_ROOT . ', "root", IF (%1$s.ToId = ' . USER_GUEST . ', "Guest", "n/a")), to_user.Username)',
'FromFullName' => 'TRIM(CONCAT(from_user.FirstName, " ", from_user.LastName))',
'ToFullName' => 'TRIM(CONCAT(to_user.FirstName, " ", to_user.LastName))',
@@ -86,8 +86,8 @@
'Fields' => Array (
'PmId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
- 'FromId' => Array('type' => 'int', 'formatter' => 'kLEFTFormatter', 'error_msgs' => Array ('invalid_option' => '!lu_error_UserNotFound!'), 'left_sql' => 'SELECT %s FROM '.TABLE_PREFIX.'PortalUser WHERE `%s` = \'%s\'', 'left_key_field' => 'PortalUserId', 'left_title_field' => 'Login', 'required' => 1, 'default' => null),
- 'ToId' => Array('type' => 'int', 'formatter' => 'kLEFTFormatter', 'error_msgs' => Array ('invalid_option' => '!lu_error_UserNotFound!'), 'left_sql' => 'SELECT %s FROM '.TABLE_PREFIX.'PortalUser WHERE `%s` = \'%s\'', 'left_key_field' => 'PortalUserId', 'left_title_field' => 'Login', 'required' => 1, 'default' => null),
+ 'FromId' => Array('type' => 'int', 'formatter' => 'kLEFTFormatter', 'error_msgs' => Array ('invalid_option' => '!lu_error_UserNotFound!'), 'left_sql' => 'SELECT %s FROM '.TABLE_PREFIX.'PortalUser WHERE `%s` = \'%s\'', 'left_key_field' => 'PortalUserId', 'left_title_field' => 'Username', 'required' => 1, 'default' => null),
+ 'ToId' => Array('type' => 'int', 'formatter' => 'kLEFTFormatter', 'error_msgs' => Array ('invalid_option' => '!lu_error_UserNotFound!'), 'left_sql' => 'SELECT %s FROM '.TABLE_PREFIX.'PortalUser WHERE `%s` = \'%s\'', 'left_key_field' => 'PortalUserId', 'left_title_field' => 'Username', 'required' => 1, 'default' => null),
'FolderId' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (0 => 'lu_Inbox', 1 => 'lu_Sent'), 'use_phrases' => 1, 'not_null' => 1, 'default' => PM_FOLDER_SENT),
'Status' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (0 => 'lu_opt_MessageUnread', 1 => 'lu_opt_MessageViewed', 2 => 'lu_opt_MessageRead', 3 => 'lu_opt_MessageReplied', 4 => 'lu_opt_MessageSent'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 0),
'PMBodyId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
Index: in-bulletin/units/topics/topics_config.php
===================================================================
--- in-bulletin/units/topics/topics_config.php (revision 14710)
+++ in-bulletin/units/topics/topics_config.php (working copy)
@@ -289,7 +289,7 @@
'CalculatedFields' => Array (
'' => Array (
- 'UserName' => 'IF (ISNULL(u.Login), IF (%1$s.OwnerId = ' . USER_ROOT . ', "root", IF (%1$s.OwnerId = ' . USER_GUEST . ', "Guest", "n/a")), u.Login)',
+ 'UserName' => 'IF (ISNULL(u.Username), IF (%1$s.OwnerId = ' . USER_ROOT . ', "root", IF (%1$s.OwnerId = ' . USER_GUEST . ', "Guest", "n/a")), u.Username)',
'CategoryId' => TABLE_PREFIX.'%3$sCategoryItems.CategoryId',
'Filename' => TABLE_PREFIX.'%3$sCategoryItems.Filename',
'CategoryFilename' => TABLE_PREFIX.'Category.NamedParentPath',
@@ -388,7 +388,7 @@
'left_sql' => 'SELECT %s FROM ' . TABLE_PREFIX . 'PortalUser
WHERE `%s` = \'%s\' ',
'left_key_field' => 'PortalUserId',
- 'left_title_field' => 'Login',
+ 'left_title_field' => 'Username',
'error_msgs' => Array ('invalid_option' => '!la_error_UserNotFound!'),
'sample_value' => 'Guest', 'required' => 1, 'default' => NULL,
),
@@ -399,7 +399,7 @@
'left_sql' => 'SELECT %s FROM ' . TABLE_PREFIX . 'PortalUser
WHERE `%s` = \'%s\' ',
'left_key_field' => 'PortalUserId',
- 'left_title_field' => 'Login',
+ 'left_title_field' => 'Username',
'error_msgs' => Array ('invalid_option' => '!la_error_UserNotFound!'),
'default' => NULL,
),
Index: in-commerce/units/affiliate_payments/affiliate_payments_config.php
===================================================================
--- in-commerce/units/affiliate_payments/affiliate_payments_config.php (revision 14717)
+++ in-commerce/units/affiliate_payments/affiliate_payments_config.php (working copy)
@@ -87,7 +87,7 @@
'PortalUserId' => 'af.PortalUserId',
),
'log' => Array(
- 'Username' => 'au.Login',
+ 'Username' => 'au.Username',
'PortalUserId' => 'af.PortalUserId',
),
),
@@ -106,7 +106,7 @@
'Fields' => Array(
'AffiliatePaymentId' => Array('type' => 'int', 'not_null' => 1, 'default' => 0),
- 'AffiliateId' => Array('type'=>'int','formatter'=>'kLEFTFormatter', 'error_msgs' => Array ('invalid_option' => '!la_error_UserNotFound!'), 'options' => Array(0 => 'lu_None'), 'left_sql'=>'SELECT %s FROM '.TABLE_PREFIX.'Affiliates af LEFT JOIN '.TABLE_PREFIX.'PortalUser pu ON pu.PortalUserId = af.PortalUserId WHERE `%s` = \'%s\'','left_key_field'=>'AffiliateId','left_title_field'=>'Login','not_null'=>1,'default'=>0),
+ 'AffiliateId' => Array('type'=>'int','formatter'=>'kLEFTFormatter', 'error_msgs' => Array ('invalid_option' => '!la_error_UserNotFound!'), 'options' => Array(0 => 'lu_None'), 'left_sql'=>'SELECT %s FROM '.TABLE_PREFIX.'Affiliates af LEFT JOIN '.TABLE_PREFIX.'PortalUser pu ON pu.PortalUserId = af.PortalUserId WHERE `%s` = \'%s\'','left_key_field'=>'AffiliateId','left_title_field'=>'Username','not_null'=>1,'default'=>0),
'PaymentDate' => Array('type' => 'int', 'formatter'=>'kDateFormatter', 'default' => '#NOW#'),
'Amount' => Array('type' => 'double', 'formatter'=>'kFormatter', 'format'=>'%.02f', 'not_null' => '1', 'required'=>1, 'default' => '0.00'),
'Comment' => Array('type' => 'string', 'formatter' => 'kFormatter', 'using_fck' => 1, 'default' => NULL),
Index: in-commerce/units/affiliates/affiliates_config.php
===================================================================
--- in-commerce/units/affiliates/affiliates_config.php (revision 14705)
+++ in-commerce/units/affiliates/affiliates_config.php (working copy)
@@ -155,7 +155,7 @@
'CalculatedFields' => Array(
'' => Array (
'UserId' => 'u.PortalUserId',
- 'UserName' => 'IF( LENGTH(u.Login), u.Login, \'\')',
+ 'UserName' => 'IF( LENGTH(u.Username), u.Username, \'\')',
'PlanName' => 'ap.Name',
),
),
@@ -179,7 +179,7 @@
'Fields' => Array(
'AffiliateId' => Array('type' => 'int', 'not_null' => 1, 'default' => 0),
- 'PortalUserId' => Array('type' => 'int', 'unique'=>Array('PortalUserId'), 'formatter' => 'kLEFTFormatter', 'error_msgs' => Array ('invalid_option' => '!la_error_UserNotFound!', 'unique' => '!la_affiliate_already_exists!'), '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', 'required' => 1, 'not_null' => 1, 'default' => 0, ),
+ 'PortalUserId' => Array('type' => 'int', 'unique'=>Array('PortalUserId'), 'formatter' => 'kLEFTFormatter', 'error_msgs' => Array ('invalid_option' => '!la_error_UserNotFound!', 'unique' => '!la_affiliate_already_exists!'), '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', 'required' => 1, 'not_null' => 1, 'default' => 0, ),
'AffiliatePlanId' => Array('type' => 'int', 'formatter'=>'kOptionsFormatter', 'options_sql'=>'SELECT Name, AffiliatePlanId FROM '.TABLE_PREFIX.'AffiliatePlans WHERE Enabled = 1 ORDER BY Name', 'option_key_field'=>'AffiliatePlanId', 'option_title_field'=>'Name', 'not_null' => 1, 'default' => 0),
'AccumulatedAmount' => Array('type' => 'double', 'formatter'=>'kFormatter', 'format'=>'%.02f', 'not_null' => '1','default' => '0.00'),
'AmountToPay' => Array('type' => 'double', 'formatter'=>'kFormatter', 'format'=>'%.02f', 'not_null' => '1','default' => '0.00'),
Index: in-commerce/units/coupons/coupons_config.php
===================================================================
--- in-commerce/units/coupons/coupons_config.php (revision 14717)
+++ in-commerce/units/coupons/coupons_config.php (working copy)
@@ -117,7 +117,7 @@
'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', 'required' => 0, 'default' => null,
+ 'left_title_field' => 'Username', 'required' => 0, 'default' => null,
),
'LastUsedOn' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => NULL),
'NumberOfUses' => Array ('type' => 'int', 'default' => 1),
Index: in-commerce/units/downloads/download_helper.php
===================================================================
--- in-commerce/units/downloads/download_helper.php (revision 14705)
+++ in-commerce/units/downloads/download_helper.php (working copy)
@@ -62,7 +62,7 @@
$product_object =& $this->Application->recallObject( 'p' );
$down_object->SetDBField('PortalUserId', $this->Application->RecallVar('user_id'));
- $down_object->SetDBField('Username', $user_object->GetDBField('Login'));
+ $down_object->SetDBField('Username', $user_object->GetDBField('Username'));
$down_object->SetDBField('ProductId', $product_id);
$down_object->SetDBField('ProductName', $product_object->GetField('Name'));
$down_object->SetDBField('FileId', $file_info['FileId']);
Index: in-commerce/units/orders/orders_config.php
===================================================================
--- in-commerce/units/orders/orders_config.php (revision 14717)
+++ in-commerce/units/orders/orders_config.php (working copy)
@@ -240,8 +240,8 @@
'CalculatedFields' => Array (
'' => Array (
- 'CustomerName' => 'IF( ISNULL(u.Login), IF (%1$s.PortalUserId = ' . USER_ROOT . ', \'root\', IF (%1$s.PortalUserId = ' . USER_GUEST . ', \'Guest\', \'n/a\')), CONCAT(u.FirstName,\' \',u.LastName) )',
- 'Username' => 'IF( ISNULL(u.Login),\'root\',u.Login)',
+ 'CustomerName' => 'IF( ISNULL(u.Username), IF (%1$s.PortalUserId = ' . USER_ROOT . ', \'root\', IF (%1$s.PortalUserId = ' . USER_GUEST . ', \'Guest\', \'n/a\')), CONCAT(u.FirstName,\' \',u.LastName) )',
+ 'Username' => 'IF( ISNULL(u.Username),\'root\',u.Username)',
'OrderNumber' => 'CONCAT(LPAD(Number,6,"0"),\'-\',LPAD(SubNumber,3,"0") )',
'SubtotalWithoutDiscount' => '(SubTotal + DiscountTotal)',
'SubtotalWithDiscount' => '(SubTotal)',
@@ -249,7 +249,7 @@
'TotalAmount' => 'SubTotal+ShippingCost+VAT+ProcessingFee+InsuranceFee-GiftCertificateDiscount',
'CouponCode' => 'pc.Code',
'CouponName' => 'pc.Name',
- 'AffiliateUser' => 'IF( LENGTH(au.Login),au.Login,\'!la_None!\')',
+ 'AffiliateUser' => 'IF( LENGTH(au.Username),au.Username,\'!la_None!\')',
'AffiliatePortalUserId' => 'af.PortalUserId',
'GiftCertificateCode' => 'gc.Code',
'GiftCertificateRecipient' => 'gc.Recipient',
@@ -308,7 +308,7 @@
'not_null' => 1, 'default' => 0,
),
'OrderDate' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'required' => 1, 'default' => '#NOW#'),
- 'PortalUserId' =>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', 'required' =>1, 'not_null' =>1, 'default' =>-1),
+ 'PortalUserId' =>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', 'required' =>1, 'not_null' =>1, 'default' =>-1),
'OrderIP' => Array ('type' => 'string', 'not_null' => 1, 'default' => '', 'filter_type' => 'like'),
'UserComment' => Array ('type' => 'string', 'formatter' => 'kFormatter', 'using_fck' => 1, 'default' => NULL),
'AdminComment' => Array ('type' => 'string', 'formatter' => 'kFormatter', 'using_fck' => 1, 'default' => NULL),
@@ -437,7 +437,7 @@
),
'GWResult1' => Array ('type' => 'string', 'formatter' => 'kSerializedFormatter', 'default' => NULL),
'GWResult2' => Array ('type' => 'string', 'formatter' => 'kSerializedFormatter', 'default' => NULL),
- 'AffiliateId' => Array ('type' => 'int', 'formatter' => 'kLEFTFormatter', 'error_msgs' => Array ('invalid_option' => '!la_error_UserNotFound!'), 'options' => Array (0 => 'lu_None'), 'left_sql' => 'SELECT %s FROM '.TABLE_PREFIX.'Affiliates af LEFT JOIN '.TABLE_PREFIX.'PortalUser pu ON pu.PortalUserId = af.PortalUserId WHERE `%s` = \'%s\'', 'left_key_field' => 'AffiliateId', 'left_title_field' => 'Login', 'not_null' =>1, 'default' =>0),
+ 'AffiliateId' => Array ('type' => 'int', 'formatter' => 'kLEFTFormatter', 'error_msgs' => Array ('invalid_option' => '!la_error_UserNotFound!'), 'options' => Array (0 => 'lu_None'), 'left_sql' => 'SELECT %s FROM '.TABLE_PREFIX.'Affiliates af LEFT JOIN '.TABLE_PREFIX.'PortalUser pu ON pu.PortalUserId = af.PortalUserId WHERE `%s` = \'%s\'', 'left_key_field' => 'AffiliateId', 'left_title_field' => 'Username', 'not_null' =>1, 'default' =>0),
'VisitId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
'AffiliateCommission' => Array ('type' => 'double', 'formatter' => 'kFormatter', 'format' => '%.02f', 'not_null' => 1, 'default' => '0.0000'),
'ProcessingFee' => Array ('type' => 'double', 'formatter' => 'kFormatter', 'format' => '%.02f', 'not_null' => '0', 'default' => '0.0000'),
Index: in-commerce/units/orders/orders_tag_processor.php
===================================================================
--- in-commerce/units/orders/orders_tag_processor.php (revision 14705)
+++ in-commerce/units/orders/orders_tag_processor.php (working copy)
@@ -806,31 +806,44 @@
return false;
}
- $user =& $this->Application->recallObject('u', null, Array ('skip_autoload' => true));
- /* @var $user kDBItem */
+ if ( isset($params['user_prefix']) ) {
+ $user =& $this->Application->recallObject($params['user_prefix']);
+ /* @var $user kDBItem */
+ }
+ else {
+ $user =& $this->Application->recallObject('u', null, Array ('skip_autoload' => true));
+ /* @var $user kDBItem */
+ }
$order =& $this->Application->recallObject($this->Prefix . '.last');
+ /* @var $order OrdersItem */
$order_prefix = $params['type'] == 'billing' ? 'Billing' : 'Shipping';
+ $names = explode(' ', $order->GetDBField($order_prefix . 'To'), 2);
+
+ if ( !$user->GetDBField('FirstName') ) {
+ $user->SetDBField('FirstName', getArrayValue($names, 0));
+ }
+
+ if ( !$user->GetDBField('LastName') ) {
+ $user->SetDBField('LastName', getArrayValue($names, 1));
+ }
+
$order_fields = Array (
- 'To', 'Company', 'Phone', 'Fax', 'Email', 'Address1',
- 'Address2', 'City', 'State', 'Zip', 'Country'
+ 'Company', 'Phone', 'Fax', 'Email', 'Address1' => 'Street',
+ 'Address2' => 'Street2', 'City', 'State', 'Zip', 'Country'
);
- $names = explode(' ', $order->GetDBField($order_prefix.'To'), 2);
- if (!$user->GetDBField('FirstName')) $user->SetDBField('FirstName', getArrayValue($names, 0) );
- if (!$user->GetDBField('LastName')) $user->SetDBField('LastName', getArrayValue($names, 1) );
- if (!$user->GetDBField('Company')) $user->SetDBField('Company', $order->GetDBField($order_prefix.'Company') );
- if (!$user->GetDBField('Phone')) $user->SetDBField('Phone', $order->GetDBField($order_prefix.'Phone') );
- if (!$user->GetDBField('Fax')) $user->SetDBField('Fax', $order->GetDBField($order_prefix.'Fax') );
- if (!$user->GetDBField('Email')) $user->SetDBField('Email', $order->GetDBField($order_prefix.'Email') );
- if (!$user->GetDBField('Street')) $user->SetDBField('Street', $order->GetDBField($order_prefix.'Address1') );
- if (!$user->GetDBField('Street2')) $user->SetDBField('Street2', $order->GetDBField($order_prefix.'Address2') );
- if (!$user->GetDBField('City')) $user->SetDBField('City', $order->GetDBField($order_prefix.'City') );
- if (!$user->GetDBField('State')) $user->SetDBField('State', $order->GetDBField($order_prefix.'State') );
- if (!$user->GetDBField('Zip')) $user->SetDBField('Zip', $order->GetDBField($order_prefix.'Zip') );
- if (!$user->GetDBField('Country')) $user->SetDBField('Country', $order->GetDBField($order_prefix.'Country') );
+ foreach ($order_fields as $src_field => $dst_field) {
+ if ( is_numeric($src_field) ) {
+ $src_field = $dst_field;
+ }
+ if ( !$user->GetDBField($dst_field) ) {
+ $user->SetDBField($dst_field, $order->GetDBField($order_prefix . $src_field));
+ }
+ }
+
$cs_helper =& $this->Application->recallObject('CountryStatesHelper');
/* @var $cs_helper kCountryStatesHelper */
Index: in-commerce/units/products/products_config.php
===================================================================
--- in-commerce/units/products/products_config.php (revision 14717)
+++ in-commerce/units/products/products_config.php (working copy)
@@ -511,7 +511,7 @@
'left_sql' => 'SELECT %s FROM ' . TABLE_PREFIX . 'PortalUser
WHERE `%s` = \'%s\'',
'left_key_field' => 'PortalUserId',
- 'left_title_field' => 'Login',
+ 'left_title_field' => 'Username',
'error_msgs' => Array ('invalid_option' => '!la_error_UserNotFound!'),
'sample_value' => 'Guest', 'required' => 1, 'default' => NULL,
),
Index: in-commerce/units/reports/reports_event_handler.php
===================================================================
--- in-commerce/units/reports/reports_event_handler.php (revision 14717)
+++ in-commerce/units/reports/reports_event_handler.php (working copy)
@@ -456,7 +456,7 @@
));
$new_options['CalculatedFields'][''] = Array (
- 'Login' => 'u.Login',
+ 'Login' => 'u.Username',
'FirstName' => 'u.FirstName',
'LastName' => 'u.LastName',
);
Index: in-link/install/install_data.sql
===================================================================
--- in-link/install/install_data.sql (revision 14705)
+++ in-link/install/install_data.sql (working copy)
@@ -134,7 +134,7 @@
INSERT INTO SearchConfig VALUES ('Link', 'EditorsPick', 0, 1, 'lu_fielddesc_link_editorspick', 'lu_field_editorspick', 'In-Link', 'la_text_link', 14, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
INSERT INTO SearchConfig VALUES ('Link', 'Status', 0, 0, 'lu_fielddesc_link_status', 'lu_field_status', 'In-Link', 'la_text_link', 13, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
INSERT INTO SearchConfig VALUES ('Link', 'Priority', 0, 0, 'lu_fielddesc_link_priority', 'lu_field_priority', 'In-Link', 'la_text_link', 12, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO SearchConfig VALUES ('Link', 'ModifiedById', 0, 0, 'lu_fielddesc_link_modifiedbyid', 'lu_field_modifiedbyid', 'In-Link', 'la_text_link', 11, DEFAULT, 0, 'text', 'PortalUser.Login', '{ForeignTable}.PortalUserId={LocalTable}.ModifiedById', NULL, NULL, NULL, NULL, NULL);
+INSERT INTO SearchConfig VALUES ('Link', 'ModifiedById', 0, 0, 'lu_fielddesc_link_modifiedbyid', 'lu_field_modifiedbyid', 'In-Link', 'la_text_link', 11, DEFAULT, 0, 'text', 'PortalUser.Username', '{ForeignTable}.PortalUserId={LocalTable}.ModifiedById', NULL, NULL, NULL, NULL, NULL);
INSERT INTO SearchConfig VALUES ('Link', 'CreatedById', 0, 0, 'lu_fielddesc_link_createdbyid', 'lu_field_createdbyid', 'In-Link', 'la_text_link', 10, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
INSERT INTO SearchConfig VALUES ('Link', 'CachedReviewsQty', 0, 0, 'lu_fielddesc_link_cachedreviewsqty', 'lu_field_cachedreviewsqty', 'In-Link', 'la_text_link', 9, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
INSERT INTO SearchConfig VALUES ('Link', 'CachedVotesQty', 0, 0, 'lu_fielddesc_link_cachedvotesqty', 'lu_field_cachedvotesqty', 'In-Link', 'la_text_link', 8, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
Index: in-link/install/upgrades.sql
===================================================================
--- in-link/install/upgrades.sql (revision 14705)
+++ in-link/install/upgrades.sql (working copy)
@@ -135,4 +135,9 @@
# ===== v 5.1.3 =====
UPDATE Phrase
SET `Module` = 'Core'
-WHERE PhraseKey IN ('LA_FLD_LISTINGID', 'LA_FLD_LISTINGTYPE');
\ No newline at end of file
+WHERE PhraseKey IN ('LA_FLD_LISTINGID', 'LA_FLD_LISTINGTYPE');
+
+# ===== v 5.2.0-B1 =====
+UPDATE SearchConfig
+SET ForeignField = 'PortalUser.Username'
+WHERE ForeignField = 'PortalUser.Login' AND ModuleName = 'In-Link';
\ No newline at end of file
Index: in-link/units/links/links_config.php
===================================================================
--- in-link/units/links/links_config.php (revision 14712)
+++ in-link/units/links/links_config.php (working copy)
@@ -395,7 +395,7 @@
'CalculatedFields' => Array (
'' => Array (
- 'UserName' => 'IF (ISNULL(u.Login), IF (%1$s.CreatedById = ' . USER_ROOT . ', "root", IF (%1$s.CreatedById = ' . USER_GUEST . ', "Guest", "n/a")), u.Login)',
+ 'UserName' => 'IF (ISNULL(u.Username), IF (%1$s.CreatedById = ' . USER_ROOT . ', "root", IF (%1$s.CreatedById = ' . USER_GUEST . ', "Guest", "n/a")), u.Username)',
'CategoryId' => TABLE_PREFIX.'%3$sCategoryItems.CategoryId',
'Filename' => TABLE_PREFIX.'%3$sCategoryItems.Filename',
'CategoryFilename' => TABLE_PREFIX.'Category.NamedParentPath',
@@ -470,11 +470,11 @@
'left_sql' => 'SELECT %s FROM ' . TABLE_PREFIX . 'PortalUser
WHERE `%s` = \'%s\'',
'left_key_field' => 'PortalUserId',
- 'left_title_field' => 'Login',
+ 'left_title_field' => 'Username',
'error_msgs' => Array ('invalid_option' => '!la_error_UserNotFound!'),
'sample_value' => 'Guest', 'required' => 1, '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' => '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),
'Priority' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
'Status' => Array (
'type' => 'int',
Index: in-link/units/listings/listings_config.php
===================================================================
--- in-link/units/listings/listings_config.php (revision 14705)
+++ in-link/units/listings/listings_config.php (working copy)
@@ -106,7 +106,7 @@
'CalculatedFields' => Array (
'' => Array (
'LinkName' => 'CONCAT(item_table.Name, " (", item_table.Url, ")")',
- 'LinkOwner' => 'IF (ISNULL(u.Login), IF (item_table.CreatedById = ' . USER_ROOT . ', "root", IF (item_table.CreatedById = ' . USER_GUEST . ', "Guest", "n/a")), u.Login)',
+ 'LinkOwner' => 'IF (ISNULL(u.Username), IF (item_table.CreatedById = ' . USER_ROOT . ', "root", IF (item_table.CreatedById = ' . USER_GUEST . ', "Guest", "n/a")), u.Username)',
),
),
'Fields' => Array (
Index: in-news/units/articles/articles_config.php
===================================================================
--- in-news/units/articles/articles_config.php (revision 14713)
+++ in-news/units/articles/articles_config.php (working copy)
@@ -331,7 +331,7 @@
'CalculatedFields' => Array (
'' => Array (
- 'UserName' => 'IF (ISNULL(u.Login), IF (%1$s.CreatedById = ' . USER_ROOT . ', "root", IF (%1$s.CreatedById = ' . USER_GUEST . ', "Guest", "n/a")), u.Login)',
+ 'UserName' => 'IF (ISNULL(u.Username), IF (%1$s.CreatedById = ' . USER_ROOT . ', "root", IF (%1$s.CreatedById = ' . USER_GUEST . ', "Guest", "n/a")), u.Username)',
'CategoryId' => TABLE_PREFIX.'%3$sCategoryItems.CategoryId',
'Filename' => TABLE_PREFIX.'%3$sCategoryItems.Filename',
'CategoryFilename' => TABLE_PREFIX.'Category.NamedParentPath',
@@ -402,7 +402,7 @@
'left_sql' => 'SELECT %s FROM ' . TABLE_PREFIX . 'PortalUser
WHERE `%s` = \'%s\'',
'left_key_field' => 'PortalUserId',
- 'left_title_field' => 'Login',
+ 'left_title_field' => 'Username',
'error_msgs' => Array ('invalid_option' => '!la_error_UserNotFound!'),
'sample_value' => 'Guest', 'required' => 1, 'default' => NULL,
),
@@ -439,7 +439,7 @@
'HotItem' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (2 => 'la_Auto', 1 => 'la_Always', 0 => 'la_Never'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 2),
'Archived' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Yes', 2 => 'la_No'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 0),
'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),
'OrgId' => Array ('type' => 'int', 'default' => null),
'MetaKeywords' => Array ('type' => 'string', 'default' => null),
'MetaDescription' => Array ('type' => 'string', 'formatter' => 'kFormatter', 'using_fck' => 1, 'default' => null),
login_to_username_themes.patch [^] (13,320 bytes) 2011-11-03 03:36
[Show Content]
Index: advanced/_install/english.lang
===================================================================
--- advanced/_install/english.lang (revision 14705)
+++ advanced/_install/english.lang (working copy)
@@ -173,7 +173,6 @@
<PHRASE Label="lu_fld_Image1" Module="Core" Type="0">Mm5kIEltYWdl</PHRASE>
<PHRASE Label="lu_fld_Image2" Module="Core" Type="0">M3JkIEltYWdl</PHRASE>
<PHRASE Label="lu_fld_LastName" Module="Core" Type="0">TGFzdCBuYW1l</PHRASE>
- <PHRASE Label="lu_fld_Login" Module="Core" Type="0">VXNlcm5hbWU=</PHRASE>
<PHRASE Label="lu_fld_module" Module="Core" Type="0">TW9kdWxl</PHRASE>
<PHRASE Label="lu_fld_MoreCategories" Module="Core" Type="0">QWRkaXRpb25hbCBDYXRlZ29yaWVz</PHRASE>
<PHRASE Label="lu_fld_Name" Module="Core" Type="0">TmFtZQ==</PHRASE>
@@ -196,6 +195,7 @@
<PHRASE Label="lu_fld_title" Module="Core" Type="0">VGl0bGU=</PHRASE>
<PHRASE Label="lu_fld_translation" Module="Core" Type="0">VHJhbnNsYXRpb24=</PHRASE>
<PHRASE Label="lu_fld_UserGroup" Module="Core" Type="0">TWVtYmVyc2hpcCBHcm91cA==</PHRASE>
+ <PHRASE Label="lu_fld_Username" Module="Core" Type="0">VXNlcm5hbWU=</PHRASE>
<PHRASE Label="lu_fld_VerifyPassword" Module="Core" Type="0">VmVyaWZ5IFBhc3N3b3Jk</PHRASE>
<PHRASE Label="lu_fld_version" Module="Core" Type="0">VmVyc2lvbg==</PHRASE>
<PHRASE Label="lu_fld_Zip" Module="Core" Type="0">WmlwIGNvZGU=</PHRASE>
Index: advanced/in-commerce/elements/content_boxes/checkout/form_register.elm.tpl
===================================================================
--- advanced/in-commerce/elements/content_boxes/checkout/form_register.elm.tpl (revision 14705)
+++ advanced/in-commerce/elements/content_boxes/checkout/form_register.elm.tpl (working copy)
@@ -5,49 +5,49 @@
<span class="field-required">*</span> <inp2:m_phrase name="lu_IndicatesRequired"/><br /><br />
- <inp2:ord_PrefillRegistrationFields type="billing"/>
- <inp2:m_if check="u_HasError" field="any">
+ <inp2:u.register_FormName name="registration"/>
+ <inp2:ord_PrefillRegistrationFields user_prefix="u.register" type="billing"/>
+ <inp2:m_if check="u.register_HasError" field="any">
<inp2:m_RenderElement name="error_message" />
</inp2:m_if>
- <img src="<inp2:m_TemplatesBase module="In-Portal"/>img/grey_pix.gif" width="100%" height="1" align="absmiddle" alt="" /><br /><br />
+ <img src="<inp2:m_TemplatesBase module='In-Portal'/>img/grey_pix.gif" width="100%" height="1" align="absmiddle" alt="" /><br /><br />
<form method="post" action="<inp2:m_FormAction/>">
<table class="form-data fullwidth">
- <inp2:m_if check="u_UseUsernames">
- <inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Login" title="lu_fld_Login" style="width:155px" />
- </inp2:m_if>
+ <inp2:m_RenderElement name="inp_edit_box" prefix="u.register" field="Username" title="lu_fld_Login" style="width:155px" />
+ <inp2:m_RenderElement name="inp_edit_box" prefix="u.register" field="Email" title="lu_fld_Email" style="width:155px" />
- <inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Email" title="lu_fld_Email" style="width:155px" />
-
<inp2:m_if check="m_ConfigEquals" name="User_Password_Auto" value="0">
- <inp2:m_RenderElement name="inp_edit_password" prefix="u" field="Password" title="lu_fld_Password" style="width:155px" />
- <inp2:m_RenderElement name="inp_edit_password" prefix="u" field="VerifyPassword" title="lu_fld_VerifyPassword" style="width:155px" />
+ <inp2:m_RenderElement name="inp_edit_password" prefix="u.register" field="Password" title="lu_fld_Password" style="width:155px" />
+ <inp2:m_RenderElement name="inp_edit_password" prefix="u.register" field="VerifyPassword" title="lu_fld_VerifyPassword" style="width:155px" />
</inp2:m_if>
- <inp2:m_RenderElement name="inp_edit_date" prefix="u" field="dob" title="lu_fld_BirthDate" />
- <inp2:m_RenderElement name="inp_edit_box" prefix="u" field="FirstName" title="lu_fld_FirstName" style="width:155px" />
- <inp2:m_RenderElement name="inp_edit_box" prefix="u" field="LastName" title="lu_fld_LastName" style="width:155px" />
- <inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Company" title="lu_fld_Company" style="width:155px" />
- <inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Street" title="lu_fld_AddressLine1" style="width:155px" />
- <inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Street2" title="lu_fld_AddressLine2" style="width:155px" />
- <inp2:m_RenderElement name="inp_edit_box" prefix="u" field="City" title="lu_fld_City" style="width:155px" />
- <inp2:m_RenderElement name="inp_edit_box" prefix="u" field="State" title="lu_fld_State" style="width:155px" />
- <inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Zip" title="lu_fld_Zip" style="width:55px" />
- <inp2:m_RenderElement name="inp_edit_options" prefix="u" field="Country" title="lu_fld_Country" has_empty="1"/>
- <inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Phone" title="lu_fld_Phone" style="width:155px" />
- <inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Fax" title="lu_fld_Fax" style="width:155px" is_last="1"/>
+ <inp2:m_RenderElement name="inp_edit_box" prefix="u.register" field="FirstName" title="lu_fld_FirstName" style="width:155px" />
+ <inp2:m_RenderElement name="inp_edit_box" prefix="u.register" field="LastName" title="lu_fld_LastName" style="width:155px" />
+ <inp2:m_RenderElement name="inp_edit_box" prefix="u.register" field="Company" title="lu_fld_Company" style="width:155px" />
+ <inp2:m_RenderElement name="inp_edit_box" prefix="u.register" field="Phone" title="lu_fld_Phone" style="width:155px" />
+ <inp2:m_RenderElement name="inp_edit_box" prefix="u.register" field="Fax" title="lu_fld_Fax" style="width:155px"/>
+ <inp2:m_RenderElement name="inp_edit_date" prefix="u.register" field="dob" title="lu_fld_BirthDate" />
+ <inp2:m_RenderElement name="inp_edit_box" prefix="u.register" field="Street" title="lu_fld_AddressLine1" style="width:155px" />
+ <inp2:m_RenderElement name="inp_edit_box" prefix="u.register" field="Street2" title="lu_fld_AddressLine2" style="width:155px" />
+ <inp2:m_RenderElement name="inp_edit_box" prefix="u.register" field="City" title="lu_fld_City" style="width:155px" />
+ <inp2:m_RenderElement name="inp_edit_box" prefix="u.register" field="State" title="lu_fld_State" style="width:155px" />
+ <inp2:m_RenderElement name="inp_edit_box" prefix="u.register" field="Zip" title="lu_fld_Zip" style="width:55px" />
+ <inp2:m_RenderElement name="inp_edit_options" prefix="u.register" field="Country" title="lu_fld_Country" has_empty="1" is_last="1"/>
+
+
<inp2:m_RenderElement design="inp_edit_buttons">
- <input type="hidden" name="next_template" value="<inp2:m_get var="next_template"/>">
+ <input type="hidden" name="next_template" value="<inp2:m_get var='next_template'/>">
<input type="hidden" name="registration_confirm_template" value="platform/login/register_confirm">
<input type="hidden" name="registration_confirm_pending_template" value="platform/login/register_confirm_pending">
<input type="hidden" name="fields_prefilled" value="1" />
- <input class="button" type="submit" id="events[u][OnCreate]" name="events[u][OnCreate]" value="<inp2:m_Phrase label="lu_btn_Register" no_editing="1"/>"/>
+ <input class="button" type="submit" id="events[u.register][OnCreate]" name="events[u.register][OnCreate]" value="<inp2:m_Phrase label="lu_btn_Register" no_editing="1"/>"/>
<input type="hidden" name="cancel_template" value="in-commerce/checkout/shop_cart" />
- <input type="submit" class="button" name="events[ls][OnCancel]" value="<inp2:m_Phrase label="lu_btn_Cancel" />" no_editing="1"/>
+ <input type="submit" class="button" name="events[u.register][OnCancel]" value="<inp2:m_Phrase label="lu_btn_Cancel" />" no_editing="1"/>
</inp2:m_RenderElement>
</table>
</form>
Index: advanced/platform/elements/users.elm.tpl
===================================================================
--- advanced/platform/elements/users.elm.tpl (revision 14705)
+++ advanced/platform/elements/users.elm.tpl (working copy)
@@ -9,7 +9,7 @@
</tr>
<tr class="listing-row">
<td valign="top">
- <a href="<inp2:ProfileLink template="platform/my_account/public_profile"/>"><inp2:Field name="Login"/></a>
+ <a href="<inp2:ProfileLink template="platform/my_account/public_profile"/>"><inp2:Field name="Username"/></a>
</td>
<td valign="top">
<inp2:m_if check="LoggedIn">
Index: advanced/platform/login/forgot_password.tpl
===================================================================
--- advanced/platform/login/forgot_password.tpl (revision 14705)
+++ advanced/platform/login/forgot_password.tpl (working copy)
@@ -60,7 +60,7 @@
<form method="post" action="<inp2:m_FormAction/>">
<table class="form-data fullwidth">
<inp2:m_if check="u_UseUsernames">
- <inp2:m_RenderElement name="inp_edit_box" prefix="u.forgot" field="ForgotLogin" title="lu_fld_Login" style="width: 155px;"/>
+ <inp2:m_RenderElement name="inp_edit_box" prefix="u.forgot" field="ForgotLogin" title="lu_fld_Username" style="width: 155px;"/>
<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
<td class="field-name"></td>
Index: advanced/platform/login/register.tpl
===================================================================
--- advanced/platform/login/register.tpl (revision 14705)
+++ advanced/platform/login/register.tpl (working copy)
@@ -56,9 +56,7 @@
<form method="post" action="<inp2:m_FormAction/>">
<table class="form-data fullwidth">
- <inp2:m_if check="u.register_UseUsernames">
- <inp2:m_RenderElement name="inp_edit_box" prefix="u.register" field="Login" title="lu_fld_Login" style="width:155px" />
- </inp2:m_if>
+ <inp2:m_RenderElement name="inp_edit_box" prefix="u.register" field="Username" title="lu_fld_Username" style="width:155px" />
<inp2:m_if check="m_ConfigEquals" name="User_Password_Auto" value="0">
<inp2:m_RenderElement name="inp_edit_password" prefix="u.register" field="Password" title="lu_fld_Password" style="width:155px" />
@@ -82,9 +80,9 @@
<inp2:m_if check="m_GetConfig" name="AllowSelectGroupOnFront">
<inp2:m_RenderElement name="inp_edit_options" prefix="u.register" field="PrimaryGroupId" title="lu_fld_UserGroup" />
</inp2:m_if>
-
+
<inp2:m_RenderElement name="inp_edit_checkbox" prefix="u.register" field="SubscribeToMailing" title="lu_fld_SubscribeToMailing" is_last="1"/>
-
+
<inp2:m_if check="m_ConfigEquals" option="RegistrationCaptcha" value="1">
<inp2:m_RenderElement name="inp_edit_field_separator" is_last="0"/>
<inp2:m_RenderElement name="inp_edit_captcha" prefix="u.register" style="width: 170px;" />
Index: advanced/platform/my_account/my_preferences.tpl
===================================================================
--- advanced/platform/my_account/my_preferences.tpl (revision 14705)
+++ advanced/platform/my_account/my_preferences.tpl (working copy)
@@ -70,8 +70,8 @@
</tr>
<tr>
- <td class="field-name"><inp2:m_phrase name="lu_fld_Login"/></td>
- <td><inp2:u_Field field="Login"/></td>
+ <td class="field-name"><inp2:m_phrase name="lu_fld_Username"/></td>
+ <td><inp2:u_Field field="Username"/></td>
<td class="field-value"> </td>
</tr>
Index: advanced/platform/my_account/my_profile.tpl
===================================================================
--- advanced/platform/my_account/my_profile.tpl (revision 14705)
+++ advanced/platform/my_account/my_profile.tpl (working copy)
@@ -49,9 +49,9 @@
<form method="post" enctype="multipart/form-data" action="<inp2:m_FormAction/>">
<table class="form-data fullwidth">
<inp2:m_if check="u_Field" name="OldStyleLogin" db="db">
- <inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Login" title="lu_fld_Login" style="width:155px"/>
+ <inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Username" title="lu_fld_Username" style="width:155px"/>
<inp2:m_else/>
- <inp2:m_RenderElement name="inp_label" prefix="u" field="Login" title="lu_fld_Login"/>
+ <inp2:m_RenderElement name="inp_label" prefix="u" field="Username" title="lu_fld_Username"/>
</inp2:m_if>
<inp2:m_RenderElement name="inp_edit_password" prefix="u" field="Password" title="lu_fld_Password" style="width:155px" />
Index: advanced/platform/my_account/public_profile.tpl
===================================================================
--- advanced/platform/my_account/public_profile.tpl (revision 14705)
+++ advanced/platform/my_account/public_profile.tpl (working copy)
@@ -45,8 +45,8 @@
<table class="form-data fullwidth">
<tr>
- <td class="field-name"><inp2:m_phrase name="lu_fld_Login"/></td>
- <td class="field-value"><inp2:u.profile_Field field="Login"/></td>
+ <td class="field-name"><inp2:m_phrase name="lu_fld_Username"/></td>
+ <td class="field-value"><inp2:u.profile_Field field="Username"/></td>
</tr>
<inp2:m_if check="user-profile_ProfileFieldCount">
email_or_username_and_config_var_core.patch [^] (10,117 bytes) 2011-11-03 05:42
[Show Content]
Index: admin_templates/login.tpl
===================================================================
--- admin_templates/login.tpl (revision 14705)
+++ admin_templates/login.tpl (working copy)
@@ -135,11 +135,11 @@
</td>
</tr>
<tr>
- <td class="text"><inp2:m_phrase name="la_Text_Login"/>:</td>
+ <td class="text"><inp2:m_phrase name="la_fld_EmailOrUsername"/>:</td>
<td><input type="text" name="<inp2:u.login-admin_InputName name='UserLogin'/>" class="text" value="<inp2:u.login-admin_CookieUsername field='UserLogin'/>" style="width: 150px;"></td>
</tr>
<tr>
- <td class="text"><inp2:m_phrase name="la_prompt_Password"/>:</td>
+ <td class="text"><inp2:m_phrase name="la_fld_Password"/>:</td>
<td><input type="password" name="<inp2:u.login-admin_InputName name='UserPassword'/>" class="text" style="width: 150px;"></td>
</tr>
<tr>
Index: install/english.lang
===================================================================
--- install/english.lang (revision 14726)
+++ install/english.lang (working copy)
@@ -174,6 +174,7 @@
<PHRASE Label="la_config_PerpageReviews" Module="Core" Type="1">Q29tbWVudHMgcGVyIHBhZ2U=</PHRASE>
<PHRASE Label="la_config_QuickCategoryPermissionRebuild" Module="Core" Type="1">UXVpY2sgU2VjdGlvbiBQZXJtaXNzaW9uIFJlYnVpbGQ=</PHRASE>
<PHRASE Label="la_config_RecycleBinFolder" Module="Core" Type="1">IlJlY3ljbGUgQmluIiBTZWN0aW9uSWQ=</PHRASE>
+ <PHRASE Label="la_config_RegistrationUsernameRequired" Module="Core" Type="1">VXNlcm5hbWUgUmVxdWlyZWQgRHVyaW5nIFJlZ2lzdHJhdGlvbg==</PHRASE>
<PHRASE Label="la_config_RememberLastAdminTemplate" Module="Core" Type="1">UmVzdG9yZSBsYXN0IHZpc2l0ZWQgQWRtaW4gU2VjdGlvbiBhZnRlciBMb2dpbg==</PHRASE>
<PHRASE Label="la_config_RequireSSLAdmin" Module="Core" Type="1">UmVxdWlyZSBTU0wgZm9yIEFkbWluaXN0cmF0aXZlIENvbnNvbGU=</PHRASE>
<PHRASE Label="la_config_require_ssl" Module="Core" Type="1">UmVxdWlyZSBTU0wgZm9yIGxvZ2luICYgY2hlY2tvdXQ=</PHRASE>
@@ -358,6 +359,7 @@
<PHRASE Label="la_fld_ElapsedTime" Module="Core" Type="1">RWxhcHNlZCBUaW1l</PHRASE>
<PHRASE Label="la_fld_Email" Module="Core" Type="1" Column="RW1haWw=">RS1tYWls</PHRASE>
<PHRASE Label="la_fld_EmailCommunicationRole" Module="Core" Type="1" Column="RS1tYWlsIENvbW11bmljYXRpb24gUm9sZQ==">RS1tYWlsIENvbW11bmljYXRpb24gUm9sZQ==</PHRASE>
+ <PHRASE Label="la_fld_EmailOrUsername" Module="Core" Type="1">RS1tYWlsIG9yIFVzZXJuYW1l</PHRASE>
<PHRASE Label="la_fld_EmailPassword" Module="Core" Type="1">RS1tYWlsICI8c3Ryb25nPntwYXNzd29yZH08L3N0cm9uZz4iIHBhc3N3b3JkIHRvIHVzZXI=</PHRASE>
<PHRASE Label="la_fld_EmailsQueued" Module="Core" Type="1" Column="UXVldWU=">RW1haWxzIGluIFF1ZXVl</PHRASE>
<PHRASE Label="la_fld_EmailsSent" Module="Core" Type="1" Column="U2VudA==">RW1haWxzIFNlbnQ=</PHRASE>
@@ -914,7 +916,6 @@
<PHRASE Label="la_prompt_NewestUserDate" Module="Core" Type="1">TmV3ZXN0IFVzZXIgRGF0ZQ==</PHRASE>
<PHRASE Label="la_prompt_NonExpiredSessions" Module="Core" Type="1">Q3VycmVudGx5IEFjdGl2ZSBVc2VyIFNlc3Npb25z</PHRASE>
<PHRASE Label="la_prompt_overwritephrases" Module="Core" Type="2">T3ZlcndyaXRlIEV4aXN0aW5nIFBocmFzZXM=</PHRASE>
- <PHRASE Label="la_prompt_Password" Module="Core" Type="1">UGFzc3dvcmQ=</PHRASE>
<PHRASE Label="la_prompt_PendingCategories" Module="Core" Type="1">UGVuZGluZyBTZWN0aW9ucw==</PHRASE>
<PHRASE Label="la_prompt_PendingItems" Module="Core" Type="1">UGVuZGluZyBJdGVtcw==</PHRASE>
<PHRASE Label="la_prompt_perform_now" Module="Core" Type="1">UGVyZm9ybSB0aGlzIG9wZXJhdGlvbiBub3c/</PHRASE>
@@ -1153,7 +1154,6 @@
<PHRASE Label="la_Text_Invert" Module="Core" Type="1">SW52ZXJ0</PHRASE>
<PHRASE Label="la_text_keyword" Module="Core" Type="1">S2V5d29yZA==</PHRASE>
<PHRASE Label="la_Text_Link" Module="Core" Type="1">TGluaw==</PHRASE>
- <PHRASE Label="la_Text_Login" Module="Core" Type="1">VXNlcm5hbWU=</PHRASE>
<PHRASE Label="la_Text_MetaInfo" Module="Core" Type="1">RGVmYXVsdCBNRVRBIGtleXdvcmRz</PHRASE>
<PHRASE Label="la_text_min_password" Module="Core" Type="1">TWluaW11bSBwYXNzd29yZCBsZW5ndGg=</PHRASE>
<PHRASE Label="la_text_min_username" Module="Core" Type="1">VXNlciBuYW1lIGxlbmd0aCAobWluIC0gbWF4KQ==</PHRASE>
@@ -1473,7 +1473,6 @@
<PHRASE Label="la_users_review_deny" Module="Core" Type="1">TnVtYmVyIG9mIGRheXMgdG8gZGVueSBtdWx0aXBsZSBDb21tZW50cyBmcm9tIHRoZSBzYW1lIHVzZXI=</PHRASE>
<PHRASE Label="la_users_subscriber_group" Module="Core" Type="2">QXNzaWduIG1haWxpbmcgbGlzdCBzdWJzY3JpYmVycyB0byBncm91cA==</PHRASE>
<PHRASE Label="la_users_votes_deny" Module="Core" Type="1">TnVtYmVyIG9mIGRheXMgdG8gZGVueSBtdWx0aXBsZSB2b3RlcyBmcm9tIHRoZSBzYW1lIHVzZXI=</PHRASE>
- <PHRASE Label="la_use_emails_as_login" Module="Core" Type="1">VXNlIEVtYWlscyBBcyBMb2dpbg==</PHRASE>
<PHRASE Label="la_US_UK" Module="Core" Type="1">VVMvVUs=</PHRASE>
<PHRASE Label="la_ValidationEmail" Module="Core" Type="1">RS1tYWlsIGFkZHJlc3M=</PHRASE>
<PHRASE Label="la_Value" Module="Core" Type="1">VmFsdWU=</PHRASE>
Index: install/install_data.sql
===================================================================
--- install/install_data.sql (revision 14726)
+++ install/install_data.sql (working copy)
@@ -99,7 +99,7 @@
# Section "in-portal:configure_users":
INSERT INTO ConfigurationValues VALUES(DEFAULT, 'User_Allow_New', '3', 'In-Portal:Users', 'in-portal:configure_users', 'la_title_General', 'la_users_allow_new', 'radio', '', '1=la_opt_UserInstantRegistration||2=la_opt_UserNotAllowedRegistration||3=la_opt_UserUponApprovalRegistration||4=la_opt_UserEmailActivation', 10.01, 0, 1, NULL);
INSERT INTO ConfigurationValues VALUES(DEFAULT, 'AdvancedUserManagement', '0', 'In-Portal:Users', 'in-portal:configure_users', 'la_title_General', 'la_prompt_AdvancedUserManagement', 'checkbox', NULL, NULL, 10.011, 0, 1, NULL);
-INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Email_As_Login', '0', 'In-Portal:Users', 'in-portal:configure_users', 'la_title_General', 'la_use_emails_as_login', 'checkbox', NULL, NULL, 10.02, 0, 0, NULL);
+INSERT INTO ConfigurationValues VALUES(DEFAULT, 'RegistrationUsernameRequired', '1', 'In-Portal:Users', 'in-portal:configure_users', 'la_title_General', 'la_config_RegistrationUsernameRequired', 'checkbox', NULL, NULL, 10.02, 0, 0, NULL);
INSERT INTO ConfigurationValues VALUES(DEFAULT, 'RegistrationCaptcha', '0', 'In-Portal:Users', 'in-portal:configure_users', 'la_title_General', 'la_registration_captcha', 'checkbox', NULL, NULL, 10.025, 0, 0, NULL);
INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Min_UserName', '3', 'In-Portal:Users', 'in-portal:configure_users', 'la_title_General', 'la_text_min_username', 'text', '', 'style="width: 50px;"', 10.03, 1, 0, NULL);
INSERT INTO ConfigurationValues VALUES(DEFAULT, 'MaxUserName', '', 'In-Portal:Users', 'in-portal:configure_users', 'la_title_General', 'la_text_min_username', 'text', '', 'style="width: 50px;"', 10.03, 2, 0, NULL);
Index: install/upgrades.sql
===================================================================
--- install/upgrades.sql (revision 14726)
+++ install/upgrades.sql (working copy)
@@ -2220,4 +2220,18 @@
UPDATE BanRules
SET ItemField = 'Username'
-WHERE ItemField = 'Login';
\ No newline at end of file
+WHERE ItemField = 'Login';
+
+DELETE FROM Phrase
+WHERE PhraseKey IN (
+ 'LU_USERNAME', 'LU_EMAIL', 'LU_PASSWORD', 'LA_TEXT_LOGIN', 'LA_PROMPT_PASSWORD',
+ 'LA_USE_EMAILS_AS_LOGIN', 'LU_USER_AND_EMAIL_ALREADY_EXIST', 'LU_ENTERFORGOTEMAIL'
+);
+
+UPDATE ConfigurationValues
+SET VariableName = 'RegistrationUsernameRequired', Prompt = 'la_config_RegistrationUsernameRequired'
+WHERE VariableName = 'Email_As_Login';
+
+UPDATE ConfigurationValues
+SET VariableValue = IF(VariableValue = 1, 0, 1)
+WHERE VariableName = 'RegistrationUsernameRequired';
Index: kernel/managers/cache_manager.php
===================================================================
--- kernel/managers/cache_manager.php (revision 14705)
+++ kernel/managers/cache_manager.php (working copy)
@@ -378,7 +378,7 @@
'KeepSessionOnBrowserClose',
'User_GuestGroup',
'User_LoggedInGroup',
- 'Email_As_Login',
+ 'RegistrationUsernameRequired',
// output related
'UseModRewrite',
Index: units/users/users_event_handler.php
===================================================================
--- units/users/users_event_handler.php (revision 14726)
+++ units/users/users_event_handler.php (working copy)
@@ -470,12 +470,6 @@
$cs_helper->PopulateStates($event, 'State', 'Country');
- if ( $this->Application->ConfigValue('Email_As_Login') ) {
- $error_msgs = $object->GetFieldOption('Email', 'error_msgs');
- $error_msgs['unique'] = '!lu_user_and_email_already_exist!';
- $object->SetFieldOption('Email', 'error_msgs', $error_msgs);
- }
-
$this->setUserGroup($object);
$user_helper =& $this->Application->recallObject('UserHelper');
@@ -1457,7 +1451,7 @@
}
}
- if ( !$this->Application->ConfigValue('Email_As_Login') ) {
+ if ( $this->Application->ConfigValue('RegistrationUsernameRequired') ) {
// Username becomes required only, when it's used in registration process
$form_fields['Username']['required'] = 1;
}
Index: units/users/users_tag_processor.php
===================================================================
--- units/users/users_tag_processor.php (revision 14726)
+++ units/users/users_tag_processor.php (working copy)
@@ -16,7 +16,6 @@
class UsersTagProcessor extends kDBTagProcessor
{
-
function LogoutLink($params)
{
$pass = Array('pass' => 'all,m,u', 'u_event' => 'OnLogout', 'm_cat_id' => 0);
@@ -24,11 +23,6 @@
return $this->Application->HREF($logout_template, '', $pass);
}
- function UseUsernames($params)
- {
- return $this->Application->ConfigValue('Email_As_Login') != 1;
- }
-
function RegistrationEnabled($params)
{
return $this->Application->ConfigValue('User_Allow_New') != 2;
email_or_username_and_config_var_themes.patch [^] (7,732 bytes) 2011-11-03 05:42
[Show Content]
Index: advanced/_install/english.lang
===================================================================
--- advanced/_install/english.lang (revision 14720)
+++ advanced/_install/english.lang (working copy)
@@ -93,12 +93,10 @@
<PHRASE Label="lu_description_PrivateMessages" Module="Core" Type="0">WW91ciBQcml2YXRlIE1lc3NhZ2Vz</PHRASE>
<PHRASE Label="lu_details" Module="Core" Type="0">RGV0YWlscw==</PHRASE>
<PHRASE Label="lu_edit" Module="Core" Type="0">TW9kaWZ5</PHRASE>
- <PHRASE Label="LU_EMAIL" Module="Core" Type="0">RS1NYWls</PHRASE>
<PHRASE Label="lu_email_already_exist" Module="Core" Type="0">QSB1c2VyIHdpdGggc3VjaCBlLW1haWwgYWxyZWFkeSBleGlzdHMu</PHRASE>
<PHRASE Label="lu_email_send_error" Module="Core" Type="0">TWFpbCBzZW5kaW5nIGZhaWxlZA==</PHRASE>
<PHRASE Label="lu_EnterEmailToRecommend" Module="Core" Type="0">RnJpZW5kJ3MgZS1tYWlsIGFkZHJlc3M=</PHRASE>
<PHRASE Label="lu_EnterEmailToSubscribe" Module="Core" Type="0">WW91ciBlLW1haWwgYWRkcmVzcw==</PHRASE>
- <PHRASE Label="lu_EnterForgotEmail" Module="Core" Type="0">RW50ZXIgeW91ciBFbWFpbCBBZGRyZXNzIGJlbG93IHRvIGhhdmUgeW91ciBhY2NvdW50IGluZm9ybWF0aW9uIHNlbnQgdG8gdGhlIGVtYWlsIGFkZHJlc3Mgb2YgeW91ciBhY2NvdW50Lg==</PHRASE>
<PHRASE Label="lu_EnterForgotUserEmail" Module="Core" Type="0">RW50ZXIgeW91ciBVc2VybmFtZSBvciBFbWFpbCBBZGRyZXNzIGJlbG93IHRvIGhhdmUgeW91ciBhY2NvdW50IGluZm9ybWF0aW9uIHNlbnQgdG8gdGhlIGVtYWlsIGFkZHJlc3Mgb2YgeW91ciBhY2NvdW50Lg==</PHRASE>
<PHRASE Label="lu_ErrorAlreadyReviewed" Module="Core" Type="0">WW91IGhhdmUgYWxyZWFkeSBjb21tZW50ZWQgdGhpcyBpdGVtIQ==</PHRASE>
<PHRASE Label="lu_error_404_description" Module="Core" Type="0">U29ycnksIHRoZSByZXF1ZXN0ZWQgVVJMIHdhcyBub3QgZm91bmQgb24gb3VyIHNlcnZlci4=</PHRASE>
@@ -161,6 +159,7 @@
<PHRASE Label="lu_fld_Description" Module="Core" Type="0">RGVzY3JpcHRpb24=</PHRASE>
<PHRASE Label="lu_fld_Duration" Module="Core" Type="0">RHVyYXRpb24=</PHRASE>
<PHRASE Label="lu_fld_Email" Module="Core" Type="0">RS1NYWls</PHRASE>
+ <PHRASE Label="lu_fld_EmailOrUsername" Module="Core" Type="0">RS1tYWlsIG9yIFVzZXJuYW1l</PHRASE>
<PHRASE Label="lu_fld_Fax" Module="Core" Type="0">RmF4</PHRASE>
<PHRASE Label="lu_fld_File" Module="Core" Type="0">RmlsZQ==</PHRASE>
<PHRASE Label="lu_fld_File1" Module="Core" Type="0">UHJpbWFyeSBGaWxl</PHRASE>
@@ -240,7 +239,6 @@
<PHRASE Label="lu_OldToRecent" Module="Core" Type="0">T2xkIHRvIFJlY2VudA==</PHRASE>
<PHRASE Label="LU_Opt_SelectCategory" Module="Core" Type="0">U2VsZWN0IENhdGVnb3J5</PHRASE>
<PHRASE Label="lu_or" Module="Core" Type="0">b3I=</PHRASE>
- <PHRASE Label="lu_password" Module="Core" Type="0">UGFzc3dvcmQ=</PHRASE>
<PHRASE Label="lu_passwords_do_not_match" Module="Core" Type="0">UGFzc3dvcmRzIGRvIG5vdCBtYXRjaA==</PHRASE>
<PHRASE Label="lu_passwords_too_short" Module="Core" Type="0">UGFzc3dvcmQgaXMgdG9vIHNob3J0LCBwbGVhc2UgZW50ZXIgYXQgbGVhc3QgJXMgY2hhcmFjdGVycw==</PHRASE>
<PHRASE Label="lu_PendingItem" Module="Core" Type="0">cGVuZGluZyBpdGVt</PHRASE>
@@ -373,9 +371,7 @@
<PHRASE Label="lu_unsubscribe_confirm" Module="Core" Type="0">VW5zdWJzY3JpcHRpb24gQ29uZmlybWF0aW9u</PHRASE>
<PHRASE Label="lu_unsubscribe_confirm_prompt" Module="Core" Type="0">QXJlIHlvdSBzdXJlIHlvdSB3YW50IHRvIHVuc3Vic2NyaWJlIGZyb20gb3VyIG1haWxpbmcgbGlzdD8gKFlvdSBjYW4gYWx3YXlzIHN1YnNjcmliZSBhZ2FpbiBieSBlbnRlcmluZyB5b3VyIGVtYWlsIGF0IHRoZSBob21lIHBhZ2Up</PHRASE>
<PHRASE Label="lu_unsubscribe_title" Module="Core" Type="0">VW5zdWJzY3JpYmU=</PHRASE>
- <PHRASE Label="lu_username" Module="Core" Type="0">VXNlcm5hbWU=</PHRASE>
<PHRASE Label="lu_user_already_exist" Module="Core" Type="0">QSB1c2VyIHdpdGggc3VjaCB1c2VybmFtZSBhbHJlYWR5IGV4aXN0cy4=</PHRASE>
- <PHRASE Label="lu_user_and_email_already_exist" Module="Core" Type="0">QSB1c2VyIHdpdGggc3VjaCB1c2VybmFtZS9lLW1haWwgYWxyZWFkeSBleGlzdHMu</PHRASE>
<PHRASE Label="lu_user_pending_aproval_text" Module="Core" Type="0">VGhhbmsgeW91IGZvciByZWdpc3RlcmluZy4gWW91ciByZWdpc3RyYXRpb24gaXMgcGVuZGluZyBhZG1pbmlzdHJhdGl2ZSBhcHByb3ZhbC4=</PHRASE>
<PHRASE Label="lu_VerifyPassword" Module="Core" Type="0">VmVyaWZ5IHBhc3N3b3Jk</PHRASE>
<PHRASE Label="lu_visit_DirectReferer" Module="Core" Type="0">RGlyZWN0IGFjY2VzcyBvciBib29rbWFyaw==</PHRASE>
Index: advanced/platform/elements/side_boxes/login.elm.tpl
===================================================================
--- advanced/platform/elements/side_boxes/login.elm.tpl (revision 14705)
+++ advanced/platform/elements/side_boxes/login.elm.tpl (working copy)
@@ -84,17 +84,12 @@
<form method="post" action="<inp2:m_FormAction />">
<inp2:u.login-sidebox_FormName name="login"/>
- <inp2:m_if check="u.login-sidebox_UseUsernames">
- <inp2:m_phrase label="lu_username"/><br />
- <inp2:m_else/>
- <inp2:m_phrase label="lu_email"/><br />
- </inp2:m_if>
-
+ <inp2:m_phrase label="lu_fld_EmailOrUsername"/><br />
<input class="input-text" type="text" name="<inp2:u.login-sidebox_InputName name='UserLogin'/>" value="<inp2:u.login-sidebox_Field name='UserLogin'/>" style="width:155px" /><br />
<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="1" height="5" alt=""/><br />
- <inp2:m_Phrase label="lu_Password"/><br />
+ <inp2:m_Phrase label="lu_fld_Password"/><br />
<input type="password" class="input-text" name="<inp2:u.login-sidebox_InputName name='UserPassword'/>" value="<inp2:u.login-sidebox_Field name='UserPassword'/>" style="width:155px" /><br />
<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" alt="" width="1" height="10" border="0" /><br />
Index: advanced/platform/login/forgot_password.tpl
===================================================================
--- advanced/platform/login/forgot_password.tpl (revision 14720)
+++ advanced/platform/login/forgot_password.tpl (working copy)
@@ -42,11 +42,7 @@
<inp2:m_phrase name="lu_title_ForgotPassword"/>
</inp2:m_Capture>
- <inp2:m_if check="u_UseUsernames">
- <inp2:m_Phrase label="lu_EnterForgotUserEmail"/>
- <inp2:m_else/>
- <inp2:m_Phrase label="lu_EnterForgotEmail"/>
- </inp2:m_if>
+ <inp2:m_Phrase label="lu_EnterForgotUserEmail"/>
<br /><br />
<inp2:u.forgot_FormName name="forgot_password"/>
@@ -59,19 +55,17 @@
<form method="post" action="<inp2:m_FormAction/>">
<table class="form-data fullwidth">
- <inp2:m_if check="u_UseUsernames">
- <inp2:m_RenderElement name="inp_edit_box" prefix="u.forgot" field="ForgotLogin" title="lu_fld_Username" style="width: 155px;"/>
+ <inp2:m_RenderElement name="inp_edit_box" prefix="u.forgot" field="ForgotLogin" title="lu_fld_Username" style="width: 155px;"/>
- <tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
- <td class="field-name"></td>
- <td class="field-value">
- <inp2:m_Phrase label="lu_Or"/>
- </td>
- </tr>
- <inp2:m_RenderElement name="inp_edit_field_separator" is_last="0"/>
- </inp2:m_if>
+ <tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
+ <td class="field-name"></td>
+ <td class="field-value">
+ <inp2:m_Phrase label="lu_Or"/>
+ </td>
+ </tr>
+ <inp2:m_RenderElement name="inp_edit_field_separator" is_last="0"/>
- <inp2:m_RenderElement name="inp_edit_box" prefix="u.forgot" field="ForgotEmail" title="lu_fld_Email" style="width: 155px;"/>
+ <inp2:m_RenderElement name="inp_edit_box" prefix="u.forgot" field="ForgotEmail" title="lu_fld_Email" style="width: 155px;" is_last="1"/>
<inp2:m_RenderElement design="inp_edit_buttons">
<input type="hidden" name="template_success" value="platform/login/forgot_password_reset_notice"/>
|