lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-04-05 21:01:35 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Shifting SmtpSettingsPart

Browse Source
This commit is contained in:
Sebastien Ros 2013-10-31 16:02:55 -07:00
parent ef12e5321a
commit 04b5e35765
6 changed files with 42 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/Orchard.Web/Modules/Orchard.Email/Handlers/SmtpSettingsPartHandler.cs
View File

@ -3,7 +3,6 @@ using System.Text;
using JetBrains.Annotations;
using Orchard.ContentManagement;
using Orchard.Email.Models;
using Orchard.Data;
using Orchard.ContentManagement.Handlers;
using Orchard.Localization;
using Orchard.Logging;
@ -14,15 +13,20 @@ namespace Orchard.Email.Handlers {
public class SmtpSettingsPartHandler : ContentHandler {
private readonly IEncryptionService _encryptionService;
public SmtpSettingsPartHandler(IRepository<SmtpSettingsPartRecord> repository, IEncryptionService encryptionService) {
public SmtpSettingsPartHandler(IEncryptionService encryptionService) {
T = NullLocalizer.Instance;
Logger = NullLogger.Instance;
_encryptionService = encryptionService;
Filters.Add(new ActivatingFilter<SmtpSettingsPart>("Site"));
Filters.Add(StorageFilter.For(repository));
OnLoaded<SmtpSettingsPart>(LazyLoadHandlers);
OnInitializing<SmtpSettingsPart>((context, part) => {
part.Port = 25;
part.RequireCredentials = false;
part.EnableSsl = false;
});
}
public new ILogger Logger { get; set; }
@ -30,7 +34,7 @@ namespace Orchard.Email.Handlers {
void LazyLoadHandlers(LoadContentContext context, SmtpSettingsPart part) {
part.PasswordField.Getter(() => {
try {
return String.IsNullOrWhiteSpace(part.Record.Password) ? String.Empty : Encoding.UTF8.GetString(_encryptionService.Decode(Convert.FromBase64String(part.Record.Password)));
return String.IsNullOrWhiteSpace(part.Password) ? String.Empty : Encoding.UTF8.GetString(_encryptionService.Decode(Convert.FromBase64String(part.Password)));
}
catch {
Logger.Error("The email password could not be decrypted. It might be corrupted, try to reset it.");
@ -38,7 +42,7 @@ namespace Orchard.Email.Handlers {
}
});
part.PasswordField.Setter(value => part.Record.Password = String.IsNullOrWhiteSpace(value) ? String.Empty : Convert.ToBase64String(_encryptionService.Encode(Encoding.UTF8.GetBytes(value))));
part.PasswordField.Setter(value => part.Password = String.IsNullOrWhiteSpace(value) ? String.Empty : Convert.ToBase64String(_encryptionService.Encode(Encoding.UTF8.GetBytes(value))));
}
public Localizer T { get; set; }

12
src/Orchard.Web/Modules/Orchard.Email/Migrations.cs
View File

@ -5,18 +5,6 @@ namespace Orchard.Email {
public int Create() {
SchemaBuilder.CreateTable("SmtpSettingsPartRecord",
table => table
.ContentPartRecord()
.Column<string>("Address")
.Column<string>("Host")
.Column<int>("Port")
.Column<bool>("EnableSsl")
.Column<bool>("RequireCredentials")
.Column<string>("UserName")
.Column<string>("Password")
);
return 1;
}
}

36
src/Orchard.Web/Modules/Orchard.Email/Models/SmtpSettingsPart.cs
View File

@ -3,7 +3,7 @@ using System;
using Orchard.ContentManagement.Utilities;
namespace Orchard.Email.Models {
public class SmtpSettingsPart : ContentPart<SmtpSettingsPartRecord> {
public class SmtpSettingsPart : ContentPart {
private readonly ComputedField<string> _password = new ComputedField<string>();
public ComputedField<string> PasswordField {
@ -11,44 +11,44 @@ namespace Orchard.Email.Models {
}
public string Address {
get { return Record.Address; }
set { Record.Address = value; }
get { return this.Retrieve(x => x.Address); }
set { this.Store(x => x.Address, value); }
}
public string Host {
get { return Record.Host; }
set { Record.Host = value; }
get { return this.Retrieve(x => x.Host); }
set { this.Store(x => x.Host, value); }
}
public int Port {
get { return Record.Port; }
set { Record.Port = value; }
get { return this.Retrieve(x => x.Port); }
set { this.Store(x => x.Port, value); }
}
public bool EnableSsl {
get { return Record.EnableSsl; }
set { Record.EnableSsl = value; }
get { return this.Retrieve(x => x.EnableSsl); }
set { this.Store(x => x.EnableSsl, value); }
}
public bool RequireCredentials {
get { return Record.RequireCredentials; }
set { Record.RequireCredentials = value; }
get { return this.Retrieve(x => x.RequireCredentials); }
set { this.Store(x => x.RequireCredentials, value); }
}
public string UserName {
get { return Record.UserName; }
set { Record.UserName = value; }
get { return this.Retrieve(x => x.UserName); }
set { this.Store(x => x.UserName, value); }
}
public string Password {
get { return _password.Value; }
set { _password.Value = value; }
get { return this.Retrieve(x => x.Password); }
set { this.Store(x => x.Password, value); }
}
public bool IsValid() {
return !String.IsNullOrWhiteSpace(Record.Host)
&& Record.Port > 0
&& !String.IsNullOrWhiteSpace(Record.Address);
return !String.IsNullOrWhiteSpace(Host)
&& Port > 0
&& !String.IsNullOrWhiteSpace(Address);
}
}
}

46
src/Orchard.Web/Modules/Orchard.Email/Models/SmtpSettingsPartRecord.cs
View File

@ -1,46 +0,0 @@
using Orchard.ContentManagement.Records;
namespace Orchard.Email.Models {
public class SmtpSettingsPartRecord : ContentPartRecord {
/// <summary>
/// From address in the mail message
/// </summary>
public virtual string Address { get; set; }
/// <summary>
/// Server name hosting the SMTP service
/// </summary>
public virtual string Host { get; set; }
/// <summary>
/// Port number on which SMTP service runs
/// </summary>
public virtual int Port { get; set; }
/// <summary>
/// Whether to enable SSL communications with the server
/// </summary>
public virtual bool EnableSsl { get; set; }
/// <summary>
/// Whether specific credentials should be used
/// </summary>
public virtual bool RequireCredentials { get; set; }
/// <summary>
/// The username to connect to the SMTP server if DefaultCredentials is False
/// </summary>
public virtual string UserName { get; set; }
/// <summary>
/// The password to connect to the SMTP server if DefaultCredentials is False
/// </summary>
public virtual string Password { get; set; }
public SmtpSettingsPartRecord() {
Port = 25;
RequireCredentials = false;
EnableSsl = false;
}
}
}

1
src/Orchard.Web/Modules/Orchard.Email/Orchard.Email.csproj
View File

@ -69,7 +69,6 @@
<Compile Include="Drivers\SmtpSettingsPartDriver.cs" />
<Compile Include="Handlers\SmtpSettingsPartHandler.cs" />
<Compile Include="Models\SmtpSettingsPart.cs" />
<Compile Include="Models\SmtpSettingsPartRecord.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Rules\MailActions.cs" />
<Compile Include="Rules\MailForms.cs" />

15
src/Orchard.Web/Modules/Upgrade/Controllers/InfosetController.cs
View File

@ -159,8 +159,23 @@ namespace Upgrade.Controllers {
site.As<InfosetPart>().Store("RegistrationSettingsPart", "NotificationsRecipients", (bool)reader["NotificationsRecipients"]);
site.As<InfosetPart>().Store("RegistrationSettingsPart", "EnableLostPassword", (bool)reader["EnableLostPassword"]);
});
_upgradeService.ExecuteReader("DROP TABLE " + _upgradeService.GetPrefixedTableName("Orchard_Users_RegistrationSettingsPartRecord"), null);
// SmtpSettingsPartRecord
_upgradeService.ExecuteReader("SELECT * FROM " + _upgradeService.GetPrefixedTableName("Orchard_Email_SmtpSettingsPartRecord"),
(reader, connection) => {
site.As<InfosetPart>().Store("SmtpSettingsPart", "Address", (string)reader["Address"]);
site.As<InfosetPart>().Store("SmtpSettingsPart", "Host", (string)reader["Host"]);
site.As<InfosetPart>().Store("SmtpSettingsPart", "Port", (int)reader["Port"]);
site.As<InfosetPart>().Store("SmtpSettingsPart", "EnableSsl", (bool)reader["EnableSsl"]);
site.As<InfosetPart>().Store("SmtpSettingsPart", "RequireCredentials", (bool)reader["RequireCredentials"]);
site.As<InfosetPart>().Store("SmtpSettingsPart", "UserName", (string)reader["UserName"]);
site.As<InfosetPart>().Store("SmtpSettingsPart", "Password", (string)reader["Password"]);
});
_upgradeService.ExecuteReader("DROP TABLE " + _upgradeService.GetPrefixedTableName("Orchard_Email_SmtpSettingsPartRecord"), null);
_orchardServices.Notifier.Information(T("Site Settings migrated successfully"));
return View();