yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes 28012 and 28044, issues with notification emails and issue with getAllByEmail method in Users

Browse Source 
[TFS Changeset #73410]
This commit is contained in:
hartvig
2010-07-20 09:47:27 +00:00
parent 7969ad0f6c
commit cf56f07e28
2 changed files with 9 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
umbraco/businesslogic/User.cs
View File

@@ -398,26 +398,20 @@ namespace umbraco.BusinessLogic
/// <returns></returns>
public static User[] getAllByEmail(string email)
{
List<User> retVal = new List<User>();
System.Collections.ArrayList tmpContainer = new System.Collections.ArrayList();
IRecordsReader dr;
dr = SqlHelper.ExecuteReader(
"Select id from umbracoUser where userEmail LIKE %@email%", SqlHelper.CreateParameter("@email", email));
"Select id from umbracoUser where userEmail LIKE @email", SqlHelper.CreateParameter("@email", String.Format("%{0}%", email)));
while (dr.Read())
{
tmpContainer.Add(BusinessLogic.User.GetUser(dr.GetInt("id")));
retVal.Add(BusinessLogic.User.GetUser(dr.GetInt("id")));
}
dr.Close();
User[] retVal = new User[tmpContainer.Count];
int c = 0;
foreach (User u in tmpContainer)
{
retVal[c] = u;
c++;
}
return retVal;
return retVal.ToArray();
}
/// <summary>
@@ -436,7 +430,7 @@ namespace umbraco.BusinessLogic
var users = new List<User>();
if (partialMatch)
{
{
using (var dr = SqlHelper.ExecuteReader(
"Select id from umbracoUser where userLogin LIKE @login", SqlHelper.CreateParameter("@login", String.Format("%{0}%", login))))
{
@@ -461,7 +455,7 @@ namespace umbraco.BusinessLogic
return users;
}
/// <summary>
@@ -613,7 +607,7 @@ namespace umbraco.BusinessLogic
{
this.LoginName = DateTime.Now.ToString("yyyyMMdd") + "_" + this.LoginName;
}
}
/// <summary>

4
umbraco/cms/businesslogic/workflow/Notification.cs
View File

@@ -122,13 +122,13 @@ namespace umbraco.cms.businesslogic.workflow
string[] subjectVars = {
HttpContext.Current.Request.ServerVariables["SERVER_NAME"] + ":" + HttpContext.Current.Request.Url.Port.ToString() + SystemDirectories.Umbraco, ui.Text(Action.Alias)
HttpContext.Current.Request.ServerVariables["SERVER_NAME"] + ":" + HttpContext.Current.Request.Url.Port.ToString() + IOHelper.ResolveUrl(SystemDirectories.Umbraco), ui.Text(Action.Alias)
,
documentObject.Text
};
string[] bodyVars = {
mailingUser.Name, ui.Text(Action.Alias), documentObject.Text, performingUser.Name,
HttpContext.Current.Request.ServerVariables["SERVER_NAME"] + ":" + HttpContext.Current.Request.Url.Port.ToString() + SystemDirectories.Umbraco,
HttpContext.Current.Request.ServerVariables["SERVER_NAME"] + ":" + HttpContext.Current.Request.Url.Port.ToString() +IOHelper.ResolveUrl(SystemDirectories.Umbraco),
documentObject.Id.ToString(), summary.ToString(),
String.Format("http://{0}/{1}",
HttpContext.Current.Request.ServerVariables["SERVER_NAME"] + ":" + HttpContext.Current.Request.Url.Port.ToString(),