Changeset 71

Timestamp:

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

Author:

george

Message:

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

Location:

trunk

Files:

• Readme.txt (modified) (1 diff)
• www/Application/Config (modified) (1 prop)
• www/Application/Controller/HomePage.php (modified) (4 diffs)
• www/Application/Controller/Include.php (modified) (1 diff)
• www/Application/Controller/Server.php (modified) (1 diff)
• www/Application/Controller/User.php (added)
• www/Application/Include.php (modified) (1 diff)
• www/Application/Style/Style.css (modified) (2 diffs)
• www/Application/View/Page.php (modified) (3 diffs)
• www/Application/View/Server.php (modified) (13 diffs)
• www/Application/View/User.php (modified) (11 diffs)
• www/Base/Form.php (modified) (9 diffs)
• www/Base/Html.php (modified) (1 diff)
• www/Base/Table.php (modified) (1 diff)
• www/Base/Types/Base.php (modified) (1 diff)
• www/Base/Types/Include.php (modified) (2 diffs)
• www/Base/Types/PointerOneToOne.php (modified) (3 diffs)

trunk/Readme.txt

@@ -15 +15 @@
 
 
-2) Konfigurační soubory
+2) Soubory nastavení
 
-  Zkopírovat soubor www/config.sample.php na www/config.php a vyplnit údaje.
+  Zkopírovat soubor www/Application/Config/ConfigSample.php na Config.php ve stejné složce a vyplnit údaje.
   Uživatelský účet pro přístup do databáze MySQL musí mít plný přístup, aby mohl vytvářet databáze pro servery.
 

trunk/www/Application/Controller/HomePage.php

@@ -8 +8 @@
     $View = new HomePageView($this->System);
     return($Page->GetOutput($View->Welcome()));
+  }
+  
+  function Info()
+  {
+    $Page = new PageView($this->System);
+    $View = new HomePageView($this->System);
+    return($Page->GetOutput($View->Info()));
+  }
+
+  function State()
+  {
+    $Page = new PageView($this->System);
+    $View = new HomePageView($this->System);
+    return($Page->GetOutput($View->State()));
   }
   
