add logger to dbmanager, thx Sephi

Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
froxlor · Dec 10, 2013 · 7eedf6e · 7eedf6e
1 parent 3e54fd7
commit 7eedf6e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/admin_customers.php b/admin_customers.php
@@ -247,7 +247,7 @@
 				Database::needRoot(true);
 				$last_dbserver = 0;
 
-				$dbm = new DbManager($settings);
+				$dbm = new DbManager($settings, $log);
 
 				while ($row_database = $databases_stmt->fetch(PDO::FETCH_ASSOC)) {
 
@@ -1378,7 +1378,7 @@
 						Database::needRoot(true);
 						$last_dbserver = 0;
 
-						$dbm = new DbManager($settings);
+						$dbm = new DbManager($settings, $log);
 
 						// For each of them
 						while ($row_database = $databases_stmt->fetch(PDO::FETCH_ASSOC)) {

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

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