Changeset 831 for trunk/Modules/Translation/Save.php

Timestamp:

Aug 24, 2015, 9:57:27 PM (9 years ago)

Author:

chronos

Message:

• Removed: Do not use fixed number for text group item index. Do not exclude all other groups for mass translation except spell rank.
• Modified: Translation save page redirection part of code moved to separate method.
• Fixed: Translation save condition for empty original text items.

File:

• trunk/Modules/Translation/Save.php (modified) (7 diffs)

trunk/Modules/Translation/Save.php

@@ -42 +42 @@
 
             // Get all similar english texts
-            $Filter = '';
+            $Filter = array();
             foreach($Group['Items'] as $GroupItem)
-              if(($GroupItem['Visible'] == 1) and ($EnglishText[$GroupItem['Column']] != ''))
-              $Filter .= ' OR (`'.$GroupItem['Column'].'` = "'.addslashes($EnglishText[$GroupItem['Column']]).'")';
-            if(substr($Filter, 0, 3) == ' OR') $Filter = ' AND ('.substr($Filter, 3).')';
-
-            $DbResult = $this->Database->query('SELECT * FROM `'.$Table.'` WHERE (`Language` = '.$this->System->Config['OriginalLanguage'].')'.$Filter);
+              if(($GroupItem['Visible'] == 1))
+              $Filter[] = '(`'.$GroupItem['Column'].'` = "'.addslashes($EnglishText[$GroupItem['Column']]).'")';
+            if(count($Filter) > 0) $Filter = ' AND ('.implode(' OR ', $Filter).')';
+
+            $Query = 'SELECT * FROM `'.$Table.'` WHERE (`Language` = '.$this->System->Config['OriginalLanguage'].')'.$Filter;
+            echo($Query."\n");
+            $DbResult = $this->Database->query($Query);
             while($EnglishFound = $DbResult->fetch_assoc())
             {
@@ -120 +122 @@
                 $CompleteParts = 0;
                 $Completable = true;
-                $OnlyRank = true;
                 foreach($Group['Items'] as $GroupItem)
                 {
@@ -131 +132 @@
                       if(array_key_exists($GroupItem['Column'], $_POST))
                       {
-                        if (44 <> $GroupItem['Id']) $OnlyRank = false;
                         $Values .= ', "'.$_POST[$GroupItem['Column']].'"';
                         $CompleteParts |= (1 << ($GroupItem['Sequence'] - 1));
@@ -144 +144 @@
                 }
                 if($Completable) $NewComplete = 1; // All parts of text are completed. Make entire text as completed
-                else $NewComplete = 0;
+                  else $NewComplete = 0;
                 if($SourceText['ID'] == $EnglishFound['ID'])
                 {
@@ -156 +156 @@
                 $Columns .= ', `Complete`, `CompleteParts`';
                 $Values .= ', '.$NewComplete.', '.$CompleteParts;
-
-                if (!$OnlyRank)
-                {
-                  $this->Database->query('INSERT INTO `'.$Table.'` ('.$Columns.') VALUES ('.$Values.')');
-                  $LastID = $this->Database->insert_id;
-
-                  $Output .= 'Text <a href="'.$this->System->Link('/form.php?group='.
-                    $GroupId.'&amp;ID='.$LastID).'">'.$LastID.'</a> ze skupiny <a href="TranslationList.php?group='.
-                    $GroupId.'&amp;user=0&amp;action=filter">'.$TranslationTree[$GroupId]['Name'].'</a> uložen jako '.
-                    $CompleteText[$NewComplete].'. Převzat z <a href="form.php?group='.$GroupId.'&amp;ID='.$TextID.'">'.$TextID.'</a>.<br/>';
-                  $this->System->ModuleManager->Modules['Log']->WriteLog('Text <a href="'.
-                    $this->System->Link('/form.php?group='.$GroupId.'&amp;ID='.$LastID).'">'.
-                    $LastID.'</a> ze skupiny <a href="TranslationList.php?group='.
-                    $GroupId.'&amp;user=0&amp;text=&amp;entry=&amp;action=filter">'.
-                    $TranslationTree[$GroupId]['Name'].'</a> uložen jako '.$CompleteText[$NewComplete].
-                    '. Převzat z <a href="form.php?group='.$GroupId.'&amp;ID='.$TextID.'">'.$TextID.'</a>.', LOG_TYPE_TRANSLATION);
-                }
+                $this->Database->query('INSERT INTO `'.$Table.'` ('.$Columns.') VALUES ('.$Values.')');
+                $LastID = $this->Database->insert_id;
+
+                $Output .= 'Text <a href="'.$this->System->Link('/form.php?group='.
+                  $GroupId.'&amp;ID='.$LastID).'">'.$LastID.'</a> ze skupiny <a href="TranslationList.php?group='.
+                  $GroupId.'&amp;user=0&amp;action=filter">'.$TranslationTree[$GroupId]['Name'].'</a> uložen jako '.
+                  $CompleteText[$NewComplete].'. Převzat z <a href="form.php?group='.$GroupId.'&amp;ID='.$TextID.'">'.$TextID.'</a>.<br/>';
+                $this->System->ModuleManager->Modules['Log']->WriteLog('Text <a href="'.
+                  $this->System->Link('/form.php?group='.$GroupId.'&amp;ID='.$LastID).'">'.
+                  $LastID.'</a> ze skupiny <a href="TranslationList.php?group='.
+                  $GroupId.'&amp;user=0&amp;text=&amp;entry=&amp;action=filter">'.
+                  $TranslationTree[$GroupId]['Name'].'</a> uložen jako '.$CompleteText[$NewComplete].
+                  '. Převzat z <a href="form.php?group='.$GroupId.'&amp;ID='.$TextID.'">'.$TextID.'</a>.', LOG_TYPE_TRANSLATION);
               }
             }
@@ -178 +174 @@
         } else $Output .= ShowMessage('Zadaná položka nenalezena.', MESSAGE_CRITICAL);
 