@@ -23 +37 @@
     if(array_key_exists('Action', $_GET))
     {
-      if($_GET['Action'] == 'LoginForm')
-      {
-        $UserView = new UserView($this->Database, $this->System);
-        $Output .= $UserView->LoginForm();
-      } else
-      if($_GET['Action'] == 'Login')
-      {
-        $UserView = new UserView($this->Database, $this->System);
-        $Output .= $UserView->LoginResult();
-      } else 
-      if($_GET['Action'] == 'Logout')
-      {
-        $UserView = new UserView($this->Database, $this->System);
-        $Output .= $UserView->Logout();
-      } else
-      if($_GET['Action'] == 'UserOptions')
-      { 
-        $UserView = new UserView($this->Database, $this->System);
-        $Output .= $UserView->Options();
-      } else
-      if($_GET['Action'] == 'UserOptionsSave')
-      {
-        $UserView = new UserView($this->Database, $this->System);
-        $Output .= $UserView->OptionsSave();
-      } else
-      if($_GET['Action'] == 'UserRegister')
-      {
-        $UserView = new UserView($this->Database, $this->System);
-        $Output .= $UserView->Register();
-      } else
-      if($_GET['Action'] == 'UserRegisterConfirm')
-      {
-        $UserView = new UserView($this->Database, $this->System);
-        $Output .= $UserView->RegisterConfirm();
-      } else
-      if($_GET['Action'] == 'PasswordRecovery')
-      {
-        $UserView = new UserView($this->Database, $this->System);
-        $Output .= $UserView->PasswordRecovery();
-      } else
-      if($_GET['Action'] == 'PasswordRecoveryFinish')
-      {
-        $UserView = new UserView($this->Database, $this->System);
-        $Output .= $UserView->PasswordRecoveryFinish();
-      } else
-      if($_GET['Action'] == 'PasswordRecoveryConfirm')
-      {
-        $UserView = new UserView($this->Database, $this->System);
-        $Output .= $UserView->PasswordRecoveryConfirm();
-      } else
-      if($_GET['Action'] == 'UserRegisterSave')
-      {
-        $UserView = new UserView($this->Database, $this->System);
-        $Output .= $UserView->RegisterSave();
-      } else
-      if($_GET['Action'] == 'ServerAdd')
-      {
-        $ServerView = new ServerView($this->Database, $this->System);
-        $Output .= $ServerView->Add();
-      } else
-      if($_GET['Action'] == 'ServerCreate')
-      {
-        $ServerView = new ServerView($this->Database, $this->System);
-        $Output .= $ServerView->Create();
-      } else
-      if($_GET['Action'] == 'ServerShow')
-      {
-        $ServerView = new ServerView($this->Database, $this->System);
-        $Output .= $ServerView->Item();
-        //if(array_key_exists('Id', $_GET)) $Output .= $this->ShowServer($_GET['Id']);
-        //else $this->SystemMessage('Zobrazení serveru', 'Nebylo zadáno Id');
-      } else
-      if($_GET['Action'] == 'ServerEdit')
-      {
-        $ServerView = new ServerView($this->Database, $this->System);
-        $Output .= $ServerView->Edit();
-      } else
-      if($_GET['Action'] == 'ServerSave')
-      {
-        $ServerView = new ServerView($this->Database, $this->System);
-        $Output .= $ServerView->Save();
-      } else
-      if($_GET['Action'] == 'ServerStart')
-      {
-        $ServerView = new ServerView($this->Database, $this->System);
-        $Output .= $ServerView->Start();
-      } else
-      if($_GET['Action'] == 'ServerStop')
-      {
-        $ServerView = new ServerView($this->Database, $this->System);
-        $Output .= $ServerView->Stop();
-      } else
-      if($_GET['Action'] == 'ServerDatabaseImport')
-      {
-        $DatabaseView = new DatabaseView($this->Database, $this->System);
-        $Output .= $DatabaseView->Import();
-      } else
       if($_GET['Action'] == 'EmulatorShow')
       {
@@ -175 +92 @@
         $Output .= $UpdateView->ItemList();
       } else     
-      if($_GET['Action'] == 'GameAccountRegister')
-      {
-        $ServerView = new ServerView($this->Database, $this->System);
-        $Output .= $ServerView->AccountCreate();
-      } else
-      if($_GET['Action'] == 'GameAccountRegister2')
-      {
-        $ServerView = new ServerView($this->Database, $this->System);
-        $Output .= $ServerView->AccountCreateFinish();
-      } else      
-      if($_GET['Action'] == 'Info')
-      {
-        $BaseView = new BaseView($this->Database, $this->System);
-        $Output .= $BaseView->Info();
-      } else      
       if($_GET['Action'] == 'BackupAdd')
       {
@@ -244 +146 @@
         $BaseView = new BaseView($this->Database, $this->System);
         $Output .= $BaseView->State();
-      } else
-      if($_GET['Action'] == 'ServerList')
-      {
-        $ServerView = new ServerView($this->Database, $this->System);
-        $Output .= $ServerView->ItemList();
       } else
       if($_GET['Action'] == 'RealmList')

trunk/www/Application/Controller/Include.php

@@ -4 +4 @@
 include('Application/Controller/Realm.php');
 include('Application/Controller/Server.php');
+include('Application/Controller/User.php');
 
 ?>

trunk/www/Application/Controller/Server.php

@@ -3 +3 @@
 class ServerController extends Controller
 {
+  function Add()
+  {
+    $Page = new PageView($this->System);
+    $View = new ServerView($this->System);
+    return($Page->GetOutput($View->Add()));
+  }  
   
+  function Create()
+  {
+    $Page = new PageView($this->System);
+    $View = new ServerView($this->System);
+    return($Page->GetOutput($View->Create()));
+  }  
+  
+  function Show()
+  {
+    $Page = new PageView($this->System);
+    $View = new ServerView($this->System);
+    return($Page->GetOutput($View->Item()));
+  }  
+
+  function Edit()
+  {
+    $Page = new PageView($this->System);
+    $View = new ServerView($this->System);
+    return($Page->GetOutput($View->Edit()));
+  }  
+
+  function Save()
+  {
+    $Page = new PageView($this->System);
+    $View = new ServerView($this->System);
+    return($Page->GetOutput($View->Save()));
+  }  
+  
+  function Start()
+  {
+    $Page = new PageView($this->System);
+    $View = new ServerView($this->System);
+    return($Page->GetOutput($View->Start()));
+  }  
+  
+  function Stop()
+  {
+    $Page = new PageView($this->System);
+    $View = new ServerView($this->System);
+    return($Page->GetOutput($View->Stop()));
+  }  
+  
+  function DatabaseImport()
+  {
+    $Page = new PageView($this->System);
+    $View = new DatabaseView($this->System);
+    return($Page->GetOutput($View->Import()));
+  }  
+
+  function ItemList()
+  {
+    $Page = new PageView($this->System);
+    $View = new ServerView($this->System);
+    return($Page->GetOutput($View->ItemList()));
+  }  
+
+  function GameAccountRegister()
+  {
+    $Page = new PageView($this->System);
+    $View = new ServerView($this->System);
+    return($Page->GetOutput($View->AccountCreate()));
+  }  
+
+  function GameAccountRegisterFinish()
+  {
+    $Page = new PageView($this->System);
+    $View = new ServerView($this->System);
+    return($Page->GetOutput($View->AccountCreateFinish()));
+  }  
 }
 

trunk/www/Application/Include.php

@@ -2 +2 @@
 
 include('Application/CustomTypes.php');
-include('Application/Config/Config.php');
+if(file_exists('Application/Config/Config.php')) include('Application/Config/Config.php');
+  else die('Nenalezen soubor Application/Config/Config.php. Vytvořte jej kopií ze souboru Application/Config/ConfigSample.php.');
 include('Application/Model/Include.php');
 include('Application/View/Include.php');

trunk/www/Application/Style/Style.css

@@ -69 +69 @@
 }
 
