Changeset 634 for trunk/Common

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.

Location:

trunk/Common

Files:

• Database.php (modified) (1 diff)
• Page.php (modified) (1 diff)
• Setup/DefaultConfig.php (modified) (1 diff)

trunk/Common/Database.php

@@ -174 +174 @@
     return(addslashes($Text));
   }
+  
+  public function __sleep()
+  {
+    return array('LastQuery');
+  }
+
+  public function __wakeup()
+  {
+  }
 }
 

trunk/Common/Page.php

@@ -87 +87 @@
       $Output .= '<div class="MainTitle">'.$Title.'</div>
       <div class="Navigation"><span class="MenuItem"><strong>Navigace :: </strong> '.$Navigation.'</span><div class="MenuItem2">';
-      if(isset($this->System->User) and ($this->System->Config['Web']['UserSupport'] == 1))
-      {
-        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=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>'; 
+        foreach($this->System->Bars['Top'] as $BarItem)
+        $Output .= call_user_func($BarItem);
       $Output .= '</div></div>';
     }

trunk/Common/Setup/DefaultConfig.php

@@ -27 +27 @@
         array('Name' => 'Web/WebcamPassword', 'Type' => 'Password', 'Default' => '', 'Title' => 'Heslo web kamery'),
         array('Name' => 'Web/WebcamRefresh', 'Type' => 'Integer', 'Default' => '5', 'Title' => 'Interval obnovení'),
-        array('Name' => 'Web/UserSupport', 'Type' => 'Boolean', 'Default' => '1', 'Title' => 'Podpora uživatelů'),
         array('Name' => 'Web/UploadFileFolder', 'Type' => 'String', 'Default' => 'files', 'Title' => 'Složka načtených souborů'),
         array('Name' => 'Web/News/DaysAgo', 'Type' => 'Integer', 'Default' => '30', 'Title' => 'Stáří zobrazovaných aktualit'),