diff --git a/interface/lib/app.inc.php b/interface/lib/app.inc.php
index 12b7e9e922386692f684ddd6759f1bcdb8806180..ab7d90334861ea1c88938acaad9b9c5a716b6e60 100755
--- a/interface/lib/app.inc.php
+++ b/interface/lib/app.inc.php
@@ -62,7 +62,11 @@ class app {
$this->_conf = $conf;
if($this->_conf['start_db'] == true) {
$this->load('db_'.$this->_conf['db_type']);
- $this->db = new db;
+ try {
+ $this->db = new db;
+ } catch (Exception $e) {
+ $this->db = false;
+ }
}
//* Start the session
diff --git a/interface/lib/classes/db_mysql.inc.php b/interface/lib/classes/db_mysql.inc.php
index e3bf695dfcd8cc5b339131ed00f7ea6e5f7341fd..b0ae61ef36398a431d5f9b73f1b7cde3f2a7e4a4 100644
--- a/interface/lib/classes/db_mysql.inc.php
+++ b/interface/lib/classes/db_mysql.inc.php
@@ -1,4 +1,12 @@
<?php
+/*
+ * db_mysql.inc.php: ISPConfig mysql db interface
+ *
+ * Note! When making changes to this file, put a copy in both locations:
+ * interface/lib/classes/db_mysql.inc.php
+ * server/lib/classes/db_mysql.inc.php
+ */
+
/*
Copyright (c) 2005, Till Brehm, projektfarm Gmbh
All rights reserved.
@@ -27,7 +35,8 @@
EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-class db {
+class db
+{
/**#@+
* @access private
*/
@@ -40,12 +49,10 @@ class db {
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
/**#@-*/
- public $show_error_messages = false; // false in server, true in interface
-
+ public $show_error_messages = false; // false in server, interface sets true when generating templates
/* old things - unused now ////
private $linkId = 0; // last result of mysqli_connect()
@@ -53,8 +60,8 @@ class db {
private $record = array(); // last record fetched
private $autoCommit = 1; // Autocommit Transactions
private $currentRow; // current row number
- private $errorNumber = 0; // last error number
*/
+ public $errorNumber = 0; // last error number
public $errorMessage = ''; // last error message
/*
private $errorLocation = '';// last error location
@@ -63,34 +70,38 @@ class db {
*/
// constructor
- public function __construct($prefix = '') {
- global $conf;
- if($prefix != '') $prefix .= '_';
- $this->dbHost = $conf[$prefix.'db_host'];
- $this->dbPort = $conf[$prefix.'db_port'];
- $this->dbName = $conf[$prefix.'db_database'];
- $this->dbUser = $conf[$prefix.'db_user'];
- $this->dbPass = $conf[$prefix.'db_password'];
- $this->dbCharset = $conf[$prefix.'db_charset'];
- $this->dbNewLink = $conf[$prefix.'db_new_link'];
- $this->dbClientFlags = $conf[$prefix.'db_client_flags'];
+ public function __construct($host = NULL , $user = NULL, $pass = NULL, $database = NULL, $port = NULL, $flags = NULL) {
+ global $app, $conf;
+
+ $this->dbHost = $host ? $host : $conf['db_host'];
+ $this->dbPort = $port ? $port : $conf['db_port'];
+ $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->dbClientFlags = ($flags !== NULL) ? $flags : $conf['db_client_flags'];
$this->_iConnId = mysqli_init();
mysqli_real_connect($this->_iConnId, $this->dbHost, $this->dbUser, $this->dbPass, '', (int)$this->dbPort, NULL, $this->dbClientFlags);
- for($try=0;(!is_object($this->_iConnId) || mysqli_connect_error()) && $try < 5;++$try) {
+ for($try=0;(!is_object($this->_iConnId) || mysqli_connect_errno()) && $try < 5;++$try) {
sleep($try);
- mysqli_real_connect($this->_iConnId, $this->dbHost, $this->dbUser, $this->dbPass, '', (int)$this->dbPort, NULL, $this->dbClientFlags);
+ if(!is_object($this->_iConnId)) {
+ $this->_iConnId = mysqli_init();
+ }
+ if(!mysqli_real_connect($this->_iConnId, $this->dbHost, $this->dbUser, $this->dbPass, '', (int)$this->dbPort, NULL, $this->dbClientFlags)) {
+ $this->_sqlerror('Database connection failed');
+ }
}
- if(!is_object($this->_iConnId) || mysqli_connect_error()) {
+ if(!is_object($this->_iConnId) || mysqli_connect_errno()) {
$this->_iConnId = null;
- $this->_sqlerror('Zugriff auf Datenbankserver fehlgeschlagen! / Database server not accessible!');
- return false;
+ $this->_sqlerror('Zugriff auf Datenbankserver fehlgeschlagen! / Database server not accessible!', '', true); // sets errorMessage
+ throw new Exception($this->errorMessage);
}
if(!((bool)mysqli_query( $this->_iConnId, 'USE `' . $this->dbName . '`'))) {
$this->close();
- $this->_sqlerror('Datenbank nicht gefunden / Database not found');
- return false;
+ $this->_sqlerror('Datenbank nicht gefunden / Database not found', '', true); // sets errorMessage
+ throw new Exception($this->errorMessage);
}
$this->_setCharset();
@@ -105,6 +116,23 @@ class db {
$this->_iConnId = null;
}
+ /*
+ * Test mysql connection.
+ *
+ * @return boolean returns true if db connection is good.
+ */
+ public function testConnection() {
+ if(mysqli_connect_errno()) {
+ return false;
+ }
+ return (boolean)(is_object($this->_iConnId) && mysqli_ping($this->_iConnId));
+ }
+
+ /* This allows our private variables to be "read" out side of the class */
+ public function __get($var) {
+ return isset($this->$var) ? $this->$var : NULL;
+ }
+
public function _build_query_string($sQuery = '') {
$iArgs = func_num_args();
if($iArgs > 1) {
@@ -127,7 +155,7 @@ class db {
if($iPos2 !== false && ($iPos === false || $iPos2 <= $iPos)) {
$sTxt = $this->escape($sValue);
-
+
$sTxt = str_replace('`', '', $sTxt);
if(strpos($sTxt, '.') !== false) {
$sTxt = preg_replace('/^(.+)\.(.+)$/', '`$1`.`$2`', $sTxt);
@@ -169,33 +197,33 @@ class db {
/**#@+
- * @access private
- */
+ * @access private
+ */
private function _setCharset() {
- mysqli_query($this->_iConnId, 'SET NAMES '.$this->dbCharset);
- mysqli_query($this->_iConnId, "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."'");
+ $this->query('SET NAMES '.$this->dbCharset);
+ $this->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."'");
}
-
+
private function securityScan($string) {
global $app, $conf;
-
+
// get security config
if(isset($app)) {
$app->uses('getconf');
$ids_config = $app->getconf->get_security_config('ids');
-
+
if($ids_config['sql_scan_enabled'] == 'yes') {
-
+
// Remove whitespace
$string = trim($string);
if(substr($string,-1) == ';') $string = substr($string,0,-1);
-
+
// Save original string
$string_orig = $string;
-
+
//echo $string;
$chars = array(';', '#', '/*', '*/', '--', '\\\'', '\\"');
-
+
$string = str_replace('\\\\', '', $string);
$string = preg_replace('/(^|[^\\\])([\'"])\\2/is', '$1', $string);
$string = preg_replace('/(^|[^\\\])([\'"])(.*?[^\\\])\\2/is', '$1', $string);
@@ -239,14 +267,28 @@ class db {
$try = 0;
do {
$try++;
- $ok = mysqli_ping($this->_iConnId);
+ $ok = (is_object($this->_iConnId)) ? mysqli_ping($this->_iConnId) : false;
if(!$ok) {
- if(!mysqli_real_connect(mysqli_init(), $this->dbHost, $this->dbUser, $this->dbPass, $this->dbName, (int)$this->dbPort, NULL, $this->dbClientFlags)) {
- if($try > 4) {
- $this->_sqlerror('DB::query -> reconnect');
+ if(!is_object($this->_iConnId)) {
+ $this->_iConnId = mysqli_init();
+ }
+ if(!mysqli_real_connect($this->_isConnId, $this->dbHost, $this->dbUser, $this->dbPass, $this->dbName, (int)$this->dbPort, NULL, $this->dbClientFlags)) {
+ if(mysqli_connect_errno() == '111') {
+ // server is not available
+ if($try > 9) {
+ if(isset($app) && isset($app->forceErrorExit)) {
+ $app->forceErrorExit('Database connection failure!');
+ }
+ // if we reach this, the app object is missing or has no exit method, so we continue as normal
+ }
+ sleep(30); // additional seconds, please!
+ }
+
+ if($try > 9) {
+ $this->_sqlerror('db::_query -> reconnect', '', true);
return false;
} else {
- sleep(1);
+ sleep(($try > 7 ? 5 : 1));
}
} else {
$this->_setCharset();
@@ -258,7 +300,7 @@ class db {
$aArgs = func_get_args();
$sQuery = call_user_func_array(array(&$this, '_build_query_string'), $aArgs);
$this->securityScan($sQuery);
- $this->_iQueryId = @mysqli_query($this->_iConnId, $sQuery);
+ $this->_iQueryId = mysqli_query($this->_iConnId, $sQuery);
if (!$this->_iQueryId) {
$this->_sqlerror('Falsche Anfrage / Wrong Query', 'SQL-Query = ' . $sQuery);
return false;
@@ -390,7 +432,7 @@ class db {
}
public function query_all_array($sQuery = '') {
- return $this->queryAllArray($sQuery);
+ return call_user_func_array(array(&$this, 'queryAllArray'), func_get_args());
}
@@ -404,13 +446,14 @@ class db {
* @return int id of last inserted row or 0 if none
*/
public function insert_id() {
- $iRes = mysqli_query($this->_iConnId, 'SELECT LAST_INSERT_ID() as `newid`');
- if(!is_object($iRes)) return false;
-
- $aReturn = mysqli_fetch_assoc($iRes);
- mysqli_free_result($iRes);
-
- return $aReturn['newid'];
+ $oResult = $this->query('SELECT LAST_INSERT_ID() as `newid`');
+ if(!$oResult) {
+ $this->_sqlerror('Unable to select last_insert_id()');
+ return false;
+ }
+ $aReturn = $oResult->get();
+ $oResult->free();
+ return isset($aReturn['newid']) ? $aReturn['newid'] : 0;
}
@@ -431,6 +474,7 @@ class db {
}
+
/**
* check if a utf8 string is valid
*
@@ -470,7 +514,7 @@ class db {
public function escape($sString) {
global $app;
if(!is_string($sString) && !is_numeric($sString)) {
- $app->log('NON-String given in escape function! (' . gettype($sString) . ')', LOGLEVEL_DEBUG);
+ $app->log('NON-String given in escape function! (' . gettype($sString) . ')', LOGLEVEL_INFO);
//$sAddMsg = getDebugBacktrace();
$app->log($sAddMsg, LOGLEVEL_DEBUG);
$sString = '';
@@ -479,7 +523,7 @@ class db {
$cur_encoding = mb_detect_encoding($sString);
if($cur_encoding != "UTF-8") {
if($cur_encoding != 'ASCII') {
- if(is_object($app) && method_exists($app, 'log')) $app->log('String ' . substr($sString, 0, 25) . '... is ' . $cur_encoding . '.', LOGLEVEL_DEBUG);
+ if(is_object($app) && method_exists($app, 'log')) $app->log('String ' . substr($sString, 0, 25) . '... is ' . $cur_encoding . '.', LOGLEVEL_INFO);
if($cur_encoding) $sString = mb_convert_encoding($sString, 'UTF-8', $cur_encoding);
else $sString = mb_convert_encoding($sString, 'UTF-8');
}
@@ -496,20 +540,27 @@ class db {
*
* @access private
*/
- private function _sqlerror($sErrormsg = 'Unbekannter Fehler', $sAddMsg = '') {
+ private function _sqlerror($sErrormsg = 'Unbekannter Fehler', $sAddMsg = '', $bNoLog = false) {
global $app, $conf;
- $mysql_error = (is_object($this->_iConnId) ? mysqli_error($this->_iConnId) : mysqli_connect_error());
- $mysql_errno = (is_object($this->_iConnId) ? mysqli_errno($this->_iConnId) : mysqli_connect_errno());
+ $mysql_errno = mysqli_connect_errno();
+ $mysql_error = mysqli_connect_error();
+ if ($mysql_errno === 0 && is_object($this->_iConnId)) {
+ $mysql_errno = mysqli_errno($this->_iConnId);
+ $mysql_error = mysqli_error($this->_iConnId);
+ }
+ $this->errorNumber = $mysql_error;
$this->errorMessage = $mysql_error;
//$sAddMsg .= getDebugBacktrace();
if($this->show_error_messages && $conf['demo_mode'] === false) {
echo $sErrormsg . $sAddMsg;
- } else if(is_object($app) && method_exists($app, 'log')) {
- $app->log($sErrormsg . $sAddMsg . ' -> ' . $mysql_errno . ' (' . $mysql_error . ')', LOGLEVEL_WARN);
- }
+ } elseif(is_object($app) && method_exists($app, 'log') && $bNoLog == false) {
+ $app->log($sErrormsg . $sAddMsg . ' -> ' . $mysql_errno . ' (' . $mysql_error . ')', LOGLEVEL_WARN, false);
+ } elseif(php_sapi_name() == 'cli') {
+ echo $sErrormsg . $sAddMsg;
+ }
}
public function affectedRows() {
@@ -541,27 +592,27 @@ class db {
}
return $out;
}
-
+
public function insertFromArray($tablename, $data) {
if(!is_array($data)) return false;
-
+
$k_query = '';
$v_query = '';
-
+
$params = array($tablename);
$v_params = array();
-
+
foreach($data as $key => $value) {
$k_query .= ($k_query != '' ? ', ' : '') . '??';
$v_query .= ($v_query != '' ? ', ' : '') . '?';
$params[] = $key;
$v_params[] = $value;
}
-
+
$query = 'INSERT INTO ?? (' . $k_query . ') VALUES (' . $v_query . ')';
return $this->query($query, true, array_merge($params, $v_params));
}
-
+
public function diffrec($record_old, $record_new) {
$diffrec_full = array();
$diff_num = 0;
@@ -597,15 +648,36 @@ class db {
}
+ /**
+ * Function to get the database-size
+ * @param string $database_name
+ * @return int - database-size in bytes
+ */
+ public function getDatabaseSize($database_name) {
+ global $app;
+
+ require_once 'lib/mysql_clientdb.conf';
+
+ $result = $this->_query("SELECT SUM(data_length+index_length) FROM information_schema.TABLES WHERE table_schema='".$this->escape($database_name)."'");
+ if(!$result) {
+ $this->_sqlerror('Unable to determine the size of database ' . $database_name);
+ return;
+ }
+ $database_size = $result->getAsRow();
+ $result->free();
+ return $database_size[0] ? $database_size[0] : 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;
+ global $app;
- // Check fields
- if(!preg_match('/^[a-zA-Z0-9\-\_\.]{1,64}$/',$db_table)) $app->error('Invalid table name '.$db_table);
- if(!preg_match('/^[a-zA-Z0-9\-\_]{1,64}$/',$primary_field)) $app->error('Invalid primary field '.$primary_field.' in table '.$db_table);
-
- $primary_id = intval($primary_id);
+ // 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
@@ -625,12 +697,13 @@ class db {
if($diff_num > 0) {
- //print_r($diff_num);
- //print_r($diffrec_full);
$diffstr = serialize($diffrec_full);
- $username = $_SESSION['s']['user']['username'];
+ if(isset($_SESSION)) {
+ $username = $_SESSION['s']['user']['username'];
+ } else {
+ $username = 'admin';
+ }
$dbidx = $primary_field.':'.$primary_id;
- if(trim($username) == '') $username = 'none';
if($action == 'INSERT') $action = 'i';
if($action == 'UPDATE') $action = 'u';
@@ -645,11 +718,11 @@ class db {
//** Inserts a record and saves the changes into the datalog
public function datalogInsert($tablename, $insert_data, $index_field) {
global $app;
-
+
// Check fields
if(!preg_match('/^[a-zA-Z0-9\-\_\.]{1,64}$/',$tablename)) $app->error('Invalid table name '.$tablename);
if(!preg_match('/^[a-zA-Z0-9\-\_]{1,64}$/',$index_field)) $app->error('Invalid index field '.$index_field.' in table '.$tablename);
-
+
if(is_array($insert_data)) {
$key_str = '';
$val_str = '';
@@ -688,7 +761,7 @@ class db {
// Check fields
if(!preg_match('/^[a-zA-Z0-9\-\_\.]{1,64}$/',$tablename)) $app->error('Invalid table name '.$tablename);
if(!preg_match('/^[a-zA-Z0-9\-\_]{1,64}$/',$index_field)) $app->error('Invalid index field '.$index_field.' in table '.$tablename);
-
+
$old_rec = $this->queryOneRecord("SELECT * FROM ?? WHERE ?? = ?", $tablename, $index_field, $index_value);
if(is_array($update_data)) {
@@ -723,7 +796,7 @@ class db {
// Check fields
if(!preg_match('/^[a-zA-Z0-9\-\_\.]{1,64}$/',$tablename)) $app->error('Invalid table name '.$tablename);
if(!preg_match('/^[a-zA-Z0-9\-\_]{1,64}$/',$index_field)) $app->error('Invalid index field '.$index_field.' in table '.$tablename);
-
+
$old_rec = $this->queryOneRecord("SELECT * FROM ?? WHERE ?? = ?", $tablename, $index_field, $index_value);
$this->query("DELETE FROM ?? WHERE ?? = ?", $tablename, $index_field, $index_value);
$new_rec = array();
@@ -732,13 +805,20 @@ class db {
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 = ? WHERE datalog_id = ?", $errormsg, $app->modules->current_datalog_id);
+
+ return true;
+ }
+
//* get the current datalog status for the specified login (or currently logged in user)
public function datalogStatus($login = '') {
global $app;
$return = array('count' => 0, 'entries' => array());
- //if($_SESSION['s']['user']['typ'] == 'admin') return $return; // these information should not be displayed to admin users
- // removed in favor of new non intrusive datalogstatus notification header
if($login == '' && isset($_SESSION['s']['user'])) {
$login = $_SESSION['s']['user']['username'];
@@ -747,14 +827,24 @@ class db {
$result = $this->queryAllRecords("SELECT COUNT( * ) AS cnt, sys_datalog.action, sys_datalog.dbtable FROM sys_datalog, server WHERE server.server_id = sys_datalog.server_id AND sys_datalog.user = ? AND sys_datalog.datalog_id > server.updated GROUP BY sys_datalog.dbtable, sys_datalog.action", $login);
foreach($result as $row) {
if(!$row['dbtable'] || in_array($row['dbtable'], array('aps_instances', 'aps_instances_settings', 'mail_access', 'mail_content_filter'))) continue; // ignore some entries, maybe more to come
- $return['entries'][] = array('table' => $row['dbtable'], 'action' => $row['action'], 'count' => $row['cnt'], 'text' => $app->lng('datalog_status_' . $row['action'] . '_' . $row['dbtable']));
- $return['count'] += $row['cnt'];
+ $return['entries'][] = array('table' => $row['dbtable'], 'action' => $row['action'], 'count' => $row['cnt'], 'text' => $app->lng('datalog_status_' . $row['action'] . '_' . $row['dbtable'])); $return['count'] += $row['cnt'];
}
unset($result);
return $return;
}
+
+ public function freeResult($query)
+ {
+ if(is_object($query) && (get_class($query) == "mysqli_result")) {
+ $query->free();
+ return true;
+ } else {
+ return false;
+ }
+ }
+
/*
$columns = array(action => add | alter | drop
name => Spaltenname
@@ -879,15 +969,6 @@ class db {
if($rows = $app->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];
- */
-
$name = $row['Field'];
$default = $row['Default'];
$key = $row['Key'];
@@ -988,7 +1069,7 @@ class db {
return 'char';
break;
case 'varchar':
- if($typeValue < 1) die('Database failure: Lenght required for these data types.');
+ if($typeValue < 1) die('Database failure: Length required for these data types.');
return 'varchar('.$typeValue.')';
break;
case 'text':
diff --git a/interface/lib/classes/session.inc.php b/interface/lib/classes/session.inc.php
index f4a90beda9ae46276598d9381e0206dcf0e3ac4c..3e93cd4314faded0b1f32e7a0e0b094a183de693 100644
--- a/interface/lib/classes/session.inc.php
+++ b/interface/lib/classes/session.inc.php
@@ -36,7 +36,11 @@ class session {
private $permanent = false;
function __construct($session_timeout = 0) {
- $this->db = new db;
+ try {
+ $this->db = new db;
+ } catch (Exception $e) {
+ $this->db = false;
+ }
$this->timeout = $session_timeout;
}
diff --git a/interface/web/themes/default/assets/stylesheets/ispconfig.css b/interface/web/themes/default/assets/stylesheets/ispconfig.css
index d432c7c59d9faae47ffaf42004438fdc5b41e38e..5cd1bd14110d7146f0a614e356f88a5ef9f8665d 100644
--- a/interface/web/themes/default/assets/stylesheets/ispconfig.css
+++ b/interface/web/themes/default/assets/stylesheets/ispconfig.css
@@ -25,6 +25,9 @@ body {
.form-group input[type='checkbox'] {
margin-top: 10px; }
+.form-group .checkbox-inline input[type='checkbox'] {
+ margin-top: 4px; }
+
.control-label {
font-weight: normal; }
.control-label:after {
diff --git a/interface/web/themes/default/assets/stylesheets/ispconfig.sass b/interface/web/themes/default/assets/stylesheets/ispconfig.sass
index 9855d07dc1ccbdded77d195b1796753506d919fd..3ea081053405df2cbbe81b98661e1f3e9d9cc055 100644
--- a/interface/web/themes/default/assets/stylesheets/ispconfig.sass
+++ b/interface/web/themes/default/assets/stylesheets/ispconfig.sass
@@ -25,6 +25,9 @@ body
.form-group input[type='checkbox']
margin-top: 10px
+.form-group .checkbox-inline input[type='checkbox']
+ margin-top: 4px
+
.control-label
font-weight: normal
@@ -311,4 +314,4 @@ thead.dark
.input-group-field:last-child
border-top-left-radius: 0
- border-bottom-left-radius: 0
\ No newline at end of file
+ border-bottom-left-radius: 0
diff --git a/interface/web/tools/dns_import_tupa.php b/interface/web/tools/dns_import_tupa.php
index 12bd03529673c39a8b5d9979e2f4cf4bc6a84111..d1b4e1af3b05e86624e9b9d500f7c6664d996488 100644
--- a/interface/web/tools/dns_import_tupa.php
+++ b/interface/web/tools/dns_import_tupa.php
@@ -49,32 +49,27 @@ if(isset($_POST['start']) && $_POST['start'] == 1) {
//* CSRF Check
$app->auth->csrf_token_check();
- //* Set variable sin template
+ //* Set variables in template
$app->tpl->setVar('dbhost', $_POST['dbhost'], true);
$app->tpl->setVar('dbname', $_POST['dbname'], true);
$app->tpl->setVar('dbuser', $_POST['dbuser'], true);
$app->tpl->setVar('dbpassword', $_POST['dbpassword'], true);
+ $app->tpl->setVar('dbssl', 'true', true);
//* Establish connection to external database
$msg .= 'Connecting to external database...<br />';
- //* Backup DB login details
- /*$conf_bak['db_host'] = $conf['db_host'];
- $conf_bak['db_database'] = $conf['db_database'];
- $conf_bak['db_user'] = $conf['db_user'];
- $conf_bak['db_password'] = $conf['db_password'];*/
+ //* Set external db client flags
+ $db_client_flags = 0;
+ if(isset($_POST['dbssl']) && $_POST['dbssl'] == 1) $db_client_flags |= MYSQLI_CLIENT_SSL;
- //* Set external Login details
- $conf['imp_db_host'] = $_POST['dbhost'];
- $conf['imp_db_database'] = $_POST['dbname'];
- $conf['imp_db_user'] = $_POST['dbuser'];
- $conf['imp_db_password'] = $_POST['dbpassword'];
- $conf['imp_db_charset'] = $conf['db_charset'];
- $conf['imp_db_new_link'] = $conf['db_new_link'];
- $conf['imp_db_client_flags'] = $conf['db_client_flags'];
-
- //* create new db object
- $exdb = new db('imp');
+ //* create new db object with external login details
+ try {
+ $exdb = new db($_POST['dbhost'], $_POST['dbuser'], $_POST['dbpassword'], $_POST['dbname'], 3306, $db_client_flags);
+ } catch (Exception $e) {
+ $error .= "Error connecting to Tupa database" . ($e->getMessage() ? ": " . $e->getMessage() : '.') . "<br />\n";
+ $exdb = false;
+ }
$server_id = 1;
$sys_userid = 1;
@@ -159,26 +154,13 @@ if(isset($_POST['start']) && $_POST['start'] == 1) {
);
$dns_rr_id = $app->db->datalogInsert('dns_rr', $insert_data, 'id');
//$msg .= $insert_data.'<br />';
-
}
}
}
-
}
}
-
-
-
- } else {
- $error .= $exdb->errorMessage;
}
- //* restore db login details
- /*$conf['db_host'] = $conf_bak['db_host'];
- $conf['db_database'] = $conf_bak['db_database'];
- $conf['db_user'] = $conf_bak['db_user'];
- $conf['db_password'] = $conf_bak['db_password'];*/
-
}
$app->tpl->setVar('msg', $msg);
diff --git a/interface/web/tools/import_vpopmail.php b/interface/web/tools/import_vpopmail.php
index 0209c80e28d6dc43aff100acfaa0ac2d9d555f89..3e732d3740923cb32457409f9d5260b086ac08a4 100644
--- a/interface/web/tools/import_vpopmail.php
+++ b/interface/web/tools/import_vpopmail.php
@@ -52,17 +52,17 @@ $app->tpl->setVar($wb);
if(isset($_POST['db_hostname']) && $_POST['db_hostname'] != '') {
- //* Set external Login details
- $conf['imp_db_host'] = $_POST['db_hostname'];
- $conf['imp_db_database'] = $_POST['db_name'];
- $conf['imp_db_user'] = $_POST['db_user'];
- $conf['imp_db_password'] = $_POST['db_password'];
- $conf['imp_db_charset'] = 'utf8';
- $conf['imp_db_new_link'] = false;
- $conf['imp_db_client_flags'] = 0;
-
- //* create new db object
- $exdb = new db('imp');
+ //* Set external db client flags
+ $db_client_flags = 0;
+ if(isset($_POST['db_ssl']) && $_POST['db_ssl'] == 1) $db_client_flags |= MYSQLI_CLIENT_SSL;
+
+ //* create new db object with external login details
+ try {
+ $exdb = new db($_POST['db_hostname'], $_POST['db_user'], $_POST['db_password'], $_POST['db_name'], 3306, $db_client_flags);
+ } catch (Exception $e) {
+ $error .= "Error connecting to database" . ($e->getMessage() ? ": " . $e->getMessage() : '.') . "<br />\n";
+ $exdb = false;
+ }
if($exdb !== false) {
$msg .= 'Databse connection succeeded<br />';
@@ -75,9 +75,6 @@ if(isset($_POST['db_hostname']) && $_POST['db_hostname'] != '') {
} else {
$msg .= 'The server with the ID $local_server_id is not a mail server.<br />';
}
-
- } else {
- $msg .= 'Database connection failed<br />';
}
} else {
@@ -88,6 +85,7 @@ $app->tpl->setVar('db_hostname', $_POST['db_hostname'], true);
$app->tpl->setVar('db_user', $_POST['db_user'], true);
$app->tpl->setVar('db_password', $_POST['db_password'], true);
$app->tpl->setVar('db_name', $_POST['db_name'], true);
+$app->tpl->setVar('db_ssl', 'true', true);
$app->tpl->setVar('local_server_id', $_POST['local_server_id'], true);
$app->tpl->setVar('msg', $msg);
$app->tpl->setVar('error', $error);
diff --git a/interface/web/tools/templates/dns_import_tupa.htm b/interface/web/tools/templates/dns_import_tupa.htm
index 2d37a6a0419fec37ada787f3ec33d989bfbc250c..cd47f431e017f967aa316fce7fbe75d528cdcb65 100644
--- a/interface/web/tools/templates/dns_import_tupa.htm
+++ b/interface/web/tools/templates/dns_import_tupa.htm
@@ -4,22 +4,27 @@
<legend>PowerDNS Tupa import</legend>
<div class="form-group">
- <label class="col-sm-3 control-label">Tupa database hostname</label>
+ <label class="col-sm-3 control-label" for="dbhost">Tupa database hostname</label>
<div class="col-sm-9"><input class="form-control" type="text" id="dbhost" value="{tmpl_var name='dbhost'}" name="dbhost" /></div>
</div>
<div class="form-group">
- <label class="col-sm-3 control-label">Tupa database name</label>
+ <label class="col-sm-3 control-label" for="dbname">Tupa database name</label>
<div class="col-sm-9"><input class="form-control" type="text" id="dbname" value="{tmpl_var name='dbname'}" name="dbname" /></div>
</div>
<div class="form-group">
- <label class="col-sm-3 control-label">Tupa database user</label>
+ <label class="col-sm-3 control-label" for="dbuser">Tupa database user</label>
<div class="col-sm-9"><input class="form-control" type="text" id="dbuser" value="{tmpl_var name='dbuser'}" name="dbuser" /></div>
</div>
<div class="form-group">
- <label class="col-sm-3 control-label">Tupa database password</label>
+ <label class="col-sm-3 control-label" for="dbpassword">Tupa database password</label>
<div class="col-sm-9"><input class="form-control" type="text" id="dbpassword" value="{tmpl_var name='dbpassword'}" name="dbpassword" /></div>
</div>
-
+ <div class="form-group">
+ <label class="col-sm-3 control-label" for="dboptions">Tupa database options</label>
+ <div class="col-sm-9" id="dboptions">
+ <label class="checkbox-inline" for="dbssl"><input type="checkbox" id="dbssl" value="1" name="dbssl" <tmpl_if name='dbssl' op='==' value='true'>checked</tmpl_if>/> Use SSL</label>
+ </div>
+ </div>
<tmpl_if name="msg">
<div id="OKMsg"><p><tmpl_var name="msg"></p></div>
@@ -34,4 +39,4 @@
<div class="clear"><div class="right">
<button class="btn btn-default formbutton-success" type="button" value="Import" data-submit-form="pageForm" data-form-action="tools/dns_import_tupa.php">Start</button>
<button class="btn btn-default formbutton-default" type="button" value="Cancel" data-load-content="tools/index.php">Cancel</button>
- </div></div>
\ No newline at end of file
+ </div></div>
diff --git a/interface/web/tools/templates/import_vpopmail.htm b/interface/web/tools/templates/import_vpopmail.htm
index 749ce74a411d1543ca0aec6a07c65948f14c709e..7876875b9828e9bc9d1f2be90b75bf3449f268c0 100644
--- a/interface/web/tools/templates/import_vpopmail.htm
+++ b/interface/web/tools/templates/import_vpopmail.htm
@@ -8,26 +8,31 @@
<div class="pnl_formsarea">
<legend>{tmpl_var name="legend_txt"}</legend>
<div class="form-group">
- <label class="col-sm-3 control-label">Database Hostname</label>
+ <label class="col-sm-3 control-label" for="db_hostname">Database Hostname</label>
<div class="col-sm-9"><input class="form-control" type="text" id="db_hostname" value="{tmpl_var name='db_hostname'}" name="db_hostname" /></div>
</div>
<div class="form-group">
- <label class="col-sm-3 control-label">Database Name</label>
+ <label class="col-sm-3 control-label" for="db_name">Database Name</label>
<div class="col-sm-9"><input class="form-control" type="text" id="db_name" value="{tmpl_var name='db_name'}" name="db_name" /></div>
</div>
<div class="form-group">
- <label class="col-sm-3 control-label">Database User</label>
+ <label class="col-sm-3 control-label" for="db_user">Database User</label>
<div class="col-sm-9"><input class="form-control" type="text" id="db_user" value="{tmpl_var name='db_user'}" name="db_user" /></div>
</div>
<div class="form-group">
- <label class="col-sm-3 control-label">Database password</label>
+ <label class="col-sm-3 control-label" for="db_password">Database password</label>
<div class="col-sm-9"><input class="form-control" type="text" id="db_password" value="{tmpl_var name='db_password'}" name="db_password" /></div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label" for="db_options">Tupa database options</label>
+ <div class="col-sm-9" id="db_options">
+ <label class="checkbox-inline" for="db_ssl"><input type="checkbox" id="db_ssl" value="1" name="db_ssl" <tmpl_if name='db_ssl' op='==' value='true'>checked</tmpl_if>/> Use SSL</label>
+ </div>
</div>
<div class="form-group">
- <label class="col-sm-3 control-label">Server ID of local mailserver</label>
+ <label class="col-sm-3 control-label" for="local_server_id">Server ID of local mailserver</label>
<div class="col-sm-9"><input class="form-control" type="text" id="local_server_id" value="{tmpl_var name='local_server_id'}" name="local_server_id" /></div>
</div>
-
</div>
<tmpl_if name="msg">
diff --git a/server/lib/app.inc.php b/server/lib/app.inc.php
index ce2a5484fcf5efc8671727a954d5897259b8fa2a..86df2a86f6b43181d8ba137a326d8cbf3fd643de 100644
--- a/server/lib/app.inc.php
+++ b/server/lib/app.inc.php
@@ -43,7 +43,11 @@ class app {
if($conf['start_db'] == true) {
$this->load('db_'.$conf['db_type']);
- $this->db = new db;
+ try {
+ $this->db = new db;
+ } catch (Exception $e) {
+ $this->db = false;
+ }
/*
Initialize the connection to the master DB,
@@ -51,7 +55,11 @@ class app {
*/
if($conf['dbmaster_host'] != '' && ($conf['dbmaster_host'] != $conf['db_host'] || ($conf['dbmaster_host'] == $conf['db_host'] && $conf['dbmaster_database'] != $conf['db_database']))) {
- $this->dbmaster = new db($conf['dbmaster_host'], $conf['dbmaster_user'], $conf['dbmaster_password'], $conf['dbmaster_database'], $conf['dbmaster_port'], $conf['dbmaster_client_flags']);
+ try {
+ $this->dbmaster = new db($conf['dbmaster_host'], $conf['dbmaster_user'], $conf['dbmaster_password'], $conf['dbmaster_database'], $conf['dbmaster_port'], $conf['dbmaster_client_flags']);
+ } catch (Exception $e) {
+ $this->dbmaster = false;
+ }
} else {
$this->dbmaster = $this->db;
}
diff --git a/server/lib/classes/cron.d/100-monitor_database_size.inc.php b/server/lib/classes/cron.d/100-monitor_database_size.inc.php
index d2981dd31451de58df3816c5b71ce9128fc35f74..97f12253717980eb1bdbdded76b211d2b7a64777 100644
--- a/server/lib/classes/cron.d/100-monitor_database_size.inc.php
+++ b/server/lib/classes/cron.d/100-monitor_database_size.inc.php
@@ -95,12 +95,12 @@ class cronjob_monitor_database_size extends cronjob {
if(!is_numeric($quota)) continue;
if($quota < 1 || $quota > $data[$i]['size']) {
- print $rec['database_name'] . ' does not exceed quota qize: ' . $quota . ' > ' . $data[$i]['size'] . "\n";
+ print 'database ' . $rec['database_name'] . ' size does not exceed quota: ' . ($quota < 1 ? 'unlimited' : $quota) . ' (quota) > ' . $data[$i]['size'] . " (used)\n";
if($rec['quota_exceeded'] == 'y') {
$app->dbmaster->datalogUpdate('web_database', array('quota_exceeded' => 'n'), 'database_id', $rec['database_id']);
}
} elseif($rec['quota_exceeded'] == 'n') {
- print $rec['database_name'] . ' exceeds quota qize: ' . $quota . ' < ' . $data[$i]['size'] . "\n";
+ print 'database ' . $rec['database_name'] . ' size exceeds quota: ' . $quota . ' (quota) < ' . $data[$i]['size'] . " (used)\n";
$app->dbmaster->datalogUpdate('web_database', array('quota_exceeded' => 'y'), 'database_id', $rec['database_id']);
}
}
diff --git a/server/lib/classes/cron.d/200-ftplogfiles.inc.php b/server/lib/classes/cron.d/200-ftplogfiles.inc.php
index e471967555bf33dd6f3bcdf66244ea9a1bc2e5f7..36b43352404153dcde58ee8e857de9bd6830011d 100644
--- a/server/lib/classes/cron.d/200-ftplogfiles.inc.php
+++ b/server/lib/classes/cron.d/200-ftplogfiles.inc.php
@@ -71,24 +71,26 @@ class cronjob_ftplogfiles extends cronjob {
}
}
- $fp = fopen('/var/log/pure-ftpd/transfer.log.1', 'r');
+ $fp = @fopen('/var/log/pure-ftpd/transfer.log.1', 'r');
$ftp_traffic = array();
- // cumule des stats journalière dans un tableau
- while($line = fgets($fp))
- {
- $parsed_line = parse_ftp_log($line);
-
- $sql = "SELECT wd.domain FROM ftp_user AS fu INNER JOIN web_domain AS wd ON fu.parent_domain_id = wd.domain_id WHERE fu.username = ? ";
- $temp = $app->db->queryOneRecord($sql, $parsed_line['username'] );
-
- $parsed_line['domain'] = $temp['domain'];
-
- add_ftp_traffic($ftp_traffic, $parsed_line);
+ if ($fp) {
+ // cumule des stats journalière dans un tableau
+ while($line = fgets($fp))
+ {
+ $parsed_line = parse_ftp_log($line);
+
+ $sql = "SELECT wd.domain FROM ftp_user AS fu INNER JOIN web_domain AS wd ON fu.parent_domain_id = wd.domain_id WHERE fu.username = ? ";
+ $temp = $app->db->queryOneRecord($sql, $parsed_line['username'] );
+
+ $parsed_line['domain'] = $temp['domain'];
+
+ add_ftp_traffic($ftp_traffic, $parsed_line);
+ }
+
+ fclose($fp);
}
-
- fclose($fp);
-
+
// Save du tableau en BD
foreach($ftp_traffic as $traffic_date => $all_traffic)
{
@@ -123,4 +125,4 @@ class cronjob_ftplogfiles extends cronjob {
}
}
-?>
\ No newline at end of file
+?>
diff --git a/server/lib/classes/db_mysql.inc.php b/server/lib/classes/db_mysql.inc.php
index 4eb691ce4422dc6c3683957b3b73f6f0e5c7d4e1..b0ae61ef36398a431d5f9b73f1b7cde3f2a7e4a4 100644
--- a/server/lib/classes/db_mysql.inc.php
+++ b/server/lib/classes/db_mysql.inc.php
@@ -1,4 +1,12 @@
<?php
+/*
+ * db_mysql.inc.php: ISPConfig mysql db interface
+ *
+ * Note! When making changes to this file, put a copy in both locations:
+ * interface/lib/classes/db_mysql.inc.php
+ * server/lib/classes/db_mysql.inc.php
+ */
+
/*
Copyright (c) 2005, Till Brehm, projektfarm Gmbh
All rights reserved.
@@ -41,12 +49,10 @@ class db
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
/**#@-*/
- public $show_error_messages = false; // false in server, true in interface
-
+ public $show_error_messages = false; // false in server, interface sets true when generating templates
/* old things - unused now ////
private $linkId = 0; // last result of mysqli_connect()
@@ -54,8 +60,8 @@ class db
private $record = array(); // last record fetched
private $autoCommit = 1; // Autocommit Transactions
private $currentRow; // current row number
- public $errorNumber = 0; // last error number
*/
+ public $errorNumber = 0; // last error number
public $errorMessage = ''; // last error message
/*
private $errorLocation = '';// last error location
@@ -73,25 +79,29 @@ class db
$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 = $flags ? $flags : $conf['db_client_flags'];
+ $this->dbClientFlags = ($flags !== NULL) ? $flags : $conf['db_client_flags'];
$this->_iConnId = mysqli_init();
mysqli_real_connect($this->_iConnId, $this->dbHost, $this->dbUser, $this->dbPass, '', (int)$this->dbPort, NULL, $this->dbClientFlags);
- for($try=0;(!is_object($this->_iConnId) || mysqli_connect_error()) && $try < 5;++$try) {
+ for($try=0;(!is_object($this->_iConnId) || mysqli_connect_errno()) && $try < 5;++$try) {
sleep($try);
- mysqli_real_connect($this->_iConnId, $this->dbHost, $this->dbUser, $this->dbPass, '', (int)$this->dbPort, NULL, $this->dbClientFlags);
+ if(!is_object($this->_iConnId)) {
+ $this->_iConnId = mysqli_init();
+ }
+ if(!mysqli_real_connect($this->_iConnId, $this->dbHost, $this->dbUser, $this->dbPass, '', (int)$this->dbPort, NULL, $this->dbClientFlags)) {
+ $this->_sqlerror('Database connection failed');
+ }
}
- if(!is_object($this->_iConnId) || mysqli_connect_error()) {
+ if(!is_object($this->_iConnId) || mysqli_connect_errno()) {
$this->_iConnId = null;
- $this->_sqlerror('Zugriff auf Datenbankserver fehlgeschlagen! / Database server not accessible!', '', true);
- return false;
+ $this->_sqlerror('Zugriff auf Datenbankserver fehlgeschlagen! / Database server not accessible!', '', true); // sets errorMessage
+ throw new Exception($this->errorMessage);
}
if(!((bool)mysqli_query( $this->_iConnId, 'USE `' . $this->dbName . '`'))) {
$this->close();
- $this->_sqlerror('Datenbank nicht gefunden / Database not found', '', true);
- return false;
+ $this->_sqlerror('Datenbank nicht gefunden / Database not found', '', true); // sets errorMessage
+ throw new Exception($this->errorMessage);
}
$this->_setCharset();
@@ -106,6 +116,18 @@ class db
$this->_iConnId = null;
}
+ /*
+ * Test mysql connection.
+ *
+ * @return boolean returns true if db connection is good.
+ */
+ public function testConnection() {
+ if(mysqli_connect_errno()) {
+ return false;
+ }
+ return (boolean)(is_object($this->_iConnId) && mysqli_ping($this->_iConnId));
+ }
+
/* This allows our private variables to be "read" out side of the class */
public function __get($var) {
return isset($this->$var) ? $this->$var : NULL;
@@ -134,6 +156,7 @@ class db
if($iPos2 !== false && ($iPos === false || $iPos2 <= $iPos)) {
$sTxt = $this->escape($sValue);
+ $sTxt = str_replace('`', '', $sTxt);
if(strpos($sTxt, '.') !== false) {
$sTxt = preg_replace('/^(.+)\.(.+)$/', '`$1`.`$2`', $sTxt);
$sTxt = str_replace('.`*`', '.*', $sTxt);
@@ -174,17 +197,68 @@ class db
/**#@+
- * @access private
- */
+ * @access private
+ */
private function _setCharset() {
- mysqli_query($this->_iConnId, 'SET NAMES '.$this->dbCharset);
- mysqli_query($this->_iConnId, "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."'");
+ $this->query('SET NAMES '.$this->dbCharset);
+ $this->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."'");
+ }
+
+ private function securityScan($string) {
+ global $app, $conf;
+
+ // get security config
+ if(isset($app)) {
+ $app->uses('getconf');
+ $ids_config = $app->getconf->get_security_config('ids');
+
+ if($ids_config['sql_scan_enabled'] == 'yes') {
+
+ // Remove whitespace
+ $string = trim($string);
+ if(substr($string,-1) == ';') $string = substr($string,0,-1);
+
+ // Save original string
+ $string_orig = $string;
+
+ //echo $string;
+ $chars = array(';', '#', '/*', '*/', '--', '\\\'', '\\"');
+
+ $string = str_replace('\\\\', '', $string);
+ $string = preg_replace('/(^|[^\\\])([\'"])\\2/is', '$1', $string);
+ $string = preg_replace('/(^|[^\\\])([\'"])(.*?[^\\\])\\2/is', '$1', $string);
+ $ok = true;
+
+ if(substr_count($string, "`") % 2 != 0 || substr_count($string, "'") % 2 != 0 || substr_count($string, '"') % 2 != 0) {
+ $app->log("SQL injection warning (" . $string_orig . ")",2);
+ $ok = false;
+ } else {
+ foreach($chars as $char) {
+ if(strpos($string, $char) !== false) {
+ $ok = false;
+ $app->log("SQL injection warning (" . $string_orig . ")",2);
+ break;
+ }
+ }
+ }
+ if($ok == true) {
+ return true;
+ } else {
+ if($ids_config['sql_scan_action'] == 'warn') {
+ // we return false in warning level.
+ return false;
+ } else {
+ // if sql action = 'block' or anything else then stop here.
+ $app->error('Possible SQL injection. All actions have been logged.');
+ }
+ }
+ }
+ }
}
private function _query($sQuery = '') {
global $app;
- //if($this->isConnected == false) return false;
if ($sQuery == '') {
$this->_sqlerror('Keine Anfrage angegeben / No query given');
return false;
@@ -193,10 +267,13 @@ class db
$try = 0;
do {
$try++;
- $ok = mysqli_ping($this->_iConnId);
+ $ok = (is_object($this->_iConnId)) ? mysqli_ping($this->_iConnId) : false;
if(!$ok) {
- if(!mysqli_real_connect(mysqli_init(), $this->dbHost, $this->dbUser, $this->dbPass, $this->dbName, (int)$this->dbPort, NULL, $this->dbClientFlags)) {
- if($this->errorNumber == '111') {
+ if(!is_object($this->_iConnId)) {
+ $this->_iConnId = mysqli_init();
+ }
+ if(!mysqli_real_connect($this->_isConnId, $this->dbHost, $this->dbUser, $this->dbPass, $this->dbName, (int)$this->dbPort, NULL, $this->dbClientFlags)) {
+ if(mysqli_connect_errno() == '111') {
// server is not available
if($try > 9) {
if(isset($app) && isset($app->forceErrorExit)) {
@@ -208,7 +285,7 @@ class db
}
if($try > 9) {
- $this->_sqlerror('DB::query -> reconnect', '', true);
+ $this->_sqlerror('db::_query -> reconnect', '', true);
return false;
} else {
sleep(($try > 7 ? 5 : 1));
@@ -222,7 +299,7 @@ class db
$aArgs = func_get_args();
$sQuery = call_user_func_array(array(&$this, '_build_query_string'), $aArgs);
-
+ $this->securityScan($sQuery);
$this->_iQueryId = mysqli_query($this->_iConnId, $sQuery);
if (!$this->_iQueryId) {
$this->_sqlerror('Falsche Anfrage / Wrong Query', 'SQL-Query = ' . $sQuery);
@@ -369,13 +446,14 @@ class db
* @return int id of last inserted row or 0 if none
*/
public function insert_id() {
- $iRes = mysqli_query($this->_iConnId, 'SELECT LAST_INSERT_ID() as `newid`');
- if(!is_object($iRes)) return false;
-
- $aReturn = mysqli_fetch_assoc($iRes);
- mysqli_free_result($iRes);
-
- return $aReturn['newid'];
+ $oResult = $this->query('SELECT LAST_INSERT_ID() as `newid`');
+ if(!$oResult) {
+ $this->_sqlerror('Unable to select last_insert_id()');
+ return false;
+ }
+ $aReturn = $oResult->get();
+ $oResult->free();
+ return isset($aReturn['newid']) ? $aReturn['newid'] : 0;
}
@@ -465,8 +543,13 @@ class db
private function _sqlerror($sErrormsg = 'Unbekannter Fehler', $sAddMsg = '', $bNoLog = false) {
global $app, $conf;
- $mysql_error = (is_object($this->_iConnId) ? mysqli_error($this->_iConnId) : mysqli_connect_error());
- $mysql_errno = (is_object($this->_iConnId) ? mysqli_errno($this->_iConnId) : mysqli_connect_errno());
+ $mysql_errno = mysqli_connect_errno();
+ $mysql_error = mysqli_connect_error();
+ if ($mysql_errno === 0 && is_object($this->_iConnId)) {
+ $mysql_errno = mysqli_errno($this->_iConnId);
+ $mysql_error = mysqli_error($this->_iConnId);
+ }
+ $this->errorNumber = $mysql_error;
$this->errorMessage = $mysql_error;
//$sAddMsg .= getDebugBacktrace();
@@ -510,6 +593,26 @@ class db
return $out;
}
+ public function insertFromArray($tablename, $data) {
+ if(!is_array($data)) return false;
+
+ $k_query = '';
+ $v_query = '';
+
+ $params = array($tablename);
+ $v_params = array();
+
+ foreach($data as $key => $value) {
+ $k_query .= ($k_query != '' ? ', ' : '') . '??';
+ $v_query .= ($v_query != '' ? ', ' : '') . '?';
+ $params[] = $key;
+ $v_params[] = $value;
+ }
+
+ $query = 'INSERT INTO ?? (' . $k_query . ') VALUES (' . $v_query . ')';
+ return $this->query($query, true, array_merge($params, $v_params));
+ }
+
public function diffrec($record_old, $record_new) {
$diffrec_full = array();
$diff_num = 0;
@@ -550,34 +653,24 @@ class db
* @param string $database_name
* @return int - database-size in bytes
*/
-
-
public function getDatabaseSize($database_name) {
global $app;
- include 'lib/mysql_clientdb.conf';
+ require_once 'lib/mysql_clientdb.conf';
- /* Connect to the database */
- $link = mysqli_connect($clientdb_host, $clientdb_user, $clientdb_password);
- if (!$link) {
- $app->log('Unable to connect to the database'.mysqli_connect_error(), LOGLEVEL_DEBUG);
- return;
- }
-
- /* Get database-size from information_schema */
- $result = mysqli_query($link, "SELECT SUM(data_length+index_length) FROM information_schema.TABLES WHERE table_schema='".mysqli_real_escape_string($link, $database_name)."'");
+ $result = $this->_query("SELECT SUM(data_length+index_length) FROM information_schema.TABLES WHERE table_schema='".$this->escape($database_name)."'");
if(!$result) {
- $app->log('Unable to get the database-size for ' . $database_name . ': '.mysqli_error($link), LOGLEVEL_DEBUG);
+ $this->_sqlerror('Unable to determine the size of database ' . $database_name);
return;
}
- $database_size = mysqli_fetch_row($result);
- mysqli_close($link);
- return $database_size[0];
+ $database_size = $result->getAsRow();
+ $result->free();
+ return $database_size[0] ? $database_size[0] : 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;
+ global $app;
// Insert backticks only for incomplete table names.
if(stristr($db_table, '.')) {
@@ -626,6 +719,10 @@ class db
public function datalogInsert($tablename, $insert_data, $index_field) {
global $app;
+ // Check fields
+ if(!preg_match('/^[a-zA-Z0-9\-\_\.]{1,64}$/',$tablename)) $app->error('Invalid table name '.$tablename);
+ if(!preg_match('/^[a-zA-Z0-9\-\_]{1,64}$/',$index_field)) $app->error('Invalid index field '.$index_field.' in table '.$tablename);
+
if(is_array($insert_data)) {
$key_str = '';
$val_str = '';
@@ -661,6 +758,10 @@ class db
public function datalogUpdate($tablename, $update_data, $index_field, $index_value, $force_update = false) {
global $app;
+ // Check fields
+ if(!preg_match('/^[a-zA-Z0-9\-\_\.]{1,64}$/',$tablename)) $app->error('Invalid table name '.$tablename);
+ if(!preg_match('/^[a-zA-Z0-9\-\_]{1,64}$/',$index_field)) $app->error('Invalid index field '.$index_field.' in table '.$tablename);
+
$old_rec = $this->queryOneRecord("SELECT * FROM ?? WHERE ?? = ?", $tablename, $index_field, $index_value);
if(is_array($update_data)) {
@@ -692,6 +793,10 @@ class db
public function datalogDelete($tablename, $index_field, $index_value) {
global $app;
+ // Check fields
+ if(!preg_match('/^[a-zA-Z0-9\-\_\.]{1,64}$/',$tablename)) $app->error('Invalid table name '.$tablename);
+ if(!preg_match('/^[a-zA-Z0-9\-\_]{1,64}$/',$index_field)) $app->error('Invalid index field '.$index_field.' in table '.$tablename);
+
$old_rec = $this->queryOneRecord("SELECT * FROM ?? WHERE ?? = ?", $tablename, $index_field, $index_value);
$this->query("DELETE FROM ?? WHERE ?? = ?", $tablename, $index_field, $index_value);
$new_rec = array();
@@ -709,6 +814,26 @@ class db
return true;
}
+ //* get the current datalog status for the specified login (or currently logged in user)
+ public function datalogStatus($login = '') {
+ global $app;
+
+ $return = array('count' => 0, 'entries' => array());
+
+ if($login == '' && isset($_SESSION['s']['user'])) {
+ $login = $_SESSION['s']['user']['username'];
+ }
+
+ $result = $this->queryAllRecords("SELECT COUNT( * ) AS cnt, sys_datalog.action, sys_datalog.dbtable FROM sys_datalog, server WHERE server.server_id = sys_datalog.server_id AND sys_datalog.user = ? AND sys_datalog.datalog_id > server.updated GROUP BY sys_datalog.dbtable, sys_datalog.action", $login);
+ foreach($result as $row) {
+ if(!$row['dbtable'] || in_array($row['dbtable'], array('aps_instances', 'aps_instances_settings', 'mail_access', 'mail_content_filter'))) continue; // ignore some entries, maybe more to come
+ $return['entries'][] = array('table' => $row['dbtable'], 'action' => $row['action'], 'count' => $row['cnt'], 'text' => $app->lng('datalog_status_' . $row['action'] . '_' . $row['dbtable'])); $return['count'] += $row['cnt'];
+ }
+ unset($result);
+
+ return $return;
+ }
+
public function freeResult($query)
{
@@ -839,10 +964,10 @@ class db
function tableInfo($table_name) {
- global $go_api, $go_info;
+ global $go_api, $go_info, $app;
// Tabellenfelder einlesen
- if($rows = $go_api->db->queryAllRecords('SHOW FIELDS FROM ??', $table_name)){
+ if($rows = $app->db->queryAllRecords('SHOW FIELDS FROM ??', $table_name)){
foreach($rows as $row) {
$name = $row['Field'];
$default = $row['Default'];
@@ -944,7 +1069,7 @@ class db
return 'char';
break;
case 'varchar':
- if($typeValue < 1) die('Database failure: Lenght required for these data types.');
+ if($typeValue < 1) die('Database failure: Length required for these data types.');
return 'varchar('.$typeValue.')';
break;
case 'text':
@@ -953,6 +1078,9 @@ class db
case 'blob':
return 'blob';
break;
+ case 'date':
+ return 'date';
+ break;
}
}
diff --git a/server/server.php b/server/server.php
index 689cb174901017229d480e1f3dc920375303507a..106d3edc654f4dd9974b76fca0f183d1dd2d56cd 100644
--- a/server/server.php
+++ b/server/server.php
@@ -61,7 +61,7 @@ $conf['server_id'] = intval($conf['server_id']);
/*
* Try to Load the server configuration from the master-db
*/
-if ($app->dbmaster->connect_error == NULL) {
+if ($app->dbmaster->testConnection()) {
$server_db_record = $app->dbmaster->queryOneRecord("SELECT * FROM server WHERE server_id = ?", $conf['server_id']);
if(!is_array($server_db_record)) die('Unable to load the server configuration from database.');
@@ -152,7 +152,7 @@ $needStartCore = true;
/*
* Next we try to process the datalog
*/
-if ($app->db->connect_error == NULL && $app->dbmaster->connect_error == NULL) {
+if ($app->db->testConnection() && $app->dbmaster->testConnection()) {
// Check if there is anything to update
if ($conf['mirror_server_id'] > 0) {
@@ -187,7 +187,7 @@ if ($app->db->connect_error == NULL && $app->dbmaster->connect_error == NULL) {
$needStartCore = false;
} else {
- if ($app->db->connect->connect_error == NULL) {
+ if (!$app->db->connect->testConnection()) {
$app->log('Unable to connect to local server.' . $app->db->errorMessage, LOGLEVEL_WARN);
} else {
$app->log('Unable to connect to master server.' . $app->dbmaster->errorMessage, LOGLEVEL_WARN);