MS

app/DD-Record-Organiser/ClassControlCommands.vb

@@ -156,7 +156,7 @@
 
                 SQL = "SELECT MAX(GUID) FROM TBPMO_CONTROL_SCREEN WHERE CONTROL_ID = " & guid & " AND SCREEN_ID = " & CURRENT_SCREEN_ID
                 Dim ctrl_screen_Id = ClassDatabase.Execute_Scalar(SQL, True)
-                SQL = String.Format("INSERT INTO TBPMO_CONTROL_LANGUAGE (LANGUAGE_TYPE,CONTROL_SCREEN_ID,CAPTION,ADDED_WHO) VALUES ('{0}',{1},'{2}','{3}')", USER_LANGUAGE, ctrl_screen_Id, CONTROL_TEXT, Environment.UserName)
+                SQL = String.Format("INSERT INTO TBPMO_CONTROL_LANGUAGE (LANGUAGE_TYPE,CONTROL_SCREEN_ID,CAPTION,ADDED_WHO) VALUES ('{0}',{1},'{2}','{3}')", USER_LANGUAGE, ctrl_screen_Id, CONTROL_TEXT, USER_USERNAME)
                 ClassDatabase.Execute_non_Query(SQL, True)
                 Return True
             Else
@@ -181,7 +181,7 @@
             '    Console.WriteLine("After:" & x & ":" & y)
             'End If
 
-            Dim SQL = "UPDATE TBPMO_CONTROL_SCREEN SET X_LOC = " & x & ", Y_LOC = " & y & ", CHANGED_WHO = '" & Environment.UserName & "' WHERE CONTROL_ID = " & CONTROL_ID
+            Dim SQL = "UPDATE TBPMO_CONTROL_SCREEN SET X_LOC = " & x & ", Y_LOC = " & y & ", CHANGED_WHO = '" & USER_USERNAME & "' WHERE CONTROL_ID = " & CONTROL_ID
 
             If ClassDatabase.Execute_non_Query(SQL) = True Then
                 Return True
@@ -204,7 +204,7 @@
             Dim NAME As String
             Dim REQUIRED As Integer
             Dim READ_ONLY As Integer
-            Dim CHANGED_WHO As String = Environment.UserName
+            Dim CHANGED_WHO As String = USER_USERNAME
             Dim COL_NAME As String
             Dim SQLCommand As String
             Dim EnabledWhen As String
@@ -361,7 +361,7 @@
             Dim CurrentType As String = control.GetType.ToString
             Dim X_LOC, Y_LOC As Integer
             Dim HEIGHT, WIDTH As Integer
-            Dim CHANGED_WHO As String = Environment.UserName
+            Dim CHANGED_WHO As String = USER_USERNAME
             Dim CONTROL_TEXT As String
             Dim TAB_INDEX As Integer
             Dim TAB_STOP As Integer