Changeset 800 for trunk/includes/Database.php

Timestamp:

Mar 16, 2014, 11:15:43 AM (10 years ago)

Author:

chronos

Message:

• Added: Module Redirection responsible for redirection of old pages to new valid address.
• Fixed: Error on client version item display if id was not specified.
• Fixed: Error on silent application module reregistration.
• Removed: White space on end of lines in some files.

File:

• trunk/includes/Database.php (modified) (19 diffs)

trunk/includes/Database.php

@@ -8 +8 @@
   var $PDOStatement;
   var $num_rows = 0;
-  
+
   function fetch_assoc()
   {
     return($this->PDOStatement->fetch(PDO::FETCH_ASSOC));
   }
-  
+
   function fetch_array()
   {
@@ -29 +29 @@
   var $Prefix;
   var $Functions;
-  var $Type;  
+  var $Type;
   var $PDO;
   var $Error;
@@ -37 +37 @@
   var $ShowSQLQuery;
   var $LogFile;
-  
+
   function __construct()
-  {    
+  {
         $this->Functions = array('NOW()', 'CURDATE()', 'CURTIME()', 'UUID()');
         $this->Type = 'mysql'; // mysql, pgsql
@@ -47 +47 @@
         $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;
@@ -55 +55 @@
     $this->PDO = new PDO($ConnectionString, $User, $Password);
   }
-  
+
   function select_db($Database)
   {
     $this->query('USE `'.$Database.'`');
   }
-  
+
   function query($Query)
   {
@@ -67 +67 @@
     $Result = new DatabaseResult();
     $Result->PDOStatement = $this->PDO->query($Query);
-    if(($this->ShowSQLQuery == true) or ($this->LogSQLQuery == true)) 
-      $Duration = ' ; '.round(microtime() - $QueryStartTime, 3). ' s';
+    if(($this->ShowSQLQuery == true) or ($this->LogSQLQuery == true))
+      $Duration = ' ; '.round(microtime() - $QueryStartTime, 4). ' s';
     if($this->LogSQLQuery == true)
       file_put_contents($this->LogFile, $Query.$Duration."\n", FILE_APPEND);
@@ -81 +81 @@
       $this->Error = $this->PDO->errorInfo();
       $this->Error = $this->Error[2];
-      if(($this->Error != '') and ($this->ShowSQLError == true)) 
+      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);  
+    return($Result);
   }
 
   function select($Table, $What = '*', $Condition = 1)
-  {   
-    return($this->query('SELECT '.$What.' FROM `'.$this->Prefix.$Table.'` WHERE '.$Condition));  
+  {
+    return($this->query('SELECT '.$What.' FROM `'.$this->Prefix.$Table.'` WHERE '.$Condition));
   }
 
   function delete($Table, $Condition)
   {
-    $this->query('DELETE FROM `'.$this->Prefix.$Table.'` WHERE '.$Condition);  
-  }
-  
+    $this->query('DELETE FROM `'.$this->Prefix.$Table.'` WHERE '.$Condition);
+  }
+
   function insert($Table, $Data)
   {
@@ -105 +105 @@
     {
       $Name .= ',`'.$Key.'`';
-      if(!in_array($Value, $this->Functions)) 
+      if(!in_array($Value, $this->Functions))
       {
         if(is_null($Value)) $Value = 'NULL';
@@ -114 +114 @@
     $Name = substr($Name, 1);
     $Values = substr($Values, 1);
-    $this->query('INSERT INTO `'.$this->Prefix.$Table.'` ('.$Name.') VALUES('.$Values.')'); 
+    $this->query('INSERT INTO `'.$this->Prefix.$Table.'` ('.$Name.') VALUES('.$Values.')');
     $this->insert_id = $this->PDO->lastInsertId();
   }
-  
+
   function update($Table, $Condition, $Data)
   {
@@ -123 +123 @@
     foreach($Data as $Key => $Value)
     {
-      if(!in_array($Value, $this->Functions)) 
+      if(!in_array($Value, $this->Functions))
       {
         if(is_null($Value)) $Value = 'NULL';
@@ -130 +130 @@
       $Values .= ', `'.$Key.'`='.$Value;
     }
-    $Values = substr($Values, 2);  
+    $Values = substr($Values, 2);
     $this->query('UPDATE `'.$this->Prefix.$Table.'` SET '.$Values.' WHERE ('.$Condition.')');
   }
-  
+
   function replace($Table, $Data)
   {
@@ -140 +140 @@
     foreach($Data as $Key => $Value)
     {
-      if(!in_array($Value, $this->Functions)) 
+      if(!in_array($Value, $this->Functions))
       {
         if(is_null($Value)) $Value = 'NULL';
@@ -154 +154 @@
     //echo($this->error().'<br>');
   }
-  
+
   function charset($Charset)
   {
     $this->query('SET NAMES "'.$Charset.'"');
   }
-  
+
   function real_escape_string($Text)
   {
     return(addslashes($Text));
   }
-  
+
   function quote($Text)
   {
         return($this->PDO->quote($Text));
   }
-  
+
   function __sleep()
   {
@@ -177 +177 @@
   function __wakeup()
   {
-  }  
+  }
 }
 
@@ -183 +183 @@
 {
   if($Time == NULL) return(NULL);
-    else return(date('Y-m-d H:i:s', $Time));  
+    else return(date('Y-m-d H:i:s', $Time));
 }
 
@@ -189 +189 @@
 {
   if($Time == NULL) return(NULL);
-    else return(date('Y-m-d', $Time));  
+    else return(date('Y-m-d', $Time));
 }
 
@@ -195 +195 @@
 {
   if($Time == NULL) return(NULL);
-    else return(date('H:i:s', $Time));  
+    else return(date('H:i:s', $Time));
 }
 
 function MysqlDateTimeToTime($DateTime)
 {
-  if($DateTime == '') return(0);      
+  if($DateTime == '') return(0);
   $Parts = explode(' ', $DateTime);
-  $DateParts = explode('-', $Parts[0]); 
+  $DateParts = explode('-', $Parts[0]);
   $TimeParts = explode(':', $Parts[1]);
-  $Result = mktime($TimeParts[0], $TimeParts[1], $TimeParts[2], $DateParts[1], $DateParts[2], $DateParts[0]); 
-  return($Result);  
+  $Result = mktime($TimeParts[0], $TimeParts[1], $TimeParts[2], $DateParts[1], $DateParts[2], $DateParts[0]);
+  return($Result);
 }
 
@@ -211 +211 @@
 {
   if($Date == '') return(0);
-  return(MysqlDateTimeToTime($Date.' 0:0:0'));  
+  return(MysqlDateTimeToTime($Date.' 0:0:0'));
 }
 
@@ -217 +217 @@
 {
   if($Time == '') return(0);
-  return(MysqlDateTimeToTime('0000-00-00 '.$Time));  
-}
+  return(MysqlDateTimeToTime('0000-00-00 '.$Time));
+}