Changeset 826

Timestamp:

Mar 1, 2015, 3:38:19 PM (9 years ago)

Author:

chronos

Message:

• Modified: Removed generation of user level to images as files. Level images ware replaced by HTML progress bar.
• Modified: User XP level and translated count is now calculated during every translation save operation rather then calculated in user list and group view page show.
• Fixed: Wrong indentation in some files.

Location:

trunk

Files:

• Modules/Export/ProcessTask.php (modified) (3 diffs)
• Modules/Team/Team.php (modified) (11 diffs)
• Modules/Translation/Form.php (modified) (3 diffs)
• Modules/Translation/Progress.php (modified) (3 diffs)
• Modules/Translation/Save.php (modified) (1 diff)
• Modules/Translation/Translation.php (modified) (1 diff)
• Modules/Translation/UserLevel.php (moved) (moved from trunk/img_level.php ) (7 diffs)
• Modules/User/Profile.php (modified) (4 diffs)
• Modules/User/UserList.php (modified) (2 diffs)
• admin/index.php (modified) (3 diffs)
• img_statistic.php (deleted)
• includes/Version.php (modified) (1 diff)

trunk/Modules/Export/ProcessTask.php

@@ -10 +10 @@
 
 //LoadCommandLineParameters();
-  $System = new System();
-  $System->DoNotShowPage = true;
-    $System->Run();
-
-function SetProgress($Export,$per) {
+$System = new System();
+$System->DoNotShowPage = true;
+$System->Run();
+
+function SetProgress($Export, $Progress)
+{
    global $System;
-        $System->Database->query('UPDATE `ExportTask` SET `Progress`='.$per.' WHERE `Export`='.$Export->Id);
-}
-
+
+   $System->Database->query('UPDATE `ExportTask` SET `Progress`='.$Progress.' WHERE `Export`='.$Export->Id);
+}
 
 function DeleteOldFiles($deldir)
 {
-        if(file_exists($deldir.'/'))
-        {
-          $Dir = opendir($deldir.'/') ;
-          while(($File = readdir($Dir)) !== false)
-          {
-            if(($File != '..') and ($File != '.') and (!is_dir("$File"))) unlink($deldir.'/'.$File);
-          }
-          closedir($Dir);
-        }
-
-}
-
-function rcopy($src, $dst) {
+  if(file_exists($deldir.'/'))
+  {
+    $Dir = opendir($deldir.'/') ;
+    while(($File = readdir($Dir)) !== false)
+    {
+      if(($File != '..') and ($File != '.') and (!is_dir("$File"))) unlink($deldir.'/'.$File);
+    }
+    closedir($Dir);
+  }
+}
+
+function rcopy($src, $dst)
+{
  // echo  $src.' '.$dst."\n";
   if (file_exists($dst)) DeleteOldFiles($dst);
@@ -46 +47 @@
 }
 
