Changeset 349

Timestamp:

Mar 3, 2010, 10:37:40 AM (14 years ago)

Author:

george

Message:

• Opraveno: Neprovádět prázdné SQL řádky při vykonávání exportu pro AoWoW.
• Opraveno: Chyba použití globální proměné při generování obrázků XP překladatelů při zobzarení týmu. Nestandardně zde byl vkládán skript přes include uvnitř funkce, což zapříčinilo změnu globálních proměnných na lokální.
• Upraveno: Doplněny SQL uvozovky v některých dotazech.

Location:

trunk

Files:

• admin.php (modified) (2 diffs)
• export/export.php (modified) (7 diffs)
• export/process_aowow_export.php (modified) (1 diff)
• img_level.php (modified) (4 diffs)
• img_statistic.php (modified) (1 diff)
• save.php (modified) (5 diffs)
• team.php (modified) (2 diffs)
• userlist.php (modified) (1 diff)

trunk/admin.php

@@ -2 +2 @@
 
 include('includes/global.php');
+include_once('img_level.php');
 
 ShowPage();
 
-echo('<h3>Volby pro správu</h3>');
-if(Licence(LICENCE_ADMIN))
+function ShowMenu()
 {
+  global $Config;
+  
+  echo('<h3>Volby pro správu</h3>');
   echo('<a href="https://wowpreklad.zdechov.net/mysql/">Správa databáze</a><br/>'.
   '<small>Rozhraní phpMyAdmin pro přímou správu databáze</small><br/><br/>');
@@ -16 +19 @@
   echo('<a href="'.$Config['Web']['BaseURL'].'log.php">Záznamy událostí</a><br/>'.
   '<small>Procházení všech systémových záznamů akcí a událostí</small><br/><br/>');
-  echo('<a href="'.$Config['Web']['BaseURL'].'img_level.php?nothide">Generování obrázků úrovní překladatelů</a><br/>'.
-  '<small>Ihned provede přegenerování všech obrázků úrovní překladatelů</small><br/><br/>');
-  
-  
+  echo('<a href="'.$Config['Web']['BaseURL'].'admin.php?action=img_level">Generování obrázků úrovní překladatelů</a><br/>'.
+  '<small>Ihned provede přegenerování všech obrázků úrovní překladatelů</small><br/><br/>');    
+}
+
+if(Licence(LICENCE_ADMIN))
+{
+  if(array_key_exists('action', $_GET))
+  {
+    if($_GET['action'] == 'img_level') 
+    {
+      ImgLevelShow();
+    } else ShowMenu();
+  } else ShowMenu();  
 } else echo('Nemáte oprávnění');
       

trunk/export/export.php

