Changeset 58

Timestamp:

Aug 4, 2009, 7:21:15 PM (15 years ago)

Author:

george

Message:

• Opraveno: Zobrazení souboru realmlist.wtf pro servery.
• Opraveno: Třídy pro zpracování realmů.

Location:

trunk/www

Files:

• model/realm.php (modified) (5 diffs)
• model/realmlist.php (deleted)
• realmlist.php (added)
• sql/updates/54.sql (modified) (2 diffs)
• sql/updates/57.sql (modified) (1 diff)
• sql/updates/58.sql (added)
• view/realm.php (modified) (2 diffs)

trunk/www/model/realm.php

@@ -85 +85 @@
     }
     // Lookup nearest database with full import
-    $DbResult = $this->Database->query('SELECT * FROM `Database` WHERE (`Emulator` <> 0) AND (`Revision` <= '.$this->Server['Database']['Revision'].') AND (`SourceFileName` <> "") ORDER BY `Revision` DESC');
+    $DbResult = $this->Database->query('SELECT * FROM `Database` WHERE (`Emulator` <> 0) AND (`Revision` <= '.$this->Realm['Database']['Revision'].') AND (`SourceFileName` <> "") ORDER BY `Revision` DESC');
     $Database = $DbResult->fetch_assoc();
     
@@ -99 +99 @@
     $this->Task->Add('Inicializace databáze', $CommandList);
     
-    if($Database['Id'] != $this->Server['Database']['Id']) 
-    {
-      $NewDatabaseId = $this->Server['Database']['Id'];
-      $this->Server['Database']['Id'] = $Database['Id'];
+    if($Database['Id'] != $this->Data['Database']['Id']) 
+    {
+      $NewDatabaseId = $this->Data['Database']['Id'];
+      $this->Data['Database']['Id'] = $Database['Id'];
       $this->Update($NewDatabaseId, false, false);
     }
@@ -221 +221 @@
     $EmulatorConfig->ParameterList['WorldServerPort'] = $this->Data['NetworkPortWorldd'];
     $EmulatorConfig->ParameterList['Motd'] = $this->Data['Motd'];
-    print_r($this->Data);
     $EmulatorConfig->ParameterList['DataDir'] = 'wowclient/'.$this->Data['Database']['Emulator']['Client']['Version'];
-    $EmulatorConfig->ParameterList['LogsDir'] = 'server/'.$this->Id.'/log';
+    $EmulatorConfig->ParameterList['LogsDir'] = 'realm/'.$this->Id.'/log';
     $EmulatorConfig->ParameterList['LogLevel'] = 1;
     $EmulatorConfig->ParameterList['PlayerLimit'] = $Config['MaxOnlinePlayerCountPerServer'];
@@ -261 +260 @@
      'php www/shell.php RealmLock '.$this->Id,
     );
-    $DbResult = $this->Database->query('SELECT `Revision` FROM `Database` WHERE `Id` = '.$this->Server['Database']['Id']);
+    $DbResult = $this->Database->query('SELECT `Revision` FROM `Database` WHERE `Id` = '.$this->Data['Database']['Id']);
     $DbRow = $DbResult->fetch_assoc();
     $DatabaseRevisionStart = $DbRow['Revision'];
