#1675 Error when login form with empty values is submitted also allow to override login form

template/scripts/BxBaseFormLogin.php

@@ -75,19 +75,20 @@ class BxBaseFormLogin extends BxTemplFormView
 
     function isValid ()
     {
-        $bIsValid = parent::isValid ();
-        if (! $bIsValid)
+        if (!parent::isValid())
             return false;
         
 		$sId = trim($this->getCleanValue('ID'));
-		$sPassword = $this->getCleanValue('Password');
+        $sPassword = $this->getCleanValue('Password');
+
         if ($sId != ''){
             $sErrorString = bx_check_password($sId, $sPassword, $this->getRole());
             $this->_setCustomError ($sErrorString);
             return $sErrorString ? false : true;
         }
-        else{
-            return $bIsValid;
+        else {
+            $this->_setCustomError (_t('_sys_txt_error_occured'));
+            return false;
         }
     }
 

template/scripts/BxBaseServiceLogin.php

@@ -82,7 +82,7 @@ class BxBaseServiceLogin extends BxDol
 
         $sCustomHtmlBefore = '';
         $sCustomHtmlAfter = '';
-        bx_alert('profile', 'show_login_form', 0, 0, array('oForm' => $oForm, 'sParams' => &$sParams, 'sCustomHtmlBefore' => &$sCustomHtmlBefore, 'sCustomHtmlAfter' => &$sCustomHtmlAfter, 'aAuthTypes' => &$aAuthTypes));
+        bx_alert('profile', 'show_login_form', 0, 0, array('oForm' => &$oForm, 'sParams' => &$sParams, 'sCustomHtmlBefore' => &$sCustomHtmlBefore, 'sCustomHtmlAfter' => &$sCustomHtmlAfter, 'aAuthTypes' => &$aAuthTypes));
 
         if ($sForceRelocate && 0 === mb_stripos($sForceRelocate, BX_DOL_URL_ROOT))
             $oForm->aInputs['relocate']['value'] = $sForceRelocate;