diff --git a/classes/controller/AdminController.php b/classes/controller/AdminController.php index f41c1c346..469733646 100644 --- a/classes/controller/AdminController.php +++ b/classes/controller/AdminController.php @@ -2368,7 +2368,7 @@ class AdminControllerCore extends Controller foreach ($rules['required'] as $field) if (($value = Tools::getValue($field)) == false && (string)$value != '0') if (!Tools::getValue($this->identifier) || ($field != 'passwd' && $field != 'no-picture')) - $this->errors[] = sprintf( + $this->errors[$field] = sprintf( Tools::displayError('The %s field is required.'), call_user_func(array($class_name, 'displayFieldName'), $field, $class_name) ); @@ -2377,7 +2377,7 @@ class AdminControllerCore extends Controller if (isset($rules['requiredLang']) && is_array($rules['requiredLang'])) foreach ($rules['requiredLang'] as $field_lang) if (($empty = Tools::getValue($field_lang.'_'.$default_language->id)) === false || $empty !== '0' && empty($empty)) - $this->errors[] = sprintf( + $this->errors[$field_lang.'_'.$default_language->id] = sprintf( Tools::displayError('The field %1$s is required at least in %2$s.'), call_user_func(array($class_name, 'displayFieldName'), $field_lang, $class_name), $default_language->name @@ -2387,7 +2387,7 @@ class AdminControllerCore extends Controller if (isset($rules['size']) && is_array($rules['size'])) foreach ($rules['size'] as $field => $max_length) if (Tools::getValue($field) !== false && Tools::strlen(Tools::getValue($field)) > $max_length) - $this->errors[] = sprintf( + $this->errors[$field] = sprintf( Tools::displayError('The %1$s field is too long (%2$d chars max).'), call_user_func(array($class_name, 'displayFieldName'), $field, $class_name), $max_length @@ -2400,7 +2400,7 @@ class AdminControllerCore extends Controller { $field_lang_value = Tools::getValue($field_lang.'_'.$language['id_lang']); if ($field_lang_value !== false && Tools::strlen($field_lang_value) > $max_length) - $this->errors[] = sprintf( + $this->errors[$field_lang.'_'.$language['id_lang']] = sprintf( Tools::displayError('The field %1$s (%2$s) is too long (%3$d chars max, html chars including).'), call_user_func(array($class_name, 'displayFieldName'), $field_lang, $class_name), $language['name'], @@ -2415,7 +2415,7 @@ class AdminControllerCore extends Controller foreach ($rules['validate'] as $field => $function) if (($value = Tools::getValue($field)) !== false && ($field != 'passwd')) if (!Validate::$function($value) && !empty($value)) - $this->errors[] = sprintf( + $this->errors[$field] = sprintf( Tools::displayError('The %s field is invalid.'), call_user_func(array($class_name, 'displayFieldName'), $field, $class_name) ); @@ -2424,12 +2424,12 @@ class AdminControllerCore extends Controller if (($value = Tools::getValue('passwd')) != false) { if ($class_name == 'Employee' && !Validate::isPasswdAdmin($value)) - $this->errors[] = sprintf( + $this->errors['passwd'] = sprintf( Tools::displayError('The %s field is invalid.'), call_user_func(array($class_name, 'displayFieldName'), 'passwd', $class_name) ); elseif ($class_name == 'Customer' && !Validate::isPasswd($value)) - $this->errors[] = sprintf( + $this->errors['passwd'] = sprintf( Tools::displayError('The %s field is invalid.'), call_user_func(array($class_name, 'displayFieldName'), 'passwd', $class_name) ); @@ -2441,7 +2441,7 @@ class AdminControllerCore extends Controller foreach ($languages as $language) if (($value = Tools::getValue($field_lang.'_'.$language['id_lang'])) !== false && !empty($value)) if (!Validate::$function($value)) - $this->errors[] = sprintf( + $this->errors[$field_lang.'_'.$language['id_lang']] = sprintf( Tools::displayError('The %1$s field (%2$s) is invalid.'), call_user_func(array($class_name, 'displayFieldName'), $field_lang, $class_name), $language['name']