ouyang/snipe-it
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Set required fields if ldap is enabled"

Browse Source 
This reverts commit 2f69be03d3.
This commit is contained in:
Wahlstedt, Walter
2015-11-17 10:47:59 -05:00
parent 2f69be03d3
commit c8ecddba54
2 changed files with 33 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/controllers/admin/SettingsController.php
+25 -51
View File
@@ -67,57 +67,31 @@ class SettingsController extends AdminController
// Declare the rules for the form validation
if (Setting::getSettings()->ldap_enabled == 1){
$rules = array(
"brand" => 'required|min:1|numeric',
"per_page" => 'required|min:1|numeric',
"qr_text" => 'min:1|max:31',
"logo" => 'mimes:jpeg,bmp,png,gif',
"custom_css" => 'alpha_space',
"alert_email" => 'email',
"slack_endpoint" => 'url',
"default_currency" => 'required',
"slack_channel" => 'regex:/(?<!\w)#\w+/',
"slack_botname" => 'alpha_dash',
"ldap_server" => 'required|url',
"ldap_uname" => 'required|min:1',
"ldap_pword" => 'required|min:1',
"ldap_basedn" => 'required|min:1',
"ldap_filter" => 'required|min:1',
"ldap_username_field" => 'required|min:1',
"ldap_lname_field" => 'required|min:1',
"ldap_auth_filter_query" => 'required|min:1',
"ldap_version" => 'required|min:1',
"ldap_active_flag" => 'min:1',
"ldap_emp_num" => 'min:1',
"ldap_email" => 'min:1',
);
}else{
$rules = array(
"brand" => 'required|min:1|numeric',
"per_page" => 'required|min:1|numeric',
"qr_text" => 'min:1|max:31',
"logo" => 'mimes:jpeg,bmp,png,gif',
"custom_css" => 'alpha_space',
"alert_email" => 'email',
"slack_endpoint" => 'url',
"default_currency" => 'required',
"slack_channel" => 'regex:/(?<!\w)#\w+/',
"slack_botname" => 'alpha_dash',
"ldap_server" => 'url',
"ldap_uname" => 'min:1',
"ldap_pword" => 'min:1',
"ldap_basedn" => 'min:1',
"ldap_filter" => 'min:1',
"ldap_username_field" => 'min:1',
"ldap_lname_field" => 'min:1',
"ldap_auth_filter_query" => 'min:1',
"ldap_version" => 'min:1',
"ldap_active_flag" => 'min:1',
"ldap_emp_num" => 'min:1',
"ldap_email" => 'min:1',
);
}
$rules = array(
"brand" => 'required|min:1|numeric',
"per_page" => 'required|min:1|numeric',
"qr_text" => 'min:1|max:31',
"logo" => 'mimes:jpeg,bmp,png,gif',
"custom_css" => 'alpha_space',
"alert_email" => 'email',
"slack_endpoint" => 'url',
"default_currency" => 'required',
"slack_channel" => 'regex:/(?<!\w)#\w+/',
"slack_botname" => 'alpha_dash',
"ldap_server" => 'url',
"ldap_uname" => 'min:1',
"ldap_pword" => 'min:1',
"ldap_basedn" => 'min:1',
"ldap_filter" => 'min:1',
"ldap_username_field" => 'min:1',
"ldap_lname_field" => 'min:1',
"ldap_auth_filter_query" => 'min:1',
"ldap_version" => 'min:1',
"ldap_active_flag" => 'min:1',
"ldap_emp_num" => 'min:1',
"ldap_email" => 'min:1',
);
if (Config::get('app.lock_passwords')==false) {
$rules['site_name'] = 'required|min:3';