Merge branch 'master' of https://github.com/unacms/una

unacms · Nov 13, 2024 · 0f4b7d1 · 0f4b7d1
2 parents c3df190 + 4c3f012
commit 0f4b7d1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/modules/boonex/english/data/langs/system/en.xml b/modules/boonex/english/data/langs/system/en.xml
@@ -3962,6 +3962,7 @@ If it is not enabled then please consider implement this optimization, since it
     <string name="_sys_txt_forgot_pasword_email_send_failed"><![CDATA[Email send failed, please try again later.]]></string>
     <string name="_sys_txt_forgot_pasword_error_occured"><![CDATA[Error occurred, please report error to the site administrator.]]></string>
     <string name="_sys_txt_forgot_pasword_sms_text"><![CDATA[Click the link below to reset your password {0}]]></string>
+    <string name="_sys_txt_forgot_pasword_logged_in"><![CDATA[You are already logged in. If you still wish to reset your password, please log out first and then initiate the password recovery process.]]></string>
 
     <string name="_sys_txt_form_entry_input_picture_copy"><![CDATA[Copy URL]]></string>
     <string name="_sys_txt_form_entry_input_picture_delete"><![CDATA[Delete]]></string>

diff --git a/template/scripts/BxBaseServiceAccount.php b/template/scripts/BxBaseServiceAccount.php
@@ -591,6 +591,12 @@ public function serviceGetOptionsPruningInterval()
     public function serviceForgotPassword()
     {
         if(isLogged()){
+            $bApi = bx_is_api();
+            if($bApi) {
+               return [
+                    bx_api_get_msg(_t("_sys_txt_forgot_pasword_logged_in"), ['ext' => ['msg_type' => 'result']]),
+                ];
+            }
             header('Location: ' . BX_DOL_URL_ROOT);
             exit;
         }