@@ -308 +307 @@
   {
     $Output = array();
-    if(isset($this->Server['Database']['Emulator']['Id']))
-      exec('ps -aux|grep "emulator/'.$this->Server['Database']['Emulator']['Id'].'/bin/mangos-worldd -c realm/'.$this->Id.'/etc/mangosd.conf"| grep -v grep', $Output);
+    if(isset($this->Data['Database']['Emulator']['Id']))
+      exec('ps -aux|grep "emulator/'.$this->Data['Database']['Emulator']['Id'].'/bin/mangos-worldd -c realm/'.$this->Id.'/etc/mangosd.conf"| grep -v grep', $Output);
     if(count($Output) > 0)
     {

trunk/www/sql/updates/54.sql

@@ -2 +2 @@
   `Id` int(11) NOT NULL auto_increment,
   `Name` varchar(255) NOT NULL,
+  `Database` int(11) NOT NULL,
   `Server` int(11) NOT NULL,
   `NetworkPortWorldd` int(11) NOT NULL,
@@ -23 +24 @@
 ALTER TABLE `Realm` ADD FOREIGN KEY ( `Database` ) REFERENCES `Database` (`Id`);
 
-INSERT INTO `Realm` (SELECT 0 AS `Id`, "" AS `Name`, `Server`.`Id` AS `Server`, `NetworkPortWorldd`, `Motd`, "" AS `Description`, `Type`, "" AS `Homepage`, `TimeCreate`, 0 AS `Online`, `CharacterOnlineCount`, `CharacterCount`, `AccountCount`, 0 AS `Lock` FROM `Server`);
+INSERT INTO `Realm` (SELECT 0 AS `Id`, "" AS `Name`, `Server`.`Database` AS `Database`, `Server`.`Id` AS `Server`, `NetworkPortWorldd`, `Motd`, "" AS `Description`, `Type`, "" AS `Homepage`, `TimeCreate`, 0 AS `Online`, `CharacterOnlineCount`, `CharacterCount`, `AccountCount`, 0 AS `Lock` FROM `Server`);
 
 ALTER TABLE `Server` DROP `NetworkPortWorldd` , DROP `Motd` , DROP `Type` ;

trunk/www/sql/updates/57.sql

@@ -1 @@
-RENAME TABLE `ServerLog`  TO `RealmLog` ;
-
-ALTER TABLE `RealmLog` DROP FOREIGN KEY `RealmLog_ibfk_1` ;
-
-ALTER TABLE `RealmLog` CHANGE `Server` `Realm` INT( 11 ) NOT NULL ;
-
-ALTER TABLE `RealmLog` ADD FOREIGN KEY ( `Realm` ) REFERENCES `Realm` (`Id`);
-
+CREATE TABLE IF NOT EXISTS `RealmLog` (
+  `Id` int(11) NOT NULL auto_increment,
+  `Realm` int(11) NOT NULL,
+  `Time` datetime NOT NULL,
+  `Text` text NOT NULL,
+  PRIMARY KEY  (`Id`),
+  KEY `Server` (`Realm`),
+  KEY `Time` (`Time`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;

trunk/www/view/realm.php

@@ -63 +63 @@
     'Table' => '',
     'Items' => array(
-      'ServerId' => array('Type' => 'Hidden', 'Caption' => 'Id', 'Default' => 0),
+      'RealmId' => array('Type' => 'Hidden', 'Caption' => 'Id', 'Default' => 0),
       'SkipCinematics' => array('Type' => 'SkipCinematics', 'Caption' => 'Zobrazovat úvodní video', 'Default' => ''),
       'StartPlayerLevel' => array('Type' => 'Integer', 'Caption' => 'Počáteční úroveň hráčů', 'Default' => 1),
@@ -143 +143 @@
     //$Form->Values['UsedMemory'] = $this->System->AddPrefixMultipliers($RealmStatus['UsedMemory'] * 1024, 'B', 4, 'Binary');
     $Output .= $Form->ShowTable();
-    $Server = new Server($this->Database, $Realm->Data['Server']);
     $Output .= '<div style="text-align: center">';
-    if((($this->System->Modules['User']->User['Role'] >= USER_ROLE_USER) and ($this->System->Modules['User']->User['Id'] == $Server->Server['User'])) or ($this->System->Modules['User']->User['Role'] >= USER_ROLE_ADMINISTRATOR))
+    if((($this->System->Modules['User']->User['Role'] >= USER_ROLE_USER) and ($this->System->Modules['User']->User['Id'] == $Realm->GetUser())) or ($this->System->Modules['User']->User['Role'] >= USER_ROLE_ADMINISTRATOR))
     {
       $Output .= '<br /><a href="http://'.$this->System->Config['Web']['Host'].'/mysql/">Správa databáze</a> ';
       if(array_key_exists('Id', $Realm->Data['Database']) and ($Realm->Data['Lock'] == 0))
       {
-        if($ServerStatus['WorlddPortState'] == true) $Output .= ' <a href="?Action=RealmStop&amp;Id='.$Realm->Id.'">Zastavit</a>  <a href="?Action=RealmRestart&amp;Id='.$Realm->Id.'">Restartovat</a>';
+        if($RealmStatus['WorlddPortState'] == true) $Output .= ' <a href="?Action=RealmStop&amp;Id='.$Realm->Id.'">Zastavit</a>  <a href="?Action=RealmRestart&amp;Id='.$Realm->Id.'">Restartovat</a>';
           else $Output .= ' <a href="?Action=RealmStart&amp;Id='.$Realm->Id.'">Spustit</a>';
       }