Changeset 58 for trunk/www/model/realm.php

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ů.

File:

• trunk/www/model/realm.php (modified) (5 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)
     {