Skip to content
Snippets Groups Projects
Commit 21b1c30c authored by Till Brehm's avatar Till Brehm
Browse files

Update mysql_clientdb_plugin.inc.php

parent 6322f58c
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
server/plugins-available/mysql_clientdb_plugin.inc.php
+ 8
− 8
View file @ 21b1c30c
...@@ -153,17 +153,17 @@ class mysql_clientdb_plugin { ...@@ -153,17 +153,17 @@ class mysql_clientdb_plugin {
// mariadb or mysql < 5.7 // mariadb or mysql < 5.7
if($this->getDatabaseType($link) == 'mariadb' || version_compare($this->getDatabaseVersion($link), '5.7', '<')) { if($this->getDatabaseType($link) == 'mariadb' || version_compare($this->getDatabaseVersion($link), '5.7', '<')) {
$query = sprintf("SET PASSWORD FOR '%s'@'%s' = '%s'", $query = sprintf("SET PASSWORD FOR '%s'@'%s' = '%s'",
$link->escape_string($data['new']['database_user']), $link->escape_string($database_user),
$db_host, $db_host,
$link->escape_string($data['new']['database_password'])); $link->escape_string($database_password));
if(!$link->query($query)) $success = false; if(!$link->query($query)) $success = false;
} }
// mysql >= 5.7 // mysql >= 5.7
else { else {
$query = sprintf("ALTER USER IF EXISTS '%s'@'%s' IDENTIFIED WITH mysql_native_password AS '%s'", $query = sprintf("ALTER USER IF EXISTS '%s'@'%s' IDENTIFIED WITH mysql_native_password AS '%s'",
$link->escape_string($data['new']['database_user']), $link->escape_string($database_user),
$db_host, $db_host,
$link->escape_string($data['new']['database_password'])); $link->escape_string($database_password));
if(!$link->query($query)) $success = false; if(!$link->query($query)) $success = false;
} }
...@@ -190,17 +190,17 @@ class mysql_clientdb_plugin { ...@@ -190,17 +190,17 @@ class mysql_clientdb_plugin {
// mariadb or mysql < 5.7 // mariadb or mysql < 5.7
if($this->getDatabaseType($link) == 'mariadb' || version_compare($this->getDatabaseVersion($link), '5.7', '<')) { if($this->getDatabaseType($link) == 'mariadb' || version_compare($this->getDatabaseVersion($link), '5.7', '<')) {
$query = sprintf("SET PASSWORD FOR '%s'@'%s' = '%s'", $query = sprintf("SET PASSWORD FOR '%s'@'%s' = '%s'",
$link->escape_string($data['new']['database_user']), $link->escape_string($database_user),
$db_host, $db_host,
$link->escape_string($data['new']['database_password'])); $link->escape_string($database_password));
if(!$link->query($query)) $success = false; if(!$link->query($query)) $success = false;
} }
// mysql >= 5.7 // mysql >= 5.7
else { else {
$query = sprintf("ALTER USER IF EXISTS '%s'@'%s' IDENTIFIED WITH mysql_native_password AS '%s'", $query = sprintf("ALTER USER IF EXISTS '%s'@'%s' IDENTIFIED WITH mysql_native_password AS '%s'",
$link->escape_string($data['new']['database_user']), $link->escape_string($database_user),
$db_host, $db_host,
$link->escape_string($data['new']['database_password'])); $link->escape_string($database_password));
if(!$link->query($query)) $success = false; if(!$link->query($query)) $success = false;
} }
if($success == true) $link->query("FLUSH PRIVILEGES"); if($success == true) $link->query("FLUSH PRIVILEGES");
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment