diff --git a/static/js/tracker.js b/static/js/tracker.js index a9e8f6f..c851b8e 100644 --- a/static/js/tracker.js +++ b/static/js/tracker.js @@ -10,7 +10,7 @@ function validate(what, text) { } else if (what == 'email') { var re = /^(([a-zA-Z0-9_\-\.]+)@([a-zA-Z0-9_\-\.]+)\.([a-zA-Z]{2,5}){1,25})+([,.](([a-zA-Z0-9_\-\.]+)@([a-zA-Z0-9_\-\.]+)\.([a-zA-Z]{2,5}){1,25})+)*$/; } else if (what == 'greenzone') { - var re = /^$|^[0-9]+\.[0-9]+,[0-9]+\.[0-9]+,[0-9]+\.[0-9]+,[0-9]+\.[0-9]+$/; + var re = /^ *$|^[0-9]+\.[0-9]+,[0-9]+\.[0-9]+,[0-9]+\.[0-9]+,[0-9]+\.[0-9]+$/; } return re.test(text); diff --git a/tracker.go b/tracker.go index a4a2c44..e76ce3d 100644 --- a/tracker.go +++ b/tracker.go @@ -5,6 +5,7 @@ import ( "log" "net/http" "regexp" + "strings" ) // tracker handler @@ -124,7 +125,7 @@ func save_tracker_settingsHandler(response http.ResponseWriter, request *http.Re fmt.Fprintf(response, "{ \"rc\": 16, \"msg\": \"greenzone must be specified in URL\" }") return } - mygreenzone := greenzone[0] + mygreenzone := strings.ReplaceAll(greenzone[0]," ","") match3, _ := regexp.MatchString(`^$|^[0-9]+\.[0-9]+,[0-9]+\.[0-9]+,[0-9]+\.[0-9]+,[0-9]+\.[0-9]+$`, mygreenzone) if !(match3) {