From a4becf146d727bd32b513b9d2810d1b55d4318a8 Mon Sep 17 00:00:00 2001 From: Till Brehm <tbrehm@ispconfig.org> Date: Sun, 27 Jul 2014 07:32:36 -0400 Subject: [PATCH] Merge branch 'stable-3.0.5' of git.ispconfig.org:ispconfig/ispconfig3 into stable-3.0.5 --- server/plugins-available/mysql_clientdb_plugin.inc.php | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/server/plugins-available/mysql_clientdb_plugin.inc.php b/server/plugins-available/mysql_clientdb_plugin.inc.php index cba977c..6145db0 100644 --- a/server/plugins-available/mysql_clientdb_plugin.inc.php +++ b/server/plugins-available/mysql_clientdb_plugin.inc.php @@ -83,7 +83,14 @@ if(!is_array($host_list)) $host_list = explode(',', $host_list); $success = true; - + if(!preg_match('/\*[A-F0-9]{40}$/', $database_password)) { + $result = $link->query("SELECT PASSWORD('" . $link->escape_string($database_password) . "') as `crypted`"); + if($result) { + $row = $result->fetch_assoc(); + $database_password = $row['crypted']; + $result->free(); + } + } // loop through hostlist foreach($host_list as $db_host) { $db_host = trim($db_host); @@ -270,7 +277,7 @@ $old_host_list .= 'localhost'; // Create the database user if database was disabled before - if($data['new']['active'] == 'y' && $data['old']['active'] == 'n') { + if($data['new']['active'] == 'y') { if($db_user) { if($db_user['database_user'] == 'root') $app->log('User root not allowed for Client databases', LOGLEVEL_WARNING); else $this->process_host_list('GRANT', $data['new']['database_name'], $db_user['database_user'], $db_user['database_password'], $host_list, $link); -- Gitblit v1.9.1