Changeset 24 for trunk

Timestamp:

Jun 12, 2009, 11:40:00 PM (15 years ago)

Author:

george

Message:

• Upraveno: Zobrazení ladících záznamů restartů přepracováno na formulářový a tabulkový systém.
• Přidáno: Doplněny pokyny k instalaci požadovaných systémových RPM balíků.
• Upraveno: Tabulka ClientVersion přejmenována na Client.
• Přidáno: Zobrazaní tabulky existujících verzí herního klienta.
• Přidáno: Tabulka zobrazení dostupných záloh.

Location:

trunk

Files:

• Readme.txt (modified) (2 diffs)
• www/emulator.php (modified) (3 diffs)
• www/form.php (modified) (1 diff)
• www/form_classes.php (modified) (3 diffs)
• www/global.php (modified) (1 diff)
• www/index.php (modified) (3 diffs)
• www/mangos_debug.php (modified) (3 diffs)
• www/page.php (modified) (1 diff)
• www/server.php (modified) (2 diffs)
• www/sql/updates/24.sql (added)
• www/style.css (modified) (2 diffs)
• www/table.php (modified) (1 diff)
• www/types/DateTime.php (modified) (1 diff)

trunk/Readme.txt

@@ -18 +18 @@
 3) Práva pro zápis
 
-  Nastavit práva pro zápis pro web server pro složky server, emulator, database a backup.
+  Nastavit práva pro zápis pro web server pro složky server, emulator, database, client a backup.
 
 
@@ -24 +24 @@
 
   Z důvodu ochrany bezpečí vytvořte v systému uživatele mangos.
+
+
+5) Požadované systémové balíky
+
+  Instalace pro distribuci fedora:
+    yum install wine gdb openssl cpp gcc gcc-c++ openssl-devel libgcrypt-devel zlib-devel make libtool subversion automake autoconf git mysql-devel mysql-server mysql mysql-libs screen

trunk/www/emulator.php

@@ -14 +14 @@
     $DbResult = $this->Database->query('SELECT * FROM `Emulator` WHERE `Id`='.$Id);
     $this->Emulator = $DbResult->fetch_assoc();
-    $DbResult = $this->Database->query('SELECT * FROM `ClientVersion` WHERE `Id`='.$this->Emulator['ClientVersion']);
-    $this->Emulator['ClientVersion'] = $DbResult->fetch_assoc();
+    $DbResult = $this->Database->query('SELECT * FROM `Client` WHERE `Id`='.$this->Emulator['Client']);
+    $this->Emulator['Client'] = $DbResult->fetch_assoc();
   }
   
@@ -24 +24 @@
     
     //$this->AddTask('Vytvoření nového emulátoru', array(
-    //  'ln -s wowclient/'.$this->Emulator['ClientVersion']['Version'].'/maps emulator/'.$this->Emulator['Id'].'/mangos/maps',
-    //  'ln -s wowclient/'.$this->Emulator['ClientVersion']['Version'].'/dbc emulator/'.$this->Emulator['Id'].'/mangos/dbc',
+    //  'ln -s wowclient/'.$this->Emulator['Client']['Version'].'/maps emulator/'.$this->Emulator['Id'].'/mangos/maps',
+    //  'ln -s wowclient/'.$this->Emulator['Client']['Version'].'/dbc emulator/'.$this->Emulator['Id'].'/mangos/dbc',
     //));
     $this->Download();
