Changeset 309

Timestamp:

Jan 31, 2010, 10:13:41 AM (15 years ago)

Author:

george

Message:

• Opraveno: Chyba vytváření složky při generování addonu.
• Opraveno: Kontrolovat chybně zadané nebo chybějící vstupní pole při ukládání překladů.
• Opraveno: Kontrola zadání hledaných slov při hledání překladů.

Location:

trunk

Files:

• TranslationList.php (modified) (2 diffs)
• export/create_addon.php (modified) (2 diffs)
• img_statistic.php (modified) (1 diff)
• includes/global_function.php (modified) (1 diff)
• save.php (modified) (3 diffs)
• sql/updates/308.sql (modified) (1 diff)

trunk/TranslationList.php

@@ -297 +297 @@
 {
   if(array_key_exists('search', $_GET)) $Search = $_GET['search'];
-  else $Search = $_POST['search'];
+  else if(array_key_exists('search', $_POST)) $Search = $_POST['search'];
+  else ErrorMessage('Nebyl zadán text k vyhledání.');
   
   $sql = 'SELECT *, (SELECT `user`.`user` FROM `user` WHERE `user`.`id` = `'.$Table.'`.`user`) AS `User` FROM `'.$Table.'` WHERE `ID` LIKE "%'.$Search.'%"
@@ -306 +307 @@
   foreach($TranslationTree[$GroupId]['Items'] as $Item)
   {
-  if($Item['Column'] != '') $sql .= ' OR `'.$Item['Column'].'` LIKE "%'.$Search.'%"';
+    if($Item['Column'] != '') $sql .= ' OR `'.$Item['Column'].'` LIKE "%'.$Search.'%"';
   }
     

trunk/export/create_addon.php

@@ -155 +155 @@
       $Buffer .= 'f("'.addslashes($Line['ShortCut']).'", "'.$Original.'", "'.$Translated.'");'."\n";
     }
-    //nepřeložené texty
+    // Nepřeložené texty
     $Query = 'SELECT '.$Column['Column'].' as Original, ShortCut FROM '.$Group['TablePrefix'].' WHERE Language = 0  AND VersionStart <= '.$this->ClientVersion['BuildNumber'].' AND VersionEnd >= '.$this->ClientVersion['BuildNumber'].' AND entry NOT IN (SELECT entry FROM '.$Group['TablePrefix'].' WHERE (Complete = 1)  AND VersionStart <= '.$this->ClientVersion['BuildNumber'].' AND VersionEnd >= '.$this->ClientVersion['BuildNumber'].' AND '.$this->WhereLang.' AND '.$this->WhereUsers.')';
     $DbResult = $this->Database->query($Query);
@@ -169 +169 @@
       $Buffer .= 'f("'.addslashes($Line['ShortCut']).'", "'.$Original.'", "'.$Translated.'");'."\n";
     }
+    if(!file_exists($this->TempDir.'CzWoW/')) mkdir($this->TempDir.'CzWoW/', 0777, true);
     file_put_contents($this->TempDir.'CzWoW/LocalizationStrings.lua', $Buffer);
   }

trunk/img_statistic.php

@@ -47 +47 @@
 imagefilledrectangle($Image, 0, 0, $PercentBar, 59, $Color2);
 $FontSize = 10;
-if(($NumberPerDay > 0) and ($team == '') and ($language == '') and ($user_sql == '') and ($NotTran > 0)) 
+if(($NumberPerDay > 0) and ($team == '') and ($language == '') and ($NotTran > 0)) 
 {
   $TimeToTranslate = ($NotTran  / $NumberPerDay) * $Days;

trunk/includes/global_function.php

@@ -550 +550 @@
 }
 
+function ErrorMessage($Text)
+{
+  echo($Text);
+  ShowFooter();
+  die();
+}
+
 ?>

trunk/save.php

