Changeset 353

Timestamp:

Mar 3, 2010, 1:42:04 PM (15 years ago)

Author:

george

Message:

• Opraveno: U exportů v tabulce výpisu překladatelů také používat přímo sloupec počtu překladů TranslatedCount.
• Opraveno: Nemazat překladatele, kteří mají vytvořen nějaký export.

Location:

trunk

Files:

• admin.php (modified) (1 diff)
• download.php (modified) (1 diff)
• export/index.php (modified) (1 diff)

trunk/admin.php

@@ -37 +37 @@
     ' AND (`ID` != 128)'. // Skip user Neznámý
     ' AND (`LastLogin` < DATE_SUB(NOW(), INTERVAL 3 MONTH))'. // Time limit
-    ' AND (NOT EXISTS (SELECT `ID` FROM `dictionary` WHERE `user`.`ID` = `dictionary`.`user`))'. // dictionary
-    ' AND (NOT EXISTS (SELECT `Id` FROM `news` WHERE `user`.`ID` = `news`.`user`))'. // news
-    ' AND (NOT EXISTS (SELECT `ID` FROM `shoutbox` WHERE `user`.`user` = `shoutbox`.`user`))'. // shoutbox
+    ' AND (NOT EXISTS (SELECT `Id` FROM `Export` WHERE `user`.`ID` = `Export`.`User`))'. // Without exports
+    ' AND (NOT EXISTS (SELECT `ID` FROM `dictionary` WHERE `user`.`ID` = `dictionary`.`user`))'. // Without dictionary words
+    ' AND (NOT EXISTS (SELECT `Id` FROM `news` WHERE `user`.`ID` = `news`.`user`))'. // Without news
+    ' AND (NOT EXISTS (SELECT `ID` FROM `shoutbox` WHERE `user`.`user` = `shoutbox`.`user`))'. // Without shoutbox messages
     '';
   $DbResult = $Database->SQLCommand('SELECT COUNT(*) FROM `user`'.$Condition);

trunk/download.php

@@ -5 +5 @@
 ShowPage();
 
-function GetPercentOfTable($TableID,$Users) 
+function GetPercentOfTable($TableID, $Users) 
 {
 

trunk/export/index.php

@@ -178 +178 @@
     else $InitialOrder = '';
 
-  $Columns = '';
-  $Joins = '';
-  foreach($TranslationTree as $Group)
-    if($Group['TablePrefix'] != '')
-    {
-      $Columns .= 'COALESCE(T'.$Group['Id'].'.Count, 0) + ';
-      $Joins .= ' LEFT JOIN (SELECT User, COUNT(User) as Count FROM `'.$Group['TablePrefix'].'` WHERE (Complete = 1) AND (Language <> 0) GROUP BY User) as T'.$Group['Id'].' ON user.ID=T'.$Group['Id'].'.User';
-    }
-  $Query = 'SELECT (@I := @I + 1) AS Sequence2, TT.* FROM (SELECT ExportUser.Sequence, T.ID, T.TranslatedCount, T.user, T.XP FROM (SELECT user.ID, user.user, user.XP, ('.substr($Columns, 0, -3).') as TranslatedCount FROM `user`'.$Joins.') AS T';
+  $Query = 'SELECT (@I := @I + 1) AS Sequence2, TT.* FROM (SELECT ExportUser.Sequence, T.ID, T.TranslatedCount, T.user, T.XP FROM (SELECT user.ID, user.user, user.XP, TranslatedCount FROM `user`) AS T';
   $Query .=' LEFT JOIN ExportUser ON ExportUser.Export = '.$_GET['ExportId'].' AND ExportUser.User=T.ID';
   $Query .=' WHERE T.TranslatedCount > 0 ORDER BY COALESCE(ExportUser.Sequence, 100000000)'.$InitialOrder.') AS TT';