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

Merge

Browse source
This commit is contained in:
Alexander Trofimov 2015-05-21 12:07:10 +03:00
commit 6864613f99
5 changed files with 30 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

31
WebsitePanel/Database/update_db.sql
View file

@ -12216,7 +12216,7 @@ SET @columnFullName = 'FullName'
DECLARE @curUsers cursor DECLARE @curUsers cursor
DECLARE @curSpace cursor DECLARE @curSpace cursor
DECLARE @sqlSpace nvarchar(2000) DECLARE @sqlSpace nvarchar(3000)
DECLARE @sqlUsers nvarchar(2000) DECLARE @sqlUsers nvarchar(2000)
DECLARE @sqlReturn nvarchar(4000) DECLARE @sqlReturn nvarchar(4000)
@ -12325,7 +12325,7 @@ SET @sqlSpace = @sqlSpace + 'SI.ItemID
INNER JOIN ServiceItems AS SI ON I.ItemID = SI.ItemID INNER JOIN ServiceItems AS SI ON I.ItemID = SI.ItemID
INNER JOIN ServiceItemTypes AS STYPE ON SI.ItemTypeID = STYPE.ItemTypeID INNER JOIN ServiceItemTypes AS STYPE ON SI.ItemTypeID = STYPE.ItemTypeID
WHERE STYPE.Searchable = 1 WHERE STYPE.Searchable = 1
UNION UNION (
SELECT SELECT
D.DomainID AS ItemID, D.DomainID AS ItemID,
D.DomainName as TextSearch, D.DomainName as TextSearch,
@ -12339,14 +12339,37 @@ SET @sqlSpace = @sqlSpace + 'SI.ItemID
UNION UNION
SELECT SELECT
EA.ItemID AS ItemID, EA.ItemID AS ItemID,
EA.AccountName as TextSearch, EA.DisplayName as TextSearch,
''ExchangeAccount'' as ColumnType, ''ExchangeAccount'' as ColumnType,
''ExchangeAccountMailbox'' as FullType, ''ExchangeAccount'' as FullType,
SI2.PackageID as PackageID, SI2.PackageID as PackageID,
EA.AccountID as AccountID EA.AccountID as AccountID
FROM @ItemsService AS I2 FROM @ItemsService AS I2
INNER JOIN ServiceItems AS SI2 ON I2.ItemID = SI2.ItemID INNER JOIN ServiceItems AS SI2 ON I2.ItemID = SI2.ItemID
INNER JOIN ExchangeAccounts AS EA ON I2.ItemID = EA.ItemID INNER JOIN ExchangeAccounts AS EA ON I2.ItemID = EA.ItemID
UNION
SELECT
EA4.ItemID AS ItemID,
EA4.PrimaryEmailAddress as TextSearch,
''ExchangeAccount'' as ColumnType,
''ExchangeAccount'' as FullType,
SI4.PackageID as PackageID,
EA4.AccountID as AccountID
FROM @ItemsService AS I4
INNER JOIN ServiceItems AS SI4 ON I4.ItemID = SI4.ItemID
INNER JOIN ExchangeAccounts AS EA4 ON I4.ItemID = EA4.ItemID
UNION
SELECT
EA3.ItemID AS ItemID,
EAEA.EmailAddress as TextSearch,
''ExchangeAccount'' as ColumnType,
''ExchangeAccount'' as FullType,
SI3.PackageID as PackageID,
EA3.AccountID as AccountID
FROM @ItemsService AS I3
INNER JOIN ServiceItems AS SI3 ON I3.ItemID = SI3.ItemID
INNER JOIN ExchangeAccounts AS EA3 ON I3.ItemID = EA3.ItemID
INNER JOIN ExchangeAccountEmailAddresses AS EAEA ON I3.ItemID = EAEA.AccountID)
ORDER BY TextSearch'; ORDER BY TextSearch';
SET @sqlSpace = @sqlSpace + ' open @curValue' SET @sqlSpace = @sqlSpace + ' open @curValue'

4
WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/Users/UserController.cs
View file

