Changeset 54

Timestamp:

Aug 3, 2009, 8:44:23 PM (15 years ago)

Author:

george

Message:

• Přeorganizování složek a rozhození souborů do podsložek model, common, design a style.
• Upraveno: Rozpracované oddělení serverů na více světů.

Location:

trunk

Files:

• Readme.txt (modified) (1 diff)
• realm (added)
• www/backup.php (deleted)
• www/code.php (deleted)
• www/common (added)
• www/common/code.php (added)
• www/common/database.php (added)
• www/common/error.php (added)
• www/common/form.php (added)
• www/common/global.php (added)
• www/common/list.php (added)
• www/common/log.php (added)
• www/common/module.php (added)
• www/common/page.php (added)
• www/common/table.php (added)
• www/config.sample.php (modified) (1 diff)
• www/database.php (deleted)
• www/design (added)
• www/emulator.php (deleted)
• www/error.php (deleted)
• www/form.php (deleted)
• www/form_classes.php (modified) (2 diffs)
• www/global.js (deleted)
• www/history.php (deleted)
• www/include.php (added)
• www/index.php (modified) (8 diffs)
• www/log.php (deleted)
• www/mangos_configuration_file.php (deleted)
• www/mangos_debug.php (deleted)
• www/model (added)
• www/model/backup.php (added)
• www/model/emulator.php (added)
• www/model/history.php (added)
• www/model/mangos_configuration_file.php (added)
• www/model/mangos_debug.php (added)
• www/model/platform.php (added)
• www/model/realm.php (added)
• www/model/realmlist.php (added)
• www/model/server.php (added)
• www/model/shell.php (added)
• www/model/task.php (added)
• www/model/user.php (added)
• www/module.php (deleted)
• www/page.php (deleted)
• www/platform.php (deleted)
• www/realmlist.php (deleted)
• www/server.php (deleted)
• www/shell.php (deleted)
• www/sql/updates/54.sql (added)
• www/style (added)
• www/style.css (deleted)
• www/style/global.js (added)
• www/style/style.css (added)
• www/table.php (deleted)
• www/task.php (deleted)
• www/update (added)
• www/user.php (deleted)

trunk/Readme.txt

@@ -6 +6 @@
   www - Webové administrační rozhraní v PHP.
   server - Složka pro ukládání konfigurací a ladících záznamů vytvořených serverů.
+  realm - Složka pro ukládání nastavení a záznamů světů.
   emulator - Složka obsahující dostupné emulátory.
   database - Složka obsahující zdrojové sql soubory pro nastavení databáze. Soubory jsou získávány z adresy https://unifieddb.svn.sourceforge.net/svnroot/unifieddb/.

trunk/www/config.sample.php

@@ -31 +31 @@
   'BaseDir' => '/opt/wowhosting/',
   'MaxServerCount' => 20,
+  'MaxRealmPerServerCount' => 1,
   'MaxOnlinePlayerCountPerServer' => 100,
   'CompilerParameters' => '',

trunk/www/form_classes.php

@@ -83 +83 @@
       'Description' => array('Type' => 'Text', 'Caption' => 'Popis', 'Default' => ''),
       'Homepage' => array('Type' => 'Hyperlink', 'Caption' => 'Webové stránky', 'Default' => ''),
-      'Type' => array('Type' => 'ServerType', 'Caption' => 'Typ', 'Default' => 0),
       'Database' => array('Type' => 'Database', 'Caption' => 'Databáze', 'Default' => 0),
-      'Motd' => array('Type' => 'String', 'Caption' => 'Zpráva dne', 'Default' => 'Vítejte na free WoW serveru'),
       'ServerId' => array('Type' => 'Hidden', 'Caption' => 'Id', 'Default' => 0),
       'TimeCreate' => array('Type' => 'DateTime', 'Caption' => 'Datum založení', 'Default' => 'NOW()'),
@@ -103 +101 @@
       'CharacterCount' => array('Type' => 'Integer', 'Caption' => 'Postav', 0),
       'UserName' => array('Type' => 'String', 'Caption' => 'Správce', 'Default' => ''),
