#96 returning FirstName and LastName fields

boonex · Oct 8, 2015 · 8225f08 · 8225f08
1 parent 51d72d5
commit 8225f08
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 0 deletions.
diff --git a/inc/classes/BxDolMemberInfo.php b/inc/classes/BxDolMemberInfo.php
@@ -72,6 +72,15 @@ public function get ($aData)
 	        case 'sys_full_name':
 	            return htmlspecialchars_adv($aData['FullName'] ? $aData['FullName'] : $aData['NickName']);
 
+            case 'sys_first_name':
+                return $aData['FirstName'] ? $aData['FirstName'] : $aData['NickName'];
+
+            case 'sys_first_name_last_name':
+                return $aData['FirstName'] || $aData['LastName'] ? $aData['FirstName'] . ' ' . $aData['LastName'] : $aData['NickName'];
+
+            case 'sys_last_name_firs_name':
+                return $aData['FirstName'] || $aData['LastName'] ? $aData['LastName'] . ' ' . $aData['FirstName'] : $aData['NickName'];
+
 	        case 'sys_status_message':
 	            return $aData['UserStatusMessage'];
 

diff --git a/install/langs/lang-en.php b/install/langs/lang-en.php
@@ -317,9 +317,15 @@
   '_FieldCaption_Interests_Edit' => 'Interests',
   '_FieldCaption_Interests_View' => 'Interests',
   '_FieldCaption_Keyword_Search' => 'Keyword',
+  '_FieldCaption_FirstName_Edit' => 'First Name',
+  '_FieldCaption_FirstName_Join' => 'First  Name',
+  '_FieldCaption_FirstName_View' => 'First Name',
   '_FieldCaption_FullName_Edit' => 'Full Name',
   '_FieldCaption_FullName_Join' => 'Full Name',
   '_FieldCaption_FullName_View' => 'Full Name',
+  '_FieldCaption_LastName_Edit' => 'Last Name',
+  '_FieldCaption_LastName_Join' => 'Last Name',
+  '_FieldCaption_LastName_View' => 'Last Name',
   '_FieldCaption_Location_Search' => 'Location',
   '_FieldCaption_LookingFor_Edit' => 'Looking For',
   '_FieldCaption_LookingFor_Join' => 'Looking for',
@@ -383,7 +389,9 @@
   '_FieldDesc_ID_View' => 'ID',
   '_FieldDesc_Income_Edit' => 'Your income',
   '_FieldDesc_Interests_Edit' => 'Your Interests',
+  '_FieldDesc_FirstName_Join' => 'Enter your first name',
   '_FieldDesc_FullName_Join' => 'Enter your full name',
+  '_FieldDesc_LastName_Join' => 'Enter your last name',
   '_FieldDesc_LookingFor_Join' => 'Please specify whom you are looking for',
   '_FieldDesc_Membership_Edit' => 'Member membership level',
   '_FieldDesc_NickName_Join' => 'Choose a Username which will be used for logging in to the site',
@@ -414,9 +422,15 @@
   '_FieldError_Headline_Mandatory' => 'You must specify your headline',
   '_FieldError_Headline_Max' => 'Please, enter {0} character(s) or less',
   '_FieldError_Headline_Min' => 'Please, enter {0} character(s) or more',
+  '_FieldError_FirstName_Mandatory' => 'Enter your first name',
+  '_FieldError_FirstName_Max' => 'Please, enter {0} character(s) or less',
+  '_FieldError_FirstName_Min' => 'Please, enter {0} character(s) or more',  
   '_FieldError_FullName_Mandatory' => 'Enter your full name',
   '_FieldError_FullName_Max' => 'Please, enter {0} character(s) or less',
   '_FieldError_FullName_Min' => 'Please, enter {0} character(s) or more',
+  '_FieldError_LastName_Mandatory' => 'Enter your last name',
+  '_FieldError_LastName_Max' => 'Please, enter {0} character(s) or less',
+  '_FieldError_LastName_Min' => 'Please, enter {0} character(s) or more',
   '_FieldError_NickName_Check' => 'Your Username must contain only latin symbols, numbers or underscore ( _ ) or minus ( - ) signs',
   '_FieldError_NickName_Mandatory' => 'You must enter Username',
   '_FieldError_NickName_Max' => 'Your Username should be no longer than {0} characters long',
@@ -1880,6 +1894,9 @@
   '_sys_mailbox_back_outbox' => 'Back to outbox',
   '_sys_mailbox_back_trash' => 'Back to trash',
   '_sys_member_info_username' => 'Username',
+  '_sys_member_info_first_name' => 'First Name',
+  '_sys_member_info_first_name_last_name' => 'First Name + Last Name',
+  '_sys_member_info_last_name_firs_name' => 'Last Name + First Name',
   '_sys_member_info_full_name' => 'Full Name',
   '_sys_member_info_headline' => 'Headline',
   '_sys_member_info_status_message' => 'Status Message',