-#Footer
+.Footer
 {
   border-style: solid; 
@@ -78 +78 @@
   font-size: 10px;
   text-align: center;
+}
+
+.Footer ul li
+{
+  display: inline;
+  padding-left: 5px;
+  padding-right: 5px;
 }
 

trunk/www/Application/View/Page.php

@@ -29 +29 @@
   {
     $Output = '<div class="Navigation"><span class="MenuItem">'.
-    '<a href="?Action=Info">Informace</a>'.
-    ' <a href="?Module=System&amp;Action=State">Stav systému</a>'.
-    ' <a href="?Module=Server&amp;Action=List">Seznam serverů</a>'.
-    ' <a href="?Module=Client&amp;Action=List">Verze klienta</a>'.
-    ' <a href="?Module=Emulator&amp;Action=List">Verze emulátoru</a>'.
+    '<a href="?Module=HomePage&amp;Action=Info">Informace</a>'.
+    ' <a href="?Module=HomePage&amp;Action=State">Stav systému</a>'.
+    ' <a href="?Module=Server&amp;Action=ItemList">Seznam serverů</a>'.
+    ' <a href="?Module=Client&amp;Action=ItemList">Verze klienta</a>'.
+    ' <a href="?Module=Emulator&amp;Action=ItemList">Verze emulátoru</a>'.
     '</span><div class="MenuItem2">';
     if($this->System->Modules['User']->User['Id'] == $this->System->Modules['User']->AnonymousUserId)
@@ -40 +40 @@
       if($this->Config['Web']['UserRegistrationEnabled']) $Output .= ' <a href="'.$this->System->Config['Web']['RootFolder'].'/?Module=User&amp;Action=Register">Registrace</a>'; 
     } else $Output .= $this->System->Modules['User']->User['Name'].' <a href="'.$this->Config['Web']['RootFolder'].'/?Module=User&amp;Action=Logout">Odhlásit</a>'.
-       ' <a href="'.$this->Config['Web']['RootFolder'].'/?Module=Userr&amp;Action=Options">Nastavení</a>';
+       ' <a href="'.$this->Config['Web']['RootFolder'].'/?Module=User&amp;Action=Options">Nastavení</a>';
     $Output .= '</div></div>';
     return($Output);
@@ -50 +50 @@
     
     $Time = round($this->System->GetMicrotime() - $ScriptTimeStart, 2);
