Changeset 683 for trunk

Timestamp:

Jan 23, 2010, 5:23:04 PM (15 years ago)

Author:

george

Message:

• Přidáno: Nové sloupce Enabled pro povolení/zakázání světů, přihlšaovacích serverů a počítačů.

Location:

trunk

Files:

• inc/realm.php (modified) (1 diff)
• inc/server.php (modified) (4 diffs)
• inc/update_state.php (modified) (2 diffs)
• pages/gmteam.php (modified) (1 diff)
• pages/realmlist.php (modified) (3 diffs)
• pages/server.php (modified) (2 diffs)
• sql/updates/683.sql (added)

trunk/inc/realm.php

@@ -11 +11 @@
     parent::__construct($System);
     $this->Id = $Id;
-    $DbResult = $this->Database->query('SELECT * FROM Realm WHERE Id='.$Id);
+    $DbResult = $this->Database->query('SELECT * FROM Realm WHERE Id='.$Id.' AND Enabled=1');
     $this->Data = $DbResult->fetch_assoc();
     $this->CharactersDatabase = new Database($this->Data['DatabaseHost'], $this->Data['DatabaseUser'], $this->Data['DatabasePassword'], $this->Data['DatabaseCharacters']);

trunk/inc/server.php

@@ -13 +13 @@
     parent::__construct($System);
     $this->Id = $Id;
-    $DbResult = $this->Database->query('SELECT * FROM Logon WHERE Id='.$Id);
+    $DbResult = $this->Database->query('SELECT * FROM Logon WHERE Id='.$Id.' AND Enabled=1' );
     $this->Data = $DbResult->fetch_assoc();
     $this->ServerDatabase = new Database($this->Data['DatabaseHost'], $this->Data['DatabaseUser'], $this->Data['DatabasePassword'], $this->Data['DatabaseRealmd']);
@@ -53 +53 @@
   {
     $TotalCount = 0;
-    $DbResult = $this->Database->query('SELECT Id FROM Realm');
+    $DbResult = $this->Database->query('SELECT Id FROM Realm WHERE Enabled=1');
     while($DbRow = $DbResult->fetch_assoc())
     {
@@ -71 +71 @@
   {
     $TotalCount = 0;
-    $DbResult = $this->Database->query('SELECT Id FROM Realm');
+    $DbResult = $this->Database->query('SELECT Id FROM Realm WHERE Enabled=1');
     while($DbRow = $DbResult->fetch_assoc())
     {
@@ -372 +372 @@
   {
     $Output = '';
-    $DbResult = $this->Database->query('SELECT COUNT(*) FROM Realm');
+    $DbResult = $this->Database->query('SELECT COUNT(*) FROM Realm WHERE Enabled=1');
     $DbRow = $DbResult->fetch_row();
     $RealmCount = $DbRow[0];

trunk/inc/update_state.php

@@ -13 +13 @@
 // Check logon servers
 $System = new System($Config);
-$DbResult = $System->Database->query('SELECT Logon.Id, Host.Address, Logon.Port FROM Logon JOIN Host ON Host.Id=Logon.Host');
+$DbResult = $System->Database->query('SELECT Logon.Id, Host.Address, Logon.Port FROM Logon JOIN Host ON Host.Id=Logon.Host AND Logon.Enabled=1');
 while($Logon = $DbResult->fetch_assoc())
 {
@@ -23 +23 @@
 
 // Check realms
-$DbResult = $System->Database->query('SELECT Realm.Id, Host.Address, Realm.Port FROM Realm JOIN Host ON Host.Id=Realm.Host');
+$DbResult = $System->Database->query('SELECT Realm.Id, Host.Address, Realm.Port FROM Realm JOIN Host ON Host.Id=Realm.Host AND Realm.Enabled=1');
 while($Realm = $DbResult->fetch_assoc())
 {

trunk/pages/gmteam.php

@@ -55 +55 @@
 
 $Output .= ShowGMList(array('Id' => 0, 'Name' => 'Všechny světy'));
-$DbResult = $System->Database->query('SELECT * FROM Realm');
+$DbResult = $System->Database->query('SELECT * FROM Realm WHERE Enabled=1');
 while($Realm = $DbResult->fetch_assoc())
 {

trunk/pages/realmlist.php

@@ -3 +3 @@
 if(array_key_exists('Server', $_GET))
 {
-  $DbResult = $System->Database->query('SELECT Logon.Id, Host.Address, Logon.Port FROM Logon JOIN Host ON Host.Id=Logon.Host WHERE Logon.Id='.$_GET['Server']);
+  $DbResult = $System->Database->query('SELECT Logon.Id, Host.Address, Logon.Port FROM Logon JOIN Host ON Host.Id=Logon.Host WHERE Logon.Id='.$_GET['Server'].' AND   Logon.Enabled=1');
   if($DbResult->num_rows > 0)
   {
@@ -15 +15 @@
   $Output = '<h2 align="center">Seznam světů</h2>';
 
-  $DbResult = $System->Database->query('SELECT Logon.Id, Host.Address, Logon.Port FROM Logon JOIN Host ON Host.Id=Logon.Host');
+  $DbResult = $System->Database->query('SELECT Logon.Name, Logon.Id, Host.Address, Logon.Port FROM Logon JOIN Host ON Host.Id=Logon.Host WHERE Logon.Enabled=1');
   while($DbRow = $DbResult->fetch_assoc())
   {
     $Server = new Server($System, $DbRow['Id']);
-    $Output .= '<div style="text-align: center">Realmlist <a href="?page=realmlist&amp;Server='.$DbRow['Id'].'">'.$DbRow['Address'];
+    $Output .= '<div style="text-align: center">'.$DbRow['Name'].' <a href="?page=realmlist&amp;Server='.$DbRow['Id'].'">'.$DbRow['Address'];
     if($DbRow['Port'] != 3724) $Output .= ':'.$DbRow['Port'];
     $Output .= '</a></div>';
@@ -31 +31 @@
     '</tr>';
   
-    $DbResult2 = $System->Database->query('SELECT * FROM Realm WHERE Logon='.$Server->Id.' ORDER BY Name');
+    $DbResult2 = $System->Database->query('SELECT * FROM Realm WHERE Logon='.$Server->Id.' AND Enabled=1 ORDER BY Name');
     while($DbRow = $DbResult2->fetch_assoc())
     {

trunk/pages/server.php

@@ -1 +1 @@
 <?php
 
-$DbResult = $System->Database->query('SELECT COUNT(*) FROM Realm');
+$DbResult = $System->Database->query('SELECT COUNT(*) FROM Realm WHERE Enabled=1');
 $DbRow = $DbResult->fetch_row();
 $RealmCount = $DbRow[0];
+
+ // Check servers online state.
+$DbResult = $System->Database->query('SELECT COUNT(*) FROM Logon WHERE Online = 1 AND Enabled=1');
+$DbRow = $DbResult->fetch_row();
+$OnlineState = $DbRow[0] > 0; // Report online state if one of all servers is online.
 
 $Output = '<h3 class="PageTitle">Server Heroes of Fantasy</h3>'.
@@ -12 +17 @@
   <tr>
     <td>Přihlašovací server je</td>
-    <td>'.$server->OnlineStateImage($System->NetworkPortState($Config['Web']['WoWServerAddr'], 3724)).'</td>
+    <td>'.$server->OnlineStateImage($OnlineState).'</td>
   </tr>
   <tr>