Changeset 712 for trunk/inc

Timestamp:

Jul 30, 2013, 11:34:19 PM (11 years ago)

Author:

chronos

Message:

• Upraveno: Aktualizace inicializačního skriptu pro sql databázi na revizi 710.
• Upraveno: Aktualizována třída Database na novější využívající třídu PDO a generující výjímky při chybě, které je pak nutno očetřit.

Location:

trunk

Files:

• . (modified) (1 prop)
• inc/Version.php (added)
• inc/config.sample.php (modified) (3 diffs)
• inc/database.php (modified) (5 diffs)
• inc/realm.php (modified) (1 diff)
• inc/server.php (modified) (1 diff)
• inc/system.php (modified) (2 diffs)

trunk

@@ -5 +5 @@
 minimanager
 mmfpm
+.settings
+.buildpath
+.project

@@ -5 +5 @@
 minimanager
 mmfpm
+.settings
+.buildpath
+.project

trunk/inc/config.sample.php

@@ -19 +19 @@
     'UDBRevision' => '204',
     'ScriptDev2Revision' => '137',
-    'ClientVersion' => '3.1.3',
+    'ClientVersion' => '3.3.5a',
     'DatabaseHost' => 'localhost',
     'DatabaseUser' => 'server1',
@@ -38 +38 @@
   (
     'Charset' => 'utf-8',
-    'Host' => 'george-virt.zdechov.net',
+    'Host' => 'localhost',
     'Description' => 'Neoficiální herní server hry World of Warcraft',
     'Keywords' => 'wowserver, world of warcraft, free, wow, server, hof, heroes of fantasy, zdechov, mangos',
@@ -51 +51 @@
     'ShowPHPError' => false,
     'ServerFounded' => '1.1.2000',
-    'BankAccount' => '670100-2202937132/6210',
+    'BankAccount' => '',
     'TableRowPerPage' => 20,
     'DefaultRealmIndex' => 1,

trunk/inc/database.php

@@ -2 +2 @@
 
 // Extended database class
-// Date: 2009-02-16
-
-class Database extends mysqli
-{
-  var $Prefix = '';
+// Date: 2011-11-25
+
+
+class DatabaseResult
+{
+  var $PDOStatement;
+  var $num_rows = 0;
+  
+  function fetch_assoc()
+  {
+    return($this->PDOStatement->fetch(PDO::FETCH_ASSOC));
+  }
+  
+  function fetch_array()
+  {
+    return($this->PDOStatement->fetch(PDO::FETCH_BOTH));
+  }
+
+  function fetch_row()
+  {
+    return($this->PDOStatement->fetch(PDO::FETCH_NUM));
+  }
+}
+
+class Database
+{
+  var $Prefix;
+  var $Functions;
+  var $Type;  
+  var $PDO;
+  var $Error;
+  var $insert_id;
+  var $LastQuery;
+  var $ShowSQLError;
+  var $ShowSQLQuery;
+  var $LogFile;
+  
+  function __construct()
+  {    
+        $this->Functions = array('NOW()', 'CURDATE()', 'CURTIME()', 'UUID()');
+        $this->Type = 'mysql'; // mysql, pgsql
+        $this->ShowSQLError = false;
+        $this->ShowSQLQuery = false;
+        $this->LogSQLQuery = false;
+        $this->LogFile = dirname(__FILE__).'/../Query.log';
+  }
+  
+  function Connect($Host, $User, $Password, $Database)
+  {    
+    if($this->Type == 'mysql') $ConnectionString = 'mysql:host='.$Host.';dbname='.$Database;
+      else if($this->Type == 'pgsql') $ConnectionString = 'pgsql:dbname='.$Database.';host='.$Host;
+      else $ConnectionString = '';
+    $this->PDO = new PDO($ConnectionString, $User, $Password);
+  }
+  
+  function select_db($Database)
+  {
+    $this->query('USE `'.$Database.'`');
+  }
   
   function query($Query)
   {
-          global $Config;
-        
-          if($Config['Web']['ShowSQLQuery'] == true) 
-            echo('<div style="border-bottom-width: 1px; border-bottom-style: solid; padding-bottom: 3px; padding-top: 3px; font-size: 12px; font-family: Arial;">'.$Query.'</div>');
-          $Result = parent::query($Query);
-    if(($this->error != '') and ($Config['Web']['ShowSQLError'] == true)) 
-            echo('<div><strong>SQL Error: </strong>'.$this->error.'<br />'.$Query.'</div>');
-
+    $this->LastQuery = $Query;
+    if($this->ShowSQLQuery == true) 
+      echo('<div style="border-bottom-width: 1px; border-bottom-style: solid; padding-bottom: 3px; padding-top: 3px; font-size: 12px; font-family: Arial;">'.$Query.'</div>'."\n");
+    if($this->LogSQLQuery == true)
+      file_put_contents($this->LogFile, $Query."\n", FILE_APPEND);
+    $Result = new DatabaseResult();
+    $Result->PDOStatement = $this->PDO->query($Query);
+    if($Result->PDOStatement)
+    {
+      $Result->num_rows = $Result->PDOStatement->rowCount();
+      $this->insert_id = $this->PDO->lastInsertId();
+    } else
+    {
+      $this->Error = $this->PDO->errorInfo();
+      $this->Error = $this->Error[2];
+      if(($this->Error != '') and ($this->ShowSQLError == true)) 
+        echo('<div><strong>SQL Error: </strong>'.$this->Error.'<br />'.$Query.'</div>');
+        throw new Exception('SQL Error: '.$this->Error);
+    }
     return($Result);  
   }
 
   function select($Table, $What = '*', $Condition = 1)
-  {
+  {   
     return($this->query('SELECT '.$What.' FROM `'.$this->Prefix.$Table.'` WHERE '.$Condition));  
   }
@@ -37 +102 @@
     foreach($Data as $Key => $Value)
     {
-      $Value = strtr($Value, '"', '\"');
       $Name .= ',`'.$Key.'`';
-            if($Value == 'NOW()') $Values .= ','.$Value;
-else if($Value == 'UUID()') $Values .= ','.$Value;
-              else $Values .= ",'".$Value."'";
+      if(!in_array($Value, $this->Functions)) 
+      {
+        if(is_null($Value)) $Value = 'NULL';
+        else $Value = $this->PDO->quote($Value);
+      }
+      $Values .= ','.$Value;
     }
     $Name = substr($Name, 1);
     $Values = substr($Values, 1);
     $this->query('INSERT INTO `'.$this->Prefix.$Table.'` ('.$Name.') VALUES('.$Values.')'); 
+    $this->insert_id = $this->PDO->lastInsertId();
   }
   
@@ -53 +121 @@
     foreach($Data as $Key => $Value)
     {
-            $Value = strtr($Value, '"', '\"');
-      if($Value != 'NOW()') $Value = "'".$Value."'";
-      $Values .= ', '.$Key.'='.$Value;
+      if(!in_array($Value, $this->Functions)) 
+      {
+        if(is_null($Value)) $Value = 'NULL';
+        else $Value = $this->PDO->quote($Value);
+      }
+      $Values .= ', `'.$Key.'`='.$Value;
     }
     $Values = substr($Values, 2);  
@@ -67 +138 @@
     foreach($Data as $Key => $Value)
     {
-      $Value = strtr($Value, '"', '\"');
+      if(!in_array($Value, $this->Functions)) 
+      {
+        if(is_null($Value)) $Value = 'NULL';
+        else $Value = $this->PDO->quote($Value);
+      }
       $Name .= ',`'.$Key.'`';
-      if($Value == 'NOW()') $Values .= ','.$Value;
-        else $Values .= ',"'.$Value.'"';
+      $Values .= ','.$Value;
     }
     $Name = substr($Name, 1);
@@ -83 +157 @@
     $this->query('SET NAMES "'.$Charset.'"');
   }
-}
-
-?>
+  
+  function real_escape_string($Text)
+  {
+    return(addslashes($Text));
+  }  
+}
+
+function TimeToMysqlDateTime($Time)
+{
+  if($Time == NULL) return(NULL);
+    else return(date('Y-m-d H:i:s', $Time));  
+}
+
+function TimeToMysqlDate($Time)
+{
+  if($Time == NULL) return(NULL);
+    else return(date('Y-m-d', $Time));  
+}
+
+function TimeToMysqlTime($Time)
+{
+  if($Time == NULL) return(NULL);
+    else return(date('H:i:s', $Time));  
+}
+
+function MysqlDateTimeToTime($DateTime)
+{
+  if($DateTime == '') return(0);      
+  $Parts = explode(' ', $DateTime);
+  $DateParts = explode('-', $Parts[0]); 
+  $TimeParts = explode(':', $Parts[1]);
+  $Result = mktime($TimeParts[0], $TimeParts[1], $TimeParts[2], $DateParts[1], $DateParts[2], $DateParts[0]); 
+  return($Result);  
+}
+
+function MysqlDateToTime($Date)
+{
+  if($Date == '') return(0);
+  return(MysqlDateTimeToTime($Date.' 0:0:0'));  
+}
+
+function MysqlTimeToTime($Time)
+{
+  if($Time == '') return(0);
+  return(MysqlDateTimeToTime('0000-00-00 '.$Time));  
+}