-    $Output = '<div id="Footer">
-   <i>| Založeno na projektu <a href="http://svn.zdechov.net/trac/wowhosting/">WoW hosting</a>'.
-   ' | <a href="http://svn.zdechov.net/trac/wowhosting/browser">Zdrojové kódy</a>'.
-   ' | <a href="http://svn.zdechov.net/trac/wowhosting/log?verbose=on">Novinky</a>'.
-   ' | Správce: '.$this->Config['Web']['Admin'].
-   ' | E-mail: '.$this->Config['Web']['AdminEmail'].' | ';
-    if($this->Config['Web']['ShowRuntimeInfo'] == true) $Output .= ' Doba generování: '.$Time.' s / '.ini_get('max_execution_time').' s | Použitá paměť: '.HumanSize(memory_get_peak_usage(FALSE)).' / '.ini_get('memory_limit').'B |';
-  $Output .= '</i></div></body></html>';
+    $Output = '<div class="Footer">
+   <ul><li>Založeno na projektu <a href="http://svn.zdechov.net/trac/wowhosting/">WoW hosting</a></li>'.
+   '<li><a href="http://svn.zdechov.net/trac/wowhosting/browser">Zdrojové kódy</a></li>'.
+   '<li><a href="http://svn.zdechov.net/trac/wowhosting/log?verbose=on">Novinky</a></li>'.
+   '<li>Správce: '.$this->Config['Web']['Admin'].'</li>'.
+   '<li>E-mail: '.$this->Config['Web']['AdminEmail'].'</li>';
+    if($this->Config['Web']['ShowRuntimeInfo'] == true) $Output .= '<li>Doba generování: '.$Time.' s / '.ini_get('max_execution_time').' s</li><li>Použitá paměť: '.HumanSize(memory_get_peak_usage(FALSE)).' / '.ini_get('memory_limit').'B</li>';
+  $Output .= '</ul></div></body></html>';
     return($Output); 
   }

trunk/www/Application/View/Server.php

@@ -97 +97 @@
     foreach($Table->Values as $Index => $Item)
     {
-     $Table->Values[$Index]['Actions'] = '<a href="?Action=ServerShow&amp;Id='.$Item['Id'].'">Podrobnosti</a>';
+     $Table->Values[$Index]['Actions'] = '<a href="?Module=Server&amp;Action=Show&amp;Id='.$Item['Id'].'">Podrobnosti</a>';
      unset($Table->Values[$Index]['Id']);
     }
@@ -109 +109 @@
       $DbRow = $DbResult->fetch_row();
       if(($ServerCount < $Config['MaxServerCount']) and ($DbRow[0] < $Config['MaxServerCountPerUser']))
-        $Output .= '<br /><div style="text-align: center;"><a href="?Action=ServerAdd">Vytvořit nový server</a></dev>';      
+        $Output .= '<br /><div style="text-align: center;"><a href="?Module=Server&amp;Action=Add">Vytvořit nový server</a></dev>';      
     }
     return($Output);
@@ -123 +123 @@
     {
     $Output = '<h4>Podrobnosti serveru</h4>';
-    $Form = new Form($this->ItemFormClass);
+    $Form = new Form($this->System, $this->ItemFormClass);
     $Form->LoadValuesFromDatabase($Id);
     $Form->Definition['Items']['Realmlist'] = array('Type' => 'String', 'Caption' => 'Adresa k připojení', 'Default' => '');    
@@ -142 +142 @@
       if(array_key_exists('Id', $Server->Server['Database']) and ($Server->Server['Lock'] == 0))
       {
-        if($ServerStatus['RealmdPortState'] == true) $Output .= ' <a href="?Action=ServerStop&amp;Id='.$Server->Id.'">Zastavit</a>  <a href="?Action=ServerRestart&amp;Id='.$Server->Id.'">Restartovat</a>';
-          else $Output .= ' <a href="?Action=ServerStart&amp;Id='.$Server->Id.'">Spustit</a>';
+        if($ServerStatus['RealmdPortState'] == true) $Output .= ' <a href="?Action=ServerStop&amp;Id='.$Server->Id.'">Zastavit</a>  <a href="?Module=Server&amp;Action=Restart&amp;Id='.$Server->Id.'">Restartovat</a>';
+          else $Output .= ' <a href="?Module=Server&amp;Action=Start&amp;Id='.$Server->Id.'">Spustit</a>';
       }
       if($Server->Server['Lock'] == 0)
       {
-        $Output .= ' <a href="?Action=ServerEdit&amp;Id='.$Server->Id.'">Upravit základní nastavení</a>';
+        $Output .= ' <a href="?Module=Server&amp;Action=Edit&amp;Id='.$Server->Id.'">Upravit základní nastavení</a>';
       }
       //$Output .= ' <a href="?Action=ServerDatabaseImport&amp;Id='.$Server->Id.'">Načtení čisté databáze</a>';
-      $Output .= ' <a href="?Action=RealmAdd&amp;Id='.$Server->Id.'">Vytvořit nový svět</a>';
-      $Output .= ' <a href="?Action=UpdateRealmCharacters&amp;Id='.$Server->Id.'">Aktualizovat počty postav</a>';
+      $Output .= ' <a href="?Module=Realm&amp;Action=Add&amp;Id='.$Server->Id.'">Vytvořit nový svět</a>';
+      $Output .= ' <a href="?Module=Realm&amp;Action=UpdateCharacters&amp;Id='.$Server->Id.'">Aktualizovat počty postav</a>';
     }
