Przeglądaj źródła

Ticket #4385 - Forgot password improvements.

AntonLV 3 lat temu
rodzic
commit
1bf1c0c50b

+ 5 - 0
inc/classes/BxDolPage.php

@@ -754,6 +754,11 @@ class BxDolPage extends BxDolFactory implements iBxDolFactoryObject, iBxDolRepla
         return $aResult;
     }
 
+    public function setTitle ($sTitle)
+    {
+        return $this->_aObject['title'] = $sTitle;
+    }
+
     /**
      * Add replace markers. Markers are replaced in raw, html, lang blocks and page title, description, keywords and block titles.
      * @param $a array of markers as key => value

+ 1 - 1
install/sql/system.sql

@@ -3679,7 +3679,7 @@ INSERT INTO `sys_form_inputs` (`object`, `module`, `name`, `value`, `values`, `c
 ('sys_profile', 'system', 'do_cancel', '_sys_form_profile_input_do_cancel', '', 0, 'button', '_sys_form_profile_input_sys_do_cancel', '', '', 0, 0, 0, 'a:2:{s:5:"class";s:22:"bx-def-margin-sec-left";s:7:"onclick";s:45:"$(''.bx-popup-applied:visible'').dolPopupHide()";}', '', '', '', '', '', '', '', 0, 0),
 
 ('sys_forgot_password', 'system', 'key', '', '', 0, 'hidden', '_sys_form_forgot_password_input_caption_system_key', '', '', 0, 0, 0, '', '', '', '', '', '', '', '', 0, 0),
-('sys_forgot_password', 'system', 'password', '', '', 0, 'password', '_sys_form_forgot_password_input_caption_system_password', '_sys_form_forgot_password_input_caption_password', '', 1, 0, 0, '', '', '', 'Preg', 'a:1:{s:4:"preg";s:38:"~^(?=.*[a-z])(?=.*[A-Z])(?=.*\\d).{8,}~";}', '_sys_form_account_input_password_error', 'Xss', '', 1, 0),
+('sys_forgot_password', 'system', 'password', '', '', 0, 'password', '_sys_form_forgot_password_input_caption_system_password_reset', '_sys_form_forgot_password_input_caption_password_reset', '', 1, 0, 0, '', '', '', 'Preg', 'a:1:{s:4:"preg";s:38:"~^(?=.*[a-z])(?=.*[A-Z])(?=.*\\d).{8,}~";}', '_sys_form_account_input_password_error', 'Xss', '', 1, 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, '', '', '', 'EmailExistOrEmpty', '', '_sys_form_account_input_email_error', 'Xss', '', 0, 0),
 ('sys_forgot_password', 'system', 'phone', '', '', 0, 'text', '_sys_form_forgot_password_input_caption_system_phone', '_sys_form_forgot_password_input_phone', '', 1, 0, 0, '', '', '', 'PhoneExistOrEmpty', '', '_sys_form_account_input_phone_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', '', '', 1, 0),

+ 3 - 0
modules/boonex/english/data/langs/system/en.xml

@@ -2506,6 +2506,8 @@ If it is not enabled then please consider implement this optimization, since it
         <string name="_sys_form_forgot_password_input_caption_system_key"><![CDATA[Key]]></string>
         <string name="_sys_form_forgot_password_input_caption_system_password"><![CDATA[Password]]></string>
         <string name="_sys_form_forgot_password_input_caption_password"><![CDATA[Password]]></string>
+        <string name="_sys_form_forgot_password_input_caption_system_password_reset"><![CDATA[Password]]></string>
+        <string name="_sys_form_forgot_password_input_caption_password_reset"><![CDATA[Type your new password]]></string>
 	<string name="_sys_form_forgot_password_input_email"><![CDATA[Email]]></string>
 	<string name="_sys_form_forgot_password_input_caption_system_phone"><![CDATA[Phone]]></string>
 	<string name="_sys_form_forgot_password_input_phone"><![CDATA[Phone]]></string>
@@ -3317,6 +3319,7 @@ If it is not enabled then please consider implement this optimization, since it
     <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_forgot_password_reset"><![CDATA[Choose New Password]]></string>
     <string name="_sys_page_title_home"><![CDATA[{site_title} :: Homepage]]></string>
     <string name="_sys_page_title_logout"><![CDATA[Log out]]></string>
     <string name="_sys_page_title_login"><![CDATA[Log in]]></string>

+ 3 - 0
modules/boonex/russian/data/langs/system/ru.xml

@@ -2480,6 +2480,8 @@
         <string name="_sys_form_forgot_password_input_caption_system_key"><![CDATA[Ключ]]></string>
         <string name="_sys_form_forgot_password_input_caption_system_password"><![CDATA[Пароль]]></string>
         <string name="_sys_form_forgot_password_input_caption_password"><![CDATA[Пароль]]></string>
+        <string name="_sys_form_forgot_password_input_caption_system_password_reset"><![CDATA[Пароль]]></string>
+        <string name="_sys_form_forgot_password_input_caption_password_reset"><![CDATA[Введите новый пароль]]></string>
 	<string name="_sys_form_forgot_password_input_email"><![CDATA[Email]]></string>
 	<string name="_sys_form_forgot_password_input_caption_system_phone"><![CDATA[Телефон]]></string>
 	<string name="_sys_form_forgot_password_input_phone"><![CDATA[Телефон]]></string>
@@ -3272,6 +3274,7 @@
 	<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_forgot_password_reset"><![CDATA[Выберите новый пароль]]></string>
 	<string name="_sys_page_title_home"><![CDATA[{site_title} :: Домашняя страница]]></string>
     <string name="_sys_page_title_logout"><![CDATA[Выход]]></string>
 	<string name="_sys_page_title_login"><![CDATA[Вход]]></string>

+ 5 - 0
template/scripts/BxBaseServiceAccount.php

@@ -607,6 +607,11 @@ class BxBaseServiceAccount extends BxDol
             return MsgBox(_t('_sys_txt_reset_pasword_success'), 3) . bx_srv('system', 'login_form_only', array('', bx_get_reset_password_redirect($iAccountId)), 'TemplServiceLogin');
         }
 
+        $sTitleReset = _t('_sys_page_title_forgot_password_reset');
+        BxDolTemplate::getInstance()->setPageHeader($sTitleReset);
+        if(($oPage = BxDolPage::getObjectInstanceByURI()) !== false)
+            $oPage->setTitle($sTitleReset);
+
         return $oForm->getCode();
     }