@@ -66 +66 @@
   {
     $this->Task->Add('Vygenerování souborů map', array(
-      'cd wowclient/'.$this->Emulator['ClientVersion']['Version'].'/client',
+      'cd wowclient/'.$this->Emulator['Client']['Version'].'/client',
       'wine emulator/'.$this->Id.'/source/contrib/extractor/ad.exe',
-      'mv wowclient/'.$this->Emulator['ClientVersion']['Version'].'/client/dbc wowclient/'.$this->Emulator['ClientVersion']['Version'].'/',
-      'mv wowclient/'.$this->Emulator['ClientVersion']['Version'].'/client/maps wowclient/'.$this->Emulator['ClientVersion']['Version'].'/',
+      'mv wowclient/'.$this->Emulator['Client']['Version'].'/client/dbc wowclient/'.$this->Emulator['Client']['Version'].'/',
+      'mv wowclient/'.$this->Emulator['Client']['Version'].'/client/maps wowclient/'.$this->Emulator['Client']['Version'].'/',
     ));
     return('Požadavek na vygenerování map zařazen.');

trunk/www/form.php

@@ -82 +82 @@
 
     $DbResult = $Database->query('SELECT T.* FROM '.$this->Definition['Table'].' AS T WHERE T.Id='.$Id);
-    $DbRow = $DbResult->fetch_assoc();
+    if($DbResult->num_rows > 0) $DbRow = $DbResult->fetch_assoc();
     foreach($this->Definition['Items'] as $Index => $Item)
     {
       if($Item['Type'] != 'Hidden')
-        $this->Values[$Index] = $DbRow[$Index];
+        if($DbResult->num_rows > 0) $this->Values[$Index] = $DbRow[$Index];
+          else $this->Values[$Index] = '';
     }
+    return($DbResult->num_rows > 0);
   }
 

trunk/www/form_classes.php

