AppStd/TaskFlow
8
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

2.1.6.3 Final - ApplServer, frmAdminsitrationBugs etc

Browse Source
This commit is contained in:
SchreiberM
2021-01-20 14:53:37 +01:00
parent 0d519d470f
commit 16a2c21de2
22 changed files with 1818 additions and 788 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
app/DD_PM_WINDREAM/clsPatterns.vb
View File

@@ -65,7 +65,7 @@ Public Class clsPatterns
result = ReplaceIDBAttributes(result, is_SQL)
End If
If Not IsNothing(result) Then
result = ReplaceUserValues(result, USER_PRENAME, USER_SURNAME, USER_SHORTNAME, USER_LANGUAGE, USER_EMAIL, USER_ID, CURRENT_CLICKED_PROFILE_ID, CURRENT_CLICKED_PROFILE_TITLE)
result = ReplaceUserValues(result)
LOGGER.Debug($"input AFTER replacing: [{result}]")
End If
@@ -107,41 +107,39 @@ Public Class clsPatterns
End Try
End Function
Public Shared Function ReplaceUserValues(input As String, prename As Object, surname As Object, shortname As Object, language As String, email As Object, userId As Object, profileId As Object, profileTITLE As Object) As String
Public Shared Function ReplaceUserValues(input As String) As String
Try
Dim result = input
While ContainsPatternAndValue(result, PATTERN_USER, USER_VALUE_PRENAME)
result = ReplacePattern(result, PATTERN_USER, prename)
result = ReplacePattern(result, PATTERN_USER, USER_PRENAME)
End While
While ContainsPatternAndValue(result, PATTERN_USER, USER_VALUE_USER_ID)
result = ReplacePattern(result, PATTERN_USER, userId)
result = ReplacePattern(result, PATTERN_USER, USER_ID)
End While
While ContainsPatternAndValue(result, PATTERN_USER, USER_VALUE_SURNAME)
result = ReplacePattern(result, PATTERN_USER, surname)
result = ReplacePattern(result, PATTERN_USER, USER_SURNAME)
End While
If IsDBNull(shortname) Then
shortname = ""
End If
While ContainsPatternAndValue(result, PATTERN_USER, USER_VALUE_SHORTNAME)
result = ReplacePattern(result, PATTERN_USER, shortname)
result = ReplacePattern(result, PATTERN_USER, USER_SHORTNAME)
End While
While ContainsPatternAndValue(result, PATTERN_USER, USER_VALUE_LANGUAGE)
result = ReplacePattern(result, PATTERN_USER, language)
result = ReplacePattern(result, PATTERN_USER, USER_LANGUAGE)
End While
While ContainsPatternAndValue(result, PATTERN_USER, USER_VALUE_EMAIL)
result = ReplacePattern(result, PATTERN_USER, email)
result = ReplacePattern(result, PATTERN_USER, USER_EMAIL)
End While
While ContainsPatternAndValue(result, PATTERN_USER, VALUE_PROFILE_ID)
result = ReplacePattern(result, PATTERN_USER, profileId)
result = ReplacePattern(result, PATTERN_USER, CURRENT_CLICKED_PROFILE_ID)
End While
While ContainsPatternAndValue(result, PATTERN_USER, VALUE_PROFILE_TITLE)
result = ReplacePattern(result, PATTERN_USER, profileTITLE)
result = ReplacePattern(result, PATTERN_USER, CURRENT_CLICKED_PROFILE_TITLE)
End While
LOGGER.Debug("pInput AFTER ReplaceUserValues: " & input)
Return result