@@ -23 +23 @@
   function LoadFilters()
   {  
-    $DbResult = $this->Database->query('SELECT * FROM `Export` WHERE Id='.$this->Id);
+    $DbResult = $this->Database->query('SELECT * FROM `Export` WHERE `Id`='.$this->Id);
     $this->Export = $DbResult->fetch_assoc();
 
     // Filter selected languages
     $this->WhereLang = '';
-    $DbResult = $this->Database->query('SELECT * FROM `ExportLanguage` WHERE Export='.$this->Id.' ORDER BY Sequence');
+    $DbResult = $this->Database->query('SELECT * FROM `ExportLanguage` WHERE `Export`='.$this->Id.' ORDER BY `Sequence`');
     while($Language = $DbResult->fetch_assoc())
-      $this->WhereLang .= ' OR (Language = '.$Language['Language'].')'; 
+      $this->WhereLang .= ' OR (`Language` = '.$Language['Language'].')'; 
     if($this->WhereLang == '') $this->WhereLang = 1; 
       else $this->WhereLang = '('.substr($this->WhereLang, 4).')';
@@ -37 +37 @@
     $this->SelectedUsers = '';  
     $this->UserNames = '';
-    $DbResult = $this->Database->query('SELECT ExportUser.*, user.user FROM `ExportUser` LEFT JOIN user ON user.ID=ExportUser.User WHERE ExportUser.Export='.$this->Id.' ORDER BY ExportUser.Sequence');
+    $DbResult = $this->Database->query('SELECT `ExportUser`.*, `user`.`user` FROM `ExportUser` LEFT JOIN `user` ON `user`.`ID`=`ExportUser`.`User` WHERE `ExportUser`.`Export`='.$this->Id.' ORDER BY `ExportUser`.`Sequence`');
     while($User = $DbResult->fetch_assoc())
     {
@@ -52 +52 @@
     } else
     {
-      $this->WhereUsers = '(User IN ('.$this->SelectedUsers.'))';
-      $this->OrderByUserList = ' ORDER BY FIELD(User, '.$this->SelectedUsers.')';
+      $this->WhereUsers = '(`User` IN ('.$this->SelectedUsers.'))';
+      $this->OrderByUserList = ' ORDER BY FIELD(`User`, '.$this->SelectedUsers.')';
     }
     
@@ -59 +59 @@
     if(isset($_SESSION) and ($_SESSION['UserID'] != ''))
     {
-      $DbResult = $this->Database->query('SELECT user FROM `user` WHERE ID='.$_SESSION['UserID']);
+      $DbResult = $this->Database->query('SELECT `user` FROM `user` WHERE `ID`='.$_SESSION['UserID']);
       $this->User = $DbResult->fetch_assoc();
     } else $this->User = array('user' => 'Neznámý');
@@ -141 +141 @@
       $Buffer .= '--'.$AoWoWTable.', ';
       $Buffer .= "\n\n";  
-      $Query = 'SELECT name,'.$IndexColum.' FROM '.$AoWoWTable;
+      $Query = 'SELECT `name`,`'.$IndexColum.'` FROM `'.$AoWoWTable.'`';
       $DbResult = $Database2->query($Query);
       while($Line = $DbResult->fetch_assoc()) 
@@ -147 +147 @@
         $Ori_text = $Line['name'];
         $DbResult2 = $Database2->query('SELECT text as en,
-        (SELECT text FROM '.$Config['Database']['Database'].'.global_strings as tabletran
-         WHERE tableen.entry = tabletran.entry AND (Complete = 1) AND '.$this->WhereLang.'
-          AND '.$this->WhereUsers.$this->OrderByUserList.' LIMIT 1) as tran
-         FROM '.$Config['Database']['Database'].'.global_strings as tableen WHERE
-          text = "'.addslashes($Ori_text).'" LIMIT 1');
+        (SELECT `text` FROM `'.$Config['Database']['Database'].'`.`global_strings` AS `tabletran`
+         WHERE `tableen`.`entry` = `tabletran`.`entry` AND (`Complete` = 1) AND '.$this->WhereLang.' AND '.$this->WhereUsers.$this->OrderByUserList.' LIMIT 1) AS `tran`
+         FROM `'.$Config['Database']['Database'].'`.`global_strings` AS `tableen` WHERE
+          `text` = "'.addslashes($Ori_text).'" LIMIT 1');
         $Tran = $DbResult2->fetch_assoc();
         //echo ($Line['name'].'='.$Tran['tran']);
         if($Tran['tran'] == '') 
         {
-          $DbResult2 = $Database2->query('SELECT OptionText as en,
-          (SELECT OptionText FROM '.$this->Config['Database']['Database'].'.npc_option as tabletran
-           WHERE tableen.entry = tabletran.entry AND (Complete = 1) AND '.$this->WhereLang.'
-            AND '.$this->WhereUsers.$this->OrderByUserList.' LIMIT 1) as tran
-          FROM '.$this->Config['Database']['Database'].'.npc_option as tableen WHERE
-            OptionText = "'.addslashes($Ori_text).'" LIMIT 1');
+          $DbResult2 = $Database2->query('SELECT `OptionText` AS `en`,
+          (SELECT `OptionText` FROM `'.$this->Config['Database']['Database'].'`.`npc_option` AS `tabletran`
+           WHERE `tableen`.`entry` = `tabletran`.`entry` AND (`Complete` = 1) AND '.$this->WhereLang.'
+            AND '.$this->WhereUsers.$this->OrderByUserList.' LIMIT 1) AS `tran`
+          FROM `'.$this->Config['Database']['Database'].'`.`npc_option` AS `tableen` WHERE
+            `OptionText` = "'.addslashes($Ori_text).'" LIMIT 1');
           $Tran = $DbResult2->fetch_assoc();
         }
         
         if($Tran['tran'] <> '')
-          $Buffer .= 'UPDATE `'.$AoWoWTable.'` SET name = "'.addslashes($Tran['tran']).'" WHERE '.$IndexColum.' = '.$Line[$IndexColum].' ;'."\n";
+          $Buffer .= 'UPDATE `'.$AoWoWTable.'` SET `name` = "'.addslashes($Tran['tran']).'" WHERE '.$IndexColum.' = '.$Line[$IndexColum].' ;'."\n";
       }
       $Buffer .= "\n\n";  
@@ -204 +203 @@
         $Group['MangosTableIndex'] = 'entry';
       }
-      $Query = 'SELECT *,(SELECT user FROM user WHERE user.ID=T.User) as UserName FROM (SELECT * FROM '.$Group['TablePrefix'].' WHERE (Complete = 1) AND (VersionStart <= '.$this->ClientVersion['BuildNumber'].') AND (VersionEnd >= '.$this->ClientVersion['BuildNumber'].') AND '.$this->WhereLang.' AND '.$this->WhereUsers.$this->OrderByUserList.') AS T GROUP BY T.entry'; 
+      $Query = 'SELECT *,(SELECT `user` FROM `user` WHERE `user`.`ID`=`T`.`User`) AS `UserName` FROM (SELECT * FROM `'.$Group['TablePrefix'].'` WHERE (`Complete` = 1) AND (`VersionStart` <= '.$this->ClientVersion['BuildNumber'].') AND (`VersionEnd` >= '.$this->ClientVersion['BuildNumber'].') AND '.$this->WhereLang.' AND '.$this->WhereUsers.$this->OrderByUserList.') AS `T` GROUP BY `T`.`entry`'; 
       //echo($Query);
       $Buffer .= '    <group id="'.$Group['Id'].'" name="'.$Group['TablePrefix'].'">'."\n";

trunk/export/process_aowow_export.php

@@ -46 +46 @@
 {
   //echo($Line."\n");
-  $Database2->query($Line);
+  if(trim($Line) != '') $Database2->query($Line);
 }
 

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();
-
-$FontFile = 'images/FRIZQT__.ttf';
 
 // Nastavení
@@ -13 +7 @@
 $index_level = 100;
 $from_diakrit = 3; //zvýšené xp za slovo s diakritikou
+$FontFile = 'images/FRIZQT__.ttf';
 
 function CheckDiakrit($word)
@@ -26 +21 @@
     }
   }
