maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

Merge remote-tracking branch 'origin/0.9.31'

Browse Source
This commit is contained in:
Michael Kaufmann (d00p)
2013-12-11 07:30:29 +01:00
parent 7bf0299d33 7eedf6e694
commit e7678b8b6a
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
admin_customers.php
View File

@@ -243,7 +243,7 @@ if ($page == 'customers'
Database::needRoot(true); Database::needRoot(true);
$last_dbserver = 0; $last_dbserver = 0;
$dbm = new DbManager($settings); $dbm = new DbManager($settings, $log);
while ($row_database = $databases_stmt->fetch(PDO::FETCH_ASSOC)) { while ($row_database = $databases_stmt->fetch(PDO::FETCH_ASSOC)) {
@@ -1265,7 +1265,7 @@ if ($page == 'customers'
Database::needRoot(true); Database::needRoot(true);
$last_dbserver = 0; $last_dbserver = 0;
$dbm = new DbManager($settings); $dbm = new DbManager($settings, $log);
// For each of them // For each of them
while ($row_database = $databases_stmt->fetch(PDO::FETCH_ASSOC)) { while ($row_database = $databases_stmt->fetch(PDO::FETCH_ASSOC)) {

4
customer_mysql.php
View File

@@ -109,7 +109,7 @@ if ($page == 'overview') {
if (isset($_POST['send']) && $_POST['send'] == 'send') { if (isset($_POST['send']) && $_POST['send'] == 'send') {
// Begin root-session // Begin root-session
Database::needRoot(true, $result['dbserver']); Database::needRoot(true, $result['dbserver']);
$dbm = new DbManager($settings); $dbm = new DbManager($settings, $log);
$dbm->getManager()->deleteDatabase($result['databasename']); $dbm->getManager()->deleteDatabase($result['databasename']);
$log->logAction(USR_ACTION, LOG_INFO, "deleted database '" . $result['databasename'] . "'"); $log->logAction(USR_ACTION, LOG_INFO, "deleted database '" . $result['databasename'] . "'");
Database::needRoot(false); Database::needRoot(false);
@@ -171,7 +171,7 @@ if ($page == 'overview') {
$databasedescription = validate(trim($_POST['description']), 'description'); $databasedescription = validate(trim($_POST['description']), 'description');
// create database, user, set permissions, etc.pp. // create database, user, set permissions, etc.pp.
$dbm = new DbManager($settings); $dbm = new DbManager($settings, $log);
$username = $dbm->createDatabase( $username = $dbm->createDatabase(
$userinfo['loginname'], $userinfo['loginname'],
$password, $password,

4
lib/functions/database/function.correctMysqlUsers.php
View File

@@ -19,7 +19,7 @@
function correctMysqlUsers($mysql_access_host_array) { function correctMysqlUsers($mysql_access_host_array) {
global $settings; global $settings, $log;
// get sql-root access data // get sql-root access data
Database::needRoot(true); Database::needRoot(true);
@@ -36,7 +36,7 @@ function correctMysqlUsers($mysql_access_host_array) {
Database::needSqlData(); Database::needSqlData();
$sql_root = Database::getSqlData(); $sql_root = Database::getSqlData();
$dbm = new DbManager($settings); $dbm = new DbManager($settings, $log);
$users = $dbm->getManager()->getAllSqlUsers(false); $users = $dbm->getManager()->getAllSqlUsers(false);
$databases = array( $databases = array(