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

set password compatibility for mysql8

Browse Source 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann
2018-12-04 19:52:18 +01:00
parent 1707b5e7fd
commit 456875905d
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/classes/database/manager/class.DbManagerMySQL.php
View File

@@ -67,7 +67,7 @@ class DbManagerMySQL {
*/ */
public function grantPrivilegesTo($username = null, $password = null, $access_host = null, $p_encrypted = false) { public function grantPrivilegesTo($username = null, $password = null, $access_host = null, $p_encrypted = false) {
// mysql8 compatibility // mysql8 compatibility
if (Database::getAttribute(PDO::ATTR_SERVER_VERSION) >= '8.0.0') { if (version_compare(Database::getAttribute(PDO::ATTR_SERVER_VERSION), '8.0.11', '>=')) {
// create user // create user
$stmt = Database::prepare(" $stmt = Database::prepare("
CREATE USER '" . $username . "'@'" . $access_host . "' IDENTIFIED BY 'password' CREATE USER '" . $username . "'@'" . $access_host . "' IDENTIFIED BY 'password'
@@ -86,11 +86,15 @@ class DbManagerMySQL {
Database::pexecute($stmt, array("username" => $username, "host" => $access_host)); Database::pexecute($stmt, array("username" => $username, "host" => $access_host));
} }
// set passoword // set passoword
if (version_compare(Database::getAttribute(PDO::ATTR_SERVER_VERSION), '5.7.6', '<')) {
if ($p_encrypted) { if ($p_encrypted) {
$stmt = Database::prepare("SET PASSWORD FOR :username@:host = :password"); $stmt = Database::prepare("SET PASSWORD FOR :username@:host = :password");
} else { } else {
$stmt = Database::prepare("SET PASSWORD FOR :username@:host = PASSWORD(:password)"); $stmt = Database::prepare("SET PASSWORD FOR :username@:host = PASSWORD(:password)");
} }
} else {
$stmt = Database::prepare("ALTER USER :username@:host IDENTIFIED BY :password");
}
Database::pexecute($stmt, array("username" => $username, "host" => $access_host, "password" => $password)); Database::pexecute($stmt, array("username" => $username, "host" => $access_host, "password" => $password));
} }