Changeset 561

Timestamp:

Aug 13, 2013, 11:31:34 PM (11 years ago)

Author:

chronos

Message:

• Modified: New RSS channels are now registered by modules itself.
• Modified: ShoutBox transformed to application module.

Location:

trunk

Files:

• Modules/FrontPage/FrontPage.php (modified) (1 diff)
• Modules/ShoutBox (added)
• Modules/ShoutBox/ShoutBox.php (added)
• Modules/Translation/Form.php (modified) (2 diffs)
• Modules/Translation/Save.php (modified) (1 diff)
• Modules/Translation/Translation.php (modified) (1 diff)
• Modules/Translation/TranslationList.php (modified) (1 diff)
• action.php (modified) (2 diffs)
• includes/Page.php (modified) (2 diffs)
• includes/Version.php (modified) (1 diff)
• includes/global.php (modified) (3 diffs)
• includes/system.php (modified) (2 diffs)

trunk/Modules/FrontPage/FrontPage.php

@@ -82 +82 @@
                         '<tr><td>'.$this->ShowLastTranslated().'</td>'.
                         '<td class="news-box">'.$this->ShowNews().'</td>'.
-                        '<td>'.$this->ShowShoutBox().'</td>'.
+                        '<td>'.$this->System->ModuleManager->Modules['ShoutBox']->ShowBox().'</td>'.
                         '</tr></table>';
          return($Output);
   } 
 
-  function ShowShoutbox()
-  {
-        $Output = '<strong><a href="'.$this->System->Link('/action.php?action=ShoutBoxView').'">Kecátko:</a></strong>';
-        
-        if($this->System->User->Licence(LICENCE_USER))
-                $Output .= ' <a href="'.$this->System->Link('/action.php?action=shoutbox').'">Vložit</a>';
-        $Output .= '<div class="box"><table>';
-        $DbResult = $this->Database->query('SELECT * FROM `ShoutBox` ORDER BY `ID` DESC LIMIT 30');
-        while($Line = $DbResult->fetch_assoc())
-                $Output .= '<tr><td><strong>'.$Line['UserName'].'</strong>: '.MakeActiveLinks($Line['Text']).'</td></tr>';
-        $Output .= '</table></div>';
-        return($Output);
-  }
-  
   function ShowNews()
   {

trunk/Modules/Translation/Form.php

@@ -16 +16 @@
                 }
                 return $Text;
-        }       
+        }               
 
         function Show()
         {
+                $Action = '';
+    if(array_key_exists('action', $_GET)) $Action = $_GET['action'];
+                
+    if($Action == 'delete') $Output = $this->Delete();
+                else $Output = $this->ShowForm();
+                return($Output);
+        }
+        
+        function ShowForm()
+        {
                 global $System, $Config, $User, $TranslationTree;
+                
                 $Output = '';
         
@@ -197 +208 @@
                 } else $Output = ShowMessage('Nebylo zadáno ID.', MESSAGE_CRITICAL);
                 return($Output);
+        }
+
+        function Delete()
+        {
+                global $System, $User, $Config;
+        
+                if($User->Licence(LICENCE_MODERATOR))
+                {
+                        $TextID = $_GET['ID'];
+                        $System->Database->query('DELETE FROM `'.$Table.'` WHERE `ID` = '.$TextID.' AND `Language` <> '.$Config['OriginalLanguage']);
+                        $Output = ShowMessage('Překlad byl smazán.');
+                        WriteLog('Překlad byl smazán! <a href="form.php?group='.$GroupID.'&amp;ID='.$TextID.'">'.$TextID.'</a>', LOG_TYPE_MODERATOR);
+                } else $Output = ShowMessage('Nemáte oprávnění', MESSAGE_CRITICAL);
+                return($Output);
         }       
 }

trunk/Modules/Translation/Save.php