@@ -12 +12 @@
 if(array_key_exists('entry', $_POST) and Licence(LICENCE_USER)) 
 {
-  $entry = $_POST['entry'];  
+  $entry = $_POST['entry'] * 1; // Make numeric  
   $UserID = $_SESSION['UserID'];
-  $TextID = $_POST['ID'];
-  $Language = $_POST['Language'];
+  $TextID = $_POST['ID'] * 1;
+  $Language = $_POST['Language'] * 1;
   if(array_key_exists('End', $_POST)) $complete = 1;
     else $complete = 0;
              
-  $LineAJ = mysql_fetch_array($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));
-  $Line = mysql_fetch_array($Database->SQLCommand('SELECT * FROM '.$Table.' WHERE user='.$UserID.' AND entry = '.$entry.'
-   AND VersionStart = '.$LineTake['VersionStart'].' AND VersionEnd = '.$LineTake['VersionEnd']));
+  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']);
+  $Line = mysql_fetch_array($DbResult);
   if(!$Line) 
   {
-  $Columns = '`Language` , `User` , `Complete` , `Take` , `VersionStart` , `VersionEnd`';
-  $Values = $Language.','.$UserID.','.$complete.','.$TextID.','.$LineTake['VersionStart'].','.$LineTake['VersionEnd'];
-  foreach($TranslationTree[$GroupId]['Items'] as $GroupItem)
-  {
+    $Columns = '`Language` , `User` , `Complete` , `Take` , `VersionStart` , `VersionEnd`';
+    $Values = $Language.','.$UserID.','.$complete.','.$TextID.','.$LineTake['VersionStart'].','.$LineTake['VersionEnd'];
+    foreach($TranslationTree[$GroupId]['Items'] as $GroupItem)
+    {
       if(array_key_exists($GroupItem['Column'], $_POST))
+      {
+        if (($GroupItem['Column'] <> 'ShortCut') and ($GroupItem['Column'] <> 'Rank'))
+        {
+          $Columns .= ', `'.$GroupItem['Column'].'`';
+          $Values .= ', "'.@$_POST[$GroupItem['Column']].'"';
+        }
+      }
+    }  
+    //echo('INSERT INTO `'.$Table.'` ('.$Columns.') VALUES ('.$Values.')');
+    //  $Database->SQLCommand('INSERT INTO `'.$Table.'` (`entry`, '.$Columns.') VALUES ('.$entry.','.$Values.')');
+    //  $LastID = mysql_insert_id();
+
+    // Kontrolování stejných textů  
+    $Where = 'Language = 0';
+    foreach($TranslationTree[$GroupId]['Items'] as $GroupItem)
     {
-     if (($GroupItem['Column'] <> 'ShortCut') and ($GroupItem['Column'] <> 'Rank'))   {
-      $Columns .= ', `'.$GroupItem['Column'].'`';
-        $Values .= ', "'.@$_POST[$GroupItem['Column']].'"';
-       }
+      if(($GroupItem['Column'] <> 'ShortCut') and ($GroupItem['Column'] <> 'Rank')) 
+      {
+        if(array_key_exists($GroupItem['Column'], $_POST))  
+          $Where .= ' AND `'.$GroupItem['Column'].'` = "'.addslashes($LineAJ[$GroupItem['Column']]).'"';
+            else $Where .= ' AND `'.$GroupItem['Column'].'` = ""';
+      }
+      if($GroupItem['Column'] == 'Rank') 
+      {
+        if(array_key_exists('Rank', $_POST)) 
+        {
+          $Rank = substr($_POST['Rank'],0 ,strpos($_POST['Rank'],' '));
+          if(strlen($Rank) <= 2) 
+            $Rank = substr($_POST['Rank'], strpos($_POST['Rank'],' ') + 1);
+        } else $Rank = 'Úroveň';
+      }  
     }
-  }  
-  //echo('INSERT INTO `'.$Table.'` ('.$Columns.') VALUES ('.$Values.')');
-  //  $Database->SQLCommand('INSERT INTO `'.$Table.'` (`entry`, '.$Columns.') VALUES ('.$entry.','.$Values.')');
-  //  $LastID = mysql_insert_id();
-
-  //kontrolování stejných textů
+    
+    $SameTranID = $Database->SQLCommand('SELECT * FROM '.$Table.' WHERE '.$Where);
+    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']));
+      if(!$Line) 
+      {
+        if($GroupItem['Column'] <> 'ShortCut') 
+        {  
+          if(isset($Rank)) 
+          {
+            $Rank_number = substr($SameTranLine['Rank'], strpos($SameTranLine['Rank'],' ') + 1); 
+            if($Rank_number <> '') $Rank_cur = $Rank.' '.$Rank_number;
+              else $Rank_cur = $SameTranLine['Rank'];
+            $Database->SQLCommand('INSERT INTO `'.$Table.'` (`entry`, '.$Columns.', `Rank`) VALUES ('.$SameTranLine['entry'].','.$Values.',"'.$Rank_cur.'")');
+          } else 
+          { 
+            $Database->SQLCommand('INSERT INTO `'.$Table.'` (`entry`, '.$Columns.') VALUES ('.$SameTranLine['entry'].','.$Values.')');
+          } 
+        } else 
+        { 
+          $Database->SQLCommand('INSERT INTO `'.$Table.'` (`entry`, '.$Columns.', `ShortCut`) VALUES ('.$SameTranLine['entry'].','.$Values.',"'.$SameTranLine['ShortCut'].'")');
+        }
+        $LastIDs[] = mysql_insert_id();
+      }
+    }
   
-  
-  $Where = 'Language = 0';
-  foreach($TranslationTree[$GroupId]['Items'] as $GroupItem)
-  {
-   if (($GroupItem['Column'] <> 'ShortCut') and ($GroupItem['Column'] <> 'Rank')) 
-      if(array_key_exists($GroupItem['Column'], $_POST))  {
-    $Where .= ' AND `'.$GroupItem['Column'].'` = "'.addslashes($LineAJ[$GroupItem['Column']]).'"';
-    } else {
-      $Where .= ' AND `'.$GroupItem['Column'].'` = ""';
-    }
-   if ($GroupItem['Column'] == 'Rank') {
-     if (array_key_exists('Rank',$_POST)) {
-       $Rank = substr($_POST['Rank'], 0 ,strpos($_POST['Rank'],' '));
-       if (strlen($Rank)<= 2) 
-         $Rank = substr($_POST['Rank'], strpos($_POST['Rank'],' ')+1);
-     } else {
-     $Rank = 'Úroveň';
-     }
-   }
-  }  
-  
-  $SameTranID = $Database->SQLCommand('SELECT * FROM '.$Table.' WHERE '.$Where);
-  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']));
-      if(!$Line) {
-         if ($GroupItem['Column'] <> 'ShortCut') {  
-         if (isset($Rank)) {
-           $Rank_number = substr($SameTranLine['Rank'], strpos($SameTranLine['Rank'],' ')+1); 
-         if ($Rank_number <> '') {
-             $Rank_cur = $Rank.' '.$Rank_number;
-         } else {
-             $Rank_cur = $SameTranLine['Rank'];
-           }
-            $Database->SQLCommand('INSERT INTO `'.$Table.'` (`entry`, '.$Columns.', `Rank`) VALUES ('.$SameTranLine['entry'].','.$Values.',"'.$Rank_cur.'")');
-       } else { 
-          $Database->SQLCommand('INSERT INTO `'.$Table.'` (`entry`, '.$Columns.') VALUES ('.$SameTranLine['entry'].','.$Values.')');
-       }
-     } else { 
-          $Database->SQLCommand('INSERT INTO `'.$Table.'` (`entry`, '.$Columns.', `ShortCut`) VALUES ('.$SameTranLine['entry'].','.$Values.',"'.$SameTranLine['ShortCut'].'")');
-     }
-      $LastIDs[] = mysql_insert_id();
-    }
-  }
-  
-  //konec kontrolování stejných textů
+    // 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 />';
+    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);
-  }
+    }
   } else
   {
@@ -110 +113 @@
     WriteLog('Změny v překladu <a href="form.php?group='.$GroupId.'&amp;ID='.$TextID.'">'.$TextID.'</a> ('.$entry.') uloženy!', 1);
   }
