Changeset 93 for trunk/www/Application

Timestamp:

Aug 15, 2013, 11:17:26 PM (11 years ago)

Author:

chronos

Message:

• Fixed: System variable as parameter to constructors of descendents of Module class.
• Removed: End PHP mark "?>" from all files.

Location:

trunk/www/Application

Files:

• Application.php (modified) (1 diff)
• Config/ConfigSample.php (modified) (1 diff)
• Controller/Backup.php (modified) (1 diff)
• Controller/Client.php (modified) (1 diff)
• Controller/Cluster.php (modified) (1 diff)
• Controller/Debug.php (modified) (1 diff)
• Controller/Emulator.php (modified) (1 diff)
• Controller/HomePage.php (modified) (1 diff)
• Controller/News.php (modified) (1 diff)
• Controller/Realm.php (modified) (1 diff)
• Controller/Server.php (modified) (2 diffs)
• Controller/Task.php (modified) (1 diff)
• Controller/Update.php (modified) (1 diff)
• Controller/User.php (modified) (1 diff)
• Localization/cz.php (modified) (1 diff)
• Model/Backup.php (modified) (3 diffs)
• Model/Cluster.php (modified) (2 diffs)
• Model/ClusterList.php (modified) (1 diff)
• Model/Emulator.php (modified) (4 diffs)
• Model/History.php (modified) (2 diffs)
• Model/MangosConfigurationFile.php (modified) (2 diffs)
• Model/MangosDebug.php (modified) (2 diffs)
• Model/Permission.php (modified) (1 diff)
• Model/Platform.php (modified) (3 diffs)
• Model/Realm.php (modified) (11 diffs)
• Model/RealmList.php (modified) (2 diffs)
• Model/RemoteConsole.php (modified) (1 diff)
• Model/Server.php (modified) (11 diffs)
• Model/ServerList.php (modified) (1 diff)
• Model/Shell.php (modified) (17 diffs)
• Model/TableRelations.php (modified) (1 diff)
• Model/Task.php (modified) (2 diffs)
• Model/User.php (modified) (3 diffs)
• View/Backup.php (modified) (5 diffs)
• View/Client.php (modified) (2 diffs)
• View/Cluster.php (modified) (1 diff)
• View/Database.php (modified) (2 diffs)
• View/Debug.php (modified) (3 diffs)
• View/Emulator.php (modified) (6 diffs)
• View/HomePage.php (modified) (2 diffs)
• View/News.php (modified) (1 diff)
• View/Page.php (modified) (2 diffs)
• View/Realm.php (modified) (19 diffs)
• View/Server.php (modified) (19 diffs)
• View/Task.php (modified) (2 diffs)
• View/Update.php (modified) (3 diffs)
• View/User.php (modified) (6 diffs)

trunk/www/Application/Application.php

@@ -37 +37 @@
 $Application = new Application();
 $Application->Run();
-
-?>

trunk/www/Application/Config/ConfigSample.php

@@ -45 +45 @@
   'BackupCountPerServer' => 20,  
 );
-
-?>

trunk/www/Application/Controller/Backup.php

@@ -35 +35 @@
   }    
 }
-
-?>

trunk/www/Application/Controller/Client.php

@@ -14 +14 @@
   }    
 }
-
-?>

trunk/www/Application/Controller/Cluster.php

@@ -57 +57 @@
   }    
 }
-
-?>

trunk/www/Application/Controller/Debug.php

@@ -21 +21 @@
   }    
 }
-
-?>

trunk/www/Application/Controller/Emulator.php

@@ -49 +49 @@
   }    
 }
-
-?>

trunk/www/Application/Controller/HomePage.php

@@ -37 +37 @@
   }
 }
-
-?>

trunk/www/Application/Controller/News.php

@@ -21 +21 @@
   }    
 }
-
-?>

trunk/www/Application/Controller/Realm.php

@@ -91 +91 @@
   }    
 }
-
-?>

trunk/www/Application/Controller/Server.php

@@ -104 +104 @@
   function UnLock()
   {
-    $Model = new Server($this->Database, $_GET['Id']);
+    $Model = new Server($this->System, $_GET['Id']);
     $Model->UnLock();
   }    
@@ -110 +110 @@
   function Lock()
   {
-    $Model = new Server($this->Database, $_GET['Id']);
+    $Model = new Server($this->System, $_GET['Id']);
     $Model->Lock();
   }      
 }
-
-?>

trunk/www/Application/Controller/Task.php

@@ -37 +37 @@
   }    
 }
-
-?>

trunk/www/Application/Controller/Update.php

@@ -21 +21 @@
   }    
 }
-
-?>

trunk/www/Application/Controller/User.php

@@ -84 +84 @@
   }    
 }
-
-?>

trunk/www/Application/Localization/cz.php

@@ -29 +29 @@
   'AccessDenied' => 'K provedení požadované akce nemáte dostatečné oprávnění',
 );
-
-?>

trunk/www/Application/Model/Backup.php

@@ -8 +8 @@
   var $Task;
   
-  function __construct($Database, $Id)
+  function __construct($System, $Id)
   {
-    $this->Database = $Database;
-    $this->Task = new Task($Database);
+        parent::__construct($System);
+    $this->Task = new Task($System);
     $this->Id = $Id;
     $DbResult = $this->Database->query('SELECT * FROM `Backup` WHERE `Id`='.$Id);
@@ -42 +42 @@
   function Create($ServerId)
   {
-    $Server = new Server($this->Database, $ServerId);
+    $Server = new Server($this->System, $ServerId);
     $Description = 'MaNGOS r'.$Server->Server['Database']['Emulator']['Revision'].', UDB r'.$Server->Server['Database']['Revision'].', SD2 r'.$Server->Server['Database']['ScriptDev2Revision'].', Client '.$Server->Server['Database']['Emulator']['Client']['Version'];
     $this->Database->insert('Backup', array('Server' => $ServerId, 'Time' => 'NOW()', 'Description' => $Description, 'Lock' => 1, 'Database' => $Server->Server['Database']['Id']));
@@ -73 +73 @@
   }
 }
-
-?>

trunk/www/Application/Model/Cluster.php

@@ -7 +7 @@
   function __construct($System, $Id)
   {
-    $this->System = $System;
-    $this->Config = $System->Config;
-    $this->Database = $System->Database;
+        parent::__construct($System);
     
     $DbResult = $this->Database->query('SELECT * FROM `ClusterNode` WHERE `Id`='.$Id);
@@ -31 +29 @@
   }  
 }
-
-?>

trunk/www/Application/Model/ClusterList.php

@@ -13 +13 @@
   }  
 }
-
-?>

trunk/www/Application/Model/Emulator.php

@@ -9 +9 @@
   var $Task;
   
