Changeset 613

Timestamp:

Nov 27, 2013, 10:48:31 AM (11 years ago)

Author:

maron

Message:

• Fixed: Some bugs in Comparison.php

Location:

trunk

Files:

• Modules/Translation/Comparison.php (modified) (3 diffs)
• Modules/Translation/Form.php (modified) (1 diff)
• includes/Version.php (modified) (1 diff)

trunk/Modules/Translation/Comparison.php

@@ -52 +52 @@
                         if((array_key_exists('ID1', $_GET)) and ($_GET['ID1'] <> -1))  //porovnání pouze 2 textů
                         {
-                                $TextID1 = $_GET['ID1'];
+                                $TextID1 = $_GET['ID1'];   
                                 $TextID2 = $_GET['ID2'];
-                                $WhereID = ' AND ((`'.$Table.'`.`ID` = '.$TextID1.') OR (`'.$Table.'`.`ID` = '.$TextID2.') OR (`'.$Table.'`.`Language` = '.$this->System->Config['OriginalLanguage'].'))';
+                                $WhereID = ' AND ((`'.$Table.'`.`ID` = '.$TextID1.') OR (`'.$Table.'`.`ID` = '.$TextID2.'))';
                         } else $WhereID = '';
         
@@ -92 +92 @@
                         foreach($TranslationTree[$GroupId]['Items'] as $Index => $TextItem)
                         {
-                                if($Line[0][$TextItem['Column']] <> '')
+                          $writethis = false;
+                                for($i = 0; $i < count($Line); $i++)
+                                {
+                                  if($Line[$i][$TextItem['Column']] <> '') $writethis = true;
+                                }
+                                if($writethis)
                                 {
                                         $Output .= '<tr><th>'.$TextItem['Name'].'</th>';
@@ -100 +105 @@
                                                 {
                                                   $Output .= '<td>';
-                                                  $Output .= str_replace("\n", '<br/>', $this->CompareString($Line[$i][$TextItem['Column']],$Line[$i - 1][$TextItem['Column']]));
+                                                  $Output .= str_replace("\n", '<br/>', $this->CompareString(htmlspecialchars($Line[$i][$TextItem['Column']]),htmlspecialchars($Line[$i - 1][$TextItem['Column']])));
                                                   $Output .= '</td>';
-                                          } else $Output .= '<td>'.$Line[$i][$TextItem['Column']].'</td>';
+                                          } else $Output .= '<td>'.htmlspecialchars($Line[$i][$TextItem['Column']]).'</td>';
                                   }
                                   $Output .= '</tr>';

trunk/Modules/Translation/Form.php

@@ -101 +101 @@
                                          
                                         $DbResult = $this->Database->query('SELECT COUNT(*) FROM `'.$Table.'` WHERE '.
-                                                '(`Entry` = '.$Line['Entry'].') AND (`Language` <> '.$this->System->Config['OriginalLanguage'].') AND (`Complete` = 1)');
+                                                '(`Entry` = '.$Line['Entry'].')');
                                         $Version = $DbResult->fetch_row();
                                         $Version = $Version[0];

trunk/includes/Version.php

@@ -6 +6 @@
 // and system will need database update. 
 
-$Revision = 611; // Subversion revision
+$Revision = 613; // Subversion revision
 $DatabaseRevision = 610; // Database structure revision 
-$ReleaseTime = '2013-11-26';
+$ReleaseTime = '2013-11-27';