@@ -77 +77 @@
   'ServerList' => array(
     'Title' => 'Server',
-    'Table' => '(SELECT `ClientVersion`.`Version`, `Server`.`Name`, `Server`.`Id`, `Server`.`NetworkPortRealmd`, `User`.`Name` AS `UserName`, Server.Online, Server.CharacterOnlineCount, Server.CharacterCount, Server.AccountCount FROM `Server` JOIN `User` ON `User`.`Id` = `Server`.`User` JOIN `Database` ON `Database`.`Id` = `Server`.`Database` JOIN `Emulator` ON `Emulator`.`Id` = `Database`.`Emulator` JOIN `ClientVersion` ON `ClientVersion`.`Id` = `Emulator`.`ClientVersion`) AS T',
+    'Table' => '(SELECT `Client`.`Version`, `Server`.`Name`, `Server`.`Id`, `Server`.`NetworkPortRealmd`, `User`.`Name` AS `UserName`, Server.Online, Server.CharacterOnlineCount, Server.CharacterCount, Server.AccountCount FROM `Server` JOIN `User` ON `User`.`Id` = `Server`.`User` JOIN `Database` ON `Database`.`Id` = `Server`.`Database` JOIN `Emulator` ON `Emulator`.`Id` = `Database`.`Emulator` JOIN `Client` ON `Client`.`Id` = `Emulator`.`Client`)',
     'Items' => array(
       'Name' => array('Type' => 'String', 'Caption' => 'Název', 'Default' => ''),
@@ -90 +90 @@
   ),
   'EmulatorList' => array(
-    'Title' => 'Emulátor',
-    'Table' => '(SELECT `Emulator`.`Name`, `Emulator`.`Id`, `ClientVersion`.`Version` AS `ClientVersion`, `Emulator`.`Revision`, `Emulator`.`ScriptDev2Revision`, `Emulator`.`ScriptDev2PatchFileName`, `Emulator`.`CommitHash` FROM `Emulator` JOIN `ClientVersion` ON `ClientVersion`.`Id` = `Emulator`.`ClientVersion`) AS T',
+    'Title' => 'Emulátory',
+    'Table' => '(SELECT `Emulator`.`Name`, `Emulator`.`Id`, `Client`.`Version` AS `ClientVersion`, `Emulator`.`Revision`, `Emulator`.`ScriptDev2Revision`, `Emulator`.`ScriptDev2PatchFileName`, `Emulator`.`CommitHash` FROM `Emulator` JOIN `Client` ON `Client`.`Id` = `Emulator`.`Client`)',
     'Items' => array(
       'Name' => array('Type' => 'String', 'Caption' => 'Název', 'Default' => ''),
@@ -107 +107 @@
       'Name' => array('Type' => 'String', 'Caption' => 'Název', 'Default' => ''),
       'Revision' => array('Type' => 'Integer', 'Caption' => 'Revize', 'Default' => 0),
-      //'ClientVersion' => array('Type' => 'PointerOneToOne', 'Caption' => 'Verze klienta', 'Default' => 0),
+      //'Client' => array('Type' => 'PointerOneToOne', 'Caption' => 'Verze klienta', 'Default' => 0),
       'ScriptDev2Revision' => array('Type' => 'Integer', 'Caption' => 'Verze SD2', 'Default' => 0),
       'ScriptDev2PatchFileName' => array('Type' => 'String', 'Caption' => 'SD2 záplata', 'Default' => ''),
       'CommitHash' => array('Type' => 'String', 'Caption' => 'Commit HASH', 'Default' => ''),
+    ),
+  ),
+  'BackupList' => array(
+    'Title' => 'Zálohy',
+    'Table' => '(SELECT * FROM `Backup`)',
+    'Items' => array(
+      'Time' => array('Type' => 'DateTime', 'Caption' => 'Čas', 'Default' => ''),
+      'Description' => array('Type' => 'String', 'Caption' => 'Popis', 'Default' => ''),
+    ),
+  ),
+  'ClientList' => array(
+    'Title' => 'Verze klienta',
+    'Table' => 'Client',
+    'Items' => array(
+      'Version' => array('Type' => 'String', 'Caption' => 'Verze', 'Default' => ''),
+      'BuildNumber' => array('Type' => 'Integer', 'Caption' => 'Čislo sestavení', 'Default' => ''),
+      'ReleaseDate' => array('Type' => 'Date', 'Caption' => 'Datum vydání', 'Default' => ''),
+    ),
+  ),
+  'DebugList' => array(
+    'Title' => 'Restarty',
+    'Table' => 'Debug',
+    'Items' => array(
+      'Time' => array('Type' => 'String', 'Caption' => 'Čas', 'Default' => ''),
+      'MangosVersion' => array('Type' => 'String', 'Caption' => 'Verze emulátoru', 'Default' => ''),
+      'DbVersion' => array('Type' => 'String', 'Caption' => 'Verze databáze', 'Default' => ''),
+      'MaxPlayerCount' => array('Type' => 'Integer', 'Caption' => 'Max. online hráčů', 'Default' => ''),
+      'Uptime' => array('Type' => 'String', 'Caption' => 'Doba běhu', 'Default' => ''),
+    ),
+  ),
+  'DebugItem' => array(
+    'Title' => 'Záznam restartu',
+    'Table' => 'Debug',
+    'Items' => array(
+      'Time' => array('Type' => 'DateTime', 'Caption' => 'Čas', 'Default' => ''),
+      'MangosVersion' => array('Type' => 'String', 'Caption' => 'Verze emulátoru', 'Default' => ''),
+      'DbVersion' => array('Type' => 'String', 'Caption' => 'Verze databáze', 'Default' => ''),
+      'MaxPlayerCount' => array('Type' => 'Integer', 'Caption' => 'Max. online hráčů', 'Default' => ''),
+      'Uptime' => array('Type' => 'String', 'Caption' => 'Doba běhu', 'Default' => ''),
     ),
   ),

trunk/www/global.php

@@ -260 +260 @@
 function TimeToHumanTime($Value)
 {
-  return(floor($Value / 3600 / 24).' days, '.date('H:i:s', $Value - 3600));
+  return(floor($Value / 3600 / 24).' dnů, '.date('H:i:s', $Value - 3600));
 }
 

trunk/www/index.php

@@ -102 +102 @@
   }
   
