From b1a6a5a3991cec5cd08873b01376e45d0b247f18 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Thu, 14 Nov 2013 09:05:33 -0500
Subject: [PATCH] Cleaning up code to match coding guidelines
---
server/lib/classes/db_mysql.inc.php | 964 ++++++++++++++++++++++++++++----------------------------
1 files changed, 483 insertions(+), 481 deletions(-)
diff --git a/server/lib/classes/db_mysql.inc.php b/server/lib/classes/db_mysql.inc.php
index af09fbf..9d56ac3 100644
--- a/server/lib/classes/db_mysql.inc.php
+++ b/server/lib/classes/db_mysql.inc.php
@@ -29,69 +29,69 @@
class db extends mysqli
{
- protected $dbHost = ''; // hostname of the MySQL server
- private $dbName = ''; // logical database name on that server
- private $dbUser = ''; // database authorized user
- private $dbPass = ''; // user's password
- private $dbCharset = 'utf8';// Database charset
- private $dbNewLink = false; // Return a new linkID when connect is called again
- private $dbClientFlags = 0; // MySQL Client falgs
- private $linkId = 0; // last result of mysqli_connect()
- private $queryId = 0; // last result of mysqli_query()
- private $record = array(); // last record fetched
- private $autoCommit = 1; // Autocommit Transactions
- private $currentRow; // current row number
- public $errorNumber = 0; // last error number
- public $errorMessage = ''; // last error message
- private $errorLocation = '';// last error location
- public $show_error_messages = false; // false in server, true in interface
- private $isConnected = false; // needed to know if we have a valid mysqli object from the constructor
+ protected $dbHost = ''; // hostname of the MySQL server
+ private $dbName = ''; // logical database name on that server
+ private $dbUser = ''; // database authorized user
+ private $dbPass = ''; // user's password
+ private $dbCharset = 'utf8';// Database charset
+ private $dbNewLink = false; // Return a new linkID when connect is called again
+ private $dbClientFlags = 0; // MySQL Client falgs
+ private $linkId = 0; // last result of mysqli_connect()
+ private $queryId = 0; // last result of mysqli_query()
+ private $record = array(); // last record fetched
+ private $autoCommit = 1; // Autocommit Transactions
+ private $currentRow; // current row number
+ public $errorNumber = 0; // last error number
+ public $errorMessage = ''; // last error message
+ private $errorLocation = '';// last error location
+ public $show_error_messages = false; // false in server, true in interface
+ private $isConnected = false; // needed to know if we have a valid mysqli object from the constructor
- // constructor
- public function __construct($host = NULL , $user = NULL, $pass = NULL, $database = NULL) {
- global $app, $conf;
+ // constructor
+ public function __construct($host = NULL , $user = NULL, $pass = NULL, $database = NULL) {
+ global $app, $conf;
- $this->dbHost = $host ? $host : $conf['db_host'];
- $this->dbName = $database ? $database : $conf['db_database'];
- $this->dbUser = $user ? $user : $conf['db_user'];
- $this->dbPass = $pass ? $pass : $conf['db_password'];
- $this->dbCharset = $conf['db_charset'];
- $this->dbNewLink = $conf['db_new_link'];
- $this->dbClientFlags = $conf['db_client_flags'];
+ $this->dbHost = $host ? $host : $conf['db_host'];
+ $this->dbName = $database ? $database : $conf['db_database'];
+ $this->dbUser = $user ? $user : $conf['db_user'];
+ $this->dbPass = $pass ? $pass : $conf['db_password'];
+ $this->dbCharset = $conf['db_charset'];
+ $this->dbNewLink = $conf['db_new_link'];
+ $this->dbClientFlags = $conf['db_client_flags'];
- parent::__construct($this->dbHost, $this->dbUser, $this->dbPass,$this->dbName);
- $try = 0;
- //while(!is_null($this->connect_error) && $try < 10) {
- while(mysqli_connect_error() && $try < 10) {
- if($try > 8) sleep(5);
- elseif($try > 0) sleep(1);
-
- $try++;
- $this->updateError('DB::__construct');
-
- parent::__construct($this->dbHost, $this->dbUser, $this->dbPass,$this->dbName);
- }
-
- //if(is_null($this->connect_error)) $this->isConnected = true;
- if(!mysqli_connect_error()) $this->isConnected = true;
-
- $this->setCharacterEncoding();
- }
+ parent::__construct($this->dbHost, $this->dbUser, $this->dbPass, $this->dbName);
+ $try = 0;
+ //while(!is_null($this->connect_error) && $try < 10) {
+ while(mysqli_connect_error() && $try < 10) {
+ if($try > 8) sleep(5);
+ elseif($try > 0) sleep(1);
- public function __destruct() {
- $this->close(); // helps avoid memory leaks, and persitent connections that don't go away.
- }
+ $try++;
+ $this->updateError('DB::__construct');
- /* This allows our private variables to be "read" out side of the class */
- public function __get($var) {
- return isset($this->$var) ? $this->$var : NULL;
- }
+ parent::__construct($this->dbHost, $this->dbUser, $this->dbPass, $this->dbName);
+ }
- // error handler
- public function updateError($location) {
- global $app;
+ //if(is_null($this->connect_error)) $this->isConnected = true;
+ if(!mysqli_connect_error()) $this->isConnected = true;
- /*
+ $this->setCharacterEncoding();
+ }
+
+ public function __destruct() {
+ $this->close(); // helps avoid memory leaks, and persitent connections that don't go away.
+ }
+
+ /* This allows our private variables to be "read" out side of the class */
+ public function __get($var) {
+ return isset($this->$var) ? $this->$var : NULL;
+ }
+
+ // error handler
+ public function updateError($location) {
+ global $app;
+
+ /*
if(!is_null($this->connect_error)) {
$this->errorNumber = $this->connect_errno;
$this->errorMessage = $this->connect_error;
@@ -100,210 +100,212 @@
$this->errorMessage = $this->error;
}
*/
- if(mysqli_connect_error()) {
- $this->errorNumber = mysqli_connect_errno();
- $this->errorMessage = mysqli_connect_error();
- } else {
- $this->errorNumber = mysqli_errno($this);
- $this->errorMessage = mysqli_error($this);
- }
+ if(mysqli_connect_error()) {
+ $this->errorNumber = mysqli_connect_errno();
+ $this->errorMessage = mysqli_connect_error();
+ } else {
+ $this->errorNumber = mysqli_errno($this);
+ $this->errorMessage = mysqli_error($this);
+ }
- $this->errorLocation = $location;
- if($this->errorNumber) {
- $error_msg = $this->errorLocation .' '. $this->errorMessage;
- // This right here will allow us to use the samefile for server & interface
- if($this->show_error_messages) {
- echo $error_msg;
- } else if(is_object($app) && method_exists($app, 'log')) {
- $app->log($error_msg, LOGLEVEL_WARN);
- } else {
- /* This could be called before $app is ever declared.. In that case we should just spit out to error_log() */
- error_log($error_msg);
- }
- }
- }
-
- private function setCharacterEncoding() {
- if($this->isConnected == false) return false;
- parent::query( 'SET NAMES '.$this->dbCharset);
- parent::query( "SET character_set_results = '".$this->dbCharset."', character_set_client = '".$this->dbCharset."', character_set_connection = '".$this->dbCharset."', character_set_database = '".$this->dbCharset."', character_set_server = '".$this->dbCharset."'");
- }
-
- public function query($queryString) {
- if($this->isConnected == false) return false;
- $try = 0;
- do {
- $try++;
- $ok = $this->ping();
- if(!$ok) {
- if(!$this->real_connect($this->dbHost, $this->dbUser, $this->dbPass, $this->dbName)) {
- if($try > 9) {
- $this->updateError('DB::query -> reconnect');
- return false;
- } else {
- sleep(($try > 7 ? 5 : 1));
- }
- } else {
- $this->setCharacterEncoding();
- $ok = true;
- }
- }
- } while($ok == false);
- $this->queryId = parent::query($queryString);
- $this->updateError('DB::query('.$queryString.') -> mysqli_query');
- if(!$this->queryId) {
- return false;
- }
- $this->currentRow = 0;
- return $this->queryId;
- }
-
- // returns all records in an array
- public function queryAllRecords($queryString) {
- if(!$this->query($queryString))
- {
- return false;
- }
- $ret = array();
- while($line = $this->nextRecord())
- {
- $ret[] = $line;
- }
- return $ret;
- }
-
- // returns one record in an array
- public function queryOneRecord($queryString) {
- if(!$this->query($queryString) || $this->numRows() == 0)
- {
- return false;
- }
- return $this->nextRecord();
- }
-
- // returns the next record in an array
- public function nextRecord() {
- $this->record = $this->queryId->fetch_assoc();
- $this->updateError('DB::nextRecord()-> mysql_fetch_array');
- if(!$this->record || !is_array($this->record))
- {
- return false;
- }
- $this->currentRow++;
- return $this->record;
- }
-
- // returns number of rows returned by the last select query
- public function numRows() {
- return $this->queryId->num_rows;
- }
-
- public function affectedRows() {
- return $this->queryId->affected_rows;
- }
-
- // returns mySQL insert id
- public function insertID() {
- return $this->insert_id;
- }
-
-
- // Check der variablen
- // Really.. using quote should be phased out in favor of using bind_param's. Though, for legacy code..
- // here's the equivalent
- public function quote($formfield) {
- return $this->escape_string($formfield);
- }
-
- // Check der variablen
- public function unquote($formfield) {
- return stripslashes($formfield);
- }
-
-public function toLower($record) {
- if(is_array($record)) {
- foreach($record as $key => $val) {
- $key = strtolower($key);
- $out[$key] = $val;
- }
- }
- return $out;
- }
-
- public function diffrec($record_old, $record_new) {
- $diffrec_full = array();
- $diff_num = 0;
-
- if(is_array($record_old) && count($record_old) > 0) {
- foreach($record_old as $key => $val) {
- // if(!isset($record_new[$key]) || $record_new[$key] != $val) {
- if(@$record_new[$key] != $val) {
- // Record has changed
- $diffrec_full['old'][$key] = $val;
- $diffrec_full['new'][$key] = @$record_new[$key];
- $diff_num++;
- } else {
- $diffrec_full['old'][$key] = $val;
- $diffrec_full['new'][$key] = $val;
+ $this->errorLocation = $location;
+ if($this->errorNumber) {
+ $error_msg = $this->errorLocation .' '. $this->errorMessage;
+ // This right here will allow us to use the samefile for server & interface
+ if($this->show_error_messages) {
+ echo $error_msg;
+ } else if(is_object($app) && method_exists($app, 'log')) {
+ $app->log($error_msg, LOGLEVEL_WARN);
+ } else {
+ /* This could be called before $app is ever declared.. In that case we should just spit out to error_log() */
+ error_log($error_msg);
+ }
+ }
}
- }
- } elseif(is_array($record_new)) {
- foreach($record_new as $key => $val) {
- if(isset($record_new[$key]) && @$record_old[$key] != $val) {
- // Record has changed
- $diffrec_full['new'][$key] = $val;
- $diffrec_full['old'][$key] = @$record_old[$key];
- $diff_num++;
- } else {
- $diffrec_full['new'][$key] = $val;
- $diffrec_full['old'][$key] = $val;
- }
+
+ private function setCharacterEncoding() {
+ if($this->isConnected == false) return false;
+ parent::query( 'SET NAMES '.$this->dbCharset);
+ parent::query( "SET character_set_results = '".$this->dbCharset."', character_set_client = '".$this->dbCharset."', character_set_connection = '".$this->dbCharset."', character_set_database = '".$this->dbCharset."', character_set_server = '".$this->dbCharset."'");
}
- }
- return array('diff_num' => $diff_num, 'diff_rec' => $diffrec_full);
+ public function query($queryString) {
+ if($this->isConnected == false) return false;
+ $try = 0;
+ do {
+ $try++;
+ $ok = $this->ping();
+ if(!$ok) {
+ if(!$this->real_connect($this->dbHost, $this->dbUser, $this->dbPass, $this->dbName)) {
+ if($try > 9) {
+ $this->updateError('DB::query -> reconnect');
+ return false;
+ } else {
+ sleep(($try > 7 ? 5 : 1));
+ }
+ } else {
+ $this->setCharacterEncoding();
+ $ok = true;
+ }
+ }
+ } while($ok == false);
+ $this->queryId = parent::query($queryString);
+ $this->updateError('DB::query('.$queryString.') -> mysqli_query');
+ if(!$this->queryId) {
+ return false;
+ }
+ $this->currentRow = 0;
+ return $this->queryId;
+ }
- }
+ // returns all records in an array
+ public function queryAllRecords($queryString) {
+ if(!$this->query($queryString))
+ {
+ return false;
+ }
+ $ret = array();
+ while($line = $this->nextRecord())
+ {
+ $ret[] = $line;
+ }
+ return $ret;
+ }
- /**
- * Function to get the database-size
- * @param string $database_name
- * @return int - database-size in bytes
- */
- public function getDatabaseSize($database_name) {
- global $app;
- include('lib/mysql_clientdb.conf');
- /* Connect to the database */
- $link = mysql_connect($clientdb_host, $clientdb_user, $clientdb_password);
- if (!$link) {
- $app->log('Unable to connect to the database'.mysql_error($link),LOGLEVEL_DEBUG);
- return;
- }
- /* Get database-size from information_schema */
- $result=mysql_query("SELECT SUM(data_length+index_length) FROM information_schema.TABLES WHERE table_schema='".mysql_real_escape_string($database_name)."';",$link);
- $this->close;
- if (!$result) {
- $app->log('Unable to get the database-size'.mysql_error($link),LOGLEVEL_DEBUG);
- return;
- }
- $database_size = mysql_fetch_row($result);
- return $database_size[0];
- }
+ // returns one record in an array
+ public function queryOneRecord($queryString) {
+ if(!$this->query($queryString) || $this->numRows() == 0)
+ {
+ return false;
+ }
+ return $this->nextRecord();
+ }
- //** Function to fill the datalog with a full differential record.
- public function datalogSave($db_table, $action, $primary_field, $primary_id, $record_old, $record_new, $force_update = false) {
- global $app,$conf;
+ // returns the next record in an array
+ public function nextRecord() {
+ $this->record = $this->queryId->fetch_assoc();
+ $this->updateError('DB::nextRecord()-> mysql_fetch_array');
+ if(!$this->record || !is_array($this->record))
+ {
+ return false;
+ }
+ $this->currentRow++;
+ return $this->record;
+ }
- // Insert backticks only for incomplete table names.
- if(stristr($db_table,'.')) {
- $escape = '';
- } else {
- $escape = '`';
- }
+ // returns number of rows returned by the last select query
+ public function numRows() {
+ return $this->queryId->num_rows;
+ }
+
+ public function affectedRows() {
+ return $this->queryId->affected_rows;
+ }
+
+ // returns mySQL insert id
+ public function insertID() {
+ return $this->insert_id;
+ }
+
+
+ // Check der variablen
+ // Really.. using quote should be phased out in favor of using bind_param's. Though, for legacy code..
+ // here's the equivalent
+ public function quote($formfield) {
+ return $this->escape_string($formfield);
+ }
+
+ // Check der variablen
+ public function unquote($formfield) {
+ return stripslashes($formfield);
+ }
+
+ public function toLower($record) {
+ if(is_array($record)) {
+ foreach($record as $key => $val) {
+ $key = strtolower($key);
+ $out[$key] = $val;
+ }
+ }
+ return $out;
+ }
+
+ public function diffrec($record_old, $record_new) {
+ $diffrec_full = array();
+ $diff_num = 0;
+
+ if(is_array($record_old) && count($record_old) > 0) {
+ foreach($record_old as $key => $val) {
+ // if(!isset($record_new[$key]) || $record_new[$key] != $val) {
+ if(@$record_new[$key] != $val) {
+ // Record has changed
+ $diffrec_full['old'][$key] = $val;
+ $diffrec_full['new'][$key] = @$record_new[$key];
+ $diff_num++;
+ } else {
+ $diffrec_full['old'][$key] = $val;
+ $diffrec_full['new'][$key] = $val;
+ }
+ }
+ } elseif(is_array($record_new)) {
+ foreach($record_new as $key => $val) {
+ if(isset($record_new[$key]) && @$record_old[$key] != $val) {
+ // Record has changed
+ $diffrec_full['new'][$key] = $val;
+ $diffrec_full['old'][$key] = @$record_old[$key];
+ $diff_num++;
+ } else {
+ $diffrec_full['new'][$key] = $val;
+ $diffrec_full['old'][$key] = $val;
+ }
+ }
+ }
+
+ return array('diff_num' => $diff_num, 'diff_rec' => $diffrec_full);
+
+ }
+
+ /**
+ * Function to get the database-size
+ * @param string $database_name
+ * @return int - database-size in bytes
+ */
+
+
+ public function getDatabaseSize($database_name) {
+ global $app;
+ include 'lib/mysql_clientdb.conf';
+ /* Connect to the database */
+ $link = mysql_connect($clientdb_host, $clientdb_user, $clientdb_password);
+ if (!$link) {
+ $app->log('Unable to connect to the database'.mysql_error($link), LOGLEVEL_DEBUG);
+ return;
+ }
+ /* Get database-size from information_schema */
+ $result=mysql_query("SELECT SUM(data_length+index_length) FROM information_schema.TABLES WHERE table_schema='".mysql_real_escape_string($database_name)."';", $link);
+ $this->close;
+ if (!$result) {
+ $app->log('Unable to get the database-size'.mysql_error($link), LOGLEVEL_DEBUG);
+ return;
+ }
+ $database_size = mysql_fetch_row($result);
+ return $database_size[0];
+ }
+
+ //** Function to fill the datalog with a full differential record.
+ public function datalogSave($db_table, $action, $primary_field, $primary_id, $record_old, $record_new, $force_update = false) {
+ global $app, $conf;
+
+ // Insert backticks only for incomplete table names.
+ if(stristr($db_table, '.')) {
+ $escape = '';
+ } else {
+ $escape = '`';
+ }
if($force_update == true) {
//* We force a update even if no record has changed
- $diffrec_full = array('new' => $record_new,'old' => $record_old);
+ $diffrec_full = array('new' => $record_new, 'old' => $record_old);
$diff_num = count($record_new);
} else {
//* get the difference record between old and new record
@@ -313,124 +315,124 @@
unset($tmp);
}
- // Insert the server_id, if the record has a server_id
- $server_id = (isset($record_old['server_id']) && $record_old['server_id'] > 0)?$record_old['server_id']:0;
- if(isset($record_new['server_id'])) $server_id = $record_new['server_id'];
+ // Insert the server_id, if the record has a server_id
+ $server_id = (isset($record_old['server_id']) && $record_old['server_id'] > 0)?$record_old['server_id']:0;
+ if(isset($record_new['server_id'])) $server_id = $record_new['server_id'];
- if($diff_num > 0) {
- $diffstr = $this->quote(serialize($diffrec_full));
- if(isset($_SESSION)) {
- $username = $this->quote($_SESSION['s']['user']['username']);
- } else {
- $username = 'admin';
+ if($diff_num > 0) {
+ $diffstr = $this->quote(serialize($diffrec_full));
+ if(isset($_SESSION)) {
+ $username = $this->quote($_SESSION['s']['user']['username']);
+ } else {
+ $username = 'admin';
+ }
+ $dbidx = $primary_field.':'.$primary_id;
+
+ if($action == 'INSERT') $action = 'i';
+ if($action == 'UPDATE') $action = 'u';
+ if($action == 'DELETE') $action = 'd';
+ $sql = "INSERT INTO sys_datalog (dbtable,dbidx,server_id,action,tstamp,user,data) VALUES ('".$db_table."','$dbidx','$server_id','$action','".time()."','$username','$diffstr')";
+ $this->query($sql);
}
- $dbidx = $primary_field.':'.$primary_id;
- if($action == 'INSERT') $action = 'i';
- if($action == 'UPDATE') $action = 'u';
- if($action == 'DELETE') $action = 'd';
- $sql = "INSERT INTO sys_datalog (dbtable,dbidx,server_id,action,tstamp,user,data) VALUES ('".$db_table."','$dbidx','$server_id','$action','".time()."','$username','$diffstr')";
- $this->query($sql);
+ return true;
}
- return true;
- }
+ //** Inserts a record and saves the changes into the datalog
+ public function datalogInsert($tablename, $insert_data, $index_field) {
+ global $app;
- //** Inserts a record and saves the changes into the datalog
- public function datalogInsert($tablename, $insert_data, $index_field) {
- global $app;
-
- if(is_array($insert_data)) {
+ if(is_array($insert_data)) {
$key_str = '';
$val_str = '';
foreach($insert_data as $key => $val) {
$key_str .= "`".$key ."`,";
$val_str .= "'".$this->quote($val)."',";
}
- $key_str = substr($key_str,0,-1);
- $val_str = substr($val_str,0,-1);
+ $key_str = substr($key_str, 0, -1);
+ $val_str = substr($val_str, 0, -1);
$insert_data_str = '('.$key_str.') VALUES ('.$val_str.')';
} else {
$insert_data_str = $insert_data;
}
- $old_rec = array();
- $this->query("INSERT INTO $tablename $insert_data_str");
- $index_value = $this->insertID();
- $new_rec = $this->queryOneRecord("SELECT * FROM $tablename WHERE $index_field = '$index_value'");
- $this->datalogSave($tablename, 'INSERT', $index_field, $index_value, $old_rec, $new_rec);
+ $old_rec = array();
+ $this->query("INSERT INTO $tablename $insert_data_str");
+ $index_value = $this->insertID();
+ $new_rec = $this->queryOneRecord("SELECT * FROM $tablename WHERE $index_field = '$index_value'");
+ $this->datalogSave($tablename, 'INSERT', $index_field, $index_value, $old_rec, $new_rec);
- return $index_value;
- }
+ return $index_value;
+ }
- //** Updates a record and saves the changes into the datalog
- public function datalogUpdate($tablename, $update_data, $index_field, $index_value, $force_update = false) {
+ //** Updates a record and saves the changes into the datalog
+ public function datalogUpdate($tablename, $update_data, $index_field, $index_value, $force_update = false) {
global $app;
-
- $old_rec = $this->queryOneRecord("SELECT * FROM $tablename WHERE $index_field = '$index_value'");
-
- if(is_array($update_data)) {
+
+ $old_rec = $this->queryOneRecord("SELECT * FROM $tablename WHERE $index_field = '$index_value'");
+
+ if(is_array($update_data)) {
$update_data_str = '';
foreach($update_data as $key => $val) {
$update_data_str .= "`".$key ."` = '".$this->quote($val)."',";
}
- $update_data_str = substr($update_data_str,0,-1);
+ $update_data_str = substr($update_data_str, 0, -1);
} else {
$update_data_str = $update_data;
}
-
- $this->query("UPDATE $tablename SET $update_data_str WHERE $index_field = '$index_value'");
- $new_rec = $this->queryOneRecord("SELECT * FROM $tablename WHERE $index_field = '$index_value'");
- $this->datalogSave($tablename, 'UPDATE', $index_field, $index_value, $old_rec, $new_rec, $force_update);
- return true;
- }
+ $this->query("UPDATE $tablename SET $update_data_str WHERE $index_field = '$index_value'");
+ $new_rec = $this->queryOneRecord("SELECT * FROM $tablename WHERE $index_field = '$index_value'");
+ $this->datalogSave($tablename, 'UPDATE', $index_field, $index_value, $old_rec, $new_rec, $force_update);
- //** Deletes a record and saves the changes into the datalog
- public function datalogDelete($tablename, $index_field, $index_value) {
- global $app;
+ return true;
+ }
- $old_rec = $this->queryOneRecord("SELECT * FROM $tablename WHERE $index_field = '$index_value'");
- $this->query("DELETE FROM $tablename WHERE $index_field = '$index_value'");
- $new_rec = array();
- $this->datalogSave($tablename, 'DELETE', $index_field, $index_value, $old_rec, $new_rec);
-
- return true;
- }
-
//** Deletes a record and saves the changes into the datalog
- public function datalogError($errormsg) {
- global $app;
-
- if(isset($app->modules->current_datalog_id) && $app->modules->current_datalog_id > 0) $this->query("UPDATE sys_datalog set error = '".$this->quote($errormsg)."' WHERE datalog_id = ".$app->modules->current_datalog_id);
+ public function datalogDelete($tablename, $index_field, $index_value) {
+ global $app;
- return true;
- }
+ $old_rec = $this->queryOneRecord("SELECT * FROM $tablename WHERE $index_field = '$index_value'");
+ $this->query("DELETE FROM $tablename WHERE $index_field = '$index_value'");
+ $new_rec = array();
+ $this->datalogSave($tablename, 'DELETE', $index_field, $index_value, $old_rec, $new_rec);
+
+ return true;
+ }
+
+ //** Deletes a record and saves the changes into the datalog
+ public function datalogError($errormsg) {
+ global $app;
+
+ if(isset($app->modules->current_datalog_id) && $app->modules->current_datalog_id > 0) $this->query("UPDATE sys_datalog set error = '".$this->quote($errormsg)."' WHERE datalog_id = ".$app->modules->current_datalog_id);
+
+ return true;
+ }
- public function freeResult($query)
- {
- if(is_object($query) && (get_class($query) == "mysqli_result")) {
- $query->free();
- return true;
- } else {
- return false;
- }
- }
+ public function freeResult($query)
+ {
+ if(is_object($query) && (get_class($query) == "mysqli_result")) {
+ $query->free();
+ return true;
+ } else {
+ return false;
+ }
+ }
- /* TODO: Does anything use this? */
- public function delete() {
+ /* TODO: Does anything use this? */
+ public function delete() {
- }
+ }
- /* TODO: Does anything use this? */
- public function Transaction($action) {
- //action = begin, commit oder rollback
+ /* TODO: Does anything use this? */
+ public function Transaction($action) {
+ //action = begin, commit oder rollback
- }
+ }
- /*
+ /*
$columns = array(action => add | alter | drop
name => Spaltenname
name_new => neuer Spaltenname, nur bei 'alter' belegt
@@ -444,33 +446,33 @@
*/
- public function createTable($table_name,$columns) {
- $index = '';
- $sql = "CREATE TABLE $table_name (";
- foreach($columns as $col){
- $sql .= $col['name'].' '.$this->mapType($col['type'],$col['typeValue']).' ';
+ public 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'] != '') $sql .= "DEFAULT '".$col['defaultValue']."' ";
- if($col['notNull'] == true) {
- $sql .= 'NOT NULL ';
- } else {
- $sql .= 'NULL ';
+ 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);
+ $sql .= ')';
+ $this->query($sql);
+ return true;
}
- 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
@@ -483,59 +485,59 @@
*/
- public 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'].' ';
+ public 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.= ',';
+ // Index definitions
+ 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;
}
- 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.= ',';
- // Index definitions
- 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'].'),';
+
+ public function dropTable($table_name) {
+ $this->check($table_name);
+ $sql = "DROP TABLE '". $table_name."'";
+ return $this->query($sql);
}
- }
- $sql .= $index;
- $sql = substr($sql,0,-1);
- //die($sql);
- $this->query($sql);
- return true;
- }
+ // gibt Array mit Tabellennamen zur�ck
+ public function getTables($database_name = '') {
+ if($this->isConnected == false) return false;
+ if($database_name == '') $database_name = $this->dbName;
+ $result = parent::query("SHOW TABLES FROM $database_name");
+ for ($i = 0; $i < $result->num_rows; $i++) {
+ $tb_names[$i] = (($result->data_seek( $i) && (($___mysqli_tmp = $result->fetch_row()) !== NULL)) ? array_shift($___mysqli_tmp) : false);
+ }
+ return $tb_names;
+ }
- public function dropTable($table_name) {
- $this->check($table_name);
- $sql = "DROP TABLE '". $table_name."'";
- return $this->query($sql);
- }
-
- // gibt Array mit Tabellennamen zur�ck
- public function getTables($database_name = '') {
- if($this->isConnected == false) return false;
- if($database_name == '') $database_name = $this->dbName;
- $result = parent::query("SHOW TABLES FROM $database_name");
- for ($i = 0; $i < $result->num_rows; $i++) {
- $tb_names[$i] = (($result->data_seek( $i) && (($___mysqli_tmp = $result->fetch_row()) !== NULL)) ? array_shift($___mysqli_tmp) : false);
- }
- return $tb_names;
- }
-
- // gibt Feldinformationen zur Tabelle zur�ck
- /*
+ // gibt Feldinformationen zur Tabelle zur�ck
+ /*
$columns = array(action => add | alter | drop
name => Spaltenname
name_new => neuer Spaltenname, nur bei 'alter' belegt
@@ -549,67 +551,67 @@
*/
- function tableInfo($table_name) {
+ function tableInfo($table_name) {
- global $go_api,$go_info;
- // Tabellenfelder einlesen
+ 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];
+ 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 = 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;
+ $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
+ // 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';
+ 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;
+ $column['type'] = $metaType;
- $columns[] = $column;
- }
- return $columns;
- } else {
- return false;
- }
+ $columns[] = $column;
+ }
+ return $columns;
+ } else {
+ return false;
+ }
- //$this->createTable('tester',$columns);
+ //$this->createTable('tester',$columns);
- /*
+ /*
$result = mysql_list_fields($go_info["server"]["db_name"],$table_name);
$fields = mysql_num_fields ($result);
$i = 0;
@@ -634,40 +636,40 @@
- }
+ }
- public 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('Database failure: Lenght required for these data types.');
- return 'varchar('.$typeValue.')';
- break;
- case 'text':
- return 'text';
- break;
- case 'blob':
- return 'blob';
- break;
- }
- }
+ public 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('Database failure: Lenght required for these data types.');
+ return 'varchar('.$typeValue.')';
+ break;
+ case 'text':
+ return 'text';
+ break;
+ case 'blob':
+ return 'blob';
+ break;
+ }
+ }
- }
+}
- ?>
+?>
--
Gitblit v1.9.1