Changeset 48

Timestamp:

Jun 20, 2009, 1:46:49 PM (15 years ago)

Author:

george

Message:

• Upraveno: Změna typu databáze z MyISAM na InnoDB a doplnění cizích klíčů.
• Přidáno: Zobrazení počtu databází ve stavu systému.

Location:

trunk/www

Files:

• index.php (modified) (2 diffs)
• platform.php (modified) (1 diff)
• server.php (modified) (1 diff)
• sql/updates/48.sql (added)

trunk/www/index.php

@@ -65 +65 @@
     $ServerStatus = $Server->GetState();
     $Form->Values['Realmlist'] = $Config['Web']['Host'].':'.$Form->Values['NetworkPortRealmd'];
-    unset($Form->Values['NetworkPortRealmd']);
+    unset($Form->Definition['Items']['NetworkPortRealmd']);
     $Form->Values['Uptime'] = $this->System->AddPrefixMultipliers($ServerStatus['Uptime'], '', 4, 'Time');
     $Form->Values['UsedMemory'] = $this->System->AddPrefixMultipliers($ServerStatus['UsedMemory'] * 1024, 'B', 4, 'Binary');
@@ -815 +815 @@
         '<tr><td>Počet emulátorů</td><td>'.$State['EmulatorCount'].'</td></tr>'.
         '<tr><td>Počet uživatelů</td><td>'.$State['UserCount'].'</td></tr>'.
+        '<tr><td>Počet databází</td><td>'.$State['DatabaseCount'].'</td></tr>'.
         '<tr><td>Počet záloh</td><td>'.$State['BackupCount'].'</td></tr>'.
         '<tr><td>Čekajících/všech úloh ve frontě</td><td>'.$State['TaskQueued'].' / '.$State['TaskCount'].'</td></tr>'.

trunk/www/platform.php

@@ -50 +50 @@
     $State['MemoryTotal'] = $this->MemoryTotal();
     $State['Uptime'] = $this->SystemUptime();
-    $DbResult = $this->Database->query('SELECT COUNT(*) FROM Server');
+    $DbResult = $this->Database->query('SELECT COUNT(*) FROM `Server`');
     $DbRow = $DbResult->fetch_row();
     $State['ServerCount'] = $DbRow[0];
-    $DbResult = $this->Database->query('SELECT COUNT(*) FROM Server WHERE Online = 1');
+    $DbResult = $this->Database->query('SELECT COUNT(*) FROM `Server` WHERE `Online` = 1');
     $DbRow = $DbResult->fetch_row();
     $State['ServerOnlineCount'] = $DbRow[0];
-    $DbResult = $this->Database->query('SELECT COUNT(*) FROM User');
+    $DbResult = $this->Database->query('SELECT COUNT(*) FROM `User`');
     $DbRow = $DbResult->fetch_row();
     $State['UserCount'] = $DbRow[0];
-    $DbResult = $this->Database->query('SELECT COUNT(*) FROM Emulator');
+    $DbResult = $this->Database->query('SELECT COUNT(*) FROM `Emulator`');
     $DbRow = $DbResult->fetch_row();
     $State['EmulatorCount'] = $DbRow[0];
-    $DbResult = $this->Database->query('SELECT COUNT(*) FROM Backup');
+    $DbResult = $this->Database->query('SELECT COUNT(*) FROM `Backup`');
     $DbRow = $DbResult->fetch_row();
     $State['BackupCount'] = $DbRow[0];
-    $DbResult = $this->Database->query('SELECT COUNT(*) FROM Task');
+    $DbResult = $this->Database->query('SELECT COUNT(*) FROM `Task`');
     $DbRow = $DbResult->fetch_row();
     $State['TaskCount'] = $DbRow[0];
-    $DbResult = $this->Database->query('SELECT COUNT(*) FROM Task WHERE State != 2');
+    $DbResult = $this->Database->query('SELECT COUNT(*) FROM `Database`');
+    $DbRow = $DbResult->fetch_row();
+    $State['DatabaseCount'] = $DbRow[0];
+    $DbResult = $this->Database->query('SELECT COUNT(*) FROM `Task` WHERE `State` != 2');
     $DbRow = $DbResult->fetch_row();
     $State['TaskQueued'] = $DbRow[0];

trunk/www/server.php

@@ -162 +162 @@
       $State['CharacterCount'] = 0;
       $State['AccountCount'] = 0;
+      $State['Uptime'] = 0;
     }
     $State['UsedMemory'] = $this->GetUsedMemory();