Changeset 376 for trunk/dictionary.php

Timestamp:

Mar 11, 2010, 8:40:32 AM (15 years ago)

Author:

george

Message:

• Upraveno: Informace o přihlášeném uživateli nově pročištěny a sjednoceny do třídy User. SQL pro kontrolu a generovány hesel dostupné přímo přes metodu CryptPasswordSQL. Přístup k Id přihlášeného uživatele přes globální proměnnou $User a vlastnost Id ($User->Id). Podobně přístup k dalším vlastnostem uživatele.
• Opraveno: Některé chyby z předchozích předělávek.

File:

• trunk/dictionary.php (modified) (8 diffs)

trunk/dictionary.php

@@ -91 +91 @@
 if(!isset($_SESSION['language'])) 
 {
-  if(Licence(LICENCE_USER)) 
-  {
-    $DbResult = $Database->SQLCommand('SELECT `Language` FROM `User` WHERE `ID`='.$_SESSION['UserID']);
-    $User = mysql_fetch_assoc($DbResult);
-    $_SESSION['language'] = $User['Language'];
+  if($User->Licence(LICENCE_USER)) 
+  {
+    $_SESSION['language'] = $User->Language;
   } else $_SESSION['language'] = 1;
 }
@@ -127 +125 @@
   if(array_key_exists('action', $_GET)) 
   {
-    if(($_GET['action'] == 'insert')  and Licence(LICENCE_USER))
+    if(($_GET['action'] == 'insert')  and $User->Licence(LICENCE_USER))
     {
       echo('<form action="dictionary.php?action=save" method="post">'.
@@ -140 +138 @@
       '</form>');    
     } else
-    if(($_GET['action'] == 'save') and Licence(LICENCE_USER))
+    if(($_GET['action'] == 'save') and $User->Licence(LICENCE_USER))
     {
       if(array_key_exists('Original', $_POST) and array_key_exists('Translated', $_POST) and array_key_exists('Description', $_POST))
@@ -157 +155 @@
         }
       
-        $DbResult = $Database->SQLCommand('SELECT `Id` FROM `Dictionary` WHERE `Entry` = '.$Entry.' AND `Language`='.$_SESSION['language'].' AND `User`='.$_SESSION['UserID']);
+        $DbResult = $Database->SQLCommand('SELECT `Id` FROM `Dictionary` WHERE `Entry` = '.$Entry.' AND `Language`='.$_SESSION['language'].' AND `User`='.$User->Id);
         if(mysql_num_rows($DbResult) > 0)
         {
@@ -163 +161 @@
           $Database->SQLCommand('UPDATE `Dictionary` SET `Text`="'.$_POST['Translated'].'", `Description` = "'.$_POST['Description'].'" WHERE Id='.$DbRow['Id']);
         } else      
-          $Database->SQLCommand('INSERT INTO `Dictionary` ( `Text` , `Entry` , `Description` , `User`, `Language` ) VALUES ("'.$_POST['Translated'].'", "'.$Entry.'", "'.$_POST['Description'].'", '.$_SESSION['UserID'].', '.$_SESSION['language'].')');
+          $Database->SQLCommand('INSERT INTO `Dictionary` ( `Text` , `Entry` , `Description` , `User`, `Language` ) VALUES ("'.$_POST['Translated'].'", "'.$Entry.'", "'.$_POST['Description'].'", '.$User->Id.', '.$_SESSION['language'].')');
         echo('Záznam byl uložen!');
       } else echo('Nebyly zaslány všechny položky formuláře.');
     } else
-    if(($_GET['action'] == 'remove') and Licence(LICENCE_USER))
-    {
-      $Database->SQLCommand('DELETE FROM `Dictionary` WHERE `User`='.$_SESSION['UserID'].' AND `Language`='.$_SESSION['language'].' AND `Entry`='.$_GET['entry']);
+    if(($_GET['action'] == 'remove') and $User->Licence(LICENCE_USER))
+    {
+      $Database->SQLCommand('DELETE FROM `Dictionary` WHERE `User`='.$User->Id.' AND `Language`='.$_SESSION['language'].' AND `Entry`='.$_GET['entry']);
     } else
-    if(($_GET['action'] == 'modify')  and Licence(LICENCE_USER))
-    {
-      $DbResult = $Database->SQLCommand('SELECT * FROM `Dictionary` WHERE `User`='.$_SESSION['UserID'].' AND `Entry`='.$_GET['entry'].' AND `Language`='.$_SESSION['language']);
+    if(($_GET['action'] == 'modify')  and $User->Licence(LICENCE_USER))
+    {
+      $DbResult = $Database->SQLCommand('SELECT * FROM `Dictionary` WHERE `User`='.$User->Id.' AND `Entry`='.$_GET['entry'].' AND `Language`='.$_SESSION['language']);
       $DbRow = mysql_fetch_assoc($DbResult);
       $DbResult = $Database->SQLCommand('SELECT * FROM `Dictionary` WHERE `User`=0 AND `Entry`='.$_GET['entry'].' AND `Language`=0');
@@ -199 +197 @@
     <input type="text" value="'.$Search.'" name="search" size="30" />
     <input type="submit" value="Vyhledat" />');
-  if(Licence(LICENCE_USER)) echo(' <a href="dictionary.php?action=insert">Vložit slovo</a>');
+  if($User->Licence(LICENCE_USER)) echo(' <a href="dictionary.php?action=insert">Vložit slovo</a>');
            
   echo('</td></tr>'); 
@@ -231 +229 @@
     array('Name' => 'UserName', 'Title' => 'Překladatel'), 
   );
-  if(Licence(LICENCE_USER)) $TableColumns[] = array('Name' => '', 'Title' => 'Akce');
+  if($User->Licence(LICENCE_USER)) $TableColumns[] = array('Name' => '', 'Title' => 'Akce');
   $Order = GetOrderTableHeader($TableColumns, 'Original');
   echo('<table width="98%" class="BaseTable">');
@@ -245 +243 @@
     <td>'.$Line['Description'].'</td>
     <td>'.$Line['UserName'].'</td>');
-    if(Licence(LICENCE_USER))
-    {
-      if($Line['UserID'] == $_SESSION['UserID']) 
+    if($User->Licence(LICENCE_USER))
+    {
+      if($Line['UserID'] == $User->Id) 
         echo('<td><a href="?action=remove&amp;entry='.$Line['Entry'].'">Smazat</a> <a href="?action=modify&amp;entry='.$Line['Entry'].'">Upravit</a></td>');
         else echo('<td></td>');