detain / db_abstraction

src/Loader.php

Braces +10 added lines, -20 removed lines

@@ -14,8 +14,7 @@ 
  *
  * @package MyDb
  */
-class Loader
-{
+class Loader {
 	/* public: connection parameters */
 	public $Type = 'mysqli';
 	public $host = 'localhost';
@@ -55,8 +54,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) {
@@ -97,24 +95,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;
 	}
 
@@ -122,8 +117,7 @@ 
 	 * @param $str
 	 * @return string
 	 */
-	public function dbAddslashes($str)
-	{
+	public function dbAddslashes($str) {
 		if (!isset($str) || $str == '') {
 			return '';
 		}
@@ -141,8 +135,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);
 	}
 
@@ -154,8 +147,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') {
@@ -181,8 +173,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__);
@@ -192,8 +183,7 @@ 
 	/**
 	 * @return array
 	 */
-	public function indexNames()
-	{
+	public function indexNames() {
 		return [];
 	}
 }

src/Generic.php

Braces +18 added lines, -36 removed lines

@@ -12,8 +12,7 @@ 
 /**
  * Class Generic
  */
-abstract class Generic
-{
+abstract class Generic {
 	/* public: connection parameters */
 	public $host = 'localhost';
 	public $database = '';
@@ -63,8 +62,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($database = '', $user = '', $password = '', $host = 'localhost', $query = '')
-	{
+	public function __construct($database = '', $user = '', $password = '', $host = 'localhost', $query = '') {
 		$this->database = $database;
 		$this->user = $user;
 		$this->password = $password;
@@ -81,24 +79,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;
 	}
 
@@ -106,8 +101,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);
 		}
@@ -118,8 +112,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);
@@ -129,8 +122,7 @@ 
 	 * @param mixed $str
 	 * @return string
 	 */
-	public function dbAddslashes($str = '')
-	{
+	public function dbAddslashes($str = '') {
 		if (!isset($str) || $str == '') {
 			return '';
 		}
@@ -142,8 +134,7 @@ 
 	 * @param mixed $epoch
 	 * @return bool|string
 	 */
-	public function toTimestamp($epoch)
-	{
+	public function toTimestamp($epoch) {
 		return date('Y-m-d H:i:s', $epoch);
 	}
 
@@ -152,8 +143,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)) {
@@ -179,8 +169,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;
 		}
@@ -207,8 +196,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);
 	}
 
@@ -219,8 +207,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 {
@@ -236,8 +223,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 */
 
@@ -265,8 +251,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') : '').
@@ -293,8 +278,7 @@ 
 		}
 	}
 
-	public function emailError($queryString, $error, $line, $file)
-	{
+	public function emailError($queryString, $error, $line, $file) {
 		$email = $this->type." Error<br>\n".'Query: '.$queryString."<br>\n".$error."<br>\n".'Line: '.$line."<br>\n".'File: '.$file."<br>\n".(isset($GLOBALS['tf']) ? 'User: '.$GLOBALS['tf']->session->account_id."<br>\n" : '');
 		$email .= '<br><br>Request Variables:<br>'.print_r($_REQUEST, true);
 		$email .= '<br><br>Server Variables:<br>'.print_r($_SERVER, true);
@@ -315,8 +299,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);
@@ -328,8 +311,7 @@ 
 	/**
 	 * @return array
 	 */
-	public function indexNames()
-	{
+	public function indexNames() {
 		return [];
 	}
 }