From d7eac1d7463686c96b5ba9eb6dad4e523702837a Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Tue, 30 Mar 2021 22:14:43 +0200
Subject: [PATCH 1/4] Do not flag mover messages

---
 plugins/dynamix/include/ColorCoding.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/dynamix/include/ColorCoding.php b/plugins/dynamix/include/ColorCoding.php
index bd1446df5..cb15ca0b3 100644
--- a/plugins/dynamix/include/ColorCoding.php
+++ b/plugins/dynamix/include/ColorCoding.php
@@ -1,6 +1,6 @@
 <?PHP
-/* Copyright 2005-2020, Lime Technology
- * Copyright 2012-2020, Bergware International.
+/* Copyright 2005-2021, Lime Technology
+ * Copyright 2012-2021, Bergware International.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License version 2,
@@ -14,7 +14,7 @@
 // Color coding for syslog and disk log
 $match =
 [['class' => 'text',
-  'text'  => ['to the standard error','non[ -]fatal error','correct gpt errors','error handler\b','(kernel|logger): [|+ #-.]','logger: (naming|log)','tainted: (host-cpu|high-privileges)','root: (>f|cd)\+\+\+\+','root: \.d\.\.t\.']
+  'text'  => ['to the standard error','non[ -]fatal error','correct gpt errors','error handler\b','(kernel|logger): [|+ #-.]','logger: (naming|log)','tainted: (host-cpu|high-privileges)','root: (>f|cd)\+\+\+\+','root: \.d\.\.t\.','(move: ){1,2}]
  ],
  ['class' => 'login',
   'text'  => ['(accepted|failed) password','sshd\[\d+\]:',' login user ']

From 68e4eb893bb12270330bee2acb7cdf33ad61c522 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Tue, 30 Mar 2021 22:32:51 +0200
Subject: [PATCH 2/4] Allow dot in user name

---
 plugins/dynamix/UserAdd.page | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/plugins/dynamix/UserAdd.page b/plugins/dynamix/UserAdd.page
index ad332da49..cbf69b5f7 100644
--- a/plugins/dynamix/UserAdd.page
+++ b/plugins/dynamix/UserAdd.page
@@ -3,8 +3,8 @@ Title="Add User"
 Tag="user"
 ---
 <?PHP
-/* Copyright 2005-2020, Lime Technology
- * Copyright 2012-2020, Bergware International.
+/* Copyright 2005-2021, Lime Technology
+ * Copyright 2012-2021, Bergware International.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License version 2,
@@ -56,10 +56,10 @@ function showPassword() {
 }
 function checkUsername(form) {
   var username = form.userName.value.trim();
-  if (!username.match('^[a-z_][a-z0-9_-]*[$]?$')) {
+  if (!username.match('^[a-z_][a-z0-9_-\.]*[$]?$')) {
     $('input[name="cmdUserEdit"]').val("_(Add)_");
     swal({title:"_(Invalid user name)_",text:"_(Use only lowercase letters, digits, underscores and dashes)_",type:"error",html:true,confirmButtonText:"_(Ok)_"});
-		
+
     return false;
   }
   if (form.userPasswordGUI.value.length > 128 || form.userPasswordConfGUI.value.length > 128) {

From 7b5c722b57368a65df1f8739273f99c952cac57d Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Wed, 31 Mar 2021 17:55:26 +0200
Subject: [PATCH 3/4] Do not flag mover messages

---
 plugins/dynamix/include/ColorCoding.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/dynamix/include/ColorCoding.php b/plugins/dynamix/include/ColorCoding.php
index cb15ca0b3..9c5423733 100644
--- a/plugins/dynamix/include/ColorCoding.php
+++ b/plugins/dynamix/include/ColorCoding.php
@@ -14,7 +14,7 @@
 // Color coding for syslog and disk log
 $match =
 [['class' => 'text',
-  'text'  => ['to the standard error','non[ -]fatal error','correct gpt errors','error handler\b','(kernel|logger): [|+ #-.]','logger: (naming|log)','tainted: (host-cpu|high-privileges)','root: (>f|cd)\+\+\+\+','root: \.d\.\.t\.','(move: ){1,2}]
+  'text'  => ['to the standard error','non[ -]fatal error','correct gpt errors','error handler\b','(kernel|logger): [|+ #-.]','logger: (naming|log)','tainted: (host-cpu|high-privileges)','root: (>f|cd)\+\+\+\+','root: \.d\.\.t\.','(move: ){2}]
  ],
  ['class' => 'login',
   'text'  => ['(accepted|failed) password','sshd\[\d+\]:',' login user ']

From b15b9144b703a27975405f3af802f4a1f41e17cc Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Wed, 31 Mar 2021 19:15:33 +0200
Subject: [PATCH 4/4] Revert "Allow dot in user name"

This reverts commit 68e4eb893bb12270330bee2acb7cdf33ad61c522.
---
 plugins/dynamix/UserAdd.page | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/plugins/dynamix/UserAdd.page b/plugins/dynamix/UserAdd.page
index cbf69b5f7..ad332da49 100644
--- a/plugins/dynamix/UserAdd.page
+++ b/plugins/dynamix/UserAdd.page
@@ -3,8 +3,8 @@ Title="Add User"
 Tag="user"
 ---
 <?PHP
-/* Copyright 2005-2021, Lime Technology
- * Copyright 2012-2021, Bergware International.
+/* Copyright 2005-2020, Lime Technology
+ * Copyright 2012-2020, Bergware International.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License version 2,
@@ -56,10 +56,10 @@ function showPassword() {
 }
 function checkUsername(form) {
   var username = form.userName.value.trim();
-  if (!username.match('^[a-z_][a-z0-9_-\.]*[$]?$')) {
+  if (!username.match('^[a-z_][a-z0-9_-]*[$]?$')) {
     $('input[name="cmdUserEdit"]').val("_(Add)_");
     swal({title:"_(Invalid user name)_",text:"_(Use only lowercase letters, digits, underscores and dashes)_",type:"error",html:true,confirmButtonText:"_(Ok)_"});
-
+		
     return false;
   }
   if (form.userPasswordGUI.value.length > 128 || form.userPasswordConfGUI.value.length > 128) {