Changeset 681

Timestamp:

Jan 23, 2010, 1:32:45 PM (15 years ago)

Author:

george

Message:

• Upraveno: Nastavení počítačů, přihlašovacích serverů a světů přesunuto do databáze z konfiguračního souboru.

Location:

trunk

Files:

• . (modified) (1 prop)
• inc/realm.php (modified) (5 diffs)
• inc/server.php (modified) (6 diffs)
• pages/arena.php (modified) (1 diff)
• pages/commands.php (modified) (1 diff)
• pages/events.php (modified) (1 diff)
• pages/gmteam.php (modified) (1 diff)
• pages/guilda.php (modified) (1 diff)
• pages/guildy.php (modified) (1 diff)
• pages/online.php (modified) (1 diff)
• pages/realmlist.php (modified) (1 diff)
• pages/server.php (modified) (3 diffs)
• pages/tophraci.php (modified) (1 diff)
• sql/updates/650.sql (added)

trunk

@@ -1 @@
-mm
-Thumbs.db
+gallery
+armory
+tester
+test
+minimanager
+mmfpm

@@ -1 @@
-mm
-Thumbs.db
+gallery
+armory
+tester
+test
+minimanager
+mmfpm

trunk/inc/realm.php

@@ -11 +11 @@
     parent::__construct($System);
     $this->Id = $Id;
-    $this->Database = new Database($this->Config['Mangos']['RealmList'][$Id]['DatabaseHost'], $this->Config['Mangos']['RealmList'][$Id]['DatabaseUser'], $this->Config['Mangos']['RealmList'][$Id]['DatabasePassword'], $this->Config['Mangos']['RealmList'][$Id]['DatabaseCharacters']);
-    if($this->Database->connect_error) 
+    $DbResult = $this->Database->query('SELECT * FROM Realm WHERE Id='.$Id);
+    $this->Data = $DbResult->fetch_assoc();
+    $this->CharactersDatabase = new Database($this->Data['DatabaseHost'], $this->Data['DatabaseUser'], $this->Data['DatabasePassword'], $this->Data['DatabaseCharacters']);
+    $this->CharactersDatabase->select_db($this->Data['DatabaseCharacters']);
+    if($this->CharactersDatabase->connect_error) 
     {
-      //die('Přihlášení k databázi realmu '.$this->Id.' selhalo: '.$this->Database->connect_error);
+      die('Přihlášení k databázi realmu '.$this->Id.' selhalo: '.$this->Database->connect_error);
     }