-    //addres and redirecting
-    echo('<br />Překládat: <a href="TranslationList.php?group='.$GroupId.'&amp;action=notran">Nepřeložené</a> '); 
+  // Address and redirecting
+  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);
-    echo('<br /><br />');
+  $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));
     
-    switch ($redirecting['redirecting']) {
-      case 1:
-            echo('<script type="text/javascript" language="JavaScript" charset="utf-8">'.
-          'setTimeout("parent.location.href=\''.htmlspecialchars_decode('TranslationList.php?group='.$GroupId.'&amp;action=notran').'\'", 1500)'.
-          '</script>');
-        break;
-      case 2:
-        if ($next <> '')
-            echo('<script type="text/javascript" language="JavaScript" charset="utf-8">'.
+  switch($redirecting['redirecting']) 
+  {
+    case 1:
+      echo('<script type="text/javascript" language="JavaScript" charset="utf-8">'.
+       'setTimeout("parent.location.href=\''.htmlspecialchars_decode('TranslationList.php?group='.$GroupId.'&amp;action=notran').'\'", 1500)'.
+       '</script>');
+      break;
+    case 2:
+      if($next <> '')
+        echo('<script type="text/javascript" language="JavaScript" charset="utf-8">'.
           'setTimeout("parent.location.href=\''.htmlspecialchars_decode($next).'\'", 1500)'.
           '</script>');
-        break;
-      case 3:
-        if ($prev <> '')
-            echo('<script type="text/javascript" language="JavaScript" charset="utf-8">'.
+      break;
+    case 3:
+      if($prev <> '')
+        echo('<script type="text/javascript" language="JavaScript" charset="utf-8">'.
           'setTimeout("parent.location.href=\''.htmlspecialchars_decode($prev).'\'", 1500)'.
           '</script>');
-        break;
+    break;
   }
   
   echo ('Z této stránky můžete být automaticky přesměrování. Nastavit kam chcete být přesměrování si můžete v <a href="'.$Config['Web']['BaseURL'].'Options.php" Title = "Nastavení uživatele">Nastavení</a>');
     
-  $Database->SQLCommand('UPDATE `user` SET `NeedUpdate` = 1 WHERE ID = '.$UserID); //informace o nutnosti načíst XP
+  // Aktualizace informace o nutnosti načíst XP
+  $Database->SQLCommand('UPDATE `user` SET `NeedUpdate` = 1 WHERE ID = '.$UserID); 
 } else 
 {
@@ -170 +175 @@
           
 ShowFooter();      
+
 ?>

trunk/sql/updates/308.sql

@@ -2 +2 @@
 
 -- Salt passwords
-UPDATE `user` SET Salt = SUBSTRING(SHA1(RAND()), 1, 8);
-UPDATE `user` SET `pass` = sha1(CONCAT(`pass`, `Salt`))
+UPDATE `user` SET `Salt` = SUBSTRING(SHA1(RAND()), 1, 8);
+UPDATE `user` SET `pass` = sha1(CONCAT(`pass`, `Salt`));