Changeset 71 for trunk/www/Application/View/User.php

Timestamp:

Aug 23, 2009, 6:14:01 PM (15 years ago)

Author:

george

Message:

• Upraveno: Znovu zprovozněny třídy HomePage, Server a User.

File:

• trunk/www/Application/View/User.php (modified) (11 diffs)

trunk/www/Application/View/User.php

@@ -49 +49 @@
   );
   
-  function LoginForm()
+  function Login()
   {
     global $Config;
     
-    $Form = new Form($this->LoginFormClass);
-    $Form->OnSubmit = '?Action=Login';
+    $Form = new Form($this->System, $this->LoginFormClass);
+    $Form->OnSubmit = '?Module=User&Action=LoginFinish';
     $Output = $Form->ShowEditForm();
     $Output .= '<div class="Centred">';
     if($Config['Web']['UserRegistrationEnabled']) 
-      $Output .= '<a href="?Action=UserRegister">Registrovat se</a> ';
-    $Output .= '<a href="?Action=PasswordRecovery">Obnova zapomenutého hesla</a></div>';
+      $Output .= '<a href="?Module=User&amp;Action=Register">Registrovat se</a> ';
+    $Output .= '<a href="?Module=User&amp;Action=PasswordRecovery">Obnova zapomenutého hesla</a></div>';
     return($Output);
   }
   
-  function LoginResult()
+  function LoginFinish()
   {
-    $Form = new Form($this->LoginFormClass);
-    $Form->OnSubmit = '?Action=Login';
+    $Form = new Form($this->System, $this->LoginFormClass);
+    $Form->OnSubmit = '?Module=User&amp;Action=LoginFinish';
     $Form->LoadValuesFromForm();
     $Result = $this->System->Modules['User']->Login($Form->Values['Username'], $Form->Values['Password']);
@@ -74 +74 @@
       $Form->Values['Password'] = '';
       $Output .= $Form->ShowEditForm();
-      $Output .= '<div class="Centred"><a href="?Action=UserRegister">Registrovat se</a> '.
-        '<a href="?Action=PasswordRecovery">Obnova zapomenutého hesla</a></div>';
+      $Output .= '<div class="Centred"><a href="?Module=User&amp;Action=UserRegister">Registrovat se</a> '.
+        '<a href="?Module=User&amp;Action=PasswordRecovery">Obnova zapomenutého hesla</a></div>';
     }
     return($Output);
@@ -86 +86 @@
     if($Config['Web']['UserRegistrationEnabled']) 
     {
-      $Form = new Form($this->RegisterFormClass, array());
+      $Form = new Form($this->System, $this->RegisterFormClass, array());
       $Form->LoadValuesFromForm();
       $Result = $this->System->Modules['User']->Register($Form->Values['Login'], $Form->Values['Password'], $Form->Values['Password2'], $Form->Values['Email'], $Form->Values['Name']);
@@ -92 +92 @@
       if($Result <> USER_REGISTRATED) 
       {
-        $Form->OnSubmit = '?Action=UserRegisterSave';
+        $Form->OnSubmit = '?Module=User&amp;Action=UserRegisterSave';
         $Output = $Form->ShowEditForm();
       }
@@ -108 +108 @@
   function PasswordRecoveryFinish()
   {
-    $Form = new Form($this->PasswordRecoveryFormClass);
+    $Form = new Form($this->System, $this->PasswordRecoveryFormClass);
     $Form->LoadValuesFromForm();
     $Result = $this->System->Modules['User']->PasswordRecoveryRequest($Form->Values['Name'], $Form->Values['Email']);
@@ -121 +121 @@
   function PasswordRecovery()
   {
-    $Form = new Form($this->PasswordRecoveryFormClass);
-    $Form->OnSubmit = '?Action=PasswordRecovery2';
+    $Form = new Form($this->System, $this->PasswordRecoveryFormClass);
+    $Form->OnSubmit = '?Module=User&amp;Action=PasswordRecovery2';
     $Output = $Form->ShowEditForm();
     return($Output);
@@ -130 +130 @@
   {
     $Output = $this->System->SystemMessage('Odhlášení', $this->System->Modules['User']->Logout());
-    $Output .= $this->LoginForm();
+    $Output .= $this->Login();
     return($Output);
   }
@@ -136 +136 @@
   function Options()
   {
-    $UserOptions = new Form($this->OptionsFormClass);
+    $UserOptions = new Form($this->System, $this->OptionsFormClass);
     $UserOptions->LoadValuesFromDatabase($this->System->Modules['User']->User['Id']);
-    $UserOptions->OnSubmit = '?Action=UserOptionsSave';
+    $UserOptions->OnSubmit = '?Module=User&amp;Action=UserOptionsSave';
     $Output = $UserOptions->ShowEditForm();
     return($Output);
@@ -145 +145 @@
   function OptionsSave()
   {
-    $UserOptions = new Form($this->OptionsFormClass, array());
+    $UserOptions = new Form($this->System, $this->OptionsFormClass, array());
     $UserOptions->LoadValuesFromForm();
     $UserOptions->SaveValuesToDatabase($this->System->Modules['User']->User['Id']);
@@ -151 +151 @@
     $this->System->Modules['Log']->NewRecord('User', 'Nastavení uživatele změněno', $UserOptions->Values['Name']);
     $UserOptions->LoadValuesFromDatabase($this->System->Modules['User']->User['Id']);
-    $UserOptions->OnSubmit = '?Action=UserOptionsSave';
+    $UserOptions->OnSubmit = '?Module=User&amp;Action=UserOptionsSave';
     $Output .= $UserOptions->ShowEditForm();
     return($Output);
@@ -162 +162 @@
     if($Config['Web']['UserRegistrationEnabled']) 
     {
-      $Form = new Form($this->RegisterFormClass);
+      $Form = new Form($this->System, $this->RegisterFormClass);
       $Form->LoadValuesFromForm();
-      $Form->OnSubmit = '?Action=UserRegisterSave';
+      $Form->OnSubmit = '?Module=User&amp;Action=UserRegisterSave';
       $Output = 'Vyplňte správně požadované údaje. Na zadaný email vám bude zaslán aktivační email.';
       $Output .= $Form->ShowEditForm();