Changeset 577 for trunk/Modules/Dictionary

Timestamp:

Sep 11, 2013, 10:37:54 PM (11 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.

File:

• trunk/Modules/Dictionary/Dictionary.php (modified) (16 diffs)

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'] = '';
 }