Merge branch '1.5'

Author: Guite

src/system/AdminModule/Resources/views/AdminInterface/updateCheck.html.twig

@@ -1,5 +1,5 @@
 {% if hasPermission('ZikulaAdminModule::', '::', 'ACCESS_ADMIN') and updateCheckHelper.enabled %}
-    <div id="updatecheck" class="alert" style="background-color: #F7F7F7">
+    <div id="updatecheck" class="alert alert-success">
         <div class="row">
             <div class="col-sm-12">
                 <i class="close" data-dismiss="alert">&times;</i>

src/system/ZAuthModule/AuthenticationMethod/AbstractNativeAuthenticationMethod.php

@@ -109,7 +109,11 @@ protected function authenticateByField(array $data, $field = 'uname')
                     $this->session->getFlashBag()->add('error', $this->translator->__('Incorrect login credentials'));
                 }
             } else {
-                $this->session->getFlashBag()->add('error', $this->translator->__f('User not found with %field %value', ['%field' => $field, '%value' => $data[$field]]));
+                $this->session->getFlashBag()->add('error', $this->translator->__f('User not found with %field %value using %method method.', [
+                    '%field' => $field,
+                    '%value' => $data[$field],
+                    '%method' => $this->getDisplayName()
+                ]));
             }
         }
 

src/system/ZAuthModule/AuthenticationMethod/NativeEitherAuthenticationMethod.php

@@ -69,8 +69,11 @@ public function getLoginTemplateName($type = 'page', $position = 'left')
      */
     public function authenticate(array $data = [])
     {
-        $field = filter_var($data['either'], FILTER_VALIDATE_EMAIL) ? 'email' : 'uname';
-        $data[$field] = $data['either'];
+        $field = 'email'; // default
+        if (isset($data['either'])) {
+            $field = filter_var($data['either'], FILTER_VALIDATE_EMAIL) ? 'email' : 'uname';
+            $data[$field] = $data['either'];
+        }
 
         return $this->authenticateByField($data, $field);
     }