-  return $result;
+  return($result);
 }
 
 function CreateImg($prefix, $user, $xp) 
 {
-  global $index_level, $FontFile;
-    
+  global $index_level, $FontFile;   
+  
   if($xp > 0) 
   {
-    $level = sqrt ($xp / $index_level);
+    $level = sqrt($xp / $index_level);
     $level = substr($level, 0, strpos($level, '.'));
   } else $level = 0;
@@ -106 +101 @@
 }
 
-// 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 />');
+function ImgLevelUpdate()
+{ 
+  global $Database;
+
+  // Hlavní kod pro uživatele
+  $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
+  }
+
+  // Hlavní kod pro překladatelské týmy
+  $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
+  }
+  $Database->SQLCommand('UPDATE user SET NeedUpdate = 0');
 }
 
-// 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)) 
+function ImgLevelShow()
 {
-  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 />');
+  global $Database;
+  
+  // Hlavní kod pro uživatele
+  $ID = $Database->SQLCommand('SELECT ID,user FROM user');
+  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
+    echo('<img src="tmp/user/'.$LineUser['user'].'/level.png" /><br />');
+  }
+
+  // Hlavní kod pro překladatelské týmy
+  $ID = $Database->SQLCommand('SELECT ID,name,(SELECT avg(XP) FROM user WHERE team = Team.Id) as average FROM Team');
+  while($LineTeam = mysql_fetch_array($ID)) 
+  {
+    CreateImg('team', $LineTeam['name'], substr($LineTeam['average'], 0, strpos($LineTeam['average'],'.')));  // Vytváření obrázku
+    echo('<img src="tmp/team/'.$LineTeam['name'].'/level.png" /><br />');
+  }
+  $Database->SQLCommand('UPDATE user SET NeedUpdate = 0');
 }