+  function ShowBackupListOnRow($Row)
+  {
+    //$Row['Name'] = '<a href="?Action=EmulatorShow&amp;Id='.$Row['Id'].'">'.$Row['Name'].'</a>';
+    return($Row);
+  }
+  
+  function ShowBackupList()
+  {
+    global $Config;
+    
+    $Output = '<h4>Dostupné zálohy</h4>';
+    $Table = new Table('BackupList');
+    $Table->OnRow = array($this, 'ShowBackupListOnRow');
+    $Table->LoadValuesFromDatabase($this->Database);
+    $Output .= $Table->Show();
+    if($this->System->Modules['User']->User['Role'] >= USER_ROLE_ADMINISTRATOR) 
+    {
+      $Output .= '<br /><div style="text-align: center;"><a href="?Action=BackupAdd">Zálohovat</a></dev>';      
+    }
+    return($Output);
+  }
+
+  function ShowClientListOnRow($Row)
+  {
+    //$Row['Name'] = '<a href="?Action=EmulatorShow&amp;Id='.$Row['Id'].'">'.$Row['Name'].'</a>';
+    return($Row);
+  }
+  
+  function ShowClientList()
+  {
+    global $Config;
+    
+    $Output = '<h4>Verze herního klienta</h4>';
+    $Table = new Table('ClientList');
+    $Table->OnRow = array($this, 'ShowClientListOnRow');
+    $Table->LoadValuesFromDatabase($this->Database);
+    $Output .= $Table->Show();
+    if($this->System->Modules['User']->User['Role'] >= USER_ROLE_ADMINISTRATOR) 
+    {
+      //$Output .= '<br /><div style="text-align: center;"><a href="?Action=BackupAdd">Zálohovat</a></dev>';      
+    }
+    return($Output);
+  }
+
+  function ShowDebugListOnRow($Row)
+  {
+    $Row['Time'] = '<a href="?Action=ServerDebug&amp;Id='.$Row['Id'].'&amp;Show=Backtrace">'.str_replace(' ', '&nbsp;', $Row['Time']).'</a>';
+    $Row['Uptime'] = TimeToHumanTime($Row['Uptime']);
+    return($Row);
+  }
+  
+  function ShowDebugList()
+  {
+    global $Config;
+    
+    $Output = '<h4>Záznamy restartů</h4>';
+    $Table = new Table('DebugList');
+    $Table->OnRow = array($this, 'ShowDebugListOnRow');
+    $Table->LoadValuesFromDatabase($this->Database);
+    $Output .= $Table->Show();
+    if($this->System->Modules['User']->User['Role'] >= USER_ROLE_ADMINISTRATOR) 
+    {
+      //$Output .= '<br /><div style="text-align: center;"><a href="?Action=BackupAdd">Zálohovat</a></dev>';      
+    }
+    return($Output);
+  }
+
   function UserMenu()
   {
@@ -114 +181 @@
         $Server = $DbResult->fetch_assoc();
         $Output .= '<div><a href="?Action=ServerShow&amp;Id='.$Server['Id'].'">Můj server</a></div>';
-        $Output .= '<div><a href="?Action=ServerDebug&amp;Id='.$Server['Id'].'">Ladící záznamy</a></div>';
+        $Output .= '<div><a href="?Action=DebugList&amp;Id='.$Server['Id'].'">Ladící záznamy</a></div>';
+        $Output .= '<div><a href="?Action=BackupList&amp;Id='.$Server['Id'].'">Zálohy</a></div>';
       } else $Output .= '<div><a href="?Action=ServerAdd">Vytvořit vlastní server</a></div>';
-      $Output .= '<div><a href="'.$this->System->Config['Web']['RootFolder'].'/?Action=UserOptions">Nastavení účtu</a></div>'; 
       if($this->System->Modules['User']->User['Role'] == USER_ROLE_ADMINISTRATOR) 
       {
-        $Output .= '<div><a href="'.$this->System->Config['Web']['RootFolder'].'/?Action=EmulatorList">Emulátory</a></div>'; 
+        $Output .= '<div><a href="'.$this->System->Config['Web']['RootFolder'].'/?Action=EmulatorList">Emulátory</a></div>';
       }
     }
@@ -373 +440 @@
           $Output .= $MangosDebug->Show($Server['Id']);
         } else $Output .= USER_BAD_ROLE;
