Changeset 632 for trunk

Timestamp:

Aug 30, 2009, 8:59:02 AM (15 years ago)

Author:

george

Message:

• Upraveno: Doplňující informace ke spolkům jako jsou webové stránky spolku jsou nyní uloženy v samostatné tabulce bez nutnosti zasahování do tabulek emulátoru.
• Opraveno: Zobrazování seznamu spolků a výpisu členů.

Location:

trunk

Files:

• pages/guilda.php (modified) (3 diffs)
• pages/guildy.php (modified) (2 diffs)
• pages/online.php (modified) (1 diff)
• sql/updates/632.sql (added)

trunk/pages/guilda.php

@@ -11 +11 @@
 
 $Realm = new Realm($System, $_COOKIE['RealmIndex']);
-$db = $Realm->Database;
-$db->select_db($Config['Mangos']['RealmList'][$Realm->Id]['DatabaseCharacters']);
+$db2 = $Realm->Database;
+$db2->select_db($Config['Mangos']['RealmList'][$Realm->Id]['DatabaseCharacters']);
 $id = (isset($_GET['id'])) ? $_GET['id'] : 0;
 if($id != 0)
 {
   $guild_id = $id;
-  $DbResult = $db->query('SELECT `guildid`, `name`, `createdate` FROM `guild` WHERE `guildid` = '.$guild_id.' LIMIT 1');
+  $DbResult = $db2->query('SELECT `guildid`, `name`, `createdate` FROM `guild` WHERE `guildid` = '.$guild_id.' LIMIT 1');
   $guild_data = $DbResult->fetch_assoc();
-  $members = $db->query('SELECT guild_member.guid, guild_member.rank AS mrank, `characters`.name, SUBSTRING_INDEX(SUBSTRING_INDEX(`characters`.`data`, " ", '.$Config['Mangos']['CharacterDataOffset']['Level'].' + 1), " ", -1) AS level, (SELECT rname FROM guild_rank WHERE guildid ='.$guild_id.' AND rid = mrank + 1) AS rname, guild_member.pnote, guild_member.offnote FROM guild_member,`characters` LEFT JOIN guild_member k1 ON k1.`guid`=`characters`.`guid` WHERE guild_member.guildid = '.$guild_id.' AND guild_member.guid=`characters`.guid ORDER BY mrank');
+  $members = $db2->query('SELECT guild_member.guid, guild_member.rank AS mrank, `characters`.name, SUBSTRING_INDEX(SUBSTRING_INDEX(`characters`.`data`, " ", '.$Config['Mangos']['CharacterDataOffset']['Level'].' + 1), " ", -1) AS level, (SELECT rname FROM guild_rank WHERE guildid ='.$guild_id.' AND rid = mrank + 1) AS rname, guild_member.pnote, guild_member.offnote FROM guild_member,`characters` LEFT JOIN guild_member k1 ON k1.`guid`=`characters`.`guid` WHERE guild_member.guildid = '.$guild_id.' AND guild_member.guid=`characters`.guid ORDER BY mrank');
   $total_members = $members->num_rows;
-  $members_data = $members->fetch_assoc();
-  $DbResult = $db->query('SELECT count(*) AS online_mem  FROM `guild_member`, `characters`, `guild` WHERE guild.guildid = '.$guild_id.' AND guild_member.guildid = guild.guildid AND guild_member.guid = characters.guid AND characters.online = 1');
+  $DbResult = $db2->query('SELECT count(*) AS online_mem  FROM `guild_member`, `characters`, `guild` WHERE guild.guildid = '.$guild_id.' AND guild_member.guildid = guild.guildid AND guild_member.guid = characters.guid AND characters.online = 1');
   $online_mem = $DbResult->fetch_assoc();
 
@@ -43 +42 @@
       <th>Celkem členů: </th>
       <td>'.$total_members.' (Online : '.$online_mem['online_mem'].')</td>
+    </tr>');
+  $DbResult = $db->query('SELECT Homepage FROM GuildInfo WHERE Guild='.$guild_id);
+  $DbRow = $DbResult->fetch_assoc();
+  $Homepage = $DbRow['Homepage'];
+  if($Homepage != '')
+  {
+    echo('    <tr>
+      <th>Webové stránky: </th>
+      <td><a href="http://'.$Homepage.'/">'.$Homepage.'</a></td>
     </tr>
-  </table><br />');
+');
+  }
+  echo('</table><br />');
+
   
   // members info
@@ -59 +70 @@
   while($member = $members->fetch_row())
   {    
-    $query = $db->query('SELECT `race`,`class`,`online`, `account`, `logout_time`, SUBSTRING_INDEX(SUBSTRING_INDEX(`characters`.`data`, " ", '.$Config['Mangos']['CharacterDataOffset']['Level'].' + 1), " ", -1) AS level, 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 `guid` = '.$member[0].' LIMIT 1;');
+    $query = $db2->query('SELECT `race`,`class`,`online`, `account`, `logout_time`, SUBSTRING_INDEX(SUBSTRING_INDEX(`characters`.`data`, " ", '.$Config['Mangos']['CharacterDataOffset']['Level'].' + 1), " ", -1) AS level, 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 `guid` = '.$member[0].' LIMIT 1;');
     $online = $query->fetch_assoc();
     $accid = $online['account'];

trunk/pages/guildy.php

@@ -44 +44 @@
 
 $Realm = new Realm($System, $_COOKIE['RealmIndex']);
-$db = $Realm->Database;
-$db->select_db($Config['Mangos']['RealmList'][$Realm->Id]['DatabaseCharacters']);
+$db2 = $Realm->Database;
+$db2->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.';');
+$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.';');
 while($row = $sql->fetch_assoc())
 {
-  $DbResult = $db->query('SELECT count(*) AS online_mem  FROM `guild_member`, `characters`, `guild` WHERE guild.guildid = '.$row['guildid'].' AND guild_member.guildid = guild.guildid AND guild_member.guid = characters.guid AND characters.online = 1');
+  $DbResult = $db2->query('SELECT COUNT(*) AS online_mem  FROM `guild_member`, `characters`, `guild` WHERE guild.guildid = '.$row['guildid'].' AND guild_member.guildid = guild.guildid AND guild_member.guid = characters.guid AND characters.online = 1');
   $online_mem = $DbResult->fetch_assoc();
+  $DbResult = $db->query('SELECT Homepage FROM GuildInfo WHERE Guild='.$row['guildid']);
+  $DbRow = $DbResult->fetch_assoc();
+  $Homepage = $DbRow['Homepage'];
   $date_arr = explode(' ', $row['createdate']);
   $date = explode('-', $date_arr[0]);
@@ -62 +65 @@
     <td align="center">'.$row['member_count'].'</td>
     <td align="center">'.$online_mem['online_mem'].'</td>
-    <td align="center">'.$server->GuidToCharName($row['leader']).'</td>
-    <td align="center">'.GuildPages($row['homepage'],$row['name']).'</td>
+    <td align="center">'.$Realm->GuidToCharName($row['leader']).'</td>
+    <td align="center">'.GuildPages($Homepage, $row['name']).'</td>
     <td align="center">'.$human_date.'</td>
   </tr>');

trunk/pages/online.php

@@ -29 +29 @@
   <tr>
     <th align="center">Frakce</th>
-    <th align="center">'.MakeLink('Nick', 'name').'</th>
+    <th align="center">'.MakeLink('Jméno', 'name').'</th>
     <th align="center">'.MakeLink('Rasa', 'race').'</th>
-    <th align="center">'.MakeLink('Class', 'class').'</th>
-    <th align="center">'.MakeLink('Lvl', 'level').'</th>
+    <th align="center">'.MakeLink('Třída', 'class').'</th>
+    <th align="center">'.MakeLink('Úroveň', 'level').'</th>
     <th align="center">'.MakeLink('Mapa', 'map').'</th>
-    <th align="center">'.MakeLink('Honory', 'highest_rank').'<br />'.
-    MakeLink('Aréna body', 'arena_points').'</th></tr>');
+    <th align="center">'.MakeLink('Body cti', 'highest_rank').'<br />'.
+    MakeLink('Body arén', 'arena_points').'</th></tr>');
 
 $Realm->Database->select_db($Config['Mangos']['RealmList'][$_COOKIE['RealmIndex']]['DatabaseCharacters']);