Fix up sharepoint 2013 mess

WebsitePanel/Database/update_db.sql

@@ -9462,11 +9462,15 @@ END
 GO
 
 UPDATE [dbo].[Quotas] SET GroupID = 45 WHERE QuotaName = 'EnterpriseStorage.DriveMaps'
+GO
 
 
 UPDATE [dbo].[ResourceGroups] SET GroupName = 'Sharepoint Enterprise Server' WHERE GroupName = 'Sharepoint Server'
 GO
 
+UPDATE [dbo].[ResourceGroups] SET GroupController = 'WebsitePanel.EnterpriseServer.HostedSharePointServerEntController' WHERE GroupName = 'Sharepoint Enterprise Server'
+GO
+
 IF NOT EXISTS (SELECT * FROM [dbo].[Providers] WHERE [DisplayName] = 'Hosted SharePoint Enterprise 2013')
 BEGIN
 DECLARE @provider_id AS INT
@@ -9478,9 +9482,6 @@ VALUES (@provider_id, @group_id, N'HostedSharePoint2013Ent', N'Hosted SharePoint
 END
 GO
 
-UPDATE Providers SET ProviderType = N'WebsitePanel.Providers.HostedSolution.HostedSharePointServer2013Ent, WebsitePanel.Providers.HostedSolution.SharePoint2013Ent' WHERE ProviderID = 1301
-GO
-
 UPDATE [dbo].[Quotas] SET QuotaName = 'HostedSharePointEnterprise.Sites' WHERE QuotaId = 550
 GO
 

WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Client/HostedSharePointServersProxy.cs

@@ -26,11 +26,10 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE)  ARISING  IN  ANY WAY OUT OF THE USE OF THIS
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:2.0.50727.7905
+//     Runtime Version:2.0.50727.8009
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -51,6 +50,7 @@ namespace WebsitePanel.EnterpriseServer {
     using WebsitePanel.Providers;
     
     
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
@@ -141,7 +141,7 @@ namespace WebsitePanel.EnterpriseServer {
         
         /// <remarks/>
         [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/GetSiteCollectionsPaged", RequestNamespace="http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace="http://smbsaas/websitepanel/enterpriseserver", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        public SharePointSiteCollectionListPaged GetSiteCollectionsPaged(int packageId, int organizationId, string filterColumn, string filterValue, string sortColumn, int startRow, int maximumRows, string groupName) {
+        public SharePointSiteCollectionListPaged GetSiteCollectionsPaged(int packageId, int organizationId, string filterColumn, string filterValue, string sortColumn, int startRow, int maximumRows) {
             object[] results = this.Invoke("GetSiteCollectionsPaged", new object[] {
                         packageId,
                         organizationId,
@@ -149,13 +149,12 @@ namespace WebsitePanel.EnterpriseServer {
                         filterValue,
                         sortColumn,
                         startRow,
-                        maximumRows,
+                        maximumRows});
-                        groupName});
             return ((SharePointSiteCollectionListPaged)(results[0]));
         }
         
         /// <remarks/>
-        public System.IAsyncResult BeginGetSiteCollectionsPaged(int packageId, int organizationId, string filterColumn, string filterValue, string sortColumn, int startRow, int maximumRows, string groupName, System.AsyncCallback callback, object asyncState) {
+        public System.IAsyncResult BeginGetSiteCollectionsPaged(int packageId, int organizationId, string filterColumn, string filterValue, string sortColumn, int startRow, int maximumRows, System.AsyncCallback callback, object asyncState) {
             return this.BeginInvoke("GetSiteCollectionsPaged", new object[] {
                         packageId,
                         organizationId,
@@ -163,8 +162,7 @@ namespace WebsitePanel.EnterpriseServer {
                         filterValue,
                         sortColumn,
                         startRow,
-                        maximumRows,
+                        maximumRows}, callback, asyncState);
-                        groupName}, callback, asyncState);
         }
         
         /// <remarks/>
@@ -174,12 +172,12 @@ namespace WebsitePanel.EnterpriseServer {
         }
         
         /// <remarks/>
-        public void GetSiteCollectionsPagedAsync(int packageId, int organizationId, string filterColumn, string filterValue, string sortColumn, int startRow, int maximumRows, string groupName) {
+        public void GetSiteCollectionsPagedAsync(int packageId, int organizationId, string filterColumn, string filterValue, string sortColumn, int startRow, int maximumRows) {
-            this.GetSiteCollectionsPagedAsync(packageId, organizationId, filterColumn, filterValue, sortColumn, startRow, maximumRows, groupName, null);
+            this.GetSiteCollectionsPagedAsync(packageId, organizationId, filterColumn, filterValue, sortColumn, startRow, maximumRows, null);
         }
         
         /// <remarks/>
-        public void GetSiteCollectionsPagedAsync(int packageId, int organizationId, string filterColumn, string filterValue, string sortColumn, int startRow, int maximumRows, string groupName, object userState) {
+        public void GetSiteCollectionsPagedAsync(int packageId, int organizationId, string filterColumn, string filterValue, string sortColumn, int startRow, int maximumRows, object userState) {
             if ((this.GetSiteCollectionsPagedOperationCompleted == null)) {
                 this.GetSiteCollectionsPagedOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetSiteCollectionsPagedOperationCompleted);
             }
@@ -190,8 +188,7 @@ namespace WebsitePanel.EnterpriseServer {
                         filterValue,
                         sortColumn,
                         startRow,
-                        maximumRows,
+                        maximumRows}, this.GetSiteCollectionsPagedOperationCompleted, userState);
-                        groupName}, this.GetSiteCollectionsPagedOperationCompleted, userState);
         }
         
         private void OnGetSiteCollectionsPagedOperationCompleted(object arg) {
@@ -244,20 +241,18 @@ namespace WebsitePanel.EnterpriseServer {
         
         /// <remarks/>
         [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/GetSiteCollections", RequestNamespace="http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace="http://smbsaas/websitepanel/enterpriseserver", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        public SharePointSiteCollection[] GetSiteCollections(int packageId, bool recursive, string groupName) {
+        public SharePointSiteCollection[] GetSiteCollections(int packageId, bool recursive) {
             object[] results = this.Invoke("GetSiteCollections", new object[] {
                         packageId,
-                        recursive,
+                        recursive});
-                        groupName});
             return ((SharePointSiteCollection[])(results[0]));
         }
         
         /// <remarks/>
-        public System.IAsyncResult BeginGetSiteCollections(int packageId, bool recursive, string groupName, System.AsyncCallback callback, object asyncState) {
+        public System.IAsyncResult BeginGetSiteCollections(int packageId, bool recursive, System.AsyncCallback callback, object asyncState) {
             return this.BeginInvoke("GetSiteCollections", new object[] {
                         packageId,
-                        recursive,
+                        recursive}, callback, asyncState);
-                        groupName}, callback, asyncState);
         }
         
         /// <remarks/>
@@ -267,19 +262,18 @@ namespace WebsitePanel.EnterpriseServer {
         }
         
         /// <remarks/>
-        public void GetSiteCollectionsAsync(int packageId, bool recursive, string groupName) {
+        public void GetSiteCollectionsAsync(int packageId, bool recursive) {
-            this.GetSiteCollectionsAsync(packageId, recursive, groupName, null);
+            this.GetSiteCollectionsAsync(packageId, recursive, null);
         }
         
         /// <remarks/>
-        public void GetSiteCollectionsAsync(int packageId, bool recursive, string groupName, object userState) {
+        public void GetSiteCollectionsAsync(int packageId, bool recursive, object userState) {
             if ((this.GetSiteCollectionsOperationCompleted == null)) {
                 this.GetSiteCollectionsOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetSiteCollectionsOperationCompleted);
             }
             this.InvokeAsync("GetSiteCollections", new object[] {
                         packageId,
-                        recursive,
+                        recursive}, this.GetSiteCollectionsOperationCompleted, userState);
-                        groupName}, this.GetSiteCollectionsOperationCompleted, userState);
         }
         
         private void OnGetSiteCollectionsOperationCompleted(object arg) {
@@ -426,18 +420,16 @@ namespace WebsitePanel.EnterpriseServer {
         
         /// <remarks/>
         [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/AddSiteCollection", RequestNamespace="http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace="http://smbsaas/websitepanel/enterpriseserver", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        public int AddSiteCollection(SharePointSiteCollection item, string groupName) {
+        public int AddSiteCollection(SharePointSiteCollection item) {
             object[] results = this.Invoke("AddSiteCollection", new object[] {
-                        item,
+                        item});
-                        groupName});
             return ((int)(results[0]));
         }
         
         /// <remarks/>
-        public System.IAsyncResult BeginAddSiteCollection(SharePointSiteCollection item, string groupName, System.AsyncCallback callback, object asyncState) {
+        public System.IAsyncResult BeginAddSiteCollection(SharePointSiteCollection item, System.AsyncCallback callback, object asyncState) {
             return this.BeginInvoke("AddSiteCollection", new object[] {
-                        item,
+                        item}, callback, asyncState);
-                        groupName}, callback, asyncState);
         }
         
         /// <remarks/>
@@ -447,18 +439,17 @@ namespace WebsitePanel.EnterpriseServer {
         }
         
         /// <remarks/>
-        public void AddSiteCollectionAsync(SharePointSiteCollection item, string groupName) {
+        public void AddSiteCollectionAsync(SharePointSiteCollection item) {
-            this.AddSiteCollectionAsync(item, groupName, null);
+            this.AddSiteCollectionAsync(item, null);
         }
         
         /// <remarks/>
-        public void AddSiteCollectionAsync(SharePointSiteCollection item, string groupName, object userState) {
+        public void AddSiteCollectionAsync(SharePointSiteCollection item, object userState) {
             if ((this.AddSiteCollectionOperationCompleted == null)) {
                 this.AddSiteCollectionOperationCompleted = new System.Threading.SendOrPostCallback(this.OnAddSiteCollectionOperationCompleted);
             }
             this.InvokeAsync("AddSiteCollection", new object[] {
-                        item,
+                        item}, this.AddSiteCollectionOperationCompleted, userState);
-                        groupName}, this.AddSiteCollectionOperationCompleted, userState);
         }
         
         private void OnAddSiteCollectionOperationCompleted(object arg) {

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

@@ -1074,8 +1074,15 @@ namespace WebsitePanel.EnterpriseServer
                                     {
                                         SharePointSiteCollectionListPaged sharePointStats = HostedSharePointServerController.GetSiteCollectionsPaged(org.PackageId, o.Id, string.Empty, string.Empty, string.Empty, 0, 0);
                                         stats.CreatedSharePointSiteCollections += sharePointStats.TotalRowCount;
+                                    }
+
+                                    if (cntxTmp.Groups.ContainsKey(ResourceGroups.SharepointEnterpriseServer))
+                                    {
+                                        SharePointSiteCollectionListPaged sharePointStats = HostedSharePointServerController.GetSiteCollectionsPaged(org.PackageId, o.Id, string.Empty, string.Empty, string.Empty, 0, 0);
+                                        stats.CreatedSharePointEnterpriseSiteCollections += sharePointStats.TotalRowCount;
                                     }                                    
 
+
                                     if (cntxTmp.Groups.ContainsKey(ResourceGroups.HostedCRM))
                                     {
                                         stats.CreatedCRMUsers += CRMController.GetCRMUsersCount(o.Id, string.Empty, string.Empty, CRMUserLycenseTypes.FULL ).Value;

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

@@ -158,6 +158,18 @@ namespace WebsitePanel.EnterpriseServer.Code.HostedSolution
             return PackageController.GetPackageServiceId(packageId, ResourceGroups.SharepointFoundationServer);
         }
 
+
+        private static HostedSharePointServerEnt GetHostedSharePointServerEnt(int serviceId)
+        {
+            HostedSharePointServerEnt sps = new HostedSharePointServerEnt();
+            ServiceProviderProxy.Init(sps, serviceId);
+            return sps;
+        }
+
+        private static int GetHostedSharePointEntServiceId(int packageId)
+        {
+            return PackageController.GetPackageServiceId(packageId, ResourceGroups.SharepointEnterpriseServer);
+        }
         
         private static void PopulateBaseItem(BaseStatistics stats, Organization org, string topReseller)
         {
@@ -394,6 +406,7 @@ namespace WebsitePanel.EnterpriseServer.Code.HostedSolution
                     string.Format("Could not get sharepoint server. PackageId: {0}", org.PackageId), ex);
             }
 
+
             foreach (SharePointSiteCollection siteCollection in siteCollections)
             {
                 try
@@ -419,6 +432,59 @@ namespace WebsitePanel.EnterpriseServer.Code.HostedSolution
         }
 
 
+        private static void PopulateSharePointEntItem(Organization org, EnterpriseSolutionStatisticsReport report, string topReseller)
+        {
+            List<SharePointSiteCollection> siteCollections;
+
+            try
+            {
+                siteCollections = HostedSharePointServerEntController.GetSiteCollections(org.Id);
+            }
+            catch (Exception ex)
+            {
+                throw new ApplicationException(string.Format("Could not get site collections. OrgId: {0}", org.Id), ex);
+            }
+
+            if (siteCollections == null || siteCollections.Count == 0)
+                return;
+
+
+            HostedSharePointServerEnt srvEnt;
+            try
+            {
+                int serviceId = GetHostedSharePointEntServiceId(org.PackageId);
+                srvEnt = GetHostedSharePointServerEnt(serviceId);
+            }
+            catch (Exception ex)
+            {
+                throw new ApplicationException(
+                    string.Format("Could not get sharepoint enterprise server. PackageId: {0}", org.PackageId), ex);
+            }
+
+            foreach (SharePointSiteCollection siteCollection in siteCollections)
+            {
+                try
+                {
+                    SharePointStatistics stats = new SharePointStatistics();
+                    PopulateBaseItem(stats, org, topReseller);
+
+                    stats.SiteCollectionUrl = siteCollection.PhysicalAddress;
+                    stats.SiteCollectionOwner = siteCollection.OwnerName;
+                    stats.SiteCollectionQuota = siteCollection.MaxSiteStorage;
+
+                    stats.SiteCollectionCreated = siteCollection.CreatedDate;
+
+                    stats.SiteCollectionSize = srvEnt.Enterprise_GetSiteCollectionSize(siteCollection.PhysicalAddress);
+
+                    report.SharePointReport.Items.Add(stats);
+                }
+                catch (Exception ex)
+                {
+                    TaskManager.WriteError(ex);
+                }
+            }
+        }
+
         private static void PopulateExchangeReportItems(Organization org, EnterpriseSolutionStatisticsReport report, string topReseller)
         {
             TaskManager.Write("Exchange Report Items " + org.Name);

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

@@ -179,6 +179,20 @@ namespace WebsitePanel.EnterpriseServer
                             }
                         }
                     }
