Changeset 800 for trunk/Modules


Ignore:
Timestamp:
Mar 16, 2014, 11:15:43 AM (11 years ago)
Author:
chronos
Message:
  • Added: Module Redirection responsible for redirection of old pages to new valid address.
  • Fixed: Error on client version item display if id was not specified.
  • Fixed: Error on silent application module reregistration.
  • Removed: White space on end of lines in some files.
Location:
trunk/Modules
Files:
2 added
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/Modules/ClientVersion/ClientVersion.php

    r790 r800  
    1313    $this->Dependencies = array('');
    1414  }
    15  
     15
    1616  function Start()
    1717  {
    … …  
    3838                return($Output);
    3939        }
    40        
     40
    4141        function ShowItem()
    4242        {
    43      $YesNo = array('Ne', 'Ano');
    44      $DbResult = $this->System->Database->query('SELECT * FROM ClientVersion WHERE Id='.($_GET['id']*1));
    45      if($DbResult->num_rows > 0)
    46      {
    47          $Version = $DbResult->fetch_assoc();
    48    
    49      $Output = '<h3>'.T('Client version').'</h3>';
    50      $Output .= '<table class="BaseTable">'.
     43    if(array_key_exists('id', $_GET))
     44    {
     45      $YesNo = array('Ne', 'Ano');
     46      $DbResult = $this->System->Database->query('SELECT * FROM ClientVersion WHERE Id='.($_GET['id']*1));
     47      if($DbResult->num_rows > 0)
     48      {
     49        $Version = $DbResult->fetch_assoc();
     50
     51      $Output = '<h3>'.T('Client version').'</h3>';
     52      $Output .= '<table class="BaseTable">'.
    5153        '<tr><td>'.T('Version').'</td><td>'.$Version['Version'].'</td></tr>'.
    5254        '<tr><td>'.T('More information').'</td><td><a href="http://www.wowwiki.com/Patch_'.$Version['Version'].'">wowwiki.com'.
    … …  
    5860        '</table>';
    5961        $Output .= '<div><a href="?">'.T('All versions list').'</a></div>';
    60         if($Version['Imported']) 
     62        if($Version['Imported'])
    6163          $Output .= '<div><a href="'.$this->System->Link('/progress/?Version='.$Version['Version']).'">'.T('Progress').'</a></div>';
    62      } else $Output = ShowMessage(T('Item not found'), MESSAGE_CRITICAL);
     64      } else $Output = ShowMessage(T('Item not found'), MESSAGE_CRITICAL);
     65    } else $Output = ShowMessage(T('Item not found'), MESSAGE_CRITICAL);
    6366                return($Output);
    6467        }
    65        
     68
    6669        function ShowList()
    67         {               
     70        {
    6871                $this->Title = T('Game version');
    6972    $DbResult = $this->System->Database->query('SELECT COUNT(*) FROM `ClientVersion`');
    7073    $DbRow = $DbResult->fetch_row();
    71     $PageList = GetPageList($DbRow[0]);   
     74    $PageList = GetPageList($DbRow[0]);
    7275
    7376    $Output = '<h3>'.T('Game version').'</h3>'.
    … …  
    7578
    7679    $TableColumns = array(
    77       array('Name' => 'Version', 'Title' => T('Version')), 
    78       array('Name' => 'BuildNumber', 'Title' => T('Build')), 
    79       array('Name' => 'ReleaseDate', 'Title' => T('Release date')), 
    80       array('Name' => 'Title', 'Title' => T('Title')), 
     80      array('Name' => 'Version', 'Title' => T('Version')),
     81      array('Name' => 'BuildNumber', 'Title' => T('Build')),
     82      array('Name' => 'ReleaseDate', 'Title' => T('Release date')),
     83      array('Name' => 'Title', 'Title' => T('Title')),
    8184      array('Name' => 'Imported', 'Title' => T('Imported')),
    8285    );
    … …  
    8487    $Output .= '<table class="BaseTable">'.
    8588      $Order['Output'];
    86      
     89
    8790    $YesNo = array('Ne', 'Ano');
    8891
    … …  
    97100    $Output .= '</table>'.
    98101      $PageList['Output'];
    99     return($Output);       
     102    return($Output);
    100103  }
    101104}

  • trunk/Modules/Download/Download.php

    r791 r800  
    1717        {
    1818                $this->System->RegisterPage('download', 'PageDownload');
    19                 $this->System->RegisterPage('download.php', 'PageDownload');
    2019                $this->System->RegisterMenuItem(array(
    2120      'Title' => T('Download'),
    … …  
    3534$Output = '<h3>'.T('Accessories for client').'</h3>'.
    3635  '<strong><a href="'.$fileslink.'/WowLua/wowpatcher.exe">wowpatcher</a></strong> - '.T('Tool to command line, which search and edit file wow.exe for support editing files Glue Strings.lua and GlobalStrings.lua.').' '.
    37   T('Designed for one-time creation of new modified version of wow.exe. Help can be called with the - help option. The ability to modify future versions not guaranteed.').' '. 
     36  T('Designed for one-time creation of new modified version of wow.exe. Help can be called with the - help option. The ability to modify future versions not guaranteed.').' '.
    3837  '<br /><br/>'.
    39   '<strong>WowLua</strong> - '.T('Specific modified version of WoW.exe for free servers with support for translation Lua files').'<br/>'. 
     38  '<strong>WowLua</strong> - '.T('Specific modified version of WoW.exe for free servers with support for translation Lua files').'<br/>'.
    4039  'enGB a enUS: '.
    4140  ' <a href="'.$fileslink.'/WowLua/WowLua_3.3.5a.exe">3.3.5a</a>'.
    … …  
    4645  ' <a href="'.$fileslink.'/WowLua/WowLua_1.12.1.exe">1.12.1</a>'.
    4746  '<br/><br/>'.
    48   '<strong>WoWMe</strong> - '.T('Edited files wow.exe with support of translation dbc files').':<br/>'. 
     47  '<strong>WoWMe</strong> - '.T('Edited files wow.exe with support of translation dbc files').':<br/>'.
    4948  '<a href="'.$fileslink.'/WoWMe/WoWMe_4.3.4.zip">4.3.4</a> '.
    5049  '<a href="'.$fileslink.'/WoWMe/WoWMe_3.2.0.rar">3.2.0</a> '.
    … …  
    5453  '<br/><br/>'.
    5554  '<strong>CzechWoW</strong> - '.T('Czech for client with edited client files (old)').'<br/>';
    56    
     55
    5756  $Output .= '<a href="'.$fileslink.'/CzechWoW/Instalace_CzechWoW_3.3.5a_2010-09-09.exe">Instalace CzechWoW 3.3.5a 2010-09-09.exe</a><br/>'.
    5857  '<a href="'.$fileslink.'/CzechWoW/Instalace_CzechWoW_3.3.3a_2010-04-23.exe">Instalace CzechWoW 3.3.3a 2010-04-23.exe</a><br/>'.
    … …  
    7776  return($Output);
    7877        }
    79        
    80         function ShowDownload() 
     78
     79        function ShowDownload()
    8180        {
    8281    $Output = '<h3>'.T('Download czech').'</h3><br />';
    83    
     82
    8483    $Output .= T('Additional files: modified wow.exe, fonts to game, translated interface aowow and more can be found on page').' <a href="'.$this->System->Link('/download/?Files').'">'.T('Files').'</a><br />';
    8584    $Output .= T('If none of these files is suitable for you, for example, to the Czech without the translated interface. You can generate your own section in section').' <a href="'.$this->System->Link('/export').'">'.T('Export').'</a><br /><br />';
    … …  
    8786    $Output .= T('If you no longer want translation in game, you can uninstall it by file Uninstall.exe at the directory of game.').'<br />';
    8887    $Output .= '<br /><br />';
    89    
     88
    9089    $DbResult = $this->System->Database->query('SELECT COUNT(*) FROM `Export` WHERE `Featured`=1');
    9190    $DbRow = $DbResult->fetch_row();
    92     $PageList = GetPageList($DbRow[0]);   
     91    $PageList = GetPageList($DbRow[0]);
    9392
    9493    $Output .= $PageList['Output'];
    9594    $TableColumns = array(
    96       array('Name' => 'Version', 'Title' => T('Download')), 
    97       array('Name' => 'Title', 'Title' => T('Name2'),), 
    98       array('Name' => 'TimeCreate', 'Title' => T('Creation date')), 
     95      array('Name' => 'Version', 'Title' => T('Download')),
     96      array('Name' => 'Title', 'Title' => T('Name2'),),
     97      array('Name' => 'TimeCreate', 'Title' => T('Creation date')),
    9998      array('Name' => 'Description', 'Title' => T('Description')),
    100     );   
     99    );
    101100    $Order = GetOrderTableHeader($TableColumns, 'Id', 1);
    102101    $Output .= '<table class="BaseTable">'.
    103       $Order['Output'];                 
     102      $Order['Output'];
    104103        $DbRows = $this->Database->query('SELECT `ClientVersion`.`Version` AS `Version`, '.
    105104      '`Export`.`Id`, `Export`.`ClientVersion`, `Export`.`OutputType`, `Export`.`Title`, '.
    … …  
    107106      'JOIN `ClientVersion` as `ClientVersion` ON `ClientVersion`.`Id`=`Export`.`ClientVersion` '.
    108107      'WHERE `Featured`=1 '.$Order['SQL'].$PageList['SQLLimit']);
    109     while ($DbExport = $DbRows->fetch_assoc()) 
     108    while ($DbExport = $DbRows->fetch_assoc())
    110109    {
    111110        $ExportId = $DbExport['Id'];
    112                    
     111
    113112                          if ($DbExport['OutputType'] == 10)
    114113                    $filename = $this->System->Config['Web']['TempFolder'].'Export/'.$ExportId.'/'.'Instalace_CzechWoW_'.$DbExport['Version'].'.exe';
    115114                          if ($DbExport['OutputType'] == 7)
    116115                    $filename = $this->System->Config['Web']['TempFolder'].'Export/'.$ExportId.'/'.'CzWoW_Addon-'.$DbExport['Version'].'.zip';
    117                            
     116
    118117                          if ($DbExport['OutputType'] == 10)
    119118          $Output .= '<tr><td><a href="'.$this->System->Link('/'.$filename).
    … …  
    129128            $ExportId.'&amp;Tab=7').'">'.T('Make export').'</a><br /> <a href="'.
    130129            $this->System->Link('/export/?Action=View&amp;ExportId='.$ExportId).'">Export '.$ExportId.'</a></td>';
    131                                
     130
    132131        $Output .= '<td>'.$DbExport['Title'].'</td>'; //.'<td>'.$DbExport['ClientVersion'].'</td>';
    133                                
     132
    134133                          if ((($DbExport['OutputType'] == 10) or ($DbExport['OutputType'] == 7)) and (file_exists($filename)))
    135134          $Output .= '<td>'.date('d.m.y H:i',filemtime($filename)).'</td>';
    … …  
    137136          $Output .= '<td>&nbsp;</td>';
    138137
    139                                         $Output .= 
     138                                        $Output .=
    140139                                        '<td>'.str_replace("\n", '<br />',$DbExport['Description']).'</td>'.
    141140          '</tr>';
    … …  
    143142    $Output .= '</table>'.
    144143      $PageList['Output'];
    145        
     144
    146145    return($Output);
    147146  }
    148        
    149         function Show() 
     147
     148        function Show()
    150149        {
    151150                $this->Title = T('Download');
    … …  
    153152    if (isset($_GET['Files'])) $Output .= $this->ShowFiles();
    154153    else $Output .= $this->ShowDownload();
    155  
     154
    156155    return($Output);
    157   }     
     156  }
    158157}
    159    

  • trunk/Modules/Translation/Save.php

    r727 r800  
    2525                        $Language = $_POST['Language'] * 1;
    2626                        if(array_key_exists('End', $_POST)) $Complete = 1;
    27                         else $Complete = 0;
     27                          else $Complete = 0;
    2828       
    2929                        // Get source text record from database by ID
    … …  
    3434       
    3535                                // Get data for english original
    36                                 $DbResult = $this->Database->query('SELECT * FROM `'.$Table.'` WHERE (`Entry`='.$SourceText['Entry'].
    37                                                 ') AND (`Language` = '.$this->System->Config['OriginalLanguage'].') AND (`VersionStart` = '.$SourceText['VersionStart'].
    38                                                 ') AND (`VersionEnd` = '.$SourceText['VersionEnd'].')');
     36                                $DbResult = $this->Database->query('SELECT * FROM `'.$Table.'` WHERE (`Entry`='.$SourceText['Entry'].') '.
     37                                        'AND (`Language` = '.$this->System->Config['OriginalLanguage'].') AND (`VersionStart` = '.$SourceText['VersionStart'].') '.
     38                                        'AND (`VersionEnd` = '.$SourceText['VersionEnd'].')');
    3939                                if($DbResult->num_rows > 0)
    4040                                {
Note: See TracChangeset for help on using the changeset viewer.