-    $Output .= ' <a href="?Action=GameAccountRegister&amp;Id='.$Server->Id.'">Vytvoření herního účtu</a>';
+    $Output .= ' <a href="?Module=Server&amp;Action=GameAccountRegister&amp;Id='.$Server->Id.'">Vytvoření herního účtu</a>';
     $Output .= '</div>';
     
     // Show realmlist
-    $RealmView = new RealmView($this->Database, $this->System);
+    $RealmView = new RealmView($this->System);
     $Output .= $RealmView->ItemList();
     } else $Output = $this->System->SystemMessage('Zobrazení serveru', 'Server se zadaným id nenalezen.');
@@ -180 +180 @@
         else 
         {
-          $Form = new Form($this->CreateFormClass);
+          $Form = new Form($this->System, $this->CreateFormClass);
           $Form->LoadValuesFromForm();
           $Form->OnSubmit = '?Action=ServerCreate';
@@ -208 +208 @@
         if($NewPortRealmd < $Config['BaseNetworkPortRealmd']) $NewPortRealmd = $Config['BaseNetworkPortRealmd'];
             
-        $Form = new Form($this->CreateFormClass, array());
+        $Form = new Form($this->System, $this->CreateFormClass, array());
         $Form->LoadValuesFromForm();
         $this->Database->insert('Server', array('Name' => $Form->Values['Name'], 'Description' => $Form->Values['Description'], 'User' => $this->System->Modules['User']->User['Id'], 'Homepage' => $Form->Values['Homepage'], 'Database' => $Form->Values['Database'], 'NetworkPortRealmd' => $NewPortRealmd, 'Lock' => 1, 'TimeCreate' => 'NOW()'));
@@ -215 +215 @@
         $Server->CreateDatabase();            
         $Output .= $this->System->SystemMessage('Vytvoření serveru', $Server->ImportDatabase(true));
-        $TaskView = new TaskView($this->Database, $this->System);
+        $TaskView = new TaskView($this->System);
         $Output .= $TaskView->ItemList();
         //$UserOptions->LoadValuesFromDatabase($this->System->Modules['User']->User['Id']);
@@ -231 +231 @@
     if(($this->System->Modules['User']->User['Id'] == $Server->Server['User']) or ($this->System->Modules['User']->User['Role'] >= USER_ROLE_ADMINISTRATOR))
     {
-      $Form = new Form($this->EditFormClass, array());
+      $Form = new Form($this->System, $this->EditFormClass, array());
       $Form->LoadValuesFromForm();
       $ServerId = $_POST['ServerId'];
@@ -253 +253 @@
     if(($this->System->Modules['User']->User['Id'] == $Server->Server['User']) or ($this->System->Modules['User']->User['Role'] >= USER_ROLE_ADMINISTRATOR))
     {
-      $Form = new Form($this->EditFormClass);
+      $Form = new Form($this->System, $this->EditFormClass);
       $Form->LoadValuesFromDatabase($_GET['Id']);
       $Form->Values['ServerId'] = $_GET['Id'];
@@ -271 +271 @@
       {
         $Output .= $this->System->SystemMessage('Spuštění serveru', $Server->Start());
-        $TaskView = new TaskView($this->Database, $this->System);
+        $TaskView = new TaskView($this->System);
         $Output .= $TaskView->ItemList();;
       } else $this->System->SystemMessage('Spuštění serveru', 'Nemáte oprávnění');
@@ -287 +287 @@
       {
         $Output .= $this->System->SystemMessage('Zastavení serveru', $Server->Stop());
-        $TaskView = new TaskView($this->Database, $this->System);
+        $TaskView = new TaskView($this->System);
         $Output .= $TaskView->ItemList();;
       } else $this->System->SystemMessage('Zastavení serveru', 'Nemáte oprávnění');
@@ -296 +296 @@
   function AccountCreate()
   {
-    $Form = new Form($this->GameAccountNewFormClass);
+    $Form = new Form($this->System, $this->GameAccountNewFormClass);
     $Form->LoadValuesFromForm();
     $Form->Values['ServerId'] = $_GET['Id'];
-    $Form->OnSubmit = '?Action=GameAccountRegister2';
+    $Form->OnSubmit = '?Module=Server&amp;Action=GameAccountRegisterFinish';
     $Output = $Form->ShowEditForm();
     return($Output);
@@ -306 +306 @@
   function AccountCreateFinish()
   {
-    $Form = new Form($this->GameAccountNewFormClass);
+    $Form = new Form($this->System, $this->GameAccountNewFormClass);
     $Form->LoadValuesFromForm();
     $Server = new Server($this->Database, $Form->Values['ServerId']);
     $Output = $this->System->SystemMessage('Vytvoření herního účtu', $Server->NewAccount($Form->Values['Name'], $Form->Values['Password'], $Form->Values['Password2'], $Form->Values['Email'], $Form->Values['Expansion']));
-    $Output .= '<a href="?Action=GameAccountRegister&amp;Id='.$Form->Values['ServerId'].'">Zpět k zadání údajů</a>';
+    $Output .= '<a href="?Module=Server&amp;Action=GameAccountRegister&amp;Id='.$Form->Values['ServerId'].'">Zpět k zadání údajů</a>';
     return($Output);
   }

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();

trunk/www/Base/Form.php

@@ -1 +1 @@
 <?php
 
-class Form
+class Form extends Module
 {
   var $Definition = array();
@@ -7 +7 @@
   var $OnSubmit = '';
   
-  function __construct($FormClass)
+  function __construct($System, $FormClass)
   {  
     $this->Definition = $FormClass;
@@ -14 +14 @@
       $this->Values[$Index] = '';
     }    
+    $this->System = $System;
+    $this->Database = $System->Database;
+    $this->Config = $System->Config;
   }
 
@@ -24 +27 @@
   function ShowTableBlock($Context = '')
   {
-    global $Database, $FormTypes;
+    global $FormTypes;
 
     $Table = array(
@@ -41 +44 @@
       }
     }
-    $Output = '<div style="text-align: center">'.$this->Definition['Title'].'</div>'.Table($Table, 'WideTable');
+    $Html = new Html();
+    $Output = '<div style="text-align: center">'.$this->Definition['Title'].'</div>'.$Html->Table($Table, 'WideTable');
     return($Output); 
   }
@@ -54 +58 @@
   function ShowEditBlock($Context = '')
   {
-    global $Database, $FormTypes;
+    global $FormTypes;
 
     $Table = array(
@@ -70 +74 @@
       }
     }
-    $Output = '<fieldset><legend>'.$this->Definition['Title'].'</legend>'.Table($Table, 'BasicTable').
+    $Html = new Html();
+    $Output = '<fieldset><legend>'.$this->Definition['Title'].'</legend>'.$Html->Table($Table, 'BasicTable').
     '</fieldset>';
     foreach($this->Definition['Items'] as $Index => $Item)
@@ -79 +84 @@
   function LoadValuesFromDatabase($Id)
   {
-    global $Database;
-
-    $DbResult = $Database->query('SELECT T.* FROM '.$this->Definition['Table'].' AS T WHERE T.Id='.$Id);
+    $DbResult = $this->Database->query('SELECT T.* FROM '.$this->Definition['Table'].' AS T WHERE T.Id='.$Id);
     if($DbResult->num_rows > 0) $DbRow = $DbResult->fetch_assoc();
     foreach($this->Definition['Items'] as $Index => $Item)
@@ -94 +97 @@
   function SaveValuesToDatabase($Id)
   {
-    global $Database;
-
     if($Id == 0)
     {
       $this->Values['Id'] = $Id;
-      $DbResult = $Database->replace($this->Definition['Table'], $this->Values);
+      $DbResult = $this->Database->replace($this->Definition['Table'], $this->Values);
     } else
-    $DbResult = $Database->update($this->Definition['Table'], 'Id='.$Id, $this->Values);
+    $DbResult = $this->Database->update($this->Definition['Table'], 'Id='.$Id, $this->Values);
   }
 

trunk/www/Base/Html.php

@@ -1 +1 @@
 <?php
 
-class HTML extends Module
+class HTML
 {
   function ShowArray($Value)

trunk/www/Base/Table.php

@@ -57 +57 @@
       'Rows' => $this->Values,
     );
-    $Output = Table($Table, 'WideTable');
-    $Output .= '<div class="Pager">'.PageList('Page', $this->Page, $this->TotalRowCount, $Config['Web']['TableRowPerPage']).'</div>';
+    $Html = new Html();
+    $Output = $Html->Table($Table, 'WideTable');
+    $Output .= '<div class="Pager">'.$Html->PageList('Page', $this->Page, $this->TotalRowCount, $Config['Web']['TableRowPerPage']).'</div>';
     return($Output);
   }  

trunk/www/Base/Types/Base.php

@@ -1 +1 @@
 <?php
 
-class TypeBase
+class TypeBase extends Module
 {
   var $DatabaseCompareOperators = array();

trunk/www/Base/Types/Include.php

@@ -42 +42 @@
 function ExecuteTypeEvent($TypeName, $Event, $Parameters = array())
 {
-  global $TypeDefinitionList;
+  global $TypeDefinitionList, $System;
   
   if(array_key_exists($TypeName, $TypeDefinitionList))
@@ -48 +48 @@
     $Type = $TypeDefinitionList[$TypeName];
     $TypeClass = 'Type'.$Type['Class'];
-    $TypeObject = new $TypeClass;
+    $TypeObject = new $TypeClass($System);
     if(is_callable(array($TypeObject, $Event))) return($TypeObject->$Event($Parameters));
       else return($TypeName.'->'.$Event.'('.serialize($Parameters).')');

trunk/www/Base/Types/PointerOneToOne.php

@@ -5 +5 @@
   function OnView($Item)
   {
-    global $Database, $TypeDefinitionList;
+    global $TypeDefinitionList;
 
     $Type = $TypeDefinitionList[$Item['Type']];
-    $DbResult = $Database->query('SELECT '.$Type['Parameters']['Name'].' AS Name FROM `'.$Type['Parameters']['Table'].'` WHERE `'.$Type['Parameters']['Id'].'`='.$Item['Value']);
+    $DbResult = $this->Database->query('SELECT '.$Type['Parameters']['Name'].' AS Name FROM `'.$Type['Parameters']['Table'].'` WHERE `'.$Type['Parameters']['Id'].'`='.$Item['Value']);
     $DbRow = $DbResult->fetch_assoc();
     $Output = $DbRow['Name'];
@@ -24 +24 @@
   function OnEdit($Item)
   {
-    global $Database, $TypeDefinitionList;
+    global $TypeDefinitionList;
 
     $Output = '<select name="'.$Item['Name'].'">';
@@ -30 +30 @@
     if(array_key_exists('Condition', $Type['Parameters'])) $Where = ' WHERE '.$Type['Parameters']['Condition'];
       else $Where = '';
-    $DbResult = $Database->query('SELECT '.$Type['Parameters']['Name'].' AS Name,'.$Type['Parameters']['Id'].' AS Id FROM `'.$Type['Parameters']['Table'].'`'.$Where.' ORDER BY Name DESC');
+    $DbResult = $this->Database->query('SELECT '.$Type['Parameters']['Name'].' AS Name,'.$Type['Parameters']['Id'].' AS Id FROM `'.$Type['Parameters']['Table'].'`'.$Where.' ORDER BY Name DESC');
     while($DbRow = $DbResult->fetch_assoc())
     {