+
+                    if (cntx.Groups.ContainsKey(ResourceGroups.SharepointEnterpriseServer))
+                    {
+                        SharePointSiteDiskSpace[] sharePointSiteDiskSpaces =
+                            HostedSharePointServerEntController.CalculateSharePointSitesDiskSpace(org.Id, out res);
+                        if (res == 0)
+                        {
+                            foreach (SharePointSiteDiskSpace currecnt in sharePointSiteDiskSpaces)
+                            {
+                                size += currecnt.DiskSpace;
+                            }
+                        }
+                    }
+
                     ServiceProviderItemDiskSpace tmp = new ServiceProviderItemDiskSpace();
                     tmp.ItemId = item.Id;
                     tmp.DiskSpace = size;

WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/SharePoint/HostedSharePointServerEntController.cs

@@ -791,7 +791,7 @@ namespace WebsitePanel.EnterpriseServer.Code.SharePoint
 
         private static int GetHostedSharePointServiceId(int packageId)
         {
-            return PackageController.GetPackageServiceId(packageId, ResourceGroups.SharepointFoundationServer);
+            return PackageController.GetPackageServiceId(packageId, ResourceGroups.SharepointEnterpriseServer);
         }
 
         private static List<SharePointSiteCollection> GetOrganizationSharePointSiteCollections(int orgId)