diff --git a/install/sql/v72.sql b/install/sql/v72.sql
@@ -2347,6 +2347,10 @@ INSERT INTO `sys_profile_fields` VALUES(64, 'FavoriteBooks', 'area', NULL, '', N
 INSERT INTO `sys_profile_fields` VALUES(66, 'FullName', 'text', NULL, '', 2, 200, '', 'LKey', '', 0, '', 1, 1, 0, 20, 1, 17, 2, 17, 2, 0, NULL, 17, 2, 17, 5, 0, NULL, 17, 2, '', 0, NULL, 0, NULL, 0, NULL, 0, 0);
 INSERT INTO `sys_profile_fields` VALUES(67, 'allow_view_to', 'system', NULL, '', NULL, NULL, '', 'LKey', '', 0, '', 0, 0, 0, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, '', 0, NULL, 0, NULL, 0, NULL, 0, 0);
 INSERT INTO `sys_profile_fields` VALUES(68, 'Agree', 'system', NULL, '', NULL, NULL, '', 'LKey', '', 0, '', 0, 0, 0, 20, 7, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, '', 0, NULL, 0, NULL, 0, NULL, 0, 0);
+INSERT INTO `sys_profile_fields` VALUES(NULL, 'FirstName', 'text', NULL, '', 2, 200, '', 'LKey', '', 0, '', 1, 0, 0, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, '', 0, NULL, 0, NULL, 0, NULL, 0, 0);
+INSERT INTO `sys_profile_fields` VALUES(NULL, 'LastName',  'text', NULL, '', 2, 200, '', 'LKey', '', 0, '', 1, 0, 0, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, '', 0, NULL, 0, NULL, 0, NULL, 0, 0);
+
+
 -- --------------------------------------------------------
 
 --
@@ -2425,6 +2429,8 @@ CREATE TABLE `Profiles` (
   `FavoriteFilms` text NOT NULL,
   `FavoriteBooks` text NOT NULL,
   `FullName` varchar(255) NOT NULL,
+  `FirstName` varchar(255) NOT NULL,
+  `LastName` varchar(255) NOT NULL,
   PRIMARY KEY  (`ID`),
   UNIQUE KEY `NickName` (`NickName`),
   KEY `Country` (`Country`),

diff --git a/modules/boonex/russian/data/lang-ru.php b/modules/boonex/russian/data/lang-ru.php
@@ -317,9 +317,15 @@
   '_FieldCaption_Interests_Edit' => 'Интересы',
   '_FieldCaption_Interests_View' => 'Интересы',
   '_FieldCaption_Keyword_Search' => 'Ключевое слово',
+  '_FieldCaption_FirstName_Edit' => 'Имя',
+  '_FieldCaption_FirstName_Join' => 'Имя',
+  '_FieldCaption_FirstName_View' => 'Имя',
   '_FieldCaption_FullName_Edit' => 'Полное имя',
   '_FieldCaption_FullName_Join' => 'Полное имя',
   '_FieldCaption_FullName_View' => 'Полное имя',
+  '_FieldCaption_LastName_Edit' => 'Фамилия',
+  '_FieldCaption_LastName_Join' => 'Фамилия',
+  '_FieldCaption_LastName_View' => 'Фамилия',
   '_FieldCaption_Location_Search' => 'Проживание',
   '_FieldCaption_LookingFor_Edit' => 'Ищу',
   '_FieldCaption_LookingFor_Join' => 'Ищу',
@@ -383,7 +389,9 @@
   '_FieldDesc_ID_View' => 'Номер',
   '_FieldDesc_Income_Edit' => 'Ваш доход',
   '_FieldDesc_Interests_Edit' => 'Ваши интересы',
+  '_FieldDesc_FirstName_Join' => 'Введите своё имя',
   '_FieldDesc_FullName_Join' => 'Введите свое полное имя',
+  '_FieldDesc_LastName_Join' => 'Введите свою фамилию',
   '_FieldDesc_LookingFor_Join' => 'Пожалуйста, укажите, кого Вы ищете',
   '_FieldDesc_Membership_Edit' => 'Членство пользователя',
   '_FieldDesc_NickName_Join' => 'Придумайте имя пользователя для доступа на сайт',
@@ -414,9 +422,15 @@
   '_FieldError_Headline_Mandatory' => 'Вы должны указать заголовок',
   '_FieldError_Headline_Max' => 'Пожалуйста, введите не более {0} символов',
   '_FieldError_Headline_Min' => 'Пожалуйста, введите не менее {0} символов',
+  '_FieldError_FirstName_Mandatory' => 'Введите своё имя',
+  '_FieldError_FirstName_Max' => 'Пожалуйста, введите не более {0} символов',
+  '_FieldError_FirstName_Min' => 'Пожалуйста, введите не менее {0} символов',
   '_FieldError_FullName_Mandatory' => 'Введите свое полное имя',
   '_FieldError_FullName_Max' => 'Пожалуйста, введите не более {0} символов',
   '_FieldError_FullName_Min' => 'Пожалуйста, введите не менее {0} символов',
+  '_FieldError_LastName_Mandatory' => 'Введите свою фамилию',
+  '_FieldError_LastName_Max' => 'Пожалуйста, введите не более {0} символов',
+  '_FieldError_LastName_Min' => 'Пожалуйста, введите не менее {0} символов',
   '_FieldError_NickName_Check' => 'Имя пользователя долджно содержать только латинские буквы, знак минус или знак подчёркивания',
   '_FieldError_NickName_Mandatory' => 'Вы должны ввести имя пользователя',
   '_FieldError_NickName_Max' => 'Имя пользователя должно быть не длиннее {0} символов',
@@ -1879,6 +1893,9 @@
   '_sys_mailbox_back_outbox' => 'Вернуться в отправленные',
   '_sys_mailbox_back_trash' => 'Вернуться в корзину',
   '_sys_member_info_username' => 'Имя пользователя',
+  '_sys_member_info_first_name' => 'Имя',
+  '_sys_member_info_first_name_last_name' => 'Имя + Фамилия',
+  '_sys_member_info_last_name_firs_name' => 'Фамилия + Имя',
   '_sys_member_info_full_name' => 'Полное имя',
   '_sys_member_info_headline' => 'Заголовок',
   '_sys_member_info_status_message' => 'Статус-сообщение',