-function GetWinZPatch($patch) {
+function GetWinZPatch($patch)
+{
   //TMP="Z:\\a\\www\\wowpreklad\\tmp\\Export\\${EXPORTID}\\"
   $patch = str_replace(DIRECTORY_SEPARATOR,'\\',$patch);
@@ -53 +55 @@
 }
 
-function MPQPack($packdir) {
-
+function MPQPack($packdir)
+{
   if(file_exists($packdir.DIRECTORY_SEPARATOR))
   {

trunk/Modules/Team/Team.php

@@ -30 +30 @@
 }
 
-include_once(dirname(__FILE__).'/../../img_level.php');
-
 class PageTeam extends Page
 {
@@ -60 +58 @@
 
     $TableColumns = array(
-        array('Name' => 'Name', 'Title' => T('Name')),
-        array('Name' => 'URL', 'Title' => T('Web pages')),
-        array('Name' => 'LeaderName', 'Title' => T('Leader')),
-        array('Name' => 'NumberUser', 'Title' => T('Member count')),
-        array('Name' => 'TimeCreate', 'Title' => T('Founding date')),
+      array('Name' => 'Name', 'Title' => T('Name')),
+      array('Name' => 'URL', 'Title' => T('Web pages')),
+      array('Name' => 'LeaderName', 'Title' => T('Leader')),
+      array('Name' => 'NumberUser', 'Title' => T('Member count')),
+      array('Name' => 'TimeCreate', 'Title' => T('Founding date')),
     );
     if($this->System->User->Licence(LICENCE_USER)) $TableColumns[] = array('Name' => '', 'Title' => T('User actions'));
@@ -77 +75 @@
     {
       $Output .= '<tr>'.
-          '<td><a href="?action=team&amp;id='.$Team['Id'].'">'.$Team['Name'].'</a></td>'.
-          '<td><a href="http://'.$Team['URL'].'">'.$Team['URL'].'</a></td>'.
-          '<td><a href="'.$this->System->Link('/user.php?user='.$Team['Leader']).'">'.$Team['LeaderName'].'</a></td>'.
-          '<td><a href="'.$this->System->Link('/userlist.php?team='.$Team['Id']).'" title="Zobrazit členy týmu">'.$Team['NumberUser'].'</a></td>'.
-          '<td>'.HumanDate($Team['TimeCreate']).'</td>';
+        '<td><a href="?action=team&amp;id='.$Team['Id'].'">'.$Team['Name'].'</a></td>'.
+        '<td><a href="http://'.$Team['URL'].'">'.$Team['URL'].'</a></td>'.
+        '<td><a href="'.$this->System->Link('/user.php?user='.$Team['Leader']).'">'.$Team['LeaderName'].'</a></td>'.
+        '<td><a href="'.$this->System->Link('/userlist.php?team='.$Team['Id']).'" title="Zobrazit členy týmu">'.$Team['NumberUser'].'</a></td>'.
+        '<td>'.HumanDate($Team['TimeCreate']).'</td>';
       if($this->System->User->Licence(LICENCE_USER))
       {
@@ -92 +90 @@
     }
     $Output .= '</table>'.
-        $PageList['Output'];
+      $PageList['Output'];
 
     return($Output);
@@ -132 +130 @@
         {
           $this->Database->query('INSERT INTO `Team` (`Name` ,`Description`, `URL`, `TimeCreate`, `Leader`)'.
-              ' VALUES ("'.trim($_POST['Name']).'", "'.trim($_POST['Description']).'", "'.
-              $_POST['URL'].'", NOW(), '.$this->System->User->Id.')');
+            ' VALUES ("'.trim($_POST['Name']).'", "'.trim($_POST['Description']).'", "'.
+            $_POST['URL'].'", NOW(), '.$this->System->User->Id.')');
           $this->Database->query('UPDATE `User` SET `Team` = '.$this->Database->insert_id.' WHERE `ID` = '.$this->System->User->Id);
           $Output .= ShowMessage('Překladatelský tým vytvořen.');
@@ -158 +156 @@
           $Team = $DbResult->fetch_assoc();
           $Output = '<form action="?action=finish_modify&amp;id='.$_GET['id'].'" method="post">'.
-              '<fieldset><legend>Nastavení týmu</legend>'.
-              '<table><tr><td>Jméno:</td><td><input type="text" name="Name" value="'.$Team['Name'].'"/></td></tr>'.
-              '<tr><td>Webové stránky:</td><td>http://<input type="text" name="URL" value="'.$Team['URL'].'"/></td></tr>'.
-              '<tr><td>Popis:</td><td><input type="text" name="Description" value="'.$Team['Description'].'"/></td></tr>'.
-              '<tr><td colspan="2"><input type="submit" value="Uložit" /></td></tr>'.
-              '</table></fieldset></form>';
+            '<fieldset><legend>Nastavení týmu</legend>'.
+            '<table><tr><td>Jméno:</td><td><input type="text" name="Name" value="'.$Team['Name'].'"/></td></tr>'.
+            '<tr><td>Webové stránky:</td><td>http://<input type="text" name="URL" value="'.$Team['URL'].'"/></td></tr>'.
+            '<tr><td>Popis:</td><td><input type="text" name="Description" value="'.$Team['Description'].'"/></td></tr>'.
+            '<tr><td colspan="2"><input type="submit" value="Uložit" /></td></tr>'.
+            '</table></fieldset></form>';
         } else $Output = ShowMesage('Tým nenalezen.', MESSAGE_CRITICAL);
       } else $Output = ShowMessage('Nezadáno id týmu', MESSAGE_CRITICAL);
@@ -202 +200 @@
     {
       $Output ='<form action="?action=finish_create" method="post">'.
-          '<fieldset><legend>Vytvoření nového týmu</legend>'.
-          '<table><tr><td>Jméno:</td><td><input type="text" name="Name" /></td></tr>'.
-          '<tr><td>Webové stránky:</td><td>http://<input type="text" name="URL" value=""/></td></tr>'.
-          '<tr><td>Popis:</td><td><input type="text" name="Description" /></td></tr>'.
-          '<tr><td colspan="2"><input type="submit" value="Vytvořit a vstoupit" /></td></tr>'.
-          '</table></fieldset></form>';
+        '<fieldset><legend>Vytvoření nového týmu</legend>'.
+        '<table><tr><td>Jméno:</td><td><input type="text" name="Name" /></td></tr>'.
+        '<tr><td>Webové stránky:</td><td>http://<input type="text" name="URL" value=""/></td></tr>'.
+        '<tr><td>Popis:</td><td><input type="text" name="Description" /></td></tr>'.
+        '<tr><td colspan="2"><input type="submit" value="Vytvořit a vstoupit" /></td></tr>'.
+        '</table></fieldset></form>';
     } else $Output = ShowMessage(T('Access denied'), MESSAGE_CRITICAL);
     return($Output);
@@ -217 +215 @@
     if(array_key_exists('id', $_GET) and is_numeric($_GET['id']))
     {
-      ImgLevelUpdate();
-
       $DbResult = $this->Database->query('SELECT `Id`, `Name`, `Description`, `URL`, `Leader`, '.
-          '(SELECT COUNT(*) FROM `User` WHERE '.
-          '`Team` = `Team`.`Id`) AS `NumberUser`, (SELECT SUM(`TranslatedCount`) FROM `User` WHERE '.
-          '`Team` = `Team`.`Id`) AS `NumberTranslate` FROM '.
-          '`Team` WHERE `Id`='.($_GET['id'] * 1));
+        '(SELECT COUNT(*) FROM `User` WHERE '.
+        '`Team` = `Team`.`Id`) AS `NumberUser`, '.
+        '(SELECT SUM(`TranslatedCount`) FROM `User` WHERE `Team` = `Team`.`Id`) AS `NumberTranslate`, '.
+        '(SELECT ROUND(AVG(`XP`)) FROM `User` WHERE `Team` = `Team`.`Id`) AS `AverageXP` FROM '.
+        '`Team` WHERE `Id`='.($_GET['id'] * 1));
       if($DbResult->num_rows > 0)
       {
@@ -233 +230 @@
         } else $Leader = array('Name' => '', 'Id' => 0);
 
-        $Output .='<strong>Překladatelský tým '.$Team['Name'].'</strong><br />'.
-            'Webové stránky: <a href="http://'.$Team['URL'].'">'.$Team['URL'].'</a><br/>'.
-            'Vedoucí: <a href="'.$this->System->Link('/user.php?user='.$Leader['Id']).'">'.$Leader['Name'].'</a><br/>'.
-            'Popis: '.$Team['Description'].'<br /><br />';
+        $Output .='<h3>Překladatelský tým '.$Team['Name'].'</h3><br />'.
+          'Webové stránky: <a href="http://'.$Team['URL'].'">'.$Team['URL'].'</a><br/>'.
+          'Vedoucí: <a href="'.$this->System->Link('/user.php?user='.$Leader['Id']).'">'.$Leader['Name'].'</a><br/>';
+        if($Team['Description'] != '')
+          $Output .= 'Popis: '.$Team['Description'].'<br />';
+        $Output .= '<br />';
         //$Output .= '<a href="export/?team='.$Team['Id'].'">Exportovat překlad týmu</a> ';
         if($this->System->User->Licence(LICENCE_USER))
           $Output .='<a href="?action=gointeam&amp;id='.$Team['Id'].'">Vstoupit do týmu</a><br /><br />';
+        $XP = GetLevelMinMax($Team['AverageXP']);
         $Output .='<fieldset><legend>Statistika</legend>'.
-            'Počet členů týmu: <a href="'.$this->System->Link('/userlist.php?team='.$Team['Id']).'" title="Zobrazit členy týmu">'.$Team['NumberUser'].'</a><br />'.
-            'Počet přeložených textů týmu: <strong>'.$Team['NumberTranslate'].'</strong><br />'.
-            'Průměrná úroveň překladatelů v týmu: <img src="'.$this->System->Link('/tmp/team/'.$Team['Name'].'/level.png').'" /><br /><br />'.
-            '<strong>Stav dokončení týmu pro verzi '.$this->System->Config['Web']['GameVersion'].'</strong><br />';
+          'Počet členů týmu: <a href="'.$this->System->Link('/userlist.php?team='.$Team['Id']).'" title="Zobrazit členy týmu">'.$Team['NumberUser'].'</a><br />'.
+          'Počet přeložených textů týmu: <strong>'.$Team['NumberTranslate'].'</strong><br />'.
+          'Průměrná úroveň překladatelů v týmu: <strong>'.$XP['Level'].'</strong> zkušenost: '.ProgressBar(150, round($XP['XP'] / $XP['MaxXP'] * 100, 2), $XP['XP'].' / '.$XP['MaxXP']).'<br />'.
+          '<br />'.
+          '<strong>Stav dokončení týmu pro verzi '.$this->System->Config['Web']['GameVersion'].'</strong><br />';
 
         $BuildNumber = GetBuildNumber($this->System->Config['Web']['GameVersion']);
@@ -256 +257 @@
           {
             $Query .= 'SELECT (SELECT COUNT(DISTINCT(`Entry`)) FROM ('.
-                'SELECT `T`.`Entry` FROM `'.$DbRow['TablePrefix'].'` AS `T` '.
-                'WHERE (`User` IN (SELECT `ID` FROM `User` WHERE `Team` = '.$Team['Id'].')) '.
-                'AND (`Complete` = 1) AND (`T`.`Language`!='.$this->System->Config['OriginalLanguage'].') '.
-                'AND (`VersionStart` <= '.$BuildNumber.') AND (`VersionEnd` >= '.$BuildNumber.')'.
-                ') AS `C1`) AS `Translated`, '.
-                '(SELECT COUNT(DISTINCT(`Entry`)) FROM ('.
-                'SELECT `T`.`Entry` FROM `'.$DbRow['TablePrefix'].'` AS `T` '.
-                'WHERE (`Language` = '.$this->System->Config['OriginalLanguage'].') '.
-                'AND (`VersionStart` <= '.$BuildNumber.') AND (`VersionEnd` >= '.$BuildNumber.')'.
-                ') AS `C2`) AS `Total`, "'.$DbRow['Name'].'" AS `Name` UNION ';
+              'SELECT `T`.`Entry` FROM `'.$DbRow['TablePrefix'].'` AS `T` '.
+              'WHERE (`User` IN (SELECT `ID` FROM `User` WHERE `Team` = '.$Team['Id'].')) '.
+              'AND (`Complete` = 1) AND (`T`.`Language`!='.$this->System->Config['OriginalLanguage'].') '.
+              'AND (`VersionStart` <= '.$BuildNumber.') AND (`VersionEnd` >= '.$BuildNumber.')'.
+              ') AS `C1`) AS `Translated`, '.
+              '(SELECT COUNT(DISTINCT(`Entry`)) FROM ('.
+              'SELECT `T`.`Entry` FROM `'.$DbRow['TablePrefix'].'` AS `T` '.
+              'WHERE (`Language` = '.$this->System->Config['OriginalLanguage'].') '.
+              'AND (`VersionStart` <= '.$BuildNumber.') AND (`VersionEnd` >= '.$BuildNumber.')'.
+              ') AS `C2`) AS `Total`, "'.$DbRow['Name'].'" AS `Name` UNION ';
           }
           $Query = substr($Query, 0, - 6);
@@ -276 +277 @@
           $Output .='<table class="BaseTable">';
           $TableColumns = array(
-              array('Name' => 'Name', 'Title' => 'Jméno'),
-              array('Name' => 'Translated', 'Title' => 'Přeložených'),
-              array('Name' => 'Total', 'Title' => 'Anglických'),
-              array('Name' => 'Percent', 'Title' => 'Procenta'),
+            array('Name' => 'Name', 'Title' => 'Jméno'),
+            array('Name' => 'Translated', 'Title' => 'Přeložených'),
+            array('Name' => 'Total', 'Title' => 'Anglických'),
+            array('Name' => 'Percent', 'Title' => 'Procenta'),
           );
 

trunk/Modules/Translation/Form.php

@@ -203 +203 @@
           $Output .= '</td></tr>';
 
-          //todo javascript
+          // TODO: javascript
 
           $Output .= '<script src="'.$this->System->Link('/style/jquery.js').'"></script>'.
@@ -238 +238 @@
 
               $Output .= '<br/><table class="BaseTable">'.
-              '<tr><th>Překladač:</th><th>Nepřeložené</th><th>Přeložené</th>';
+              '<tr><th>Google překladač:</th><th>Nepřeložené</th><th>Přeložené</th>';
               foreach($TranslationTree[$GroupId]['Items'] as $Index => $TextItem)
                 if($TextItem['Visible'] == 1)
@@ -245 +245 @@
                       '<td>'.$LineAJ[$TextItem['Column']].'</td>'.
                       '<td>'.GetTranslateGoogle($LineAJ[$TextItem['Column']]).'</td></tr>';
-
 
               $Output .= '</table>';

trunk/Modules/Translation/Progress.php

@@ -19 +19 @@
       {
         $Query .= 'SELECT (SELECT COUNT(DISTINCT(`Entry`)) FROM ('.
-            'SELECT `T`.`Entry` FROM `'.$DbRow['TablePrefix'].'` AS `T` '.
-            'WHERE (`Complete` = 1) '.$LanguageFilter.' '.
-            'AND (`VersionStart` <= '.$BuildNumber.') AND (`VersionEnd` >= '.$BuildNumber.')'.
-            ') AS `C1`) AS `Translated`, '.
-            '(SELECT COUNT(DISTINCT(`Entry`)) FROM ('.
-            'SELECT `T`.`Entry` FROM `'.$DbRow['TablePrefix'].'` AS `T` '.
-            'WHERE (`Language` = '.$this->System->Config['OriginalLanguage'].') '.
-            'AND (`VersionStart` <= '.$BuildNumber.') AND (`VersionEnd` >= '.$BuildNumber.')'.
-            ') AS `C2`) AS `Total`, "'.$DbRow['Name'].'" AS `Name` UNION ';
+          'SELECT `T`.`Entry` FROM `'.$DbRow['TablePrefix'].'` AS `T` '.
+          'WHERE (`Complete` = 1) '.$LanguageFilter.' '.
+          'AND (`VersionStart` <= '.$BuildNumber.') AND (`VersionEnd` >= '.$BuildNumber.')'.
+          ') AS `C1`) AS `Translated`, '.
+          '(SELECT COUNT(DISTINCT(`Entry`)) FROM ('.
+          'SELECT `T`.`Entry` FROM `'.$DbRow['TablePrefix'].'` AS `T` '.
+          'WHERE (`Language` = '.$this->System->Config['OriginalLanguage'].') '.
+          'AND (`VersionStart` <= '.$BuildNumber.') AND (`VersionEnd` >= '.$BuildNumber.')'.
+          ') AS `C2`) AS `Total`, "'.$DbRow['Name'].'" AS `Name` UNION ';
       }
       $Query = substr($Query, 0, - 6);
@@ -38 +38 @@
       $Output .= '<table class="BaseTable">';
       $TableColumns = array(
-          array('Name' => 'Name', 'Title' => 'Jméno'),
-          array('Name' => 'Translated', 'Title' => 'Přeložených'),
-          array('Name' => 'Total', 'Title' => 'Anglických'),
-          array('Name' => 'Percent', 'Title' => 'Procenta'),
+        array('Name' => 'Name', 'Title' => 'Jméno'),
+        array('Name' => 'Translated', 'Title' => 'Přeložených'),
+        array('Name' => 'Total', 'Title' => 'Anglických'),
+        array('Name' => 'Percent', 'Title' => 'Procenta'),
       );
 
@@ -67 +67 @@
   {
     $this->Title = T('Progress');
-$LanguageList = GetLanguageList();
+    $LanguageList = GetLanguageList();
 
-if(array_key_exists('Version', $_GET)) $_SESSION['StatVersion'] = $_GET['Version'];
-if(!array_key_exists('StatVersion', $_SESSION))
-{
-  if($this->System->User->Licence(LICENCE_USER) and ($this->System->User->PreferredVersionGame != ''))
-  {
-    $_SESSION['StatVersion'] = $this->System->User->PreferredVersionGame;
-  } else
-    $_SESSION['StatVersion'] = $this->System->Config['Web']['GameVersion'];
-}
+    if(array_key_exists('Version', $_GET)) $_SESSION['StatVersion'] = $_GET['Version'];
+    if(!array_key_exists('StatVersion', $_SESSION))
+    {
+      if($this->System->User->Licence(LICENCE_USER) and ($this->System->User->PreferredVersionGame != ''))
+      {
+        $_SESSION['StatVersion'] = $this->System->User->PreferredVersionGame;
+      } else {
+        $_SESSION['StatVersion'] = $this->System->Config['Web']['GameVersion'];
+      }
+    }
 
-if(!isset($_SESSION['language']))
-{
-  if($this->System->User->Licence(LICENCE_USER))
-  {
-    $_SESSION['language'] = $this->System->User->Language;
-  } else $_SESSION['language'] = '';
-}
-if(array_key_exists('language', $_GET)) {
-  if($_GET['language'] == '') $_SESSION['language'] = '';
-    else {
-      $_SESSION['language'] = $_GET['language'] * 1;
+    if(!isset($_SESSION['language']))
+    {
+      if($this->System->User->Licence(LICENCE_USER))
+      {
+        $_SESSION['language'] = $this->System->User->Language;
+      } else {
+        $_SESSION['language'] = '';
+      }
     }
-}
-if(!array_key_exists($_SESSION['language'], $LanguageList)) $_SESSION['language'] = '';
+    if(array_key_exists('language', $_GET))
+    {
+      if($_GET['language'] == '') {
+        $_SESSION['language'] = '';
+      } else {
+        $_SESSION['language'] = $_GET['language'] * 1;
+      }
+    }
+    if(!array_key_exists($_SESSION['language'], $LanguageList)) $_SESSION['language'] = '';
 
-// Show client version selection
-$Output = 'Verze klienta: ';
-$DbResult = $this->Database->query('SELECT `Version`, `Title` FROM `ClientVersion` WHERE `Imported`=1 ORDER BY `Version`');
-while($DbRow = $DbResult->fetch_assoc())
-  $Output .= '<a href="?Version='.$DbRow['Version'].'" title="'.$DbRow['Title'].'">'.$DbRow['Version'].'</a> ';
-$Output .= '<br/>';
+    // Show client version selection
+    $Output = 'Verze klienta: ';
+    $DbResult = $this->Database->query('SELECT `Version`, `Title` FROM `ClientVersion` WHERE `Imported`=1 ORDER BY `Version`');
+    while($DbRow = $DbResult->fetch_assoc())
+      $Output .= '<a href="?Version='.$DbRow['Version'].'" title="'.$DbRow['Title'].'">'.$DbRow['Version'].'</a> ';
+    $Output .= '<br/>';
 
-// Show language selection
-$Output .= 'Jazyk: ';
-$Lang = '<a href="?language=">Všechny</a>';
-if($_SESSION['language'] == '') $Output .= '<strong>'.$Lang.'</strong> ';
-  else $Output .= $Lang;
-foreach($LanguageList as $Language)
-if($Language['Enabled'] == 1)
-{
-  $Lang = ' <a href="?language='.$Language['Id'].'">'.$Language['Name'].'</a>';
-  if($Language['Id'] == $_SESSION['language']) $Output .= '<strong>'.$Lang.'</strong> ';
-    else $Output .= $Lang;
-}
+    // Show language selection
+    $Output .= 'Jazyk: ';
+    $Lang = '<a href="?language=">Všechny</a>';
+    if($_SESSION['language'] == '') $Output .= '<strong>'.$Lang.'</strong> ';
+      else $Output .= $Lang;
+    foreach($LanguageList as $Language)
+    if($Language['Enabled'] == 1)
+    {
+      $Lang = ' <a href="?language='.$Language['Id'].'">'.$Language['Name'].'</a>';
+      if($Language['Id'] == $_SESSION['language']) $Output .= '<strong>'.$Lang.'</strong> ';
+        else $Output .= $Lang;
+    }
 
-if(is_numeric($_SESSION['language'])) $LanguageName = $LanguageList[$_SESSION['language']]['Name'];
-  else $LanguageName = 'Všechny';
-$Output .= '<br/><br /><h3>Statistika dokončení překladů jazyka '.$LanguageName.' pro verzi '.$_SESSION['StatVersion'].'</h3><br/>';
-$Output .= $this->ShowStatTable();
+    if(is_numeric($_SESSION['language'])) $LanguageName = $LanguageList[$_SESSION['language']]['Name'];
+      else $LanguageName = 'Všechny';
+    $Output .= '<br/><br /><h3>Statistika dokončení překladů jazyka '.$LanguageName.' pro verzi '.$_SESSION['StatVersion'].'</h3><br/>';
+    $Output .= $this->ShowStatTable();
 
     return($Output);

trunk/Modules/Translation/Save.php

@@ -213 +213 @@
 
         // Update flag for experience info load
-        $this->Database->query('UPDATE `User` SET `NeedUpdate` = 1 WHERE `ID` = '.$this->System->User->Id);
+        //$this->Database->query('UPDATE `User` SET `NeedUpdate` = 1 WHERE `ID` = '.$this->System->User->Id);
+        UserLevelUpdate($this->System->User->Id);
       } else $Output .= ShowMessage('Položka nenalezena', MESSAGE_CRITICAL);
     } else

trunk/Modules/Translation/Translation.php

@@ -7 +7 @@
 include_once(dirname(__FILE__).'/Progress.php');
 include_once(dirname(__FILE__).'/LoadNames.php');
+include_once(dirname(__FILE__).'/UserLevel.php');
 
 class ModuleTranslation extends AppModule

trunk/Modules/Translation/UserLevel.php

@@ -7 +7 @@
 $index_level = 100;
 $from_diakrit = 3; // higher xp for word with diacritics
-$FontFile = dirname(__FILE__).'/images/FRIZQT__.ttf';
 
 function CheckDiakrit($Word)
@@ -22 +21 @@
 }
 
-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(dirname(__FILE__).'/tmp/'.$prefix.'/')) mkdir(dirname(__FILE__).'/tmp/'.$prefix.'/');
-  if(!file_exists(dirname(__FILE__).'/tmp/'.$prefix.'/'.$user.'/')) mkdir(dirname(__FILE__).'/tmp/'.$prefix.'/'.$user.'/');
-  ImagePNG($Image, dirname(__FILE__).'/tmp/'.$prefix.'/'.$user.'/level.png');
-}
-
 function GetXPFromTranslation($UserId)
 {
@@ -67 +33 @@
       foreach($TranslationTree[$Group['Id']]['Items'] as $Index => $TextItem)
       {
-         $GroupBy .= '`'.$TextItem['Column'].'`, ';
+        $GroupBy .= '`'.$TextItem['Column'].'`, ';
       }
       $GroupBy = substr($GroupBy, 0, -2);
 
-      $IDtran = $System->Database->query('SELECT * FROM `'.$Group['TablePrefix'].'` WHERE (`User` = '.$UserId.') AND (`Complete` = 1) AND (`Take` IS NOT NULL) '.$GroupBy);
+      $IDtran = $System->Database->query('SELECT * FROM `'.$Group['TablePrefix'].'` WHERE '.
+        '(`User` = '.$UserId.') AND (`Complete` = 1) AND (`Take` IS NOT NULL) '.$GroupBy);
       while($Line = $IDtran->fetch_array())
       {
@@ -80 +47 @@
         foreach($TranslationTree[$Group['Id']]['Items'] as $Index => $TextItem)
         {
-          if(($Line[$TextItem['Column']] <> $LineComparison[$TextItem['Column']]) and (strlen($Line[$TextItem['Column']]) > (strlen($LineComparison[$TextItem['Column']]) * 0.5)))
+          if(($Line[$TextItem['Column']] <> $LineComparison[$TextItem['Column']]) and
+            (strlen($Line[$TextItem['Column']]) > (strlen($LineComparison[$TextItem['Column']]) * 0.5)))
           {
             $TextArr = explode(' ', $Line[$TextItem['Column']]);
@@ -91 +59 @@
           } else
           {
-            if (($Line[$TextItem['Column']] == $LineComparison[$TextItem['Column']]) and ('0' == $LineComparison['Language']) and ($LineComparison[$TextItem['Column']] <> '') and ($TextItem['Column'] <> 'ShortCut')) $translated = false;
+            if (($Line[$TextItem['Column']] == $LineComparison[$TextItem['Column']]) and
+              ('0' == $LineComparison['Language']) and ($LineComparison[$TextItem['Column']] <> '') and
+              ($TextItem['Column'] <> 'ShortCut')) $translated = false;
           }
         }
@@ -101 +71 @@
 }
 
-function ImgLevelUpdate()
+function UserLevelUpdate($UserId)
 {
   global $System, $TranslationTree, $Config;
 
   // Main code for users
-  $DbResult = $System->Database->query('SELECT `ID`, `Name` FROM `User` WHERE `NeedUpdate` = 1');
+  $DbResult = $System->Database->query('SELECT `ID`, `Name` FROM `User` WHERE `Id` = '.$UserId);
   if($DbResult->num_rows > 0)
   {
@@ -127 +97 @@
       $xp = GetXPFromTranslation($LineUser['ID']);
       $System->Database->query('UPDATE `User` SET `XP` = '.$xp.', `TranslatedCount` = '.$TranslatedCount.' WHERE `User`.`ID` = '.$LineUser['ID']);
-      CreateImg('user', $LineUser['Name'], $xp);
     }
-
-    // Main code for translation teams
-    $DbResult = $System->Database->query('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 = $DbResult->fetch_array())
-    {
-      CreateImg('team', $LineTeam['Name'], substr($LineTeam['Average'], 0, strpos($LineTeam['Average'],'.')));  //image creation
-    }
-    $System->Database->query('UPDATE `User` SET `NeedUpdate` = 0');
   }
 }
-
-function ImgLevelShow()
-{
-  global $System;
-
-  // Do update for all users
-  $System->Database->query('UPDATE `User` SET `NeedUpdate` = 1');
-  ImgLevelUpdate();
-
-  $Output = '<strong>Uživatelé</strong><br/>';
-  $ID = $System->Database->query('SELECT `ID`, `Name` FROM `User`');
-  while($LineUser = $ID->fetch_array())
-  {
-    $Output .= '<img src="'.$System->Link('/tmp/user/'.$LineUser['Name'].'/level.png').'"/> '.$LineUser['Name'].'<br />';
-  }
-
-  $Output .= '<br/><strong>Týmy</strong><br/>';
-  $ID = $System->Database->query('SELECT `ID`, `Name` FROM `Team`');
-  while($LineTeam = $ID->fetch_array())
-  {
-    $Output .= '<img src="'.$System->Link('/tmp/team/'.$LineTeam['Name'].'/level.png').'"/> '.$LineTeam['Name'].'<br />';
-  }
-  WriteLog('Přegenerovány obrázky úrovní překladatelů a týmů', LOG_TYPE_ADMINISTRATION);
-  return($Output);
-}

trunk/Modules/User/Profile.php

@@ -13 +13 @@
       $Subject = $_POST['subject'];
       $Output = 'Email: <strong>'.$Email.'</strong><br />'.
-          'Předmět: <strong>'.$Subject.'</strong><br />'.
-          'Text: <strong>'.$Text.'</strong><br />';
-
-      if(@mail($Email, $Subject, $Text, 'From: '.$this->System->Config['Web']['AdminEmail'].'\nReply-To: '.$this->System->Config['Web']['AdminEmail'].'\nX-Mailer: PHP/'))
+        'Předmět: <strong>'.$Subject.'</strong><br />'.
+        'Text: <strong>'.$Text.'</strong><br />';
+
+      if(@mail($Email, $Subject, $Text, 'From: '.$this->System->Config['Web']['AdminEmail'].
+        '\nReply-To: '.$this->System->Config['Web']['AdminEmail'].'\nX-Mailer: PHP/'))
       {
         $Output .= ShowMessage(T('Message was sent'));
@@ -156 +157 @@
         'Poslední připojení: <strong>'.HumanDateTime($UserLine['LastLogin']).'</strong><br />'.
         'Počet přeložených: <a href="TranslationList.php?user='.$UserLine['ID'].'&amp;state=2&amp;group=0" title="Zobrazit Všechny jeho přeložené texty"><strong>'.$UserLine['TranslatedCount'].'</strong></a><br />'.
-        'Úroveň: <strong>'.$XP['Level'].'</strong><br/>'.
-        'Zkušenost: '.ProgressBar(150, round($XP['XP'] / $XP['MaxXP'] * 100, 2), $XP['XP'].' / '.$XP['MaxXP']).'<br/>';
+        'Úroveň: <strong>'.$XP['Level'].'</strong> zkušenost: '.ProgressBar(150, round($XP['XP'] / $XP['MaxXP'] * 100, 2), $XP['XP'].' / '.$XP['MaxXP']).'<br/>';
       if($UserLine['TeamName'] != '')
         $Output .= 'Člen týmu: <a href="team/?action=team&amp;id='.$UserLine['Team'].'"><strong>'.$UserLine['TeamName'].'</strong></a><br />';
@@ -175 +175 @@
       }
 
-
     $Output .= '<br /><fieldset><legend>Text profilu:</legend>'.str_replace("\n", '<br/>', $UserLine['Info']).'</fieldset><br/>';
 
     $Output .= '<table class="Home"><tr>'.
-        '<td>'.$this->ShowLastTranslated().'</td>'.
-        '<td>'.$this->ExportList().'</td>'.
-        '</tr></table>';
+      '<td>'.$this->ShowLastTranslated().'</td>'.
+      '<td>'.$this->ExportList().'</td>'.
+      '</tr></table>';
     $Output .= '<br />'.$this->ShowLastForum().'<br />';
     if($this->System->User->Licence(LICENCE_MODERATOR))
@@ -224 +223 @@
           'Email: <strong>'.$UserLine['Email'].'</strong><br />';
       $Output .= '<br/><form action="user.php" method="post"><div>'.
-          'Napsat E-mail:'.
-          '<input type="text" name="email" value="'.$UserLine['Email'].'" /><br/>'.
-          'Předmět:'.
-          '<input type="text" name="subject" value="'.$this->System->Config['Web']['Title'].'" />'.
-          '<br />'.
-          '<textarea name="text" rows="20" cols="62">'.
-          ''."\n".
-          'S pozdravem '.$this->System->User->Name."\n".
-          '--------------------------------------------------------'."\n".
-          $this->System->Config['Web']['Title'].' '.$this->System->Config['Web']['Host'].$this->System->Link('/')."\n".
-          '</textarea><br/>'.
-          '<input type="submit" value="Odeslat" />'.
-          '</div></form></fieldset>';
+        'Napsat E-mail:'.
+        '<input type="text" name="email" value="'.$UserLine['Email'].'" /><br/>'.
+        'Předmět:'.
+        '<input type="text" name="subject" value="'.$this->System->Config['Web']['Title'].'" />'.
+        '<br />'.
+        '<textarea name="text" rows="20" cols="62">'.
+        ''."\n".
+        'S pozdravem '.$this->System->User->Name."\n".
+        '--------------------------------------------------------'."\n".
+        $this->System->Config['Web']['Title'].' '.$this->System->Config['Web']['Host'].$this->System->Link('/')."\n".
+        '</textarea><br/>'.
+        '<input type="submit" value="Odeslat" />'.
+        '</div></form></fieldset>';
       }
     } else $Output .= ShowMessage('Uživatel nenalezen', MESSAGE_CRITICAL);