-
-        // Address and redirecting
-        $Output .= '<br />Překládat: <a href="TranslationList.php?group='.$GroupId.'&amp;state=1&amp;user=0&entry=">Nepřeložené</a> ';
-
-        $prev = FollowingTran($TextID, $Table, $GroupId, True);
-        $next = FollowingTran($TextID, $Table, $GroupId);
-        $Output .= '<br /><br />';
-        $DbResult = $this->Database->query('SELECT `Redirecting` FROM `User` WHERE `ID`='.$this->System->User->Id);
-        $redirecting = $DbResult->fetch_assoc();
-
-        switch($redirecting['Redirecting'])
-        {
-          case 1:
-            $Output .= '<script type="text/javascript" language="JavaScript" charset="utf-8">'.
-                'setTimeout("parent.location.href=\''.htmlspecialchars_decode('TranslationList.php?group='.$GroupId.'&amp;state=1&amp;user=0').'\'", 1500)'.
-                '</script>';
-            break;
-          case 2:
-            if($next <> '')
-              $Output .= '<script type="text/javascript" language="JavaScript" charset="utf-8">'.
-              'setTimeout("parent.location.href=\''.htmlspecialchars_decode($next).'\'", 1500)'.
-              '</script>';
-            break;
-          case 3:
-            if($prev <> '')
-              $Output .= '<script type="text/javascript" language="JavaScript" charset="utf-8">'.
-              'setTimeout("parent.location.href=\''.htmlspecialchars_decode($prev).'\'", 1500)'.
-              '</script>';
-            break;
-        }
-
-        $Output .= '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="'.
-          $this->System->Link('/Options.php').'" title="Nastavení uživatele">Nastavení</a>';
+        $Output .= $this->ShowRedirection($GroupId, $Table, $TextID);
 
         // Update flag for experience info load
@@ -245 +209 @@
     return($Output);
   }
+
+  function ShowRedirection($GroupId, $Table, $TextID)
+  {
+        // Address and redirecting
+        $Output = '<br />Překládat: <a href="TranslationList.php?group='.$GroupId.'&amp;state=1&amp;user=0&entry=">Nepřeložené</a> ';
+
+        $prev = FollowingTran($TextID, $Table, $GroupId, True);
+        $next = FollowingTran($TextID, $Table, $GroupId);
+        $Output .= '<br /><br />';
+        $DbResult = $this->Database->query('SELECT `Redirecting` FROM `User` WHERE `ID`='.$this->System->User->Id);
+        $redirecting = $DbResult->fetch_assoc();
+
+        switch($redirecting['Redirecting'])
+        {
+                case 1:
+                        $Output .= '<script type="text/javascript" language="JavaScript" charset="utf-8">'.
+                                        'setTimeout("parent.location.href=\''.htmlspecialchars_decode('TranslationList.php?group='.$GroupId.'&amp;state=1&amp;user=0').'\'", 1500)'.
+                                        '</script>';
+                        break;
+                case 2:
+                        if($next <> '')
+                                $Output .= '<script type="text/javascript" language="JavaScript" charset="utf-8">'.
+                                                'setTimeout("parent.location.href=\''.htmlspecialchars_decode($next).'\'", 1500)'.
+                                                '</script>';
+                                break;
+                case 3:
+                        if($prev <> '')
+                                $Output .= '<script type="text/javascript" language="JavaScript" charset="utf-8">'.
+                                                'setTimeout("parent.location.href=\''.htmlspecialchars_decode($prev).'\'", 1500)'.
+                                                '</script>';
+                                break;
+        }
+
+        $Output .= '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="'.
+          $this->System->Link('/Options.php').'" title="Nastavení uživatele">Nastavení</a>';
+    return($Output);
+  }
 }