DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-02-21 03:15:45 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Updated validation

Browse source
This commit is contained in:
snipe 2016-06-01 15:45:05 -07:00
parent 33a35ec7f5
commit eacf70ee3f
2 changed files with 33 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/Http/Requests/SetupUserRequest.php
View file

@ -24,14 +24,14 @@ class SetupUserRequest extends Request
public function rules() public function rules()
{ {
return [ return [
'site_name' => 'required|string|min:1',
'first_name' => 'required|string|min:1', 'first_name' => 'required|string|min:1',
'last_name' => 'required|string|min:1', 'last_name' => 'required|string|min:1',
'location_id' => 'numeric',
'username' => 'required|string|min:2|unique:users,username,NULL,deleted_at', 'username' => 'required|string|min:2|unique:users,username,NULL,deleted_at',
'email' => 'email|unique:users,email', 'email' => 'email|unique:users,email',
'password' => 'required|min:6', 'password' => 'required|min:6',
'password_confirm' => 'required|min:6|same:password', 'password_confirm' => 'required|min:6|same:password',
'company_id' => 'integer', 'email_domain' => 'required|min:4',
]; ];
} }

51
app/Models/Setting.php
View file

@ -11,28 +11,39 @@ class Setting extends Model
use ValidatingTrait; use ValidatingTrait;
protected $rules = [ protected $rules = [
"site_name" => 'required|min:1', "brand" => 'required|min:1|numeric',
"brand" => 'required|min:1|numeric', "qr_text" => 'min:1|max:31',
"alert_threshold" => 'numeric', "logo_img" => 'mimes:jpeg,bmp,png,gif',
"alert_interval" => 'numeric', "custom_css" => 'string',
"qr_text" => 'min:1|max:31', "alert_email" => 'email_array',
"custom_css" => 'string', "slack_endpoint" => 'url',
"slack_endpoint" => 'url', "default_currency" => 'required',
"default_currency" => 'required', "locale" => 'required',
"slack_channel" => 'regex:/(?<!\w)#\w+/', "slack_channel" => 'regex:/(?<!\w)#\w+/',
"slack_botname" => 'string', "slack_botname" => 'string',
"ldap_server" => 'sometimes|required_if:ldap_enabled,1|url', 'labels_per_page' => 'numeric',
"ldap_uname" => 'sometimes|required_if:ldap_enabled,1', 'labels_width' => 'numeric',
"ldap_pword" => 'sometimes|required_if:ldap_enabled,1', 'labels_height' => 'numeric',
"ldap_basedn" => 'sometimes|required_if:ldap_enabled,1', 'labels_pmargin_left' => 'numeric',
"ldap_filter" => 'sometimes|required_if:ldap_enabled,1', 'labels_pmargin_right' => 'numeric',
"ldap_username_field" => 'sometimes|required_if:ldap_enabled,1', 'labels_pmargin_top' => 'numeric',
"ldap_lname_field" => 'sometimes|required_if:ldap_enabled,1', 'labels_pmargin_bottom' => 'numeric',
"ldap_auth_filter_query" => 'sometimes|required_if:ldap_enabled,1', 'labels_display_bgutter' => 'numeric',
"ldap_version" => 'sometimes|required_if:ldap_enabled,1', 'labels_display_sgutter' => 'numeric',
'labels_fontsize' => 'numeric|min:5',
'labels_pagewidth' => 'numeric',
'labels_pageheight' => 'numeric',
"ldap_server" => 'sometimes|required_if:ldap_enabled,1|url',
"ldap_uname" => 'sometimes|required_if:ldap_enabled,1',
"ldap_basedn" => 'sometimes|required_if:ldap_enabled,1',
"ldap_filter" => 'sometimes|required_if:ldap_enabled,1',
"ldap_username_field" => 'sometimes|required_if:ldap_enabled,1',
"ldap_lname_field" => 'sometimes|required_if:ldap_enabled,1',
"ldap_auth_filter_query" => 'sometimes|required_if:ldap_enabled,1',
"ldap_version" => 'sometimes|required_if:ldap_enabled,1',
]; ];
protected $fillable = ['site_name']; protected $fillable = ['site_name','email_domain','email_format','username_format'];
public static function getSettings() public static function getSettings()
{ {