Ticket #255 - Clean up: Login/Join forms.

install/sql/system.sql

@@ -2264,7 +2264,8 @@ INSERT INTO `sys_form_inputs` (`object`, `module`, `name`, `value`, `values`, `c
 ('sys_account', 'system', 'password_current', '', '', 0, 'password', '_sys_form_login_input_caption_system_password_current', '_sys_form_account_input_password_current', '', 1, 0, 0, '', '', '', 'PasswordCurrent', '', '_sys_form_account_input_password_current_error', '', '', 0, 0),
 ('sys_account', 'system', 'delete_confirm', '1', '', 0, 'checkbox', '_sys_form_login_input_caption_system_delete_confirm', '_sys_form_account_input_delete_confirm', '_sys_form_account_input_delete_confirm_info', 1, 0, 0, '', '', '', 'Avail', '', '_sys_form_account_input_delete_confirm_error', '', '', 0, 0),
 ('sys_account', 'system', 'receive_updates', '1', '', 1, 'switcher', '_sys_form_login_input_caption_system_receive_updates', '_sys_form_account_input_receive_updates', '', 0, 0, 0, '', '', '', '', '', '', 'Int', '', 0, 0),
-('sys_account', 'system', 'receive_news', '1', '', 0, 'switcher', '_sys_form_login_input_caption_system_receive_news', '_sys_form_account_input_receive_news', '', 0, 0, 0, '', '', '', '', '', '', 'Int', '', 0, 0),
+('sys_account', 'system', 'receive_news', '1', '', 1, 'switcher', '_sys_form_login_input_caption_system_receive_news', '_sys_form_account_input_receive_news', '', 0, 0, 0, '', '', '', '', '', '', 'Int', '', 0, 0),
+('sys_account', 'system', 'agreement', '', '', 0, 'custom', '_sys_form_login_input_caption_system_agreement', '_sys_form_account_input_agreement', '', 0, 0, 0, '', '', '', '', '', '', '', '', 0, 0),
 
 ('sys_forgot_password', 'system', 'email', '', '', 0, 'text', '_sys_form_forgot_password_input_caption_system_email', '_sys_form_forgot_password_input_email', '', 1, 0, 0, '', '', '', 'EmailExist', '', '_sys_form_account_input_email_error', 'Xss', '', 0, 0),
 ('sys_forgot_password', 'system', 'captcha', '', '', 0, 'captcha', '_sys_form_login_input_caption_system_captcha', '_sys_form_account_input_captcha', '', 1, 0, 0, '', '', '', 'Captcha', '', '_sys_form_account_input_captcha_error', '', '', 0, 0),
@@ -2320,11 +2321,9 @@ INSERT INTO `sys_form_display_inputs` (`display_name`, `input_name`, `visible_fo
 
 ('sys_account_create', 'name', 2147483647, 1, 1),
 ('sys_account_create', 'email', 2147483647, 1, 2),
-('sys_account_create', 'receive_news', 2147483647, 1, 3),
-('sys_account_create', 'password', 2147483647, 1, 4),
-('sys_account_create', 'password_confirm', 2147483647, 1, 5),
-('sys_account_create', 'captcha', 2147483647, 1, 6),
-('sys_account_create', 'do_submit', 2147483647, 1, 7),
+('sys_account_create', 'password', 2147483647, 1, 3),
+('sys_account_create', 'do_submit', 2147483647, 1, 4),
+('sys_account_create', 'agreement', 2147483647, 1, 5),
 
 ('sys_account_settings_email', 'email', 2147483647, 1, 1),
 ('sys_account_settings_email', 'password_current', 2147483647, 1, 2),
@@ -2856,8 +2855,10 @@ INSERT INTO `sys_menu_items` (`set_name`, `module`, `name`, `title_system`, `tit
 -- footer menu
 INSERT INTO `sys_menu_items` (`set_name`, `module`, `name`, `title_system`, `title`, `link`, `onclick`, `target`, `icon`, `submenu_object`, `visible_for_levels`, `active`, `copyable`, `order`) VALUES
 ('sys_footer', 'system', 'about', '_sys_menu_item_title_system_about', '_sys_menu_item_title_about', 'page.php?i=about', '', '', '', '', 2147483647, 1, 1, 1),
-('sys_footer', 'system', 'switch_language', '_sys_menu_item_title_system_switch_language', '_sys_menu_item_title_switch_language', 'javascript:void(0);', 'bx_menu_popup(''sys_switch_language_popup'', window);', '', '', '', 2147483647, 0, 1, 2),
-('sys_footer', 'system', 'switch_template', '_sys_menu_item_title_system_switch_template', '_sys_menu_item_title_switch_template', 'javascript:void(0);', 'bx_menu_popup(''sys_switch_template'', window);', '', '', '', 2147483647, 1, 1, 3);
+('sys_footer', 'system', 'terms', '_sys_menu_item_title_system_terms', '_sys_menu_item_title_terms', 'page.php?i=terms', '', '', '', '', 2147483647, 1, 1, 2),
+('sys_footer', 'system', 'privacy', '_sys_menu_item_title_system_privacy', '_sys_menu_item_title_privacy', 'page.php?i=privacy', '', '', '', '', 2147483647, 1, 1, 3),
+('sys_footer', 'system', 'switch_language', '_sys_menu_item_title_system_switch_language', '_sys_menu_item_title_switch_language', 'javascript:void(0);', 'bx_menu_popup(''sys_switch_language_popup'', window);', '', '', '', 2147483647, 0, 1, 4),
+('sys_footer', 'system', 'switch_template', '_sys_menu_item_title_system_switch_template', '_sys_menu_item_title_switch_template', 'javascript:void(0);', 'bx_menu_popup(''sys_switch_template'', window);', '', '', '', 2147483647, 1, 1, 5);
 
 -- site toolbar menu
 INSERT INTO `sys_menu_items`(`set_name`, `module`, `name`, `title_system`, `title`, `link`, `onclick`, `target`, `icon`, `submenu_object`, `visible_for_levels`, `active`, `copyable`, `order`) VALUES 
@@ -3284,6 +3285,8 @@ CREATE TABLE IF NOT EXISTS `sys_objects_page` (
 INSERT INTO `sys_objects_page` (`object`, `uri`, `title_system`, `title`, `module`, `layout_id`, `visible_for_levels`, `visible_for_levels_editable`, `url`, `meta_description`, `meta_keywords`, `meta_robots`, `cache_lifetime`, `cache_editable`, `deletable`, `override_class_name`, `override_class_file`) VALUES
 ('sys_home', 'home', '_sys_page_title_system_home', '_sys_page_title_home', 'system', 5, 2147483647, 1, '', '', '', '', 0, 1, 0, 'BxTemplPageHome', ''),
 ('sys_about', 'about', '_sys_page_title_system_about', '_sys_page_title_about', 'system', 5, 2147483647, 1, 'page.php?i=about', '', '', '', 0, 1, 0, '', ''),
+('sys_terms', 'terms', '_sys_page_title_system_terms', '_sys_page_title_terms', 'system', 5, 2147483647, 1, 'page.php?i=terms', '', '', '', 0, 1, 0, '', ''),
+('sys_privacy', 'privacy', '_sys_page_title_system_privacy', '_sys_page_title_privacy', 'system', 5, 2147483647, 1, 'page.php?i=privacy', '', '', '', 0, 1, 0, '', ''),
 ('sys_dashboard', 'dashboard', '_sys_page_title_system_dashboard', '_sys_page_title_dashboard', 'system', 11, 2147483646, 1, 'page.php?i=dashboard', '', '', '', 0, 1, 0, 'BxTemplPageDashboard', ''),
 ('sys_create_account', 'create-account', '_sys_page_title_system_create_account', '_sys_page_title_create_account', 'system', 5, 2147483647, 1, 'page.php?i=create-account', '', '', '', 0, 1, 0, '', ''),
 ('sys_login', 'login', '_sys_page_title_system_login', '_sys_page_title_login', 'system', 5, 2147483647, 1, 'page.php?i=login', '', '', '', 0, 1, 0, '', ''),
@@ -3381,6 +3384,10 @@ INSERT INTO `sys_pages_blocks` (`object`, `cell_id`, `module`, `title_system`, `
 
 ('sys_about', 1, 'system', '', '_sys_page_block_title_about', 11, 2147483647, 'lang', '_sys_page_lang_block_about', 0, 1, 1),
 
+('sys_terms', 1, 'system', '', '_sys_page_block_title_terms', 11, 2147483647, 'lang', '_sys_page_lang_block_terms', 0, 1, 1),
+
+('sys_privacy', 1, 'system', '', '_sys_page_block_title_privacy', 11, 2147483647, 'lang', '_sys_page_lang_block_privacy', 0, 1, 1),
+
 ('sys_dashboard', 2, 'system', '', '_sys_page_block_title_profile_stats', 13, 2147483646, 'service', 'a:4:{s:6:"module";s:6:"system";s:6:"method";s:13:"profile_stats";s:6:"params";a:0:{}s:5:"class";s:20:"TemplServiceProfiles";}', 0, 1, 0),
 
 ('sys_dashboard', 2, 'system', '', '_sys_page_block_title_profile_membership', 11, 2147483647, 'service', 'a:4:{s:6:"module";s:6:"system";s:6:"method";s:18:"profile_membership";s:6:"params";a:0:{}s:5:"class";s:20:"TemplServiceProfiles";}', 0, 1, 1),

modules/boonex/english/data/langs/system/en.xml

@@ -1618,6 +1618,8 @@ If it is not enabled then please consider implement this optimization, since it
 	<string name="_sys_et_txt_subject_bg_operation_failed"><![CDATA[Background operation failed]]></string>
 	<string name="_sys_et_txt_unsubscribe"><![CDATA[Unsubscribe]]></string>
 	<string name="_sys_form_account"><![CDATA[Account]]></string>
+	<string name="_sys_form_account_input_agreement"><![CDATA[]]></string>
+	<string name="_sys_form_account_input_agreement_value"><![CDATA[<div class="bx-def-font-align-center bx-def-font-small bx-def-font-grayed">By signing up, you agree to the <a href="{0}">Terms of Service</a> and <a href="{1}">Privacy Policy</a>.</div>]]></string>
 	<string name="_sys_form_account_input_captcha"><![CDATA[Security Image]]></string>
 	<string name="_sys_form_account_input_captcha_error"><![CDATA[Security image input failed. Please, try again.]]></string>
 	<string name="_sys_form_account_input_captcha_label_text_image"><![CDATA[Type the text:]]></string>
@@ -1637,17 +1639,17 @@ If it is not enabled then please consider implement this optimization, since it
 	<string name="_sys_form_account_input_email_error"><![CDATA[Email is not valid]]></string>
 	<string name="_sys_form_account_input_email_uniq_error"><![CDATA[This email address is already registered. Please, use <a href="{0}">Forgot password</a> to restore access to your account.]]></string>
 	<string name="_sys_form_account_input_email_uniq_error_loggedin"><![CDATA[This email is already used by someone.]]></string>
-	<string name="_sys_form_account_input_name"><![CDATA[Account Name]]></string>
+	<string name="_sys_form_account_input_name"><![CDATA[Account name]]></string>
 	<string name="_sys_form_account_input_name_error"><![CDATA[This is a required field.]]></string>
-	<string name="_sys_form_account_input_password"><![CDATA[New Password]]></string>
-	<string name="_sys_form_account_input_password_confirm"><![CDATA[Confirm New Password]]></string>
+	<string name="_sys_form_account_input_password"><![CDATA[Create a password]]></string>
+	<string name="_sys_form_account_input_password_confirm"><![CDATA[Confirm a password]]></string>
 	<string name="_sys_form_account_input_password_confirm_error"><![CDATA[Password confirmation failed]]></string>
 	<string name="_sys_form_account_input_password_current"><![CDATA[Current Password]]></string>
 	<string name="_sys_form_account_input_password_current_error"><![CDATA[Current password isn't correct, please enter password you are using to login to this site.]]></string>
 	<string name="_sys_form_account_input_password_error"><![CDATA[Password must at least 6 characters long.]]></string>
 	<string name="_sys_form_account_input_receive_news"><![CDATA[Receive Newsletters]]></string>
 	<string name="_sys_form_account_input_receive_updates"><![CDATA[Receive Site Updates]]></string>
-	<string name="_sys_form_account_input_submit"><![CDATA[Submit]]></string>
+	<string name="_sys_form_account_input_submit"><![CDATA[Sign up]]></string>
 	<string name="_sys_form_checkbox_value_off"><![CDATA[No]]></string>
 	<string name="_sys_form_checkbox_value_on"><![CDATA[Yes]]></string>
 	<string name="_sys_form_comment"><![CDATA[Comment]]></string>
@@ -1688,12 +1690,13 @@ If it is not enabled then please consider implement this optimization, since it
 	<string name="_sys_form_input_sys_location"><![CDATA[Location]]></string>
 	<string name="_sys_form_input_location"><![CDATA[Location]]></string>
 	<string name="_sys_form_login"><![CDATA[Sign in]]></string>
+	<string name="_sys_form_login_input_caption_system_agreement"><![CDATA[Agreement]]></string>
 	<string name="_sys_form_login_input_caption_system_captcha"><![CDATA[Captcha]]></string>
 	<string name="_sys_form_login_input_caption_system_delete_confirm"><![CDATA[Confirm Delete]]></string>
-	<string name="_sys_form_login_input_caption_system_do_submit"><![CDATA[Submit]]></string>
+	<string name="_sys_form_login_input_caption_system_do_submit"><![CDATA[Sign up]]></string>
 	<string name="_sys_form_login_input_caption_system_email"><![CDATA[Email]]></string>
 	<string name="_sys_form_login_input_caption_system_id"><![CDATA[ID]]></string>
-	<string name="_sys_form_login_input_caption_system_name"><![CDATA[Account Name]]></string>
+	<string name="_sys_form_login_input_caption_system_name"><![CDATA[Account name]]></string>
 	<string name="_sys_form_login_input_caption_system_password"><![CDATA[Password]]></string>
 	<string name="_sys_form_login_input_caption_system_password_confirm"><![CDATA[Confirm Password]]></string>
 	<string name="_sys_form_login_input_caption_system_password_current"><![CDATA[Current Password]]></string>
@@ -1828,11 +1831,13 @@ If it is not enabled then please consider implement this optimization, since it
 	<string name="_sys_location_geolocation_not_supported_by_browser"><![CDATA[Geolocation is not supported by this browser]]></string>
 	<string name="_sys_location_undefined"><![CDATA[Location off]]></string>
 	<string name="_sys_menu_item_title_about"><![CDATA[About]]></string>
+	<string name="_sys_menu_item_title_privacy"><![CDATA[Privacy]]></string>
 	<string name="_sys_menu_item_title_search"><![CDATA[Search]]></string>
 	<string name="_sys_menu_item_title_switch_language"><![CDATA[Language]]></string>
 	<string name="_sys_menu_item_title_switch_language_mask"><![CDATA[{1} {0}]]></string>
 	<string name="_sys_menu_item_title_switch_template"><![CDATA[Design]]></string>
 	<string name="_sys_menu_item_title_switch_template_mask"><![CDATA[{0}]]></string>
+	<string name="_sys_menu_item_title_terms"><![CDATA[Terms]]></string>
 	<string name="_sys_menu_item_title_account_menu"><![CDATA[{member_display_name}]]></string>
 	<string name="_sys_menu_item_title_account_profile_context"><![CDATA[Profiles]]></string>
 	<string name="_sys_menu_item_title_account_dashboard"><![CDATA[Dashboard]]></string>
@@ -1857,8 +1862,10 @@ If it is not enabled then please consider implement this optimization, since it
 	<string name="_sys_menu_item_title_set_acl_level"><![CDATA[Set membership]]></string>
 	<string name="_sys_menu_item_title_studio"><![CDATA[Studio]]></string>
 	<string name="_sys_menu_item_title_system_about"><![CDATA[About]]></string>
+	<string name="_sys_menu_item_title_system_privacy"><![CDATA[Privacy]]></string>
 	<string name="_sys_menu_item_title_system_switch_language"><![CDATA[Language]]></string>
 	<string name="_sys_menu_item_title_system_switch_template"><![CDATA[Template]]></string>
+	<string name="_sys_menu_item_title_system_terms"><![CDATA[Terms]]></string>
 	<string name="_sys_menu_item_title_system_account_menu"><![CDATA[Account]]></string>
 	<string name="_sys_menu_item_title_system_account_profile_context"><![CDATA[Profiles]]></string>
 	<string name="_sys_menu_item_title_system_account_dashboard_administration"><![CDATA[Administration]]></string>
@@ -1962,7 +1969,7 @@ If it is not enabled then please consider implement this optimization, since it
 	<string name="_sys_page_block_title_account_settings_pwd"><![CDATA[Change Password]]></string>
 	<string name="_sys_page_block_title_add_content"><![CDATA[Add Content]]></string>
 	<string name="_sys_page_block_title_confirm_email"><![CDATA[Email Confirmation]]></string>
-	<string name="_sys_page_block_title_create_account"><![CDATA[Create Account]]></string>
+	<string name="_sys_page_block_title_create_account"><![CDATA[Sign up]]></string>
 	<string name="_sys_page_block_title_dashboard"><![CDATA[Dashboard]]></string>
 	<string name="_sys_page_block_title_homepage_menu"><![CDATA[Content modules menu]]></string>
 	<string name="_sys_page_block_title_forgot_password"><![CDATA[Forgot Password]]></string>
@@ -1970,6 +1977,7 @@ If it is not enabled then please consider implement this optimization, since it
 	<string name="_sys_page_block_system_title_login_only"><![CDATA[Sign in]]></string>
 	<string name="_sys_page_block_title_login"><![CDATA[Sign in]]></string>
 	<string name="_sys_page_block_title_manage_tools"><![CDATA[Manage]]></string>
+	<string name="_sys_page_block_title_privacy"><![CDATA[Privacy Policy]]></string>
 	<string name="_sys_page_block_title_profile_stats"><![CDATA[Profile stats]]></string>
 	<string name="_sys_page_block_title_profile_membership"><![CDATA[Membership]]></string>
 	<string name="_sys_page_block_title_unsubscribe_news"><![CDATA[Unsubscribe From Site Newsletters]]></string>
@@ -1978,7 +1986,10 @@ If it is not enabled then please consider implement this optimization, since it
 	<string name="_sys_page_block_title_std_dash_space"><![CDATA[Space Usage]]></string>
 	<string name="_sys_page_block_title_std_dash_host_tools"><![CDATA[Host Tools]]></string>
 	<string name="_sys_page_block_title_std_dash_cache"><![CDATA[Cache]]></string>
+	<string name="_sys_page_block_title_terms"><![CDATA[Terms of Service]]></string>
 	<string name="_sys_page_lang_block_about"><![CDATA[This site is powered by BoonEx Trident. The rest is a mystery.]]></string>
+	<string name="_sys_page_lang_block_terms"><![CDATA[Our terms of use.]]></string>
+	<string name="_sys_page_lang_block_privacy"><![CDATA[Our privacy policy.]]></string>
 	<string name="_sys_page_title_about"><![CDATA[About]]></string>
 	<string name="_sys_page_title_account_profile_switcher"><![CDATA[Switch Profile]]></string>
 	<string name="_sys_page_title_account_settings_delete"><![CDATA[Delete Account]]></string>
@@ -1987,11 +1998,13 @@ If it is not enabled then please consider implement this optimization, since it
 	<string name="_sys_page_title_account_settings_pwd"><![CDATA[Change Password]]></string>
 	<string name="_sys_page_title_add_content"><![CDATA[Add Content]]></string>
 	<string name="_sys_page_title_confirm_email"><![CDATA[Email Confirmation]]></string>
-	<string name="_sys_page_title_create_account"><![CDATA[Create Account]]></string>
+	<string name="_sys_page_title_create_account"><![CDATA[Sign up]]></string>
 	<string name="_sys_page_title_dashboard"><![CDATA[Dashboard]]></string>
 	<string name="_sys_page_title_forgot_password"><![CDATA[Forgot Password]]></string>
 	<string name="_sys_page_title_home"><![CDATA[{site_title} :: Homepage]]></string>
 	<string name="_sys_page_title_login"><![CDATA[Sign in]]></string>
+	<string name="_sys_page_title_privacy"><![CDATA[Privacy Policy]]></string>
+	<string name="_sys_page_title_terms"><![CDATA[Terms of Service]]></string>
 	<string name="_sys_page_title_system_about"><![CDATA[About]]></string>
 	<string name="_sys_page_title_system_account_profile_switcher"><![CDATA[Switch Profile]]></string>
 	<string name="_sys_page_title_system_account_settings_delete"><![CDATA[Delete Account]]></string>
@@ -2000,11 +2013,13 @@ If it is not enabled then please consider implement this optimization, since it
 	<string name="_sys_page_title_system_account_settings_pwd"><![CDATA[Change Password]]></string>
 	<string name="_sys_page_title_system_add_content"><![CDATA[Add Content]]></string>
 	<string name="_sys_page_title_system_confirm_email"><![CDATA[Email Confirmation]]></string>
-	<string name="_sys_page_title_system_create_account"><![CDATA[Create Account]]></string>
+	<string name="_sys_page_title_system_create_account"><![CDATA[Sign up]]></string>
 	<string name="_sys_page_title_system_dashboard"><![CDATA[Dashboard]]></string>
 	<string name="_sys_page_title_system_forgot_password"><![CDATA[Forgot Password]]></string>
 	<string name="_sys_page_title_system_home"><![CDATA[Homepage]]></string>
 	<string name="_sys_page_title_system_login"><![CDATA[Sign in]]></string>
+	<string name="_sys_page_title_system_privacy"><![CDATA[Privacy Policy]]></string>
+	<string name="_sys_page_title_system_terms"><![CDATA[Terms of Service]]></string>
 	<string name="_sys_page_title_system_unsubscribe_news"><![CDATA[Unsubscribe From Newsletters]]></string>
 	<string name="_sys_page_title_system_unsubscribe_notifications"><![CDATA[Unsubscribe From Notifications]]></string>
 	<string name="_sys_page_title_system_studio_dashboard"><![CDATA[Studio Dashboard]]></string>
@@ -2163,6 +2178,7 @@ If it is not enabled then please consider implement this optimization, since it
 	<string name="_sys_txt_form_submission_error"><![CDATA[Incorrect info. Please, check your inputs and try to submit again.]]></string>
 
     <string name="_sys_txt_homepage_cover"><![CDATA[Unity is strength... when there is teamwork and collaboration, wonderful things can be achieved.<br /><button class="bx-btn bx-hide-when-logged-in bx-def-margin-top" onclick="document.location='{0}'">Join Now!</button>]]></string>
+    <string name="_sys_txt_join_description"><![CDATA[Already a member? <a href="{0}">Log in.</a>]]></string>
 	<string name="_sys_txt_login_description"><![CDATA[Not a member yet? <a href="{0}">Join now!</a>]]></string>
 	<string name="_sys_txt_login_error"><![CDATA[Entered email or password is incorrect. Please try again.]]></string>
 	<string name="_sys_txt_login_invalid_role"><![CDATA[Access denied]]></string>

modules/boonex/persons/install/langs/en.xml

@@ -15,6 +15,7 @@
 	<string name="_bx_persons_form_profile_display_delete"><![CDATA[Delete Person]]></string>
 	<string name="_bx_persons_form_profile_display_view"><![CDATA[View Person]]></string>
     <string name="_bx_persons_form_profile_input_sys_do_submit"><![CDATA[Submit]]></string>
+    <string name="_bx_persons_form_profile_input_submit"><![CDATA[Submit]]></string>
     <string name="_bx_persons_form_profile_input_sys_allow_view_to"><![CDATA[Privacy]]></string>
     <string name="_bx_persons_form_profile_input_allow_view_to"><![CDATA[Privacy]]></string>
 	<string name="_bx_persons_form_profile_input_sys_fullname"><![CDATA[Full Name]]></string>

modules/boonex/persons/install/sql/install.sql

@@ -105,7 +105,7 @@ INSERT INTO `sys_form_inputs`(`object`, `module`, `name`, `value`, `values`, `ch
 ('bx_person', 'bx_persons', 'cover', '', '', 0, 'file', '_bx_persons_form_profile_input_sys_cover', '_bx_persons_form_profile_input_cover', '', 0, 0, 0, '', '', '', '', '', '', 'Int', '', 1, 0),
 ('bx_person', 'bx_persons', 'cover_preview', '', '', 0, 'custom', '_bx_persons_form_profile_input_sys_cover_preview', '_bx_persons_form_profile_input_cover_preview', '', 0, 0, 0, '', '', '', '', '', '', '', '', 1, 0),
 ('bx_person', 'bx_persons', 'delete_confirm', 1, '', 0, 'checkbox', '_bx_persons_form_profile_input_sys_delete_confirm', '_bx_persons_form_profile_input_delete_confirm', '_bx_persons_form_profile_input_delete_confirm_info', 1, 0, 0, '', '', '', 'Avail', '', '_bx_persons_form_profile_input_delete_confirm_error', '', '', 1, 0),
-('bx_person', 'bx_persons', 'do_submit', '_sys_form_account_input_submit', '', 0, 'submit', '_bx_persons_form_profile_input_sys_do_submit', '', '', 0, 0, 0, '', '', '', '', '', '', '', '', 1, 0),
+('bx_person', 'bx_persons', 'do_submit', '_bx_persons_form_profile_input_submit', '', 0, 'submit', '_bx_persons_form_profile_input_sys_do_submit', '', '', 0, 0, 0, '', '', '', '', '', '', '', '', 1, 0),
 ('bx_person', 'bx_persons', 'description', '', '', 0, 'textarea', '_bx_persons_form_profile_input_sys_desc', '_bx_persons_form_profile_input_desc', '', 0, 0, 0, '', '', '', '', '', '', 'Xss', '', 1, 1),
 ('bx_person', 'bx_persons', 'fullname', '', '', 0, 'text', '_bx_persons_form_profile_input_sys_fullname', '_bx_persons_form_profile_input_fullname', '', 1, 0, 0, '', '', '', 'Avail', '', '_bx_persons_form_profile_input_fullname_err', 'Xss', '', 1, 0),
 ('bx_person', 'bx_persons', 'picture', '', '', 0, 'file', '_bx_persons_form_profile_input_sys_picture', '_bx_persons_form_profile_input_picture', '', 1, 0, 0, '', '', '', 'Avail', '', '_bx_persons_form_profile_input_picture_err', 'Int', '', 1, 0),

modules/boonex/russian/data/langs/bx_persons/ru.xml

@@ -15,6 +15,7 @@
 	<string name="_bx_persons_form_profile_display_delete"><![CDATA[Удалить персону]]></string>
 	<string name="_bx_persons_form_profile_display_view"><![CDATA[Просмотреть персону]]></string>
     <string name="_bx_persons_form_profile_input_sys_do_submit"><![CDATA[Выполнить]]></string>
+    <string name="_bx_persons_form_profile_input_submit"><![CDATA[Выполнить]]></string>
     <string name="_bx_persons_form_profile_input_sys_allow_view_to"><![CDATA[Конфиденциальность]]></string>
     <string name="_bx_persons_form_profile_input_allow_view_to"><![CDATA[Конфиденциальность]]></string>
 	<string name="_bx_persons_form_profile_input_sys_fullname"><![CDATA[Полное имя]]></string>

modules/boonex/russian/data/langs/system/ru.xml

@@ -1618,6 +1618,8 @@
 	<string name="_sys_et_txt_subject_bg_operation_failed"><![CDATA[Фоновая операция не удалась]]></string>
 	<string name="_sys_et_txt_unsubscribe"><![CDATA[Отписаться]]></string>
 	<string name="_sys_form_account"><![CDATA[Аккаунт]]></string>
+	<string name="_sys_form_account_input_agreement"><![CDATA[]]></string>
+	<string name="_sys_form_account_input_agreement_value"><![CDATA[<div class="bx-def-font-align-center bx-def-font-small bx-def-font-grayed">Присоединяясь, Вы соглашаетесь с <a href="{0}">Правилами пользования</a> и <a href="{1}">Политикой конфиденциальности</a>.</div>]]></string>
 	<string name="_sys_form_account_input_captcha"><![CDATA[Капча]]></string>
 	<string name="_sys_form_account_input_captcha_error"><![CDATA[Проверка капчи не удалась. Попытайтесь ещё раз.]]></string>
 	<string name="_sys_form_account_input_captcha_label_text_image"><![CDATA[Введите текст:]]></string>
@@ -1639,15 +1641,15 @@
 	<string name="_sys_form_account_input_email_uniq_error_loggedin"><![CDATA[Этот эл. адрес уже кем-то используется.]]></string>
 	<string name="_sys_form_account_input_name"><![CDATA[Имя Аккаунта]]></string>
 	<string name="_sys_form_account_input_name_error"><![CDATA[Это обязательное поле.]]></string>
-	<string name="_sys_form_account_input_password"><![CDATA[Новый Пароль]]></string>
-	<string name="_sys_form_account_input_password_confirm"><![CDATA[Подтвердить новый пароль]]></string>
+	<string name="_sys_form_account_input_password"><![CDATA[Создать пароль]]></string>
+	<string name="_sys_form_account_input_password_confirm"><![CDATA[Подтвердить пароль]]></string>
 	<string name="_sys_form_account_input_password_confirm_error"><![CDATA[Не удалось подтвердить пароль]]></string>
 	<string name="_sys_form_account_input_password_current"><![CDATA[Текущий пароль]]></string>
 	<string name="_sys_form_account_input_password_current_error"><![CDATA[Неправильный текущий пароль. Введите пароль, который Вы используете для доступа к этому сайту.]]></string>
 	<string name="_sys_form_account_input_password_error"><![CDATA[Пароль должен иметь как минимум 6 символов.]]></string>
 	<string name="_sys_form_account_input_receive_news"><![CDATA[Получать Новости]]></string>
 	<string name="_sys_form_account_input_receive_updates"><![CDATA[Получать обновления сайта]]></string>
-	<string name="_sys_form_account_input_submit"><![CDATA[Выполнить]]></string>
+	<string name="_sys_form_account_input_submit"><![CDATA[Присоединиться]]></string>
 	<string name="_sys_form_checkbox_value_off"><![CDATA[Нет]]></string>
 	<string name="_sys_form_checkbox_value_on"><![CDATA[Да]]></string>
 	<string name="_sys_form_comment"><![CDATA[Комментарий]]></string>
@@ -1688,9 +1690,10 @@
 	<string name="_sys_form_input_sys_location"><![CDATA[Расположение]]></string>
 	<string name="_sys_form_input_location"><![CDATA[Расположение]]></string>
 	<string name="_sys_form_login"><![CDATA[Вход]]></string>
+	<string name="_sys_form_login_input_caption_system_agreement"><![CDATA[Соглашение]]></string>
 	<string name="_sys_form_login_input_caption_system_captcha"><![CDATA[Капча]]></string>
 	<string name="_sys_form_login_input_caption_system_delete_confirm"><![CDATA[Подтвердить Удаление]]></string>
-	<string name="_sys_form_login_input_caption_system_do_submit"><![CDATA[Выполнить]]></string>
+	<string name="_sys_form_login_input_caption_system_do_submit"><![CDATA[Присоединиться]]></string>
 	<string name="_sys_form_login_input_caption_system_email"><![CDATA[Имейл]]></string>
 	<string name="_sys_form_login_input_caption_system_id"><![CDATA[ID]]></string>
 	<string name="_sys_form_login_input_caption_system_name"><![CDATA[Имя Аккаунта]]></string>
@@ -1828,11 +1831,13 @@
 	<string name="_sys_location_geolocation_not_supported_by_browser"><![CDATA[Геолокация не поддерживается этим браузером]]></string>
 	<string name="_sys_location_undefined"><![CDATA[Отключить местоположение]]></string>
 	<string name="_sys_menu_item_title_about"><![CDATA[О нас]]></string>
+	<string name="_sys_menu_item_title_privacy"><![CDATA[Конфиденциальность]]></string>
 	<string name="_sys_menu_item_title_search"><![CDATA[Поиск]]></string>
 	<string name="_sys_menu_item_title_switch_language"><![CDATA[Язык]]></string>
 	<string name="_sys_menu_item_title_switch_language_mask"><![CDATA[{1} {0}]]></string>
 	<string name="_sys_menu_item_title_switch_template"><![CDATA[Дизайн]]></string>
 	<string name="_sys_menu_item_title_switch_template_mask"><![CDATA[{0}]]></string>
+	<string name="_sys_menu_item_title_terms"><![CDATA[Правила]]></string>
 	<string name="_sys_menu_item_title_account_menu"><![CDATA[{member_display_name}]]></string>
 	<string name="_sys_menu_item_title_account_profile_context"><![CDATA[Профили]]></string>
 	<string name="_sys_menu_item_title_account_dashboard"><![CDATA[Панель]]></string>
@@ -1857,8 +1862,10 @@
 	<string name="_sys_menu_item_title_set_acl_level"><![CDATA[Назначить членство]]></string>
 	<string name="_sys_menu_item_title_studio"><![CDATA[Студия]]></string>
 	<string name="_sys_menu_item_title_system_about"><![CDATA[Об...]]></string>
+	<string name="_sys_menu_item_title_system_privacy"><![CDATA[Конфиденциальность]]></string>
 	<string name="_sys_menu_item_title_system_switch_language"><![CDATA[Язык]]></string>
 	<string name="_sys_menu_item_title_system_switch_template"><![CDATA[Тема]]></string>
+	<string name="_sys_menu_item_title_system_terms"><![CDATA[Правила]]></string>
 	<string name="_sys_menu_item_title_system_account_menu"><![CDATA[Аккаунт]]></string>
 	<string name="_sys_menu_item_title_system_account_profile_context"><![CDATA[Профили]]></string>
 	<string name="_sys_menu_item_title_system_account_dashboard_administration"><![CDATA[Администрация]]></string>
@@ -1962,7 +1969,7 @@
 	<string name="_sys_page_block_title_account_settings_pwd"><![CDATA[Изменить Пароль]]></string>
 	<string name="_sys_page_block_title_add_content"><![CDATA[Добавить Содержимое]]></string>
 	<string name="_sys_page_block_title_confirm_email"><![CDATA[Имейл - Подтверждение]]></string>
-	<string name="_sys_page_block_title_create_account"><![CDATA[Создать Аккаунт]]></string>
+	<string name="_sys_page_block_title_create_account"><![CDATA[Присоединиться]]></string>
 	<string name="_sys_page_block_title_dashboard"><![CDATA[Панель]]></string>
     <string name="_sys_page_block_title_homepage_menu"><![CDATA[Меню модулей с содержимым]]></string>
 	<string name="_sys_page_block_title_forgot_password"><![CDATA[Забыли Пароль]]></string>
@@ -1970,6 +1977,7 @@
 	<string name="_sys_page_block_system_title_login_only"><![CDATA[Вход]]></string>
 	<string name="_sys_page_block_title_login"><![CDATA[Вход]]></string>
 	<string name="_sys_page_block_title_manage_tools"><![CDATA[Управление]]></string>
+	<string name="_sys_page_block_title_privacy"><![CDATA[Политика конфиденциальности]]></string>
 	<string name="_sys_page_block_title_profile_stats"><![CDATA[Профиль - Статистика]]></string>
 	<string name="_sys_page_block_title_profile_membership"><![CDATA[Членство]]></string>
 	<string name="_sys_page_block_title_unsubscribe_news"><![CDATA[Отписаться от Новостей Сайта]]></string>
@@ -1978,7 +1986,10 @@
 	<string name="_sys_page_block_title_std_dash_space"><![CDATA[Использование дискового пространства]]></string>
 	<string name="_sys_page_block_title_std_dash_host_tools"><![CDATA[Хост - Инструменты]]></string>
 	<string name="_sys_page_block_title_std_dash_cache"><![CDATA[Кэш]]></string>
+	<string name="_sys_page_block_title_terms"><![CDATA[Правила пользования]]></string>
 	<string name="_sys_page_lang_block_about"><![CDATA[Этот сайт регулируется BoonEx Trident. Остальное - тайна, покрытая мраком.]]></string>
+	<string name="_sys_page_lang_block_terms"><![CDATA[Правила пользования нашим сайтом.]]></string>
+	<string name="_sys_page_lang_block_privacy"><![CDATA[Политика конфиденциальности нашего сайта.]]></string>
 	<string name="_sys_page_title_about"><![CDATA[Об...]]></string>
 	<string name="_sys_page_title_account_profile_switcher"><![CDATA[Переключить Профиль]]></string>
 	<string name="_sys_page_title_account_settings_delete"><![CDATA[Удалить Аккаунт]]></string>
@@ -1987,11 +1998,13 @@
 	<string name="_sys_page_title_account_settings_pwd"><![CDATA[Изменить Пароль]]></string>
 	<string name="_sys_page_title_add_content"><![CDATA[Добавить Содержимое]]></string>
 	<string name="_sys_page_title_confirm_email"><![CDATA[Имейл - Подтверждение]]></string>
-	<string name="_sys_page_title_create_account"><![CDATA[Создать Аккаунт]]></string>
+	<string name="_sys_page_title_create_account"><![CDATA[Присоединиться]]></string>
 	<string name="_sys_page_title_dashboard"><![CDATA[Панель]]></string>
 	<string name="_sys_page_title_forgot_password"><![CDATA[Забыли Пароль]]></string>
 	<string name="_sys_page_title_home"><![CDATA[{site_title} :: Домашняя страница]]></string>
 	<string name="_sys_page_title_login"><![CDATA[Вход]]></string>
+	<string name="_sys_page_title_privacy"><![CDATA[Политика конфиденциальности]]></string>
+	<string name="_sys_page_title_terms"><![CDATA[Правила пользования]]></string>
 	<string name="_sys_page_title_system_about"><![CDATA[Об...]]></string>
 	<string name="_sys_page_title_system_account_profile_switcher"><![CDATA[Переключить Профиль]]></string>
 	<string name="_sys_page_title_system_account_settings_delete"><![CDATA[Удалить Аккаунт]]></string>
@@ -2000,11 +2013,13 @@
 	<string name="_sys_page_title_system_account_settings_pwd"><![CDATA[Изменить Пароль]]></string>
 	<string name="_sys_page_title_system_add_content"><![CDATA[Добавить Содержимое]]></string>
 	<string name="_sys_page_title_system_confirm_email"><![CDATA[Имейл Подтверждение]]></string>
-	<string name="_sys_page_title_system_create_account"><![CDATA[Создать Аккаунт]]></string>
+	<string name="_sys_page_title_system_create_account"><![CDATA[Присоединиться]]></string>
 	<string name="_sys_page_title_system_dashboard"><![CDATA[Панель]]></string>
 	<string name="_sys_page_title_system_forgot_password"><![CDATA[Забыли Пароль]]></string>
 	<string name="_sys_page_title_system_home"><![CDATA[Домашняя Страница]]></string>
 	<string name="_sys_page_title_system_login"><![CDATA[Вход]]></string>
+	<string name="_sys_page_title_system_privacy"><![CDATA[Политика конфиденциальности]]></string>
+	<string name="_sys_page_title_system_terms"><![CDATA[Правила пользования]]></string>
 	<string name="_sys_page_title_system_unsubscribe_news"><![CDATA[Отписаться от Новостей]]></string>
 	<string name="_sys_page_title_system_unsubscribe_notifications"><![CDATA[Отписаться от Уведомлений]]></string>
 	<string name="_sys_page_title_system_studio_dashboard"><![CDATA[Студия - Панель]]></string>
@@ -2164,6 +2179,7 @@
 	<string name="_sys_txt_form_submission_error"><![CDATA[Неправильная информация. Пожалуйста, проверьте ввод и отошлите снова.]]></string>
 
     <string name="_sys_txt_homepage_cover"><![CDATA[Сплоченность людей — нерушимая крепость.<br /><button class="bx-btn bx-hide-when-logged-in bx-def-margin-top" onclick="document.location='{0}'">Присоедениться!</button>]]></string>
+    <string name="_sys_txt_join_description"><![CDATA[Уже зарегистрировались? <a href="{0}">Заходите.</a>]]></string>
 	<string name="_sys_txt_login_description"><![CDATA[Ещё нет аккаунта? <a href="{0}">Зарегистрируйтесь!</a>]]></string>
 	<string name="_sys_txt_login_error"><![CDATA[Введённый имейл или пароль неправильны. Пожалуйста, попытайтесь снова.]]></string>
 	<string name="_sys_txt_login_invalid_role"><![CDATA[Доступ запрещён]]></string>

template/css/general.css

@@ -152,9 +152,11 @@
 }
 
 /* --------------- login form */
+#sys_account .bx-form-input-wrapper-submit,
 #sys-form-login .bx-form-input-wrapper-submit {
 	text-align: center;
 }
+#sys_account .bx-form-input-wrapper-submit .bx-btn,
 #sys-form-login .bx-form-input-wrapper-submit .bx-btn {
 	display: inline-block;
     float: none;

template/scripts/BxBaseFormAccount.php

@@ -69,6 +69,11 @@ class BxBaseFormAccount extends BxTemplFormView
 
     public function __construct($aInfo, $oTemplate)
     {
+    	if(isset($aInfo['inputs']['agreement'])) {
+    		$oPermalink = BxDolPermalinks::getInstance();
+    		$aInfo['inputs']['agreement']['content'] = _t('_sys_form_account_input_agreement_value', $oPermalink->permalink('page.php?i=terms'), $oPermalink->permalink('page.php?i=privacy'));
+    	} 
+
         parent::__construct($aInfo, $oTemplate);
         $this->_bSetPendingApproval = !(bool)getParam('sys_account_autoapproval');
     }

template/scripts/BxBaseFormView.php

@@ -365,7 +365,7 @@ EOS;
      */
     function genRowStandard(&$aInput, $isOneLine = false)
     {
-        $sCaption = isset($aInput['caption']) ? bx_process_output($aInput['caption']) : '';
+        $sCaption = isset($aInput['caption']) ? bx_process_output($aInput['caption'], BX_DATA_HTML) : '';
 
         $sRequired = !empty($aInput['required']) ? '<span class="bx-form-required">*</span> ' : '';
 
@@ -615,7 +615,7 @@ BLAH;
             break;
 
             case 'value':
-                $sInput = $aInput['value'];
+                $sInput = isset($aInput['value']) ? $aInput['value'] : '';
             break;
 
             default:

template/scripts/BxBaseServiceAccount.php

@@ -25,7 +25,11 @@ class BxBaseServiceAccount extends BxDol
 
     public function serviceCreateAccountForm ($aParams = array())
     {
-        return $this->_oAccountForms->createAccountForm($aParams);
+	    $sLoginText = '';
+        if (!isset($aParams['no_login_text']) || (int)$aParams['no_login_text'] == 1)
+            $sLoginText = '<hr class="bx-def-hr bx-def-margin-sec-topbottom" /><div class="bx-def-font-align-center">' . _t('_sys_txt_join_description', BX_DOL_URL_ROOT . BxDolPermalinks::getInstance()->permalink('page.php?i=login')) . '</div>';
+
+        return $this->_oAccountForms->createAccountForm($aParams) . $sLoginText;
     }
 
     public function serviceAccountSettingsEmail ($iAccountId = false)