Merge branch 'master' of git.ispconfig.org:ispconfig/ispconfig3

Falko Timme

2014-11-28 756b8360e90c4884f1bd6d7e84656c24b450eee7

Merge branch 'master' of git.ispconfig.org:ispconfig/ispconfig3

 interface/web/login/password_reset.php

@@ -54,7 +54,7 @@
    $username = $app->db->quote($_POST['username']);
    $email = $app->db->quote($_POST['email']);

    $client = $app->db->queryOneRecord("SELECT client.*, sys_user.lost_password_function FROM client,sys_user WHERE client.username = '$username' AND client.email = '$email' AND client.client_id = sys_user.client_id");
    $client = $app->db->queryOneRecord("SELECT client.*, sys_user.lost_password_function FROM client,sys_user WHERE client.username = ? AND client.email = ? AND client.client_id = sys_user.client_id", $username, $email);

    if($client['lost_password_function'] == 0) {
        $app->tpl->setVar("error", $wb['lost_password_function_disabled_txt']);