Merge remote-tracking branch 'remotes/dev/1.6' into 1.6

src/Oro/Bundle/SecurityBundle/Tests/Selenium/LoginFormTest.php

@@ -156,7 +156,7 @@ public function testForgotPassword()
         $this->waitPageToLoad();
         $this->waitForAjax();
         $messageActual = $this->byXPath("//*[@id='top-page']//div[contains(@class,'alert-error')]")->text();
-        $messageExpect = "The username or email address \"123test123\" does not exist.";
+        $messageExpect = "There is no active user with username or email address \"123test123\".";
         $this->assertEquals($messageExpect, $messageActual);
 
         $this->byId('prependedInput')->value('[email protected]');

src/Oro/Bundle/UserBundle/Controller/ResetController.php

@@ -34,7 +34,7 @@ public function sendEmailAction()
         $username = $this->getRequest()->request->get('username');
         $user = $this->get('oro_user.manager')->findUserByUsernameOrEmail($username);
 
-        if (null === $user) {
+        if (null === $user || !$user->isEnabled()) {
             return $this->render('OroUserBundle:Reset:request.html.twig', array('invalid_username' => $username));
         }
 

src/Oro/Bundle/UserBundle/Resources/public/js/init-signin.js

@@ -1,5 +1,8 @@
 /* jshint browser:true */
 /* global require */
+/**
+ * @deprecated since 1.8 because of vulnerability for "phishing" attack
+ */
 require(['jquery'],
 function($) {
     'use strict';
@@ -21,4 +24,4 @@ function($) {
             $('input[name="_target_path"]').val(hashUrl);
         }
     });
-});
+});

src/Oro/Bundle/UserBundle/Resources/translations/messages.en.yml

@@ -22,6 +22,10 @@ Login page: Login page
 "Business Unit": "Business Unit"
 "User": "User"
 "None": "None"
+"There is no active user with username or email address \"%username%\".": "There is no active user with username or email address \"%username%\"."
+"Username or Email": "Username or Email"
+"Return to Login": "Return to Login"
+"Request": "Request"
 
 change_password:
     flash:

src/Oro/Bundle/UserBundle/Resources/views/Reset/request.html.twig

@@ -13,7 +13,7 @@
     <fieldset class="oro-forgot-password">
         {% if invalid_username is defined %}
             <div class="alert alert-error">
-                {{ 'The username or email address "%username%" does not exist.'|trans({ '%username%': invalid_username }) }}
+                {{ 'There is no active user with username or email address "%username%".'|trans({ '%username%': invalid_username }) }}
             </div>
         {% endif %}
         {{ messagesContent }}

src/Oro/Bundle/UserBundle/Resources/views/layout.html.twig

@@ -13,7 +13,7 @@
 
     {% include 'OroRequireJSBundle::scripts.html.twig' with {compressed: not app.debug} %}
     <script type="text/javascript">
-        require(['jquery', 'oroui/js/init-layout', 'orouser/js/init-signin'],
+        require(['jquery', 'oroui/js/init-layout'],
         function($) {
             $(function() {
                 // emulates 'document ready state' for selenium tests