From 7fe908c50c8dbc5cc05f571dbe11d66141caacd4 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Thu, 14 Nov 2013 09:01:22 -0500
Subject: [PATCH] Cleaning up code to match coding guidelines

---
 install/lib/mysql.lib.php |  574 ++++++++++++++++++++++++++++----------------------------
 1 files changed, 287 insertions(+), 287 deletions(-)

diff --git a/install/lib/mysql.lib.php b/install/lib/mysql.lib.php
index b7f1ae8..c5c2a83 100644
--- a/install/lib/mysql.lib.php
+++ b/install/lib/mysql.lib.php
@@ -30,25 +30,25 @@
 
 class db
 {
-	var $dbHost = "";		  // hostname of the MySQL server
-	var $dbName = "";		  // logical database name on that server
-	var $dbUser = "";		  // database authorized user
-	var $dbPass = "";		  // user's password
+	var $dbHost = "";    // hostname of the MySQL server
+	var $dbName = "";    // logical database name on that server
+	var $dbUser = "";    // database authorized user
+	var $dbPass = "";    // user's password
 	var $dbCharset = "";      // what charset comes and goes to mysql: utf8 / latin1
-	var $linkId = false;		  // last result of mysql_connect()
-	var $queryId = 0;		  // last result of mysql_query()
-	var $record	= array();	  // last record fetched
-    var $autoCommit = 1;      // Autocommit Transactions
-	var $currentRow;		  // current row number
-	var $errorNumber = 0;	  // last error number
-	var $errorMessage = "";	  // last error message
+	var $linkId = false;    // last result of mysql_connect()
+	var $queryId = 0;    // last result of mysql_query()
+	var $record = array();   // last record fetched
+	var $autoCommit = 1;      // Autocommit Transactions
+	var $currentRow;    // current row number
+	var $errorNumber = 0;   // last error number
+	var $errorMessage = "";   // last error message
 	var $errorLocation = "";  // last error location
 	var $show_error_messages = false;
 
 	// constructor
 	function db()
 	{
-		
+
 		global $conf;
 		$this->dbHost = $conf["mysql"]["host"];
 		//$this->dbName = $conf["mysql"]["database"];
@@ -66,7 +66,7 @@
 		$this->errorLocation = $location;
 		if($this->errorNumber && $this->show_error_messages)
 		{
-			echo('<br /><b>'.$this->errorLocation.'</b><br />'.$this->errorMessage);
+			echo '<br /><b>'.$this->errorLocation.'</b><br />'.$this->errorMessage;
 			flush();
 		}
 	}
@@ -138,7 +138,7 @@
 	// returns the next record in an array
 	function nextRecord()
 	{
-        $this->record = mysqli_fetch_assoc($this->queryId);
+		$this->record = mysqli_fetch_assoc($this->queryId);
 		$this->updateError('DB::nextRecord()<br />mysqli_fetch_array');
 		if(!$this->record || !is_array($this->record))
 		{
@@ -153,37 +153,37 @@
 	{
 		return mysqli_num_rows($this->queryId);
 	}
-	
+
 	function affectedRows()
 	{
 		return mysqli_affected_rows($this->linkId);
 	}
-	
+
 	// returns mySQL insert id
 	function insertID()
 	{
 		return mysqli_insert_id($this->linkId);
 	}
-    
-    // Check der variablen
+
+	// Check der variablen
 	// deprecated, now use quote
-    function check($formfield)
-    {
-        return $this->quote($formfield);
-    }
-	
+	function check($formfield)
+	{
+		return $this->quote($formfield);
+	}
+
 	// Check der variablen
-    function quote($formfield)
-    {
-        return mysqli_real_escape_string($this->linkId, $formfield);
-    }
-	
+	function quote($formfield)
+	{
+		return mysqli_real_escape_string($this->linkId, $formfield);
+	}
+
 	// Check der variablen
-    function unquote($formfield)
-    {
-        return stripslashes($formfield);
-    }
-	
+	function unquote($formfield)
+	{
+		return stripslashes($formfield);
+	}
+
 	function toLower($record) {
 		if(is_array($record)) {
 			foreach($record as $key => $val) {
@@ -191,116 +191,64 @@
 				$out[$key] = $val;
 			}
 		}
-	return $out;
+		return $out;
 	}
-   
-   
-   function insert($tablename,$form,$debug = 0)
-   {
-     if(is_array($form)){
-       foreach($form as $key => $value) 
-	    {
-	    $sql_key .= "$key, ";
-        $sql_value .= "'".$this->check($value)."', ";
-  		 }
-   	$sql_key = substr($sql_key,0,strlen($sql_key) - 2);
-    $sql_value = substr($sql_value,0,strlen($sql_value) - 2);
-    
-   	$sql = "INSERT INTO $tablename (" . $sql_key . ") VALUES (" . $sql_value .")";
-   
-  		 if($debug == 1) echo "SQL-Statement: ".$sql."<br><br>";
-  		 $this->query($sql);
-  		 if($debug == 1) echo "mySQL Error Message: ".$this->errorMessage;
-      }
-   }
-   
-   function update($tablename,$form,$bedingung,$debug = 0)
-   {
-   
-     if(is_array($form)){
-       foreach($form as $key => $value) 
-	    {
-	    $insql .= "$key = '".$this->check($value)."', ";
-  		 }
-   	        $insql = substr($insql,0,strlen($insql) - 2);
-   	        $sql = "UPDATE $tablename SET " . $insql . " WHERE $bedingung";
-  		 if($debug == 1) echo "SQL-Statement: ".$sql."<br><br>";
-  		 $this->query($sql);
-  		 if($debug == 1) echo "mySQL Error Message: ".$this->errorMessage;
-       }
-   }
-   
-   function closeConn() {
-   
-   }
-   
-   function freeResult() {
-   
-   
-   }
-   
-   function delete() {
-   
-   }
-   
-   function Transaction($action) {
-   //action = begin, commit oder rollback
-   
-   }
-   
-   /*
-   $columns = array(action =>   add | alter | drop
-                    name =>     Spaltenname
-                    name_new => neuer Spaltenname, nur bei 'alter' belegt
-                    type =>     42go-Meta-Type: int16, int32, int64, double, char, varchar, text, blob
-                    typeValue => Wert z.B. bei Varchar
-                    defaultValue =>  Default Wert
-                    notNull =>   true | false
-                    autoInc =>   true | false
-                    option =>   unique | primary | index)
-   
-   
-   */
-   
-   function createTable($table_name,$columns) {
-   $index = "";
-   $sql = "CREATE TABLE $table_name (";
-   foreach($columns as $col){
-        $sql .= $col["name"]." ".$this->mapType($col["type"],$col["typeValue"])." ";
-   
-        if($col["defaultValue"] != "") {
-			if($col["defaultValue"] == "NULL" or $col["defaultValue"] == "NOT NULL") {
-				$sql .= "DEFAULT ".$col["defaultValue"]." ";
-			} else {
-				$sql .= "DEFAULT '".$col["defaultValue"]."' ";
+
+
+	function insert($tablename, $form, $debug = 0)
+	{
+		if(is_array($form)){
+			foreach($form as $key => $value)
+			{
+				$sql_key .= "$key, ";
+				$sql_value .= "'".$this->check($value)."', ";
 			}
-			
-		} elseif($col["defaultValue"] != false) {
-			$sql .= "DEFAULT '' ";
+			$sql_key = substr($sql_key, 0, strlen($sql_key) - 2);
+			$sql_value = substr($sql_value, 0, strlen($sql_value) - 2);
+
+			$sql = "INSERT INTO $tablename (" . $sql_key . ") VALUES (" . $sql_value .")";
+
+			if($debug == 1) echo "SQL-Statement: ".$sql."<br><br>";
+			$this->query($sql);
+			if($debug == 1) echo "mySQL Error Message: ".$this->errorMessage;
 		}
-		if($col["defaultValue"] != "NULL" && $col["defaultValue"] != "NOT NULL") {
-        	if($col["notNull"] == true) {
-            	$sql .= "NOT NULL ";
-        	} else {
-            	$sql .= "NULL ";
-        	}
+	}
+
+	function update($tablename, $form, $bedingung, $debug = 0)
+	{
+
+		if(is_array($form)){
+			foreach($form as $key => $value)
+			{
+				$insql .= "$key = '".$this->check($value)."', ";
+			}
+			$insql = substr($insql, 0, strlen($insql) - 2);
+			$sql = "UPDATE $tablename SET " . $insql . " WHERE $bedingung";
+			if($debug == 1) echo "SQL-Statement: ".$sql."<br><br>";
+			$this->query($sql);
+			if($debug == 1) echo "mySQL Error Message: ".$this->errorMessage;
 		}
-        if($col["autoInc"] == true) $sql .= "auto_increment ";
-        $sql.= ",";
-        // key Definitionen
-        if($col["option"] == "primary") $index .= "PRIMARY KEY (".$col["name"]."),";
-        if($col["option"] == "index") $index .= "INDEX (".$col["name"]."),";
-        if($col["option"] == "unique") $index .= "UNIQUE (".$col["name"]."),";
-   }
-   $sql .= $index;
-   $sql = substr($sql,0,-1);
-   $sql .= ")";
-   
-   $this->query($sql);
-   return true;
-   }
-   
-   /*
+	}
+
+	function closeConn() {
+
+	}
+
+	function freeResult() {
+
+
+	}
+
+	function delete() {
+
+	}
+
+	function Transaction($action) {
+		//action = begin, commit oder rollback
+
+	}
+
+	/*
    $columns = array(action =>   add | alter | drop
                     name =>     Spaltenname
                     name_new => neuer Spaltenname, nur bei 'alter' belegt
@@ -310,56 +258,108 @@
                     notNull =>   true | false
                     autoInc =>   true | false
                     option =>   unique | primary | index)
-   
-   
+
+
    */
-   function alterTable($table_name,$columns) {
-   $index = "";
-   $sql = "ALTER TABLE $table_name ";
-   foreach($columns as $col){
-        if($col["action"] == 'add') {
-            $sql .= "ADD ".$col["name"]." ".$this->mapType($col["type"],$col["typeValue"])." ";
-        } elseif ($col["action"] == 'alter') {
-            $sql .= "CHANGE ".$col["name"]." ".$col["name_new"]." ".$this->mapType($col["type"],$col["typeValue"])." ";
-        } elseif ($col["action"] == 'drop') {
-            $sql .= "DROP ".$col["name"]." ";
-        }
-        if($col["action"] != 'drop') {  
-        if($col["defaultValue"] != "") $sql .= "DEFAULT '".$col["defaultValue"]."' ";
-        if($col["notNull"] == true) {
-            $sql .= "NOT NULL ";
-        } else {
-            $sql .= "NULL ";
-        }
-        if($col["autoInc"] == true) $sql .= "auto_increment ";
-        $sql.= ",";
-        // key Definitionen
-        if($col["option"] == "primary") $index .= "PRIMARY KEY (".$col["name"]."),";
-        if($col["option"] == "index") $index .= "INDEX (".$col["name"]."),";
-        if($col["option"] == "unique") $index .= "UNIQUE (".$col["name"]."),";
-        }
-   }
-   $sql .= $index;
-   $sql = substr($sql,0,-1);
-   
-   //die($sql);
-   $this->query($sql);
-   return true;
-   }
-   
-   function dropTable($table_name) {
-   $this->check($table_name);
-   $sql = "DROP TABLE '". $table_name."'";
-   return $this->query($sql);
-   }
-   
-   // gibt Array mit Tabellennamen zur�ck
-   function getTables($database_name = '') {
-   	
+
+	function createTable($table_name, $columns) {
+		$index = "";
+		$sql = "CREATE TABLE $table_name (";
+		foreach($columns as $col){
+			$sql .= $col["name"]." ".$this->mapType($col["type"], $col["typeValue"])." ";
+
+			if($col["defaultValue"] != "") {
+				if($col["defaultValue"] == "NULL" or $col["defaultValue"] == "NOT NULL") {
+					$sql .= "DEFAULT ".$col["defaultValue"]." ";
+				} else {
+					$sql .= "DEFAULT '".$col["defaultValue"]."' ";
+				}
+
+			} elseif($col["defaultValue"] != false) {
+				$sql .= "DEFAULT '' ";
+			}
+			if($col["defaultValue"] != "NULL" && $col["defaultValue"] != "NOT NULL") {
+				if($col["notNull"] == true) {
+					$sql .= "NOT NULL ";
+				} else {
+					$sql .= "NULL ";
+				}
+			}
+			if($col["autoInc"] == true) $sql .= "auto_increment ";
+			$sql.= ",";
+			// key Definitionen
+			if($col["option"] == "primary") $index .= "PRIMARY KEY (".$col["name"]."),";
+			if($col["option"] == "index") $index .= "INDEX (".$col["name"]."),";
+			if($col["option"] == "unique") $index .= "UNIQUE (".$col["name"]."),";
+		}
+		$sql .= $index;
+		$sql = substr($sql, 0, -1);
+		$sql .= ")";
+
+		$this->query($sql);
+		return true;
+	}
+
+	/*
+   $columns = array(action =>   add | alter | drop
+                    name =>     Spaltenname
+                    name_new => neuer Spaltenname, nur bei 'alter' belegt
+                    type =>     42go-Meta-Type: int16, int32, int64, double, char, varchar, text, blob
+                    typeValue => Wert z.B. bei Varchar
+                    defaultValue =>  Default Wert
+                    notNull =>   true | false
+                    autoInc =>   true | false
+                    option =>   unique | primary | index)
+
+
+   */
+	function alterTable($table_name, $columns) {
+		$index = "";
+		$sql = "ALTER TABLE $table_name ";
+		foreach($columns as $col){
+			if($col["action"] == 'add') {
+				$sql .= "ADD ".$col["name"]." ".$this->mapType($col["type"], $col["typeValue"])." ";
+			} elseif ($col["action"] == 'alter') {
+				$sql .= "CHANGE ".$col["name"]." ".$col["name_new"]." ".$this->mapType($col["type"], $col["typeValue"])." ";
+			} elseif ($col["action"] == 'drop') {
+				$sql .= "DROP ".$col["name"]." ";
+			}
+			if($col["action"] != 'drop') {
+				if($col["defaultValue"] != "") $sql .= "DEFAULT '".$col["defaultValue"]."' ";
+				if($col["notNull"] == true) {
+					$sql .= "NOT NULL ";
+				} else {
+					$sql .= "NULL ";
+				}
+				if($col["autoInc"] == true) $sql .= "auto_increment ";
+				$sql.= ",";
+				// key Definitionen
+				if($col["option"] == "primary") $index .= "PRIMARY KEY (".$col["name"]."),";
+				if($col["option"] == "index") $index .= "INDEX (".$col["name"]."),";
+				if($col["option"] == "unique") $index .= "UNIQUE (".$col["name"]."),";
+			}
+		}
+		$sql .= $index;
+		$sql = substr($sql, 0, -1);
+
+		//die($sql);
+		$this->query($sql);
+		return true;
+	}
+
+	function dropTable($table_name) {
+		$this->check($table_name);
+		$sql = "DROP TABLE '". $table_name."'";
+		return $this->query($sql);
+	}
+
+	// gibt Array mit Tabellennamen zur�ck
+	function getTables($database_name = '') {
+
 		if($database_name == ''){
-            $database_name = $this->dbName;
-        }
-		
+			$database_name = $this->dbName;
+		}
+
 		$tables = $this->queryAllRecords("SHOW TABLES FROM `$database_name`");
 		$tb_names = array();
 		if(is_array($tables) && !empty($tables)){
@@ -367,7 +367,7 @@
 				$tb_names[$i] = $tables[$i]['Tables_in_'.$database_name];
 			}
 		}
-		
+
 		/*
         $result = mysqli_query("SHOW TABLES FROM `$database_name`");
         $tb_names = array();
@@ -375,11 +375,11 @@
             $tb_names[$i] = mysql_tablename($result, $i);
         }
 		*/
-        return $tb_names;       
-   }
-   
-   // gibt Feldinformationen zur Tabelle zur�ck
-   /*
+		return $tb_names;
+	}
+
+	// gibt Feldinformationen zur Tabelle zur�ck
+	/*
    $columns = array(action =>   add | alter | drop
                     name =>     Spaltenname
                     name_new => neuer Spaltenname, nur bei 'alter' belegt
@@ -389,101 +389,101 @@
                     notNull =>   true | false
                     autoInc =>   true | false
                     option =>   unique | primary | index)
-   
-   
-   */
-   
-   function tableInfo($table_name) {
-   
-   global $go_api,$go_info;
-   // Tabellenfelder einlesen
-    
-    if($rows = $go_api->db->queryAllRecords("SHOW FIELDS FROM ".$table_name)){
-    foreach($rows as $row) {
-        $name = $row[0];
-        $default = $row[4];
-        $key = $row[3];
-        $extra = $row[5];
-        $isnull = $row[2];
-        $type = $row[1];
-    
-        
-        $column = array();
-    
-        $column["name"] = $name;
-        //$column["type"] = $type;
-        $column["defaultValue"] = $default;
-        if(stristr($key,"PRI")) $column["option"] = "primary";
-        if(stristr($isnull,"YES")) {
-            $column["notNull"] = false;
-        } else {
-           $column["notNull"] = true; 
-        }
-        if($extra == 'auto_increment') $column["autoInc"] = true;
-        
-        
-        // Type in Metatype umsetzen
-        
-        if(stristr($type,"int(")) $metaType = 'int32';
-        if(stristr($type,"bigint")) $metaType = 'int64';
-        if(stristr($type,"char")) {
-            $metaType = 'char';
-            $tmp_typeValue = explode('(',$type);
-            $column["typeValue"] = substr($tmp_typeValue[1],0,-1);  
-        }
-        if(stristr($type,"varchar")) {
-            $metaType = 'varchar';
-            $tmp_typeValue = explode('(',$type);
-            $column["typeValue"] = substr($tmp_typeValue[1],0,-1);  
-        }
-        if(stristr($type,"text")) $metaType = 'text';
-        if(stristr($type,"double")) $metaType = 'double';
-        if(stristr($type,"blob")) $metaType = 'blob';
-        
-        
-        $column["type"] = $metaType;
-        
-    $columns[] = $column;
-    }
-        return $columns;
-    } else {
-        return false;
-    }
 
-   }
-   
-   function mapType($metaType,$typeValue) {
-   global $go_api;
-   $metaType = strtolower($metaType);
-   switch ($metaType) {
-   case 'int16':
-        return 'smallint';
-   break;
-   case 'int32':
-        return 'int';
-   break;
-   case 'int64':
-        return 'bigint';
-   break;
-   case 'double':
-        return 'double';
-   break;
-   case 'char':
-        return 'char';
-   break;
-   case 'varchar':
-        if($typeValue < 1) die("Datenbank Fehler: F�r diesen Datentyp ist eine L�ngenangabe notwendig.");
-        return 'varchar('.$typeValue.')';
-   break;
-   case 'text':
-        return 'text';
-   break;
-   case 'blob':
-        return 'blob';
-   break;
-   }
-   }
-	
+
+   */
+
+	function tableInfo($table_name) {
+
+		global $go_api, $go_info;
+		// Tabellenfelder einlesen
+
+		if($rows = $go_api->db->queryAllRecords("SHOW FIELDS FROM ".$table_name)){
+			foreach($rows as $row) {
+				$name = $row[0];
+				$default = $row[4];
+				$key = $row[3];
+				$extra = $row[5];
+				$isnull = $row[2];
+				$type = $row[1];
+
+
+				$column = array();
+
+				$column["name"] = $name;
+				//$column["type"] = $type;
+				$column["defaultValue"] = $default;
+				if(stristr($key, "PRI")) $column["option"] = "primary";
+				if(stristr($isnull, "YES")) {
+					$column["notNull"] = false;
+				} else {
+					$column["notNull"] = true;
+				}
+				if($extra == 'auto_increment') $column["autoInc"] = true;
+
+
+				// Type in Metatype umsetzen
+
+				if(stristr($type, "int(")) $metaType = 'int32';
+				if(stristr($type, "bigint")) $metaType = 'int64';
+				if(stristr($type, "char")) {
+					$metaType = 'char';
+					$tmp_typeValue = explode('(', $type);
+					$column["typeValue"] = substr($tmp_typeValue[1], 0, -1);
+				}
+				if(stristr($type, "varchar")) {
+					$metaType = 'varchar';
+					$tmp_typeValue = explode('(', $type);
+					$column["typeValue"] = substr($tmp_typeValue[1], 0, -1);
+				}
+				if(stristr($type, "text")) $metaType = 'text';
+				if(stristr($type, "double")) $metaType = 'double';
+				if(stristr($type, "blob")) $metaType = 'blob';
+
+
+				$column["type"] = $metaType;
+
+				$columns[] = $column;
+			}
+			return $columns;
+		} else {
+			return false;
+		}
+
+	}
+
+	function mapType($metaType, $typeValue) {
+		global $go_api;
+		$metaType = strtolower($metaType);
+		switch ($metaType) {
+		case 'int16':
+			return 'smallint';
+			break;
+		case 'int32':
+			return 'int';
+			break;
+		case 'int64':
+			return 'bigint';
+			break;
+		case 'double':
+			return 'double';
+			break;
+		case 'char':
+			return 'char';
+			break;
+		case 'varchar':
+			if($typeValue < 1) die("Datenbank Fehler: F�r diesen Datentyp ist eine L�ngenangabe notwendig.");
+			return 'varchar('.$typeValue.')';
+			break;
+		case 'text':
+			return 'text';
+			break;
+		case 'blob':
+			return 'blob';
+			break;
+		}
+	}
+
 }
 
 ?>

--
Gitblit v1.9.1