Changeset 35 for trunk/UContact.pas

Timestamp:

Nov 25, 2021, 3:04:55 PM (3 years ago)

Author:

chronos

Message:

• Added: Support for QUOTED-PRINTABLE encoding.

File:

• trunk/UContact.pas (modified) (4 diffs)

trunk/UContact.pas

@@ -117 +117 @@
 
 implementation
+
+uses
+  UQuotedPrintable;
 
 resourcestring
@@ -226 +229 @@
 procedure TContactProperty.EvaluateAttributes;
 var
-  Index: Integer;
+  I: Integer;
 begin
   if Attributes.IndexOf('BASE64') <> -1 then
     Encoding := 'BASE64'
   else
-  if Attributes.IndexOfName('ENCODING') <> -1 then
-    Encoding := Attributes.Values['ENCODING']
-    else Encoding := '';
+  if Attributes.IndexOfName('ENCODING') <> -1 then begin
+    Encoding := Attributes.Values['ENCODING'];
+    if (Encoding = 'QUOTED-PRINTABLE') or (Encoding = 'BASE64') then begin
+      Values.DelimitedText := GetDecodedValue;
+      Attributes.Delete(Attributes.IndexOfName('ENCODING'));
+    end;
+  end else Encoding := '';
 
   if Attributes.IndexOfName('CHARSET') <> -1 then
@@ -240 +247 @@
 
   // Simplify TYPE attribute from TYPE=VALUE into VALUE
-  Index := Attributes.IndexOfName('TYPE');
-  if Index <> -1 then
-    Attributes.Strings[Index] := Attributes.Values['TYPE'];
+  for I := 0 to Attributes.Count - 1 do begin
+    if Attributes.Names[I] = 'TYPE' then
+      Attributes.Strings[I] := Attributes.Values['TYPE'];
+  end;
 end;
 
@@ -251 +259 @@
   else
   if Encoding = 'QUOTED-PRINTABLE' then
-    Result := Values.DelimitedText
+    Result := DecodeQuotedPrintable(Values.DelimitedText)
   else Result := '';
 end;