Ysurac / FlightAirMap

require/class.Connection.php

Doc Comments +20 added lines

@@ -6,6 +6,9 @@ 
 	public $dbs = array();
 	public $latest_schema = 40;
 	
+	/**
+	 * @param string $dbname
+	 */
 	public function __construct($dbc = null,$dbname = null,$user = null,$pass = null) {
 	    global $globalDBdriver, $globalNoDB;
 	    if (isset($globalNoDB) && $globalNoDB === TRUE) {
@@ -141,6 +144,9 @@ 
 		return true;
 	}
 
+	/**
+	 * @param string $table
+	 */
 	public function tableExists($table)
 	{
 		global $globalDBdriver, $globalDBname;
@@ -190,6 +196,11 @@ 
 	/*
 	* Check if index exist
 	*/
+
+	/**
+	 * @param string $table
+	 * @param string $index
+	 */
 	public function indexExists($table,$index)
 	{
 		global $globalDBdriver, $globalDBname;
@@ -232,6 +243,10 @@ 
 		return $columns;
 	}
 
+	/**
+	 * @param string $table
+	 * @param string $column
+	 */
 	public function getColumnType($table,$column) {
 		$select = $this->db->query('SELECT '.$column.' FROM '.$table);
 		$tomet = $select->getColumnMeta(0);
@@ -242,6 +257,11 @@ 
 	* Check if a column name exist in a table
 	* @return Boolean column exist or not
 	*/
+
+	/**
+	 * @param string $table
+	 * @param string $name
+	 */
 	public function checkColumnName($table,$name)
 	{
 		global $globalDBdriver, $globalDBname;

Indentation +30 added lines, -30 removed lines

@@ -7,35 +7,35 @@ 
 	public $latest_schema = 40;
 	
 	public function __construct($dbc = null,$dbname = null,$user = null,$pass = null) {
-	    global $globalDBdriver, $globalNoDB;
-	    if (isset($globalNoDB) && $globalNoDB === TRUE) {
+		global $globalDBdriver, $globalNoDB;
+		if (isset($globalNoDB) && $globalNoDB === TRUE) {
 		$this->db = null;
-	    } else {
+		} else {
 		if ($dbc === null) {
-		    if ($this->db === null && $dbname === null) {
+			if ($this->db === null && $dbname === null) {
 			if ($user === null && $pass === null) {
-			    $this->createDBConnection();
+				$this->createDBConnection();
 			} else {
-			    $this->createDBConnection(null,$user,$pass);
+				$this->createDBConnection(null,$user,$pass);
 			}
-		    } else {
+			} else {
 			$this->createDBConnection($dbname);
-		    }
+			}
 		} elseif ($dbname === null || $dbname === 'default') {
-	    	    $this->db = $dbc;
-	    	    if ($this->connectionExists() === false) {
+				$this->db = $dbc;
+				if ($this->connectionExists() === false) {
 			/*
 			echo 'Restart Connection !!!'."\n";
 			$e = new \Exception;
 			var_dump($e->getTraceAsString());
 			*/
 			$this->createDBConnection();
-		    }
+			}
 		} else {
-		    //$this->connectionExists();
-		    $this->dbs[$dbname] = $dbc;
+			//$this->connectionExists();
+			$this->dbs[$dbname] = $dbc;
+		}
 		}
-	    }
 	}
 
 	public function db() {
@@ -56,11 +56,11 @@ 
 	}
 
 	/**
-	* Creates the database connection
-	*
-	* @return Boolean of the database connection
-	*
-	*/
+	 * Creates the database connection
+	 *
+	 * @return Boolean of the database connection
+	 *
+	 */
 
 	public function createDBConnection($DBname = null, $user = null, $pass = null)
 	{
@@ -157,7 +157,7 @@ 
 			return false;
 		}
 		if($results->rowCount()>0) {
-		    return true; 
+			return true; 
 		}
 		else return false;
 	}
@@ -174,14 +174,14 @@ 
 				$sum = $sum->fetchColumn(0);
 			} else $sum = 0;
 			if (intval($sum) !== 2) {
-			     return false;
+				 return false;
 			}
 			
 		} catch(PDOException $e) {
 			if($e->getCode() != 'HY000' || !stristr($e->getMessage(), 'server has gone away')) {
-            			throw $e;
-	                }
-	                //echo 'error ! '.$e->getMessage();
+						throw $e;
+					}
+					//echo 'error ! '.$e->getMessage();
 			return false;
 		}
 		return true; 
@@ -285,8 +285,8 @@ 
 		$version = 0;
 		if ($this->tableExists('aircraft')) {
 			if (!$this->tableExists('config')) {
-	    			$version = '1';
-	    			return $version;
+					$version = '1';
+					return $version;
 			} else {
 				$query = "SELECT value FROM config WHERE name = 'schema_version' LIMIT 1";
 				try {
@@ -307,10 +307,10 @@ 
 	* @return Boolean if latest version or not
 	*/
 	public function latest() {
-	    global $globalNoDB;
-	    if (isset($globalNoDB) && $globalNoDB === TRUE) return true;
-	    if ($this->check_schema_version() == $this->latest_schema) return true;
-	    else return false;
+		global $globalNoDB;
+		if (isset($globalNoDB) && $globalNoDB === TRUE) return true;
+		if ($this->check_schema_version() == $this->latest_schema) return true;
+		else return false;
 	}
 
 }