@ -101,7 +101,7 @@ namespace WebsitePanel.EnterpriseServer
// compare user passwords // compare user passwords
if (CryptoUtils.SHA1(user.Password) == password) if ((CryptoUtils.SHA1(user.Password) == password) || (user.Password == password))
{ {
switch (user.OneTimePasswordState) switch (user.OneTimePasswordState)
{ {
@ -172,7 +172,7 @@ namespace WebsitePanel.EnterpriseServer
} }
// compare user passwords // compare user passwords
if (CryptoUtils.SHA1(user.Password) == password) if ((CryptoUtils.SHA1(user.Password) == password) || (user.Password == password))
return new UserInfo(user); return new UserInfo(user);
return null; return null;

3
WebsitePanel/Sources/WebsitePanel.WebPortal/App_GlobalResources/WebsitePanel_SharedResources.ascx.resx
View file

@ -5292,9 +5292,6 @@
<data name="UserItemType.ExchangeAccount" xml:space="preserve"> <data name="UserItemType.ExchangeAccount" xml:space="preserve">
<value>Exchange Account</value> <value>Exchange Account</value>
</data> </data>
<data name="UserItemType.ExchangeAccountMailbox" xml:space="preserve">
<value>Exchange Mailbox</value>
</data>
<data name="UserItemType.Users" xml:space="preserve"> <data name="UserItemType.Users" xml:space="preserve">
<value>Account Home</value> <value>Account Home</value>
</data> </data>

2
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SkinControls/GlobalSearch.ascx
View file

@ -50,7 +50,7 @@
$ImgBtn.attr('disabled', 'disabled'); $ImgBtn.attr('disabled', 'disabled');
} }
}); });
if (document.referrer.search("pid=Login") > 0) { if (document.referrer.search("pid=Login") > 0 || window.location.href.search("pid=SearchObject") > 0) {
$("#<%= tbSearch.ClientID %>").focus(); $("#<%= tbSearch.ClientID %>").focus();
} }

7
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SkinControls/GlobalSearch.ascx.cs
View file

@ -48,7 +48,6 @@ namespace WebsitePanel.Portal.SkinControls
const string TYPE_DOMAIN = "Domain"; const string TYPE_DOMAIN = "Domain";
const string TYPE_ORGANIZATION = "Organization"; const string TYPE_ORGANIZATION = "Organization";
const string TYPE_EXCHANGEACCOUNT = "ExchangeAccount"; const string TYPE_EXCHANGEACCOUNT = "ExchangeAccount";
const string TYPE_EXCHANGEACCOUNT_MAILBOX = "ExchangeAccountMailbox";
const string PID_SPACE_WEBSITES = "SpaceWebSites"; const string PID_SPACE_WEBSITES = "SpaceWebSites";
const string PID_SPACE_DIMAINS = "SpaceDomains"; const string PID_SPACE_DIMAINS = "SpaceDomains";
const string PID_SPACE_EXCHANGESERVER = "SpaceExchangeServer"; const string PID_SPACE_EXCHANGESERVER = "SpaceExchangeServer";
@ -151,12 +150,6 @@ namespace WebsitePanel.Portal.SkinControls
"moduleDefId=ExchangeServer"); "moduleDefId=ExchangeServer");
break; break;
case TYPE_EXCHANGEACCOUNT: case TYPE_EXCHANGEACCOUNT:
res = PortalUtils.NavigatePageURL(PID_SPACE_EXCHANGESERVER, "ItemID", itemId.ToString(),
PortalUtils.SPACE_ID_PARAM + "=" + spaceId, "ctl=edit_user",//"mid="+this.ModuleID.ToString(),
"AccountID="+this.tbAccountId.Text,"Context=User",
"moduleDefId=ExchangeServer");
break;
case TYPE_EXCHANGEACCOUNT_MAILBOX:
res = PortalUtils.NavigatePageURL(PID_SPACE_EXCHANGESERVER, "ItemID", itemId.ToString(), res = PortalUtils.NavigatePageURL(PID_SPACE_EXCHANGESERVER, "ItemID", itemId.ToString(),
PortalUtils.SPACE_ID_PARAM + "=" + spaceId, "ctl=edit_user",//"mid="+this.ModuleID.ToString(), PortalUtils.SPACE_ID_PARAM + "=" + spaceId, "ctl=edit_user",//"mid="+this.ModuleID.ToString(),
"AccountID=" + this.tbAccountId.Text, "Context=Mailbox", "AccountID=" + this.tbAccountId.Text, "Context=Mailbox",