Changeset 625 for trunk

Timestamp:

Aug 18, 2009, 12:25:53 PM (15 years ago)

Author:

george

Message:

• Upraveno: Stránka GM týmu přepracována do přehlednější formy s podporou více světů.

Location:

trunk

Files:

• inc/server.php (modified) (1 diff)
• index.php (modified) (2 diffs)
• pages/dotation.php (modified) (1 diff)
• pages/gmteam.php (modified) (2 diffs)
• pages/teamspeak.php (modified) (3 diffs)
• sql/updates/624.sql (modified) (1 diff)
• sql/updates/625.sql (added)

trunk/inc/server.php

@@ -380 +380 @@
         else $Target = '';
       $Output .= '<div style="text-align: center;"><form name="RealmSelection'.$FormNameSufix.'" action="'.$Target.'" method="post">'.
-      '<div>Svět <select name="RealmIndex" onchange="document.RealmSelection'.$FormNameSufix.'.submit()">';
+      '<div>Výběr světa <select name="RealmIndex" onchange="document.RealmSelection'.$FormNameSufix.'.submit()">';
       foreach($Config['Mangos']['RealmList'] as $Index => $Realm)
       {

trunk/index.php

@@ -51 +51 @@
   array('link' => 'forum/', 'Text' => 'Fórum'),
   array('link' => '?page=server', 'Text' => 'Server'),
+  array('link' => '?page=gmteam', 'Text' => 'GM Tým'),
   //array('link' => 'bug_tracker/', 'Text' => 'Nahlaš chybu'),
   array('link' => 'gallery/', 'Text' => 'Galerie'),
@@ -68 +69 @@
   array('link' => '?page=tophraci', 'Text' => 'Nej hráči'),
   array('link' => '?page=guildy', 'Text' => 'Spolky'),
-  array('link' => '?page=gmteam', 'Text' => 'GM Tým'),
+  array('link' => 'armory/', 'Text' => 'Armory'),
   array('link' => '?page=gh', 'Text' => 'Domky spolků'),
   array('link' => '?page=arena', 'Text' => 'Arény'),

trunk/pages/dotation.php

@@ -10 +10 @@
     <th>Příspěvek(CZK)</th>
   </tr>';
-$load_dotation = $db->query('SELECT * FROM `finance_reward` ORDER BY `Id` DESC');
+$load_dotation = $db->query('SELECT * FROM `finance_reward` ORDER BY `Price` DESC');
 while($row = $load_dotation->fetch_assoc())
 {

trunk/pages/gmteam.php

@@ -1 +1 @@
 <?php
 
-$Role = array('Hráč', 'Moderátor', 'Game Master', 'Kontrolor chyb', 'Vedoucí Tábora', 'Administrátor', 'Správce Systému');
+function ShowGMList($Realm)
+{
+  global $db, $Config;
+  
+  $Result = $db->query('SELECT `gm_tym`.*, `account`.`id`, `account`.`username` FROM `'.$Config['Mangos']['DatabaseRealmd'].'`.`account` LEFT JOIN `'.$Config['Database']['Database'].'`.`gm_tym` ON `gm_tym`.`AccountId` = `account`.`id` WHERE (`account`.`locked` = 0) AND (`account`.`gmlevel` > 0) AND (`gm_tym`.`RealmId` = '.$Realm['Id'].') ORDER BY `gm_tym`.`RealmId`, `account`.`username`');
+  if($Realm['Id'] == 0) $Output = '<h3 class="PageTitle">'.$Realm['Name'].'</h3>';
+    else $Output = '<h3 class="PageTitle">Svět '.$Realm['Name'].'</h3>';
+  $Output .= '<table class="BaseTable">'.
+    '<tr><th>Jméno</th><th>Pověření</th><th>Postavy</th></tr>';
+  if($Result->num_rows == 0) return('');
+  
+  while($Line = $Result->fetch_array())
+  {
+    $Line['username'] = strtoupper($Line['username'][0]).strtolower(substr($Line['username'], 1));
+    if(substr($Line['username'], -2, 2) == 'gm') $Line['username'] = substr($Line['username'], 0, -2);
+  
+    $Output .= '<tr><td>'.$Line['username'].'</td>'.
+      '<td>'.$Line['Delegation'].'</td>';
+    $db->select_db($Config['Mangos']['RealmList'][$_COOKIE['RealmIndex']]['DatabaseCharacters']);
+    $Output .= '<td>';
+    $Characters = array();
+    $ResultMangos = $db->query('SELECT * FROM `characters` WHERE account = "'.$Line['id'].'"');
+    while($LineMangos = $ResultMangos->fetch_array())
+    { 
+      if($LineMangos['online'] == 1) $Characters[] = $LineMangos['name'].'(online)';
+        else $Characters[] = $LineMangos['name'];
+    }
+    $Output .= implode(', ', $Characters);
+    $Output .= '</td>';
 
-echo('<h3 class="PageTitle">GM tým</h3>');
-echo($server->RealmSelection());
-$db->select_db($Config['Mangos']['DatabaseRealmd']);
-$Result = $db->query('SELECT * FROM account WHERE (locked = 0) AND (gmlevel > 0) ORDER BY username');
-echo('<table class="GMTeamTable">');
-while($Line = $Result->fetch_array())
-{
-  $Line['username'] = strtoupper($Line['username'][0]).strtolower(substr($Line['username'], 1));
-  if(substr($Line['username'], -2, 2) == 'gm') $Line['username'] = substr($Line['username'], 0, -2);
-  
-  echo('<tr class="start"><th>Přezdívka:</th>');
-  echo('<td>'.$Line['username'].'</td>');
-  echo('</tr>');
-  echo('<tr><th>Pověření:</th>');
-  echo('<td>'.$Line['Note'].'</td>');
-  echo('</tr>');
 /*
-  if ($Line['Email'] <> '') 
-  {
-    echo '<tr><td><p>Email:</p></td>';
-    echo '<td><p><b>'.$Line['Email'].'</b></p></td>';
-    echo '</tr>';
-  }
-  $Acc = $Line['AccID'];
-*/
-  $db->select_db($Config['Mangos']['RealmList'][$_COOKIE['RealmIndex']]['DatabaseCharacters']);
-  echo('<tr><th>GM Postavy ve hře:</th>');
-  echo('<td>');
-  $Characters = array();
-  $ResultMangos = $db->query('SELECT * FROM `characters` WHERE account = "'.$Line['id'].'"');
-  while($LineMangos = $ResultMangos->fetch_array())
-  {
-    if($LineMangos['online'] == 1) $Characters[] = $LineMangos['name'].'(online)';
-      else $Characters[] = $LineMangos['name'];
-  }
-  echo(implode(', ', $Characters));
-  echo('</td></tr>');
-
-//  $Database->select_db($Config['Mangos']['DatabaseRealmd']);
+ * //  $Database->select_db($Config['Mangos']['DatabaseRealmd']);
   if($Line['ForumId'] != 0)
   {
@@ -49 +40 @@
   }
   //echo('<tr><td colspan="2"><hr></td></tr>');
+  */
+    $Output .= '</tr>';
+  }
+  $Output .= '</table>';
+  return($Output);
 }
-echo('</table>');
+
+//$Role = array('Hráč', 'Moderátor', 'Game Master', 'Kontrolor chyb', 'Vedoucí Tábora', 'Administrátor', 'Správce Systému');
+//$_COOKIE['RealmIndex']
+
+$Output = '<h2 class="PageTitle">GM tým</h3>';
+
+$Output .= ShowGMList(array('Id' => 0, 'Name' => 'Všechny světy'));
+foreach($Config['Mangos']['RealmList'] as $Realm)
+{
+  $Output .= ShowGMList($Realm);
+}
+$Output .= '<br />'.$server->RealmSelection();
+
+echo($Output);
 
 ?>

trunk/pages/teamspeak.php

@@ -3 +3 @@
 echo('<table class="SimpleTable"><tr><td>');
 echo('<h4>TeamSpeak server</h4>');
-echo('Adresa pro připojení: wow.zdechov.net<br /><br />');
+echo('Adresa pro připojení: '.$Config['Web']['WoWServerAddr'].'<br /><br />');
 
   // The code between the 2 lines below turns on PHPs error handlers.
@@ -35 +35 @@
   // Set the teamspeak server IP or Hostname below (DO NOT INCLUDE THE
   // PORT NUMBER):
-  $settings['serveraddress'] = 'wow.zdechov.net';
+  $settings['serveraddress'] = $Config['Web']['WoWServerAddr'];
   
   // If your you use another port than 8767 to connect to your teamspeak
@@ -71 +71 @@
 echo('</td></tr></table>');
 
-
 ?>

trunk/sql/updates/624.sql

@@ -1 @@
-CREATE TABLE `wow`.`finance_reward` (
+CREATE TABLE `finance_reward` (
 `Id` INT NOT NULL AUTO_INCREMENT ,
 `Reward` VARCHAR( 255 ) NOT NULL ,