-      } else
+      } else      
+      if($_GET['Action'] == 'ClientList')
+      {
+        $Output .= $this->ShowClientList();
+      } else     
+      if($_GET['Action'] == 'BackupList')
+      {
+        $Output .= $this->ShowBackupList($_GET['Id']);
+      } else     
+      if($_GET['Action'] == 'DebugList')
+      {
+        $Output .= $this->ShowDebugList($_GET['Id']);
+      } else     
       if($_GET['Action'] == 'Test')
       {

trunk/www/mangos_debug.php

@@ -13 +13 @@
   function Show($ServerId)
   {
-    $Output = '<table width="100%"><tr><td width="10%" valign="top" style="">'.
-      '<strong>Restart history:</strong><br />';
-
-    if(array_key_exists('Id', $_GET)) $Id = addslashes($_GET['Id']);
-      else $Id = 0;
-    if(array_key_exists('Page', $_GET)) $Page = addslashes($_GET['Page']);
-      else $Page = 0;
-
-    $DbResult = $this->Database->query('SELECT COUNT(*) FROM Debug WHERE Server='.$ServerId);
-    $DbRow = $DbResult->fetch_array();
-    $Total = $DbRow[0];
-
-    $DbResult = $this->Database->query('SELECT Id, Time FROM Debug  WHERE Server='.$ServerId.' ORDER BY Time DESC LIMIT '.($Page * $this->ItemPerPage).','.$this->ItemPerPage);
-    while($DbRow = $DbResult->fetch_array())
+    global $System;
+    
+    $Output = '';
+    $Form = new Form('DebugItem');
+    if($Form->LoadValuesFromDatabase($_GET['Id']))
     {
-      if($DbRow['Id'] == $Id) $Output .= '<strong>';
-      $Output .= '<a href="?Action=ServerDebug&amp;Id='.$DbRow['Id'].'&amp;Page='.$Page.'&amp;Show=Backtrace">'.str_replace(' ', '&nbsp;', $DbRow['Time']).'</a>';
-      if($DbRow['Id'] == $Id) $Output .= '</strong>';
-      $Output .= '<br />';
-    }
-    $Output .= PageList('Page', $Page, $Total, $this->ItemPerPage, 2);
-
-    $Output .= '</td><td valign="top" width="90%">';
-
-    if($Id > 0)
-    {
-      $DbResult = $this->Database->query('SELECT * FROM Debug WHERE Id="'.$Id.'" ORDER BY Time');
-      if($DbResult->num_rows > 0)
-      {
-        $DbRow = $DbResult->fetch_array();
-        $Output .= '<strong>Čas záznamu:</strong> '.$DbRow['Time'].'<br />';
-        $Output .= '<strong>Verze MaNGOSu:</strong> '.$DbRow['MangosVersion'].'<br />'; 
-        $Output .= '<strong>Verze databáze:</strong> '.$DbRow['DbVersion'].'<br />'; 
-        $Output .= '<strong>Doba běhu:</strong> '.TimeToHumanTime($DbRow['Uptime']).'<br />'; 
-        $Output .= '<strong>Maximum hráčů:</strong> '.$DbRow['MaxPlayerCount'].'<br /><br />'; 
-        $Output .= '<a href="?Action=ServerDebug&amp;Id='.$Id.'&amp;Page='.$Page.'&amp;Show=Backtrace">Backtrace</a>'.
-          '  <a href="?Action=ServerDebug&amp;Id='.$Id.'&amp;Page='.$Page.'&amp;Show=Log">Mangos log</a>'.
-          '  <a href="?Action=ServerDebug&amp;Id='.$Id.'&amp;Page='.$Page.'&amp;Show=Error">Console error log</a>'.
-          '  <a href="?Action=ServerDebug&amp;Id='.$Id.'&amp;Page='.$Page.'&amp;Show=DbErrors">Database error log</a>'.
-          '  <a href="?Action=ServerDebug&amp;Id='.$Id.'&amp;Page='.$Page.'&amp;Show=Configuration">Mangos configuration</a>'.
+        $Form->Values['Uptime'] = TimeToHumanTime($Form->Values['Uptime']);
+        $Output .= $Form->ShowTable();
+      
+        $Output .= '<a href="?Action=ServerDebug&amp;Id='.$_GET['Id'].'&amp;Show=Backtrace">Backtrace</a>'.
+          '  <a href="?Action=ServerDebug&amp;Id='.$_GET['Id'].'&amp;Show=Log">Mangos log</a>'.
+          '  <a href="?Action=ServerDebug&amp;Id='.$_GET['Id'].'&amp;Show=Error">Console error log</a>'.
+          '  <a href="?Action=ServerDebug&amp;Id='.$_GET['Id'].'&amp;Show=DbErrors">Database error log</a>'.
+          '  <a href="?Action=ServerDebug&amp;Id='.$_GET['Id'].'&amp;Show=Configuration">Mangos configuration</a>'.
           '<hr>';
         if(array_key_exists('Show', $_GET))
@@ -60 +34 @@
           {
             case 'Backtrace':
+              $DbResult = $this->Database->select('Debug', 'Backtrace', 'Id='.$_GET['Id']);
+              $DbRow = $DbResult->fetch_assoc();
               $Content = htmlspecialchars($DbRow['Backtrace']);
               for($I = 1; $I < $this->MaxMangosThreadCount; $I++)
@@ -69 +45 @@
               break;
             case 'Log': 
+              $DbResult = $this->Database->select('Debug', 'Log', 'Id='.$_GET['Id']);
+              $DbRow = $DbResult->fetch_assoc();
               $Output .= '<strong>Console standard output log:</strong> <br><pre>'.htmlspecialchars($DbRow['Log']).'</pre>';
               break;
             case 'Error': 
+              $DbResult = $this->Database->select('Debug', 'ErrorLog', 'Id='.$_GET['Id']);
+              $DbRow = $DbResult->fetch_assoc();
               $Output .= '<strong>Console error log:</strong> <br><pre>'.htmlspecialchars($DbRow['ErrorLog']).'</pre>';
               break;
             case 'DbErrors': 
+              $DbResult = $this->Database->select('Debug', 'DbErrors', 'Id='.$_GET['Id']);
+              $DbRow = $DbResult->fetch_assoc();
               $Output .= '<strong>Database error log:</strong> <br><pre>'.htmlspecialchars($DbRow['DbErrors']).'</pre>';
               break;
             case 'Configuration': 
+              $DbResult = $this->Database->select('Debug', 'Configuration', 'Id='.$_GET['Id']);
+              $DbRow = $DbResult->fetch_assoc();
               $Output .= '<strong>Mangos configuration:</strong> <br><pre>'.htmlspecialchars($DbRow['Configuration']).'</pre>';
               break;
           }
         }
-      }
-    }
-    $Output .= '</td></tr></table>';
+    } else $Output = 'Položka nenalezena';
     return($Output);
   }