-$Database->SQLCommand('UPDATE user SET NeedUpdate = 0');
-
-if($nothide) ShowFooter();      
 
 ?>

trunk/img_statistic.php

@@ -15 +15 @@
 if(array_key_exists('language', $_GET)) 
 {
-  $language = ' AND `Language` = '.$_GET['language'].'';
+  $language = ' AND (`Language` = '.$_GET['language'].')';
 } else $language = '';
 
 
-$ID = mysql_fetch_row($Database->SQLCommand('SELECT MAX(`VersionEnd`) FROM '.$Group['TablePrefix']));
+$DbResult = $Database->SQLCommand('SELECT MAX(`VersionEnd`) FROM '.$Group['TablePrefix']);
+$ID = mysql_fetch_row($DbResult);
 $BuildNumber_max = $ID[0];
 
 $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));
+$ID = mysql_fetch_row($Database->SQLCommand('SELECT count(distinct(`entry`)) FROM `'.$Group['TablePrefix'].'` WHERE '.$where));
 $NumberTranslate = $ID[0];
   
-$ID = mysql_fetch_row($Database->SQLCommand('SELECT count(distinct(`entry`)) FROM '.$Group['TablePrefix'].' WHERE `VersionEnd` = '.$BuildNumber_max.' AND (`Language` = 0)'));
+$ID = mysql_fetch_row($Database->SQLCommand('SELECT count(distinct(`entry`)) FROM `'.$Group['TablePrefix'].'` WHERE `VersionEnd` = '.$BuildNumber_max.' AND (`Language` = 0)'));
 $NumberAJ = $ID[0];
 
