detain / db_abstraction

src/Generic.php

Indentation +3 added lines, -3 removed lines

@@ -19,7 +19,7 @@ 
 	public $database = '';
 	public $user = '';
 	public $password = '';
-    public $port = '';
+	public $port = '';
 
 	/* public: configuration parameters */
 	public $autoStripslashes = false;
@@ -69,7 +69,7 @@ 
 	 * @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
+	 * @param string $port optional port for the connection
 	 */
 	public function __construct($database = '', $user = '', $password = '', $host = 'localhost', $query = '', $port = '')
 	{
@@ -77,7 +77,7 @@ 
 		$this->user = $user;
 		$this->password = $password;
 		$this->host = $host;
-        $this->port = $port;
+		$this->port = $port;
 		if ($query != '') {
 			$this->query($query);
 		}

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(array('\\', "\0", "\n", "\r", "'", '"', "\x1a"), array('\\\\', '\\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', $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 ($stripSlashes || ($this->autoStripslashes && !$stripSlashes)) {
 			return stripslashes($this->Record[$name]);
 		} else {
@@ -245,8 +232,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 */
 
@@ -274,8 +260,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') : '').
@@ -306,8 +291,7 @@ 
 		}
 	}
 
-	public function emailError($queryString, $error, $line, $file)
-	{
+	public function emailError($queryString, $error, $line, $file) {
 		$subject = php_uname('n').' MySQLi Error';
 		$smarty = new \TFSmarty();
 		$smarty->assign([
@@ -334,8 +318,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' || !in_array($this->Error, ['', '()'])) {
 			$sqlstate = mysqli_sqlstate($this->linkId);
@@ -347,8 +330,7 @@ 
 	/**
 	 * @return array
 	 */
-	public function indexNames()
-	{
+	public function indexNames() {
 		return [];
 	}
 	
@@ -360,8 +342,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
@@ -383,8 +364,7 @@ 
 	 * Return logged queries.
 	 * @return array Logged queries
 	 */
-	public function getLog()
-	{
+	public function getLog() {
 		return $this->log;
 	}    
 }

src/Mysqli/Db.php

Indentation +11 added lines, -11 removed lines

@@ -69,12 +69,12 @@ 
 		if ($user == '') {
 			$user = $this->user;
 		}
-        if ($password == '') {
-            $password = $this->password;
-        }
-        if ($port == '') {
-            $port = $this->port;
-        }
+		if ($password == '') {
+			$password = $this->password;
+		}
+		if ($port == '') {
+			$port = $this->port;
+		}
 		/* establish connection, select database */
 		if (!is_object($this->linkId)) {
 			$this->connectionAttempt++;
@@ -87,11 +87,11 @@ 
 			}
 			$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 ($port != '') {
-                $this->linkId->real_connect($host, $user, $password, $database, $port);
-            } else {
-                $this->linkId->real_connect($host, $user, $password, $database);
-            }			
+			if ($port != '') {
+				$this->linkId->real_connect($host, $user, $password, $database, $port);
+			} else {
+				$this->linkId->real_connect($host, $user, $password, $database);
+			}			
 			$this->linkId->set_charset($this->characterSet);
 			if ($this->linkId->connect_errno) {
 				$this->halt("connect($host, $user, \$password) failed. ".$mysqli->connect_error);

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 = 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
@@ -267,8 +256,7 @@ 
 	/**
 	 * @return array|null|object
 	 */
-	public function fetchObject()
-	{
+	public function fetchObject() {
 		$this->Record = @mysqli_fetch_object($this->queryId);
 		return $this->Record;
 	}
@@ -281,8 +269,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;
@@ -306,8 +293,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;
@@ -327,8 +313,7 @@ 
 	 *
 	 * @return bool
 	 */
-	public function transactionBegin()
-	{
+	public function transactionBegin() {
 		if (version_compare(PHP_VERSION, '5.5.0') < 0) {
 			return true;
 		}
@@ -343,8 +328,7 @@ 
 	 *
 	 * @return bool
 	 */
-	public function transactionCommit()
-	{
+	public function transactionCommit() {
 		if (version_compare(PHP_VERSION, '5.5.0') < 0 || $this->linkId === 0) {
 			return true;
 		}
@@ -356,8 +340,7 @@ 
 	 *
 	 * @return bool
 	 */
-	public function transactionAbort()
-	{
+	public function transactionAbort() {
 		if (version_compare(PHP_VERSION, '5.5.0') < 0 || $this->linkId === 0) {
 			return true;
 		}
@@ -373,8 +356,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;
 		}
@@ -390,8 +372,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)) {
@@ -419,8 +400,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');
@@ -437,8 +417,7 @@ 
 	 * Db::affectedRows()
 	 * @return int
 	 */
-	public function affectedRows()
-	{
+	public function affectedRows() {
 		return @mysqli_affected_rows($this->linkId);
 	}
 
@@ -446,8 +425,7 @@ 
 	 * Db::num_rows()
 	 * @return int
 	 */
-	public function num_rows()
-	{
+	public function num_rows() {
 		return @mysqli_num_rows($this->queryId);
 	}
 
@@ -455,8 +433,7 @@ 
 	 * Db::num_fields()
 	 * @return int
 	 */
-	public function num_fields()
-	{
+	public function num_fields() {
 		return @mysqli_num_fields($this->queryId);
 	}
 
@@ -465,8 +442,7 @@ 
 	 *
 	 * @return array
 	 */
-	public function tableNames()
-	{
+	public function tableNames() {
 		$return = [];
 		$this->query('SHOW TABLES');
 		$i = 0;