Changeset 39

Timestamp:

Jun 16, 2009, 6:11:15 PM (15 years ago)

Author:

george

Message:

• Upraveno: Zobrazení více informací o serverech včetně počtu účtů, postav a online hráčů, dále pak zabraná paměť a doba běhu.

Location:

trunk/www

Files:

• form_classes.php (modified) (3 diffs)
• index.php (modified) (6 diffs)
• server.php (modified) (3 diffs)
• sql/updates/39.sql (added)

trunk/www/form_classes.php

@@ -47 +47 @@
     ),
   ),
-  'NewServer' => array(
+  'ServerCreate' => array(
     'Title' => 'Nový server',
     'Table' => 'Server',
@@ -60 +60 @@
     ),
   ),
-  'EditServer' => array(
+  'ServerEdit' => array(
     'Title' => 'Nastavení',
     'Table' => 'Server',
@@ -73 +73 @@
       'ServerId' => array('Type' => 'Hidden', 'Caption' => 'Id', 'Default' => 0),
       //'TimeCreation' => array('Type' => 'DateTime', 'Caption' => 'Datum založení', 'Default' => 'NOW()'),
+    ),
+  ),
+  'ServerView' => array(
+    'Title' => 'Nastavení',
+    'Table' => 'Server',
+    'SubmitText' => 'Uložit',
+    'Items' => array(
+      'Name' => array('Type' => 'String', 'Caption' => 'Název', 'Default' => 'WoW server'),
+      'Description' => array('Type' => 'Text', 'Caption' => 'Popis', 'Default' => ''),
+      'Homepage' => array('Type' => 'Hyperlink', 'Caption' => 'Webové stránky', 'Default' => ''),
+      'Type' => array('Type' => 'ServerType', 'Caption' => 'Typ', 'Default' => 0),
+      'Database' => array('Type' => 'Database', 'Caption' => 'Databáze', 'Default' => 0),
+      'Motd' => array('Type' => 'String', 'Caption' => 'Zpráva dne', 'Default' => 'Vítejte na free WoW serveru'),
+      'ServerId' => array('Type' => 'Hidden', 'Caption' => 'Id', 'Default' => 0),
+      'TimeCreate' => array('Type' => 'DateTime', 'Caption' => 'Datum založení', 'Default' => 'NOW()'),
+      'NetworkPortRealmd' => array('Type' => 'Integer', 'Caption' => 'Port realmd', 'Default' => ''),
     ),
   ),

trunk/www/index.php

