Changeset 634 for trunk/Modules/Portal

Timestamp:

Jan 19, 2014, 2:28:30 PM (11 years ago)

Author:

chronos

Message:

• Upraveno: Uživatelské akce přesunuty z modulu Portal do modulu User.

File:

• trunk/Modules/Portal/Portal.php (modified) (5 diffs)

trunk/Modules/Portal/Portal.php

@@ -42 +42 @@
       ),
     ));
-    $this->System->FormManager->RegisterClass('UserOptions', array(
-      'Title' => 'Základní nastavení',
-      'Table' => 'User',
-      'SubmitText' => 'Uložit',
-      'Items' => array(
-        'Login' => array('Type' => 'String', 'Caption' => 'Přihlašovací jméno', 'Default' => ''),
-        'Salt' => array('Type' => 'RandomHash', 'Caption' => 'Sůl', 'Default' => ''),
-        'Password' => array('Type' => 'Password', 'Caption' => 'Heslo', 'Default' => ''),
-        'Name' => array('Type' => 'String', 'Caption' => 'Zobrazované jméno', 'Default' => ''),
-        'Email' => array('Type' => 'String', 'Caption' => 'E-mail', 'Default' => ''),
-        'PhoneNumber' => array('Type' => 'String', 'Caption' => 'Telefón', 'Default' => ''),
-        'ICQ' => array('Type' => 'String', 'Caption' => 'ICQ', 'Default' => ''),
-      ),
-    ));
-    $this->System->FormManager->RegisterClass('UserRegister', array(
-      'Title' => 'Registrace uživatele',
-      'SubmitText' => 'Registrovat',
-      'Table' => 'User',
-      'Items' => array(
-        'Login' => array('Type' => 'String', 'Caption' => 'Přihlašovací jméno', 'Default' => ''),
-        'Password' => array('Type' => 'Password', 'Caption' => 'Heslo', 'Default' => ''),
-        'Password2' => array('Type' => 'Password', 'Caption' => 'Potvrzení hesla', 'Default' => ''),
-        'Name' => array('Type' => 'String', 'Caption' => 'Zobrazované jméno', 'Default' => ''),
-        'Email' => array('Type' => 'String', 'Caption' => 'E-mail', 'Default' => ''),
-        'PhoneNumber' => array('Type' => 'String', 'Caption' => 'Telefón', 'Default' => ''),
-        'ICQ' => array('Type' => 'String', 'Caption' => 'ICQ', 'Default' => ''),
-      ),
-    ));
-    $this->System->FormManager->RegisterClass('PasswordRecovery', array(
-      'Title' => 'Obnova hesla',
-      'SubmitText' => 'Obnovit',
-      'Table' => '',
-      'Items' => array(
-        'Name' => array('Type' => 'String', 'Caption' => 'Přihlašovací jméno', 'Default' => ''),
-        'Email' => array('Type' => 'String', 'Caption' => 'E-mail', 'Default' => ''),
-      ),
-    ));
-    $this->System->FormManager->RegisterClass('UserLogin', array(
-      'Title' => 'Přihlášení uživatele',
-      'SubmitText' => 'Přihlásit',
-      'Table' => '',
-      'Items' => array(
-        'Username' => array('Type' => 'String', 'Caption' => 'Přihlašovací jméno', 'Default' => ''),
-        'Password' => array('Type' => 'Password', 'Caption' => 'Heslo', 'Default' => ''),
-        'StayLogged' => array('Type' => 'Boolean', 'Caption' => 'Zůstat přihlášen', 'Default' => '0'),
-      ),
-    ));
-    
+    $this->System->ModuleManager->Modules['User']->UserPanel[] = array('PagePortal', 'UserPanel');
   }  
   