@@ -6 +6 @@
   {
         global $System, $User, $Config, $TranslationTree;
-$Output = '';
-$CompleteText = array('nedokončený', 'dokončený');
-
-unset($Message);
-$System->ModuleManager->Modules['FrontPage']->HandleLoginForm();
-if(isset($Message)) $Output .= ShowMessage($Message, $MessageType);
-
-$GroupId = LoadGroupIdParameter();
-$Group = $TranslationTree[$GroupId];
-$Table = $Group['TablePrefix'];
-if($User->Licence(LICENCE_USER)) 
-{
-  if(array_key_exists('ID', $_POST) and is_numeric($_POST['ID']))
-  {
-    $Entry = $_POST['entry'] * 1;
-    $TextID = $_POST['ID'] * 1;
-    $Language = $_POST['Language'] * 1;
-    if(array_key_exists('End', $_POST)) $Complete = 1;
-      else $Complete = 0;
-    
-    // Get source text record from database by ID
-    $DbResult = $System->Database->query('SELECT * FROM `'.$Table.'` WHERE `ID`='.$TextID);
-    if($DbResult->num_rows > 0)
-    {
-      $SourceText = $DbResult->fetch_assoc();
-      
-      // Get data for english original
-      $DbResult = $System->Database->query('SELECT * FROM `'.$Table.'` WHERE (`Entry`='.$SourceText['Entry'].
-        ') AND (`Language` = '.$Config['OriginalLanguage'].') AND (`VersionStart` = '.$SourceText['VersionStart'].
-        ') AND (`VersionEnd` = '.$SourceText['VersionEnd'].')');
-      if($DbResult->num_rows > 0)
-      {
-        $EnglishText = $DbResult->fetch_assoc();
-        
-        // Get all similar english texts
-        $Filter = '';
-        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 = $System->Database->query('SELECT * FROM `'.$Table.'` WHERE (`Language` = '.$Config['OriginalLanguage'].')'.$Filter);
-        while($EnglishFound = $DbResult->fetch_assoc())
-        {         
-          // Get user translation paired to found english item entry
-          $DbResult2 = $System->Database->query('SELECT * FROM `'.$Table.'` WHERE (`User` = '.$User->Id.
-                ') AND (`Entry` = '.$EnglishFound['Entry'].') AND (`VersionStart` = '.$EnglishFound['VersionStart'].
-                ') AND (`VersionEnd` = '.$EnglishFound['VersionEnd'].')');
-          if($DbResult2->num_rows > 0)
-          {
-            // Update existed user translation
-            $ExistedText = $DbResult2->fetch_assoc();
-            $Values = '`Language` = '.$Language;
-            
-            $UpdateModifyTime = false;
-            $Completable = true;
-            $CompleteParts = $ExistedText['CompleteParts'];
-            foreach($Group['Items'] as $GroupItem)
-            {
-              if($GroupItem['Visible'] == 1)
-              {
-                if($SourceText[$GroupItem['Column']] != $ExistedText[$GroupItem['Column']]) 
-                  $UpdateModifyTime = true;
-                
-                if($EnglishFound[$GroupItem['Column']] == $EnglishText[$GroupItem['Column']])
-                {
-                  if(array_key_exists($GroupItem['Column'], $_POST))
-                  {
-                    $Values .= ', `'.$GroupItem['Column'].'` = "'.$_POST[$GroupItem['Column']].'"'; 
-                    $CompleteParts |= (1 << ($GroupItem['Sequence'] - 1));
-                  }
-                } 
-                if((($CompleteParts & (1 << ($GroupItem['Sequence'] - 1))) == 0) and ($EnglishFound[$GroupItem['Column']] != '')) $Completable = false;
-              }
-            }
-            if($Completable) $NewComplete = 1; // All parts of text are completed. Make entire text as completed
-              else $NewComplete = 0; 
-            if($SourceText['ID'] == $ExistedText['ID']) 
-            {
-              $NewComplete = $Complete; // Our original user text, set complete according user choice
-              if($Complete == 1)
-              {
-                foreach($Group['Items'] as $GroupItem)
-                  if($GroupItem['Visible'] == 1) $CompleteParts |= (1 << ($GroupItem['Sequence'] - 1));
-              }
-            }
-            $Values .= ', `Complete`='.$NewComplete.', `CompleteParts` = '.$CompleteParts;
-            
-            if($UpdateModifyTime) $Values .= ', `ModifyTime` = NOW()';
-            
-            // Update user translation
-            $System->Database->query('UPDATE `'.$Table.'` SET '.$Values.' WHERE `ID` = '.$ExistedText['ID']);
-            
-            $Output .= 'Změny v překladu <a href="form.php?group='.$GroupId.'&amp;ID='.$ExistedText['ID'].'">'.$ExistedText['ID'].'</a> ('.$ExistedText['Entry'].') uloženy jako '.$CompleteText[$NewComplete].'.<br />';
-            WriteLog('Změny v překladu <a href="form.php?group='.$GroupId.'&amp;ID='.$ExistedText['ID'].'">'.$ExistedText['ID'].'</a> ('.$ExistedText['Entry'].') uloženy jako '.$CompleteText[$NewComplete].'.', LOG_TYPE_TRANSLATION);
-          } else
-          {
-            // Insert new user translation
-            $Columns = '`Entry`, `VersionStart`, `VersionEnd`, `Language`, `User`, `Take`, `ModifyTime`';
-            $Values = $EnglishFound['Entry'].', '.$EnglishFound['VersionStart'].', '.$EnglishFound['VersionEnd'].', '.$Language.', '.$User->Id.', '.$SourceText['ID'].', NOW()';
-
-            $CompleteParts = 0;
-            $Completable = true;
-            foreach($Group['Items'] as $GroupItem)
-            {
-              $Columns .= ', `'.$GroupItem['Column'].'`';
-              if($GroupItem['Visible'] == 1)
-              {
-                if($EnglishFound[$GroupItem['Column']] == $EnglishText[$GroupItem['Column']])
-                {
-                  // Read form user data
-                  if(array_key_exists($GroupItem['Column'], $_POST))
-                  {
-                    $Values .= ', "'.$_POST[$GroupItem['Column']].'"'; 
-                    $CompleteParts |= (1 << ($GroupItem['Sequence'] - 1));
-                  } else $Values .= ', "'.addslashes($EnglishFound[$GroupItem['Column']]).'"'; 
-                } else $Values .= ', "'.addslashes($EnglishFound[$GroupItem['Column']]).'"'; 
-                if((($CompleteParts & (1 << ($GroupItem['Sequence'] - 1))) == 0) and ($EnglishFound[$GroupItem['Column']] != '')) $Completable = false;
-              } else 
-              {
-                // Read from english text
-                $Values .= ', "'.$EnglishFound[$GroupItem['Column']].'"'; 
-              }
-            }
-            if($Completable) $NewComplete = 1; // All parts of text are completed. Make entire text as completed
-              else $NewComplete = 0; 
-            if($SourceText['ID'] == $EnglishFound['ID'])
-            {
-              $NewComplete = $Complete; // Our original user text, set complete according user choice
-              if($Complete == 1)
-              {
-                foreach($Group['Items'] as $GroupItem)
-                  if($GroupItem['Visible'] == 1) $CompleteParts |= (1 << ($GroupItem['Sequence'] - 1));
-              }
-            }
-            $Columns .= ', `Complete`, `CompleteParts`';
-            $Values .= ', '.$NewComplete.', '.$CompleteParts;
-
-            $System->Database->query('INSERT INTO `'.$Table.'` ('.$Columns.') VALUES ('.$Values.')');
-            $LastID = $System->Database->insert_id;
-            
-            $Output .= 'Text <a href="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/>';
-            WriteLog('Text <a href="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);
-          }
-        }        
-      } else $Output .= ShowMessage('Anglický originál k překladu nenalezen.', MESSAGE_CRITICAL);      
-    } 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 = $System->Database->query('SELECT `Redirecting` FROM `User` WHERE `ID`='.$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="'.$System->Link('/Options.php').'" title="Nastavení uživatele">Nastavení</a>';
-    
-  // Update flag for experience info load
-  $System->Database->query('UPDATE `User` SET `NeedUpdate` = 1 WHERE `ID` = '.$User->Id); 
-  } else $Output .= ShowMessage('Položka nenalezena', MESSAGE_CRITICAL);
-} else 
-{
-  if(array_key_exists('ID', $_POST) and array_key_exists('entry', $_POST) and array_key_exists('Language', $_POST) and array_key_exists('user', $_POST)) 
-  {
-    $Output .= 'Byli jste automaticky odhlášeni. Pro <strong>Uložení překladu</strong> se musíte přihlásit zde:<br /><br />'.
-      '<form action="save.php?action=login&amp;group='.$GroupId.'" method="post"><div>'.
-      '<input type="hidden" name="entry" value="'.$_POST['entry'].'" />'.
-      '<input type="hidden" name="user" value="'.$_POST['user'].'" />'.
-      '<input type="hidden" name="ID" value="'.$_POST['ID'].'" />'.
-      '<input type="hidden" name="Language" value="'.$_POST['Language'].'" />';    
-
-    foreach($TranslationTree[$GroupId]['Items'] as $Index => $TextItem)
-    {
-      if(array_key_exists($TextItem['Column'], $_POST)) $Value = $_POST[$TextItem['Column']]; else $Value = '';
-      $Output .= '<input id="'.$TextItem['Column'].'" name="'.$TextItem['Column'].'" type="hidden" value="'.htmlspecialchars($Value).'" />';
-    }  
-    $Output .= '<table>'.
-    '<tr>'.
-    '<td>Jméno: <input type="text" name="LoginUser" size="13" /></td>'.
-    '</tr><tr>'.
-    '<td>Heslo: <input type="password" name="LoginPass" size="13" /></td>'.
-    '</tr><tr>'.
-    '<th><input type="submit" value="Přihlásit a uložit překlad" /></th>'.
-    '</tr>'.
-    '</table>';  
-  } else $Output = ShowMessage('Nezadány požadované údaje.', MESSAGE_CRITICAL);
-}
+        
+        $Output = '';
+        $CompleteText = array('nedokončený', 'dokončený');
+        
+        unset($Message);
+        $System->ModuleManager->Modules['FrontPage']->HandleLoginForm();
+        if(isset($Message)) $Output .= ShowMessage($Message, $MessageType);
+        
+        $GroupId = LoadGroupIdParameter();
+        $Group = $TranslationTree[$GroupId];
+        $Table = $Group['TablePrefix'];
+        if($User->Licence(LICENCE_USER))
+        {
+                if(array_key_exists('ID', $_POST) and is_numeric($_POST['ID']))
+                {
+                        $Entry = $_POST['entry'] * 1;
+                        $TextID = $_POST['ID'] * 1;
+                        $Language = $_POST['Language'] * 1;
+                        if(array_key_exists('End', $_POST)) $Complete = 1;
+                        else $Complete = 0;
+        
+                        // Get source text record from database by ID
+                        $DbResult = $System->Database->query('SELECT * FROM `'.$Table.'` WHERE `ID`='.$TextID);
+                        if($DbResult->num_rows > 0)
+                        {
+                                $SourceText = $DbResult->fetch_assoc();
+        
+                                // Get data for english original
+                                $DbResult = $System->Database->query('SELECT * FROM `'.$Table.'` WHERE (`Entry`='.$SourceText['Entry'].
+                                                ') AND (`Language` = '.$Config['OriginalLanguage'].') AND (`VersionStart` = '.$SourceText['VersionStart'].
+                                                ') AND (`VersionEnd` = '.$SourceText['VersionEnd'].')');
+                                if($DbResult->num_rows > 0)
+                                {
+                                        $EnglishText = $DbResult->fetch_assoc();
+        
+                                        // Get all similar english texts
+                                        $Filter = '';
+                                        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 = $System->Database->query('SELECT * FROM `'.$Table.'` WHERE (`Language` = '.$Config['OriginalLanguage'].')'.$Filter);
+                                        while($EnglishFound = $DbResult->fetch_assoc())
+                                        {
+                                                // Get user translation paired to found english item entry
+                                                $DbResult2 = $System->Database->query('SELECT * FROM `'.$Table.'` WHERE (`User` = '.$User->Id.
+                                                                ') AND (`Entry` = '.$EnglishFound['Entry'].') AND (`VersionStart` = '.$EnglishFound['VersionStart'].
+                                                                ') AND (`VersionEnd` = '.$EnglishFound['VersionEnd'].')');
+                                                if($DbResult2->num_rows > 0)
+                                                {
+                                                        // Update existed user translation
+                                                        $ExistedText = $DbResult2->fetch_assoc();
+                                                        $Values = '`Language` = '.$Language;
+        
+                                                        $UpdateModifyTime = false;
+                                                        $Completable = true;
+                                                        $CompleteParts = $ExistedText['CompleteParts'];
+                                                        foreach($Group['Items'] as $GroupItem)
+                                                        {
+                                                                if($GroupItem['Visible'] == 1)
+                                                                {
+                                                                        if($SourceText[$GroupItem['Column']] != $ExistedText[$GroupItem['Column']])
+                                                                                $UpdateModifyTime = true;
+        
+                                                                        if($EnglishFound[$GroupItem['Column']] == $EnglishText[$GroupItem['Column']])
+                                                                        {
+                                                                                if(array_key_exists($GroupItem['Column'], $_POST))
+                                                                                {
+                                                                                        $Values .= ', `'.$GroupItem['Column'].'` = "'.$_POST[$GroupItem['Column']].'"';
+                                                                                        $CompleteParts |= (1 << ($GroupItem['Sequence'] - 1));
+                                                                                }
+                                                                        }
+                                                                        if((($CompleteParts & (1 << ($GroupItem['Sequence'] - 1))) == 0) and ($EnglishFound[$GroupItem['Column']] != '')) $Completable = false;
+                                                                }
+                                                        }
+                                                        if($Completable) $NewComplete = 1; // All parts of text are completed. Make entire text as completed
+                                                        else $NewComplete = 0;
+                                                        if($SourceText['ID'] == $ExistedText['ID'])
+                                                        {
+                                                                $NewComplete = $Complete; // Our original user text, set complete according user choice
+                                                                if($Complete == 1)
+                                                                {
+                                                                        foreach($Group['Items'] as $GroupItem)
+                                                                                if($GroupItem['Visible'] == 1) $CompleteParts |= (1 << ($GroupItem['Sequence'] - 1));
+                                                                }
+                                                        }
+                                                        $Values .= ', `Complete`='.$NewComplete.', `CompleteParts` = '.$CompleteParts;
+        
+                                                        if($UpdateModifyTime) $Values .= ', `ModifyTime` = NOW()';
+        
+                                                        // Update user translation
+                                                        $System->Database->query('UPDATE `'.$Table.'` SET '.$Values.' WHERE `ID` = '.$ExistedText['ID']);
+        
+                                                        $Output .= 'Změny v překladu <a href="form.php?group='.$GroupId.'&amp;ID='.$ExistedText['ID'].'">'.$ExistedText['ID'].'</a> ('.$ExistedText['Entry'].') uloženy jako '.$CompleteText[$NewComplete].'.<br />';
+                                                        WriteLog('Změny v překladu <a href="form.php?group='.$GroupId.'&amp;ID='.$ExistedText['ID'].'">'.$ExistedText['ID'].'</a> ('.$ExistedText['Entry'].') uloženy jako '.$CompleteText[$NewComplete].'.', LOG_TYPE_TRANSLATION);
+                                                } else
+                                                {
+                                                        // Insert new user translation
+                                                        $Columns = '`Entry`, `VersionStart`, `VersionEnd`, `Language`, `User`, `Take`, `ModifyTime`';
+                                                        $Values = $EnglishFound['Entry'].', '.$EnglishFound['VersionStart'].', '.$EnglishFound['VersionEnd'].', '.$Language.', '.$User->Id.', '.$SourceText['ID'].', NOW()';
+        
+                                                        $CompleteParts = 0;
+                                                        $Completable = true;
+                                                        foreach($Group['Items'] as $GroupItem)
+                                                        {
+                                                                $Columns .= ', `'.$GroupItem['Column'].'`';
+                                                                if($GroupItem['Visible'] == 1)
+                                                                {
+                                                                        if($EnglishFound[$GroupItem['Column']] == $EnglishText[$GroupItem['Column']])
+                                                                        {
+                                                                                // Read form user data
+                                                                                if(array_key_exists($GroupItem['Column'], $_POST))
+                                                                                {
+                                                                                        $Values .= ', "'.$_POST[$GroupItem['Column']].'"';
+                                                                                        $CompleteParts |= (1 << ($GroupItem['Sequence'] - 1));
+                                                                                } else $Values .= ', "'.addslashes($EnglishFound[$GroupItem['Column']]).'"';
+                                                                        } else $Values .= ', "'.addslashes($EnglishFound[$GroupItem['Column']]).'"';
+                                                                        if((($CompleteParts & (1 << ($GroupItem['Sequence'] - 1))) == 0) and ($EnglishFound[$GroupItem['Column']] != '')) $Completable = false;
+                                                                } else
+                                                                {
+                                                                        // Read from english text
+                                                                        $Values .= ', "'.$EnglishFound[$GroupItem['Column']].'"';
+                                                                }
+                                                        }
+                                                        if($Completable) $NewComplete = 1; // All parts of text are completed. Make entire text as completed
+                                                        else $NewComplete = 0;
+                                                        if($SourceText['ID'] == $EnglishFound['ID'])
+                                                        {
+                                                                $NewComplete = $Complete; // Our original user text, set complete according user choice
+                                                                if($Complete == 1)
+                                                                {
+                                                                        foreach($Group['Items'] as $GroupItem)
+                                                                                if($GroupItem['Visible'] == 1) $CompleteParts |= (1 << ($GroupItem['Sequence'] - 1));
+                                                                }
+                                                        }
+                                                        $Columns .= ', `Complete`, `CompleteParts`';
+                                                        $Values .= ', '.$NewComplete.', '.$CompleteParts;
+        
+                                                        $System->Database->query('INSERT INTO `'.$Table.'` ('.$Columns.') VALUES ('.$Values.')');
+                                                        $LastID = $System->Database->insert_id;
+        
+                                                        $Output .= 'Text <a href="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/>';
+                                                        WriteLog('Text <a href="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);
+                                                }
+                                        }
+                                } else $Output .= ShowMessage('Anglický originál k překladu nenalezen.', MESSAGE_CRITICAL);
+                        } 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 = $System->Database->query('SELECT `Redirecting` FROM `User` WHERE `ID`='.$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="'.$System->Link('/Options.php').'" title="Nastavení uživatele">Nastavení</a>';
+        
+                        // Update flag for experience info load
+                        $System->Database->query('UPDATE `User` SET `NeedUpdate` = 1 WHERE `ID` = '.$User->Id);
+                } else $Output .= ShowMessage('Položka nenalezena', MESSAGE_CRITICAL);
+        } else
+        {
+                if(array_key_exists('ID', $_POST) and array_key_exists('entry', $_POST) and array_key_exists('Language', $_POST) and array_key_exists('user', $_POST))
+                {
+                        $Output .= 'Byli jste automaticky odhlášeni. Pro <strong>Uložení překladu</strong> se musíte přihlásit zde:<br /><br />'.
+                                        '<form action="save.php?action=login&amp;group='.$GroupId.'" method="post"><div>'.
+                                        '<input type="hidden" name="entry" value="'.$_POST['entry'].'" />'.
+                                        '<input type="hidden" name="user" value="'.$_POST['user'].'" />'.
+                                        '<input type="hidden" name="ID" value="'.$_POST['ID'].'" />'.
+                                        '<input type="hidden" name="Language" value="'.$_POST['Language'].'" />';
+        
+                        foreach($TranslationTree[$GroupId]['Items'] as $Index => $TextItem)
+                        {
+                                if(array_key_exists($TextItem['Column'], $_POST)) $Value = $_POST[$TextItem['Column']]; else $Value = '';
+                                $Output .= '<input id="'.$TextItem['Column'].'" name="'.$TextItem['Column'].'" type="hidden" value="'.htmlspecialchars($Value).'" />';
+                        }
+                        $Output .= '<table>'.
+                                        '<tr>'.
+                                        '<td>Jméno: <input type="text" name="LoginUser" size="13" /></td>'.
+                                        '</tr><tr>'.
+                                        '<td>Heslo: <input type="password" name="LoginPass" size="13" /></td>'.
+                                        '</tr><tr>'.
+                                        '<th><input type="submit" value="Přihlásit a uložit překlad" /></th>'.
+                                        '</tr>'.
+                                        '</table>';
+                } else $Output = ShowMessage('Nezadány požadované údaje.', MESSAGE_CRITICAL);
+        }        
     return($Output);          
   }

trunk/Modules/Translation/Translation.php

@@ -25 +25 @@
         $this->System->RegisterPage('save.php', 'PageTranslationSave');
     $this->System->RegisterPage('TranslationList.php', 'PageTranslationList');
+    $this->System->RegisterRSS(array('Title' => 'Poslední překlady', 'Channel' => 'translation'));
   }
 }

trunk/Modules/Translation/TranslationList.php

@@ -3 +3 @@
 class PageTranslationList extends Page
 {
-function ShowFilter($GroupId = 0)
-{
-  global $System, $TranslationTree, $Config;
-  
-  $Filter = array('SQL' => '');
-  
-  $Output = '<form action="?" method="post">'.
-  '<table class="BaseTable"><tr>'.
-  '<th>Zpracování</th>'.
-  '<th>Skupina</th>'.
-  '<th>Verze</th>'.
-  '<th>Jazyk</th>'.
-  '<th>Překladatel</th>'.
-  '<th>Slova</th>'.
-  '<th>Položka</th>'.
-  '<th></th></tr><tr>';
-
-  // State
-  $Filter['State'] = GetParameter('state', 0, true, true);  
-  $Output .= '<td><select name="state">';
-  if($Filter['State'] == 0) $Selected = ' selected="selected"';
-    else $Selected = '';
-  $Output .= '<option value="0"'.$Selected.'>Všechny</option>';
-  if($Filter['State'] == 1) $Selected = ' selected="selected"';
-    else $Selected = '';
-  $Output .= '<option value="1"'.$Selected.'>Nepřeložené</option>';
-  if($Filter['State'] == 2) $Selected = ' selected="selected"';
-    else $Selected = '';
-  $Output .= '<option value="2"'.$Selected.'>Přeložené</option>';
-  if($Filter['State'] == 3) $Selected = ' selected="selected"';
-    else $Selected = '';
-  $Output .= '<option value="3"'.$Selected.'>Rozpracované</option>';
-  if($Filter['State'] == 4) $Selected = ' selected="selected"';
-    else $Selected = '';
-  $Output .= '<option value="4"'.$Selected.'>Anglické</option>';
-  $Output .= '</select></td>';
-
-  // Translation group
-  if($GroupId == 0)
-  {
-    $Filter['Group'] = GetParameter('group', 0, true, true);  
-    if($Filter['Group'] != 0)
-    {
-      if(isset($TranslationTree[$Filter['Group']]) == false) ErrorMessage('Překladová skupina dle zadaného Id neexistuje.'); 
-      $Table = $TranslationTree[$Filter['Group']]['TablePrefix'];
-    }
-  } else 
-  {
-    $Filter['Group'] = $GroupId;
-    $Table = $TranslationTree[$Filter['Group']]['TablePrefix'];
-  }
-    
-  $Output .= '<td><select name="group" style="width: 80px">';
-  if($Filter['Group'] == 0) $Selected = ' selected="selected"';
-    else $Selected = '';
-  $Output .= '<option value="0"'.$Selected.'>Všechny</option>';
-  $DbResult = $System->Database->query('SELECT `Id`,`Name` FROM `Group` ORDER BY `Name`');
-  while($Group = $DbResult->fetch_assoc())
-  {
-    if($Group['Id'] == $Filter['Group']) $Selected = ' selected="selected"';
-      else $Selected = '';
-    $Output .= '<option value="'.$Group['Id'].'"'.$Selected.'>'.$Group['Name'].'</option>';
-  }
-  $Output .= '</select></td>';
-  
-  // Version
-  $Filter['Version'] = GetParameter('version', 0, true, true);  
-  if($Filter['Version'] != 0)
-  {
-    $DbResult = $System->Database->query('SELECT `Id`, `BuildNumber`,`Version` FROM `ClientVersion` WHERE (`Imported` = 1) AND (`Id` ='.$Filter['Version'].')');
-    if($DbResult->num_rows > 0)
-    {
-      $DbRow = $DbResult->fetch_assoc();
-      $Filter['BuildNumber'] = $DbRow['BuildNumber'];
-    } else ErrorMessage('Zadaná verze klienta nenalezena');
-  }
-  $Output .= '<td><select name="version">';
-  if($Filter['Version'] == 0) $Selected = ' selected="selected"';
-    else $Selected = '';
-  $Output .= '<option value="0"'.$Selected.'>Všechny</option>';
-  $DbResult = $System->Database->query('SELECT `Id`, `BuildNumber`,`Version` FROM `ClientVersion` WHERE `Imported` = 1 ORDER BY `BuildNumber` DESC');
-  while($Version = $DbResult->fetch_assoc())
-  {
-    if($Version['Id'] == $Filter['Version']) $Selected = ' selected="selected"';
-      else $Selected = '';
-    $Output .= '<option value="'.$Version['Id'].'"'.$Selected.'>'.$Version['Version'].'</option>';
-  }
-  $Output .= '</select></td>';
-  if($Filter['Version'] != 0) $VersionFilter = ' AND (`VersionStart` <= '.$Filter['BuildNumber'].') AND (`VersionEnd` >= '.$Filter['BuildNumber'].')';
-    else $VersionFilter = '';
-    //else $Filter['SQL'] .= ' AND '; DISTINCT(Entry)
-  
-  // Language
-  $Filter['Language'] = GetParameter('lang', 0, true, true);  
-  $Output .= '<td><select name="lang">';
-  if($Filter['Language'] == 0) $Selected = ' selected="selected"';
-    else $Selected = '';
-  $Output .= '<option value="0"'.$Selected.'>Všechny</option>';
-  $DbResult = $System->Database->query('SELECT `Id`, `Name` FROM `Language` WHERE `Enabled` = 1 ORDER BY `Name`');
-  while($Language = $DbResult->fetch_assoc())
-  {
-    if($Language['Id'] == $Filter['Language']) $Selected = ' selected="selected"';
-      else $Selected = '';
-    $Output .= '<option value="'.$Language['Id'].'"'.$Selected.'>'.$Language['Name'].'</option>';
-  }
-  $Output .= '</select></td>';
-  if($Filter['Language'] != 0) $LanguageFilter = ' AND (`T`.`Language` = '.$Filter['Language'].')';
-    else $LanguageFilter = '';
-
-  // User
-  $Filter['User'] = GetParameter('user', 0, true, true);  
-  $Output .= '<td><select name="user" style="width: 80px">';
-  if($Filter['User'] == 0) $Selected = ' selected="selected"';
-    else $Selected = '';
-  $Output .= '<option value="0"'.$Selected.'>Všichni</option>';
-  $DbResult = $System->Database->query('SELECT `Id`, `Name` FROM `User` ORDER BY `Name`');
-  while($User = $DbResult->fetch_assoc())
-  {
-    if($User['Id'] == $Filter['User']) $Selected = ' selected="selected"';
-      else $Selected = '';
-    $Output .= '<option value="'.$User['Id'].'"'.$Selected.'>'.$User['Name'].'</option>';
-  }
-  $Output .= '</select></td>';
-  if($Filter['User'] != 0) $UserFilter = ' AND (`User` = '.$Filter['User'].')';
-    else $UserFilter = '';
-  
-  // Words
-  $Filter['Text'] = GetParameter('text', '', false, true);  
-  $Output .= '<td><input name="text" type="text" style="width: 60px;" value="'.$Filter['Text'].'"></td>';
-  if($Filter['Text'] != '') 
-  {
-    $Items = array('(`T`.`ID` LIKE "%'.$Filter['Text'].'%")', '(`T`.`Entry` LIKE "%'.$Filter['Text'].'%")');
-    if($Filter['Group'] != 0)
-    foreach($TranslationTree[$Filter['Group']]['Items'] as $GroupItem)
-    if($GroupItem['Visible'] == 1)
-      $Items[] = '(`T`.`'.$GroupItem['Column'].'` LIKE "%'.$Filter['Text'].'%")';
-    $Filter['SQL'] .= ' AND ('.implode(' OR ', $Items).')';
-  }
-
-  // Entry
-  $Filter['Entry'] = GetParameter('entry', '', false, true);  
-  $Output .= '<td><input name="entry" type="text" style="width: 60px;" value="'.$Filter['Entry'].'"></td>';
-  if($Filter['Entry'] != '') 
-  {
-    $Filter['SQL'] .= ' AND (`Entry` = "'.$Filter['Entry'].'")';
-  }
-
-  if($Filter['Group'] != 0)
-  {
-    if($Filter['State'] == 0) $Filter['SQL'] .= $UserFilter.$VersionFilter.'';
-    else if($Filter['State'] == 1) $Filter['SQL'] .= $VersionFilter.' AND (`T`.`Language` = '.$Config['OriginalLanguage'].') '.
-      'AND NOT EXISTS(SELECT 1 FROM `'.$Table.'` AS `Sub` WHERE '.
-      '(`Sub`.`Language` <> '.$Config['OriginalLanguage'].')'.$LanguageFilter.$UserFilter.
-      ' AND (`Sub`.`Entry` = `T`.`Entry`) AND (`Sub`.`Complete` = 1) AND '.
-      '(`Sub`.`VersionStart` = `T`.`VersionStart`) AND (`Sub`.`VersionEnd` = `T`.`VersionEnd`))';
-    else if($Filter['State'] == 2) $Filter['SQL'] .= $UserFilter.$LanguageFilter.$VersionFilter.' AND (`T`.`Complete` = 1)';
-    else if($Filter['State'] == 3) $Filter['SQL'] .= $UserFilter.$LanguageFilter.$VersionFilter.' AND (`T`.`Language` != '.$Config['OriginalLanguage'].
-      ') AND (`T`.`Complete` = 0)';
-    else if($Filter['State'] == 4) $Filter['SQL'] .= $VersionFilter.' AND (`T`.`Language` = '.$Config['OriginalLanguage'].')';
-  }
-
-  /*
-  // Ownership
-  if(array_key_exists('owner', $_GET) and is_numeric($_GET['owner'])) $Filter['Owner'] = $_GET['owner']; 
-    else $Filter['Owner'] = 0;  
-  $Output .= ' <td><select name="owner">';
-  if($Filter['Owner'] == 0) $Selected = ' selected="selected"';
-    else $Selected = '';
-  $Output .= '<option value="0"'.$Selected.'>Všech</option>';
-  if($Filter['Owner'] == 1) $Selected = ' selected="selected"';
-    else $Selected = '';
-  $Output .= '<option value="1"'.$Selected.'>Překladatelův tým</option>';
-  if($Filter['Owner'] == 2) $Selected = ' selected="selected"';
-    else $Selected = '';
-  $Output .= '<option value="2"'.$Selected.'>Překladatele</option>';
-  $Output .= '</select></td>';
-  if(($Filter['Owner'] == 2) AND ($Filter['User'] != 0)) $Filter['SQL'] .= ' AND (`User` = '.$Filter['User'].')';
-  */
-  
-  $Output .= '<td><input type="submit" value="Filtrovat"/></td>';
-  $Output .= '</tr></table>';
-  $Output .= '</form><br/>';
-  $Filter['Output'] = $Output;
-  return($Filter);
+        function ShowFilter($GroupId = 0)
+        {
+                global $System, $TranslationTree, $Config;
+        
+                $Filter = array('SQL' => '');
+        
+                $Output = '<form action="?" method="post">'.
+                                '<table class="BaseTable"><tr>'.
+                                '<th>Zpracování</th>'.
+                                '<th>Skupina</th>'.
+                                '<th>Verze</th>'.
+                                '<th>Jazyk</th>'.
+                                '<th>Překladatel</th>'.
+                                '<th>Slova</th>'.
+                                '<th>Položka</th>'.
+                                '<th></th></tr><tr>';
+        
+                // State
+                $Filter['State'] = GetParameter('state', 0, true, true);
+                $Output .= '<td><select name="state">';
+                if($Filter['State'] == 0) $Selected = ' selected="selected"';
+                else $Selected = '';
+                $Output .= '<option value="0"'.$Selected.'>Všechny</option>';
+                if($Filter['State'] == 1) $Selected = ' selected="selected"';
+                else $Selected = '';
+                $Output .= '<option value="1"'.$Selected.'>Nepřeložené</option>';
+                if($Filter['State'] == 2) $Selected = ' selected="selected"';
+                else $Selected = '';
+                $Output .= '<option value="2"'.$Selected.'>Přeložené</option>';
+                if($Filter['State'] == 3) $Selected = ' selected="selected"';
+                else $Selected = '';
+                $Output .= '<option value="3"'.$Selected.'>Rozpracované</option>';
+                if($Filter['State'] == 4) $Selected = ' selected="selected"';
+                else $Selected = '';
+                $Output .= '<option value="4"'.$Selected.'>Anglické</option>';
+                $Output .= '</select></td>';
+        
+                // Translation group
+                if($GroupId == 0)
+                {
+                        $Filter['Group'] = GetParameter('group', 0, true, true);
+                        if($Filter['Group'] != 0)
+                        {
+                                if(isset($TranslationTree[$Filter['Group']]) == false) ErrorMessage('Překladová skupina dle zadaného Id neexistuje.');
+                                $Table = $TranslationTree[$Filter['Group']]['TablePrefix'];
+                        }
+                } else
+                {
+                        $Filter['Group'] = $GroupId;
+                        $Table = $TranslationTree[$Filter['Group']]['TablePrefix'];
+                }
+        
+                $Output .= '<td><select name="group" style="width: 80px">';
+                if($Filter['Group'] == 0) $Selected = ' selected="selected"';
+                else $Selected = '';
+                $Output .= '<option value="0"'.$Selected.'>Všechny</option>';
+                $DbResult = $System->Database->query('SELECT `Id`,`Name` FROM `Group` ORDER BY `Name`');
+                while($Group = $DbResult->fetch_assoc())
+                {
+                        if($Group['Id'] == $Filter['Group']) $Selected = ' selected="selected"';
+                        else $Selected = '';
+                        $Output .= '<option value="'.$Group['Id'].'"'.$Selected.'>'.$Group['Name'].'</option>';
+                }
+                $Output .= '</select></td>';
+        
+                // Version
+                $Filter['Version'] = GetParameter('version', 0, true, true);
+                if($Filter['Version'] != 0)
+                {
+                        $DbResult = $System->Database->query('SELECT `Id`, `BuildNumber`,`Version` FROM `ClientVersion` WHERE (`Imported` = 1) AND (`Id` ='.$Filter['Version'].')');
+                        if($DbResult->num_rows > 0)
+                        {
+                                $DbRow = $DbResult->fetch_assoc();
+                                $Filter['BuildNumber'] = $DbRow['BuildNumber'];
+                        } else ErrorMessage('Zadaná verze klienta nenalezena');
+                }
+                $Output .= '<td><select name="version">';
+                if($Filter['Version'] == 0) $Selected = ' selected="selected"';
+                else $Selected = '';
+                $Output .= '<option value="0"'.$Selected.'>Všechny</option>';
+                $DbResult = $System->Database->query('SELECT `Id`, `BuildNumber`,`Version` FROM `ClientVersion` WHERE `Imported` = 1 ORDER BY `BuildNumber` DESC');
+                while($Version = $DbResult->fetch_assoc())
+                {
+                        if($Version['Id'] == $Filter['Version']) $Selected = ' selected="selected"';
+                        else $Selected = '';
+                        $Output .= '<option value="'.$Version['Id'].'"'.$Selected.'>'.$Version['Version'].'</option>';
+                }
+                $Output .= '</select></td>';
+                if($Filter['Version'] != 0) $VersionFilter = ' AND (`VersionStart` <= '.$Filter['BuildNumber'].') AND (`VersionEnd` >= '.$Filter['BuildNumber'].')';
+                else $VersionFilter = '';
+                //else $Filter['SQL'] .= ' AND '; DISTINCT(Entry)
+        
+                // Language
+                $Filter['Language'] = GetParameter('lang', 0, true, true);
+                $Output .= '<td><select name="lang">';
+                if($Filter['Language'] == 0) $Selected = ' selected="selected"';
+                else $Selected = '';
+                $Output .= '<option value="0"'.$Selected.'>Všechny</option>';
+                $DbResult = $System->Database->query('SELECT `Id`, `Name` FROM `Language` WHERE `Enabled` = 1 ORDER BY `Name`');
+                while($Language = $DbResult->fetch_assoc())
+                {
+                        if($Language['Id'] == $Filter['Language']) $Selected = ' selected="selected"';
+                        else $Selected = '';
+                        $Output .= '<option value="'.$Language['Id'].'"'.$Selected.'>'.$Language['Name'].'</option>';
+                }
+                $Output .= '</select></td>';
+                if($Filter['Language'] != 0) $LanguageFilter = ' AND (`T`.`Language` = '.$Filter['Language'].')';
+                else $LanguageFilter = '';
+        
+                // User
+                $Filter['User'] = GetParameter('user', 0, true, true);
+                $Output .= '<td><select name="user" style="width: 80px">';
+                if($Filter['User'] == 0) $Selected = ' selected="selected"';
+                else $Selected = '';
+                $Output .= '<option value="0"'.$Selected.'>Všichni</option>';
+                $DbResult = $System->Database->query('SELECT `Id`, `Name` FROM `User` ORDER BY `Name`');
+                while($User = $DbResult->fetch_assoc())
+                {
+                        if($User['Id'] == $Filter['User']) $Selected = ' selected="selected"';
+                        else $Selected = '';
+                        $Output .= '<option value="'.$User['Id'].'"'.$Selected.'>'.$User['Name'].'</option>';
+                }
+                $Output .= '</select></td>';
+                if($Filter['User'] != 0) $UserFilter = ' AND (`User` = '.$Filter['User'].')';
+                else $UserFilter = '';
+        
+                // Words
+                $Filter['Text'] = GetParameter('text', '', false, true);
+                $Output .= '<td><input name="text" type="text" style="width: 60px;" value="'.$Filter['Text'].'"></td>';
+                if($Filter['Text'] != '')
+                {
+                        $Items = array('(`T`.`ID` LIKE "%'.$Filter['Text'].'%")', '(`T`.`Entry` LIKE "%'.$Filter['Text'].'%")');
+                        if($Filter['Group'] != 0)
+                                foreach($TranslationTree[$Filter['Group']]['Items'] as $GroupItem)
+                                if($GroupItem['Visible'] == 1)
+                                $Items[] = '(`T`.`'.$GroupItem['Column'].'` LIKE "%'.$Filter['Text'].'%")';
+                        $Filter['SQL'] .= ' AND ('.implode(' OR ', $Items).')';
+                }
+        
+                // Entry
+                $Filter['Entry'] = GetParameter('entry', '', false, true);
+                $Output .= '<td><input name="entry" type="text" style="width: 60px;" value="'.$Filter['Entry'].'"></td>';
+                if($Filter['Entry'] != '')
+                {
+                        $Filter['SQL'] .= ' AND (`Entry` = "'.$Filter['Entry'].'")';
+                }
+        
+                if($Filter['Group'] != 0)
+                {
+                        if($Filter['State'] == 0) $Filter['SQL'] .= $UserFilter.$VersionFilter.'';
+                        else if($Filter['State'] == 1) $Filter['SQL'] .= $VersionFilter.' AND (`T`.`Language` = '.$Config['OriginalLanguage'].') '.
+                                        'AND NOT EXISTS(SELECT 1 FROM `'.$Table.'` AS `Sub` WHERE '.
+                                        '(`Sub`.`Language` <> '.$Config['OriginalLanguage'].')'.$LanguageFilter.$UserFilter.
+                                        ' AND (`Sub`.`Entry` = `T`.`Entry`) AND (`Sub`.`Complete` = 1) AND '.
+                                        '(`Sub`.`VersionStart` = `T`.`VersionStart`) AND (`Sub`.`VersionEnd` = `T`.`VersionEnd`))';
+                        else if($Filter['State'] == 2) $Filter['SQL'] .= $UserFilter.$LanguageFilter.$VersionFilter.' AND (`T`.`Complete` = 1)';
+                        else if($Filter['State'] == 3) $Filter['SQL'] .= $UserFilter.$LanguageFilter.$VersionFilter.' AND (`T`.`Language` != '.$Config['OriginalLanguage'].
+                        ') AND (`T`.`Complete` = 0)';
+                        else if($Filter['State'] == 4) $Filter['SQL'] .= $VersionFilter.' AND (`T`.`Language` = '.$Config['OriginalLanguage'].')';
+                }
+        
+                /*
+                 // Ownership
+                if(array_key_exists('owner', $_GET) and is_numeric($_GET['owner'])) $Filter['Owner'] = $_GET['owner'];
+                else $Filter['Owner'] = 0;
+                $Output .= ' <td><select name="owner">';
+                if($Filter['Owner'] == 0) $Selected = ' selected="selected"';
+                else $Selected = '';
+                $Output .= '<option value="0"'.$Selected.'>Všech</option>';
+                if($Filter['Owner'] == 1) $Selected = ' selected="selected"';
+                else $Selected = '';
+                $Output .= '<option value="1"'.$Selected.'>Překladatelův tým</option>';
+                if($Filter['Owner'] == 2) $Selected = ' selected="selected"';
+                else $Selected = '';
+                $Output .= '<option value="2"'.$Selected.'>Překladatele</option>';
+                $Output .= '</select></td>';
+                if(($Filter['Owner'] == 2) AND ($Filter['User'] != 0)) $Filter['SQL'] .= ' AND (`User` = '.$Filter['User'].')';
+                */
+        
+                $Output .= '<td><input type="submit" value="Filtrovat"/></td>';
+                $Output .= '</tr></table>';
+                $Output .= '</form><br/>';
+                $Filter['Output'] = $Output;
+                return($Filter);
+        }
+        
+        function ShowTranslationList($Filter)
+        {
+                global $System, $TranslationTree;
+        
+                $Output = $Filter['Output'];
+                $Table = $TranslationTree[$Filter['Group']]['TablePrefix'];
+        
+                $Query = 'SELECT `T`.`ID`, `T`.`Entry`, `T`.`VersionStart`, `T`.`VersionEnd`, '.
+                                '`T`.`'.$TranslationTree[$Filter['Group']]['Items'][0]['Column'].'`, '.
+                                '`User`.`Name` AS `UserName`, `User`.`ID` AS `UserId`, '.
+                                '`Language`.`Name` AS `LanguageName`, `TS`.`Version` AS `VersionStartText`, `TE`.`Version` AS `VersionEndText` '.
+                                'FROM `'.$Table.'` AS `T` '.
+                                'LEFT JOIN `User` ON `User`.`ID` = `T`.`User` '.
+                                'LEFT JOIN `Language` ON `Language`.`ID` = `T`.`Language` '.
+                                'LEFT JOIN `ClientVersion` AS `TS` ON `TS`.`BuildNumber` = `T`.`VersionStart` '.
+                                'LEFT JOIN `ClientVersion` AS `TE` ON `TE`.`BuildNumber` = `T`.`VersionEnd` '.
+                                'WHERE 1 '.$Filter['SQL'];
+        
+                // Get total item count
+                $DbResult = $System->Database->query('SELECT COUNT(*) FROM ('.$Query.') AS `TT`');
+                $DbRow = $DbResult->fetch_row();
+                $PageList = GetPageList($DbRow[0]);
+        
+                $Output .= $PageList['Output'];
+                $TableColumns = array(
+                                array('Name' => 'ID', 'Title' => 'Číslo'),
+                                array('Name' => 'Entry', 'Title' => 'Položka'),
+                                array('Name' => $TranslationTree[$Filter['Group']]['Items'][0]['Column'], 'Title' => 'Název'),
+                                array('Name' => 'VersionStart', 'Title' => 'Verze'),
+                                array('Name' => 'LanguageName', 'Title' => 'Jazyk'),
+                                array('Name' => 'UserName', 'Title' => 'Překladatel'),
+                );
+        
+                $Order = GetOrderTableHeader($TableColumns, 'VersionStart', 1);
+                $Output .= '<table class="BaseTable">'.
+                                $Order['Output'];
+                 
+                $DbResult = $System->Database->query($Query.' '.$Order['SQL'].' '.$PageList['SQLLimit']);
+                while($Line = $DbResult->fetch_assoc())
+                {
+                        $Output .= '<tr><td><a href="form.php?group='.$Filter['Group'].'&amp;ID='.$Line['ID'].'">'.$Line['ID'].'</a></td><td>'.$Line['Entry'].'</td>'.
+                                        '<td>'.htmlspecialchars($Line[$TranslationTree[$Filter['Group']]['Items'][0]['Column']]).'</td>'.
+                                        '<td>'.$Line['VersionStartText'].'-'.$Line['VersionEndText'].'</td>'.
+                                        '<td>'.$Line['LanguageName'].'</td>'.
+                                        '<td><a href="user.php?user='.$Line['UserId'].'">'.$Line['UserName'].'</a></td>';
+                        '</tr>';
+                }
+                $Output .= '</table>'.
+                                $PageList['Output'];
+                return($Output);
+        }
+        
+        function ShowGroupList($Filter)
+        {
+                global $System, $TranslationTree;
+        
+                $Output = $Filter['Output'];
+        
+                $Output .= '<table class="BaseTable"><tr><th>Skupina</th><th>Počet</th></tr>';
+                $Total = 0;
+                foreach($TranslationTree as $Group)
+                        if($Group['TablePrefix'] != '')
+                        {
+                                $Filter = $this->ShowFilter($Group['Id']);
+                                $ID = $System->Database->query('SELECT COUNT(*) FROM `'.$Group['TablePrefix'].'` AS `T` WHERE 1 '.$Filter['SQL']);
+                                $Line = $ID->fetch_row();
+                                $Output .= '<tr><td><a href="?group='.$Group['Id'].'">'.$Group['Name'].'</td><td>'.$Line[0].'</a></tr>';
+                                $Total += $Line[0];
+                        }
+                        $Output .= '<tr><td><strong>Celkem</strong></td><td><strong>'.$Total.'</strong></td></tr>'.
+                                        '</table>';
+                        return($Output);
+        }
+        
+        function ShowGroupTypeList()
+        {
+                global $System, $User;
+        
+                $DbResult = $System->Database->query('SELECT COUNT(*) FROM `Group`');
+                $DbRow = $DbResult->fetch_row();
+                $PageList = GetPageList($DbRow[0]);
+                $Output = '<h3>Seznam překladových skupin</h3>'.
+                                $PageList['Output'];
+        
+                $Output .= '<table class="BaseTable">';
+                $TableColumns = array(
+                                array('Name' => 'Name', 'Title' => 'Jméno'),
+                                array('Name' => 'SourceType', 'Title' => 'Typ zdroje'),
+                                array('Name' => '', 'Title' => 'Zdroje'),
+                                array('Name' => 'LastImport', 'Title' => 'Datum posledního importu'),
+                                array('Name' => 'LastVersion', 'Title' => 'Verze posledního importu'),
+                );
+        
+                $Order = GetOrderTableHeader($TableColumns, 'Name', 0);
+                $Output .= $Order['Output'];
+        
+                $DbResult = $System->Database->query('SELECT * FROM `Group`'.$Order['SQL'].$PageList['SQLLimit']);
+                while($Group = $DbResult->fetch_assoc())
+                {
+                        $Output .= '<tr><td><a href="?group='.$Group['Id'].'&amp;action=filter">'.$Group['Name'].'</a></td><td>'.$Group['SourceType'].'</td><td>';
+                        if($Group['MangosTable'] != '') $Output .= $Group['MangosTable'].'.sql ';
+                        if($Group['DBCFileName'] != '') $Output .= $Group['DBCFileName'].'.dbc ';
+                        if($Group['LuaFileName'] != '') $Output .= $Group['LuaFileName'].'.lua ';
+                        $Output .= '</td><td><a title="Změny po posledním importu u vybrané překladové skupiny" href="log.php?group='.
+                                        $Group['Id'].'&amp;type=11">'.HumanDate($Group['LastImport']).'</a></td><td>'.GetVersionWOW($Group['LastVersion']).'</td></tr>';
+                }
+                $Output .= '</table>'.
+                                '<br /><a title="Záznam změn po importu" href="log.php?type=11">Záznam změn v textech při importu</a><br/>';
+                if($User->Licence(LICENCE_ADMIN)) $Output .= '<a href="?action=groupadd">Přidat překladovou skupinu</a>';
+                return($Output);
+        }
+        
+        function ShowMenu()
+        {
+                global $User, $TranslationTree;
+        
+                $GroupId = GetParameter('group', 0, true);
+                if($GroupId == 0) $Output = ShowMessage('Skupina nenalezena', MESSAGE_CRITICAL);
+                else {
+                        $Table = $TranslationTree[$GroupId]['TablePrefix'];
+        
+                        $Output = '<h3>Základní filtrování textů</h3><br/>'.
+                                        '<table class="BaseTable"><tr><th>Odkaz</th><th>Popis</th></tr>'.
+                                        '<tr><td><a title="Všechny dostupné texty ve skupině" href="?group='.$GroupId.'&amp;state=4">Všechny</a></td>'.
+                                        '<td>Zobrazit všechny dostupné anglické texty ve skupině.</td></tr>'.
+                                        '<tr><td><a title="Přeložené texty, můžete zde hlasovat, nebo text opravovat" href="?group='.$GroupId.'&amp;state=2">Přeložené</a></td>'.
+                                        '<td>Zobrazit pouze již přeložené texty.</td></tr>'.
+                                        '<tr><td><a title="Nepřeložené texty" href="?group='.$GroupId.'&amp;state=1">Nepřeložené</a></td>'.
+                                        '<td>Dosud nepřeložené texty, které je potřeba přeložit.</td></tr>'.
+                                        '<tr><td><a title="Nedokončené texty" href="?group='.$GroupId.'&amp;state=3">Nedokončené</a></td>'.
+                                        '<td>Texty označené jako rozpracované.</td></tr>';
+        
+                        if($User->Licence(LICENCE_USER))
+                        {
+                                $Output .= '<tr><td><a title="Nedokončené texty" href="?group='.$GroupId.'&amp;state=3&amp;user='.$User->Id.'">Moje nedokončené</a></td>
+                                <td>Nedokončené texty přihlášeného uživatele</td></tr>
+                                <tr><td><a title="Přeložené texty přihlášeného uživatele" href="?group='.$GroupId.'&amp;state=2&amp;user='.$User->Id.'">Moje přeložené</a></td>
+                                <td>Přeložené texty přihlášeného uživatele</td></tr>';
+                        }
+        
+                        $Output .= '<tr><td><form action="?group='.$GroupId.'&amp;entry=" method="post"><div>'.
+                                        '<input type="text" name="text" size="8" />'.
+                                        '<input type="submit" value="Hledat" />'.
+                                        '</div></form>'.
+                                        '</td><td>Vyhledat pomocí textu</td></tr>';
+        
+                        $Output .= '<tr><td><form action="?group='.$GroupId.'&amp;text=" method="post"><div>'.
+                                        '<input type="text" name="entry" size="8" />'.
+                                        '<input type="submit" value="Hledat" />'.
+                                        '</div></form>'.
+                                        '</td><td>Zobrazit podle ID textu v databázi MaNGOSu</td></tr>';
+        
+                        $Output .= '</table>';
+                }
+                return($Output);
+        }
+        
+        function ShowGroupAdd()
+        {
+                global $User;
+        
+                if($User->Licence(LICENCE_ADMIN))
+                {
+                        $Output = '<h3>Vložení nové překladové skupiny</h3>'.
+                                        '<form action="?action=groupaddfinish" method="post">'.
+                                        '<table>'.
+                                        '<tr><td>Název:</td><td><input type="text" name="Name"/></td></tr>'.
+                                        '<tr><td>Název tabulky v databázi:</td><td><input type="text" name="TablePrefix"/></td></tr>'.
+                                        '<tr><td>Typ zdroje:</td><td><input type="text" name="SourceType"/></td></tr>'.
+                                        '<tr><td>Mangos databáze:</td><td><input type="text" name="MangosDatabase"/></td></tr>'.
+                                        '<tr><td>Mangos tabulka:</td><td><input type="text" name="MangosTable"/></td></tr>'.
+                                        '<tr><td colspan="2"><input type="submit" name="add" value="Přidat"/></td></tr>'.
+                                        '</table></form>';
+                } else $Output = ShowMessage('Nemáte oprávnění.', MESSAGE_CRITICAL);
+                return($Output);
+        }
+        
+        function ShowGroupAddFinish()
+        {
+                global $User;
+        
+                if($User->Licence(LICENCE_ADMIN))
+                {
+                        // TODO: Add group items manipulation oprations
+                }
+        }
+        
+        function Show()
+        {
+                $Action = GetParameter('action', '');
+                if($Action == 'filter') $Output = $this->ShowMenu();
+                else if($Action == 'grouplist') $Output = $this->ShowGroupTypeList();
+                else if($Action == 'groupadd') $Output = $this->ShowGroupAdd();
+                else if($Action == 'groupaddfinish') $Output = $this->ShowGroupAddFinish();
+                else
+                {
+                        $Filter = $this->ShowFilter();
+                        if($Filter['Group'] > 0) $Output = $this->ShowTranslationList($Filter);
+                        else $Output = $this->ShowGroupList($Filter);
+                }
+                return($Output);
+        }
 }
-
-function ShowTranslationList($Filter)
-{
-  global $System, $TranslationTree;
- 
-  $Output = $Filter['Output'];
-  $Table = $TranslationTree[$Filter['Group']]['TablePrefix'];
-  
-  $Query = 'SELECT `T`.`ID`, `T`.`Entry`, `T`.`VersionStart`, `T`.`VersionEnd`, '.
-    '`T`.`'.$TranslationTree[$Filter['Group']]['Items'][0]['Column'].'`, '.
-    '`User`.`Name` AS `UserName`, `User`.`ID` AS `UserId`, '.
-    '`Language`.`Name` AS `LanguageName`, `TS`.`Version` AS `VersionStartText`, `TE`.`Version` AS `VersionEndText` '.
-    'FROM `'.$Table.'` AS `T` '.
-    'LEFT JOIN `User` ON `User`.`ID` = `T`.`User` '.
-    'LEFT JOIN `Language` ON `Language`.`ID` = `T`.`Language` '.
-    'LEFT JOIN `ClientVersion` AS `TS` ON `TS`.`BuildNumber` = `T`.`VersionStart` '.
-    'LEFT JOIN `ClientVersion` AS `TE` ON `TE`.`BuildNumber` = `T`.`VersionEnd` '.
-    'WHERE 1 '.$Filter['SQL'];
-  
-  // Get total item count
-  $DbResult = $System->Database->query('SELECT COUNT(*) FROM ('.$Query.') AS `TT`');
-  $DbRow = $DbResult->fetch_row();
-  $PageList = GetPageList($DbRow[0]);    
- 
-  $Output .= $PageList['Output'];
-  $TableColumns = array(
-    array('Name' => 'ID', 'Title' => 'Číslo'), 
-    array('Name' => 'Entry', 'Title' => 'Položka'), 
-    array('Name' => $TranslationTree[$Filter['Group']]['Items'][0]['Column'], 'Title' => 'Název'), 
-    array('Name' => 'VersionStart', 'Title' => 'Verze'), 
-    array('Name' => 'LanguageName', 'Title' => 'Jazyk'), 
-        array('Name' => 'UserName', 'Title' => 'Překladatel'),
-  );
-    
-  $Order = GetOrderTableHeader($TableColumns, 'VersionStart', 1);
-  $Output .= '<table class="BaseTable">'.
-    $Order['Output'];
-   
-  $DbResult = $System->Database->query($Query.' '.$Order['SQL'].' '.$PageList['SQLLimit']);
-  while($Line = $DbResult->fetch_assoc()) 
-  {
-    $Output .= '<tr><td><a href="form.php?group='.$Filter['Group'].'&amp;ID='.$Line['ID'].'">'.$Line['ID'].'</a></td><td>'.$Line['Entry'].'</td>'.
-      '<td>'.htmlspecialchars($Line[$TranslationTree[$Filter['Group']]['Items'][0]['Column']]).'</td>'.
-      '<td>'.$Line['VersionStartText'].'-'.$Line['VersionEndText'].'</td>'.
-      '<td>'.$Line['LanguageName'].'</td>'.
-      '<td><a href="user.php?user='.$Line['UserId'].'">'.$Line['UserName'].'</a></td>';
-      '</tr>';
-  }
-  $Output .= '</table>'.  
-    $PageList['Output'];
-  return($Output);  
-}
-
-function ShowGroupList($Filter)
-{
-  global $System, $TranslationTree;
-  
-  $Output = $Filter['Output'];
-
-  $Output .= '<table class="BaseTable"><tr><th>Skupina</th><th>Počet</th></tr>';
-  $Total = 0;
-  foreach($TranslationTree as $Group)
-    if($Group['TablePrefix'] != '')
-    {
-      $Filter = $this->ShowFilter($Group['Id']);
-      $ID = $System->Database->query('SELECT COUNT(*) FROM `'.$Group['TablePrefix'].'` AS `T` WHERE 1 '.$Filter['SQL']);
-      $Line = $ID->fetch_row();
-      $Output .= '<tr><td><a href="?group='.$Group['Id'].'">'.$Group['Name'].'</td><td>'.$Line[0].'</a></tr>';
-      $Total += $Line[0];
-    }
-  $Output .= '<tr><td><strong>Celkem</strong></td><td><strong>'.$Total.'</strong></td></tr>'.
-    '</table>';
-  return($Output);
-}
-
-function ShowGroupTypeList()
-{
-  global $System, $User;
-  
-  $DbResult = $System->Database->query('SELECT COUNT(*) FROM `Group`');
-  $DbRow = $DbResult->fetch_row();
-  $PageList = GetPageList($DbRow[0]);  
-  $Output = '<h3>Seznam překladových skupin</h3>'.
-    $PageList['Output'];
-  
-  $Output .= '<table class="BaseTable">';
-  $TableColumns = array(
-    array('Name' => 'Name', 'Title' => 'Jméno'), 
-    array('Name' => 'SourceType', 'Title' => 'Typ zdroje'), 
-    array('Name' => '', 'Title' => 'Zdroje'), 
-    array('Name' => 'LastImport', 'Title' => 'Datum posledního importu'), 
-    array('Name' => 'LastVersion', 'Title' => 'Verze posledního importu'),
-  );
-
-  $Order = GetOrderTableHeader($TableColumns, 'Name', 0);
-  $Output .= $Order['Output'];
-
-  $DbResult = $System->Database->query('SELECT * FROM `Group`'.$Order['SQL'].$PageList['SQLLimit']);
-  while($Group = $DbResult->fetch_assoc()) 
-  {
-    $Output .= '<tr><td><a href="?group='.$Group['Id'].'&amp;action=filter">'.$Group['Name'].'</a></td><td>'.$Group['SourceType'].'</td><td>';
-    if($Group['MangosTable'] != '') $Output .= $Group['MangosTable'].'.sql ';
-    if($Group['DBCFileName'] != '') $Output .= $Group['DBCFileName'].'.dbc ';
-    if($Group['LuaFileName'] != '') $Output .= $Group['LuaFileName'].'.lua ';
-    $Output .= '</td><td><a title="Změny po posledním importu u vybrané překladové skupiny" href="log.php?group='.
-      $Group['Id'].'&amp;type=11">'.HumanDate($Group['LastImport']).'</a></td><td>'.GetVersionWOW($Group['LastVersion']).'</td></tr>';
-  }
-  $Output .= '</table>'.
-    '<br /><a title="Záznam změn po importu" href="log.php?type=11">Záznam změn v textech při importu</a><br/>';
-  if($User->Licence(LICENCE_ADMIN)) $Output .= '<a href="?action=groupadd">Přidat překladovou skupinu</a>';
-  return($Output);
-}
-
-function ShowMenu()
-{
-  global $User, $TranslationTree;
-  
-  $GroupId = GetParameter('group', 0, true);
-  if($GroupId == 0) $Output = ShowMessage('Skupina nenalezena', MESSAGE_CRITICAL);
-  else {
-  $Table = $TranslationTree[$GroupId]['TablePrefix'];
-  
-  $Output = '<h3>Základní filtrování textů</h3><br/>'.
-    '<table class="BaseTable"><tr><th>Odkaz</th><th>Popis</th></tr>'.
-    '<tr><td><a title="Všechny dostupné texty ve skupině" href="?group='.$GroupId.'&amp;state=4">Všechny</a></td>'.
-    '<td>Zobrazit všechny dostupné anglické texty ve skupině.</td></tr>'.
-    '<tr><td><a title="Přeložené texty, můžete zde hlasovat, nebo text opravovat" href="?group='.$GroupId.'&amp;state=2">Přeložené</a></td>'.
-    '<td>Zobrazit pouze již přeložené texty.</td></tr>'.
-    '<tr><td><a title="Nepřeložené texty" href="?group='.$GroupId.'&amp;state=1">Nepřeložené</a></td>'.
-    '<td>Dosud nepřeložené texty, které je potřeba přeložit.</td></tr>'.
-    '<tr><td><a title="Nedokončené texty" href="?group='.$GroupId.'&amp;state=3">Nedokončené</a></td>'.
-    '<td>Texty označené jako rozpracované.</td></tr>';
-
-  if($User->Licence(LICENCE_USER)) 
-  {
-    $Output .= '<tr><td><a title="Nedokončené texty" href="?group='.$GroupId.'&amp;state=3&amp;user='.$User->Id.'">Moje nedokončené</a></td>
-    <td>Nedokončené texty přihlášeného uživatele</td></tr>
-    <tr><td><a title="Přeložené texty přihlášeného uživatele" href="?group='.$GroupId.'&amp;state=2&amp;user='.$User->Id.'">Moje přeložené</a></td>
-    <td>Přeložené texty přihlášeného uživatele</td></tr>';
-  }       
-
-  $Output .= '<tr><td><form action="?group='.$GroupId.'&amp;entry=" method="post"><div>'.
-    '<input type="text" name="text" size="8" />'.
-    '<input type="submit" value="Hledat" />'.
-    '</div></form>'.
-    '</td><td>Vyhledat pomocí textu</td></tr>';
-          
-  $Output .= '<tr><td><form action="?group='.$GroupId.'&amp;text=" method="post"><div>'.
-    '<input type="text" name="entry" size="8" />'.
-    '<input type="submit" value="Hledat" />'.
-    '</div></form>'.
-    '</td><td>Zobrazit podle ID textu v databázi MaNGOSu</td></tr>';
-                                                
-  $Output .= '</table>';
-  }
-  return($Output);
-}
-
-function ShowGroupAdd()
-{
-  global $User;
-  
-  if($User->Licence(LICENCE_ADMIN)) 
-  {
-    $Output = '<h3>Vložení nové překladové skupiny</h3>'.
-      '<form action="?action=groupaddfinish" method="post">'.
-    '<table>'.
-    '<tr><td>Název:</td><td><input type="text" name="Name"/></td></tr>'.
-    '<tr><td>Název tabulky v databázi:</td><td><input type="text" name="TablePrefix"/></td></tr>'.
-    '<tr><td>Typ zdroje:</td><td><input type="text" name="SourceType"/></td></tr>'.
-    '<tr><td>Mangos databáze:</td><td><input type="text" name="MangosDatabase"/></td></tr>'.
-    '<tr><td>Mangos tabulka:</td><td><input type="text" name="MangosTable"/></td></tr>'.
-    '<tr><td colspan="2"><input type="submit" name="add" value="Přidat"/></td></tr>'.
-    '</table></form>';
-  } else $Output = ShowMessage('Nemáte oprávnění.', MESSAGE_CRITICAL);
-  return($Output);
-}
-
-function ShowGroupAddFinish()
-{
-  global $User;
-  
-  if($User->Licence(LICENCE_ADMIN)) 
-  {
-        // TODO: Add group items manipulation oprations 
-  }
-}
-
-function Show()
-{
-  $Action = GetParameter('action', '');
-  if($Action == 'filter') $Output = $this->ShowMenu();
-  else if($Action == 'grouplist') $Output = $this->ShowGroupTypeList();
-  else if($Action == 'groupadd') $Output = $this->ShowGroupAdd();
-  else if($Action == 'groupaddfinish') $Output = $this->ShowGroupAddFinish();
-  else 
-  {
-    $Filter = $this->ShowFilter();
-    if($Filter['Group'] > 0) $Output = $this->ShowTranslationList($Filter);
-      else $Output = $this->ShowGroupList($Filter);
-  }
-  return($Output);
-}   
-}

trunk/action.php

@@ -184 +184 @@
 }
 
-function Delete()
-{
-  global $System, $User, $Config;
-  
-  if($User->Licence(LICENCE_MODERATOR)) 
-  {
-    $TextID = $_GET['ID'];       
-    $System->Database->query('DELETE FROM `'.$Table.'` WHERE `ID` = '.$TextID.' AND `Language` <> '.$Config['OriginalLanguage']);
-    $Output = ShowMessage('Překlad byl smazán.');   
-    WriteLog('Překlad byl smazán! <a href="form.php?group='.$GroupID.'&amp;ID='.$TextID.'">'.$TextID.'</a>', LOG_TYPE_MODERATOR);
-  } else $Output = ShowMessage('Nemáte oprávnění', MESSAGE_CRITICAL);
-  return($Output); 
-}
-
-function ShoutBox()
-{
-  global $System, $User;
-  
-  $Output = '';
-  if($User->Licence(LICENCE_USER))
-  {
-    if(!array_key_exists('add', $_POST)) 
-    {
-      $Output .= '<form action="action.php?action=shoutbox" method="post">'.
-        '<fieldset><legend>Nová zpráva kecátka</legend>'.
-        'Uživatel: ';
-      if($User->Licence(LICENCE_USER)) $Output .= '<b>'.$User->Name.'</b><br />'; 
-      else $Output .= '<input type="text" name="user" /><br />';
-      $Output .= 'Text zprávy: <br/>
-      <textarea onkeydown="ResizeTextArea(this)" name="text" cols="40"></textarea> <br/>
-      <input type="submit" name="add" value="Odeslat" /><br /></fieldset>
-      </form>';
-    } else 
-    {
-      if(array_key_exists('text', $_POST)) 
-      {
-        $Text = $_POST['text'];
-        if(trim($Text) == '') $Output .= ShowMessage('Nelze vložit prázdnou zprávu.', MESSAGE_WARNING);
-        else
-        {
-          // Protection against mutiple post of same message
-          $DbResult = $System->Database->query('SELECT `Text` FROM `ShoutBox` WHERE (`User` = "'.$User->Id.'") ORDER BY `Date` DESC LIMIT 1');
-          if($DbResult->num_rows > 0) 
-          {
-            $DbRow = $DbResult->fetch_assoc();          
-          } else $DbRow['Text'] = '';
-        
-          if($DbRow['Text'] == $Text) $Output .= ShowMessage('Nelze vložit stejnou zprávu vícekrát za sebou.', MESSAGE_WARNING);
-          else 
-          {
-            $System->Database->query('INSERT INTO `ShoutBox` ( `User`, `UserName` , `Text` , `Date` , `IP` ) '.
-              ' VALUES ('.$User->Id.', "'.$User->Name.'", "'.$Text.'", NOW(), "'.$_SERVER['REMOTE_ADDR'].'")');
-            $Output .= ShowMessage('Zpráva vložena.');   
-          }
-        }
-      } else $Output .= ShowMessage('Nezadán text pro novou zprávu.', MESSAGE_CRITICAL);   
-    }
-    $Output .= '<br/>';
-  } else $Output .= ShowMessage('Pro vkládaní zpráv musíte byt registrováni.', MESSAGE_CRITICAL);
-  $Output .= ShoutBoxView();
-  return($Output);
-}
-
-function ShoutBoxView()
-{
-  global $System, $User;
-    
-  $DbResult = $System->Database->query('SELECT COUNT(*) FROM `ShoutBox`');
-  $DbRow = $DbResult->fetch_row();
-  $PageList = GetPageList($DbRow[0]);    
-
-  $Output = '<h3>Kecátko</h3>'.$PageList['Output']; 
-  if($User->Licence(LICENCE_USER)) $Output .= ' <a href="action.php?action=shoutbox">Vložit</a>';
-  $Output .= '<div class="shoutbox">';
-  $DbResult = $System->Database->query('SELECT * FROM `ShoutBox` ORDER BY `ID` DESC '.$PageList['SQLLimit']);
-  while($Line = $DbResult->fetch_assoc())
-    $Output .= '<div><strong>'.$Line['UserName'].'</strong>: '.MakeActiveLinks($Line['Text']).'</div>';
-  $Output .= '</div>'.$PageList['Output'];
-  return($Output); 
-}
-
 function ShowNewsHistory()
 {
@@ -290 +209 @@
 if(array_key_exists('action', $_GET)) $Action = $_GET['action'];
 
-if($Action == 'shoutbox') $Output = ShoutBox();
-else if($Action == 'news') $Output = ShowNewsHistory();
+if($Action == 'news') $Output = ShowNewsHistory();
 else if($Action == 'search') $Output = Search();
-else if($Action == 'delete') $Output = Delete();
 else if($Action == 'dbkit') $Output = DatabaseKit();
-else if($Action == 'ShoutBoxView') $Output = ShoutBoxView();
 else $Output = ShowMessage('Nebyla zadána žádná akce.', MESSAGE_CRITICAL);
 

trunk/includes/Page.php

@@ -156 +156 @@
 '<script type="text/javascript" src="'.$System->Link('/style/global.js').'"></script>'.
 '<link rel="shortcut icon" href="'.$System->Link('/images/favicon.ico').'" />';
-  if(isset($RSSChannels)) 
-  foreach($RSSChannels as $Channel)
+  foreach($System->RSSChannels as $Channel)
   {
     $Output .= ' <link rel="alternate" title="'.$Channel['Title'].'" href="'.
@@ -180 +179 @@
   global $System, $ScriptStartTime, $User, $Revision, $ReleaseTime;
 
-    $ScriptGenerateDuration = round(GetMicrotime() - $ScriptStartTime, 2);
-
-    $Output = '</td>'.
-      '<td class="menu2">';
-    $Output .= ShowTranslatedMenu();
-    $Output .= '</td>'.
-    '</tr><tr>'.
-    '<td colspan="4" class="page-bottom">Verze: '.$Revision.' ('.HumanDate($ReleaseTime).')'.
-    ' &nbsp; <a href="http://svn.zdechov.net/trac/wowpreklad/browser/trunk">Zdrojové soubory</a> &nbsp; '.
-    '<a href="http://svn.zdechov.net/trac/wowpreklad/log/trunk?verbose=on">Novinky</a> &nbsp; '.
-    $System->Config['Web']['WebCounter'];
-  
-    $Output .= '</td></tr>';
-    if($System->Config['Web']['ShowRuntimeInfo'] == true) 
-      $Output .= '<tr><td colspan="3" style="text-align: center;">Doba generování: '.$ScriptGenerateDuration.' s / '.ini_get('max_execution_time').' s &nbsp;&nbsp; Použitá paměť: '.HumanSize(memory_get_peak_usage(FALSE)).' / '.ini_get('memory_limit').'B &nbsp;&nbsp; <a href="http://validator.w3.org/check?uri='.htmlentities('http://'.$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI'].'?'.$_SERVER['QUERY_STRING']).'">HTML validator</a></td></tr>';
-    $Output .= '</table>'.
-      '</body>'.
-      '</html>';
-    $User->Store();
-    return($Output); 
+  $ScriptGenerateDuration = round(GetMicrotime() - $ScriptStartTime, 2);
+  
+  $Output = '</td>'.
+                '<td class="menu2">';
+  $Output .= ShowTranslatedMenu();
+  $Output .= '</td>'.
+                '</tr><tr>'.
+                '<td colspan="4" class="page-bottom">Verze: '.$Revision.' ('.HumanDate($ReleaseTime).')'.
+                ' &nbsp; <a href="http://svn.zdechov.net/trac/wowpreklad/browser/trunk">Zdrojové soubory</a> &nbsp; '.
+                '<a href="http://svn.zdechov.net/trac/wowpreklad/log/trunk?verbose=on">Novinky</a> &nbsp; '.
+                $System->Config['Web']['WebCounter'];
+  
+  $Output .= '</td></tr>';
+  if($System->Config['Web']['ShowRuntimeInfo'] == true)
+        $Output .= '<tr><td colspan="3" style="text-align: center;">Doba generování: '.$ScriptGenerateDuration.' s / '.ini_get('max_execution_time').' s &nbsp;&nbsp; Použitá paměť: '.HumanSize(memory_get_peak_usage(FALSE)).' / '.ini_get('memory_limit').'B &nbsp;&nbsp; <a href="http://validator.w3.org/check?uri='.htmlentities('http://'.$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI'].'?'.$_SERVER['QUERY_STRING']).'">HTML validator</a></td></tr>';
+  $Output .= '</table>'.
+                '</body>'.
+                '</html>';
+  $User->Store();
+  return($Output);
 }
 

trunk/includes/Version.php

@@ -1 +1 @@
 <?php
 
-$Revision = 560; // Subversion revision
+$Revision = 561; // Subversion revision
 $DatabaseRevision = 543; // Database structure revision 
 $ReleaseTime = '2013-08-13';

trunk/includes/global.php

@@ -24 +24 @@
 include_once(dirname(__FILE__).'/../Modules/Server/Server.php');
 include_once(dirname(__FILE__).'/../Modules/ClientVersion/ClientVersion.php');
+include_once(dirname(__FILE__).'/../Modules/ShoutBox/ShoutBox.php');
 include_once(dirname(__FILE__).'/../Modules/FrontPage/FrontPage.php');
 
@@ -71 +72 @@
   $System->ModuleManager->RegisterModule(new ModuleReferrer($System));
   $System->ModuleManager->Modules['Referrer']->Excluded[] = $System->Config['Web']['Host'];
-  $System->ModuleManager->RegisterModule(new ModuleFrontPage($System));
   $System->ModuleManager->RegisterModule(new ModuleTeam($System));
   $System->ModuleManager->RegisterModule(new ModuleDictionary($System));
@@ -79 +79 @@
   $System->ModuleManager->RegisterModule(new ModuleServer($System));
   $System->ModuleManager->RegisterModule(new ModuleClientVersion($System));
+  $System->ModuleManager->RegisterModule(new ModuleShoutBox($System));
+  $System->ModuleManager->RegisterModule(new ModuleFrontPage($System));
   $System->ModuleManager->StartAll();
 }
 
-$RSSChannels = array(
-  array('Title' => 'Změny systému', 'Channel' => 'news'),
-  array('Title' => 'Poslední překlady', 'Channel' => 'translation'),
-  array('Title' => 'Kecátko', 'Channel' => 'shoutbox'),
-);
+$System->RegisterRSS(array('Title' => 'Změny systému', 'Channel' => 'news'));
 
 function GetMicrotime()

trunk/includes/system.php

@@ -23 +23 @@
   var $ModuleManager;
   var $PathItems;
+  var $Menu;
+  var $RSSChannels;
   
   function __construct()
   {
     $this->Config = array();
+    $this->Menu = array();
+    $this->RSSChannels = array();
   }
   
@@ -133 +137 @@
   }
   
+  function RegisterRSS($Channel, $Pos = NULL)
+  {
+        if(is_null($Pos)) $this->RSSChannels[] = $Channel;
+          else {
+                array_splice($this->RSSChannels, $Pos, 0, array($Channel));
+          }
+  }
+  
   function SearchPage($PathItems, $Pages)
   {