Added a check to prevent that password protected ssl keys get saved. Thanks...

Till Brehm

2016-04-20 bff9826960ebd8237c9bcbca68c16013cff50024

 server/plugins-available/mysql_clientdb_plugin.inc.php

@@ -71,9 +71,10 @@

   }

   function process_host_list($action, $database_name, $database_user, $database_password, $host_list, $link, $database_rename_user = '', $user_read_only = false) {
   function process_host_list($action, $database_name, $database_user, $database_password, $host_list, $link, $database_rename_user = '', $user_access_mode = 'rw') {
      global $app;

		
      if(!$user_access_mode) $user_access_mode = 'rw';
      $action = strtoupper($action);

      // set to all hosts if none given
@@ -83,7 +84,17 @@
      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();
            }
      }
		
      $app->log("Calling $action for $database_name with access $user_access_mode and hosts " . implode(', ', $host_list), LOGLEVEL_DEBUG);
		
      // loop through hostlist
      foreach($host_list as $db_host) {
         $db_host = trim($db_host);
@@ -94,7 +105,7 @@
         $valid = true;
         if($db_host == '%' || $db_host == 'localhost') {
            $valid = true;
         } elseif(preg_match("/^[0-9]{1,3}(\.)[0-9]{1,3}(\.)[0-9]{1,3}(\.)[0-9]{1,3}$/", $db_host)) {
         } elseif(preg_match("/^((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/", $db_host)) {
            $groups = explode('.', $db_host);
            foreach($groups as $group){
               if($group<0 or $group>255)
@@ -104,19 +115,32 @@
            $valid = false;
         }

         if($valid == false) continue;

         if($valid == false) {
            $app->log("Invalid host " . $db_host . " for GRANT to " . $database_name, LOGLEVEL_DEBUG);
            continue;
         }
			
         $grants = 'ALL PRIVILEGES';
         if($user_access_mode == 'r') $grants = 'SELECT';
         elseif($user_access_mode == 'rd') $grants = 'SELECT, DELETE, ALTER, DROP';
			
         if($action == 'GRANT') {
            if(!$link->query("GRANT " . ($user_read_only ? "SELECT" : "ALL") . " ON ".$link->escape_string($database_name).".* TO '".$link->escape_string($database_user)."'@'$db_host' IDENTIFIED BY PASSWORD '".$link->escape_string($database_password)."';")) $success = false;
            $app->log("GRANT " . ($user_read_only ? "SELECT" : "ALL") . " ON ".$link->escape_string($database_name).".* TO '".$link->escape_string($database_user)."'@'$db_host' IDENTIFIED BY PASSWORD '".$link->escape_string($database_password)."'; success? " . ($success ? 'yes' : 'no'), LOGLEVEL_DEBUG);
            if($user_access_mode == 'r' || $user_access_mode == 'rd') {
               if(!$link->query("REVOKE ALL PRIVILEGES ON `".$link->escape_string($database_name)."`.* FROM '".$link->escape_string($database_user)."'@'$db_host'")) $success = false;
               $app->log("REVOKE ALL PRIVILEGES ON `".$link->escape_string($database_name)."`.* FROM '".$link->escape_string($database_user)."'@'$db_host' success? " . ($success ? 'yes' : 'no'), LOGLEVEL_DEBUG);
               $success = true;
            }
				
            if(!$link->query("GRANT " . $grants . " ON `".$link->escape_string($database_name)."`.* TO '".$link->escape_string($database_user)."'@'$db_host' IDENTIFIED BY PASSWORD '".$link->escape_string($database_password)."'")) $success = false;
            $app->log("GRANT " . $grants . " ON `".$link->escape_string($database_name)."`.* TO '".$link->escape_string($database_user)."'@'$db_host' IDENTIFIED BY PASSWORD '".$link->escape_string($database_password)."' success? " . ($success ? 'yes' : 'no'), LOGLEVEL_DEBUG);
         } elseif($action == 'REVOKE') {
            if(!$link->query("REVOKE ALL PRIVILEGES ON ".$link->escape_string($database_name).".* FROM '".$link->escape_string($database_user)."'@'$db_host' IDENTIFIED BY PASSWORD '".$link->escape_string($database_password)."';")) $success = false;
            if(!$link->query("REVOKE ALL PRIVILEGES ON `".$link->escape_string($database_name)."`.* FROM '".$link->escape_string($database_user)."'@'$db_host'")) $success = false;
         } elseif($action == 'DROP') {
            if(!$link->query("DROP USER '".$link->escape_string($database_user)."'@'$db_host';")) $success = false;
            if(!$link->query("DROP USER '".$link->escape_string($database_user)."'@'$db_host'")) $success = false;
         } elseif($action == 'RENAME') {
            if(!$link->query("RENAME USER '".$link->escape_string($database_user)."'@'$db_host' TO '".$link->escape_string($database_rename_user)."'@'$db_host'")) $success = false;
         } elseif($action == 'PASSWORD') {
            if(!$link->query("SET PASSWORD FOR '".$link->escape_string($database_user)."'@'$db_host' = '".$link->escape_string($database_password)."';")) $success = false;
            if(!$link->query("SET PASSWORD FOR '".$link->escape_string($database_user)."'@'$db_host' = '".$link->escape_string($database_password)."'")) $success = false;
         }
      }

@@ -129,7 +153,7 @@
      // set to all hosts if none given
      if(trim($host_list) == '') $host_list = '%';

      $db_user_databases = $app->db->queryAllRecords("SELECT * FROM web_database WHERE (database_user_id = ".$user_id." OR database_ro_user_id = ".$user_id.") AND active = 'y' AND database_id != ".$database_id);
      $db_user_databases = $app->db->queryAllRecords("SELECT * FROM web_database WHERE (database_user_id = ? OR database_ro_user_id = ?) AND active = 'y' AND database_id != ?", $user_id, $user_id, $database_id);
      $db_user_host_list = array();
      if(is_array($db_user_databases) && !empty($db_user_databases)){
         foreach($db_user_databases as $db_user_database){
@@ -188,7 +212,7 @@
         }

         //* Create the new database
         if ($link->query('CREATE DATABASE '.$link->escape_string($data['new']['database_name']).$query_charset_table)) {
         if ($link->query('CREATE DATABASE `'.$link->escape_string($data['new']['database_name']).'`'.$query_charset_table)) {
            $app->log('Created MySQL database: '.$data['new']['database_name'], LOGLEVEL_DEBUG);
         } else {
            $app->log('Unable to create the database: '.$link->error, LOGLEVEL_WARNING);
@@ -198,9 +222,8 @@
         if($data['new']['active'] == 'y') {

            // get the users for this database
            $db_user = $app->db->queryOneRecord("SELECT `database_user`, `database_password` FROM `web_database_user` WHERE `database_user_id` = '" . intval($data['new']['database_user_id']) . "'");

            $db_ro_user = $app->db->queryOneRecord("SELECT `database_user`, `database_password` FROM `web_database_user` WHERE `database_user_id` = '" . intval($data['new']['database_ro_user_id']) . "'");
            $db_user = $app->db->queryOneRecord("SELECT `database_user`, `database_password` FROM `web_database_user` WHERE `database_user_id` = ?", $data['new']['database_user_id']);
            $db_ro_user = $app->db->queryOneRecord("SELECT `database_user`, `database_password` FROM `web_database_user` WHERE `database_user_id` = ?", $data['new']['database_ro_user_id']);

            $host_list = '';
            if($data['new']['remote_access'] == 'y') {
@@ -212,16 +235,15 @@

            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);
               else $this->process_host_list('GRANT', $data['new']['database_name'], $db_user['database_user'], $db_user['database_password'], $host_list, $link, '', ($data['new']['quota_exceeded'] == 'y' ? 'rd' : 'rw'));
            }
            if($db_ro_user && $data['new']['database_user_id'] != $data['new']['database_ro_user_id']) {
               if($db_ro_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_ro_user['database_user'], $db_ro_user['database_password'], $host_list, $link, '', true);
               else $this->process_host_list('GRANT', $data['new']['database_name'], $db_ro_user['database_user'], $db_ro_user['database_password'], $host_list, $link, '', 'r');
            }

         }

         $link->query('FLUSH PRIVILEGES;');
         $link->close();
      }
   }
@@ -244,13 +266,13 @@
            $app->log('Unable to connect to the database: '.$link->connect_error, LOGLEVEL_ERROR);
            return;
         }

			
         // get the users for this database
         $db_user = $app->db->queryOneRecord("SELECT `database_user`, `database_password` FROM `web_database_user` WHERE `database_user_id` = '" . intval($data['new']['database_user_id']) . "'");
         $old_db_user = $app->db->queryOneRecord("SELECT `database_user`, `database_password` FROM `web_database_user` WHERE `database_user_id` = '" . intval($data['old']['database_user_id']) . "'");
         $db_user = $app->db->queryOneRecord("SELECT `database_user`, `database_password` FROM `web_database_user` WHERE `database_user_id` = ?", $data['new']['database_user_id']);
         $old_db_user = $app->db->queryOneRecord("SELECT `database_user`, `database_password` FROM `web_database_user` WHERE `database_user_id` = ?", $data['old']['database_user_id']);

         $db_ro_user = $app->db->queryOneRecord("SELECT `database_user`, `database_password` FROM `web_database_user` WHERE `database_user_id` = '" . intval($data['new']['database_ro_user_id']) . "'");
         $old_db_ro_user = $app->db->queryOneRecord("SELECT `database_user`, `database_password` FROM `web_database_user` WHERE `database_user_id` = '" . intval($data['old']['database_ro_user_id']) . "'");
         $db_ro_user = $app->db->queryOneRecord("SELECT `database_user`, `database_password` FROM `web_database_user` WHERE `database_user_id` = ?", $data['new']['database_ro_user_id']);
         $old_db_ro_user = $app->db->queryOneRecord("SELECT `database_user`, `database_password` FROM `web_database_user` WHERE `database_user_id` = ?", $data['old']['database_ro_user_id']);

         $host_list = '';
         if($data['new']['remote_access'] == 'y') {
@@ -269,49 +291,159 @@
         if($old_host_list != '') $old_host_list .= ',';
         $old_host_list .= 'localhost';

         //* rename database
         if ( $data['new']['database_name'] !=  $data['old']['database_name'] ) {
            $old_name = $link->escape_string($data['old']['database_name']);
            $new_name = $link->escape_string($data['new']['database_name']);
            $timestamp = time();

            $tables = $link->query("SELECT TABLE_NAME FROM information_schema.tables WHERE table_schema='".$old_name."' AND TABLE_TYPE='BASE TABLE'");
            if ($tables->num_rows > 0) {
               while ($row = $tables->fetch_assoc()) {
                  $tables_array[] = $row['TABLE_NAME'];
               }

               //* save triggers, routines and events
               $triggers = $link->query("SHOW TRIGGERS FROM ".$old_name);
               if ($triggers->num_rows > 0) {
                  while ($row = $triggers->fetch_assoc()) {
                     $triggers_array[] = $row;
                  }
                  $app->log('Dumping triggers from '.$old_name, LOGLEVEL_DEBUG);
                  $command = "mysqldump -h ".escapeshellarg($clientdb_host)." -u ".escapeshellarg($clientdb_user)." -p".escapeshellarg($clientdb_password)." ".$old_name." -d -t -R -E > ".$timestamp.$old_name.'.triggers';
                  exec($command, $out, $ret);
                  $app->system->chmod($timestamp.$old_name.'.triggers', 0600);
                  if ($ret != 0) {
                     unset($triggers_array);
                     $app->system->unlink($timestamp.$old_name.'.triggers');
                     $app->log('Unable to dump triggers from '.$old_name, LOGLEVEL_ERROR);
                  }
                  unset($out);
               }

               //* save views
               $views = $link->query("SELECT TABLE_NAME FROM information_schema.tables WHERE table_schema='".$old_name."' and TABLE_TYPE='VIEW'");
               if ($views->num_rows > 0) {
                  while ($row = $views->fetch_assoc()) {
                     $views_array[] = $row;
                  }
                  foreach ($views_array as $_views) {
                     $temp[] = $_views['TABLE_NAME'];
                  }
                  $app->log('Dumping views from '.$old_name, LOGLEVEL_DEBUG);
                  $temp_views = implode(' ', $temp);
                  $command = "mysqldump -h ".escapeshellarg($clientdb_host)." -u ".escapeshellarg($clientdb_user)." -p".escapeshellarg($clientdb_password)." ".$old_name." ".$temp_views." > ".$timestamp.$old_name.'.views';
                  exec($command, $out, $ret);
                  $app->system->chmod($timestamp.$old_name.'.views', 0600);
                  if ($ret != 0) {
                     unset($views_array);
                     $app->system->unlink($timestamp.$old_name.'.views');
                     $app->log('Unable to dump views from '.$old_name, LOGLEVEL_ERROR);
                  }
                  unset($out);
                  unset($temp);
                  unset($temp_views);
               }

               //* create new database
               $this->db_insert($event_name, $data);

               $link->query("show databases like '".$new_name."'");
               if ($link) {
                  //* rename tables
                  foreach ($tables_array as $table) {
                     $table = $link->escape_string($table);
                     $sql = "RENAME TABLE ".$old_name.".".$table." TO ".$new_name.".".$table;
                     $link->query($sql);
                     $app->log($sql, LOGLEVEL_DEBUG);
                     if(!$link) {
                        $app->log($sql." failed", LOGLEVEL_ERROR);
                     }
                  }

                  //* drop old triggers
                  if (@is_array($triggers_array)) {
                     foreach($triggers_array as $trigger) {
                        $_trigger = $link->escape_string($trigger['Trigger']);
                        $sql = "DROP TRIGGER ".$old_name.".".$_trigger;
                        $link->query($sql);
                        $app->log($sql, LOGLEVEL_DEBUG);
                        unset($_trigger);
                     }
                     //* update triggers, routines and events
                     $command = "mysql -h ".escapeshellarg($clientdb_host)." -u ".escapeshellarg($clientdb_user)." -p".escapeshellarg($clientdb_password)." ".$new_name." < ".$timestamp.$old_name.'.triggers';
                     exec($command, $out, $ret);
                     if ($ret != 0) {
                        $app->log('Unable to import triggers for '.$new_name, LOGLEVEL_ERROR);
                     } else {
                        $app->system->unlink($timestamp.$old_name.'.triggers');
                     }
                  }

                  //* loading views
                  if (@is_array($views_array)) {
                     $command = "mysql -h ".escapeshellarg($clientdb_host)." -u ".escapeshellarg($clientdb_user)." -p".escapeshellarg($clientdb_password)." ".$new_name." < ".$timestamp.$old_name.'.views';
                     exec($command, $out, $ret);
                     if ($ret != 0) {
                        $app->log('Unable to import views for '.$new_name, LOGLEVEL_ERROR);
                     } else {
                        $app->system->unlink($timestamp.$old_name.'.views');
                     }
                  }

                  //* drop old database
                  $this->db_delete($event_name, $data);
               } else {
                  $app->log('Connection to new databse '.$new_name.' failed', LOGLEVEL_ERROR);
                  if (@is_array($triggers_array)) {
                     $app->system->unlink($timestamp.$old_name.'.triggers');
                  }
                  if (@is_array($views_array)) {
                     $app->system->unlink($timestamp.$old_name.'.views');
                  }
               }

            } else { //* SELECT TABLE_NAME error
               $app->log('Unable to rename database '.$old_name.' to '.$new_name, LOGLEVEL_ERROR);
            }
         }

         // 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);
               else $this->process_host_list('GRANT', $data['new']['database_name'], $db_user['database_user'], $db_user['database_password'], $host_list, $link, '', ($data['new']['quota_exceeded'] == 'y' ? 'rd' : 'rw'));
            }
            if($db_ro_user && $data['new']['database_user_id'] != $data['new']['database_ro_user_id']) {
               if($db_ro_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_ro_user['database_user'], $db_ro_user['database_password'], $host_list, $link, '', true);
               else $this->process_host_list('GRANT', $data['new']['database_name'], $db_ro_user['database_user'], $db_ro_user['database_password'], $host_list, $link, '', 'r');
            }
         } else if($data['new']['active'] == 'n' && $data['old']['active'] == 'y') { // revoke database user, if inactive
               if($old_db_user) {
                  if($old_db_user['database_user'] == 'root'){
                     $app->log('User root not allowed for Client databases', LOGLEVEL_WARNING);
                  } else {
                     // Find out users to drop and users to revoke
                     $drop_or_revoke_user = $this->drop_or_revoke_user($data['old']['database_id'], $data['old']['database_user_id'], $old_host_list);
                     if($drop_or_revoke_user['drop_hosts'] != '') $this->process_host_list('DROP', $data['old']['database_name'], $old_db_user['database_user'], $old_db_user['database_password'], $drop_or_revoke_user['drop_hosts'], $link);
                     if($drop_or_revoke_user['revoke_hosts'] != '') $this->process_host_list('REVOKE', $data['old']['database_name'], $old_db_user['database_user'], $old_db_user['database_password'], $drop_or_revoke_user['revoke_hosts'], $link);


                     //$this->process_host_list('DROP', $data['new']['database_name'], $db_user['database_user'], $db_user['database_password'], $old_host_list, $link);
                     //$this->process_host_list('REVOKE', $data['new']['database_name'], $db_user['database_user'], $db_user['database_password'], $old_host_list, $link);
                  }
         } elseif($data['new']['active'] == 'n' && $data['old']['active'] == 'y') { // revoke database user, if inactive
            if($old_db_user) {
               if($old_db_user['database_user'] == 'root'){
                  $app->log('User root not allowed for Client databases', LOGLEVEL_WARNING);
               } else {
                  // Find out users to drop and users to revoke
                  $drop_or_revoke_user = $this->drop_or_revoke_user($data['old']['database_id'], $data['old']['database_user_id'], $old_host_list);
                  if($drop_or_revoke_user['drop_hosts'] != '') $this->process_host_list('DROP', $data['old']['database_name'], $old_db_user['database_user'], $old_db_user['database_password'], $drop_or_revoke_user['drop_hosts'], $link);
                  if($drop_or_revoke_user['revoke_hosts'] != '') $this->process_host_list('REVOKE', $data['old']['database_name'], $old_db_user['database_user'], $old_db_user['database_password'], $drop_or_revoke_user['revoke_hosts'], $link);
               }
               if($old_db_ro_user && $data['old']['database_user_id'] != $data['old']['database_ro_user_id']) {
                  if($old_db_ro_user['database_user'] == 'root'){
                     $app->log('User root not allowed for Client databases', LOGLEVEL_WARNING);
                  } else {
                     // Find out users to drop and users to revoke
                     $drop_or_revoke_user = $this->drop_or_revoke_user($data['old']['database_id'], $data['old']['database_ro_user_id'], $old_host_list);
                     if($drop_or_revoke_user['drop_hosts'] != '') $this->process_host_list('DROP', $data['old']['database_name'], $old_db_ro_user['database_user'], $old_db_ro_user['database_password'], $drop_or_revoke_user['drop_hosts'], $link);
                     if($drop_or_revoke_user['revoke_hosts'] != '') $this->process_host_list('REVOKE', $data['old']['database_name'], $old_db_ro_user['database_user'], $old_db_ro_user['database_password'], $drop_or_revoke_user['revoke_hosts'], $link);

                     //$this->process_host_list('DROP', $data['new']['database_name'], $db_ro_user['database_user'], $db_ro_user['database_password'], $old_host_list, $link);
                     //$this->process_host_list('REVOKE', $data['new']['database_name'], $db_ro_user['database_user'], $db_ro_user['database_password'], $old_host_list, $link);
                  }
               }
               // Database is not active, so stop processing here
               $link->query('FLUSH PRIVILEGES;');
               $link->close();
               return;
            }
            if($old_db_ro_user && $data['old']['database_user_id'] != $data['old']['database_ro_user_id']) {
               if($old_db_ro_user['database_user'] == 'root'){
                  $app->log('User root not allowed for Client databases', LOGLEVEL_WARNING);
               } else {
                  // Find out users to drop and users to revoke
                  $drop_or_revoke_user = $this->drop_or_revoke_user($data['old']['database_id'], $data['old']['database_ro_user_id'], $old_host_list);
                  if($drop_or_revoke_user['drop_hosts'] != '') $this->process_host_list('DROP', $data['old']['database_name'], $old_db_ro_user['database_user'], $old_db_ro_user['database_password'], $drop_or_revoke_user['drop_hosts'], $link);
                  if($drop_or_revoke_user['revoke_hosts'] != '') $this->process_host_list('REVOKE', $data['old']['database_name'], $old_db_ro_user['database_user'], $old_db_ro_user['database_password'], $drop_or_revoke_user['revoke_hosts'], $link);
               }
            }
            // Database is not active, so stop processing here
            $link->close();
            return;
         }

         //* selected Users have changed
         if($data['new']['database_user_id'] != $data['old']['database_user_id']) {
@@ -324,15 +456,12 @@
                     $drop_or_revoke_user = $this->drop_or_revoke_user($data['old']['database_id'], $data['old']['database_user_id'], $old_host_list);
                     if($drop_or_revoke_user['drop_hosts'] != '') $this->process_host_list('DROP', $data['old']['database_name'], $old_db_user['database_user'], $old_db_user['database_password'], $drop_or_revoke_user['drop_hosts'], $link);
                     if($drop_or_revoke_user['revoke_hosts'] != '') $this->process_host_list('REVOKE', $data['old']['database_name'], $old_db_user['database_user'], $old_db_user['database_password'], $drop_or_revoke_user['revoke_hosts'], $link);

                     //$this->process_host_list('DROP', $data['new']['database_name'], $old_db_user['database_user'], $old_db_user['database_password'], $old_host_list, $link);
                     //$this->process_host_list('REVOKE', $data['new']['database_name'], $old_db_user['database_user'], $old_db_user['database_password'], $old_host_list, $link);
                  }
               }
            }
            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);
               else $this->process_host_list('GRANT', $data['new']['database_name'], $db_user['database_user'], $db_user['database_password'], $host_list, $link, '', ($data['new']['quota_exceeded'] == 'y' ? 'rd' : 'rw'));
            }
         }
         if($data['new']['database_ro_user_id'] != $data['old']['database_ro_user_id']) {
@@ -345,23 +474,17 @@
                     $drop_or_revoke_user = $this->drop_or_revoke_user($data['old']['database_id'], $data['old']['database_user_id'], $old_host_list);
                     if($drop_or_revoke_user['drop_hosts'] != '') $this->process_host_list('DROP', $data['old']['database_name'], $old_db_ro_user['database_user'], $old_db_ro_user['database_password'], $drop_or_revoke_user['drop_hosts'], $link);
                     if($drop_or_revoke_user['revoke_hosts'] != '') $this->process_host_list('REVOKE', $data['old']['database_name'], $old_db_ro_user['database_user'], $old_db_ro_user['database_password'], $drop_or_revoke_user['revoke_hosts'], $link);

                     //$this->process_host_list('DROP', $data['new']['database_name'], $old_db_user['database_user'], $old_db_user['database_password'], $old_host_list, $link);
                     //$this->process_host_list('REVOKE', $data['new']['database_name'], $old_db_user['database_user'], $old_db_user['database_password'], $old_host_list, $link);
                  }
               }
            }
            if($db_ro_user && $data['new']['database_user_id'] != $data['new']['database_ro_user_id']) {
               if($db_ro_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_ro_user['database_user'], $db_ro_user['database_password'], $host_list, $link, '', true);
               else $this->process_host_list('GRANT', $data['new']['database_name'], $db_ro_user['database_user'], $db_ro_user['database_password'], $host_list, $link, '', 'r');
            }
         }

         //* Remote access option has changed.
         if($data['new']['remote_access'] != $data['old']['remote_access']) {

            //* revoke old priveliges
            //mysql_query("REVOKE ALL PRIVILEGES ON ".mysql_real_escape_string($data["new"]["database_name"],$link).".* FROM '".mysql_real_escape_string($data["new"]["database_user"],$link)."';",$link);

            //* set new priveliges
            if($data['new']['remote_access'] == 'y') {
@@ -369,12 +492,12 @@
                  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'], $data['new']['remote_ips'], $link);
                     $this->process_host_list('GRANT', $data['new']['database_name'], $db_user['database_user'], $db_user['database_password'], $data['new']['remote_ips'], $link, '', ($data['new']['quota_exceeded'] == 'y' ? 'rd' : 'rw'));
                  }
               }
               if($db_ro_user && $data['new']['database_user_id'] != $data['new']['database_ro_user_id']) {
                  if($db_ro_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_ro_user['database_user'], $db_ro_user['database_password'], $data['new']['remote_ips'], $link, '', true);
                  else $this->process_host_list('GRANT', $data['new']['database_name'], $db_ro_user['database_user'], $db_ro_user['database_password'], $data['new']['remote_ips'], $link, '', 'r');
               }
            } else {
               if($old_db_user) {
@@ -385,9 +508,6 @@
                     $drop_or_revoke_user = $this->drop_or_revoke_user($data['old']['database_id'], $data['old']['database_user_id'], $data['old']['remote_ips']);
                     if($drop_or_revoke_user['drop_hosts'] != '') $this->process_host_list('DROP', $data['old']['database_name'], $old_db_user['database_user'], $old_db_user['database_password'], $drop_or_revoke_user['drop_hosts'], $link);
                     if($drop_or_revoke_user['revoke_hosts'] != '') $this->process_host_list('REVOKE', $data['old']['database_name'], $old_db_user['database_user'], $old_db_user['database_password'], $drop_or_revoke_user['revoke_hosts'], $link);

                     //$this->process_host_list('DROP', $data['new']['database_name'], $db_user['database_user'], $db_user['database_password'], $data['old']['remote_ips'], $link);
                     //$this->process_host_list('REVOKE', $data['new']['database_name'], $db_user['database_user'], $db_user['database_password'], $data['old']['remote_ips'], $link);
                  }
               }
               if($old_db_ro_user && $data['old']['database_user_id'] != $data['old']['database_ro_user_id']) {
@@ -398,9 +518,6 @@
                     $drop_or_revoke_user = $this->drop_or_revoke_user($data['old']['database_id'], $data['old']['database_ro_user_id'], $data['old']['remote_ips']);
                     if($drop_or_revoke_user['drop_hosts'] != '') $this->process_host_list('DROP', $data['old']['database_name'], $old_db_ro_user['database_user'], $old_db_ro_user['database_password'], $drop_or_revoke_user['drop_hosts'], $link);
                     if($drop_or_revoke_user['revoke_hosts'] != '') $this->process_host_list('REVOKE', $data['old']['database_name'], $old_db_ro_user['database_user'], $old_db_ro_user['database_password'], $drop_or_revoke_user['revoke_hosts'], $link);

                     //$this->process_host_list('DROP', $data['new']['database_name'], $db_ro_user['database_user'], $db_ro_user['database_password'], $data['old']['remote_ips'], $link);
                     //$this->process_host_list('REVOKE', $data['new']['database_name'], $db_ro_user['database_user'], $db_ro_user['database_password'], $data['old']['remote_ips'], $link);
                  }
               }
            }
