Changeset 922 for trunk/Modules/User

Timestamp:

Feb 28, 2022, 8:53:22 AM (3 years ago)

Author:

chronos

Message:

• Modified: Do not determine form submit from URL but directly from submit variable and filled form variables.
• Added: Use system config from /etc/isp-central directory if standard config is not available.
• Modified: Form file code cleanup. FormManager class moved to separate file.

Location:

trunk/Modules/User

Files:

• UserModel.php (modified) (1 diff)
• UserPage.php (modified) (1 diff)

trunk/Modules/User/UserModel.php

@@ -418 +418 @@
         $Row['Id'].'&H='.$Row['Password'].'&P='.$NewPassword.'">tento odkaz</a>.'."\n<br />".
         "Po přihlášení si prosím změňte heslo na nové.\n\n<br><br>Na tento email neodpovídejte.", 'text/html');
-      print_r($Mail);
       $Mail->Send();
 

trunk/Modules/User/UserPage.php

@@ -180 +180 @@
         $Form = new Form($this->System->FormManager);
         $Form->SetClass('PasswordRecovery');
-        $Form->OnSubmit = '?Action=PasswordRecovery2';
-        $Output .= $Form->ShowEditForm();
-      } else
-      if ($Action == 'PasswordRecovery2')
-      {
-        $Form = new Form($this->System->FormManager);
-        $Form->SetClass('PasswordRecovery');
-        $Form->LoadValuesFromForm();
-        $Result = $User->PasswordRecoveryRequest($Form->Values['Name'], $Form->Values['Email']);
-        $Output .= $this->SystemMessage('Obnova hesla', $Result);
-        if ($Result <> USER_PASSWORD_RECOVERY_SUCCESS)
-        {
+        if ($Form->HasAllPostVariables())
+        {
+          $Form->LoadValuesFromForm();
+          $Result = $User->PasswordRecoveryRequest($Form->Values['Name'], $Form->Values['Email']);
+          $Output .= $this->SystemMessage('Obnova hesla', $Result);
+          if ($Result <> USER_PASSWORD_RECOVERY_SUCCESS)
+          {
+            $Output .= $Form->ShowEditForm();
+          }
+        } else
+        {
+          $Form->OnSubmit = '?Action=PasswordRecovery';
           $Output .= $Form->ShowEditForm();
         }