Changeset 630 for trunk/pages

Timestamp:

Aug 26, 2009, 3:07:07 PM (15 years ago)

Author:

george

Message:

• Přidáno: Podpora pro umístění světů na oddělených serverech. Vzdálené připojení k databázi.
• Přidáno: Třída Realm pro sadu funkcí týkajících se světů.
• Přidáno: Třída System pro reprezentaci obecných funkcí.

Location:

trunk/pages

Files:

• arena.php (modified) (1 diff)
• commands.php (modified) (1 diff)
• events.php (modified) (1 diff)
• gmteam.php (modified) (3 diffs)
• guilda.php (modified) (1 diff)
• guildy.php (modified) (1 diff)
• online.php (modified) (2 diffs)
• realmlist.php (modified) (1 diff)
• server.php (modified) (4 diffs)
• tophraci.php (modified) (1 diff)

trunk/pages/arena.php

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

trunk/pages/commands.php

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

trunk/pages/events.php

@@ -90 +90 @@
 echo('<h3 class="PageTitle">Události ve hře</h3>');
 echo($server->RealmSelection());
+$Realm = new Realm($System, $_COOKIE['RealmIndex']);
+$db = $Realm->Database;
+$db->select_db($Config['Mangos']['RealmList'][$Realm->Id]['DatabaseMangos']);
 
 $Events = Events();

trunk/pages/gmteam.php

@@ -3 +3 @@
 function ShowGMList($Realm)
 {
-  global $db, $Config;
+  global $db, $db2, $Config;
   
   $Result = $db->query('SELECT * FROM `GmTeam` WHERE (`RealmId` = '.$Realm['Id'].') AND (`TimeTo` IS NULL) ORDER BY `RealmId`, `Nick`');
@@ -21 +21 @@
     $Output .= '<td>';
     $Characters = array();
-    $ResultMangos = $db->query('SELECT * FROM `'.$Config['Mangos']['RealmList'][$_COOKIE['RealmIndex']]['DatabaseCharacters'].'`.`characters` WHERE `account` = "'.$Line['AccountId'].'"');
+    $ResultMangos = $db2->query('SELECT * FROM `characters` WHERE `account` = "'.$Line['AccountId'].'"');
     while($LineMangos = $ResultMangos->fetch_array())
     { 
@@ -49 +49 @@
 //$_COOKIE['RealmIndex']
 
+$Realm = new Realm($System, $_COOKIE['RealmIndex']);
+$db2 = $Realm->Database;
+$db2->select_db($Config['Mangos']['RealmList'][$Realm->Id]['DatabaseCharacters']);
+
 $db->select_db($Config['Database']['Database']);
 $Output = '<h2 class="PageTitle">GM tým</h3>';

trunk/pages/guilda.php

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

trunk/pages/guildy.php

@@ -43 +43 @@
   </tr>');
 
-$db->select_db($Config['Mangos']['RealmList'][$_COOKIE['RealmIndex']]['DatabaseCharacters']);
+$Realm = new Realm($System, $_COOKIE['RealmIndex']);
+$db = $Realm->Database;
+$db->select_db($Config['Mangos']['RealmList'][$Realm->Id]['DatabaseCharacters']);
 
 $sql = $db->query('SELECT `guild`.homepage, `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

@@ -24 +24 @@
 echo($server->RealmSelection());
 
-echo('<div style="text-align: center">Celkem '.$server->MangosOnline($_COOKIE['RealmIndex']).' hráčů.</div>'.
+$Realm = new Realm($System, $_COOKIE['RealmIndex']);
+echo('<div style="text-align: center">Celkem '.$Realm->OnlineCharactersCount().' hráčů.</div>'.
 '<table class="BaseTable">
   <tr>
@@ -36 +37 @@
     MakeLink('Aréna body', 'arena_points').'</th></tr>');
 
-$db->select_db($Config['Mangos']['RealmList'][$_COOKIE['RealmIndex']]['DatabaseCharacters']);
-$sql = $db->query('SELECT guid, name, race, class, zone, map, '.
+$Realm->Database->select_db($Config['Mangos']['RealmList'][$_COOKIE['RealmIndex']]['DatabaseCharacters']);
+$sql = $Realm->Database->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

@@ -18 +18 @@
   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'].'x</td><td>'.$RealmConfig['Type'].'</td><td>'.$server->ServerImg($server->ServerOnline($DbRow['address'], $DbRow['port'])).'</td><td>'.$server->MangosOnline($Index).' / '.$RealmConfig['MaxOnlinePlayers'].' / '.$server->CharacterCount($Index).'</td></tr>';
+    $Output .= '<tr><td><a href="?page=online&amp;RealmIndex='.$Index.'">'.$RealmConfig['Name'].'</a></td><td>'.$RealmConfig['XPRate'].'x</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>';

trunk/pages/server.php

@@ -8 +8 @@
   <tr>
     <td>Přihlašovací server je</td>
-    <td>'.$server->ServerImg($server->ServerOnline($Config['Web']['WoWServerAddr'], 3724)).'</td>
+    <td>'.$server->OnlineStateImage($System->NetworkPortState($Config['Web']['WoWServerAddr'], 3724)).'</td>
   </tr>
   <tr>
@@ -16 +16 @@
   <tr>
     <td>Ve všech světech přítomno</td>
-    <td>'.$server->ServerMangosOnline().' hráčů</td>
-  </tr>
-  <tr>
-    <td>Server beží bez restartu</td>
-    <td>'.$server->ServerUptime().' (hodiny)</td>
+    <td>'.$server->OnlineAccountCount().' hráčů</td>
   </tr>
   <tr>
@@ -28 +24 @@
   <tr>
     <td>Ve všech světech uloženo</td>
-    <td>'.$server->ServerCharacterCount().' postav</td>
+    <td>'.$server->CharacterCount().' postav</td>
   </tr>
   <tr>
     <td><a href="?page=teamspeak">TeamSpeak</a> server je</td>
-    <td>'.$server->ServerImg($server->ServerOnline($Config['Web']['WoWServerAddr'], 51234)).'</td>
+    <td>'.$server->OnlineStateImage($System->NetworkPortState($Config['Web']['WoWServerAddr'], 51234)).'</td>
   </tr>
   <tr>
     <td><a href="http://www.heroesoffantasy.cz:6969/">Torrent</a> server je</td>
-    <td>'.$server->ServerImg($server->ServerOnline($Config['Web']['WoWServerAddr'], 6969)).'</td>
+    <td>'.$server->OnlineStateImage($System->NetworkPortState($Config['Web']['WoWServerAddr'], 6969)).'</td>
   </tr>
   <tr>
@@ -65 +61 @@
 {
   $Realms = array();
-  foreach($Server['Realms'] as $Realm)
-    $Realms[] = $Config['Mangos']['RealmList'][$Realm]['Name'];
+  foreach($Config['Mangos']['RealmList'] as $RealmIndex => $Realm)
+  {
+    if($Realm['Server'] == $Index) $Realms[] = $Realm['Name'];
+  }
     
   $Output .= '<table class="BaseTable" style="width: 100%; margin: 5px;">

trunk/pages/tophraci.php

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