-  function __construct($Database, $Id)
+  function __construct($System, $Id)
   {
-    $this->Database = $Database;
-    $this->Task = new Task($Database);
+    parent::__construct($System);
+    $this->Task = new Task($System);
     $this->Id = $Id;
     $DbResult = $this->Database->query('SELECT * FROM `Emulator` WHERE `Id`='.$Id);
@@ -35 +35 @@
   function Download()
   {
-    global $Config;
-    
     $this->Lock();
     $this->Task->Add('Stažení emulátoru', array(
       'php www/shell.php EmulatorLock '.$this->Id,
-      'mkdir '.$Config['BaseDir'].'emulator/'.$this->Id.'/',
-      'cd '.$Config['BaseDir'].'emulator/'.$this->Id.'/',
+      'mkdir '.$this->Config['BaseDir'].'emulator/'.$this->Id.'/',
+      'cd '.$this->Config['BaseDir'].'emulator/'.$this->Id.'/',
       'git clone git://github.com/mangos/mangos.git source',
       'cd source',
@@ -55 +53 @@
   function Compile()
   {
-    global $Config;
-    
     $this->Lock();
     $this->Task->Add('Překlad emulátoru', array(
       'php www/shell.php EmulatorLock '.$this->Id,
-      'cd '.$Config['BaseDir'].'emulator/'.$this->Id.'/source',
+      'cd '.$this->Config['BaseDir'].'emulator/'.$this->Id.'/source',
       'autoreconf -ifv',
       'mkdir objdir',
       'cd objdir',
-      'export CFLAGS="-g -ggdb '.$Config['CompilerParameters'].'"',
-      'export CXXFLAGS="-g -ggdb '.$Config['CompilerParameters'].'"',
-      '../configure --prefix='.$Config['BaseDir'].'emulator/'.$this->Id.'/ --enable-cli --enable-ra',
+      'export CFLAGS="-g -ggdb '.$this->Config['CompilerParameters'].'"',
+      'export CXXFLAGS="-g -ggdb '.$this->Config['CompilerParameters'].'"',
+      '../configure --prefix='.$this->Config['BaseDir'].'emulator/'.$this->Id.'/ --enable-cli --enable-ra',
       'make',
       'make install',
@@ -99 +95 @@
   }
 }
-
-?>

trunk/www/Application/Model/History.php

@@ -11 +11 @@
   var $Resolution = 1000;
   
-  function __construct($Database, $ServerId, $MeasureId)
+  function __construct($System, $ServerId, $MeasureId)
   {
-    $this->Database = $Database;
+    parent::__construct($System);
     $this->ServerId = $ServerId;
     $this->MeasureId = $MeasureId;
@@ -59 +59 @@
   }
 }
-
-?>

trunk/www/Application/Model/MangosConfigurationFile.php

@@ -7 +7 @@
   var $ParameterList;
   
-  function __construct($Database)
+  function __construct($System)
   {
-    $this->Database = $Database;
+    parent::__construct($System);
     $this->Parameters = array();
   }
@@ -41 +41 @@
   } 
 }
-
-?>

trunk/www/Application/Model/MangosDebug.php

@@ -8 +8 @@
   var $MaxMangosThreadCount = 12;
   
-  function __construct($Database)
+  function __construct($System)
   {
-    $this->Database = $Database;
+    parent::__construct($System);
   } 
   
   function ProcessLog($RealmId)
   {
-    global $Config;
-    
     $Output = '';
     // Read server Id from first parameter
-    $Realm = new Realm($this->Database, $RealmId);
+    $Realm = new Realm($this->System, $RealmId);
     
     $LogDir = '../realm/'.$RealmId.'/log/';
@@ -104 +102 @@
   }
 }
-
-?>

trunk/www/Application/Model/Permission.php

@@ -46 +46 @@
   }
 }
-
-?>

trunk/www/Application/Model/Platform.php

@@ -7 +7 @@
   var $Id;
   
-  function __construct($Database)
+  function __construct($System)
   {
-    $this->Database = $Database;
+    parent::__construct($System);
   } 
   
@@ -46 +46 @@
   function State()
   {
-    global $Config;
-    
     $State = array();
     $State['MemoryUsed'] = $this->MemoryUsage();
@@ -76 +74 @@
     $DbRow = $DbResult->fetch_row();
     $State['TaskQueued'] = $DbRow[0];
-    $State['ServerMaxCount'] = $Config['MaxServerCount'];
+    $State['ServerMaxCount'] = $this->Config['MaxServerCount'];
     return($State);
   }  
 }
-
-?>

trunk/www/Application/Model/Realm.php

@@ -9 +9 @@
   var $Task;
   
-  function __construct($Database, $Id)
-  {
-    $this->Database = $Database;
-    $this->Task = new Task($Database);
+  function __construct($System, $Id)
+  {
+    parent::__construct($System);
+    $this->Task = new Task($System);
     $this->Id = $Id;
     $DbResult = $this->Database->query('SELECT * FROM `Realm` WHERE `Id`='.$Id);
@@ -31 +31 @@
 
   function GetState()
-  {
-    global $System;
-    
+  {    
     $State = array();
-    $State['WorlddPortState'] = $System->NetworkPortState('localhost', $this->Data['NetworkPortWorldd']);
+    $State['WorlddPortState'] = $this->System->NetworkPortState('localhost', $this->Data['NetworkPortWorldd']);
     $State['Online'] = $State['WorlddPortState'];
     $State['Uptime'] = $this->Uptime();
@@ -140 +138 @@
   function UpdateRealmlist()
   {
-    $Server = new Server($this->Database, $this->Data['Server']);
+    $Server = new Server($this->System, $this->Data['Server']);
     $Server->UpdateRealmList();
   }
@@ -153 +151 @@
   function UpdateScripts()
   {
-    global $Config;
-    
     $RealmBinDir = '../realm/'.$this->Id.'/bin/';
     if(!file_exists($RealmBinDir)) mkdir($RealmBinDir, 0777, true);    
@@ -165 +161 @@
       'info thread',
     );
-    for($I = 1; $I < $Config['MangosWorlddThreadCountMax']; $I++)
+    for($I = 1; $I < $this->Config['MangosWorlddThreadCountMax']; $I++)
       $Content[] = 'thread apply '.$I.' bt full';
     file_put_contents($ScriptFileName, implode("\n", $Content));
@@ -209 +205 @@
   function SetupConfigurationFiles()
   {
-    global $Config;
-    
     $EmulatorEtcDir = '../emulator/'.$this->Data['Database']['Emulator']['Id'].'/etc/';
     $RealmEtcDir = '../realm/'.$this->Id.'/etc/';
@@ -220 +214 @@
     if(!file_exists($RealmEtcDir.'mangosd.conf')) 
       file_put_contents($RealmEtcDir.'mangosd.conf', file_get_contents($EmulatorEtcDir.'mangosd.conf.dist'));
-    $EmulatorConfig = new MangosConfigurationFile($this->Database);
+    $EmulatorConfig = new MangosConfigurationFile($this->System);
     $EmulatorConfig->Load($RealmEtcDir.'mangosd.conf');
     $EmulatorConfig->ParameterList['RealmID'] = $this->Data['Id'];
@@ -235 +229 @@
       
     // scriptdev2.conf
-    $EmulatorConfig = new MangosConfigurationFile($this->Database);
+    $EmulatorConfig = new MangosConfigurationFile($this->System);
     $EmulatorConfig->Load($EmulatorEtcDir.'scriptdev2.conf');
     $EmulatorConfig->ParameterList['ScriptDev2DatabaseInfo'] = 'localhost;3306;server'.$this->Data['Server'].';server'.$this->Data['Server'].';realm'.$this->Id.'_scriptdev2';
@@ -255 +249 @@
     if($DoBackup)
     {
-      $Backup = new Backup($this->Database, 0);
+      $Backup = new Backup($this->System, 0);
       $Output .= '<br />'.$Backup->Create($this->Id);
     }
@@ -364 +358 @@
     while($DbRow = $DbResult->fetch_assoc())
     {
-      $Realm = new Realm($this->Database, $DbRow['Id']);    
+      $Realm = new Realm($this->System, $DbRow['Id']);    
       $Realm->UpdateState();
     }    
@@ -380 +374 @@
   }
 }
-
-?>

trunk/www/Application/Model/RealmList.php

@@ -12 +12 @@
     while($DbRow = $DbResult->fetch_assoc())
     {
-      $Server = new Server($this->Database, $DbRow['Id']);
+      $Server = new Server($this->System, $DbRow['Id']);
       $Total += $Server->RealmCount();
     }
@@ -18 +18 @@
   }
 }
-
-?>

trunk/www/Application/Model/RemoteConsole.php

@@ -49 +49 @@
   }
 }
