Changeset 24 for trunk/www


Ignore:
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/www
Files:
1 added
11 edited

Legend:

Unmodified
Added
Removed

  • trunk/www/emulator.php

    r23 r24  
    1414    $DbResult = $this->Database->query('SELECT * FROM `Emulator` WHERE `Id`='.$Id);
    1515    $this->Emulator = $DbResult->fetch_assoc();
    16     $DbResult = $this->Database->query('SELECT * FROM `ClientVersion` WHERE `Id`='.$this->Emulator['ClientVersion']);
    17     $this->Emulator['ClientVersion'] = $DbResult->fetch_assoc();
     16    $DbResult = $this->Database->query('SELECT * FROM `Client` WHERE `Id`='.$this->Emulator['Client']);
     17    $this->Emulator['Client'] = $DbResult->fetch_assoc();
    1818  }
    1919 
    … …  
    2424   
    2525    //$this->AddTask('Vytvoření nového emulátoru', array(
    26     //  'ln -s wowclient/'.$this->Emulator['ClientVersion']['Version'].'/maps emulator/'.$this->Emulator['Id'].'/mangos/maps',
    27     //  'ln -s wowclient/'.$this->Emulator['ClientVersion']['Version'].'/dbc emulator/'.$this->Emulator['Id'].'/mangos/dbc',
     26    //  'ln -s wowclient/'.$this->Emulator['Client']['Version'].'/maps emulator/'.$this->Emulator['Id'].'/mangos/maps',
     27    //  'ln -s wowclient/'.$this->Emulator['Client']['Version'].'/dbc emulator/'.$this->Emulator['Id'].'/mangos/dbc',
    2828    //));
    2929    $this->Download();
    … …  
    6666  {
    6767    $this->Task->Add('Vygenerování souborů map', array(
    68       'cd wowclient/'.$this->Emulator['ClientVersion']['Version'].'/client',
     68      'cd wowclient/'.$this->Emulator['Client']['Version'].'/client',
    6969      'wine emulator/'.$this->Id.'/source/contrib/extractor/ad.exe',
    70       'mv wowclient/'.$this->Emulator['ClientVersion']['Version'].'/client/dbc wowclient/'.$this->Emulator['ClientVersion']['Version'].'/',
    71       'mv wowclient/'.$this->Emulator['ClientVersion']['Version'].'/client/maps wowclient/'.$this->Emulator['ClientVersion']['Version'].'/',
     70      'mv wowclient/'.$this->Emulator['Client']['Version'].'/client/dbc wowclient/'.$this->Emulator['Client']['Version'].'/',
     71      'mv wowclient/'.$this->Emulator['Client']['Version'].'/client/maps wowclient/'.$this->Emulator['Client']['Version'].'/',
    7272    ));
    7373    return('Požadavek na vygenerování map zařazen.');

  • trunk/www/form.php

    r21 r24  
    8282
    8383    $DbResult = $Database->query('SELECT T.* FROM '.$this->Definition['Table'].' AS T WHERE T.Id='.$Id);
    84     $DbRow = $DbResult->fetch_assoc();
     84    if($DbResult->num_rows > 0) $DbRow = $DbResult->fetch_assoc();
    8585    foreach($this->Definition['Items'] as $Index => $Item)
    8686    {
    8787      if($Item['Type'] != 'Hidden')
    88         $this->Values[$Index] = $DbRow[$Index];
     88        if($DbResult->num_rows > 0) $this->Values[$Index] = $DbRow[$Index];
     89          else $this->Values[$Index] = '';
    8990    }
     91    return($DbResult->num_rows > 0);
    9092  }
    9193

  • trunk/www/form_classes.php

    r22 r24  
    7777  'ServerList' => array(
    7878    'Title' => 'Server',
    79     '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',
     79    '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`)',
    8080    'Items' => array(
    8181      'Name' => array('Type' => 'String', 'Caption' => 'Název', 'Default' => ''),
    … …  
    9090  ),
    9191  'EmulatorList' => array(
    92     'Title' => 'Emulátor',
    93     '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',
     92    'Title' => 'Emulátory',
     93    '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`)',
    9494    'Items' => array(
    9595      'Name' => array('Type' => 'String', 'Caption' => 'Název', 'Default' => ''),
    … …  
    107107      'Name' => array('Type' => 'String', 'Caption' => 'Název', 'Default' => ''),
    108108      'Revision' => array('Type' => 'Integer', 'Caption' => 'Revize', 'Default' => 0),
    109       //'ClientVersion' => array('Type' => 'PointerOneToOne', 'Caption' => 'Verze klienta', 'Default' => 0),
     109      //'Client' => array('Type' => 'PointerOneToOne', 'Caption' => 'Verze klienta', 'Default' => 0),
    110110      'ScriptDev2Revision' => array('Type' => 'Integer', 'Caption' => 'Verze SD2', 'Default' => 0),
    111111      'ScriptDev2PatchFileName' => array('Type' => 'String', 'Caption' => 'SD2 záplata', 'Default' => ''),
    112112      'CommitHash' => array('Type' => 'String', 'Caption' => 'Commit HASH', 'Default' => ''),
     113    ),
     114  ),
     115  'BackupList' => array(
     116    'Title' => 'Zálohy',
     117    'Table' => '(SELECT * FROM `Backup`)',
     118    'Items' => array(
     119      'Time' => array('Type' => 'DateTime', 'Caption' => 'Čas', 'Default' => ''),
     120      'Description' => array('Type' => 'String', 'Caption' => 'Popis', 'Default' => ''),
     121    ),
     122  ),
     123  'ClientList' => array(
     124    'Title' => 'Verze klienta',
     125    'Table' => 'Client',
     126    'Items' => array(
     127      'Version' => array('Type' => 'String', 'Caption' => 'Verze', 'Default' => ''),
     128      'BuildNumber' => array('Type' => 'Integer', 'Caption' => 'Čislo sestavení', 'Default' => ''),
     129      'ReleaseDate' => array('Type' => 'Date', 'Caption' => 'Datum vydání', 'Default' => ''),
     130    ),
     131  ),
     132  'DebugList' => array(
     133    'Title' => 'Restarty',
     134    'Table' => 'Debug',
     135    'Items' => array(
     136      'Time' => array('Type' => 'String', 'Caption' => 'Čas', 'Default' => ''),
     137      'MangosVersion' => array('Type' => 'String', 'Caption' => 'Verze emulátoru', 'Default' => ''),
     138      'DbVersion' => array('Type' => 'String', 'Caption' => 'Verze databáze', 'Default' => ''),
     139      'MaxPlayerCount' => array('Type' => 'Integer', 'Caption' => 'Max. online hráčů', 'Default' => ''),
     140      'Uptime' => array('Type' => 'String', 'Caption' => 'Doba běhu', 'Default' => ''),
     141    ),
     142  ),
     143  'DebugItem' => array(
     144    'Title' => 'Záznam restartu',
     145    'Table' => 'Debug',
     146    'Items' => array(
     147      'Time' => array('Type' => 'DateTime', 'Caption' => 'Čas', 'Default' => ''),
     148      'MangosVersion' => array('Type' => 'String', 'Caption' => 'Verze emulátoru', 'Default' => ''),
     149      'DbVersion' => array('Type' => 'String', 'Caption' => 'Verze databáze', 'Default' => ''),
     150      'MaxPlayerCount' => array('Type' => 'Integer', 'Caption' => 'Max. online hráčů', 'Default' => ''),
     151      'Uptime' => array('Type' => 'String', 'Caption' => 'Doba běhu', 'Default' => ''),
    113152    ),
    114153  ),

  • trunk/www/global.php

    r21 r24  
    260260function TimeToHumanTime($Value)
    261261{
    262   return(floor($Value / 3600 / 24).' days, '.date('H:i:s', $Value - 3600));
     262  return(floor($Value / 3600 / 24).' dnů, '.date('H:i:s', $Value - 3600));
    263263}
    264264

  • trunk/www/index.php

    r23 r24  
    102102  }
    103103 
     104  function ShowBackupListOnRow($Row)
     105  {
     106    //$Row['Name'] = '<a href="?Action=EmulatorShow&amp;Id='.$Row['Id'].'">'.$Row['Name'].'</a>';
     107    return($Row);
     108  }
     109 
     110  function ShowBackupList()
     111  {
     112    global $Config;
     113   
     114    $Output = '<h4>Dostupné zálohy</h4>';
     115    $Table = new Table('BackupList');
     116    $Table->OnRow = array($this, 'ShowBackupListOnRow');
     117    $Table->LoadValuesFromDatabase($this->Database);
     118    $Output .= $Table->Show();
     119    if($this->System->Modules['User']->User['Role'] >= USER_ROLE_ADMINISTRATOR)
     120    {
     121      $Output .= '<br /><div style="text-align: center;"><a href="?Action=BackupAdd">Zálohovat</a></dev>';     
     122    }
     123    return($Output);
     124  }
     125
     126  function ShowClientListOnRow($Row)
     127  {
     128    //$Row['Name'] = '<a href="?Action=EmulatorShow&amp;Id='.$Row['Id'].'">'.$Row['Name'].'</a>';
     129    return($Row);
     130  }
     131 
     132  function ShowClientList()
     133  {
     134    global $Config;
     135   
     136    $Output = '<h4>Verze herního klienta</h4>';
     137    $Table = new Table('ClientList');
     138    $Table->OnRow = array($this, 'ShowClientListOnRow');
     139    $Table->LoadValuesFromDatabase($this->Database);
     140    $Output .= $Table->Show();
     141    if($this->System->Modules['User']->User['Role'] >= USER_ROLE_ADMINISTRATOR)
     142    {
     143      //$Output .= '<br /><div style="text-align: center;"><a href="?Action=BackupAdd">Zálohovat</a></dev>';     
     144    }
     145    return($Output);
     146  }
     147
     148  function ShowDebugListOnRow($Row)
     149  {
     150    $Row['Time'] = '<a href="?Action=ServerDebug&amp;Id='.$Row['Id'].'&amp;Show=Backtrace">'.str_replace(' ', '&nbsp;', $Row['Time']).'</a>';
     151    $Row['Uptime'] = TimeToHumanTime($Row['Uptime']);
     152    return($Row);
     153  }
     154 
     155  function ShowDebugList()
     156  {
     157    global $Config;
     158   
     159    $Output = '<h4>Záznamy restartů</h4>';
     160    $Table = new Table('DebugList');
     161    $Table->OnRow = array($this, 'ShowDebugListOnRow');
     162    $Table->LoadValuesFromDatabase($this->Database);
     163    $Output .= $Table->Show();
     164    if($this->System->Modules['User']->User['Role'] >= USER_ROLE_ADMINISTRATOR)
     165    {
     166      //$Output .= '<br /><div style="text-align: center;"><a href="?Action=BackupAdd">Zálohovat</a></dev>';     
     167    }
     168    return($Output);
     169  }
     170
    104171  function UserMenu()
    105172  {
    … …  
    114181        $Server = $DbResult->fetch_assoc();
    115182        $Output .= '<div><a href="?Action=ServerShow&amp;Id='.$Server['Id'].'">Můj server</a></div>';
    116         $Output .= '<div><a href="?Action=ServerDebug&amp;Id='.$Server['Id'].'">Ladící záznamy</a></div>';
     183        $Output .= '<div><a href="?Action=DebugList&amp;Id='.$Server['Id'].'">Ladící záznamy</a></div>';
     184        $Output .= '<div><a href="?Action=BackupList&amp;Id='.$Server['Id'].'">Zálohy</a></div>';
    117185      } else $Output .= '<div><a href="?Action=ServerAdd">Vytvořit vlastní server</a></div>';
    118       $Output .= '<div><a href="'.$this->System->Config['Web']['RootFolder'].'/?Action=UserOptions">Nastavení účtu</a></div>';
    119186      if($this->System->Modules['User']->User['Role'] == USER_ROLE_ADMINISTRATOR)
    120187      {
    121         $Output .= '<div><a href="'.$this->System->Config['Web']['RootFolder'].'/?Action=EmulatorList">Emulátory</a></div>'; 
     188        $Output .= '<div><a href="'.$this->System->Config['Web']['RootFolder'].'/?Action=EmulatorList">Emulátory</a></div>';
    122189      }
    123190    }
    … …  
    373440          $Output .= $MangosDebug->Show($Server['Id']);
    374441        } else $Output .= USER_BAD_ROLE;
    375       } else
     442      } else     
     443      if($_GET['Action'] == 'ClientList')
     444      {
     445        $Output .= $this->ShowClientList();
     446      } else     
     447      if($_GET['Action'] == 'BackupList')
     448      {
     449        $Output .= $this->ShowBackupList($_GET['Id']);
     450      } else     
     451      if($_GET['Action'] == 'DebugList')
     452      {
     453        $Output .= $this->ShowDebugList($_GET['Id']);
     454      } else     
    376455      if($_GET['Action'] == 'Test')
    377456      {

  • trunk/www/mangos_debug.php

    r21 r24  
    1313  function Show($ServerId)
    1414  {
    15     $Output = '<table width="100%"><tr><td width="10%" valign="top" style="">'.
    16       '<strong>Restart history:</strong><br />';
    17 
    18     if(array_key_exists('Id', $_GET)) $Id = addslashes($_GET['Id']);
    19       else $Id = 0;
    20     if(array_key_exists('Page', $_GET)) $Page = addslashes($_GET['Page']);
    21       else $Page = 0;
    22 
    23     $DbResult = $this->Database->query('SELECT COUNT(*) FROM Debug WHERE Server='.$ServerId);
    24     $DbRow = $DbResult->fetch_array();
    25     $Total = $DbRow[0];
    26 
    27     $DbResult = $this->Database->query('SELECT Id, Time FROM Debug  WHERE Server='.$ServerId.' ORDER BY Time DESC LIMIT '.($Page * $this->ItemPerPage).','.$this->ItemPerPage);
    28     while($DbRow = $DbResult->fetch_array())
     15    global $System;
     16   
     17    $Output = '';
     18    $Form = new Form('DebugItem');
     19    if($Form->LoadValuesFromDatabase($_GET['Id']))
    2920    {
    30       if($DbRow['Id'] == $Id) $Output .= '<strong>';
    31       $Output .= '<a href="?Action=ServerDebug&amp;Id='.$DbRow['Id'].'&amp;Page='.$Page.'&amp;Show=Backtrace">'.str_replace(' ', '&nbsp;', $DbRow['Time']).'</a>';
    32       if($DbRow['Id'] == $Id) $Output .= '</strong>';
    33       $Output .= '<br />';
    34     }
    35     $Output .= PageList('Page', $Page, $Total, $this->ItemPerPage, 2);
    36 
    37     $Output .= '</td><td valign="top" width="90%">';
    38 
    39     if($Id > 0)
    40     {
    41       $DbResult = $this->Database->query('SELECT * FROM Debug WHERE Id="'.$Id.'" ORDER BY Time');
    42       if($DbResult->num_rows > 0)
    43       {
    44         $DbRow = $DbResult->fetch_array();
    45         $Output .= '<strong>Čas záznamu:</strong> '.$DbRow['Time'].'<br />';
    46         $Output .= '<strong>Verze MaNGOSu:</strong> '.$DbRow['MangosVersion'].'<br />';
    47         $Output .= '<strong>Verze databáze:</strong> '.$DbRow['DbVersion'].'<br />';
    48         $Output .= '<strong>Doba běhu:</strong> '.TimeToHumanTime($DbRow['Uptime']).'<br />';
    49         $Output .= '<strong>Maximum hráčů:</strong> '.$DbRow['MaxPlayerCount'].'<br /><br />';
    50         $Output .= '<a href="?Action=ServerDebug&amp;Id='.$Id.'&amp;Page='.$Page.'&amp;Show=Backtrace">Backtrace</a>'.
    51           '  <a href="?Action=ServerDebug&amp;Id='.$Id.'&amp;Page='.$Page.'&amp;Show=Log">Mangos log</a>'.
    52           '  <a href="?Action=ServerDebug&amp;Id='.$Id.'&amp;Page='.$Page.'&amp;Show=Error">Console error log</a>'.
    53           '  <a href="?Action=ServerDebug&amp;Id='.$Id.'&amp;Page='.$Page.'&amp;Show=DbErrors">Database error log</a>'.
    54           '  <a href="?Action=ServerDebug&amp;Id='.$Id.'&amp;Page='.$Page.'&amp;Show=Configuration">Mangos configuration</a>'.
     21        $Form->Values['Uptime'] = TimeToHumanTime($Form->Values['Uptime']);
     22        $Output .= $Form->ShowTable();
     23     
     24        $Output .= '<a href="?Action=ServerDebug&amp;Id='.$_GET['Id'].'&amp;Show=Backtrace">Backtrace</a>'.
     25          '  <a href="?Action=ServerDebug&amp;Id='.$_GET['Id'].'&amp;Show=Log">Mangos log</a>'.
     26          '  <a href="?Action=ServerDebug&amp;Id='.$_GET['Id'].'&amp;Show=Error">Console error log</a>'.
     27          '  <a href="?Action=ServerDebug&amp;Id='.$_GET['Id'].'&amp;Show=DbErrors">Database error log</a>'.
     28          '  <a href="?Action=ServerDebug&amp;Id='.$_GET['Id'].'&amp;Show=Configuration">Mangos configuration</a>'.
    5529          '<hr>';
    5630        if(array_key_exists('Show', $_GET))
    … …  
    6034          {
    6135            case 'Backtrace':
     36              $DbResult = $this->Database->select('Debug', 'Backtrace', 'Id='.$_GET['Id']);
     37              $DbRow = $DbResult->fetch_assoc();
    6238              $Content = htmlspecialchars($DbRow['Backtrace']);
    6339              for($I = 1; $I < $this->MaxMangosThreadCount; $I++)
    … …  
    6945              break;
    7046            case 'Log':
     47              $DbResult = $this->Database->select('Debug', 'Log', 'Id='.$_GET['Id']);
     48              $DbRow = $DbResult->fetch_assoc();
    7149              $Output .= '<strong>Console standard output log:</strong> <br><pre>'.htmlspecialchars($DbRow['Log']).'</pre>';
    7250              break;
    7351            case 'Error':
     52              $DbResult = $this->Database->select('Debug', 'ErrorLog', 'Id='.$_GET['Id']);
     53              $DbRow = $DbResult->fetch_assoc();
    7454              $Output .= '<strong>Console error log:</strong> <br><pre>'.htmlspecialchars($DbRow['ErrorLog']).'</pre>';
    7555              break;
    7656            case 'DbErrors':
     57              $DbResult = $this->Database->select('Debug', 'DbErrors', 'Id='.$_GET['Id']);
     58              $DbRow = $DbResult->fetch_assoc();
    7759              $Output .= '<strong>Database error log:</strong> <br><pre>'.htmlspecialchars($DbRow['DbErrors']).'</pre>';
    7860              break;
    7961            case 'Configuration':
     62              $DbResult = $this->Database->select('Debug', 'Configuration', 'Id='.$_GET['Id']);
     63              $DbRow = $DbResult->fetch_assoc();
    8064              $Output .= '<strong>Mangos configuration:</strong> <br><pre>'.htmlspecialchars($DbRow['Configuration']).'</pre>';
    8165              break;
    8266          }
    8367        }
    84       }
    85     }
    86     $Output .= '</td></tr></table>';
     68    } else $Output = 'Položka nenalezena';
    8769    return($Output);
    8870  }

  • trunk/www/page.php

    r23 r24  
    3131    if($this->System->Modules['User']->User['Id'] == $this->System->Modules['User']->AnonymousUserId)
    3232      $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>';
    33       else $Output .= $this->System->Modules['User']->User['Name'].' <a href="'.$this->System->Config['Web']['RootFolder'].'/?Action=Logout">Odhlásit</a>';
     33      else $Output .= $this->System->Modules['User']->User['Name'].' <a href="'.$this->System->Config['Web']['RootFolder'].'/?Action=Logout">Odhlásit</a>'.
     34       ' <a href="'.$this->System->Config['Web']['RootFolder'].'/?Action=UserOptions">Nastavení</a>';
    3435    $Output .= '</div></div>';
    3536    return($Output);

  • trunk/www/server.php

    r23 r24  
    2525      $DbResult = $this->Database->query('SELECT * FROM `Emulator` WHERE `Id`='.$this->Server['Database']['Emulator']);
    2626      if($DbResult->num_rows > 0) $this->Server['Database']['Emulator'] = $DbResult->fetch_assoc();
    27         else $this->Server['Database']['Emulator'] = array('ClientVersion' => 0);
    28       $DbResult = $this->Database->query('SELECT * FROM `ClientVersion` WHERE `Id`='.$this->Server['Database']['Emulator']['ClientVersion']);
    29       if($DbResult->num_rows > 0) $this->Server['Database']['Emulator']['ClientVersion'] = $DbResult->fetch_assoc();
    30         else $this->Server['Database']['Emulator']['ClientVersion'] = array();
     27        else $this->Server['Database']['Emulator'] = array('Client' => 0);
     28      $DbResult = $this->Database->query('SELECT * FROM `Client` WHERE `Id`='.$this->Server['Database']['Emulator']['Client']);
     29      if($DbResult->num_rows > 0) $this->Server['Database']['Emulator']['Client'] = $DbResult->fetch_assoc();
     30        else $this->Server['Database']['Emulator']['Client'] = array();
    3131    }
    3232  }
    … …  
    214214    $Config->ParameterList['WorldServerPort'] = $this->Server['NetworkPortWorldd'];
    215215    $Config->ParameterList['Motd'] = $this->Server['Motd'];
    216     $Config->ParameterList['DataDir'] = 'wowclient/'.$this->Server['Database']['Emulator']['ClientVersion']['Version'];
     216    $Config->ParameterList['DataDir'] = 'wowclient/'.$this->Server['Database']['Emulator']['ClientV']['Version'];
    217217    $Config->ParameterList['LogsDir'] = 'server/'.$this->Id.'/log';
    218218    $Config->ParameterList['LogLevel'] = 1;

  • trunk/www/style.css

    r23 r24  
    345345.UserMenu
    346346{
    347   width: 20%;
     347  width: 15%;
    348348}
    349349
    … …  
    351351{
    352352}
     353
     354h4
     355{
     356  text-align: center;
     357  margin-bottom: 3px;
     358}

  • trunk/www/table.php

    r21 r24  
    6565    foreach($this->QueryParameters as $Index => $Item)
    6666      $Table = str_replace('%'.$Index, $Item, $Table);
    67     $DbResult = $Database->query('SELECT COUNT(*) FROM '.$Table.' ORDER BY T.'.$_GET['Column'].' '.$OrderType[$_GET['Order']]);
     67    $DbResult = $Database->query('SELECT COUNT(*) FROM '.$Table.' AS T ORDER BY T.'.$_GET['Column'].' '.$OrderType[$_GET['Order']]);
    6868    $DbRow = $DbResult->fetch_row();
    6969    $this->TotalRowCount = $DbRow[0];
    7070    if(array_key_exists('Page', $_GET)) $this->Page = $_GET['Page']; else $this->Page = 0;
    7171    if($this->Page > ($this->TotalRowCount / $Config['Web']['TableRowPerPage'])) $this->Page = 0;
    72     $DbResult = $Database->query('SELECT * FROM '.$Table.' ORDER BY T.'.$_GET['Column'].' '.$OrderType[$_GET['Order']].' LIMIT '.($this->Page * $Config['Web']['TableRowPerPage']).', '.$Config['Web']['TableRowPerPage']);
     72    $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']);
    7373    while($DbRow = $DbResult->fetch_assoc())
    7474    {

  • trunk/www/types/DateTime.php

    r11 r24  
    88  {
    99    global $MonthNames;
     10   
     11    if($Item['Value'] != '')
     12    {
     13      $ValueParts = explode(' ', $Item['Value']);
     14      $DateParts = explode('-', $ValueParts[0]);
     15      $TimeParts = explode(':', $ValueParts[1]);
    1016
    11     $ValueParts = explode(' ', $Item['Value']);
    12     $DateParts = explode('-', $ValueParts[0]);
    13     $TimeParts = explode(':', $ValueParts[1]);
    14 
    15     $Output = $TimeParts[0].':'.$TimeParts[1].':'.$TimeParts[2].' '.($DateParts[2] * 1).'. '.$MonthNames[$DateParts[1] * 1].' '.$DateParts[0];
     17      $Output = $TimeParts[0].':'.$TimeParts[1].':'.$TimeParts[2].' '.($DateParts[2] * 1).'. '.$MonthNames[$DateParts[1] * 1].' '.$DateParts[0];
     18    } else $Output = '';
    1619    return($Output);
    1720  }
Note: See TracChangeset for help on using the changeset viewer.