|
From: <tmy...@us...> - 2006-05-30 10:26:23
|
Revision: 38 Author: tmyroadctfig Date: 2006-05-30 03:25:50 -0700 (Tue, 30 May 2006) ViewCVS: http://svn.sourceforge.net/nmailserver/?rev=38&view=rev Log Message: ----------- Added initial administration website. Modified Paths: -------------- NMail/branches/luke-dev/NMail.LocalStoreData.MySql/MySqlLocalStoreData.cs NMail/branches/luke-dev/NMail.Server/NMailServer.cs NMail/branches/luke-dev/NMail.Server/RemoteAdministration.cs NMail/branches/luke-dev/NMail.sln Added Paths: ----------- NMail/branches/luke-dev/NMail.Administration.Web/ NMail/branches/luke-dev/NMail.Administration.Web/App_Code/ NMail/branches/luke-dev/NMail.Administration.Web/App_Code/MailDomainDataSource.cs NMail/branches/luke-dev/NMail.Administration.Web/App_Data/ NMail/branches/luke-dev/NMail.Administration.Web/Bin/ NMail/branches/luke-dev/NMail.Administration.Web/Default.aspx NMail/branches/luke-dev/NMail.Administration.Web/Global.asax NMail/branches/luke-dev/NMail.Administration.Web/Images/ NMail/branches/luke-dev/NMail.Administration.Web/Images/nmail-logo.png NMail/branches/luke-dev/NMail.Administration.Web/Login.aspx NMail/branches/luke-dev/NMail.Administration.Web/Login.aspx.cs NMail/branches/luke-dev/NMail.Administration.Web/MailDomainDetails.aspx NMail/branches/luke-dev/NMail.Administration.Web/MailDomainDetails.aspx.cs NMail/branches/luke-dev/NMail.Administration.Web/MasterPage.master NMail/branches/luke-dev/NMail.Administration.Web/StyleSheet.css NMail/branches/luke-dev/NMail.Administration.Web/ViewMailDomains.aspx NMail/branches/luke-dev/NMail.Administration.Web/ViewMailDomains.aspx.cs NMail/branches/luke-dev/NMail.Administration.Web/Web.sitemap NMail/branches/luke-dev/NMail.Administration.Web/web.config NMail/branches/luke-dev/NMail.Administration.Web.sln Added: NMail/branches/luke-dev/NMail.Administration.Web/App_Code/MailDomainDataSource.cs =================================================================== --- NMail/branches/luke-dev/NMail.Administration.Web/App_Code/MailDomainDataSource.cs (rev 0) +++ NMail/branches/luke-dev/NMail.Administration.Web/App_Code/MailDomainDataSource.cs 2006-05-30 10:25:50 UTC (rev 38) @@ -0,0 +1,81 @@ +using System; +using System.Data; +using System.Configuration; +using System.Web; +using System.Web.Security; +using System.Web.UI; +using System.Web.SessionState; +using System.Web.UI.WebControls; +using System.Web.UI.WebControls.WebParts; +using System.Web.UI.HtmlControls; + +using NMail; +using NMail.Authentication; +using NMail.DataTypes; +using NMail.DataTypes.LocalStore; + +namespace NMail.Administration.Web +{ + /// <summary> + /// Summary description for MailDomainDataSource + /// </summary> + public static class MailDomainDataSource + { + public static DataTable GetMailDomains() + { + DataTable result = new DataTable("Mail Domains"); + result.Columns.Add("Id"); + result.Columns.Add("Primary Host"); + + IHttpSessionState session = SessionStateUtility.GetHttpSessionStateFromContext(HttpContext.Current); + IAuthenticationToken authToken = (IAuthenticationToken)session["AuthToken"]; + ILocalStore localStore = (ILocalStore)session["LocalStore"]; + + MailDomain[] mailDomains = localStore.GetMailDomains(authToken); + + foreach (MailDomain mailDomain in mailDomains) + { + object[] p = { mailDomain.MailDomainId, mailDomain.PrimaryHost }; + result.Rows.Add(p); + } + + return result; + } + + public static DataTable GetMailDomain(int mailDomainId) + { + DataTable result = new DataTable("Mail Domain"); + result.Columns.Add("Id"); + result.Columns.Add("Primary Host"); + + IHttpSessionState session = SessionStateUtility.GetHttpSessionStateFromContext(HttpContext.Current); + IAuthenticationToken authToken = (IAuthenticationToken)session["AuthToken"]; + ILocalStore localStore = (ILocalStore)session["LocalStore"]; + + MailDomain[] mailDomains = localStore.GetMailDomains(authToken); + + foreach (MailDomain mailDomain in mailDomains) + { + if (mailDomain.MailDomainId == mailDomainId) + { + object[] p = { mailDomain.MailDomainId, mailDomain.PrimaryHost }; + result.Rows.Add(p); + break; + } + } + + return result; + } + + public static void UpdateMailDomain(int mailDomainId, string primaryHost) + { + MailDomain updatedMailDomain = new MailDomain(mailDomainId, new Host(primaryHost)); + + IHttpSessionState session = SessionStateUtility.GetHttpSessionStateFromContext(HttpContext.Current); + IAuthenticationToken authToken = (IAuthenticationToken)session["AuthToken"]; + ILocalStore localStore = (ILocalStore)session["LocalStore"]; + + localStore.UpdateMailDomain(authToken, updatedMailDomain); + } + } +} Added: NMail/branches/luke-dev/NMail.Administration.Web/Default.aspx =================================================================== --- NMail/branches/luke-dev/NMail.Administration.Web/Default.aspx (rev 0) +++ NMail/branches/luke-dev/NMail.Administration.Web/Default.aspx 2006-05-30 10:25:50 UTC (rev 38) @@ -0,0 +1,17 @@ +<%@ Page Language="C#" MasterPageFile="~/MasterPage.master" Title="Untitled Page" %> + +<script runat="server"> + + protected void Page_Load(object sender, EventArgs e) + { + if (!Request.IsAuthenticated) + { + Response.Redirect("Login.aspx"); + } + } +</script> + +<asp:Content ID="Content" ContentPlaceHolderID="ContentPlaceHolder" Runat="Server"> + Where here! +</asp:Content> + Added: NMail/branches/luke-dev/NMail.Administration.Web/Global.asax =================================================================== --- NMail/branches/luke-dev/NMail.Administration.Web/Global.asax (rev 0) +++ NMail/branches/luke-dev/NMail.Administration.Web/Global.asax 2006-05-30 10:25:50 UTC (rev 38) @@ -0,0 +1,36 @@ +<%@ Application Language="C#" %> + +<script runat="server"> + + void Application_Start(object sender, EventArgs e) + { + } + + void Application_End(object sender, EventArgs e) + { + // Code that runs on application shutdown + + } + + void Application_Error(object sender, EventArgs e) + { + // Code that runs when an unhandled error occurs + + } + + void Session_Start(object sender, EventArgs e) + { + // Code that runs when a new session is started + + } + + void Session_End(object sender, EventArgs e) + { + // Code that runs when a session ends. + // Note: The Session_End event is raised only when the sessionstate mode + // is set to InProc in the Web.config file. If session mode is set to StateServer + // or SQLServer, the event is not raised. + + } + +</script> Added: NMail/branches/luke-dev/NMail.Administration.Web/Images/nmail-logo.png =================================================================== (Binary files differ) Property changes on: NMail/branches/luke-dev/NMail.Administration.Web/Images/nmail-logo.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: NMail/branches/luke-dev/NMail.Administration.Web/Login.aspx =================================================================== --- NMail/branches/luke-dev/NMail.Administration.Web/Login.aspx (rev 0) +++ NMail/branches/luke-dev/NMail.Administration.Web/Login.aspx 2006-05-30 10:25:50 UTC (rev 38) @@ -0,0 +1,15 @@ +<%@ Page Language="C#" CodeFile="Login.aspx.cs" Inherits="Login" MasterPageFile="~/MasterPage.master" Title="NMail Administration - Login" %> + +<asp:Content ID="Content" ContentPlaceHolderID="ContentPlaceHolder" Runat="Server"> + <asp:LoginView ID="LoginView" runat="server"> + <LoggedInTemplate> + You are currently logged in as + <asp:LoginName ID="LoginName" runat="server" />. + </LoggedInTemplate> + <AnonymousTemplate> + <asp:Login ID="Login" runat="server" OnAuthenticate="Login_Authenticate" DestinationPageUrl="~/Default.aspx" DisplayRememberMe="False"> + </asp:Login> + </AnonymousTemplate> + </asp:LoginView> +</asp:Content> + Added: NMail/branches/luke-dev/NMail.Administration.Web/Login.aspx.cs =================================================================== --- NMail/branches/luke-dev/NMail.Administration.Web/Login.aspx.cs (rev 0) +++ NMail/branches/luke-dev/NMail.Administration.Web/Login.aspx.cs 2006-05-30 10:25:50 UTC (rev 38) @@ -0,0 +1,37 @@ +using System; +using System.Data; +using System.Configuration; +using System.Collections; +using System.Net.Security; +using System.Runtime.Remoting; +using System.Runtime.Remoting.Channels; +using System.Security.Cryptography.X509Certificates; +using System.Threading; +using System.Web; +using System.Web.Security; +using System.Web.UI; +using System.Web.UI.WebControls; +using System.Web.UI.WebControls.WebParts; +using System.Web.UI.HtmlControls; + +using NMail.Authentication; +using NMail.IO; +using NMail.Server; + +public partial class Login : System.Web.UI.Page +{ + protected void Login_Authenticate(object sender, AuthenticateEventArgs e) + { + System.Web.UI.WebControls.Login login = (System.Web.UI.WebControls.Login)this.LoginView.FindControl("Login"); + + RemoteAdministration ra = (RemoteAdministration)Activator.GetObject(typeof(RemoteAdministration), "tcp://localhost:7877/RemoteAdministration.rem"); + IAuthenticationToken authToken = ra.NMailServer.AuthenticationProvider.Authenticate(login.UserName, login.Password); + + if (authToken != null) + { + e.Authenticated = true; + Session["AuthToken"] = authToken; + Session["LocalStore"] = ra.NMailServer.LocalStore; + } + } +} \ No newline at end of file Added: NMail/branches/luke-dev/NMail.Administration.Web/MailDomainDetails.aspx =================================================================== --- NMail/branches/luke-dev/NMail.Administration.Web/MailDomainDetails.aspx (rev 0) +++ NMail/branches/luke-dev/NMail.Administration.Web/MailDomainDetails.aspx 2006-05-30 10:25:50 UTC (rev 38) @@ -0,0 +1,21 @@ +<%@ Page Language="C#" MasterPageFile="~/MasterPage.master" AutoEventWireup="true" CodeFile="MailDomainDetails.aspx.cs" Inherits="MailDomainDetails" Title="Untitled Page" %> +<asp:Content ID="Content1" ContentPlaceHolderID="ContentPlaceHolder" Runat="Server"> + <asp:DetailsView ID="DetailsView1" runat="server" CellPadding="4" DataSourceID="MailDomainDataSource" + ForeColor="#333333" GridLines="None" Height="50px" Width="125px"> + <FooterStyle BackColor="#507CD1" Font-Bold="True" ForeColor="White" /> + <CommandRowStyle BackColor="#D1DDF1" Font-Bold="True" /> + <EditRowStyle BackColor="#2461BF" /> + <RowStyle BackColor="#EFF3FB" /> + <PagerStyle BackColor="#2461BF" ForeColor="White" HorizontalAlign="Center" /> + <FieldHeaderStyle BackColor="#DEE8F5" Font-Bold="True" /> + <HeaderStyle BackColor="#507CD1" Font-Bold="True" ForeColor="White" /> + <AlternatingRowStyle BackColor="White" /> + </asp:DetailsView> + <asp:ObjectDataSource ID="MailDomainDataSource" runat="server" SelectMethod="GetMailDomain" + TypeName="NMail.Administration.Web.MailDomainDataSource"> + <SelectParameters> + <asp:QueryStringParameter Name="mailDomainId" QueryStringField="MailDomainId" Type="Int32" /> + </SelectParameters> + </asp:ObjectDataSource> +</asp:Content> + Added: NMail/branches/luke-dev/NMail.Administration.Web/MailDomainDetails.aspx.cs =================================================================== --- NMail/branches/luke-dev/NMail.Administration.Web/MailDomainDetails.aspx.cs (rev 0) +++ NMail/branches/luke-dev/NMail.Administration.Web/MailDomainDetails.aspx.cs 2006-05-30 10:25:50 UTC (rev 38) @@ -0,0 +1,18 @@ +using System; +using System.Data; +using System.Configuration; +using System.Collections; +using System.Web; +using System.Web.Security; +using System.Web.UI; +using System.Web.UI.WebControls; +using System.Web.UI.WebControls.WebParts; +using System.Web.UI.HtmlControls; + +public partial class MailDomainDetails : System.Web.UI.Page +{ + protected void Page_Load(object sender, EventArgs e) + { + + } +} Added: NMail/branches/luke-dev/NMail.Administration.Web/MasterPage.master =================================================================== --- NMail/branches/luke-dev/NMail.Administration.Web/MasterPage.master (rev 0) +++ NMail/branches/luke-dev/NMail.Administration.Web/MasterPage.master 2006-05-30 10:25:50 UTC (rev 38) @@ -0,0 +1,48 @@ +<%@ Master Language="C#" %> + +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> + +<html xmlns="http://www.w3.org/1999/xhtml" > +<head runat="server"> + <title>Untitled Page</title> + <link href="StyleSheet.css" rel="stylesheet" type="text/css" /> +</head> +<body> + <form id="form1" runat="server"> + <div> + <table border="0" cellpadding="0" cellspacing="0" style="width: 100%; height: 100%"> + <tr> + <td colspan="2" style="vertical-align: middle; width: 100%; border-bottom: darkgray thin solid;"> + <h1><img src="Images/nmail-logo.png" style="vertical-align: middle" /> NMail Web Administration</h1> + </td> + </tr> + <tr> + <td colspan="2" style="border-bottom: darkgray thick solid;"> + <table style="width: 100%"> + <tr> + <td style="width: 100%"><asp:SiteMapPath ID="SiteMapPath" runat="server" /></td> + <td style="text-align: right;"><asp:LoginStatus ID="LoginStatus" runat="server" /></td> + </tr> + </table> + </td> + </tr> + <tr> + <td style="border-right-style: solid; border-right-color: darkgray; padding-right: 1em; padding-left: 1em; padding-bottom: 1em; padding-top: 1em;"> + <asp:TreeView ID="TreeView" runat="server" DataSourceID="SiteMapDataSource"> + </asp:TreeView> + <asp:SiteMapDataSource ID="SiteMapDataSource" runat="server" /> + </td> + <td style="width: 100%; padding-right: 1em; padding-left: 1em; padding-bottom: 1em; padding-top: 1em;"> + <asp:ContentPlaceHolder ID="ContentPlaceHolder" runat="server"> + </asp:ContentPlaceHolder> + </td> + </tr> + <tr> + <td colspan="2" style="border-top-style: solid; border-top-color: darkgray;"> + <a href="http://nmailserver.sourceforege.net">NMail homepage.</a></td> + </tr> + </table> + </div> + </form> +</body> +</html> Added: NMail/branches/luke-dev/NMail.Administration.Web/StyleSheet.css =================================================================== --- NMail/branches/luke-dev/NMail.Administration.Web/StyleSheet.css (rev 0) +++ NMail/branches/luke-dev/NMail.Administration.Web/StyleSheet.css 2006-05-30 10:25:50 UTC (rev 38) @@ -0,0 +1,4 @@ +body +{ + font-family: Sans-Serif; +} Added: NMail/branches/luke-dev/NMail.Administration.Web/ViewMailDomains.aspx =================================================================== --- NMail/branches/luke-dev/NMail.Administration.Web/ViewMailDomains.aspx (rev 0) +++ NMail/branches/luke-dev/NMail.Administration.Web/ViewMailDomains.aspx 2006-05-30 10:25:50 UTC (rev 38) @@ -0,0 +1,24 @@ +<%@ Page Language="C#" MasterPageFile="~/MasterPage.master" AutoEventWireup="true" CodeFile="ViewMailDomains.aspx.cs" Inherits="ViewMailDomains" Title="Untitled Page" %> +<asp:Content ID="Content" ContentPlaceHolderID="ContentPlaceHolder" Runat="Server"> + <asp:ObjectDataSource ID="MailDomainDataSource" runat="server" SelectMethod="GetMailDomains" TypeName="NMail.Administration.Web.MailDomainDataSource" UpdateMethod="UpdateMailDomain"> + <UpdateParameters> + <asp:Parameter Name="mailDomainId" Type="Int32" /> + <asp:Parameter Name="primaryHost" Type="String" /> + </UpdateParameters> + </asp:ObjectDataSource> + <asp:GridView ID="GridView1" runat="server" AllowPaging="True" AllowSorting="True" + CellPadding="4" DataSourceID="MailDomainDataSource" ForeColor="#333333" GridLines="None"> + <FooterStyle BackColor="#507CD1" Font-Bold="True" ForeColor="White" /> + <Columns> + <asp:HyperLinkField DataNavigateUrlFields="Id" DataNavigateUrlFormatString="MailDomainDetails.aspx?MailDomainId={0}" + HeaderText="Details" Text="details" /> + </Columns> + <RowStyle BackColor="#EFF3FB" /> + <EditRowStyle BackColor="#2461BF" /> + <SelectedRowStyle BackColor="#D1DDF1" Font-Bold="True" ForeColor="#333333" /> + <PagerStyle BackColor="#2461BF" ForeColor="White" HorizontalAlign="Center" /> + <HeaderStyle BackColor="#507CD1" Font-Bold="True" ForeColor="White" /> + <AlternatingRowStyle BackColor="White" /> + </asp:GridView> +</asp:Content> + Added: NMail/branches/luke-dev/NMail.Administration.Web/ViewMailDomains.aspx.cs =================================================================== --- NMail/branches/luke-dev/NMail.Administration.Web/ViewMailDomains.aspx.cs (rev 0) +++ NMail/branches/luke-dev/NMail.Administration.Web/ViewMailDomains.aspx.cs 2006-05-30 10:25:50 UTC (rev 38) @@ -0,0 +1,26 @@ +using System; +using System.Data; +using System.Configuration; +using System.Collections; +using System.Collections.Generic; +using System.Web; +using System.Web.Security; +using System.Web.UI; +using System.Web.UI.WebControls; +using System.Web.UI.WebControls.WebParts; +using System.Web.UI.HtmlControls; + +using NMail; +using NMail.Authentication; +using NMail.DataTypes.LocalStore; + +public partial class ViewMailDomains : System.Web.UI.Page +{ + protected void Page_Load(object sender, EventArgs e) + { + if (!Request.IsAuthenticated) + { + Response.Redirect("Login.aspx"); + } + } +} Added: NMail/branches/luke-dev/NMail.Administration.Web/Web.sitemap =================================================================== --- NMail/branches/luke-dev/NMail.Administration.Web/Web.sitemap (rev 0) +++ NMail/branches/luke-dev/NMail.Administration.Web/Web.sitemap 2006-05-30 10:25:50 UTC (rev 38) @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="utf-8" ?> +<siteMap xmlns="http://schemas.microsoft.com/AspNet/SiteMap-File-1.0" > + <siteMapNode url="Default.aspx" title="Home" description=""> + <siteMapNode url="Login.aspx" title="Login" description="" /> + <siteMapNode url="ViewMailDomains.aspx" title="Mail Domains" description="" /> + </siteMapNode> +</siteMap> Added: NMail/branches/luke-dev/NMail.Administration.Web/web.config =================================================================== --- NMail/branches/luke-dev/NMail.Administration.Web/web.config (rev 0) +++ NMail/branches/luke-dev/NMail.Administration.Web/web.config 2006-05-30 10:25:50 UTC (rev 38) @@ -0,0 +1,58 @@ +<?xml version="1.0"?> +<!-- + Note: As an alternative to hand editing this file you can use the + web admin tool to configure settings for your application. Use + the Website->Asp.Net Configuration option in Visual Studio. + A full list of settings and comments can be found in + machine.config.comments usually located in + \Windows\Microsoft.Net\Framework\v2.x\Config +--> +<configuration xmlns="http://schemas.microsoft.com/.NetConfiguration/v2.0"> + <appSettings/> + <connectionStrings/> + <system.web> + <!-- + Set compilation debug="true" to insert debugging + symbols into the compiled page. Because this + affects performance, set this value to true only + during development. + --> + <compilation debug="true"> + <assemblies> + <add assembly="System.Runtime.Remoting, Version=2.0.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089"/></assemblies></compilation> + <!-- + The <authentication> section enables configuration + of the security authentication mode used by + ASP.NET to identify an incoming user. + --> + <authentication mode="Forms"> + <forms loginUrl="Login.aspx" + timeout="60" + protection="All" + slidingExpiration="true"/> + </authentication> + <!-- + The <customErrors> section enables configuration + of what to do if/when an unhandled error occurs + during the execution of a request. Specifically, + it enables developers to configure html error pages + to be displayed in place of a error stack trace. + + <customErrors mode="RemoteOnly" defaultRedirect="GenericErrorPage.htm"> + <error statusCode="403" redirect="NoAccess.htm" /> + <error statusCode="404" redirect="FileNotFound.htm" /> + </customErrors> + --> + </system.web> + + <!--<system.runtime.remoting> + <application> + <client> + <wellknown + type="NMail.Server.RemoteAdministration, NMail.Server" + url="tcp://localhost:7877/RemoteAdministration.rem" + /> + </client> + </application> + </system.runtime.remoting>--> +</configuration> Added: NMail/branches/luke-dev/NMail.Administration.Web.sln =================================================================== --- NMail/branches/luke-dev/NMail.Administration.Web.sln (rev 0) +++ NMail/branches/luke-dev/NMail.Administration.Web.sln 2006-05-30 10:25:50 UTC (rev 38) @@ -0,0 +1,35 @@ + +Microsoft Visual Studio Solution File, Format Version 9.00 +# Visual Web Developer Express 2005 +Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "C:\...\NMail.Administration.Web\", "NMail.Administration.Web\", "{C9095A2E-5198-49CA-B198-C6536A9143BD}" + ProjectSection(WebsiteProperties) = preProject + Debug.AspNetCompiler.VirtualPath = "/NMail.Administration.Web" + Debug.AspNetCompiler.PhysicalPath = "..\..\..\..\Desktop\NMail-trunk\branches\luke-dev\NMail.Administration.Web\" + Debug.AspNetCompiler.TargetPath = "PrecompiledWeb\NMail.Administration.Web\" + Debug.AspNetCompiler.Updateable = "true" + Debug.AspNetCompiler.ForceOverwrite = "true" + Debug.AspNetCompiler.FixedNames = "false" + Debug.AspNetCompiler.Debug = "True" + Release.AspNetCompiler.VirtualPath = "/NMail.Administration.Web" + Release.AspNetCompiler.PhysicalPath = "..\..\..\..\Desktop\NMail-trunk\branches\luke-dev\NMail.Administration.Web\" + Release.AspNetCompiler.TargetPath = "PrecompiledWeb\NMail.Administration.Web\" + Release.AspNetCompiler.Updateable = "true" + Release.AspNetCompiler.ForceOverwrite = "true" + Release.AspNetCompiler.FixedNames = "false" + Release.AspNetCompiler.Debug = "False" + VWDPort = "3245" + DefaultWebSiteLanguage = "Visual C#" + EndProjectSection +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|.NET = Debug|.NET + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {C9095A2E-5198-49CA-B198-C6536A9143BD}.Debug|.NET.ActiveCfg = Debug|.NET + {C9095A2E-5198-49CA-B198-C6536A9143BD}.Debug|.NET.Build.0 = Debug|.NET + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal Modified: NMail/branches/luke-dev/NMail.LocalStoreData.MySql/MySqlLocalStoreData.cs =================================================================== --- NMail/branches/luke-dev/NMail.LocalStoreData.MySql/MySqlLocalStoreData.cs 2006-05-20 15:56:30 UTC (rev 37) +++ NMail/branches/luke-dev/NMail.LocalStoreData.MySql/MySqlLocalStoreData.cs 2006-05-30 10:25:50 UTC (rev 38) @@ -40,7 +40,7 @@ /// <summary> /// A MySql based local store data provider. /// </summary> - public class MySqlLocalStoreData : ILocalStoreData, IHashAuthProvider, ILocalStoreUserMap { + public class MySqlLocalStoreData : MarshalByRefObject, ILocalStoreData, IHashAuthProvider, ILocalStoreUserMap { private MySqlConnection GetConnection() { MySqlConnection cnn = new MySqlConnection(MySqlLocalStoreDataConfiguration.Current.ConnectionString); cnn.Open(); Modified: NMail/branches/luke-dev/NMail.Server/NMailServer.cs =================================================================== --- NMail/branches/luke-dev/NMail.Server/NMailServer.cs 2006-05-20 15:56:30 UTC (rev 37) +++ NMail/branches/luke-dev/NMail.Server/NMailServer.cs 2006-05-30 10:25:50 UTC (rev 38) @@ -21,6 +21,7 @@ using log4net; +using NMail.Authentication; using NMail.Configuration; using NMail.DataTypes; @@ -308,5 +309,11 @@ return NMailConfiguration.Current.LocalStore; } } + + public IAuthenticationProvider AuthenticationProvider { + get { + return NMailConfiguration.Current.AuthenticationProvider; + } + } } } Modified: NMail/branches/luke-dev/NMail.Server/RemoteAdministration.cs =================================================================== --- NMail/branches/luke-dev/NMail.Server/RemoteAdministration.cs 2006-05-20 15:56:30 UTC (rev 37) +++ NMail/branches/luke-dev/NMail.Server/RemoteAdministration.cs 2006-05-30 10:25:50 UTC (rev 38) @@ -20,11 +20,11 @@ using System.Net.Security; using System.Runtime.Remoting; using System.Runtime.Remoting.Channels; +using System.Runtime.Remoting.Channels.Tcp; using System.Runtime.Serialization.Formatters; using System.Security.Cryptography.X509Certificates; using NMail.Configuration; -using NMail.IO; namespace NMail.Server { /// <summary> @@ -69,12 +69,12 @@ // Setup the remoting channel IDictionary props = new Hashtable(); props["port"] = "7877"; - props["isServer"] = "yes"; - props["certificate"] = new X509Certificate2("NMail.pfx", ""); - props["authProvider"] = NMailConfiguration.Current.AuthenticationProvider; -#if DEBUG - props["useTls"] = false; -#endif +// props["isServer"] = "yes"; +// props["certificate"] = new X509Certificate2("NMail.pfx", ""); +// props["authProvider"] = NMailConfiguration.Current.AuthenticationProvider; +//#if DEBUG +// props["useTls"] = false; +//#endif channel = new TcpChannel(props, null, provider); ChannelServices.RegisterChannel(channel, false); Modified: NMail/branches/luke-dev/NMail.sln =================================================================== --- NMail/branches/luke-dev/NMail.sln 2006-05-20 15:56:30 UTC (rev 37) +++ NMail/branches/luke-dev/NMail.sln 2006-05-30 10:25:50 UTC (rev 38) @@ -40,6 +40,8 @@ EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NMail.Administration.Console", "NMail.Administration.Console\NMail.Administration.Console.csproj", "{93F9B202-EB30-4FF8-B10F-BD45FD3B7E9F}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NMail.Administration.WebLib", "NMail.Administration.WebLib\NMail.Administration.WebLib.csproj", "{614C9689-45BE-4047-8D32-10D266C28E98}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -126,6 +128,10 @@ {93F9B202-EB30-4FF8-B10F-BD45FD3B7E9F}.Debug|Any CPU.Build.0 = Debug|Any CPU {93F9B202-EB30-4FF8-B10F-BD45FD3B7E9F}.Release|Any CPU.ActiveCfg = Release|Any CPU {93F9B202-EB30-4FF8-B10F-BD45FD3B7E9F}.Release|Any CPU.Build.0 = Release|Any CPU + {614C9689-45BE-4047-8D32-10D266C28E98}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {614C9689-45BE-4047-8D32-10D266C28E98}.Debug|Any CPU.Build.0 = Debug|Any CPU + {614C9689-45BE-4047-8D32-10D266C28E98}.Release|Any CPU.ActiveCfg = Release|Any CPU + {614C9689-45BE-4047-8D32-10D266C28E98}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
