diff --git a/WebsitePanel.WHMCSModule/modules/addons/websitepanel_addons/websitepanel_addons.php b/WebsitePanel.WHMCSModule/modules/addons/websitepanel_addons/websitepanel_addons.php
index fa8036bd..d71cb9b7 100644
--- a/WebsitePanel.WHMCSModule/modules/addons/websitepanel_addons/websitepanel_addons.php
+++ b/WebsitePanel.WHMCSModule/modules/addons/websitepanel_addons/websitepanel_addons.php
@@ -68,7 +68,7 @@ function websitepanel_addons_activate()
$query = "CREATE TABLE `mod_wspaddons` (
`whmcs_id` int(11) NOT NULL,
`wsp_id` int(11) NOT NULL,
- `is_ipaddress` bit(1) NOT NULL DEFAULT b'0',
+ `is_ipaddress` bit(1) NOT NULL DEFAULT 0,
PRIMARY KEY (`whmcs_id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;";
$result = full_query($query);
diff --git a/WebsitePanel/Database/update_db.sql b/WebsitePanel/Database/update_db.sql
index 1547a587..03265998 100644
--- a/WebsitePanel/Database/update_db.sql
+++ b/WebsitePanel/Database/update_db.sql
@@ -2372,3 +2372,32 @@ UPDATE AdditionalGroups SET
GroupName = @GroupName
WHERE ID = @GroupID
GO
+
+
+
+-- Remote Desktop Services
+
+-- RDS ResourceGroup
+
+IF NOT EXISTS (SELECT * FROM [dbo].[ResourceGroups] WHERE [GroupName] = 'RDS')
+BEGIN
+INSERT [dbo].[ResourceGroups] ([GroupID], [GroupName], [GroupOrder], [GroupController], [ShowGroup]) VALUES (45, N'RDS', 26, NULL, 1)
+END
+GO
+
+-- RDS Quota
+
+IF NOT EXISTS (SELECT * FROM [dbo].[Quotas] WHERE [QuotaName] = 'RDS.Users')
+BEGIN
+INSERT [dbo].[Quotas] ([QuotaID], [GroupID],[QuotaOrder], [QuotaName], [QuotaDescription], [QuotaTypeID], [ServiceQuota], [ItemTypeID]) VALUES (450, 45, 1, N'RDS.Users',N'Remote Desktop Users',2, 0 , NULL)
+END
+GO
+
+-- RDS Provider
+
+IF NOT EXISTS (SELECT * FROM [dbo].[Providers] WHERE [DisplayName] = 'Remote Desktop Services Windows 2012')
+BEGIN
+INSERT [dbo].[Providers] ([ProviderId], [GroupId], [ProviderName], [DisplayName], [ProviderType], [EditorControl], [DisableAutoDiscovery])
+VALUES(1501, 45, N'RemoteDesktopServices2012', N'Remote Desktop Services Windows 2012', N'WebsitePanel.Providers.RemoteDesktopServices.Windows2012,WebsitePanel.Providers.RemoteDesktopServices.Windows2012', N'RDS', 1)
+END
+GO
diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Base/HostedSolution/ESPermission.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Base/HostedSolution/ESPermission.cs
new file mode 100644
index 00000000..75af0759
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Base/HostedSolution/ESPermission.cs
@@ -0,0 +1,40 @@
+п»їusing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace WebsitePanel.EnterpriseServer.Base.HostedSolution
+{
+ public class ESPermission
+ {
+ string displayName;
+ string account;
+ string access;
+ bool isGroup;
+
+ public string DisplayName
+ {
+ get { return displayName; }
+ set { displayName = value; }
+ }
+
+ public string Account
+ {
+ get { return account; }
+ set { account = value; }
+ }
+
+ public string Access
+ {
+ get { return access; }
+ set { access = value; }
+ }
+
+ public bool IsGroup
+ {
+ get { return isGroup; }
+ set { isGroup = value; }
+ }
+ }
+
+}
diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Base/Packages/Quotas.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Base/Packages/Quotas.cs
index 6e6bad12..8e3abc8f 100644
--- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Base/Packages/Quotas.cs
+++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Base/Packages/Quotas.cs
@@ -234,5 +234,8 @@ order by rg.groupOrder
public const string HELICON_ZOO = "HeliconZoo.*";
+ public const string ENTERPRISESTORAGE_DISKSTORAGESPACE = "EnterpriseStorage.DiskStorageSpace";
+ public const string ENTERPRISESTORAGE_FOLDERS = "EnterpriseStorage.Folders";
+
}
}
diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Base/WebsitePanel.EnterpriseServer.Base.csproj b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Base/WebsitePanel.EnterpriseServer.Base.csproj
index e5ea3611..082f5542 100644
--- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Base/WebsitePanel.EnterpriseServer.Base.csproj
+++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Base/WebsitePanel.EnterpriseServer.Base.csproj
@@ -117,6 +117,7 @@
// This code was generated by a tool.
-// Runtime Version:2.0.50727.6407
+// Runtime Version:2.0.50727.4984
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@@ -37,489 +37,929 @@
//------------------------------------------------------------------------------
//
-// This source code was auto-generated by wsdl, Version=2.0.50727.3038.
+// This source code was auto-generated by wsdl, Version=2.0.50727.42.
//
+
+using WebsitePanel.EnterpriseServer.Base.HostedSolution;
using WebsitePanel.Providers;
using WebsitePanel.Providers.Common;
-using WebsitePanel.Providers.ResultObjects;
+using WebsitePanel.Providers.HostedSolution;
using WebsitePanel.Providers.OS;
-
-namespace WebsitePanel.EnterpriseServer {
+namespace WebsitePanel.EnterpriseServer
+{
using System.Xml.Serialization;
using System.Web.Services;
using System.ComponentModel;
using System.Web.Services.Protocols;
using System;
using System.Diagnostics;
-
-
+
+
///
// This code was generated by a tool.
-// Runtime Version:2.0.50727.5466
+// Runtime Version:2.0.50727.4984
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@@ -39,7 +38,14 @@
//
// This source code was auto-generated by wsdl, Version=2.0.50727.42.
//
-namespace WebsitePanel.EnterpriseServer {
+
+using WebsitePanel.Providers;
+using WebsitePanel.Providers.Common;
+using WebsitePanel.Providers.ResultObjects;
+using WebsitePanel.Providers.Web;
+
+namespace WebsitePanel.EnterpriseServer
+{
using System.Xml.Serialization;
using System.Web.Services;
using System.ComponentModel;
@@ -47,478 +53,1931 @@ namespace WebsitePanel.EnterpriseServer {
using System;
using System.Diagnostics;
using System.Data;
- using WebsitePanel.Providers;
- using WebsitePanel.Providers.Common;
- using WebsitePanel.Providers.Web;
- using WebsitePanel.Providers.ResultObjects;
-
-
+
+
/// SearchESAccounts(int itemId, string filterColumn, string filterValue, string sortColumn)
+ {
+ return SearchESAccountsInternal(itemId, filterColumn, filterValue, sortColumn);
}
- public static ResultObject SetFolderQuota(int itemId, string folderName, long quota)
+ public static SystemFilesPaged GetEnterpriseFoldersPaged(int itemId, string filterValue, string sortColumn, int startRow, int maximumRows)
{
- return SetFolderQuotaInternal(itemId, folderName, quota);
+ return GetEnterpriseFoldersPagedInternal(itemId, filterValue, sortColumn, startRow, maximumRows);
}
+
+ public static ResultObject SetFolderPermission(int itemId, string folder, ESPermission[] permission)
+ {
+ return SetFolderWebDavRulesInternal(itemId, folder, permission);
+ }
+
+ public static ESPermission[] GetFolderPermission(int itemId, string folder)
+ {
+ return ConvertToESPermission(itemId,GetFolderWebDavRulesInternal(itemId, folder));
+ }
+
+ public static bool CheckFileServicesInstallation(int serviceId)
+ {
+ EnterpriseStorage es = GetEnterpriseStorage(serviceId);
+ return es.CheckFileServicesInstallation();
+ }
+
+ public static SystemFile RenameFolder(int itemId, string oldFolder, string newFolder)
+ {
+ return RenameFolderInternal(itemId, oldFolder, newFolder);
+ }
+
#endregion
@@ -83,37 +124,376 @@ namespace WebsitePanel.EnterpriseServer
return es;
}
-
- private static SystemFile[] GetFoldersInternal(int itemId)
+ protected static SystemFile[] GetFoldersInternal(int itemId)
{
- return new SystemFile[1];
+ try
+ {
+ // load organization
+ Organization org = OrganizationController.GetOrganization(itemId);
+ if (org == null)
+ {
+ return null;
+ }
+
+ EnterpriseStorage es = GetEnterpriseStorage(GetEnterpriseStorageServiceID(org.PackageId));
+
+ return es.GetFolders(org.OrganizationId);
+ }
+ catch (Exception ex)
+ {
+ throw ex;
+ }
}
- private static SystemFile GetFolderInternal(int itemId, string folderName)
+ protected static SystemFile GetFolderInternal(int itemId, string folderName)
{
- return new SystemFile();
- }
+ try
+ {
+ // load organization
+ Organization org = OrganizationController.GetOrganization(itemId);
+ if (org == null)
+ {
+ return null;
+ }
- private static ResultObject CreateFolderInternal(int itemId, string folderName, long quota)
- {
- return new ResultObject();
- }
+ EnterpriseStorage es = GetEnterpriseStorage(GetEnterpriseStorageServiceID(org.PackageId));
- private static ResultObject DeleteFolderInternal(int itemId, string folderName)
- {
- return new ResultObject();
- }
-
- private static ResultObject SetFolderQuotaInternal(int itemId, string folderName, long quota)
- {
- return new ResultObject();
+ return es.GetFolder(org.OrganizationId, folderName);
+ }
+ catch (Exception ex)
+ {
+ throw ex;
+ }
}
- public static bool CheckFileServicesInstallation(int serviceId)
+ protected static SystemFile RenameFolderInternal(int itemId, string oldFolder, string newFolder)
{
- EnterpriseStorage es = GetEnterpriseStorage(serviceId);
- return es.CheckFileServicesInstallation();
+ try
+ {
+ // load organization
+ Organization org = OrganizationController.GetOrganization(itemId);
+ if (org == null)
+ {
+ return null;
+ }
+
+ EnterpriseStorage es = GetEnterpriseStorage(GetEnterpriseStorageServiceID(org.PackageId));
+
+ return es.RenameFolder(org.OrganizationId, oldFolder, newFolder);
+ }
+ catch (Exception ex)
+ {
+ throw ex;
+ }
+ }
+
+ protected static ResultObject CreateFolderInternal(int itemId, string folderName)
+ {
+ ResultObject result = TaskManager.StartResultTask("ENTERPRISE_STORAGE", "CREATE_FOLDER");
+
+ try
+ {
+ // load organization
+ Organization org = OrganizationController.GetOrganization(itemId);
+ if (org == null)
+ {
+ return null;
+ }
+
+ EnterpriseStorage es = GetEnterpriseStorage(GetEnterpriseStorageServiceID(org.PackageId));
+
+ es.CreateFolder(org.OrganizationId, folderName);
+ }
+ catch (Exception ex)
+ {
+ result.AddError("ENTERPRISE_STORAGE_CREATE_FOLDER", ex);
+ }
+ finally
+ {
+ if (!result.IsSuccess)
+ {
+ TaskManager.CompleteResultTask(result);
+ }
+ else
+ {
+ TaskManager.CompleteResultTask();
+ }
+ }
+
+ return result;
+ }
+
+ protected static ResultObject DeleteFolderInternal(int itemId, string folderName)
+ {
+ ResultObject result = TaskManager.StartResultTask("ENTERPRISE_STORAGE", "DELETE_FOLDER");
+
+ try
+ {
+ // load organization
+ Organization org = OrganizationController.GetOrganization(itemId);
+ if (org == null)
+ {
+ return null;
+ }
+
+ EnterpriseStorage es = GetEnterpriseStorage(GetEnterpriseStorageServiceID(org.PackageId));
+
+ es.DeleteFolder(org.OrganizationId, folderName);
+ }
+ catch (Exception ex)
+ {
+ result.AddError("ENTERPRISE_STORAGE_DELETE_FOLDER", ex);
+ }
+ finally
+ {
+ if (!result.IsSuccess)
+ {
+ TaskManager.CompleteResultTask(result);
+ }
+ else
+ {
+ TaskManager.CompleteResultTask();
+ }
+ }
+
+ return result;
+ }
+
+ protected static List SearchESAccountsInternal(int itemId, string filterColumn, string filterValue, string sortColumn)
+ {
+ // load organization
+ Organization org = (Organization)PackageController.GetPackageItem(itemId);
+ if (org == null)
+ return null;
+
+ string accountTypes = string.Format("{0}, {1}, {2}", ((int)ExchangeAccountType.SecurityGroup),
+ (int)ExchangeAccountType.DefaultSecurityGroup, ((int)ExchangeAccountType.User));
+
+ if (PackageController.GetPackageServiceId(org.PackageId, ResourceGroups.Exchange) != 0)
+ {
+ accountTypes = string.Format("{0}, {1}, {2}, {3}", accountTypes, ((int)ExchangeAccountType.Mailbox),
+ ((int)ExchangeAccountType.Room), ((int)ExchangeAccountType.Equipment));
+ }
+
+ List tmpAccounts = ObjectUtils.CreateListFromDataReader(
+ DataProvider.SearchExchangeAccountsByTypes(SecurityContext.User.UserId, itemId,
+ accountTypes, filterColumn, filterValue, sortColumn));
+
+
+ List exAccounts = new List();
+
+ foreach (ExchangeAccount tmpAccount in tmpAccounts.ToArray())
+ {
+ if (tmpAccount.AccountType == ExchangeAccountType.SecurityGroup || tmpAccount.AccountType == ExchangeAccountType.SecurityGroup
+ ? OrganizationController.GetSecurityGroupGeneralSettings(itemId, tmpAccount.AccountId) == null
+ : OrganizationController.GetSecurityGroupGeneralSettings(itemId, tmpAccount.AccountId) == null)
+ continue;
+
+ exAccounts.Add(tmpAccount);
+ }
+
+ return exAccounts;
+
+ }
+
+ protected static SystemFilesPaged GetEnterpriseFoldersPagedInternal(int itemId, string filterValue, string sortColumn,
+ int startRow, int maximumRows)
+ {
+ SystemFilesPaged result = new SystemFilesPaged();
+
+ try
+ {
+ // load organization
+ Organization org = OrganizationController.GetOrganization(itemId);
+ if (org == null)
+ {
+ return null;
+ }
+
+ EnterpriseStorage es = GetEnterpriseStorage(GetEnterpriseStorageServiceID(org.PackageId));
+ List folders = es.GetFolders(org.OrganizationId).Where(x => x.Name.Contains(filterValue)).ToList();
+
+ switch (sortColumn)
+ {
+ case "Size":
+ folders = folders.OrderBy(x => x.Size).ToList();
+ break;
+ default:
+ folders = folders.OrderBy(x => x.Name).ToList();
+ break;
+ }
+
+ result.RecordsCount = folders.Count;
+ result.PageItems = folders.Skip(startRow).Take(maximumRows).ToArray();
+ }
+ catch { /*skip exception*/}
+
+ return result;
+ }
+
+ protected static ResultObject SetFolderWebDavRulesInternal(int itemId, string folder, ESPermission[] permission)
+ {
+ ResultObject result = TaskManager.StartResultTask("ENTERPRISE_STORAGE", "SET_WEBDAV_FOLDER_RULES");
+
+ try
+ {
+ // load organization
+ Organization org = OrganizationController.GetOrganization(itemId);
+ if (org == null)
+ {
+ return null;
+ }
+
+ var rules = ConvertToWebDavRule(itemId,permission);
+
+ EnterpriseStorage es = GetEnterpriseStorage(GetEnterpriseStorageServiceID(org.PackageId));
+
+ es.SetFolderWebDavRules(org.OrganizationId, folder, rules);
+ }
+ catch (Exception ex)
+ {
+ result.AddError("ENTERPRISE_STORAGE_SET_WEBDAV_FOLDER_RULES", ex);
+ }
+ finally
+ {
+ if (!result.IsSuccess)
+ {
+ TaskManager.CompleteResultTask(result);
+ }
+ else
+ {
+ TaskManager.CompleteResultTask();
+ }
+ }
+
+ return result;
+ }
+
+ protected static WebDavFolderRule[] GetFolderWebDavRulesInternal(int itemId, string folder)
+ {
+ try
+ {
+ // load organization
+ Organization org = OrganizationController.GetOrganization(itemId);
+ if (org == null)
+ {
+ return null;
+ }
+
+ EnterpriseStorage es = GetEnterpriseStorage(GetEnterpriseStorageServiceID(org.PackageId));
+
+ return es.GetFolderWebDavRules(org.OrganizationId, folder);
+ }
+ catch (Exception ex)
+ {
+ throw ex;
+ }
+
+ }
+
+ private static int GetEnterpriseStorageServiceID(int packageId)
+ {
+ return PackageController.GetPackageServiceId(packageId, ResourceGroups.EnterpriseStorage);
+ }
+
+ private static EnterpriseStorage GetEnterpriseStorageByPackageId(int packageId)
+ {
+ var serviceId = PackageController.GetPackageServiceId(packageId, ResourceGroups.EnterpriseStorage);
+
+ return GetEnterpriseStorage(serviceId);
+ }
+
+ private static WebDavFolderRule[] ConvertToWebDavRule(int itemId, ESPermission[] permissions)
+ {
+ var rules = new List();
+
+ foreach (var permission in permissions)
+ {
+ var rule = new WebDavFolderRule();
+
+ var account = ObjectUtils.FillObjectFromDataReader(DataProvider.GetExchangeAccountByAccountName(itemId, permission.Account));
+
+ if (account.AccountType == ExchangeAccountType.SecurityGroup)
+ {
+ rule.Roles.Add(permission.Account);
+ }
+ else
+ {
+ rule.Users.Add(permission.Account);
+ }
+
+ if (permission.Access.ToLower().Contains("read-only"))
+ {
+ rule.Read = true;
+ }
+
+ if (permission.Access.ToLower().Contains("read-write"))
+ {
+ rule.Write = true;
+ rule.Read = true;
+ }
+
+ rule.Pathes.Add("*");
+
+ rules.Add(rule);
+ }
+
+ return rules.ToArray();
+ }
+
+ private static ESPermission[] ConvertToESPermission(int itemId, WebDavFolderRule[] rules)
+ {
+ var permissions = new List();
+
+ foreach (var rule in rules)
+ {
+ var permission = new ESPermission();
+
+ permission.Account = rule.Users.Any() ? rule.Users[0] : rule.Roles[0];
+
+ permission.IsGroup = rule.Roles.Any();
+
+ var orgObj = OrganizationController.GetAccountByAccountName(itemId, permission.Account);
+
+ if (orgObj == null)
+ continue;
+
+ if (permission.IsGroup)
+ {
+ var secGroupObj = OrganizationController.GetSecurityGroupGeneralSettings(itemId, orgObj.AccountId);
+
+ if (secGroupObj == null)
+ continue;
+
+ permission.DisplayName = secGroupObj.DisplayName;
+
+ }
+ else
+ {
+ var userObj = OrganizationController.GetUserGeneralSettings(itemId, orgObj.AccountId);
+
+ if (userObj == null)
+ continue;
+
+ permission.DisplayName = userObj.DisplayName;
+ }
+
+ if (rule.Read && !rule.Write)
+ {
+ permission.Access = "Read-Only";
+ }
+ if (rule.Write)
+ {
+ permission.Access = "Read-Write";
+ }
+
+
+ permissions.Add(permission);
+ }
+
+ return permissions.ToArray();
+
}
}
}
diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/Files/FilesController.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/Files/FilesController.cs
index 913941f1..cffcc6db 100644
--- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/Files/FilesController.cs
+++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/Files/FilesController.cs
@@ -910,7 +910,7 @@ namespace WebsitePanel.EnterpriseServer
return users.ToArray();
}
- public static int SetFolderQuota(int packageId, string path, string driveName)
+ public static int SetFolderQuota(int packageId, string path, string driveName,string quotas)
{
// check account
@@ -929,8 +929,8 @@ namespace WebsitePanel.EnterpriseServer
// disk space quota
// This gets all the disk space allocated for a specific customer
- // It includes the package Add Ons * Quatity + Hosting Plan System disk space value.
- QuotaValueInfo diskSpaceQuota = PackageController.GetPackageQuota(packageId, Quotas.OS_DISKSPACE);
+ // It includes the package Add Ons * Quatity + Hosting Plan System disk space value. //Quotas.OS_DISKSPACE
+ QuotaValueInfo diskSpaceQuota = PackageController.GetPackageQuota(packageId, quotas);
#region figure Quota Unit
@@ -965,7 +965,7 @@ namespace WebsitePanel.EnterpriseServer
}
-
+
public static int ApplyEnableHardQuotaFeature(int packageId)
{
if (SecurityContext.CheckAccount(DemandAccount.IsActive | DemandAccount.IsAdmin | DemandAccount.NotDemo) != 0)
@@ -1014,7 +1014,7 @@ namespace WebsitePanel.EnterpriseServer
continue;
string homeFolder = FilesController.GetHomeFolder(childPackage.PackageId);
- FilesController.SetFolderQuota(childPackage.PackageId, homeFolder, driveName);
+ FilesController.SetFolderQuota(childPackage.PackageId, homeFolder, driveName, Quotas.OS_DISKSPACE);
}
}
catch (Exception ex)
@@ -1027,7 +1027,6 @@ namespace WebsitePanel.EnterpriseServer
}
return 0;
-
}
public static int DeleteDirectoryRecursive(int packageId, string rootPath)
diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/HostedSolution/OrganizationController.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/HostedSolution/OrganizationController.cs
index 27ccc76f..a2dc1d4a 100644
--- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/HostedSolution/OrganizationController.cs
+++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/HostedSolution/OrganizationController.cs
@@ -48,6 +48,7 @@ using System.IO;
using System.Xml;
using System.Xml.Serialization;
using WebsitePanel.EnterpriseServer.Base.HostedSolution;
+using WebsitePanel.Providers.OS;
namespace WebsitePanel.EnterpriseServer
{
@@ -417,6 +418,36 @@ namespace WebsitePanel.EnterpriseServer
};
PackageController.AddPackageItem(orgDomain);
+
+ //Create Enterprise storage
+
+ int esServiceId = PackageController.GetPackageServiceId(packageId, ResourceGroups.EnterpriseStorage);
+
+ if (esServiceId != 0)
+ {
+ StringDictionary esSesstings = ServerController.GetServiceSettings(esServiceId);
+
+ string usersHome = esSesstings["UsersHome"];
+ string usersDomain = esSesstings["UsersDomain"];
+ string locationDrive = esSesstings["LocationDrive"];
+
+ string homePath = string.Format("{0}:\\{1}",locationDrive, usersHome);
+
+ EnterpriseStorageController.CreateFolder(itemId);
+
+ WebServerController.AddWebDavDirectory(packageId, usersDomain, organizationId, homePath);
+
+ int osId = PackageController.GetPackageServiceId(packageId, ResourceGroups.Os);
+ bool enableHardQuota = (esSesstings["enablehardquota"] != null)
+ ? bool.Parse(esSesstings["enablehardquota"])
+ : false;
+
+ if (enableHardQuota && osId != 0 && OperatingSystemController.CheckFileServicesInstallation(osId))
+ {
+ FilesController.SetFolderQuota(packageId, Path.Combine(usersHome, organizationId),
+ locationDrive, Quotas.ENTERPRISESTORAGE_DISKSTORAGESPACE);
+ }
+ }
}
catch (Exception ex)
{
@@ -714,6 +745,26 @@ namespace WebsitePanel.EnterpriseServer
TaskManager.WriteError(ex);
}
+ //Cleanup Enterprise storage
+ int esId = PackageController.GetPackageServiceId(org.PackageId, ResourceGroups.EnterpriseStorage);
+
+ if (esId != 0)
+ {
+ StringDictionary esSesstings = ServerController.GetServiceSettings(esId);
+
+ string usersDomain = esSesstings["UsersDomain"];
+
+ try
+ {
+ WebServerController.DeleteWebDavDirectory(org.PackageId, usersDomain, org.OrganizationId);
+ EnterpriseStorageController.DeleteFolder(itemId);
+ }
+ catch (Exception ex)
+ {
+ successful = false;
+ TaskManager.WriteError(ex);
+ }
+ }
//Cleanup Exchange
try
@@ -741,8 +792,6 @@ namespace WebsitePanel.EnterpriseServer
TaskManager.WriteError(ex);
}
-
-
// delete organization domains
List domains = GetOrganizationDomains(itemId);
foreach (OrganizationDomainName domain in domains)
@@ -764,7 +813,6 @@ namespace WebsitePanel.EnterpriseServer
// delete meta-item
PackageController.DeletePackageItem(itemId);
-
return successful ? 0 : BusinessErrorCodes.ERROR_ORGANIZATION_DELETE_SOME_PROBLEMS;
}
catch (Exception ex)
@@ -946,7 +994,13 @@ namespace WebsitePanel.EnterpriseServer
stats.CreatedLyncUsers = LyncController.GetLyncUsersCount(org.Id).Value;
}
+ if (cntxTmp.Groups.ContainsKey(ResourceGroups.EnterpriseStorage))
+ {
+ SystemFile[] folders = EnterpriseStorageController.GetFolders(itemId);
+ stats.CreatedEnterpriseStorageFolders = folders.Count();
+ stats.UsedEnterpriseStorageSpace = (int)folders.Sum(x => x.Size);
+ }
}
else
{
@@ -998,6 +1052,14 @@ namespace WebsitePanel.EnterpriseServer
{
stats.CreatedLyncUsers += LyncController.GetLyncUsersCount(o.Id).Value;
}
+
+ if (cntxTmp.Groups.ContainsKey(ResourceGroups.EnterpriseStorage))
+ {
+ SystemFile[] folders = EnterpriseStorageController.GetFolders(itemId);
+
+ stats.CreatedEnterpriseStorageFolders = folders.Count();
+ stats.UsedEnterpriseStorageSpace = (int)folders.Sum(x => x.Size);
+ }
}
}
}
@@ -1035,6 +1097,17 @@ namespace WebsitePanel.EnterpriseServer
stats.AllocatedLyncUsers = cntx.Quotas[Quotas.LYNC_USERS].QuotaAllocatedValue;
}
+ if (cntx.Groups.ContainsKey(ResourceGroups.EnterpriseStorage))
+ {
+ stats.AllocatedEnterpriseStorageFolders = cntx.Quotas[Quotas.ENTERPRISESTORAGE_FOLDERS].QuotaAllocatedValue;
+ }
+
+
+ if (cntx.Groups.ContainsKey(ResourceGroups.EnterpriseStorage))
+ {
+ stats.AllocatedEnterpriseStorageSpace = cntx.Quotas[Quotas.ENTERPRISESTORAGE_DISKSTORAGESPACE].QuotaAllocatedValue;
+ }
+
return stats;
}
catch (Exception ex)
diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/Packages/PackageController.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/Packages/PackageController.cs
index 5332351b..1b89f3dc 100644
--- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/Packages/PackageController.cs
+++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/Packages/PackageController.cs
@@ -1015,7 +1015,7 @@ namespace WebsitePanel.EnterpriseServer
return;
string homeFolder = FilesController.GetHomeFolder(packageId);
- FilesController.SetFolderQuota(packageId, homeFolder, driveName);
+ FilesController.SetFolderQuota(packageId, homeFolder, driveName, Quotas.OS_DISKSPACE);
}
diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/Servers/ServerController.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/Servers/ServerController.cs
index 7391b19d..50d3a2ae 100644
--- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/Servers/ServerController.cs
+++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/Servers/ServerController.cs
@@ -1249,10 +1249,13 @@ namespace WebsitePanel.EnterpriseServer
int quotaUsed = cntx.Quotas[quotaName].QuotaUsedValue;
// check the maximum allowed number
- if (addressesNumber > (quotaAllocated - quotaUsed))
+ if (quotaAllocated != -1) // check only if not unlimited
{
- res.ErrorCodes.Add("IP_ADDRESSES_QUOTA_LIMIT_REACHED");
- return res;
+ if (addressesNumber > (quotaAllocated - quotaUsed))
+ {
+ res.ErrorCodes.Add("IP_ADDRESSES_QUOTA_LIMIT_REACHED");
+ return res;
+ }
}
// check if requested more than available
diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/Tasks/TaskManager.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/Tasks/TaskManager.cs
index 971ad59a..78abe2ac 100644
--- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/Tasks/TaskManager.cs
+++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/Tasks/TaskManager.cs
@@ -741,7 +741,6 @@ namespace WebsitePanel.EnterpriseServer
if (res != null)
{
res.IsSuccess = false;
-
if (!string.IsNullOrEmpty(errorCode))
res.ErrorCodes.Add(errorCode);
}
diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/WebServers/WebServerController.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/WebServers/WebServerController.cs
index c46671c9..cae1da64 100644
--- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/WebServers/WebServerController.cs
+++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/WebServers/WebServerController.cs
@@ -1708,6 +1708,97 @@ namespace WebsitePanel.EnterpriseServer
}
}
+ public static int AddWebDavDirectory(int packageId, string site, string vdirName, string contentpath)
+ {
+ // check account
+ int accountCheck = SecurityContext.CheckAccount(DemandAccount.NotDemo | DemandAccount.IsActive);
+ if (accountCheck < 0) return accountCheck;
+
+ // place log record
+ TaskManager.StartTask("ENTERPRISE_STORAGE", "ADD_VDIR", vdirName);
+
+ TaskManager.WriteParameter("enterprise storage", site);
+
+ try
+ {
+ // create virtual directory
+ WebVirtualDirectory dir = new WebVirtualDirectory();
+ dir.Name = vdirName;
+ dir.ContentPath = Path.Combine(contentpath, vdirName);
+
+ dir.EnableAnonymousAccess = false;
+ dir.EnableWindowsAuthentication = false;
+ dir.EnableBasicAuthentication = false;
+
+ //dir.InstalledDotNetFramework = aspNet;
+
+ dir.DefaultDocs = null; // inherit from service
+ dir.HttpRedirect = "";
+ dir.HttpErrors = null;
+ dir.MimeMaps = null;
+
+ int serviceId = PackageController.GetPackageServiceId(packageId, ResourceGroups.Web);
+
+ if (serviceId == -1)
+ return serviceId;
+
+ // create directory
+ WebServer web = new WebServer();
+ ServiceProviderProxy.Init(web, serviceId);
+ if (web.VirtualDirectoryExists(site, vdirName))
+ return BusinessErrorCodes.ERROR_VDIR_ALREADY_EXISTS;
+
+ web.CreateVirtualDirectory(site, dir);
+
+ return 0;
+
+ }
+ catch (Exception ex)
+ {
+ throw TaskManager.WriteError(ex);
+ }
+ finally
+ {
+ TaskManager.CompleteTask();
+ }
+ }
+
+ public static int DeleteWebDavDirectory(int packageId, string site, string vdirName)
+ {
+ // check account
+ int accountCheck = SecurityContext.CheckAccount(DemandAccount.NotDemo | DemandAccount.IsActive);
+ if (accountCheck < 0) return accountCheck;
+
+ // place log record
+ TaskManager.StartTask("ENTERPRISE_STORAGE", "DELETE_VDIR", vdirName);
+
+ TaskManager.WriteParameter("enterprise storage", site);
+
+ try
+ {
+ int serviceId = PackageController.GetPackageServiceId(packageId, ResourceGroups.Web);
+
+ if (serviceId == -1)
+ return serviceId;
+
+ // create directory
+ WebServer web = new WebServer();
+ ServiceProviderProxy.Init(web, serviceId);
+ if (web.VirtualDirectoryExists(site, vdirName))
+ web.DeleteVirtualDirectory(site, vdirName);
+
+ return 0;
+ }
+ catch (Exception ex)
+ {
+ throw TaskManager.WriteError(ex);
+ }
+ finally
+ {
+ TaskManager.CompleteTask();
+ }
+ }
+
public static int UpdateVirtualDirectory(int siteItemId, WebVirtualDirectory vdir)
{
// check account
@@ -4528,5 +4619,57 @@ Please ensure the space has been allocated {0} IP address as a dedicated one and
return result;
}
#endregion
+
+
+ #region Directory Browsing
+
+ public static bool GetDirectoryBrowseEnabled(int itemId, string siteId)
+ {
+ // load organization
+ var org = OrganizationController.GetOrganization(itemId);
+ if (org == null)
+ {
+ return false;
+ }
+
+ siteId = RemoveProtocolFromUrl(siteId);
+
+ var webServer = GetWebServer(GetWebServerServiceID(org.PackageId));
+
+ return webServer.GetDirectoryBrowseEnabled(siteId);
+ }
+
+ public static void SetDirectoryBrowseEnabled(int itemId, string siteId, bool enabled)
+ {
+ // load organization
+ var org = OrganizationController.GetOrganization(itemId);
+ if (org == null)
+ {
+ return;
+ }
+
+ siteId = RemoveProtocolFromUrl(siteId);
+
+ var webServer = GetWebServer(GetWebServerServiceID(org.PackageId));
+
+ webServer.SetDirectoryBrowseEnabled(siteId, enabled);
+ }
+
+ private static string RemoveProtocolFromUrl(string input)
+ {
+ if (input.Contains("//"))
+ {
+ return System.Text.RegularExpressions.Regex.Split(input, "//")[1];
+ }
+
+ return input;
+ }
+
+ #endregion
+
+ private static int GetWebServerServiceID(int packageId)
+ {
+ return PackageController.GetPackageServiceId(packageId, ResourceGroups.Web);
+ }
}
}
diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/esEnterpriseStorage.asmx.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/esEnterpriseStorage.asmx.cs
index aa7f35d5..638886e6 100644
--- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/esEnterpriseStorage.asmx.cs
+++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/esEnterpriseStorage.asmx.cs
@@ -42,6 +42,8 @@ using WebsitePanel.Providers.HostedSolution;
using WebsitePanel.Providers.EnterpriseStorage;
using WebsitePanel.Providers.ResultObjects;
using WebsitePanel.Providers.OS;
+using WebsitePanel.Providers.Web;
+using WebsitePanel.EnterpriseServer.Base.HostedSolution;
namespace WebsitePanel.EnterpriseServer
{
@@ -74,11 +76,10 @@ namespace WebsitePanel.EnterpriseServer
}
[WebMethod]
- public ResultObject CreateEnterpriseFolder(int itemId, string folderName, long quota)
+ public ResultObject CreateEnterpriseFolder(int itemId, string folderName)
{
- return EnterpriseStorageController.CreateFolder(itemId, folderName, quota);
+ return EnterpriseStorageController.CreateFolder(itemId, folderName);
}
-
[WebMethod]
public ResultObject DeleteEnterpriseFolder(int itemId, string folderName)
@@ -87,9 +88,33 @@ namespace WebsitePanel.EnterpriseServer
}
[WebMethod]
- public ResultObject SetEnterpriseFolderQuota(int itemId, string folderName, long quota)
+ public ESPermission[] GetEnterpriseFolderPermissions(int itemId, string folderName)
{
- return EnterpriseStorageController.SetFolderQuota(itemId, folderName, quota);
+ return EnterpriseStorageController.GetFolderPermission(itemId, folderName);
+ }
+
+ [WebMethod]
+ public ResultObject SetEnterpriseFolderPermissions(int itemId, string folderName, ESPermission[] permission)
+ {
+ return EnterpriseStorageController.SetFolderPermission(itemId, folderName, permission);
+ }
+
+ [WebMethod]
+ public List SearchESAccounts(int itemId, string filterColumn, string filterValue, string sortColumn)
+ {
+ return EnterpriseStorageController.SearchESAccounts(itemId, filterColumn, filterValue, sortColumn);
+ }
+
+ [WebMethod]
+ public SystemFilesPaged GetEnterpriseFoldersPaged(int itemId, string filterValue, string sortColumn, int startRow, int maximumRows)
+ {
+ return EnterpriseStorageController.GetEnterpriseFoldersPaged(itemId, filterValue, sortColumn, startRow, maximumRows);
+ }
+
+ [WebMethod]
+ public SystemFile RenameEnterpriseFolder(int itemId, string oldName, string newName)
+ {
+ return EnterpriseStorageController.RenameFolder(itemId, oldName, newName);
}
}
}
diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/esWebServers.asmx.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/esWebServers.asmx.cs
index 59eca47c..29c49b61 100644
--- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/esWebServers.asmx.cs
+++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/esWebServers.asmx.cs
@@ -625,5 +625,22 @@ namespace WebsitePanel.EnterpriseServer
}
#endregion
+
+
+ #region Directory Browsing
+
+ [WebMethod]
+ public bool GetDirectoryBrowseEnabled(int itemId, string site)
+ {
+ return WebServerController.GetDirectoryBrowseEnabled(itemId, site);
+ }
+
+ [WebMethod]
+ public void SetDirectoryBrowseEnabled(int itemId, string site, bool enabled)
+ {
+ WebServerController.SetDirectoryBrowseEnabled(itemId, site, enabled);
+ }
+
+ #endregion
}
}
diff --git a/WebsitePanel/Sources/WebsitePanel.Providers.Base/Common/Constants.cs b/WebsitePanel/Sources/WebsitePanel.Providers.Base/Common/Constants.cs
index 56a981d0..9d5bfab4 100644
--- a/WebsitePanel/Sources/WebsitePanel.Providers.Base/Common/Constants.cs
+++ b/WebsitePanel/Sources/WebsitePanel.Providers.Base/Common/Constants.cs
@@ -66,7 +66,7 @@ namespace WebsitePanel.Providers.Common
public const string AdministrationToolService = "AdministrationToolService";
-
+ public const string UsersHome = "UsersHome";
}
diff --git a/WebsitePanel/Sources/WebsitePanel.Providers.Base/EnterpriseStorage/IEnterpriseStorage.cs b/WebsitePanel/Sources/WebsitePanel.Providers.Base/EnterpriseStorage/IEnterpriseStorage.cs
index 879d2021..dbcc97cc 100644
--- a/WebsitePanel/Sources/WebsitePanel.Providers.Base/EnterpriseStorage/IEnterpriseStorage.cs
+++ b/WebsitePanel/Sources/WebsitePanel.Providers.Base/EnterpriseStorage/IEnterpriseStorage.cs
@@ -29,6 +29,7 @@
using System;
using System.Collections;
using WebsitePanel.Providers.OS;
+using WebsitePanel.Providers.Web;
namespace WebsitePanel.Providers.EnterpriseStorage
{
@@ -38,10 +39,13 @@ namespace WebsitePanel.Providers.EnterpriseStorage
public interface IEnterpriseStorage
{
SystemFile[] GetFolders(string organizationId);
- SystemFile GetFolder(string organizationId, string folder);
+ SystemFile GetFolder(string organizationId, string folderName);
void CreateFolder(string organizationId, string folder);
+ SystemFile RenameFolder(string organizationId, string originalFolder, string newFolder);
void DeleteFolder(string organizationId, string folder);
- void SetFolderQuota(string organizationId, string folder, long quota);
+ bool SetFolderWebDavRules(string organizationId, string folder, WebDavFolderRule[] rules);
+ WebDavFolderRule[] GetFolderWebDavRules(string organizationId, string folder);
bool CheckFileServicesInstallation();
+
}
}
diff --git a/WebsitePanel/Sources/WebsitePanel.Providers.Base/HostedSolution/ExchangeMailbox.cs b/WebsitePanel/Sources/WebsitePanel.Providers.Base/HostedSolution/ExchangeMailbox.cs
index 69c8bb69..1913624b 100644
--- a/WebsitePanel/Sources/WebsitePanel.Providers.Base/HostedSolution/ExchangeMailbox.cs
+++ b/WebsitePanel/Sources/WebsitePanel.Providers.Base/HostedSolution/ExchangeMailbox.cs
@@ -102,6 +102,8 @@ namespace WebsitePanel.Providers.HostedSolution
long recoverabelItemsSpace;
long recoverabelItemsWarning;
+ string exchangeGuid;
+
public string DisplayName
@@ -424,5 +426,12 @@ namespace WebsitePanel.Providers.HostedSolution
set { this.recoverabelItemsWarning = value; }
}
+ public string ExchangeGuid
+ {
+ get { return this.exchangeGuid; }
+ set { this.exchangeGuid = value; }
+ }
+
+
}
}
diff --git a/WebsitePanel/Sources/WebsitePanel.Providers.Base/OS/SystemFile.cs b/WebsitePanel/Sources/WebsitePanel.Providers.Base/OS/SystemFile.cs
index c76cb539..89079c91 100644
--- a/WebsitePanel/Sources/WebsitePanel.Providers.Base/OS/SystemFile.cs
+++ b/WebsitePanel/Sources/WebsitePanel.Providers.Base/OS/SystemFile.cs
@@ -27,7 +27,7 @@
// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
using System;
-
+using WebsitePanel.Providers.Web;
namespace WebsitePanel.Providers.OS
{
///
@@ -44,6 +44,8 @@ namespace WebsitePanel.Providers.OS
private long quota;
private bool isEmpty;
private bool isPublished;
+ private WebDavFolderRule[] rules;
+ private string url;
public SystemFile()
{
@@ -108,5 +110,16 @@ namespace WebsitePanel.Providers.OS
set { this.isPublished = value; }
}
+ public WebDavFolderRule[] Rules
+ {
+ get { return this.rules; }
+ set { this.rules = value; }
+ }
+
+ public string Url
+ {
+ get { return this.url; }
+ set { this.url = value; }
+ }
}
}
diff --git a/WebsitePanel/Sources/WebsitePanel.Providers.Base/OS/SystemFilesPaged.cs b/WebsitePanel/Sources/WebsitePanel.Providers.Base/OS/SystemFilesPaged.cs
new file mode 100644
index 00000000..676c8238
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.Providers.Base/OS/SystemFilesPaged.cs
@@ -0,0 +1,20 @@
+п»їnamespace WebsitePanel.Providers.OS
+{
+ public class SystemFilesPaged
+ {
+ int recordsCount;
+ SystemFile[] pageItems;
+
+ public int RecordsCount
+ {
+ get { return this.recordsCount; }
+ set { this.recordsCount = value; }
+ }
+
+ public SystemFile[] PageItems
+ {
+ get { return this.pageItems; }
+ set { this.pageItems = value; }
+ }
+ }
+}
diff --git a/WebsitePanel/Sources/WebsitePanel.Providers.Base/Web/IWebDav.cs b/WebsitePanel/Sources/WebsitePanel.Providers.Base/Web/IWebDav.cs
new file mode 100644
index 00000000..e2536a40
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.Providers.Base/Web/IWebDav.cs
@@ -0,0 +1,17 @@
+п»їusing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using WebsitePanel.Providers.HostedSolution;
+
+namespace WebsitePanel.Providers.Web
+{
+ public interface IWebDav
+ {
+ void CreateWebDavRule(string organizationId, string folder, WebDavFolderRule rule);
+ bool DeleteWebDavRule(string organizationId, string folder, WebDavFolderRule rule);
+ bool DeleteAllWebDavRules(string organizationId, string folder);
+ bool SetFolderWebDavRules(string organizationId, string folder, WebDavFolderRule[] newRules);
+ WebDavFolderRule[] GetFolderWebDavRules(string organizationId, string folder);
+ }
+}
diff --git a/WebsitePanel/Sources/WebsitePanel.Providers.Base/Web/IWebServer.cs b/WebsitePanel/Sources/WebsitePanel.Providers.Base/Web/IWebServer.cs
index 3a00984d..0ffd737d 100644
--- a/WebsitePanel/Sources/WebsitePanel.Providers.Base/Web/IWebServer.cs
+++ b/WebsitePanel/Sources/WebsitePanel.Providers.Base/Web/IWebServer.cs
@@ -32,6 +32,8 @@ using WebsitePanel.Providers.HostedSolution;
using WebsitePanel.Providers.ResultObjects;
using WebsitePanel.Providers.WebAppGallery;
using WebsitePanel.Providers.Common;
+using Microsoft.Web.Administration;
+using Microsoft.Web.Management.Server;
namespace WebsitePanel.Providers.Web
{
@@ -166,6 +168,8 @@ namespace WebsitePanel.Providers.Web
SSLCertificate ImportCertificate(WebSite website);
bool CheckCertificate(WebSite webSite);
-
+ //Directory Browseing
+ bool GetDirectoryBrowseEnabled(string siteId);
+ void SetDirectoryBrowseEnabled(string siteId, bool enabled);
}
}
diff --git a/WebsitePanel/Sources/WebsitePanel.Providers.Base/Web/WebDavFolderRule.cs b/WebsitePanel/Sources/WebsitePanel.Providers.Base/Web/WebDavFolderRule.cs
new file mode 100644
index 00000000..44815d80
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.Providers.Base/Web/WebDavFolderRule.cs
@@ -0,0 +1,60 @@
+п»їusing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using WebsitePanel.Providers.HostedSolution;
+
+namespace WebsitePanel.Providers.Web
+{
+
+ public enum WebDavAccess
+ {
+ Read = 1,
+ Source = 16,
+ Write = 2
+ }
+
+ [Serializable]
+ public class WebDavFolderRule
+ {
+ public List Pathes { get; set; }
+ public List Users { get; set; }
+ public List Roles { get; set; }
+
+ public int AccessRights
+ {
+ get
+ {
+ int result = 0;
+
+ if (Read)
+ {
+ result |= (int)WebDavAccess.Read;
+ }
+
+ if (Write)
+ {
+ result |= (int)WebDavAccess.Write;
+ }
+
+ if (Source)
+ {
+ result |= (int)WebDavAccess.Source;
+ }
+
+ return result;
+ }
+ }
+
+ public bool Read { get; set; }
+ public bool Write { get; set; }
+ public bool Source { get; set; }
+
+ public WebDavFolderRule()
+ {
+ Pathes = new List();
+ Users = new List();
+ Roles = new List();
+ }
+ }
+}
diff --git a/WebsitePanel/Sources/WebsitePanel.Providers.Base/WebsitePanel.Providers.Base.csproj b/WebsitePanel/Sources/WebsitePanel.Providers.Base/WebsitePanel.Providers.Base.csproj
index ebac1619..427c0ffa 100644
--- a/WebsitePanel/Sources/WebsitePanel.Providers.Base/WebsitePanel.Providers.Base.csproj
+++ b/WebsitePanel/Sources/WebsitePanel.Providers.Base/WebsitePanel.Providers.Base.csproj
@@ -57,6 +57,14 @@
618
+
+ False
+ ..\..\Lib\References\Microsoft\Microsoft.Web.Administration.dll
+
+
+ False
+ ..\..\Lib\References\Microsoft\Microsoft.Web.Management.dll
+
pdbonly
true
- bin\Release\
+ ..\WebsitePanel.Server\bin\
TRACE
prompt
4
@@ -39,6 +39,22 @@
{684C932A-6C75-46AC-A327-F3689D89EB42}
WebsitePanel.Providers.Base
+
+ {9be0317d-e42e-4ff6-9a87-8c801f046ea1}
+ WebsitePanel.Providers.Web.IIs60
+
+
+ {1b9dce85-c664-49fc-b6e1-86c63cab88d1}
+ WebsitePanel.Providers.Web.IIs70
+
+
+ {6e348968-461d-45a1-b235-4f552947b9f1}
+ WebsitePanel.Providers.Web.IIs80
+
+
+ {ce2df3d7-d6ff-48fa-b2ea-7b836fcbf698}
+ WebsitePanel.Providers.Web.WebDav
+
{E91E52F3-9555-4D00-B577-2B1DBDD87CA7}
WebsitePanel.Server.Utils
diff --git a/WebsitePanel/Sources/WebsitePanel.Providers.EnterpriseStorage.Windows2012/Windows2012.cs b/WebsitePanel/Sources/WebsitePanel.Providers.EnterpriseStorage.Windows2012/Windows2012.cs
index 4e919d44..8ac0996f 100644
--- a/WebsitePanel/Sources/WebsitePanel.Providers.EnterpriseStorage.Windows2012/Windows2012.cs
+++ b/WebsitePanel/Sources/WebsitePanel.Providers.EnterpriseStorage.Windows2012/Windows2012.cs
@@ -36,63 +36,142 @@ using Microsoft.Win32;
using WebsitePanel.Server.Utils;
using WebsitePanel.Providers.Utils;
using WebsitePanel.Providers.OS;
+using WebsitePanel.Providers.Web;
namespace WebsitePanel.Providers.EnterpriseStorage
{
- public class Windows2012 : HostingServiceProviderBase
+ public class Windows2012 : HostingServiceProviderBase, IEnterpriseStorage
{
-
#region Properties
+
protected string UsersHome
{
get { return FileUtils.EvaluateSystemVariables(ProviderSettings["UsersHome"]); }
}
- #endregion
+ protected string LocationDrive
+ {
+ get { return FileUtils.EvaluateSystemVariables(ProviderSettings["LocationDrive"]); }
+ }
+
+ protected string UsersDomain
+ {
+ get { return FileUtils.EvaluateSystemVariables(ProviderSettings["UsersDomain"]); }
+ }
+
+ #endregion
#region Folders
public SystemFile[] GetFolders(string organizationId)
{
+ string rootPath = string.Format("{0}:\\{1}\\{2}", LocationDrive, UsersHome, organizationId);
+
+ DirectoryInfo root = new DirectoryInfo(rootPath);
+ IWebDav webdav = new Web.WebDav(UsersDomain);
ArrayList items = new ArrayList();
- DirectoryInfo root = new DirectoryInfo(string.Format("{0}\\{1}", UsersHome, organizationId));
// get directories
DirectoryInfo[] dirs = root.GetDirectories();
foreach (DirectoryInfo dir in dirs)
{
- string fullName = System.IO.Path.Combine(string.Format("{0}\\{1}", UsersHome, organizationId), dir.Name);
- SystemFile fi = new SystemFile(dir.Name, fullName, true, 0, dir.CreationTime, dir.LastWriteTime);
- items.Add(fi);
+ string fullName = System.IO.Path.Combine(rootPath, dir.Name);
+
+ SystemFile folder = new SystemFile(dir.Name, fullName, true,
+ FileUtils.BytesToMb(FileUtils.CalculateFolderSize(dir.FullName)), dir.CreationTime, dir.LastWriteTime);
+
+ folder.Url = string.Format("https://{0}/{1}/{2}", UsersDomain, organizationId, dir.Name);
+ folder.Rules = webdav.GetFolderWebDavRules(organizationId, dir.Name);
+
+ items.Add(folder);
// check if the directory is empty
- fi.IsEmpty = (Directory.GetFileSystemEntries(fullName).Length == 0);
+ folder.IsEmpty = (Directory.GetFileSystemEntries(fullName).Length == 0);
}
return (SystemFile[])items.ToArray(typeof(SystemFile));
}
- public SystemFile GetFolder(string organizationId, string folder)
+ public SystemFile GetFolder(string organizationId, string folderName)
{
- DirectoryInfo root = new DirectoryInfo(string.Format("{0}\\{1}\\{2}", UsersHome, organizationId, folder));
- string fullName = string.Format("{0}\\{1}\\{2}", UsersHome, organizationId, folder);
- return new SystemFile(root.Name, fullName, true, 0, root.CreationTime, root.LastWriteTime);
+ string fullName = string.Format("{0}:\\{1}\\{2}\\{3}", LocationDrive, UsersHome, organizationId, folderName);
+
+ DirectoryInfo root = new DirectoryInfo(fullName);
+
+ SystemFile folder = new SystemFile(root.Name, fullName, true,
+ FileUtils.BytesToMb( FileUtils.CalculateFolderSize(root.FullName)), root.CreationTime, root.LastWriteTime);
+
+ folder.Url = string.Format("https://{0}/{1}/{2}", UsersDomain, organizationId, folderName);
+ folder.Rules = GetFolderWebDavRules(organizationId, folderName);
+
+ return folder;
}
public void CreateFolder(string organizationId, string folder)
{
- FileUtils.CreateDirectory(string.Format("{0}\\{1}\\{2}", UsersHome, organizationId, folder));
+ FileUtils.CreateDirectory(string.Format("{0}:\\{1}\\{2}\\{3}", LocationDrive, UsersHome, organizationId, folder));
+ }
+
+ public SystemFile RenameFolder(string organizationId, string originalFolder, string newFolder)
+ {
+ var oldPath = string.Format("{0}:\\{1}\\{2}\\{3}", LocationDrive, UsersHome, organizationId, originalFolder);
+ var newPath = string.Format("{0}:\\{1}\\{2}\\{3}", LocationDrive, UsersHome, organizationId, newFolder);
+
+ FileUtils.MoveFile(oldPath,newPath);
+
+ IWebDav webdav = new WebDav(UsersDomain);
+
+ //deleting old folder rules
+ webdav.DeleteAllWebDavRules(organizationId, originalFolder);
+
+ return GetFolder(organizationId, newFolder);
}
public void DeleteFolder(string organizationId, string folder)
{
- FileUtils.DeleteDirectoryRecursive(string.Format("{0}\\{1}\\{2}", UsersHome, organizationId, folder));
+ string rootPath = string.Format("{0}:\\{1}\\{2}\\{3}", LocationDrive, UsersHome, organizationId, folder);
+
+ DirectoryInfo treeRoot = new DirectoryInfo(rootPath);
+
+ if (treeRoot.Exists)
+ {
+ DirectoryInfo[] dirs = treeRoot.GetDirectories();
+ while (dirs.Length > 0)
+ {
+ foreach (DirectoryInfo dir in dirs)
+ DeleteFolder(organizationId, folder != string.Empty ? string.Format("{0}\\{1}", folder, dir.Name) : dir.Name);
+
+ dirs = treeRoot.GetDirectories();
+ }
+
+ // DELETE THE FILES UNDER THE CURRENT ROOT
+ string[] files = Directory.GetFiles(treeRoot.FullName);
+ foreach (string file in files)
+ {
+ File.SetAttributes(file, FileAttributes.Normal);
+ File.Delete(file);
+ }
+
+ IWebDav webdav = new WebDav(UsersDomain);
+
+ webdav.DeleteAllWebDavRules(organizationId, folder);
+
+ Directory.Delete(treeRoot.FullName, true);
+ }
}
- public void SetFolderQuota(string organizationId, string folder, long quota)
+ public bool SetFolderWebDavRules(string organizationId, string folder, WebDavFolderRule[] rules)
{
+ IWebDav webdav = new WebDav(UsersDomain);
+ return webdav.SetFolderWebDavRules(organizationId, folder, rules);
+ }
+ public WebDavFolderRule[] GetFolderWebDavRules(string organizationId, string folder)
+ {
+ IWebDav webdav = new WebDav(UsersDomain);
+
+ return webdav.GetFolderWebDavRules(organizationId, folder);
}
public bool CheckFileServicesInstallation()
@@ -103,6 +182,7 @@ namespace WebsitePanel.Providers.EnterpriseStorage
#endregion
#region HostingServiceProvider methods
+
public override string[] Install()
{
List messages = new List();
@@ -177,5 +257,6 @@ namespace WebsitePanel.Providers.EnterpriseStorage
Server.Utils.OS.WindowsVersion version = WebsitePanel.Server.Utils.OS.GetVersion();
return version == WebsitePanel.Server.Utils.OS.WindowsVersion.WindowsServer2012;
}
+
}
}
diff --git a/WebsitePanel/Sources/WebsitePanel.Providers.HostedSolution.Exchange2013/Exchange2013.cs b/WebsitePanel/Sources/WebsitePanel.Providers.HostedSolution.Exchange2013/Exchange2013.cs
index eaaefdad..1c77bf52 100644
--- a/WebsitePanel/Sources/WebsitePanel.Providers.HostedSolution.Exchange2013/Exchange2013.cs
+++ b/WebsitePanel/Sources/WebsitePanel.Providers.HostedSolution.Exchange2013/Exchange2013.cs
@@ -2296,6 +2296,7 @@ namespace WebsitePanel.Providers.HostedSolution
info.DisplayName = (string)GetPSObjectProperty(mailbox, "DisplayName");
info.HideFromAddressBook = (bool)GetPSObjectProperty(mailbox, "HiddenFromAddressListsEnabled");
+ info.ExchangeGuid = GetPSObjectProperty(mailbox, "ExchangeGuid").ToString();
Command cmd = new Command("Get-User");
diff --git a/WebsitePanel/Sources/WebsitePanel.Providers.HostedSolution.Lync2013/LyncBase.cs b/WebsitePanel/Sources/WebsitePanel.Providers.HostedSolution.Lync2013/LyncBase.cs
index b8cd6a62..7894d701 100644
--- a/WebsitePanel/Sources/WebsitePanel.Providers.HostedSolution.Lync2013/LyncBase.cs
+++ b/WebsitePanel/Sources/WebsitePanel.Providers.HostedSolution.Lync2013/LyncBase.cs
@@ -637,7 +637,7 @@ namespace WebsitePanel.Providers.HostedSolution
command = new Command("Set-CsSimpleUrlConfiguration");
command.Parameters.Add("Identity", "Global");
- command.Parameters.Add("Tenant", id);
+ //command.Parameters.Add("Tenant", id);
command.Parameters.Add("SimpleUrl", SimpleUrls);
ExecuteShellCommand(runspace, command, false);
}
diff --git a/WebsitePanel/Sources/WebsitePanel.Providers.HostedSolution.Lync2013HP/Lync2013HP.cs b/WebsitePanel/Sources/WebsitePanel.Providers.HostedSolution.Lync2013HP/Lync2013HP.cs
index d20a5b4e..32909339 100644
--- a/WebsitePanel/Sources/WebsitePanel.Providers.HostedSolution.Lync2013HP/Lync2013HP.cs
+++ b/WebsitePanel/Sources/WebsitePanel.Providers.HostedSolution.Lync2013HP/Lync2013HP.cs
@@ -202,6 +202,7 @@ namespace WebsitePanel.Providers.HostedSolution
ActiveDirectoryUtils.SetADObjectPropertyValue(ou, "msRTCSIP-Domains", sipDomain);
ActiveDirectoryUtils.SetADObjectPropertyValue(ou, "msRTCSIP-TenantId", id);
ActiveDirectoryUtils.SetADObjectPropertyValue(ou, "msRTCSIP-ObjectId", id);
+ ActiveDirectoryUtils.SetADObjectPropertyValue(ou, "msRTCSIP-DomainUrlMap", sipDomain + "#" + SimpleUrlRoot+sipDomain);
ou.CommitChanges();
//Create simpleurls
diff --git a/WebsitePanel/Sources/WebsitePanel.Providers.TerminalServices.Windows2012/WebsitePanel.Providers.RemoteDesktopServices.Windows2012.csproj b/WebsitePanel/Sources/WebsitePanel.Providers.TerminalServices.Windows2012/WebsitePanel.Providers.RemoteDesktopServices.Windows2012.csproj
index fc48c88e..0bb44d32 100644
--- a/WebsitePanel/Sources/WebsitePanel.Providers.TerminalServices.Windows2012/WebsitePanel.Providers.RemoteDesktopServices.Windows2012.csproj
+++ b/WebsitePanel/Sources/WebsitePanel.Providers.TerminalServices.Windows2012/WebsitePanel.Providers.RemoteDesktopServices.Windows2012.csproj
@@ -25,7 +25,7 @@
pdbonly
true
- bin\Release\
+ ..\WebsitePanel.Server\bin\
TRACE
prompt
4
diff --git a/WebsitePanel/Sources/WebsitePanel.Providers.TerminalServices.Windows2012/Windows2012.cs b/WebsitePanel/Sources/WebsitePanel.Providers.TerminalServices.Windows2012/Windows2012.cs
index a62c52cc..122f9fbf 100644
--- a/WebsitePanel/Sources/WebsitePanel.Providers.TerminalServices.Windows2012/Windows2012.cs
+++ b/WebsitePanel/Sources/WebsitePanel.Providers.TerminalServices.Windows2012/Windows2012.cs
@@ -35,6 +35,7 @@ using Microsoft.Win32;
using WebsitePanel.Server.Utils;
using WebsitePanel.Providers.Utils;
using WebsitePanel.Providers.OS;
+using WebsitePanel.Providers.Common;
namespace WebsitePanel.Providers.RemoteDesktopServices
@@ -45,7 +46,7 @@ namespace WebsitePanel.Providers.RemoteDesktopServices
#region Properties
protected string UsersHome
{
- get { return FileUtils.EvaluateSystemVariables(ProviderSettings["UsersHome"]); }
+ get { return FileUtils.EvaluateSystemVariables(ProviderSettings[Constants.UsersHome]); }
}
#endregion
@@ -121,6 +122,9 @@ namespace WebsitePanel.Providers.RemoteDesktopServices
public override bool IsInstalled()
{
+ // TODO: Remove it.
+ return true;
+
Server.Utils.OS.WindowsVersion version = WebsitePanel.Server.Utils.OS.GetVersion();
return version == WebsitePanel.Server.Utils.OS.WindowsVersion.WindowsServer2012;
}
diff --git a/WebsitePanel/Sources/WebsitePanel.Providers.Web.IIS70/IIs70.cs b/WebsitePanel/Sources/WebsitePanel.Providers.Web.IIS70/IIs70.cs
index 5594f308..0a203841 100644
--- a/WebsitePanel/Sources/WebsitePanel.Providers.Web.IIS70/IIs70.cs
+++ b/WebsitePanel/Sources/WebsitePanel.Providers.Web.IIS70/IIs70.cs
@@ -3771,6 +3771,27 @@ namespace WebsitePanel.Providers.Web
#endregion
+ #region Directory Browsing
+
+ public override bool GetDirectoryBrowseEnabled(string siteId)
+ {
+ using (ServerManager srvman = webObjectsSvc.GetServerManager())
+ {
+ var enabled = dirBrowseSvc.GetDirectoryBrowseSettings(srvman, siteId)[DirectoryBrowseGlobals.Enabled];
+
+ return enabled != null ? (bool)enabled : false;
+ }
+ }
+
+ public override void SetDirectoryBrowseEnabled(string siteId, bool enabled)
+ {
+ dirBrowseSvc.SetDirectoryBrowseEnabled(siteId, enabled);
+ }
+
+
+
+ #endregion
+
public override bool IsIISInstalled()
{
int value = 0;
diff --git a/WebsitePanel/Sources/WebsitePanel.Providers.Web.IIs60/IIs60.cs b/WebsitePanel/Sources/WebsitePanel.Providers.Web.IIs60/IIs60.cs
index 48bc859e..86c60501 100644
--- a/WebsitePanel/Sources/WebsitePanel.Providers.Web.IIs60/IIs60.cs
+++ b/WebsitePanel/Sources/WebsitePanel.Providers.Web.IIs60/IIs60.cs
@@ -56,6 +56,8 @@ using System.Xml.Serialization;
using System.Text.RegularExpressions;
using WebsitePanel.Providers.Common;
using System.Collections.Specialized;
+using Microsoft.Web.Administration;
+using Microsoft.Web.Management.Server;
namespace WebsitePanel.Providers.Web
{
@@ -3412,7 +3414,28 @@ namespace WebsitePanel.Providers.Web
}
#endregion
- public virtual bool IsIISInstalled()
+ #region Directory Browsing
+
+ public virtual bool GetDirectoryBrowseEnabled(string siteId)
+ {
+ ManagementObject objVirtDir = wmi.GetObject(String.Format("IIsWebVirtualDirSetting='{0}'", GetVirtualDirectoryPath(siteId, "")));
+ return objVirtDir.Properties["EnableDirBrowsing"].Value != null ? (bool)objVirtDir.Properties["EnableDirBrowsing"].Value : false;
+ }
+
+ public virtual void SetDirectoryBrowseEnabled(string siteId, bool enabled)
+ {
+ ManagementObject objSite = wmi.GetObject(String.Format("IIsWebServerSetting='{0}'", siteId));
+
+ WebSite site = GetSite(siteId);
+ site.EnableDirectoryBrowsing = enabled;
+
+ FillWmiObjectFromVirtualDirectory(objSite, site, false);
+ objSite.Put();
+ }
+
+ #endregion
+
+ public virtual bool IsIISInstalled()
{
int value = 0;
RegistryKey root = Registry.LocalMachine;
@@ -3737,10 +3760,5 @@ namespace WebsitePanel.Providers.Web
throw new NotSupportedException();
}
#endregion
-
-
-
-
-
}
}
diff --git a/WebsitePanel/Sources/WebsitePanel.Providers.Web.IIs60/WebsitePanel.Providers.Web.IIs60.csproj b/WebsitePanel/Sources/WebsitePanel.Providers.Web.IIs60/WebsitePanel.Providers.Web.IIs60.csproj
index d14ee66c..53a4c9a8 100644
--- a/WebsitePanel/Sources/WebsitePanel.Providers.Web.IIs60/WebsitePanel.Providers.Web.IIs60.csproj
+++ b/WebsitePanel/Sources/WebsitePanel.Providers.Web.IIs60/WebsitePanel.Providers.Web.IIs60.csproj
@@ -67,11 +67,19 @@
False
..\..\Lib\Microsoft.Practices.ObjectBuilder.dll
+
+ False
+ ..\..\Lib\References\Microsoft\Microsoft.Web.Administration.dll
+
False
..\..\Lib\References\Microsoft\Microsoft.Web.Deployment.dll
True
+
+ False
+ ..\..\Lib\References\Microsoft\Microsoft.Web.Management.dll
+
False
..\..\Lib\References\Microsoft\Microsoft.Web.PlatformInstaller.dll
diff --git a/WebsitePanel/Sources/WebsitePanel.Providers.Web.IIs80/WebsitePanel.Providers.Web.IIs80.csproj b/WebsitePanel/Sources/WebsitePanel.Providers.Web.IIs80/WebsitePanel.Providers.Web.IIs80.csproj
index a4a33fb4..8e83d0c4 100644
--- a/WebsitePanel/Sources/WebsitePanel.Providers.Web.IIs80/WebsitePanel.Providers.Web.IIs80.csproj
+++ b/WebsitePanel/Sources/WebsitePanel.Providers.Web.IIs80/WebsitePanel.Providers.Web.IIs80.csproj
@@ -30,6 +30,14 @@
4
+
+ False
+ ..\..\Lib\References\Microsoft\Microsoft.Web.Administration.dll
+
+
+ False
+ ..\..\Lib\References\Microsoft\Microsoft.Web.Management.dll
+
();
+
+ foreach (var rule in authoringRulesCollection)
+ {
+ rules.Add(rule.ToWebDavFolderRule());
+ }
+
+ return rules.ToArray();
+ }
+ }
+
+
+ public bool DeleteAllWebDavRules(string organizationId, string folder)
+ {
+ try
+ {
+ using (ServerManager serverManager = new ServerManager())
+ {
+
+ Configuration config = serverManager.GetApplicationHostConfiguration();
+ //ConfigurationSection authoringRulesSection = config.GetSection("system.webServer/webdav/authoringRules", string.Format("{0}/{1}/{2}", _usersDomain, organizationId, folder));
+
+ //ConfigurationElementCollection authoringRulesCollection = authoringRulesSection.GetCollection();
+ //authoringRulesCollection.Clear();
+
+ config.RemoveLocationPath(string.Format("{0}/{1}/{2}", _usersDomain, organizationId, folder));
+ serverManager.CommitChanges();
+ return true;
+ }
+ }
+ catch
+ {
+ return false;
+ }
+ }
+ }
+}
diff --git a/WebsitePanel/Sources/WebsitePanel.Providers.Web.WebDav/WebDavExtensions.cs b/WebsitePanel/Sources/WebsitePanel.Providers.Web.WebDav/WebDavExtensions.cs
new file mode 100644
index 00000000..4a566c87
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.Providers.Web.WebDav/WebDavExtensions.cs
@@ -0,0 +1,91 @@
+п»їusing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Microsoft.Web.Administration;
+
+namespace WebsitePanel.Providers.Web.Extensions
+{
+ public static class WebDavExtensions
+ {
+ public static WebDavFolderRule ToWebDavFolderRule(this ConfigurationElement element)
+ {
+ var result = new WebDavFolderRule();
+
+ if(!string.IsNullOrEmpty(element["users"].ToString()))
+ {
+ var users = element["users"].ToString().Split(',');
+
+ foreach (var user in users)
+ {
+ result.Users.Add(user.Trim());
+ }
+ }
+
+ if (!string.IsNullOrEmpty(element["roles"].ToString()))
+ {
+ var roles = element["roles"].ToString().Split(',');
+
+ foreach (var role in roles)
+ {
+ result.Roles.Add(role.Trim());
+ }
+ }
+
+ if (!string.IsNullOrEmpty(element["path"].ToString()))
+ {
+ var pathes = element["path"].ToString().Split(',');
+
+ foreach (var path in pathes)
+ {
+ result.Pathes.Add(path.Trim());
+ }
+ }
+
+ var access = (int)element["access"] ;
+
+ result.Write = (access & (int)WebDavAccess.Write) == (int)WebDavAccess.Write;
+ result.Read = (access & (int)WebDavAccess.Read) == (int)WebDavAccess.Read;
+ result.Source = (access & (int)WebDavAccess.Source) == (int)WebDavAccess.Source;
+
+ return result;
+ }
+
+ public static bool ExistsWebDavRule(this ConfigurationElementCollection collection, WebDavFolderRule settings)
+ {
+ return collection.FindWebDavRule(settings) != null;
+ }
+
+ public static ConfigurationElement FindWebDavRule(this ConfigurationElementCollection collection, WebDavFolderRule settings)
+ {
+ return collection.FirstOrDefault(x =>
+ {
+ var s = x["users"].ToString();
+ if (settings.Users.Any()
+ && x["users"].ToString() != string.Join(", ", settings.Users.ToArray()))
+ {
+ return false;
+ }
+
+ if (settings.Roles.Any()
+ && x["roles"].ToString() != string.Join(", ", settings.Roles.ToArray()))
+ {
+ return false;
+ }
+
+ if (settings.Pathes.Any()
+ && x["path"].ToString() != string.Join(", ", settings.Pathes.ToArray()))
+ {
+ return false;
+ }
+
+ //if ((int)x["access"] != settings.AccessRights)
+ //{
+ // return false;
+ //}
+
+ return true;
+ });
+ }
+ }
+}
diff --git a/WebsitePanel/Sources/WebsitePanel.Providers.Web.WebDav/WebsitePanel.Providers.Web.WebDav.csproj b/WebsitePanel/Sources/WebsitePanel.Providers.Web.WebDav/WebsitePanel.Providers.Web.WebDav.csproj
new file mode 100644
index 00000000..79dfc0f3
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.Providers.Web.WebDav/WebsitePanel.Providers.Web.WebDav.csproj
@@ -0,0 +1,63 @@
+п»ї
+
+
+ Debug
+ AnyCPU
+ {CE2DF3D7-D6FF-48FA-B2EA-7B836FCBF698}
+ Library
+ Properties
+ WebsitePanel.Providers.Web.WebDav
+ WebsitePanel.Providers.Web.WebDav
+ v3.5
+ 512
+
+
+ true
+ full
+ false
+ bin\Debug\
+ DEBUG;TRACE
+ prompt
+ 4
+
+
+ pdbonly
+ true
+ bin\Release\
+ TRACE
+ prompt
+ 4
+
+
+
+ False
+ ..\..\Lib\References\Microsoft\Microsoft.Web.Administration.dll
+
+
+
+
+
+
+ {684c932a-6c75-46ac-a327-f3689d89eb42}
+ WebsitePanel.Providers.Base
+
+
+
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.Server.Client/EnterpriseStorageProxy.cs b/WebsitePanel/Sources/WebsitePanel.Server.Client/EnterpriseStorageProxy.cs
index 15aa090c..81bed424 100644
--- a/WebsitePanel/Sources/WebsitePanel.Server.Client/EnterpriseStorageProxy.cs
+++ b/WebsitePanel/Sources/WebsitePanel.Server.Client/EnterpriseStorageProxy.cs
@@ -25,11 +25,10 @@
// ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
-// Runtime Version:2.0.50727.6407
+// Runtime Version:2.0.50727.4984
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@@ -37,418 +36,688 @@
//------------------------------------------------------------------------------
//
-// This source code was auto-generated by wsdl, Version=2.0.50727.3038.
+// This source code was auto-generated by wsdl, Version=2.0.50727.42.
//
-using WebsitePanel.Providers.Common;
-using WebsitePanel.Providers.ResultObjects;
using WebsitePanel.Providers.OS;
+using WebsitePanel.Providers.Web;
-namespace WebsitePanel.Providers.EnterpriseStorage {
+namespace WebsitePanel.Providers.EnterpriseStorage
+{
using System.Xml.Serialization;
using System.Web.Services;
using System.ComponentModel;
using System.Web.Services.Protocols;
using System;
using System.Diagnostics;
-
-
+
+
///
// This code was generated by a tool.
-// Runtime Version:2.0.50727.5466
+// Runtime Version:2.0.50727.4984
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@@ -39,950 +38,1665 @@
//
// This source code was auto-generated by wsdl, Version=2.0.50727.42.
//
-namespace WebsitePanel.Providers.Web {
+
+using WebsitePanel.Providers.Common;
+using WebsitePanel.Providers.ResultObjects;
+using WebsitePanel.Providers.WebAppGallery;
+
+namespace WebsitePanel.Providers.Web
+{
using System.Xml.Serialization;
using System.Web.Services;
using System.ComponentModel;
using System.Web.Services.Protocols;
using System;
using System.Diagnostics;
- using WebsitePanel.Providers.ResultObjects;
- using WebsitePanel.Providers.WebAppGallery;
- using WebsitePanel.Providers.Common;
-
-
+
+
/// true
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/microsoft-resx
+
+
+ 2.0
+
+
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ ShowProgressDialog('Creating folder ...');
+
+
+ Create Folder
+
+
+
+
+ Folder Name: *
+
+
+ Folders
+
+
+ Enter Folder Name
+
+
+ *
+
+
+ Create New Folder In
+
+
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/App_LocalResources/EnterpriseStorageFolderGeneralSettings.ascx.resx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/App_LocalResources/EnterpriseStorageFolderGeneralSettings.ascx.resx
new file mode 100644
index 00000000..1dabc5e0
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/App_LocalResources/EnterpriseStorageFolderGeneralSettings.ascx.resx
@@ -0,0 +1,150 @@
+п»ї
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/microsoft-resx
+
+
+ 2.0
+
+
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ ShowProgressDialog('Updating folder settings...');
+
+
+ Save Changes
+
+
+ Permissions
+
+
+ Notes:
+
+
+ Edit Folder
+
+
+ Folders
+
+
+ Enter Folder Name
+
+
+ *
+
+
+ Folder Name:
+
+
+ Folder Url:
+
+
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/App_LocalResources/EnterpriseStorageFolders.ascx.resx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/App_LocalResources/EnterpriseStorageFolders.ascx.resx
new file mode 100644
index 00000000..0dd3e88c
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/App_LocalResources/EnterpriseStorageFolders.ascx.resx
@@ -0,0 +1,156 @@
+п»ї
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/microsoft-resx
+
+
+ 2.0
+
+
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ Create New Folder
+
+
+ if(!confirm('Are you sure you want to delete selected folder?')) return false; else ShowProgressDialog('Deleting Folder...');
+
+
+ Delete
+
+
+ Delete Folder
+
+
+ No folders have been added yet. To add a new folder click "Create New Folder" button.
+
+
+
+
+ Total Folders Allocated:
+
+
+ Folders
+
+
+ Folder Name
+
+
+ Folder Size
+
+
+ Folders
+
+
+ Url
+
+
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/App_LocalResources/ExchangeMailboxGeneralSettings.ascx.resx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/App_LocalResources/ExchangeMailboxGeneralSettings.ascx.resx
index 4b853b3b..9b7b5be3 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/App_LocalResources/ExchangeMailboxGeneralSettings.ascx.resx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/App_LocalResources/ExchangeMailboxGeneralSettings.ascx.resx
@@ -168,4 +168,10 @@
Litigation Hold
+
+ Exchange Guid:
+
+
+ Advanced Information
+
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/EnterpriseStorageCreateFolder.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/EnterpriseStorageCreateFolder.ascx
new file mode 100644
index 00000000..af4e4960
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/EnterpriseStorageCreateFolder.ascx
@@ -0,0 +1,46 @@
+<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="EnterpriseStorageCreateFolder.ascx.cs" Inherits="WebsitePanel.Portal.ExchangeServer.EnterpriseStorageCreateFolder" %>
+<%@ Register Src="../UserControls/SimpleMessageBox.ascx" TagName="SimpleMessageBox" TagPrefix="wsp" %>
+<%@ Register Src="UserControls/EmailAddress.ascx" TagName="EmailAddress" TagPrefix="wsp" %>
+<%@ Register Src="UserControls/Menu.ascx" TagName="Menu" TagPrefix="wsp" %>
+<%@ Register Src="UserControls/Breadcrumb.ascx" TagName="Breadcrumb" TagPrefix="wsp" %>
+<%@ Register Src="../UserControls/EnableAsyncTasksSupport.ascx" TagName="EnableAsyncTasksSupport" TagPrefix="wsp" %>
+
+
+// This code was generated by a tool.
+//
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated.
+//
+//------------------------------------------------------------------------------
+
+namespace WebsitePanel.Portal.ExchangeServer {
+
+
+ public partial class EnterpriseStorageCreateFolder {
+
+ ///
+ /// asyncTasks control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::WebsitePanel.Portal.EnableAsyncTasksSupport asyncTasks;
+
+ ///
+ /// breadcrumb control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::WebsitePanel.Portal.ExchangeServer.UserControls.Breadcrumb breadcrumb;
+
+ ///
+ /// menu control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::WebsitePanel.Portal.ExchangeServer.UserControls.Menu menu;
+
+ ///
+ /// imgESS control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.WebControls.Image imgESS;
+
+ ///
+ /// locTitle control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.WebControls.Localize locTitle;
+
+ ///
+ /// litRootFolder control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.WebControls.Literal litRootFolder;
+
+ ///
+ /// messageBox control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::WebsitePanel.Portal.UserControls.SimpleMessageBox messageBox;
+
+ ///
+ /// locFolderName control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.WebControls.Localize locFolderName;
+
+ ///
+ /// txtFolderName control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.WebControls.TextBox txtFolderName;
+
+ ///
+ /// valRequireFolderName control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.WebControls.RequiredFieldValidator valRequireFolderName;
+
+ ///
+ /// btnCreate control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.WebControls.Button btnCreate;
+
+ ///
+ /// valSummary control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.WebControls.ValidationSummary valSummary;
+ }
+}
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/EnterpriseStorageFolderGeneralSettings.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/EnterpriseStorageFolderGeneralSettings.ascx
new file mode 100644
index 00000000..d6305bc2
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/EnterpriseStorageFolderGeneralSettings.ascx
@@ -0,0 +1,71 @@
+<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="EnterpriseStorageFolderGeneralSettings.ascx.cs" Inherits="WebsitePanel.Portal.ExchangeServer.EnterpriseStorageFolderGeneralSettings" %>
+<%@ Register Src="../UserControls/SimpleMessageBox.ascx" TagName="SimpleMessageBox" TagPrefix="wsp" %>
+<%@ Register Src="UserControls/EnterpriseStoragePermissions.ascx" TagName="ESPermissions" TagPrefix="wsp"%>
+<%@ Register Src="UserControls/Menu.ascx" TagName="Menu" TagPrefix="wsp" %>
+<%@ Register Src="UserControls/Breadcrumb.ascx" TagName="Breadcrumb" TagPrefix="wsp" %>
+<%@ Register TagPrefix="wsp" TagName="CollapsiblePanel" Src="../UserControls/CollapsiblePanel.ascx" %>
+<%@ Register Src="../UserControls/EnableAsyncTasksSupport.ascx" TagName="EnableAsyncTasksSupport" TagPrefix="wsp" %>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+// This code was generated by a tool.
+//
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated.
+//
+//------------------------------------------------------------------------------
+
+namespace WebsitePanel.Portal.ExchangeServer {
+
+
+ public partial class EnterpriseStorageFolderGeneralSettings {
+
+ ///
+ /// asyncTasks control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::WebsitePanel.Portal.EnableAsyncTasksSupport asyncTasks;
+
+ ///
+ /// breadcrumb control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::WebsitePanel.Portal.ExchangeServer.UserControls.Breadcrumb breadcrumb;
+
+ ///
+ /// menu control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::WebsitePanel.Portal.ExchangeServer.UserControls.Menu menu;
+
+ ///
+ /// Image1 control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.WebControls.Image Image1;
+
+ ///
+ /// locTitle control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.WebControls.Localize locTitle;
+
+ ///
+ /// litFolderName control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.WebControls.Literal litFolderName;
+
+ ///
+ /// messageBox control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::WebsitePanel.Portal.UserControls.SimpleMessageBox messageBox;
+
+ ///
+ /// locFolderName control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.WebControls.Localize locFolderName;
+
+ ///
+ /// txtFolderName control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.WebControls.TextBox txtFolderName;
+
+ ///
+ /// valRequireFolderName control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.WebControls.RequiredFieldValidator valRequireFolderName;
+
+ ///
+ /// locFolderUrl control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.WebControls.Localize locFolderUrl;
+
+ ///
+ /// lblFolderUrl control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.WebControls.Label lblFolderUrl;
+
+ ///
+ /// locDirectoryBrowsing control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.WebControls.Localize locDirectoryBrowsing;
+
+ ///
+ /// chkDirectoryBrowsing control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.WebControls.CheckBox chkDirectoryBrowsing;
+
+ ///
+ /// PermissionsPanel control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.HtmlControls.HtmlGenericControl PermissionsPanel;
+
+ ///
+ /// PermissionsSection control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.WebControls.Localize PermissionsSection;
+
+ ///
+ /// permissions control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::WebsitePanel.Portal.ExchangeServer.UserControls.EnterpriseStoragePermissions permissions;
+
+ ///
+ /// btnSave control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.WebControls.Button btnSave;
+
+ ///
+ /// valSummary control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.WebControls.ValidationSummary valSummary;
+ }
+}
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/EnterpriseStorageFolders.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/EnterpriseStorageFolders.ascx
new file mode 100644
index 00000000..eff151eb
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/EnterpriseStorageFolders.ascx
@@ -0,0 +1,105 @@
+<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="EnterpriseStorageFolders.ascx.cs" Inherits="WebsitePanel.Portal.ExchangeServer.EnterpriseStorageFolders" %>
+<%@ Register Src="../UserControls/SimpleMessageBox.ascx" TagName="SimpleMessageBox" TagPrefix="wsp" %>
+<%@ Register Src="UserControls/Menu.ascx" TagName="Menu" TagPrefix="wsp" %>
+<%@ Register Src="UserControls/Breadcrumb.ascx" TagName="Breadcrumb" TagPrefix="wsp" %>
+<%@ Register Src="../UserControls/QuotaViewer.ascx" TagName="QuotaViewer" TagPrefix="wsp" %>
+<%@ Register Src="../UserControls/EnableAsyncTasksSupport.ascx" TagName="EnableAsyncTasksSupport" TagPrefix="wsp" %>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ <%# Eval("Name") %>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+// This code was generated by a tool.
+//
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated.
+//
+//------------------------------------------------------------------------------
+
+namespace WebsitePanel.Portal.ExchangeServer {
+
+
+ public partial class EnterpriseStorageFolders {
+
+ ///
+ /// asyncTasks control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::WebsitePanel.Portal.EnableAsyncTasksSupport asyncTasks;
+
+ ///
+ /// breadcrumb control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::WebsitePanel.Portal.ExchangeServer.UserControls.Breadcrumb breadcrumb;
+
+ ///
+ /// menu control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::WebsitePanel.Portal.ExchangeServer.UserControls.Menu menu;
+
+ ///
+ /// imgESS control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.WebControls.Image imgESS;
+
+ ///
+ /// locTitle control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.WebControls.Localize locTitle;
+
+ ///
+ /// litRootFolder control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.WebControls.Literal litRootFolder;
+
+ ///
+ /// messageBox control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::WebsitePanel.Portal.UserControls.SimpleMessageBox messageBox;
+
+ ///
+ /// btnAddFolder control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.WebControls.Button btnAddFolder;
+
+ ///
+ /// SearchPanel control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.WebControls.Panel SearchPanel;
+
+ ///
+ /// locSearch control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.WebControls.Localize locSearch;
+
+ ///
+ /// ddlPageSize control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.WebControls.DropDownList ddlPageSize;
+
+ ///
+ /// txtSearchValue control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.WebControls.TextBox txtSearchValue;
+
+ ///
+ /// cmdSearch control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.WebControls.ImageButton cmdSearch;
+
+ ///
+ /// gvFolders control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.WebControls.GridView gvFolders;
+
+ ///
+ /// odsEnterpriseFoldersPaged control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.WebControls.ObjectDataSource odsEnterpriseFoldersPaged;
+
+ ///
+ /// locQuota control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.WebControls.Localize locQuota;
+
+ ///
+ /// foldersQuota control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::WebsitePanel.Portal.QuotaViewer foldersQuota;
+ }
+}
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/EnterpriseStorageSpaces.ascx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/EnterpriseStorageSpaces.ascx.designer.cs
index 9c027dbd..ab2c2ca7 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/EnterpriseStorageSpaces.ascx.designer.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/EnterpriseStorageSpaces.ascx.designer.cs
@@ -26,7 +26,6 @@
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/ExchangeMailboxGeneralSettings.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/ExchangeMailboxGeneralSettings.ascx
index ba8d6e3b..684c694f 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/ExchangeMailboxGeneralSettings.ascx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/ExchangeMailboxGeneralSettings.ascx
@@ -119,6 +119,16 @@
+
+
+
+