@@ -421,7 +538,7 @@
               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'], $data['new']['remote_ips'], $link);
                  $this->process_host_list('GRANT', $data['new']['database_name'], $db_user['database_user'], $db_user['database_password'], $data['new']['remote_ips'], $link, '', ($data['new']['quota_exceeded'] == 'y' ? 'rd' : 'rw'));
               }
            }

@@ -440,13 +557,11 @@
               if($db_ro_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_ro_user['database_user'], $db_ro_user['database_password'], $data['new']['remote_ips'], $link, '', true);
                  $this->process_host_list('GRANT', $data['new']['database_name'], $db_ro_user['database_user'], $db_ro_user['database_password'], $data['new']['remote_ips'], $link, '', 'r');
               }
            }
         }


         $link->query('FLUSH PRIVILEGES;');
         $link->close();
      }

@@ -477,26 +592,25 @@
         $old_host_list .= 'localhost';

         if($data['old']['database_user_id']) {
            $old_db_user = $app->db->queryOneRecord("SELECT `database_user`, `database_password` FROM `web_database_user` WHERE `database_user_id` = '" . intval($data['old']['database_user_id']) . "'");
            $old_db_user = $app->db->queryOneRecord("SELECT `database_user`, `database_password` FROM `web_database_user` WHERE `database_user_id` = ?", $data['old']['database_user_id']);
            $drop_or_revoke_user = $this->drop_or_revoke_user($data['old']['database_id'], $data['old']['database_user_id'], $old_host_list);
            if($drop_or_revoke_user['drop_hosts'] != '') $this->process_host_list('DROP', $data['old']['database_name'], $old_db_user['database_user'], $old_db_user['database_password'], $drop_or_revoke_user['drop_hosts'], $link);
            if($drop_or_revoke_user['revoke_hosts'] != '') $this->process_host_list('REVOKE', $data['old']['database_name'], $old_db_user['database_user'], $old_db_user['database_password'], $drop_or_revoke_user['revoke_hosts'], $link);
         }
         if($data['old']['database_ro_user_id']) {
            $old_db_user = $app->db->queryOneRecord("SELECT `database_user`, `database_password` FROM `web_database_user` WHERE `database_user_id` = '" . intval($data['old']['database_ro_user_id']) . "'");
            $old_db_user = $app->db->queryOneRecord("SELECT `database_user`, `database_password` FROM `web_database_user` WHERE `database_user_id` = ?", $data['old']['database_ro_user_id']);
            $drop_or_revoke_user = $this->drop_or_revoke_user($data['old']['database_id'], $data['old']['database_ro_user_id'], $old_host_list);
            if($drop_or_revoke_user['drop_hosts'] != '') $this->process_host_list('DROP', $data['old']['database_name'], $old_db_user['database_user'], $old_db_user['database_password'], $drop_or_revoke_user['drop_hosts'], $link);
            if($drop_or_revoke_user['revoke_hosts'] != '') $this->process_host_list('REVOKE', $data['old']['database_name'], $old_db_user['database_user'], $old_db_user['database_password'], $drop_or_revoke_user['revoke_hosts'], $link);
         }


         if($link->query('DROP DATABASE '.$link->escape_string($data['old']['database_name']))) {
         if($link->query('DROP DATABASE `'.$link->escape_string($data['old']['database_name'].'`'))) {
            $app->log('Dropping MySQL database: '.$data['old']['database_name'], LOGLEVEL_DEBUG);
         } else {
            $app->log('Error while dropping MySQL database: '.$data['old']['database_name'].' '.$link->error, LOGLEVEL_WARNING);
         }

         $link->query('FLUSH PRIVILEGES;');
         $link->close();
      }

@@ -532,7 +646,8 @@

      $host_list = array('localhost');
      // get all databases this user was active for
      $db_list = $app->db->queryAllRecords("SELECT `remote_access`, `remote_ips` FROM `web_database` WHERE `database_user_id` = '" . intval($data['old']['database_user_id']) . "'");
      $user_id = intval($data['old']['database_user_id']);
      $db_list = $app->db->queryAllRecords("SELECT `remote_access`, `remote_ips` FROM `web_database` WHERE `database_user_id` = ? OR database_ro_user_id = ?", $user_id, $user_id);;
      if(count($db_list) < 1) return; // nothing to do on this server for this db user

      foreach($db_list as $database) {
@@ -559,7 +674,6 @@
         }
      }

      $link->query('FLUSH PRIVILEGES;');
      $link->close();

   }
@@ -595,7 +709,6 @@
         }
      }

      $link->query('FLUSH PRIVILEGES;');
      $link->close();
   }