Merge pull request #303 from PrimusNZ/master

Update MySQL users to use all hosts

modules/mysql/edit_server.php

@@ -127,7 +127,7 @@ function exec_ogp_module() {
 						if($test_mysql_conn == 0)
 						{
 							$SQL = "CREATE DATABASE IF NOT EXISTS \\`".$mysql_db['db_name']."\\`;".
-								   "GRANT ".$mysql_db['privilegies_str']." ON \\`".$mysql_db['db_name']."\\`.* TO '".$mysql_db['db_user']."'@'localhost' IDENTIFIED BY '".$mysql_db['db_passwd']."';".
+								   "GRANT ".$mysql_db['privilegies_str']." ON \\`".$mysql_db['db_name']."\\`.* TO '".$mysql_db['db_user']."'@'%' IDENTIFIED BY '".$mysql_db['db_passwd']."';".
 								   "FLUSH PRIVILEGES;";
 							
 							$command = "mysql --host=localhost --port=".$mysql_db['mysql_port']." -uroot -p".$mysql_db['mysql_root_passwd']." -e \"".$SQL."\"";
@@ -148,7 +148,7 @@ function exec_ogp_module() {
 							if ( $link !== FALSE )
 							{
 								$queries = array("CREATE DATABASE IF NOT EXISTS `".$mysql_db['db_name']."`;",
-												 "GRANT ".$mysql_db['privilegies_str']." ON `".$mysql_db['db_name']."`.* TO '".$mysql_db['db_user']."'@'".$mysql_db['mysql_ip']."' IDENTIFIED BY '".$mysql_db['db_passwd']."';",
+												 "GRANT ".$mysql_db['privilegies_str']." ON `".$mysql_db['db_name']."`.* TO '".$mysql_db['db_user']."'@'%' IDENTIFIED BY '".$mysql_db['db_passwd']."';",
 												 "FLUSH PRIVILEGES;");
 								foreach( $queries as $query )
 								{
@@ -174,7 +174,7 @@ function exec_ogp_module() {
 							if ( $link !== FALSE )
 							{
 								$queries = array("CREATE DATABASE IF NOT EXISTS `".$mysql_db['db_name']."`;",
-												 "GRANT ".$mysql_db['privilegies_str']." ON `".$mysql_db['db_name']."`.* TO '".$mysql_db['db_user']."'@'".$mysql_db['mysql_ip']."' IDENTIFIED BY '".$mysql_db['db_passwd']."';",
+												 "GRANT ".$mysql_db['privilegies_str']." ON `".$mysql_db['db_name']."`.* TO '".$mysql_db['db_user']."'@'%' IDENTIFIED BY '".$mysql_db['db_passwd']."';",
 												 "FLUSH PRIVILEGES;");
 								foreach( $queries as $query )
 								{
@@ -208,7 +208,7 @@ function exec_ogp_module() {
 			if($host_stat === 1 )
 			{
 				$remote->exec('mysql --host=localhost --port='.$mysql_db['mysql_port'].' -uroot -p'.$mysql_db['mysql_root_passwd'].
-							  ' -e "DROP DATABASE '.$mysql_db['db_name'].";DROP USER '".$mysql_db['db_user']."'@'".$mysql_db['mysql_ip']."';\"");
+							  ' -e "DROP DATABASE '.$mysql_db['db_name'].";DROP USER '".$mysql_db['db_user']."'@'%';\"");
 			}
 		}
 		else
@@ -220,7 +220,7 @@ function exec_ogp_module() {
 				if ( $link !== FALSE )
 				{
 					$queries = array("DROP DATABASE ".$mysql_db['db_name'].";",
-									 "DROP USER '".$mysql_db['db_user']."'@'".$mysql_db['mysql_ip']."';");
+									 "DROP USER '".$mysql_db['db_user']."'@'%';");
 					foreach( $queries as $query )
 					{
 						@$return = mysqli_query($link, $query);
@@ -238,7 +238,7 @@ function exec_ogp_module() {
 				if ( $link !== FALSE )
 				{
 					$queries = array("DROP DATABASE ".$mysql_db['db_name'].";",
-									 "DROP USER '".$mysql_db['db_user']."'@'".$mysql_db['mysql_ip']."';");
+									 "DROP USER '".$mysql_db['db_user']."'@'%';");
 					foreach( $queries as $query )
 					{
 						@$return = mysql_query($query);
@@ -290,8 +290,8 @@ function exec_ogp_module() {
 					$host_stat = $remote->status_chk();
 					if($host_stat === 1 )
 					{
-						$SQL = "DROP USER '".$mysql_db['db_user']."'@'".$mysql_server['mysql_ip']."';".
-							   "GRANT ".$mysql_db['privilegies_str']." ON \\`".$mysql_db['db_name']."\\`.* TO '".$mysql_db['db_user']."'@'localhost' IDENTIFIED BY '".$post_db_passwd."';".
+						$SQL = "DROP USER '".$mysql_db['db_user']."'@'%';".
+							   "GRANT ".$mysql_db['privilegies_str']." ON \\`".$mysql_db['db_name']."\\`.* TO '".$mysql_db['db_user']."'@'%' IDENTIFIED BY '".$post_db_passwd."';".
 							   "FLUSH PRIVILEGES;";
 							
 						$command = "mysql --host=localhost --port=".$mysql_db['mysql_port']." -uroot -p".$mysql_db['mysql_root_passwd']." -e \"".$SQL."\"";
@@ -306,8 +306,8 @@ function exec_ogp_module() {
 						
 						if ( $link !== FALSE )
 						{
-							$queries = array("DROP USER '".$mysql_db['db_user']."'@'".$mysql_server['mysql_ip']."';",
-											 "GRANT ".$mysql_db['privilegies_str']." ON `".$mysql_db['db_name']."`.* TO '".$mysql_db['db_user']."'@'".$mysql_db['mysql_ip']."' IDENTIFIED BY '".$post_db_passwd."';",
+							$queries = array("DROP USER '".$mysql_db['db_user']."'@'%';",
+											 "GRANT ".$mysql_db['privilegies_str']." ON `".$mysql_db['db_name']."`.* TO '".$mysql_db['db_user']."'@'%' IDENTIFIED BY '".$post_db_passwd."';",
 											 "FLUSH PRIVILEGES;");
 							foreach( $queries as $query )
 							{
@@ -325,8 +325,8 @@ function exec_ogp_module() {
 						
 						if ( $link !== FALSE )
 						{
-							$queries = array("DROP USER '".$mysql_db['db_user']."'@'".$mysql_server['mysql_ip']."';",
-											 "GRANT ".$mysql_db['privilegies_str']." ON `".$mysql_db['db_name']."`.* TO '".$mysql_db['db_user']."'@'".$mysql_db['mysql_ip']."' IDENTIFIED BY '".$post_db_passwd."';",
+							$queries = array("DROP USER '".$mysql_db['db_user']."'@'%';",
+											 "GRANT ".$mysql_db['privilegies_str']." ON `".$mysql_db['db_name']."`.* TO '".$mysql_db['db_user']."'@'%' IDENTIFIED BY '".$post_db_passwd."';",
 											 "FLUSH PRIVILEGES;");
 							foreach( $queries as $query )
 							{
@@ -351,10 +351,10 @@ function exec_ogp_module() {
 					if($host_stat === 1 )
 					{
 						if($enabled == "0")
-							$SQL = "DROP USER '".$mysql_db['db_user']."'@'".$mysql_server['mysql_ip']."';".
+							$SQL = "DROP USER '".$mysql_db['db_user']."'@'%';".
 								   "FLUSH PRIVILEGES;";
 						else
-							$SQL = "GRANT ".$mysql_db['privilegies_str']." ON \\`".$mysql_db['db_name']."\\`.* TO '".$mysql_db['db_user']."'@'localhost' IDENTIFIED BY '".$post_db_passwd."';".
+							$SQL = "GRANT ".$mysql_db['privilegies_str']." ON \\`".$mysql_db['db_name']."\\`.* TO '".$mysql_db['db_user']."'@'%' IDENTIFIED BY '".$post_db_passwd."';".
 								   "FLUSH PRIVILEGES;";
 							
 						$command = "mysql --host=localhost --port=".$mysql_db['mysql_port']." -uroot -p".$mysql_db['mysql_root_passwd']." -e \"".$SQL."\"";
@@ -370,10 +370,10 @@ function exec_ogp_module() {
 						if ( $link !== FALSE )
 						{
 							if($enabled == "0")
-								$queries = array("DROP USER '".$mysql_db['db_user']."'@'".$mysql_server['mysql_ip']."';",
+								$queries = array("DROP USER '".$mysql_db['db_user']."'@'%';",
 												 "FLUSH PRIVILEGES;");
 							else
-								$queries = array("GRANT ".$mysql_db['privilegies_str']." ON `".$mysql_db['db_name']."`.* TO '".$mysql_db['db_user']."'@'".$mysql_db['mysql_ip']."' IDENTIFIED BY '".$post_db_passwd."';",
+								$queries = array("GRANT ".$mysql_db['privilegies_str']." ON `".$mysql_db['db_name']."`.* TO '".$mysql_db['db_user']."'@'%' IDENTIFIED BY '".$post_db_passwd."';",
 												 "FLUSH PRIVILEGES;");
 												 
 							foreach( $queries as $query )
@@ -393,10 +393,10 @@ function exec_ogp_module() {
 						if ( $link !== FALSE )
 						{
 							if($enabled == "0")
-								$queries = array("DROP USER '".$mysql_db['db_user']."'@'".$mysql_server['mysql_ip']."';",
+								$queries = array("DROP USER '".$mysql_db['db_user']."'@'%';",
 												 "FLUSH PRIVILEGES;");
 							else
-								$queries = array("GRANT ".$mysql_db['privilegies_str']." ON `".$mysql_db['db_name']."`.* TO '".$mysql_db['db_user']."'@'".$mysql_db['mysql_ip']."' IDENTIFIED BY '".$post_db_passwd."';",
+								$queries = array("GRANT ".$mysql_db['privilegies_str']." ON `".$mysql_db['db_name']."`.* TO '".$mysql_db['db_user']."'@'%' IDENTIFIED BY '".$post_db_passwd."';",
 												 "FLUSH PRIVILEGES;");
 												 
 							foreach( $queries as $query )
@@ -449,7 +449,7 @@ function exec_ogp_module() {
 						if($host_stat === 1 )
 						{
 							$remote->exec('mysql --host=localhost --port='.$mysql_server['mysql_port'].' -uroot -p'.$mysql_server['mysql_root_passwd'].
-										  ' -e "DROP DATABASE '.$mysql_db['db_name'].";DROP USER '".$mysql_db['db_user']."'@'".$mysql_server['mysql_ip']."';\"");
+										  ' -e "DROP DATABASE '.$mysql_db['db_name'].";DROP USER '".$mysql_db['db_user']."'@'%';\"");
 						}
 					}
 					else
@@ -461,7 +461,7 @@ function exec_ogp_module() {
 							if ( $link !== FALSE )
 							{
 								$queries = array("DROP DATABASE ".$mysql_db['db_name'].";",
-												 "DROP USER '".$mysql_db['db_user']."'@'".$mysql_server['mysql_ip']."';");
+												 "DROP USER '".$mysql_db['db_user']."'@'%';");
 								foreach( $queries as $query )
 								{
 									@$return = mysqli_query($query);
@@ -478,7 +478,7 @@ function exec_ogp_module() {
 							if ( $link !== FALSE )
 							{
 								$queries = array("DROP DATABASE ".$mysql_db['db_name'].";",
-												 "DROP USER '".$mysql_db['db_user']."'@'".$mysql_server['mysql_ip']."';");
+												 "DROP USER '".$mysql_db['db_user']."'@'%';");
 								foreach( $queries as $query )
 								{
 									@$return = mysql_query($query);