Fix merge error that disabled contact drag'n'drop

Thomas Bruederli

2014-08-19 fc52af24f1418d6590a2d37a0d8cc31b123e38f6

 plugins/password/drivers/virtualmin.php

@@ -18,8 +18,7 @@
{
    function save($currpass, $newpass)
    {
        $rcmail = rcmail::get_instance();

        $rcmail   = rcmail::get_instance();
        $format   = $rcmail->config->get('password_virtualmin_format', 0);
        $username = $_SESSION['username'];

@@ -48,14 +47,14 @@
            $pieces = explode("_", $username);
            $domain = $pieces[0];
            break;
      case 8: // domain taken from alias, username left as it was
         $email = $rcmail->user->data['alias'];
         $domain = substr(strrchr($email, "@"), 1);
         break;
        default: // username@domain
            $domain = substr(strrchr($username, "@"), 1);
        }

        if (!$domain) {
            $domain = $rcmail->user->get_username('domain');
        }

        $username = escapeshellcmd($username);
        $domain   = escapeshellcmd($domain);
        $newpass  = escapeshellcmd($newpass);