trunk/www/page.php

@@ -31 +31 @@
     if($this->System->Modules['User']->User['Id'] == $this->System->Modules['User']->AnonymousUserId)
       $Output .= '<a href="'.$this->System->Config['Web']['RootFolder'].'/?Action=LoginForm">Přihlášení</a> <a href="'.$this->System->Config['Web']['RootFolder'].'/?Action=UserRegister">Registrace</a>'; 
-      else $Output .= $this->System->Modules['User']->User['Name'].' <a href="'.$this->System->Config['Web']['RootFolder'].'/?Action=Logout">Odhlásit</a>';
+      else $Output .= $this->System->Modules['User']->User['Name'].' <a href="'.$this->System->Config['Web']['RootFolder'].'/?Action=Logout">Odhlásit</a>'.
+       ' <a href="'.$this->System->Config['Web']['RootFolder'].'/?Action=UserOptions">Nastavení</a>';
     $Output .= '</div></div>';
     return($Output);

trunk/www/server.php

@@ -25 +25 @@
       $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();
+        else $this->Server['Database']['Emulator'] = array('Client' => 0);
+      $DbResult = $this->Database->query('SELECT * FROM `Client` WHERE `Id`='.$this->Server['Database']['Emulator']['Client']);
+      if($DbResult->num_rows > 0) $this->Server['Database']['Emulator']['Client'] = $DbResult->fetch_assoc();
+        else $this->Server['Database']['Emulator']['Client'] = array();
     }
   } 
