detain / db_abstraction

src/Mysqli/Db.php

Indentation +25 added lines, -25 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);
@@ -247,20 +247,20 @@ 
 			}
 			$start = microtime(true);
 			if (false === $this->queryId = @mysqli_query($this->linkId, $queryString, MYSQLI_STORE_RESULT)) {
-                if (@mysqli_errno($this->linkId) == 3101) {
-                    myadmin_log('myadmin', 'error', 'Got MySQLi 3101 Rollback Error, Trying Again in 1 second', __LINE__, __FILE__);
-                    sleep(1);
-                    if (false === $this->queryId = @mysqli_query($this->linkId, $queryString, MYSQLI_STORE_RESULT)) {
-                        if (@mysqli_errno($this->linkId) == 3101) {
-                            myadmin_log('myadmin', 'error', 'Got MySQLi 3101 Rollback Error, Trying Again in 1 second', __LINE__, __FILE__);
-                            sleep(1);
-                            if (false === $this->queryId = @mysqli_query($this->linkId, $queryString, MYSQLI_STORE_RESULT)) {
-                                myadmin_log('myadmin', 'error', 'Got MySQLi 3101 Rollback Error, Giving Up', __LINE__, __FILE__);
-                            }
-                        }
-                    }
-                }
-            }
+				if (@mysqli_errno($this->linkId) == 3101) {
+					myadmin_log('myadmin', 'error', 'Got MySQLi 3101 Rollback Error, Trying Again in 1 second', __LINE__, __FILE__);
+					sleep(1);
+					if (false === $this->queryId = @mysqli_query($this->linkId, $queryString, MYSQLI_STORE_RESULT)) {
+						if (@mysqli_errno($this->linkId) == 3101) {
+							myadmin_log('myadmin', 'error', 'Got MySQLi 3101 Rollback Error, Trying Again in 1 second', __LINE__, __FILE__);
+							sleep(1);
+							if (false === $this->queryId = @mysqli_query($this->linkId, $queryString, MYSQLI_STORE_RESULT)) {
+								myadmin_log('myadmin', 'error', 'Got MySQLi 3101 Rollback Error, Giving Up', __LINE__, __FILE__);
+							}
+						}
+					}
+				}
+			}
  			$this->addLog($queryString, microtime(true) - $start, $line, $file);
 			$this->Row = 0;
 			$this->Errno = @mysqli_errno($this->linkId);