diff --git a/admin_customers.php b/admin_customers.php index bf39d858..bedbf190 100644 --- a/admin_customers.php +++ b/admin_customers.php @@ -211,7 +211,6 @@ if($page == 'customers' { $databases = $db->query("SELECT * FROM " . TABLE_PANEL_DATABASES . " WHERE customerid='" . (int)$id . "' ORDER BY `dbserver`"); $db_root = new db($sql_root[0]['host'], $sql_root[0]['user'], $sql_root[0]['password'], ''); - unset($db_root->password); $last_dbserver = 0; while($row_database = $db->fetch_array($databases)) @@ -221,7 +220,6 @@ if($page == 'customers' $db_root->query('FLUSH PRIVILEGES;'); $db_root->close(); $db_root = new db($sql_root[$row_database['dbserver']]['host'], $sql_root[$row_database['dbserver']]['user'], $sql_root[$row_database['dbserver']]['password'], ''); - unset($db_root->password); $last_dbserver = $row_database['dbserver']; } @@ -1244,7 +1242,6 @@ if($page == 'customers' /* Retrieve customer's databases */ $databases = $db->query("SELECT * FROM " . TABLE_PANEL_DATABASES . " WHERE customerid='" . (int)$id . "' ORDER BY `dbserver`"); $db_root = new db($sql_root[0]['host'], $sql_root[0]['user'], $sql_root[0]['password'], ''); - unset($db_root->password); $last_dbserver = 0; /* For each of them */ @@ -1255,7 +1252,6 @@ if($page == 'customers' $db_root->query('FLUSH PRIVILEGES;'); $db_root->close(); $db_root = new db($sql_root[$row_database['dbserver']]['host'], $sql_root[$row_database['dbserver']]['user'], $sql_root[$row_database['dbserver']]['password'], ''); - unset($db_root->password); $last_dbserver = $row_database['dbserver']; } diff --git a/customer_mysql.php b/customer_mysql.php index 1be955a9..5897a152 100644 --- a/customer_mysql.php +++ b/customer_mysql.php @@ -64,7 +64,6 @@ elseif($page == 'mysqls') // Begin root-session $db_root = new db($sql_root[0]['host'], $sql_root[0]['user'], $sql_root[0]['password'], ''); - unset($db_root->password); while($row = $db->fetch_array($result)) { if($paging->checkDisplay($i)) @@ -103,7 +102,6 @@ elseif($page == 'mysqls') // Begin root-session $db_root = new db($sql_root[$result['dbserver']]['host'], $sql_root[$result['dbserver']]['user'], $sql_root[$result['dbserver']]['password'], ''); - unset($db_root->password); foreach(array_map('trim', array_unique(explode(',', $settings['system']['mysql_access_host']))) as $mysql_access_host) { $db_root->query('REVOKE ALL PRIVILEGES ON * . * FROM `' . $db_root->escape($result['databasename']) . '`@`' . $db_root->escape($mysql_access_host) . '`'); @@ -183,7 +181,6 @@ elseif($page == 'mysqls') // Begin root-session $db_root = new db($sql_root[$dbserver]['host'], $sql_root[$dbserver]['user'], $sql_root[$dbserver]['password'], ''); - unset($db_root->password); $db_root->query('CREATE DATABASE `' . $db_root->escape($username) . '`'); $log->logAction(USR_ACTION, LOG_INFO, "created database '" . $username . "'"); foreach(array_map('trim', explode(',', $settings['system']['mysql_access_host'])) as $mysql_access_host) @@ -299,7 +296,6 @@ elseif($page == 'mysqls') // Begin root-session $db_root = new db($sql_root[$result['dbserver']]['host'], $sql_root[$result['dbserver']]['user'], $sql_root[$result['dbserver']]['password'], ''); - unset($db_root->password); foreach(array_map('trim', explode(',', $settings['system']['mysql_access_host'])) as $mysql_access_host) { $db_root->query('SET PASSWORD FOR `' . $db_root->escape($result['databasename']) . '`@`' . $db_root->escape($mysql_access_host) . '` = PASSWORD(\'' . $db_root->escape($password) . '\')'); diff --git a/lib/classes/database/class.db.php b/lib/classes/database/class.db.php index 9ac485d3..76c85077 100644 --- a/lib/classes/database/class.db.php +++ b/lib/classes/database/class.db.php @@ -29,56 +29,56 @@ class db * @var int */ - var $link_id = 0; + public $link_id = 0; /** * Query ID for every query * @var int */ - var $query_id = 0; + private $query_id = 0; /** * Errordescription, if an error occures * @var string */ - var $errdesc = ''; + public $errdesc = ''; /** * Errornumber, if an error occures * @var int */ - var $errno = 0; + public $errno = 0; /** * Servername * @var string */ - var $server = ''; + private $server = ''; /** * Username * @var string */ - var $user = ''; + private $user = ''; /** * Password * @var string */ - var $password = ''; + private $password = ''; /** * Database * @var string */ - var $database = ''; + private $database = ''; /** * Class constructor. Connects to Databaseserver and selects Database @@ -188,8 +188,19 @@ class db function query($query_str, $unbuffered = false, $suppress_error = false) { + global $numbqueries; + if (!mysql_ping($this->link_id)) + { + $this->link_id = mysql_connect($this->server,$this->user,$this->password); + if(!$this->database) + { + return false; + } + mysql_select_db($this->database); + } + if(!$unbuffered) { if($suppress_error) diff --git a/lib/cron_init.php b/lib/cron_init.php index a65040e1..7c530eae 100644 --- a/lib/cron_init.php +++ b/lib/cron_init.php @@ -155,7 +155,6 @@ if($db->link_id == 0) fwrite($debugHandler, 'Database-connection established' . "\n"); unset($sql); -unset($db->password); $result = $db->query("SELECT `settingid`, `settinggroup`, `varname`, `value` FROM `" . TABLE_PANEL_SETTINGS . "`"); while($row = $db->fetch_array($result)) diff --git a/lib/functions/froxlor/function.openRootDB.php b/lib/functions/froxlor/function.openRootDB.php index 49082384..926416ea 100644 --- a/lib/functions/froxlor/function.openRootDB.php +++ b/lib/functions/froxlor/function.openRootDB.php @@ -58,7 +58,6 @@ function openRootDB($debugHandler = false, $lockfile = false) die('root can\'t connect to mysqlserver. Please check userdata.inc.php! Exiting...'); } - unset($db_root->password); if(isset($debugHandler) && $debugHandler !== false) { fwrite($debugHandler, 'Database-rootconnection established' . "\n"); diff --git a/lib/init.php b/lib/init.php index 988c0ded..1ad1f2f2 100644 --- a/lib/init.php +++ b/lib/init.php @@ -117,7 +117,6 @@ require ('./lib/tables.inc.php'); $db = new db($sql['host'], $sql['user'], $sql['password'], $sql['db']); unset($sql['password']); -unset($db->password); // we will try to unset most of the $sql information if they are not needed // by the calling script.