trunk/inc/realm.php

@@ -13 +13 @@
     $DbResult = $this->Database->query('SELECT * FROM Realm WHERE Id='.$Id.' AND Enabled=1');
     $this->Data = $DbResult->fetch_assoc();
-    $this->CharactersDatabase = new Database($this->Data['DatabaseHost'], $this->Data['DatabaseUser'], $this->Data['DatabasePassword'], $this->Data['DatabaseCharacters']);
+    $this->CharactersDatabase = new Database();
+    $this->CharactersDatabase->Connect($this->Data['DatabaseHost'], $this->Data['DatabaseUser'], $this->Data['DatabasePassword'], $this->Data['DatabaseCharacters']);
     $this->CharactersDatabase->select_db($this->Data['DatabaseCharacters']);
-    if($this->CharactersDatabase->connect_error) 
-    {
-      die('Přihlášení k databázi realmu '.$this->Id.' selhalo: '.$this->Database->connect_error);
-    }
+    //if($this->CharactersDatabase->connect_error) 
+    //{
+    //  die('Přihlášení k databázi realmu '.$this->Id.' selhalo: '.$this->Database->connect_error);
+    //}
     $this->CharactersDatabase->charset($this->Config['Database']['Charset']);
     
-    $this->MangosDatabase = new Database($this->Data['DatabaseHost'], $this->Data['DatabaseUser'], $this->Data['DatabasePassword'], $this->Data['DatabaseMangos']);
+    $this->MangosDatabase = new Database();
+    $this->MangosDatabase->Connect($this->Data['DatabaseHost'], $this->Data['DatabaseUser'], $this->Data['DatabasePassword'], $this->Data['DatabaseMangos']);
     $this->MangosDatabase->select_db($this->Data['DatabaseMangos']);
