detain / db_abstraction

src/Mysqli/Db.php

Braces +1 added lines, -2 removed lines

@@ -17,8 +17,7 @@
  *
  * @access public
  */
-class Db extends Generic implements Db_Interface
-{
+class Db extends Generic implements Db_Interface {
 	/**
 	 * @var string
 	 */

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

@@ -170,7 +170,7 @@ 
 	public function queryReturn($query, $line = '', $file = '') {
 		$this->query($query, $line, $file);
 		if ($this->num_rows() == 0) {
-			return FALSE;
+			return false;
 		} elseif ($this->num_rows() == 1) {
 			$this->next_record(MYSQLI_ASSOC);
 			return $this->Record;
@@ -239,12 +239,12 @@ 
 			$this->free();
 		if ($this->Debug)
 			printf("Debug: query = %s<br>\n", $queryString);
-		if (isset($GLOBALS['log_queries']) && $GLOBALS['log_queries'] !== FALSE)
+		if (isset($GLOBALS['log_queries']) && $GLOBALS['log_queries'] !== false)
 			$this->log($queryString, $line, $file);
 		$tries = 3;
 		$try = 0;
-		$this->queryId = FALSE;
-		while ((null === $this->queryId || $this->queryId === FALSE) && $try <= $tries) {
+		$this->queryId = false;
+		while ((null === $this->queryId || $this->queryId === false) && $try <= $tries) {
 			$try++;
 			if ($try > 1) {
 				@mysqli_close($this->linkId);
@@ -254,10 +254,10 @@ 
 			$this->Row = 0;
 			$this->Errno = @mysqli_errno($this->linkId);
 			$this->Error = @mysqli_error($this->linkId);
-			if ($try == 1 && (null === $this->queryId || $this->queryId === FALSE)) {
+			if ($try == 1 && (null === $this->queryId || $this->queryId === false)) {
 				$email = "MySQLi Error<br>\n".'Query: '.$queryString."<br>\n".'Error #'.$this->Errno.': '.$this->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);
+				$email .= '<br><br>Request Variables:<br>'.print_r($_REQUEST, true);
+				$email .= '<br><br>Server Variables:<br>'.print_r($_SERVER, true);
 				$subject = $_SERVER['HOSTNAME'].' MySQLi Error';
 				$headers = '';
 				$headers .= 'MIME-Version: 1.0'.PHP_EOL;
@@ -270,7 +270,7 @@ 
 			}
 		}
 		$this->haltOnError = $haltPrev;
-		if (null === $this->queryId || $this->queryId === FALSE)
+		if (null === $this->queryId || $this->queryId === false)
 			$this->halt('', $line, $file);
 
 		// Will return nada if it fails. That's fine.
@@ -294,7 +294,7 @@ 
 	 * @return bool
 	 */
 	public function next_record($resultType = MYSQLI_BOTH) {
-		if ($this->queryId === FALSE) {
+		if ($this->queryId === false) {
 			$this->halt('next_record called with no query pending.');
 			return 0;
 		}
@@ -422,11 +422,11 @@ 
 	 * @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');
-		if ($haltOnError === TRUE && !$res) {
+		if ($haltOnError === true && !$res) {
 			$this->halt('unlock() failed.');
 			return 0;
 		}
@@ -515,9 +515,9 @@ 
  * @return bool
  */
 function mysqli_result($result, $row, $field = 0) {
-	if ($result === false) return FALSE;
-	if ($row >= mysqli_num_rows($result)) return FALSE;
-	if (is_string($field) && !(mb_strpos($field, '.') === FALSE)) {
+	if ($result === false) return false;
+	if ($row >= mysqli_num_rows($result)) return false;
+	if (is_string($field) && !(mb_strpos($field, '.') === false)) {
 		$tField = explode('.', $field);
 		$field = -1;
 		$tFields = mysqli_fetch_fields($result);
@@ -527,7 +527,7 @@ 
 				break;
 			}
 		}
-		if ($field == -1) return FALSE;
+		if ($field == -1) return false;
 	}
 	mysqli_data_seek($result, $row);
 	$line = mysqli_fetch_array($result);

src/Db_Interface.php

Indentation +6 added lines, -6 removed lines

@@ -1,11 +1,11 @@
 <?php
 /**
-	* Generic SQL Driver Related Functionality
-	* by detani@interserver.net
-	* @copyright 2018
-	* @package MyAdmin
-	* @category SQL
-	*/
+ * Generic SQL Driver Related Functionality
+ * by detani@interserver.net
+ * @copyright 2018
+ * @package MyAdmin
+ * @category SQL
+ */
 
 namespace MyDb;
 /**

Braces +1 added lines, -2 removed lines

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

src/Pdo/Db.php

Braces +3 added lines, -6 removed lines

@@ -17,8 +17,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 = [];
@@ -76,11 +75,9 @@ 
 		if ($this->characterSet != '')
 			$dSN .= ';charset='.$this->characterSet;
 		if ($this->linkId === FALSE) {
-			try
-			{
+			try {
 				$this->linkId = new \PDO($dSN, $user, $password);
-			}
-			catch (\PDOException $e) {
+			} catch (\PDOException $e) {
 				$this->halt('Connection Failed '.$e->getMessage());
 				return 0;
 			}

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

@@ -75,7 +75,7 @@ 
 		$dSN = "$driver:dbname=$database;host=$host";
 		if ($this->characterSet != '')
 			$dSN .= ';charset='.$this->characterSet;
-		if ($this->linkId === FALSE) {
+		if ($this->linkId === false) {
 			try
 			{
 				$this->linkId = new \PDO($dSN, $user, $password);
@@ -138,7 +138,7 @@ 
 	public function queryReturn($query, $line = '', $file = '') {
 		$this->query($query, $line, $file);
 		if ($this->num_rows() == 0) {
-			return FALSE;
+			return false;
 		} elseif ($this->num_rows() == 1) {
 			$this->next_record(MYSQL_ASSOC);
 			return $this->Record;
@@ -187,12 +187,12 @@ 
 			/* we already complained in connect() about that. */
 		}
 		// New query, discard previous result.
-		if ($this->queryId !== FALSE)
+		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)
+		if (isset($GLOBALS['log_queries']) && $GLOBALS['log_queries'] !== false)
 			$this->log($queryString, $line, $file);
 
 		$this->queryId = $this->linkId->prepare($queryString);
@@ -200,8 +200,8 @@ 
 		$this->Rows = $this->queryId->fetchAll();
 		$this->log("PDO Query $queryString (S:$success) - ".count($this->Rows).' Rows', __LINE__, __FILE__);
 		$this->Row = 0;
-		if ($success === FALSE) {
-			$email = "MySQL Error<br>\n".'Query: '.$queryString."<br>\n".'Error #'.print_r($this->queryId->errorInfo(), TRUE)."<br>\n".'Line: '.$line."<br>\n".'File: '.$file."<br>\n".(isset($GLOBALS['tf']) ? 'User: '.$GLOBALS['tf']->session->account_id."<br>\n" : '');
+		if ($success === false) {
+			$email = "MySQL Error<br>\n".'Query: '.$queryString."<br>\n".'Error #'.print_r($this->queryId->errorInfo(), true)."<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>';
 			foreach ($_REQUEST as $key => $value)
@@ -216,7 +216,7 @@ 
 			$headers .= 'Content-type: text/html; charset=UTF-8'.PHP_EOL;
 			$headers .= 'From: No-Reply <no-reply@interserver.net>'.PHP_EOL;
 			$headers .= 'X-Mailer: Trouble-Free.Net Admin Center'.PHP_EOL;
-			admin_mail($subject, $email, $headers, FALSE, 'admin/sql_error.tpl');
+			admin_mail($subject, $email, $headers, false, 'admin/sql_error.tpl');
 			$this->halt('Invalid SQL: '.$queryString, $line, $file);
 		}
 

src/Generic.php

Braces +1 added lines, -2 removed lines

@@ -12,8 +12,7 @@
 /**
  * Class Generic
  */
-abstract class Generic
-{
+abstract class Generic {
 	/* public: connection parameters */
 	public $host = 'localhost';
 	public $database = '';

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

@@ -21,7 +21,7 @@ 
 	public $password = '';
 
 	/* public: configuration parameters */
-	public $autoStripslashes = FALSE;
+	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)
 
@@ -152,7 +152,7 @@ 
 			$time = $timestamp;
 		else {
 			$this->log('Cannot Match Timestamp from '.$timestamp, __LINE__, __FILE__);
-			$time = FALSE;
+			$time = false;
 		}
 		return $time;
 	}

src/Mdb2/Db.php

Braces +1 added lines, -2 removed lines

@@ -17,8 +17,7 @@
  *
  * @access public
  */
-class Db extends Generic implements Db_Interface
-{
+class Db extends Generic implements Db_Interface {
 	public $host = 'localhost';
 	public $user = 'pdns';
 	public $password = '';

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

@@ -24,7 +24,7 @@ 
 	public $password = '';
 	public $database = 'pdns';
 	public $type = 'mdb2';
-	public $error = FALSE;
+	public $error = false;
 	public $message = '';
 
 	/**
@@ -220,7 +220,7 @@ 
 	public function queryReturn($query, $line = '', $file = '') {
 		$this->query($query, $line, $file);
 		if ($this->num_rows() == 0) {
-			return FALSE;
+			return false;
 		} elseif ($this->num_rows() == 1) {
 			$this->next_record(MYSQL_ASSOC);
 			return $this->Record;
@@ -275,7 +275,7 @@ 
 			$this->free();
 		if ($this->Debug)
 			printf("Debug: query = %s<br>\n", $queryString);
-		if (isset($GLOBALS['log_queries']) && $GLOBALS['log_queries'] !== FALSE)
+		if (isset($GLOBALS['log_queries']) && $GLOBALS['log_queries'] !== false)
 			$this->log($queryString, $line, $file);
 		$tries = 3;
 		$try = 1;
@@ -283,27 +283,27 @@ 
 		$this->Row = 0;
 		$this->Errno = @mysqli_errno($this->linkId);
 		$this->Error = @mysqli_error($this->linkId);
-		while ($this->queryId === FALSE && $try <= $tries) {
+		while ($this->queryId === false && $try <= $tries) {
 			$this->message = 'MySQL error '.@mysqli_errno($this->linkId).': '.@mysqli_error($this->linkId).' Query: '.$this->query;
-			$this->error = TRUE;
+			$this->error = true;
 			@mysqli_close($this->linkId);
 			$this->connect();
 			$try++;
 		}
 		$this->haltOnError = $haltPrev;
-		if ($this->queryId === FALSE) {
+		if ($this->queryId === false) {
 			$email = "MySQLi Error<br>\n".'Query: '.$queryString."<br>\n".'Error #'.$this->Errno.': '.$this->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);
+			$email .= '<br><br>Request Variables:<br>'.print_r($_REQUEST, true);
+			$email .= '<br><br>Server Variables:<br>'.print_r($_SERVER, true);
 			$subject = $_SERVER['HOSTNAME'].' MySQLi Error';
 			$headers = '';
 			$headers .= 'MIME-Version: 1.0'.PHP_EOL;
 			$headers .= 'Content-type: text/html; charset=UTF-8'.PHP_EOL;
 			$headers .= 'From: No-Reply <no-reply@interserver.net>'.PHP_EOL;
 			$headers .= 'X-Mailer: Trouble-Free.Net Admin Center'.PHP_EOL;
-			admin_mail($subject, $email, $headers, FALSE, 'admin/sql_error.tpl');
+			admin_mail($subject, $email, $headers, false, 'admin/sql_error.tpl');
 			$this->halt('Invalid SQL: '.$queryString, $line, $file);
 		}
 
@@ -320,7 +320,7 @@ 
 	 * @return bool
 	 */
 	public function next_record($resultType = MYSQLI_BOTH) {
-		if ($this->queryId === FALSE) {
+		if ($this->queryId === false) {
 			$this->halt('next_record called with no query pending.');
 			return 0;
 		}
@@ -365,7 +365,7 @@ 
 	 * @return bool
 	 */
 	public function transactionBegin() {
-		return TRUE;
+		return true;
 	}
 
 	/**
@@ -373,7 +373,7 @@ 
 	 * @return bool
 	 */
 	public function transactionCommit() {
-		return TRUE;
+		return true;
 	}
 
 	/**
@@ -381,7 +381,7 @@ 
 	 * @return bool
 	 */
 	public function transactionAbort() {
-		return TRUE;
+		return true;
 	}
 
 	/**

src/Loader.php

Braces +1 added lines, -2 removed lines

@@ -13,8 +13,7 @@
  *
  * @package MyDb
  */
-class Loader
-{
+class Loader {
 	/* public: connection parameters */
 	public $Type = 'mysqli';
 	public $host = 'localhost';

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

@@ -23,7 +23,7 @@
 	public $password = '';
 
 	/* public: configuration parameters */
-	public $autoStripslashes = FALSE;
+	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)
 

src/Pgsql/Db.php

Braces +1 added lines, -2 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 = '5432';

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

@@ -115,7 +115,7 @@ 
 	public function queryReturn($query, $line = '', $file = '') {
 		$this->query($query, $line, $file);
 		if ($this->num_rows() == 0) {
-			return FALSE;
+			return false;
 		} elseif ($this->num_rows() == 1) {
 			$this->next_record(MYSQL_ASSOC);
 			return $this->Record;
@@ -236,7 +236,7 @@ 
 		if (!$this->Errno) {
 			return pg_exec($this->linkId, 'commit');
 		} else {
-			return FALSE;
+			return false;
 		}
 	}
 

src/Adodb/Db.php

Braces +3 added lines, -6 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';
@@ -172,11 +171,9 @@ 
 
 		}
 
-		try
-		{
+		try {
 			$this->queryId = $this->linkId->Execute($queryString);
-		}
-		catch (exception $e) {
+		} catch (exception $e) {
 			$email = "MySQL Error<br>\n".'Query: '.$queryString."<br>\n".'Error #'.print_r($e, TRUE)."<br>\n".'Line: '.$line."<br>\n".'File: '.$file."<br>\n".(isset($GLOBALS['tf']) ?
 					'User: '.$GLOBALS['tf']->session->account_id."<br>\n" : '');
 

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

@@ -45,7 +45,7 @@ 
 		if ('' == $driver)
 			$driver = $this->driver;
 		/* establish connection, select database */
-		if ($this->linkId === FALSE) {
+		if ($this->linkId === false) {
 			$this->linkId = NewADOConnection($driver);
 			$this->linkId->Connect($host, $user, $password, $database);
 		}
@@ -112,7 +112,7 @@ 
 	public function queryReturn($query, $line = '', $file = '') {
 		$this->query($query, $line, $file);
 		if ($this->num_rows() == 0) {
-			return FALSE;
+			return false;
 		} elseif ($this->num_rows() == 1) {
 			$this->next_record(MYSQL_ASSOC);
 			return $this->Record;
@@ -162,12 +162,12 @@ 
 		}
 
 		// New query, discard previous result.
-		if ($this->queryId !== FALSE)
+		if ($this->queryId !== false)
 			$this->free();
 
 		if ($this->Debug)
 			printf("Debug: query = %s<br>\n", $queryString);
-		if ($GLOBALS['log_queries'] !== FALSE) {
+		if ($GLOBALS['log_queries'] !== false) {
 			$this->log($queryString, $line, $file);
 
 		}
@@ -177,7 +177,7 @@ 
 			$this->queryId = $this->linkId->Execute($queryString);
 		}
 		catch (exception $e) {
-			$email = "MySQL Error<br>\n".'Query: '.$queryString."<br>\n".'Error #'.print_r($e, TRUE)."<br>\n".'Line: '.$line."<br>\n".'File: '.$file."<br>\n".(isset($GLOBALS['tf']) ?
+			$email = "MySQL Error<br>\n".'Query: '.$queryString."<br>\n".'Error #'.print_r($e, true)."<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>';
@@ -193,7 +193,7 @@ 
 			$headers .= 'Content-type: text/html; charset=UTF-8'.PHP_EOL;
 			$headers .= 'From: No-Reply <no-reply@interserver.net>'.PHP_EOL;
 			$headers .= 'X-Mailer: Trouble-Free.Net Admin Center'.PHP_EOL;
-			admin_mail($subject, $email, $headers, FALSE, 'admin/sql_error.tpl');
+			admin_mail($subject, $email, $headers, false, 'admin/sql_error.tpl');
 			$this->halt('Invalid SQL: '.$queryString, $line, $file);
 		}
 		$this->log("ADOdb Query $queryString (S:$success) - ".count($this->Rows).' Rows', __LINE__, __FILE__);
@@ -247,7 +247,7 @@ 
 	 * @return bool
 	 */
 	public function transactionBegin() {
-		return TRUE;
+		return true;
 	}
 
 	/**
@@ -255,7 +255,7 @@ 
 	 * @return bool
 	 */
 	public function transactionCommit() {
-		return TRUE;
+		return true;
 	}
 
 	/**
@@ -263,7 +263,7 @@ 
 	 * @return bool
 	 */
 	public function transactionAbort() {
-		return TRUE;
+		return true;
 	}
 
 	/**