Merge remote-tracking branch 'ispc/stable-3.0.5' into stable-3.0.5

Marius Cramer

2014-08-13 42539643c396f9d8865dcf9a51b13dc869709d16

 server/plugins-available/mysql_clientdb_plugin.inc.php

@@ -83,7 +83,14 @@
      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();
            }
      }
      // loop through hostlist
      foreach($host_list as $db_host) {
         $db_host = trim($db_host);
@@ -270,7 +277,7 @@
         $old_host_list .= 'localhost';

         // 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);