+    ),
+  ),
+  'RealmView' => array(
+    'Title' => 'Nastavení',
+    'Table' => 'Svět',
+    'SubmitText' => 'Uložit',
+    'Items' => array(
+      'Name' => array('Type' => 'String', 'Caption' => 'Název', 'Default' => 'WoW server'),
+      'Description' => array('Type' => 'Text', 'Caption' => 'Popis', 'Default' => ''),
+      'Type' => array('Type' => 'ServerType', 'Caption' => 'Typ', 'Default' => 0),
+      'Database' => array('Type' => 'Database', 'Caption' => 'Databáze', 'Default' => 0),
+      'Motd' => array('Type' => 'String', 'Caption' => 'Zpráva dne', 'Default' => 'Vítejte na free WoW serveru'),
+      'RealmId' => array('Type' => 'Hidden', 'Caption' => 'Id', 'Default' => 0),
+      'TimeCreate' => array('Type' => 'DateTime', 'Caption' => 'Datum založení', 'Default' => 'NOW()'),
+      'NetworkPortWorldd' => array('Type' => 'Integer', 'Caption' => 'Port realmd', 'Default' => ''),
+    ),
+  ),
+  'RealmList' => array(
+    'Title' => 'Světy',
+    'Table' => '(SELECT `Client`.`Version`, `Realm`.`Name`, `Realm`.`Id`, `Server`.`Name` AS `ServerName`, `Realm`.`NetworkPortWorldd`, Realm.Online, Realm.CharacterOnlineCount, Realm.CharacterCount FROM `Realm` JOIN `Server` ON `Server`.`Id` = `Realm`.`Server` JOIN `Database` ON `Database`.`Id` = `Realm`.`Database` JOIN `Emulator` ON `Emulator`.`Id` = `Database`.`Emulator` JOIN `Client` ON `Client`.`Id` = `Emulator`.`Client`)',
+    'Items' => array(
+      'Name' => array('Type' => 'String', 'Caption' => 'Název', 'Default' => ''),
+      'NetworkPortWorldd' => array('Type' => 'Integer', 'Caption' => 'Realmlist', 'Default' => ''),
+      'Version' => array('Type' => 'Integer', 'Caption' => 'Verze', 'Default' => 0),
+      'Online' => array('Type' => 'OnlineState', 'Caption' => 'Stav', 'Default' => 0),
+      'CharacterOnlineCount' => array('Type' => 'Integer', 'Caption' => 'Hráčů online', 'Default' => 0),
+      'CharacterCount' => array('Type' => 'Integer', 'Caption' => 'Postav', 0),
+      'ServerName' => array('Type' => 'String', 'Caption' => 'Server', 'Default' => ''),
     ),
   ),

trunk/www/index.php

@@ -1 +1 @@
 <?php
 
-include('global.php');
+include('include.php');
+
+chdir(substr($_SERVER['SCRIPT_FILENAME'], 0, strrpos($_SERVER['SCRIPT_FILENAME'], '/')));
+
+$ScriptTimeStart = GetMicrotime();
+// SQL injection hack protection
+foreach($_POST as $Index => $Item) $_POST[$Index] = addslashes($Item);
+foreach($_GET as $Index => $Item) $_GET[$Index] = addslashes($Item);
+
+if(isset($_SERVER['REMOTE_ADDR'])) session_start();
+$Database = new Database($Config['Database']['Host'], $Config['Database']['User'], $Config['Database']['Password'], $Config['Database']['Database']);
+$Database->Prefix = $Config['Database']['Prefix'];
+$Database->charset($Config['Database']['Charset']);
+
+$System = new System();
+$System->Config = $Config;
+$System->Database = &$Database;
+$System->AddModule(new Log());
+$System->AddModule(new User());
+if(isset($_SERVER['REMOTE_ADDR'])) $System->Modules['User']->Check();
+  else $System->Modules['User']->User['Id'] = 0;
 
 class Index extends Page
@@ -61 +81 @@
     $Form->Definition['Items']['UsedMemory'] = array('Type' => 'String', 'Caption' => 'Použitá paměť', 'Default' => '');    
     $Form->Definition['Items']['AccountCount'] = array('Type' => 'String', 'Caption' => 'Počet účtů', 'Default' => '');    
-    $Form->Definition['Items']['CharacterCount'] = array('Type' => 'String', 'Caption' => 'Počet postav', 'Default' => '');    
-    $Form->Definition['Items']['CharacterOnlineCount'] = array('Type' => 'String', 'Caption' => 'Počet hráčů online', 'Default' => '');    
     $ServerStatus = $Server->GetState();
     $Form->Values['Realmlist'] = $Config['Web']['Host'].':'.$Form->Values['NetworkPortRealmd'];
