Changeset 682

Timestamp:

Jan 23, 2010, 4:03:37 PM (14 years ago)

Author:

george

Message:

• Opraveno: Na dalších stránkách přepracován systém pro načítání údajů z databáze namísto konfiguračního souboru.
• Přidáno: Skript pro periodickou kontrolu online stavu přihlašovacích serverů a světů. Online stav se načítá nově přímo z databáze a sníží se tak zátěž sítových portů služeb.

Location:

trunk

Files:

• inc/config.sample.php (modified) (3 diffs)
• inc/html.php (modified) (2 diffs)
• inc/player.php (modified) (14 diffs)
• inc/update_state.php (added)
• index.php (modified) (3 diffs)
• pages/events.php (modified) (1 diff)
• pages/gmteam.php (modified) (1 diff)
• pages/server.php (modified) (2 diffs)
• pages/test-server.php (deleted)
• sql/updates/682.sql (added)

trunk/inc/config.sample.php

@@ -34 +34 @@
       'ArenaPoints' => 1649,
     ),
-    'RealmList' => array(
-      1 => array(
-        'Id' => 7,
-        'Name' => 'Realm 1'
-        'DatabaseHost' => 'localhost',
-        'DatabaseUser' => 'server1',
-        'DatabasePassword' => 'server1',
-        'DatabaseCharacters' => 'realm1_characters',
-        'DatabaseMangos' => 'realm1_mangos',
-        'DatabaseScriptDev2' => 'realm1_scriptdev2',
-        'Server' => 1,
-        'MaxOnlinePlayers' => 100,
-        'XPRate' => 1,
-        'Type' => 'Normalní',
-        'Description' => 'Hlavní realm',
-      ),
-    ),
   ),
   'Web' => array
@@ -70 +53 @@
     'BankAccount' => '670100-2202937132/6210',
     'TableRowPerPage' => 20,
-    'ServerList' => array(
-      1 => array(
-        'OS' => 'GNU/Linux',
-        'CPU' => 'AMD Athlon 64 X2 5600+, 2,8 GHz',
-        'Memory' => '8 GB DDR2 800 MHz dual channel',
-        'HDD' => 'WD Green 1 TB, 32 MB cache',
-        'Address' => 'localhost',
-        'Internet' => '16/16 Mbit/s, agregace 1:32',
-        'Statistic' => 'http://localhost/stat/',
-      },
-    },
+    'DefaultRealmIndex' => 1,
   ),
   'CheckRegistration' => array
@@ -93 +66 @@
 );
 
-// Zpětná kompatibilita
+// Zastaralé, pro zpětnou kompatibilitu
 $db_server = $Config['Database']['Host'];
 $db_user = $Config['Database']['User'];

trunk/inc/html.php

@@ -263 +263 @@
   {
     global $server, $Config, $System;
+    
+    // Check servers online state.
+    $DbResult = $System->Database->query('SELECT COUNT(*) FROM Logon WHERE Online = 1');
+    $DbRow = $DbResult->fetch_row();
+    $OnlineState = $DbRow[0] > 0; // Report online state if one of all servers is online.
 
     if(isset($_COOKIE['hof-quick']) AND $_COOKIE['hof-quick'] == 'no')
@@ -275 +280 @@
         '<tr>'.
         '<td colspan="2">'.
-        '<strong>Server : </strong>'.$server->OnlineStateImage($System->NetworkPortState($Config['Web']['WoWServerAddr'], 3724)).'<b> (<a href="?page=realmlist">'.$server->OnlineCharactersCount().' hráčů celkem</a>) | Patch '.$Config['Mangos']['ClientVersion'].' | <a href="'.$Config['Web']['BaseURL'].'/pages/realmlist.wtf">Realmlist</a> | <a href="?page=server">Server info</a> | <a href="?page=realmlist">Seznam světů</a></b>'.
+        '<strong>Server : </strong>'.$server->OnlineStateImage($OnlineState).'<b> (<a href="?page=realmlist">'.$server->OnlineCharactersCount().' hráčů celkem</a>) | Patch '.$Config['Mangos']['ClientVersion'].' | <a href="'.$Config['Web']['BaseURL'].'/pages/realmlist.wtf">Realmlist</a> | <a href="?page=server">Server info</a> | <a href="?page=realmlist">Seznam světů</a></b>'.
         '</td></tr></table><br />');
     }

