Index: install/english.lang
===================================================================
--- install/english.lang (revision 14318)
+++ install/english.lang (working copy)
@@ -65,7 +65,7 @@
QWRkaXRpb25hbA==
QWRtaW4gUHJpbWFyeQ==
QWZmZWN0ZWQgSXRlbXM=
- QWx0IFZhbHVl
+ QWx0IFZhbHVl
QmNj
Qm91bmNlZCBPbg==
Qm91bmNlIEluZm8=
@@ -189,7 +189,7 @@
UnVsZSBUeXBl
UnVuIEludGVydmFs
UnVuIE1vZGU=
- U2VhcmNoIFRlcm0=
+ U2VhcmNoIFRlcm0=
QXR0ZW1wdHMg
U2VudCBPbg==
U2VudA==
@@ -353,11 +353,11 @@
SW5jb3JyZWN0IGRhdGUgZm9ybWF0LCBwbGVhc2UgdXNlICglcykgZXguICglcyk=
SW5jb3JyZWN0IGRhdGEgZm9ybWF0LCBwbGVhc2UgdXNlICVz
SW52YWxpZCBGb3JtYXQ=
- RmllbGQgaXMgb3V0IG9mIHJhbmdl
+ RmllbGQgdmFsdWUgbGVuZ3RoIGlzIG91dCBvZiByYW5nZSwgcG9zc2libGUgdmFsdWUgbGVuZ3RoIGZyb20gJXMgdG8gJXM=
UHJpbWFyeSBMYW5nLiB2YWx1ZSBSZXF1aXJlZA==
RmllbGQgaXMgcmVxdWlyZWQ=
RmllbGQgdmFsdWUgbXVzdCBiZSB1bmlxdWU=
- RmllbGQgaXMgb3V0IG9mIHJhbmdlLCBwb3NzaWJsZSB2YWx1ZXMgZnJvbSAlcyB0byAlcw==
+ RmllbGQgdmFsdWUgaXMgb3V0IG9mIHJhbmdlLCBwb3NzaWJsZSB2YWx1ZXMgZnJvbSAlcyB0byAlcw==
RXhwb3J0IGZvbGRlciBpcyBub3Qgd3JpdGFibGU=
RXJyb3IgY3JlYXRpbmcgZm9sZGVyLiBFcnJvciBudW1iZXI6
UGxlYXNlIG5hbWUgeW91ciBmaWxlcyB0byBiZSB3ZWItZnJpZW5kbHkuIFdlIHJlY29tbWVuZCB1c2luZyBvbmx5IHRoZXNlIGNoYXJhY3RlcnMgaW4gZmlsZSBuYW1lczogDQpMZXR0ZXJzIGEteiwgQS1aLCBOdW1iZXJzIDAtOSwgIl8iICh1bmRlcnNjb3JlKSwgIi0iIChkYXNoKSwgIiAiIChzcGFjZSksICIuIiAocGVyaW9kKQ0KUGxlYXNlIGF2b2lkIHVzaW5nIGFueSBvdGhlciBjaGFyYWN0ZXJzIGxpa2UgcXVvdGVzLCBicmFja2V0cywgcXVvdGF0aW9uIG1hcmtzLCAiPyIsICIhIiwgIj0iLCBmb3JlaWduIHN5bWJvbHMsIGV0Yy4=
@@ -643,7 +643,7 @@
U3RhdGU=
U3RhdGUgQ291bnRyeQ==
U3RhdHVz
- U3RvcCBXb3Jk
+ U3RvcCBXb3Jk
U3ViamVjdA==
U3VibWl0dGVkIE9u
U3VnZ2VzdGVkIENvcnJlY3Rpb24=
@@ -1013,7 +1013,7 @@
VXNlIG5vbi1ibG9ja2luZyBzb2NrZXQgbW9kZQ==
U1FMIFF1ZXJ5Og==
UGVyZm9ybSBTUUwgUXVlcnk=
- U3RlcCBPbmU=
+ U3RlcCBPbmU=
U3VibWl0dGVkIE9u
RW5hYmxlIFRhZyBDYWNoaW5n
VG90YWwgU2l6ZSBvZiBTeXN0ZW0gRmlsZXM=
@@ -1168,7 +1168,7 @@
U2hvdyBBbGw=
U2hvdyBTdHJ1Y3R1cmU=
V2Vic2l0ZSAmIENvbnRlbnQ=
- QWRtaW4gU2tpbnM=
+ QWRtaW4gU2tpbnM=
U3VtbWFyeQ==
Q29uZmlndXJhdGlvbg==
VGFnIGxpYnJhcnk=
@@ -1273,7 +1273,7 @@
QWRkaW5nIFBocmFzZQ==
QWRkaW5nIEtleXdvcmQ=
QWRkaW5nIFJlbGF0aW9uc2hpcA==
- QWRkaW5nIENvbW1lbnQ=
+ QWRkaW5nIENvbW1lbnQ=
QWRkaW5nIFRoZW1l
QWRkaW5nIFVzZXI=
QWRkaXRpb25hbCBQZXJtaXNzaW9ucw==
@@ -1323,7 +1323,7 @@
RWRpdGluZyBQaHJhc2U=
RWRpdGluZyBLZXl3b3Jk
RWRpdGluZyBSZWxhdGlvbnNoaXA=
- RWRpdGluZyBDb21tZW50
+ RWRpdGluZyBDb21tZW50
RWRpdGluZyBUaGVtZQ==
RWRpdGluZyBVc2Vy
RS1tYWlsIENvbW11bmljYXRpb24=
@@ -1362,7 +1362,7 @@
TmV3IEZpZWxk
TmV3IEltYWdl
TmV3IFJlbGF0aW9uc2hpcA==
- TmV3IENvbW1lbnQ=
+ TmV3IENvbW1lbnQ=
Tm8gUGVybWlzc2lvbnM=
UGVybWlzc2lvbnM=
TGFiZWxzICYgUGhyYXNlcw==
@@ -1380,7 +1380,7 @@
U2l0ZSBEb21haW5z
U3BlbGxpbmcgRGljdGlvbmFyeQ==
U3RvcCBXb3Jkcw==
- U3RydWN0dXJlICYgRGF0YQ==
+ U3RydWN0dXJlICYgRGF0YQ==
U3lzdGVtIFRvb2xz
Q2xlYXIgVGVtcGxhdGVzIENhY2hl
Q29tbW9ubHkgVXNlZCBLZXlz
@@ -1450,7 +1450,7 @@
TmV3IENvbW1lbnQ=
TmV3IFNlYXJjaCBGaWVsZA==
TmV3IFNpdGUgRG9tYWlu
- TmV3IFN0b3AgV29yZA==
+ TmV3IFN0b3AgV29yZA==
TmV3IFRlcm0=
TmV3IFRoZW1l
TmV3IFVzZXI=
Index: units/users/users_config.php
===================================================================
--- units/users/users_config.php (revision 14318)
+++ units/users/users_config.php (working copy)
@@ -348,7 +348,12 @@
'Fields' => Array
(
'PortalUserId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
- 'Login' => Array ('type' => 'string', 'unique'=>Array('Login'), 'default' => null,'required'=>1, 'error_msgs' => Array('unique'=>'!lu_user_already_exist!', 'banned' => '!la_error_UserBanned!')),
+ 'Login' => Array (
+ 'type' => 'string', 'max_len' => 255,
+ 'unique' => Array ('Login'),
+ 'error_msgs' => Array ('unique' => '!lu_user_already_exist!', 'banned' => '!la_error_UserBanned!'),
+ 'required' => 1, 'default' => NULL,
+ ),
'Password' => Array ('type' => 'string', 'formatter' => 'kPasswordFormatter', 'encryption_method' => 'md5', 'verify_field' => 'VerifyPassword', 'skip_empty' => 1, 'default' => md5('')),
'FirstName' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''),
'LastName' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''),
Index: units/users/users_event_handler.php
===================================================================
--- units/users/users_event_handler.php (revision 14318)
+++ units/users/users_event_handler.php (working copy)
@@ -1380,13 +1380,16 @@
$first_country = $this->Application->ConfigValue('User_Default_Registration_Country');
}
+ $fields = $this->Application->getUnitOption($event->Prefix, 'Fields');
+
if ($first_country) {
// update user country dropdown sql
- $fields = $this->Application->getUnitOption($event->Prefix, 'Fields');
$fields['Country']['options_sql'] = preg_replace('/ORDER BY (.*)/', 'ORDER BY IF (CountryStateId = '.$first_country.', 1, 0) DESC, \\1', $fields['Country']['options_sql']);
- $this->Application->setUnitOption($event->Prefix, 'Fields', $fields);
}
+ $fields['Login']['min_len'] = $this->Application->ConfigValue('Min_UserName');
+ $this->Application->setUnitOption($event->Prefix, 'Fields', $fields);
+
// 2. set default user registration group
$virtual_fields = $this->Application->getUnitOption($event->Prefix, 'VirtualFields');
$virtual_fields['UserGroup']['default'] = $this->Application->ConfigValue('User_NewGroup');