@@ -214 +214 @@
     $Config->ParameterList['WorldServerPort'] = $this->Server['NetworkPortWorldd'];
     $Config->ParameterList['Motd'] = $this->Server['Motd'];
-    $Config->ParameterList['DataDir'] = 'wowclient/'.$this->Server['Database']['Emulator']['ClientVersion']['Version'];
+    $Config->ParameterList['DataDir'] = 'wowclient/'.$this->Server['Database']['Emulator']['ClientV']['Version'];
     $Config->ParameterList['LogsDir'] = 'server/'.$this->Id.'/log';
     $Config->ParameterList['LogLevel'] = 1;

trunk/www/style.css

@@ -345 +345 @@
 .UserMenu
 {
-  width: 20%;
+  width: 15%;
 }
 
@@ -351 +351 @@
 {
 }
+
+h4
+{
+  text-align: center;
+  margin-bottom: 3px;
+}

trunk/www/table.php

@@ -65 +65 @@
     foreach($this->QueryParameters as $Index => $Item)
       $Table = str_replace('%'.$Index, $Item, $Table);
-    $DbResult = $Database->query('SELECT COUNT(*) FROM '.$Table.' ORDER BY T.'.$_GET['Column'].' '.$OrderType[$_GET['Order']]);
+    $DbResult = $Database->query('SELECT COUNT(*) FROM '.$Table.' AS T ORDER BY T.'.$_GET['Column'].' '.$OrderType[$_GET['Order']]);
     $DbRow = $DbResult->fetch_row();
     $this->TotalRowCount = $DbRow[0];
     if(array_key_exists('Page', $_GET)) $this->Page = $_GET['Page']; else $this->Page = 0;
     if($this->Page > ($this->TotalRowCount / $Config['Web']['TableRowPerPage'])) $this->Page = 0;
-    $DbResult = $Database->query('SELECT * FROM '.$Table.' ORDER BY T.'.$_GET['Column'].' '.$OrderType[$_GET['Order']].' LIMIT '.($this->Page * $Config['Web']['TableRowPerPage']).', '.$Config['Web']['TableRowPerPage']);
+    $DbResult = $Database->query('SELECT * FROM '.$Table.' AS T ORDER BY T.'.$_GET['Column'].' '.$OrderType[$_GET['Order']].' LIMIT '.($this->Page * $Config['Web']['TableRowPerPage']).', '.$Config['Web']['TableRowPerPage']);
     while($DbRow = $DbResult->fetch_assoc())
     {

trunk/www/types/DateTime.php

@@ -8 +8 @@
   {
     global $MonthNames;
+    
+    if($Item['Value'] != '')
+    {
+      $ValueParts = explode(' ', $Item['Value']);
+      $DateParts = explode('-', $ValueParts[0]);
+      $TimeParts = explode(':', $ValueParts[1]);
 
-    $ValueParts = explode(' ', $Item['Value']);
-    $DateParts = explode('-', $ValueParts[0]);
-    $TimeParts = explode(':', $ValueParts[1]);
-
-    $Output = $TimeParts[0].':'.$TimeParts[1].':'.$TimeParts[2].' '.($DateParts[2] * 1).'. '.$MonthNames[$DateParts[1] * 1].' '.$DateParts[0];
+      $Output = $TimeParts[0].':'.$TimeParts[1].':'.$TimeParts[2].' '.($DateParts[2] * 1).'. '.$MonthNames[$DateParts[1] * 1].' '.$DateParts[0];
+    } else $Output = '';
     return($Output);
   }