diff --git a/app/Forms/Auth/GoogleForm.php b/app/Forms/Auth/GoogleForm.php index d90fe08..0acfe0d 100644 --- a/app/Forms/Auth/GoogleForm.php +++ b/app/Forms/Auth/GoogleForm.php @@ -31,7 +31,7 @@ class GoogleForm extends CommonForm case "access_code": $formRules[$field] = "required|trim|string"; default: - $rule = parent::getFormRule($action, $field); + $formRules = parent::getFormRule($action, $field, $formRules); break; } return $formRules; diff --git a/app/Forms/Auth/LocalForm.php b/app/Forms/Auth/LocalForm.php index e0e33b8..771ac70 100644 --- a/app/Forms/Auth/LocalForm.php +++ b/app/Forms/Auth/LocalForm.php @@ -32,10 +32,10 @@ class LocalForm extends CommonForm $formRules[$field] = sprintf("required|trim|min_length[4]|max_length[20]%s", in_array($action, ["create", "create_form"]) ? "|is_unique[{$this->getAttribute('table')}.{$field}]" : ""); break; case "passwd": - $rule = in_array($action, ["create", "create_form"]) ? "required|trim|string" : "permit_empty|trim|string"; + $formRules[$field] = in_array($action, ["create", "create_form"]) ? "required|trim|string" : "permit_empty|trim|string"; break; default: - $rule = parent::getFormRule($action, $field); + $formRules = parent::getFormRule($action, $field, $formRules); break; } return $formRules; diff --git a/app/Forms/UserForm.php b/app/Forms/UserForm.php index e39b5b7..95351a8 100644 --- a/app/Forms/UserForm.php +++ b/app/Forms/UserForm.php @@ -54,7 +54,7 @@ class UserForm extends CommonForm $formRules[$field] = sprintf("required|trim|min_length[4]|max_length[20]%s", in_array($action, ["create", "create_form"]) ? "|is_unique[{$this->getAttribute('table')}.{$field}]" : ""); break; case "passwd": - $rule = sprintf("%s|%s", in_array($action, ["create", "create_form"]) ? "required" : "permit_empty", "trim|string"); + $formRules[$field] = sprintf("%s|%s", in_array($action, ["create", "create_form"]) ? "required" : "permit_empty", "trim|string"); break; case "confirmpassword": $formRules[$field] = sprintf("%s|%s", in_array($action, ["create", "create_form"]) ? "required" : "permit_empty", "trim|string|matches[passwd]");