Changeset 552 for trunk

Timestamp:

Jun 19, 2013, 5:53:35 PM (12 years ago)

Author:

chronos

Message:

• Opraveno: Nezobrazovat překládaný text v formuláři pro nepřihlášené uživatele.

Location:

trunk

Files:

• Modules/Dictionary/Dictionary.php (modified) (1 diff)
• Modules/Translation/Form.php (modified) (1 diff)
• Todo.txt (added)
• includes/Version.php (modified) (1 diff)
• includes/global.php (modified) (1 diff)
• index.php (modified) (1 diff)

trunk/Modules/Dictionary/Dictionary.php

@@ -305 +305 @@
 function Show()
 {
-        global $LanguageList;
+        global $LanguageList, $User;
         
 $LanguageList = GetLanguageList();

trunk/Modules/Translation/Form.php

@@ -17 +17 @@
                 return $Text;
         }       
-        
+
         function Show()
-  {
-        global $System, $Config, $User, $TranslationTree;
-        $Output = '';
-
-$GroupId = LoadGroupIdParameter();
-$Table = $TranslationTree[$GroupId]['TablePrefix'];
-if(array_key_exists('action', $_GET)) $Action = $_GET['action']; 
-  else $Action = '';
-
-if(array_key_exists('ID', $_GET)) 
-{
-  $TextID = $_GET['ID'] * 1;  
-
-  $DbResult = $System->Database->query('SELECT * FROM `'.$Table.'` WHERE `ID` = '.$TextID);
-  $Line = $DbResult->fetch_assoc();
-  if(!$Line) 
-  {
-    $Output .= ShowMessage('Překlad nenalezen.', MESSAGE_CRITICAL);
-  } else 
-  {
-    
-  $DbResult = $System->Database->query('SELECT * FROM `'.$Table.'` WHERE (`Language` = '.$Config['OriginalLanguage'].') AND (`Entry` = '.$Line['Entry'].') AND (`VersionEnd` = '.$Line['VersionEnd'].') LIMIT 1');
-  $LineAJ = $DbResult->fetch_assoc();
-  if(!$LineAJ) 
-  {
-    $Output .= ShowMessage('Anglický originál k překladu nenalezen.', MESSAGE_CRITICAL);
-  } else 
-  {
-  
-  if($Line['User'] != '')
-  {
-    $IDUser = $System->Database->query('SELECT * FROM `User` WHERE `ID` = '.$Line['User']);
-    $LineUser = $IDUser->fetch_array();
-  } else 
-    $LineUser = array('Name' => '');
-  
-  $Output .= 'Skupina: <strong>'.$TranslationTree[$GroupId]['Name'].'</strong><br />';
-      
-  if(($Line['Language'] <> 0) and ($LineUser['Name'] <> '')) 
-    $Output .= 'Přeložil: <strong>'.$LineUser['Name'].'</strong> dne '.HumanDate($Line['ModifyTime']).'<br />';
-  if(($Line['Take'] <> 0) and ($Line['Take'] <> $Line['ID'])) 
-  {
-    $DbResult = $System->Database->query('SELECT `Language`,`VersionStart`,`VersionEnd` FROM `'.$Table.'` WHERE `ID` = '.$Line['Take']);
-    $Language = $DbResult->fetch_assoc();
-    // echo $Language['Language'].'  '.$Line['Take'];
-    
-    $DbResult = $System->Database->query('SELECT `Name` FROM `Language` WHERE `Id` ='.$Language['Language']);
-    $Lang = $DbResult->fetch_assoc();
-    
-    $Output .= 'Původní text: <strong>'.
-      ' ID <a href="form.php?group='.$GroupId.'&amp;ID='.$Line['Take'].'">'.$Line['Take'].'</a></strong>'.
-      ' ('.$Lang['Name'].')'.
-      ' <br />';
-  }
-  $Output .= 'Text: ';
-  if($Line['Language'] <> 0) 
-  {
-    if($Line['Complete'] == 1) $Output .= ' <b>Hotov</b>';
-      else $Output .= ' <b> Uložen v rozepsaných</b> ';
-  } else $Output .= ' <b>Anglická, původní verze</b> ';
-
-  $Output .= '<br />'.
-    'Verze: <b>'.GetVersionWOW($Line['VersionStart']).' - '.GetVersionWOW($Line['VersionEnd']).'</b>'.
-    '<br />';
-   
-  $DbResult = $System->Database->query('SELECT COUNT(*) FROM `'.$Table.'` WHERE (`Entry` = '.$Line['Entry'].') AND (`Language` <> '.$Config['OriginalLanguage'].') AND (`Complete` = 1)');
-  $Version = $DbResult->fetch_row();
-  $Version = $Version[0];
-  if($Version > 0)
-  {
-    $Output .= '<form action="comparison.php" method="get"><a href="TranslationList.php?group='.$GroupId.'&amp;user=0&amp;state=2&amp;entry='.$Line['Entry'].'&amp;text=">Počet verzí: <strong>'.$Version.'</strong></a>  
-      <input type="hidden" name="group" value="'.$GroupId.'" />
-      <input type="hidden" name="entry" value="'.$Line['Entry'].'" />
-      <input type="hidden" name="ID2" value="'.$TextID.'" />
-      <select onchange="this.form.submit();" name="ID1">
-      <option value="-1">Vyberte text k porovnání</option>
-      <option value="-1">Zobrazit/porovnat všechny</option>'; 
-    $DataID = $System->Database->query('SELECT *, (SELECT `User`.`Name` AS `UserName` FROM `User` WHERE `User`.`ID` = `'.$Table.'`.`User`) AS `UserName` FROM `'.$Table.'` WHERE (`Entry` = '.$Line['Entry'].') AND (`ID` <> '.$Line['ID'].') AND (`Complete` = 1)');  
-    while($Version = $DataID->fetch_array())
-    {     
-      if($Version['ID'] == $Line['Take']) $Output .= '<option value="'.$Version['ID'].'">'.$Version['ID'].' - '.$Version['User'].' (převzato)</option>';   
-      else 
-      {
-        if($Version['Language'] == 0) $Version['UserName'] = 'Předloha';
-        $Output .= '<option value="'.$Version['ID'].'">'.$Version['ID'].' - '.
-        $Version['UserName'].' ('.GetVersionWOW($Version['VersionStart']).' - '.
-        GetVersionWOW($Version['VersionEnd']).')</option>';
-      }
-    }
-    $Output .= '</select></form>';    
-  } else
-  {
-    $Output .= '<a href="TranslationList.php?group='.$GroupId.'&amp;user=0&amp;state=2&amp;entry='.$Line['Entry'].'&amp;text=">Počet verzí: <strong>'.$Version.'</strong></a>'; 
-  }
-
-  // Special characters: $B - New line, $N - Name, $C - profession
-  $Output .= '<form action="save.php?group='.$GroupId.'" method="post"><div>';
-  if($User->Licence(LICENCE_USER)) 
-  {
-    if(($GroupId < 4) or ($GroupId == 10) or ($GroupId == 11)) 
-      $Output .= '<a href="dictionary.php?action=group&amp;group='.$GroupId.'&amp;ID='.$LineAJ['ID'].'" target="_blank"  title="Zobrazit přeložené názvy věci, postav, a herních objektů k tomuto překladu">Vyhledat v názvech</a>';
-    $Output .= ' <input type="submit" value="Uložit do rozepsaných" name="save" title="Klikněte na uložit pro pozdější dokončení překladu" />'.
-      '<input type="submit" value="Dokončeno" name="End" title="Klikněte na Dokončeno jesli jsou všechny texty hotové a chcete již publikovat" /> ';
-    FollowingTran($TextID, $Table, $GroupId, true); 
-    FollowingTran($TextID, $Table, $GroupId);
-  }
-
-  if($TranslationTree[$GroupId]['WowheadName'] != '')
-    $WowheadLink = '<a href="http://www.wowhead.com/?'.$TranslationTree[$GroupId]['WowheadName'].'='.$LineAJ['Entry'].'">'.$LineAJ['Entry'].'</a>';
-    else $WowheadLink = $LineAJ['Entry'];
-  
-  $Output .= '<input type="hidden" name="entry" value="'.$LineAJ['Entry'].'" />
-    <input type="hidden" name="user" value="'.$User->Id.'" />
-    <input type="hidden" name="ID" value="'.$TextID.'" />
-    <table class="BaseTable">
-      <tr>
-        <th>Číslo textu: '.$WowheadLink.'</th>
-        <th>Nepřeložené</th>
-        <th>Přeložené</th>
-      </tr>
-      <tr>
-        <th>Jazyk</th>
-        <td>Anglický</td>
-        <td>
-          Přeloženo do:'; 
-  if($Line['Language'] <> 0) $Language = $Line['Language']; 
-  else if($User->Id != 0)
-  {
-    $Language = $User->Language;
-  } else $Language = 0;
-  $Output .= WriteLanguages($Language).
-    '</td></tr>';
-
-  // Difference highlighting
-  $Text = '';
-  foreach($TranslationTree[$GroupId]['Items'] as $Index => $TextItem)
-    if($TextItem['Visible'] == 1)
-      $Text = $Text.' '.$LineAJ[$TextItem['Column']];
-
-  if(($GroupId < 4) or ($GroupId == 10) or ($GroupId == 11)) {
-  //<span class="edit">barvou.</span>
-    $names = GetTranslatNames($Text,0,array('Dictionary' => 'Text','TextCreature' => 'name'));
-  } else {
-    $names = GetTranslatNames($Text,0,array('Dictionary' => 'Text'));
-  }
-
-  foreach($TranslationTree[$GroupId]['Items'] as $Index => $TextItem)
-  if($TextItem['Visible'] == 1)
-  {          
-    if(($LineAJ[$TextItem['Column']] <> '') or ($Line[$TextItem['Column']] <> ''))  
-    {
-      if ($TextItem['Name'] == 'Text' AND (($Table == 'global_strings') OR ($Table == 'glue_strings'))) 
-        $Output .= '<tr><th>'.$LineAJ['ShortCut'].'</th>';
-        else $Output .= '<tr><th>'.$TextItem['Name'].'</th>';
-      $Output .= '<td>'.str_replace("\n", '<br/>', $this->ColorNames(htmlspecialchars($LineAJ[$TextItem['Column']]),$names)).'</td>
-      <td><textarea rows="8" cols="40" onkeydown="ResizeTextArea(this)" class="textedit" id="'.$TextItem['Column'].'" name="'.$TextItem['Column'].'">'.htmlspecialchars($Line[$TextItem['Column']]).'</textarea></td></tr>';
-    }
-  } else
-  {
-    $Output .= '<input id="'.$TextItem['Column'].'" name="'.$TextItem['Column'].'" type="hidden" value="'.htmlspecialchars($Line[$TextItem['Column']]).'" />';
-  }
-  $Output .= '</table></div></form>';
-  }
-  }
-} else $Output = ShowMessage('Nebylo zadáno ID.', MESSAGE_CRITICAL);
-return($Output);
-  }
+        {
+                global $System, $Config, $User, $TranslationTree;
+                $Output = '';
+        
+                $GroupId = LoadGroupIdParameter();
+                $Table = $TranslationTree[$GroupId]['TablePrefix'];
+                if(array_key_exists('action', $_GET)) $Action = $_GET['action'];
+                else $Action = '';
+        
+                if(array_key_exists('ID', $_GET))
+                {
+                        $TextID = $_GET['ID'] * 1;
+        
+                        $DbResult = $System->Database->query('SELECT * FROM `'.$Table.'` WHERE `ID` = '.$TextID);
+                        $Line = $DbResult->fetch_assoc();
+                        if(!$Line)
+                        {
+                                $Output .= ShowMessage('Překlad nenalezen.', MESSAGE_CRITICAL);
+                        } else
+                        {
+        
+                                $DbResult = $System->Database->query('SELECT * FROM `'.$Table.'` WHERE (`Language` = '.$Config['OriginalLanguage'].') AND (`Entry` = '.$Line['Entry'].') AND (`VersionEnd` = '.$Line['VersionEnd'].') LIMIT 1');
+                                $LineAJ = $DbResult->fetch_assoc();
+                                if(!$LineAJ)
+                                {
+                                        $Output .= ShowMessage('Anglický originál k překladu nenalezen.', MESSAGE_CRITICAL);
+                                } else
+                                {
+        
+                                        if($Line['User'] != '')
+                                        {
+                                                $IDUser = $System->Database->query('SELECT * FROM `User` WHERE `ID` = '.$Line['User']);
+                                                $LineUser = $IDUser->fetch_array();
+                                        } else
+                                                $LineUser = array('Name' => '');
+        
+                                        $Output .= 'Skupina: <strong>'.$TranslationTree[$GroupId]['Name'].'</strong><br />';
+        
+                                        if(($Line['Language'] <> 0) and ($LineUser['Name'] <> ''))
+                                                $Output .= 'Přeložil: <strong>'.$LineUser['Name'].'</strong> dne '.HumanDate($Line['ModifyTime']).'<br />';
+                                        if(($Line['Take'] <> 0) and ($Line['Take'] <> $Line['ID']))
+                                        {
+                                                $DbResult = $System->Database->query('SELECT `Language`,`VersionStart`,`VersionEnd` FROM `'.$Table.'` WHERE `ID` = '.$Line['Take']);
+                                                $Language = $DbResult->fetch_assoc();
+                                                // echo $Language['Language'].'  '.$Line['Take'];
+        
+                                                $DbResult = $System->Database->query('SELECT `Name` FROM `Language` WHERE `Id` ='.$Language['Language']);
+                                                $Lang = $DbResult->fetch_assoc();
+        
+                                                $Output .= 'Původní text: <strong>'.
+                                                                ' ID <a href="form.php?group='.$GroupId.'&amp;ID='.$Line['Take'].'">'.$Line['Take'].'</a></strong>'.
+                                                                ' ('.$Lang['Name'].')'.
+                                                                ' <br />';
+                                        }
+                                        $Output .= 'Text: ';
+                                        if($Line['Language'] <> 0)
+                                        {
+                                                if($Line['Complete'] == 1) $Output .= ' <b>Hotov</b>';
+                                                else $Output .= ' <b> Uložen v rozepsaných</b> ';
+                                        } else $Output .= ' <b>Anglická, původní verze</b> ';
+        
+                                        $Output .= '<br />'.
+                                                        'Verze: <b>'.GetVersionWOW($Line['VersionStart']).' - '.GetVersionWOW($Line['VersionEnd']).'</b>'.
+                                                        '<br />';
+                                         
+                                        $DbResult = $System->Database->query('SELECT COUNT(*) FROM `'.$Table.'` WHERE (`Entry` = '.$Line['Entry'].') AND (`Language` <> '.$Config['OriginalLanguage'].') AND (`Complete` = 1)');
+                                        $Version = $DbResult->fetch_row();
+                                        $Version = $Version[0];
+                                        if($Version > 0)
+                                        {
+                                                $Output .= '<form action="comparison.php" method="get"><a href="TranslationList.php?group='.$GroupId.'&amp;user=0&amp;state=2&amp;entry='.$Line['Entry'].'&amp;text=">Počet verzí: <strong>'.$Version.'</strong></a>
+                                                <input type="hidden" name="group" value="'.$GroupId.'" />
+                                                <input type="hidden" name="entry" value="'.$Line['Entry'].'" />
+                                                <input type="hidden" name="ID2" value="'.$TextID.'" />
+                                                <select onchange="this.form.submit();" name="ID1">
+                                                <option value="-1">Vyberte text k porovnání</option>
+                                                <option value="-1">Zobrazit/porovnat všechny</option>';
+                                                $DataID = $System->Database->query('SELECT *, (SELECT `User`.`Name` AS `UserName` FROM `User` WHERE `User`.`ID` = `'.$Table.'`.`User`) AS `UserName` FROM `'.$Table.'` WHERE (`Entry` = '.$Line['Entry'].') AND (`ID` <> '.$Line['ID'].') AND (`Complete` = 1)');
+                                                while($Version = $DataID->fetch_array())
+                                                {
+                                                        if($Version['ID'] == $Line['Take']) $Output .= '<option value="'.$Version['ID'].'">'.$Version['ID'].' - '.$Version['User'].' (převzato)</option>';
+                                                        else
+                                                        {
+                                                                if($Version['Language'] == 0) $Version['UserName'] = 'Předloha';
+                                                                $Output .= '<option value="'.$Version['ID'].'">'.$Version['ID'].' - '.
+                                                                                $Version['UserName'].' ('.GetVersionWOW($Version['VersionStart']).' - '.
+                                                                                GetVersionWOW($Version['VersionEnd']).')</option>';
+                                                        }
+                                                }
+                                                $Output .= '</select></form>';
+                                        } else
+                                        {
+                                                $Output .= '<a href="TranslationList.php?group='.$GroupId.'&amp;user=0&amp;state=2&amp;entry='.$Line['Entry'].'&amp;text=">Počet verzí: <strong>'.$Version.'</strong></a>';
+                                        }
+        
+                                        // Special characters: $B - New line, $N - Name, $C - profession                                        
+                                        if($User->Licence(LICENCE_USER))
+                                        {
+                                                $Output .= '<form action="save.php?group='.$GroupId.'" method="post"><div>';
+                                                if(($GroupId < 4) or ($GroupId == 10) or ($GroupId == 11))
+                                                        $Output .= '<a href="dictionary.php?action=group&amp;group='.$GroupId.'&amp;ID='.$LineAJ['ID'].'" target="_blank"  title="Zobrazit přeložené názvy věci, postav, a herních objektů k tomuto překladu">Vyhledat v názvech</a>';
+                                                $Output .= ' <input type="submit" value="Uložit do rozepsaných" name="save" title="Klikněte na uložit pro pozdější dokončení překladu" />'.
+                                                                '<input type="submit" value="Dokončeno" name="End" title="Klikněte na Dokončeno jesli jsou všechny texty hotové a chcete již publikovat" /> ';
+                                                FollowingTran($TextID, $Table, $GroupId, true);
+                                                FollowingTran($TextID, $Table, $GroupId);
+                                        }
+        
+                                        if($TranslationTree[$GroupId]['WowheadName'] != '')
+                                                $WowheadLink = '<a href="http://www.wowhead.com/?'.$TranslationTree[$GroupId]['WowheadName'].'='.$LineAJ['Entry'].'">'.$LineAJ['Entry'].'</a>';
+                                        else $WowheadLink = $LineAJ['Entry'];
+        
+                                        $Output .= '<input type="hidden" name="entry" value="'.$LineAJ['Entry'].'" />
+                                        <input type="hidden" name="user" value="'.$User->Id.'" />
+                                        <input type="hidden" name="ID" value="'.$TextID.'" />
+                                        <table class="BaseTable">
+                                        <tr>
+                                        <th>Číslo textu: '.$WowheadLink.'</th>
+                                        <th>Nepřeložené</th>
+                                        <th>Přeložené</th>
+                                        </tr>
+                                        <tr>
+                                        <th>Jazyk</th>
+                                        <td>Anglický</td>
+                                        <td>';
+                                        if($Line['Language'] <> 0) $Language = $Line['Language'];
+                                        else if($User->Id != 0)
+                                        {
+                                                $Language = $User->Language;
+                                        } else $Language = 0;
+                                        if($User->Licence(LICENCE_USER)) $Output .= WriteLanguages($Language);
+                                          else {                                        
+                  $DbResult3 = $System->Database->select('Language', '`Id`, `Name`', '`Enabled` = 1');
+                  if($DbResult3->num_rows > 0) 
+                  { 
+                        $Language = $DbResult3->fetch_assoc();
+                        $Output .= $Language['Name'];
+                  }
+                                          }
+                                        
+                                        $Output .= '</td></tr>';
+        
+                                        // Difference highlighting
+                                        $Text = '';
+                                        foreach($TranslationTree[$GroupId]['Items'] as $Index => $TextItem)
+                                                if($TextItem['Visible'] == 1)
+                                                $Text = $Text.' '.$LineAJ[$TextItem['Column']];
+        
+                                        if(($GroupId < 4) or ($GroupId == 10) or ($GroupId == 11)) {
+                                                //<span class="edit">barvou.</span>
+                                                $names = GetTranslatNames($Text,0,array('Dictionary' => 'Text','TextCreature' => 'name'));
+                                        } else {
+                                                $names = GetTranslatNames($Text,0,array('Dictionary' => 'Text'));
+                                        }
+        
+                                        foreach($TranslationTree[$GroupId]['Items'] as $Index => $TextItem)
+                                                if($TextItem['Visible'] == 1)
+                                                {
+                                                        if(($LineAJ[$TextItem['Column']] <> '') or ($Line[$TextItem['Column']] <> ''))
+                                                        {
+                                                                if ($TextItem['Name'] == 'Text' AND (($Table == 'global_strings') OR ($Table == 'glue_strings')))
+                                                                        $Output .= '<tr><th>'.$LineAJ['ShortCut'].'</th>';
+                                                                else $Output .= '<tr><th>'.$TextItem['Name'].'</th>';
+                                                                $Output .= '<td>'.str_replace("\n", '<br/>', $this->ColorNames(htmlspecialchars($LineAJ[$TextItem['Column']]),$names)).'</td>
+                                                                <td>';
+                                                                if($User->Licence(LICENCE_USER)) $Output .= '<textarea rows="8" cols="40" onkeydown="ResizeTextArea(this)" class="textedit" id="'.$TextItem['Column'].'" name="'.$TextItem['Column'].'">';
+                                                                $Output .=  htmlspecialchars($Line[$TextItem['Column']]);
+                                                                if($User->Licence(LICENCE_USER)) $Output .= '</textarea></td></tr>';
+                                                        }
+                                                } else
+                                                {
+                                                        $Output .= '<input id="'.$TextItem['Column'].'" name="'.$TextItem['Column'].'" type="hidden" value="'.htmlspecialchars($Line[$TextItem['Column']]).'" />';
+                                                }
+                                                $Output .= '</table></div>';
+                                                if($User->Licence(LICENCE_USER)) $Output .= '</form>';
+                                }
+                        }
+                } else $Output = ShowMessage('Nebylo zadáno ID.', MESSAGE_CRITICAL);
+                return($Output);
+        }       
 }

trunk/includes/Version.php

@@ -1 +1 @@
 <?php
 
-$Revision = 551; // Subversion revision
+$Revision = 552; // Subversion revision
 $DatabaseRevision = 543; // Database structure revision 
-$ReleaseTime = '2013-06-18';
-
-?>
+$ReleaseTime = '2013-06-19';

trunk/includes/global.php

@@ -679 +679 @@
         return($Output);
 }
-
-
-?>

trunk/index.php

@@ -5 +5 @@
 $System->PathItems = ProcessURL();
 $System->ShowPage();       
-
-?>