Changeset 292

Timestamp:

Dec 27, 2009, 8:19:32 PM (15 years ago)

Author:

george

Message:

• Upraveno: Generování obrázků úrovní překladatelů přesměrováno do podsložky user ve složce tmp a týmů z teams do team.
• Upraveno: Přepracován skript pro zpracování úloh pro generování exportů DBC souborů. Nyní běží v nekončené smyčce a čeká na nové úlohy. Generování se provádí ve frontě a to i během dne.

Location:

trunk

Files:

• export/cmd.php (deleted)
• export/export.php (modified) (5 diffs)
• export/export_output.php (modified) (1 diff)
• export/process_task.php (added)
• img_level.php (modified) (1 diff)
• img_statistic.php (modified) (2 diffs)
• includes/config.sample.php (modified) (1 diff)
• includes/global.php (modified) (1 diff)
• readme.txt (modified) (1 diff)
• sql/updates/292.sql (added)
• team.php (modified) (1 diff)
• userlist.php (modified) (1 diff)

trunk/export/export.php

@@ -60 +60 @@
     }
     
-    if($_SESSION['UserID'] != '')
+    if(isset($_SESSION) and ($_SESSION['UserID'] != ''))
     {
       $DbResult = $this->Database->query('SELECT user FROM `user` WHERE ID='.$_SESSION['UserID']);
@@ -234 +234 @@
     $this->LoadFilters();
 
-    $TempDir = $this->Config['Web']['TempFolder'].$_SESSION['User'].'/dbc/';
-    if(!file_exists($TempDir)) mkdir($TempDir, 0777, true);
-
-  
-    foreach($TranslationTree as $Group)
-    if(in_array($Group['Id'], $Setting['groups']) and ($Group['DBCFileName'] != '')) 
-    { 
+    $DbResult = $this->Database->query('SELECT `group`.* FROM `ExportGroup` JOIN `group` ON `group`.`Id` = `ExportGroup`.`Group` WHERE `ExportGroup`.`Export`='.$this->Id.' AND `group`.`DBCFileName` != ""');
+    while($Group = $DbResult->fetch_assoc())
+    {
       echo($Group['Name'].'... ');
       $DBCFile = new DBCFile();
-      $DBCFile->OpenFile('../source/'.$Setting['Version'].'/dbc/'.$Group['DBCFileName'].'.dbc', GetDBCColumns($Setting['Version'],$Group['DBCFileName']));
+      $DBCFile->OpenFile('../source/'.$this->ClientVersion['Version'].'/dbc/'.$Group['DBCFileName'].'.dbc', GetDBCColumns($Setting['Version'], $Group['DBCFileName']));
       $DBCFile2 = new DBCFile();
-      $DBCFile2->CreateFile($TempDir.$Group['DBCFileName'].'.dbc', GetDBCColumns($Setting['Version'],$Group['DBCFileName']));
+      $DBCFile2->CreateFile($this->TempDir.$Group['DBCFileName'].'.dbc', GetDBCColumns($this->ClientVersion['Version'], $Group['DBCFileName']));
       $Count = $DBCFile->GetRecordCount();
       //if($Group['DBCFileName'] == 'Spell') $Count = 1000;
@@ -253 +249 @@
       {
         $Line = $DBCFile->GetLine($I);
-        $Query = 'SELECT * FROM (SELECT * FROM '.$Group['TablePrefix'].' WHERE (Complete = 1) AND '.$WhereLang.' AND '.$WhereUsers.' AND (entry='.$Line[0].')  AND VersionStart <= '.GetBuildNumber($Setting['Version']).' AND VersionEnd >= '.GetBuildNumber($Setting['Version']).' ORDER BY FIELD(User, '.$SelectedUsers.')) AS T GROUP BY T.entry';       
-        $DbResult = $this->Database->query($Query);
-        if($DbResult->num_rows > 0)
-        {
-          $DbRow = $DbResult->fetch_assoc();
+        $Query = 'SELECT * FROM (SELECT * FROM '.$Group['TablePrefix'].' WHERE (Complete = 1) AND '.$this->WhereLang.' AND '.$this->WhereUsers.' AND (entry='.$Line[0].')  AND VersionStart <= '.$this->ClientVersion['BuildNumber'].' AND VersionEnd >= '.$this->ClientVersion['BuildNumber'].' ORDER BY FIELD(User, '.$this->SelectedUsers.')) AS T GROUP BY T.entry';       
+        $DbResult2 = $this->Database->query($Query);
+        if($DbResult2->num_rows > 0)
+        {
+          $DbRow = $DbResult2->fetch_assoc();
           //  if($Setting['Diacritics'] != 1) $Buffer = utf2ascii($Buffer);
 
-          foreach($Group['Items'] as $GroupItem)
-            if(GetDBCColumnIndex($Setting['Version'], $Group['DBCFileName'], $GroupItem['Column']) != '')
-          $Line[GetDBCColumnIndex($this->Export['ClientVersion'], $Group['DBCFileName'],$GroupItem['Column'])] = $DbRow[$GroupItem['Column']];
+          foreach($TranslationTree[$Group['Id']]['Items'] as $GroupItem)
+            if(GetDBCColumnIndex($this->ClientVersion['Version'], $Group['DBCFileName'], $GroupItem['Column']) != '')
+          $Line[GetDBCColumnIndex($this->ClientVersion['Version'], $Group['DBCFileName'],$GroupItem['Column'])] = $DbRow[$GroupItem['Column']];
           //print_r($Line);
         }
@@ -279 +275 @@
     $this->LoadFilters();
 
-    $TempDir = $this->Config['Web']['TempFolder'].$_SESSION['User'].'/lua/';
-    if(!file_exists($TempDir)) mkdir($TempDir, 0777, true);
-  
     $DbResult = $this->Database->query('SELECT `group`.* FROM `ExportGroup` JOIN `group` ON `group`.`Id` = `ExportGroup`.`Group` WHERE `ExportGroup`.`Export`='.$this->Id.' AND `group`.`LuaFileName` != ""');
     while($Group = $DbResult->fetch_assoc())
@@ -289 +282 @@
       $File->OpenFile('../source/'.$this->ClientVersion['Version'].'/lua/'.$Group['LuaFileName'].'.lua');
       $File2 = new FileStream();
-      $File2->CreateFile($TempDir.''.$Group['LuaFileName'].'.lua');
+      $File2->CreateFile($this->TempDir.''.$Group['LuaFileName'].'.lua');
  
       while(!$File->EOF())

trunk/export/export_output.php

@@ -195 +195 @@
   if($ExportTask['TimeFinish'] > $ExportTask['TimeStart'])
   {
-    echo('<strong>Soubor ke stažení: <a href="">CzWoW.zip</a></strong><br/>');
+    echo('<strong>Soubor ke stažení: <a href="../tmp/Export/'.$ExportTask['Export'].'/CzWoW_DBC.zip">CzWoW_DBC.zip</a></strong><br/>');
   } else echo('<strong>Soubor čeká na zpracování ve frontě.</strong><br/>');
 }

trunk/img_level.php

@@ -2 +2 @@
 
 require_once('includes/global.php');
-if (array_key_exists('nothide',$_GET))
-        $nothide = true;
-else
-        $nothide = false;
-if ($nothide) ShowPage();
+
+if (array_key_exists('nothide', $_GET)) $nothide = true;
+  else $nothide = false;
+if($nothide) ShowPage();
 
 $FontFile = 'images/FRIZQT__.ttf';
-$TranslationTree = GetTranslationTree();
 
-//nastavení
+// Nastavení
 $xp_from_word = 1;
 $index_level = 100;
 $from_diakrit = 3; //zvýšené xp za slovo s diakritikou
 
-  function CheckDiakrit($word) {
-        $result = false;
-    $Diakrit = Array("á","č","ď","é","ě","í","ľ","ň","ó","ř","š","ť","ú",
-    "ů","ý","ž","Á","Č","Ď","É","Ě","Í","Ľ","Ň","Ó","Ř","Š","Ť","Ú","Ů","Ý","Ž");
-        for ($i=0;$i<count($Diakrit);$i=$i+1) {
-                if (strpos($word,$Diakrit[$i]) <> false) {
-                        $result = true;
-                }
-        }
-        return $result;
+function CheckDiakrit($word)
+{
+  $result = false;
+  $Diakrit = Array("á","č","ď","é","ě","í","ľ","ň","ó","ř","š","ť","ú",
+  "ů","ý","ž","Á","Č","Ď","É","Ě","Í","Ľ","Ň","Ó","Ř","Š","Ť","Ú","Ů","Ý","Ž");
+  for($i = 0; $i < count($Diakrit); $i = $i + 1) 
+  {
+    if(strpos($word, $Diakrit[$i]) <> false) 
+    {
+      $result = true;
+    }
   }
+  return $result;
+}
 
-  function CreateImg($user,$xp) {
-        global $index_level,$FontFile;
-        
-        if ($xp > 0) {
-                $level = sqrt ($xp / $index_level);
-                $level = substr($level,0,strpos($level,'.'));
-        } else {
-                $level = 0;
-        }
-        $xp_min = ($level) * ($level) * ($index_level);
-        $xp_max = ($level+1)*($level+1)* ($index_level);
-        $xp_max = $xp_max-$xp_min;
-        $xp = $xp-$xp_min;
-        
-        if($xp_max > 0) $Percent = ( $xp / $xp_max) * 100; else $Percent = 0;
-        $Percent = substr($Percent, 0, 5);
+function CreateImg($prefix, $user, $xp) 
+{
+  global $index_level, $FontFile;
+    
+  if($xp > 0) 
+  {
+    $level = sqrt ($xp / $index_level);
+    $level = substr($level, 0, strpos($level, '.'));
+  } else $level = 0;
+  $xp_min = $level * $level * $index_level;
+  $xp_max = ($level + 1) * ($level + 1) * $index_level;
+  $xp_max = $xp_max - $xp_min;
+  $xp = $xp - $xp_min;
+    
+  if($xp_max > 0) $Percent = ( $xp / $xp_max) * 100; 
+    else $Percent = 0;
+  $Percent = substr($Percent, 0, 5);
 
-        $PercentBar = $Percent * 2.5;
-        $Image = ImageCreateTrueColor(250, 15);
-        $Color1 = imagecolorallocate($Image, 214, 214, 214);
-        $Color2 = imagecolorallocate($Image, 239, 131, 166);
-        $Color3 = imagecolorallocate($Image, 225, 0, 0);
-        imagefilledrectangle($Image, 0, 0, 250, 15, $Color1);
-        imagefilledrectangle($Image, 0, 0, $PercentBar, 59, $Color2);
-        ImageTTFText($Image, 11, 0, 10, 12, $Color3, $FontFile, $level.' Level');
-        ImageTTFText($Image, 8, 0, 80, 12, $Color3, $FontFile, $xp.'/'.$xp_max.' xp   '.$user);
-        
-        if (file_exists('tmp/teams/') == false) mkdir ('tmp/teams/');
-        if (file_exists('tmp/'.$user.'/') == false) mkdir ('tmp/'.$user.'/');
-        ImagePNG($Image,'tmp/'.$user.'/level.png'); 
+  $PercentBar = $Percent * 2.5;
+  $Image = ImageCreateTrueColor(250, 15);
+  $Color1 = imagecolorallocate($Image, 214, 214, 214);
+  $Color2 = imagecolorallocate($Image, 239, 131, 166);
+  $Color3 = imagecolorallocate($Image, 225, 0, 0);
+  imagefilledrectangle($Image, 0, 0, 250, 15, $Color1);
+  imagefilledrectangle($Image, 0, 0, $PercentBar, 59, $Color2);
+  ImageTTFText($Image, 11, 0, 10, 12, $Color3, $FontFile, $level.' Level');
+  ImageTTFText($Image, 8, 0, 80, 12, $Color3, $FontFile, $xp.'/'.$xp_max.' xp   '.$user);
+  
+  if(!file_exists('tmp/'.$prefix.'/')) mkdir('tmp/'.$prefix.'/');
+  if(!file_exists('tmp/'.$prefix.'/'.$user.'/')) mkdir('tmp/'.$prefix.'/'.$user.'/');
+  ImagePNG($Image, 'tmp/'.$prefix.'/'.$user.'/level.png'); 
+}
+
+function GetXPFromTranslation($user_ID) 
+{
+  global $Database, $TranslationTree, $xp_from_word, $from_diakrit;
+  $xp = 0;
+
+  foreach($TranslationTree as $Group) 
+  { //překladové skupiny
+    if($Group['TablePrefix'] != '') 
+    {
+      $groupby = 'GROUP BY';
+      foreach($TranslationTree[$Group['Id']]['Items'] as $Index => $TextItem) 
+      {  
+        if($groupby == 'GROUP BY') $groupby .= ' '.$TextItem['Column'];
+          else $groupby .= ', '.$TextItem['Column'];
+      } 
+      $IDtran = $Database->SQLCommand('SELECT * FROM `'.$Group['TablePrefix'].'` WHERE User = '.$user_ID.' AND Complete = 1 '.$groupby);
+      while($Line = mysql_fetch_array($IDtran)) 
+      {   //jednotlivé překlady
+        $LineComparison = mysql_fetch_assoc($Database->SQLCommand('SELECT * FROM `'.$Group['TablePrefix'].'` WHERE ID = '.$Line['Take']));
+        $xp_translation = 0;   //mazání posledního
+        $translated = true;
+        foreach($TranslationTree[$Group['Id']]['Items'] as $Index => $TextItem) 
+        {          //jednotlivé položky překladu
+          if(($Line[$TextItem['Column']] <> $LineComparison[$TextItem['Column']]) and (strlen($Line[$TextItem['Column']]) > (strlen($LineComparison[$TextItem['Column']]) * 0.5))) 
+          {  //zda není stejný, zda je aspoň dlouhý jako polovina
+            $TextArr = explode(' ',$Line[$TextItem['Column']]);
+            for ($i = 0; $i < count($TextArr); $i = $i + 1) 
+            {  //pro každé slovo
+              if(CheckDiakrit($TextArr[$i])) $indikator = $from_diakrit;
+                else $indikator = 1;
+              $xp_translation = $xp_translation + ($indikator * $xp_from_word);
+            }                                
+          } else 
+          {
+            if (($Line[$TextItem['Column']] == $LineComparison[$TextItem['Column']]) and ('0' == $LineComparison['Language']) and ($LineComparison[$TextItem['Column']] <> '') and ($TextItem['Column'] <> 'ShortCut')) $translated = false;
+          }
+        }       
+        if($translated) $xp = $xp + $xp_translation;   //přičítání XP za celý překlad, pokud je celý přeložený
+      }
+    }
   }
+  return $xp;
+}
 
-  function GetXPFromTranslation($user_ID) {
-        global $Database,$TranslationTree,$xp_from_word,$from_diakrit;
-        $xp = 0;
+// Hlavní kod pro uživatele
+if($nothide) $ID = $Database->SQLCommand('SELECT ID,user FROM user');
+  else $ID = $Database->SQLCommand('SELECT ID,user FROM user WHERE NeedUpdate = 1');
+while($LineUser = mysql_fetch_array($ID)) 
+{
+  $xp = GetXPFromTranslation($LineUser['ID']); // Načítání XP
+  $Database->SQLCommand('UPDATE user SET XP = '.$xp.' WHERE ID = '.$LineUser['ID']);  // Ukládání XP pro řazení
+  CreateImg('user', $LineUser['user'], $xp);  // Vytváření obrázku
+  if($nothide) echo('<img src="tmp/user/'.$LineUser['user'].'/level.png" /><br />');
+}
 
-        foreach($TranslationTree as $Group) { //překladové skupiny
-                if($Group['TablePrefix'] != '') {
-                        $groupby = 'GROUP BY';
-                        foreach($TranslationTree[$Group['Id']]['Items'] as $Index => $TextItem) {  
-                                if ($groupby == 'GROUP BY') $groupby .= ' '.$TextItem['Column'];
-                                else $groupby .= ', '.$TextItem['Column'];
-                        }       
-                $IDtran = $Database->SQLCommand('SELECT * FROM `'.$Group['TablePrefix'].'` WHERE User = '.$user_ID.' AND Complete = 1 '.$groupby);
-                        while ($Line = mysql_fetch_array($IDtran)) {   //jednotlivé překlady
-                                $LineComparison = mysql_fetch_assoc($Database->SQLCommand('SELECT * FROM `'.$Group['TablePrefix'].'` WHERE ID = '.$Line['Take']));
-                                $xp_translation = 0;   //mazání posledního
-                                $translated = true;
-                                foreach($TranslationTree[$Group['Id']]['Items'] as $Index => $TextItem) {          //jednotlivé položky překladu
-                                        if (($Line[$TextItem['Column']] <> $LineComparison[$TextItem['Column']]) and (strlen($Line[$TextItem['Column']]) > (strlen($LineComparison[$TextItem['Column']])*0.5))) {  //zda není stejný, zda je aspoň dlouhý jako polovina
-                                                $TextArr = explode(' ',$Line[$TextItem['Column']]);
-                                                for ($i=0;$i<count($TextArr);$i=$i+1) {  //pro každé slovo
-                                                        if (CheckDiakrit($TextArr[$i]))  // zjišťování diakritiky
-                                                                $indikator = $from_diakrit;
-                                                        else
-                                                                $indikator = 1;
-                                                        $xp_translation = $xp_translation + ($indikator * $xp_from_word);
-                                                }                                                                
-                                } else {
-                                        if (($Line[$TextItem['Column']] == $LineComparison[$TextItem['Column']]) and
-                                         ('0' == $LineComparison['Language']) and
-                                          ($LineComparison[$TextItem['Column']] <> '') and
-                                           ($TextItem['Column'] <> 'ShortCut'))
-                                                $translated = false;
-                                        }
-                                }                       
-                                if ($translated) $xp = $xp+$xp_translation;   //přičítání XP za celý překlad, pokud je celý přeložený
-                        }
-                }
-        }
-        return $xp;
-  }
+// Hlavní kod pro překladatelské týmy
+if($nothide) $ID = $Database->SQLCommand('SELECT ID,name,(SELECT avg(XP) FROM user WHERE team = team.ID) as average FROM team');
+  else $ID = $Database->SQLCommand('SELECT ID,name,(SELECT avg(XP) FROM user WHERE team = team.ID) as average  FROM team WHERE ID IN (SELECT Team FROM user WHERE NeedUpdate = 1)');
+while($LineTeam = mysql_fetch_array($ID)) 
+{
+  CreateImg('team', $LineTeam['name'], substr($LineTeam['average'], 0, strpos($LineTeam['average'],'.')));  //vytváření obrázku
+  if($nothide) echo('<img src="tmp/team/'.$LineTeam['name'].'/level.png" /><br />');
+}
+$Database->SQLCommand('UPDATE user SET NeedUpdate = 0');
 
-//hlavní kod pro uživatele
-        if ($nothide) $ID = $Database->SQLCommand('SELECT ID,user FROM user');
-        else $ID = $Database->SQLCommand('SELECT ID,user FROM user WHERE NeedUpdate = 1');
-while ($LineUser = mysql_fetch_array($ID)) {
-        $xp = GetXPFromTranslation($LineUser['ID']); //načítání XP
-        $Database->SQLCommand('UPDATE user SET XP = '.$xp.' WHERE ID = '.$LineUser['ID']);  //ukládání XP pro řazení
-        CreateImg($LineUser['user'],$xp);  //vytváření obrázku
-        if ($nothide)   echo ('<img src="tmp/'.$LineUser['user'].'/level.png" /><br />');
-}
-//hlavní kod pro překladatelské týmy
-        if ($nothide) $ID = $Database->SQLCommand('SELECT ID,name,(SELECT avg(XP) FROM user WHERE team = team.ID) as average FROM team');
-        else $ID = $Database->SQLCommand('SELECT ID,name,(SELECT avg(XP) FROM user WHERE team = team.ID) as average  FROM team WHERE ID IN (SELECT Team FROM user WHERE NeedUpdate = 1)');
-while ($LineTeam = mysql_fetch_array($ID)) {
-        CreateImg('teams/'.$LineTeam['name'],substr($LineTeam['average'], 0, strpos($LineTeam['average'],'.')));  //vytváření obrázku
-        if ($nothide)   echo ('<img src="tmp/'.$LineTeam['name'].'/level.png" /><br />');
-}
-        $Database->SQLCommand('UPDATE user SET NeedUpdate = 0');
-
-if ($nothide) ShowFooter();      
+if($nothide) ShowFooter();      
 
 ?>

trunk/img_statistic.php

@@ -18 +18 @@
 } else $language = '';
 
-if(array_key_exists('user', $_GET)) 
-{
-  $DbResult = $Database->SQLCommand('SELECT `user`,`ExportSetting` FROM `user` WHERE ID='.($_GET['user'] * 1));
-  if(mysql_num_rows($DbResult) > 0)
-  {
-    $User = mysql_fetch_assoc($DbResult);
-    $ExportSetting = unserialize($User['ExportSetting']);
-    $SelectedUsers = ''; 
-    foreach($ExportSetting['users-selection'] as $Item)
-      $SelectedUsers .= ','.$Item;
-    $SelectedUsers = substr($SelectedUsers, 1);
-    $user_sql = ' AND `User` IN ('.$SelectedUsers.')';
-  } else $user_sql = '';
-} else $user_sql = '';
-
 
 $ID = mysql_fetch_row($Database->SQLCommand('SELECT MAX(`VersionEnd`) FROM '.$Group['TablePrefix']));
 $BuildNumber_max = $ID[0];
 
-$where = 'VersionEnd = '.$BuildNumber_max.' AND (`Language` <> 0) AND (`Complete` = 1) '.$team.$language.$user_sql;
+$where = 'VersionEnd = '.$BuildNumber_max.' AND (`Language` <> 0) AND (`Complete` = 1) '.$team.$language;
 $ID = mysql_fetch_row($Database->SQLCommand('SELECT count(distinct(`entry`)) FROM '.$Group['TablePrefix'].' WHERE '.$where));
 $NumberTranslate = $ID[0];
@@ -68 +53 @@
   ImageTTFText($Image, $FontSize, 0, 5, 29, $Color3, $FontFile, getmonthyears($TimeToTranslate));
 }
-if($user_sql <> '') 
-{
-  ImageTTFText($Image, $FontSize, 0, 5, 13, $Color3, $FontFile, 'Statistika výběru');
-  ImageTTFText($Image, $FontSize, 0, 5, 29, $Color3, $FontFile, 'uživatele: '.$User['user'] );
-}
 ImageTTFText($Image, $FontSize, 0, 140, 13, $Color3, $FontFile, $NumberTranslate.'/'.$NumberAJ);
 ImageTTFText($Image, $FontSize, 0, 240, 13, $Color3, $FontFile, $Group['Name']);

trunk/includes/config.sample.php

@@ -25 +25 @@
     'VisiblePagingItems' => 20,
   ),
+  'ExportTashProcessPeriod' => 10,
 );
 

trunk/includes/global.php

@@ -3 +3 @@
 $ScriptStartTime = GetMicrotime();
 
-if(!isset($_SESSION)) session_start();
+if(isset($_SERVER['REMOTE_ADDR'])) session_start();
 
 // SQL injection hack protection

trunk/readme.txt

@@ -47 +47 @@
 Číslo id ve sloupci entry je však přiděleno dynamicky a pro různé verze mangosu by byly čísla generovány jinak. Proto je nutno při aktualizacích čísla přebrat synchronizovat vůči starým verzím.
 
+8) Při startu systému je potřeba spustit skript export/process_task.php pro zpracování delé trvajících úloh exportů.
+
+

trunk/team.php

@@ -135 +135 @@
       'Počet členů týmu: <a href="userlist.php?team='.$Line['ID'].'" title="Zobrazit členy týmu">'.$Line['numberuser'].'</a><br />'.
       'Počet přeložených textů týmu: <strong>'.$Line['NumberTranslate'].'</strong><br />'.
-      'Průměrná úroveň překladatelů v týmu: <img src="tmp/teams/'.$Line['name'].'/level.png" /><br /><br />'.
+      'Průměrná úroveň překladatelů v týmu: <img src="tmp/team/'.$Line['name'].'/level.png" /><br /><br />'.
       '<strong>Stav dokončení pro tým:</strong><br />');
       foreach($TranslationTree as $Group)

trunk/userlist.php

@@ -63 +63 @@
     echo('<tr><td>'.$Name.'</td>
       <td style="text-align: center;"><a href="TranslationList.php?user='.$Line['ID'].'&amp;action=userall" title="Zobrazit Všechny jeho přeložené texty">'.$Line['NumberTranslate'].'</a></td>
-      <td><img src="tmp/'.$Line['user'].'/level.png" alt="Úroveň uživatele" /></td>
+      <td><img src="tmp/user/'.$Line['user'].'/level.png" alt="Úroveň uživatele" /></td>
       <td>'.$Moderators[$Line['GM']].'</td>
       <td>'.HumanDate($Line['LastLogin']).'</td></tr>');