Changeset 728
- Timestamp:
- Jan 7, 2014, 10:17:46 PM (11 years ago)
- Location:
- trunk
- Files:
-
- 4 edited
-
Modules/Export/Page.php (modified) (2 diffs)
-
Modules/Translation/Form.php (modified) (1 diff)
-
Modules/User/Profile.php (modified) (4 diffs)
-
includes/Version.php (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/Modules/Export/Page.php
r727 r728 599 599 if($Export['OutputType'] == '') $Output .= ShowMessage('Nevybrán typ exportu', MESSAGE_CRITICAL); 600 600 else { 601 $Query = 'SELECT `ClientVersion`.* FROM `ExportVersion` LEFT JOIN `ClientVersion` ON `ClientVersion`.`Id`=`ExportVersion`.`ClientVersion` WHERE `ExportType`='.$Export['OutputType']; 601 $Query = 'SELECT `ClientVersion`.* FROM `ExportVersion` '. 602 'LEFT JOIN `ClientVersion` ON `ClientVersion`.`Id`=`ExportVersion`.`ClientVersion` WHERE `ExportType`='.$Export['OutputType']; 602 603 603 604 $DbResult = $this->System->Database->query('SELECT COUNT(*) FROM ('.$Query.') AS `X`'); … … 631 632 while($Version = $DbResult->fetch_assoc()) 632 633 { 633 $Output .= '<tr><td><a href=" http://www.wowwiki.com/Patch_'.$Version['Version'].'">'.634 $Output .= '<tr><td><a href="'.$this->System->Link('/client-version/?action=item&id='.$Version['Id']).'">'. 634 635 $Version['Version'].'</a></td><td>'.$Version['BuildNumber'].'</td><td>'. 635 636 HumanDate($Version['ReleaseDate']).'</td><td>'.$Version['Title'].'</td><td>'. -
trunk/Modules/Translation/Form.php
r727 r728 158 158 159 159 $Output .= '<br />'. 160 'Verze: <b>'.GetVersionWOW($Line['VersionStart']).' - '.GetVersionWOW($Line['VersionEnd']).'</b>'. 161 '<br />'; 160 'Verze: <b><a href="'.$this->System->Link('/client-version/?action=item&id='.GetVersionWOWId($Line['VersionStart'])).'">'.GetVersionWOW($Line['VersionStart']). 161 '</a> - <a href="'.$this->System->Link('/client-version/?action=item&id='.GetVersionWOWId($Line['VersionEnd'])).'">'.GetVersionWOW($Line['VersionEnd']).'</a></b>'. 162 '<br />'; 162 163 163 164 $DbResult = $this->Database->query('SELECT COUNT(*) FROM `'.$Table.'` WHERE '. -
trunk/Modules/User/Profile.php
r636 r728 50 50 $Order['Output']; 51 51 52 $DbResult = $this->System->Database->query('SELECT `User`.`Name` AS `UserName`, `Export`.`Id`, `Export`.`TimeCreate`, `Export`.`Title`, `Export`.`User`, `Export`.`UsedCount`, (SELECT Version FROM `ClientVersion` WHERE `ClientVersion`.`Id`=`Export`.`ClientVersion`) AS `ClientVersion`,(SELECT Name FROM `ExportOutputType` WHERE `ExportOutputType`.`Id`=`Export`.`OutputType`) AS `OutputType`, (SELECT COUNT(*) FROM `ExportGroup` WHERE `ExportGroup`.`Export`=`Export`.`Id`) AS `GroupCount`, (SELECT COUNT(*) FROM `ExportUser` WHERE `ExportUser`.`Export`=`Export`.`Id`) AS `UserCount` FROM `Export` LEFT JOIN `User` ON `User`.`ID`=`Export`.`User` '.$Filter.$Order['SQL'].$PageList['SQLLimit']); 52 $DbResult = $this->System->Database->query('SELECT `User`.`Name` AS `UserName`, `Export`.`Id`, `Export`.`TimeCreate`, `Export`.`Title`, `Export`.`User`, `Export`.`UsedCount`, `Export`.`ClientVersion` AS `ClientVersionId`, '. 53 '(SELECT Version FROM `ClientVersion` WHERE `ClientVersion`.`Id`=`Export`.`ClientVersion`) AS `ClientVersion`, '. 54 '(SELECT Name FROM `ExportOutputType` WHERE `ExportOutputType`.`Id`=`Export`.`OutputType`) AS `OutputType`, '. 55 '(SELECT COUNT(*) FROM `ExportGroup` WHERE `ExportGroup`.`Export`=`Export`.`Id`) AS `GroupCount`, '. 56 '(SELECT COUNT(*) FROM `ExportUser` WHERE `ExportUser`.`Export`=`Export`.`Id`) AS `UserCount` FROM `Export` '. 57 'LEFT JOIN `User` ON `User`.`ID`=`Export`.`User` '.$Filter.$Order['SQL'].$PageList['SQLLimit']); 53 58 while($Export = $DbResult->fetch_assoc()) 54 59 { … … 60 65 '<td>'.$Export['Title'].'</td>'. 61 66 '<td>'.$Export['OutputType'].'</td>'. 62 '<td> '.$Export['ClientVersion'].'</td>'.67 '<td><a href="'.$this->System->Link('/client-version/?action=item&id='.$Export['ClientVersionId']).'">'.$Export['ClientVersion'].'</a></td>'. 63 68 '<td>'.$Export['UsedCount'].'</td>'. 64 69 '<td>'.$Action.'</td></tr>'; … … 116 121 $Output = ''; 117 122 $Query = 'SELECT `User`.`Name`, `UserTrace`.`LastLogin`, `UserTrace`.`LastIP`, '. 118 '`User`.`Email`, `UserTrace`.`UserAgent`, '.123 '`User`.`Email`, `UserTrace`.`UserAgent`, `User`.`PreferredVersion`, '. 119 124 '`User`.`TranslatedCount`, `User`.`Team`, `User`.`ID`, `User`.`Info`, '. 120 125 '`Team`.`Name` AS `TeamName`, `Language`.`Name` AS `LanguageName`, '. … … 133 138 '<h3>Překladatel '.$UserLine['Name'].'</h3>'. 134 139 'Výchozí jazyk: <strong>'.$UserLine['LanguageName'].'</strong><br />'. 135 'Výchozí verze klienta: < strong>'.$UserLine['Version'].'</strong><br />'.140 'Výchozí verze klienta: <a href="'.$this->System->Link('/client-version/?action=item&id='.$UserLine['PreferredVersion']).'"><strong>'.$UserLine['Version'].'</strong></a><br />'. 136 141 'Poslední připojení: <strong>'.HumanDateTime($UserLine['LastLogin']).'</strong><br />'. 137 142 'Počet přeložených: <a href="TranslationList.php?user='.$UserLine['ID'].'&state=2&group=0" title="Zobrazit Všechny jeho přeložené texty"><strong>'.$UserLine['TranslatedCount'].'</strong></a><br />'; -
trunk/includes/Version.php
r726 r728 6 6 // and system will need database update. 7 7 8 $Revision = 72 6; // Subversion revision8 $Revision = 728; // Subversion revision 9 9 $DatabaseRevision = 725; // Database structure revision 10 10 $ReleaseTime = '2014-01-07';
Note:
See TracChangeset
for help on using the changeset viewer.
