Revision: 231
http://svn.sourceforge.net/nmailserver/?rev=231&view=rev
Author: tmyroadctfig
Date: 2007-06-17 02:43:57 -0700 (Sun, 17 Jun 2007)
Log Message:
-----------
Work the web admin site partially working again.
Modified Paths:
--------------
NMail/trunk/NMail.Administration.Web/App_Code/FolderDataSource.cs
NMail/trunk/NMail.Administration.Web/App_Code/MailDomainDataSource.cs
NMail/trunk/NMail.Administration.Web/App_Code/UserDataSource.cs
NMail/trunk/NMail.Administration.Web/App_Themes/Default/Default.skin
NMail/trunk/NMail.Administration.Web/App_Themes/Default/StyleSheet.css
NMail/trunk/NMail.Administration.Web/CreateFolder.aspx.cs
NMail/trunk/NMail.Administration.Web/CreateMailDomain.aspx.cs
NMail/trunk/NMail.Administration.Web/CreateUser.aspx.cs
NMail/trunk/NMail.Administration.Web/Default.aspx
NMail/trunk/NMail.Administration.Web/FolderDetails.aspx
NMail/trunk/NMail.Administration.Web/FolderDetails.aspx.cs
NMail/trunk/NMail.Administration.Web/Login.aspx
NMail/trunk/NMail.Administration.Web/Login.aspx.cs
NMail/trunk/NMail.Administration.Web/MailDomainDetails.aspx
NMail/trunk/NMail.Administration.Web/MailDomainDetails.aspx.cs
NMail/trunk/NMail.Administration.Web/MasterPage.master
NMail/trunk/NMail.Administration.Web/TaskList.ascx
NMail/trunk/NMail.Administration.Web/UserDetails.aspx
NMail/trunk/NMail.Administration.Web/UserDetails.aspx.cs
NMail/trunk/NMail.Administration.Web/ViewUsers.aspx
NMail/trunk/NMail.Administration.Web/Web.sitemap
NMail/trunk/NMail.Administration.Web/web.config
Added Paths:
-----------
NMail/trunk/NMail.Administration.Web/Bin/AjaxControlToolkit.dll
NMail/trunk/NMail.Administration.Web/Bin/NMail.LocalStoreData.NHibernate.dll.refresh
NMail/trunk/NMail.Administration.Web/Bin/ar/
NMail/trunk/NMail.Administration.Web/Bin/ar/AjaxControlToolkit.resources.dll
NMail/trunk/NMail.Administration.Web/Bin/cs/
NMail/trunk/NMail.Administration.Web/Bin/cs/AjaxControlToolkit.resources.dll
NMail/trunk/NMail.Administration.Web/Bin/de/
NMail/trunk/NMail.Administration.Web/Bin/de/AjaxControlToolkit.resources.dll
NMail/trunk/NMail.Administration.Web/Bin/es/
NMail/trunk/NMail.Administration.Web/Bin/es/AjaxControlToolkit.resources.dll
NMail/trunk/NMail.Administration.Web/Bin/fr/
NMail/trunk/NMail.Administration.Web/Bin/fr/AjaxControlToolkit.resources.dll
NMail/trunk/NMail.Administration.Web/Bin/he/
NMail/trunk/NMail.Administration.Web/Bin/he/AjaxControlToolkit.resources.dll
NMail/trunk/NMail.Administration.Web/Bin/hi/
NMail/trunk/NMail.Administration.Web/Bin/hi/AjaxControlToolkit.resources.dll
NMail/trunk/NMail.Administration.Web/Bin/it/
NMail/trunk/NMail.Administration.Web/Bin/it/AjaxControlToolkit.resources.dll
NMail/trunk/NMail.Administration.Web/Bin/ja/
NMail/trunk/NMail.Administration.Web/Bin/ja/AjaxControlToolkit.resources.dll
NMail/trunk/NMail.Administration.Web/Bin/ko/
NMail/trunk/NMail.Administration.Web/Bin/ko/AjaxControlToolkit.resources.dll
NMail/trunk/NMail.Administration.Web/Bin/pt/
NMail/trunk/NMail.Administration.Web/Bin/pt/AjaxControlToolkit.resources.dll
NMail/trunk/NMail.Administration.Web/Bin/ru/
NMail/trunk/NMail.Administration.Web/Bin/ru/AjaxControlToolkit.resources.dll
NMail/trunk/NMail.Administration.Web/Bin/zh-CHS/
NMail/trunk/NMail.Administration.Web/Bin/zh-CHS/AjaxControlToolkit.resources.dll
NMail/trunk/NMail.Administration.Web/Bin/zh-CHT/
NMail/trunk/NMail.Administration.Web/Bin/zh-CHT/AjaxControlToolkit.resources.dll
NMail/trunk/NMail.Administration.Web/Images/LGPL/
NMail/trunk/NMail.Administration.Web/Images/LGPL/22x22/
NMail/trunk/NMail.Administration.Web/Images/LGPL/22x22/CreateUser.png
NMail/trunk/NMail.Administration.Web/Images/LGPL/22x22/Folder.png
NMail/trunk/NMail.Administration.Web/Images/LGPL/22x22/Group.png
NMail/trunk/NMail.Administration.Web/Images/LGPL/22x22/Login.png
NMail/trunk/NMail.Administration.Web/Images/LGPL/22x22/MailDomain.png
NMail/trunk/NMail.Administration.Web/Images/LGPL/22x22/Question.png
NMail/trunk/NMail.Administration.Web/Images/LGPL/22x22/Spool.png
NMail/trunk/NMail.Administration.Web/Images/LGPL/22x22/User.png
NMail/trunk/NMail.Administration.Web/Images/LGPL/32x32/
NMail/trunk/NMail.Administration.Web/Images/LGPL/32x32/DeleteUser.png
NMail/trunk/NMail.Administration.Web/Images/LGPL/32x32/Error.png
NMail/trunk/NMail.Administration.Web/Images/LGPL/32x32/Folder.png
NMail/trunk/NMail.Administration.Web/Images/LGPL/32x32/Group.png
NMail/trunk/NMail.Administration.Web/Images/LGPL/32x32/Login.png
NMail/trunk/NMail.Administration.Web/Images/LGPL/32x32/Logout.png
NMail/trunk/NMail.Administration.Web/Images/LGPL/32x32/MailDomain.png
NMail/trunk/NMail.Administration.Web/Images/LGPL/32x32/Services.png
NMail/trunk/NMail.Administration.Web/Images/LGPL/32x32/Spool.png
NMail/trunk/NMail.Administration.Web/Images/LGPL/32x32/User.png
NMail/trunk/NMail.Administration.Web/Images/LGPL/LGPL.txt
NMail/trunk/NMail.Administration.Web/Images/down.png
NMail/trunk/NMail.Administration.Web/Images/up.png
Removed Paths:
-------------
NMail/trunk/NMail.Administration.Web/Images/Tango/
Modified: NMail/trunk/NMail.Administration.Web/App_Code/FolderDataSource.cs
===================================================================
--- NMail/trunk/NMail.Administration.Web/App_Code/FolderDataSource.cs 2007-06-16 15:54:29 UTC (rev 230)
+++ NMail/trunk/NMail.Administration.Web/App_Code/FolderDataSource.cs 2007-06-17 09:43:57 UTC (rev 231)
@@ -85,12 +85,22 @@
/// </summary>
/// <param name="folderId">The Id of the folder to delete.</param>
/// <returns>The result of the attempt to delete the folder.</returns>
- public static void DeleteFolder(int folderId)
+ public static LocalStoreFolderResult DeleteFolder(int folderId)
{
IHttpSessionState session = SessionStateUtility.GetHttpSessionStateFromContext(HttpContext.Current);
IAuthenticationToken authToken = (IAuthenticationToken)session["AuthToken"];
ILocalStore localStore = (ILocalStore)session["LocalStore"];
- localStore.DeleteFolder(authToken, folderId);
+
+ try
+ {
+ localStore.DeleteFolder(authToken, folderId);
+ }
+ catch (Exception)
+ {
+ return LocalStoreFolderResult.NotPermitted;
+ }
+
+ return LocalStoreFolderResult.OkSuccessful;
}
/// <summary>
@@ -98,12 +108,22 @@
/// </summary>
/// <param name="folderName">The name of the folder to create.</param>
/// <returns>The result of the attempt to create the folder.</returns>
- public static void CreateFolder(string folderName)
+ public static LocalStoreFolderResult CreateFolder(string folderName)
{
IHttpSessionState session = SessionStateUtility.GetHttpSessionStateFromContext(HttpContext.Current);
IAuthenticationToken authToken = (IAuthenticationToken)session["AuthToken"];
ILocalStore localStore = (ILocalStore)session["LocalStore"];
- localStore.CreateFolder(authToken, folderName);
+
+ try
+ {
+ localStore.CreateFolder(authToken, folderName);
+ }
+ catch (Exception)
+ {
+ return LocalStoreFolderResult.NotPermitted;
+ }
+
+ return LocalStoreFolderResult.OkSuccessful;
}
#endregion
@@ -383,4 +403,37 @@
}
}
#endregion
+
+ /// <summary>
+ /// Possible return results for local store folder operations.
+ /// </summary>
+ public enum LocalStoreFolderResult
+ {
+ /// <summary>
+ /// The operation was completed successfully.
+ /// </summary>
+ OkSuccessful = 0,
+
+ /// <summary>
+ /// The create or rename failed because a folder with the same name already existed.
+ /// </summary>
+ AlreadyExists = 1,
+
+ /// <summary>
+ /// The folder was not deleted because it contained child folders.
+ /// </summary>
+ HasChildren = 2,
+
+ /// <summary>
+ /// The operation failed because the source folder was not found on the server.
+ /// If the operation is on a subfolder that the user can't see due to permissions
+ /// this will be returned.
+ /// </summary>
+ NonExistent = 3,
+
+ /// <summary>
+ /// The user is not permitted to perform the operation.
+ /// </summary>
+ NotPermitted = 4
+ }
}
Modified: NMail/trunk/NMail.Administration.Web/App_Code/MailDomainDataSource.cs
===================================================================
--- NMail/trunk/NMail.Administration.Web/App_Code/MailDomainDataSource.cs 2007-06-16 15:54:29 UTC (rev 230)
+++ NMail/trunk/NMail.Administration.Web/App_Code/MailDomainDataSource.cs 2007-06-17 09:43:57 UTC (rev 231)
@@ -69,12 +69,22 @@
return null;
}
- public static void UpdateMailDomain(MailDomain updatedMailDomain)
+ public static LocalStoreMailDomainResult UpdateMailDomain(MailDomain updatedMailDomain)
{
IHttpSessionState session = SessionStateUtility.GetHttpSessionStateFromContext(HttpContext.Current);
IAuthenticationToken authToken = (IAuthenticationToken)session["AuthToken"];
ILocalStore localStore = (ILocalStore)session["LocalStore"];
- localStore.UpdateMailDomain(authToken, updatedMailDomain);
+
+ try
+ {
+ localStore.UpdateMailDomain(authToken, updatedMailDomain);
+ }
+ catch (Exception)
+ {
+ return LocalStoreMailDomainResult.NotPermitted;
+ }
+
+ return LocalStoreMailDomainResult.OkSuccessful;
}
public static void AddMailboxMapping(int mailDomainId, Type mappingType)
@@ -87,20 +97,40 @@
throw new NotImplementedException();
}
- public static void CreateMailDomain(Host primaryHost)
+ public static LocalStoreMailDomainResult CreateMailDomain(Host primaryHost)
{
IHttpSessionState session = SessionStateUtility.GetHttpSessionStateFromContext(HttpContext.Current);
IAuthenticationToken authToken = (IAuthenticationToken)session["AuthToken"];
ILocalStore localStore = (ILocalStore)session["LocalStore"];
- localStore.CreateMailDomain(authToken, new MailDomain(0, primaryHost));
+
+ try
+ {
+ localStore.CreateMailDomain(authToken, new MailDomain(0, primaryHost));
+ }
+ catch (Exception)
+ {
+ return LocalStoreMailDomainResult.NotPermitted;
+ }
+
+ return LocalStoreMailDomainResult.OkSuccessful;
}
- public static void DeleteMailDomain(int mailDomainId)
+ public static LocalStoreMailDomainResult DeleteMailDomain(int mailDomainId)
{
IHttpSessionState session = SessionStateUtility.GetHttpSessionStateFromContext(HttpContext.Current);
IAuthenticationToken authToken = (IAuthenticationToken)session["AuthToken"];
ILocalStore localStore = (ILocalStore)session["LocalStore"];
- localStore.DeleteMailDomain(authToken, mailDomainId);
+
+ try
+ {
+ localStore.DeleteMailDomain(authToken, mailDomainId);
+ }
+ catch (Exception)
+ {
+ return LocalStoreMailDomainResult.NotPermitted;
+ }
+
+ return LocalStoreMailDomainResult.OkSuccessful;
}
public static List<LocalStoreUser> GetMailDomainUsers(int mailDomainId)
@@ -121,7 +151,7 @@
return users;
}
- public static void AddUser(int mailDomainId, int userId)
+ public static LocalStoreMailDomainResult AddUser(int mailDomainId, int userId)
{
IHttpSessionState session = SessionStateUtility.GetHttpSessionStateFromContext(HttpContext.Current);
IAuthenticationToken authToken = (IAuthenticationToken)session["AuthToken"];
@@ -134,8 +164,17 @@
throw new ArgumentException("Invalid mail domain.");
}
- mailDomain.UserIds.Add(userId);
- localStore.UpdateMailDomain(authToken, mailDomain);
+ try
+ {
+ mailDomain.UserIds.Add(userId);
+ localStore.UpdateMailDomain(authToken, mailDomain);
+ }
+ catch (Exception)
+ {
+ return LocalStoreMailDomainResult.NotPermitted;
+ }
+
+ return LocalStoreMailDomainResult.OkSuccessful;
}
public static void RemoveUser(int mailDomainId, int userId)
@@ -166,4 +205,35 @@
return new List<ILocalStoreUserMap>(mailDomain.MailboxMappings);
}
}
+
+ /// <summary>
+ /// Possible return results for local store mail domain operations.
+ /// </summary>
+ public enum LocalStoreMailDomainResult
+ {
+ /// <summary>
+ /// The operation completed successfully.
+ /// </summary>
+ OkSuccessful = 0,
+
+ /// <summary>
+ /// A mail domain with the same primary host already exists.
+ /// </summary>
+ AlreadyExists = 1,
+
+ /// <summary>
+ /// No matching mail domain exists in the local store.
+ /// </summary>
+ NoSuchMailDomain = 2,
+
+ /// <summary>
+ /// The user is not permitted to perform the operation.
+ /// </summary>
+ NotPermitted = 3,
+
+ /// <summary>
+ /// The user doesn't exist in the mail domain.
+ /// </summary>
+ NoSuchUser = 4
+ }
}
Modified: NMail/trunk/NMail.Administration.Web/App_Code/UserDataSource.cs
===================================================================
--- NMail/trunk/NMail.Administration.Web/App_Code/UserDataSource.cs 2007-06-16 15:54:29 UTC (rev 230)
+++ NMail/trunk/NMail.Administration.Web/App_Code/UserDataSource.cs 2007-06-17 09:43:57 UTC (rev 231)
@@ -58,12 +58,22 @@
return localStore.GetUser(authToken, userId);
}
- public static void DeleteUser(int userId)
+ public static LocalStoreUserResult DeleteUser(int userId)
{
IHttpSessionState session = SessionStateUtility.GetHttpSessionStateFromContext(HttpContext.Current);
IAuthenticationToken authToken = (IAuthenticationToken)session["AuthToken"];
ILocalStore localStore = (ILocalStore)session["LocalStore"];
- localStore.DeleteUser(authToken, userId);
+
+ try
+ {
+ localStore.DeleteUser(authToken, userId);
+ }
+ catch (Exception ex)
+ {
+ return LocalStoreUserResult.UnkownError;
+ }
+
+ return LocalStoreUserResult.OkSuccessful;
}
public static List<StoreFolder> GetUserFolders(int userId)
@@ -75,7 +85,7 @@
return new List<StoreFolder>(localStore.GetUserFolders(authToken, userId));
}
- public static void CreateUesr(string Username, int? QuotaWarnLimit, int? QuotaHardLimit)
+ public static LocalStoreUserResult CreateUesr(string Username, int? QuotaWarnLimit, int? QuotaHardLimit)
{
IHttpSessionState session = SessionStateUtility.GetHttpSessionStateFromContext(HttpContext.Current);
IAuthenticationToken authToken = (IAuthenticationToken)session["AuthToken"];
@@ -84,7 +94,63 @@
user.Username = Username;
user.QuotaHardLimit = QuotaHardLimit;
user.QuotaWarnLimit = QuotaWarnLimit;
- localStore.CreateUser(authToken, user);
+
+ try
+ {
+ localStore.CreateUser(authToken, user);
+ }
+ catch (Exception ex)
+ {
+ return LocalStoreUserResult.UnkownError;
+ }
+
+ return LocalStoreUserResult.OkSuccessful;
}
}
+
+ /// <summary>
+ /// Possible return results for local store user operations.
+ /// </summary>
+ public enum LocalStoreUserResult
+ {
+ /// <summary>
+ /// The operation completed successfully.
+ /// </summary>
+ OkSuccessful = 0,
+
+ /// <summary>
+ /// A user with the same name already exists.
+ /// </summary>
+ AlreadyExists = 1,
+
+ /// <summary>
+ /// No matching user exists in the local store.
+ /// </summary>
+ NoSuchUser = 2,
+
+ /// <summary>
+ /// Cannot add or remove the user from the mail domain because it doens't exist.
+ /// </summary>
+ NoSuchMailDomain = 3,
+
+ /// <summary>
+ /// The user cannot be deleted because they still own folders.
+ /// </summary>
+ UserStillHasFolders = 4,
+
+ /// <summary>
+ /// The user is not permitted to perform the operation.
+ /// </summary>
+ NotPermitted = 5,
+
+ /// <summary>
+ /// The user cannot be created because there is existing folders with the same details.
+ /// </summary>
+ FoldersAlreadyExist = 6,
+
+ /// <summary>
+ /// An unknown error occurred trying to perform the operation.
+ /// </summary>
+ UnkownError = 7
+ }
}
Modified: NMail/trunk/NMail.Administration.Web/App_Themes/Default/Default.skin
===================================================================
--- NMail/trunk/NMail.Administration.Web/App_Themes/Default/Default.skin 2007-06-16 15:54:29 UTC (rev 230)
+++ NMail/trunk/NMail.Administration.Web/App_Themes/Default/Default.skin 2007-06-17 09:43:57 UTC (rev 231)
@@ -1,6 +1,6 @@
<asp:SiteMapPath runat="server" Font-Size="smaller" />
-<asp:LoginStatus runat="server" Font-Size="smaller" />
+<asp:LoginStatus runat="server" Font-Size="smaller" SkinId="LocationBar" />
<asp:DetailsView runat="server" CellPadding="4" ForeColor="#333333" GridLines="None">
<CommandRowStyle BackColor="#aaaaaa" Font-Bold="True" />
Modified: NMail/trunk/NMail.Administration.Web/App_Themes/Default/StyleSheet.css
===================================================================
--- NMail/trunk/NMail.Administration.Web/App_Themes/Default/StyleSheet.css 2007-06-16 15:54:29 UTC (rev 230)
+++ NMail/trunk/NMail.Administration.Web/App_Themes/Default/StyleSheet.css 2007-06-17 09:43:57 UTC (rev 231)
@@ -1,22 +1,50 @@
body
{
font-family: Sans-Serif;
+ height: 100%;
}
+html
+{
+ height: 99%;
+}
-A:link
+a
{
+ color: black;
+ text-decoration: none;
+}
+
+a:link
+{
color: Blue;
}
-A:visited
+a:visited
{
color: #101070;
}
+a:hover
+{
+ text-decoration: underline;
+}
+
+img
+{
+ border-top-style: none;
+ border-right-style: none;
+ border-left-style: none;
+ border-bottom-style: none;
+}
+
+h1
+{
+ font-size: x-large;
+}
+
.title
{
font-size: 24pt;
- color: white;
font-family: Tahoma, Arial, Sans-Serif;
padding: 0px;
margin: 0px;
@@ -27,15 +55,18 @@
font-weight: bold;
font-style: italic;
font-size: 24pt;
- color: white;
font-family: Tahoma, Arial, Sans-Serif;
padding: 0px;
margin: 0px;
+ padding-right: 1em;
+ padding-left: 0px;
+ padding-bottom: 0px;
+ padding-top: 0px;
}
.title-box
{
- background-color: #123785;
+ background-color: #7FAEFF;
border-top: black thin solid;
border-bottom: black thin solid;
padding: 0.5em;
@@ -43,7 +74,7 @@
.status-box
{
- background-color: #666666;
+ background-color: #cccccc;
border-bottom: black thin solid;
padding-left: 0.5em;
padding-right: 0.5em;
@@ -51,7 +82,7 @@
.side-bar
{
- background-color: #cccccc;
+ background-color: #B5B5B5;
border-right: black thin solid;
vertical-align: top;
height: 100%;
@@ -76,4 +107,22 @@
{
background-color: white;
padding: 4px;
+}
+
+.CollapsibleHeader
+{
+ background-color: #cccccc;
+ font-weight: bold;
+ margin-top: 1em;
+}
+
+.CollapsiblePanel
+{
+ background-color: #E2E2E2;
+ margin-bottom: 1em;
+}
+
+.CollapsibleImage
+{
+ text-align: right;
}
\ No newline at end of file
Added: NMail/trunk/NMail.Administration.Web/Bin/AjaxControlToolkit.dll
===================================================================
(Binary files differ)
Property changes on: NMail/trunk/NMail.Administration.Web/Bin/AjaxControlToolkit.dll
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: NMail/trunk/NMail.Administration.Web/Bin/NMail.LocalStoreData.NHibernate.dll.refresh
===================================================================
(Binary files differ)
Property changes on: NMail/trunk/NMail.Administration.Web/Bin/NMail.LocalStoreData.NHibernate.dll.refresh
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: NMail/trunk/NMail.Administration.Web/Bin/ar/AjaxControlToolkit.resources.dll
===================================================================
(Binary files differ)
Property changes on: NMail/trunk/NMail.Administration.Web/Bin/ar/AjaxControlToolkit.resources.dll
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: NMail/trunk/NMail.Administration.Web/Bin/cs/AjaxControlToolkit.resources.dll
===================================================================
(Binary files differ)
Property changes on: NMail/trunk/NMail.Administration.Web/Bin/cs/AjaxControlToolkit.resources.dll
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: NMail/trunk/NMail.Administration.Web/Bin/de/AjaxControlToolkit.resources.dll
===================================================================
(Binary files differ)
Property changes on: NMail/trunk/NMail.Administration.Web/Bin/de/AjaxControlToolkit.resources.dll
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: NMail/trunk/NMail.Administration.Web/Bin/es/AjaxControlToolkit.resources.dll
===================================================================
(Binary files differ)
Property changes on: NMail/trunk/NMail.Administration.Web/Bin/es/AjaxControlToolkit.resources.dll
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: NMail/trunk/NMail.Administration.Web/Bin/fr/AjaxControlToolkit.resources.dll
===================================================================
(Binary files differ)
Property changes on: NMail/trunk/NMail.Administration.Web/Bin/fr/AjaxControlToolkit.resources.dll
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: NMail/trunk/NMail.Administration.Web/Bin/he/AjaxControlToolkit.resources.dll
===================================================================
(Binary files differ)
Property changes on: NMail/trunk/NMail.Administration.Web/Bin/he/AjaxControlToolkit.resources.dll
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: NMail/trunk/NMail.Administration.Web/Bin/hi/AjaxControlToolkit.resources.dll
===================================================================
(Binary files differ)
Property changes on: NMail/trunk/NMail.Administration.Web/Bin/hi/AjaxControlToolkit.resources.dll
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: NMail/trunk/NMail.Administration.Web/Bin/it/AjaxControlToolkit.resources.dll
===================================================================
(Binary files differ)
Property changes on: NMail/trunk/NMail.Administration.Web/Bin/it/AjaxControlToolkit.resources.dll
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: NMail/trunk/NMail.Administration.Web/Bin/ja/AjaxControlToolkit.resources.dll
===================================================================
(Binary files differ)
Property changes on: NMail/trunk/NMail.Administration.Web/Bin/ja/AjaxControlToolkit.resources.dll
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: NMail/trunk/NMail.Administration.Web/Bin/ko/AjaxControlToolkit.resources.dll
===================================================================
(Binary files differ)
Property changes on: NMail/trunk/NMail.Administration.Web/Bin/ko/AjaxControlToolkit.resources.dll
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: NMail/trunk/NMail.Administration.Web/Bin/pt/AjaxControlToolkit.resources.dll
===================================================================
(Binary files differ)
Property changes on: NMail/trunk/NMail.Administration.Web/Bin/pt/AjaxControlToolkit.resources.dll
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: NMail/trunk/NMail.Administration.Web/Bin/ru/AjaxControlToolkit.resources.dll
===================================================================
(Binary files differ)
Property changes on: NMail/trunk/NMail.Administration.Web/Bin/ru/AjaxControlToolkit.resources.dll
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: NMail/trunk/NMail.Administration.Web/Bin/zh-CHS/AjaxControlToolkit.resources.dll
===================================================================
(Binary files differ)
Property changes on: NMail/trunk/NMail.Administration.Web/Bin/zh-CHS/AjaxControlToolkit.resources.dll
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: NMail/trunk/NMail.Administration.Web/Bin/zh-CHT/AjaxControlToolkit.resources.dll
===================================================================
(Binary files differ)
Property changes on: NMail/trunk/NMail.Administration.Web/Bin/zh-CHT/AjaxControlToolkit.resources.dll
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: NMail/trunk/NMail.Administration.Web/CreateFolder.aspx.cs
===================================================================
--- NMail/trunk/NMail.Administration.Web/CreateFolder.aspx.cs 2007-06-16 15:54:29 UTC (rev 230)
+++ NMail/trunk/NMail.Administration.Web/CreateFolder.aspx.cs 2007-06-17 09:43:57 UTC (rev 231)
@@ -37,12 +37,12 @@
case LocalStoreFolderResult.AlreadyExists:
this.StatusMessage.Text = string.Format("Folder \"{0}\" already exists.", this.folderName);
- this.StatusImage.ImageUrl = Request.ApplicationPath + @"/Images/Tango/Error.png";
+ this.StatusImage.ImageUrl = Request.ApplicationPath + @"/Images/LGPL/32x32/Error.png";
break;
default:
this.StatusMessage.Text = string.Format("Unknown error occured while attempting to create the folder \"{0}\": {1}", this.folderName, result.ToString());
- this.StatusImage.ImageUrl = Request.ApplicationPath + @"/Images/Tango/Error.png";
+ this.StatusImage.ImageUrl = Request.ApplicationPath + @"/Images/LGPL/32x32/Error.png";
break;
}
Modified: NMail/trunk/NMail.Administration.Web/CreateMailDomain.aspx.cs
===================================================================
--- NMail/trunk/NMail.Administration.Web/CreateMailDomain.aspx.cs 2007-06-16 15:54:29 UTC (rev 230)
+++ NMail/trunk/NMail.Administration.Web/CreateMailDomain.aspx.cs 2007-06-17 09:43:57 UTC (rev 231)
@@ -48,12 +48,12 @@
case LocalStoreMailDomainResult.AlreadyExists:
this.StatusMessage.Text = string.Format("Mail domain \"{0}\" already exists.", hostName);
- this.StatusImage.ImageUrl = Request.ApplicationPath + @"/Images/Tango/Error.png";
+ this.StatusImage.ImageUrl = Request.ApplicationPath + @"/Images/LGPL/32x32/Error.png";
break;
default:
this.StatusMessage.Text = string.Format("Unknown error occured while attempting to create mail domain \"{0}\": {1}", hostName, result.ToString());
- this.StatusImage.ImageUrl = Request.ApplicationPath + @"/Images/Tango/Error.png";
+ this.StatusImage.ImageUrl = Request.ApplicationPath + @"/Images/LGPL/32x32/Error.png";
break;
}
Modified: NMail/trunk/NMail.Administration.Web/CreateUser.aspx.cs
===================================================================
--- NMail/trunk/NMail.Administration.Web/CreateUser.aspx.cs 2007-06-16 15:54:29 UTC (rev 230)
+++ NMail/trunk/NMail.Administration.Web/CreateUser.aspx.cs 2007-06-17 09:43:57 UTC (rev 231)
@@ -37,12 +37,12 @@
case LocalStoreUserResult.AlreadyExists:
this.StatusMessage.Text = string.Format("User \"{0}\" already exists.", this.username);
- this.StatusImage.ImageUrl = Request.ApplicationPath + @"/Images/Tango/Error.png";
+ this.StatusImage.ImageUrl = Request.ApplicationPath + @"/Images/LGPL/32x32/Error.png";
break;
default:
this.StatusMessage.Text = string.Format("Unknown error occured while attempting to create the user \"{0}\": {1}", username, result.ToString());
- this.StatusImage.ImageUrl = Request.ApplicationPath + @"/Images/Tango/Error.png";
+ this.StatusImage.ImageUrl = Request.ApplicationPath + @"/Images/LGPL/32x32/Error.png";
break;
}
Modified: NMail/trunk/NMail.Administration.Web/Default.aspx
===================================================================
--- NMail/trunk/NMail.Administration.Web/Default.aspx 2007-06-16 15:54:29 UTC (rev 230)
+++ NMail/trunk/NMail.Administration.Web/Default.aspx 2007-06-17 09:43:57 UTC (rev 231)
@@ -1,6 +1,57 @@
<%@ Page Language="C#" MasterPageFile="~/MasterPage.master" Title="Untitled Page" %>
<asp:Content ID="Content" ContentPlaceHolderID="ContentPlaceHolder" Runat="Server">
- Welcome to the NMail administration website.
+ <p>
+ <img src="Images/LGPL/32x32/User.png" />
+ You are currently logged in as "<asp:LoginName ID="LoginName" runat="server" />".
+ </p>
+
+ <p>
+ Welcome to the NMail administration website. You can now perform the following:
+ </p>
+
+ <div style="padding-left: 2em">
+ <p>
+ <a href="">
+ <img src="Images/LGPL/32x32/Services.png"/> Manage services.
+ </a>
+ </p>
+
+ <p>
+ <a href="SpoolDetails.aspx">
+ <img src="Images/LGPL/32x32/Spool.png"/> Manage the outgoing message spool.
+ </a>
+ </p>
+
+ <p>
+ <a href="ViewMailDomains.aspx">
+ <img src="Images/LGPL/32x32/MailDomain.png"/> Manage mail domains.
+ </a>
+ </p>
+
+ <p>
+ <a href="ViewUsers.aspx">
+ <img src="Images/LGPL/32x32/User.png"/> Manage users.
+ </a>
+ </p>
+
+ <p>
+ <a href="">
+ <img src="Images/LGPL/32x32/Group.png"/> Manage groups.
+ </a>
+ </p>
+
+ <p>
+ <a href="ViewFolders.aspx">
+ <img src="Images/LGPL/32x32/Folder.png"/> Manage folders.
+ </a>
+ </p>
+
+ <p>
+ <a href="">
+ <img src="Images/LGPL/32x32/Logout.png"/> <asp:LoginStatus ID="LoginStatus1" runat="server" />.
+ </a>
+ </p>
+ </div>
</asp:Content>
Modified: NMail/trunk/NMail.Administration.Web/FolderDetails.aspx
===================================================================
--- NMail/trunk/NMail.Administration.Web/FolderDetails.aspx 2007-06-16 15:54:29 UTC (rev 230)
+++ NMail/trunk/NMail.Administration.Web/FolderDetails.aspx 2007-06-17 09:43:57 UTC (rev 231)
@@ -6,7 +6,7 @@
<asp:Panel ID="ConfirmPanel" runat="server" Visible="false">
<br />
<div style="border-right: black thin solid; padding-right: 0.5em; border-top: black thin solid; padding-left: 0.5em; padding-bottom: 0.5em; border-left: black thin solid; color: red; padding-top: 0.5em; border-bottom: black thin solid;">
- <img src="Images/Tango/Question.png" />
+ <img src="Images/LGPL/32x32/Question.png" />
Really delete this folder?
<asp:Button ID="yesBtn" runat="server" Text="Yes" OnClick="yesBtn_Click" />
<asp:Button ID="noBtn" runat="server" Text="No" OnClick="noBtn_Click" /></div>
Modified: NMail/trunk/NMail.Administration.Web/FolderDetails.aspx.cs
===================================================================
--- NMail/trunk/NMail.Administration.Web/FolderDetails.aspx.cs 2007-06-16 15:54:29 UTC (rev 230)
+++ NMail/trunk/NMail.Administration.Web/FolderDetails.aspx.cs 2007-06-17 09:43:57 UTC (rev 231)
@@ -9,6 +9,7 @@
using System.Web.UI.WebControls.WebParts;
using System.Web.UI.HtmlControls;
+using NMail.Administration.Web;
using NMail.DataTypes.ACLs;
using NMail.DataTypes.LocalStore;
@@ -45,17 +46,17 @@
case LocalStoreFolderResult.HasChildren:
this.StatusMessage.Text = "Cannot delete the folder because it still has sub-folders.";
- this.StatusImage.ImageUrl = Request.ApplicationPath + @"/Images/Tango/Error.png";
+ this.StatusImage.ImageUrl = Request.ApplicationPath + @"/Images/LGPL/32x32/Error.png";
break;
case LocalStoreFolderResult.NotPermitted:
this.StatusMessage.Text = "You are not permitted to delete this folder.";
- this.StatusImage.ImageUrl = Request.ApplicationPath + @"/Images/Tango/Error.png";
+ this.StatusImage.ImageUrl = Request.ApplicationPath + @"/Images/LGPL/32x32/Error.png";
break;
default:
this.StatusMessage.Text = string.Format("Unknown error occured while attempting to delete the folder: {0}", result.ToString());
- this.StatusImage.ImageUrl = Request.ApplicationPath + @"/Images/Tango/Error.png";
+ this.StatusImage.ImageUrl = Request.ApplicationPath + @"/Images/LGPL/32x32/Error.png";
break;
}
Added: NMail/trunk/NMail.Administration.Web/Images/LGPL/22x22/CreateUser.png
===================================================================
(Binary files differ)
Property changes on: NMail/trunk/NMail.Administration.Web/Images/LGPL/22x22/CreateUser.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: NMail/trunk/NMail.Administration.Web/Images/LGPL/22x22/Folder.png
===================================================================
(Binary files differ)
Property changes on: NMail/trunk/NMail.Administration.Web/Images/LGPL/22x22/Folder.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: NMail/trunk/NMail.Administration.Web/Images/LGPL/22x22/Group.png
===================================================================
(Binary files differ)
Property changes on: NMail/trunk/NMail.Administration.Web/Images/LGPL/22x22/Group.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: NMail/trunk/NMail.Administration.Web/Images/LGPL/22x22/Login.png
===================================================================
(Binary files differ)
Property changes on: NMail/trunk/NMail.Administration.Web/Images/LGPL/22x22/Login.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: NMail/trunk/NMail.Administration.Web/Images/LGPL/22x22/MailDomain.png
===================================================================
(Binary files differ)
Property changes on: NMail/trunk/NMail.Administration.Web/Images/LGPL/22x22/MailDomain.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: NMail/trunk/NMail.Administration.Web/Images/LGPL/22x22/Question.png
===================================================================
(Binary files differ)
Property changes on: NMail/trunk/NMail.Administration.Web/Images/LGPL/22x22/Question.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: NMail/trunk/NMail.Administration.Web/Images/LGPL/22x22/Spool.png
===================================================================
(Binary files differ)
Property changes on: NMail/trunk/NMail.Administration.Web/Images/LGPL/22x22/Spool.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: NMail/trunk/NMail.Administration.Web/Images/LGPL/22x22/User.png
===================================================================
(Binary files differ)
Property changes on: NMail/trunk/NMail.Administration.Web/Images/LGPL/22x22/User.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: NMail/trunk/NMail.Administration.Web/Images/LGPL/32x32/DeleteUser.png
===================================================================
(Binary files differ)
Property changes on: NMail/trunk/NMail.Administration.Web/Images/LGPL/32x32/DeleteUser.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: NMail/trunk/NMail.Administration.Web/Images/LGPL/32x32/Error.png
===================================================================
(Binary files differ)
Property changes on: NMail/trunk/NMail.Administration.Web/Images/LGPL/32x32/Error.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: NMail/trunk/NMail.Administration.Web/Images/LGPL/32x32/Folder.png
===================================================================
(Binary files differ)
Property changes on: NMail/trunk/NMail.Administration.Web/Images/LGPL/32x32/Folder.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: NMail/trunk/NMail.Administration.Web/Images/LGPL/32x32/Group.png
===================================================================
(Binary files differ)
Property changes on: NMail/trunk/NMail.Administration.Web/Images/LGPL/32x32/Group.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: NMail/trunk/NMail.Administration.Web/Images/LGPL/32x32/Login.png
===================================================================
(Binary files differ)
Property changes on: NMail/trunk/NMail.Administration.Web/Images/LGPL/32x32/Login.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: NMail/trunk/NMail.Administration.Web/Images/LGPL/32x32/Logout.png
===================================================================
(Binary files differ)
Property changes on: NMail/trunk/NMail.Administration.Web/Images/LGPL/32x32/Logout.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: NMail/trunk/NMail.Administration.Web/Images/LGPL/32x32/MailDomain.png
===================================================================
(Binary files differ)
Property changes on: NMail/trunk/NMail.Administration.Web/Images/LGPL/32x32/MailDomain.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: NMail/trunk/NMail.Administration.Web/Images/LGPL/32x32/Services.png
===================================================================
(Binary files differ)
Property changes on: NMail/trunk/NMail.Administration.Web/Images/LGPL/32x32/Services.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: NMail/trunk/NMail.Administration.Web/Images/LGPL/32x32/Spool.png
===================================================================
(Binary files differ)
Property changes on: NMail/trunk/NMail.Administration.Web/Images/LGPL/32x32/Spool.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: NMail/trunk/NMail.Administration.Web/Images/LGPL/32x32/User.png
===================================================================
(Binary files differ)
Property changes on: NMail/trunk/NMail.Administration.Web/Images/LGPL/32x32/User.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: NMail/trunk/NMail.Administration.Web/Images/LGPL/LGPL.txt
===================================================================
--- NMail/trunk/NMail.Administration.Web/Images/LGPL/LGPL.txt (rev 0)
+++ NMail/trunk/NMail.Administration.Web/Images/LGPL/LGPL.txt 2007-06-17 09:43:57 UTC (rev 231)
@@ -0,0 +1,504 @@
+ GNU LESSER GENERAL PUBLIC LICENSE
+ Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL. It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+ This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it. You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.
+
+ When we speak of free software, we are referring to freedom of use,
+not price. Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+ To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights. These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+ For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you. You must make sure that they, too, receive or can get the source
+code. If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it. And you must show them these terms so they know their rights.
+
+ We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+ To protect each distributor, we want to make it very clear that
+there is no warranty for the free library. Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+
+ Finally, software patents pose a constant threat to the existence of
+any free program. We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder. Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+ Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License. This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License. We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+ When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library. The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom. The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+ We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License. It also provides other free software developers Less
+of an advantage over competing non-free programs. These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries. However, the Lesser license provides advantages in certain
+special circumstances.
+
+ For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard. To achieve this, non-free programs must be
+allowed to use the library. A more frequent case is that a free
+library does the same job as widely used non-free libraries. In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+ In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software. For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+ Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+ The precise terms and conditions for copying, distribution and
+modification follow. Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library". The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+
+ GNU LESSER GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+ A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+ The "Library", below, refers to any such software library or work
+which has been distributed under these terms. A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language. (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+ "Source code" for a work means the preferred form of the work for
+making modifications to it. For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+ Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it). Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+
+ 1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+ You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+ 2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ a) The modified work must itself be a software library.
+
+ b) You must cause the files modified to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ c) You must cause the whole of the work to be licensed at no
+ charge to all third parties under the terms of this License.
+
+ d) If a facility in the modified Library refers to a function or a
+ table of data to be supplied by an application program that uses
+ the facility, other than as an argument passed when the facility
+ is invoked, then you must make a good faith effort to ensure that,
+ in the event an application does not supply such function or
+ table, the facility still operates, and performs whatever part of
+ its purpose remains meaningful.
+
+ (For example, a function in a library to compute square roots has
+ a purpose that is entirely well-defined independent of the
+ application. Therefore, Subsection 2d requires that any
+ application-supplied function or table used by this function must
+ be optional: if the application does not supply it, the square
+ root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library. To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License. (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.) Do not make any other change in
+these notices.
+
+ Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+ This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+ 4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+ If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+ 5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library". Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+ However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library". The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+ When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library. The
+threshold for this to be true is not precisely defined by law.
+
+ If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work. (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+ Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+ 6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+ You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License. You must supply a copy of this License. If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License. Also, you must do one
+of these things:
+
+ a) Accompany the work with the complete corresponding
+ machine-readable source code for the Library including whatever
+ changes were used in the work (which must be distributed under
+ Sections 1 and 2 above); and, if the work is an executable linked
+ with the Library, with the complete machine-readable "work that
+ uses the Library", as object code and/or source code, so that the
+ user can modify the Library and then relink to produce a modified
+ executable containing the modified Library. (It is understood
+ that the user who changes the contents of definitions files in the
+ Library will not necessarily be able to recompile the application
+ to use the modified definitions.)
+
+ b) Use a suitable shared library mechanism for linking with the
+ Library. A suitable mechanism is one that (1) uses at run time a
+ copy of the library already present on the user's computer system,
+ rather than copying library functions into the executable, and (2)
+ will operate properly with a modified version of the library, if
+ the user installs one, as long as the modified version is
+ interface-compatible with the version that the work was made with.
+
+ c) Accompany the work with a written offer, valid for at
+ least three years, to give the same user the materials
+ specified in Subsection 6a, above, for a charge no more
+ than the cost of performing this distribution.
+
+ d) If distribution of the work is made by offering access to copy
+ from a designated place, offer equivalent access to copy the above
+ specified materials from the same place.
+
+ e) Verify that the user has already received a copy of these
+ materials or that you have already sent this user a copy.
+
+ For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it. However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+ It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system. Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+ 7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+ a) Accompany the combined library with a copy of the same work
+ based on the Library, uncombined with any other library
+ facilities. This must be distributed under the terms of the
+ Sections above.
+
+ b) Give prominent notice with the combined library of the fact
+ that part of it is a work based on the Library, and explaining
+ where to find the accompanying uncombined form of the same work.
+
+ 8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License. Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License. However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+ 9. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Library or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+ 10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+
+ 11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all. For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this se...
[truncated message content] |