Changeset 455 for trunk/dictionary.php

Timestamp:

Apr 13, 2010, 10:03:12 AM (14 years ago)

Author:

george

Message:

• Upraveno: Přístup k databázi převeden na objektový pomocí rozšířené PHP třídy mysqli. Při práci s databází použít globální objekt $System a jeho prvek $Database ($System->Database->query("SELECT ...");.
• Upraveno: Při vkládání nové zprávy do Kecátka neprovádět přesměrování, ale rovnou zobrazit výpis. U některých překladatelů toto způsobovalo opakované vložení zprávy.

File:

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

trunk/dictionary.php

@@ -5 +5 @@
 function WriteTranslatNames($Text,$mode) 
 {
-        
+  
   if ($mode == 0) echo ('..Nalezené názvy jmen věcí, míst, postav');
   if ($mode == 1) echo ('..Všechny přeložené');
@@ -26 +26 @@
   $buff = GetTranslatNames($Text,$mode,$TablesColumn);
   
-         // $buff[] = array($Line['ID'],GetIDbyName($Table),$Line[$Column],$Line['Tran']);
+   // $buff[] = array($Line['ID'],GetIDbyName($Table),$Line[$Column],$Line['Tran']);
   foreach($buff as $Line) {
       if ($mode == 0) 
@@ -73 +73 @@
   '<a href="?mode=0&amp;group='.$GroupId.'&amp;ID='.$TextID.'" title="Zobrazit pouze přesné výsledky">Přesné</a> '.
   '<a href="?mode=2&amp;group='.$GroupId.'&amp;ID='.$TextID.'" title="Zobrazit všechny nepřeložené">Nepřeložené</a> ');
-    $Line = mysql_fetch_assoc($Database->SQLCommand('SELECT * FROM '.$Table.' Where ID = '.$TextID));
+    $DbResult = $System->Database->query('SELECT * FROM '.$Table.' Where ID = '.$TextID);
+    $Line = $DbResult->fetch_assoc();
     if(!$Line) die('Překlad nenalezen.');
     
@@ -102 +103 @@
       if(array_key_exists('Original', $_POST) and array_key_exists('Translated', $_POST) and array_key_exists('Description', $_POST))
       {       
-        $DbResult = $Database->SQLCommand('SELECT * FROM `Dictionary` WHERE `Text` = "'.$_POST['Original'].'" AND `Language`=0');
-        if(mysql_num_rows($DbResult) > 0)
-        {
-          $DbRow = mysql_fetch_assoc($DbResult);
+        $DbResult = $System->Database->query('SELECT * FROM `Dictionary` WHERE `Text` = "'.$_POST['Original'].'" AND `Language`=0');
+        if($DbResult->num_rows > 0)
+        {
+          $DbRow = $DbResult->fetch_assoc();
           $Entry = $DbRow['Entry'];
         } else 
         {
-          $DbResult = $Database->SQLCommand('SELECT MAX(`Entry`) FROM `Dictionary`');
-          $DbRow = mysql_fetch_row($DbResult);
+          $DbResult = $System->Database->query('SELECT MAX(`Entry`) FROM `Dictionary`');
+          $DbRow = $DbResult->fetch_row();
           $Entry = $DbRow[0] + 1;
-          $Database->SQLCommand('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.'", "", 0, 0);');
         }
       
-        $DbResult = $Database->SQLCommand('SELECT `Id` FROM `Dictionary` WHERE `Entry` = '.$Entry.' AND `Language`='.$_SESSION['language'].' AND `User`='.$User->Id);
+        $DbResult = $System->Database->query('SELECT `Id` FROM `Dictionary` WHERE `Entry` = '.$Entry.' AND `Language`='.$_SESSION['language'].' AND `User`='.$User->Id);
         if(mysql_num_rows($DbResult) > 0)
         {
           $DbRow = mysql_fetch_assoc($DbResult);
-          $Database->SQLCommand('UPDATE `Dictionary` SET `Text`="'.$_POST['Translated'].'", `Description` = "'.$_POST['Description'].'" WHERE Id='.$DbRow['Id']);
+          $System->Database->query('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'].'", '.$User->Id.', '.$_SESSION['language'].')');
+          $System->Database->query('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.');
@@ -127 +128 @@
     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']);
+      $System->Database->query('DELETE FROM `Dictionary` WHERE `User`='.$User->Id.' AND `Language`='.$_SESSION['language'].' AND `Entry`='.$_GET['entry']);
     } else
     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');
-      $DbRow2 = mysql_fetch_assoc($DbResult);
+      $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');
+      $DbRow2 = $DbResult->fetch_assoc();
       echo('<form action="dictionary.php?action=save" method="post">'.
       '<fieldset><legend>Upravení slova</legend>'.
@@ -177 +178 @@
   } else $sql = 'SELECT `User`.`Name` AS `UserName`, `ID` AS `UserID`, `T3`.`Entry`, `T3`.`Original`, `T3`.`Translated`, `T3`.`Description` FROM (SELECT `T2`.`User`, `T1`.Language, `T1`.`Text` AS `Original`, `T2`.`Text` AS `Translated`, `T2`.`Description`, `T1`.`Entry` AS `Entry` FROM `Dictionary` AS `T1` JOIN `Dictionary` AS `T2` ON `T2`.`Entry` = `T1`.`Entry` AND `T2`.`Language` = '.$_SESSION['language'].') AS `T3` JOIN `User` ON `User`.`ID` = `T3`.`User` WHERE `T3`.`Language` = 0';
 
-  $DbResult = $Database->SQLCommand('SELECT COUNT(*) FROM ('.$sql.') AS `T1`');
-  $DbRow = mysql_fetch_row($DbResult);
+  $DbResult = $System->Database->query('SELECT COUNT(*) FROM ('.$sql.') AS `T1`');
+  $DbRow = $DbResult->fetch_row();
   $PageList = GetPageList($DbRow[0]);  
 
@@ -195 +196 @@
 
   $sql_page = $sql.$Order['SQL'].$PageList['SQLLimit'];
-  $ID = $Database->SQLCommand($sql_page);
-  while($Line = mysql_fetch_assoc($ID)) 
+  $DbResult = $System->Database->query($sql_page);
+  while($Line = $DbResult->fetch_assoc()) 
   {
     echo('<tr>