WebsitePanel/Sources/WebsitePanel.EnterpriseServer/esHostedSharePointServers.asmx.cs

@@ -55,7 +55,6 @@ namespace WebsitePanel.EnterpriseServer
 		/// <param name="sortColumn">Sort column name.</param>
 		/// <param name="startRow">Row index to start from.</param>
 		/// <param name="maximumRows">Maximum number of rows to retrieve.</param>
-        /// <param name="groupName">Resource group name.</param>
 		/// <returns>Site collections in raw format.</returns>
 		[WebMethod]
 		public SharePointSiteCollectionListPaged GetSiteCollectionsPaged(int packageId, int organizationId,
@@ -80,7 +79,6 @@ namespace WebsitePanel.EnterpriseServer
 		/// </summary>
 		/// <param name="packageId">Package that owns site collections.</param>
 		/// <param name="recursive">A value which shows whether nested spaces must be searched as well.</param>
-        /// <param name="groupName">Resource group name.</param>
 		/// <returns>List of found site collections.</returns>
 		[WebMethod]
 		public List<SharePointSiteCollection> GetSiteCollections(int packageId, bool recursive)
@@ -133,7 +131,6 @@ namespace WebsitePanel.EnterpriseServer
 		/// Adds SharePoint site collection.
 		/// </summary>
 		/// <param name="item">Site collection description.</param>
-        /// <param name="groupName">Resource group name.</param>
 		/// <returns>Created site collection id within metabase.</returns>
 		[WebMethod]
 		public int AddSiteCollection(SharePointSiteCollection item)

WebsitePanel/Sources/WebsitePanel.WebPortal/App_GlobalResources/WebsitePanel_SharedResources.ascx.resx

@@ -3371,14 +3371,11 @@
   <data name="Quota.HostedSolution.DeletedUsersBackupStorageSpace" xml:space="preserve">
     <value>Deleted Users Backup Storage Space per Organization, Mb</value>
   </data>
-  <data name="ResourceGroup.Hosted SharePoint" xml:space="preserve">
-    <value>Hosted SharePoint</value>
-  </data>
   <data name="ResourceGroup.SharePoint Foundation Server" xml:space="preserve">
     <value>SharePoint Foundation Server</value>
   </data>
-    <data name="ResourceGroup.SharePoint Server" xml:space="preserve">
+    <data name="ResourceGroup.SharePoint Enterprise Server" xml:space="preserve">
-    <value>SharePoint Server</value>
+    <value>SharePoint Enterprise Server</value>
   </data>
   <data name="ResourceGroup.OCS" xml:space="preserve">
     <value>Office Communications Server</value>

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/OrganizationMenu.ascx.resx

@@ -204,8 +204,8 @@
   <data name="Text.SharePointFoundationServerGroup" xml:space="preserve">
     <value>SharePoint Foundation</value>
   </data>
-  <data name="Text.SharePointServerGroup" xml:space="preserve">
+  <data name="Text.SharePointEnterpriseServerGroup" xml:space="preserve">
-    <value>SharePoint Server</value>
+    <value>SharePoint Enterprise Server</value>
   </data>
   <data name="Text.SiteCollections" xml:space="preserve">
     <value>Site Collections</value>

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/UserOrganization.ascx.resx

@@ -237,8 +237,8 @@
   <data name="Text.SharePointFoundationServerGroup" xml:space="preserve">
     <value>Hosted Organization - SharePoint Foundation Server</value>
   </data>
-  <data name="Text.SharePointServerGroup" xml:space="preserve">
+  <data name="Text.SharePointEnterpriseServerGroup" xml:space="preserve">
-    <value>Hosted Organization - SharePoint Server</value>
+    <value>Hosted Organization - SharePoint Enterprise Server</value>
   </data>  
   <data name="Text.SiteCollections" xml:space="preserve">
     <value>Sharepoint Sites</value>

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Code/Helpers/HostedSharePointSiteCollectionsHelper.cs

@@ -37,7 +37,6 @@ using System.Web.UI.WebControls.WebParts;
 using System.Web.UI.HtmlControls;
 using WebsitePanel.Providers.SharePoint;
 using System.Collections.Generic;
-using WebsitePanel.EnterpriseServer;
 
 namespace WebsitePanel.Portal
 {
@@ -45,28 +44,19 @@ namespace WebsitePanel.Portal
 	{
 		SharePointSiteCollectionListPaged result;
 
-		public int GetSharePointSiteCollectionPagedCount(int packageId, int organizationId, string groupName, string filterColumn, string filterValue)
+		public int GetSharePointSiteCollectionPagedCount(int packageId, int organizationId, string filterColumn, string filterValue)
 		{
 			return result.TotalRowCount;
 		}
 
-		public List<SharePointSiteCollection> GetSharePointSiteCollectionPaged(int packageId, int organizationId, string groupName, string filterColumn, string filterValue, int maximumRows, int startRowIndex, string sortColumn)
+		public List<SharePointSiteCollection> GetSharePointSiteCollectionPaged(int packageId, int organizationId, string filterColumn, string filterValue, int maximumRows, int startRowIndex, string sortColumn)
 		{
 			if (!String.IsNullOrEmpty(filterValue))
 			{
 				filterValue = filterValue + "%";
 			}
 
-            if (ResourceGroups.SharepointFoundationServer.Replace(" ", "").Equals(groupName))
+			result = ES.Services.HostedSharePointServers.GetSiteCollectionsPaged(packageId, organizationId, filterColumn, filterValue, sortColumn, startRowIndex, maximumRows);
-            {
-                groupName = ResourceGroups.SharepointFoundationServer;
-            }
-            else if (ResourceGroups.SharepointServer.Replace(" ", "").Equals(groupName))
-            {
-                groupName = ResourceGroups.SharepointServer;
-            }
-
-			result = ES.Services.HostedSharePointServers.GetSiteCollectionsPaged(packageId, organizationId, filterColumn, filterValue, sortColumn, startRowIndex, maximumRows, groupName);
 
 			return result.SiteCollections;            
 		}

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

@@ -168,8 +168,8 @@
   <data name="Text.SharePointFoundationServerGroup" xml:space="preserve">
     <value>SharePoint Foundation</value>
   </data>
-  <data name="Text.SharePointServerGroup" xml:space="preserve">
+  <data name="Text.SharePointEnterpriseServerGroup" xml:space="preserve">
-    <value>SharePoint Server</value>
+    <value>SharePoint Enterprise</value>
   </data>
   <data name="Text.OCSGroup" xml:space="preserve">
     <value>OCS</value>

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

@@ -319,9 +319,9 @@ namespace WebsitePanel.Portal.ExchangeServer.UserControls
                 PrepareSharePointMenu(cntx, groups, imagePath, GetLocalizedString("Text.SharePointFoundationServerGroup"));
             }
 
-            if (cntx.Groups.ContainsKey(ResourceGroups.SharepointServer))
+            if (cntx.Groups.ContainsKey(ResourceGroups.SharepointEnterpriseServer))
             {
-                PrepareSharePointMenu(cntx, groups, imagePath, GetLocalizedString("Text.SharePointServerGroup"));
+                PrepareSharePointMenu(cntx, groups, imagePath, GetLocalizedString("Text.SharePointEnterpriseServerGroup"));
             }
 
             //CRM Menu

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePointBackupSiteCollection.ascx

@@ -14,7 +14,6 @@
 <div id="ExchangeContainer">
 	<div class="Module">
 		<div class="Left">
-            <wsp:Menu id="menu" runat="server" SelectedItem="sharepoint_sitecollections" />
 		</div>
 		<div class="Content">
 			<div class="Center">

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePointBackupSiteCollection.ascx.designer.cs

@@ -21,15 +21,6 @@ namespace WebsitePanel.Portal {
         /// </remarks>
         protected global::WebsitePanel.Portal.EnableAsyncTasksSupport asyncTasks;
         
-        /// <summary>
-        /// menu 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.Menu menu;
-        
         /// <summary>
         /// Image1 control.
         /// </summary>

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePointEditSiteCollection.ascx

@@ -15,7 +15,6 @@
 <div id="ExchangeContainer">
 	<div class="Module">
 		<div class="Left">
-            <wsp:Menu id="menu" runat="server" SelectedItem="sharepoint_sitecollections" />
 		</div>
 		<div class="Content">
 			<div class="Center">

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePointEditSiteCollection.ascx.cs

@@ -44,11 +44,6 @@ namespace WebsitePanel.Portal
     {
         SharePointSiteCollection item = null;
 
-        public static string GroupName
-        {
-            get { return HttpContext.Current.Request["GroupName"]; }
-        }
-
         private int OrganizationId
         {
             get
@@ -230,7 +225,7 @@ namespace WebsitePanel.Portal
         /// <returns> Reserved disk space vallue.</returns>
         private int GetReservedDiskStorageSpace()
         {
-            var existingCollections = ES.Services.HostedSharePointServers.GetSiteCollections(PanelSecurity.PackageId, false, GroupName);
+            var existingCollections = ES.Services.HostedSharePointServers.GetSiteCollections(PanelSecurity.PackageId, false);
 
             return (int)existingCollections.Sum(siteCollection => siteCollection.MaxSiteStorage);
         }
@@ -257,20 +252,9 @@ namespace WebsitePanel.Portal
                 {
                     item = new SharePointSiteCollection();
 
-                    string groupName = GroupName;
+                       if (!UseSharedSLL(PanelSecurity.PackageId))
-
-                    if (ResourceGroups.SharepointFoundationServer.Replace(" ", "").Equals(groupName))
-                    {
-                        groupName = ResourceGroups.SharepointFoundationServer;
-                    }
-                    else if (ResourceGroups.SharepointServer.Replace(" ", "").Equals(groupName))
-                    {
-                        groupName = ResourceGroups.SharepointServer;
-                    }
-
-                    if (!UseSharedSLL(PanelSecurity.PackageId))
                     {                        
-                        SharePointSiteCollectionListPaged existentSiteCollections = ES.Services.HostedSharePointServers.GetSiteCollectionsPaged(PanelSecurity.PackageId, this.OrganizationId, "ItemName", String.Format("%{0}", this.domain.DomainName), String.Empty, 0, Int32.MaxValue, groupName);
+                        SharePointSiteCollectionListPaged existentSiteCollections = ES.Services.HostedSharePointServers.GetSiteCollectionsPaged(PanelSecurity.PackageId, this.OrganizationId, "ItemName", String.Format("%{0}", this.domain.DomainName), String.Empty, 0, Int32.MaxValue);
                         foreach (SharePointSiteCollection existentSiteCollection in existentSiteCollections.SiteCollections)
                         {
                             Uri existentSiteCollectionUri = new Uri(existentSiteCollection.Name);
@@ -303,7 +287,7 @@ namespace WebsitePanel.Portal
                     item.MaxSiteStorage = maxStorage.QuotaValue;
                     item.WarningStorage = warningStorage.QuotaValue;                    
 
-                    int result = ES.Services.HostedSharePointServers.AddSiteCollection(item, groupName);
+                    int result = ES.Services.HostedSharePointServers.AddSiteCollection(item);
                     if (result < 0)
                     {
                         localMessageBox.ShowResultMessage(result);
@@ -390,19 +374,19 @@ namespace WebsitePanel.Portal
 
         protected void btnBackup_Click(object sender, EventArgs e)
         {
-            Response.Redirect(EditUrl("SpaceID", PanelSecurity.PackageId.ToString(), "sharepoint_backup_sitecollection", "SiteCollectionID=" + this.SiteCollectionId, "ItemID=" + PanelRequest.ItemID.ToString(), "GroupName=" + GroupName));
+            Response.Redirect(EditUrl("SpaceID", PanelSecurity.PackageId.ToString(), "sharepoint_backup_sitecollection", "SiteCollectionID=" + this.SiteCollectionId, "ItemID=" + PanelRequest.ItemID.ToString()));
         }
 
         protected void btnRestore_Click(object sender, EventArgs e)
         {
-            Response.Redirect(EditUrl("SpaceID", PanelSecurity.PackageId.ToString(), "sharepoint_restore_sitecollection", "SiteCollectionID=" + this.SiteCollectionId, "ItemID=" + PanelRequest.ItemID.ToString(), "GroupName=" + GroupName));
+            Response.Redirect(EditUrl("SpaceID", PanelSecurity.PackageId.ToString(), "sharepoint_restore_sitecollection", "SiteCollectionID=" + this.SiteCollectionId, "ItemID=" + PanelRequest.ItemID.ToString()));
         }
 
 
 
         private void RedirectToSiteCollectionsList()
         {
-            Response.Redirect(EditUrl("SpaceID", PanelSecurity.PackageId.ToString(), "sharepoint_sitecollections", "ItemID=" + PanelRequest.ItemID.ToString(), "GroupName=" + GroupName));
+            Response.Redirect(EditUrl("SpaceID", PanelSecurity.PackageId.ToString(), "sharepoint_sitecollections", "ItemID=" + PanelRequest.ItemID.ToString()));
         }
 
         private bool UseSharedSLL(int packageID)

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePointEditSiteCollection.ascx.designer.cs

@@ -21,15 +21,6 @@ namespace WebsitePanel.Portal {
         /// </remarks>
         protected global::WebsitePanel.Portal.EnableAsyncTasksSupport asyncTasks;
         
-        /// <summary>
-        /// menu 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.Menu menu;
-        
         /// <summary>
         /// Image1 control.
         /// </summary>

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePointRestoreSiteCollection.ascx

@@ -17,7 +17,6 @@
 <div id="ExchangeContainer">
 	<div class="Module">
 		<div class="Left">
-            <wsp:Menu id="menu" runat="server" SelectedItem="sharepoint_sitecollections" />
 		</div>
 		<div class="Content">
 			<div class="Center">

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePointRestoreSiteCollection.ascx.designer.cs

@@ -21,15 +21,6 @@ namespace WebsitePanel.Portal {
         /// </remarks>
         protected global::WebsitePanel.Portal.EnableAsyncTasksSupport asyncTasks;
         
-        /// <summary>
-        /// menu 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.Menu menu;
-        
         /// <summary>
         /// Image1 control.
         /// </summary>

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePointStorageSettings.ascx

@@ -14,7 +14,6 @@
 <div id="ExchangeContainer">
 	<div class="Module">
 		<div class="Left">
-            <wsp:Menu id="menu" runat="server" SelectedItem="storage_limits" /> 
         </div>
 		<div class="Content">
 			<div class="Center">

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePointStorageSettings.ascx.designer.cs

@@ -12,15 +12,6 @@ namespace WebsitePanel.Portal {
     
     public partial class HostedSharePointStorageSettings {
         
-        /// <summary>
-        /// menu 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.Menu menu;
-        
         /// <summary>
         /// Image1 control.
         /// </summary>

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePointStorageUsage.ascx

@@ -11,7 +11,6 @@
 <div id="ExchangeContainer">
 	<div class="Module">
 		<div class="Left">
-            <wsp:Menu id="menu" runat="server" SelectedItem="storage_limits" /> 
         </div>
 		<div class="Content">
 			<div class="Center">

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePointStorageUsage.ascx.designer.cs

@@ -12,15 +12,6 @@ namespace WebsitePanel.Portal {
     
     public partial class HostedSharePointStorageUsage {
         
-        /// <summary>
-        /// menu 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.Menu menu;
-        
         /// <summary>
         /// Image1 control.
         /// </summary>

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ServersEditService.ascx.cs

@@ -161,7 +161,7 @@ namespace WebsitePanel.Portal
                                                                 (resourceGroup.GroupName == ResourceGroups.Os)|
                                                                 (resourceGroup.GroupName == ResourceGroups.HostedOrganizations) |
                                                                 (resourceGroup.GroupName == ResourceGroups.SharepointFoundationServer) |
-                                                                (resourceGroup.GroupName == ResourceGroups.SharepointServer) |
+                                                                (resourceGroup.GroupName == ResourceGroups.SharepointEnterpriseServer) |
                                                                 (resourceGroup.GroupName == ResourceGroups.Mail)|
                                                                 (resourceGroup.GroupName == ResourceGroups.Lync)|
                                                                 (resourceGroup.GroupName == ResourceGroups.Exchange)|

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserControls/OrganizationMenuControl.cs

@@ -98,8 +98,8 @@ namespace WebsitePanel.Portal.UserControls
             if (Cntx.Groups.ContainsKey(ResourceGroups.SharepointFoundationServer))
                 PrepareSharePointMenuRoot(items, GetLocalizedString("Text.SharePointFoundationServerGroup"), ResourceGroups.SharepointFoundationServer.Replace(" ", ""));
 
-            if (Cntx.Groups.ContainsKey(ResourceGroups.SharepointServer))
+            if (Cntx.Groups.ContainsKey(ResourceGroups.SharepointEnterpriseServer))
-                PrepareSharePointMenuRoot(items, GetLocalizedString("Text.SharePointServerGroup"), ResourceGroups.SharepointServer.Replace(" ", ""));
+                PrepareSharePointMenuRoot(items, GetLocalizedString("Text.SharePointEnterpriseServerGroup"), ResourceGroups.SharepointEnterpriseServer.Replace(" ", ""));
 
             //CRM Menu
             if (Cntx.Groups.ContainsKey(ResourceGroups.HostedCRM2013))