@@ -69 +87 @@
     $Form->Values['UsedMemory'] = $this->System->AddPrefixMultipliers($ServerStatus['UsedMemory'] * 1024, 'B', 4, 'Binary');
     $Form->Values['AccountCount'] = $ServerStatus['AccountCount'];
-    $Form->Values['CharacterCount'] = $ServerStatus['CharacterCount'];
-    $Form->Values['CharacterOnlineCount'] = $ServerStatus['CharacterOnlineCount'];
     $Output .= $Form->ShowTable();
     $Output .= '<div style="text-align: center">';
@@ -204 +220 @@
   }
 
+  function ShowRealmList()
+  {
+    global $Config;
+    
+    $Realm = new Realm($this->Database, 0);
+    //$Realm->UpdateServerList();
+    $Output = '<h4>Seznam světů</h4>';
+    $Table = new Table('RealmList');
+    //$Table->OnRow = array($this, 'ShowRealmListOnRow');
+    $Table->Definition['Items']['Id'] = array('Type' => 'Hidden', 'Caption' => '', 'Default' => '');
+    $Table->LoadValuesFromDatabase($this->Database);
+    $Table->Definition['Items']['Actions'] = array('Type' => 'String', 'Caption' => '', 'Default' => '');
+    foreach($Table->Values as $Index => $Item)
+    {
+     $Table->Values[$Index]['Actions'] = '<a href="?Action=RealmShow&amp;Id='.$Item['Id'].'">Podrobnosti</a>';
+     unset($Table->Values[$Index]['Id']);
+    }
+    $Output .= $Table->Show();
+    if($this->System->Modules['User']->User['Role'] >= USER_ROLE_USER) 
+    {
+      $DbResult = $this->Database->query('SELECT COUNT(*) FROM Realm');
+      $DbRow = $DbResult->fetch_row();
+      $RealmCount = $DbRow[0];
+      //$DbResult = $this->Database->query('SELECT COUNT(*) FROM Realm WHERE Server='.$this->System->Modules['User']->User['Id']);
+      //$DbRow = $DbResult->fetch_row();
+      if(($RealmCount < $Config['MaxRealmPerServerCount']))
+        $Output .= '<br /><div style="text-align: center;"><a href="?Action=RealmAdd">Vytvořit nový svět</a></dev>';      
+    }
+    return($Output);
+  }
+
   function ShowClientListOnRow($Row)
   {
@@ -329 +376 @@
         $Server = $DbResult->fetch_assoc();
         $Output .= '<div><a href="?Action=ServerShow&amp;Id='.$Server['Id'].'">Můj server</a></div>';
+        $Output .= '<div><a href="?Action=RealmList">Moje světy</a></div>';
         $Output .= '<div><a href="?Action=DebugList&amp;Id='.$Server['Id'].'">Ladící záznamy</a></div>';
         $Output .= '<div><a href="?Action=BackupList&amp;Id='.$Server['Id'].'">Zálohy</a></div>';
@@ -392 +440 @@
           $Output .= $Form->ShowEditForm();
           $Output .= '<div class="Centred"><a href="?Action=UserRegister">Registrovat se</a> '.
-                '<a href="?Action=PasswordRecovery">Obnova zapomenutého hesla</a></div>';
+          '<a href="?Action=PasswordRecovery">Obnova zapomenutého hesla</a></div>';
         }
       } else 
@@ -803 +851 @@
         } else $Output .= USER_BAD_ROLE;
       } else      
+      if($_GET['Action'] == 'EmulatorShow')
+      {
+        if(array_key_exists('Id', $_GET)) $Output .= $this->ShowEmulator($_GET['Id']);
+        else $this->SystemMessage('Zobrazení emulátoru', 'Nebylo zadáno Id');
+      } else
       if($_GET['Action'] == 'State')
       {
@@ -824 +877 @@
         $Output .= $this->ShowServerList();
       } else
+      if($_GET['Action'] == 'RealmList')
+      {
+        $Output .= $this->ShowRealmList();
+      } else
       if($_GET['Action'] == 'Test')
       {