detain / db_abstraction

src/Pgsql/Db.php

Indentation +380 added lines, -380 removed lines

@@ -19,396 +19,396 @@
  */
 class Db extends Generic implements Db_Interface
 {
-    /* public: this is an api revision, not a CVS revision. */
-    public $type = 'pgsql';
-    public $port = '';
-    public $defaultPort = '5432';
-
-
-    /**
-     * adds if not blank
-     *
-     * @param string $add the value to set
-     * @param string $me the key/field to set the value for
-     * @param false|string $quote optional indicate the value needs quoted
-     * @return string
-     */
-    public function ifadd($add, $me, $quote = false)
-    {
-        if ('' != $add) {
-            return ' '.$me.($quote === false ? '' : $quote).$add.($quote === false ? '' : $quote);
-        }
-        return '';
-    }
-
-    /**
-     * @param $string
-     * @return string
-     */
-    public function real_escape($string = '')
-    {
-        return $this->escape($string);
-    }
-
-    /**
-     * alias function of select_db, changes the database we are working with.
-     *
-     * @param string $database the name of the database to use
-     * @return void
-     */
-    public function useDb($database)
-    {
-        $this->selectDb($database);
-    }
-
-    /**
-     * changes the database we are working with.
-     *
-     * @param string $database the name of the database to use
-     * @return void
-     */
-    public function selectDb($database)
-    {
-        /*if ($database != $this->database) {
+	/* public: this is an api revision, not a CVS revision. */
+	public $type = 'pgsql';
+	public $port = '';
+	public $defaultPort = '5432';
+
+
+	/**
+	 * adds if not blank
+	 *
+	 * @param string $add the value to set
+	 * @param string $me the key/field to set the value for
+	 * @param false|string $quote optional indicate the value needs quoted
+	 * @return string
+	 */
+	public function ifadd($add, $me, $quote = false)
+	{
+		if ('' != $add) {
+			return ' '.$me.($quote === false ? '' : $quote).$add.($quote === false ? '' : $quote);
+		}
+		return '';
+	}
+
+	/**
+	 * @param $string
+	 * @return string
+	 */
+	public function real_escape($string = '')
+	{
+		return $this->escape($string);
+	}
+
+	/**
+	 * alias function of select_db, changes the database we are working with.
+	 *
+	 * @param string $database the name of the database to use
+	 * @return void
+	 */
+	public function useDb($database)
+	{
+		$this->selectDb($database);
+	}
+
+	/**
+	 * changes the database we are working with.
+	 *
+	 * @param string $database the name of the database to use
+	 * @return void
+	 */
+	public function selectDb($database)
+	{
+		/*if ($database != $this->database) {
             $this->database = $database;
             $this->linkId = null;
             $this->connect();
         }*/
-    }
-
-    /**
-     * Db::connect()
-     * @return void
-     */
-    public function connect()
-    {
-        if (0 == $this->linkId) {
-            $connectString = trim($this->ifadd($this->host, 'host=').
-                             $this->ifadd($this->port, 'port=').
-                             $this->ifadd($this->database, 'dbname=').
-                             $this->ifadd($this->user, 'user=').
-                             $this->ifadd($this->password, 'password=', "'"));
-            $this->linkId = pg_connect($connectString);
-            if (!$this->linkId) {
-                $this->halt('Link-ID == FALSE, connect failed');
-            }
-        }
-    }
-
-    /* This only affects systems not using persistent connections */
-
-    /**
-     * Db::disconnect()
-     * @return bool
-     */
-    public function disconnect()
-    {
-        return @pg_close($this->linkId);
-    }
-
-    /**
-     * Db::queryReturn()
-     *
-     * Sends an SQL query to the server like the normal query() command but iterates through
-     * any rows and returns the row or rows immediately or FALSE on error
-     *
-     * @param mixed $query SQL Query to be used
-     * @param string $line optionally pass __LINE__ calling the query for logging
-     * @param string $file optionally pass __FILE__ calling the query for logging
-     * @return mixed FALSE if no rows, if a single row it returns that, if multiple it returns an array of rows, associative responses only
-     */
-    public function queryReturn($query, $line = '', $file = '')
-    {
-        $this->query($query, $line, $file);
-        if ($this->num_rows() == 0) {
-            return false;
-        } elseif ($this->num_rows() == 1) {
-            $this->next_record(MYSQL_ASSOC);
-            return $this->Record;
-        } else {
-            $out = [];
-            while ($this->next_record(MYSQL_ASSOC)) {
-                $out[] = $this->Record;
-            }
-            return $out;
-        }
-    }
-
-    /**
-     * db:qr()
-     *
-     *  alias of queryReturn()
-     *
-     * @param mixed $query SQL Query to be used
-     * @param string $line optionally pass __LINE__ calling the query for logging
-     * @param string $file optionally pass __FILE__ calling the query for logging
-     * @return mixed FALSE if no rows, if a single row it returns that, if multiple it returns an array of rows, associative responses only
-     */
-    public function qr($query, $line = '', $file = '')
-    {
-        return $this->queryReturn($query, $line, $file);
-    }
-
-    /**
-     * Db::query()
-     *
-     *  Sends an SQL query to the database
-     *
-     * @param mixed $queryString
-     * @param string $line
-     * @param string $file
-     * @return mixed 0 if no query or query id handler, safe to ignore this return
-     */
-    public function query($queryString, $line = '', $file = '')
-    {
-        /* No empty queries, please, since PHP4 chokes on them. */
-        /* The empty query string is passed on from the constructor,
+	}
+
+	/**
+	 * Db::connect()
+	 * @return void
+	 */
+	public function connect()
+	{
+		if (0 == $this->linkId) {
+			$connectString = trim($this->ifadd($this->host, 'host=').
+							 $this->ifadd($this->port, 'port=').
+							 $this->ifadd($this->database, 'dbname=').
+							 $this->ifadd($this->user, 'user=').
+							 $this->ifadd($this->password, 'password=', "'"));
+			$this->linkId = pg_connect($connectString);
+			if (!$this->linkId) {
+				$this->halt('Link-ID == FALSE, connect failed');
+			}
+		}
+	}
+
+	/* This only affects systems not using persistent connections */
+
+	/**
+	 * Db::disconnect()
+	 * @return bool
+	 */
+	public function disconnect()
+	{
+		return @pg_close($this->linkId);
+	}
+
+	/**
+	 * Db::queryReturn()
+	 *
+	 * Sends an SQL query to the server like the normal query() command but iterates through
+	 * any rows and returns the row or rows immediately or FALSE on error
+	 *
+	 * @param mixed $query SQL Query to be used
+	 * @param string $line optionally pass __LINE__ calling the query for logging
+	 * @param string $file optionally pass __FILE__ calling the query for logging
+	 * @return mixed FALSE if no rows, if a single row it returns that, if multiple it returns an array of rows, associative responses only
+	 */
+	public function queryReturn($query, $line = '', $file = '')
+	{
+		$this->query($query, $line, $file);
+		if ($this->num_rows() == 0) {
+			return false;
+		} elseif ($this->num_rows() == 1) {
+			$this->next_record(MYSQL_ASSOC);
+			return $this->Record;
+		} else {
+			$out = [];
+			while ($this->next_record(MYSQL_ASSOC)) {
+				$out[] = $this->Record;
+			}
+			return $out;
+		}
+	}
+
+	/**
+	 * db:qr()
+	 *
+	 *  alias of queryReturn()
+	 *
+	 * @param mixed $query SQL Query to be used
+	 * @param string $line optionally pass __LINE__ calling the query for logging
+	 * @param string $file optionally pass __FILE__ calling the query for logging
+	 * @return mixed FALSE if no rows, if a single row it returns that, if multiple it returns an array of rows, associative responses only
+	 */
+	public function qr($query, $line = '', $file = '')
+	{
+		return $this->queryReturn($query, $line, $file);
+	}
+
+	/**
+	 * Db::query()
+	 *
+	 *  Sends an SQL query to the database
+	 *
+	 * @param mixed $queryString
+	 * @param string $line
+	 * @param string $file
+	 * @return mixed 0 if no query or query id handler, safe to ignore this return
+	 */
+	public function query($queryString, $line = '', $file = '')
+	{
+		/* No empty queries, please, since PHP4 chokes on them. */
+		/* The empty query string is passed on from the constructor,
         * when calling the class without a query, e.g. in situations
         * like these: '$db = new db_Subclass;'
         */
-        if ($queryString == '') {
-            return 0;
-        }
-
-        $this->connect();
-
-        /* printf("<br>Debug: query = %s<br>\n", $queryString); */
-
-        $this->queryId = @pg_exec($this->linkId, $queryString);
-        $this->Row = 0;
-
-        $this->Error = pg_errormessage($this->linkId);
-        $this->Errno = ($this->Error == '') ? 0 : 1;
-        if (!$this->queryId) {
-            $this->halt('Invalid SQL: '.$queryString, $line, $file);
-        }
-
-        return $this->queryId;
-    }
-
-    /**
-     * Db::free()
-     *
-     * @return void
-     */
-    public function free()
-    {
-        @pg_freeresult($this->queryId);
-        $this->queryId = 0;
-    }
-
-    /**
-     * Db::next_record()
-     * @param mixed $resultType
-     * @return bool
-     */
-    public function next_record($resultType = PGSQL_BOTH)
-    {
-        $this->Record = @pg_fetch_array($this->queryId, $this->Row++, $resultType);
-
-        $this->Error = pg_errormessage($this->linkId);
-        $this->Errno = ($this->Error == '') ? 0 : 1;
-
-        $stat = is_array($this->Record);
-        if (!$stat && $this->autoFree) {
-            pg_freeresult($this->queryId);
-            $this->queryId = 0;
-        }
-        return $stat;
-    }
-
-    /**
-     * Db::seek()
-     *
-     * @param mixed $pos
-     * @return void
-     */
-    public function seek($pos)
-    {
-        $this->Row = $pos;
-    }
-
-    /**
-     * Db::transactionBegin()
-     *
-     * @return mixed
-     */
-    public function transactionBegin()
-    {
-        return $this->query('begin');
-    }
-
-    /**
-     * Db::transactionCommit()
-     * @return bool|mixed
-     */
-    public function transactionCommit()
-    {
-        if (!$this->Errno) {
-            return pg_exec($this->linkId, 'commit');
-        } else {
-            return false;
-        }
-    }
-
-    /**
-     * Db::transactionAbort()
-     * @return mixed
-     */
-    public function transactionAbort()
-    {
-        return pg_exec($this->linkId, 'rollback');
-    }
-
-    /**
-     * Db::getLastInsertId()
-     * @param mixed $table
-     * @param mixed $field
-     * @return int
-     */
-    public function getLastInsertId($table, $field)
-    {
-        /* This will get the last insert ID created on the current connection.  Should only be called
+		if ($queryString == '') {
+			return 0;
+		}
+
+		$this->connect();
+
+		/* printf("<br>Debug: query = %s<br>\n", $queryString); */
+
+		$this->queryId = @pg_exec($this->linkId, $queryString);
+		$this->Row = 0;
+
+		$this->Error = pg_errormessage($this->linkId);
+		$this->Errno = ($this->Error == '') ? 0 : 1;
+		if (!$this->queryId) {
+			$this->halt('Invalid SQL: '.$queryString, $line, $file);
+		}
+
+		return $this->queryId;
+	}
+
+	/**
+	 * Db::free()
+	 *
+	 * @return void
+	 */
+	public function free()
+	{
+		@pg_freeresult($this->queryId);
+		$this->queryId = 0;
+	}
+
+	/**
+	 * Db::next_record()
+	 * @param mixed $resultType
+	 * @return bool
+	 */
+	public function next_record($resultType = PGSQL_BOTH)
+	{
+		$this->Record = @pg_fetch_array($this->queryId, $this->Row++, $resultType);
+
+		$this->Error = pg_errormessage($this->linkId);
+		$this->Errno = ($this->Error == '') ? 0 : 1;
+
+		$stat = is_array($this->Record);
+		if (!$stat && $this->autoFree) {
+			pg_freeresult($this->queryId);
+			$this->queryId = 0;
+		}
+		return $stat;
+	}
+
+	/**
+	 * Db::seek()
+	 *
+	 * @param mixed $pos
+	 * @return void
+	 */
+	public function seek($pos)
+	{
+		$this->Row = $pos;
+	}
+
+	/**
+	 * Db::transactionBegin()
+	 *
+	 * @return mixed
+	 */
+	public function transactionBegin()
+	{
+		return $this->query('begin');
+	}
+
+	/**
+	 * Db::transactionCommit()
+	 * @return bool|mixed
+	 */
+	public function transactionCommit()
+	{
+		if (!$this->Errno) {
+			return pg_exec($this->linkId, 'commit');
+		} else {
+			return false;
+		}
+	}
+
+	/**
+	 * Db::transactionAbort()
+	 * @return mixed
+	 */
+	public function transactionAbort()
+	{
+		return pg_exec($this->linkId, 'rollback');
+	}
+
+	/**
+	 * Db::getLastInsertId()
+	 * @param mixed $table
+	 * @param mixed $field
+	 * @return int
+	 */
+	public function getLastInsertId($table, $field)
+	{
+		/* This will get the last insert ID created on the current connection.  Should only be called
         * after an insert query is run on a table that has an auto incrementing field.  Of note, table
         * and field are required because pgsql returns the last inserted OID, which is unique across
         * an entire installation.  These params allow us to retrieve the sequenced field without adding
         * conditional code to the apps.
         */
-        if (!isset($table) || $table == '' || !isset($field) || $field == '') {
-            return -1;
-        }
-
-        $oid = pg_getlastoid($this->queryId);
-        if ($oid == -1) {
-            return -1;
-        }
-
-        $result = @pg_exec($this->linkId, "select $field from $table where oid=$oid");
-        if (!$result) {
-            return -1;
-        }
-
-        $Record = @pg_fetch_array($result, 0);
-        @pg_freeresult($result);
-        if (!is_array($Record)) /* OID not found? */
-        {
-            return -1;
-        }
-
-        return $Record[0];
-    }
-
-    /**
-     * Db::lock()
-     * @param mixed  $table
-     * @param string $mode
-     * @return int|mixed
-     */
-    public function lock($table, $mode = 'write')
-    {
-        $result = $this->transactionBegin();
-
-        if ($mode == 'write') {
-            if (is_array($table)) {
-                foreach ($table as $t) {
-                    $result = pg_exec($this->linkId, 'lock table '.$t[1].' in share mode');
-                }
-            } else {
-                $result = pg_exec($this->linkId, 'lock table '.$table.' in share mode');
-            }
-        } else {
-            $result = 1;
-        }
-
-        return $result;
-    }
-
-    /**
-     * Db::unlock()
-     * @return bool|mixed
-     */
-    public function unlock()
-    {
-        return $this->transactionCommit();
-    }
-
-    /**
-     * Db::affectedRows()
-     * @return void
-     */
-    public function affectedRows()
-    {
-        return pg_cmdtuples($this->queryId);
-    }
-
-    /**
-     * Db::num_rows()
-     * @return int
-     */
-    public function num_rows()
-    {
-        return pg_numrows($this->queryId);
-    }
-
-    /**
-     * Db::num_fields()
-     * @return int
-     */
-    public function num_fields()
-    {
-        return pg_numfields($this->queryId);
-    }
-
-    /**
-     * @param mixed $msg
-     * @param string $line
-     * @param string $file
-     * @return mixed|void
-     */
-    public function haltmsg($msg, $line = '', $file = '')
-    {
-        $this->log("Database error: $msg", $line, $file, 'error');
-        if ($this->Errno != '0' || $this->Error != '()') {
-            $this->log('PostgreSQL Error: '.pg_last_error($this->linkId), $line, $file, 'error');
-        }
-        $this->logBackTrace($msg, $line, $file);
-    }
-
-    /**
-     * Db::tableNames()
-     *
-     * @return array
-     */
-    public function tableNames()
-    {
-        $return = [];
-        $this->query("select relname from pg_class where relkind = 'r' and not relname like 'pg_%'");
-        $i = 0;
-        while ($this->next_record()) {
-            $return[$i]['table_name'] = $this->f(0);
-            $return[$i]['tablespace_name'] = $this->database;
-            $return[$i]['database'] = $this->database;
-            ++$i;
-        }
-        return $return;
-    }
-
-    /**
-     * Db::indexNames()
-     *
-     * @return array
-     */
-    public function indexNames()
-    {
-        $return = [];
-        $this->query("SELECT relname FROM pg_class WHERE NOT relname ~ 'pg_.*' AND relkind ='i' ORDER BY relname");
-        $i = 0;
-        while ($this->next_record()) {
-            $return[$i]['index_name'] = $this->f(0);
-            $return[$i]['tablespace_name'] = $this->database;
-            $return[$i]['database'] = $this->database;
-            ++$i;
-        }
-        return $return;
-    }
+		if (!isset($table) || $table == '' || !isset($field) || $field == '') {
+			return -1;
+		}
+
+		$oid = pg_getlastoid($this->queryId);
+		if ($oid == -1) {
+			return -1;
+		}
+
+		$result = @pg_exec($this->linkId, "select $field from $table where oid=$oid");
+		if (!$result) {
+			return -1;
+		}
+
+		$Record = @pg_fetch_array($result, 0);
+		@pg_freeresult($result);
+		if (!is_array($Record)) /* OID not found? */
+		{
+			return -1;
+		}
+
+		return $Record[0];
+	}
+
+	/**
+	 * Db::lock()
+	 * @param mixed  $table
+	 * @param string $mode
+	 * @return int|mixed
+	 */
+	public function lock($table, $mode = 'write')
+	{
+		$result = $this->transactionBegin();
+
+		if ($mode == 'write') {
+			if (is_array($table)) {
+				foreach ($table as $t) {
+					$result = pg_exec($this->linkId, 'lock table '.$t[1].' in share mode');
+				}
+			} else {
+				$result = pg_exec($this->linkId, 'lock table '.$table.' in share mode');
+			}
+		} else {
+			$result = 1;
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Db::unlock()
+	 * @return bool|mixed
+	 */
+	public function unlock()
+	{
+		return $this->transactionCommit();
+	}
+
+	/**
+	 * Db::affectedRows()
+	 * @return void
+	 */
+	public function affectedRows()
+	{
+		return pg_cmdtuples($this->queryId);
+	}
+
+	/**
+	 * Db::num_rows()
+	 * @return int
+	 */
+	public function num_rows()
+	{
+		return pg_numrows($this->queryId);
+	}
+
+	/**
+	 * Db::num_fields()
+	 * @return int
+	 */
+	public function num_fields()
+	{
+		return pg_numfields($this->queryId);
+	}
+
+	/**
+	 * @param mixed $msg
+	 * @param string $line
+	 * @param string $file
+	 * @return mixed|void
+	 */
+	public function haltmsg($msg, $line = '', $file = '')
+	{
+		$this->log("Database error: $msg", $line, $file, 'error');
+		if ($this->Errno != '0' || $this->Error != '()') {
+			$this->log('PostgreSQL Error: '.pg_last_error($this->linkId), $line, $file, 'error');
+		}
+		$this->logBackTrace($msg, $line, $file);
+	}
+
+	/**
+	 * Db::tableNames()
+	 *
+	 * @return array
+	 */
+	public function tableNames()
+	{
+		$return = [];
+		$this->query("select relname from pg_class where relkind = 'r' and not relname like 'pg_%'");
+		$i = 0;
+		while ($this->next_record()) {
+			$return[$i]['table_name'] = $this->f(0);
+			$return[$i]['tablespace_name'] = $this->database;
+			$return[$i]['database'] = $this->database;
+			++$i;
+		}
+		return $return;
+	}
+
+	/**
+	 * Db::indexNames()
+	 *
+	 * @return array
+	 */
+	public function indexNames()
+	{
+		$return = [];
+		$this->query("SELECT relname FROM pg_class WHERE NOT relname ~ 'pg_.*' AND relkind ='i' ORDER BY relname");
+		$i = 0;
+		while ($this->next_record()) {
+			$return[$i]['index_name'] = $this->f(0);
+			$return[$i]['tablespace_name'] = $this->database;
+			$return[$i]['database'] = $this->database;
+			++$i;
+		}
+		return $return;
+	}
 }

Braces +25 added lines, -50 removed lines

@@ -17,8 +17,7 @@ 
  *
  * @access public
  */
-class Db extends Generic implements Db_Interface
-{
+class Db extends Generic implements Db_Interface {
     /* public: this is an api revision, not a CVS revision. */
     public $type = 'pgsql';
     public $port = '';
@@ -33,8 +32,7 @@ 
      * @param false|string $quote optional indicate the value needs quoted
      * @return string
      */
-    public function ifadd($add, $me, $quote = false)
-    {
+    public function ifadd($add, $me, $quote = false) {
         if ('' != $add) {
             return ' '.$me.($quote === false ? '' : $quote).$add.($quote === false ? '' : $quote);
         }
@@ -45,8 +43,7 @@ 
      * @param $string
      * @return string
      */
-    public function real_escape($string = '')
-    {
+    public function real_escape($string = '') {
         return $this->escape($string);
     }
 
@@ -56,8 +53,7 @@ 
      * @param string $database the name of the database to use
      * @return void
      */
-    public function useDb($database)
-    {
+    public function useDb($database) {
         $this->selectDb($database);
     }
 
@@ -67,8 +63,7 @@ 
      * @param string $database the name of the database to use
      * @return void
      */
-    public function selectDb($database)
-    {
+    public function selectDb($database) {
         /*if ($database != $this->database) {
             $this->database = $database;
             $this->linkId = null;
@@ -80,8 +75,7 @@ 
      * Db::connect()
      * @return void
      */
-    public function connect()
-    {
+    public function connect() {
         if (0 == $this->linkId) {
             $connectString = trim($this->ifadd($this->host, 'host=').
                              $this->ifadd($this->port, 'port=').
@@ -101,8 +95,7 @@ 
      * Db::disconnect()
      * @return bool
      */
-    public function disconnect()
-    {
+    public function disconnect() {
         return @pg_close($this->linkId);
     }
 
@@ -117,8 +110,7 @@ 
      * @param string $file optionally pass __FILE__ calling the query for logging
      * @return mixed FALSE if no rows, if a single row it returns that, if multiple it returns an array of rows, associative responses only
      */
-    public function queryReturn($query, $line = '', $file = '')
-    {
+    public function queryReturn($query, $line = '', $file = '') {
         $this->query($query, $line, $file);
         if ($this->num_rows() == 0) {
             return false;
@@ -144,8 +136,7 @@ 
      * @param string $file optionally pass __FILE__ calling the query for logging
      * @return mixed FALSE if no rows, if a single row it returns that, if multiple it returns an array of rows, associative responses only
      */
-    public function qr($query, $line = '', $file = '')
-    {
+    public function qr($query, $line = '', $file = '') {
         return $this->queryReturn($query, $line, $file);
     }
 
@@ -159,8 +150,7 @@ 
      * @param string $file
      * @return mixed 0 if no query or query id handler, safe to ignore this return
      */
-    public function query($queryString, $line = '', $file = '')
-    {
+    public function query($queryString, $line = '', $file = '') {
         /* No empty queries, please, since PHP4 chokes on them. */
         /* The empty query string is passed on from the constructor,
         * when calling the class without a query, e.g. in situations
@@ -191,8 +181,7 @@ 
      *
      * @return void
      */
-    public function free()
-    {
+    public function free() {
         @pg_freeresult($this->queryId);
         $this->queryId = 0;
     }
@@ -202,8 +191,7 @@ 
      * @param mixed $resultType
      * @return bool
      */
-    public function next_record($resultType = PGSQL_BOTH)
-    {
+    public function next_record($resultType = PGSQL_BOTH) {
         $this->Record = @pg_fetch_array($this->queryId, $this->Row++, $resultType);
 
         $this->Error = pg_errormessage($this->linkId);
@@ -223,8 +211,7 @@ 
      * @param mixed $pos
      * @return void
      */
-    public function seek($pos)
-    {
+    public function seek($pos) {
         $this->Row = $pos;
     }
 
@@ -233,8 +220,7 @@ 
      *
      * @return mixed
      */
-    public function transactionBegin()
-    {
+    public function transactionBegin() {
         return $this->query('begin');
     }
 
@@ -242,8 +228,7 @@ 
      * Db::transactionCommit()
      * @return bool|mixed
      */
-    public function transactionCommit()
-    {
+    public function transactionCommit() {
         if (!$this->Errno) {
             return pg_exec($this->linkId, 'commit');
         } else {
@@ -255,8 +240,7 @@ 
      * Db::transactionAbort()
      * @return mixed
      */
-    public function transactionAbort()
-    {
+    public function transactionAbort() {
         return pg_exec($this->linkId, 'rollback');
     }
 
@@ -266,8 +250,7 @@ 
      * @param mixed $field
      * @return int
      */
-    public function getLastInsertId($table, $field)
-    {
+    public function getLastInsertId($table, $field) {
         /* This will get the last insert ID created on the current connection.  Should only be called
         * after an insert query is run on a table that has an auto incrementing field.  Of note, table
         * and field are required because pgsql returns the last inserted OID, which is unique across
@@ -304,8 +287,7 @@ 
      * @param string $mode
      * @return int|mixed
      */
-    public function lock($table, $mode = 'write')
-    {
+    public function lock($table, $mode = 'write') {
         $result = $this->transactionBegin();
 
         if ($mode == 'write') {
@@ -327,8 +309,7 @@ 
      * Db::unlock()
      * @return bool|mixed
      */
-    public function unlock()
-    {
+    public function unlock() {
         return $this->transactionCommit();
     }
 
@@ -336,8 +317,7 @@ 
      * Db::affectedRows()
      * @return void
      */
-    public function affectedRows()
-    {
+    public function affectedRows() {
         return pg_cmdtuples($this->queryId);
     }
 
@@ -345,8 +325,7 @@ 
      * Db::num_rows()
      * @return int
      */
-    public function num_rows()
-    {
+    public function num_rows() {
         return pg_numrows($this->queryId);
     }
 
@@ -354,8 +333,7 @@ 
      * Db::num_fields()
      * @return int
      */
-    public function num_fields()
-    {
+    public function num_fields() {
         return pg_numfields($this->queryId);
     }
 
@@ -365,8 +343,7 @@ 
      * @param string $file
      * @return mixed|void
      */
-    public function haltmsg($msg, $line = '', $file = '')
-    {
+    public function haltmsg($msg, $line = '', $file = '') {
         $this->log("Database error: $msg", $line, $file, 'error');
         if ($this->Errno != '0' || $this->Error != '()') {
             $this->log('PostgreSQL Error: '.pg_last_error($this->linkId), $line, $file, 'error');
@@ -379,8 +356,7 @@ 
      *
      * @return array
      */
-    public function tableNames()
-    {
+    public function tableNames() {
         $return = [];
         $this->query("select relname from pg_class where relkind = 'r' and not relname like 'pg_%'");
         $i = 0;
@@ -398,8 +374,7 @@ 
      *
      * @return array
      */
-    public function indexNames()
-    {
+    public function indexNames() {
         $return = [];
         $this->query("SELECT relname FROM pg_class WHERE NOT relname ~ 'pg_.*' AND relkind ='i' ORDER BY relname");
         $i = 0;

src/Loader.php

Indentation +187 added lines, -187 removed lines

@@ -1,12 +1,12 @@ 
 <?php
 
-    /**
-     * Generic SQL Driver Related Functionality
-     * @author Joe Huss <detain@interserver.net>
-     * @copyright 2019
-     * @package MyAdmin
-     * @category SQL
-     */
+	/**
+	 * Generic SQL Driver Related Functionality
+	 * @author Joe Huss <detain@interserver.net>
+	 * @copyright 2019
+	 * @package MyAdmin
+	 * @category SQL
+	 */
 
 namespace MyDb;
 
@@ -17,184 +17,184 @@ 
  */
 class Loader
 {
-    /* public: connection parameters */
-    public $Type = 'mysqli';
-    public $host = 'localhost';
-    public $database = '';
-    public $user = '';
-    public $password = '';
-
-    /* public: configuration parameters */
-    public $autoStripslashes = false;
-    public $Debug = 0; // Set to 1 for debugging messages.
-    public $haltOnError = 'yes'; // "yes" (halt with message), "no" (ignore errors quietly), "report" (ignore error, but spit a warning)
-
-    /* public: result array and current row number */
-    public $Record = [];
-    public $Row;
-
-    /* public: current error number and error text */
-    public $Errno = 0;
-    public $Error = '';
-
-    public $type;
-
-    /* private: link and query handles */
-    public $linkId = 0;
-    public $queryId = 0;
-
-    public $characterSet = '';
-    public $collation = '';
-
-    /**
-     * Constructs the db handler, can optionally specify connection parameters
-     *
-     * @param string $Type Optional The database type mysql/mysqli/pdo/adodb/pgsql
-     * @param string $database Optional The database name
-     * @param string $user Optional The username to connect with
-     * @param string $password Optional The password to use
-     * @param string $host Optional The hostname where the server is, or default to localhost
-     * @param string $query Optional query to perform immediately
-     */
-    public function __construct($Type = '', $database = '', $user = '', $password = '', $host = 'localhost', $query = '')
-    {
-        $this->Type = $Type;
-        if (!defined('db')) {
-            switch ($this->Type) {
-                case 'mysqli':
-                    include_once 'class.db_mysqli.inc.php';
-                    break;
-                case 'mysql':
-                    include_once 'class.db_mysql.inc.php';
-                    break;
-                case 'adodb':
-                    include_once 'class.db_adodb.inc.php';
-                    break;
-                case 'mdb2':
-                    include_once 'class.db_mdb2.inc.php';
-                    break;
-                case 'pdo':
-                    include_once 'class.db_pdo.inc.php';
-                    break;
-                case 'pgsql':
-                    include_once 'class.db_pgsql.inc.php';
-                    break;
-                default:
-                    $this->log('Could not find DB class '.$this->Type, __LINE__, __FILE__);
-                    break;
-            }
-        }
-        $this->database = $database;
-        $this->user = $user;
-        $this->password = $password;
-        $this->host = $host;
-        if ($query != '') {
-            $this->query($query);
-        }
-    }
-
-    /**
-     * @param        $message
-     * @param string $line
-     * @param string $file
-     */
-    public function log($message, $line = '', $file = '')
-    {
-        error_log($message);
-    }
-
-    /**
-     * @return int
-     */
-    public function linkId()
-    {
-        return $this->linkId;
-    }
-
-    /**
-     * @return int
-     */
-    public function queryId()
-    {
-        return $this->queryId;
-    }
-
-    /**
-     * @param $str
-     * @return string
-     */
-    public function dbAddslashes($str)
-    {
-        if (!isset($str) || $str == '') {
-            return '';
-        }
-
-        return addslashes($str);
-    }
-
-    /**
-     * db:qr()
-     *
-     *  alias of queryReturn()
-     *
-     * @param mixed $query SQL Query to be used
-     * @param string $line optionally pass __LINE__ calling the query for logging
-     * @param string $file optionally pass __FILE__ calling the query for logging
-     * @return mixed FALSE if no rows, if a single row it returns that, if multiple it returns an array of rows, associative responses only
-     */
-    public function qr($query, $line = '', $file = '')
-    {
-        return $this->queryReturn($query, $line, $file);
-    }
-
-    /**
-     * error handling
-     *
-     * @param mixed $msg
-     * @param string $line
-     * @param string $file
-     * @return void
-     */
-    public function halt($msg, $line = '', $file = '')
-    {
-        $this->unlock(false);
-
-        if ($this->haltOnError == 'no') {
-            return;
-        }
-        $this->haltmsg($msg);
-
-        if ($file) {
-            error_log("File: $file");
-        }
-        if ($line) {
-            error_log("Line: $line");
-        }
-        if ($this->haltOnError != 'report') {
-            echo '<p><b>Session halted.</b>';
-            // FIXME! Add check for error levels
-            if (isset($GLOBALS['tf'])) {
-                $GLOBALS['tf']->terminate();
-            }
-        }
-    }
-
-    /**
-     * @param $msg
-     */
-    public function haltmsg($msg)
-    {
-        $this->log("Database error: $msg", __LINE__, __FILE__);
-        if ($this->Errno != '0' || $this->Error != '()') {
-            $this->log('SQL Error: '.$this->Errno.' ('.$this->Error.')', __LINE__, __FILE__);
-        }
-    }
-
-    /**
-     * @return array
-     */
-    public function indexNames()
-    {
-        return [];
-    }
+	/* public: connection parameters */
+	public $Type = 'mysqli';
+	public $host = 'localhost';
+	public $database = '';
+	public $user = '';
+	public $password = '';
+
+	/* public: configuration parameters */
+	public $autoStripslashes = false;
+	public $Debug = 0; // Set to 1 for debugging messages.
+	public $haltOnError = 'yes'; // "yes" (halt with message), "no" (ignore errors quietly), "report" (ignore error, but spit a warning)
+
+	/* public: result array and current row number */
+	public $Record = [];
+	public $Row;
+
+	/* public: current error number and error text */
+	public $Errno = 0;
+	public $Error = '';
+
+	public $type;
+
+	/* private: link and query handles */
+	public $linkId = 0;
+	public $queryId = 0;
+
+	public $characterSet = '';
+	public $collation = '';
+
+	/**
+	 * Constructs the db handler, can optionally specify connection parameters
+	 *
+	 * @param string $Type Optional The database type mysql/mysqli/pdo/adodb/pgsql
+	 * @param string $database Optional The database name
+	 * @param string $user Optional The username to connect with
+	 * @param string $password Optional The password to use
+	 * @param string $host Optional The hostname where the server is, or default to localhost
+	 * @param string $query Optional query to perform immediately
+	 */
+	public function __construct($Type = '', $database = '', $user = '', $password = '', $host = 'localhost', $query = '')
+	{
+		$this->Type = $Type;
+		if (!defined('db')) {
+			switch ($this->Type) {
+				case 'mysqli':
+					include_once 'class.db_mysqli.inc.php';
+					break;
+				case 'mysql':
+					include_once 'class.db_mysql.inc.php';
+					break;
+				case 'adodb':
+					include_once 'class.db_adodb.inc.php';
+					break;
+				case 'mdb2':
+					include_once 'class.db_mdb2.inc.php';
+					break;
+				case 'pdo':
+					include_once 'class.db_pdo.inc.php';
+					break;
+				case 'pgsql':
+					include_once 'class.db_pgsql.inc.php';
+					break;
+				default:
+					$this->log('Could not find DB class '.$this->Type, __LINE__, __FILE__);
+					break;
+			}
+		}
+		$this->database = $database;
+		$this->user = $user;
+		$this->password = $password;
+		$this->host = $host;
+		if ($query != '') {
+			$this->query($query);
+		}
+	}
+
+	/**
+	 * @param        $message
+	 * @param string $line
+	 * @param string $file
+	 */
+	public function log($message, $line = '', $file = '')
+	{
+		error_log($message);
+	}
+
+	/**
+	 * @return int
+	 */
+	public function linkId()
+	{
+		return $this->linkId;
+	}
+
+	/**
+	 * @return int
+	 */
+	public function queryId()
+	{
+		return $this->queryId;
+	}
+
+	/**
+	 * @param $str
+	 * @return string
+	 */
+	public function dbAddslashes($str)
+	{
+		if (!isset($str) || $str == '') {
+			return '';
+		}
+
+		return addslashes($str);
+	}
+
+	/**
+	 * db:qr()
+	 *
+	 *  alias of queryReturn()
+	 *
+	 * @param mixed $query SQL Query to be used
+	 * @param string $line optionally pass __LINE__ calling the query for logging
+	 * @param string $file optionally pass __FILE__ calling the query for logging
+	 * @return mixed FALSE if no rows, if a single row it returns that, if multiple it returns an array of rows, associative responses only
+	 */
+	public function qr($query, $line = '', $file = '')
+	{
+		return $this->queryReturn($query, $line, $file);
+	}
+
+	/**
+	 * error handling
+	 *
+	 * @param mixed $msg
+	 * @param string $line
+	 * @param string $file
+	 * @return void
+	 */
+	public function halt($msg, $line = '', $file = '')
+	{
+		$this->unlock(false);
+
+		if ($this->haltOnError == 'no') {
+			return;
+		}
+		$this->haltmsg($msg);
+
+		if ($file) {
+			error_log("File: $file");
+		}
+		if ($line) {
+			error_log("Line: $line");
+		}
+		if ($this->haltOnError != 'report') {
+			echo '<p><b>Session halted.</b>';
+			// FIXME! Add check for error levels
+			if (isset($GLOBALS['tf'])) {
+				$GLOBALS['tf']->terminate();
+			}
+		}
+	}
+
+	/**
+	 * @param $msg
+	 */
+	public function haltmsg($msg)
+	{
+		$this->log("Database error: $msg", __LINE__, __FILE__);
+		if ($this->Errno != '0' || $this->Error != '()') {
+			$this->log('SQL Error: '.$this->Errno.' ('.$this->Error.')', __LINE__, __FILE__);
+		}
+	}
+
+	/**
+	 * @return array
+	 */
+	public function indexNames()
+	{
+		return [];
+	}
 }

Braces +10 added lines, -20 removed lines

@@ -15,8 +15,7 @@ 
  *
  * @package MyDb
  */
-class Loader
-{
+class Loader {
     /* public: connection parameters */
     public $Type = 'mysqli';
     public $host = 'localhost';
@@ -56,8 +55,7 @@ 
      * @param string $host Optional The hostname where the server is, or default to localhost
      * @param string $query Optional query to perform immediately
      */
-    public function __construct($Type = '', $database = '', $user = '', $password = '', $host = 'localhost', $query = '')
-    {
+    public function __construct($Type = '', $database = '', $user = '', $password = '', $host = 'localhost', $query = '') {
         $this->Type = $Type;
         if (!defined('db')) {
             switch ($this->Type) {
@@ -98,24 +96,21 @@ 
      * @param string $line
      * @param string $file
      */
-    public function log($message, $line = '', $file = '')
-    {
+    public function log($message, $line = '', $file = '') {
         error_log($message);
     }
 
     /**
      * @return int
      */
-    public function linkId()
-    {
+    public function linkId() {
         return $this->linkId;
     }
 
     /**
      * @return int
      */
-    public function queryId()
-    {
+    public function queryId() {
         return $this->queryId;
     }
 
@@ -123,8 +118,7 @@ 
      * @param $str
      * @return string
      */
-    public function dbAddslashes($str)
-    {
+    public function dbAddslashes($str) {
         if (!isset($str) || $str == '') {
             return '';
         }
@@ -142,8 +136,7 @@ 
      * @param string $file optionally pass __FILE__ calling the query for logging
      * @return mixed FALSE if no rows, if a single row it returns that, if multiple it returns an array of rows, associative responses only
      */
-    public function qr($query, $line = '', $file = '')
-    {
+    public function qr($query, $line = '', $file = '') {
         return $this->queryReturn($query, $line, $file);
     }
 
@@ -155,8 +148,7 @@ 
      * @param string $file
      * @return void
      */
-    public function halt($msg, $line = '', $file = '')
-    {
+    public function halt($msg, $line = '', $file = '') {
         $this->unlock(false);
 
         if ($this->haltOnError == 'no') {
@@ -182,8 +174,7 @@ 
     /**
      * @param $msg
      */
-    public function haltmsg($msg)
-    {
+    public function haltmsg($msg) {
         $this->log("Database error: $msg", __LINE__, __FILE__);
         if ($this->Errno != '0' || $this->Error != '()') {
             $this->log('SQL Error: '.$this->Errno.' ('.$this->Error.')', __LINE__, __FILE__);
@@ -193,8 +184,7 @@ 
     /**
      * @return array
      */
-    public function indexNames()
-    {
+    public function indexNames() {
         return [];
     }
 }

src/Mdb2/Db.php

Indentation +73 added lines, -73 removed lines

@@ -20,81 +20,81 @@
  */
 class Db extends MysqliDb implements Db_Interface
 {
-    public $host = 'localhost';
-    public $user = 'pdns';
-    public $password = '';
-    public $database = 'pdns';
-    public $type = 'mdb2';
-    public $error = false;
-    public $message = '';
+	public $host = 'localhost';
+	public $user = 'pdns';
+	public $password = '';
+	public $database = 'pdns';
+	public $type = 'mdb2';
+	public $error = false;
+	public $message = '';
 
-    /**
-     * Db::quote()
-     * @param string $text
-     * @param string $type
-     * @return string
-     */
-    public function quote($text = '', $type = 'text')
-    {
-        switch ($type) {
-            case 'text':
-                return "'".$this->escape($text)."'";
-                break;
-            case 'integer':
-                return (int) $text;
-                break;
-            default:
-                return $text;
-                break;
-        }
-    }
+	/**
+	 * Db::quote()
+	 * @param string $text
+	 * @param string $type
+	 * @return string
+	 */
+	public function quote($text = '', $type = 'text')
+	{
+		switch ($type) {
+			case 'text':
+				return "'".$this->escape($text)."'";
+				break;
+			case 'integer':
+				return (int) $text;
+				break;
+			default:
+				return $text;
+				break;
+		}
+	}
 
-    /**
-     * Db::queryOne()
-     *
-     * @param mixed $query
-     * @param string $line
-     * @param string $file
-     * @return bool
-     */
-    public function queryOne($query, $line = '', $file = '')
-    {
-        $this->query($query, $line, $file);
-        if ($this->num_rows() > 0) {
-            $this->next_record();
-            return $this->f(0);
-        } else {
-            return 0;
-        }
-    }
+	/**
+	 * Db::queryOne()
+	 *
+	 * @param mixed $query
+	 * @param string $line
+	 * @param string $file
+	 * @return bool
+	 */
+	public function queryOne($query, $line = '', $file = '')
+	{
+		$this->query($query, $line, $file);
+		if ($this->num_rows() > 0) {
+			$this->next_record();
+			return $this->f(0);
+		} else {
+			return 0;
+		}
+	}
 
-    /**
-     * Db::queryRow()
-     *
-     * @param mixed $query
-     * @param string $line
-     * @param string $file
-     * @return array|bool
-     */
-    public function queryRow($query, $line = '', $file = '')
-    {
-        $this->query($query, $line, $file);
-        if ($this->num_rows() > 0) {
-            $this->next_record();
-            return $this->Record;
-        } else {
-            return 0;
-        }
-    }
+	/**
+	 * Db::queryRow()
+	 *
+	 * @param mixed $query
+	 * @param string $line
+	 * @param string $file
+	 * @return array|bool
+	 */
+	public function queryRow($query, $line = '', $file = '')
+	{
+		$this->query($query, $line, $file);
+		if ($this->num_rows() > 0) {
+			$this->next_record();
+			return $this->Record;
+		} else {
+			return 0;
+		}
+	}
 
-    /**
-     * Db::lastInsertId()
-     * @param mixed $table
-     * @param mixed $field
-     * @return int
-     */
-    public function lastInsertId($table, $field)
-    {
-        return $this->getLastInsertId($table, $field);
-    }
+	/**
+	 * Db::lastInsertId()
+	 * @param mixed $table
+	 * @param mixed $field
+	 * @return int
+	 */
+	public function lastInsertId($table, $field)
+	{
+		return $this->getLastInsertId($table, $field);
+	}
 }

Braces +5 added lines, -10 removed lines

@@ -18,8 +18,7 @@ 
  *
  * @access public
  */
-class Db extends MysqliDb implements Db_Interface
-{
+class Db extends MysqliDb implements Db_Interface {
     public $host = 'localhost';
     public $user = 'pdns';
     public $password = '';
@@ -34,8 +33,7 @@ 
      * @param string $type
      * @return string
      */
-    public function quote($text = '', $type = 'text')
-    {
+    public function quote($text = '', $type = 'text') {
         switch ($type) {
             case 'text':
                 return "'".$this->escape($text)."'";
@@ -57,8 +55,7 @@ 
      * @param string $file
      * @return bool
      */
-    public function queryOne($query, $line = '', $file = '')
-    {
+    public function queryOne($query, $line = '', $file = '') {
         $this->query($query, $line, $file);
         if ($this->num_rows() > 0) {
             $this->next_record();
@@ -76,8 +73,7 @@ 
      * @param string $file
      * @return array|bool
      */
-    public function queryRow($query, $line = '', $file = '')
-    {
+    public function queryRow($query, $line = '', $file = '') {
         $this->query($query, $line, $file);
         if ($this->num_rows() > 0) {
             $this->next_record();
@@ -93,8 +89,7 @@ 
      * @param mixed $field
      * @return int
      */
-    public function lastInsertId($table, $field)
-    {
+    public function lastInsertId($table, $field) {
         return $this->getLastInsertId($table, $field);
     }
 }

src/Mysqli/Db.php

Braces +24 added lines, -48 removed lines

@@ -17,8 +17,7 @@ 
  *
  * @access public
  */
-class Db extends Generic implements Db_Interface
-{
+class Db extends Generic implements Db_Interface {
     /**
      * @var string
      */
@@ -30,8 +29,7 @@ 
      * @param string $database the name of the database to use
      * @return void
      */
-    public function useDb($database)
-    {
+    public function useDb($database) {
         $this->selectDb($database);
     }
 
@@ -41,8 +39,7 @@ 
      * @param string $database the name of the database to use
      * @return void
      */
-    public function selectDb($database)
-    {
+    public function selectDb($database) {
         $this->connect();
         mysqli_select_db($this->linkId, $database);
     }
@@ -57,8 +54,7 @@ 
      * @param string $password
      * @return int|\mysqli
      */
-    public function connect($database = '', $host = '', $user = '', $password = '', $port = '')
-    {
+    public function connect($database = '', $host = '', $user = '', $password = '', $port = '') {
         /* Handle defaults */
         if ($database == '') {
             $database = $this->database;
@@ -105,8 +101,7 @@ 
      * Db::disconnect()
      * @return bool
      */
-    public function disconnect()
-    {
+    public function disconnect() {
         $return = !is_int($this->linkId) && method_exists($this->linkId, 'close') ? $this->linkId->close() : false;
         $this->linkId = 0;
         return $return;
@@ -116,8 +111,7 @@ 
      * @param $string
      * @return string
      */
-    public function real_escape($string = '')
-    {
+    public function real_escape($string = '') {
         if ((!is_resource($this->linkId) || $this->linkId == 0) && !$this->connect()) {
             return $this->escape($string);
         }
@@ -128,8 +122,7 @@ 
      * discard the query result
      * @return void
      */
-    public function free()
-    {
+    public function free() {
         if (is_resource($this->queryId)) {
             @mysqli_free_result($this->queryId);
         }
@@ -147,8 +140,7 @@ 
      * @param string $file optionally pass __FILE__ calling the query for logging
      * @return mixed FALSE if no rows, if a single row it returns that, if multiple it returns an array of rows, associative responses only
      */
-    public function queryReturn($query, $line = '', $file = '')
-    {
+    public function queryReturn($query, $line = '', $file = '') {
         $this->query($query, $line, $file);
         if ($this->num_rows() == 0) {
             return false;
@@ -174,8 +166,7 @@ 
      * @param string $file optionally pass __FILE__ calling the query for logging
      * @return mixed FALSE if no rows, if a single row it returns that, if multiple it returns an array of rows, associative responses only
      */
-    public function qr($query, $line = '', $file = '')
-    {
+    public function qr($query, $line = '', $file = '') {
         return $this->queryReturn($query, $line, $file);
     }
 
@@ -187,8 +178,7 @@ 
      * @param string $line
      * @param string $file
      */
-    public function prepare($query, $line = '', $file = '')
-    {
+    public function prepare($query, $line = '', $file = '') {
         if (!$this->connect()) {
             return 0;
         }
@@ -210,8 +200,7 @@ 
      * @param string $file
      * @return mixed 0 if no query or query id handler, safe to ignore this return
      */
-    public function query($queryString, $line = '', $file = '')
-    {
+    public function query($queryString, $line = '', $file = '') {
         /* No empty queries, please, since PHP4 chokes on them. */
         /* The empty query string is passed on from the constructor,
         * when calling the class without a query, e.g. in situations
@@ -289,8 +278,7 @@ 
     /**
      * @return array|null|object
      */
-    public function fetchObject()
-    {
+    public function fetchObject() {
         $this->Record = @mysqli_fetch_object($this->queryId);
         return $this->Record;
     }
@@ -303,8 +291,7 @@ 
      * @param mixed $resultType
      * @return bool
      */
-    public function next_record($resultType = MYSQLI_BOTH)
-    {
+    public function next_record($resultType = MYSQLI_BOTH) {
         if ($this->queryId === false) {
             $this->haltmsg('next_record called with no query pending.');
             return 0;
@@ -328,8 +315,7 @@ 
      * @param integer $pos the row numbe starting at 0 to switch to
      * @return bool whetherit was successfu or not.
      */
-    public function seek($pos = 0)
-    {
+    public function seek($pos = 0) {
         $status = @mysqli_data_seek($this->queryId, $pos);
         if ($status) {
             $this->Row = $pos;
@@ -349,8 +335,7 @@ 
      *
      * @return bool
      */
-    public function transactionBegin()
-    {
+    public function transactionBegin() {
         if (version_compare(PHP_VERSION, '5.5.0') < 0) {
             return true;
         }
@@ -365,8 +350,7 @@ 
      *
      * @return bool
      */
-    public function transactionCommit()
-    {
+    public function transactionCommit() {
         if (version_compare(PHP_VERSION, '5.5.0') < 0 || $this->linkId === 0) {
             return true;
         }
@@ -378,8 +362,7 @@ 
      *
      * @return bool
      */
-    public function transactionAbort()
-    {
+    public function transactionAbort() {
         if (version_compare(PHP_VERSION, '5.5.0') < 0 || $this->linkId === 0) {
             return true;
         }
@@ -395,8 +378,7 @@ 
      * @param string $field
      * @return int|string
      */
-    public function getLastInsertId($table, $field)
-    {
+    public function getLastInsertId($table, $field) {
         if (!isset($table) || $table == '' || !isset($field) || $field == '') {
             return -1;
         }
@@ -412,8 +394,7 @@ 
      * @param string $mode
      * @return bool|int|\mysqli_result
      */
-    public function lock($table, $mode = 'write')
-    {
+    public function lock($table, $mode = 'write') {
         $this->connect();
         $query = 'lock tables ';
         if (is_array($table)) {
@@ -441,8 +422,7 @@ 
      * @param bool $haltOnError optional, defaults to TRUE, whether or not to halt on error
      * @return bool|int|\mysqli_result
      */
-    public function unlock($haltOnError = true)
-    {
+    public function unlock($haltOnError = true) {
         $this->connect();
 
         $res = @mysqli_query($this->linkId, 'unlock tables');
@@ -459,8 +439,7 @@ 
      * Db::affectedRows()
      * @return int
      */
-    public function affectedRows()
-    {
+    public function affectedRows() {
         return @mysqli_affected_rows($this->linkId);
     }
 
@@ -468,8 +447,7 @@ 
      * Db::num_rows()
      * @return int
      */
-    public function num_rows()
-    {
+    public function num_rows() {
         return @mysqli_num_rows($this->queryId);
     }
 
@@ -477,8 +455,7 @@ 
      * Db::num_fields()
      * @return int
      */
-    public function num_fields()
-    {
+    public function num_fields() {
         return @mysqli_num_fields($this->queryId);
     }
 
@@ -487,8 +464,7 @@ 
      *
      * @return array
      */
-    public function tableNames()
-    {
+    public function tableNames() {
         $return = [];
         $this->query('SHOW TABLES');
         $i = 0;

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -88,7 +88,7 @@
             //error_log("real_connect($host, $user, $password, $database, $port)");
             $this->linkId = mysqli_init();
             $this->linkId->options(MYSQLI_INIT_COMMAND, "SET NAMES {$this->characterSet} COLLATE {$this->collation}, COLLATION_CONNECTION = {$this->collation}, COLLATION_DATABASE = {$this->collation}");
-            if (!$this->linkId->real_connect($host, $user, $password, $database, $port != '' ? $port : NULL)) {
+            if (!$this->linkId->real_connect($host, $user, $password, $database, $port != '' ? $port : null)) {
                 $this->halt("connect($host, $user, \$password) failed. ".$this->linkId->connect_error);
                 return 0;
             }

Indentation +494 added lines, -494 removed lines

@@ -19,503 +19,503 @@
  */
 class Db extends Generic implements Db_Interface
 {
-    /**
-     * @var string
-     */
-    public $type = 'mysqli';
-
-    /**
-     * alias function of select_db, changes the database we are working with.
-     *
-     * @param string $database the name of the database to use
-     * @return void
-     */
-    public function useDb($database)
-    {
-        $this->selectDb($database);
-    }
-
-    /**
-     * changes the database we are working with.
-     *
-     * @param string $database the name of the database to use
-     * @return void
-     */
-    public function selectDb($database)
-    {
-        $this->connect();
-        mysqli_select_db($this->linkId, $database);
-    }
-
-    /* public: connection management */
-
-    /**
-     * Db::connect()
-     * @param string $database
-     * @param string $host
-     * @param string $user
-     * @param string $password
-     * @return int|\mysqli
-     */
-    public function connect($database = '', $host = '', $user = '', $password = '', $port = '')
-    {
-        /* Handle defaults */
-        if ($database == '') {
-            $database = $this->database;
-        }
-        if ($host == '') {
-            $host = $this->host;
-        }
-        if ($user == '') {
-            $user = $this->user;
-        }
-        if ($password == '') {
-            $password = $this->password;
-        }
-        if ($port == '') {
-            $port = $this->port;
-        }
-        /* establish connection, select database */
-        if (!is_object($this->linkId)) {
-            $this->connectionAttempt++;
-            if ($this->connectionAttempt >= $this->maxConnectErrors - 1) {
-                error_log("MySQLi Connection Attempt #{$this->connectionAttempt}/{$this->maxConnectErrors}");
-            }
-            if ($this->connectionAttempt >= $this->maxConnectErrors) {
-                $this->halt("connect($host, $user, \$password) failed. ".$this->linkId->connect_error);
-                return 0;
-            }
-            //error_log("real_connect($host, $user, $password, $database, $port)");
-            $this->linkId = mysqli_init();
-            $this->linkId->options(MYSQLI_INIT_COMMAND, "SET NAMES {$this->characterSet} COLLATE {$this->collation}, COLLATION_CONNECTION = {$this->collation}, COLLATION_DATABASE = {$this->collation}");
-            if (!$this->linkId->real_connect($host, $user, $password, $database, $port != '' ? $port : NULL)) {
-                $this->halt("connect($host, $user, \$password) failed. ".$this->linkId->connect_error);
-                return 0;
-            }
-            $this->linkId->set_charset($this->characterSet);
-            if ($this->linkId->connect_errno) {
-                $this->halt("connect($host, $user, \$password) failed. ".$this->linkId->connect_error);
-                return 0;
-            }
-        }
-        return $this->linkId;
-    }
-
-    /**
-     * Db::disconnect()
-     * @return bool
-     */
-    public function disconnect()
-    {
-        $return = !is_int($this->linkId) && method_exists($this->linkId, 'close') ? $this->linkId->close() : false;
-        $this->linkId = 0;
-        return $return;
-    }
-
-    /**
-     * @param $string
-     * @return string
-     */
-    public function real_escape($string = '')
-    {
-        if ((!is_resource($this->linkId) || $this->linkId == 0) && !$this->connect()) {
-            return $this->escape($string);
-        }
-        return mysqli_real_escape_string($this->linkId, $string);
-    }
-
-    /**
-     * discard the query result
-     * @return void
-     */
-    public function free()
-    {
-        if (is_resource($this->queryId)) {
-            @mysqli_free_result($this->queryId);
-        }
-        $this->queryId = 0;
-    }
-
-    /**
-     * Db::queryReturn()
-     *
-     * Sends an SQL query to the server like the normal query() command but iterates through
-     * any rows and returns the row or rows immediately or FALSE on error
-     *
-     * @param mixed $query SQL Query to be used
-     * @param string $line optionally pass __LINE__ calling the query for logging
-     * @param string $file optionally pass __FILE__ calling the query for logging
-     * @return mixed FALSE if no rows, if a single row it returns that, if multiple it returns an array of rows, associative responses only
-     */
-    public function queryReturn($query, $line = '', $file = '')
-    {
-        $this->query($query, $line, $file);
-        if ($this->num_rows() == 0) {
-            return false;
-        } elseif ($this->num_rows() == 1) {
-            $this->next_record(MYSQLI_ASSOC);
-            return $this->Record;
-        } else {
-            $out = [];
-            while ($this->next_record(MYSQLI_ASSOC)) {
-                $out[] = $this->Record;
-            }
-            return $out;
-        }
-    }
-
-    /**
-     * db:qr()
-     *
-     *  alias of queryReturn()
-     *
-     * @param mixed $query SQL Query to be used
-     * @param string $line optionally pass __LINE__ calling the query for logging
-     * @param string $file optionally pass __FILE__ calling the query for logging
-     * @return mixed FALSE if no rows, if a single row it returns that, if multiple it returns an array of rows, associative responses only
-     */
-    public function qr($query, $line = '', $file = '')
-    {
-        return $this->queryReturn($query, $line, $file);
-    }
-
-    /**
-     * creates a prepaired statement from query
-     *
-     * @param string $query sql query like INSERT INTO table (col) VALUES (?)  or  SELECT * from table WHERE col1 = ? and col2 = ?  or  UPDATE table SET col1 = ?, col2 = ? WHERE col3 = ?
-     * @return int|\MyDb\Mysqli\mysqli_stmt
-     * @param string $line
-     * @param string $file
-     */
-    public function prepare($query, $line = '', $file = '')
-    {
-        if (!$this->connect()) {
-            return 0;
-        }
-        $haltPrev = $this->haltOnError;
-        $this->haltOnError = 'no';
-        $start = microtime(true);
-        $prepare = mysqli_prepare($this->linkId, $query);
-        if (!isset($GLOBALS['disable_db_queries'])) {
-            $this->addLog($query, microtime(true) - $start, $line, $file);
-        }
-        return $prepare;
-    }
-
-    /**
-     * Db::query()
-     *
-     *  Sends an SQL query to the database
-     *
-     * @param mixed $queryString
-     * @param string $line
-     * @param string $file
-     * @return mixed 0 if no query or query id handler, safe to ignore this return
-     */
-    public function query($queryString, $line = '', $file = '')
-    {
-        /* No empty queries, please, since PHP4 chokes on them. */
-        /* The empty query string is passed on from the constructor,
+	/**
+	 * @var string
+	 */
+	public $type = 'mysqli';
+
+	/**
+	 * alias function of select_db, changes the database we are working with.
+	 *
+	 * @param string $database the name of the database to use
+	 * @return void
+	 */
+	public function useDb($database)
+	{
+		$this->selectDb($database);
+	}
+
+	/**
+	 * changes the database we are working with.
+	 *
+	 * @param string $database the name of the database to use
+	 * @return void
+	 */
+	public function selectDb($database)
+	{
+		$this->connect();
+		mysqli_select_db($this->linkId, $database);
+	}
+
+	/* public: connection management */
+
+	/**
+	 * Db::connect()
+	 * @param string $database
+	 * @param string $host
+	 * @param string $user
+	 * @param string $password
+	 * @return int|\mysqli
+	 */
+	public function connect($database = '', $host = '', $user = '', $password = '', $port = '')
+	{
+		/* Handle defaults */
+		if ($database == '') {
+			$database = $this->database;
+		}
+		if ($host == '') {
+			$host = $this->host;
+		}
+		if ($user == '') {
+			$user = $this->user;
+		}
+		if ($password == '') {
+			$password = $this->password;
+		}
+		if ($port == '') {
+			$port = $this->port;
+		}
+		/* establish connection, select database */
+		if (!is_object($this->linkId)) {
+			$this->connectionAttempt++;
+			if ($this->connectionAttempt >= $this->maxConnectErrors - 1) {
+				error_log("MySQLi Connection Attempt #{$this->connectionAttempt}/{$this->maxConnectErrors}");
+			}
+			if ($this->connectionAttempt >= $this->maxConnectErrors) {
+				$this->halt("connect($host, $user, \$password) failed. ".$this->linkId->connect_error);
+				return 0;
+			}
+			//error_log("real_connect($host, $user, $password, $database, $port)");
+			$this->linkId = mysqli_init();
+			$this->linkId->options(MYSQLI_INIT_COMMAND, "SET NAMES {$this->characterSet} COLLATE {$this->collation}, COLLATION_CONNECTION = {$this->collation}, COLLATION_DATABASE = {$this->collation}");
+			if (!$this->linkId->real_connect($host, $user, $password, $database, $port != '' ? $port : NULL)) {
+				$this->halt("connect($host, $user, \$password) failed. ".$this->linkId->connect_error);
+				return 0;
+			}
+			$this->linkId->set_charset($this->characterSet);
+			if ($this->linkId->connect_errno) {
+				$this->halt("connect($host, $user, \$password) failed. ".$this->linkId->connect_error);
+				return 0;
+			}
+		}
+		return $this->linkId;
+	}
+
+	/**
+	 * Db::disconnect()
+	 * @return bool
+	 */
+	public function disconnect()
+	{
+		$return = !is_int($this->linkId) && method_exists($this->linkId, 'close') ? $this->linkId->close() : false;
+		$this->linkId = 0;
+		return $return;
+	}
+
+	/**
+	 * @param $string
+	 * @return string
+	 */
+	public function real_escape($string = '')
+	{
+		if ((!is_resource($this->linkId) || $this->linkId == 0) && !$this->connect()) {
+			return $this->escape($string);
+		}
+		return mysqli_real_escape_string($this->linkId, $string);
+	}
+
+	/**
+	 * discard the query result
+	 * @return void
+	 */
+	public function free()
+	{
+		if (is_resource($this->queryId)) {
+			@mysqli_free_result($this->queryId);
+		}
+		$this->queryId = 0;
+	}
+
+	/**
+	 * Db::queryReturn()
+	 *
+	 * Sends an SQL query to the server like the normal query() command but iterates through
+	 * any rows and returns the row or rows immediately or FALSE on error
+	 *
+	 * @param mixed $query SQL Query to be used
+	 * @param string $line optionally pass __LINE__ calling the query for logging
+	 * @param string $file optionally pass __FILE__ calling the query for logging
+	 * @return mixed FALSE if no rows, if a single row it returns that, if multiple it returns an array of rows, associative responses only
+	 */
+	public function queryReturn($query, $line = '', $file = '')
+	{
+		$this->query($query, $line, $file);
+		if ($this->num_rows() == 0) {
+			return false;
+		} elseif ($this->num_rows() == 1) {
+			$this->next_record(MYSQLI_ASSOC);
+			return $this->Record;
+		} else {
+			$out = [];
+			while ($this->next_record(MYSQLI_ASSOC)) {
+				$out[] = $this->Record;
+			}
+			return $out;
+		}
+	}
+
+	/**
+	 * db:qr()
+	 *
+	 *  alias of queryReturn()
+	 *
+	 * @param mixed $query SQL Query to be used
+	 * @param string $line optionally pass __LINE__ calling the query for logging
+	 * @param string $file optionally pass __FILE__ calling the query for logging
+	 * @return mixed FALSE if no rows, if a single row it returns that, if multiple it returns an array of rows, associative responses only
+	 */
+	public function qr($query, $line = '', $file = '')
+	{
+		return $this->queryReturn($query, $line, $file);
+	}
+
+	/**
+	 * creates a prepaired statement from query
+	 *
+	 * @param string $query sql query like INSERT INTO table (col) VALUES (?)  or  SELECT * from table WHERE col1 = ? and col2 = ?  or  UPDATE table SET col1 = ?, col2 = ? WHERE col3 = ?
+	 * @return int|\MyDb\Mysqli\mysqli_stmt
+	 * @param string $line
+	 * @param string $file
+	 */
+	public function prepare($query, $line = '', $file = '')
+	{
+		if (!$this->connect()) {
+			return 0;
+		}
+		$haltPrev = $this->haltOnError;
+		$this->haltOnError = 'no';
+		$start = microtime(true);
+		$prepare = mysqli_prepare($this->linkId, $query);
+		if (!isset($GLOBALS['disable_db_queries'])) {
+			$this->addLog($query, microtime(true) - $start, $line, $file);
+		}
+		return $prepare;
+	}
+
+	/**
+	 * Db::query()
+	 *
+	 *  Sends an SQL query to the database
+	 *
+	 * @param mixed $queryString
+	 * @param string $line
+	 * @param string $file
+	 * @return mixed 0 if no query or query id handler, safe to ignore this return
+	 */
+	public function query($queryString, $line = '', $file = '')
+	{
+		/* No empty queries, please, since PHP4 chokes on them. */
+		/* The empty query string is passed on from the constructor,
         * when calling the class without a query, e.g. in situations
         * like these: '$db = new db_Subclass;'
         */
-        if ($queryString == '') {
-            return 0;
-        }
-        if (!$this->connect()) {
-            return 0;
-            /* we already complained in connect() about that. */
-        }
-        $haltPrev = $this->haltOnError;
-        $this->haltOnError = 'no';
-        // New query, discard previous result.
-        if (is_resource($this->queryId)) {
-            $this->free();
-        }
-        if ($this->Debug) {
-            printf("Debug: query = %s<br>\n", $queryString);
-        }
-        if (isset($GLOBALS['log_queries']) && $GLOBALS['log_queries'] !== false) {
-            $this->log($queryString, $line, $file);
-        }
-        $tries = 2;
-        $try = 0;
-        $this->queryId = false;
-        while ((null === $this->queryId || $this->queryId === false) && $try <= $tries) {
-            $try++;
-            if ($try > 1) {
-                @mysqli_close($this->linkId);
-                $this->linkId = 0;
-            }
-            $start = microtime(true);
-            $onlyRollback = true;
-            $fails = -1;
-            while ($fails < 30 && (null === $this->queryId || $this->queryId === false)) {
-                $this->connect();
-                $fails++;
-                try {
-                    $this->queryId = @mysqli_query($this->linkId, $queryString, MYSQLI_STORE_RESULT);
-                    if (in_array((int)@mysqli_errno($this->linkId), [1213, 2006, 3101, 1180])) {
-                        //error_log("got ".@mysqli_errno($this->linkId)." sql error fails {$fails} on query {$queryString} from {$line}:{$file}");
-                        usleep(250000); // 0.25 second
-                    } else {
-                        $onlyRollback = false;
-                        if (in_array((int)@mysqli_errno($this->linkId), [1064])) {
-                            $tries = 0;
-                        }
-                        break;
-                    }
-                } catch (\mysqli_sql_exception $e) {
-                    if (in_array((int)$e->getCode(), [1213, 2006, 3101, 1180])) {
-                        //error_log("got ".$e->getCode()." sql error fails {$fails}");
-                        usleep(250000); // 0.25 second
-                    } else {
-                        error_log('Got mysqli_sql_exception code '.$e->getCode().' error '.$e->getMessage().' on query '.$queryString.' from '.$line.':'.$file);
-                        $onlyRollback = false;
-                        if (in_array((int)@mysqli_errno($this->linkId), [1064])) {
-                            $tries = 0;
-                        }
-                        break;
-                    }
-                }
-            }
-            if (!isset($GLOBALS['disable_db_queries'])) {
-                $this->addLog($queryString, microtime(true) - $start, $line, $file);
-            }
-            $this->Row = 0;
-            $this->Errno = @mysqli_errno($this->linkId);
-            $this->Error = @mysqli_error($this->linkId);
-            if ($try == 1 && (null === $this->queryId || $this->queryId === false)) {
-                //$this->emailError($queryString, 'Error #'.$this->Errno.': '.$this->Error, $line, $file);
-            }
-        }
-        $this->haltOnError = $haltPrev;
-        if ($onlyRollback === true && false === $this->queryId) {
-            error_log('Got MySQLi 3101 Rollback Error '.$fails.' Times, Giving Up on '.$queryString.' from '.$line.':'.$file.' on '.__LINE__.':'.__FILE__);
-        }
-        if (null === $this->queryId || $this->queryId === false) {
-            $this->emailError($queryString, 'Error #'.$this->Errno.': '.$this->Error, $line, $file);
-            $this->halt('', $line, $file);
-        }
-
-        // Will return nada if it fails. That's fine.
-        return $this->queryId;
-    }
-
-    /**
-     * @return array|null|object
-     */
-    public function fetchObject()
-    {
-        $this->Record = @mysqli_fetch_object($this->queryId);
-        return $this->Record;
-    }
-
-    /* public: walk result set */
-
-    /**
-     * Db::next_record()
-     *
-     * @param mixed $resultType
-     * @return bool
-     */
-    public function next_record($resultType = MYSQLI_BOTH)
-    {
-        if ($this->queryId === false) {
-            $this->haltmsg('next_record called with no query pending.');
-            return 0;
-        }
-
-        $this->Record = @mysqli_fetch_array($this->queryId, $resultType);
-        ++$this->Row;
-        $this->Errno = mysqli_errno($this->linkId);
-        $this->Error = mysqli_error($this->linkId);
-
-        $stat = is_array($this->Record);
-        if (!$stat && $this->autoFree && is_resource($this->queryId)) {
-            $this->free();
-        }
-        return $stat;
-    }
-
-    /**
-     * switch to position in result set
-     *
-     * @param integer $pos the row numbe starting at 0 to switch to
-     * @return bool whetherit was successfu or not.
-     */
-    public function seek($pos = 0)
-    {
-        $status = @mysqli_data_seek($this->queryId, $pos);
-        if ($status) {
-            $this->Row = $pos;
-        } else {
-            $this->haltmsg("seek({$pos}) failed: result has ".$this->num_rows().' rows', __LINE__, __FILE__);
-            /* half assed attempt to save the day, but do not consider this documented or even desirable behaviour. */
-            $rows = $this->num_rows();
-            @mysqli_data_seek($this->queryId, $rows);
-            $this->Row = $rows;
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * Initiates a transaction
-     *
-     * @return bool
-     */
-    public function transactionBegin()
-    {
-        if (version_compare(PHP_VERSION, '5.5.0') < 0) {
-            return true;
-        }
-        if (!$this->connect()) {
-            return 0;
-        }
-        return mysqli_begin_transaction($this->linkId);
-    }
-
-    /**
-     * Commits a transaction
-     *
-     * @return bool
-     */
-    public function transactionCommit()
-    {
-        if (version_compare(PHP_VERSION, '5.5.0') < 0 || $this->linkId === 0) {
-            return true;
-        }
-        return mysqli_commit($this->linkId);
-    }
-
-    /**
-     * Rolls back a transaction
-     *
-     * @return bool
-     */
-    public function transactionAbort()
-    {
-        if (version_compare(PHP_VERSION, '5.5.0') < 0 || $this->linkId === 0) {
-            return true;
-        }
-        return mysqli_rollback($this->linkId);
-    }
-
-    /**
-     * This will get the last insert ID created on the current connection.  Should only be called after an insert query is
-     * run on a table that has an auto incrementing field.  $table and $field are required, but unused here since it's
-     * unnecessary for mysql.  For compatibility with pgsql, the params must be supplied.
-     *
-     * @param string $table
-     * @param string $field
-     * @return int|string
-     */
-    public function getLastInsertId($table, $field)
-    {
-        if (!isset($table) || $table == '' || !isset($field) || $field == '') {
-            return -1;
-        }
-
-        return @mysqli_insert_id($this->linkId);
-    }
-
-    /* public: table locking */
-
-    /**
-     * Db::lock()
-     * @param mixed  $table
-     * @param string $mode
-     * @return bool|int|\mysqli_result
-     */
-    public function lock($table, $mode = 'write')
-    {
-        $this->connect();
-        $query = 'lock tables ';
-        if (is_array($table)) {
-            foreach ($table as $key => $value) {
-                if ($key == 'read' && $key != 0) {
-                    $query .= "$value read, ";
-                } else {
-                    $query .= "$value $mode, ";
-                }
-            }
-            $query = mb_substr($query, 0, -2);
-        } else {
-            $query .= "$table $mode";
-        }
-        $res = @mysqli_query($this->linkId, $query);
-        if (!$res) {
-            $this->halt("lock($table, $mode) failed.");
-            return 0;
-        }
-        return $res;
-    }
-
-    /**
-     * Db::unlock()
-     * @param bool $haltOnError optional, defaults to TRUE, whether or not to halt on error
-     * @return bool|int|\mysqli_result
-     */
-    public function unlock($haltOnError = true)
-    {
-        $this->connect();
-
-        $res = @mysqli_query($this->linkId, 'unlock tables');
-        if ($haltOnError === true && !$res) {
-            $this->halt('unlock() failed.');
-            return 0;
-        }
-        return $res;
-    }
-
-    /* public: evaluate the result (size, width) */
-
-    /**
-     * Db::affectedRows()
-     * @return int
-     */
-    public function affectedRows()
-    {
-        return @mysqli_affected_rows($this->linkId);
-    }
-
-    /**
-     * Db::num_rows()
-     * @return int
-     */
-    public function num_rows()
-    {
-        return @mysqli_num_rows($this->queryId);
-    }
-
-    /**
-     * Db::num_fields()
-     * @return int
-     */
-    public function num_fields()
-    {
-        return @mysqli_num_fields($this->queryId);
-    }
-
-    /**
-     * gets an array of the table names in teh current datase
-     *
-     * @return array
-     */
-    public function tableNames()
-    {
-        $return = [];
-        $this->query('SHOW TABLES');
-        $i = 0;
-        while ($info = $this->queryId->fetch_row()) {
-            $return[$i]['table_name'] = $info[0];
-            $return[$i]['tablespace_name'] = $this->database;
-            $return[$i]['database'] = $this->database;
-            ++$i;
-        }
-        return $return;
-    }
+		if ($queryString == '') {
+			return 0;
+		}
+		if (!$this->connect()) {
+			return 0;
+			/* we already complained in connect() about that. */
+		}
+		$haltPrev = $this->haltOnError;
+		$this->haltOnError = 'no';
+		// New query, discard previous result.
+		if (is_resource($this->queryId)) {
+			$this->free();
+		}
+		if ($this->Debug) {
+			printf("Debug: query = %s<br>\n", $queryString);
+		}
+		if (isset($GLOBALS['log_queries']) && $GLOBALS['log_queries'] !== false) {
+			$this->log($queryString, $line, $file);
+		}
+		$tries = 2;
+		$try = 0;
+		$this->queryId = false;
+		while ((null === $this->queryId || $this->queryId === false) && $try <= $tries) {
+			$try++;
+			if ($try > 1) {
+				@mysqli_close($this->linkId);
+				$this->linkId = 0;
+			}
+			$start = microtime(true);
+			$onlyRollback = true;
+			$fails = -1;
+			while ($fails < 30 && (null === $this->queryId || $this->queryId === false)) {
+				$this->connect();
+				$fails++;
+				try {
+					$this->queryId = @mysqli_query($this->linkId, $queryString, MYSQLI_STORE_RESULT);
+					if (in_array((int)@mysqli_errno($this->linkId), [1213, 2006, 3101, 1180])) {
+						//error_log("got ".@mysqli_errno($this->linkId)." sql error fails {$fails} on query {$queryString} from {$line}:{$file}");
+						usleep(250000); // 0.25 second
+					} else {
+						$onlyRollback = false;
+						if (in_array((int)@mysqli_errno($this->linkId), [1064])) {
+							$tries = 0;
+						}
+						break;
+					}
+				} catch (\mysqli_sql_exception $e) {
+					if (in_array((int)$e->getCode(), [1213, 2006, 3101, 1180])) {
+						//error_log("got ".$e->getCode()." sql error fails {$fails}");
+						usleep(250000); // 0.25 second
+					} else {
+						error_log('Got mysqli_sql_exception code '.$e->getCode().' error '.$e->getMessage().' on query '.$queryString.' from '.$line.':'.$file);
+						$onlyRollback = false;
+						if (in_array((int)@mysqli_errno($this->linkId), [1064])) {
+							$tries = 0;
+						}
+						break;
+					}
+				}
+			}
+			if (!isset($GLOBALS['disable_db_queries'])) {
+				$this->addLog($queryString, microtime(true) - $start, $line, $file);
+			}
+			$this->Row = 0;
+			$this->Errno = @mysqli_errno($this->linkId);
+			$this->Error = @mysqli_error($this->linkId);
+			if ($try == 1 && (null === $this->queryId || $this->queryId === false)) {
+				//$this->emailError($queryString, 'Error #'.$this->Errno.': '.$this->Error, $line, $file);
+			}
+		}
+		$this->haltOnError = $haltPrev;
+		if ($onlyRollback === true && false === $this->queryId) {
+			error_log('Got MySQLi 3101 Rollback Error '.$fails.' Times, Giving Up on '.$queryString.' from '.$line.':'.$file.' on '.__LINE__.':'.__FILE__);
+		}
+		if (null === $this->queryId || $this->queryId === false) {
+			$this->emailError($queryString, 'Error #'.$this->Errno.': '.$this->Error, $line, $file);
+			$this->halt('', $line, $file);
+		}
+
+		// Will return nada if it fails. That's fine.
+		return $this->queryId;
+	}
+
+	/**
+	 * @return array|null|object
+	 */
+	public function fetchObject()
+	{
+		$this->Record = @mysqli_fetch_object($this->queryId);
+		return $this->Record;
+	}
+
+	/* public: walk result set */
+
+	/**
+	 * Db::next_record()
+	 *
+	 * @param mixed $resultType
+	 * @return bool
+	 */
+	public function next_record($resultType = MYSQLI_BOTH)
+	{
+		if ($this->queryId === false) {
+			$this->haltmsg('next_record called with no query pending.');
+			return 0;
+		}
+
+		$this->Record = @mysqli_fetch_array($this->queryId, $resultType);
+		++$this->Row;
+		$this->Errno = mysqli_errno($this->linkId);
+		$this->Error = mysqli_error($this->linkId);
+
+		$stat = is_array($this->Record);
+		if (!$stat && $this->autoFree && is_resource($this->queryId)) {
+			$this->free();
+		}
+		return $stat;
+	}
+
+	/**
+	 * switch to position in result set
+	 *
+	 * @param integer $pos the row numbe starting at 0 to switch to
+	 * @return bool whetherit was successfu or not.
+	 */
+	public function seek($pos = 0)
+	{
+		$status = @mysqli_data_seek($this->queryId, $pos);
+		if ($status) {
+			$this->Row = $pos;
+		} else {
+			$this->haltmsg("seek({$pos}) failed: result has ".$this->num_rows().' rows', __LINE__, __FILE__);
+			/* half assed attempt to save the day, but do not consider this documented or even desirable behaviour. */
+			$rows = $this->num_rows();
+			@mysqli_data_seek($this->queryId, $rows);
+			$this->Row = $rows;
+			return false;
+		}
+		return true;
+	}
+
+	/**
+	 * Initiates a transaction
+	 *
+	 * @return bool
+	 */
+	public function transactionBegin()
+	{
+		if (version_compare(PHP_VERSION, '5.5.0') < 0) {
+			return true;
+		}
+		if (!$this->connect()) {
+			return 0;
+		}
+		return mysqli_begin_transaction($this->linkId);
+	}
+
+	/**
+	 * Commits a transaction
+	 *
+	 * @return bool
+	 */
+	public function transactionCommit()
+	{
+		if (version_compare(PHP_VERSION, '5.5.0') < 0 || $this->linkId === 0) {
+			return true;
+		}
+		return mysqli_commit($this->linkId);
+	}
+
+	/**
+	 * Rolls back a transaction
+	 *
+	 * @return bool
+	 */
+	public function transactionAbort()
+	{
+		if (version_compare(PHP_VERSION, '5.5.0') < 0 || $this->linkId === 0) {
+			return true;
+		}
+		return mysqli_rollback($this->linkId);
+	}
+
+	/**
+	 * This will get the last insert ID created on the current connection.  Should only be called after an insert query is
+	 * run on a table that has an auto incrementing field.  $table and $field are required, but unused here since it's
+	 * unnecessary for mysql.  For compatibility with pgsql, the params must be supplied.
+	 *
+	 * @param string $table
+	 * @param string $field
+	 * @return int|string
+	 */
+	public function getLastInsertId($table, $field)
+	{
+		if (!isset($table) || $table == '' || !isset($field) || $field == '') {
+			return -1;
+		}
+
+		return @mysqli_insert_id($this->linkId);
+	}
+
+	/* public: table locking */
+
+	/**
+	 * Db::lock()
+	 * @param mixed  $table
+	 * @param string $mode
+	 * @return bool|int|\mysqli_result
+	 */
+	public function lock($table, $mode = 'write')
+	{
+		$this->connect();
+		$query = 'lock tables ';
+		if (is_array($table)) {
+			foreach ($table as $key => $value) {
+				if ($key == 'read' && $key != 0) {
+					$query .= "$value read, ";
+				} else {
+					$query .= "$value $mode, ";
+				}
+			}
+			$query = mb_substr($query, 0, -2);
+		} else {
+			$query .= "$table $mode";
+		}
+		$res = @mysqli_query($this->linkId, $query);
+		if (!$res) {
+			$this->halt("lock($table, $mode) failed.");
+			return 0;
+		}
+		return $res;
+	}
+
+	/**
+	 * Db::unlock()
+	 * @param bool $haltOnError optional, defaults to TRUE, whether or not to halt on error
+	 * @return bool|int|\mysqli_result
+	 */
+	public function unlock($haltOnError = true)
+	{
+		$this->connect();
+
+		$res = @mysqli_query($this->linkId, 'unlock tables');
+		if ($haltOnError === true && !$res) {
+			$this->halt('unlock() failed.');
+			return 0;
+		}
+		return $res;
+	}
+
+	/* public: evaluate the result (size, width) */
+
+	/**
+	 * Db::affectedRows()
+	 * @return int
+	 */
+	public function affectedRows()
+	{
+		return @mysqli_affected_rows($this->linkId);
+	}
+
+	/**
+	 * Db::num_rows()
+	 * @return int
+	 */
+	public function num_rows()
+	{
+		return @mysqli_num_rows($this->queryId);
+	}
+
+	/**
+	 * Db::num_fields()
+	 * @return int
+	 */
+	public function num_fields()
+	{
+		return @mysqli_num_fields($this->queryId);
+	}
+
+	/**
+	 * gets an array of the table names in teh current datase
+	 *
+	 * @return array
+	 */
+	public function tableNames()
+	{
+		$return = [];
+		$this->query('SHOW TABLES');
+		$i = 0;
+		while ($info = $this->queryId->fetch_row()) {
+			$return[$i]['table_name'] = $info[0];
+			$return[$i]['tablespace_name'] = $this->database;
+			$return[$i]['database'] = $this->database;
+			++$i;
+		}
+		return $return;
+	}
 }
 
 /**

Spacing +4 added lines, -4 removed lines

@@ -255,24 +255,24 @@
                 $fails++;
                 try {
                     $this->queryId = @mysqli_query($this->linkId, $queryString, MYSQLI_STORE_RESULT);
-                    if (in_array((int)@mysqli_errno($this->linkId), [1213, 2006, 3101, 1180])) {
+                    if (in_array((int) @mysqli_errno($this->linkId), [1213, 2006, 3101, 1180])) {
                         //error_log("got ".@mysqli_errno($this->linkId)." sql error fails {$fails} on query {$queryString} from {$line}:{$file}");
                         usleep(250000); // 0.25 second
                     } else {
                         $onlyRollback = false;
-                        if (in_array((int)@mysqli_errno($this->linkId), [1064])) {
+                        if (in_array((int) @mysqli_errno($this->linkId), [1064])) {
                             $tries = 0;
                         }
                         break;
                     }
                 } catch (\mysqli_sql_exception $e) {
-                    if (in_array((int)$e->getCode(), [1213, 2006, 3101, 1180])) {
+                    if (in_array((int) $e->getCode(), [1213, 2006, 3101, 1180])) {
                         //error_log("got ".$e->getCode()." sql error fails {$fails}");
                         usleep(250000); // 0.25 second
                     } else {
                         error_log('Got mysqli_sql_exception code '.$e->getCode().' error '.$e->getMessage().' on query '.$queryString.' from '.$line.':'.$file);
                         $onlyRollback = false;
-                        if (in_array((int)@mysqli_errno($this->linkId), [1064])) {
+                        if (in_array((int) @mysqli_errno($this->linkId), [1064])) {
                             $tries = 0;
                         }
                         break;

src/Db_Interface.php

Indentation +45 added lines, -45 removed lines

@@ -16,57 +16,57 @@
  */
 interface Db_Interface
 {
-    /**
-     * Db_Interface constructor.
-     *
-     * @param string $database
-     * @param string $user
-     * @param string $password
-     * @param string $host
-     * @param string $query
-     * @param string $port
-     */
-    public function __construct($database = '', $user = '', $password = '', $host = 'localhost', $query = '', $port = '');
+	/**
+	 * Db_Interface constructor.
+	 *
+	 * @param string $database
+	 * @param string $user
+	 * @param string $password
+	 * @param string $host
+	 * @param string $query
+	 * @param string $port
+	 */
+	public function __construct($database = '', $user = '', $password = '', $host = 'localhost', $query = '', $port = '');
 
-    /**
-     * @param $message
-     * @param string $line
-     * @param string $file
-     * @return mixed
-     */
-    public function log($message, $line = '', $file = '');
+	/**
+	 * @param $message
+	 * @param string $line
+	 * @param string $file
+	 * @return mixed
+	 */
+	public function log($message, $line = '', $file = '');
 
-    public function linkId();
+	public function linkId();
 
-    public function queryId();
+	public function queryId();
 
-    /**
-     * @param $str
-     * @return mixed
-     */
-    public function dbAddslashes($str);
+	/**
+	 * @param $str
+	 * @return mixed
+	 */
+	public function dbAddslashes($str);
 
-    /**
-     * @param $query
-     * @param string $line
-     * @param string $file
-     * @return mixed
-     */
-    public function qr($query, $line = '', $file = '');
+	/**
+	 * @param $query
+	 * @param string $line
+	 * @param string $file
+	 * @return mixed
+	 */
+	public function qr($query, $line = '', $file = '');
 
-    /**
-     * @param $msg
-     * @param string $line
-     * @param string $file
-     * @return mixed
-     */
-    public function halt($msg, $line = '', $file = '');
+	/**
+	 * @param $msg
+	 * @param string $line
+	 * @param string $file
+	 * @return mixed
+	 */
+	public function halt($msg, $line = '', $file = '');
 
-    /**
-     * @param $msg
-     * @return mixed
-     */
-    public function haltmsg($msg);
+	/**
+	 * @param $msg
+	 * @return mixed
+	 */
+	public function haltmsg($msg);
 
-    public function indexNames();
+	public function indexNames();
 }

Braces +1 added lines, -2 removed lines

@@ -14,8 +14,7 @@
  *
  * @package MyDb
  */
-interface Db_Interface
-{
+interface Db_Interface {
     /**
      * Db_Interface constructor.
      *

src/Adodb/Db.php

Indentation +322 added lines, -322 removed lines

@@ -19,258 +19,258 @@ 
  */
 class Db extends Generic implements Db_Interface
 {
-    public $driver = 'mysql';
-    public $Rows = [];
-    public $type = 'adodb';
-
-    /**
-     * Db::connect()
-     * @param string $database
-     * @param string $host
-     * @param string $user
-     * @param string $password
-     * @param string $driver
-     * @return bool|\the
-     */
-    public function connect($database = '', $host = '', $user = '', $password = '', $driver = 'mysql')
-    {
-        /* Handle defaults */
-        if ('' == $database) {
-            $database = $this->database;
-        }
-        if ('' == $host) {
-            $host = $this->host;
-        }
-        if ('' == $user) {
-            $user = $this->user;
-        }
-        if ('' == $password) {
-            $password = $this->password;
-        }
-        if ('' == $driver) {
-            $driver = $this->driver;
-        }
-        /* establish connection, select database */
-        if ($this->linkId === false) {
-            $this->linkId = NewADOConnection($driver);
-            $this->linkId->Connect($host, $user, $password, $database);
-        }
-        return $this->linkId;
-    }
-
-    /* This only affects systems not using persistent connections */
-
-    /**
-     * Db::disconnect()
-     * @return void
-     */
-    public function disconnect()
-    {
-    }
-
-    /**
-     * @param $string
-     * @return string
-     */
-    public function real_escape($string = '')
-    {
-        return escapeshellarg($string);
-    }
-
-    /**
-     * discard the query result
-     * @return void
-     */
-    public function free()
-    {
-        //			@mysql_free_result($this->queryId);
-        //			$this->queryId = 0;
-    }
-
-    /**
-     * Db::queryReturn()
-     *
-     * Sends an SQL query to the server like the normal query() command but iterates through
-     * any rows and returns the row or rows immediately or FALSE on error
-     *
-     * @param mixed $query SQL Query to be used
-     * @param string $line optionally pass __LINE__ calling the query for logging
-     * @param string $file optionally pass __FILE__ calling the query for logging
-     * @return mixed FALSE if no rows, if a single row it returns that, if multiple it returns an array of rows, associative responses only
-     */
-    public function queryReturn($query, $line = '', $file = '')
-    {
-        $this->query($query, $line, $file);
-        if ($this->num_rows() == 0) {
-            return false;
-        } elseif ($this->num_rows() == 1) {
-            $this->next_record(MYSQL_ASSOC);
-            return $this->Record;
-        } else {
-            $out = [];
-            while ($this->next_record(MYSQL_ASSOC)) {
-                $out[] = $this->Record;
-            }
-            return $out;
-        }
-    }
-
-    /**
-     * db:qr()
-     *
-     *  alias of queryReturn()
-     *
-     * @param mixed $query SQL Query to be used
-     * @param string $line optionally pass __LINE__ calling the query for logging
-     * @param string $file optionally pass __FILE__ calling the query for logging
-     * @return mixed FALSE if no rows, if a single row it returns that, if multiple it returns an array of rows, associative responses only
-     */
-    public function qr($query, $line = '', $file = '')
-    {
-        return $this->queryReturn($query, $line, $file);
-    }
-
-    /**
-     * Db::query()
-     *
-     *  Sends an SQL query to the database
-     *
-     * @param mixed $queryString
-     * @param string $line
-     * @param string $file
-     * @return mixed 0 if no query or query id handler, safe to ignore this return
-     */
-    public function query($queryString, $line = '', $file = '')
-    {
-        /* No empty queries, please, since PHP4 chokes on them. */
-        /* The empty query string is passed on from the constructor,
+	public $driver = 'mysql';
+	public $Rows = [];
+	public $type = 'adodb';
+
+	/**
+	 * Db::connect()
+	 * @param string $database
+	 * @param string $host
+	 * @param string $user
+	 * @param string $password
+	 * @param string $driver
+	 * @return bool|\the
+	 */
+	public function connect($database = '', $host = '', $user = '', $password = '', $driver = 'mysql')
+	{
+		/* Handle defaults */
+		if ('' == $database) {
+			$database = $this->database;
+		}
+		if ('' == $host) {
+			$host = $this->host;
+		}
+		if ('' == $user) {
+			$user = $this->user;
+		}
+		if ('' == $password) {
+			$password = $this->password;
+		}
+		if ('' == $driver) {
+			$driver = $this->driver;
+		}
+		/* establish connection, select database */
+		if ($this->linkId === false) {
+			$this->linkId = NewADOConnection($driver);
+			$this->linkId->Connect($host, $user, $password, $database);
+		}
+		return $this->linkId;
+	}
+
+	/* This only affects systems not using persistent connections */
+
+	/**
+	 * Db::disconnect()
+	 * @return void
+	 */
+	public function disconnect()
+	{
+	}
+
+	/**
+	 * @param $string
+	 * @return string
+	 */
+	public function real_escape($string = '')
+	{
+		return escapeshellarg($string);
+	}
+
+	/**
+	 * discard the query result
+	 * @return void
+	 */
+	public function free()
+	{
+		//			@mysql_free_result($this->queryId);
+		//			$this->queryId = 0;
+	}
+
+	/**
+	 * Db::queryReturn()
+	 *
+	 * Sends an SQL query to the server like the normal query() command but iterates through
+	 * any rows and returns the row or rows immediately or FALSE on error
+	 *
+	 * @param mixed $query SQL Query to be used
+	 * @param string $line optionally pass __LINE__ calling the query for logging
+	 * @param string $file optionally pass __FILE__ calling the query for logging
+	 * @return mixed FALSE if no rows, if a single row it returns that, if multiple it returns an array of rows, associative responses only
+	 */
+	public function queryReturn($query, $line = '', $file = '')
+	{
+		$this->query($query, $line, $file);
+		if ($this->num_rows() == 0) {
+			return false;
+		} elseif ($this->num_rows() == 1) {
+			$this->next_record(MYSQL_ASSOC);
+			return $this->Record;
+		} else {
+			$out = [];
+			while ($this->next_record(MYSQL_ASSOC)) {
+				$out[] = $this->Record;
+			}
+			return $out;
+		}
+	}
+
+	/**
+	 * db:qr()
+	 *
+	 *  alias of queryReturn()
+	 *
+	 * @param mixed $query SQL Query to be used
+	 * @param string $line optionally pass __LINE__ calling the query for logging
+	 * @param string $file optionally pass __FILE__ calling the query for logging
+	 * @return mixed FALSE if no rows, if a single row it returns that, if multiple it returns an array of rows, associative responses only
+	 */
+	public function qr($query, $line = '', $file = '')
+	{
+		return $this->queryReturn($query, $line, $file);
+	}
+
+	/**
+	 * Db::query()
+	 *
+	 *  Sends an SQL query to the database
+	 *
+	 * @param mixed $queryString
+	 * @param string $line
+	 * @param string $file
+	 * @return mixed 0 if no query or query id handler, safe to ignore this return
+	 */
+	public function query($queryString, $line = '', $file = '')
+	{
+		/* No empty queries, please, since PHP4 chokes on them. */
+		/* The empty query string is passed on from the constructor,
         * when calling the class without a query, e.g. in situations
         * like these: '$db = new db_Subclass;'
         */
-        if ($queryString == '') {
-            return 0;
-        }
-        if (!$this->connect()) {
-            return 0;
-            /* we already complained in connect() about that. */
-        }
-
-        // New query, discard previous result.
-        if ($this->queryId !== false) {
-            $this->free();
-        }
-
-        if ($this->Debug) {
-            printf("Debug: query = %s<br>\n", $queryString);
-        }
-        if (isset($GLOBALS['log_queries']) && $GLOBALS['log_queries'] !== false) {
-            $this->log($queryString, $line, $file);
-        }
-
-        try {
-            $this->queryId = $this->linkId->Execute($queryString);
-        } catch (exception $e) {
-            $this->emailError($queryString, $e, $line, $file);
-        }
-        $this->log("ADOdb Query $queryString (S:$success) - ".count($this->Rows).' Rows', __LINE__, __FILE__);
-        $this->Row = 0;
-
-        // Will return nada if it fails. That's fine.
-        return $this->queryId;
-    }
-
-    /**
-     * Db::next_record()
-     * @param mixed $resultType
-     * @return bool
-     */
-    public function next_record($resultType = MYSQL_ASSOC)
-    {
-        if (!$this->queryId) {
-            $this->halt('next_record called with no query pending.');
-            return 0;
-        }
-        ++$this->Row;
-        $this->Record = $this->queryId->FetchRow();
-        $stat = is_array($this->Record);
-        if (!$stat && $this->autoFree) {
-            $this->free();
-        }
-        return $stat;
-    }
-
-    /* public: position in result set */
-
-    /**
-     * Db::seek()
-     * @param integer $pos
-     * @return int
-     */
-    public function seek($pos = 0)
-    {
-        if (isset($this->Rows[$pos])) {
-            $this->Row = $pos;
-        } else {
-            $this->halt("seek($pos) failed: result has ".count($this->Rows).' rows');
-            /* half assed attempt to save the day,
+		if ($queryString == '') {
+			return 0;
+		}
+		if (!$this->connect()) {
+			return 0;
+			/* we already complained in connect() about that. */
+		}
+
+		// New query, discard previous result.
+		if ($this->queryId !== false) {
+			$this->free();
+		}
+
+		if ($this->Debug) {
+			printf("Debug: query = %s<br>\n", $queryString);
+		}
+		if (isset($GLOBALS['log_queries']) && $GLOBALS['log_queries'] !== false) {
+			$this->log($queryString, $line, $file);
+		}
+
+		try {
+			$this->queryId = $this->linkId->Execute($queryString);
+		} catch (exception $e) {
+			$this->emailError($queryString, $e, $line, $file);
+		}
+		$this->log("ADOdb Query $queryString (S:$success) - ".count($this->Rows).' Rows', __LINE__, __FILE__);
+		$this->Row = 0;
+
+		// Will return nada if it fails. That's fine.
+		return $this->queryId;
+	}
+
+	/**
+	 * Db::next_record()
+	 * @param mixed $resultType
+	 * @return bool
+	 */
+	public function next_record($resultType = MYSQL_ASSOC)
+	{
+		if (!$this->queryId) {
+			$this->halt('next_record called with no query pending.');
+			return 0;
+		}
+		++$this->Row;
+		$this->Record = $this->queryId->FetchRow();
+		$stat = is_array($this->Record);
+		if (!$stat && $this->autoFree) {
+			$this->free();
+		}
+		return $stat;
+	}
+
+	/* public: position in result set */
+
+	/**
+	 * Db::seek()
+	 * @param integer $pos
+	 * @return int
+	 */
+	public function seek($pos = 0)
+	{
+		if (isset($this->Rows[$pos])) {
+			$this->Row = $pos;
+		} else {
+			$this->halt("seek($pos) failed: result has ".count($this->Rows).' rows');
+			/* half assed attempt to save the day,
             * but do not consider this documented or even
             * desirable behaviour.
             */
-            return 0;
-        }
-        return 1;
-    }
-
-    /**
-     * Db::transactionBegin()
-     * @return bool
-     */
-    public function transactionBegin()
-    {
-        return true;
-    }
-
-    /**
-     * Db::transactionCommit()
-     * @return bool
-     */
-    public function transactionCommit()
-    {
-        return true;
-    }
-
-    /**
-     * Db::transactionAbort()
-     * @return bool
-     */
-    public function transactionAbort()
-    {
-        return true;
-    }
-
-    /**
-     * Db::getLastInsertId()
-     *
-     * @param mixed $table
-     * @param mixed $field
-     * @return mixed
-     */
-    public function getLastInsertId($table, $field)
-    {
-        return $this->linkId->Insert_ID($table, $field);
-    }
-
-    /* public: table locking */
-
-    /**
-     * Db::lock()
-     * @param mixed  $table
-     * @param string $mode
-     * @return void
-     */
-    public function lock($table, $mode = 'write')
-    {
-        /*			$this->connect();
+			return 0;
+		}
+		return 1;
+	}
+
+	/**
+	 * Db::transactionBegin()
+	 * @return bool
+	 */
+	public function transactionBegin()
+	{
+		return true;
+	}
+
+	/**
+	 * Db::transactionCommit()
+	 * @return bool
+	 */
+	public function transactionCommit()
+	{
+		return true;
+	}
+
+	/**
+	 * Db::transactionAbort()
+	 * @return bool
+	 */
+	public function transactionAbort()
+	{
+		return true;
+	}
+
+	/**
+	 * Db::getLastInsertId()
+	 *
+	 * @param mixed $table
+	 * @param mixed $field
+	 * @return mixed
+	 */
+	public function getLastInsertId($table, $field)
+	{
+		return $this->linkId->Insert_ID($table, $field);
+	}
+
+	/* public: table locking */
+
+	/**
+	 * Db::lock()
+	 * @param mixed  $table
+	 * @param string $mode
+	 * @return void
+	 */
+	public function lock($table, $mode = 'write')
+	{
+		/*			$this->connect();
 
         * $query = "lock tables ";
         * if (is_array($table))
@@ -300,15 +300,15 @@ 
         * }
         * return $res;
         */
-    }
+	}
 
-    /**
-     * Db::unlock()
-     * @return void
-     */
-    public function unlock()
-    {
-        /*			$this->connect();
+	/**
+	 * Db::unlock()
+	 * @return void
+	 */
+	public function unlock()
+	{
+		/*			$this->connect();
 
         * $res = @mysql_query("unlock tables");
         * if (!$res)
@@ -318,72 +318,72 @@ 
         * }
         * return $res;
         */
-    }
-
-    /* public: evaluate the result (size, width) */
-
-    /**
-     * Db::affectedRows()
-     *
-     * @return mixed
-     */
-    public function affectedRows()
-    {
-        return @$this->linkId->Affected_Rows();
-        //			return @$this->queryId->rowCount();
-    }
-
-    /**
-     * Db::num_rows()
-     *
-     * @return mixed
-     */
-    public function num_rows()
-    {
-        return $this->queryId->NumRows();
-    }
-
-    /**
-     * Db::num_fields()
-     *
-     * @return mixed
-     */
-    public function num_fields()
-    {
-        return $this->queryId->NumCols();
-    }
-
-    /**
-     * @param mixed $msg
-     * @param string $line
-     * @param string $file
-     * @return mixed|void
-     */
-    public function haltmsg($msg, $line = '', $file = '')
-    {
-        $this->log("Database error: $msg", $line, $file, 'error');
-        if ($this->linkId->ErrorNo() != '0' && $this->linkId->ErrorMsg() != '') {
-            $this->log('ADOdb SQL Error: '.$this->linkId->ErrorMsg(), $line, $file, 'error');
-        }
-        $this->logBackTrace($msg, $line, $file);
-    }
-
-    /**
-     * Db::tableNames()
-     *
-     * @return array
-     */
-    public function tableNames()
-    {
-        $return = [];
-        $this->query('SHOW TABLES');
-        $i = 0;
-        while ($info = $this->queryId->FetchRow()) {
-            $return[$i]['table_name'] = $info[0];
-            $return[$i]['tablespace_name'] = $this->database;
-            $return[$i]['database'] = $this->database;
-            ++$i;
-        }
-        return $return;
-    }
+	}
+
+	/* public: evaluate the result (size, width) */
+
+	/**
+	 * Db::affectedRows()
+	 *
+	 * @return mixed
+	 */
+	public function affectedRows()
+	{
+		return @$this->linkId->Affected_Rows();
+		//			return @$this->queryId->rowCount();
+	}
+
+	/**
+	 * Db::num_rows()
+	 *
+	 * @return mixed
+	 */
+	public function num_rows()
+	{
+		return $this->queryId->NumRows();
+	}
+
+	/**
+	 * Db::num_fields()
+	 *
+	 * @return mixed
+	 */
+	public function num_fields()
+	{
+		return $this->queryId->NumCols();
+	}
+
+	/**
+	 * @param mixed $msg
+	 * @param string $line
+	 * @param string $file
+	 * @return mixed|void
+	 */
+	public function haltmsg($msg, $line = '', $file = '')
+	{
+		$this->log("Database error: $msg", $line, $file, 'error');
+		if ($this->linkId->ErrorNo() != '0' && $this->linkId->ErrorMsg() != '') {
+			$this->log('ADOdb SQL Error: '.$this->linkId->ErrorMsg(), $line, $file, 'error');
+		}
+		$this->logBackTrace($msg, $line, $file);
+	}
+
+	/**
+	 * Db::tableNames()
+	 *
+	 * @return array
+	 */
+	public function tableNames()
+	{
+		$return = [];
+		$this->query('SHOW TABLES');
+		$i = 0;
+		while ($info = $this->queryId->FetchRow()) {
+			$return[$i]['table_name'] = $info[0];
+			$return[$i]['tablespace_name'] = $this->database;
+			$return[$i]['database'] = $this->database;
+			++$i;
+		}
+		return $return;
+	}
 }

Braces +21 added lines, -42 removed lines

@@ -17,8 +17,7 @@ 
  *
  * @access public
  */
-class Db extends Generic implements Db_Interface
-{
+class Db extends Generic implements Db_Interface {
     public $driver = 'mysql';
     public $Rows = [];
     public $type = 'adodb';
@@ -32,8 +31,7 @@ 
      * @param string $driver
      * @return bool|\the
      */
-    public function connect($database = '', $host = '', $user = '', $password = '', $driver = 'mysql')
-    {
+    public function connect($database = '', $host = '', $user = '', $password = '', $driver = 'mysql') {
         /* Handle defaults */
         if ('' == $database) {
             $database = $this->database;
@@ -64,16 +62,14 @@ 
      * Db::disconnect()
      * @return void
      */
-    public function disconnect()
-    {
+    public function disconnect() {
     }
 
     /**
      * @param $string
      * @return string
      */
-    public function real_escape($string = '')
-    {
+    public function real_escape($string = '') {
         return escapeshellarg($string);
     }
 
@@ -81,8 +77,7 @@ 
      * discard the query result
      * @return void
      */
-    public function free()
-    {
+    public function free() {
         //			@mysql_free_result($this->queryId);
         //			$this->queryId = 0;
     }
@@ -98,8 +93,7 @@ 
      * @param string $file optionally pass __FILE__ calling the query for logging
      * @return mixed FALSE if no rows, if a single row it returns that, if multiple it returns an array of rows, associative responses only
      */
-    public function queryReturn($query, $line = '', $file = '')
-    {
+    public function queryReturn($query, $line = '', $file = '') {
         $this->query($query, $line, $file);
         if ($this->num_rows() == 0) {
             return false;
@@ -125,8 +119,7 @@ 
      * @param string $file optionally pass __FILE__ calling the query for logging
      * @return mixed FALSE if no rows, if a single row it returns that, if multiple it returns an array of rows, associative responses only
      */
-    public function qr($query, $line = '', $file = '')
-    {
+    public function qr($query, $line = '', $file = '') {
         return $this->queryReturn($query, $line, $file);
     }
 
@@ -140,8 +133,7 @@ 
      * @param string $file
      * @return mixed 0 if no query or query id handler, safe to ignore this return
      */
-    public function query($queryString, $line = '', $file = '')
-    {
+    public function query($queryString, $line = '', $file = '') {
         /* No empty queries, please, since PHP4 chokes on them. */
         /* The empty query string is passed on from the constructor,
         * when calling the class without a query, e.g. in situations
@@ -184,8 +176,7 @@ 
      * @param mixed $resultType
      * @return bool
      */
-    public function next_record($resultType = MYSQL_ASSOC)
-    {
+    public function next_record($resultType = MYSQL_ASSOC) {
         if (!$this->queryId) {
             $this->halt('next_record called with no query pending.');
             return 0;
@@ -206,8 +197,7 @@ 
      * @param integer $pos
      * @return int
      */
-    public function seek($pos = 0)
-    {
+    public function seek($pos = 0) {
         if (isset($this->Rows[$pos])) {
             $this->Row = $pos;
         } else {
@@ -225,8 +215,7 @@ 
      * Db::transactionBegin()
      * @return bool
      */
-    public function transactionBegin()
-    {
+    public function transactionBegin() {
         return true;
     }
 
@@ -234,8 +223,7 @@ 
      * Db::transactionCommit()
      * @return bool
      */
-    public function transactionCommit()
-    {
+    public function transactionCommit() {
         return true;
     }
 
@@ -243,8 +231,7 @@ 
      * Db::transactionAbort()
      * @return bool
      */
-    public function transactionAbort()
-    {
+    public function transactionAbort() {
         return true;
     }
 
@@ -255,8 +242,7 @@ 
      * @param mixed $field
      * @return mixed
      */
-    public function getLastInsertId($table, $field)
-    {
+    public function getLastInsertId($table, $field) {
         return $this->linkId->Insert_ID($table, $field);
     }
 
@@ -268,8 +254,7 @@ 
      * @param string $mode
      * @return void
      */
-    public function lock($table, $mode = 'write')
-    {
+    public function lock($table, $mode = 'write') {
         /*			$this->connect();
 
         * $query = "lock tables ";
@@ -306,8 +291,7 @@ 
      * Db::unlock()
      * @return void
      */
-    public function unlock()
-    {
+    public function unlock() {
         /*			$this->connect();
 
         * $res = @mysql_query("unlock tables");
@@ -327,8 +311,7 @@ 
      *
      * @return mixed
      */
-    public function affectedRows()
-    {
+    public function affectedRows() {
         return @$this->linkId->Affected_Rows();
         //			return @$this->queryId->rowCount();
     }
@@ -338,8 +321,7 @@ 
      *
      * @return mixed
      */
-    public function num_rows()
-    {
+    public function num_rows() {
         return $this->queryId->NumRows();
     }
 
@@ -348,8 +330,7 @@ 
      *
      * @return mixed
      */
-    public function num_fields()
-    {
+    public function num_fields() {
         return $this->queryId->NumCols();
     }
 
@@ -359,8 +340,7 @@ 
      * @param string $file
      * @return mixed|void
      */
-    public function haltmsg($msg, $line = '', $file = '')
-    {
+    public function haltmsg($msg, $line = '', $file = '') {
         $this->log("Database error: $msg", $line, $file, 'error');
         if ($this->linkId->ErrorNo() != '0' && $this->linkId->ErrorMsg() != '') {
             $this->log('ADOdb SQL Error: '.$this->linkId->ErrorMsg(), $line, $file, 'error');
@@ -373,8 +353,7 @@ 
      *
      * @return array
      */
-    public function tableNames()
-    {
+    public function tableNames() {
         $return = [];
         $this->query('SHOW TABLES');
         $i = 0;

src/Pdo/Db.php

Indentation +316 added lines, -316 removed lines

@@ -20,256 +20,256 @@ 
  */
 class Db extends Generic implements Db_Interface
 {
-    /* public: connection parameters */
-    public $driver = 'mysql';
-    public $Rows = [];
-    /* public: this is an api revision, not a CVS revision. */
-    public $type = 'pdo';
-
-    /**
-     * changes the database we are working with.
-     *
-     * @param string $database the name of the database to use
-     * @return void
-     */
-    public function selectDb($database)
-    {
-        $dSN = "{$this->driver}:dbname={$database};host={$this->host}";
-        if ($this->characterSet != '') {
-            $dSN .= ';charset='.$this->characterSet;
-        }
-        $this->linkId = new PDO($dSN, $this->user, $this->password);
-        $this->database = $database;
-    }
-
-
-    /**
-     * alias function of select_db, changes the database we are working with.
-     *
-     * @param string $database the name of the database to use
-     * @return void
-     */
-    public function useDb($database)
-    {
-        $this->selectDb($database);
-    }
-
-    /* public: connection management */
-
-    /**
-     * Db::connect()
-     * @param string $database
-     * @param string $host
-     * @param string $user
-     * @param string $password
-     * @param string $driver
-     * @return bool|int|PDO
-     */
-    public function connect($database = '', $host = '', $user = '', $password = '', $driver = 'mysql')
-    {
-        /* Handle defaults */
-        if ('' == $database) {
-            $database = $this->database;
-        }
-        if ('' == $host) {
-            $host = $this->host;
-        }
-        if ('' == $user) {
-            $user = $this->user;
-        }
-        if ('' == $password) {
-            $password = $this->password;
-        }
-        if ('' == $driver) {
-            $driver = $this->driver;
-        }
-        /* establish connection, select database */
-        $dSN = "{$driver}:dbname={$database};host={$host}";
-        if ($this->characterSet != '') {
-            $dSN .= ';charset='.$this->characterSet;
-        }
-        if ($this->linkId === false) {
-            try {
-                $this->linkId = new PDO($dSN, $user, $password);
-            } catch (\PDOException $e) {
-                $this->halt('Connection Failed '.$e->getMessage());
-                return 0;
-            }
-        }
-        return $this->linkId;
-    }
-
-    /* This only affects systems not using persistent connections */
-
-    /**
-     * Db::disconnect()
-     * @return void
-     */
-    public function disconnect()
-    {
-    }
-
-    /* public: discard the query result */
-
-    /**
-     * Db::free()
-     * @return void
-     */
-    public function free()
-    {
-        //			@mysql_free_result($this->queryId);
-        //			$this->queryId = 0;
-    }
-
-    /**
-     * Db::query()
-     *
-     *  Sends an SQL query to the database
-     *
-     * @param mixed $queryString
-     * @param string $line
-     * @param string $file
-     * @return mixed 0 if no query or query id handler, safe to ignore this return
-     */
-    public function query($queryString, $line = '', $file = '')
-    {
-        /* No empty queries, please, since PHP4 chokes on them. */
-        /* The empty query string is passed on from the constructor,
+	/* public: connection parameters */
+	public $driver = 'mysql';
+	public $Rows = [];
+	/* public: this is an api revision, not a CVS revision. */
+	public $type = 'pdo';
+
+	/**
+	 * changes the database we are working with.
+	 *
+	 * @param string $database the name of the database to use
+	 * @return void
+	 */
+	public function selectDb($database)
+	{
+		$dSN = "{$this->driver}:dbname={$database};host={$this->host}";
+		if ($this->characterSet != '') {
+			$dSN .= ';charset='.$this->characterSet;
+		}
+		$this->linkId = new PDO($dSN, $this->user, $this->password);
+		$this->database = $database;
+	}
+
+
+	/**
+	 * alias function of select_db, changes the database we are working with.
+	 *
+	 * @param string $database the name of the database to use
+	 * @return void
+	 */
+	public function useDb($database)
+	{
+		$this->selectDb($database);
+	}
+
+	/* public: connection management */
+
+	/**
+	 * Db::connect()
+	 * @param string $database
+	 * @param string $host
+	 * @param string $user
+	 * @param string $password
+	 * @param string $driver
+	 * @return bool|int|PDO
+	 */
+	public function connect($database = '', $host = '', $user = '', $password = '', $driver = 'mysql')
+	{
+		/* Handle defaults */
+		if ('' == $database) {
+			$database = $this->database;
+		}
+		if ('' == $host) {
+			$host = $this->host;
+		}
+		if ('' == $user) {
+			$user = $this->user;
+		}
+		if ('' == $password) {
+			$password = $this->password;
+		}
+		if ('' == $driver) {
+			$driver = $this->driver;
+		}
+		/* establish connection, select database */
+		$dSN = "{$driver}:dbname={$database};host={$host}";
+		if ($this->characterSet != '') {
+			$dSN .= ';charset='.$this->characterSet;
+		}
+		if ($this->linkId === false) {
+			try {
+				$this->linkId = new PDO($dSN, $user, $password);
+			} catch (\PDOException $e) {
+				$this->halt('Connection Failed '.$e->getMessage());
+				return 0;
+			}
+		}
+		return $this->linkId;
+	}
+
+	/* This only affects systems not using persistent connections */
+
+	/**
+	 * Db::disconnect()
+	 * @return void
+	 */
+	public function disconnect()
+	{
+	}
+
+	/* public: discard the query result */
+
+	/**
+	 * Db::free()
+	 * @return void
+	 */
+	public function free()
+	{
+		//			@mysql_free_result($this->queryId);
+		//			$this->queryId = 0;
+	}
+
+	/**
+	 * Db::query()
+	 *
+	 *  Sends an SQL query to the database
+	 *
+	 * @param mixed $queryString
+	 * @param string $line
+	 * @param string $file
+	 * @return mixed 0 if no query or query id handler, safe to ignore this return
+	 */
+	public function query($queryString, $line = '', $file = '')
+	{
+		/* No empty queries, please, since PHP4 chokes on them. */
+		/* The empty query string is passed on from the constructor,
         * when calling the class without a query, e.g. in situations
         * like these: '$db = new db_Subclass;'
         */
-        if ($queryString == '') {
-            return 0;
-        }
-        if (!$this->connect()) {
-            return 0;
-            /* we already complained in connect() about that. */
-        }
-        // New query, discard previous result.
-        if ($this->queryId !== false) {
-            $this->free();
-        }
-
-        if ($this->Debug) {
-            printf("Debug: query = %s<br>\n", $queryString);
-        }
-        if (isset($GLOBALS['log_queries']) && $GLOBALS['log_queries'] !== false) {
-            $this->log($queryString, $line, $file);
-        }
-
-        $this->queryId = $this->linkId->prepare($queryString);
-        $success = $this->queryId->execute();
-        $this->Rows = $this->queryId->fetchAll();
-        //$this->log("PDO Query $queryString (S:$success) - ".count($this->Rows).' Rows', __LINE__, __FILE__);
-        $this->Row = -1;
-        if ($success === false) {
-            $this->emailError($queryString, json_encode($this->queryId->errorInfo(), JSON_PRETTY_PRINT), $line, $file);
-        }
-
-        // Will return nada if it fails. That's fine.
-        return $this->queryId;
-    }
-
-    /* public: walk result set */
-
-    /**
-     * Db::next_record()
-     * @param mixed $resultType
-     * @return bool
-     */
-    public function next_record($resultType = MYSQLI_ASSOC)
-    {
-        // PDO result types so far seem to be +1
-        ++$resultType;
-        if (!$this->queryId) {
-            $this->halt('next_record called with no query pending.');
-            return 0;
-        }
-
-        ++$this->Row;
-        $this->Record = $this->Rows[$this->Row];
-
-        $stat = is_array($this->Record);
-        if (!$stat && $this->autoFree) {
-            $this->free();
-        }
-        return $stat;
-    }
-
-    /* public: position in result set */
-
-    /**
-     * Db::seek()
-     * @param integer $pos
-     * @return int
-     */
-    public function seek($pos = 0)
-    {
-        if (isset($this->Rows[$pos])) {
-            $this->Row = $pos;
-        } else {
-            $this->halt("seek($pos) failed: result has ".count($this->Rows).' rows');
-            /* half assed attempt to save the day,
+		if ($queryString == '') {
+			return 0;
+		}
+		if (!$this->connect()) {
+			return 0;
+			/* we already complained in connect() about that. */
+		}
+		// New query, discard previous result.
+		if ($this->queryId !== false) {
+			$this->free();
+		}
+
+		if ($this->Debug) {
+			printf("Debug: query = %s<br>\n", $queryString);
+		}
+		if (isset($GLOBALS['log_queries']) && $GLOBALS['log_queries'] !== false) {
+			$this->log($queryString, $line, $file);
+		}
+
+		$this->queryId = $this->linkId->prepare($queryString);
+		$success = $this->queryId->execute();
+		$this->Rows = $this->queryId->fetchAll();
+		//$this->log("PDO Query $queryString (S:$success) - ".count($this->Rows).' Rows', __LINE__, __FILE__);
+		$this->Row = -1;
+		if ($success === false) {
+			$this->emailError($queryString, json_encode($this->queryId->errorInfo(), JSON_PRETTY_PRINT), $line, $file);
+		}
+
+		// Will return nada if it fails. That's fine.
+		return $this->queryId;
+	}
+
+	/* public: walk result set */
+
+	/**
+	 * Db::next_record()
+	 * @param mixed $resultType
+	 * @return bool
+	 */
+	public function next_record($resultType = MYSQLI_ASSOC)
+	{
+		// PDO result types so far seem to be +1
+		++$resultType;
+		if (!$this->queryId) {
+			$this->halt('next_record called with no query pending.');
+			return 0;
+		}
+
+		++$this->Row;
+		$this->Record = $this->Rows[$this->Row];
+
+		$stat = is_array($this->Record);
+		if (!$stat && $this->autoFree) {
+			$this->free();
+		}
+		return $stat;
+	}
+
+	/* public: position in result set */
+
+	/**
+	 * Db::seek()
+	 * @param integer $pos
+	 * @return int
+	 */
+	public function seek($pos = 0)
+	{
+		if (isset($this->Rows[$pos])) {
+			$this->Row = $pos;
+		} else {
+			$this->halt("seek($pos) failed: result has ".count($this->Rows).' rows');
+			/* half assed attempt to save the day,
             * but do not consider this documented or even
             * desirable behaviour.
             */
-            return 0;
-        }
-        return 1;
-    }
-
-    /**
-     * Initiates a transaction
-     * @return bool
-     */
-    public function transactionBegin()
-    {
-        return $this->linkId->beginTransaction();
-    }
-
-    /**
-     * Commits a transaction
-     * @return bool
-     */
-    public function transactionCommit()
-    {
-        return $this->linkId->commit();
-    }
-
-    /**
-     * Rolls back a transaction
-     * @return bool
-     */
-    public function transactionAbort()
-    {
-        return $this->linkId->rollBack();
-    }
-
-    /**
-     * Db::getLastInsertId()
-     * @param mixed $table
-     * @param mixed $field
-     * @return int
-     */
-    public function getLastInsertId($table, $field)
-    {
-        if (!isset($table) || $table == '' || !isset($field) || $field == '') {
-            return -1;
-        }
-        return $this->linkId->lastInsertId();
-    }
-
-    /* public: table locking */
-
-    /**
-     * Db::lock()
-     * @param mixed  $table
-     * @param string $mode
-     * @return void
-     */
-    public function lock($table, $mode = 'write')
-    {
-        /*			$this->connect();
+			return 0;
+		}
+		return 1;
+	}
+
+	/**
+	 * Initiates a transaction
+	 * @return bool
+	 */
+	public function transactionBegin()
+	{
+		return $this->linkId->beginTransaction();
+	}
+
+	/**
+	 * Commits a transaction
+	 * @return bool
+	 */
+	public function transactionCommit()
+	{
+		return $this->linkId->commit();
+	}
+
+	/**
+	 * Rolls back a transaction
+	 * @return bool
+	 */
+	public function transactionAbort()
+	{
+		return $this->linkId->rollBack();
+	}
+
+	/**
+	 * Db::getLastInsertId()
+	 * @param mixed $table
+	 * @param mixed $field
+	 * @return int
+	 */
+	public function getLastInsertId($table, $field)
+	{
+		if (!isset($table) || $table == '' || !isset($field) || $field == '') {
+			return -1;
+		}
+		return $this->linkId->lastInsertId();
+	}
+
+	/* public: table locking */
+
+	/**
+	 * Db::lock()
+	 * @param mixed  $table
+	 * @param string $mode
+	 * @return void
+	 */
+	public function lock($table, $mode = 'write')
+	{
+		/*			$this->connect();
 
         * $query = "lock tables ";
         * if (is_array($table))
@@ -299,15 +299,15 @@ 
         * }
         * return $res;
         */
-    }
+	}
 
-    /**
-     * Db::unlock()
-     * @return void
-     */
-    public function unlock()
-    {
-        /*			$this->connect();
+	/**
+	 * Db::unlock()
+	 * @return void
+	 */
+	public function unlock()
+	{
+		/*			$this->connect();
 
         * $res = @mysql_query("unlock tables");
         * if (!$res)
@@ -317,68 +317,68 @@ 
         * }
         * return $res;
         */
-    }
-
-    /* public: evaluate the result (size, width) */
-
-    /**
-     * Db::affectedRows()
-     *
-     * @return mixed
-     */
-    public function affectedRows()
-    {
-        return @$this->queryId->rowCount();
-    }
-
-    /**
-     * Db::num_rows()
-     * @return int
-     */
-    public function num_rows()
-    {
-        return count($this->Rows);
-    }
-
-    /**
-     * Db::num_fields()
-     * @return int
-     */
-    public function num_fields()
-    {
-        $keys = array_keys($this->Rows);
-        return count($this->Rows[$keys[0]]);
-    }
-
-    /**
-     * @param mixed $msg
-     * @param string $line
-     * @param string $file
-     * @return mixed|void
-     */
-    public function haltmsg($msg, $line = '', $file = '')
-    {
-        $this->log("Database error: $msg", $line, $file, 'error');
-        if ($this->Errno != '0' || $this->Error != '()') {
-            $this->log('PDO MySQL Error: '.json_encode($this->linkId->errorInfo()), $line, $file, 'error');
-        }
-        $this->logBackTrace($msg, $line, $file);
-    }
-
-    /**
-     * Db::tableNames()
-     *
-     * @return array
-     */
-    public function tableNames()
-    {
-        $return = [];
-        $this->query('SHOW TABLES');
-        foreach ($this->Rows as $i => $info) {
-            $return[$i]['table_name'] = $info[0];
-            $return[$i]['tablespace_name'] = $this->database;
-            $return[$i]['database'] = $this->database;
-        }
-        return $return;
-    }
+	}
+
+	/* public: evaluate the result (size, width) */
+
+	/**
+	 * Db::affectedRows()
+	 *
+	 * @return mixed
+	 */
+	public function affectedRows()
+	{
+		return @$this->queryId->rowCount();
+	}
+
+	/**
+	 * Db::num_rows()
+	 * @return int
+	 */
+	public function num_rows()
+	{
+		return count($this->Rows);
+	}
+
+	/**
+	 * Db::num_fields()
+	 * @return int
+	 */
+	public function num_fields()
+	{
+		$keys = array_keys($this->Rows);
+		return count($this->Rows[$keys[0]]);
+	}
+
+	/**
+	 * @param mixed $msg
+	 * @param string $line
+	 * @param string $file
+	 * @return mixed|void
+	 */
+	public function haltmsg($msg, $line = '', $file = '')
+	{
+		$this->log("Database error: $msg", $line, $file, 'error');
+		if ($this->Errno != '0' || $this->Error != '()') {
+			$this->log('PDO MySQL Error: '.json_encode($this->linkId->errorInfo()), $line, $file, 'error');
+		}
+		$this->logBackTrace($msg, $line, $file);
+	}
+
+	/**
+	 * Db::tableNames()
+	 *
+	 * @return array
+	 */
+	public function tableNames()
+	{
+		$return = [];
+		$this->query('SHOW TABLES');
+		foreach ($this->Rows as $i => $info) {
+			$return[$i]['table_name'] = $info[0];
+			$return[$i]['tablespace_name'] = $this->database;
+			$return[$i]['database'] = $this->database;
+		}
+		return $return;
+	}
 }

Braces +20 added lines, -40 removed lines

@@ -18,8 +18,7 @@ 
  *
  * @access public
  */
-class Db extends Generic implements Db_Interface
-{
+class Db extends Generic implements Db_Interface {
     /* public: connection parameters */
     public $driver = 'mysql';
     public $Rows = [];
@@ -32,8 +31,7 @@ 
      * @param string $database the name of the database to use
      * @return void
      */
-    public function selectDb($database)
-    {
+    public function selectDb($database) {
         $dSN = "{$this->driver}:dbname={$database};host={$this->host}";
         if ($this->characterSet != '') {
             $dSN .= ';charset='.$this->characterSet;
@@ -49,8 +47,7 @@ 
      * @param string $database the name of the database to use
      * @return void
      */
-    public function useDb($database)
-    {
+    public function useDb($database) {
         $this->selectDb($database);
     }
 
@@ -65,8 +62,7 @@ 
      * @param string $driver
      * @return bool|int|PDO
      */
-    public function connect($database = '', $host = '', $user = '', $password = '', $driver = 'mysql')
-    {
+    public function connect($database = '', $host = '', $user = '', $password = '', $driver = 'mysql') {
         /* Handle defaults */
         if ('' == $database) {
             $database = $this->database;
@@ -105,8 +101,7 @@ 
      * Db::disconnect()
      * @return void
      */
-    public function disconnect()
-    {
+    public function disconnect() {
     }
 
     /* public: discard the query result */
@@ -115,8 +110,7 @@ 
      * Db::free()
      * @return void
      */
-    public function free()
-    {
+    public function free() {
         //			@mysql_free_result($this->queryId);
         //			$this->queryId = 0;
     }
@@ -131,8 +125,7 @@ 
      * @param string $file
      * @return mixed 0 if no query or query id handler, safe to ignore this return
      */
-    public function query($queryString, $line = '', $file = '')
-    {
+    public function query($queryString, $line = '', $file = '') {
         /* No empty queries, please, since PHP4 chokes on them. */
         /* The empty query string is passed on from the constructor,
         * when calling the class without a query, e.g. in situations
@@ -177,8 +170,7 @@ 
      * @param mixed $resultType
      * @return bool
      */
-    public function next_record($resultType = MYSQLI_ASSOC)
-    {
+    public function next_record($resultType = MYSQLI_ASSOC) {
         // PDO result types so far seem to be +1
         ++$resultType;
         if (!$this->queryId) {
@@ -203,8 +195,7 @@ 
      * @param integer $pos
      * @return int
      */
-    public function seek($pos = 0)
-    {
+    public function seek($pos = 0) {
         if (isset($this->Rows[$pos])) {
             $this->Row = $pos;
         } else {
@@ -222,8 +213,7 @@ 
      * Initiates a transaction
      * @return bool
      */
-    public function transactionBegin()
-    {
+    public function transactionBegin() {
         return $this->linkId->beginTransaction();
     }
 
@@ -231,8 +221,7 @@ 
      * Commits a transaction
      * @return bool
      */
-    public function transactionCommit()
-    {
+    public function transactionCommit() {
         return $this->linkId->commit();
     }
 
@@ -240,8 +229,7 @@ 
      * Rolls back a transaction
      * @return bool
      */
-    public function transactionAbort()
-    {
+    public function transactionAbort() {
         return $this->linkId->rollBack();
     }
 
@@ -251,8 +239,7 @@ 
      * @param mixed $field
      * @return int
      */
-    public function getLastInsertId($table, $field)
-    {
+    public function getLastInsertId($table, $field) {
         if (!isset($table) || $table == '' || !isset($field) || $field == '') {
             return -1;
         }
@@ -267,8 +254,7 @@ 
      * @param string $mode
      * @return void
      */
-    public function lock($table, $mode = 'write')
-    {
+    public function lock($table, $mode = 'write') {
         /*			$this->connect();
 
         * $query = "lock tables ";
@@ -305,8 +291,7 @@ 
      * Db::unlock()
      * @return void
      */
-    public function unlock()
-    {
+    public function unlock() {
         /*			$this->connect();
 
         * $res = @mysql_query("unlock tables");
@@ -326,8 +311,7 @@ 
      *
      * @return mixed
      */
-    public function affectedRows()
-    {
+    public function affectedRows() {
         return @$this->queryId->rowCount();
     }
 
@@ -335,8 +319,7 @@ 
      * Db::num_rows()
      * @return int
      */
-    public function num_rows()
-    {
+    public function num_rows() {
         return count($this->Rows);
     }
 
@@ -344,8 +327,7 @@ 
      * Db::num_fields()
      * @return int
      */
-    public function num_fields()
-    {
+    public function num_fields() {
         $keys = array_keys($this->Rows);
         return count($this->Rows[$keys[0]]);
     }
@@ -356,8 +338,7 @@ 
      * @param string $file
      * @return mixed|void
      */
-    public function haltmsg($msg, $line = '', $file = '')
-    {
+    public function haltmsg($msg, $line = '', $file = '') {
         $this->log("Database error: $msg", $line, $file, 'error');
         if ($this->Errno != '0' || $this->Error != '()') {
             $this->log('PDO MySQL Error: '.json_encode($this->linkId->errorInfo()), $line, $file, 'error');
@@ -370,8 +351,7 @@ 
      *
      * @return array
      */
-    public function tableNames()
-    {
+    public function tableNames() {
         $return = [];
         $this->query('SHOW TABLES');
         foreach ($this->Rows as $i => $info) {

src/Generic.php

Indentation +381 added lines, -381 removed lines

@@ -14,385 +14,385 @@
  */
 abstract class Generic
 {
-    /* public: connection parameters */
-    public $host = 'localhost';
-    public $database = '';
-    public $user = '';
-    public $password = '';
-    public $port = '';
-
-    /* public: configuration parameters */
-    public $autoStripslashes = false;
-    public $Debug = 0; // Set to 1 for debugging messages.
-    public $haltOnError = 'yes'; // "yes" (halt with message), "no" (ignore errors quietly), "report" (ignore error, but spit a warning)
-
-    public $maxConnectErrors = 5;
-    public $connectionAttempt = 0;
-    public $maxMatches = 10000000;
-
-    /**
-     * @var int
-     */
-    public $autoFree = 0; // Set to 1 for automatic mysql_free_result()
-
-    /* public: result array and current row number */
-    public $Record = [];
-    public $Row;
-
-    /* public: current error number and error text */
-    public $Errno = 0;
-    public $Error = '';
-
-    /* public: this is an api revision, not a CVS revision. */
-    public $type = 'generic';
-
-    /**
-     * @var int|object
-     */
-    public $linkId = 0;
-    public $queryId = 0;
-
-    public $characterSet = 'utf8mb4';
-    public $collation = 'utf8mb4_unicode_ci';
-
-    /**
-     * Logged queries.
-     * @var array
-     */
-    protected $log = [];
-
-    /**
-     * Constructs the db handler, can optionally specify connection parameters
-     *
-     * @param string $database Optional The database name
-     * @param string $user Optional The username to connect with
-     * @param string $password Optional The password to use
-     * @param string $host Optional The hostname where the server is, or default to localhost
-     * @param string $query Optional query to perform immediately
-     * @param string $port optional port for the connection
-     */
-    public function __construct($database = '', $user = '', $password = '', $host = 'localhost', $query = '', $port = '')
-    {
-        $this->database = $database;
-        $this->user = $user;
-        $this->password = $password;
-        $this->host = $host;
-        $this->port = $port;
-        if ($query != '') {
-            $this->query($query);
-        }
-        $this->connection_atttempt = 0;
-    }
-
-    /**
-     * @param string $message
-     * @param string $line
-     * @param string $file
-     * @return void
-     */
-    public function log($message, $line = '', $file = '', $level = 'info')
-    {
-        error_log($message);
-    }
-
-    /**
-     * @return int|object
-     */
-    public function linkId()
-    {
-        return $this->linkId;
-    }
-
-    /**
-     * @return int|object
-     */
-    public function queryId()
-    {
-        return $this->queryId;
-    }
-
-    /**
-     * @param $string
-     * @return string
-     */
-    public function real_escape($string = '')
-    {
-        if ((!is_resource($this->linkId) || $this->linkId == 0) && !$this->connect()) {
-            return $this->escape($string);
-        }
-        return mysqli_real_escape_string($this->linkId, $string);
-    }
-
-    /**
-     * @param $string
-     * @return string
-     */
-    public function escape($string = '')
-    {
-        //if (function_exists('mysql_escape_string'))
-        //return mysql_escape_string($string);
-        return str_replace(['\\', "\0", "\n", "\r", "'", '"', "\x1a"], ['\\\\', '\\0', '\\n', '\\r', "\\'", '\\"', '\\Z'], $string);
-    }
-
-    /**
-     * @param mixed $str
-     * @return string
-     */
-    public function dbAddslashes($str = '')
-    {
-        if (!isset($str) || $str == '') {
-            return '';
-        }
-        return addslashes($str);
-    }
-
-    /**
-     * Db::toTimestamp()
-     * @param mixed $epoch
-     * @return bool|string
-     */
-    public function toTimestamp($epoch)
-    {
-        return date('Y-m-d H:i:s', is_float($epoch) ? intval($epoch) : $epoch);
-    }
-
-    /**
-     * Db::fromTimestamp()
-     * @param mixed $timestamp
-     * @return bool|int|mixed
-     */
-    public function fromTimestamp($timestamp)
-    {
-        if (preg_match('/([0-9]{4})-([0-9]{2})-([0-9]{2}) ([0-9]{2}):([0-9]{2}):([0-9]{2})/', $timestamp, $parts)) {
-            $time = mktime($parts[4], $parts[5], $parts[6], $parts[2], $parts[3], $parts[1]);
-        } elseif (preg_match('/([0-9]{4})([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})/', $timestamp, $parts)) {
-            $time = mktime($parts[4], $parts[5], $parts[6], $parts[2], $parts[3], $parts[1]);
-        } elseif (preg_match('/([0-9]{4})([0-9]{2})([0-9]{2})/', $timestamp, $parts)) {
-            $time = mktime(1, 1, 1, $parts[2], $parts[3], $parts[1]);
-        } elseif (is_numeric($timestamp) && $timestamp >= 943938000) {
-            $time = $timestamp;
-        } else {
-            $this->log('Cannot Match Timestamp from '.$timestamp, __LINE__, __FILE__);
-            $time = false;
-        }
-        return $time;
-    }
-
-    /**
-     * perform a query with limited result set
-     *
-     * @param string $queryString
-     * @param string|int $numRows
-     * @param int $offset
-     * @param string|int $line
-     * @param string $file
-     * @return mixed
-     */
-    public function limitQuery($queryString, $numRows = '', $offset = 0, $line = '', $file = '')
-    {
-        if (!$numRows) {
-            $numRows = $this->maxMatches;
-        }
-        if ($offset == 0) {
-            $queryString .= ' LIMIT '.(int) $numRows;
-        } else {
-            $queryString .= ' LIMIT '.(int) $offset.','.(int) $numRows;
-        }
-
-        if ($this->Debug) {
-            printf("Debug: limitQuery = %s<br>offset=%d, num_rows=%d<br>\n", $queryString, $offset, $numRows);
-        }
-
-        return $this->query($queryString, $line, $file);
-    }
-
-    /**
-     * db:qr()
-     *
-     *  alias of queryReturn()
-     *
-     * @param mixed $query SQL Query to be used
-     * @param string $line optionally pass __LINE__ calling the query for logging
-     * @param string $file optionally pass __FILE__ calling the query for logging
-     * @return mixed FALSE if no rows, if a single row it returns that, if multiple it returns an array of rows, associative responses only
-     */
-    public function qr($query, $line = '', $file = '')
-    {
-        return $this->queryReturn($query, $line, $file);
-    }
-
-    /**
-     * gets a field
-     *
-     * @param mixed  $name
-     * @param string $stripSlashes
-     * @return string
-     */
-    public function f($name, $stripSlashes = '')
-    {
-        if (is_null($this->Record)) {
-            return null;
-        } elseif ($stripSlashes || ($this->autoStripslashes && !$stripSlashes)) {
-            return stripslashes($this->Record[$name]);
-        } else {
-            return $this->Record[$name];
-        }
-    }
-
-    /**
-     * error handling
-     *
-     * @param mixed $msg
-     * @param string $line
-     * @param string $file
-     * @return void
-     */
-    public function halt($msg, $line = '', $file = '')
-    {
-        $this->unlock(false);
-        /* Just in case there is a table currently locked */
-
-        //$this->Error = @$this->linkId->error;
-        //$this->Errno = @$this->linkId->errno;
-        if ($this->haltOnError == 'no') {
-            return true;
-        }
-        if ($msg != '') {
-            $this->haltmsg($msg, $line, $file);
-        }
-        if ($this->haltOnError != 'report') {
-            echo '<p><b>Session halted.</b>';
-            //if (isset($GLOBALS['tf']))
-            //$GLOBALS['tf']->terminate();
-            die();
-        }
-        return true;
-    }
-
-    /**
-     * @param mixed $msg
-     * @param string $line
-     * @param string $file
-     * @return mixed|void
-     */
-    public function logBackTrace($msg, $line = '', $file = '')
-    {
-        $backtrace = (function_exists('debug_backtrace') ? debug_backtrace() : []);
-        $this->log(
-            ('' !== getenv('REQUEST_URI') ? ' '.getenv('REQUEST_URI') : '').
-            ((isset($_POST) && count($_POST)) ? ' POST='.json_encode($_POST) : '').
-            ((isset($_GET) && count($_GET)) ? ' GET='.json_encode($_GET) : '').
-            ((isset($_FILES) && count($_FILES)) ? ' FILES='.json_encode($_FILES) : '').
-            ('' !== getenv('HTTP_USER_AGENT') ? ' AGENT="'.getenv('HTTP_USER_AGENT').'"' : '').
-            (isset($_SERVER['REQUEST_METHOD']) ? ' METHOD="'.$_SERVER['REQUEST_METHOD'].'"'.
-                ($_SERVER['REQUEST_METHOD'] === 'POST' ? ' POST="'.json_encode($_POST).'"' : '') : ''),
-            $line,
-            $file,
-            'error'
-        );
-        for ($level = 1, $levelMax = count($backtrace); $level < $levelMax; $level++) {
-            $message = (isset($backtrace[$level]['file']) ? 'File: '.$backtrace[$level]['file'] : '').
-                (isset($backtrace[$level]['line']) ? ' Line: '.$backtrace[$level]['line'] : '').
-                ' Function: '.(isset($backtrace[$level] ['class']) ? '(class '.$backtrace[$level] ['class'].') ' : '').
-                (isset($backtrace[$level] ['type']) ? $backtrace[$level] ['type'].' ' : '').
-                $backtrace[$level] ['function'].'(';
-            if (isset($backtrace[$level] ['args'])) {
-                for ($argument = 0, $argumentMax = count($backtrace[$level]['args']); $argument < $argumentMax; $argument++) {
-                    $message .= ($argument > 0 ? ', ' : '').
-                        (is_object($backtrace[$level]['args'][$argument]) ? 'class '.get_class($backtrace[$level]['args'][$argument]) : json_encode($backtrace[$level]['args'][$argument]));
-                }
-            }
-            $message .= ')';
-            $this->log($message, $line, $file, 'error');
-        }
-    }
-
-    public function emailError($queryString, $error, $line, $file)
-    {
-        $subject = php_uname('n').' MySQLi Error '.$queryString;
-        if (class_exists('\\TFSmarty')) {
-            $smarty = new \TFSmarty();
-            $smarty->assign([
-                'type' => $this->type,
-                'queryString' => $queryString,
-                'error' => $error,
-                'line' => $line,
-                'file' => $file,
-                'request' => $_REQUEST,
-                'server' => $_SERVER,
-            ]);
-            if (isset($GLOBALS['tf'])) {
-                $smarty->assign('account_id', $GLOBALS['tf']->session->account_id);
-            }
-            $email = $smarty->fetch('email/admin/sql_error.tpl');
-            (new \MyAdmin\Mail())->adminMail($subject, $email, 'john@interserver.net', '');
-            (new \MyAdmin\Mail())->adminMail($subject, $email, 'detain@interserver.net', '');
-        }
-        $this->haltmsg('Invalid SQL: '.$queryString, $line, $file);
-    }
-
-    /**
-     * @param mixed $msg
-     * @param string $line
-     * @param string $file
-     * @return mixed|void
-     */
-    public function haltmsg($msg, $line = '', $file = '')
-    {
-        $email = "DB Error {$msg} {$file}:{$line}";
-        if (class_exists('\\MyAdmin\Mail')) {
-            \MyAdmin\Mail::failsafeMail($email, $email, ['detain@interserver.net', 'john@interserver.net']);
-            return;
-        }
-        $this->log("Database error: $msg", $line, $file, 'error');
-        if ($this->Errno != '0' || !in_array($this->Error, ['', '()'])) {
-            $sqlstate = mysqli_sqlstate($this->linkId);
-            $this->log("MySQLi SQLState: {$sqlstate}. Error: ".$this->Errno.' ('.$this->Error.')', $line, $file, 'error');
-        }
-        $this->logBackTrace($msg, $line, $file);
-    }
-
-    /**
-     * @return array
-     */
-    public function indexNames()
-    {
-        return [];
-    }
-
-
-    /**
-     * Add query to logged queries.
-     * @param string $statement
-     * @param float $time Elapsed seconds with microseconds
-     * @param string|int $line Line Number
-     * @param string $file File Name
-     */
-    public function addLog($statement, $time, $line = '', $file = '')
-    {
-        $query = [
-            'statement' => $statement,
-            'time' => $time * 1000
-        ];
-        if ($line != '') {
-            $query['line'] = $line;
-        }
-        if ($file != '') {
-            $query['file'] = $file;
-        }
-        if (!isset($GLOBALS['db_queries'])) {
-            $GLOBALS['db_queries'] = [];
-        }
-        $GLOBALS['db_queries'][] = $query;
-        array_push($this->log, $query);
-    }
-
-    /**
-     * Return logged queries.
-     * @return array Logged queries
-     */
-    public function getLog()
-    {
-        return $this->log;
-    }
+	/* public: connection parameters */
+	public $host = 'localhost';
+	public $database = '';
+	public $user = '';
+	public $password = '';
+	public $port = '';
+
+	/* public: configuration parameters */
+	public $autoStripslashes = false;
+	public $Debug = 0; // Set to 1 for debugging messages.
+	public $haltOnError = 'yes'; // "yes" (halt with message), "no" (ignore errors quietly), "report" (ignore error, but spit a warning)
+
+	public $maxConnectErrors = 5;
+	public $connectionAttempt = 0;
+	public $maxMatches = 10000000;
+
+	/**
+	 * @var int
+	 */
+	public $autoFree = 0; // Set to 1 for automatic mysql_free_result()
+
+	/* public: result array and current row number */
+	public $Record = [];
+	public $Row;
+
+	/* public: current error number and error text */
+	public $Errno = 0;
+	public $Error = '';
+
+	/* public: this is an api revision, not a CVS revision. */
+	public $type = 'generic';
+
+	/**
+	 * @var int|object
+	 */
+	public $linkId = 0;
+	public $queryId = 0;
+
+	public $characterSet = 'utf8mb4';
+	public $collation = 'utf8mb4_unicode_ci';
+
+	/**
+	 * Logged queries.
+	 * @var array
+	 */
+	protected $log = [];
+
+	/**
+	 * Constructs the db handler, can optionally specify connection parameters
+	 *
+	 * @param string $database Optional The database name
+	 * @param string $user Optional The username to connect with
+	 * @param string $password Optional The password to use
+	 * @param string $host Optional The hostname where the server is, or default to localhost
+	 * @param string $query Optional query to perform immediately
+	 * @param string $port optional port for the connection
+	 */
+	public function __construct($database = '', $user = '', $password = '', $host = 'localhost', $query = '', $port = '')
+	{
+		$this->database = $database;
+		$this->user = $user;
+		$this->password = $password;
+		$this->host = $host;
+		$this->port = $port;
+		if ($query != '') {
+			$this->query($query);
+		}
+		$this->connection_atttempt = 0;
+	}
+
+	/**
+	 * @param string $message
+	 * @param string $line
+	 * @param string $file
+	 * @return void
+	 */
+	public function log($message, $line = '', $file = '', $level = 'info')
+	{
+		error_log($message);
+	}
+
+	/**
+	 * @return int|object
+	 */
+	public function linkId()
+	{
+		return $this->linkId;
+	}
+
+	/**
+	 * @return int|object
+	 */
+	public function queryId()
+	{
+		return $this->queryId;
+	}
+
+	/**
+	 * @param $string
+	 * @return string
+	 */
+	public function real_escape($string = '')
+	{
+		if ((!is_resource($this->linkId) || $this->linkId == 0) && !$this->connect()) {
+			return $this->escape($string);
+		}
+		return mysqli_real_escape_string($this->linkId, $string);
+	}
+
+	/**
+	 * @param $string
+	 * @return string
+	 */
+	public function escape($string = '')
+	{
+		//if (function_exists('mysql_escape_string'))
+		//return mysql_escape_string($string);
+		return str_replace(['\\', "\0", "\n", "\r", "'", '"', "\x1a"], ['\\\\', '\\0', '\\n', '\\r', "\\'", '\\"', '\\Z'], $string);
+	}
+
+	/**
+	 * @param mixed $str
+	 * @return string
+	 */
+	public function dbAddslashes($str = '')
+	{
+		if (!isset($str) || $str == '') {
+			return '';
+		}
+		return addslashes($str);
+	}
+
+	/**
+	 * Db::toTimestamp()
+	 * @param mixed $epoch
+	 * @return bool|string
+	 */
+	public function toTimestamp($epoch)
+	{
+		return date('Y-m-d H:i:s', is_float($epoch) ? intval($epoch) : $epoch);
+	}
+
+	/**
+	 * Db::fromTimestamp()
+	 * @param mixed $timestamp
+	 * @return bool|int|mixed
+	 */
+	public function fromTimestamp($timestamp)
+	{
+		if (preg_match('/([0-9]{4})-([0-9]{2})-([0-9]{2}) ([0-9]{2}):([0-9]{2}):([0-9]{2})/', $timestamp, $parts)) {
+			$time = mktime($parts[4], $parts[5], $parts[6], $parts[2], $parts[3], $parts[1]);
+		} elseif (preg_match('/([0-9]{4})([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})/', $timestamp, $parts)) {
+			$time = mktime($parts[4], $parts[5], $parts[6], $parts[2], $parts[3], $parts[1]);
+		} elseif (preg_match('/([0-9]{4})([0-9]{2})([0-9]{2})/', $timestamp, $parts)) {
+			$time = mktime(1, 1, 1, $parts[2], $parts[3], $parts[1]);
+		} elseif (is_numeric($timestamp) && $timestamp >= 943938000) {
+			$time = $timestamp;
+		} else {
+			$this->log('Cannot Match Timestamp from '.$timestamp, __LINE__, __FILE__);
+			$time = false;
+		}
+		return $time;
+	}
+
+	/**
+	 * perform a query with limited result set
+	 *
+	 * @param string $queryString
+	 * @param string|int $numRows
+	 * @param int $offset
+	 * @param string|int $line
+	 * @param string $file
+	 * @return mixed
+	 */
+	public function limitQuery($queryString, $numRows = '', $offset = 0, $line = '', $file = '')
+	{
+		if (!$numRows) {
+			$numRows = $this->maxMatches;
+		}
+		if ($offset == 0) {
+			$queryString .= ' LIMIT '.(int) $numRows;
+		} else {
+			$queryString .= ' LIMIT '.(int) $offset.','.(int) $numRows;
+		}
+
+		if ($this->Debug) {
+			printf("Debug: limitQuery = %s<br>offset=%d, num_rows=%d<br>\n", $queryString, $offset, $numRows);
+		}
+
+		return $this->query($queryString, $line, $file);
+	}
+
+	/**
+	 * db:qr()
+	 *
+	 *  alias of queryReturn()
+	 *
+	 * @param mixed $query SQL Query to be used
+	 * @param string $line optionally pass __LINE__ calling the query for logging
+	 * @param string $file optionally pass __FILE__ calling the query for logging
+	 * @return mixed FALSE if no rows, if a single row it returns that, if multiple it returns an array of rows, associative responses only
+	 */
+	public function qr($query, $line = '', $file = '')
+	{
+		return $this->queryReturn($query, $line, $file);
+	}
+
+	/**
+	 * gets a field
+	 *
+	 * @param mixed  $name
+	 * @param string $stripSlashes
+	 * @return string
+	 */
+	public function f($name, $stripSlashes = '')
+	{
+		if (is_null($this->Record)) {
+			return null;
+		} elseif ($stripSlashes || ($this->autoStripslashes && !$stripSlashes)) {
+			return stripslashes($this->Record[$name]);
+		} else {
+			return $this->Record[$name];
+		}
+	}
+
+	/**
+	 * error handling
+	 *
+	 * @param mixed $msg
+	 * @param string $line
+	 * @param string $file
+	 * @return void
+	 */
+	public function halt($msg, $line = '', $file = '')
+	{
+		$this->unlock(false);
+		/* Just in case there is a table currently locked */
+
+		//$this->Error = @$this->linkId->error;
+		//$this->Errno = @$this->linkId->errno;
+		if ($this->haltOnError == 'no') {
+			return true;
+		}
+		if ($msg != '') {
+			$this->haltmsg($msg, $line, $file);
+		}
+		if ($this->haltOnError != 'report') {
+			echo '<p><b>Session halted.</b>';
+			//if (isset($GLOBALS['tf']))
+			//$GLOBALS['tf']->terminate();
+			die();
+		}
+		return true;
+	}
+
+	/**
+	 * @param mixed $msg
+	 * @param string $line
+	 * @param string $file
+	 * @return mixed|void
+	 */
+	public function logBackTrace($msg, $line = '', $file = '')
+	{
+		$backtrace = (function_exists('debug_backtrace') ? debug_backtrace() : []);
+		$this->log(
+			('' !== getenv('REQUEST_URI') ? ' '.getenv('REQUEST_URI') : '').
+			((isset($_POST) && count($_POST)) ? ' POST='.json_encode($_POST) : '').
+			((isset($_GET) && count($_GET)) ? ' GET='.json_encode($_GET) : '').
+			((isset($_FILES) && count($_FILES)) ? ' FILES='.json_encode($_FILES) : '').
+			('' !== getenv('HTTP_USER_AGENT') ? ' AGENT="'.getenv('HTTP_USER_AGENT').'"' : '').
+			(isset($_SERVER['REQUEST_METHOD']) ? ' METHOD="'.$_SERVER['REQUEST_METHOD'].'"'.
+				($_SERVER['REQUEST_METHOD'] === 'POST' ? ' POST="'.json_encode($_POST).'"' : '') : ''),
+			$line,
+			$file,
+			'error'
+		);
+		for ($level = 1, $levelMax = count($backtrace); $level < $levelMax; $level++) {
+			$message = (isset($backtrace[$level]['file']) ? 'File: '.$backtrace[$level]['file'] : '').
+				(isset($backtrace[$level]['line']) ? ' Line: '.$backtrace[$level]['line'] : '').
+				' Function: '.(isset($backtrace[$level] ['class']) ? '(class '.$backtrace[$level] ['class'].') ' : '').
+				(isset($backtrace[$level] ['type']) ? $backtrace[$level] ['type'].' ' : '').
+				$backtrace[$level] ['function'].'(';
+			if (isset($backtrace[$level] ['args'])) {
+				for ($argument = 0, $argumentMax = count($backtrace[$level]['args']); $argument < $argumentMax; $argument++) {
+					$message .= ($argument > 0 ? ', ' : '').
+						(is_object($backtrace[$level]['args'][$argument]) ? 'class '.get_class($backtrace[$level]['args'][$argument]) : json_encode($backtrace[$level]['args'][$argument]));
+				}
+			}
+			$message .= ')';
+			$this->log($message, $line, $file, 'error');
+		}
+	}
+
+	public function emailError($queryString, $error, $line, $file)
+	{
+		$subject = php_uname('n').' MySQLi Error '.$queryString;
+		if (class_exists('\\TFSmarty')) {
+			$smarty = new \TFSmarty();
+			$smarty->assign([
+				'type' => $this->type,
+				'queryString' => $queryString,
+				'error' => $error,
+				'line' => $line,
+				'file' => $file,
+				'request' => $_REQUEST,
+				'server' => $_SERVER,
+			]);
+			if (isset($GLOBALS['tf'])) {
+				$smarty->assign('account_id', $GLOBALS['tf']->session->account_id);
+			}
+			$email = $smarty->fetch('email/admin/sql_error.tpl');
+			(new \MyAdmin\Mail())->adminMail($subject, $email, 'john@interserver.net', '');
+			(new \MyAdmin\Mail())->adminMail($subject, $email, 'detain@interserver.net', '');
+		}
+		$this->haltmsg('Invalid SQL: '.$queryString, $line, $file);
+	}
+
+	/**
+	 * @param mixed $msg
+	 * @param string $line
+	 * @param string $file
+	 * @return mixed|void
+	 */
+	public function haltmsg($msg, $line = '', $file = '')
+	{
+		$email = "DB Error {$msg} {$file}:{$line}";
+		if (class_exists('\\MyAdmin\Mail')) {
+			\MyAdmin\Mail::failsafeMail($email, $email, ['detain@interserver.net', 'john@interserver.net']);
+			return;
+		}
+		$this->log("Database error: $msg", $line, $file, 'error');
+		if ($this->Errno != '0' || !in_array($this->Error, ['', '()'])) {
+			$sqlstate = mysqli_sqlstate($this->linkId);
+			$this->log("MySQLi SQLState: {$sqlstate}. Error: ".$this->Errno.' ('.$this->Error.')', $line, $file, 'error');
+		}
+		$this->logBackTrace($msg, $line, $file);
+	}
+
+	/**
+	 * @return array
+	 */
+	public function indexNames()
+	{
+		return [];
+	}
+
+
+	/**
+	 * Add query to logged queries.
+	 * @param string $statement
+	 * @param float $time Elapsed seconds with microseconds
+	 * @param string|int $line Line Number
+	 * @param string $file File Name
+	 */
+	public function addLog($statement, $time, $line = '', $file = '')
+	{
+		$query = [
+			'statement' => $statement,
+			'time' => $time * 1000
+		];
+		if ($line != '') {
+			$query['line'] = $line;
+		}
+		if ($file != '') {
+			$query['file'] = $file;
+		}
+		if (!isset($GLOBALS['db_queries'])) {
+			$GLOBALS['db_queries'] = [];
+		}
+		$GLOBALS['db_queries'][] = $query;
+		array_push($this->log, $query);
+	}
+
+	/**
+	 * Return logged queries.
+	 * @return array Logged queries
+	 */
+	public function getLog()
+	{
+		return $this->log;
+	}
 }

Braces +20 added lines, -40 removed lines

@@ -12,8 +12,7 @@ 
 /**
  * Class Generic
  */
-abstract class Generic
-{
+abstract class Generic {
     /* public: connection parameters */
     public $host = 'localhost';
     public $database = '';
@@ -71,8 +70,7 @@ 
      * @param string $query Optional query to perform immediately
      * @param string $port optional port for the connection
      */
-    public function __construct($database = '', $user = '', $password = '', $host = 'localhost', $query = '', $port = '')
-    {
+    public function __construct($database = '', $user = '', $password = '', $host = 'localhost', $query = '', $port = '') {
         $this->database = $database;
         $this->user = $user;
         $this->password = $password;
@@ -90,24 +88,21 @@ 
      * @param string $file
      * @return void
      */
-    public function log($message, $line = '', $file = '', $level = 'info')
-    {
+    public function log($message, $line = '', $file = '', $level = 'info') {
         error_log($message);
     }
 
     /**
      * @return int|object
      */
-    public function linkId()
-    {
+    public function linkId() {
         return $this->linkId;
     }
 
     /**
      * @return int|object
      */
-    public function queryId()
-    {
+    public function queryId() {
         return $this->queryId;
     }
 
@@ -115,8 +110,7 @@ 
      * @param $string
      * @return string
      */
-    public function real_escape($string = '')
-    {
+    public function real_escape($string = '') {
         if ((!is_resource($this->linkId) || $this->linkId == 0) && !$this->connect()) {
             return $this->escape($string);
         }
@@ -127,8 +121,7 @@ 
      * @param $string
      * @return string
      */
-    public function escape($string = '')
-    {
+    public function escape($string = '') {
         //if (function_exists('mysql_escape_string'))
         //return mysql_escape_string($string);
         return str_replace(['\\', "\0", "\n", "\r", "'", '"', "\x1a"], ['\\\\', '\\0', '\\n', '\\r', "\\'", '\\"', '\\Z'], $string);
@@ -138,8 +131,7 @@ 
      * @param mixed $str
      * @return string
      */
-    public function dbAddslashes($str = '')
-    {
+    public function dbAddslashes($str = '') {
         if (!isset($str) || $str == '') {
             return '';
         }
@@ -151,8 +143,7 @@ 
      * @param mixed $epoch
      * @return bool|string
      */
-    public function toTimestamp($epoch)
-    {
+    public function toTimestamp($epoch) {
         return date('Y-m-d H:i:s', is_float($epoch) ? intval($epoch) : $epoch);
     }
 
@@ -161,8 +152,7 @@ 
      * @param mixed $timestamp
      * @return bool|int|mixed
      */
-    public function fromTimestamp($timestamp)
-    {
+    public function fromTimestamp($timestamp) {
         if (preg_match('/([0-9]{4})-([0-9]{2})-([0-9]{2}) ([0-9]{2}):([0-9]{2}):([0-9]{2})/', $timestamp, $parts)) {
             $time = mktime($parts[4], $parts[5], $parts[6], $parts[2], $parts[3], $parts[1]);
         } elseif (preg_match('/([0-9]{4})([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})/', $timestamp, $parts)) {
@@ -188,8 +178,7 @@ 
      * @param string $file
      * @return mixed
      */
-    public function limitQuery($queryString, $numRows = '', $offset = 0, $line = '', $file = '')
-    {
+    public function limitQuery($queryString, $numRows = '', $offset = 0, $line = '', $file = '') {
         if (!$numRows) {
             $numRows = $this->maxMatches;
         }
@@ -216,8 +205,7 @@ 
      * @param string $file optionally pass __FILE__ calling the query for logging
      * @return mixed FALSE if no rows, if a single row it returns that, if multiple it returns an array of rows, associative responses only
      */
-    public function qr($query, $line = '', $file = '')
-    {
+    public function qr($query, $line = '', $file = '') {
         return $this->queryReturn($query, $line, $file);
     }
 
@@ -228,8 +216,7 @@ 
      * @param string $stripSlashes
      * @return string
      */
-    public function f($name, $stripSlashes = '')
-    {
+    public function f($name, $stripSlashes = '') {
         if (is_null($this->Record)) {
             return null;
         } elseif ($stripSlashes || ($this->autoStripslashes && !$stripSlashes)) {
@@ -247,8 +234,7 @@ 
      * @param string $file
      * @return void
      */
-    public function halt($msg, $line = '', $file = '')
-    {
+    public function halt($msg, $line = '', $file = '') {
         $this->unlock(false);
         /* Just in case there is a table currently locked */
 
@@ -275,8 +261,7 @@ 
      * @param string $file
      * @return mixed|void
      */
-    public function logBackTrace($msg, $line = '', $file = '')
-    {
+    public function logBackTrace($msg, $line = '', $file = '') {
         $backtrace = (function_exists('debug_backtrace') ? debug_backtrace() : []);
         $this->log(
             ('' !== getenv('REQUEST_URI') ? ' '.getenv('REQUEST_URI') : '').
@@ -307,8 +292,7 @@ 
         }
     }
 
-    public function emailError($queryString, $error, $line, $file)
-    {
+    public function emailError($queryString, $error, $line, $file) {
         $subject = php_uname('n').' MySQLi Error '.$queryString;
         if (class_exists('\\TFSmarty')) {
             $smarty = new \TFSmarty();
@@ -337,8 +321,7 @@ 
      * @param string $file
      * @return mixed|void
      */
-    public function haltmsg($msg, $line = '', $file = '')
-    {
+    public function haltmsg($msg, $line = '', $file = '') {
         $email = "DB Error {$msg} {$file}:{$line}";
         if (class_exists('\\MyAdmin\Mail')) {
             \MyAdmin\Mail::failsafeMail($email, $email, ['detain@interserver.net', 'john@interserver.net']);
@@ -355,8 +338,7 @@ 
     /**
      * @return array
      */
-    public function indexNames()
-    {
+    public function indexNames() {
         return [];
     }
 
@@ -368,8 +350,7 @@ 
      * @param string|int $line Line Number
      * @param string $file File Name
      */
-    public function addLog($statement, $time, $line = '', $file = '')
-    {
+    public function addLog($statement, $time, $line = '', $file = '') {
         $query = [
             'statement' => $statement,
             'time' => $time * 1000
@@ -391,8 +372,7 @@ 
      * Return logged queries.
      * @return array Logged queries
      */
-    public function getLog()
-    {
+    public function getLog() {
         return $this->log;
     }
 }