organization general settings added

WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Client/OrganizationProxy.cs

@@ -36,6 +36,10 @@ namespace WebsitePanel.EnterpriseServer.HostedSolution {
     [System.Xml.Serialization.XmlIncludeAttribute(typeof(ServiceProviderItem))]
     public partial class esOrganizations : Microsoft.Web.Services3.WebServicesClientProtocol {
         
+        private System.Threading.SendOrPostCallback UpdateOrganizationGeneralSettingsOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback GetOrganizationGeneralSettingsOperationCompleted;
+        
         private System.Threading.SendOrPostCallback UpdateOrganizationPasswordSettingsOperationCompleted;
         
         private System.Threading.SendOrPostCallback GetOrganizationPasswordSettingsOperationCompleted;
@@ -149,6 +153,12 @@ namespace WebsitePanel.EnterpriseServer.HostedSolution {
             this.Url = "http://localhost:9002/esOrganizations.asmx";
         }
         
+        /// <remarks/>
+        public event UpdateOrganizationGeneralSettingsCompletedEventHandler UpdateOrganizationGeneralSettingsCompleted;
+        
+        /// <remarks/>
+        public event GetOrganizationGeneralSettingsCompletedEventHandler GetOrganizationGeneralSettingsCompleted;
+        
         /// <remarks/>
         public event UpdateOrganizationPasswordSettingsCompletedEventHandler UpdateOrganizationPasswordSettingsCompleted;
         
@@ -311,6 +321,89 @@ namespace WebsitePanel.EnterpriseServer.HostedSolution {
         /// <remarks/>
         public event GetSupportServiceLevelCompletedEventHandler GetSupportServiceLevelCompleted;
         
+        /// <remarks/>
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/UpdateOrganizationGeneralSettings", RequestNamespace="http://tempuri.org/", ResponseNamespace="http://tempuri.org/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public void UpdateOrganizationGeneralSettings(int itemId, OrganizationGeneralSettings settings) {
+            this.Invoke("UpdateOrganizationGeneralSettings", new object[] {
+                        itemId,
+                        settings});
+        }
+        
+        /// <remarks/>
+        public System.IAsyncResult BeginUpdateOrganizationGeneralSettings(int itemId, OrganizationGeneralSettings settings, System.AsyncCallback callback, object asyncState) {
+            return this.BeginInvoke("UpdateOrganizationGeneralSettings", new object[] {
+                        itemId,
+                        settings}, callback, asyncState);
+        }
+        
+        /// <remarks/>
+        public void EndUpdateOrganizationGeneralSettings(System.IAsyncResult asyncResult) {
+            this.EndInvoke(asyncResult);
+        }
+        
+        /// <remarks/>
+        public void UpdateOrganizationGeneralSettingsAsync(int itemId, OrganizationGeneralSettings settings) {
+            this.UpdateOrganizationGeneralSettingsAsync(itemId, settings, null);
+        }
+        
+        /// <remarks/>
+        public void UpdateOrganizationGeneralSettingsAsync(int itemId, OrganizationGeneralSettings settings, object userState) {
+            if ((this.UpdateOrganizationGeneralSettingsOperationCompleted == null)) {
+                this.UpdateOrganizationGeneralSettingsOperationCompleted = new System.Threading.SendOrPostCallback(this.OnUpdateOrganizationGeneralSettingsOperationCompleted);
+            }
+            this.InvokeAsync("UpdateOrganizationGeneralSettings", new object[] {
+                        itemId,
+                        settings}, this.UpdateOrganizationGeneralSettingsOperationCompleted, userState);
+        }
+        
+        private void OnUpdateOrganizationGeneralSettingsOperationCompleted(object arg) {
+            if ((this.UpdateOrganizationGeneralSettingsCompleted != null)) {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.UpdateOrganizationGeneralSettingsCompleted(this, new System.ComponentModel.AsyncCompletedEventArgs(invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+        
+        /// <remarks/>
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/GetOrganizationGeneralSettings", RequestNamespace="http://tempuri.org/", ResponseNamespace="http://tempuri.org/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public OrganizationGeneralSettings GetOrganizationGeneralSettings(int itemId) {
+            object[] results = this.Invoke("GetOrganizationGeneralSettings", new object[] {
+                        itemId});
+            return ((OrganizationGeneralSettings)(results[0]));
+        }
+        
+        /// <remarks/>
+        public System.IAsyncResult BeginGetOrganizationGeneralSettings(int itemId, System.AsyncCallback callback, object asyncState) {
+            return this.BeginInvoke("GetOrganizationGeneralSettings", new object[] {
+                        itemId}, callback, asyncState);
+        }
+        
+        /// <remarks/>
+        public OrganizationGeneralSettings EndGetOrganizationGeneralSettings(System.IAsyncResult asyncResult) {
+            object[] results = this.EndInvoke(asyncResult);
+            return ((OrganizationGeneralSettings)(results[0]));
+        }
+        
+        /// <remarks/>
+        public void GetOrganizationGeneralSettingsAsync(int itemId) {
+            this.GetOrganizationGeneralSettingsAsync(itemId, null);
+        }
+        
+        /// <remarks/>
+        public void GetOrganizationGeneralSettingsAsync(int itemId, object userState) {
+            if ((this.GetOrganizationGeneralSettingsOperationCompleted == null)) {
+                this.GetOrganizationGeneralSettingsOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetOrganizationGeneralSettingsOperationCompleted);
+            }
+            this.InvokeAsync("GetOrganizationGeneralSettings", new object[] {
+                        itemId}, this.GetOrganizationGeneralSettingsOperationCompleted, userState);
+        }
+        
+        private void OnGetOrganizationGeneralSettingsOperationCompleted(object arg) {
+            if ((this.GetOrganizationGeneralSettingsCompleted != null)) {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.GetOrganizationGeneralSettingsCompleted(this, new GetOrganizationGeneralSettingsCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+        
         /// <remarks/>
         [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/UpdateOrganizationPasswordSettings", RequestNamespace="http://tempuri.org/", ResponseNamespace="http://tempuri.org/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
         public void UpdateOrganizationPasswordSettings(int itemId, OrganizationPasswordSettings settings) {
@@ -3029,6 +3122,36 @@ namespace WebsitePanel.EnterpriseServer.HostedSolution {
         }
     }
     
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    public delegate void UpdateOrganizationGeneralSettingsCompletedEventHandler(object sender, System.ComponentModel.AsyncCompletedEventArgs e);
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    public delegate void GetOrganizationGeneralSettingsCompletedEventHandler(object sender, GetOrganizationGeneralSettingsCompletedEventArgs e);
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class GetOrganizationGeneralSettingsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+        private object[] results;
+        
+        internal GetOrganizationGeneralSettingsCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
+            this.results = results;
+        }
+        
+        /// <remarks/>
+        public OrganizationGeneralSettings Result {
+            get {
+                this.RaiseExceptionIfNecessary();
+                return ((OrganizationGeneralSettings)(this.results[0]));
+            }
+        }
+    }
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
     public delegate void UpdateOrganizationPasswordSettingsCompletedEventHandler(object sender, System.ComponentModel.AsyncCompletedEventArgs e);

WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/HostedSolution/OrganizationController.cs

@@ -1685,6 +1685,40 @@ namespace WebsitePanel.EnterpriseServer
             return GetOrganizationSettings<OrganizationPasswordSettings>(itemId, OrganizationSettings.PasswordSettings);
         }
 
+        public static void UpdateOrganizationGeneralSettings(int itemId, OrganizationGeneralSettings settings)
+        {
+            TaskManager.StartTask("ORGANIZATION", "UPDATE_GENERAL_SETTINGS");
+
+            try
+            {
+                // load organization
+                Organization org = GetOrganization(itemId);
+
+                if (org == null)
+                {
+                    TaskManager.WriteWarning("Organization with itemId '{0}' not found", itemId.ToString());
+                    return;
+                }
+
+                var xml = ObjectUtils.Serialize(settings);
+
+                DataProvider.UpdateOrganizationSettings(itemId, OrganizationSettings.GeneralSettings, xml);
+            }
+            catch (Exception ex)
+            {
+                throw TaskManager.WriteError(ex);
+            }
+            finally
+            {
+                TaskManager.CompleteTask();
+            }
+        }
+
+        public static OrganizationGeneralSettings GetOrganizationGeneralSettings(int itemId)
+        {
+            return GetOrganizationSettings<OrganizationGeneralSettings>(itemId, OrganizationSettings.GeneralSettings);
+        }
+
         private static T GetOrganizationSettings<T>(int itemId, string settingsName)
         {
             var entity = ObjectUtils.FillObjectFromDataReader<OrganizationSettingsEntity>(DataProvider.GetOrganizationSettings(itemId, settingsName));

WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/SchedulerTasks/UserPasswordExpirationNotificationTask.cs

@@ -39,6 +39,8 @@ namespace WebsitePanel.EnterpriseServer
                 {
                     var usersWithExpiredPasswords = OrganizationController.GetOrganizationUsersWithExpiredPassword(organization.Id, daysBeforeNotify);
 
+                    var generalSettings = OrganizationController.GetOrganizationGeneralSettings(organization.Id);
+
                     foreach (var user in usersWithExpiredPasswords)
                     {
                         user.ItemId = organization.Id;
@@ -49,7 +51,7 @@ namespace WebsitePanel.EnterpriseServer
                             continue;
                         }
 
-                        OrganizationController.SendResetUserPasswordEmail(owner, user, "Scheduler Password Expiration Notification", user.PrimaryEmailAddress, string.Empty);
+                        OrganizationController.SendResetUserPasswordEmail(owner, user, "Scheduler Password Expiration Notification", user.PrimaryEmailAddress, generalSettings.OrganizationLogoUrl);
                     }
                 }
             }

WebsitePanel/Sources/WebsitePanel.EnterpriseServer/esOrganizations.asmx.cs

@@ -47,6 +47,18 @@ namespace WebsitePanel.EnterpriseServer
     {
         #region Organizations
 
+        [WebMethod]
+        public void UpdateOrganizationGeneralSettings(int itemId, OrganizationGeneralSettings settings)
+        {
+            OrganizationController.UpdateOrganizationGeneralSettings(itemId, settings);
+        }
+
+        [WebMethod]
+        public OrganizationGeneralSettings GetOrganizationGeneralSettings(int itemId)
+        {
+            return OrganizationController.GetOrganizationGeneralSettings(itemId);
+        }
+
         [WebMethod]
         public void UpdateOrganizationPasswordSettings(int itemId, OrganizationPasswordSettings settings)
         {

WebsitePanel/Sources/WebsitePanel.Providers.Base/HostedSolution/OrganizationGeneralSettings.cs

@@ -0,0 +1,7 @@
+namespace WebsitePanel.Providers.HostedSolution
+{
+    public class OrganizationGeneralSettings
+    {
+        public string OrganizationLogoUrl { get; set; }
+    }
+}

WebsitePanel/Sources/WebsitePanel.Providers.Base/HostedSolution/OrganizationSettings.cs

@@ -3,5 +3,6 @@
     public class OrganizationSettings
     {
         public const string PasswordSettings = "PasswordSettings";
+        public const string GeneralSettings = "GeneralSettings";
     }
 }

WebsitePanel/Sources/WebsitePanel.Providers.Base/WebsitePanel.Providers.Base.csproj

@@ -119,6 +119,7 @@
     <Compile Include="HostedSolution\LyncUserPlanType.cs" />
     <Compile Include="HostedSolution\LyncUsersPaged.cs" />
     <Compile Include="HostedSolution\LyncVoicePolicyType.cs" />
+    <Compile Include="HostedSolution\OrganizationGeneralSettings.cs" />
     <Compile Include="HostedSolution\OrganizationPasswordSettings.cs" />
     <Compile Include="HostedSolution\OrganizationSecurityGroup.cs" />
     <Compile Include="HostedSolution\OrganizationDeletedUser.cs" />

WebsitePanel/Sources/WebsitePanel.WebPortal/App_Data/WebsitePanel_Modules.config

@@ -477,6 +477,7 @@
 			<Control key="organization_home" src="WebsitePanel/ExchangeServer/OrganizationHome.ascx" title="OrganizationHome" type="View" />
 			<Control key="organization_user_setup" src="WebsitePanel/ExchangeServer/OrganizationUserSetupInstructions.ascx" title="OrganizationUserSetupInstructions" type="View" />
       <Control key="organization_settings_password_settings" src="WebsitePanel/ExchangeServer/OrganizationSettingsPasswordSettings.ascx" title="OrganizationSettings" type="View" />
+      <Control key="organization_settings_general_settings" src="WebsitePanel/ExchangeServer/OrganizationSettingsGeneralSettings.ascx" title="OrganizationSettings" type="View" />
 			<Control key="mailboxes" src="WebsitePanel/ExchangeServer/ExchangeMailboxes.ascx" title="ExchangeMailboxes" type="View" />
       <Control key="archivingmailboxes" src="WebsitePanel/ExchangeServer/ExchangeMailboxes.ascx" title="ExchangeArchivingMailboxes" type="View" />
       <Control key="create_mailbox" src="WebsitePanel/ExchangeServer/ExchangeCreateMailbox.ascx" title="ExchangeCreateMailbox" type="View" />

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/App_LocalResources/OrganizationHome.ascx.resx

@@ -241,6 +241,6 @@
     <value>Edit</value>
   </data>
   <data name="OrganizationSettings.Text" xml:space="preserve">
-    <value>Organization settings</value>
+    <value>Organization settings:</value>
   </data>
 </root>

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/App_LocalResources/OrganizationSettingsGeneralSettings.ascx.resx

@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="colGeneralSettings.Text" xml:space="preserve">
+    <value>General settings</value>
+  </data>
+  <data name="lblOrganizationLogoUrl.Text" xml:space="preserve">
+    <value>Organization logo URL:</value>
+  </data>
+  <data name="locTitle.Text" xml:space="preserve">
+    <value>Edit settings</value>
+  </data>
+  <data name="valRequireOrganizationLogoUrl.Text" xml:space="preserve">
+    <value>*</value>
+  </data>
+</root>

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/App_LocalResources/OrganizationSettingsPasswordSettings.ascx.resx

@@ -192,6 +192,9 @@
   <data name="valRequireAccountLockoutDuration.Text" xml:space="preserve">
     <value>*</value>
   </data>
+  <data name="valRequiredLockedOut.Text" xml:space="preserve">
+    <value>*</value>
+  </data>
   <data name="valRequireEnforcePasswordHistory.Text" xml:space="preserve">
     <value>*</value>
   </data>
@@ -204,6 +207,9 @@
   <data name="valRequireNumbers.Text" xml:space="preserve">
     <value>*</value>
   </data>
+  <data name="valRequireResetAccountLockout.Text" xml:space="preserve">
+    <value>*</value>
+  </data>
   <data name="valRequireSymbols.Text" xml:space="preserve">
     <value>*</value>
   </data>

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/OrganizationSettingsGeneralSettings.ascx

@@ -0,0 +1,56 @@
+<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="OrganizationSettingsGeneralSettings.ascx.cs" Inherits="WebsitePanel.Portal.ExchangeServer.OrganizationSettingsGeneralSettings" %>
+
+
+
+<%@ Register Src="UserControls/OrganizationSettingsTabs.ascx" TagName="CollectionTabs" TagPrefix="wsp" %>
+<%@ Register TagPrefix="wsp" TagName="CollapsiblePanel" Src="../UserControls/CollapsiblePanel.ascx" %>
+<%@ Register Src="../UserControls/SimpleMessageBox.ascx" TagName="SimpleMessageBox" TagPrefix="wsp" %>
+<%@ Register Src="../UserControls/ItemButtonPanel.ascx" TagName="ItemButtonPanel" TagPrefix="wsp" %>
+<%@ Register Src="../UserControls/EnableAsyncTasksSupport.ascx" TagName="EnableAsyncTasksSupport" TagPrefix="wsp" %>
+<script type="text/javascript" src="/JavaScript/jquery.min.js?v=1.4.4"></script>
+
+<wsp:EnableAsyncTasksSupport ID="asyncTasks" runat="server" />
+
+<div id="ExchangeContainer">
+    <div class="Module">
+        <div class="Left">
+        </div>
+        <div class="Content">
+            <div class="Center">
+                <div class="Title">
+                    <asp:Image ID="Image1" SkinID="ExchangeList48" runat="server" />
+                    <asp:Localize ID="locTitle" runat="server" meta:resourcekey="locTitle" Text="Edit Settings"></asp:Localize>
+
+                    <asp:Literal ID="litOrganizationName" runat="server" Text="Organization" />
+                </div>
+                <div class="FormBody">
+
+                    <wsp:CollectionTabs ID="tabs" runat="server" SelectedTab="organization_settings_general_settings" />
+                    <wsp:SimpleMessageBox ID="messageBox" runat="server" />
+                            <wsp:CollapsiblePanel ID="colGeneralSettings" runat="server" TargetControlID="panelGeneralSettings" meta:ResourceKey="colGeneralSettings" Text="General settings"></wsp:CollapsiblePanel>
+
+                            <asp:Panel runat="server" ID="panelGeneralSettings">
+                                <table id="GenerralSettignsTable" runat="server" cellpadding="2">
+                                    <tr>
+                                        <td class="Normal" style="width: 150px;">
+                                            <asp:Label ID="lblOrganizationLogoUrl" runat="server"
+                                                meta:resourcekey="lblOrganizationLogoUrl" Text="Minimum length:"></asp:Label></td>
+                                        <td class="Normal">
+                                            <asp:TextBox ID="txtOrganizationLogoUrl" runat="server" CssClass="NormalTextBox" Width="400px"></asp:TextBox>
+                                            <asp:RequiredFieldValidator ID="valRequireMinLength" runat="server" ControlToValidate="txtOrganizationLogoUrl" meta:resourcekey="valRequireOrganizationLogoUrl"
+                                                ErrorMessage="*" ValidationGroup="SettingsEditor" Display="Dynamic"></asp:RequiredFieldValidator>
+                                          </td>
+                                    </tr>
+    
+                                </table>
+                            </asp:Panel>
+
+                    <div class="FormFooterClean">
+                        <wsp:ItemButtonPanel ID="buttonPanel" runat="server" ValidationGroup="SettingsEditor"
+                            OnSaveClick="btnSave_Click" OnSaveExitClick="btnSaveExit_Click" />
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/OrganizationSettingsGeneralSettings.ascx.cs

@@ -0,0 +1,86 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using WebsitePanel.EnterpriseServer;
+using WebsitePanel.Providers.HostedSolution;
+
+namespace WebsitePanel.Portal.ExchangeServer
+{
+    public partial class OrganizationSettingsGeneralSettings : WebsitePanelModuleBase
+    {
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                Organization org = ES.Services.Organizations.GetOrganization(PanelRequest.ItemID);
+                litOrganizationName.Text = org.OrganizationId;
+
+                BindSettings();
+            }
+
+        }
+
+        private void BindSettings()
+        {
+            var settings = ES.Services.Organizations.GetOrganizationGeneralSettings(PanelRequest.ItemID);
+
+            if (settings != null)
+            {
+                txtOrganizationLogoUrl.Text = settings.OrganizationLogoUrl;
+            }
+        }
+
+        protected void btnSave_Click(object sender, EventArgs e)
+        {
+            if (!Page.IsValid)
+            {
+                return;
+            }
+
+            SaveGeneralSettings(GetSettings());
+        }
+
+        protected void btnSaveExit_Click(object sender, EventArgs e)
+        {
+            if (!Page.IsValid)
+            {
+                return;
+            }
+
+            if (SaveGeneralSettings(GetSettings()))
+            {
+                Response.Redirect(EditUrl("ItemID", PanelRequest.ItemID.ToString(), "organization_home",
+                    "SpaceID=" + PanelSecurity.PackageId));
+            }
+        }
+
+        private OrganizationGeneralSettings GetSettings()
+        {
+            var settings = new OrganizationGeneralSettings
+            {
+                OrganizationLogoUrl = txtOrganizationLogoUrl.Text
+            };
+
+            return settings;
+        }
+
+
+        private bool SaveGeneralSettings(OrganizationGeneralSettings settings)
+        {
+            try
+            {
+                ES.Services.Organizations.UpdateOrganizationGeneralSettings(PanelRequest.ItemID, GetSettings());
+            }
+            catch (Exception ex)
+            {
+                ShowErrorMessage("ORANIZATIONSETTINGS_NOT_UPDATED", ex);
+                return false;
+            }
+
+            return true;
+        }
+    }
+}

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/OrganizationSettingsGeneralSettings.ascx.designer.cs

@@ -0,0 +1,132 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated. 
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace WebsitePanel.Portal.ExchangeServer {
+    
+    
+    public partial class OrganizationSettingsGeneralSettings {
+        
+        /// <summary>
+        /// asyncTasks control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.EnableAsyncTasksSupport asyncTasks;
+        
+        /// <summary>
+        /// Image1 control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Image Image1;
+        
+        /// <summary>
+        /// locTitle control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Localize locTitle;
+        
+        /// <summary>
+        /// litOrganizationName control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Literal litOrganizationName;
+        
+        /// <summary>
+        /// tabs control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.ExchangeServer.UserControls.OrganizationSettingsTabs tabs;
+        
+        /// <summary>
+        /// messageBox control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.UserControls.SimpleMessageBox messageBox;
+        
+        /// <summary>
+        /// colGeneralSettings control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.CollapsiblePanel colGeneralSettings;
+        
+        /// <summary>
+        /// panelGeneralSettings control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Panel panelGeneralSettings;
+        
+        /// <summary>
+        /// GenerralSettignsTable control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlTable GenerralSettignsTable;
+        
+        /// <summary>
+        /// lblOrganizationLogoUrl control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label lblOrganizationLogoUrl;
+        
+        /// <summary>
+        /// txtOrganizationLogoUrl control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.TextBox txtOrganizationLogoUrl;
+        
+        /// <summary>
+        /// valRequireMinLength control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.RequiredFieldValidator valRequireMinLength;
+        
+        /// <summary>
+        /// buttonPanel control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.ItemButtonPanel buttonPanel;
+    }
+}

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/OrganizationSettingsPasswordSettings.ascx

@@ -23,8 +23,8 @@
                         </div>
 				        <div class="FormBody">
 
-				            <wsp:CollectionTabs id="tabs" runat="server" SelectedTab="organization_settings_password_s
+				            <wsp:CollectionTabs id="tabs" runat="server" SelectedTab="organization_settings_password_settings" />
-                                ettings" />
+
                             <wsp:SimpleMessageBox id="messageBox" runat="server" />
                             <asp:UpdatePanel runat="server" ID="PasswordPolicyPanel" UpdateMode="Conditional" ChildrenAsTriggers="true">
 		                        <ContentTemplate> 
@@ -86,6 +86,8 @@
                                                 meta:resourcekey="lblLockedOut" Text="Account Lockout threshold:"></asp:Label>
                                         </td>
                                         <td class="Normal"><asp:TextBox ID="txtLockedOut" runat="server" CssClass="NormalTextBox" Width="40px"></asp:TextBox>
+                                            <asp:RequiredFieldValidator ID="valRequiredLockedOut" runat="server" ControlToValidate="txtLockedOut" meta:resourcekey="valRequiredLockedOut"
+                                                ErrorMessage="*" ValidationGroup="SettingsEditor" Display="Dynamic"></asp:RequiredFieldValidator>
                                             <asp:RegularExpressionValidator ID="valCorrectLockedOut" runat="server" ControlToValidate="txtLockedOut" meta:resourcekey="valCorrectLockedOut"
                                                 Display="Dynamic" ErrorMessage="*" ValidationExpression="\d{1,10}" ValidationGroup="SettingsEditor"></asp:RegularExpressionValidator>
                                         </td>
@@ -96,6 +98,8 @@
                                                 meta:resourcekey="lblResetAccountLockout" Text="Reset account lockout counter after (minutes):"></asp:Label>
                                         </td>
                                         <td class="Normal"><asp:TextBox ID="txtResetAccountLockout" runat="server" CssClass="NormalTextBox" Width="40px"></asp:TextBox>
+                                            <asp:RequiredFieldValidator ID="valRequireResetAccountLockout" runat="server" ControlToValidate="txtResetAccountLockout" meta:resourcekey="valRequireResetAccountLockout"
+                                                ErrorMessage="*" ValidationGroup="SettingsEditor" Display="Dynamic"></asp:RequiredFieldValidator>
                                             <asp:RegularExpressionValidator ID="valResetAccountLockout" runat="server" ControlToValidate="txtResetAccountLockout" meta:resourcekey="valResetAccountLockout"
                                                 Display="Dynamic" ErrorMessage="*" ValidationExpression="\d{1,10}" ValidationGroup="SettingsEditor"></asp:RegularExpressionValidator>
                                         </td>
@@ -154,7 +158,7 @@
                             </asp:UpdatePanel>
 					
 				            <div class="FormFooterClean">
-                                  <wsp:ItemButtonPanel id="buttonPanel" runat="server" ValidationGroup="EditPasswordSettings" 
+                                  <wsp:ItemButtonPanel id="buttonPanel" runat="server" ValidationGroup="SettingsEditor" 
                             OnSaveClick="btnSave_Click" OnSaveExitClick="btnSaveExit_Click" />
 				            </div>
 				        </div>

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/OrganizationSettingsPasswordSettings.ascx.designer.cs

@@ -300,6 +300,15 @@ namespace WebsitePanel.Portal.ExchangeServer {
         /// </remarks>
         protected global::System.Web.UI.WebControls.TextBox txtLockedOut;
         
+        /// <summary>
+        /// valRequiredLockedOut control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.RequiredFieldValidator valRequiredLockedOut;
+        
         /// <summary>
         /// valCorrectLockedOut control.
         /// </summary>
@@ -336,6 +345,15 @@ namespace WebsitePanel.Portal.ExchangeServer {
         /// </remarks>
         protected global::System.Web.UI.WebControls.TextBox txtResetAccountLockout;
         
+        /// <summary>
+        /// valRequireResetAccountLockout control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.RequiredFieldValidator valRequireResetAccountLockout;
+        
         /// <summary>
         /// valResetAccountLockout control.
         /// </summary>

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/UserControls/App_LocalResources/OrganizationSettingsTabs.ascx.resx

@@ -117,6 +117,9 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <data name="Tab.GeneralSettigns" xml:space="preserve">
+    <value>General Settings</value>
+  </data>
   <data name="Tab.PasswordSettings" xml:space="preserve">
     <value>Password Settings</value>
   </data>

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/UserControls/OrganizationSettingsTabs.ascx.cs

@@ -20,8 +20,11 @@ namespace WebsitePanel.Portal.ExchangeServer.UserControls
         private void BindTabs()
         {
             List<Tab> tabsList = new List<Tab>();
+            tabsList.Add(CreateTab("organization_settings_general_settings", "Tab.GeneralSettigns"));
             tabsList.Add(CreateTab("organization_settings_password_settings", "Tab.PasswordSettings"));
 
+            
+
             int idx = 0;
 
             foreach (Tab tab in tabsList)

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebsitePanel.Portal.Modules.csproj

@@ -244,6 +244,13 @@
       <DependentUpon>OrganizationDeletedUserGeneralSettings.ascx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
     </Compile>
+    <Compile Include="ExchangeServer\OrganizationSettingsGeneralSettings.ascx.cs">
+      <DependentUpon>OrganizationSettingsGeneralSettings.ascx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="ExchangeServer\OrganizationSettingsGeneralSettings.ascx.designer.cs">
+      <DependentUpon>OrganizationSettingsGeneralSettings.ascx</DependentUpon>
+    </Compile>
     <Compile Include="ExchangeServer\OrganizationSettingsPasswordSettings.ascx.cs">
       <DependentUpon>OrganizationSettingsPasswordSettings.ascx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
@@ -4571,6 +4578,7 @@
     <Content Include="ExchangeServer\EnterpriseStorageFolderSettingsFolderPermissions.ascx" />
     <Content Include="ExchangeServer\EnterpriseStorageFolderSettingsOwaEditing.ascx" />
     <Content Include="ExchangeServer\ExchangeCheckDomainName.ascx" />
+    <Content Include="ExchangeServer\OrganizationSettingsGeneralSettings.ascx" />
     <Content Include="ExchangeServer\OrganizationSettingsPasswordSettings.ascx" />
     <Content Include="ExchangeServer\OrganizationUserResetPassword.ascx" />
     <Content Include="ExchangeServer\UserControls\EnterpriseStorageEditFolderTabs.ascx" />
@@ -4640,6 +4648,7 @@
     <Content Include="App_LocalResources\SettingsUserPasswordExpirationLetter.ascx.resx" />
     <Content Include="ExchangeServer\UserControls\App_LocalResources\OrganizationSettingsTabs.ascx.resx" />
     <Content Include="ExchangeServer\App_LocalResources\OrganizationSettingsPasswordSettings.ascx.resx" />
+    <Content Include="ExchangeServer\App_LocalResources\OrganizationSettingsGeneralSettings.ascx.resx" />
     <EmbeddedResource Include="RDS\App_LocalResources\RDSEditCollectionSettings.ascx.resx" />
     <Content Include="RDSServersEditServer.ascx" />
     <Content Include="RDS\AssignedRDSServers.ascx" />