Browse Source

Merge branch 'develop'

Unknown 6 years ago
parent
commit
178168d011
2 changed files with 20 additions and 5 deletions
  1. 15 2
      Quick.Arrays.pas
  2. 5 3
      Quick.SMTP.pas

+ 15 - 2
Quick.Arrays.pas

@@ -7,7 +7,7 @@
   Author      : Kike Pérez
   Author      : Kike Pérez
   Version     : 1.2
   Version     : 1.2
   Created     : 24/03/2019
   Created     : 24/03/2019
-  Modified    : 11/04/2019
+  Modified    : 31/08/2019
 
 
   This file is part of QuickLib: https://github.com/exilon/QuickLib
   This file is part of QuickLib: https://github.com/exilon/QuickLib
 
 
@@ -79,9 +79,12 @@ type
   TPair = record
   TPair = record
     Name : string;
     Name : string;
     Value : string;
     Value : string;
+    constructor Create(const aName, aValue : string);
   end;
   end;
 
 
-  TPairArray = TXArray<TPair>;
+  TPairArray = TArray<TPair>;
+
+  TPairXArray = TXArray<TPair>;
 
 
   TFlexArray = TXArray<TFlexValue>;
   TFlexArray = TXArray<TFlexValue>;
 
 
@@ -235,6 +238,8 @@ end;
 
 
 function TFlexPairArrayHelper.Add(aFlexPair: TFlexPair): Integer;
 function TFlexPairArrayHelper.Add(aFlexPair: TFlexPair): Integer;
 begin
 begin
+  SetLength(Self,Length(Self)+1);
+  Self[High(Self)] := aFlexPair;
   Result := High(Self);
   Result := High(Self);
 end;
 end;
 
 
@@ -283,4 +288,12 @@ begin
   end;
   end;
 end;
 end;
 
 
+{ TPair }
+
+constructor TPair.Create(const aName, aValue: string);
+begin
+  Name := aName;
+  Value := aValue;
+end;
+
 end.
 end.

+ 5 - 3
Quick.SMTP.pas

@@ -7,7 +7,7 @@
   Author      : Kike Pérez
   Author      : Kike Pérez
   Version     : 1.4
   Version     : 1.4
   Created     : 12/10/2017
   Created     : 12/10/2017
-  Modified    : 30/08/2018
+  Modified    : 02/09/2018
 
 
   This file is part of QuickLib: https://github.com/exilon/QuickLib
   This file is part of QuickLib: https://github.com/exilon/QuickLib
 
 
@@ -151,7 +151,7 @@ end;
 
 
 function TSMTP.SendEmail(const aFromEmail, aFromName, aSubject, aTo, aCC, aBC, aBody: string): Boolean;
 function TSMTP.SendEmail(const aFromEmail, aFromName, aSubject, aTo, aCC, aBC, aBody: string): Boolean;
 begin
 begin
-  fMail.From := fMail.From;
+  fMail.From := aFromEmail;
   Result := SendEmail(aFromName,aSubject,aTo,aCC,aBC,aBody);
   Result := SendEmail(aFromName,aSubject,aTo,aCC,aBC,aBody);
 end;
 end;
 
 
@@ -159,10 +159,12 @@ function TSMTP.SendEmail(const aFromName,aSubject,aTo,aCC,aBC,aBody : string) :
 var
 var
   mail : TMailMessage;
   mail : TMailMessage;
 begin
 begin
+  if fMail.From.IsEmpty then raise Exception.Create('Email sender not specified!');
   mail := TMailMessage.Create;
   mail := TMailMessage.Create;
   try
   try
     Mail.From := fMail.From;
     Mail.From := fMail.From;
-    Mail.SenderName := aFromName;
+    if aFromName.IsEmpty then Mail.SenderName := fMail.From
+      else Mail.SenderName := aFromName;
     Mail.Subject := aSubject;
     Mail.Subject := aSubject;
     Mail.Body := aBody;
     Mail.Body := aBody;
     Mail.Recipient := aTo;
     Mail.Recipient := aTo;