Changeset 567

Timestamp:

Sep 8, 2013, 2:28:15 PM (11 years ago)

Author:

chronos

Message:

• Upraveno: Nabídka přihlášeného uživatele se nyní zobrazuje samostatně.

Location:

trunk

Files:

• Common/Page.php (modified) (1 diff)
• Common/Version.php (modified) (1 diff)
• Modules/Portal/Portal.php (modified) (13 diffs)

trunk/Common/Page.php

@@ -71 +71 @@
       {
         if($this->System->User->User['Id'] == null)
-          $Output .= '<a href="'.$this->System->Link('/?Action=LoginForm').'">Přihlášení</a> <a href="'.$this->System->Link('/?Action=UserRegister').'">Registrace</a>'; 
-          else $Output .= $this->System->User->User['Name'].' <a href="'.$this->System->Link('/?Action=Logout').'">Odhlásit</a>';
+          $Output .= '<a href="'.$this->System->Link('/?Action=LoginForm').'">Přihlášení</a> '.
+            '<a href="'.$this->System->Link('/?Action=UserRegister').'">Registrace</a>'; 
+          else $Output .= $this->System->User->User['Name'].
+            ' <a href="'.$this->System->Link('/?Action=UserMenu').'">Nabídka</a>'.
+            ' <a href="'.$this->System->Link('/?Action=Logout').'">Odhlásit</a>';
      } else $Output .= '&nbsp;';
 //   <a href="'.$this->System->Link('/?Action=UserOptions').'">Nastavení</a>'; 

trunk/Common/Version.php

@@ -1 +1 @@
 <?php
 
-$Revision = 565; // Subversion revision
+$Revision = 567; // Subversion revision
 $DatabaseRevision = 565; // SQL structure revision
-$ReleaseTime = '2013-09-01';
+$ReleaseTime = '2013-09-08';

trunk/Modules/Portal/Portal.php

@@ -131 +131 @@
     if(array_key_exists('Action', $_GET))
     {
-      if($_GET['Action'] == 'CustomizeNewsSave')
+      $Action = $_GET['Action'];
+      if($Action == 'CustomizeNewsSave')
       {
         $Output .= $this->System->ModuleManager->Modules['News']->CustomizeSave();
       } else
-      if($_GET['Action'] == 'LoginForm')
+      if($Action == 'LoginForm')
       {
         $Form = new Form($this->System->FormManager);
@@ -144 +145 @@
         '<a href="?Action=PasswordRecovery">Obnova zapomenutého hesla</a></div>';
       } else
-      if($_GET['Action'] == 'Login')
+      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';
-        $Result = $this->System->User->Login($_POST['Username'], $_POST['Password']);
-        $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>';
-        }
+          $Form = new Form($this->System->FormManager);
+          $Form->SetClass('UserLogin');
+          $Form->OnSubmit = '?Action=Login';
+          $Result = $this->System->User->Login($_POST['Username'], $_POST['Password']);
+          $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($_GET['Action'] == 'Logout')
+      if($Action == 'Logout')
       {
         if($this->System->User->User['Id'] != null)
@@ -170 +175 @@
         } else $Output .= $this->SystemMessage('Nastavení uživatele', 'Nejste přihlášen');
       } else
-      if($_GET['Action'] == 'UserOptions')
+      if($Action == 'UserOptions')
       { 
         if($this->System->User->User['Id'] != null)
@@ -181 +186 @@
         } else $Output .= $this->SystemMessage('Nastavení uživatele', 'Nejste přihlášen');
       } else
-      if($_GET['Action'] == 'UserOptionsSave')
+      if($Action == 'UserOptionsSave')
       {
         $Form = new Form($this->System->FormManager);
@@ -192 +197 @@
         $Form->OnSubmit = '?Action=UserOptionsSave';
         $Output .= $Form->ShowEditForm();
-      }
-      if($_GET['Action'] == 'UserRegister')
+      } else
+      if($Action == 'UserRegister')
       {
         $Form = new Form($this->System->FormManager);
@@ -201 +206 @@
         $Output .= $Form->ShowEditForm();
       } else
-      if($_GET['Action'] == 'UserRegisterConfirm')
+      if($Action == 'UserRegisterConfirm')
       {
         $Output .= $this->SystemMessage('Potvrzení registrace', 
           $this->System->User->RegisterConfirm($_GET['User'], $_GET['H']));
       } else
-      if($_GET['Action'] == 'PasswordRecovery')
+      if($Action == 'PasswordRecovery')
       {
         $Form = new Form($this->System->FormManager);
@@ -213 +218 @@
         $Output .= $Form->ShowEditForm();
       } else
-      if($_GET['Action'] == 'PasswordRecovery2')
+      if($Action == 'PasswordRecovery2')
       {
         $Form = new Form($this->System->FormManager);
@@ -225 +230 @@
         }        
       } else
-      if($_GET['Action'] == 'PasswordRecoveryConfirm')
+      if($Action == 'PasswordRecoveryConfirm')
       {
         $Output .= $this->SystemMessage('Obnova hesla', $this->System->User->PasswordRecoveryConfirm($_GET['User'], $_GET['H'], $_GET['P']));
       } else
-      if($_GET['Action'] == 'UserRegisterSave')
+      if($Action == 'UserRegisterSave')
       {
         $Form = new Form($this->System->FormManager);
@@ -243 +248 @@
         }
       } else
-      if($_GET['Action'] == 'MemberOptions')
+      if($Action == 'MemberOptions')
       {
         $Form = new Form($this->System->FormManager);
@@ -264 +269 @@
         } else $Output .= $this->SystemMessage('Chyba', 'Nejste zákazníkem');
       } else
-      if($_GET['Action'] == 'MemberOptionsSave')
+      if($Action == 'MemberOptionsSave')
       {
         $Form = new Form($this->System->FormManager);
@@ -298 +303 @@
         $Form->OnSubmit = '?Action=MemberOptionsSave';
         $Output .= $Form->ShowEditForm();
-      }
-    }
-
+      } else 
+      if($Action == 'UserMenu')
+      {
+        $Output = $this->ShowUserPanel();
+      } else $Output = $this->ShowMain();
+    } else $Output = $this->ShowMain();
+    return($Output);
+  }
+    
+  function ShowMain()
+  {
+    $Output = '';
     $DbResult = $this->Database->query('SELECT * FROM `ActionGroup`');
     while($DbRow = $DbResult->fetch_assoc())
@@ -322 +336 @@
         else if($Panel['Module'] == 'UserOptions') 
         {
-          if($this->System->User->User['Id'] != null) $Output .= $this->Panel('Přihlášený uživatel', $this->UserPanel());
+          //if($this->System->User->User['Id'] != null) $Output .= $this->Panel('Přihlášený uživatel', $this->UserPanel());
         } else
         if($Panel['Module'] == 'Webcam') $Output .= $this->Panel('Kamery', $this->WebcamPanel());
@@ -331 +345 @@
     }  
     $Output .= '</tr></table>';
+    return($Output);
+  }
+  
+  function ShowUserPanel()
+  {
+    $Output = '';
+    if($this->System->User->User['Id'] != null) 
+      $Output .= $this->Panel('Nabídka uživatele', $this->UserPanel());
+      else $Output .= $this->SystemMessage('Oprávnění', 'Nejste přihlášen');
     return($Output);
   }