Changeset 577 for trunk/Modules

Timestamp:

Sep 11, 2013, 10:37:54 PM (12 years ago)

Author:

chronos

Message:

• Modified: Moved some code from global to system file. System class is now serving as main application class. Now old files which still use ShowPage function need system initialization with $InitSystem = true; before global.php inclusion.
• Modified: Get rid of some global reference to $System, $Config and $User variables.
• Modified: Search result functionality moved to application module from action.php file.

Location:

trunk/Modules

Files:

• Dictionary/Dictionary.php (modified) (16 diffs)
• Export/Page.php (modified) (18 diffs)
• FrontPage/FrontPage.php (modified) (4 diffs)
• Import/Manage.php (modified) (1 diff)
• Log/Log.php (modified) (1 diff)
• Referrer/Referrer.php (modified) (6 diffs)
• Search (added)
• Search/Search.php (added)
• Team/Team.php (modified) (14 diffs)
• Translation/Form.php (modified) (14 diffs)
• Translation/TranslationList.php (modified) (19 diffs)
• User/Options.php (modified) (4 diffs)
• User/Profile.php (modified) (2 diffs)
• User/User.php (modified) (2 diffs)
• User/UserList.php (modified) (1 diff)

trunk/Modules/Dictionary/Dictionary.php

@@ -76 +76 @@
 function DictionaryInsert()
 {
-  global $User;
-  
   $Output = '';
-  if($User->Licence(LICENCE_USER))
+  if($this->System->User->Licence(LICENCE_USER))
   {
     $Output .= '<form action="?action=save" method="post">'.
@@ -98 +96 @@
 function DictionarySave()
 {
-  global $User, $Config;
-  
-  if($User->Licence(LICENCE_USER))
+  if($this->System->User->Licence(LICENCE_USER))
   {
     if(array_key_exists('Original', $_POST) and array_key_exists('Translated', $_POST) and array_key_exists('Description', $_POST))
@@ -106 +102 @@
       // Check if original text exists and determine entry id
       $DbResult = $this->Database->query('SELECT * FROM `Dictionary` WHERE '.
-        '`Text` = "'.$_POST['Original'].'" AND `Language`= '.$Config['OriginalLanguage']);
+        '`Text` = "'.$_POST['Original'].'" AND `Language`= '.$this->System->Config['OriginalLanguage']);
       if($DbResult->num_rows > 0)
       {
@@ -117 +113 @@
         $Entry = $DbRow[0] + 1;
         $this->Database->query('INSERT INTO `Dictionary` ( `Text` , `Entry` , `Description` , '.
-          '`User`, `Language` ) VALUES ("'.$_POST['Original'].'", "'.$Entry.'", "", NULL, '.$Config['OriginalLanguage'].');');
+          '`User`, `Language` ) VALUES ("'.$_POST['Original'].'", "'.$Entry.'", "", NULL, '.$this->System->Config['OriginalLanguage'].');');
       }
   
       $DbResult = $this->Database->query('SELECT `Id` FROM `Dictionary` WHERE '.
-        '`Entry` = '.$Entry.' AND `Language`='.$_POST['Language'].' AND `User`='.$User->Id);
+        '`Entry` = '.$Entry.' AND `Language`='.$_POST['Language'].' AND `User`='.$this->System->User->Id);
       if($DbResult->num_rows > 0)
       {
@@ -129 +125 @@
       } else
         $this->Database->query('INSERT INTO `Dictionary` ( `Text` , `Entry` , `Description` , '.
-          '`User`, `Language` ) VALUES ("'.$_POST['Translated'].'", "'.$Entry.'", "'.$_POST['Description'].'", '.$User->Id.', '.$_POST['Language'].')');
+          '`User`, `Language` ) VALUES ("'.$_POST['Translated'].'", "'.$Entry.'", "'.
+                $_POST['Description'].'", '.$this->System->User->Id.', '.$_POST['Language'].')');
       $Output = ShowMessage('Záznam byl uložen!');
     } else $Output = ShowMessage('Nebyly zaslány všechny položky formuláře.', MESSAGE_CRITICAL);
