Changeset 15

Timestamp:

Jun 12, 2009, 8:09:48 AM (15 years ago)

Author:

george

Message:

• Přidáno: Nastavení parametrů gcc překladu emulátoru přes konfigurační soubor.
• Přidáno: Podpora řazení dle sloupců v tabulkách.
• Upraveno: Nezjišťovat informace o stavu serverů z tabulek mangosu, ale ukládat stavové informace serverů přímo do tabulky Server. Nutno provádět aktualizaci tabulky.

Location:

trunk

Files:

• mangos.gdb (deleted)
• www/backup.php (modified) (1 diff)
• www/config.sample.php (modified) (1 diff)
• www/emulator.php (modified) (1 diff)
• www/form.php (modified) (1 diff)
• www/index.php (modified) (3 diffs)
• www/server.php (modified) (3 diffs)
• www/sql/updates/13.sql (added)
• www/table.php (modified) (3 diffs)
• www/types/Password.php (modified) (2 diffs)
• www/user.php (modified) (1 diff)

trunk/www/backup.php

@@ -13 +13 @@
   }
   
-  function Restore()
+  function Restore($Id)
   {
+    
   }
   
-  function Save()
+  function Save($Id)
   {
+    
   }  
 }

trunk/www/config.sample.php

@@ -30 +30 @@
   'BaseDir' => '/opt/wowhosting/',
   'MaxServerCount' => 20,
+  'CompilerParameters' => '',
 );
 

trunk/www/emulator.php

@@ -60 +60 @@
       'mkdir objdir',
       'cd objdir',
-      'export CFLAGS="-march=athlon64 -m64 -O2 -g -ggdb',
-      'export CXXFLAGS="-march=athlon64 -m64 -O2 -g -ggdb',
+      'export CFLAGS="-g -ggdb '.$Config['CompilerParameters'],
+      'export CXXFLAGS="-g -ggdb '.$Config['CompilerParameters'],
       '../configure --prefix='.$Config['BaseDir'].'emulator/'.$this->Id.'/ --enable-cli --enable-ra',
       'make',

trunk/www/form.php

@@ -78 +78 @@
     foreach($this->Definition['Items'] as $Index => $Item)
     {
-      $this->Values[$Index] = $DbRow[$Index];
+      $this->Values[$Item['Name']] = $DbRow[$Item['Name']];
     }
   }

trunk/www/index.php

@@ -10 +10 @@
   function ShowServerListOnRow($Row)
   {
-    $Server = new Server($this->Database, $Row['Id']);
-    $ServerState = $Server->GetState();
-    $Row['Online'] = $ServerState['Online'] * 1;
     $Row['NetworkPortRealmd'] = $this->System->Config['Web']['Host'].':'.$Row['NetworkPortRealmd'];
     $Row['Name'] = '<a href="?Action=ServerShow&amp;Id='.$Row['Id'].'">'.$Row['Name'].'</a>';
-    $Row['AccountCount'] = $ServerState['AccountCount'];
-    $Row['CharacterCount'] = $ServerState['CharacterCount'];
-    $Row['OnlinePlayerCount'] = $ServerState['OnlinePlayerCount'];
     return($Row);
   }
@@ -25 +19 @@
     global $Config;
     
+    $Server = new Server($this->Database, 0);
+    $Server->UpdateServerList();
     $Output = '<h4>Seznam serverů</h4>';
     $Table = new Table('ServerList');
@@ -125 +121 @@
         $Form = new Form('UserLogin');
         $Form->OnSubmit = '?Action=Login';
-        $Result = $this->System->Modules['User']->Login($_POST['Username'], $_POST['Password']);
+        $Form->LoadValuesFromForm();
+        $Result = $this->System->Modules['User']->Login($Form->Values['Username'], $Form->Values['Password']);
         $Output .= $this->SystemMessage('Přihlášení', $Result);
         if($Result <> USER_LOGGED_IN)
         {
-          $Form->LoadValuesFromForm();
           $Form->Values['Password'] = '';
           $Output .= $Form->ShowEditForm();

trunk/www/server.php

@@ -18 +18 @@
     $this->Id = $Id;
     $DbResult = $this->Database->query('SELECT * FROM `Server` WHERE `Id`='.$Id);
-    $this->Server = $DbResult->fetch_assoc();
-    $DbResult = $this->Database->query('SELECT * FROM `Database` WHERE `Id`='.$this->Server['Database']);
-    if($DbResult->num_rows > 0) $this->Server['Database'] = $DbResult->fetch_assoc();
-      else $this->Server['Database'] = array('Emulator' => 0);
-    $DbResult = $this->Database->query('SELECT * FROM `Emulator` WHERE `Id`='.$this->Server['Database']['Emulator']);
-    if($DbResult->num_rows > 0) $this->Server['Database']['Emulator'] = $DbResult->fetch_assoc();
-      else $this->Server['Database']['Emulator'] = array('ClientVersion' => 0);
-    $DbResult = $this->Database->query('SELECT * FROM `ClientVersion` WHERE `Id`='.$this->Server['Database']['Emulator']['ClientVersion']);
-    if($DbResult->num_rows > 0) $this->Server['Database']['Emulator']['ClientVersion'] = $DbResult->fetch_assoc();
-      else $this->Server['Database']['Emulator']['ClientVersion'] = array();
+    if($DbResult->num_rows > 0)
+    {
+      $this->Server = $DbResult->fetch_assoc();
+      $DbResult = $this->Database->query('SELECT * FROM `Database` WHERE `Id`='.$this->Server['Database']);
+      if($DbResult->num_rows > 0) $this->Server['Database'] = $DbResult->fetch_assoc();
+        else $this->Server['Database'] = array('Emulator' => 0);
+      $DbResult = $this->Database->query('SELECT * FROM `Emulator` WHERE `Id`='.$this->Server['Database']['Emulator']);
+      if($DbResult->num_rows > 0) $this->Server['Database']['Emulator'] = $DbResult->fetch_assoc();
+        else $this->Server['Database']['Emulator'] = array('ClientVersion' => 0);
+      $DbResult = $this->Database->query('SELECT * FROM `ClientVersion` WHERE `Id`='.$this->Server['Database']['Emulator']['ClientVersion']);
+      if($DbResult->num_rows > 0) $this->Server['Database']['Emulator']['ClientVersion'] = $DbResult->fetch_assoc();
+        else $this->Server['Database']['Emulator']['ClientVersion'] = array();
+    }
   }
   