-$ID = mysql_fetch_row($Database->SQLCommand('SELECT count(*) FROM `log` WHERE `Type` = 1 AND `date` >= CURRENT_DATE - INTERVAL '.$Days.' DAY
- AND `text` LIKE "%'.$Group['Name'].'%"'));
+$DbResult = $Database->SQLCommand('SELECT count(*) FROM `log` WHERE (`Type` = 1) AND (`date` >= CURRENT_DATE - INTERVAL '.$Days.' DAY) AND (`text` LIKE "%'.$Group['Name'].'%")');
+$ID = mysql_fetch_row($DbResult);
 $NumberPerDay = $ID[0]; //date ("Y-m-d H:i:s")
 

trunk/save.php

@@ -19 +19 @@
     else $complete = 0;
              
-  $DbResult = $Database->SQLCommand('SELECT * FROM '.$Table.' WHERE Language = 0 AND entry = '.$entry);
+  $DbResult = $Database->SQLCommand('SELECT * FROM `'.$Table.'` WHERE (`Language` = 0) AND (`entry` = '.$entry.')');
   if(mysql_num_rows($DbResult) == 0) ErrorMessage('Neznámé Id položky'); 
   $LineAJ = mysql_fetch_array($DbResult);
-  $LineTake = mysql_fetch_array($Database->SQLCommand('SELECT VersionEnd,VersionStart FROM '.$Table.' WHERE ID = '.$TextID));
+  $LineTake = mysql_fetch_array($Database->SQLCommand('SELECT `VersionEnd`, `VersionStart` FROM `'.$Table.'` WHERE `ID` = '.$TextID));
   if(mysql_num_rows($DbResult) == 0) ErrorMessage('Neznámé Id položky');
-  $DbResult = $Database->SQLCommand('SELECT * FROM '.$Table.' WHERE user='.$UserID.' AND entry = '.$entry.' AND VersionStart = '.$LineTake['VersionStart'].' AND VersionEnd = '.$LineTake['VersionEnd']);
+  $DbResult = $Database->SQLCommand('SELECT * FROM `'.$Table.'` WHERE (`user`='.$UserID.') AND (`entry` = '.$entry.') AND (`VersionStart` = '.$LineTake['VersionStart'].') AND (`VersionEnd` = '.$LineTake['VersionEnd'].')');
   $Line = mysql_fetch_array($DbResult);
   if(!$Line) 
@@ -69 +69 @@
     while($SameTranLine = mysql_fetch_assoc($SameTranID))
     {
-      $Line = mysql_fetch_array($Database->SQLCommand('SELECT * FROM '.$Table.' WHERE user='.$UserID.' AND entry = '.$SameTranLine['entry'].' AND VersionStart = '.$LineTake['VersionStart'].' AND VersionEnd = '.$LineTake['VersionEnd']));
+      $Line = mysql_fetch_array($Database->SQLCommand('SELECT * FROM `'.$Table.'` WHERE (`user`='.$UserID.') AND (`entry` = '.$SameTranLine['entry'].') AND (`VersionStart` = '.$LineTake['VersionStart'].') AND (`VersionEnd` = '.$LineTake['VersionEnd'].')'));
       if(!$Line) 
       {
@@ -93 +93 @@
   
     // Konec kontrolování stejných textů    
-    
+        
     echo('Překlad <a href="form.php?group='.$GroupId.'&amp;ID='.$TextID.'">'.$TextID.'</a> ('.$entry.') uložen!<br />');
     foreach($LastIDs as $LastID)
     {
       if(count($LastIDs) > 1) echo('Nalezen stejný překlad, systémově přeložen: <a href="form.php?group='.$GroupId.'&amp;ID='.$LastID.'">'.$LastID.'</a> Převzat z: <a href="form.php?group='.$GroupId.'&amp;ID='.$TextID.'">'.$TextID.'</a><br />');
-      WriteLog('Text <a href="form.php?group='.$GroupId.'&amp;ID='.$LastID.'">'.$LastID.'</a> ze skupiny <a href="?group='.$GroupId.'&amp;action=filter">'.$TranslationTree[$GroupId]['Name'].'</a> uložen! Převzat z <a href="form.php?group='.$GroupId.'&amp;ID='.$TextID.'">'.$TextID.'</a>.', 1);
+      WriteLog('Text <a href="form.php?group='.$GroupId.'&amp;ID='.$LastID.'">'.$LastID.'</a> ze skupiny <a href="TranslationList.php?group='.$GroupId.'&amp;action=filter">'.$TranslationTree[$GroupId]['Name'].'</a> uložen! Převzat z <a href="form.php?group='.$GroupId.'&amp;ID='.$TextID.'">'.$TextID.'</a>.', 1);
     }
   } else
@@ -106 +106 @@
     if(array_key_exists($GroupItem['Column'], $_POST))
       $sql .= ', `'.$GroupItem['Column'].'`="'.$_POST[$GroupItem['Column']].'"';
-    $sql .= ', `Language` = '.$Language.' WHERE `ID` = '.$TextID.' AND `Language`  <> 0';
+    $sql .= ', `Language` = '.$Language.' WHERE `ID` = '.$TextID.' AND `Language` <> 0';
   //echo($sql);
     $Database->SQLCommand($sql);
@@ -116 +116 @@
   echo('<br />Překládat: <a href="TranslationList.php?group='.$GroupId.'&amp;action=notran">Nepřeložené</a> '); 
 
-  $prev = FollowingTran($TextID,$Table,$GroupId, True);
-  $next = FollowingTran($TextID,$Table,$GroupId);
+  $prev = FollowingTran($TextID, $Table, $GroupId, True);
+  $next = FollowingTran($TextID, $Table, $GroupId);
   echo('<br /><br />');
   $redirecting = mysql_fetch_assoc($Database->SQLCommand('SELECT `redirecting` FROM `user` WHERE `ID`='.$UserID));

trunk/team.php

@@ -2 +2 @@
 
 include('includes/global.php');
+include_once('img_level.php');
 
 ShowPage();
@@ -192 +193 @@
   if(array_key_exists('id', $_GET))
   { 
-    include('img_level.php');
+    ImgLevelUpdate();
     $Columns = '';
     $Joins = '';

trunk/userlist.php

@@ -2 +2 @@
 
 include('includes/global.php');
+include_once('img_level.php');
 
 ShowPage();
-
-include('img_level.php');
+ImgLevelUpdate();
 
 echo('<h3>Seznam uživatelů</h3>');