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);
 		}

src/Mysqli/Db.php

Indentation +23 added lines, -23 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);
@@ -246,18 +246,18 @@ 
 				$this->connect();
 			}
 			$start = microtime(true);
-            $onlyRollback = true;
-            $fails = 0;
-            while ($fails < 10 && false === $this->queryId = @mysqli_query($this->linkId, $queryString, MYSQLI_STORE_RESULT)) {
-                $fails++; 
-                if (@mysqli_errno($this->linkId) == 3101)
-                    usleep(500000); // half a second
-                else
-                    $onlyRollback = false;
-            } 
-            if ($onlyRollback === true && false === $this->queryId) {
-                myadmin_log('myadmin', 'error', 'Got MySQLi 3101 Rollback Error '.$fails.' Times, Giving Up', __LINE__, __FILE__);
-            }
+			$onlyRollback = true;
+			$fails = 0;
+			while ($fails < 10 && false === $this->queryId = @mysqli_query($this->linkId, $queryString, MYSQLI_STORE_RESULT)) {
+				$fails++; 
+				if (@mysqli_errno($this->linkId) == 3101)
+					usleep(500000); // half a second
+				else
+					$onlyRollback = false;
+			} 
+			if ($onlyRollback === true && false === $this->queryId) {
+				myadmin_log('myadmin', 'error', 'Got MySQLi 3101 Rollback Error '.$fails.' Times, Giving Up', __LINE__, __FILE__);
+			}
  			$this->addLog($queryString, microtime(true) - $start, $line, $file);
 			$this->Row = 0;
 			$this->Errno = @mysqli_errno($this->linkId);