@@ -161 +114 @@
   function UserPanel()
   {
-    $Output = '<a href="'.$this->System->Link('/?Action=UserOptions').'">Profil</a><br />';
+    $Output = '<a href="'.$this->System->Link('/user/?Action=UserOptions').'">Profil</a><br />';
     if($this->System->User->CheckPermission('Finance', 'MemberOptions')) 
       $Output .= '<a href="'.$this->System->Link('/?Action=MemberOptions').'">Domácnost</a><br />';
@@ -226 +179 @@
       {
         $Output .= $this->System->ModuleManager->Modules['News']->CustomizeSave();
-      } else
-      if($Action == 'LoginForm')
-      {
-        $Form = new Form($this->System->FormManager);
-        $Form->SetClass('UserLogin');
-        $Form->OnSubmit = '?Action=Login';
-        $Output .= $Form->ShowEditForm();
-        $Output .= '<div class="Centred"><a href="?Action=UserRegister">Registrovat se</a> '.
-        '<a href="?Action=PasswordRecovery">Obnova zapomenutého hesla</a></div>';
-      } else
-      if($Action == 'Login')
-      {
-        if(array_key_exists('Username', $_POST) and array_key_exists('Password', $_POST))
-        {
-          $Form = new Form($this->System->FormManager);
-          $Form->SetClass('UserLogin');
-          $Form->OnSubmit = '?Action=Login';
-          if(array_key_exists('StayLogged', $_POST) and ($_POST['StayLogged'] == 'on')) $StayLogged = true;
-            else $StayLogged = false;          
-          $Result = $this->System->User->Login($_POST['Username'], $_POST['Password'], $StayLogged);
-          $Output .= $this->SystemMessage('Přihlášení', $Result);
-          if($Result <> USER_LOGGED_IN)
-          {
-            $Form->LoadValuesFromForm();
-            $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>';
-          } else {
-            //$Output .= '<div class="Centred">Za 5 sekund budete přesměrováni na <a href="?Action=UserMenu">nabídku uživatele</a></div>';
-            //Header('refresh:5;url=?Action=UserMenu');
-            Header('Location: ?Action=UserMenu');
-          }
-        } else $Output .= $this->SystemMessage('Přihlášení', 'Nezadány přihlašovací údaje');
-      } else 
-      if($Action == 'Logout')
-      {
-        if($this->System->User->User['Id'] != null)
-        {
-          $Output .= $this->SystemMessage('Odhlášení', $this->System->User->Logout());
-        } else $Output .= $this->SystemMessage('Nastavení uživatele', 'Nejste přihlášen');
-      } else
-      if($Action == 'UserOptions')
-      { 
-        if($this->System->User->User['Id'] != null)
-        {
-          $Form = new Form($this->System->FormManager);
-          $Form->SetClass('UserOptions');
-          $Form->LoadValuesFromDatabase($this->System->User->User['Id']);
-          $Form->OnSubmit = '?Action=UserOptionsSave';
-          $Output .= $Form->ShowEditForm();
-        } else $Output .= $this->SystemMessage('Nastavení uživatele', 'Nejste přihlášen');
-      } else
-      if($Action == 'UserOptionsSave')
-      {
-        $Form = new Form($this->System->FormManager);
-        $Form->SetClass('UserOptions');
-        $Form->LoadValuesFromForm();
-        $Form->SaveValuesToDatabase($this->System->User->User['Id']);
-        $Output .= $this->SystemMessage('Nastavení', 'Nastavení uloženo.');
-        $this->System->ModuleManager->Modules['Log']->NewRecord('User', 'Nastavení uživatele změněno', $Form->Values['Name']);
-        $Form->LoadValuesFromDatabase($this->System->User->User['Id']);
-        $Form->OnSubmit = '?Action=UserOptionsSave';
-        $Output .= $Form->ShowEditForm();
-      } else
-      if($Action == 'UserRegister')
-      {
-        $Form = new Form($this->System->FormManager);
-        $Form->SetClass('UserRegister');
-        //$Form->LoadValuesFromForm();
-        $Form->OnSubmit = '?Action=UserRegisterSave';
-        $Output .= $Form->ShowEditForm();
-      } else
-      if($Action == 'UserRegisterConfirm')
-      {
-        $Output .= $this->SystemMessage('Potvrzení registrace', 
-          $this->System->User->RegisterConfirm($_GET['User'], $_GET['H']));
-      } else
-      if($Action == 'PasswordRecovery')
-      {
-        $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 = $this->System->User->PasswordRecoveryRequest($Form->Values['Name'], $Form->Values['Email']);
-        $Output .= $this->SystemMessage('Obnova hesla', $Result);
-        if($Result <> USER_PASSWORD_RECOVERY_SUCCESS)
-        {
-          $Output .= $Form->ShowEditForm();
-        }        
-      } else
-      if($Action == 'PasswordRecoveryConfirm')
-      {
-        $Output .= $this->SystemMessage('Obnova hesla', $this->System->User->PasswordRecoveryConfirm($_GET['User'], $_GET['H'], $_GET['P']));
-      } else
-      if($Action == 'UserRegisterSave')
-      {
-        $Form = new Form($this->System->FormManager);
-        $Form->SetClass('UserRegister');
-        $Form->LoadValuesFromForm();
-        $Result = $this->System->User->Register($Form->Values['Login'], $Form->Values['Password'], 
-          $Form->Values['Password2'], $Form->Values['Email'], $Form->Values['Name'], $Form->Values['PhoneNumber'], $Form->Values['ICQ']);
-        $Output .= $this->SystemMessage('Registrace nového účtu', $Result);
-        if($Result <> USER_REGISTRATED) 
-        {
-          $Form->OnSubmit = '?Action=UserRegisterSave';
-          $Output .= $Form->ShowEditForm();
-        }
       } else
       if($Action == 'MemberOptions')
@@ -396 +235 @@
         $Form->OnSubmit = '?Action=MemberOptionsSave';
         $Output .= $Form->ShowEditForm();
-      } else 
-      if($Action == 'UserMenu')
-      {
-        $Output = $this->ShowUserPanel();
-      } else $Output = $this->ShowMain();
+      } 
     } else $Output = $this->ShowMain();
     return($Output);
@@ -439 +274 @@
     $Output .= '</tr></table>';
     return($Output);
-  }
-  
-  function ShowUserPanel()
-  {
-    $Output = '';
-    if($this->System->User->User['Id'] != null)
-    { 
-      $Output .= '<div class="Centred"><table id="MainTable"><tr><td>';
-      $Output .= $this->Panel('Nabídka uživatele', $this->UserPanel());
-      $Output .= '</td><td>';
-      //$Output .= $this->Panel('Přehled', $this->UserPanel());
-      $Output .= '</td></tr></table></div>';
-    } else $Output .= $this->SystemMessage('Oprávnění', 'Nejste přihlášen');
-    return($Output);
-  }
+  }  
 }