@@ -138 +135 @@
 function DictionaryRemove()
 {
-  global $User;
-  
-  if($User->Licence(LICENCE_USER))
-  {
-    $this->Database->query('DELETE FROM `Dictionary` WHERE (`User`='.$User->Id.') AND (`Id`='.($_GET['id'] * 1).')');
+  if($this->System->User->Licence(LICENCE_USER))
+  {
+    $this->Database->query('DELETE FROM `Dictionary` WHERE (`User`='.$this->System->User->Id.') AND (`Id`='.($_GET['id'] * 1).')');
     $Output = ShowMessage('Záznam odstraněn.');
   } else $Output = ShowMessage('Nemáte oprávnění', MESSAGE_CRITICAL);
@@ -150 +145 @@
 function DictionaryModify()
 {
-  global $User, $Config;
-  
-  if($User->Licence(LICENCE_USER))
+  if($this->System->User->Licence(LICENCE_USER))
   {
     $DbResult = $this->Database->query('SELECT * FROM `Dictionary` WHERE `Id`='.($_GET['id'] * 1));
@@ -159 +152 @@
       $DbRow = $DbResult->fetch_assoc();
       $DbResult = $this->Database->query('SELECT * FROM `Dictionary` WHERE (`User` IS NULL) '.
-        'AND (`Entry`='.$DbRow['Entry'].') AND (`Language`= '.$Config['OriginalLanguage'].')');
+        'AND (`Entry`='.$DbRow['Entry'].') AND (`Language`= '.$this->System->Config['OriginalLanguage'].')');
       $DbRow2 = $DbResult->fetch_assoc();
       $Output = '<form action="?action=save" method="post">'.
@@ -180 +173 @@
 function DictionaryGroup()
 {
-  global $User, $TranslationTree;
+  global $TranslationTree;
   
   $Output = '';
@@ -211 +204 @@
 function DictionaryShow()
 {
-  global $User, $LanguageList, $Config;
+  global $LanguageList;
   
   $Output = '<form action="?" method="get" style="margin: 0px; padding: 0px;">'.
@@ -222 +215 @@
     <input type="text" value="'.$Search.'" name="search" size="30" />
     <input type="submit" value="Vyhledat" />';
-  if($User->Licence(LICENCE_USER)) $Output .= ' <a href="?action=insert">Vložit slovo</a>';
+  if($this->System->User->Licence(LICENCE_USER)) 
+        $Output .= ' <a href="?action=insert">Vložit slovo</a>';
            
   $Output .= '</td></tr>'. 
@@ -252 +246 @@
       '`T1`.`Entry`, `T2`.`Text` AS `Original`, `T1`.`Text` AS `Translated`, `T1`.`Description` '.    
       'FROM `Dictionary` AS `T1` JOIN `Dictionary` AS `T2` '.
-      'ON (`T2`.`Entry` = `T1`.`Entry`) AND (`T2`.`Language` = '.$Config['OriginalLanguage'].') '.
+      'ON (`T2`.`Entry` = `T1`.`Entry`) AND (`T2`.`Language` = '.$this->System->Config['OriginalLanguage'].') '.
       'JOIN `Language` ON `Language`.`Id` = `T1`.`Language` '.
       'JOIN `User` ON `User`.`ID` = `T1`.`User` '.
@@ -273 +267 @@
   $TableColumns[] = array('Name' => 'Description', 'Title' => 'Popis');
   $TableColumns[] = array('Name' => 'UserName', 'Title' => 'Překladatel');   
-  if($User->Licence(LICENCE_USER)) $TableColumns[] = array('Name' => '', 'Title' => 'Akce');
+  if($this->System->User->Licence(LICENCE_USER)) $TableColumns[] = array('Name' => '', 'Title' => 'Akce');
   $Order = GetOrderTableHeader($TableColumns, 'Original');
   $Output .= '<table class="BaseTable">'.$Order['Output'];
@@ -287 +281 @@
     $Output .= '<td>'.$Line['Description'].'</td>'.
     '<td><a href="user.php?user='.$Line['UserId'].'">'.$Line['UserName'].'</a></td>';
-    if($User->Licence(LICENCE_USER))
-    {
-      if($Line['UserId'] == $User->Id) 
+    if($this->System->User->Licence(LICENCE_USER))
+    {
+      if($Line['UserId'] == $this->System->User->Id) 
         $Output .= '<td><a href="?action=remove&amp;id='.$Line['Id'].'" onclick="return confirmAction(\'Opravdu smazat položku?\');">Smazat</a>'.
         ' <a href="?action=modify&amp;id='.$Line['Id'].'">Upravit</a></td>';
@@ -305 +299 @@
 function Show()
 {
-        global $LanguageList, $User;
+        global $LanguageList;
         
 $LanguageList = GetLanguageList();
@@ -311 +305 @@
 if(!isset($_SESSION['language']))
 {
-        if($User->Licence(LICENCE_USER))
+        if($this->System->User->Licence(LICENCE_USER))
         {
-                $_SESSION['language'] = $User->Language;
+                $_SESSION['language'] = $this->System->User->Language;
   } else $_SESSION['language'] = '';
 }

trunk/Modules/Export/Page.php

@@ -16 +16 @@
         function ExportList()
         {
-                global $User;
-        
                 $Output = '<a href="?Action=ViewList">Všechny</a>';
-                if($User->Licence(LICENCE_USER))
+                if($this->System->User->Licence(LICENCE_USER))
                 {
                         $Output .= ' <a href="?Action=ViewList&amp;Filter=Others">Ostatních</a>'.
@@ -25 +23 @@
                 }
         
-                if($User->Licence(LICENCE_USER))
+                if($this->System->User->Licence(LICENCE_USER))
                         $Output .= '<br/><div style="text-align: center;"><a href="?Action=Create">Vytvořit nový export</a></div><br/>';
                 
@@ -31 +29 @@
                 if(array_key_exists('Filter', $_GET))
                 {
-                        if($_GET['Filter'] == 'My') $Filter = ' WHERE `Export`.`User` = '.$User->Id;
-                        if($_GET['Filter'] == 'Others') $Filter = ' WHERE `Export`.`User` != '.$User->Id;
+                        if($_GET['Filter'] == 'My') $Filter = ' WHERE `Export`.`User` = '.$this->System->User->Id;
+                        if($_GET['Filter'] == 'Others') $Filter = ' WHERE `Export`.`User` != '.$this->System->User->Id;
                 }
         
@@ -62 +60 @@
                         $Action = '<a href="?Action=View&amp;ExportId='.$Export['Id'].'&amp;Tab=0">Zobrazit</a> '.
                           '<a href="?Action=View&amp;ExportId='.$Export['Id'].'&amp;Tab=7">Exportovat</a>';
-                        if($Export['User'] == $User->Id) $Action .= ' <a href="?Action=Delete&amp;ExportId='.$Export['Id'].'" onclick="return confirmAction(\'Opravdu smazat položku?\');">Smazat</a>';
-                        if($User->Id != null) $Action .= ' <a href="?Action=Clone&amp;ExportId='.$Export['Id'].'" onclick="return confirmAction(\'Opravdu klonovat položku?\');">Klonovat</a>';
+                        if($Export['User'] == $this->System->User->Id) $Action .= ' <a href="?Action=Delete&amp;ExportId='.$Export['Id'].'" onclick="return confirmAction(\'Opravdu smazat položku?\');">Smazat</a>';
+                        if($this->System->User->Id != null) $Action .= ' <a href="?Action=Clone&amp;ExportId='.$Export['Id'].'" onclick="return confirmAction(\'Opravdu klonovat položku?\');">Klonovat</a>';
                         $Output .= '<tr><td>'.HumanDate($Export['TimeCreate']).'</td>'.
                                         '<td><a href="'.$this->System->Link('/user.php?user='.$Export['User']).'">'.$Export['UserName'].'</a></td>'.
@@ -80 +78 @@
         function ExportCreate()
         {
-                global $User;
-        
-                if($User->Licence(LICENCE_USER))
-                {
-                        $DbResult = $this->System->Database->query('SELECT COUNT(*) FROM `Export` WHERE `User`='.$User->Id);
+                if($this->System->User->Licence(LICENCE_USER))
+                {
+                        $DbResult = $this->System->Database->query('SELECT COUNT(*) FROM `Export` WHERE `User`='.$this->System->User->Id);
                         $DbRow = $DbResult->fetch_row();
                         if($DbRow[0] < $this->System->Config['MaxExportPerUser'])
@@ -101 +97 @@
         function ExportCreateFinish()
         {
-                global $User;
-        
-                if($User->Licence(LICENCE_USER))
+                if($this->System->User->Licence(LICENCE_USER))
                 {
                         if(array_key_exists('Title', $_POST) and array_key_exists('Description', $_POST))
                         {
-                                $DbResult = $this->System->Database->query('SELECT COUNT(*) FROM `Export` WHERE `User`='.$User->Id);
+                                $DbResult = $this->System->Database->query('SELECT COUNT(*) FROM `Export` WHERE `User`='.$this->System->User->Id);
                                 $DbRow = $DbResult->fetch_row();
                                 if($DbRow[0] < $this->System->Config['MaxExportPerUser'])
                                 {
-                                        $this->System->Database->query('INSERT INTO `Export` (`Title`, `User`, `TimeCreate`, `WithDiacritic`, `Description`) VALUES ("'.$_POST['Title'].'", '.$User->Id.', NOW(), 1, "'.$_POST['Description'].'")');
+                                        $this->System->Database->query('INSERT INTO `Export` (`Title`, `User`, `TimeCreate`, `WithDiacritic`, `Description`) VALUES ("'.$_POST['Title'].'", '.$this->System->User->Id.', NOW(), 1, "'.$_POST['Description'].'")');
                                         $ExportId = $this->System->Database->insert_id;
                                         $Output = ShowMessage('Nový export vytvořen.<br/>Přímý odkaz na tento export: <a href="?Action=View&amp;ExportId='.$ExportId.'">zde</a>');
@@ -125 +119 @@
         function ExportDelete()
         {
-                global $User;
-        
-                if($User->Licence(LICENCE_USER))
-                {
-                        $DbResult = $this->System->Database->query('SELECT * FROM `Export` WHERE (`Id`='.($_GET['ExportId'] * 1).') AND (`User`='.$User->Id.')');
+                if($this->System->User->Licence(LICENCE_USER))
+                {
+                        $DbResult = $this->System->Database->query('SELECT * FROM `Export` WHERE (`Id`='.($_GET['ExportId'] * 1).') AND (`User`='.$this->System->User->Id.')');
                         if($DbResult->num_rows > 0)
                         {
@@ -149 +141 @@
         function ExportViewTranslators()
         {
-                global $TranslationTree, $User;
+                global $TranslationTree;
         
                 $Output = '';
@@ -155 +147 @@
                 $DbResult = $this->System->Database->query('SELECT * FROM `Export` WHERE `Id`='.$_GET['ExportId']);
                 $Export = $DbResult->fetch_assoc();
-                if($User->Licence(LICENCE_USER) and ($User->Id == $Export['User'])) $Editable = true;
+                if($this->System->User->Licence(LICENCE_USER) and ($this->System->User->Id == $Export['User'])) $Editable = true;
                 else $Editable = false;
         
@@ -251 +243 @@
         function ExportViewGeneral()
         {
-                global $User;
-        
                 $DisabledInput = array(false => ' disabled="disabled"', true => '');
                 $DisabledTextArea = array(false => ' readonly="yes"', true => '');
@@ -258 +248 @@
                 $DbRows = $this->System->Database->query('SELECT * FROM `Export` WHERE `Id`='.$_GET['ExportId']);
                 $Export = $DbRows->fetch_assoc();
-                if($User->Licence(LICENCE_USER) and ($User->Id == $Export['User'])) $Editable = true;
+                if($this->System->User->Licence(LICENCE_USER) and ($this->System->User->Id == $Export['User'])) $Editable = true;
                 else $Editable = false;
         
@@ -291 +281 @@
         function ExportViewLanguages()
         {
-                global $TranslationTree, $User;
+                global $TranslationTree;
         
                 $Output = '';
@@ -297 +287 @@
                 $DbRows = $this->System->Database->query('SELECT * FROM `Export` WHERE `Id`='.$_GET['ExportId']);
                 $Export = $DbRows->fetch_assoc();
-                if($User->Licence(LICENCE_USER) and ($User->Id == $Export['User'])) $Editable = true;
+                if($this->System->User->Licence(LICENCE_USER) and ($this->System->User->Id == $Export['User'])) $Editable = true;
                 else $Editable = false;
         
@@ -382 +372 @@
         function ExportViewGroups()
         {
-                global $TranslationTree, $User;
+                global $TranslationTree;
         
                 $Output = '';
@@ -388 +378 @@
                 $DbRows = $this->System->Database->query('SELECT * FROM Export WHERE Id='.$_GET['ExportId']);
                 $Export = $DbRows->fetch_assoc();
-                if($User->Licence(LICENCE_USER) and ($User->Id == $Export['User'])) $Editable = true;
+                if($this->System->User->Licence(LICENCE_USER) and ($this->System->User->Id == $Export['User'])) $Editable = true;
                 else $Editable = false;
         
@@ -469 +459 @@
         function ExportViewOutputFormat()
         {
-                global $User;
-        
                 $Output = '';
                 $DisabledInput = array(false => ' disabled="disabled"', true => '');
@@ -479 +467 @@
                         {
                                 $Export = $DbRows->fetch_assoc();
-                                if($User->Licence(LICENCE_USER) and ($User->Id == $Export['User'])) $Editable = true;
+                                if($this->System->User->Licence(LICENCE_USER) and ($this->System->User->Id == $Export['User'])) $Editable = true;
                                 else $Editable = false;
         
@@ -516 +504 @@
         function ExportViewVersion()
         {
-                global $User;
-        
                 $Output = '';
                 $DisabledInput = array(false => ' disabled="disabled"', true => '');
                 $DbRows = $this->System->Database->query('SELECT * FROM `Export` WHERE `Id`='.$_GET['ExportId']);
                 $Export = $DbRows->fetch_assoc();
-                if($User->Licence(LICENCE_USER) and ($User->Id == $Export['User'])) $Editable = true;
+                if($this->System->User->Licence(LICENCE_USER) and ($this->System->User->Id == $Export['User'])) $Editable = true;
                 else $Editable = false;
         

trunk/Modules/FrontPage/FrontPage.php

@@ -28 +28 @@
   function HandleLoginForm()
   {
-        global $User, $Message, $MessageType;
+        global $Message, $MessageType;
   
         if(array_key_exists('action', $_GET))
@@ -36 +36 @@
                         if(array_key_exists('LoginUser', $_POST) and array_key_exists('LoginPass', $_POST))
                         {
-                                $User->Login($_POST['LoginUser'], $_POST['LoginPass']);
-                                if($User->Role == LICENCE_ANONYMOUS)
+                                $this->System->User->Login($_POST['LoginUser'], $_POST['LoginPass']);
+                                if($this->System->User->Role == LICENCE_ANONYMOUS)
                                 {
                                         $Message = 'Jméno nebo heslo bylo zadáno špatně.';
@@ -43 +43 @@
                                 } else
                                 {
-                                        $Message = 'Přihlášení proběhlo úspěšně. Vítej <strong>'.$User->Name.'</strong>!';
+                                        $Message = 'Přihlášení proběhlo úspěšně. Vítej <strong>'.$this->System->User->Name.'</strong>!';
                                         $MessageType = MESSAGE_INFORMATION;
                                 }
@@ -54 +54 @@
                         if($_GET['action'] == 'logout')
                         {
-                                if($User->Role != LICENCE_ANONYMOUS)
+                                if($this->System->User->Role != LICENCE_ANONYMOUS)
                                 {
                                         WriteLog('Odhlášení', LOG_TYPE_USER);
-                                        $User->Logout();
+                                        $this->System->User->Logout();
                                         $Message = 'Byl jsi odhlášen.';
                                         $MessageType = MESSAGE_INFORMATION;

trunk/Modules/Import/Manage.php

@@ -95 +95 @@
         function Show()
         {
-                global $User;
-
     $Output = '';
-    if($User->Licence(LICENCE_ADMIN))
+    if($this->System->User->Licence(LICENCE_ADMIN))
     {
     if(array_key_exists('action', $_GET))

trunk/Modules/Log/Log.php

@@ -26 +26 @@
   function DoAddItem($Message)
   {
-        WriteLog($Message, LOG_TYPE_ERROR);
+        $this->WriteLog($Message, LOG_TYPE_ERROR);
+  }
+
+  function WriteLog($Text, $Type)
+  {
+        if(!isset($_SERVER['REMOTE_ADDR'])) $IP = 'Konzole';
+          else $IP = addslashes($_SERVER['REMOTE_ADDR']);
+        
+        if(!is_null($this->System->User->Id)) $UserId = $this->System->User->Id;
+          else $UserId = 'NULL';
+        $Query = 'INSERT INTO `Log` ( `User` , `Type` , `Text` , `Date` , `IP`, `URL` ) '.
+                'VALUES ('.$UserId.', '.$Type.', "'.addslashes($Text).'", NOW(), "'.$IP.'", "'.$_SERVER['REQUEST_URI'].'")';
+        $this->System->Database->query($Query);
   }
 }

trunk/Modules/Referrer/Referrer.php

@@ -57 +57 @@
   function ShowList()
   {
-        global $System, $User;
-        
-    $Banner = '<a href="http://'.$System->Config['Web']['Host'].$System->Link('/').'"><img src="http://'.$System->Config['Web']['Host'].$System->Link('/banners/wowpreklad_big.jpg').'" '.
+    $Banner = '<a href="http://'.$this->System->Config['Web']['Host'].$this->System->Link('/').'">'.
+      '<img src="http://'.$this->System->Config['Web']['Host'].$this->System->Link('/banners/wowpreklad_big.jpg').'" '.
       'alt="wowpreklad" title="Otevřený projekt překládání celé hry World of Warcraft" '.
       'class="banner" height="60" width="468" /></a>';
  
-    $BannerSmall = '<a href="http://'.$System->Config['Web']['Host'].$System->Link('/').'"><img src="http://'.$System->Config['Web']['Host'].$System->Link('/banners/wowpreklad_small.jpg').'" '.
+    $BannerSmall = '<a href="http://'.$this->System->Config['Web']['Host'].$this->System->Link('/').'">'.
+      '<img src="http://'.$this->System->Config['Web']['Host'].$this->System->Link('/banners/wowpreklad_small.jpg').'" '.
       'alt="wowpreklad" title="Otevřený projekt překládání celé hry World of Warcraft" '.
       'class="banner" height="31" width="88" /></a>';
@@ -77 +77 @@
         <div style="font-size: 10px;">Seznam je automaticky aktualizován a zobrazeny jsou servery, ze kterých přišli uživatelé během posledních třech měsíců řazený sestupně dle nejnovějších.</div><br />';    
         
-        if(!$User->Licence(LICENCE_ADMIN)) $Where = ' WHERE (`Show`=1) AND (`Parent` IS NULL)';
+        if(!$this->System->User->Licence(LICENCE_ADMIN)) $Where = ' WHERE (`Show`=1) AND (`Parent` IS NULL)';
         else $Where = '';
         $Query = 'SELECT *, (SELECT Web FROM `Referrer` AS T4 WHERE T4.Id = T3.Parent) AS ParentName '.
@@ -101 +101 @@
                         array('Name' => 'TotalHits', 'Title' => 'Příchodů'),
         );
-        if($User->Licence(LICENCE_ADMIN))
+        if($this->System->User->Licence(LICENCE_ADMIN))
         {
                 $TableColumns[] = array('Name' => 'Show', 'Title' => 'Viditelné');
@@ -119 +119 @@
                                 '<td>'.HumanDate($Line['MaxDateLast']).'</td>'.
                                 '<td>'.$Line['TotalHits'].'</td>';
-                if($User->Licence(LICENCE_ADMIN))
+                if($this->System->User->Licence(LICENCE_ADMIN))
                 {
                         $Output .=
@@ -156 +156 @@
   function Edit()
   {
-        global $User;
-        
-          if($User->Licence(LICENCE_ADMIN))
+    if($this->System->User->Licence(LICENCE_ADMIN))
           {
                 if(array_key_exists('id', $_GET))
@@ -182 +180 @@
   function EditSave()
   {
-          global $User;
-        
-          if($User->Licence(LICENCE_ADMIN))
+          if($this->System->User->Licence(LICENCE_ADMIN))
           {             
                   if($_POST['Parent'] == '') $_POST['Parent'] = null;

trunk/Modules/Team/Team.php

@@ -27 +27 @@
 }
 
-include_once('img_level.php');
+include_once('../../img_level.php');
 
 class PageTeam extends Page
@@ -33 +33 @@
         function ShowTeamList()
         {
-                global $Config, $User;
-        
                 $Output = '<h3>Seznam překladatelských týmů</h3>';
                 $Output .= 'Týmy jsou seskupení překladatelů, kteří se hlásí k něčemu společnému jako např. WoW serveru, způsobu překladu, ke stejnému hernímu spolku, aj. Být členem týmu samo o sobě nemá žádný zásadní důsledek a spíše to může pomoci se lépe orientovat mezi překladateli někomu, kdo sestavuje export.<br/>';
 
-    if($User->Licence(LICENCE_USER))
+    if($this->System->User->Licence(LICENCE_USER))
                   $Output .= '<br /><div style="text-align: center;"><a href="?action=create">Vytvořit překladatelský tým</a></div><br/>';
                 
@@ -55 +53 @@
                                 array('Name' => 'TimeCreate', 'Title' => 'Datum založení'),
                 );
-                if($User->Licence(LICENCE_USER)) $TableColumns[] = array('Name' => '', 'Title' => 'Uživatelské akce');
+                if($this->System->User->Licence(LICENCE_USER)) $TableColumns[] = array('Name' => '', 'Title' => 'Uživatelské akce');
         
                 $Order = GetOrderTableHeader($TableColumns, 'NumberUser', 1);
@@ -75 +73 @@
                                         '<td><a href="userlist.php?team='.$Team['Id'].'" title="Zobrazit členy týmu">'.$Team['NumberUser'].'</a></td>'.
                                         '<td>'.HumanDate($Team['TimeCreate']).'</td>';
-                        if($User->Licence(LICENCE_USER))
-                        {
-                                if($Team['Leader'] == $User->Id) $Action = ' <a href="?action=modify&amp;id='.$Team['Id'].'">Upravit</a>';
+                        if($this->System->User->Licence(LICENCE_USER))
+                        {
+                                if($Team['Leader'] == $this->System->User->Id) $Action = ' <a href="?action=modify&amp;id='.$Team['Id'].'">Upravit</a>';
                                 else $Action = '';
-                                if($Team['Id'] == $User->Team) $Action = ' <a href="?action=leave">Opustit</a>';
+                                if($Team['Id'] == $this->System->User->Team) $Action = ' <a href="?action=leave">Opustit</a>';
                                 $Output .= '<td><a href="?action=gointeam&amp;id='.$Team['Id'].'">Vstoupit</a>'.$Action.'</td>';
                         }
@@ -92 +90 @@
         function TeamJoin()
         {
-                global $User;
-        
-                if($User->Licence(LICENCE_USER))
+                if($this->System->User->Licence(LICENCE_USER))
                 {
                         if(array_key_exists('id', $_GET))
                         {
-                                $this->Database->query('UPDATE `User` SET `Team` = '.$_GET['id'].' WHERE `ID` = '.$User->Id);
+                                $this->Database->query('UPDATE `User` SET `Team` = '.$_GET['id'].' WHERE `ID` = '.$this->System->User->Id);
                                 $Output = ShowMessage('Vstoupil jsi do týmu.');
                                 WriteLog('Uživatel vstoupil do týmu '.$_GET['id'], LOG_TYPE_USER);
@@ -116 +112 @@
         function TeamCreateFinish()
         {
-                global $User;
-        
                 $Output = '';
-                if($User->Licence(LICENCE_USER))
+                if($this->System->User->Licence(LICENCE_USER))
                 {
                         if(array_key_exists('Name', $_POST) and array_key_exists('Description', $_POST))
@@ -130 +124 @@
                                         $this->Database->query('INSERT INTO `Team` (`Name` ,`Description`, `URL`, `TimeCreate`, `Leader`)'.
                                                         ' VALUES ("'.trim($_POST['Name']).'", "'.trim($_POST['Description']).'", "'.
-                                                        $_POST['URL'].'", NOW(), '.$User->Id.')');
-                                        $this->Database->query('UPDATE `User` SET `Team` = '.$this->Database->insert_id.' WHERE `ID` = '.$User->Id);
+                                                        $_POST['URL'].'", NOW(), '.$this->System->User->Id.')');
+                                        $this->Database->query('UPDATE `User` SET `Team` = '.$this->Database->insert_id.' WHERE `ID` = '.$this->System->User->Id);
                                         $Output .= ShowMessage('Překladatelský tým vytvořen.');
                                         WriteLog('Překladatelský tým vytvořen '.$_POST['Name'], LOG_TYPE_USER);
@@ -146 +140 @@
         function TeamModify()
         {
-                global $User;
-        
-                if($User->Licence(LICENCE_USER))
+                if($this->System->User->Licence(LICENCE_USER))
                 {
                         if(array_key_exists('id', $_GET))
                         {
-                                $DbResult = $this->Database->query('SELECT * FROM `Team` WHERE `Id`='.$_GET['id'].' AND `Leader`='.$User->Id);
+                                $DbResult = $this->Database->query('SELECT * FROM `Team` WHERE `Id`='.$_GET['id'].' AND `Leader`='.$this->System->User->Id);
                                 if($DbResult->num_rows > 0)
                                 {
@@ -171 +163 @@
         function TeamModifyFinish()
         {
-                global $User;
-        
                 $Output = '';
-                if($User->Licence(LICENCE_USER))
+                if($this->System->User->Licence(LICENCE_USER))
                 {
                         if(array_key_exists('id', $_GET) and array_key_exists('Name', $_POST) and array_key_exists('Description', $_POST) and array_key_exists('URL', $_POST))
                         {
-                                $DbResult = $this->Database->query('SELECT * FROM `Team` WHERE `Id`='.$_GET['id'].' AND `Leader`='.$User->Id);
+                                $DbResult = $this->Database->query('SELECT * FROM `Team` WHERE `Id`='.$_GET['id'].' AND `Leader`='.$this->System->User->Id);
                                 if($DbResult->num_rows > 0)
                                 {
@@ -200 +190 @@
         function TeamCreate()
         {
-                global $User;
-        
-                if($User->Licence(LICENCE_USER))
+                if($this->System->User->Licence(LICENCE_USER))
                 {
                         $Output ='<form action="?action=finish_create" method="post">'.
@@ -217 +205 @@
         function TeamShow()
         {
-                global $User, $Config;
-        
                 $Output = '';
                 if(array_key_exists('id', $_GET) and is_numeric($_GET['id']))
@@ -243 +229 @@
                                                 'Popis: '.$Team['Description'].'<br /><br />';
                                 //$Output .= '<a href="export/?team='.$Team['Id'].'">Exportovat překlad týmu</a> ';
-                                if($User->Licence(LICENCE_USER))
+                                if($this->System->User->Licence(LICENCE_USER))
                                         $Output .='<a href="?action=gointeam&amp;id='.$Team['Id'].'">Vstoupit do týmu</a><br /><br />';
                                 $Output .='<fieldset><legend>Statistika</legend>'.
                                                 'Počet členů týmu: <a href="userlist.php?team='.$Team['Id'].'" title="Zobrazit členy týmu">'.$Team['NumberUser'].'</a><br />'.
                                                 'Počet přeložených textů týmu: <strong>'.$Team['NumberTranslate'].'</strong><br />'.
-                                                'Průměrná úroveň překladatelů v týmu: <img src="tmp/team/'.$Team['Name'].'/level.png" /><br /><br />'.
-                                                '<strong>Stav dokončení týmu pro verzi '.$Config['Web']['GameVersion'].'</strong><br />';
-        
-                                $BuildNumber = GetBuildNumber($Config['Web']['GameVersion']);
+                                                'Průměrná úroveň překladatelů v týmu: <img src="'.$this->System->Link('/tmp/team/'.$Team['Name'].'/level.png').'" /><br /><br />'.
+                                                '<strong>Stav dokončení týmu pro verzi '.$this->System->Config['Web']['GameVersion'].'</strong><br />';
+        
+                                $BuildNumber = GetBuildNumber($this->System->Config['Web']['GameVersion']);
         
                                 $GroupListQuery = 'SELECT `Group`.* FROM `Group`';
@@ -263 +249 @@
                                                                 'SELECT `T`.`Entry` FROM `'.$DbRow['TablePrefix'].'` AS `T` '.
                                                                 'WHERE (`User` IN (SELECT `ID` FROM `User` WHERE `Team` = '.$Team['Id'].')) '.
-                                                                'AND (`Complete` = 1) AND (`T`.`Language`!='.$Config['OriginalLanguage'].') '.
+                                                                'AND (`Complete` = 1) AND (`T`.`Language`!='.$this->System->Config['OriginalLanguage'].') '.
                                                                 'AND (`VersionStart` <= '.$BuildNumber.') AND (`VersionEnd` >= '.$BuildNumber.')'.
                                                                 ') AS `C1`) AS `Translated`, '.
                                                                 '(SELECT COUNT(DISTINCT(`Entry`)) FROM ('.
                                                                 'SELECT `T`.`Entry` FROM `'.$DbRow['TablePrefix'].'` AS `T` '.
-                                                                'WHERE (`Language` = '.$Config['OriginalLanguage'].') '.
+                                                                'WHERE (`Language` = '.$this->System->Config['OriginalLanguage'].') '.
                                                                 'AND (`VersionStart` <= '.$BuildNumber.') AND (`VersionEnd` >= '.$BuildNumber.')'.
                                                                 ') AS `C2`) AS `Total`, "'.$DbRow['Name'].'" AS `Name` UNION ';
@@ -312 +298 @@
         function TeamLeave()
         {
-                global $User;
-        
-                if($User->Licence(LICENCE_USER))
-                {
-                        $this->Database->query('UPDATE `User` SET `Team` = NULL WHERE `ID` = '.$User->Id);
+                if($this->System->User->Licence(LICENCE_USER))
+                {
+                        $this->Database->query('UPDATE `User` SET `Team` = NULL WHERE `ID` = '.$this->System->User->Id);
                         $Output = ShowMessage('Nyní nejste členem žádného týmu.');
                         WriteLog('Uživatel vystoupil z týmu', LOG_TYPE_USER);

trunk/Modules/Translation/Form.php

@@ -30 +30 @@
         function ShowForm()
         {
-                global $System, $Config, $User, $TranslationTree;
+                global $TranslationTree;
                 
                 $Output = '';
@@ -43 +43 @@
                         $TextID = $_GET['ID'] * 1;
         
-                        $DbResult = $System->Database->query('SELECT * FROM `'.$Table.'` WHERE `ID` = '.$TextID);
+                        $DbResult = $this->Database->query('SELECT * FROM `'.$Table.'` WHERE `ID` = '.$TextID);
                         $Line = $DbResult->fetch_assoc();
                         if(!$Line)
@@ -49 +49 @@
                                 $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');
+                        {       
+                                $DbResult = $this->Database->query('SELECT * FROM `'.$Table.'` WHERE '.
+                                        '(`Language` = '.$this->System->Config['OriginalLanguage'].') AND '.
+                                        '(`Entry` = '.$Line['Entry'].') AND (`VersionEnd` = '.$Line['VersionEnd'].') LIMIT 1');
                                 $LineAJ = $DbResult->fetch_assoc();
                                 if(!$LineAJ)
@@ -61 +62 @@
                                         if($Line['User'] != '')
                                         {
-                                                $IDUser = $System->Database->query('SELECT * FROM `User` WHERE `ID` = '.$Line['User']);
+                                                $IDUser = $this->Database->query('SELECT * FROM `User` WHERE `ID` = '.$Line['User']);
                                                 $LineUser = $IDUser->fetch_array();
                                         } else
@@ -72 +73 @@
                                         if(($Line['Take'] <> 0) and ($Line['Take'] <> $Line['ID']))
                                         {
-                                                $DbResult = $System->Database->query('SELECT `Language`,`VersionStart`,`VersionEnd` FROM `'.$Table.'` WHERE `ID` = '.$Line['Take']);
+                                                $DbResult = $this->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']);
+                                                $DbResult = $this->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 />';
+                                                        ' ID <a href="form.php?group='.$GroupId.'&amp;ID='.$Line['Take'].'">'.$Line['Take'].'</a></strong>'.
+                                                        ' ('.$Lang['Name'].')'.
+                                                        ' <br />';
                                         }
                                         $Output .= 'Text: ';
@@ -95 +96 @@
                                                         '<br />';
                                          
-                                        $DbResult = $System->Database->query('SELECT COUNT(*) FROM `'.$Table.'` WHERE (`Entry` = '.$Line['Entry'].') AND (`Language` <> '.$Config['OriginalLanguage'].') AND (`Complete` = 1)');
+                                        $DbResult = $this->Database->query('SELECT COUNT(*) FROM `'.$Table.'` WHERE '.
+                                                '(`Entry` = '.$Line['Entry'].') AND (`Language` <> '.$this->System->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>
+                                                $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'].'" />
@@ -107 +110 @@
                                                 <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)');
+                                                $DataID = $this->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>';
+                                                        if($Version['ID'] == $Line['Take']) $Output .= '<option value="'.
+                                                          $Version['ID'].'">'.$Version['ID'].' - '.$Version['User'].' (převzato)</option>';
                                                         else
                                                         {
@@ -122 +126 @@
                                         } 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>';
+                                                $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))
+                                        if($this->System->User->Licence(LICENCE_USER))
                                         {
                                                 $Output .= '<form action="save.php?group='.$GroupId.'" method="post"><div>';
@@ -143 +148 @@
         
                                         $Output .= '<input type="hidden" name="entry" value="'.$LineAJ['Entry'].'" />
-                                        <input type="hidden" name="user" value="'.$User->Id.'" />
+                                        <input type="hidden" name="user" value="'.$this->System->User->Id.'" />
                                         <input type="hidden" name="ID" value="'.$TextID.'" />
                                         <table class="BaseTable">
@@ -156 +161 @@
                                         <td>';
                                         if($Line['Language'] <> 0) $Language = $Line['Language'];
-                                        else if($User->Id != 0)
-                                        {
-                                                $Language = $User->Language;
+                                        else if($this->System->User->Id != 0)
+                                        {
+                                                $Language = $this->System->User->Language;
                                         } else $Language = 0;
-                                        if($User->Licence(LICENCE_USER)) $Output .= WriteLanguages($Language);
+                                        if($this->System->User->Licence(LICENCE_USER)) $Output .= WriteLanguages($Language);
                                           else {                                        
-                  $DbResult3 = $System->Database->select('Language', '`Id`, `Name`', '`Enabled` = 1');
+                  $DbResult3 = $this->Database->select('Language', '`Id`, `Name`', '`Enabled` = 1');
                   if($DbResult3->num_rows > 0) 
                   { 
@@ -180 +185 @@
                                         if(($GroupId < 4) or ($GroupId == 10) or ($GroupId == 11)) {
                                                 //<span class="edit">barvou.</span>
-                                                $names = GetTranslatNames($Text,0,array('Dictionary' => 'Text','TextCreature' => 'name'));
+                                                $names = GetTranslatNames($Text, 0, array('Dictionary' => 'Text', 'TextCreature' => 'name'));
                                         } else {
-                                                $names = GetTranslatNames($Text,0,array('Dictionary' => 'Text'));
+                                                $names = GetTranslatNames($Text, 0, array('Dictionary' => 'Text'));
                                         }
         
@@ -190 +195 @@
                                                         if(($LineAJ[$TextItem['Column']] <> '') or ($Line[$TextItem['Column']] <> ''))
                                                         {
-                                                                if ($TextItem['Name'] == 'Text' AND (($Table == 'global_strings') OR ($Table == 'glue_strings')))
+                                                                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'].'">';
+                                                                if($this->System->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>';
+                                                                if($this->System->User->Licence(LICENCE_USER)) $Output .= '</textarea></td></tr>';
                                                         }
                                                 } else
@@ -204 +210 @@
                                                 }
                                                 $Output .= '</table></div>';
-                                                if($User->Licence(LICENCE_USER)) $Output .= '</form>';
+                                                if($this->System->User->Licence(LICENCE_USER)) $Output .= '</form>';
                                 }
                         }
@@ -213 +219 @@
         function Delete()
         {
-                global $System, $User, $Config;
-        
-                if($User->Licence(LICENCE_MODERATOR))
+                if($this->System->User->Licence(LICENCE_MODERATOR))
                 {
                         $TextID = $_GET['ID'];
-                        $System->Database->query('DELETE FROM `'.$Table.'` WHERE `ID` = '.$TextID.' AND `Language` <> '.$Config['OriginalLanguage']);
+                        $this->Database->query('DELETE FROM `'.$Table.'` WHERE `ID` = '.$TextID.' AND `Language` <> '.$this->System->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);

trunk/Modules/Translation/TranslationList.php

@@ -5 +5 @@
         function ShowFilter($GroupId = 0)
         {
-                global $System, $TranslationTree, $Config;
+                global $TranslationTree;
         
                 $Filter = array('SQL' => '');
@@ -59 +59 @@
                 else $Selected = '';
                 $Output .= '<option value="0"'.$Selected.'>Všechny</option>';
-                $DbResult = $System->Database->query('SELECT `Id`,`Name` FROM `Group` ORDER BY `Name`');
+                $DbResult = $this->Database->query('SELECT `Id`,`Name` FROM `Group` ORDER BY `Name`');
                 while($Group = $DbResult->fetch_assoc())
                 {
@@ -72 +72 @@
                 if($Filter['Version'] != 0)
                 {
-                        $DbResult = $System->Database->query('SELECT `Id`, `BuildNumber`,`Version` FROM `ClientVersion` WHERE (`Imported` = 1) AND (`Id` ='.$Filter['Version'].')');
+                        $DbResult = $this->Database->query('SELECT `Id`, `BuildNumber`,`Version` FROM `ClientVersion` WHERE (`Imported` = 1) AND (`Id` ='.$Filter['Version'].')');
                         if($DbResult->num_rows > 0)
                         {
@@ -83 +83 @@
                 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');
+                $DbResult = $this->Database->query('SELECT `Id`, `BuildNumber`,`Version` FROM `ClientVersion` WHERE `Imported` = 1 ORDER BY `BuildNumber` DESC');
                 while($Version = $DbResult->fetch_assoc())
                 {
@@ -101 +101 @@
                 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`');
+                $DbResult = $this->Database->query('SELECT `Id`, `Name` FROM `Language` WHERE `Enabled` = 1 ORDER BY `Name`');
                 while($Language = $DbResult->fetch_assoc())
                 {
@@ -118 +118 @@
                 else $Selected = '';
                 $Output .= '<option value="0"'.$Selected.'>Všichni</option>';
-                $DbResult = $System->Database->query('SELECT `Id`, `Name` FROM `User` ORDER BY `Name`');
+                $DbResult = $this->Database->query('SELECT `Id`, `Name` FROM `User` ORDER BY `Name`');
                 while($User = $DbResult->fetch_assoc())
                 {
@@ -153 +153 @@
                 {
                         if($Filter['State'] == 0) $Filter['SQL'] .= $UserFilter.$VersionFilter.'';
-                        else if($Filter['State'] == 1) $Filter['SQL'] .= $VersionFilter.' AND (`T`.`Language` = '.$Config['OriginalLanguage'].') '.
+                        else if($Filter['State'] == 1) $Filter['SQL'] .= $VersionFilter.' AND (`T`.`Language` = '.$this->System->Config['OriginalLanguage'].') '.
                                         'AND NOT EXISTS(SELECT 1 FROM `'.$Table.'` AS `Sub` WHERE '.
-                                        '(`Sub`.`Language` <> '.$Config['OriginalLanguage'].')'.$LanguageFilter.$UserFilter.
+                                        '(`Sub`.`Language` <> '.$this->System->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'].
+                        else if($Filter['State'] == 3) $Filter['SQL'] .= $UserFilter.$LanguageFilter.$VersionFilter.' AND (`T`.`Language` != '.$this->System->Config['OriginalLanguage'].
                         ') AND (`T`.`Complete` = 0)';
-                        else if($Filter['State'] == 4) $Filter['SQL'] .= $VersionFilter.' AND (`T`.`Language` = '.$Config['OriginalLanguage'].')';
+                        else if($Filter['State'] == 4) $Filter['SQL'] .= $VersionFilter.' AND (`T`.`Language` = '.$this->System->Config['OriginalLanguage'].')';
                 }
         
@@ -191 +191 @@
         function ShowTranslationList($Filter)
         {
-                global $System, $TranslationTree;
+                global $TranslationTree;
         
                 $Output = $Filter['Output'];
@@ -208 +208 @@
         
                 // Get total item count
-                $DbResult = $System->Database->query('SELECT COUNT(*) FROM ('.$Query.') AS `TT`');
+                $DbResult = $this->Database->query('SELECT COUNT(*) FROM ('.$Query.') AS `TT`');
                 $DbRow = $DbResult->fetch_row();
                 $PageList = GetPageList($DbRow[0]);
@@ -226 +226 @@
                                 $Order['Output'];
                  
-                $DbResult = $System->Database->query($Query.' '.$Order['SQL'].' '.$PageList['SQLLimit']);
+                $DbResult = $this->Database->query($Query.' '.$Order['SQL'].' '.$PageList['SQLLimit']);
                 while($Line = $DbResult->fetch_assoc())
                 {
@@ -243 +243 @@
         function ShowGroupList($Filter)
         {
-                global $System, $TranslationTree;
+                global $TranslationTree;
         
                 $Output = $Filter['Output'];
@@ -253 +253 @@
                         {
                                 $Filter = $this->ShowFilter($Group['Id']);
-                                $ID = $System->Database->query('SELECT COUNT(*) FROM `'.$Group['TablePrefix'].'` AS `T` WHERE 1 '.$Filter['SQL']);
+                                $ID = $this->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>';
@@ -265 +265 @@
         function ShowGroupTypeList()
         {
-                global $System, $User;
-        
-                $DbResult = $System->Database->query('SELECT COUNT(*) FROM `Group`');
+                $DbResult = $this->Database->query('SELECT COUNT(*) FROM `Group`');
                 $DbRow = $DbResult->fetch_row();
                 $PageList = GetPageList($DbRow[0]);
@@ -285 +283 @@
                 $Output .= $Order['Output'];
         
-                $DbResult = $System->Database->query('SELECT * FROM `Group`'.$Order['SQL'].$PageList['SQLLimit']);
+                $DbResult = $this->Database->query('SELECT * FROM `Group`'.$Order['SQL'].$PageList['SQLLimit']);
                 while($Group = $DbResult->fetch_assoc())
                 {
@@ -297 +295 @@
                 $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>';
+                if($this->System->User->Licence(LICENCE_ADMIN)) $Output .= '<a href="?action=groupadd">Přidat překladovou skupinu</a>';
                 return($Output);
         }
@@ -303 +301 @@
         function ShowMenu()
         {
-                global $User, $TranslationTree;
+                global $TranslationTree;
         
                 $GroupId = GetParameter('group', 0, true);
@@ -321 +319 @@
                                         '<td>Texty označené jako rozpracované.</td></tr>';
         
-                        if($User->Licence(LICENCE_USER))
+                        if($this->System->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>
+                                $Output .= '<tr><td><a title="Nedokončené texty" href="?group='.$GroupId.'&amp;state=3&amp;user='.$this->System->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>
+                                <tr><td><a title="Přeložené texty přihlášeného uživatele" href="?group='.$GroupId.'&amp;state=2&amp;user='.$this->System->User->Id.'">Moje přeložené</a></td>
                                 <td>Přeložené texty přihlášeného uživatele</td></tr>';
                         }
@@ -348 +346 @@
         function ShowGroupAdd()
         {
-                global $User;
-        
-                if($User->Licence(LICENCE_ADMIN))
+                if($this->System->User->Licence(LICENCE_ADMIN))
                 {
                         $Output = '<h3>Vložení nové překladové skupiny</h3>'.
@@ -368 +364 @@
         function ShowGroupAddFinish()
         {
-                global $User;
-        
-                if($User->Licence(LICENCE_ADMIN))
+                if($this->System->User->Licence(LICENCE_ADMIN))
                 {
                         // TODO: Add group items manipulation oprations

trunk/Modules/User/Options.php

@@ -5 +5 @@
         function UserOptionsFrom()
         {
-                global $User;
-        
                 $Output = '<form action="Options.php?action=save" method="post">
                 <fieldset><legend>Nastavení uživatele</legend>
                 <table>
-                <tr><td>Email:</td><td><input type="text" name="Email" value="'.$User->Email.'" /></td></tr>
+                <tr><td>Email:</td><td><input type="text" name="Email" value="'.$this->System->User->Email.'" /></td></tr>
                 <tr><td>Původní heslo:</td><td><input type="password" name="OldPass" /></td></tr>
                 <tr><td>Nové heslo:</td><td><input type="password" name="NewPass" /></td></tr>
                 <tr><td>Nové heslo pro potvrzení: </td><td><input type="password" name="NewPass2" /></td></tr>
-                <tr><td>Normálně budu překládat do: </td><td>'.WriteLanguages($User->Language).'</td></tr>
+                <tr><td>Normálně budu překládat do: </td><td>'.WriteLanguages($this->System->User->Language).'</td></tr>
                 <tr><td>Po uložení překladu přesměrovat: </td><td>';
                 $Output .= '<select name="redirecting">'.
                                 '<option value="0">Nikam</option>'.
                                 '<option value="1"';
-                if($User->Redirecting == '1') $Output .= ' selected="selected"';
+                if($this->System->User->Redirecting == '1') $Output .= ' selected="selected"';
                 $Output .= '>Na nepřeložené</option>';
                 $Output .= '<option value="2"';
-                if($User->Redirecting == '2') $Output .= ' selected="selected"';
+                if($this->System->User->Redirecting == '2') $Output .= ' selected="selected"';
                 $Output .= '>Na další překlad</option>';
                 $Output .= '<option value="3"';
-                if($User->Redirecting == '3') $Output .= ' selected="selected"';
+                if($this->System->User->Redirecting == '3') $Output .= ' selected="selected"';
                 $Output .= '>Na předchozí překlad</option>';
                 $Output .= '</select>';
         
                 $Output .= '</td></tr>'.
-                                '<tr><td>Upřednostněná verze klienta: </td><td>'.ClientVersionSelection($User->PreferredVersion).'</td></tr>'.
+                                '<tr><td>Upřednostněná verze klienta: </td><td>'.ClientVersionSelection($this->System->User->PreferredVersion).'</td></tr>'.
                                 '<tr><td>Veřejný text profilu:</td><td>'.
-                                '<textarea name="info" cols="60" rows="10">'.$User->Info.'</textarea></td></tr>'.
+                                '<textarea name="info" cols="60" rows="10">'.$this->System->User->Info.'</textarea></td></tr>'.
                                 '<tr><td colspan="2"><input type="submit" value="Uložit" /></td></tr>'.
                                 '</table></fieldset>'.
@@ -47 +45 @@
                 {
                         $Output .= '<option value="'.$LineTeam['Id'].'"';
-                        if ($LineTeam['Id'] == $User->Team) $Output .= ' selected="selected"';
+                        if ($LineTeam['Id'] == $this->System->User->Team) $Output .= ' selected="selected"';
                         $Output .= '>'.$LineTeam['Name'].'</option>';
                 }
@@ -58 +56 @@
         function UserOptionsSave()
         {
-                global $User;
-        
                 $Output = '';
                 if(array_key_exists('Email', $_POST))
@@ -78 +74 @@
                                 if($NewPass == $NewPass2)
                                 {
-                                        $DbResult = $System->Database->query('SELECT `Pass`, '.$User->CryptPasswordSQL('"'.$OldPass.'"', '`Salt`').' AS `Hash` FROM `User` WHERE `ID`= '.$User->Id);
+                                        $DbResult = $System->Database->query('SELECT `Pass`, '.$this->System->User->CryptPasswordSQL('"'.$OldPass.'"', '`Salt`').' AS `Hash` FROM `User` WHERE `ID`= '.$this->System->User->Id);
                                         $DbRow = $DbResult->fetch_assoc();
                                         if($DbRow['Hash'] == $DbRow['Pass'])
                                         {
                                                 // Update password
-                                                $Salt = $User->GetPasswordSalt();
-                                                $this->Database->query('UPDATE `User` SET `Pass` = '.$User->CryptPasswordSQL('"'.$NewPass.'"', '"'.$Salt.'"').', `Salt`="'.$Salt.'" WHERE `ID` = '.$User->Id);
+                                                $Salt = $this->System->User->GetPasswordSalt();
+                                                $this->Database->query('UPDATE `User` SET `Pass` = '.$this->System->User->CryptPasswordSQL('"'.$NewPass.'"', '"'.$Salt.'"').', `Salt`="'.$Salt.'" WHERE `ID` = '.$this->System->User->Id);
                                                 $Output .= ShowMessage('Heslo změněno.');
                                         } else $Output .= ShowMessage('Staré heslo neodpovídá.', MESSAGE_CRITICAL);
                                 } else $Output .= ShowMessage('Hesla se neshodují.', MESSAGE_CRITICAL);
                         }
-                        $this->Database->update('User', '`ID` = '.$User->Id, array('Email' => $Email,
-                                        'Language' => $Language, 'Redirecting' => $Redirecting, 'Info' => $Info,
-                                        'PreferredVersion' => $PreferredVersion));
-                        $Output .= ShowMessage('Úprava nastavení proběhla v pořádku, Email: <b>'.$Email.'</b> Uživatel: <b>'.$User->Name.'</b>');
+                        $this->Database->update('User', '`ID` = '.$this->System->User->Id, array('Email' => $Email,
+                          'Language' => $Language, 'Redirecting' => $Redirecting, 'Info' => $Info,
+                          'PreferredVersion' => $PreferredVersion));
+                        $Output .= ShowMessage('Úprava nastavení proběhla v pořádku, Email: <b>'.$Email.'</b> Uživatel: <b>'.$this->System->User->Name.'</b>');
                         WriteLog('Úprava nastavení!', LOG_TYPE_USER);
-                        $User->Load();
+                        $this->System->User->Load();
                 } else $Output .= ShowMessage('Nezadány údaje.', MESSAGE_CRITICAL);
                 return($Output);

trunk/Modules/User/Profile.php

@@ -5 +5 @@
         function SendMail()
         {
-                global $Config, $User;
-        
                 $Output = '';
                 if(array_key_exists('text', $_POST))
-                if($User->Licence(LICENCE_ADMIN))
+                if($this->System->User->Licence(LICENCE_ADMIN))
                 {
                         $Text = $_POST['text'];
@@ -18 +16 @@
                                         'Text: <strong>'.$Text.'</strong><br />';
         
-                        if(@mail($Email, $Subject, $Text, 'From: '.$Config['Web']['AdminEmail'].'\nReply-To: '.$Config['Web']['AdminEmail'].'\nX-Mailer: PHP/'))
+                        if(@mail($Email, $Subject, $Text, 'From: '.$this->System->Config['Web']['AdminEmail'].'\nReply-To: '.$this->System->Config['Web']['AdminEmail'].'\nX-Mailer: PHP/'))
                         {
                                 $Output .= ShowMessage('Zpráva byla odeslána.');

trunk/Modules/User/User.php

@@ -21 +21 @@
         function Start()
         {
+                global $User;
+                
                 $this->System->User = new User($this->System);
-                $this->System->RegisterPage('userlist.php', 'PageUserList');
+    $this->System->RegisterPage('userlist.php', 'PageUserList');
                 $this->System->RegisterPage('Options.php', 'PageUserOptions');
                 $this->System->RegisterPage('registrace.php', 'PageUserRegistration');
@@ -87 +89 @@
       $this->Id = $User['ID'];      
       $this->Load();
-      WriteLog('Login: '.$Name, LOG_TYPE_USER);
+      $this->System->ModuleManager->Modules['Log']->WriteLog('Login: '.$Name, LOG_TYPE_USER);
       $this->UpdateState();
     } else $this->Role = LICENCE_ANONYMOUS;

trunk/Modules/User/UserList.php

@@ -1 +1 @@
 <?php
 
-
-include_once('img_level.php');
+include_once(dirname(__FILE__).'/../../img_level.php');
 
 class PageUserList extends Page