trunk/inc/player.php

@@ -102 +102 @@
     global $Config;
 
-    $this->db->select_db($Config['Mangos']['RealmList'][$_COOKIE['RealmIndex']]['DatabaseCharacters']);
-    $DbResult = $this->db->query('SELECT CAST(SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, " ", '.($Config['Mangos']['CharacterDataOffset']['Level'] + 1).'), " ", -1) AS UNSIGNED) AS `level` FROM `characters` WHERE `guid` = "'.$guid.'" LIMIT 1;');
+    $Realm = new Realm($System, $_COOKIE['RealmIndex']);
+    $DbResult = $Realm->CharactersDatabase->query('SELECT CAST(SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, " ", '.($Config['Mangos']['CharacterDataOffset']['Level'] + 1).'), " ", -1) AS UNSIGNED) AS `level` FROM `characters` WHERE `guid` = "'.$guid.'" LIMIT 1;');
     $row = $DbResult->fetch_assoc();
     return($row['level']);
@@ -135 +135 @@
   public function ResetXP($guid)
   {
-    global $Config;
+    global $System, $Config;
 
     if($this->CharInAcc($guid, 0))
@@ -141 +141 @@
       if(!$this->IsOnline($guid))
       {
-        $this->db->select_db($Config['Mangos']['RealmList'][$_COOKIE['RealmIndex']]['DatabaseCharacters']);
-        $row = $this->db->query('SELECT `data` FROM `characters` WHERE `guid` = "'.$guid.'" LIMIT 1')->fetch_assoc();
+        $Realm = new Realm($System, $_COOKIE['RealmIndex']);
+        $row = $Realm->CharactersDatabase->query('SELECT `data` FROM `characters` WHERE `guid` = "'.$guid.'" LIMIT 1')->fetch_assoc();
         $data = explode(' ', $row['data']);
         $data[$Config['Mangos']['CharacterDataOffset']['Exp']] = 0;
         $data = implode(' ', $data);
-        $this->db->query('UPDATE `characters` SET `data` = "'.$data.'" WHERE `guid` ="'.$guid.'" LIMIT 1');
+        $Realm->CharactersDatabase->query('UPDATE `characters` SET `data` = "'.$data.'" WHERE `guid` ="'.$guid.'" LIMIT 1');
         $this->Msg('Postavě resetováno XP.', 0);
       } else $this->Msg('Postava musí být offline.', 1);
@@ -154 +154 @@
   public function ResetPosition($guid)
   {
-    global $Config;
-
-    $this->db->select_db($Config['Mangos']['RealmList'][$_COOKIE['RealmIndex']]['DatabaseCharacters']);
+    global $System, $Config;
+
+    $Realm = new Realm($System, $_COOKIE['RealmIndex']);
     if($this->CharInAcc($guid, 0))
     {
       if(!$this->IsOnline($guid))
       {
-        $row = $this->db->query('SELECT * FROM `character_homebind` WHERE `guid` = "'.$guid.'" LIMIT 1;')->fetch_array();
+        $row = $Realm->CharactersDatabase->query('SELECT * FROM `character_homebind` WHERE `guid` = "'.$guid.'" LIMIT 1;')->fetch_array();
         $home_char_map = $row['map'];
         $home_char_position_x = $row['position_x'];
@@ -168 +168 @@
         if(isset($home_char_map) and isset($home_char_position_x) and isset($home_char_position_y) and isset($home_char_position_z))
         {
-          $this->db->query('UPDATE `characters` SET '.
+          $Realm->CharactersDatabase->query('UPDATE `characters` SET '.
             '`map` = "'.$home_char_map.'" , '.
             '`position_x` ="'.$home_char_position_x.'" , '.
@@ -182 +182 @@
   public function PlayerJail($guid)
   {
-    global $Config;
-
-    $this->db->select_db($Config['Mangos']['RealmList'][$_COOKIE['RealmIndex']]['DatabaseCharacters']);
+    global $System, $Config;
+
+    $Realm = new Realm($System, $_COOKIE['RealmIndex']);
     // .go xyz -90.54 41.35 -31.71
     // .go xyz -91.01 100.46 -31.71
@@ -208 +208 @@
     if(!$this->IsOnline($guid))
     {
-      $this->db->query('UPDATE `characters` SET `map` = 35 ,'.
+      $Realm->CharactersDatabase->query('UPDATE `characters` SET `map` = 35 ,'.
         '`orientation` = "'.$defined_positions['o'.$rand_place].'" ,'.
         '`position_x` ="'.$defined_positions['x'.$rand_place].'" ,'.
@@ -214 +214 @@
         '`position_z` = "'.$defined_positions['z'.$rand_place].'"'.
         ' WHERE `guid` ="'.$guid.'" LIMIT 1;');
-      $this->db->query('INSERT INTO `character_aura` (`guid`, `caster_guid`, `spell`, `effect_index`, `amount`, `maxduration`, `remaintime`, `remaincharges`) VALUES '.
+      $Realm->CharactersDatabase->query('INSERT INTO `character_aura` (`guid`, `caster_guid`, `spell`, `effect_index`, `amount`, `maxduration`, `remaintime`, `remaincharges`) VALUES '.
         '('.$guid.', '.$guid.', 23775, 0, 1, -1, -1, -1), '.
         '('.$guid.', '.$guid.', 36558, 0, 1, -1, -1, -1);');               
@@ -223 +223 @@
   public function IsOnline($guid)
   {
-    global $Config;
-
-    $this->db->select_db($Config['Mangos']['RealmList'][$_COOKIE['RealmIndex']]['DatabaseCharacters']);
-    $row = $this->db->query('SELECT `online` FROM `characters` WHERE `guid` = "'.$guid.'" LIMIT 1;')->fetch_assoc();
+    global $System, $Config;
+
+    $Realm = new Realm($System, $_COOKIE['RealmIndex']);
+    $row = $Realm->CharactersDatabase->query('SELECT `online` FROM `characters` WHERE `guid` = "'.$guid.'" LIMIT 1;')->fetch_assoc();
     if($row['online'] == 1) return(true);
       else return(false);
@@ -258 +258 @@
   public function CharNameToGuid($name)
   {
-    global $Config;
-
-    $this->db->select_db($Config['Mangos']['RealmList'][$_COOKIE['RealmIndex']]['DatabaseCharacters']);
-    $row = $this->db->query('SELECT `guid` FROM `characters` WHERE `name` LIKE "'.$name.'" LIMIT 1;')->fetch_assoc();
+    global $System, $Config;
+
+    $Realm = new Realm($System, $_COOKIE['RealmIndex']);
+    $row = $Realm->CharactersDatabase->query('SELECT `guid` FROM `characters` WHERE `name` LIKE "'.$name.'" LIMIT 1;')->fetch_assoc();
     if($row['guid'] != '')
     {
@@ -275 +275 @@
     global $Config;
 
-    $this->db->select_db($Config['Mangos']['RealmList'][$_COOKIE['RealmIndex']]['DatabaseCharacters']);
-    $row = $this->db->query('SELECT `name` FROM `characters` WHERE `guid` = "'.$guid.'" LIMIT 1;')->fetch_assoc();
+    $Realm = new Realm($System, $_COOKIE['RealmIndex']);
+    $row = $Realm->CharactersDatabase->query('SELECT `name` FROM `characters` WHERE `guid` = "'.$guid.'" LIMIT 1;')->fetch_assoc();
     if($row['name'] != '')
     {
@@ -305 +305 @@
   {
     global $Config;
-
+  
     $this->db->select_db($Config['Mangos']['DatabaseRealmd']);
     $sha_pass = sha1(strtoupper($acc1_name).':'.strtoupper($acc1_pass));
@@ -344 +344 @@
   public function CharsOnAcc($accid)
   {
-    global $Config;
+    global $Config, $System;
     
     echo('<table class="BaseTable">
@@ -354 +354 @@
             <th>Nahráno</th>
           </tr>');
-    $this->db->select_db($Config['Mangos']['RealmList'][$_COOKIE['RealmIndex']]['DatabaseCharacters']);
-    echo($this->db->error);
-    $sql = $this->db->query('SELECT `guid`,`name`,`race`,`totaltime`,`class`, mid(lpad( hex( CAST(substring_index(substring_index(data, " ", '.($Config['Mangos']['CharacterDataOffset']['Gender'] + 1).'), " ",-1) AS unsigned) ), 8, 0), 4, 1) AS gender FROM `characters` WHERE `account`='.$accid.' ORDER BY `totaltime` DESC LIMIT 0, 10');
-    echo($this->db->error);
+    $Realm = new Realm($System, $_COOKIE['RealmIndex']);   
+    $sql = $Realm->CharactersDatabase->query('SELECT `guid`,`name`,`race`,`totaltime`,`class`, mid(lpad( hex( CAST(substring_index(substring_index(data, " ", '.($Config['Mangos']['CharacterDataOffset']['Gender'] + 1).'), " ",-1) AS unsigned) ), 8, 0), 4, 1) AS gender FROM `characters` WHERE `account`='.$accid.' ORDER BY `totaltime` DESC LIMIT 0, 10');
     while($row = $sql->fetch_array())
     {

trunk/index.php

@@ -18 +18 @@
   $_COOKIE['RealmIndex'] = $_GET['RealmIndex'];
 }
-$RealmList = $Config['Mangos']['RealmList'];
-$FirstRealm = array_shift($RealmList);
-if(!array_key_exists('RealmIndex', $_COOKIE)) $_COOKIE['RealmIndex'] = $FirstRealm['Id'];
-  else 
-  {
-    if(!array_key_exists($_COOKIE['RealmIndex'], $Config['Mangos']['RealmList']))
-      $_COOKIE['RealmIndex'] = $FirstRealm['Id'];
-  }
-  
+
 session_start();
 include_once('inc/error.php');
@@ -45 +37 @@
 if(isset($_COOKIE['hof-random']) and $_COOKIE['hof-random'] == 'no') $num_headers = 1;
   else $num_headers = 8;
+
+// Check right RealmIndex
+if(!array_key_exists('RealmIndex', $_COOKIE)) 
+{
+  $_COOKIE['RealmIndex'] = $Config['Web']['DefaultRealmIndex'];
+} else 
+{
+  $DbResult = $System->Database->query('SELECT Id FROM Realm WHERE Id='.$_COOKIE['RealmIndex']);
+  if($DbResult->num_rows == 0) $_COOKIE['RealmIndex'] = $Config['Web']['DefaultRealmIndex'];
+}
 
 echo('<div id="page">'.
@@ -69 +71 @@
   array('link' => '?page=teamspeak', 'Text' => 'Team speak'),
   array('link' => '?page=client', 'Text' => 'HoF Client'),
-  array('link' => '?page=test-server', 'Text' => 'Test Server'),
   array('link' => '?page=search', 'Text' => 'Vyhledávání'), 
   array('link' => '?page=realmlist', 'Text' => 'Světy'),    

trunk/pages/events.php

@@ -40 +40 @@
 function Events()
 {
-  global $db, $EventsLinks, $Config;
+  global $db, $EventsLinks, $Config, $System;
   
   $Events = array('Running' => array(), 'Planned' => array());
-  $db->select_db($Config['Mangos']['RealmList'][$_COOKIE['RealmIndex']]['DatabaseMangos']);
+  $Realm = new Realm($System, $_COOKIE['RealmIndex']);
 
-  $DbResult = $db->query('SELECT *, UNIX_TIMESTAMP(start_time) as start FROM game_event WHERE end_time > NOW() AND start_time < NOW()');
+  $DbResult = $Realm->MangosDatabase->query('SELECT *, UNIX_TIMESTAMP(start_time) as start FROM game_event WHERE end_time > NOW() AND start_time < NOW()');
   while($Row = $DbResult->fetch_array())
   { 

trunk/pages/gmteam.php

@@ -55 +55 @@
 
 $Output .= ShowGMList(array('Id' => 0, 'Name' => 'Všechny světy'));
-foreach($Config['Mangos']['RealmList'] as $Realm)
+$DbResult = $System->Database->query('SELECT * FROM Realm');
+while($Realm = $DbResult->fetch_assoc())
 {
   $Output .= ShowGMList($Realm);

trunk/pages/server.php

@@ -1 +1 @@
 <?php
+
+$DbResult = $System->Database->query('SELECT COUNT(*) FROM Realm');
+$DbRow = $DbResult->fetch_row();
+$RealmCount = $DbRow[0];
 
 $Output = '<h3 class="PageTitle">Server Heroes of Fantasy</h3>'.
@@ -12 +16 @@
   <tr>
     <td>Celkem světů</td>
-    <td>'.count($Config['Mangos']['RealmList']).'</td>
+    <td>'.$RealmCount.'</td>
   </tr>
   <tr>