Merge pull request #2853 from jaapmarcus/fix/improve-auth-log

Fix bug in logging failed log attempts

bin/v-log-user-login

@@ -38,7 +38,7 @@ is_format_valid 'user' 'ip'
 is_common_format_valid "$session_id" "SESSION_ID"
 format_no_quotes "$user_agent" "USER_AGENT"
 is_common_format_valid "$authlog" "AUTHLOG"
-is_common_format_valid "$reason" "REASON"
+format_no_quotes "$reason" "REASON"
 
 
 is_object_valid 'user' 'USER' "$user"

test/checks.bats

@@ -320,6 +320,11 @@ r' "key"
     assert_failure $E_INVALID
 }
 
+@test "format_no_quotes test2" {
+     run format_no_quotes 'test bericht' "key"
+    assert_success
+}
+
 @test "format_no_quotes .." {
      run format_no_quotes '..' "key"
     assert_success

web/templates/pages/edit_server.html

@@ -80,6 +80,9 @@
 														if ((!empty($v_timezone)) && ( $key == $v_timezone)){
 															echo ' selected' ;
 														}
+														if($key == "UTC" && $v_timezone == "Etc/UTC"){
+															echo ' selected' ;
+														}
 														echo ">".$value."</option>\n";
 													}
 												?>