Index: in-auction/install/english.lang =================================================================== --- in-auction/install/english.lang (revision 14705) +++ in-auction/install/english.lang (working copy) @@ -275,8 +275,8 @@ U3ViamVjdDogRmVlZGJhY2sgbm90IHJlY2VpdmVkCgpIZWxsbywgPGlucDI6dS5pdGVtX0ZpZWxkIG5hbWU9IkViYXlMb2dpbiIgLz4hPGJyLz48YnIvPg0KDQpQbGVhc2Ugc2VuZCBmZWVkYmFjayBhYm91dCBlQmF5IEl0ZW0gIzxpbnAyOmwtZWJheS5pdGVtX0ZpZWxkIG5hbWU9ImVCYXlMaXN0aW5nSWQiLz48YnIvPjxici8+DQoNClByb2R1Y3QgSWQ6IDxpbnAyOnAuaXRlbV9GaWVsZCBuYW1lPSJQcm9kdWN0SWQiIC8+PGJyLz4NClByb2R1Y3QgTmFtZTogPGlucDI6cC5pdGVtX0ZpZWxkIG5hbWU9ImwxX05hbWUiIC8+PGJyLz4NClByb2R1Y3QgU0tVOiA8aW5wMjpwLml0ZW1fRmllbGQgbmFtZT0iU0tVIiAvPjxici8+DQoNCg== - U3ViamVjdDogSXRlbSBpcyBOb3QgUGFpZCEKCkhlbGxvLCA8aW5wMjp1Lml0ZW1fRmllbGQgbmFtZT0iTG9naW4iIC8+ITxici8+PGJyLz4NCg0KZUJheSBJdGVtICM8aW5wMjptX1BhcmFtIG5hbWU9ImVCYXlMaXN0aW5nSWQiLz4gaW4gb3JkZXIgIzxpbnAyOm9yZC5pdGVtX0ZpZWxkIG5hbWU9Ik9yZGVyTnVtYmVyIi8+IGlzIG5vdCBwYWlkLjxici8+PGJyLz4NCg0KUGxlYXNlIGdvIHRvIHRoaXMgbGluayA8YSBocmVmPSI8aW5wMjptX1BhcmFtIG5hbWU9ImF1dG9sb2dpbl91cmwiLz4iPjxpbnAyOm1fUGFyYW0gbmFtZT0iYXV0b2xvZ2luX3VybCIvPjwvYT4gdG8gY29tcGxldGUgY2hlY2tvdXQuDQoNCg0K - U3ViamVjdDogSXRlbSBub3QgcGFpZCBub3RpZmljYXRpb24gaXMgc2VudAoKSXRlbSBub3QgcGFpZCBub3RpZmljYXRpb24gaXMgc2VudCB0byB1c2VyIDxpbnAyOnUuaXRlbV9GaWVsZCBuYW1lPSJMb2dpbiIgLz4uPGJyLz48YnIvPg0KDQplQmF5IEl0ZW0gIzxpbnAyOm1fUGFyYW0gbmFtZT0iZUJheUxpc3RpbmdJZCIvPiBpbiBvcmRlciAjPGlucDI6b3JkLml0ZW1fRmllbGQgbmFtZT0iT3JkZXJOdW1iZXIiLz4gaXMgbm90IHBhaWQuDQo= + U3ViamVjdDogSXRlbSBpcyBOb3QgUGFpZCEKCkhlbGxvLCA8aW5wMjp1Lml0ZW1fRmllbGQgbmFtZT0iVXNlcm5hbWUiIC8+ITxici8+PGJyLz4NCg0KZUJheSBJdGVtICM8aW5wMjptX1BhcmFtIG5hbWU9ImVCYXlMaXN0aW5nSWQiLz4gaW4gb3JkZXIgIzxpbnAyOm9yZC5pdGVtX0ZpZWxkIG5hbWU9Ik9yZGVyTnVtYmVyIi8+IGlzIG5vdCBwYWlkLjxici8+PGJyLz4NCg0KUGxlYXNlIGdvIHRvIHRoaXMgbGluayA8YSBocmVmPSI8aW5wMjptX1BhcmFtIG5hbWU9ImF1dG9sb2dpbl91cmwiLz4iPjxpbnAyOm1fUGFyYW0gbmFtZT0iYXV0b2xvZ2luX3VybCIvPjwvYT4gdG8gY29tcGxldGUgY2hlY2tvdXQuDQoNCg0K + U3ViamVjdDogSXRlbSBub3QgcGFpZCBub3RpZmljYXRpb24gaXMgc2VudAoKSXRlbSBub3QgcGFpZCBub3RpZmljYXRpb24gaXMgc2VudCB0byB1c2VyIDxpbnAyOnUuaXRlbV9GaWVsZCBuYW1lPSJVc2VybmFtZSIgLz4uPGJyLz48YnIvPg0KDQplQmF5IEl0ZW0gIzxpbnAyOm1fUGFyYW0gbmFtZT0iZUJheUxpc3RpbmdJZCIvPiBpbiBvcmRlciAjPGlucDI6b3JkLml0ZW1fRmllbGQgbmFtZT0iT3JkZXJOdW1iZXIiLz4gaXMgbm90IHBhaWQuDQo= U3ViamVjdDogZUJheSBPcmRlciBDcmVhdGVkCgpIZWxsbywgPGlucDI6bV9QYXJhbSBuYW1lPSJ1c2VybmFtZSIgLz4hPGJyLz48YnIvPg0KDQplQmF5IG9yZGVyIG51bWJlciA8aW5wMjpvcmQuaXRlbV9GaWVsZCBuYW1lPSJPcmRlck51bWJlciIvPiBoYXMgYmVlbiBzdWNjZXNzZnVsbHkgY3JlYXRlZC48YnIvPjxici8+DQoNClBsZWFzZSBnbyB0byB0aGlzIGxpbmsgPGEgaHJlZj0iPGlucDI6bV9QYXJhbSBuYW1lPSJhdXRvbG9naW5fdXJsIi8+Ij48aW5wMjptX1BhcmFtIG5hbWU9ImF1dG9sb2dpbl91cmwiLz48L2E+IHRvIGNvbXBsZXRlIGNoZWNrb3V0Lg0KDQo= 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),