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

MS Changes1500

Browse Source
This commit is contained in:
SchreiberM
2019-12-04 14:56:34 +01:00
parent 07b913be52
commit 27f1a4e327
6 changed files with 160 additions and 488 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
app/DD_PM_WINDREAM/clsPatterns.vb
View File

@@ -104,30 +104,31 @@ Public Class clsPatterns
Dim result = input
While ContainsPatternAndValue(result, PATTERN_USER, USER_VALUE_PRENAME)
result = ReplacePattern(input, PATTERN_USER, prename)
result = ReplacePattern(result, PATTERN_USER, prename)
End While
While ContainsPatternAndValue(result, PATTERN_USER, USER_VALUE_USER_ID)
result = ReplacePattern(input, PATTERN_USER, userId)
result = ReplacePattern(result, PATTERN_USER, userId)
End While
While ContainsPatternAndValue(result, PATTERN_USER, USER_VALUE_SURNAME)
result = ReplacePattern(input, PATTERN_USER, surname)
result = ReplacePattern(result, PATTERN_USER, surname)
End While
While ContainsPatternAndValue(result, PATTERN_USER, USER_VALUE_SHORTNAME)
result = ReplacePattern(input, PATTERN_USER, shortname)
result = ReplacePattern(result, PATTERN_USER, shortname)
End While
While ContainsPatternAndValue(result, PATTERN_USER, USER_VALUE_LANGUAGE)
result = ReplacePattern(input, PATTERN_USER, language)
result = ReplacePattern(result, PATTERN_USER, language)
End While
While ContainsPatternAndValue(result, PATTERN_USER, USER_VALUE_EMAIL)
result = ReplacePattern(input, PATTERN_USER, email)
result = ReplacePattern(result, PATTERN_USER, email)
End While
While ContainsPatternAndValue(result, PATTERN_USER, USER_VALUE_PROFILE_ID)
result = ReplacePattern(input, PATTERN_USER, profileId)
result = ReplacePattern(result, PATTERN_USER, profileId)
End While
Return result
@@ -275,7 +276,7 @@ Public Class clsPatterns
Public Shared Function ReplacePattern(input As String, type As String, replacement As String) As String
Dim elements As MatchCollection = regex.Matches(input)
If IsNothing(replacement) Or replacement = String.Empty Then
If IsNothing(replacement) Then
Return input
End If