-    if($this->MangosDatabase->connect_error) 
-    {
-      die('Přihlášení k databázi realmu '.$this->Id.' selhalo: '.$this->MangosDatabase->connect_error);
-    }
+    //if($this->MangosDatabase->connect_error) 
+    //{
+    //  die('Přihlášení k databázi realmu '.$this->Id.' selhalo: '.$this->MangosDatabase->connect_error);
+    //}
     $this->MangosDatabase->charset($this->Config['Database']['Charset']);
   }

trunk/inc/server.php

@@ -14 +14 @@
     $this->Id = $Id;
     $DbResult = $this->Database->query('SELECT * FROM Logon WHERE Id='.$Id.' AND Enabled=1' );
-    $this->Data = $DbResult->fetch_assoc();
-    $this->ServerDatabase = new Database($this->Data['DatabaseHost'], $this->Data['DatabaseUser'], $this->Data['DatabasePassword'], $this->Data['DatabaseRealmd']);
-    $this->ServerDatabase->select_db($this->Data['DatabaseRealmd']);
-    if($this->ServerDatabase->connect_error) 
+    if($DbResult->num_rows == 1)
     {
-      die('Přihlášení k databázi serveru '.$this->Id.' selhalo: '.$this->ServerDatabase->connect_error);
-    }
-    $this->ServerDatabase->charset($this->Config['Database']['Charset']);
+      $this->Data = $DbResult->fetch_assoc();
+      $this->ServerDatabase = new Database();
+      $this->ServerDatabase->Connect($this->Data['DatabaseHost'], $this->Data['DatabaseUser'], $this->Data['DatabasePassword'], $this->Data['DatabaseRealmd']);
+      $this->ServerDatabase->select_db($this->Data['DatabaseRealmd']);
+      //if($this->ServerDatabase->connect_error) 
+      //{
+      //  die('Přihlášení k databázi serveru '.$this->Id.' selhalo: '.$this->ServerDatabase->connect_error);
+      //}
+      $this->ServerDatabase->charset($this->Config['Database']['Charset']);
+    } else throw new Exception('Záznam pro přihlašovací server id '.$Id.' nenalezen!');
   }
 

trunk/inc/system.php

@@ -47 +47 @@
   function OpenLogonServerDatabase()
   {
-    $Database = new Database($this->Config['Mangos']['DatabaseHost'], $this->Config['Mangos']['DatabaseUser'], $this->Config['Mangos']['DatabasePassword'], $this->Config['Mangos']['DatabaseRealmd']);
+    $Database = new Database();
+    $Database->Connect($this->Config['Mangos']['DatabaseHost'], $this->Config['Mangos']['DatabaseUser'], $this->Config['Mangos']['DatabasePassword'], $this->Config['Mangos']['DatabaseRealmd']);
     if(mysqli_connect_error()) 
     {
@@ -58 +59 @@
   function OpenWebDatabase()
   {
-    $Database = new Database($this->Config['Database']['Host'], $this->Config['Database']['User'], $this->Config['Database']['Password'], $this->Config['Database']['Database']);
+    $Database = new Database();
+    $Database->Connect($this->Config['Database']['Host'], $this->Config['Database']['User'], $this->Config['Database']['Password'], $this->Config['Database']['Database']);
     if(mysqli_connect_error()) 
     {

@@ -5 +5 @@
 minimanager
 mmfpm
+.settings
+.buildpath
+.project