- simplified MR !533

Author: Marius Burkard

server/plugins-available/mysql_clientdb_plugin.inc.php

@@ -683,31 +683,23 @@ function db_user_update($event_name, $data) {
 				$result = $app->db->queryOneRecord("SELECT VERSION() as version");
 				$dbversion = $result['version'];
 
-				// mariadb
-				if(stripos($dbversion, 'mariadb') !== false) {
+				// mariadb or mysql < 5.7
+				if(stripos($dbversion, 'mariadb') !== false || version_compare($dbversion, '5.7', '<')) {
 					$query = sprintf("SET PASSWORD FOR '%s'@'%s' = '%s'",
 						$link->escape_string($data['new']['database_user']),
 						$db_host,
 						$link->escape_string($data['new']['database_password']));
 					$link->query($query);
 				}
-				// mysql
+				// mysql >= 5.7
 				else {
-					if (version_compare($dbversion, '5.7') >= 0) {
-						$query = sprintf("ALTER USER IF EXISTS '%s'@'%s' IDENTIFIED WITH mysql_native_password AS '%s'",
-							$link->escape_string($data['new']['database_user']),
-							$db_host,
-							$link->escape_string($data['new']['database_password']));
-						$link->query($query);
-					} else {
-						$query = sprintf("SET PASSWORD FOR '%s'@'%s' = '%s'",
-							$link->escape_string($data['new']['database_user']),
-							$db_host,
-							$link->escape_string($data['new']['database_password']));
-						$link->query($query);
-					}
-					$app->log('Changing MySQL user password for: ' . $data['new']['database_user'] . '@' . $db_host, LOGLEVEL_DEBUG);
+					$query = sprintf("ALTER USER IF EXISTS '%s'@'%s' IDENTIFIED WITH mysql_native_password AS '%s'",
+						$link->escape_string($data['new']['database_user']),
+						$db_host,
+						$link->escape_string($data['new']['database_password']));
+					$link->query($query);
 				}
+				$app->log('Changing MySQL user password for: ' . $data['new']['database_user'] . '@' . $db_host, LOGLEVEL_DEBUG);
 			}
 		}