@@ -125 +128 @@
       $DbResult = $this->Database->query('SELECT COUNT(*) FROM server'.$this->Id.'_characters.characters AS T WHERE T.online = 1');
       $DbRow = $DbResult->fetch_row();
-      $State['OnlinePlayerCount'] = $DbRow[0];
+      $State['CharacterOnlineCount'] = $DbRow[0];
       $DbResult = $this->Database->query('SELECT COUNT(*) FROM server'.$this->Id.'_characters.characters AS T');
       $DbRow = $DbResult->fetch_row();
@@ -237 +240 @@
     $Config->Save($ServerEtcDir.'scriptdev2.conf');  
   }
+  
+  function UpdateServerList()
+  {
+    $DbResult = $this->Database->select('Server', 'Id');
+    while($DbRow = $DbResult->fetch_assoc())
+    {
+      $Server = new Server($this->Database, $DbRow['Id']);
+      $ServerState = $Server->GetState();
+      $this->Database->update('Server', 'Id='.$DbRow['Id'], array(
+        'Online' => $ServerState['Online'], 
+        'CharacterOnlineCount' => $ServerState['CharacterOnlineCount'],
+        'CharacterCount' => $ServerState['CharacterCount'],
+        'AccountCount' => $ServerState['AccountCount'],
+      ));
+    }    
+  }
 }
 

trunk/www/table.php

@@ -8 +8 @@
   var $Header;
   var $OnRow;
+  var $QueryParameters;
   
   function __construct($ClassName)
@@ -14 +15 @@
 
     $this->Definition = &$FormClasses[$ClassName];    
+    $this->QueryParameters = array();
   }
   
   function Show()
   {
+    $Header = array();
+    if(!array_key_exists('Order', $_GET)) $_GET['Order'] = 0;
+    if(!array_key_exists('Column', $_GET)) $_GET['Column'] = 0;
+    $QueryParts = explode('&', $_SERVER['QUERY_STRING']);
+    foreach($QueryParts as $Part)
+    {
+      $Part2 = explode('=', $Part);
+      $QueryItems[$Part2[0]] = $Part2[1];
+    }
+    $QueryItems['Order'] = $_GET['Order'];
+    foreach($this->Definition['Items'] as $Index => $Item)
+    {
+      $QueryItems['Column'] = $Index;
+      if($_GET['Column'] == $Index) $QueryItems['Order'] = 1 - $_GET['Order'];
+        else $QueryItems['Order'] = $_GET['Order'];
+      $QueryParts = array();
+      foreach($QueryItems as $Index2 => $Item2)
+      {
+        $QueryParts[] = $Index2.'='.$Item2;
+      }
+      $Header[] = '<a href="?'.implode('&amp;', $QueryParts).'">'.$Item['Caption'].'</a>';
+    }
     $Table = array(
-      'Header' => $this->Header,
+      'Header' => $Header,
       'Rows' => $this->Values,
     );
@@ -28 +52 @@
   function LoadValuesFromDatabase($Database)
   {   
+    $OrderType = array('ASC', 'DESC');
+    if(!array_key_exists('Order', $_GET)) $_GET['Order'] = 0;
+    else if($_GET['Order'] == 'Asc') $_GET['Order'] = 1;
+    if(!array_key_exists('Column', $_GET))
+    {
+      $Keys = array_keys($this->Definition['Items']);
+      $_GET['Column'] = $Keys[0];
+    }
     $this->Header = array();
     foreach($this->Definition['Items'] as $Index => $Item)
     {
       $this->Header[] = $Item['Caption'];
-
     }
     $this->Values = array();
-    $DbResult = $Database->query('SELECT * FROM '.$this->Definition['Table']);
+    $Table = $this->Definition['Table'];
+    foreach($this->QueryParameters as $Index => $Item)
+      $Table = str_replace('%'.$Index, $Item, $Table);
+    $DbResult = $Database->query('SELECT * FROM '.$Table.' ORDER BY T.'.$_GET['Column'].' '.$OrderType[$_GET['Order']]);
     while($DbRow = $DbResult->fetch_assoc())
     {

trunk/www/types/Password.php

@@ -23 +23 @@
     global $Database;
 
-    if(!array_key_exists('SourceItemId', $Item)) $Result = sha1($_POST[$Item['Name']]);
+    $Result = sha1($_POST[$Item['Name']]);
+    /*
+    if(!array_key_exists('SourceItemId', $Item)) $Result = sha1($_POST[$Item['Name']]);    
     else
     {
@@ -34 +36 @@
       } else $Result = sha1($_POST[$Item['Name']]);
     }
+    */
     return($Result);
   }

trunk/www/user.php

@@ -141 +141 @@
     {
       $Row = $Query->fetch_assoc();
-      if($Row['Password'] != sha1($Password)) $Result = BAD_PASSWORD;
+      if($Row['Password'] != $Password) $Result = BAD_PASSWORD;
       else if($Row['Locked'] == 1) $Result = ACCOUNT_LOCKED;
       else