Changeset 455 for trunk/includes/global_function.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/includes/global_function.php (modified) (10 diffs)

trunk/includes/global_function.php

@@ -36 +36 @@
 function GetPageList($TotalCount)
 {
-  global $Database, $Config;
+  global $System;
     
   $QueryItems = GetQueryStringArray($_SERVER['QUERY_STRING']);
   
-  $ItemPerPage = $Config['Web']['ItemsPerPage'];
-  $Around = round($Config['Web']['VisiblePagingItems'] / 2);
+  $ItemPerPage = $System->Config['Web']['ItemsPerPage'];
+  $Around = round($System->Config['Web']['VisiblePagingItems'] / 2);
   $Result = '';
   $PageCount = floor($TotalCount / $ItemPerPage) + 1;
@@ -218 +218 @@
 function GetLanguageList()
 { 
-  global $Database;
+  global $System;
   
   $Result = array();
-  $DbResult = $Database->SQLCommand('SELECT * FROM `Language` WHERE `Enabled` = 1');
-  while($DbRow = mysql_fetch_assoc($DbResult))
+  $DbResult = $System->Database->query('SELECT * FROM `Language` WHERE `Enabled` = 1');
+  while($DbRow = $DbResult->fetch_assoc())
     $Result[$DbRow['Id']] = $DbRow;
   return($Result);
@@ -229 +229 @@
 function GetTranslationTree()
 { 
-  global $Database;
+  global $System;
   
   $Result = array();
-  $DbResult = $Database->SQLCommand('SELECT *, UNIX_TIMESTAMP(`LastImport`) AS `LastImportTime` FROM `Group` ORDER BY `Name`');
-  while($DbRow = mysql_fetch_assoc($DbResult))
+  $DbResult = $System->Database->query('SELECT *, UNIX_TIMESTAMP(`LastImport`) AS `LastImportTime` FROM `Group` ORDER BY `Name`');
+  while($DbRow = $DbResult->fetch_assoc())
   {
     $DbRow['Items'] = array();
     $Result[$DbRow['Id']] = $DbRow;
   }
-  $DbResult = $Database->SQLCommand('SELECT * FROM `GroupItem` ORDER BY `Group`, `Sequence`');
-  while($DbRow = mysql_fetch_assoc($DbResult))
+  $DbResult = $System->Database->query('SELECT * FROM `GroupItem` ORDER BY `Group`, `Sequence`');
+  while($DbRow = $DbResult->fetch_assoc())
   {
     $Result[$DbRow['Group']]['Items'][] = $DbRow;
@@ -250 +250 @@
 function WriteLog($Text, $Type)
 {
-  global $Database, $Config, $User;
+  global $System, $User;
  
   if(!isset($_SERVER['REMOTE_ADDR'])) $IP = 'Konzole';
     else $IP = addslashes($_SERVER['REMOTE_ADDR']);
 
-  $Database->SelectDatabase($Config['Database']['Database']);    
+  if(isset($User->Id)) $UserId = $User->Id;
+    else $UserId = 0;
   $Query = 'INSERT INTO `Log` ( `User` , `Type` , `Text` , `Date` , `IP` )
-   VALUES ('.$User->Id.', '.$Type.', "'.addslashes($Text).'", NOW(), "'.$IP.'")';
-  $Database->SQLCommand($Query);
+   VALUES ('.$UserId.', '.$Type.', "'.addslashes($Text).'", NOW(), "'.$IP.'")';
+  $System->Database->query($Query);
 }
 
@@ -273 +274 @@
 function FollowingTran($TextID, $Table, $GroupId, $Prev = false) 
 { 
-  global $Database;
+  global $System;
   
   if($Prev)
@@ -283 +284 @@
   }
   
-  $Next = mysql_fetch_assoc($Database->SQLCommand($sql));
+  $DbResult = $System->Database->query($sql);
+  $Next = $DbResult->fetch_assoc();
   if($Next) 
   {
     if($Prev) echo('<a href="form.php?group='.$GroupId.'&amp;ID='.$Next['ID'].'">Předcházející '.$Next['ID'].'</a> ');
     else echo('<a href="form.php?group='.$GroupId.'&amp;ID='.$Next['ID'].'">Následující '.$Next['ID'].'</a> ');
-      return 'form.php?group='.$GroupId.'&amp;ID='.$Next['ID'];
+      return('form.php?group='.$GroupId.'&amp;ID='.$Next['ID']);
   }
 }
@@ -294 +296 @@
 function GetBuildNumber($Version)
 {
-  global $Database, $BuildNumbers;
+  global $System, $BuildNumbers;
   
   if(isset($BuildNumbers[$Version]) == false) 
   {
     $sql = 'SELECT `BuildNumber` FROM `ClientVersion` WHERE `Version` = "'.$Version.'"';
-    $DbRow = mysql_fetch_assoc($Database->SQLCommand($sql));
+    $DbResult = $System->Database->query($sql);
+    $DbRow = $DbResult->fetch_assoc();
     $BuildNumbers[$Version] = $DbRow['BuildNumber'];
   }
@@ -307 +310 @@
 function GetVersionWOW($BuildNumber)
 {
-  global $Database, $VersionsWOW;
+  global $System, $VersionsWOW;
   
   if(isset($VersionsWOW[$BuildNumber]) == false) 
   {
     $sql = 'SELECT `Version` FROM `ClientVersion` WHERE `BuildNumber` = "'.$BuildNumber.'"';
-    $Version = mysql_fetch_assoc($Database->SQLCommand($sql));
+    $DbResult = $System->Database->query($sql);
+    $Version = $DbResult->fetch_assoc();
     $VersionsWOW[$BuildNumber] = $Version['Version'];
   }
@@ -442 +446 @@
 }
 
-
 function GetTranslatNames($Text,$mode,$TablesColumn) 
 {
-  global $Database;
+  global $System;
   
  /* $TablesID = array('gameobject' => 5,
@@ -482 +485 @@
       }
       }
-      $where = substr($where,0,strlen($where)-4);
+      $where = substr($where, 0, strlen($where) - 4);
       $where .= ')';
       if ($SqlOK) {
-        $ID = $Database->SQLCommand($sql.$where.$groupby);
+        $DbResult = $System->Database->query($sql.$where.$groupby);
     //  echo ($sql.'|'.$where.'|'.$groupby);
-        while($Line = mysql_fetch_assoc($ID)) {
-        $buff[] = array($Line['ID'],GetIDbyName($Table),$Line[$Column],$Line['Tran']);
+        while($Line = $DbResult->fetch_assoc()) 
+        {
+          $buff[] = array($Line['ID'], GetIDbyName($Table), $Line[$Column], $Line['Tran']);
         }
     }