Changeset 499 for trunk

Timestamp:

Jan 30, 2013, 10:34:18 PM (12 years ago)

Author:

chronos

Message:

• Opraveno: Použití NULL hodnoty při práci s tabulkou Log a slovníkem.

Location:

trunk

Files:

• dictionary.php (modified) (2 diffs)
• includes/global_function.php (modified) (1 diff)
• includes/user.php (modified) (1 diff)

trunk/dictionary.php

@@ -115 +115 @@
           $DbRow = $DbResult->fetch_row();
           $Entry = $DbRow[0] + 1;
-          $System->Database->query('INSERT INTO `Dictionary` ( `Text` , `Entry` , `Description` , `User`, `Language` ) VALUES ("'.$_POST['Original'].'", "'.$Entry.'", "", 0, 0);');
+          $System->Database->query('INSERT INTO `Dictionary` ( `Text` , `Entry` , `Description` , `User`, `Language` ) VALUES ("'.$_POST['Original'].'", "'.$Entry.'", "", NULL, 0);');
         }
       
@@ -137 +137 @@
       $DbResult = $System->Database->query('SELECT * FROM `Dictionary` WHERE `User`='.$User->Id.' AND `Entry`='.$_GET['entry'].' AND `Language`='.$_SESSION['language']);
       $DbRow = $DbResult->fetch_assoc();
-      $DbResult = $System->Database->query('SELECT * FROM `Dictionary` WHERE `User`=0 AND `Entry`='.$_GET['entry'].' AND `Language`=0');
+      $DbResult = $System->Database->query('SELECT * FROM `Dictionary` WHERE (`User` IS NULL) AND (`Entry`='.$_GET['entry'].') AND (`Language`=0)');
       $DbRow2 = $DbResult->fetch_assoc();
       echo('<form action="dictionary.php?action=save" method="post">'.
       '<fieldset><legend>Upravení slova</legend>'.
+      '<input type="hidden" name="entry"  value="'.$_GET['entry'].'"/>'.
       '<table><tr><td>'.
       'Původní anglické slovo:</td><td><input type="text" name="Original" value="'.$DbRow2['Text'].'" /></td></tr>'.

trunk/includes/global_function.php

@@ -255 +255 @@
     else $IP = addslashes($_SERVER['REMOTE_ADDR']);
 
-  if(isset($User->Id)) $UserId = $User->Id;
-    else $UserId = 0;
+  if(!is_null($User->Id)) $UserId = $User->Id;
+    else $UserId = 'NULL';
   $Query = 'INSERT INTO `Log` ( `User` , `Type` , `Text` , `Date` , `IP` )
    VALUES ('.$UserId.', '.$Type.', "'.addslashes($Text).'", NOW(), "'.$IP.'")';

trunk/includes/user.php

@@ -84 +84 @@
   function SetAnonymous()
   {
-    $this->Id = 0;
+    $this->Id = NULL;
     $this->Name = 'anonymous';
     $this->Role = LICENCE_ANONYMOUS;
-    $this->Language = 1;
+    $this->Language = NULL;
     $this->Redirecting = 1; 
-    $this->Team = 0;
+    $this->Team = '';
     $this->Email = '';
   }