-    $this->Database->charset($this->Config['Database']['Charset']);
+    $this->CharactersDatabase->charset($this->Config['Database']['Charset']);
+    
+    $this->MangosDatabase = new Database($this->Data['DatabaseHost'], $this->Data['DatabaseUser'], $this->Data['DatabasePassword'], $this->Data['DatabaseMangos']);
+    $this->MangosDatabase->select_db($this->Data['DatabaseMangos']);
+    if($this->MangosDatabase->connect_error) 
+    {
+      die('Přihlášení k databázi realmu '.$this->Id.' selhalo: '.$this->MangosDatabase->connect_error);
+    }
+    $this->MangosDatabase->charset($this->Config['Database']['Charset']);
   }
   
   function OnlineCharactersCount()
   {
-    if($this->Database->connect_error) return(0);
+    if($this->CharactersDatabase->connect_error) return(0);
     else {
-      $this->Database->select_db($this->Config['Mangos']['RealmList'][$this->Id]['DatabaseCharacters']);    
-      $DbResult = $this->Database->query('SELECT COUNT(*) FROM `characters` WHERE `online` = 1');
+      $DbResult = $this->CharactersDatabase->query('SELECT COUNT(*) FROM `characters` WHERE `online` = 1');
       $DbRow = $DbResult->fetch_row();
       return($DbRow[0]);
@@ -47 +57 @@
   public function CharacterCount()
   {
-    if($this->Database->connect_error) return('');
+    if($this->CharactersDatabase->connect_error) return('');
     else {
-      $this->Database->select_db($this->Config['Mangos']['RealmList'][$this->Id]['DatabaseCharacters']);    
-      $DbResult = $this->Database->query('SELECT COUNT(*) FROM `characters`');
+      $DbResult = $this->CharactersDatabase->query('SELECT COUNT(*) FROM `characters`');
       $DbRow = $DbResult->fetch_row();
       return($DbRow[0]);
@@ -58 +67 @@
   public function GuidToCharName($guid)
   {
-    if($this->Database->connect_error) return(0);
+    if($this->CharactersDatabase->connect_error) return(0);
     else {
-      $this->Database->select_db($this->Config['Mangos']['RealmList'][$this->Id]['DatabaseCharacters']);
-      $row = $this->Database->query('SELECT `name` FROM `characters` WHERE `guid` = "'.$guid.'" LIMIT 1')->fetch_array();
+      $row = $this->CharactersDatabase->query('SELECT `name` FROM `characters` WHERE `guid` = "'.$guid.'" LIMIT 1')->fetch_array();
       return($row['name']);
     }
@@ -89 +97 @@
         $edited = str_replace(")]", ";", $edited);          // 5 - selected guid
         $edited_arr = explode(";",$edited);
-        if($edited_arr[4] == "player") $sel_name = " - ".$this -> GuidToCharName($edited_arr[5]);
+        if($edited_arr[4] == "player") $sel_name = " - ".$this->GuidToCharName($edited_arr[5]);
           else $sel_name = '';
-        $human_date = $this -> HumanDate ($edited_arr[0]);
+        $human_date = $this -> HumanDate($edited_arr[0]);
         echo('<tr>
             <td><font size="2">'.$human_date.'</font></td>
@@ -107 +115 @@
         $edited = str_replace(")", "", $edited);
         $edited_arr = explode(";",$edited);
-        $human_date = $this -> HumanDate ($edited_arr[0]);
+        $human_date = $this -> HumanDate($edited_arr[0]);
         echo('<tr>
             <td><font size="2">'.$human_date.'</font></td>

trunk/inc/server.php

@@ -13 +13 @@
     parent::__construct($System);
     $this->Id = $Id;
+    $DbResult = $this->Database->query('SELECT * FROM Logon WHERE Id='.$Id);
+    $this->Data = $DbResult->fetch_assoc();
+    $this->ServerDatabase = new Database($this->Data['DatabaseHost'], $this->Data['DatabaseUser'], $this->Data['DatabasePassword'], $this->Data['DatabaseRealmd']);
+    $this->ServerDatabase->select_db($this->Data['DatabaseRealmd']);
+    if($this->ServerDatabase->connect_error) 
+    {
+      die('Přihlášení k databázi serveru '.$this->Id.' selhalo: '.$this->ServerDatabase->connect_error);
+    }
+    $this->ServerDatabase->charset($this->Config['Database']['Charset']);
   }
 
@@ -44 +53 @@
   {
     $TotalCount = 0;
-    foreach($this->Config['Mangos']['RealmList'] as $Index => $Realm)
+    $DbResult = $this->Database->query('SELECT Id FROM Realm');
+    while($DbRow = $DbResult->fetch_assoc())
     {
-      $Realm = new Realm($this->System, $Index);
+      $Realm = new Realm($this->System, $DbRow['Id']);
       $TotalCount += $Realm->OnlineCharactersCount();
     }
@@ -61 +71 @@
   {
     $TotalCount = 0;
-    foreach($this->Config['Mangos']['RealmList'] as $Index => $Realm)
+    $DbResult = $this->Database->query('SELECT Id FROM Realm');
+    while($DbRow = $DbResult->fetch_assoc())
     {
-      $Realm = new Realm($this->System, $Index);
-      $TotalCount += $Realm->CharacterCount($Index);
+      $Realm = new Realm($this->System, $DbRow['Id']);
+      $TotalCount += $Realm->CharacterCount($DbRow['Id']);
     }
     return($TotalCount);
@@ -71 +82 @@
   public function AccountCount()
   {
-    $this->Database->select_db($this->Config['Mangos']['DatabaseRealmd']);
-    $row = $this->Database->query('SELECT COUNT(*) FROM account')->fetch_row();
+    $row = $this->ServerDatabase->query('SELECT COUNT(*) FROM account')->fetch_row();
     return($row[0]);
   }
@@ -362 +372 @@
   {
     $Output = '';
-    if(count($this->Config['Mangos']['RealmList']) > 1)
+    $DbResult = $this->Database->query('SELECT COUNT(*) FROM Realm');
+    $DbRow = $DbResult->fetch_row();
+    $RealmCount = $DbRow[0];
+    
+    if($RealmCount > 1)
     { 
       if(array_key_exists('page', $_GET)) $Target = '?page='.$_GET['page'];
@@ -368 +382 @@
       $Output .= '<div style="text-align: center;"><form id="RealmSelection'.$FormNameSufix.'" action="'.$Target.'" method="post">'.
       '<div>Výběr světa <select name="RealmIndex" onchange="document.getElementById(\'RealmSelection'.$FormNameSufix.'\').submit()">';
-      foreach($this->Config['Mangos']['RealmList'] as $Index => $Realm)
+      
+      $DbResult = $this->Database->query('SELECT * FROM Realm');
+      while($Realm = $DbResult->fetch_assoc())
       {
-        if($_COOKIE['RealmIndex'] == $Index) $Selected = ' selected="selected"';
+        if($_COOKIE['RealmIndex'] == $Realm['Id']) $Selected = ' selected="selected"';
          else $Selected = '';
-        $Output .= '<option value="'.$Index.'"'.$Selected.'>'.$Realm['Name'].'</option>';
+        $Output .= '<option value="'.$Realm['Id'].'"'.$Selected.'>'.$Realm['Name'].'</option>';
       }
       $Output .= '</select></div>'.

trunk/pages/arena.php

@@ -19 +19 @@
 
 $Realm = new Realm($System, $_COOKIE['RealmIndex']);
-$db = $Realm->Database;
-$db->select_db($Config['Mangos']['RealmList'][$Realm->Id]['DatabaseCharacters']);
+$db = $Realm->CharactersDatabase;
 
 $count = $db->query('SELECT COUNT(*) FROM arena_team')->fetch_row();

trunk/pages/commands.php

@@ -5 +5 @@
 
 $Realm = new Realm($System, $_COOKIE['RealmIndex']);
-$db = $Realm->Database;
-$db->select_db($Config['Mangos']['RealmList'][$Realm->Id]['DatabaseMangos']);
+$db = $Realm->MangosDatabase;
 
 $Output .= '<ul>';

trunk/pages/events.php

@@ -91 +91 @@
 echo($server->RealmSelection());
 $Realm = new Realm($System, $_COOKIE['RealmIndex']);
-$db = $Realm->Database;
-$db->select_db($Config['Mangos']['RealmList'][$Realm->Id]['DatabaseMangos']);
+$db = $Realm->MangosDatabase;
 
 $Events = Events();

trunk/pages/gmteam.php

@@ -50 +50 @@
 
 $Realm = new Realm($System, $_COOKIE['RealmIndex']);
-$db2 = $Realm->Database;
-$db2->select_db($Config['Mangos']['RealmList'][$Realm->Id]['DatabaseCharacters']);
+$db2 = $Realm->CharactersDatabase;
 
-$db->select_db($Config['Database']['Database']);
 $Output = '<h2 class="PageTitle">GM tým</h2>';
 

trunk/pages/guilda.php

@@ -11 +11 @@
 
 $Realm = new Realm($System, $_COOKIE['RealmIndex']);
-$db2 = $Realm->Database;
-$db2->select_db($Config['Mangos']['RealmList'][$Realm->Id]['DatabaseCharacters']);
+$db2 = $Realm->CharactersDatabase;
 $id = (isset($_GET['id'])) ? $_GET['id'] : 0;
 if($id != 0)

trunk/pages/guildy.php

@@ -44 +44 @@
 
 $Realm = new Realm($System, $_COOKIE['RealmIndex']);
-$db2 = $Realm->Database;
-$db2->select_db($Config['Mangos']['RealmList'][$Realm->Id]['DatabaseCharacters']);
+$db2 = $Realm->CharactersDatabase;
 
 $sql = $db2->query('SELECT `guild`.name, `guild`.guildid, `guild`.createdate, COUNT(`guild_member`.`guildid`) AS member_count ,`leader`.`race` IN (1, 3, 4, 7, 11) AS fraction , `leader`.`guid` AS leader FROM `guild` JOIN `guild_member` ON `guild_member`.`guildid` = `guild`.`guildid` JOIN `characters` AS `memebers` ON `memebers`.`guid`= `guild_member`.`guid` JOIN `characters` AS `leader` ON `leader`.`guid`= `guild`.`leaderguid` GROUP BY guild.name ORDER BY '.$order_by.' '.$order_dir.';');

trunk/pages/online.php

@@ -37 +37 @@
     MakeLink('Body arén', 'arena_points').'</th></tr>');
 
-$Realm->Database->select_db($Config['Mangos']['RealmList'][$_COOKIE['RealmIndex']]['DatabaseCharacters']);
-$sql = $Realm->Database->query('SELECT guid, name, race, class, zone, map, '.
+$sql = $Realm->CharactersDatabase->query('SELECT guid, name, race, class, zone, map, '.
   'CAST( SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, " ", '.$Config['Mangos']['CharacterDataOffset']['HonorPoints'].'+1), " ", -1) AS UNSIGNED) AS highest_rank, '.
   'CAST( SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, " ", '.$Config['Mangos']['CharacterDataOffset']['Level'].' + 1), " ", -1) AS UNSIGNED) AS level, '.

trunk/pages/realmlist.php

@@ -1 +1 @@
 <?php
 
-$Output = '<h2 align="center">Seznam světů</h2>';
-
-$Output .= '<table class="BaseTable">'.
-  '<tr>'.
-  '<th>Název</th>'.
-  '<th>Násobek XP</th>'.
-  '<th>Zaměření</th>'.
-  '<th>Stav</th>'.
-  '<th>Hráči online / max. online / celkem</th>'.
-  '</tr>';
-  
-foreach($Config['Mangos']['RealmList'] as $Index => $RealmConfig)
+if(array_key_exists('Server', $_GET))
 {
-  $db->select_db($Config['Mangos']['DatabaseRealmd']);
-  $DbResult = $db->query('SELECT * FROM `realmlist` WHERE id='.$RealmConfig['Id']);  
+  $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']);
   if($DbResult->num_rows > 0)
   {
-    $Realm = new Realm($System, $Index);
-    $DbRow = $DbResult->fetch_assoc();
-    $Output .= '<tr><td><a href="?page=online&amp;RealmIndex='.$Index.'">'.$RealmConfig['Name'].'</a></td><td>'.$RealmConfig['XPRate'].'</td><td>'.$RealmConfig['Type'].'</td><td>'.$server->OnlineStateImage($System->NetworkPortState($DbRow['address'], $DbRow['port'])).'</td><td>'.$Realm->OnlineCharactersCount($Index).' / '.$RealmConfig['MaxOnlinePlayers'].' / '.$Realm->CharacterCount($Index).'</td></tr>';
-    $Output .= '<tr><td colspan="5">'.$RealmConfig['Description'].'</td></tr>';
-    //if(array_key_exists($Index + 1, $Config['Mangos']['RealmList'])) 
-    $Output .= '<tr><td colspan="5">&nbsp;</td></tr>';
+    $Realm = $DbResult->fetch_assoc();
+    echo('set realmlist '.$Realm['Address']);
+    if($Realm['Port'] != 3724) echo(':'.$Realm['Port']);
+    echo('</div>');
+  } else echo('Neznámé Id serveru');
+} else
+{
+  $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');
+  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'];
+    if($DbRow['Port'] != 3724) $Output .= ':'.$DbRow['Port'];
+    $Output .= '</a></div>';
+    $Output .= '<table class="BaseTable">'.
+    '<tr>'.
+    '<th>Název</th>'.
+    '<th>Násobek XP</th>'.
+    '<th>Zaměření</th>'.
+    '<th>Stav</th>'.
+    '<th>Hráči online / max. online / celkem</th>'.
+    '</tr>';
+  
+    $DbResult2 = $System->Database->query('SELECT * FROM Realm WHERE Logon='.$Server->Id.' ORDER BY Name');
+    while($DbRow = $DbResult2->fetch_assoc())
+    {
+      $Realm = new Realm($System, $DbRow['Id']);
+      $Output .= '<tr><td><a href="?page=online&amp;RealmIndex='.$Realm->Id.'">'.$Realm->Data['Name'].'</a></td><td>'.$Realm->Data['Rate'].'</td><td>'.$Realm->Data['Type'].'</td><td>'.$Server->OnlineStateImage($Realm->Data['Online']).'</td><td>'.$Realm->OnlineCharactersCount().' / '.$Realm->Data['MaxOnlinePlayers'].' / '.$Realm->CharacterCount().'</td></tr>';
+      $Output .= '<tr><td colspan="5">'.$Realm->Data['Description'].'</td></tr>';
+      //if(array_key_exists($Index + 1, $Config['Mangos']['RealmList'])) 
+      $Output .= '<tr><td colspan="5">&nbsp;</td></tr>';
+    }
+    $Output .= '</table><br/>';
   }
+  echo($Output);
 }
-$Output .= '</table>';
-echo($Output);
 
 ?>

trunk/pages/server.php

@@ -57 +57 @@
   </tr>
   <tr><td colspan="2" style="padding: 5px;">';
-  
-foreach($Config['Web']['ServerList'] as $Index => $Server)
+
+$DbResult = $System->Database->query('SELECT * FROM Host');
+while($Host = $DbResult->fetch_assoc())
 {
   $Realms = array();
-  foreach($Config['Mangos']['RealmList'] as $RealmIndex => $Realm)
+  $DbResult2 = $System->Database->query('SELECT * FROM Realm');
+  while($Realm = $DbResult2->fetch_assoc())
   {
-    if($Realm['Server'] == $Index) $Realms[] = $Realm['Name'];
+    if($Realm['Host'] == $Host['Id']) $Realms[] = $Realm['Name'];
   }
     
@@ -72 +74 @@
   <tr>
     <td>Operační systém</td>
-    <td>'.$Server['OS'].'</td>
+    <td>'.$Host['OS'].'</td>
   </tr>
   <tr>
     <td>Procesor</td>
-    <td>'.$Server['CPU'].'</td>
+    <td>'.$Host['CPU'].'</td>
   </tr>
   <tr>
     <td>Operační paměť</td>
-    <td>'.$Server['Memory'].'</td>
+    <td>'.$Host['Memory'].'</td>
   </tr>
   <tr>
     <td>Pevný disk</td>
-    <td>'.$Server['HDD'].'</td>
+    <td>'.$Host['HDD'].'</td>
   </tr>
   <tr>
     <td>Adresa serveru</td>
-    <td>'.$Server['Address'].'</td>
+    <td>'.$Host['Address'].'</td>
   </tr>
   <tr>
     <td>Internetová linka</td>
-    <td>'.$Server['Internet'].'</td>
+    <td>'.$Host['Internet'].'</td>
   </tr>
   <tr>
@@ -100 +102 @@
   <tr>
     <td>Grafy</td>
-    <td><a href="'.$Server['Statistic'].'">'.$Server['Statistic'].'</a></td>
+    <td><a href="'.$Host['Statistic'].'">'.$Host['Statistic'].'</a></td>
   </tr>
   </table>';

trunk/pages/tophraci.php

@@ -22 +22 @@
 
 $Realm = new Realm($System, $_COOKIE['RealmIndex']);
-$db = $Realm->Database;
-$db->select_db($Config['Mangos']['RealmList'][$Realm->Id]['DatabaseCharacters']);
+$db = $Realm->CharactersDatabase;
 
 $sql = 'SELECT name, totaltime, online FROM characters ORDER BY totaltime DESC LIMIT '.$top;

@@ -1 @@
-mm
-Thumbs.db
+gallery
+armory
+tester
+test
+minimanager
+mmfpm