-
-?>

trunk/www/Application/Model/Server.php

@@ -9 +9 @@
   var $Task;
   
-  function __construct($Database, $Id)
-  {
-    $this->Database = $Database;
-    $this->Task = new Task($Database);
+  function __construct($System, $Id)
+  {
+    parent::__construct($System);
+    $this->Task = new Task($System);
     $this->Id = $Id;
     $DbResult = $this->Database->query('SELECT * FROM `Server` WHERE `Id`='.$Id);
@@ -68 +68 @@
   function GetState()
   {
-    global $System;
-    
     $State = array();
-    $State['RealmdPortState'] = $System->NetworkPortState('localhost', $this->Server['NetworkPortRealmd']);
+    $State['RealmdPortState'] = $this->System->NetworkPortState('localhost', $this->Server['NetworkPortRealmd']);
     $State['Online'] = $State['RealmdPortState'];
     $DbResult = $this->Database->query('SELECT COUNT(*) FROM information_schema.TABLES WHERE TABLE_SCHEMA = "server'.$this->Id.'_realmd"');
@@ -97 +95 @@
   function UpdateRealmlist()
   {
-    global $Config;
-    
     $this->Database->query('TRUNCATE TABLE server'.$this->Id.'_realmd.realmlist');
     $DbResult = $this->Database->select('Realm', '*', 'Server = '.$this->Id);
     while($Realm = $DbResult->fetch_assoc())
     {
-      $this->Database->insert('server'.$this->Id.'_realmd`.`realmlist', array('id' => $Realm['Id'], 'name' => addslashes($Realm['Name']), 'address' => $Config['Web']['Host'], 'port' => $Realm['NetworkPortWorldd'], 'icon' => 0, 'timezone' => 1, 'color' => 0));
+      $this->Database->insert('server'.$this->Id.'_realmd`.`realmlist', 
+        array('id' => $Realm['Id'], 'name' => addslashes($Realm['Name']), 
+        'address' => $this->Config['Web']['Host'], 'port' => $Realm['NetworkPortWorldd'], 
+        'icon' => 0, 'timezone' => 1, 'color' => 0));
     }
   }
@@ -116 +115 @@
   function UpdateScripts()
   {
-    global $Config;
-    
     $ServerBinDir = '../server/'.$this->Id.'/bin/';
     if(!file_exists($ServerBinDir)) mkdir($ServerBinDir, 0777, true);       
@@ -147 +144 @@
   function SetupConfigurationFiles()
   {
-    global $Config;
-    
     $EmulatorEtcDir = '../emulator/'.$this->Server['Database']['Emulator']['Id'].'/etc/';
     $ServerEtcDir = '../server/'.$this->Id.'/etc/';
@@ -156 +151 @@
     
     // realmd.conf
-    $EmulatorConfig = new MangosConfigurationFile($this->Database);
+    $EmulatorConfig = new MangosConfigurationFile($this->System);
     $EmulatorConfig->Load($EmulatorEtcDir.'realmd.conf.dist');
     $EmulatorConfig->ParameterList['LoginDatabaseInfo'] = 'localhost;3306;server'.$this->Id.';server'.$this->Id.';server'.$this->Id.'_realmd';
@@ -178 +173 @@
     while($DbRow = $DbResult->fetch_assoc())
     {
-      $Server = new Server($this->Database, $DbRow['Id']);
+      $Server = new Server($this->System, $DbRow['Id']);
       $Server->UpdateState();
     }    
@@ -249 +244 @@
     if($DoBackup)
     {
-      $Backup = new Backup($this->Database, 0);
+      $Backup = new Backup($this->System, 0);
       $Output .= '<br />'.$Backup->Create($this->Id);
     }
@@ -308 +303 @@
     while($DbRow = $DbResult->fetch_assoc())
     {
-      $Realm = new Realm($this->Database, $DbRow['Id']);
+      $Realm = new Realm($this->System, $DbRow['Id']);
       $UsedMemory += $Realm->GetUsedMemory();
     }
@@ -335 +330 @@
   function UpdateRealmlistAccountCount()
   {
-    global $Config;
-    
     $this->Database->query('TRUNCATE TABLE server'.$this->Id.'_realmd.realmcharacters');
     $DbResult = $this->Database->select('Realm', '*', 'Server = '.$this->Id);
@@ -345 +338 @@
   }
 }
-
-?>

trunk/www/Application/Model/ServerList.php

@@ -13 +13 @@
 
 }
-
-?>

trunk/www/Application/Model/Shell.php

@@ -7 +7 @@
   var $Database;
   
-  function __construct($Database)
+  function __construct($System)
   {
-    $this->Database = $Database;  
+    parent::__construct($System);  
   }
   
@@ -17 +17 @@
     while($Server = $DbResult->fetch_assoc())
     {
-      $History = new History($this->Database, $Server['Id'], 1);
-      $Server = new Server($this->Database, $Server['Id']);
+      $History = new History($this->System, $Server['Id'], 1);
+      $Server = new Server($this->System, $Server['Id']);
       $History->AddValue($Server->GetUsedMemory());
     }   
   }
 
+  function Show() 
+  { 
+    $Output = ''; 
+    if(count($_SERVER['argv']) > 1) 
+    { 
+      $Command = $_SERVER['argv'][1]; 
+      if($Command == 'ServerProcessLog') 
+      { 
+        if((count($_SERVER['argv']) > 2) and is_numeric($_SERVER['argv'][2])) 
+        { 
+          $MangosDebug = new MangosDebug($this->System); 
+          $Output = $MangosDebug->ProcessLog($_SERVER['argv'][2]); 
+        } else $Output = 'Jako druhý parameter je nutno zadat Id serveru.'; 
+      } else 
+      if($Command == 'ServerLock') 
+      { 
+        if((count($_SERVER['argv']) > 2) and is_numeric($_SERVER['argv'][2])) 
+        { 
+          $Server = new Server($this->System, $_SERVER['argv'][2]); 
+          $Server->Lock(); 
+        } else $Output = 'Jako druhý parameter je nutno zadat Id serveru.'; 
+      } else  
       if($Command == 'ServerUnLock')
       {
         if((count($_SERVER['argv']) > 2) and is_numeric($_SERVER['argv'][2]))
         { 
-          $Server = new Server($this->Database, $_SERVER['argv'][2]);
+          $Server = new Server($this->System, $_SERVER['argv'][2]);
           $Server->UnLock();
         } else $Output = 'Jako druhý parameter je nutno zadat Id serveru.';
@@ -35 +57 @@
         if((count($_SERVER['argv']) > 2) and is_numeric($_SERVER['argv'][2]))
         {
-          $Realm = new Realm($this->Database, $_SERVER['argv'][2]);
+          $Realm = new Realm($this->System, $_SERVER['argv'][2]);
           $Realm->Lock();
         } else $Output = 'Jako druhý parameter je nutno zadat Id světa.';
@@ -43 +65 @@
         if((count($_SERVER['argv']) > 2) and is_numeric($_SERVER['argv'][2]))
         { 
-          $Realm = new Realm($this->Database, $_SERVER['argv'][2]);
+          $Realm = new Realm($this->System, $_SERVER['argv'][2]);
           $Realm->UnLock();
         } else $Output = 'Jako druhý parameter je nutno zadat Id světa.';
@@ -51 +73 @@
         if((count($_SERVER['argv']) > 2) and is_numeric($_SERVER['argv'][2]))
         {
-          $Emulator = new Emulator($this->Database, $_SERVER['argv'][2]);
+          $Emulator = new Emulator($this->System, $_SERVER['argv'][2]);
           $Emulator->Lock();
         } else $Output = 'Jako druhý parameter je nutno zadat Id emulátoru.';
@@ -59 +81 @@
         if((count($_SERVER['argv']) > 2) and is_numeric($_SERVER['argv'][2]))
         {
-          $Emulator = new Emulator($this->Database, $_SERVER['argv'][2]);
+          $Emulator = new Emulator($this->System, $_SERVER['argv'][2]);
           $Emulator->UnLock();
         } else $Output = 'Jako druhý parameter je nutno zadat Id emulátoru.';
@@ -67 +89 @@
         if((count($_SERVER['argv']) > 2) and is_numeric($_SERVER['argv'][2]))
         {
-          $Backup = new Backup($this->Database, $_SERVER['argv'][2]);
+          $Backup = new Backup($this->System, $_SERVER['argv'][2]);
           $Backup->Lock();
         } else $Output = 'Jako druhý parameter je nutno zadat Id zálohy.';
@@ -75 +97 @@
         if((count($_SERVER['argv']) > 2) and is_numeric($_SERVER['argv'][2]))
         {
-          $Backup = new Backup($this->Database, $_SERVER['argv'][2]);
+          $Backup = new Backup($this->System, $_SERVER['argv'][2]);
           $Backup->UnLock();
         } else $Output = 'Jako druhý parameter je nutno zadat Id zálohy.';
@@ -81 +103 @@
       if($Command == 'TaskProcess')
       {
-        $Task = new Task($this->Database);
+        $Task = new Task($this->System);
         $Task->ProcessAllCycle();
       } else 
@@ -90 +112 @@
         while($DbRow = $DbResult->fetch_assoc())
         {
-          $Server = new Server($this->Database, $DbRow['Id']);
-          $System->Modules['User']->User['Id'] = $Server->Server['User'];
+          $Server = new Server($this->System, $DbRow['Id']);
+          $this->System->Modules['User']->User['Id'] = $Server->Server['User'];
           $Server->Start();
         }
@@ -98 +120 @@
         while($DbRow = $DbResult->fetch_assoc())
         {
-          $Realm = new Realm($this->Database, $DbRow['Id']);
-          $System->Modules['User']->User['Id'] = $Realm->Data['User'];
+          $Realm = new Realm($this->System, $DbRow['Id']);
+          $this->System->Modules['User']->User['Id'] = $Realm->Data['User'];
           $Realm->Start();
         }
@@ -106 +128 @@
       {
         // Servers
-        $Backup = new Backup($this->Database, 0);
+        $Backup = new Backup($this->System, 0);
         $DbResult = $this->Database->select('Server', 'Id, User'); 
         while($DbRow = $DbResult->fetch_assoc())
         {
-          $System->Modules['User']->User['Id'] = $DbRow['User'];
+          $this->System->Modules['User']->User['Id'] = $DbRow['User'];
           $Backup->Create($DbRow['Id']);
         }
@@ -118 +140 @@
         if((count($_SERVER['argv']) > 2) and is_numeric($_SERVER['argv'][2]))
         {
-          $Server = new Server($this->Database, $_SERVER['argv'][2]);
+          $Server = new Server($this->System, $_SERVER['argv'][2]);
           $Server->ProcessLog();
         } else $Output = 'Jako druhý parameter je nutno zadat Id serveru.';
@@ -128 +150 @@
       if($Command == 'UpdateState')
       {
-        $Realm = new Realm($this->Database, 0);
+        $Realm = new Realm($this->System, 0);
         $Realm->UpdateStateAll();
-        $Server = new Server($this->Database, 0);
+        $Server = new Server($this->System, 0);
         $Server->UpdateStateAll();
       } else 
@@ -137 +159 @@
         if((count($_SERVER['argv']) > 3) and is_numeric($_SERVER['argv'][2]) and is_numeric($_SERVER['argv'][3]))
         {
-          $Server = new Server($this->Database, $_SERVER['argv'][2]);
+          $Server = new Server($this->System, $_SERVER['argv'][2]);
           $Server->ChangeDatabaseId($_SERVER['argv'][3]);
         } else $Output = 'Jako druhý parameter je nutno zadat Id serveru, jako třetí Id databáze.';
@@ -145 +167 @@
         if((count($_SERVER['argv']) > 3) and is_numeric($_SERVER['argv'][2]) and is_numeric($_SERVER['argv'][3]))
         {
-          $Realm = new Realm($this->Database, $_SERVER['argv'][2]);
+          $Realm = new Realm($this->System, $_SERVER['argv'][2]);
           $Realm->ChangeDatabaseId($_SERVER['argv'][3]);
         } else $Output = 'Jako druhý parameter je nutno zadat Id světa, jako třetí Id databáze.';
@@ -154 +176 @@
   }
 }
-
-?>

trunk/www/Application/Model/TableRelations.php

@@ -63 +63 @@
   
 );
-
-?>

trunk/www/Application/Model/Task.php

@@ -7 +7 @@
   var $TempScript = 'temp/wowhosting_script.sh';
   
-  function __construct($Database)
+  function __construct($System)
   {
-    $this->Database = $Database;
+        parent::__construct($System);    
   }
   
   function Add($Title, $Task)
   {
-    global $System;
-    
     $CommandList = implode("\n", $Task)."\n";
-    $this->Database->insert('Task', array('User' => $System->Modules['User']->User['Id'], 'Title' => $Title, 'TimeCreate' => 'NOW()', 'CommandList' => $CommandList));
+    $this->Database->insert('Task', array('User' => $this->System->Modules['User']->User['Id'], 'Title' => $Title, 'TimeCreate' => 'NOW()', 'CommandList' => $CommandList));
   } 
 
   function ProcessAll()
   {
-    global $Config;
-    
-    chdir($Config['BaseDir']);
+    chdir($this->Config['BaseDir']);
     $DbResult = $this->Database->query('SELECT * FROM Task WHERE State = 0 ORDER BY Id,TimeCreate ASC');
     while($Task = $DbResult->fetch_assoc())
@@ -59 +55 @@
   } 
 }
-
-?>

trunk/www/Application/Model/User.php

@@ -57 +57 @@
   function Register($Login, $Password, $Password2, $Email, $Name)
   {
-    global $Options, $Config;
-
     if(($Email == '') || ($Login == '') || ($Password == '') || ($Password2 == '')  || ($Name == '')) $Result = $this->System->Translate('MissingData');
     else if($Password != $Password2) $Result = $this->System->Translate('PasswordsUnmatched');
@@ -154 +152 @@
       $Mail = new Mail();
       $Mail->Subject = 'Obnova hesla';
-      $Mail->Content = 'Požádali jste o zaslání nového hesla na serveru <a href="http://'.$this->Config['Web']['Host'].$this->Config['Web']['RootFolder'].'">http://'.$this->Config['Web']['Host'].$this->Config['Web']['RootFolder']."</a>.<br />\nPokud jste tak neučinili, měli by jste tento email ignorovat.<br /><br />\n\nVaše nové heslo k účtu ".$Row['Login']." je: ".$NewPassword."\n<br>Pro aktivaci tohoto hesla klikněte na ".'<a href="http://'.$Config['Web']['Host'].$Config['Web']['RootFolder'].'/?Action=PasswordRecoveryConfirm&User='.$Row['Id'].'&H='.$Row['Password'].'&P='.$NewPassword.'">tento odkaz</a>.'."\n<br /> Po přihlášení si prosím změňte heslo na nové.\n\n<br><br>Na tento email neodpovídejte.";
+      $Mail->Content = 'Požádali jste o zaslání nového hesla na serveru <a href="http://'.
+        $this->Config['Web']['Host'].$this->Config['Web']['RootFolder'].'">http://'.
+        $this->Config['Web']['Host'].$this->Config['Web']['RootFolder']."</a>.<br />\n".
+        "Pokud jste tak neučinili, měli by jste tento email ignorovat.<br /><br />\n\nVaše nové heslo k účtu ".
+        $Row['Login']." je: ".$NewPassword."\n<br>Pro aktivaci tohoto hesla klikněte na ".
+        '<a href="http://'.$this->Config['Web']['Host'].$this->Config['Web']['RootFolder'].
+        '/?Action=PasswordRecoveryConfirm&User='.$Row['Id'].'&H='.$Row['Password'].'&P='.
+        $NewPassword.'">tento odkaz</a>.'."\n<br /> Po přihlášení si prosím změňte heslo na nové.\n\n".
+        "<br><br>Na tento email neodpovídejte.";
       $Mail->RecipientName = $Row['Name'];
       $Mail->RecipientAddress = $Row['Email'];
@@ -184 +190 @@
   }
 }
-
-?>

trunk/www/Application/View/Backup.php

@@ -22 +22 @@
   function ItemList()
   {
-    global $Config;
-    
     $ServerId = $_GET['Id'];
     if($this->System->Modules['User']->User['Role'] >= USER_ROLE_USER)
     {
-      $Server = new Server($this->Database, $_GET['Id']);
+      $Server = new Server($this->System, $_GET['Id']);
       if(($this->System->Modules['User']->User['Id'] == $Server->Server['User']) or ($this->System->Modules['User']->User['Role'] >= USER_ROLE_ADMINISTRATOR))
       {
@@ -61 +59 @@
     else if($this->System->Modules['User']->User['Role'] >= USER_ROLE_USER)
     {
-      $Backup = new Backup($this->Database, $_GET['Id']);
-      $Server = new Server($this->Database, $Backup->Backup['Server']);
+      $Backup = new Backup($this->System, $_GET['Id']);
+      $Server = new Server($this->System, $Backup->Backup['Server']);
       if(($this->System->Modules['User']->User['Id'] == $Server->Server['User']) or ($this->System->Modules['User']->User['Role'] >= USER_ROLE_ADMINISTRATOR))
       {
@@ -79 +77 @@
     else if($this->System->Modules['User']->User['Role'] >= USER_ROLE_USER)
     {
-      $Backup = new Backup($this->Database, $_GET['Id']);
-      $Server = new Server($this->Database, $Backup->Backup['Server']);
+      $Backup = new Backup($this->System, $_GET['Id']);
+      $Server = new Server($this->System, $Backup->Backup['Server']);
       if(($this->System->Modules['User']->User['Id'] == $Server->Server['User']) or ($this->System->Modules['User']->User['Role'] >= USER_ROLE_ADMINISTRATOR))
       {
@@ -95 +93 @@
     else if($this->System->Modules['User']->User['Role'] >= USER_ROLE_USER)
     {
-      $Server = new Server($this->Database, $_GET['Id']);
+      $Server = new Server($this->System, $_GET['Id']);
       if(($this->System->Modules['User']->User['Id'] == $Server->Server['User']) or ($this->System->Modules['User']->User['Role'] >= USER_ROLE_ADMINISTRATOR))
       {
-        $Backup = new Backup($this->Database, 0);
+        $Backup = new Backup($this->System, 0);
         $Output = $this->SystemMessage('Ruční zálohování', $Backup->Create($Server->Id));
         $Output .= $this->ShowTaskList();
@@ -106 +104 @@
   }
 }
-
-?>

trunk/www/Application/View/Client.php

@@ -26 +26 @@
   function ItemList()
   {
-    global $Config;
-    
     $Output = '<h4>Verze herního klienta</h4>';
     $Table = new Table($this->ItemListFormClass, $this->System);
@@ -36 +34 @@
   } 
 }
-
-?>

trunk/www/Application/View/Cluster.php

@@ -37 +37 @@
   } 
 }
-
-?>

trunk/www/Application/View/Database.php

@@ -10 +10 @@
     if($this->System->Modules['User']->User['Role'] >= USER_ROLE_USER)
     {
-      $Server = new Server($this->Database, $_GET['Id']);
+      $Server = new Server($this->System, $_GET['Id']);
       if(($this->System->Modules['User']->User['Id'] == $Server->Server['User']) or ($this->System->Modules['User']->User['Role'] >= USER_ROLE_ADMINISTRATOR))
       {
@@ -21 +21 @@
   }
 }
-
-?>

trunk/www/Application/View/Debug.php

@@ -37 +37 @@
   function ItemList()
   {
-    global $Config;
-    
     if($this->System->Modules['User']->User['Role'] >= USER_ROLE_USER)
     {
-      $Realm = new Realm($this->Database, $_GET['Id']);
+      $Realm = new Realm($this->System, $_GET['Id']);
       if(($this->System->Modules['User']->User['Id'] == $Realm->GetUser()) or ($this->System->Modules['User']->User['Role'] >= USER_ROLE_ADMINISTRATOR))
       {
@@ -61 +59 @@
   function Item()
   {
-    global $System;
-
     if($this->System->Modules['User']->User['Role'] >= USER_ROLE_USER)
     {
-      $Realm = new Realm($this->Database, $_GET['Id']);
+      $Realm = new Realm($this->System, $_GET['Id']);
       if(($this->System->Modules['User']->User['Id'] == $Realm->GetUser()) or ($this->System->Modules['User']->User['Role'] >= USER_ROLE_ADMINISTRATOR))
       {
         $Output = '<div>Ladící informace serveru</div>'; 
     
-    $MangosDebug = new MangosDebug($this->Database, $this->System);
+    $MangosDebug = new MangosDebug($this->System, $this->System);
     $Form = new Form($this->System, $this->ItemFormClass);
     if($Form->LoadValuesFromDatabase($_GET['Id']))
@@ -127 +123 @@
   }
 }
-
-?>

trunk/www/Application/View/Emulator.php

@@ -36 +36 @@
   function ItemList()
   {
-    global $Config;
-    
     $Output = '<h4>Seznam verzí emulátoru</h4>';
     $Table = new Table($this->ItemListFormClass, $this->System);
@@ -59 +57 @@
   {
     $Id = $_GET['Id'];
-    //$Server = new Server($this->Database, $Id);
+    //$Server = new Server($this->System, $Id);
     $Output = '<h4>Podrobnosti emulátoru</h4>';
     $Form = new Form($this->System, $this->ItemFormClass);
@@ -65 +63 @@
     $Output .= $Form->ShowTable();
     $Output .= '<div style="text-align: center">';
-    $Emulator = new Emulator($this->Database, $Id);
+    $Emulator = new Emulator($this->System, $Id);
     if($this->System->Modules['Permission']->Check('Emulator', 'Download', $Emulator->Id))
     {
@@ -106 +104 @@
     if(array_key_exists('Id', $_GET)) 
     {
-      $Emulator = new Emulator($this->Database, $_GET['Id']);
+      $Emulator = new Emulator($this->System, $_GET['Id']);
       if($this->System->Modules['Permission']->Check('Emulator', 'Download', $Emulator->Id))
       {
@@ -122 +120 @@
     if(array_key_exists('Id', $_GET)) 
     {
-      $Emulator = new Emulator($this->Database, $_GET['Id']);
+      $Emulator = new Emulator($this->System, $_GET['Id']);
       if($this->System->Modules['Permission']->Check('Emulator', 'Download', $Emulator->Id))
       {
@@ -134 +132 @@
   }
 }
-
-?>

trunk/www/Application/View/HomePage.php

@@ -47 +47 @@
   function State()
   {
-    $Platform = new Platform($this->Database);
+    $Platform = new Platform($this->System);
     $State = $Platform->State();
     $Output = '<h4>Stav systému</h4>'.
@@ -64 +64 @@
   }
 }
-
-?>

trunk/www/Application/View/News.php

@@ -51 +51 @@
   }
 }
-
-?>

trunk/www/Application/View/Page.php

@@ -102 +102 @@
   function GetOutput($Content)
   { 
-    global $Config;
-    
     $Output = $this->ShowHeader($this->FullTitle, $this->ShortTitle).
       $this->CenterPanel($Content);
     $Output .= $this->ShowFooter();
-    if($Config['Web']['FormatHTML'] == true) echo($this->FormatOutput($Output));
+    if($this->Config['Web']['FormatHTML'] == true) echo($this->FormatOutput($Output));
     else echo($Output);
   }
@@ -123 +121 @@
   }
 }
-
-?>

trunk/www/Application/View/Realm.php

@@ -105 +105 @@
   function ItemList()
   {
-    global $Config;
-    
     if(array_key_exists('Id', $_GET)) $ServerId = $_GET['Id'];
     
-    $Realm = new Realm($this->Database, 0);
+    $Realm = new Realm($this->System, 0);
     //$Realm->UpdateServerList();
     $Output = '<h4>Seznam světů</h4>';
@@ -131 +129 @@
       //$DbResult = $this->Database->query('SELECT COUNT(*) FROM Realm WHERE Server='.$this->System->Modules['User']->User['Id']);
       //$DbRow = $DbResult->fetch_row();
-      if(($RealmCount < $Config['MaxRealmPerServerCount']))
+      if(($RealmCount < $this->Config['MaxRealmPerServerCount']))
         $Output .= '<br /><div style="text-align: center;"><a href="?Module=Realm&amp;Action=Add">Vytvořit nový svět</a></dev>';      
     }
@@ -139 +137 @@
   function Item()
   {
-    global $Config;
-    
     $Id = $_GET['Id'];
-    $Realm = new Realm($this->Database, $Id);
+    $Realm = new Realm($this->System, $Id);
     //if(isset($Server->Server))
     //{
@@ -179 +175 @@
   function Add()
   {
-    global $Config;
-    
     if(array_key_exists('Id', $_GET))
     {
@@ -190 +184 @@
       $DbRow = $DbResult->fetch_row();
       $RealmCount = $DbRow[0];
-      if($RealmCount < $Config['MaxRealmCount'])
-      {
-        if($this->System->Modules['User']->RealmCount() >= $Config['MaxServerCountPerUser']) $Output .= $this->System->SystemMessage('Nový svět', 'Na jeden účet lze vytvořit maximálně '.$Config['MaxServerCountPerUser'].' světů');
+      if($RealmCount < $this->Config['MaxRealmCount'])
+      {
+        if($this->System->Modules['User']->RealmCount() >= $this->Config['MaxServerCountPerUser'])
+                $Output .= $this->System->SystemMessage('Nový svět', 'Na jeden účet lze vytvořit maximálně '.
+                        $this->Config['MaxServerCountPerUser'].' světů');
         else 
         {
@@ -209 +205 @@
   function Create()
   {
-    global $Config;   
-      
     if(array_key_exists('Id', $_GET))
     {
@@ -216 +210 @@
     if($this->System->Modules['Permission']->Check('Realm', 'Add'))
     {
-      if($this->System->Modules['User']->RealmCount() >= $Config['MaxServerCountPerUser']) $Output = $this->System->SystemMessage('Nový svět', 'Na jeden účet lze vytvořit maximálně '.$Config['MaxServerCountPerUser'].' světů');
+      if($this->System->Modules['User']->RealmCount() >= $this->Config['MaxServerCountPerUser']) 
+        $Output = $this->System->SystemMessage('Nový svět', 'Na jeden účet lze vytvořit maximálně '.
+        $this->Config['MaxServerCountPerUser'].' světů');
       else 
       {
@@ -223 +219 @@
         $DbRow = $DbResult->fetch_row();
         $NewPortWorldd = $DbRow[0] + 1;
-        if($NewPortWorldd < $Config['BaseNetworkPortWorldd']) $NewPortWorldd = $Config['BaseNetworkPortWorldd'];
+        if($NewPortWorldd < $this->Config['BaseNetworkPortWorldd']) $NewPortWorldd = $this->Config['BaseNetworkPortWorldd'];
             
         $Form = new Form($this->System, $this->CreateFormClass, array());
@@ -229 +225 @@
         $this->Database->insert('Realm', array('Name' => $Form->Values['Name'], 'Description' => $Form->Values['Description'], 'Server' => $ServerId, 'Motd' => $Form->Values['Motd'], 'Homepage' => $Form->Values['Homepage'], 'Type' => $Form->Values['Type'], 'Database' => $Form->Values['Database'], 'NetworkPortWorldd' => $NewPortWorldd, 'Lock' => 1, 'TimeCreate' => 'NOW()'));
         $LastInsertId = $this->Database->insert_id;
-        $Realm = new Realm($this->Database, $LastInsertId);
+        $Realm = new Realm($this->System, $LastInsertId);
         $Realm->CreateDatabase();            
         $Output = $this->System->SystemMessage('Vytvoření světu', $Realm->ImportDatabase(true));
@@ -246 +242 @@
   {
     $Output = '';
-    $Realm = new Realm($this->Database, $_POST['RealmId']);
+    $Realm = new Realm($this->System, $_POST['RealmId']);
     if($this->System->Modules['Permission']->Check('Realm', 'Save', $Realm->Id))
     {
@@ -257 +253 @@
       $Form->OnSubmit = '?Module=Realm&amp;Action=Save';
         
-      $Realm = new Realm($this->Database, $_POST['RealmId']);
+      $Realm = new Realm($this->System, $_POST['RealmId']);
       $Realm->SaveConfiguration();
       $Form->Values['RealmId'] = $RealmId;
@@ -268 +264 @@
   {
     $Output = '';
-    $Realm = new Realm($this->Database, $_GET['Id']);
+    $Realm = new Realm($this->System, $_GET['Id']);
     if($this->System->Modules['Permission']->Check('Realm', 'Edit', $Realm->Id))
     {
@@ -283 +279 @@
   {
     $Output = '';
-    $Realm = new Realm($this->Database, $_GET['Id']);
+    $Realm = new Realm($this->System, $_GET['Id']);
     if($this->System->Modules['Permission']->Check('Realm', 'EditDetailed', $Realm->Id))
     {
       $Form = new Form($this->System, $this->SettingDetailedFormClass);
-      $EmulatorConfig = new MangosConfigurationFile($this->Database);
+      $EmulatorConfig = new MangosConfigurationFile($this->System);
       $EmulatorConfig->Load('../realm/'.$Realm->Id.'/etc/mangosd.conf');
       $Form->Values = array();
@@ -302 +298 @@
   {
     $Output = '';
-    $Realm = new Realm($this->Database, $_POST['RealmId']);
+    $Realm = new Realm($this->System, $_POST['RealmId']);
     if($this->System->Modules['Permission']->Check('Realm', 'SaveDetailed', $Realm->Id))
     {
       $Form = new Form($this->System, $this->SettingDetailedFormClass, array());
       $Form->LoadValuesFromForm();
-      $EmulatorConfig = new MangosConfigurationFile($this->Database);
+      $EmulatorConfig = new MangosConfigurationFile($this->System);
       $EmulatorConfig->Load('../realm/'.$Realm->Id.'/etc/mangosd.conf');
       foreach($Form->Definition['Items'] as $Index => $Item)
@@ -322 +318 @@
       $Form->OnSubmit = '?Module=Realm&amp;Action=SaveDetailed';
        
-      $Realm = new Realm($this->Database, $_POST['RealmId']);
+      $Realm = new Realm($this->System, $_POST['RealmId']);
       $Realm->SaveConfiguration();
       $Form->Values['RealmId'] = $RealmId;
@@ -333 +329 @@
   {
     $Output = '';
-    $Realm = new Realm($this->Database, $_GET['Id']);
+    $Realm = new Realm($this->System, $_GET['Id']);
     if($this->System->Modules['Permission']->Check('Realm', 'Start', $Realm->Id))
     {
@@ -346 +342 @@
   {
     $Output = '';
-    $Realm = new Realm($this->Database, $_GET['Id']);
+    $Realm = new Realm($this->System, $_GET['Id']);
     if($this->System->Modules['Permission']->Check('Realm', 'Stop', $Realm->Id))
     {
@@ -358 +354 @@
   function InitDatabase()
   {
-    global $Config;   
-      
     if(array_key_exists('Id', $_GET))
     {
       $RealmId = $_GET['Id']; 
-      $Realm = new Realm($this->Database, $RealmId);
+      $Realm = new Realm($this->System, $RealmId);
       if($this->System->Modules['Permission']->Check('Realm', 'InitDatabase', $Realm->Id))
       {
@@ -377 +371 @@
   }
 }
-
-?>

trunk/www/Application/View/Server.php

@@ -84 +84 @@
   function ItemList()
   {
-    global $Config;
-    
     $Output = '<h4>Seznam serverů</h4>';
     $Table = new Table($this->ItemListFormClass, $this->System);
@@ -110 +108 @@
       $DbResult = $this->Database->query('SELECT COUNT(*) FROM Server WHERE User='.$this->System->Modules['User']->Data['Id']);
       $DbRow = $DbResult->fetch_row();
-      if(($ServerCount < $Config['MaxServerCount']) and ($DbRow[0] < $Config['MaxServerCountPerUser']))
+      if(($ServerCount < $this->Config['MaxServerCount']) and ($DbRow[0] < $this->Config['MaxServerCountPerUser']))
         $Output .= '<br /><div style="text-align: center;"><a href="?Module=Server&amp;Action=Add">Vytvořit nový server</a></div>';      
     }
@@ -118 +116 @@
   function Item()
   {
-    global $Config;
-    
     $Id = $_GET['Id'];
-    $Server = new Server($this->Database, $Id);
+    $Server = new Server($this->System, $Id);
     if(isset($Server->Server))
     {
@@ -132 +128 @@
     $Form->Definition['Items']['AccountCount'] = array('Type' => 'String', 'Caption' => 'Počet účtů', 'Default' => '');    
     $ServerStatus = $Server->GetState();
-    $Form->Values['Realmlist'] = $Config['Web']['Host'].':'.$Form->Values['NetworkPortRealmd'];
+    $Form->Values['Realmlist'] = $this->Config['Web']['Host'].':'.$Form->Values['NetworkPortRealmd'];
     unset($Form->Definition['Items']['NetworkPortRealmd']);
     $Form->Values['Uptime'] = $this->System->AddPrefixMultipliers($ServerStatus['Uptime'], '', 4, 'Time');
@@ -167 +163 @@
   function Add()
   {
-    global $Config;
-    
     $Output = '';
     if($this->System->Modules['User']->Data['Role'] >= USER_ROLE_USER)
@@ -175 +169 @@
       $DbRow = $DbResult->fetch_row();
       $ServerCount = $DbRow[0];
-      if($ServerCount < $Config['MaxServerCount'])
+      if($ServerCount < $this->Config['MaxServerCount'])
       {
         $DbResult = $this->Database->query('SELECT COUNT(*) FROM Server WHERE User='.$this->System->Modules['User']->Data['Id']);
         $DbRow = $DbResult->fetch_row();
-        if($DbRow[0] >= $Config['MaxServerCountPerUser']) $Output .= $this->System->SystemMessage('Nový server', 'Na jeden účet lze vytvořit maximálně '.$Config['MaxServerCountPerUser'].' serverů');
+        if($DbRow[0] >= $this->Config['MaxServerCountPerUser']) 
+                $Output .= $this->System->SystemMessage('Nový server', 'Na jeden účet lze vytvořit maximálně '.
+                  $this->Config['MaxServerCountPerUser'].' serverů');
         else 
         {
@@ -195 +191 @@
   function Create()
   {
-    global $Config;
-    
     $Output = '';
     if($this->System->Modules['User']->Data['Role'] >= USER_ROLE_USER)
@@ -202 +196 @@
       $DbResult = $this->Database->query('SELECT COUNT(*) FROM Server WHERE User='.$this->System->Modules['User']->Data['Id']);
       $DbRow = $DbResult->fetch_row();
-      if($DbRow[0] >= $Config['MaxServerCountPerUser']) $Output .= $this->System->SystemMessage('Nový server', 'Na jeden účet lze vytvořit maximálně '.$Config['MaxServerCountPerUser'].' serverů');
+      if($DbRow[0] >= $this->Config['MaxServerCountPerUser']) 
+        $Output .= $this->System->SystemMessage('Nový server', 'Na jeden účet lze vytvořit maximálně '.
+                $this->Config['MaxServerCountPerUser'].' serverů');
       else 
       {
@@ -208 +204 @@
         $DbRow = $DbResult->fetch_row();
         $NewPortRealmd = $DbRow[0] + 1;
-        if($NewPortRealmd < $Config['BaseNetworkPortRealmd']) $NewPortRealmd = $Config['BaseNetworkPortRealmd'];
+        if($NewPortRealmd < $this->Config['BaseNetworkPortRealmd']) $NewPortRealmd = $this->Config['BaseNetworkPortRealmd'];
             
         $Form = new Form($this->System, $this->CreateFormClass, array());
@@ -214 +210 @@
         $this->Database->insert('Server', array('Name' => $Form->Values['Name'], 'Description' => $Form->Values['Description'], 'User' => $this->System->Modules['User']->Data['Id'], 'Homepage' => $Form->Values['Homepage'], 'Database' => $Form->Values['Database'], 'NetworkPortRealmd' => $NewPortRealmd, 'Lock' => 1, 'TimeCreate' => 'NOW()'));
         $LastInsertId = $this->Database->insert_id;
-        $Server = new Server($this->Database, $LastInsertId);
+        $Server = new Server($this->System, $LastInsertId);
         $Server->CreateDatabase();            
         $Output .= $this->System->SystemMessage('Vytvoření serveru', $Server->ImportDatabase(true));
@@ -230 +226 @@
   {
     $Output = '';
-    $Server = new Server($this->Database, $_POST['ServerId']);
+    $Server = new Server($this->System, $_POST['ServerId']);
     if(($this->System->Modules['User']->Data['Id'] == $Server->Server['User']) or ($this->System->Modules['User']->Data['Role'] >= USER_ROLE_ADMINISTRATOR))
     {
@@ -241 +237 @@
       $Form->OnSubmit = '?Action=ServerSave';
         
-      $Server = new Server($this->Database, $_POST['ServerId']);
+      $Server = new Server($this->System, $_POST['ServerId']);
       $Server->SaveConfiguration();
       $Form->Values['ServerId'] = $ServerId;
@@ -252 +248 @@
   {
     $Output = '';
-    $Server = new Server($this->Database, $_GET['Id']);
+    $Server = new Server($this->System, $_GET['Id']);
     if(($this->System->Modules['User']->Data['Id'] == $Server->Server['User']) or ($this->System->Modules['User']->Data['Role'] >= USER_ROLE_ADMINISTRATOR))
     {
@@ -269 +265 @@
     if($this->System->Modules['User']->Data['Role'] >= USER_ROLE_USER)
     {
-      $Server = new Server($this->Database, $_GET['Id']);
+      $Server = new Server($this->System, $_GET['Id']);
       if(($this->System->Modules['User']->User['Id'] == $Server->Server['User']) or ($this->System->Modules['User']->Data['Role'] >= USER_ROLE_ADMINISTRATOR))
       {
@@ -285 +281 @@
     if($this->System->Modules['User']->Data['Role'] >= USER_ROLE_USER)
     {
-      $Server = new Server($this->Database, $_GET['Id']);
+      $Server = new Server($this->System, $_GET['Id']);
       if(($this->System->Modules['User']->Data['Id'] == $Server->Server['User']) or ($this->System->Modules['User']->Data['Role'] >= USER_ROLE_ADMINISTRATOR))
       {
@@ -310 +306 @@
     $Form = new Form($this->System, $this->GameAccountNewFormClass);
     $Form->LoadValuesFromForm();
-    $Server = new Server($this->Database, $Form->Values['ServerId']);
+    $Server = new Server($this->System, $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="?Module=Server&amp;Action=GameAccountRegister&amp;Id='.$Form->Values['ServerId'].'">Zpět k zadání údajů</a>';
@@ -322 +318 @@
       Header('Content-Type: text/plain');
       Header('Content-Disposition: attachment; filename="realmlist.wtf"');
-      $Server = new Server($this->Database, $_GET['Id']);
+      $Server = new Server($this->System, $_GET['Id']);
       $Output = array(
         'set realmlist '.$this->Config['Web']['Host'].':'.$Server->Server['NetworkPortRealmd'],
@@ -337 +333 @@
     if(array_key_exists('Id', $_GET))
     {
-      $Server = new Server($this->Database, $_GET['Id'] * 1);
+      $Server = new Server($this->System, $_GET['Id'] * 1);
       echo($Server->GetPatchList());
     } else echo('Zadané id serveru nenalezeno.');
@@ -371 +367 @@
   }  
 }
-
-?>

trunk/www/Application/View/Task.php

@@ -26 +26 @@
   function ItemList()
   {
-    global $Config;
-    
     $Output = '<h4>Fronta úloh</h4>';
     $Table = new Table($this->ItemListFormClass, $this->System);
     $Table->OnRow = array($this, 'ShowListOnRow');
-    $Table->Definition['Table'] = '(SELECT Id, (COALESCE(UNIX_TIMESTAMP(TimeEnd), UNIX_TIMESTAMP(NOW())) - UNIX_TIMESTAMP(TimeStart)) AS Duration, TimeCreate, Title, State FROM Task WHERE User='.$this->System->Modules['User']->User['Id'].' ORDER BY Id DESC)';
+    $Table->Definition['Table'] = '(SELECT Id, (COALESCE(UNIX_TIMESTAMP(TimeEnd), UNIX_TIMESTAMP(NOW())) - UNIX_TIMESTAMP(TimeStart)) AS Duration, TimeCreate, Title, State FROM Task WHERE User='.
+      $this->System->Modules['User']->User['Id'].' ORDER BY Id DESC)';
     $Table->Definition['Items']['Id'] = array('Type' => 'Hidden', 'Caption' => '', 'Default' => '');
     $Table->LoadValuesFromDatabase($this->Database);
@@ -65 +64 @@
   }
 }
-
-?>

trunk/www/Application/View/Update.php

@@ -7 +7 @@
   function ItemList()
   {
-    global $Config;
-   
     $ServerId = $_GET['Id']; 
     if($this->System->Modules['User']->User['Role'] >= USER_ROLE_USER)
     {
-      $Server = new Server($this->Database, $_GET['Id']);
+      $Server = new Server($this->System, $_GET['Id']);
       if(($this->System->Modules['User']->User['Id'] == $Server->Server['User']) or ($this->System->Modules['User']->User['Role'] >= USER_ROLE_ADMINISTRATOR))
       {
-        $Server = new Server($this->Database, $ServerId);
+        $Server = new Server($this->System, $ServerId);
         $Output = '<h4>Seznam dostupných aktulizací</h4>';
         $Output .= 'Před provedením aktualizace bude server zastaven a provedena záloha databáze.';
@@ -41 +39 @@
     else if($this->System->Modules['User']->User['Role'] >= USER_ROLE_USER)
     {
-      $Server = new Server($this->Database, $_GET['Server']);
+      $Server = new Server($this->System, $_GET['Server']);
       if(($this->System->Modules['User']->User['Id'] == $Server->Server['User']) or ($this->System->Modules['User']->User['Role'] >= USER_ROLE_ADMINISTRATOR))
       {
@@ -51 +49 @@
   }
 }
-
-?>

trunk/www/Application/View/User.php

@@ -53 +53 @@
   function Login()
   {
-    global $Config;
-    
     $Form = new Form($this->System, $this->LoginFormClass);
     $Form->OnSubmit = '?Module=User&Action=LoginFinish';
     $Output = $Form->ShowEditForm();
     $Output .= '<div class="Centred">';
-    if($Config['Web']['UserRegistrationEnabled']) 
+    if($this->Config['Web']['UserRegistrationEnabled']) 
       $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>';
@@ -85 +83 @@
   function RegisterSave()
   {
-    global $Config;
-    
-    if($Config['Web']['UserRegistrationEnabled']) 
+    if($this->Config['Web']['UserRegistrationEnabled']) 
     {
       $Form = new Form($this->System, $this->RegisterFormClass, array());
@@ -96 +92 @@
       if($Result <> $this->System->Translate('UserRegistrated'))
       {
-        $Form->OnSubmit = '?Module=User&amp;Action=UserRegisterSave';
+        $Form->OnSubmit = '?Module=User&amp;Action=RegisterSave';
         $Output = $Form->ShowEditForm();
       }
@@ -166 +162 @@
   function Register()
   {
-    global $Config;
-    
-    if($Config['Web']['UserRegistrationEnabled']) 
+    if($this->Config['Web']['UserRegistrationEnabled']) 
     {
       $Form = new Form($this->System, $this->RegisterFormClass);
       $Form->LoadValuesFromForm();
-      $Form->OnSubmit = '?Module=User&amp;Action=UserRegisterSave';
+      $Form->OnSubmit = '?Module=User&amp;Action=RegisterSave';
       $Output = 'Vyplňte správně požadované údaje. Na zadaný email vám bude zaslán aktivační email.';
       $Output .= $Form->ShowEditForm();
@@ -181 +175 @@
   function RegisterConfirm()
   {
-    global $Config;
-    
-    if($Config['Web']['UserRegistrationEnabled']) 
+    if($this->Config['Web']['UserRegistrationEnabled']) 
     {
       $Page = new PageView($this->System);
@@ -192 +184 @@
   }
 }
-
-?>