@@ -49 +49 @@
   function ShowServer($Id)
   {
+    global $Config;
+    
     $Server = new Server($this->Database, $Id);
     $Output = '<h4>Podrobnosti serveru</h4>';
-    $Form = new Form('EditServer');
+    $Form = new Form('ServerView');
     $Form->LoadValuesFromDatabase($Id);
+    $Form->Definition['Items']['Realmlist'] = array('Type' => 'String', 'Caption' => 'Adresa k připojení', 'Default' => '');    
+    $Form->Definition['Items']['Uptime'] = array('Type' => 'String', 'Caption' => 'Doba běhu', 'Default' => '');
+    $Form->Definition['Items']['UsedMemory'] = array('Type' => 'String', 'Caption' => 'Použitá paměť', 'Default' => '');    
+    $Form->Definition['Items']['AccountCount'] = array('Type' => 'String', 'Caption' => 'Počet účtů', 'Default' => '');    
+    $Form->Definition['Items']['CharacterCount'] = array('Type' => 'String', 'Caption' => 'Počet postav', 'Default' => '');    
+    $Form->Definition['Items']['CharacterOnlineCount'] = array('Type' => 'String', 'Caption' => 'Počet hráčů online', 'Default' => '');    
+    $ServerStatus = $Server->GetState();
+    $Form->Values['Realmlist'] = $Config['Web']['Host'].':'.$Form->Values['NetworkPortRealmd'];
+    unset($Form->Values['NetworkPortRealmd']);
+    $Form->Values['Uptime'] = $this->System->AddPrefixMultipliers($ServerStatus['Uptime'], '', 4, 'Time');
+    $Form->Values['UsedMemory'] = $this->System->AddPrefixMultipliers($ServerStatus['UsedMemory'] * 1024, 'B', 4, 'Binary');
+    $Form->Values['AccountCount'] = $ServerStatus['AccountCount'];
+    $Form->Values['CharacterCount'] = $ServerStatus['CharacterCount'];
+    $Form->Values['CharacterOnlineCount'] = $ServerStatus['CharacterOnlineCount'];
     $Output .= $Form->ShowTable();
     $Output .= '<div style="text-align: center">';
@@ -60 +76 @@
       if(array_key_exists('Id', $Server->Server['Database']) and ($Server->Server['Lock'] == 0))
       {
-        $ServerStatus = $Server->GetState();
         if($ServerStatus['RealmdPortState'] == true) $Output .= ' <a href="?Action=ServerStop&amp;Id='.$Server->Id.'">Zastavit</a>  <a href="?Action=ServerRestart&amp;Id='.$Server->Id.'">Restartovat</a>';
           else $Output .= ' <a href="?Action=ServerStart&amp;Id='.$Server->Id.'">Spustit</a>';
@@ -457 +472 @@
             else 
             {
-              $Form = new Form('NewServer');
+              $Form = new Form('ServerCreate');
               $Form->LoadValuesFromForm();
               $Form->OnSubmit = '?Action=ServerCreate';
@@ -482 +497 @@
             if($NewPortWorldd < $Config['BaseNetworkPortWorldd']) $NewPortWorldd = $Config['BaseNetworkPortWorldd'];
             
-            $Form = new Form('NewServer', array());
+            $Form = new Form('ServerCreate', array());
             $Form->LoadValuesFromForm();
-            $this->Database->insert('Server', array('Name' => $Form->Values['Name'], 'Description' => $Form->Values['Description'], 'User' => $this->System->Modules['User']->User['Id'], 'Motd' => $Form->Values['Motd'], 'Homepage' => $Form->Values['Homepage'], 'Type' => $Form->Values['Type'], 'Database' => 1, 'NetworkPortWorldd' => $NewPortWorldd, 'NetworkPortRealmd' => $NewPortRealmd, 'Lock' => 1));
+            $this->Database->insert('Server', array('Name' => $Form->Values['Name'], 'Description' => $Form->Values['Description'], 'User' => $this->System->Modules['User']->User['Id'], 'Motd' => $Form->Values['Motd'], 'Homepage' => $Form->Values['Homepage'], 'Type' => $Form->Values['Type'], 'Database' => 1, 'NetworkPortWorldd' => $NewPortWorldd, 'NetworkPortRealmd' => $NewPortRealmd, 'Lock' => 1, 'TimeCreate' => 'NOW()'));
             $LastInsertId = $this->Database->insert_id;
             $Server = new Server($this->Database, $LastInsertId);
@@ -506 +521 @@
         if(($this->System->Modules['User']->User['Id'] == $Server->Server['User']) or ($this->System->Modules['User']->User['Role'] >= USER_ROLE_ADMINISTRATOR))
         {
-          $Form = new Form('EditServer');
+          $Form = new Form('ServerEdit');
           $Form->LoadValuesFromDatabase($_GET['Id']);
           $Form->Values['ServerId'] = $_GET['Id'];
@@ -518 +533 @@
         if(($this->System->Modules['User']->User['Id'] == $Server->Server['User']) or ($this->System->Modules['User']->User['Role'] >= USER_ROLE_ADMINISTRATOR))
         {
-          $Form = new Form('EditServer', array());
+          $Form = new Form('ServerEdit', array());
           $Form->LoadValuesFromForm();
           $ServerId = $_POST['ServerId'];

trunk/www/server.php

@@ -137 +137 @@
       $DbRow = $DbResult->fetch_row();
       $State['AccountCount'] = $DbRow[0];
+      $DbResult = $this->Database->query('SELECT uptime FROM server'.$this->Id.'_realmd.uptime AS T ORDER BY T.startstring DESC');
+      $DbRow = $DbResult->fetch_assoc();
+      $State['Uptime'] = $DbRow['uptime'];
     } else
     {
@@ -143 +146 @@
       $State['AccountCount'] = 0;
     }
+    $State['UsedMemory'] = $this->GetUsedMemory();
     return($State);
   }
@@ -345 +349 @@
   {
     $Output = array();
-    exec('ps -aux|grep "emulator/'.$this->Server['Database']['Emulator']['Id'].'/bin/mangos-worldd -c server/'.$this->Id.'/etc/mangosd.conf"| grep -v grep', $Output);
-    print_r($Output);
+    if(isset($this->Server['Database']['Emulator']['Id']))
+      exec('ps -aux|grep "emulator/'.$this->Server['Database']['Emulator']['Id'].'/bin/mangos-worldd -c server/'.$this->Id.'/etc/mangosd.conf"| grep -v grep', $Output);
     if(count($Output) > 0)
     {