trunk/Modules/User/UserList.php

@@ -1 +1 @@
 <?php
-
-include_once(dirname(__FILE__).'/../../img_level.php');
 
 class PageUserList extends Page
@@ -8 +6 @@
   {
     $this->Title = T('Translators');
-    ImgLevelUpdate();
-
     $Output = '';
     if(array_key_exists('search', $_GET)) $_SESSION['search'] = $_GET['search'];

trunk/admin/index.php

@@ -3 +3 @@
 $InitSystem = true;
 include_once('../includes/global.php');
-include_once('../img_level.php');
 
 class PageAdmin extends Page
@@ -267 +266 @@
 }
 
+  function ImgLevelShow()
+  {
+    global $System;
+
+    // Do update for all users
+    $System->Database->query('UPDATE `User` SET `NeedUpdate` = 1');
+    ImgLevelUpdate();
+
+    $Output = '<strong>Uživatelé</strong><br/>';
+    $ID = $System->Database->query('SELECT `ID`, `Name` FROM `User`');
+    while($LineUser = $ID->fetch_array())
+    {
+      $Output .= '<img src="'.$System->Link('/tmp/user/'.$LineUser['Name'].'/level.png').'"/> '.$LineUser['Name'].'<br />';
+    }
+
+    $Output .= '<br/><strong>Týmy</strong><br/>';
+    $ID = $System->Database->query('SELECT `ID`, `Name` FROM `Team`');
+    while($LineTeam = $ID->fetch_array())
+    {
+      $Output .= '<img src="'.$System->Link('/tmp/team/'.$LineTeam['Name'].'/level.png').'"/> '.$LineTeam['Name'].'<br />';
+    }
+    WriteLog('Přegenerovány obrázky úrovní překladatelů a týmů', LOG_TYPE_ADMINISTRATION);
+    return($Output);
+  }
+
+
   function ShowLocale()
   {
@@ -289 +314 @@
       if(array_key_exists('action', $_GET))
       {
-        if($_GET['action'] == 'img_level') $Output .= ImgLevelShow();
+        if($_GET['action'] == 'img_level') $Output .= $this->ImgLevelShow();
         else if($_GET['action'] == 'error') $Output .= $this->TestError(12, 'test');
         else if($_GET['action'] == 'exception') $Output .= $this->TestException(12, 'test');

trunk/includes/Version.php

@@ -6 +6 @@
 // and system will need database update.
 
-$Revision = 825; // Subversion revision
+$Revision = 826; // Subversion revision
 $DatabaseRevision = 811; // Database structure revision
 $ReleaseTime = '2015-03-01';