Changeset 10 for Common/Database.php

Timestamp:

Apr 7, 2020, 8:52:35 PM (5 years ago)

Author:

chronos

Message:

• Modified: Improved code formatting.

File:

• Common/Database.php (modified) (13 diffs)

Common/Database.php

@@ -7 +7 @@
 {
   list($usec, $sec) = explode(" ", microtime());
-  return ((float)$usec + (float)$sec);
+  return (float)$usec + (float)$sec;
 }
 
@@ -17 +17 @@
   function fetch_assoc()
   {
-    return($this->PDOStatement->fetch(PDO::FETCH_ASSOC));
+    return $this->PDOStatement->fetch(PDO::FETCH_ASSOC);
   }
 
   function fetch_array()
   {
-    return($this->PDOStatement->fetch(PDO::FETCH_BOTH));
+    return $this->PDOStatement->fetch(PDO::FETCH_BOTH);
   }
 
   function fetch_row()
   {
-    return($this->PDOStatement->fetch(PDO::FETCH_NUM));
+    return $this->PDOStatement->fetch(PDO::FETCH_NUM);
   }
 }
@@ -61 +61 @@
   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;
+    if ($this->Type == 'mysql') $ConnectionString = 'mysql:host='.$Host.';dbname='.$Database;
+      else if ($this->Type == 'pgsql') $ConnectionString = 'pgsql:dbname='.$Database.';host='.$Host;
       else $ConnectionString = '';
     try {
@@ -81 +81 @@
   function Connected()
   {
-    return(isset($this->PDO));
+    return isset($this->PDO);
   }
 
@@ -91 +91 @@
   function query($Query)
   {
-    if(!$this->Connected()) throw new Exception(T('Not connected to database'));
-    if(($this->ShowSQLQuery == true) or ($this->LogSQLQuery == true)) $QueryStartTime = microtime_float();
+    if (!$this->Connected()) throw new Exception(T('Not connected to database'));
+    if (($this->ShowSQLQuery == true) or ($this->LogSQLQuery == true)) $QueryStartTime = microtime_float();
     $this->LastQuery = $Query;
     //echo('a'.$this->ShowSQLQuery.'<'.$QueryStartTime.', '.microtime_float());
-    if(($this->ShowSQLQuery == true) or ($this->LogSQLQuery == true))
+    if (($this->ShowSQLQuery == true) or ($this->LogSQLQuery == true))
       $Duration = ' ; '.round(microtime_float() - $QueryStartTime, 4). ' s';
-    if($this->LogSQLQuery == true)
+    if ($this->LogSQLQuery == true)
       file_put_contents($this->LogFile, $Query.$Duration."\n", FILE_APPEND);
-    if($this->ShowSQLQuery == true)
+    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.$Duration.'</div>'."\n");
     $Result = new DatabaseResult();
     $Result->PDOStatement = $this->PDO->query($Query);
-    if($Result->PDOStatement)
+    if ($Result->PDOStatement)
     {
       $Result->num_rows = $Result->PDOStatement->rowCount();
@@ -112 +112 @@
       $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.', Query: '.$Query);
     }
-    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);
   }
 
@@ -139 +139 @@
     $Name = '';
     $Values = '';
-    foreach($Data as $Key => $Value)
+    foreach ($Data as $Key => $Value)
     {
       $Name .= ',`'.$Key.'`';
-      if(!in_array($Value, $this->Functions))
-      {
-        if(is_null($Value)) $Value = 'NULL';
+      if (!in_array($Value, $this->Functions))
+      {
+        if (is_null($Value)) $Value = 'NULL';
         else $Value = $this->PDO->quote($Value);
       }
@@ -151 +151 @@
     $Name = substr($Name, 1);
     $Values = substr($Values, 1);
-    return('INSERT INTO `'.$this->Prefix.$Table.'` ('.$Name.') VALUES('.$Values.')');
+    return 'INSERT INTO `'.$this->Prefix.$Table.'` ('.$Name.') VALUES('.$Values.')';
   }
 
@@ -162 +162 @@
   {
     $Values = '';
-    foreach($Data as $Key => $Value)
-    {
-      if(!in_array($Value, $this->Functions))
-      {
-        if(is_null($Value)) $Value = 'NULL';
+    foreach ($Data as $Key => $Value)
+    {
+      if (!in_array($Value, $this->Functions))
+      {
+        if (is_null($Value)) $Value = 'NULL';
         else $Value = $this->PDO->quote($Value);
       }
@@ -172 +172 @@
     }
     $Values = substr($Values, 2);
-    return('UPDATE `'.$this->Prefix.$Table.'` SET '.$Values.' WHERE ('.$Condition.')');
+    return 'UPDATE `'.$this->Prefix.$Table.'` SET '.$Values.' WHERE ('.$Condition.')';
   }
 
@@ -179 +179 @@
     $Name = '';
     $Values = '';
-    foreach($Data as $Key => $Value)
-    {
-      if(!in_array($Value, $this->Functions))
-      {
-        if(is_null($Value)) $Value = 'NULL';
+    foreach ($Data as $Key => $Value)
+    {
+      if (!in_array($Value, $this->Functions))
+      {
+        if (is_null($Value)) $Value = 'NULL';
         else $Value = $this->PDO->quote($Value);
       }
@@ -203 +203 @@
   function real_escape_string($Text)
   {
-    return(addslashes($Text));
+    return addslashes($Text);
   }
 
   function quote($Text)
   {
-    return($this->PDO->quote($Text));
+    return $this->PDO->quote($Text);
   }
 
@@ -234 +234 @@
 function TimeToMysqlDateTime($Time)
 {
-  if($Time == NULL) return(NULL);
-    else return(date('Y-m-d H:i:s', $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));
+  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));
+  if ($Time == NULL) return NULL;
+    else return date('H:i:s', $Time);
 }
 
 function MysqlDateTimeToTime($DateTime)
 {
-  if($DateTime == '') return(NULL);
+  if ($DateTime == '') return NULL;
   $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);
+  return $Result;
 }
 
 function MysqlDateToTime($Date)
 {
-  if($Date == '') return(NULL);
-  return(MysqlDateTimeToTime($Date.' 0:0:0'));
+  if ($Date == '') return NULL;
+  return MysqlDateTimeToTime($Date.' 0:0:0');
 }
 
 function MysqlTimeToTime($Time)
 {
-  if($Time == '') return(NULL);
-  return(MysqlDateTimeToTime('0000-00-00 '.$Time));
-}
+  if ($Time == '') return NULL;
+  return MysqlDateTimeToTime('0000-00-00 '.$Time);
+}