zydronium/websitepanel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge

Browse source
This commit is contained in:
alexY 2015-04-27 17:07:41 +03:00
commit 81fa984bdc
180 changed files with 13490 additions and 1913 deletions
Download patch file Download diff file Expand all files Collapse all files

19
WebsitePanel/Sources/WebsitePanel.Server/Organizations.asmx.cs
View file

@ -27,6 +27,7 @@
// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Web.Services;
using System.Web.Services.Protocols;
@ -254,5 +255,23 @@ namespace WebsitePanel.Server
{
Organization.ChangeDriveMapFolderPath(organizationId, oldFolder, newFolder);
}
[WebMethod, SoapHeader("settings")]
public List<OrganizationUser> GetOrganizationUsersWithExpiredPassword(string organizationId, int daysBeforeExpiration)
{
return Organization.GetOrganizationUsersWithExpiredPassword(organizationId, daysBeforeExpiration);
}
[WebMethod, SoapHeader("settings")]
public void ApplyPasswordSettings(string organizationId, OrganizationPasswordSettings passwordSettings)
{
Organization.ApplyPasswordSettings(organizationId, passwordSettings);
}
[WebMethod, SoapHeader("settings")]
public bool CheckPhoneNumberIsInUse(string phoneNumber, string userSamAccountName = null)
{
return Organization.CheckPhoneNumberIsInUse(phoneNumber, userSamAccountName);
}
}
}

5
WebsitePanel/Sources/WebsitePanel.Server/VirtualizationServer2012.asmx.cs
View file

@ -1023,14 +1023,13 @@ namespace WebsitePanel.Server
}
[WebMethod, SoapHeader("settings")]
public bool DisableVmReplication(string vmId, string replicaServer)
public void DisableVmReplication(string vmId)
{
try
{
Log.WriteStart("'{0}' DisableVmReplication", ProviderSettings.ProviderName);
var result = VirtualizationProvider.DisableVmReplication(vmId, replicaServer);
VirtualizationProvider.DisableVmReplication(vmId);
Log.WriteEnd("'{0}' DisableVmReplication", ProviderSettings.ProviderName);
return result;
}
catch (Exception ex)
{